Commit ce4c35a4 authored by hezhengjun's avatar hezhengjun Committed by vipwzw

correct the shell script after evm command's refactor

parent c168f940
...@@ -134,7 +134,7 @@ function TestChain33ToEthAssets() { ...@@ -134,7 +134,7 @@ function TestChain33ToEthAssets() {
is_equal "${result}" "500.0000" is_equal "${result}" "500.0000"
# chain33 lock bty # chain33 lock bty
hash=$(${Chain33Cli} evm call -f 1 -a 5 -c "${chain33DeployAddr}" -e "${chain33BridgeBank}" -p "lock(${ethDeployAddr}, ${chain33BtyTokenAddr}, 500000000)" --chainID "${chain33ID}") hash=$(${Chain33Cli} send evm call -f 1 -a 5 -k "${chain33DeployAddr}" -e "${chain33BridgeBank}" -p "lock(${ethDeployAddr}, ${chain33BtyTokenAddr}, 500000000)" --chainID "${chain33ID}")
check_tx "${Chain33Cli}" "${hash}" check_tx "${Chain33Cli}" "${hash}"
# 原来的地址金额 减少了 5 # 原来的地址金额 减少了 5
...@@ -202,15 +202,15 @@ function TestChain33ToEthZBCAssets() { ...@@ -202,15 +202,15 @@ function TestChain33ToEthZBCAssets() {
cli_ret "${result}" "balance" ".balance" "0" cli_ret "${result}" "balance" ".balance" "0"
# 原来的地址金额 # 原来的地址金额
result=$(${Chain33Cli} evm abi call -a "${chain33ZBCErc20Addr}" -c "${chain33BridgeBank}" -b "balanceOf(${chain33BridgeBank})") result=$(${Chain33Cli} evm query -a "${chain33ZBCErc20Addr}" -c "${chain33BridgeBank}" -b "balanceOf(${chain33BridgeBank})")
is_equal "${result}" "0" is_equal "${result}" "0"
# chain33 lock ZBC # chain33 lock ZBC
hash=$(${Chain33Cli} evm call -f 1 -c "${chain33DeployAddr}" -e "${chain33BridgeBank}" -p "lock(${ethDeployAddr}, ${chain33ZBCErc20Addr}, 900000000)" --chainID "${chain33ID}") hash=$(${Chain33Cli} send evm call -f 1 -k "${chain33DeployAddr}" -e "${chain33BridgeBank}" -p "lock(${ethDeployAddr}, ${chain33ZBCErc20Addr}, 900000000)" --chainID "${chain33ID}")
check_tx "${Chain33Cli}" "${hash}" check_tx "${Chain33Cli}" "${hash}"
# chain33BridgeBank 是否增加了 9 # chain33BridgeBank 是否增加了 9
result=$(${Chain33Cli} evm abi call -a "${chain33ZBCErc20Addr}" -c "${chain33BridgeBank}" -b "balanceOf(${chain33BridgeBank})") result=$(${Chain33Cli} evm query -a "${chain33ZBCErc20Addr}" -c "${chain33BridgeBank}" -b "balanceOf(${chain33BridgeBank})")
is_equal "${result}" "900000000" is_equal "${result}" "900000000"
sleep 4 sleep 4
...@@ -232,11 +232,11 @@ function TestChain33ToEthZBCAssets() { ...@@ -232,11 +232,11 @@ function TestChain33ToEthZBCAssets() {
sleep ${maturityDegree} sleep ${maturityDegree}
# 接收的地址金额 变成了 8 # 接收的地址金额 变成了 8
result=$(${Chain33Cli} evm abi call -a "${chain33ZBCErc20Addr}" -c "${chain33ReceiverAddr}" -b "balanceOf(${chain33ReceiverAddr})") result=$(${Chain33Cli} evm query -a "${chain33ZBCErc20Addr}" -c "${chain33ReceiverAddr}" -b "balanceOf(${chain33ReceiverAddr})")
is_equal "${result}" "800000000" is_equal "${result}" "800000000"
# chain33BridgeBank 是否减少了 1 # chain33BridgeBank 是否减少了 1
result=$(${Chain33Cli} evm abi call -a "${chain33ZBCErc20Addr}" -c "${chain33BridgeBank}" -b "balanceOf(${chain33BridgeBank})") result=$(${Chain33Cli} evm query -a "${chain33ZBCErc20Addr}" -c "${chain33BridgeBank}" -b "balanceOf(${chain33BridgeBank})")
is_equal "${result}" "100000000" is_equal "${result}" "100000000"
echo -e "${GRE}=========== $FUNCNAME end ===========${NOC}" echo -e "${GRE}=========== $FUNCNAME end ===========${NOC}"
...@@ -264,7 +264,7 @@ function TestETH2Chain33Assets() { ...@@ -264,7 +264,7 @@ function TestETH2Chain33Assets() {
sleep ${maturityDegree} sleep ${maturityDegree}
# chain33 chain33EthTokenAddr(ETH合约中)查询 lock 金额 # chain33 chain33EthTokenAddr(ETH合约中)查询 lock 金额
result=$(${Chain33Cli} evm abi call -a "${chain33EthTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})") result=$(${Chain33Cli} evm query -a "${chain33EthTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})")
# 结果是 11 * le8 # 结果是 11 * le8
is_equal "${result}" "1100000000" is_equal "${result}" "1100000000"
...@@ -278,7 +278,7 @@ function TestETH2Chain33Assets() { ...@@ -278,7 +278,7 @@ function TestETH2Chain33Assets() {
sleep ${maturityDegree} sleep ${maturityDegree}
echo "check the balance on chain33" echo "check the balance on chain33"
result=$(${Chain33Cli} evm abi call -a "${chain33EthTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})") result=$(${Chain33Cli} evm query -a "${chain33EthTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})")
# 结果是 11-5 * le8 # 结果是 11-5 * le8
is_equal "${result}" "600000000" is_equal "${result}" "600000000"
...@@ -296,7 +296,7 @@ function TestETH2Chain33Assets() { ...@@ -296,7 +296,7 @@ function TestETH2Chain33Assets() {
sleep ${maturityDegree} sleep ${maturityDegree}
echo "check the balance on chain33" echo "check the balance on chain33"
result=$(${Chain33Cli} evm abi call -a "${chain33EthTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})") result=$(${Chain33Cli} evm query -a "${chain33EthTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})")
# 结果是 11-5 * le8 # 结果是 11-5 * le8
is_equal "${result}" "0" is_equal "${result}" "0"
...@@ -332,7 +332,7 @@ function TestETH2Chain33Ycc() { ...@@ -332,7 +332,7 @@ function TestETH2Chain33Ycc() {
sleep ${maturityDegree} sleep ${maturityDegree}
# chain33 chain33EthTokenAddr(ETH合约中)查询 lock 金额 # chain33 chain33EthTokenAddr(ETH合约中)查询 lock 金额
result=$(${Chain33Cli} evm abi call -a "${chain33YccTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})") result=$(${Chain33Cli} evm query -a "${chain33YccTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})")
# 结果是 7 * le8 # 结果是 7 * le8
is_equal "${result}" "700000000" is_equal "${result}" "700000000"
...@@ -346,7 +346,7 @@ function TestETH2Chain33Ycc() { ...@@ -346,7 +346,7 @@ function TestETH2Chain33Ycc() {
sleep ${maturityDegree} sleep ${maturityDegree}
echo "check the balance on chain33" echo "check the balance on chain33"
result=$(${Chain33Cli} evm abi call -a "${chain33YccTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})") result=$(${Chain33Cli} evm query -a "${chain33YccTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})")
# 结果是 7-5 * le8 # 结果是 7-5 * le8
is_equal "${result}" "200000000" is_equal "${result}" "200000000"
...@@ -364,7 +364,7 @@ function TestETH2Chain33Ycc() { ...@@ -364,7 +364,7 @@ function TestETH2Chain33Ycc() {
sleep ${maturityDegree} sleep ${maturityDegree}
echo "check the balance on chain33" echo "check the balance on chain33"
result=$(${Chain33Cli} evm abi call -a "${chain33YccTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})") result=$(${Chain33Cli} evm query -a "${chain33YccTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})")
# 结果是 7-5 * le8 # 结果是 7-5 * le8
is_equal "${result}" "0" is_equal "${result}" "0"
...@@ -446,7 +446,7 @@ function initPara() { ...@@ -446,7 +446,7 @@ function initPara() {
function lock_bty_multisign_docker () { function lock_bty_multisign_docker () {
local lockAmount=$1 local lockAmount=$1
local lockAmount2="${1}00000000" local lockAmount2="${1}00000000"
hash=$(${Chain33Cli} evm call -f 1 -a "${lockAmount}" -c "${chain33DeployAddr}" -e "${chain33BridgeBank}" -p "lock(${ethDeployAddr}, ${chain33BtyTokenAddr}, ${lockAmount2})" --chainID "${chain33ID}") hash=$(${Chain33Cli} send evm call -f 1 -a "${lockAmount}" -k "${chain33DeployAddr}" -e "${chain33BridgeBank}" -p "lock(${ethDeployAddr}, ${chain33BtyTokenAddr}, ${lockAmount2})" --chainID "${chain33ID}")
check_tx "${Chain33Cli}" "${hash}" check_tx "${Chain33Cli}" "${hash}"
if [[ $# -eq 3 ]]; then if [[ $# -eq 3 ]]; then
......
...@@ -137,7 +137,7 @@ function TestChain33ToEthAssets() { ...@@ -137,7 +137,7 @@ function TestChain33ToEthAssets() {
is_equal "${result}" "50.0000" is_equal "${result}" "50.0000"
# chain33 lock bty # chain33 lock bty
hash=$(${Chain33Cli} evm call -f 1 -a 5 -c "${chain33PerfAddr}" -e "${chain33BridgeBank}" -p "lock(${ethDeployAddr}, ${chain33BtyTokenAddr}, 500000000)" --chainID "${chain33ID}") hash=$(${Chain33Cli} send evm call -f 1 -a 5 -k "${chain33PerfAddr}" -e "${chain33BridgeBank}" -p "lock(${ethDeployAddr}, ${chain33BtyTokenAddr}, 500000000)" --chainID "${chain33ID}")
check_tx "${Chain33Cli}" "${hash}" check_tx "${Chain33Cli}" "${hash}"
# 原来的地址金额 减少了 5 # 原来的地址金额 减少了 5
...@@ -215,15 +215,15 @@ function TestChain33ToEthZBCAssets() { ...@@ -215,15 +215,15 @@ function TestChain33ToEthZBCAssets() {
cli_ret "${result}" "balance" ".balance" "0" cli_ret "${result}" "balance" ".balance" "0"
# 原来的地址金额 # 原来的地址金额
result=$(${Chain33Cli} evm abi call -a "${chain33ZBCErc20Addr}" -c "${chain33BridgeBank}" -b "balanceOf(${chain33BridgeBank})") result=$(${Chain33Cli} evm query -a "${chain33ZBCErc20Addr}" -c "${chain33BridgeBank}" -b "balanceOf(${chain33BridgeBank})")
is_equal "${result}" "0" is_equal "${result}" "0"
# chain33 lock ZBC # chain33 lock ZBC
hash=$(${Chain33Cli} evm call -f 1 -c "${chain33DeployAddr}" -e "${chain33BridgeBank}" -p "lock(${ethDeployAddr}, ${chain33ZBCErc20Addr}, 900000000)" --chainID "${chain33ID}") hash=$(${Chain33Cli} send evm call -f 1 -k "${chain33DeployAddr}" -e "${chain33BridgeBank}" -p "lock(${ethDeployAddr}, ${chain33ZBCErc20Addr}, 900000000)" --chainID "${chain33ID}")
check_tx "${Chain33Cli}" "${hash}" check_tx "${Chain33Cli}" "${hash}"
# chain33BridgeBank 是否增加了 9 # chain33BridgeBank 是否增加了 9
result=$(${Chain33Cli} evm abi call -a "${chain33ZBCErc20Addr}" -c "${chain33BridgeBank}" -b "balanceOf(${chain33BridgeBank})") result=$(${Chain33Cli} evm query -a "${chain33ZBCErc20Addr}" -c "${chain33BridgeBank}" -b "balanceOf(${chain33BridgeBank})")
is_equal "${result}" "900000000" is_equal "${result}" "900000000"
sleep 4 sleep 4
...@@ -245,11 +245,11 @@ function TestChain33ToEthZBCAssets() { ...@@ -245,11 +245,11 @@ function TestChain33ToEthZBCAssets() {
sleep ${maturityDegree} sleep ${maturityDegree}
# 接收的地址金额 变成了 8 # 接收的地址金额 变成了 8
result=$(${Chain33Cli} evm abi call -a "${chain33ZBCErc20Addr}" -c "${chain33ReceiverAddr}" -b "balanceOf(${chain33ReceiverAddr})") result=$(${Chain33Cli} evm query -a "${chain33ZBCErc20Addr}" -c "${chain33ReceiverAddr}" -b "balanceOf(${chain33ReceiverAddr})")
is_equal "${result}" "800000000" is_equal "${result}" "800000000"
# chain33BridgeBank 是否减少了 1 # chain33BridgeBank 是否减少了 1
result=$(${Chain33Cli} evm abi call -a "${chain33ZBCErc20Addr}" -c "${chain33BridgeBank}" -b "balanceOf(${chain33BridgeBank})") result=$(${Chain33Cli} evm query -a "${chain33ZBCErc20Addr}" -c "${chain33BridgeBank}" -b "balanceOf(${chain33BridgeBank})")
is_equal "${result}" "100000000" is_equal "${result}" "100000000"
echo -e "${GRE}=========== $FUNCNAME end ===========${NOC}" echo -e "${GRE}=========== $FUNCNAME end ===========${NOC}"
...@@ -277,7 +277,7 @@ function TestETH2Chain33Assets() { ...@@ -277,7 +277,7 @@ function TestETH2Chain33Assets() {
sleep ${maturityDegree} sleep ${maturityDegree}
# chain33 chain33EthTokenAddr(ETH合约中)查询 lock 金额 # chain33 chain33EthTokenAddr(ETH合约中)查询 lock 金额
result=$(${Chain33Cli} evm abi call -a "${chain33EthTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})") result=$(${Chain33Cli} evm query -a "${chain33EthTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})")
# 结果是 11 * le8 # 结果是 11 * le8
is_equal "${result}" "1100000000" is_equal "${result}" "1100000000"
...@@ -291,7 +291,7 @@ function TestETH2Chain33Assets() { ...@@ -291,7 +291,7 @@ function TestETH2Chain33Assets() {
sleep ${maturityDegree} sleep ${maturityDegree}
echo "check the balance on chain33" echo "check the balance on chain33"
result=$(${Chain33Cli} evm abi call -a "${chain33EthTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})") result=$(${Chain33Cli} evm query -a "${chain33EthTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})")
# 结果是 11-5 * le8 # 结果是 11-5 * le8
is_equal "${result}" "600000000" is_equal "${result}" "600000000"
...@@ -309,7 +309,7 @@ function TestETH2Chain33Assets() { ...@@ -309,7 +309,7 @@ function TestETH2Chain33Assets() {
sleep ${maturityDegree} sleep ${maturityDegree}
echo "check the balance on chain33" echo "check the balance on chain33"
result=$(${Chain33Cli} evm abi call -a "${chain33EthTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})") result=$(${Chain33Cli} evm query -a "${chain33EthTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})")
# 结果是 11-5 * le8 # 结果是 11-5 * le8
is_equal "${result}" "0" is_equal "${result}" "0"
...@@ -345,7 +345,7 @@ function TestETH2Chain33Ycc() { ...@@ -345,7 +345,7 @@ function TestETH2Chain33Ycc() {
sleep ${maturityDegree} sleep ${maturityDegree}
# chain33 chain33EthTokenAddr(ETH合约中)查询 lock 金额 # chain33 chain33EthTokenAddr(ETH合约中)查询 lock 金额
result=$(${Chain33Cli} evm abi call -a "${chain33YccTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})") result=$(${Chain33Cli} evm query -a "${chain33YccTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})")
# 结果是 7 * le8 # 结果是 7 * le8
is_equal "${result}" "700000000" is_equal "${result}" "700000000"
...@@ -359,7 +359,7 @@ function TestETH2Chain33Ycc() { ...@@ -359,7 +359,7 @@ function TestETH2Chain33Ycc() {
sleep ${maturityDegree} sleep ${maturityDegree}
echo "check the balance on chain33" echo "check the balance on chain33"
result=$(${Chain33Cli} evm abi call -a "${chain33YccTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})") result=$(${Chain33Cli} evm query -a "${chain33YccTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})")
# 结果是 7-5 * le8 # 结果是 7-5 * le8
is_equal "${result}" "200000000" is_equal "${result}" "200000000"
...@@ -377,7 +377,7 @@ function TestETH2Chain33Ycc() { ...@@ -377,7 +377,7 @@ function TestETH2Chain33Ycc() {
sleep ${maturityDegree} sleep ${maturityDegree}
echo "check the balance on chain33" echo "check the balance on chain33"
result=$(${Chain33Cli} evm abi call -a "${chain33YccTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})") result=$(${Chain33Cli} evm query -a "${chain33YccTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})")
# 结果是 7-5 * le8 # 结果是 7-5 * le8
is_equal "${result}" "0" is_equal "${result}" "0"
...@@ -488,7 +488,7 @@ function initPara() { ...@@ -488,7 +488,7 @@ function initPara() {
function lock_bty_multisign_docker () { function lock_bty_multisign_docker () {
local lockAmount=$1 local lockAmount=$1
local lockAmount2="${1}00000000" local lockAmount2="${1}00000000"
hash=$(${Chain33Cli} evm call -f 1 -a "${lockAmount}" -c "${chain33DeployAddr}" -e "${chain33BridgeBank}" -p "lock(${ethDeployAddr}, ${chain33BtyTokenAddr}, ${lockAmount2})" --chainID "${chain33ID}") hash=$(${Chain33Cli} send evm call -f 1 -a "${lockAmount}" -k "${chain33DeployAddr}" -e "${chain33BridgeBank}" -p "lock(${ethDeployAddr}, ${chain33BtyTokenAddr}, ${lockAmount2})" --chainID "${chain33ID}")
check_tx "${Chain33Cli}" "${hash}" check_tx "${Chain33Cli}" "${hash}"
if [[ $# -eq 3 ]]; then if [[ $# -eq 3 ]]; then
......
...@@ -79,7 +79,7 @@ function deployMultisign() { ...@@ -79,7 +79,7 @@ function deployMultisign() {
balance_ret "${result}" "10.0000" balance_ret "${result}" "10.0000"
# shellcheck disable=SC2154 # shellcheck disable=SC2154
hash=$(${Chain33Cli} evm call -f 1 -c "${chain33DeployAddr}" -e "${chain33BridgeBank}" -p "configOfflineSaveAccount(${multisignChain33Addr})" --chainID "${chain33ID}") hash=$(${Chain33Cli} send evm call -f 1 -k "${chain33DeployAddr}" -e "${chain33BridgeBank}" -p "configOfflineSaveAccount(${multisignChain33Addr})" --chainID "${chain33ID}")
check_tx "${Chain33Cli}" "${hash}" check_tx "${Chain33Cli}" "${hash}"
# echo -e "${GRE}=========== 部署 ETH 离线钱包合约 ===========${NOC}" # echo -e "${GRE}=========== 部署 ETH 离线钱包合约 ===========${NOC}"
...@@ -251,7 +251,7 @@ function mainTest() { ...@@ -251,7 +251,7 @@ function mainTest() {
# 拷贝 BridgeRegistry.abi 和 BridgeBank.abi # 拷贝 BridgeRegistry.abi 和 BridgeBank.abi
cp BridgeRegistry.abi "${BridgeRegistryOnChain33}.abi" cp BridgeRegistry.abi "${BridgeRegistryOnChain33}.abi"
chain33BridgeBank=$(${Chain33Cli} evm abi call -c "${chain33DeployAddr}" -b "bridgeBank()" -a "${BridgeRegistryOnChain33}") chain33BridgeBank=$(${Chain33Cli} evm query -c "${chain33DeployAddr}" -b "bridgeBank()" -a "${BridgeRegistryOnChain33}")
cp Chain33BridgeBank.abi "${chain33BridgeBank}.abi" cp Chain33BridgeBank.abi "${chain33BridgeBank}.abi"
# 在 Eth 上部署合约 # 在 Eth 上部署合约
......
...@@ -78,7 +78,7 @@ function deployMultisign() { ...@@ -78,7 +78,7 @@ function deployMultisign() {
result=$(${Chain33Cli} account balance -a "${multisignChain33Addr}" -e coins) result=$(${Chain33Cli} account balance -a "${multisignChain33Addr}" -e coins)
balance_ret "${result}" "10.0000" balance_ret "${result}" "10.0000"
hash=$(${Chain33Cli} evm call -f 1 -c "${chain33DeployAddr}" -e "${chain33BridgeBank}" -p "configOfflineSaveAccount(${multisignChain33Addr})" --chainID "${chain33ID}") hash=$(${Chain33Cli} send evm call -f 1 -k "${chain33DeployAddr}" -e "${chain33BridgeBank}" -p "configOfflineSaveAccount(${multisignChain33Addr})" --chainID "${chain33ID}")
check_tx "${Chain33Cli}" "${hash}" check_tx "${Chain33Cli}" "${hash}"
# echo -e "${GRE}=========== 部署 ETH 离线钱包合约 ===========${NOC}" # echo -e "${GRE}=========== 部署 ETH 离线钱包合约 ===========${NOC}"
...@@ -254,7 +254,7 @@ function mainTest() { ...@@ -254,7 +254,7 @@ function mainTest() {
# 拷贝 BridgeRegistry.abi 和 BridgeBank.abi # 拷贝 BridgeRegistry.abi 和 BridgeBank.abi
cp BridgeRegistry.abi "${BridgeRegistryOnChain33}.abi" cp BridgeRegistry.abi "${BridgeRegistryOnChain33}.abi"
chain33BridgeBank=$(${Chain33Cli} evm abi call -c "${chain33DeployAddr}" -b "bridgeBank()" -a "${BridgeRegistryOnChain33}") chain33BridgeBank=$(${Chain33Cli} evm query -c "${chain33DeployAddr}" -b "bridgeBank()" -a "${BridgeRegistryOnChain33}")
cp Chain33BridgeBank.abi "${chain33BridgeBank}.abi" cp Chain33BridgeBank.abi "${chain33BridgeBank}.abi"
# 在 Eth 上部署合约 # 在 Eth 上部署合约
......
...@@ -42,7 +42,7 @@ chain33ID=0 ...@@ -42,7 +42,7 @@ chain33ID=0
function LockTestChain33ToEthAssets() { function LockTestChain33ToEthAssets() {
echo -e "${GRE}=========== $FUNCNAME begin ===========${NOC}" echo -e "${GRE}=========== $FUNCNAME begin ===========${NOC}"
# chain33 lock bty # chain33 lock bty
hash=$(${Chain33Cli} evm call -f 1 -a 1 -c "${chain33DeployAddr}" -e "${chain33BridgeBank}" -p "lock(${ethSendAddress}, ${chain33BtyTokenAddr}, 100000000)" --chainID "${chain33ID}") hash=$(${Chain33Cli} send evm call -f 1 -a 1 -k "${chain33DeployAddr}" -e "${chain33BridgeBank}" -p "lock(${ethSendAddress}, ${chain33BtyTokenAddr}, 100000000)" --khainID "${chain33ID}")
check_tx "${Chain33Cli}" "${hash}" check_tx "${Chain33Cli}" "${hash}"
echo -e "${GRE}=========== $FUNCNAME end ===========${NOC}" echo -e "${GRE}=========== $FUNCNAME end ===========${NOC}"
} }
......
...@@ -39,7 +39,7 @@ multisignChain33Addr=1b193HbfvVUunUL2DVXrqt9jnbAWwLjcT ...@@ -39,7 +39,7 @@ multisignChain33Addr=1b193HbfvVUunUL2DVXrqt9jnbAWwLjcT
function lockBty() { function lockBty() {
echo -e "${GRE}=========== $FUNCNAME begin ===========${NOC}" echo -e "${GRE}=========== $FUNCNAME begin ===========${NOC}"
# echo '2:#配置自动转离线钱包(bty, 100, 50%)' # echo '2:#配置自动转离线钱包(bty, 100, 50%)'
hash=$(${Chain33Cli} evm call -f 1 -c "${chain33DeployAddr}" -e ${chain33BridgeBank} -p "configLockedTokenOfflineSave(${chain33BtyTokenAddr},BTY,10000000000,50)" --chainID "${chain33ID}") hash=$(${Chain33Cli} send evm call -f 1 -k "${chain33DeployAddr}" -e ${chain33BridgeBank} -p "configLockedTokenOfflineSave(${chain33BtyTokenAddr},BTY,10000000000,50)" --khainID "${chain33ID}")
check_tx "${Chain33Cli}" "${hash}" check_tx "${Chain33Cli}" "${hash}"
result=$(${Chain33Cli} account balance -a "${chain33BridgeBank}" -e evm) result=$(${Chain33Cli} account balance -a "${chain33BridgeBank}" -e evm)
...@@ -81,7 +81,7 @@ function lockBty() { ...@@ -81,7 +81,7 @@ function lockBty() {
function lockChain33Ycc() { function lockChain33Ycc() {
echo -e "${GRE}=========== $FUNCNAME begin ===========${NOC}" echo -e "${GRE}=========== $FUNCNAME begin ===========${NOC}"
# echo '2:#配置自动转离线钱包(YCC, 100, 60%)' # echo '2:#配置自动转离线钱包(YCC, 100, 60%)'
hash=$(${Chain33Cli} evm call -f 1 -c "${chain33DeployAddr}" -e ${chain33BridgeBank} -p "configLockedTokenOfflineSave(${chain33YccErc20Addr},YCC,10000000000,60)" --chainID "${chain33ID}") hash=$(${Chain33Cli} send evm call -f 1 -k "${chain33DeployAddr}" -e ${chain33BridgeBank} -p "configLockedTokenOfflineSave(${chain33YccErc20Addr},YCC,10000000000,60)" --chainID "${chain33ID}")
check_tx "${Chain33Cli}" "${hash}" check_tx "${Chain33Cli}" "${hash}"
lock_chain33_ycc_multisign 30 30 0 lock_chain33_ycc_multisign 30 30 0
...@@ -94,18 +94,18 @@ function lockChain33Ycc() { ...@@ -94,18 +94,18 @@ function lockChain33Ycc() {
hash=$(${CLIA} chain33 multisign transfer -a 10 -r "${chain33BridgeBank}" -t "${chain33YccErc20Addr}" -k "${chain33MultisignKeyA},${chain33MultisignKeyB},${chain33MultisignKeyC},${chain33MultisignKeyD}" | jq -r ".msg") hash=$(${CLIA} chain33 multisign transfer -a 10 -r "${chain33BridgeBank}" -t "${chain33YccErc20Addr}" -k "${chain33MultisignKeyA},${chain33MultisignKeyB},${chain33MultisignKeyC},${chain33MultisignKeyD}" | jq -r ".msg")
check_tx "${Chain33Cli}" "${hash}" check_tx "${Chain33Cli}" "${hash}"
sleep 2 sleep 2
result=$(${Chain33Cli} evm abi call -a "${chain33YccErc20Addr}" -c "${chain33BridgeBank}" -b "balanceOf(${chain33BridgeBank})") result=$(${Chain33Cli} evm query -a "${chain33YccErc20Addr}" -c "${chain33BridgeBank}" -b "balanceOf(${chain33BridgeBank})")
is_equal "${result}" "6200000000" is_equal "${result}" "6200000000"
result=$(${Chain33Cli} evm abi call -a "${chain33YccErc20Addr}" -c "${multisignChain33Addr}" -b "balanceOf(${multisignChain33Addr})") result=$(${Chain33Cli} evm query -a "${chain33YccErc20Addr}" -c "${multisignChain33Addr}" -b "balanceOf(${multisignChain33Addr})")
is_equal "${result}" "30800000000" is_equal "${result}" "30800000000"
# shellcheck disable=SC2154 # shellcheck disable=SC2154
hash=$(${CLIA} chain33 multisign transfer -a 5 -r "${chain33MultisignA}" -t "${chain33YccErc20Addr}" -k "${chain33MultisignKeyA},${chain33MultisignKeyB},${chain33MultisignKeyC},${chain33MultisignKeyD}" | jq -r ".msg") hash=$(${CLIA} chain33 multisign transfer -a 5 -r "${chain33MultisignA}" -t "${chain33YccErc20Addr}" -k "${chain33MultisignKeyA},${chain33MultisignKeyB},${chain33MultisignKeyC},${chain33MultisignKeyD}" | jq -r ".msg")
check_tx "${Chain33Cli}" "${hash}" check_tx "${Chain33Cli}" "${hash}"
sleep 2 sleep 2
result=$(${Chain33Cli} evm abi call -a "${chain33YccErc20Addr}" -c "${chain33MultisignA}" -b "balanceOf(${chain33MultisignA})") result=$(${Chain33Cli} evm query -a "${chain33YccErc20Addr}" -c "${chain33MultisignA}" -b "balanceOf(${chain33MultisignA})")
is_equal "${result}" "500000000" is_equal "${result}" "500000000"
result=$(${Chain33Cli} evm abi call -a "${chain33YccErc20Addr}" -c "${multisignChain33Addr}" -b "balanceOf(${multisignChain33Addr})") result=$(${Chain33Cli} evm query -a "${chain33YccErc20Addr}" -c "${multisignChain33Addr}" -b "balanceOf(${multisignChain33Addr})")
is_equal "${result}" "30300000000" is_equal "${result}" "30300000000"
# 判断 ETH 这端是否金额一致 # 判断 ETH 这端是否金额一致
......
...@@ -49,7 +49,7 @@ function TestChain33ToEthAssets() { ...@@ -49,7 +49,7 @@ function TestChain33ToEthAssets() {
# balance=$(cli_ret "${result}" "balance" ".balance") # balance=$(cli_ret "${result}" "balance" ".balance")
# chain33 lock bty # chain33 lock bty
hash=$(${Chain33Cli} evm call -f 1 -a 5 -c "${chain33DeployAddr}" -e "${chain33BridgeBank}" -p "lock(${ethDeployAddr}, ${chain33BtyTokenAddr}, 500000000)" --chainID "${chain33ID}") hash=$(${Chain33Cli} send evm call -f 1 -a 5 -k "${chain33DeployAddr}" -e "${chain33BridgeBank}" -p "lock(${ethDeployAddr}, ${chain33BtyTokenAddr}, 500000000)" --khainID "${chain33ID}")
check_tx "${Chain33Cli}" "${hash}" check_tx "${Chain33Cli}" "${hash}"
# 原来的地址金额 减少了 5 # 原来的地址金额 减少了 5
...@@ -111,7 +111,7 @@ function TestETH2Chain33Assets() { ...@@ -111,7 +111,7 @@ function TestETH2Chain33Assets() {
sleep ${maturityDegree} sleep ${maturityDegree}
# chain33 chain33EthTokenAddr(ETH合约中)查询 lock 金额 # chain33 chain33EthTokenAddr(ETH合约中)查询 lock 金额
result=$(${Chain33Cli} evm abi call -a "${chain33EthTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})") result=$(${Chain33Cli} evm query -a "${chain33EthTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})")
# 结果是 11 * le8 # 结果是 11 * le8
is_equal "${result}" "1100000000" is_equal "${result}" "1100000000"
...@@ -125,7 +125,7 @@ function TestETH2Chain33Assets() { ...@@ -125,7 +125,7 @@ function TestETH2Chain33Assets() {
sleep ${maturityDegree} sleep ${maturityDegree}
echo "check the balance on chain33" echo "check the balance on chain33"
result=$(${Chain33Cli} evm abi call -a "${chain33EthTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})") result=$(${Chain33Cli} evm query -a "${chain33EthTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})")
# 结果是 11-5 * le8 # 结果是 11-5 * le8
is_equal "${result}" "600000000" is_equal "${result}" "600000000"
...@@ -161,7 +161,7 @@ function TestETH2Chain33Ycc() { ...@@ -161,7 +161,7 @@ function TestETH2Chain33Ycc() {
sleep ${maturityDegree} sleep ${maturityDegree}
# chain33 chain33EthTokenAddr(ETH合约中)查询 lock 金额 # chain33 chain33EthTokenAddr(ETH合约中)查询 lock 金额
result=$(${Chain33Cli} evm abi call -a "${chain33YccTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})") result=$(${Chain33Cli} evm query -a "${chain33YccTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})")
# 结果是 7 * le8 # 结果是 7 * le8
is_equal "${result}" "700000000" is_equal "${result}" "700000000"
...@@ -175,7 +175,7 @@ function TestETH2Chain33Ycc() { ...@@ -175,7 +175,7 @@ function TestETH2Chain33Ycc() {
sleep ${maturityDegree} sleep ${maturityDegree}
echo "check the balance on chain33" echo "check the balance on chain33"
result=$(${Chain33Cli} evm abi call -a "${chain33YccTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})") result=$(${Chain33Cli} evm query -a "${chain33YccTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})")
# 结果是 7-5 * le8 # 结果是 7-5 * le8
is_equal "${result}" "200000000" is_equal "${result}" "200000000"
......
...@@ -47,7 +47,7 @@ function TestChain33ToEthAssetsKill() { ...@@ -47,7 +47,7 @@ function TestChain33ToEthAssetsKill() {
kill_ebrelayerD kill_ebrelayerD
# chain33 lock bty # chain33 lock bty
hash=$(${Chain33Cli} evm call -f 1 -a 5 -c "${chain33DeployAddr}" -e "${chain33BridgeBank}" -p "lock(${ethDeployAddr}, ${chain33BtyTokenAddr}, 500000000)" --chainID "${chain33ID}") hash=$(${Chain33Cli} send evm call -f 1 -a 5 -k "${chain33DeployAddr}" -e "${chain33BridgeBank}" -p "lock(${ethDeployAddr}, ${chain33BtyTokenAddr}, 500000000)" --chainID "${chain33ID}")
check_tx "${Chain33Cli}" "${hash}" check_tx "${Chain33Cli}" "${hash}"
# chain33BridgeBank 是否增加了 5 # chain33BridgeBank 是否增加了 5
...@@ -100,18 +100,18 @@ function TestChain33ToEthZBCAssetsKill() { ...@@ -100,18 +100,18 @@ function TestChain33ToEthZBCAssetsKill() {
cli_ret "${result}" "balance" ".balance" "0" cli_ret "${result}" "balance" ".balance" "0"
# 原来的地址金额 # 原来的地址金额
result=$(${Chain33Cli} evm abi call -a "${chain33ZBCErc20Addr}" -c "${chain33BridgeBank}" -b "balanceOf(${chain33BridgeBank})") result=$(${Chain33Cli} evm query -a "${chain33ZBCErc20Addr}" -c "${chain33BridgeBank}" -b "balanceOf(${chain33BridgeBank})")
is_equal "${result}" "0" is_equal "${result}" "0"
kill_ebrelayerC kill_ebrelayerC
kill_ebrelayerD kill_ebrelayerD
# chain33 lock ZBC # chain33 lock ZBC
hash=$(${Chain33Cli} evm call -f 1 -c "${chain33DeployAddr}" -e "${chain33BridgeBank}" -p "lock(${ethDeployAddr}, ${chain33ZBCErc20Addr}, 900000000)" --chainID "${chain33ID}") hash=$(${Chain33Cli} send evm call -f 1 -k "${chain33DeployAddr}" -e "${chain33BridgeBank}" -p "lock(${ethDeployAddr}, ${chain33ZBCErc20Addr}, 900000000)" --chainID "${chain33ID}")
check_tx "${Chain33Cli}" "${hash}" check_tx "${Chain33Cli}" "${hash}"
# chain33BridgeBank 是否增加了 9 # chain33BridgeBank 是否增加了 9
result=$(${Chain33Cli} evm abi call -a "${chain33ZBCErc20Addr}" -c "${chain33BridgeBank}" -b "balanceOf(${chain33BridgeBank})") result=$(${Chain33Cli} evm query -a "${chain33ZBCErc20Addr}" -c "${chain33BridgeBank}" -b "balanceOf(${chain33BridgeBank})")
is_equal "${result}" "900000000" is_equal "${result}" "900000000"
eth_block_wait 2 eth_block_wait 2
...@@ -140,18 +140,18 @@ function TestChain33ToEthZBCAssetsKill() { ...@@ -140,18 +140,18 @@ function TestChain33ToEthZBCAssetsKill() {
sleep ${maturityDegree} sleep ${maturityDegree}
result=$(${Chain33Cli} evm abi call -a "${chain33ZBCErc20Addr}" -c "${chain33ReceiverAddr}" -b "balanceOf(${chain33ReceiverAddr})") result=$(${Chain33Cli} evm query -a "${chain33ZBCErc20Addr}" -c "${chain33ReceiverAddr}" -b "balanceOf(${chain33ReceiverAddr})")
is_equal "${result}" "0" is_equal "${result}" "0"
start_ebrelayerC start_ebrelayerC
start_ebrelayerD start_ebrelayerD
# 接收的地址金额 变成了 8 # 接收的地址金额 变成了 8
result=$(${Chain33Cli} evm abi call -a "${chain33ZBCErc20Addr}" -c "${chain33ReceiverAddr}" -b "balanceOf(${chain33ReceiverAddr})") result=$(${Chain33Cli} evm query -a "${chain33ZBCErc20Addr}" -c "${chain33ReceiverAddr}" -b "balanceOf(${chain33ReceiverAddr})")
is_equal "${result}" "800000000" is_equal "${result}" "800000000"
# chain33BridgeBank 是否减少了 1 # chain33BridgeBank 是否减少了 1
result=$(${Chain33Cli} evm abi call -a "${chain33ZBCErc20Addr}" -c "${chain33BridgeBank}" -b "balanceOf(${chain33BridgeBank})") result=$(${Chain33Cli} evm query -a "${chain33ZBCErc20Addr}" -c "${chain33BridgeBank}" -b "balanceOf(${chain33BridgeBank})")
is_equal "${result}" "100000000" is_equal "${result}" "100000000"
echo -e "${GRE}=========== $FUNCNAME end ===========${NOC}" echo -e "${GRE}=========== $FUNCNAME end ===========${NOC}"
...@@ -181,14 +181,14 @@ function TestETH2Chain33AssetsKill() { ...@@ -181,14 +181,14 @@ function TestETH2Chain33AssetsKill() {
sleep ${maturityDegree} sleep ${maturityDegree}
# chain33 chain33EthTokenAddr(ETH合约中)查询 lock 金额 原来是0 # chain33 chain33EthTokenAddr(ETH合约中)查询 lock 金额 原来是0
result=$(${Chain33Cli} evm abi call -a "${chain33EthTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})") result=$(${Chain33Cli} evm query -a "${chain33EthTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})")
# 结果是 11 * le8 # 结果是 11 * le8
is_equal "${result}" "0" is_equal "${result}" "0"
start_ebrelayerC start_ebrelayerC
# chain33 chain33EthTokenAddr(ETH合约中)查询 lock 金额 # chain33 chain33EthTokenAddr(ETH合约中)查询 lock 金额
result=$(${Chain33Cli} evm abi call -a "${chain33EthTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})") result=$(${Chain33Cli} evm query -a "${chain33EthTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})")
# 结果是 11 * le8 # 结果是 11 * le8
is_equal "${result}" "1100000000" is_equal "${result}" "1100000000"
...@@ -215,7 +215,7 @@ function TestETH2Chain33AssetsKill() { ...@@ -215,7 +215,7 @@ function TestETH2Chain33AssetsKill() {
cli_ret "${result}" "balance" ".balance" "105" cli_ret "${result}" "balance" ".balance" "105"
echo "check the balance on chain33" echo "check the balance on chain33"
result=$(${Chain33Cli} evm abi call -a "${chain33EthTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})") result=$(${Chain33Cli} evm query -a "${chain33EthTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})")
# 结果是 11-5 * le8 # 结果是 11-5 * le8
is_equal "${result}" "600000000" is_equal "${result}" "600000000"
...@@ -248,14 +248,14 @@ function TestETH2Chain33YccKill() { ...@@ -248,14 +248,14 @@ function TestETH2Chain33YccKill() {
cli_ret "${result}" "balance" ".balance" "7" cli_ret "${result}" "balance" ".balance" "7"
# chain33 chain33EthTokenAddr(ETH合约中)查询 lock 金额 地址原来是 0 # chain33 chain33EthTokenAddr(ETH合约中)查询 lock 金额 地址原来是 0
result=$(${Chain33Cli} evm abi call -a "${chain33YccTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})") result=$(${Chain33Cli} evm query -a "${chain33YccTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})")
# 结果是 7 * le8 # 结果是 7 * le8
is_equal "${result}" "0" is_equal "${result}" "0"
start_ebrelayerC start_ebrelayerC
# chain33 chain33EthTokenAddr(ETH合约中)查询 lock 金额 # chain33 chain33EthTokenAddr(ETH合约中)查询 lock 金额
result=$(${Chain33Cli} evm abi call -a "${chain33YccTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})") result=$(${Chain33Cli} evm query -a "${chain33YccTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})")
# 结果是 7 * le8 # 结果是 7 * le8
is_equal "${result}" "700000000" is_equal "${result}" "700000000"
...@@ -282,7 +282,7 @@ function TestETH2Chain33YccKill() { ...@@ -282,7 +282,7 @@ function TestETH2Chain33YccKill() {
cli_ret "${result}" "balance" ".balance" "5" cli_ret "${result}" "balance" ".balance" "5"
echo "check the balance on chain33" echo "check the balance on chain33"
result=$(${Chain33Cli} evm abi call -a "${chain33YccTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})") result=$(${Chain33Cli} evm query -a "${chain33YccTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})")
# 结果是 7-5 * le8 # 结果是 7-5 * le8
is_equal "${result}" "200000000" is_equal "${result}" "200000000"
......
...@@ -51,7 +51,7 @@ function TestChain33ToEthAssets() { ...@@ -51,7 +51,7 @@ function TestChain33ToEthAssets() {
# balance=$(cli_ret "${result}" "balance" ".balance") # balance=$(cli_ret "${result}" "balance" ".balance")
# chain33 lock bty # chain33 lock bty
hash=$(${Chain33Cli} evm call -f 1 -a 5 -c "${chain33DeployAddr}" -e "${chain33BridgeBank}" -p "lock(${ethDeployAddr}, ${chain33BtyTokenAddr}, 500000000)" --chainID "${chain33ID}") hash=$(${Chain33Cli} send evm call -f 1 -a 5 -k "${chain33DeployAddr}" -e "${chain33BridgeBank}" -p "lock(${ethDeployAddr}, ${chain33BtyTokenAddr}, 500000000)" --chainID "${chain33ID}")
check_tx "${Chain33Cli}" "${hash}" check_tx "${Chain33Cli}" "${hash}"
# 原来的地址金额 减少了 5 # 原来的地址金额 减少了 5
...@@ -100,15 +100,15 @@ function TestChain33ToEthZBCAssets() { ...@@ -100,15 +100,15 @@ function TestChain33ToEthZBCAssets() {
cli_ret "${result}" "balance" ".balance" "0" cli_ret "${result}" "balance" ".balance" "0"
# 原来的地址金额 # 原来的地址金额
result=$(${Chain33Cli} evm abi call -a "${chain33ZBCErc20Addr}" -c "${chain33BridgeBank}" -b "balanceOf(${chain33BridgeBank})") result=$(${Chain33Cli} evm query -a "${chain33ZBCErc20Addr}" -c "${chain33BridgeBank}" -b "balanceOf(${chain33BridgeBank})")
is_equal "${result}" "0" is_equal "${result}" "0"
# chain33 lock ZBC # chain33 lock ZBC
hash=$(${Chain33Cli} evm call -f 1 -c "${chain33DeployAddr}" -e "${chain33BridgeBank}" -p "lock(${ethDeployAddr}, ${chain33ZBCErc20Addr}, 900000000)" --chainID "${chain33ID}") hash=$(${Chain33Cli} send evm call -f 1 -k "${chain33DeployAddr}" -e "${chain33BridgeBank}" -p "lock(${ethDeployAddr}, ${chain33ZBCErc20Addr}, 900000000)" --chainID "${chain33ID}")
check_tx "${Chain33Cli}" "${hash}" check_tx "${Chain33Cli}" "${hash}"
# chain33BridgeBank 是否增加了 9 # chain33BridgeBank 是否增加了 9
result=$(${Chain33Cli} evm abi call -a "${chain33ZBCErc20Addr}" -c "${chain33BridgeBank}" -b "balanceOf(${chain33BridgeBank})") result=$(${Chain33Cli} evm query -a "${chain33ZBCErc20Addr}" -c "${chain33BridgeBank}" -b "balanceOf(${chain33BridgeBank})")
is_equal "${result}" "900000000" is_equal "${result}" "900000000"
eth_block_wait 2 eth_block_wait 2
...@@ -130,11 +130,11 @@ function TestChain33ToEthZBCAssets() { ...@@ -130,11 +130,11 @@ function TestChain33ToEthZBCAssets() {
sleep ${maturityDegree} sleep ${maturityDegree}
# 接收的地址金额 变成了 8 # 接收的地址金额 变成了 8
result=$(${Chain33Cli} evm abi call -a "${chain33ZBCErc20Addr}" -c "${chain33ReceiverAddr}" -b "balanceOf(${chain33ReceiverAddr})") result=$(${Chain33Cli} evm query -a "${chain33ZBCErc20Addr}" -c "${chain33ReceiverAddr}" -b "balanceOf(${chain33ReceiverAddr})")
is_equal "${result}" "800000000" is_equal "${result}" "800000000"
# chain33BridgeBank 是否减少了 1 # chain33BridgeBank 是否减少了 1
result=$(${Chain33Cli} evm abi call -a "${chain33ZBCErc20Addr}" -c "${chain33BridgeBank}" -b "balanceOf(${chain33BridgeBank})") result=$(${Chain33Cli} evm query -a "${chain33ZBCErc20Addr}" -c "${chain33BridgeBank}" -b "balanceOf(${chain33BridgeBank})")
is_equal "${result}" "100000000" is_equal "${result}" "100000000"
echo -e "${GRE}=========== $FUNCNAME end ===========${NOC}" echo -e "${GRE}=========== $FUNCNAME end ===========${NOC}"
...@@ -162,7 +162,7 @@ function TestETH2Chain33Assets() { ...@@ -162,7 +162,7 @@ function TestETH2Chain33Assets() {
sleep ${maturityDegree} sleep ${maturityDegree}
# chain33 chain33EthTokenAddr(ETH合约中)查询 lock 金额 # chain33 chain33EthTokenAddr(ETH合约中)查询 lock 金额
result=$(${Chain33Cli} evm abi call -a "${chain33EthTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})") result=$(${Chain33Cli} evm query -a "${chain33EthTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})")
# 结果是 11 * le8 # 结果是 11 * le8
is_equal "${result}" "1100000000" is_equal "${result}" "1100000000"
...@@ -176,7 +176,7 @@ function TestETH2Chain33Assets() { ...@@ -176,7 +176,7 @@ function TestETH2Chain33Assets() {
sleep ${maturityDegree} sleep ${maturityDegree}
echo "check the balance on chain33" echo "check the balance on chain33"
result=$(${Chain33Cli} evm abi call -a "${chain33EthTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})") result=$(${Chain33Cli} evm query -a "${chain33EthTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})")
# 结果是 11-5 * le8 # 结果是 11-5 * le8
is_equal "${result}" "600000000" is_equal "${result}" "600000000"
...@@ -212,7 +212,7 @@ function TestETH2Chain33Ycc() { ...@@ -212,7 +212,7 @@ function TestETH2Chain33Ycc() {
sleep ${maturityDegree} sleep ${maturityDegree}
# chain33 chain33EthTokenAddr(ETH合约中)查询 lock 金额 # chain33 chain33EthTokenAddr(ETH合约中)查询 lock 金额
result=$(${Chain33Cli} evm abi call -a "${chain33YccTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})") result=$(${Chain33Cli} evm query -a "${chain33YccTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})")
# 结果是 7 * le8 # 结果是 7 * le8
is_equal "${result}" "700000000" is_equal "${result}" "700000000"
...@@ -226,7 +226,7 @@ function TestETH2Chain33Ycc() { ...@@ -226,7 +226,7 @@ function TestETH2Chain33Ycc() {
sleep ${maturityDegree} sleep ${maturityDegree}
echo "check the balance on chain33" echo "check the balance on chain33"
result=$(${Chain33Cli} evm abi call -a "${chain33YccTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})") result=$(${Chain33Cli} evm query -a "${chain33YccTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})")
# 结果是 7-5 * le8 # 结果是 7-5 * le8
is_equal "${result}" "200000000" is_equal "${result}" "200000000"
......
...@@ -170,7 +170,7 @@ function TestChain33ToEthAssets() { ...@@ -170,7 +170,7 @@ function TestChain33ToEthAssets() {
# balance=$(cli_ret "${result}" "balance" ".balance") # balance=$(cli_ret "${result}" "balance" ".balance")
# chain33 lock bty # chain33 lock bty
hash=$(${Chain33Cli} evm call -f 1 -a 5 -c "${chain33DeployAddr}" -e "${chain33BridgeBank}" -p "lock(${ethDeployAddr}, ${chain33BtyTokenAddr}, 500000000)") hash=$(${Chain33Cli} send evm call -f 1 -a 5 -k "${chain33DeployAddr}" -e "${chain33BridgeBank}" -p "lock(${ethDeployAddr}, ${chain33BtyTokenAddr}, 500000000)")
check_tx "${Chain33Cli}" "${hash}" check_tx "${Chain33Cli}" "${hash}"
# 原来的地址金额 减少了 5 # 原来的地址金额 减少了 5
...@@ -235,7 +235,7 @@ function TestETH2Chain33Assets() { ...@@ -235,7 +235,7 @@ function TestETH2Chain33Assets() {
sleep ${maturityDegree} sleep ${maturityDegree}
# chain33 chain33EthTokenAddr(ETH合约中)查询 lock 金额 # chain33 chain33EthTokenAddr(ETH合约中)查询 lock 金额
result=$(${Chain33Cli} evm abi call -a "${chain33EthTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})") result=$(${Chain33Cli} evm query -a "${chain33EthTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})")
# 结果是 11 * le8 # 结果是 11 * le8
is_equal "${result}" "1100000000" is_equal "${result}" "1100000000"
...@@ -249,7 +249,7 @@ function TestETH2Chain33Assets() { ...@@ -249,7 +249,7 @@ function TestETH2Chain33Assets() {
sleep ${maturityDegree} sleep ${maturityDegree}
echo "check the balance on chain33" echo "check the balance on chain33"
result=$(${Chain33Cli} evm abi call -a "${chain33EthTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})") result=$(${Chain33Cli} evm query -a "${chain33EthTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})")
# 结果是 11-5 * le8 # 结果是 11-5 * le8
is_equal "${result}" "600000000" is_equal "${result}" "600000000"
...@@ -285,7 +285,7 @@ function TestETH2Chain33Ycc() { ...@@ -285,7 +285,7 @@ function TestETH2Chain33Ycc() {
sleep ${maturityDegree} sleep ${maturityDegree}
# chain33 chain33EthTokenAddr(ETH合约中)查询 lock 金额 # chain33 chain33EthTokenAddr(ETH合约中)查询 lock 金额
result=$(${Chain33Cli} evm abi call -a "${chain33YccTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})") result=$(${Chain33Cli} evm query -a "${chain33YccTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})")
# 结果是 7 * le8 # 结果是 7 * le8
is_equal "${result}" "700000000" is_equal "${result}" "700000000"
...@@ -299,7 +299,7 @@ function TestETH2Chain33Ycc() { ...@@ -299,7 +299,7 @@ function TestETH2Chain33Ycc() {
sleep ${maturityDegree} sleep ${maturityDegree}
echo "check the balance on chain33" echo "check the balance on chain33"
result=$(${Chain33Cli} evm abi call -a "${chain33YccTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})") result=$(${Chain33Cli} evm query -a "${chain33YccTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})")
# 结果是 7-5 * le8 # 结果是 7-5 * le8
is_equal "${result}" "200000000" is_equal "${result}" "200000000"
......
...@@ -72,7 +72,7 @@ function loop_send_lock_bty() { ...@@ -72,7 +72,7 @@ function loop_send_lock_bty() {
while [[ i -lt ${#privateKeys[@]} ]]; do while [[ i -lt ${#privateKeys[@]} ]]; do
preEthBalance[$i]=$(${CLIA} ethereum balance -o "${ethAddress[i]}" -t "${ethereumBtyTokenAddr}" | jq -r ".balance") preEthBalance[$i]=$(${CLIA} ethereum balance -o "${ethAddress[i]}" -t "${ethereumBtyTokenAddr}" | jq -r ".balance")
hash=$(${Chain33Cli} evm call -f 1 -a 1 -c "${chain33DeployAddr}" -e "${chain33BridgeBank}" -p "lock(${ethAddress[i]}, ${chain33BtyTokenAddr}, 100000000)" --chainID "${chain33ID}") hash=$(${Chain33Cli} send evm call -f 1 -a 1 -k "${chain33DeployAddr}" -e "${chain33BridgeBank}" -p "lock(${ethAddress[i]}, ${chain33BtyTokenAddr}, 100000000)" --chainID "${chain33ID}")
check_tx "${Chain33Cli}" "${hash}" check_tx "${Chain33Cli}" "${hash}"
i=$((i+1)) i=$((i+1))
...@@ -128,7 +128,7 @@ function loop_send_burn_bty() { ...@@ -128,7 +128,7 @@ function loop_send_burn_bty() {
function loop_send_lock_eth() { function loop_send_lock_eth() {
echo -e "${GRE}=========== $FUNCNAME begin ===========${NOC}" echo -e "${GRE}=========== $FUNCNAME begin ===========${NOC}"
preChain33Balance=$(${Chain33Cli} evm abi call -a "${chain33EthTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})") preChain33Balance=$(${Chain33Cli} evm query -a "${chain33EthTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})")
i=0 i=0
while [[ i -lt ${#privateKeys[@]} ]]; do while [[ i -lt ${#privateKeys[@]} ]]; do
...@@ -152,7 +152,7 @@ function loop_send_lock_eth() { ...@@ -152,7 +152,7 @@ function loop_send_lock_eth() {
fi fi
i=$((i+1)) i=$((i+1))
done done
nowChain33Balance=$(${Chain33Cli} evm abi call -a "${chain33EthTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})") nowChain33Balance=$(${Chain33Cli} evm query -a "${chain33EthTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})")
diff=$(echo "$nowChain33Balance - $preChain33Balance" | bc) diff=$(echo "$nowChain33Balance - $preChain33Balance" | bc)
diff=$(echo "$diff / 100000000" | bc) diff=$(echo "$diff / 100000000" | bc)
check_number "${diff}" "${#privateKeys[@]}" check_number "${diff}" "${#privateKeys[@]}"
...@@ -163,7 +163,7 @@ function loop_send_lock_eth() { ...@@ -163,7 +163,7 @@ function loop_send_lock_eth() {
function loop_send_burn_eth() { function loop_send_burn_eth() {
echo -e "${GRE}=========== $FUNCNAME begin ===========${NOC}" echo -e "${GRE}=========== $FUNCNAME begin ===========${NOC}"
preChain33Balance=$(${Chain33Cli} evm abi call -a "${chain33EthTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})") preChain33Balance=$(${Chain33Cli} evm query -a "${chain33EthTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})")
i=0 i=0
while [[ i -lt ${#privateKeys[@]} ]]; do while [[ i -lt ${#privateKeys[@]} ]]; do
...@@ -187,7 +187,7 @@ function loop_send_burn_eth() { ...@@ -187,7 +187,7 @@ function loop_send_burn_eth() {
fi fi
i=$((i+1)) i=$((i+1))
done done
nowChain33Balance=$(${Chain33Cli} evm abi call -a "${chain33EthTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})") nowChain33Balance=$(${Chain33Cli} evm query -a "${chain33EthTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})")
diff=$(echo "$preChain33Balance - $nowChain33Balance" | bc) diff=$(echo "$preChain33Balance - $nowChain33Balance" | bc)
diff=$(echo "$diff / 100000000" | bc) diff=$(echo "$diff / 100000000" | bc)
check_number "${diff}" "${#privateKeys[@]}" check_number "${diff}" "${#privateKeys[@]}"
...@@ -198,7 +198,7 @@ function loop_send_burn_eth() { ...@@ -198,7 +198,7 @@ function loop_send_burn_eth() {
function loop_send_lock_ycc() { function loop_send_lock_ycc() {
echo -e "${GRE}=========== $FUNCNAME begin ===========${NOC}" echo -e "${GRE}=========== $FUNCNAME begin ===========${NOC}"
preChain33Balance=$(${Chain33Cli} evm abi call -a "${chain33YccTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})") preChain33Balance=$(${Chain33Cli} evm query -a "${chain33YccTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})")
# 先往每个ETH地址中导入token # 先往每个ETH地址中导入token
i=0 i=0
...@@ -228,7 +228,7 @@ function loop_send_lock_ycc() { ...@@ -228,7 +228,7 @@ function loop_send_lock_ycc() {
i=$((i+1)) i=$((i+1))
done done
nowChain33Balance=$(${Chain33Cli} evm abi call -a "${chain33YccTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})") nowChain33Balance=$(${Chain33Cli} evm query -a "${chain33YccTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})")
diff=$((nowChain33Balance - preChain33Balance)) diff=$((nowChain33Balance - preChain33Balance))
diff=$(echo "$diff / 100000000" | bc) diff=$(echo "$diff / 100000000" | bc)
check_number "${diff}" "${#privateKeys[@]}" check_number "${diff}" "${#privateKeys[@]}"
...@@ -239,7 +239,7 @@ function loop_send_lock_ycc() { ...@@ -239,7 +239,7 @@ function loop_send_lock_ycc() {
function loop_send_burn_ycc() { function loop_send_burn_ycc() {
echo -e "${GRE}=========== $FUNCNAME begin ===========${NOC}" echo -e "${GRE}=========== $FUNCNAME begin ===========${NOC}"
preChain33Balance=$(${Chain33Cli} evm abi call -a "${chain33YccTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})") preChain33Balance=$(${Chain33Cli} evm query -a "${chain33YccTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})")
i=0 i=0
while [[ i -lt ${#privateKeys[@]} ]]; do while [[ i -lt ${#privateKeys[@]} ]]; do
...@@ -259,7 +259,7 @@ function loop_send_burn_ycc() { ...@@ -259,7 +259,7 @@ function loop_send_burn_ycc() {
check_number "${res}" 1 check_number "${res}" 1
i=$((i+1)) i=$((i+1))
done done
nowChain33Balance=$(${Chain33Cli} evm abi call -a "${chain33YccTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})") nowChain33Balance=$(${Chain33Cli} evm query -a "${chain33YccTokenAddr}" -c "${chain33DeployAddr}" -b "balanceOf(${chain33ReceiverAddr})")
diff=$(echo "$preChain33Balance - $nowChain33Balance" | bc) diff=$(echo "$preChain33Balance - $nowChain33Balance" | bc)
diff=$(echo "$diff / 100000000" | bc) diff=$(echo "$diff / 100000000" | bc)
check_number "${diff}" "${#privateKeys[@]}" check_number "${diff}" "${#privateKeys[@]}"
......
...@@ -33,7 +33,7 @@ function set_offline_token_Bty() { ...@@ -33,7 +33,7 @@ function set_offline_token_Bty() {
echo -e "${GRE}=========== $FUNCNAME begin ===========${NOC}" echo -e "${GRE}=========== $FUNCNAME begin ===========${NOC}"
echo -e "${GRE}===== chain33 端 configLockedTokenOfflineSave BTY ======${NOC}" echo -e "${GRE}===== chain33 端 configLockedTokenOfflineSave BTY ======${NOC}"
# echo '2:#配置自动转离线钱包(bty, 1000, 50%)' # echo '2:#配置自动转离线钱包(bty, 1000, 50%)'
hash=$(${Chain33Cli} evm call -f 1 -c "${chain33DeployAddr}" -e "${chain33BridgeBank}" -p "configLockedTokenOfflineSave(${chain33BtyTokenAddr},BTY,100000000000,50)" --chainID "${chain33ID}") hash=$(${Chain33Cli} send evm call -f 1 -k "${chain33DeployAddr}" -e "${chain33BridgeBank}" -p "configLockedTokenOfflineSave(${chain33BtyTokenAddr},BTY,100000000000,50)" --khainID "${chain33ID}")
check_tx "${Chain33Cli}" "${hash}" check_tx "${Chain33Cli}" "${hash}"
echo -e "${GRE}=========== $FUNCNAME end ===========${NOC}" echo -e "${GRE}=========== $FUNCNAME end ===========${NOC}"
...@@ -87,7 +87,7 @@ function set_offline_token_Chain33Ycc() { ...@@ -87,7 +87,7 @@ function set_offline_token_Chain33Ycc() {
echo -e "${GRE}===== chain33 端 configLockedTokenOfflineSave ERC20 YCC ======${NOC}" echo -e "${GRE}===== chain33 端 configLockedTokenOfflineSave ERC20 YCC ======${NOC}"
# echo '2:#配置自动转离线钱包(YCC, 100, 60%)' # echo '2:#配置自动转离线钱包(YCC, 100, 60%)'
hash=$(${Chain33Cli} evm call -f 1 -c "${chain33DeployAddr}" -e "${chain33BridgeBank}" -p "configLockedTokenOfflineSave(${chain33YccErc20Addr},YCC,10000000000,60)" --chainID "${chain33ID}") hash=$(${Chain33Cli} send evm call -f 1 -k "${chain33DeployAddr}" -e "${chain33BridgeBank}" -p "configLockedTokenOfflineSave(${chain33YccErc20Addr},YCC,10000000000,60)" --chainID "${chain33ID}")
check_tx "${Chain33Cli}" "${hash}" check_tx "${Chain33Cli}" "${hash}"
echo -e "${GRE}=========== $FUNCNAME end ===========${NOC}" echo -e "${GRE}=========== $FUNCNAME end ===========${NOC}"
...@@ -109,17 +109,17 @@ function transfer_multisign_Chain33Ycc_test() { ...@@ -109,17 +109,17 @@ function transfer_multisign_Chain33Ycc_test() {
hash=$(${CLIA} chain33 multisign transfer -a 10 -r "${chain33BridgeBank}" -t "${chain33YccErc20Addr}" -k "${chain33MultisignKeyA},${chain33MultisignKeyB},${chain33MultisignKeyC},${chain33MultisignKeyD}" | jq -r ".msg") hash=$(${CLIA} chain33 multisign transfer -a 10 -r "${chain33BridgeBank}" -t "${chain33YccErc20Addr}" -k "${chain33MultisignKeyA},${chain33MultisignKeyB},${chain33MultisignKeyC},${chain33MultisignKeyD}" | jq -r ".msg")
check_tx "${Chain33Cli}" "${hash}" check_tx "${Chain33Cli}" "${hash}"
sleep 2 sleep 2
result=$(${Chain33Cli} evm abi call -a "${chain33YccErc20Addr}" -c "${chain33BridgeBank}" -b "balanceOf(${chain33BridgeBank})") result=$(${Chain33Cli} evm query -a "${chain33YccErc20Addr}" -c "${chain33BridgeBank}" -b "balanceOf(${chain33BridgeBank})")
is_equal "${result}" "6200000000" is_equal "${result}" "6200000000"
result=$(${Chain33Cli} evm abi call -a "${chain33YccErc20Addr}" -c "${multisignChain33Addr}" -b "balanceOf(${multisignChain33Addr})") result=$(${Chain33Cli} evm query -a "${chain33YccErc20Addr}" -c "${multisignChain33Addr}" -b "balanceOf(${multisignChain33Addr})")
is_equal "${result}" "30800000000" is_equal "${result}" "30800000000"
hash=$(${CLIA} chain33 multisign transfer -a 5 -r "${chain33MultisignA}" -t "${chain33YccErc20Addr}" -k "${chain33MultisignKeyA},${chain33MultisignKeyB},${chain33MultisignKeyC},${chain33MultisignKeyD}" | jq -r ".msg") hash=$(${CLIA} chain33 multisign transfer -a 5 -r "${chain33MultisignA}" -t "${chain33YccErc20Addr}" -k "${chain33MultisignKeyA},${chain33MultisignKeyB},${chain33MultisignKeyC},${chain33MultisignKeyD}" | jq -r ".msg")
check_tx "${Chain33Cli}" "${hash}" check_tx "${Chain33Cli}" "${hash}"
sleep 2 sleep 2
result=$(${Chain33Cli} evm abi call -a "${chain33YccErc20Addr}" -c "${chain33MultisignA}" -b "balanceOf(${chain33MultisignA})") result=$(${Chain33Cli} evm query -a "${chain33YccErc20Addr}" -c "${chain33MultisignA}" -b "balanceOf(${chain33MultisignA})")
is_equal "${result}" "500000000" is_equal "${result}" "500000000"
result=$(${Chain33Cli} evm abi call -a "${chain33YccErc20Addr}" -c "${multisignChain33Addr}" -b "balanceOf(${multisignChain33Addr})") result=$(${Chain33Cli} evm query -a "${chain33YccErc20Addr}" -c "${multisignChain33Addr}" -b "balanceOf(${multisignChain33Addr})")
is_equal "${result}" "30300000000" is_equal "${result}" "30300000000"
# 判断 ETH 这端是否金额一致 # 判断 ETH 这端是否金额一致
......
...@@ -74,7 +74,7 @@ function InitAndOfflineDeploy() { ...@@ -74,7 +74,7 @@ function InitAndOfflineDeploy() {
# 拷贝 BridgeRegistry.abi 和 BridgeBank.abi # 拷贝 BridgeRegistry.abi 和 BridgeBank.abi
cp BridgeRegistry.abi "${BridgeRegistryOnChain33}.abi" cp BridgeRegistry.abi "${BridgeRegistryOnChain33}.abi"
chain33BridgeBank=$(${Chain33Cli} evm abi call -c "${chain33DeployAddr}" -b "bridgeBank()" -a "${BridgeRegistryOnChain33}") chain33BridgeBank=$(${Chain33Cli} evm query -c "${chain33DeployAddr}" -b "bridgeBank()" -a "${BridgeRegistryOnChain33}")
cp Chain33BridgeBank.abi "${chain33BridgeBank}.abi" cp Chain33BridgeBank.abi "${chain33BridgeBank}.abi"
# 在 Eth 上部署合约 # 在 Eth 上部署合约
...@@ -129,11 +129,11 @@ function offline_create_bridge_token_chain33_YCC() { ...@@ -129,11 +129,11 @@ function offline_create_bridge_token_chain33_YCC() {
${Boss4xCLI} chain33 offline create_bridge_token -c "${chain33BridgeBank}" -s YCC -k "${chain33DeployKey}" --chainID "${chain33ID}" ${Boss4xCLI} chain33 offline create_bridge_token -c "${chain33BridgeBank}" -s YCC -k "${chain33DeployKey}" --chainID "${chain33ID}"
chain33_offline_send "create_bridge_token.txt" chain33_offline_send "create_bridge_token.txt"
chain33YccTokenAddr=$(${Chain33Cli} evm abi call -a "${chain33BridgeBank}" -c "${chain33DeployAddr}" -b "getToken2address(YCC)") chain33YccTokenAddr=$(${Chain33Cli} evm query -a "${chain33BridgeBank}" -c "${chain33DeployAddr}" -b "getToken2address(YCC)")
echo "YCC Token Addr = ${chain33YccTokenAddr}" echo "YCC Token Addr = ${chain33YccTokenAddr}"
cp BridgeToken.abi "${chain33YccTokenAddr}.abi" cp BridgeToken.abi "${chain33YccTokenAddr}.abi"
result=$(${Chain33Cli} evm abi call -a "${chain33YccTokenAddr}" -c "${chain33YccTokenAddr}" -b "symbol()") result=$(${Chain33Cli} evm query -a "${chain33YccTokenAddr}" -c "${chain33YccTokenAddr}" -b "symbol()")
is_equal "${result}" "YCC" is_equal "${result}" "YCC"
} }
...@@ -191,11 +191,11 @@ function offline_create_bridge_token_chain33_ETH() { ...@@ -191,11 +191,11 @@ function offline_create_bridge_token_chain33_ETH() {
${Boss4xCLI} chain33 offline create_bridge_token -c "${chain33BridgeBank}" -s ETH -k "${chain33DeployKey}" --chainID "${chain33ID}" -n "create_bridge_token:ETH" ${Boss4xCLI} chain33 offline create_bridge_token -c "${chain33BridgeBank}" -s ETH -k "${chain33DeployKey}" --chainID "${chain33ID}" -n "create_bridge_token:ETH"
chain33_offline_send "create_bridge_token.txt" chain33_offline_send "create_bridge_token.txt"
chain33EthTokenAddr=$(${Chain33Cli} evm abi call -a "${chain33BridgeBank}" -c "${chain33DeployAddr}" -b "getToken2address(ETH)") chain33EthTokenAddr=$(${Chain33Cli} evm query -a "${chain33BridgeBank}" -c "${chain33DeployAddr}" -b "getToken2address(ETH)")
echo "ETH Token Addr= ${chain33EthTokenAddr}" echo "ETH Token Addr= ${chain33EthTokenAddr}"
cp BridgeToken.abi "${chain33EthTokenAddr}.abi" cp BridgeToken.abi "${chain33EthTokenAddr}.abi"
result=$(${Chain33Cli} evm abi call -a "${chain33EthTokenAddr}" -c "${chain33EthTokenAddr}" -b "symbol()") result=$(${Chain33Cli} evm query -a "${chain33EthTokenAddr}" -c "${chain33EthTokenAddr}" -b "symbol()")
is_equal "${result}" "ETH" is_equal "${result}" "ETH"
} }
...@@ -344,9 +344,9 @@ function offline_transfer_multisign_Chain33Ycc_test() { ...@@ -344,9 +344,9 @@ function offline_transfer_multisign_Chain33Ycc_test() {
${Boss4xCLI} chain33 offline multisign_transfer -k "${chain33DeployKey}" -s "${chain33MultisignKeyA},${chain33MultisignKeyB},${chain33MultisignKeyC},${chain33MultisignKeyD}" --chainID "${chain33ID}" ${Boss4xCLI} chain33 offline multisign_transfer -k "${chain33DeployKey}" -s "${chain33MultisignKeyA},${chain33MultisignKeyB},${chain33MultisignKeyC},${chain33MultisignKeyD}" --chainID "${chain33ID}"
chain33_offline_send "multisign_transfer.txt" chain33_offline_send "multisign_transfer.txt"
sleep 10 sleep 10
result=$(${Chain33Cli} evm abi call -a "${chain33YccErc20Addr}" -c "${chain33BridgeBank}" -b "balanceOf(${chain33BridgeBank})") result=$(${Chain33Cli} evm query -a "${chain33YccErc20Addr}" -c "${chain33BridgeBank}" -b "balanceOf(${chain33BridgeBank})")
is_equal "${result}" "6200000000" is_equal "${result}" "6200000000"
result=$(${Chain33Cli} evm abi call -a "${chain33YccErc20Addr}" -c "${multisignChain33Addr}" -b "balanceOf(${multisignChain33Addr})") result=$(${Chain33Cli} evm query -a "${chain33YccErc20Addr}" -c "${multisignChain33Addr}" -b "balanceOf(${multisignChain33Addr})")
is_equal "${result}" "30800000000" is_equal "${result}" "30800000000"
# hash=$(${CLIA} chain33 multisign transfer -a 5 -r "${chain33MultisignA}" -t "${chain33YccErc20Addr}" -k "${chain33MultisignKeyA},${chain33MultisignKeyB},${chain33MultisignKeyC},${chain33MultisignKeyD}" | jq -r ".msg") # hash=$(${CLIA} chain33 multisign transfer -a 5 -r "${chain33MultisignA}" -t "${chain33YccErc20Addr}" -k "${chain33MultisignKeyA},${chain33MultisignKeyB},${chain33MultisignKeyC},${chain33MultisignKeyD}" | jq -r ".msg")
...@@ -355,9 +355,9 @@ function offline_transfer_multisign_Chain33Ycc_test() { ...@@ -355,9 +355,9 @@ function offline_transfer_multisign_Chain33Ycc_test() {
${Boss4xCLI} chain33 offline multisign_transfer -k "${chain33DeployKey}" -s "${chain33MultisignKeyA},${chain33MultisignKeyB},${chain33MultisignKeyC},${chain33MultisignKeyD}" --chainID "${chain33ID}" ${Boss4xCLI} chain33 offline multisign_transfer -k "${chain33DeployKey}" -s "${chain33MultisignKeyA},${chain33MultisignKeyB},${chain33MultisignKeyC},${chain33MultisignKeyD}" --chainID "${chain33ID}"
chain33_offline_send "multisign_transfer.txt" chain33_offline_send "multisign_transfer.txt"
sleep 10 sleep 10
result=$(${Chain33Cli} evm abi call -a "${chain33YccErc20Addr}" -c "${chain33MultisignA}" -b "balanceOf(${chain33MultisignA})") result=$(${Chain33Cli} evm query -a "${chain33YccErc20Addr}" -c "${chain33MultisignA}" -b "balanceOf(${chain33MultisignA})")
is_equal "${result}" "500000000" is_equal "${result}" "500000000"
result=$(${Chain33Cli} evm abi call -a "${chain33YccErc20Addr}" -c "${multisignChain33Addr}" -b "balanceOf(${multisignChain33Addr})") result=$(${Chain33Cli} evm query -a "${chain33YccErc20Addr}" -c "${multisignChain33Addr}" -b "balanceOf(${multisignChain33Addr})")
is_equal "${result}" "30300000000" is_equal "${result}" "30300000000"
# 判断 ETH 这端是否金额一致 # 判断 ETH 这端是否金额一致
......
...@@ -126,7 +126,7 @@ function InitAndDeploy() { ...@@ -126,7 +126,7 @@ function InitAndDeploy() {
# 拷贝 BridgeRegistry.abi 和 BridgeBank.abi # 拷贝 BridgeRegistry.abi 和 BridgeBank.abi
cp BridgeRegistry.abi "${BridgeRegistryOnChain33}.abi" cp BridgeRegistry.abi "${BridgeRegistryOnChain33}.abi"
chain33BridgeBank=$(${Chain33Cli} evm abi call -c "${chain33DeployAddr}" -b "bridgeBank()" -a "${BridgeRegistryOnChain33}") chain33BridgeBank=$(${Chain33Cli} evm query -c "${chain33DeployAddr}" -b "bridgeBank()" -a "${BridgeRegistryOnChain33}")
cp Chain33BridgeBank.abi "${chain33BridgeBank}.abi" cp Chain33BridgeBank.abi "${chain33BridgeBank}.abi"
# 在 Eth 上部署合约 # 在 Eth 上部署合约
...@@ -163,13 +163,13 @@ function create_bridge_token_eth_BTY() { ...@@ -163,13 +163,13 @@ function create_bridge_token_eth_BTY() {
function create_bridge_token_chain33_ETH() { function create_bridge_token_chain33_ETH() {
# 在 chain33 上创建 bridgeToken ETH # 在 chain33 上创建 bridgeToken ETH
echo -e "${GRE}======= 在 chain33 上创建 bridgeToken ETH ======${NOC}" echo -e "${GRE}======= 在 chain33 上创建 bridgeToken ETH ======${NOC}"
hash=$(${Chain33Cli} evm call -f 1 -c "${chain33DeployAddr}" -e "${chain33BridgeBank}" -p "createNewBridgeToken(ETH)" --chainID "${chain33ID}") hash=$(${Chain33Cli} send evm call -f 1 -k "${chain33DeployAddr}" -e "${chain33BridgeBank}" -p "createNewBridgeToken(ETH)" --chainID "${chain33ID}")
check_tx "${Chain33Cli}" "${hash}" check_tx "${Chain33Cli}" "${hash}"
chain33EthTokenAddr=$(${Chain33Cli} evm abi call -a "${chain33BridgeBank}" -c "${chain33DeployAddr}" -b "getToken2address(ETH)") chain33EthTokenAddr=$(${Chain33Cli} evm query -a "${chain33BridgeBank}" -c "${chain33DeployAddr}" -b "getToken2address(ETH)")
echo "ETH Token Addr= ${chain33EthTokenAddr}" echo "ETH Token Addr= ${chain33EthTokenAddr}"
cp BridgeToken.abi "${chain33EthTokenAddr}.abi" cp BridgeToken.abi "${chain33EthTokenAddr}.abi"
result=$(${Chain33Cli} evm abi call -a "${chain33EthTokenAddr}" -c "${chain33EthTokenAddr}" -b "symbol()") result=$(${Chain33Cli} evm query -a "${chain33EthTokenAddr}" -c "${chain33EthTokenAddr}" -b "symbol()")
is_equal "${result}" "ETH" is_equal "${result}" "ETH"
} }
...@@ -187,13 +187,13 @@ function deploy_erc20_eth_YCC() { ...@@ -187,13 +187,13 @@ function deploy_erc20_eth_YCC() {
function create_bridge_token_chain33_YCC() { function create_bridge_token_chain33_YCC() {
# 在chain33上创建bridgeToken YCC # 在chain33上创建bridgeToken YCC
echo -e "${GRE}======= 在 chain33 上创建 bridgeToken YCC ======${NOC}" echo -e "${GRE}======= 在 chain33 上创建 bridgeToken YCC ======${NOC}"
hash=$(${Chain33Cli} evm call -f 1 -c "${chain33DeployAddr}" -e "${chain33BridgeBank}" -p "createNewBridgeToken(YCC)" --chainID "${chain33ID}") hash=$(${Chain33Cli} send evm call -f 1 -k "${chain33DeployAddr}" -e "${chain33BridgeBank}" -p "createNewBridgeToken(YCC)" --chainID "${chain33ID}")
check_tx "${Chain33Cli}" "${hash}" check_tx "${Chain33Cli}" "${hash}"
chain33YccTokenAddr=$(${Chain33Cli} evm abi call -a "${chain33BridgeBank}" -c "${chain33DeployAddr}" -b "getToken2address(YCC)") chain33YccTokenAddr=$(${Chain33Cli} evm query -a "${chain33BridgeBank}" -c "${chain33DeployAddr}" -b "getToken2address(YCC)")
echo "YCC Token Addr = ${chain33YccTokenAddr}" echo "YCC Token Addr = ${chain33YccTokenAddr}"
cp BridgeToken.abi "${chain33YccTokenAddr}.abi" cp BridgeToken.abi "${chain33YccTokenAddr}.abi"
result=$(${Chain33Cli} evm abi call -a "${chain33YccTokenAddr}" -c "${chain33YccTokenAddr}" -b "symbol()") result=$(${Chain33Cli} evm query -a "${chain33YccTokenAddr}" -c "${chain33YccTokenAddr}" -b "symbol()")
is_equal "${result}" "YCC" is_equal "${result}" "YCC"
} }
...@@ -206,11 +206,11 @@ function deploy_erc20_chain33_YCC() { ...@@ -206,11 +206,11 @@ function deploy_erc20_chain33_YCC() {
cp ERC20.abi "${chain33YccErc20Addr}.abi" cp ERC20.abi "${chain33YccErc20Addr}.abi"
# echo 'YCC.1:增加allowance的设置,或者使用relayer工具进行' # echo 'YCC.1:增加allowance的设置,或者使用relayer工具进行'
hash=$(${Chain33Cli} evm call -f 1 -c "${chain33DeployAddr}" -e "${chain33YccErc20Addr}" -p "approve(${chain33BridgeBank}, 330000000000)" --chainID "${chain33ID}") hash=$(${Chain33Cli} send evm call -f 1 -k "${chain33DeployAddr}" -e "${chain33YccErc20Addr}" -p "approve(${chain33BridgeBank}, 330000000000)" --chainID "${chain33ID}")
check_tx "${Chain33Cli}" "${hash}" check_tx "${Chain33Cli}" "${hash}"
# echo 'YCC.2:#执行add lock操作:addToken2LockList' # echo 'YCC.2:#执行add lock操作:addToken2LockList'
hash=$(${Chain33Cli} evm call -f 1 -c "${chain33DeployAddr}" -e "${chain33BridgeBank}" -p "addToken2LockList(${chain33YccErc20Addr}, YCC)" --chainID "${chain33ID}") hash=$(${Chain33Cli} send evm call -f 1 -k "${chain33DeployAddr}" -e "${chain33BridgeBank}" -p "addToken2LockList(${chain33YccErc20Addr}, YCC)" --chainID "${chain33ID}")
check_tx "${Chain33Cli}" "${hash}" check_tx "${Chain33Cli}" "${hash}"
} }
...@@ -232,11 +232,11 @@ function deploy_erc20_chain33_ZBC() { ...@@ -232,11 +232,11 @@ function deploy_erc20_chain33_ZBC() {
cp ERC20.abi "${chain33ZBCErc20Addr}.abi" cp ERC20.abi "${chain33ZBCErc20Addr}.abi"
# echo 'ZBC.1:增加allowance的设置,或者使用relayer工具进行' # echo 'ZBC.1:增加allowance的设置,或者使用relayer工具进行'
hash=$(${Chain33Cli} evm call -f 1 -c "${chain33DeployAddr}" -e "${chain33ZBCErc20Addr}" -p "approve(${chain33BridgeBank}, 330000000000)" --chainID "${chain33ID}") hash=$(${Chain33Cli} send evm call -f 1 -k "${chain33DeployAddr}" -e "${chain33ZBCErc20Addr}" -p "approve(${chain33BridgeBank}, 330000000000)" --chainID "${chain33ID}")
check_tx "${Chain33Cli}" "${hash}" check_tx "${Chain33Cli}" "${hash}"
# echo 'ZBC.2:#执行add lock操作:addToken2LockList' # echo 'ZBC.2:#执行add lock操作:addToken2LockList'
hash=$(${Chain33Cli} evm call -f 1 -c "${chain33DeployAddr}" -e "${chain33BridgeBank}" -p "addToken2LockList(${chain33ZBCErc20Addr}, ZBC)" --chainID "${chain33ID}") hash=$(${Chain33Cli} send evm call -f 1 -k "${chain33DeployAddr}" -e "${chain33BridgeBank}" -p "addToken2LockList(${chain33ZBCErc20Addr}, ZBC)" --chainID "${chain33ID}")
check_tx "${Chain33Cli}" "${hash}" check_tx "${Chain33Cli}" "${hash}"
} }
...@@ -552,7 +552,7 @@ function setupChain33Multisign() { ...@@ -552,7 +552,7 @@ function setupChain33Multisign() {
result=$(${CLIA} chain33 multisign setup -k "${chain33DeployKey}" -o "${chain33MultisignA},${chain33MultisignB},${chain33MultisignC},${chain33MultisignD}") result=$(${CLIA} chain33 multisign setup -k "${chain33DeployKey}" -o "${chain33MultisignA},${chain33MultisignB},${chain33MultisignC},${chain33MultisignD}")
cli_ret "${result}" "chain33 multisign setup" cli_ret "${result}" "chain33 multisign setup"
hash=$(${Chain33Cli} evm call -f 1 -c "${chain33DeployAddr}" -e "${chain33BridgeBank}" -p "configOfflineSaveAccount(${multisignChain33Addr})" --chainID "${chain33ID}") hash=$(${Chain33Cli} send evm call -f 1 -k "${chain33DeployAddr}" -e "${chain33BridgeBank}" -p "configOfflineSaveAccount(${multisignChain33Addr})" --chainID "${chain33ID}")
check_tx "${Chain33Cli}" "${hash}" check_tx "${Chain33Cli}" "${hash}"
echo -e "${GRE}=========== $FUNCNAME end ===========${NOC}" echo -e "${GRE}=========== $FUNCNAME end ===========${NOC}"
...@@ -597,7 +597,7 @@ function deployMultisign() { ...@@ -597,7 +597,7 @@ function deployMultisign() {
function lock_bty_multisign () { function lock_bty_multisign () {
local lockAmount=$1 local lockAmount=$1
local lockAmount2="${1}00000000" local lockAmount2="${1}00000000"
hash=$(${Chain33Cli} evm call -f 1 -a "${lockAmount}" -c "${chain33DeployAddr}" -e "${chain33BridgeBank}" -p "lock(${ethDeployAddr}, ${chain33BtyTokenAddr}, ${lockAmount2})" --chainID "${chain33ID}") hash=$(${Chain33Cli} send evm call -f 1 -a "${lockAmount}" -k "${chain33DeployAddr}" -e "${chain33BridgeBank}" -p "lock(${ethDeployAddr}, ${chain33BtyTokenAddr}, ${lockAmount2})" --chainID "${chain33ID}")
check_tx "${Chain33Cli}" "${hash}" check_tx "${Chain33Cli}" "${hash}"
if [[ $# -eq 3 ]]; then if [[ $# -eq 3 ]]; then
...@@ -614,7 +614,7 @@ function lock_bty_multisign () { ...@@ -614,7 +614,7 @@ function lock_bty_multisign () {
# lock chain33 ycc erc20 判断是否转入多签地址金额是否正确 # lock chain33 ycc erc20 判断是否转入多签地址金额是否正确
function lock_chain33_ycc_multisign () { function lock_chain33_ycc_multisign () {
local lockAmount="${1}00000000" local lockAmount="${1}00000000"
hash=$(${Chain33Cli} evm call -f 1 -c "${chain33DeployAddr}" -e "${chain33BridgeBank}" -p "lock(${ethDeployAddr}, ${chain33YccErc20Addr}, ${lockAmount})" --chainID "${chain33ID}") hash=$(${Chain33Cli} send evm call -f 1 -k "${chain33DeployAddr}" -e "${chain33BridgeBank}" -p "lock(${ethDeployAddr}, ${chain33YccErc20Addr}, ${lockAmount})" --chainID "${chain33ID}")
check_tx "${Chain33Cli}" "${hash}" check_tx "${Chain33Cli}" "${hash}"
if [[ $# -eq 3 ]]; then if [[ $# -eq 3 ]]; then
...@@ -624,9 +624,9 @@ function lock_chain33_ycc_multisign () { ...@@ -624,9 +624,9 @@ function lock_chain33_ycc_multisign () {
multisignBalance="0" multisignBalance="0"
fi fi
result=$(${Chain33Cli} evm abi call -a "${chain33YccErc20Addr}" -c "${chain33BridgeBank}" -b "balanceOf(${chain33BridgeBank})") result=$(${Chain33Cli} evm query -a "${chain33YccErc20Addr}" -c "${chain33BridgeBank}" -b "balanceOf(${chain33BridgeBank})")
is_equal "${result}" "${bridgeBankBalance}" is_equal "${result}" "${bridgeBankBalance}"
result=$(${Chain33Cli} evm abi call -a "${chain33YccErc20Addr}" -c "${multisignChain33Addr}" -b "balanceOf(${multisignChain33Addr})") result=$(${Chain33Cli} evm query -a "${chain33YccErc20Addr}" -c "${multisignChain33Addr}" -b "balanceOf(${multisignChain33Addr})")
is_equal "${result}" "${multisignBalance}" is_equal "${result}" "${multisignBalance}"
fi fi
} }
......
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