Commit a9fa9d1f authored by vipwzw's avatar vipwzw

auto ci

parent b4c11c19
...@@ -10,33 +10,33 @@ source "./mainPubilcRelayerTest.sh" ...@@ -10,33 +10,33 @@ source "./mainPubilcRelayerTest.sh"
# shellcheck disable=SC2034 # shellcheck disable=SC2034
{ {
chain33BridgeBank="" chain33BridgeBank=""
ethBridgeBank="" ethBridgeBank=""
chain33BtyERC20TokenAddr="1111111111111111111114oLvT2" chain33BtyERC20TokenAddr="1111111111111111111114oLvT2"
ethereumBtyBridgeTokenAddr="" ethereumBtyBridgeTokenAddr=""
chain33EthBridgeTokenAddr="" chain33EthBridgeTokenAddr=""
ethereumBycERC20TokenAddr="" ethereumBycERC20TokenAddr=""
chain33BycBridgeTokenAddr="" chain33BycBridgeTokenAddr=""
ethereumUSDTERC20TokenAddr="" ethereumUSDTERC20TokenAddr=""
chain33USDTBridgeTokenAddr="" chain33USDTBridgeTokenAddr=""
chain33YccERC20TokenAddr="" chain33YccERC20TokenAddr=""
ethereumYccBridgeTokenAddr="" ethereumYccBridgeTokenAddr=""
chain33ZbcERC20TokenAddr="" chain33ZbcERC20TokenAddr=""
ethereumZbcBridgeTokenAddr="" ethereumZbcBridgeTokenAddr=""
BridgeRegistryOnChain33="" BridgeRegistryOnChain33=""
BridgeRegistryOnEth="" BridgeRegistryOnEth=""
multisignChain33Addr="" multisignChain33Addr=""
multisignEthAddr="" multisignEthAddr=""
chain33ID=0 chain33ID=0
maturityDegree=10 maturityDegree=10
# ETH 部署合约者的私钥 用于部署合约时签名使用 # ETH 部署合约者的私钥 用于部署合约时签名使用
ethDeployAddr="0x8AFDADFC88a1087c9A1D6c0F5Dd04634b87F303a" ethDeployAddr="0x8AFDADFC88a1087c9A1D6c0F5Dd04634b87F303a"
...@@ -84,7 +84,6 @@ maturityDegree=10 ...@@ -84,7 +84,6 @@ maturityDegree=10
chain33ReceiverAddrKey="4257d8692ef7fe13c68b65d6a52f03933db2fa5ce8faf210b5b8b80c721ced01" chain33ReceiverAddrKey="4257d8692ef7fe13c68b65d6a52f03933db2fa5ce8faf210b5b8b80c721ced01"
} }
function chain33_offline_send_evm() { function chain33_offline_send_evm() {
# shellcheck disable=SC2154 # shellcheck disable=SC2154
result=$(${EvmxgoBoss4xCLI} chain33 offline send -f "${1}") result=$(${EvmxgoBoss4xCLI} chain33 offline send -f "${1}")
...@@ -269,7 +268,7 @@ function Testethereum2EVMToChain33_usdt() { ...@@ -269,7 +268,7 @@ function Testethereum2EVMToChain33_usdt() {
} }
function get_evm_cli() { function get_evm_cli() {
# shellcheck disable=SC2034 # shellcheck disable=SC2034
{ {
# shellcheck disable=SC2154 # shellcheck disable=SC2154
docker_chain33_ip=$(get_docker_addr "${dockerNamePrefix}_chain33_1") docker_chain33_ip=$(get_docker_addr "${dockerNamePrefix}_chain33_1")
......
...@@ -10,33 +10,33 @@ source "./offlinePublic.sh" ...@@ -10,33 +10,33 @@ source "./offlinePublic.sh"
# shellcheck disable=SC2034 # shellcheck disable=SC2034
{ {
chain33BridgeBank="" chain33BridgeBank=""
ethBridgeBank="" ethBridgeBank=""
chain33BtyERC20TokenAddr="1111111111111111111114oLvT2" chain33BtyERC20TokenAddr="1111111111111111111114oLvT2"
ethereumBtyBridgeTokenAddr="" ethereumBtyBridgeTokenAddr=""
chain33EthBridgeTokenAddr="" chain33EthBridgeTokenAddr=""
ethereumBycERC20TokenAddr="" ethereumBycERC20TokenAddr=""
chain33BycBridgeTokenAddr="" chain33BycBridgeTokenAddr=""
ethereumUSDTERC20TokenAddr="" ethereumUSDTERC20TokenAddr=""
chain33USDTBridgeTokenAddr="" chain33USDTBridgeTokenAddr=""
chain33YccERC20TokenAddr="" chain33YccERC20TokenAddr=""
ethereumYccBridgeTokenAddr="" ethereumYccBridgeTokenAddr=""
chain33ZbcERC20TokenAddr="" chain33ZbcERC20TokenAddr=""
ethereumZbcBridgeTokenAddr="" ethereumZbcBridgeTokenAddr=""
BridgeRegistryOnChain33="" BridgeRegistryOnChain33=""
BridgeRegistryOnEth="" BridgeRegistryOnEth=""
multisignChain33Addr="" multisignChain33Addr=""
multisignEthAddr="" multisignEthAddr=""
chain33ID=0 chain33ID=0
maturityDegree=10 maturityDegree=10
# ETH 部署合约者的私钥 用于部署合约时签名使用 # ETH 部署合约者的私钥 用于部署合约时签名使用
ethDeployAddr="0x8AFDADFC88a1087c9A1D6c0F5Dd04634b87F303a" ethDeployAddr="0x8AFDADFC88a1087c9A1D6c0F5Dd04634b87F303a"
...@@ -890,22 +890,22 @@ function echo_addrs() { ...@@ -890,22 +890,22 @@ function echo_addrs() {
} }
function get_cli() { function get_cli() {
# shellcheck disable=SC2034 # shellcheck disable=SC2034
{ {
docker_chain33_ip=$(get_docker_addr "${dockerNamePrefix}_chain33_1") docker_chain33_ip=$(get_docker_addr "${dockerNamePrefix}_chain33_1")
MainCli="./chain33-cli --rpc_laddr http://${docker_chain33_ip}:8801" MainCli="./chain33-cli --rpc_laddr http://${docker_chain33_ip}:8801"
Para8801Cli="./chain33-cli --rpc_laddr http://${docker_chain33_ip}:8901 --paraName user.p.para." Para8801Cli="./chain33-cli --rpc_laddr http://${docker_chain33_ip}:8901 --paraName user.p.para."
Para8901Cli="./chain33-cli --rpc_laddr http://${docker_chain33_ip}:8901 --paraName user.p.para." Para8901Cli="./chain33-cli --rpc_laddr http://${docker_chain33_ip}:8901 --paraName user.p.para."
CLIA="docker exec ${dockerNamePrefix}_ebrelayera_1 /root/ebcli_A" CLIA="docker exec ${dockerNamePrefix}_ebrelayera_1 /root/ebcli_A"
CLIB="docker exec ${dockerNamePrefix}_ebrelayerb_1 /root/ebcli_A" CLIB="docker exec ${dockerNamePrefix}_ebrelayerb_1 /root/ebcli_A"
CLIC="docker exec ${dockerNamePrefix}_ebrelayerc_1 /root/ebcli_A" CLIC="docker exec ${dockerNamePrefix}_ebrelayerc_1 /root/ebcli_A"
CLID="docker exec ${dockerNamePrefix}_ebrelayerd_1 /root/ebcli_A" CLID="docker exec ${dockerNamePrefix}_ebrelayerd_1 /root/ebcli_A"
docker_ganachetest_ip=$(get_docker_addr "${dockerNamePrefix}_ganachetest_1") docker_ganachetest_ip=$(get_docker_addr "${dockerNamePrefix}_ganachetest_1")
Boss4xCLI="docker exec ${dockerNamePrefix}_ebrelayera_1 /root/boss4x --rpc_laddr http://${docker_chain33_ip}:8901 --rpc_laddr_ethereum http://${docker_ganachetest_ip}:8545 --paraName user.p.para." Boss4xCLI="docker exec ${dockerNamePrefix}_ebrelayera_1 /root/boss4x --rpc_laddr http://${docker_chain33_ip}:8901 --rpc_laddr_ethereum http://${docker_ganachetest_ip}:8545 --paraName user.p.para."
echo "${Boss4xCLI}" echo "${Boss4xCLI}"
} }
} }
function test_all() { function test_all() {
...@@ -931,4 +931,3 @@ function test_all() { ...@@ -931,4 +931,3 @@ function test_all() {
offline_set_offline_token_EthByc 100000000000000 10 offline_set_offline_token_EthByc 100000000000000 10
offline_set_offline_token_EthUSDT 100000000000000 10 offline_set_offline_token_EthUSDT 100000000000000 10
} }
...@@ -315,9 +315,9 @@ function offline_transfer_multisign_Eth_test() { ...@@ -315,9 +315,9 @@ function offline_transfer_multisign_Eth_test() {
sleep 10 sleep 10
result=$(${CLIA} ethereum balance -o "${ethBridgeBank}") result=$(${CLIA} ethereum balance -o "${ethBridgeBank}")
cli_ret "${result}" "balance" ".balance" "16" cli_ret "${result}" "balance" ".balance" "16"
result=$(${CLIA} ethereum balance -o "${multisignEthAddr}") result=$(${CLIA} ethereum balance -o "${multisignEthAddr}")
cli_ret "${result}" "balance" ".balance" "20" cli_ret "${result}" "balance" ".balance" "20"
# transfer # transfer
# shellcheck disable=SC2154 # shellcheck disable=SC2154
...@@ -329,9 +329,9 @@ function offline_transfer_multisign_Eth_test() { ...@@ -329,9 +329,9 @@ function offline_transfer_multisign_Eth_test() {
sleep 10 sleep 10
result=$(${CLIA} ethereum balance -o "${ethMultisignA}") result=$(${CLIA} ethereum balance -o "${ethMultisignA}")
cli_ret "${result}" "balance" ".balance" "1005" cli_ret "${result}" "balance" ".balance" "1005"
result=$(${CLIA} ethereum balance -o "${multisignEthAddr}") result=$(${CLIA} ethereum balance -o "${multisignEthAddr}")
cli_ret "${result}" "balance" ".balance" "15" cli_ret "${result}" "balance" ".balance" "15"
echo -e "${GRE}=========== $FUNCNAME end ===========${NOC}" echo -e "${GRE}=========== $FUNCNAME end ===========${NOC}"
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment