up shell

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

@@ -60,47 +60,45 @@ function TestETH2Chain33Assets_proxy() {
     result=$(${Chain33Cli} evm query -a "${chain33EthBridgeTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})")
     #    is_equal "${result}" "2000000000000000"
 
+    ${Chain33Cli} evm query -a "${chain33EthBridgeTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33Validatorsp})"
     # 原来的数额
     # shellcheck disable=SC2154
     result=$(${CLIA} ethereum balance -o "${ethTestAddr2}")
+    # shellcheck disable=SC2154
+    result=$(${CLIA} ethereum balance -o "${ethValidatorAddrp}")
 
     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"
+    result=$(${CLIA} chain33 withdraw -m 0.002 -k "${chain33ReceiverAddrKey}" -r "${ethTestAddr2}" -t "${chain33EthBridgeTokenAddr}")
+    cli_ret "${result}" "withdraw"
 
     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}"
+#    cli_ret "${result}" "balance" ".balance" "0"
 
     echo "check the balance on chain33"
     result=$(${Chain33Cli} evm query -a "${chain33EthBridgeTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})")
-#    is_equal "${result}" "0"
+    is_equal "${result}" "0"
 
-    # 查询 ETH 这端 bridgeBank 地址 0
-    result=$(${CLIA} ethereum balance -o "${ethBridgeBank}")
-#    cli_ret "${result}" "balance" ".balance" "0"
+    ${Chain33Cli} evm query -a "${chain33EthBridgeTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33Validatorsp})"
 
     result=$(${CLIA} ethereum balance -o "${ethTestAddr2}")
 
+    result=$(${CLIA} ethereum balance -o "${ethValidatorAddrp}")
+
     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}"
+    # shellcheck disable=SC2154
+    ${CLIA} ethereum transfer -k "${ethTestAddrKey1}" -m 10 -r "${ethValidatorAddrp}" -t "${ethereumUSDTERC20TokenAddr}"
+    sleep 2
+    result=$(${CLIA} ethereum balance -o "${ethValidatorAddrp}" -t "${ethereumUSDTERC20TokenAddr}")
+
     # 查询 ETH 这端 bridgeBank 地址原来是 0
     # shellcheck disable=SC2154
     result=$(${CLIA} ethereum balance -o "${ethBridgeBank}" -t "${ethereumUSDTERC20TokenAddr}")
@@ -125,33 +123,21 @@ function TestETH2Chain33USDT_proxy() {
     # 结果是 12 * le8
     is_equal "${result}" "1200000000"
 
+     result=$(${Chain33Cli} evm query -a "${chain33USDTBridgeTokenAddr}" -c "${chain33TestAddr1}" -b "balanceOf(${chain33Validatorsp})")
+
+    # 原来的数额
+    result=$(${CLIA} ethereum balance -o "${ethTestAddr2}" -t "${ethereumUSDTERC20TokenAddr}")
+
+    result=$(${CLIA} ethereum balance -o "${ethValidatorAddrp}" -t "${ethereumUSDTERC20TokenAddr}")
+
     # 原来的数额 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"
+    result=$(${CLIA} chain33 withdraw -m 12 -k "${chain33ReceiverAddrKey}" -r "${ethReceiverAddr1}" -t "${chain33USDTBridgeTokenAddr}")
+    cli_ret "${result}" "withdraw"
 
     sleep "${maturityDegree}"
 
@@ -163,10 +149,13 @@ function TestETH2Chain33USDT_proxy() {
     result=$(${CLIA} ethereum balance -o "${ethBridgeBank}" -t "${ethereumUSDTERC20TokenAddr}")
     cli_ret "${result}" "balance" ".balance" "0"
 
+    result=$(${CLIA} ethereum balance -o "${ethTestAddr2}" -t "${ethereumUSDTERC20TokenAddr}")
+
     # 更新后的金额 12
     result=$(${CLIA} ethereum balance -o "${ethReceiverAddr1}" -t "${ethereumUSDTERC20TokenAddr}")
     cli_ret "${result}" "balance" ".balance" "12"
 
+
     echo -e "${GRE}=========== $FUNCNAME end ===========${NOC}"
 }
 
@@ -175,7 +164,7 @@ function TestRelayerProxy() {
     setWithdraw
 
     TestETH2Chain33Assets_proxy
-#    TestETH2Chain33USDT_proxy
+    TestETH2Chain33USDT_proxy
 }
 
 function AllRelayerMainTest() {

plugin/dapp/cross2eth/ebcli/ethereumRelayerCmd.go

@@ -1118,19 +1118,21 @@ func TransferEthFlags(cmd *cobra.Command) {
 	_ = cmd.MarkFlagRequired("to")
 	cmd.Flags().Float64P("amount", "m", 0, "amount")
 	_ = cmd.MarkFlagRequired("amount")
+	cmd.Flags().StringP("token", "t", "", "token address")
 }
 
 func TransferEth(cmd *cobra.Command, args []string) {
 	rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
 	from, _ := cmd.Flags().GetString("from")
 	to, _ := cmd.Flags().GetString("to")
+	token, _ := cmd.Flags().GetString("token")
 	amount, _ := cmd.Flags().GetFloat64("amount")
 
 	d := int64(18)
 
 	realAmount := utils.ToWei(amount, d)
 	para := ebTypes.TransferToken{
-		TokenAddr: "",
+		TokenAddr: token,
 		FromKey:   from,
 		ToAddr:    to,
 		Amount:    realAmount.String(),