Skip to content

P
plugin
Commit ebdb158f authored by hezhengjun's avatar hezhengjun
Browse files
Options

Merge branch 'master' into make_eth_call_stable_1213

parents 84969d2e a081b76b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 1 deletion
plugin/dapp/bridgevmxgo/cmd/build/dockerRelayerTestEvm.sh
View file @ ebdb158f
...@@ -820,7 +820,8 @@ function StartDockerRelayerDeploy() { ...@@ -820,7 +820,8 @@ function StartDockerRelayerDeploy() {
offline_create_bridge_token_eth_YCC offline_create_bridge_token_eth_YCC
offline_deploy_erc20_chain33_ZBC offline_deploy_erc20_chain33_ZBC
offline_create_bridge_token_eth_ZBC offline_create_bridge_token_eth_ZBC
offline_deploy_erc20_eth_USDT # offline_deploy_erc20_eth_USDT
offline_deploy_erc20_create_tether_usdt_USDT
offline_create_bridge_token_chain33_USDT offline_create_bridge_token_chain33_USDT
# shellcheck disable=SC2086 # shellcheck disable=SC2086
......
plugin/dapp/cross2eth/ebrelayer/relayer/ethereum/ethereum_test.go
View file @ ebdb158f
...@@ -171,6 +171,7 @@ func Test_DeployContrcts(t *testing.T) { ...@@ -171,6 +171,7 @@ func Test_DeployContrcts(t *testing.T) {
deployInfo: cfg.Deploy, deployInfo: cfg.Deploy,
} }
relayer.clientSpec = sim relayer.clientSpec = sim
relayer.clientWss = sim
relayer.clientChainID = big.NewInt(1) relayer.clientChainID = big.NewInt(1)
deployPrivateKey, _ := crypto.ToECDSA(common.FromHex(relayer.deployInfo.DeployerPrivateKey)) deployPrivateKey, _ := crypto.ToECDSA(common.FromHex(relayer.deployInfo.DeployerPrivateKey))
...@@ -439,6 +440,7 @@ func newEthRelayer(para *ethtxs.DeployPara, sim *ethinterface.SimExtend, x2EthCo ...@@ -439,6 +440,7 @@ func newEthRelayer(para *ethtxs.DeployPara, sim *ethinterface.SimExtend, x2EthCo
relayer.eventLogIndex = relayer.getLastBridgeBankProcessedHeight() relayer.eventLogIndex = relayer.getLastBridgeBankProcessedHeight()
relayer.initBridgeBankTx() relayer.initBridgeBankTx()
relayer.clientSpec = sim relayer.clientSpec = sim
relayer.clientWss = sim
relayer.clientChainID = big.NewInt(1337) relayer.clientChainID = big.NewInt(1337)
deployPrivateKey, _ := crypto.ToECDSA(common.FromHex(relayer.deployInfo.DeployerPrivateKey)) deployPrivateKey, _ := crypto.ToECDSA(common.FromHex(relayer.deployInfo.DeployerPrivateKey))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment