Merge branch 'exchange_order_0929' of github.com:zhengjunhe/plugin into exchange_order_0929

plugin/dapp/bridgevmxgo/cmd/build/docker-compose-bridgevmxgo.yml

@@ -4,11 +4,15 @@ services:
   ganachetest:
     entrypoint: ["node", "/app/ganache-core.docker.cli.js", "-a", "20", "-b", "2", "--debug", "-m", "coast bar giraffe art venue decide symbol law visual crater vital fold", "-e", "1000"]
     image: trufflesuite/ganache-cli:latest
+    ports:
+      - "8545:8545"
 
   ebrelayera:
     build:
       context: .
       dockerfile: Dockerfile-bridgevmxgo
+    ports:
+      - "9901:9901"
 
   ebrelayerb:
     build:
@@ -31,6 +35,9 @@ services:
       PARAFILE: "/root/chain33.para33.toml"
     expose:
       - "8802"
+    ports:
+      - "8801:8801"
+      - "8901:8901"
 
   chain32:
     entrypoint: /root/entrypoint.sh

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

@@ -782,12 +782,15 @@ function DeployEvmxgo() {
 
     ${EvmxgoBoss4xCLI} chain33 offline create_add_lock_list -s ETH -t "${chain33EthBridgeTokenAddr}" -c "${XgoChain33BridgeBank}" -k "${chain33DeployKey}" -f 1 --chainID "${chain33ID}"
     chain33_offline_send_evm "create_add_lock_list.txt"
+
+    # 重启,需要重新启动relayer,更新nonce
+    restart_ebrelayerA
 }
 
 function TestETH2EVMToChain33() {
     # 查询 ETH 这端 bridgeBank 地址原来是 0
     result=$(${CLIA} ethereum balance -o "${ethBridgeBank}")
-#    cli_ret "${result}" "balance" ".balance" "0"
+#    cli_ret "${result}" "balance" ".balance" "16"
 
     # ETH 这端 lock 11个
     result=$(${CLIA} ethereum lock -m 11 -k "${ethTestAddrKey1}" -r "${chain33ReceiverAddr}")
@@ -796,16 +799,16 @@ function TestETH2EVMToChain33() {
     # eth 等待 2 个区块
     sleep 4
 
-    # 查询 ETH 这端 bridgeBank 地址 11
+    # 查询 ETH 这端 bridgeBank 地址 11 原来16
     result=$(${CLIA} ethereum balance -o "${ethBridgeBank}")
-#    cli_ret "${result}" "balance" ".balance" "11"
+#    cli_ret "${result}" "balance" ".balance" "27"
 
     sleep ${maturityDegree}
 
     # chain33 chain33EthBridgeTokenAddr（ETH合约中）查询 lock 金额
     result=$(${Chain33Cli} evm query -a "${chain33EthBridgeTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})")
     # 结果是 11 * le8
-#    is_equal "${result}" "1100000000"
+#    is_equal "${result}" "4700000000"
 
     ${EvmxgoBoss4xCLI} chain33 offline approve_erc20 -a 330000000000 -s "${XgoChain33BridgeBank}" -c "${chain33EthBridgeTokenAddr}" -k "${chain33ReceiverAddrKey}" -f 1 --chainID "${chain33ID}"
     chain33_offline_send_evm "approve_erc20.txt"
@@ -814,7 +817,7 @@ function TestETH2EVMToChain33() {
     check_tx "${Chain33Cli}" "${hash}"
 
     result=$(${Chain33Cli} evm query -a "${chain33EthBridgeTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})")
-#    is_equal "${result}" "600000000"
+#    is_equal "${result}" "4200000000"
 
     result=$(${Chain33Cli} evm query -a "${chain33EthBridgeTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${XgoChain33BridgeBank})")
 #    is_equal "${result}" "500000000"