updata test

5789e907 · QM · b4d05579 · 5789e907 · 5789e907 · 5789e907
Commit 5789e907 authored May 12, 2020 by QM
Showing with 633 additions and 18 deletions

RopstenTest.sh plugin/dapp/x2Ethereum/cmd/build/RopstenTest.sh +576 -0

exec_test.go plugin/dapp/x2Ethereum/executor/exec_test.go +13 -15

publicTest.sh plugin/dapp/x2Ethereum/testsh/publicTest.sh +44 -3

No files found.
--- a/plugin/dapp/x2Ethereum/cmd/build/RopstenTest.sh
+++ b/plugin/dapp/x2Ethereum/cmd/build/RopstenTest.sh
+#!/usr/bin/env bash
+# shellcheck disable=SC2128
+# shellcheck source=/dev/null
+set -x
+set +e
+
+source "./publicTest.sh"
+
+CLIA="./ebcli_A"
+CLIB="./ebcli_B"
+CLIC="./ebcli_C"
+CLID="./ebcli_D"
+
+chain33SenderAddr="14KEKbYtKKQm4wMthSK9J4La4nAiidGozt"
+chain33SenderAddrKey="CC38546E9E659D15E6B4893F0AB32A06D103931A8230B0BDE71459D2B27D6944"
+
+# validatorsAddr=["0x92c8b16afd6d423652559c6e266cbe1c29bfd84f", "0x0df9a824699bc5878232c9e612fe1a5346a5a368", "0xcb074cb21cdddf3ce9c3c0a7ac4497d633c9d9f1", "0xd9dab021e74ecf475788ed7b61356056b2095830"]
+ethValidatorAddrKeyA="3fa21584ae2e4fd74db9b58e2386f5481607dfa4d7ba0617aaa7858e5025dc1e"
+ethValidatorAddrKeyB="a5f3063552f4483cfc20ac4f40f45b798791379862219de9e915c64722c1d400"
+ethValidatorAddrKeyC="bbf5e65539e9af0eb0cfac30bad475111054b09c11d668fc0731d54ea777471e"
+ethValidatorAddrKeyD="c9fa31d7984edf81b8ef3b40c761f1847f6fcd5711ab2462da97dc458f1f896b"
+
+# 新增地址 chain33 需要导入地址 转入 10 bty当收费费
+chain33Validator1="1GTxrmuWiXavhcvsaH5w9whgVxUrWsUMdV"
+chain33Validator2="155ooMPBTF8QQsGAknkK7ei5D78rwDEFe6"
+chain33Validator3="13zBdQwuyDh7cKN79oT2odkxYuDbgQiXFv"
+chain33Validator4="113ZzVamKfAtGt9dq45fX1mNsEoDiN95HG"
+chain33ValidatorKey1="0xd627968e445f2a41c92173225791bae1ba42126ae96c32f28f97ff8f226e5c68"
+chain33ValidatorKey2="0x9d539bc5fd084eb7fe86ad631dba9aa086dba38418725c38d9751459f567da66"
+chain33ValidatorKey3="0x0a6671f101e30a2cc2d79d77436b62cdf2664ed33eb631a9c9e3f3dd348a23be"
+chain33ValidatorKey4="0x3818b257b05ee75b6e43ee0e3cfc2d8502342cf67caed533e3756966690b62a5"
+
+ethReceiverAddr1="0xa4ea64a583f6e51c3799335b28a8f0529570a635"
+ethReceiverAddrKey1="355b876d7cbcb930d5dfab767f66336ce327e082cbaa1877210c1bae89b1df71"
+ethReceiverAddr2="0x0c05ba5c230fdaa503b53702af1962e08d0c60bf"
+ethReceiverAddrKey2="9dc6df3a8ab139a54d8a984f54958ae0661f880229bf3bdbb886b87d58b56a08"
+maturityDegree=10
+tokenAddrBty=""
+
+function kill_ebrelayerC() {
+    kill_ebrelayer "./C/ebrelayer"
+}
+function kill_ebrelayerD() {
+    kill_ebrelayer "./D/ebrelayer"
+}
+function start_ebrelayerC() {
+    start_ebrelayer "./C/ebrelayer" "./C/ebrelayer.log"
+    ${CLIC} relayer unlock -p 123456hzj
+    sleep 5
+    eth_block_wait 1 https://ropsten-rpc.linkpool.io/
+    sleep 1
+}
+function start_ebrelayerD() {
+    start_ebrelayer "./D/ebrelayer" "./D/ebrelayer.log"
+    ${CLID} relayer unlock -p 123456hzj
+    sleep 5
+    eth_block_wait 1 https://ropsten-rpc.linkpool.io/
+    sleep 1
+}
+
+function InitAndDeploy() {
+    echo -e "${GRE}=========== $FUNCNAME begin ===========${NOC}"
+    result=$(${CLIA} relayer set_pwd -n 123456hzj -o kk)
+    cli_ret "${result}" "set_pwd"
+
+    result=$(${CLIA} relayer unlock -p 123456hzj)
+    cli_ret "${result}" "unlock"
+
+    result=$(${CLIA} relayer ethereum deploy)
+    cli_ret "${result}" "deploy"
+
+    echo -e "${GRE}=========== $FUNCNAME end ===========${NOC}"
+}
+
+function StartRelayerAndDeploy() {
+    echo -e "${GRE}=========== $FUNCNAME begin ===========${NOC}"
+
+    for name in A B C D; do
+        local ebrelayer="./$name/ebrelayer"
+        kill_ebrelayer "${ebrelayer}"
+    done
+    sleep 1
+
+    rm -rf './A' './B' './C' './D' './datadir' './ebrelayer.log' './logs'
+    mkdir './A' './B' './C' './D'
+    cp './relayer.toml' './A/relayer.toml'
+    cp './ebrelayer' './A/ebrelayer'
+
+    #start_trufflesuite
+
+    #start_ebrelayer "./A/ebrelayer" "./A/ebrelayer.log"
+    # 部署合约
+    #InitAndDeploy
+
+    # 获取 BridgeRegistry 地址
+    #result=$(${CLIA} relayer ethereum bridgeRegistry)
+    #BridgeRegistry=$(cli_ret "${result}" "bridgeRegistry" ".addr")
+    BridgeRegistry="0x212ae3c705DA7E3568a85595E8e16268FE7F6448"
+
+    #kill_ebrelayer "./A/ebrelayer"
+    # 修改 relayer.toml 配置文件
+    updata_relayer_toml_ropston ${BridgeRegistry} ${maturityDegree} "./A/relayer.toml"
+    updata_all_relayer_toml2
+
+    echo -e "${GRE}=========== $FUNCNAME end ===========${NOC}"
+}
+
+# chian33 添加验证着及权重
+function InitChain33Vilators() {
+    echo -e "${GRE}=========== $FUNCNAME begin ===========${NOC}"
+    # 导入 chain33Validators 私钥生成地址
+    result=$(${Chain33Cli} account import_key -k ${chain33ValidatorKey1} -l validator1)
+    check_addr "${result}" ${chain33Validator1}
+    result=$(${Chain33Cli} account import_key -k ${chain33ValidatorKey2} -l validator2)
+    check_addr "${result}" ${chain33Validator2}
+    result=$(${Chain33Cli} account import_key -k ${chain33ValidatorKey3} -l validator3)
+    check_addr "${result}" ${chain33Validator3}
+    result=$(${Chain33Cli} account import_key -k ${chain33ValidatorKey4} -l validator4)
+    check_addr "${result}" ${chain33Validator4}
+
+    # SetConsensusThreshold
+    hash=$(${Chain33Cli} send x2ethereum setconsensus -p 80 -k 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv)
+    check_tx "${Chain33Cli}" "${hash}"
+
+    # add a validator
+    hash=$(${Chain33Cli} send x2ethereum add -a ${chain33Validator1} -p 25 -k 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv)
+    check_tx "${Chain33Cli}" "${hash}"
+    hash=$(${Chain33Cli} send x2ethereum add -a ${chain33Validator2} -p 25 -k 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv)
+    check_tx "${Chain33Cli}" "${hash}"
+    hash=$(${Chain33Cli} send x2ethereum add -a ${chain33Validator3} -p 25 -k 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv)
+    check_tx "${Chain33Cli}" "${hash}"
+    hash=$(${Chain33Cli} send x2ethereum add -a ${chain33Validator4} -p 25 -k 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv)
+    check_tx "${Chain33Cli}" "${hash}"
+
+    # query Validators
+    totalPower=$(${Chain33Cli} send x2ethereum query totalpower -k 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv | jq .totalPower | sed 's/\"//g')
+    check_number 100 ${totalPower}
+
+    # cions 转帐到 x2ethereum 合约地址
+    hash=$(${Chain33Cli} send coins send_exec -e x2ethereum -a 200 -k 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv)
+
+    check_tx "${Chain33Cli}" "${hash}"
+    result=$(${Chain33Cli} account balance -a 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv -e x2ethereum)
+    balance_ret "${result}" "200.0000"
+
+    # chain33Validator 要有手续费
+    hash=$(${Chain33Cli} send coins transfer -a 10 -t "${chain33Validator1}" -k 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv)
+    check_tx "${Chain33Cli}" "${hash}"
+    result=$(${Chain33Cli} account balance -a "${chain33Validator1}" -e coins)
+    balance_ret "${result}" "10.0000"
+
+    hash=$(${Chain33Cli} send coins transfer -a 10 -t "${chain33Validator2}" -k 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv)
+    check_tx "${Chain33Cli}" "${hash}"
+    result=$(${Chain33Cli} account balance -a "${chain33Validator2}" -e coins)
+    balance_ret "${result}" "10.0000"
+
+    hash=$(${Chain33Cli} send coins transfer -a 10 -t "${chain33Validator3}" -k 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv)
+    check_tx "${Chain33Cli}" "${hash}"
+    result=$(${Chain33Cli} account balance -a "${chain33Validator3}" -e coins)
+    balance_ret "${result}" "10.0000"
+
+    hash=$(${Chain33Cli} send coins transfer -a 10 -t "${chain33Validator4}" -k 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv)
+    check_tx "${Chain33Cli}" "${hash}"
+    result=$(${Chain33Cli} account balance -a "${chain33Validator4}" -e coins)
+    balance_ret "${result}" "10.0000"
+
+    echo -e "${GRE}=========== $FUNCNAME end ===========${NOC}"
+}
+
+function StartAllEbrelayer() {
+    echo -e "${GRE}=========== $FUNCNAME begin ===========${NOC}"
+    # 重启 ebrelayer 并解锁
+    for name in A B C D; do
+        start_ebrelayer "./"$name"/ebrelayer" "./"$name"/ebrelayer.log"
+
+        # 导入测试地址私钥
+        CLI="./ebcli_$name"
+
+        result=$(${CLI} relayer set_pwd -n 123456hzj -o kk)
+
+        result=$(${CLI} relayer unlock -p 123456hzj)
+        cli_ret "${result}" "unlock"
+    done
+
+    echo -e "${GRE}=========== $FUNCNAME end ===========${NOC}"
+}
+
+function EthImportKey() {
+    echo -e "${GRE}=========== $FUNCNAME begin ===========${NOC}"
+    result=$(${CLIA} relayer ethereum import_chain33privatekey -k "${chain33ValidatorKey1}")
+    cli_ret "${result}" "import_chain33privatekey"
+    result=$(${CLIB} relayer ethereum import_chain33privatekey -k "${chain33ValidatorKey2}")
+    cli_ret "${result}" "import_chain33privatekey"
+    result=$(${CLIC} relayer ethereum import_chain33privatekey -k "${chain33ValidatorKey3}")
+    cli_ret "${result}" "import_chain33privatekey"
+    result=$(${CLID} relayer ethereum import_chain33privatekey -k "${chain33ValidatorKey4}")
+    cli_ret "${result}" "import_chain33privatekey"
+
+    result=$(${CLIA} relayer ethereum import_ethprivatekey -k "${ethValidatorAddrKeyA}")
+    cli_ret "${result}" "import_ethprivatekey"
+    result=$(${CLIB} relayer ethereum import_ethprivatekey -k "${ethValidatorAddrKeyB}")
+    cli_ret "${result}" "import_ethprivatekeyB"
+    result=$(${CLIC} relayer ethereum import_ethprivatekey -k "${ethValidatorAddrKeyC}")
+    cli_ret "${result}" "import_ethprivatekeyC"
+    result=$(${CLID} relayer ethereum import_ethprivatekey -k "${ethValidatorAddrKeyD}")
+    cli_ret "${result}" "import_ethprivatekeyD"
+
+    result=$(${CLIA} relayer chain33 import_privatekey -k "${ethValidatorAddrKeyA}")
+    cli_ret "${result}" "A relayer chain33 import_privatekey"
+    result=$(${CLIB} relayer chain33 import_privatekey -k "${ethValidatorAddrKeyB}")
+    cli_ret "${result}" "B relayer chain33 import_privatekey"
+    result=$(${CLIC} relayer chain33 import_privatekey -k "${ethValidatorAddrKeyC}")
+    cli_ret "${result}" "C relayer chain33 import_privatekey"
+    result=$(${CLID} relayer chain33 import_privatekey -k "${ethValidatorAddrKeyD}")
+    cli_ret "${result}" "D relayer chain33 import_privatekey"
+    echo -e "${GRE}=========== $FUNCNAME end ===========${NOC}"
+}
+
+function TestChain33ToEthAssets() {
+    echo -e "${GRE}=========== $FUNCNAME begin ===========${NOC}"
+    # token4chain33 在 以太坊 上先有 bty
+    result=$(${CLIA} relayer ethereum token4chain33 -s bty)
+    tokenAddrBty=$(cli_ret "${result}" "token4chain33" ".addr")
+
+    result=$(${CLIA} relayer ethereum balance -o "${ethReceiverAddr1}" -t "${tokenAddrBty}")
+    cli_ret "${result}" "balance" ".balance" "0"
+
+    # chain33 lock bty
+    hash=$(${Chain33Cli} send x2ethereum lock -a 5 -t bty -r ${ethReceiverAddr1} -q ${tokenAddrBty} -k 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv)
+    block_wait "${Chain33Cli}" $((maturityDegree + 2))
+    check_tx "${Chain33Cli}" "${hash}"
+
+    result=$(${Chain33Cli} account balance -a 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv -e x2ethereum)
+    balance_ret "${result}" "195.0000"
+
+    eth_block_wait $((maturityDegree + 2)) https://ropsten-rpc.linkpool.io/
+
+    result=$(${CLIA} relayer ethereum balance -o "${ethReceiverAddr1}" -t "${tokenAddrBty}")
+    cli_ret "${result}" "balance" ".balance" "5"
+
+    # eth burn
+    result=$(${CLIA} relayer ethereum burn -m 5 -k "${ethReceiverAddrKey1}" -r "${chain33SenderAddr}" -t "${tokenAddrBty}")
+    cli_ret "${result}" "burn"
+
+    result=$(${CLIA} relayer ethereum balance -o "${ethReceiverAddr1}" -t "${tokenAddrBty}")
+    cli_ret "${result}" "balance" ".balance" "0"
+
+    # eth 等待 10 个区块
+    eth_block_wait $((maturityDegree + 2)) https://ropsten-rpc.linkpool.io/
+
+    result=$(${Chain33Cli} account balance -a "${chain33SenderAddr}" -e x2ethereum)
+    balance_ret "${result}" "5"
+
+    echo -e "${GRE}=========== $FUNCNAME end ===========${NOC}"
+}
+
+# eth to chain33
+# 在以太坊上锁定资产,然后在 chain33 上铸币,针对 eth 资产
+function TestETH2Chain33Assets() {
+    echo -e "${GRE}=========== $FUNCNAME begin ===========${NOC}"
+    ${CLIA} relayer unlock -p 123456hzj
+
+    result=$(${CLIA} relayer ethereum bridgeBankAddr)
+    bridgeBankAddr=$(cli_ret "${result}" "bridgeBankAddr" ".addr")
+
+    result=$(${CLIA} relayer ethereum balance -o "${bridgeBankAddr}")
+    cli_ret "${result}" "balance" ".balance" "0"
+
+    # eth lock 0.1
+    result=$(${CLIA} relayer ethereum lock -m 0.1 -k "${ethReceiverAddrKey1}" -r 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv)
+    cli_ret "${result}" "lock"
+
+    result=$(${CLIA} relayer ethereum balance -o "${bridgeBankAddr}")
+    cli_ret "${result}" "balance" ".balance" "0.1"
+
+    # eth 等待 10 个区块
+    eth_block_wait $((maturityDegree + 2)) https://ropsten-rpc.linkpool.io/
+
+    result=$(${Chain33Cli} x2ethereum balance -s 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv -t eth | jq ".res" | jq ".[]")
+    balance_ret "${result}" "0.1"
+
+    result=$(${CLIA} relayer ethereum balance -o "${ethReceiverAddr2}")
+    balance=$(cli_ret "${result}" "balance" ".balance")
+
+    hash=$(${Chain33Cli} send x2ethereum burn -a 0.01 -t eth -r ${ethReceiverAddr2} -k 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv)
+    block_wait "${Chain33Cli}" $((maturityDegree + 2))
+    check_tx "${Chain33Cli}" "${hash}"
+
+    result=$(${Chain33Cli} x2ethereum balance -s 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv -t eth | jq ".res" | jq ".[]")
+    balance_ret "${result}" "0"
+
+    eth_block_wait 2 https://ropsten-rpc.linkpool.io/
+
+    result=$(${CLIA} relayer ethereum balance -o "${bridgeBankAddr}")
+    cli_ret "${result}" "balance" ".balance" "0"
+
+    result=$(${CLIA} relayer ethereum balance -o "${ethReceiverAddr2}")
+    cli_ret "${result}" "balance" ".balance" $(echo "${balance}+0.1" | bc)
+
+    echo -e "${GRE}=========== $FUNCNAME end ===========${NOC}"
+}
+
+function TestETH2Chain33Erc20() {
+    echo -e "${GRE}=========== $FUNCNAME begin ===========${NOC}"
+    ${CLIA} relayer unlock -p 123456hzj
+
+    # token4erc20 在 chain33 上先有 token,同时 mint
+    tokenSymbol="testc"
+#    result=$(${CLIA} relayer ethereum token4erc20 -s "${tokenSymbol}")
+#    tokenAddr=$(cli_ret "${result}" "token4erc20" ".addr")
+    tokenAddr="0x47F62ba65bCa4150BE98F31566DC559b9b04fc2D"
+
+    # 先铸币 1000
+    result=$(${CLIA} relayer ethereum mint -m 1000 -o "${ethReceiverAddr1}" -t "${tokenAddr}")
+    cli_ret "${result}" "mint"
+
+    result=$(${CLIA} relayer ethereum balance -o "${ethReceiverAddr1}" -t "${tokenAddr}")
+    cli_ret "${result}" "balance" ".balance" "1000"
+
+    result=$(${CLIA} relayer ethereum bridgeBankAddr)
+    bridgeBankAddr=$(cli_ret "${result}" "bridgeBankAddr" ".addr")
+
+    result=$(${CLIA} relayer ethereum balance -o "${bridgeBankAddr}" -t "${tokenAddr}")
+    cli_ret "${result}" "balance" ".balance" "0"
+
+    # lock 100
+    result=$(${CLIA} relayer ethereum lock -m 100 -k "${ethReceiverAddrKey1}" -r "${chain33Validator1}" -t "${tokenAddr}")
+    cli_ret "${result}" "lock"
+
+    result=$(${CLIA} relayer ethereum balance -o "${ethReceiverAddr1}" -t "${tokenAddr}")
+    cli_ret "${result}" "balance" ".balance" "900"
+
+    result=$(${CLIA} relayer ethereum balance -o "${bridgeBankAddr}" -t "${tokenAddr}")
+    cli_ret "${result}" "balance" ".balance" "100"
+
+    # eth 等待 10 个区块
+    eth_block_wait $((maturityDegree + 2)) https://ropsten-rpc.linkpool.io/
+
+    result=$(${Chain33Cli} x2ethereum balance -s "${chain33Validator1}" -t "${tokenSymbol}" -a "${tokenAddr}" | jq ".res" | jq ".[]")
+    balance_ret "${result}" "100"
+
+    # chain33 burn 100
+    hash=$(${Chain33Cli} send x2ethereum burn -a 100 -t "${tokenSymbol}" -r ${ethReceiverAddr2} -q ${tokenAddr} -k "${chain33Validator1}")
+    block_wait "${Chain33Cli}" $((maturityDegree + 2))
+    check_tx "${Chain33Cli}" "${hash}"
+
+    result=$(${Chain33Cli} x2ethereum balance -s "${chain33Validator1}" -t "${tokenSymbol}" -a "${tokenAddr}" | jq ".res" | jq ".[]")
+    balance_ret "${result}" "0"
+
+    eth_block_wait 2 https://ropsten-rpc.linkpool.io/
+
+    result=$(${CLIA} relayer ethereum balance -o "${ethReceiverAddr2}" -t "${tokenAddr}")
+    cli_ret "${result}" "balance" ".balance" "100"
+
+    result=$(${CLIA} relayer ethereum balance -o "${bridgeBankAddr}" -t "${tokenAddr}")
+    cli_ret "${result}" "balance" ".balance" "0"
+
+    echo -e "${GRE}=========== $FUNCNAME end ===========${NOC}"
+}
+
+function TestChain33ToEthAssetsKill() {
+    echo -e "${GRE}=========== $FUNCNAME begin ===========${NOC}"
+
+    if [ "${tokenAddrBty}" == "" ]; then
+        # token4chain33 在 以太坊 上先有 bty
+        result=$(${CLIA} relayer ethereum token4chain33 -s bty)
+        tokenAddrBty=$(cli_ret "${result}" "token4chain33" ".addr")
+    fi
+
+    result=$(${CLIA} relayer ethereum balance -o "${ethReceiverAddr1}" -t "${tokenAddrBty}")
+    cli_ret "${result}" "balance" ".balance" "0"
+
+    kill_ebrelayerC
+    kill_ebrelayerD
+
+    # chain33 lock bty
+    hash=$(${Chain33Cli} send x2ethereum lock -a 5 -t bty -r ${ethReceiverAddr2} -q ${tokenAddrBty} -k 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv)
+    block_wait "${Chain33Cli}" $((maturityDegree + 2))
+    check_tx "${Chain33Cli}" "${hash}"
+
+    eth_block_wait $((maturityDegree + 2)) https://ropsten-rpc.linkpool.io/
+
+    result=$(${CLIA} relayer ethereum balance -o "${ethReceiverAddr2}" -t "${tokenAddrBty}")
+    cli_ret "${result}" "balance" ".balance" "0"
+
+    start_ebrelayerC
+
+    result=$(${CLIA} relayer ethereum balance -o "${ethReceiverAddr2}" -t "${tokenAddrBty}")
+    cli_ret "${result}" "balance" ".balance" "5"
+
+    # eth burn
+    result=$(${CLIA} relayer ethereum burn -m 5 -k "${ethReceiverAddrKey2}" -r "${chain33Validator1}" -t "${tokenAddrBty}")
+    cli_ret "${result}" "burn"
+
+    result=$(${CLIA} relayer ethereum balance -o "${ethReceiverAddr2}" -t "${tokenAddrBty}")
+    cli_ret "${result}" "balance" ".balance" "0"
+
+    # eth 等待 10 个区块
+    eth_block_wait $((maturityDegree + 2)) https://ropsten-rpc.linkpool.io/
+
+    result=$(${Chain33Cli} account balance -a "${chain33Validator1}" -e x2ethereum)
+    balance_ret "${result}" "0"
+
+    start_ebrelayerD
+
+    result=$(${Chain33Cli} account balance -a "${chain33Validator1}" -e x2ethereum)
+    balance_ret "${result}" "5"
+
+    echo -e "${GRE}=========== $FUNCNAME end ===========${NOC}"
+}
+
+# eth to chain33
+# 在以太坊上锁定资产,然后在 chain33 上铸币,针对 eth 资产
+function TestETH2Chain33AssetsKill() {
+    echo -e "${GRE}=========== $FUNCNAME begin ===========${NOC}"
+    ${CLIA} relayer unlock -p 123456hzj
+
+    result=$(${CLIA} relayer ethereum bridgeBankAddr)
+    bridgeBankAddr=$(cli_ret "${result}" "bridgeBankAddr" ".addr")
+
+    result=$(${CLIA} relayer ethereum balance -o "${bridgeBankAddr}")
+    cli_ret "${result}" "balance" ".balance" "0"
+
+    kill_ebrelayerC
+    kill_ebrelayerD
+
+    # eth lock 0.1
+    result=$(${CLIA} relayer ethereum lock -m 0.1 -k "${ethReceiverAddrKey1}" -r 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv)
+    cli_ret "${result}" "lock"
+
+    result=$(${CLIA} relayer ethereum balance -o "${bridgeBankAddr}")
+    cli_ret "${result}" "balance" ".balance" "0.1"
+
+    # eth 等待 10 个区块
+    eth_block_wait $((maturityDegree + 2)) https://ropsten-rpc.linkpool.io/
+
+    result=$(${Chain33Cli} x2ethereum balance -s 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv -t eth | jq ".res" | jq ".[]")
+    balance_ret "${result}" "0"
+
+    start_ebrelayerC
+    start_ebrelayerD
+
+    result=$(${Chain33Cli} x2ethereum balance -s 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv -t eth | jq ".res" | jq ".[]")
+    balance_ret "${result}" "0.1"
+
+    result=$(${CLIA} relayer ethereum balance -o "${ethReceiverAddr2}")
+    balance=$(cli_ret "${result}" "balance" ".balance")
+
+    kill_ebrelayerC
+    kill_ebrelayerD
+
+    hash=$(${Chain33Cli} send x2ethereum burn -a 0.1 -t eth -r ${ethReceiverAddr2} -k 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv)
+    block_wait "${Chain33Cli}" $((maturityDegree + 2))
+    check_tx "${Chain33Cli}" "${hash}"
+
+    result=$(${Chain33Cli} x2ethereum balance -s 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv -t eth | jq ".res" | jq ".[]")
+    balance_ret "${result}" "0"
+
+    eth_block_wait 2 https://ropsten-rpc.linkpool.io/
+
+    result=$(${CLIA} relayer ethereum balance -o "${bridgeBankAddr}")
+    cli_ret "${result}" "balance" ".balance" "0.1"
+
+    start_ebrelayerC
+    start_ebrelayerD
+
+    result=$(${CLIA} relayer ethereum balance -o "${ethReceiverAddr2}")
+    cli_ret "${result}" "balance" ".balance" $(echo "${balance}+0.1" | bc)
+
+    echo -e "${GRE}=========== $FUNCNAME end ===========${NOC}"
+}
+
+function TestETH2Chain33Erc20Kill() {
+    echo -e "${GRE}=========== $FUNCNAME begin ===========${NOC}"
+    ${CLIA} relayer unlock -p 123456hzj
+
+    # token4erc20 在 chain33 上先有 token,同时 mint
+    tokenSymbol="testcc"
+    result=$(${CLIA} relayer ethereum token4erc20 -s "${tokenSymbol}")
+    tokenAddr=$(cli_ret "${result}" "token4erc20" ".addr")
+
+    # 先铸币 1000
+    result=$(${CLIA} relayer ethereum mint -m 1000 -o "${ethReceiverAddr1}" -t "${tokenAddr}")
+    cli_ret "${result}" "mint"
+
+    result=$(${CLIA} relayer ethereum balance -o "${ethReceiverAddr1}" -t "${tokenAddr}")
+    cli_ret "${result}" "balance" ".balance" "1000"
+
+    result=$(${CLIA} relayer ethereum bridgeBankAddr)
+    bridgeBankAddr=$(cli_ret "${result}" "bridgeBankAddr" ".addr")
+
+    result=$(${CLIA} relayer ethereum balance -o "${bridgeBankAddr}" -t "${tokenAddr}")
+    cli_ret "${result}" "balance" ".balance" "0"
+
+    kill_ebrelayerC
+    kill_ebrelayerD
+
+    # lock 100
+    result=$(${CLIA} relayer ethereum lock -m 100 -k "${ethReceiverAddrKey1}" -r "${chain33Validator1}" -t "${tokenAddr}")
+    cli_ret "${result}" "lock"
+
+    result=$(${CLIA} relayer ethereum balance -o "${ethReceiverAddr1}" -t "${tokenAddr}")
+    cli_ret "${result}" "balance" ".balance" "900"
+
+    result=$(${CLIA} relayer ethereum balance -o "${bridgeBankAddr}" -t "${tokenAddr}")
+    cli_ret "${result}" "balance" ".balance" "100"
+
+    # eth 等待 10 个区块
+    eth_block_wait $((maturityDegree + 2)) https://ropsten-rpc.linkpool.io/
+
+    result=$(${Chain33Cli} x2ethereum balance -s "${chain33Validator1}" -t "${tokenSymbol}" -a "${tokenAddr}" | jq ".res" | jq ".[]")
+    balance_ret "${result}" "0"
+
+    start_ebrelayerC
+    start_ebrelayerD
+
+    result=$(${Chain33Cli} x2ethereum balance -s "${chain33Validator1}" -t "${tokenSymbol}" -a "${tokenAddr}" | jq ".res" | jq ".[]")
+    balance_ret "${result}" "100"
+
+    kill_ebrelayerC
+    kill_ebrelayerD
+
+    # chain33 burn 100
+    hash=$(${Chain33Cli} send x2ethereum burn -a 100 -t "${tokenSymbol}" -r ${ethReceiverAddr2} -q ${tokenAddr} -k "${chain33Validator1}")
+    block_wait "${Chain33Cli}" $((maturityDegree + 2))
+    check_tx "${Chain33Cli}" "${hash}"
+
+    result=$(${Chain33Cli} x2ethereum balance -s "${chain33Validator1}" -t "${tokenSymbol}" -a "${tokenAddr}" | jq ".res" | jq ".[]")
+    balance_ret "${result}" "0"
+
+    eth_block_wait 2 https://ropsten-rpc.linkpool.io/
+
+    start_ebrelayerC
+
+    result=$(${CLIA} relayer ethereum balance -o "${ethReceiverAddr2}" -t "${tokenAddr}")
+    cli_ret "${result}" "balance" ".balance" "100"
+
+    result=$(${CLIA} relayer ethereum balance -o "${bridgeBankAddr}" -t "${tokenAddr}")
+    cli_ret "${result}" "balance" ".balance" "0"
+
+    echo -e "${GRE}=========== $FUNCNAME end ===========${NOC}"
+}
+
+function AllRelayerMainTest() {
+    set +e
+#    docker cp ${GOPATH}/src/github.com/33cn/plugin/build/ci/x2Ethereum build_chain33_1:/root/x2Ethereum
+
+    Chain33Cli="./../chain33-cli"
+
+    echo -e "${GRE}=========== $FUNCNAME begin ===========${NOC}"
+
+    if [[ ${1} != "" ]]; then
+        maturityDegree=${1}
+        echo -e "${GRE}maturityDegree is ${maturityDegree} ${NOC}"
+    fi
+
+    # init
+    #StartRelayerAndDeploy
+    #InitChain33Vilators
+    StartAllEbrelayer
+    EthImportKey
+
+    # test
+#    TestChain33ToEthAssets
+    TestETH2Chain33Assets
+    TestETH2Chain33Erc20
+#
+#    # kill relayer and start relayer
+#        TestChain33ToEthAssetsKill
+#        TestETH2Chain33AssetsKill
+#        TestETH2Chain33Erc20Kill
+
+    echo -e "${GRE}=========== $FUNCNAME end ===========${NOC}"
+}
+
+AllRelayerMainTest 1
--- a/plugin/dapp/x2Ethereum/executor/exec_test.go
+++ b/plugin/dapp/x2Ethereum/executor/exec_test.go
@@ -74,7 +74,7 @@ func (x *suiteX2Ethereum) SetupSuite() {
 	tx.Nonce = 1
 	tx.Sign(types.SECP256K1, privFrom)

-	x.action = newAction(x2eth, tx, 0)
+	x.action, _ = newAction(x2eth, tx, 0)
 	x.x2eth = x2eth
 	x.addrX2Eth = address.ExecAddress(driverName)

@@ -178,9 +178,8 @@ func (x *suiteX2Ethereum) Test_4_Eth2Chain33() {
 		EthereumSender:        ethereumAddr,
 		Chain33Receiver:       chain33Receiver,
 		ValidatorAddress:      addValidator1,
-		Amount:                10,
-		ClaimType:             common2.LockText,
-		EthSymbol:             symbol,
+		Amount:                "10",
+		ClaimType:             int64(types2.LOCK_CLAIM_TYPE),
 	}

 	receipt, err := x.action.procMsgEth2Chain33(payload)
@@ -198,20 +197,20 @@ func (x *suiteX2Ethereum) Test_4_Eth2Chain33() {
 	x.query_GetEthProphecy("000x7B95B6EC7EbD73572298cEf32Bb54FA408207359", types2.EthBridgeStatus_SuccessStatusText)
 	x.query_GetSymbolTotalAmountByTxType(symbol, 1, "lock", 10)

-	payload.Amount = 3
+	payload.Amount = "3"
 	payload.Nonce = 1
-	payload.ClaimType = common2.BurnText
+	payload.ClaimType = int64(types2.BURN_CLAIM_TYPE)
 	payload.ValidatorAddress = addValidator1
 	receipt, err = x.action.procWithdrawEth(payload)
 	x.NoError(err)
 	x.setDb(receipt)

 	payload.ValidatorAddress = addValidator2
-	payload.Amount = 2
+	payload.Amount = "2"
 	receipt, err = x.action.procWithdrawEth(payload)
 	x.Equal(err, types2.ErrClaimInconsist)

-	payload.Amount = 3
+	payload.Amount = "3"
 	receipt, err = x.action.procWithdrawEth(payload)
 	x.NoError(err)
 	x.setDb(receipt)
@@ -220,7 +219,7 @@ func (x *suiteX2Ethereum) Test_4_Eth2Chain33() {
 	x.query_GetSymbolTotalAmount(symbol, 1, 7)
 	x.query_GetSymbolTotalAmountByTxType(symbol, 1, "withdraw", 3)

-	payload.Amount = 10
+	payload.Amount = "10"
 	payload.Nonce = 2
 	payload.ValidatorAddress = addValidator1
 	receipt, err = x.action.procWithdrawEth(payload)
@@ -228,9 +227,9 @@ func (x *suiteX2Ethereum) Test_4_Eth2Chain33() {
 	receipt, err = x.action.procWithdrawEth(payload)
 	x.Equal(types.ErrNoBalance, err)

-	payload.Amount = 1
+	payload.Amount = "1"
 	payload.Nonce = 3
-	payload.ClaimType = common2.LockText
+	payload.ClaimType = int64(types2.LOCK_CLAIM_TYPE)
 	payload.ValidatorAddress = addValidator1
 	receipt, err = x.action.procMsgEth2Chain33(payload)
 	x.setDb(receipt)
@@ -248,8 +247,7 @@ func (x *suiteX2Ethereum) Test_5_Chain33ToEth() {
 		TokenContract:    tokenContractAddress,
 		Chain33Sender:    addValidator1,
 		EthereumReceiver: ethereumAddr,
-		Amount:           5,
-		EthSymbol:        symbol,
+		Amount:           "5",
 		LocalCoinSymbol:  "bty",
 		LocalCoinExec:    coinExec,
 	}
@@ -261,7 +259,7 @@ func (x *suiteX2Ethereum) Test_5_Chain33ToEth() {
 	x.query_GetSymbolTotalAmount("bty", 2, 5)
 	x.query_GetSymbolTotalAmountByTxType("bty", 2, "lock", 5)

-	msgLock.Amount = 4
+	msgLock.Amount = "4"
 	receipt, err = x.action.procMsgBurn(msgLock)
 	x.NoError(err)
 	x.setDb(receipt)
@@ -272,7 +270,7 @@ func (x *suiteX2Ethereum) Test_5_Chain33ToEth() {
 	receipt, err = x.action.procMsgBurn(msgLock)
 	x.Equal(err, types.ErrNoBalance)

-	msgLock.Amount = 1
+	msgLock.Amount = "1"
 	receipt, err = x.action.procMsgBurn(msgLock)
 	x.NoError(err)
 	x.setDb(receipt)

--- a/plugin/dapp/x2Ethereum/testsh/publicTest.sh
+++ b/plugin/dapp/x2Ethereum/testsh/publicTest.sh
@@ -287,6 +287,34 @@ function updata_relayer_toml() {
    #sed -i 's/192.168.3.156/'${pushHost}'/g' "../build/relayer.toml"
 }

+# 更新配置文件 $1 为 BridgeRegistry 合约地址; $2 等待区块 默认10; $3 relayer.toml 地址
+function updata_relayer_toml_ropston() {
+    local BridgeRegistry=${1}
+    local maturityDegree=${2}
+    local file=${3}
+
+    local chain33Host=127.0.0.1
+    local pushHost=127.0.0.1
+
+    local line=$(delete_line_show ${file} "chain33Host")
+    # 在第 line 行后面 新增合约地址
+    sed -i ''${line}' a chain33Host="http://'${chain33Host}':8801"' "${file}"
+
+    line=$(delete_line_show ${file} "pushHost")
+    sed -i ''${line}' a pushHost="http://'${pushHost}':20000"' "${file}"
+
+    line=$(delete_line_show ${file} "BridgeRegistry")
+    sed -i ''${line}' a BridgeRegistry="'${BridgeRegistry}'"' "${file}"
+
+    sed -i 's/EthMaturityDegree=10/'EthMaturityDegree=${maturityDegree}'/g' "${file}"
+    sed -i 's/maturityDegree=10/'maturityDegree=${maturityDegree}'/g' "${file}"
+
+    #sed -i 's/#BridgeRegistry=\"0x40BFE5eD039A9a2Eb42ece2E2CA431bFa7Cf4c42\"/BridgeRegistry=\"'${BridgeRegistry}'\"/g' "../build/relayer.toml"
+    #sed -i 's/192.168.64.2/'${chain33Host}'/g' "../build/relayer.toml"
+    #sed -i 's/192.168.3.156/'${pushHost}'/g' "../build/relayer.toml"
+}
+
+
 # 更新 B C D 的配置文件
 function updata_all_relayer_toml() {
    local port=9901
@@ -409,7 +437,7 @@ function wait_prophecy_finish() {
    set -x
 }

-# eth 区块等待 $1:等待高度
+# eth 区块等待 $1:等待高度 $2:url地址，默认为 http://localhost:7545,测试网络用 https://ropsten-rpc.linkpool.io/
 function eth_block_wait() {
    set +x
    if [[ $# -lt 0 ]]; then
@@ -417,11 +445,24 @@ function eth_block_wait() {
        exit 1
    fi

-    local cur_height=$(curl -ksd '{"id":1,"jsonrpc":"2.0","method":"eth_blockNumber","params":[]}' http://localhost:7545 | jq -r ".result")
+    local cur_height=""
+    local new_height=""
+    local url=${2}
+    if [ "${url}" == "" ];then
+        cur_height=$(curl -ksd '{"id":1,"jsonrpc":"2.0","method":"eth_blockNumber","params":[]}' http://localhost:7545 | jq -r ".result")
+    else
+        cur_height=$(curl -H "Content-Type: application/json" -X POST --data '{"id":1,"jsonrpc":"2.0","method":"eth_blockNumber","params":[]}' ${url} | jq -r ".result")
+    fi
+
    local expect=$((cur_height + ${1} + 1))
    local count=0
    while true; do
-        new_height=$(curl -ksd '{"id":1,"jsonrpc":"2.0","method":"eth_blockNumber","params":[]}' http://localhost:7545 | jq -r ".result")
+        if [ "${url}" == "" ];then
+            new_height=$(curl -ksd '{"id":1,"jsonrpc":"2.0","method":"eth_blockNumber","params":[]}' http://localhost:7545 | jq -r ".result")
+        else
+            new_height=$(curl -H "Content-Type: application/json" -X POST --data '{"id":1,"jsonrpc":"2.0","method":"eth_blockNumber","params":[]}' ${url} | jq -r ".result")
+        fi
+
        if [[ ${new_height} -ge ${expect} ]]; then
            break
        fi