Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
zjg555543 committed Oct 27, 2023
1 parent 8cfc5c3 commit 29cbda8
Show file tree
Hide file tree
Showing 10 changed files with 15 additions and 14 deletions.
4 changes: 2 additions & 2 deletions config/config.debug.toml
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@ RootCAPath = "/app/root-ca-cert"

[NetworkConfig]
GenBlockNumber = 1
PolygonBridgeAddress = "0xFc2f92CBFA1b38a4B38B412F582cf08028cBA9e0"
PolygonBridgeAddress = "0x10B65c586f795aF3eCCEe594fE4E38E1F059F780"
PolygonZkEVMGlobalExitRootAddress = "0xEd236da21Ff62bC7B62608AdB818da49E8549fa7"
L2PolygonBridgeAddresses = ["0xFc2f92CBFA1b38a4B38B412F582cf08028cBA9e0"]
L2PolygonBridgeAddresses = ["0x10B65c586f795aF3eCCEe594fE4E38E1F059F780"]

[Nacos]
NacosUrls = ""
Expand Down
4 changes: 2 additions & 2 deletions config/network.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ var (
},
"local": {
GenBlockNumber: 1,
PolygonBridgeAddress: common.HexToAddress("0xFc2f92CBFA1b38a4B38B412F582cf08028cBA9e0"),
PolygonBridgeAddress: common.HexToAddress("0x10B65c586f795aF3eCCEe594fE4E38E1F059F780"),
PolygonZkEVMGlobalExitRootAddress: common.HexToAddress("0xEd236da21Ff62bC7B62608AdB818da49E8549fa7"),
L2PolygonBridgeAddresses: []common.Address{common.HexToAddress("0xFc2f92CBFA1b38a4B38B412F582cf08028cBA9e0")},
L2PolygonBridgeAddresses: []common.Address{common.HexToAddress("0x10B65c586f795aF3eCCEe594fE4E38E1F059F780")},
},
}
)
Expand Down
4 changes: 2 additions & 2 deletions docs/running_local.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ make test-edge
| Address | Description |
|---|---|
| 0x610178dA211FEF7D417bC0e6FeD39F05609AD788 | Proof of Efficiency |
| 0xFc2f92CBFA1b38a4B38B412F582cf08028cBA9e0 | L1 Bridge |
| 0xFc2f92CBFA1b38a4B38B412F582cf08028cBA9e0 | L2 Bridge |
| 0x10B65c586f795aF3eCCEe594fE4E38E1F059F780 | L1 Bridge |
| 0x10B65c586f795aF3eCCEe594fE4E38E1F059F780 | L2 Bridge |
| 0x5FbDB2315678afecb367f032d93F642f64180aa3 | Matic token |
| 0xEd236da21Ff62bC7B62608AdB818da49E8549fa7 | GlobalExitRootManager |

Expand Down
4 changes: 2 additions & 2 deletions test/e2e/bridge_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
)

var (
l1BridgeAddr = common.HexToAddress("0xFc2f92CBFA1b38a4B38B412F582cf08028cBA9e0")
l2BridgeAddr = common.HexToAddress("0xFc2f92CBFA1b38a4B38B412F582cf08028cBA9e0")
l1BridgeAddr = common.HexToAddress("0x10B65c586f795aF3eCCEe594fE4E38E1F059F780")
l2BridgeAddr = common.HexToAddress("0x10B65c586f795aF3eCCEe594fE4E38E1F059F780")
)

// TestE2E tests the flow of deposit and withdraw funds using the vector
Expand Down
4 changes: 2 additions & 2 deletions test/operations/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ const (

// MaticTokenAddress token address
MaticTokenAddress = "0x5FbDB2315678afecb367f032d93F642f64180aa3" //nolint:gosec
l1BridgeAddr = "0xFc2f92CBFA1b38a4B38B412F582cf08028cBA9e0"
l2BridgeAddr = "0xFc2f92CBFA1b38a4B38B412F582cf08028cBA9e0"
l1BridgeAddr = "0x10B65c586f795aF3eCCEe594fE4E38E1F059F780"
l2BridgeAddr = "0x10B65c586f795aF3eCCEe594fE4E38E1F059F780"

l1AccHexAddress = "0x2ecf31ece36ccac2d3222a303b1409233ecbb225"

Expand Down
2 changes: 1 addition & 1 deletion test/scripts/claim/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
)

const (
l2BridgeAddr = "0xFc2f92CBFA1b38a4B38B412F582cf08028cBA9e0"
l2BridgeAddr = "0x10B65c586f795aF3eCCEe594fE4E38E1F059F780"

l2AccHexAddress = "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266"
l2AccHexPrivateKey = "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80"
Expand Down
2 changes: 1 addition & 1 deletion test/scripts/deposit/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
)

const (
l1BridgeAddr = "0xFc2f92CBFA1b38a4B38B412F582cf08028cBA9e0"
l1BridgeAddr = "0x10B65c586f795aF3eCCEe594fE4E38E1F059F780"

l1AccHexAddress = "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266"
l1AccHexPrivateKey = "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80"
Expand Down
2 changes: 1 addition & 1 deletion test/scripts/initialClaim/Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Typically this action is used to include the claim tx to fill the bridge autocla
## Parameters
At the beginning of the script there are the next constant variables that need to be reviewed.
```
l2BridgeAddr = "0xFc2f92CBFA1b38a4B38B412F582cf08028cBA9e0"
l2BridgeAddr = "0x10B65c586f795aF3eCCEe594fE4E38E1F059F780"
zkevmAddr = "0x610178dA211FEF7D417bC0e6FeD39F05609AD788"
accHexAddress = "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266"
Expand Down
2 changes: 1 addition & 1 deletion test/scripts/initialClaim/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
)

const (
l2BridgeAddr = "0xFc2f92CBFA1b38a4B38B412F582cf08028cBA9e0"
l2BridgeAddr = "0x10B65c586f795aF3eCCEe594fE4E38E1F059F780"
zkevmAddr = "0x610178dA211FEF7D417bC0e6FeD39F05609AD788"

accHexAddress = "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266"
Expand Down
1 change: 1 addition & 0 deletions utils/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ func NewClient(ctx context.Context, nodeURL string, bridgeSCAddr common.Address)
if len(bridgeSCAddr) != 0 {
br, err = polygonzkevmbridge.NewPolygonzkevmbridge(bridgeSCAddr, client)
}
log.Infof("nodeURL:%v, bridgeSCAddr:%v, ", nodeURL, bridgeSCAddr.String())
return &Client{
Client: client,
bridge: br,
Expand Down

0 comments on commit 29cbda8

Please sign in to comment.