Merge branch 'master' into make_eth_call_stable_1213

plugin/dapp/bridgevmxgo/cmd/build/dockerRelayerTestEvm.sh

@@ -820,7 +820,8 @@ function StartDockerRelayerDeploy() {
     offline_create_bridge_token_eth_YCC
     offline_deploy_erc20_chain33_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
 
     # shellcheck disable=SC2086

plugin/dapp/cross2eth/ebrelayer/relayer/ethereum/ethereum_test.go

@@ -171,6 +171,7 @@ func Test_DeployContrcts(t *testing.T) {
 		deployInfo:          cfg.Deploy,
 	}
 	relayer.clientSpec = sim
+	relayer.clientWss = sim
 	relayer.clientChainID = big.NewInt(1)
 
 	deployPrivateKey, _ := crypto.ToECDSA(common.FromHex(relayer.deployInfo.DeployerPrivateKey))
@@ -439,6 +440,7 @@ func newEthRelayer(para *ethtxs.DeployPara, sim *ethinterface.SimExtend, x2EthCo
 	relayer.eventLogIndex = relayer.getLastBridgeBankProcessedHeight()
 	relayer.initBridgeBankTx()
 	relayer.clientSpec = sim
+	relayer.clientWss = sim
 	relayer.clientChainID = big.NewInt(1337)
 
 	deployPrivateKey, _ := crypto.ToECDSA(common.FromHex(relayer.deployInfo.DeployerPrivateKey))