add proxy test shell

plugin/dapp/cross2eth/boss4x/chain33/offline/createERC20.go

@@ -239,8 +239,8 @@ func SetWithdrawProxy(cmd *cobra.Command, _ []string) {
 	parameter := fmt.Sprintf("setWithdrawProxy(%s)", withdrawAddr)
 	_, packData, err := evmAbi.Pack(parameter, generated.BridgeBankABI, false)
 	if nil != err {
-		fmt.Println("configOfflineSaveAccount", "Failed to do abi.Pack due to:", err.Error())
+		fmt.Println("setWithdrawProxy", "Failed to do abi.Pack due to:", err.Error())
 		return
 	}
-	callContractAndSignWrite(cmd, packData, contract, "create_bridge_token")
+	callContractAndSignWrite(cmd, packData, contract, "set_withdraw_proxy")
 }

plugin/dapp/cross2eth/cmd/build/dockerRelayerTest.sh

@@ -19,6 +19,7 @@ function start_docker_ebrelayerProxy() {
 
     pushNameChange "./relayerproxy.toml"
 
+    # 代理转账中继器中的标志位ProcessWithDraw设置为true
     sed -i 's/^ProcessWithDraw=.*/ProcessWithDraw=true/g' "./relayerproxy.toml"
 
     # shellcheck disable=SC2154
@@ -30,16 +31,163 @@ function start_docker_ebrelayerProxy() {
     init_validator_relayer "${CLIP}" "${validatorPwd}" "${chain33ValidatorKeyp}" "${ethValidatorAddrKeyp}"
 }
 
-#1.通过以下命令设置代理提币
-#./ebcli_A ethereum cfgWithdraw
-#./ebcli_A ethereum cfgWithdraw 设置的数量是以wei为单位的 USDT 精度为６ eth/bnb　或者ｈｔ就是１８
-#
-#２．在chain33上的bridgeBank合约中设置proxyReceiver
-#
-#3.将其中代理转账中继器中的标志位ProcessWithDraw设置为true，其余中继器保持false
+#strle18="000000000000000000"
+#strle6="000000"
 
 function setWithdraw() {
+    result=$(${CLIP} ethereum cfgWithdraw -f 1 -s ETH -a "500000000000000000000")
+    cli_ret "${result}" "cfgWithdraw"
+    result=$(${CLIP} ethereum cfgWithdraw -f 1 -s USDT -a "500000000")
+    cli_ret "${result}" "cfgWithdraw"
+
+    # 在chain33上的bridgeBank合约中设置proxyReceiver
+    # shellcheck disable=SC2154
+    ${Boss4xCLI} chain33 offline set_withdraw_proxy -c "${chain33BridgeBank}" -a "${chain33Validatorsp}" -k "${chain33DeployKey}" -n "set_withdraw_proxy:${chain33Validatorsp}"
+    chain33_offline_send "set_withdraw_proxy.txt"
+}
+
+# eth to chain33 在以太坊上锁定 ETH 资产,然后在 chain33 上 burn
+function TestETH2Chain33Assets_proxy() {
+    echo -e "${GRE}=========== $FUNCNAME begin ===========${NOC}"
+    echo -e "${GRE}=========== eth to chain33 在以太坊上锁定 ETH 资产,然后在 chain33 上 burn ===========${NOC}"
+    # shellcheck disable=SC2154
+    result=$(${CLIA} ethereum balance -o "${ethBridgeBank}")
+    cli_ret "${result}" "balance" ".balance" "0"
+
+    # shellcheck disable=SC2154
+    result=$(${CLIA} ethereum lock -m 0.002 -k "${ethTestAddrKey1}" -r "${chain33ReceiverAddr}")
+    cli_ret "${result}" "lock"
+
+    # eth 等待 2 个区块
+    sleep 4
+
+    result=$(${CLIA} ethereum balance -o "${ethBridgeBank}")
+    cli_ret "${result}" "balance" ".balance" "0.002"
+
+    # shellcheck disable=SC2086
+    sleep "${maturityDegree}"
+
+    # chain33 chain33EthBridgeTokenAddr（ETH合约中）查询 lock 金额
+    # shellcheck disable=SC2154
+    result=$(${Chain33Cli} evm query -a "${chain33EthBridgeTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})")
+    #    is_equal "${result}" "2000000000000000"
+
+    # 原来的数额
+    # shellcheck disable=SC2154
+    result=$(${CLIA} ethereum balance -o "${ethTestAddr2}")
+
+    echo '#5.burn ETH from Chain33 ETH(Chain33)-----> Ethereum'
+    # shellcheck disable=SC2154
+    result=$(${CLIA} chain33 withdraw -m 0.0003 -k "${chain33ReceiverAddrKey}" -r "${ethTestAddr2}" -t "${chain33EthBridgeTokenAddr}")
+    cli_ret "${result}" "burn"
+
+    sleep "${maturityDegree}"
+
+    echo "check the balance on chain33"
+    result=$(${Chain33Cli} evm query -a "${chain33EthBridgeTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})")
+    #    is_equal "${result}" "1700000000000000"
+
+    # 查询 ETH 这端 bridgeBank 地址 0
+    result=$(${CLIA} ethereum balance -o "${ethBridgeBank}")
+#    cli_ret "${result}" "balance" ".balance" "0.0017"
+
+    echo '#5.burn ETH from Chain33 ETH(Chain33)-----> Ethereum 6'
+    result=$(${CLIA} chain33 burn -m 0.0017 -k "${chain33ReceiverAddrKey}" -r "${ethTestAddr2}" -t "${chain33EthBridgeTokenAddr}")
+    cli_ret "${result}" "burn"
+
+    sleep "${maturityDegree}"
+
+    echo "check the balance on chain33"
+    result=$(${Chain33Cli} evm query -a "${chain33EthBridgeTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})")
+#    is_equal "${result}" "0"
+
+    # 查询 ETH 这端 bridgeBank 地址 0
+    result=$(${CLIA} ethereum balance -o "${ethBridgeBank}")
+#    cli_ret "${result}" "balance" ".balance" "0"
+
+    result=$(${CLIA} ethereum balance -o "${ethTestAddr2}")
+
+    echo -e "${GRE}=========== $FUNCNAME end ===========${NOC}"
+}
+
+function TestETH2Chain33USDT_proxy() {
+    echo -e "${GRE}=========== $FUNCNAME begin ===========${NOC}"
+    echo -e "${GRE}=========== eth to chain33 在以太坊上锁定 USDT 资产,然后在 chain33 上 burn ===========${NOC}"
+    # 查询 ETH 这端 bridgeBank 地址原来是 0
+    # shellcheck disable=SC2154
+    result=$(${CLIA} ethereum balance -o "${ethBridgeBank}" -t "${ethereumUSDTERC20TokenAddr}")
+    cli_ret "${result}" "balance" ".balance" "0"
+
+    # ETH 这端 lock 12个 USDT
+    result=$(${CLIA} ethereum lock -m 12 -k "${ethTestAddrKey1}" -r "${chain33ReceiverAddr}" -t "${ethereumUSDTERC20TokenAddr}")
+    cli_ret "${result}" "lock"
+
+    # eth 等待 2 个区块
+    sleep 4
+
+    # 查询 ETH 这端 bridgeBank 地址 12 USDT
+    result=$(${CLIA} ethereum balance -o "${ethBridgeBank}" -t "${ethereumUSDTERC20TokenAddr}")
+    cli_ret "${result}" "balance" ".balance" "12"
+
+    sleep "${maturityDegree}"
+
+    # chain33 chain33EthBridgeTokenAddr（ETH合约中）查询 lock 金额
+    # shellcheck disable=SC2154
+    result=$(${Chain33Cli} evm query -a "${chain33USDTBridgeTokenAddr}" -c "${chain33TestAddr1}" -b "balanceOf(${chain33ReceiverAddr})")
+    # 结果是 12 * le8
+    is_equal "${result}" "1200000000"
+
+    # 原来的数额 0
+    # shellcheck disable=SC2154
+    result=$(${CLIA} ethereum balance -o "${ethReceiverAddr1}" -t "${ethereumUSDTERC20TokenAddr}")
+    cli_ret "${result}" "balance" ".balance" "0"
+
+    echo '#5.burn YCC from Chain33 YCC(Chain33)-----> Ethereum'
+    result=$(${CLIA} chain33 burn -m 5 -k "${chain33ReceiverAddrKey}" -r "${ethReceiverAddr1}" -t "${chain33USDTBridgeTokenAddr}")
+    cli_ret "${result}" "burn"
+
+    sleep "${maturityDegree}"
+
+    echo "check the balance on chain33"
+    result=$(${Chain33Cli} evm query -a "${chain33USDTBridgeTokenAddr}" -c "${chain33TestAddr1}" -b "balanceOf(${chain33ReceiverAddr})")
+    # 结果是 12-5 * le8
+    is_equal "${result}" "700000000"
+
+    # 查询 ETH 这端 bridgeBank 地址 7
+    result=$(${CLIA} ethereum balance -o "${ethBridgeBank}" -t "${ethereumUSDTERC20TokenAddr}")
+    cli_ret "${result}" "balance" ".balance" "7"
+
+    # 更新后的金额 5
+    result=$(${CLIA} ethereum balance -o "${ethReceiverAddr1}" -t "${ethereumUSDTERC20TokenAddr}")
+    cli_ret "${result}" "balance" ".balance" "5"
+
+    echo '#5.burn USDT from Chain33 USDT(Chain33)-----> Ethereum'
+    result=$(${CLIA} chain33 burn -m 7 -k "${chain33ReceiverAddrKey}" -r "${ethReceiverAddr1}" -t "${chain33USDTBridgeTokenAddr}")
+    cli_ret "${result}" "burn"
+
+    sleep "${maturityDegree}"
+
+    echo "check the balance on chain33"
+    result=$(${Chain33Cli} evm query -a "${chain33USDTBridgeTokenAddr}" -c "${chain33TestAddr1}" -b "balanceOf(${chain33ReceiverAddr})")
+    is_equal "${result}" "0"
+
+    # 查询 ETH 这端 bridgeBank 地址 0
+    result=$(${CLIA} ethereum balance -o "${ethBridgeBank}" -t "${ethereumUSDTERC20TokenAddr}")
+    cli_ret "${result}" "balance" ".balance" "0"
+
+    # 更新后的金额 12
+    result=$(${CLIA} ethereum balance -o "${ethReceiverAddr1}" -t "${ethereumUSDTERC20TokenAddr}")
+    cli_ret "${result}" "balance" ".balance" "12"
+
+    echo -e "${GRE}=========== $FUNCNAME end ===========${NOC}"
+}
+
+function TestRelayerProxy() {
     start_docker_ebrelayerProxy
+    setWithdraw
+
+    TestETH2Chain33Assets_proxy
+#    TestETH2Chain33USDT_proxy
 }
 
 function AllRelayerMainTest() {
@@ -68,8 +216,9 @@ function AllRelayerMainTest() {
     initPara
 
     StartDockerRelayerDeploy
+    TestRelayerProxy
 
-    test_all
+#    test_all
 
     echo_addrs
     echo -e "${GRE}=========== $FUNCNAME end ===========${NOC}"

plugin/dapp/cross2eth/cmd/build/public/mainPubilcRelayerTest.sh

@@ -68,10 +68,13 @@ source "./offlinePublic.sh"
     chain33ReceiverAddr="12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv"
     chain33ReceiverAddrKey="4257d8692ef7fe13c68b65d6a52f03933db2fa5ce8faf210b5b8b80c721ced01"
 
-    chain33Validatorp="1GTxrmuWiXavhcvsaH5w9whgVxUrWsUMdV"
-    chain33ValidatorKeyp="0xd627968e445f2a41c92173225791bae1ba42126ae96c32f28f97ff8f226e5c68"
     ethValidatorAddrp="0x0c05ba5c230fdaa503b53702af1962e08d0c60bf"
     ethValidatorAddrKeyp="9dc6df3a8ab139a54d8a984f54958ae0661f880229bf3bdbb886b87d58b56a08"
+    chain33Validatorp="1GTxrmuWiXavhcvsaH5w9whgVxUrWsUMdV"
+    chain33ValidatorKeyp="0xd627968e445f2a41c92173225791bae1ba42126ae96c32f28f97ff8f226e5c68"
+
+    chain33Validatorsp="1Hf1wnnr6XaYy5Sf3HhAfT4N8JYV4sMh9J"
+    chain33ValidatorKeysp="0x1dadb7cbad8ea3f968cfad40ac32981def6215690618e62c48e816e7c732a8c2"
 
     chain33ID=0
     maturityDegree=10
@@ -262,7 +265,6 @@ function TestChain33ToEthAssets() {
 #}
 
 # eth to chain33 在以太坊上锁定 ETH 资产,然后在 chain33 上 burn
-
 function TestETH2Chain33Assets() {
     echo -e "${GRE}=========== $FUNCNAME begin ===========${NOC}"
     echo -e "${GRE}=========== eth to chain33 在以太坊上锁定 ETH 资产,然后在 chain33 上 burn ===========${NOC}"

plugin/dapp/cross2eth/cmd/build/public/relayerPublic.sh

@@ -424,7 +424,7 @@ function InitChain33Validator() {
     }
 
     # 导入 chain33Validators 私钥生成地址
-    for name in a b c d p; do
+    for name in a b c d p sp; do
         eval chain33ValidatorKey=\$chain33ValidatorKey${name}
         eval chain33Validator=\$chain33Validator${name}
         result=$(${Chain33Cli} account import_key -k "${chain33ValidatorKey}" -l validator$name)