Skip to content

P
plugin
Commit a0dd0a98 authored by QM's avatar QM Committed by 33cn
Browse files
Options

rename

parent f7699199
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 29 deletions
plugin/dapp/bridgevmxgo/cmd/build/public/offlinePublic.sh
View file @ a0dd0a98
...@@ -114,19 +114,19 @@ function offline_deploy_erc20_eth_BYC() { ...@@ -114,19 +114,19 @@ function offline_deploy_erc20_eth_BYC() {
ethereum_offline_sign_send "create_add_lock_list.txt" ethereum_offline_sign_send "create_add_lock_list.txt"
} }
function offline_deploy_erc20_eth_USTD() { function offline_deploy_erc20_eth_USDT() {
# eth 上 铸币 USTD # eth 上 铸币 USDT
echo -e "${GRE}======= 在 ethereum 上创建 ERC20 USTD ======${NOC}" echo -e "${GRE}======= 在 ethereum 上创建 ERC20 USDT ======${NOC}"
# shellcheck disable=SC2154 # shellcheck disable=SC2154
${Boss4xCLI} ethereum offline create_erc20 -m 33000000000000000000 -s USTD -o "${ethTestAddr1}" -d "${ethDeployAddr}" ${Boss4xCLI} ethereum offline create_erc20 -m 33000000000000000000 -s USDT -o "${ethTestAddr1}" -d "${ethDeployAddr}"
${Boss4xCLI} ethereum offline sign -f "deployErc20USTD.txt" -k "${ethDeployKey}" ${Boss4xCLI} ethereum offline sign -f "deployErc20USDT.txt" -k "${ethDeployKey}"
sleep 10 sleep 10
result=$(${Boss4xCLI} ethereum offline send -f "deploysigntxs.txt") result=$(${Boss4xCLI} ethereum offline send -f "deploysigntxs.txt")
hash=$(echo "${result}" | jq -r ".[0].TxHash") hash=$(echo "${result}" | jq -r ".[0].TxHash")
check_eth_tx "${hash}" check_eth_tx "${hash}"
ethereumUSTDERC20TokenAddr=$(echo "${result}" | jq -r ".[0].ContractAddr") ethereumUSDTERC20TokenAddr=$(echo "${result}" | jq -r ".[0].ContractAddr")
${Boss4xCLI} ethereum offline create_add_lock_list -s USTD -t "${ethereumUSTDERC20TokenAddr}" -c "${ethBridgeBank}" -d "${ethDeployAddr}" ${Boss4xCLI} ethereum offline create_add_lock_list -s USDT -t "${ethereumUSDTERC20TokenAddr}" -c "${ethBridgeBank}" -d "${ethDeployAddr}"
ethereum_offline_sign_send "create_add_lock_list.txt" ethereum_offline_sign_send "create_add_lock_list.txt"
} }
...@@ -147,21 +147,21 @@ function offline_create_bridge_token_chain33_BYC() { ...@@ -147,21 +147,21 @@ function offline_create_bridge_token_chain33_BYC() {
${CLIA} chain33 token set -t "${chain33BycBridgeTokenAddr}" -s BYC ${CLIA} chain33 token set -t "${chain33BycBridgeTokenAddr}" -s BYC
} }
function offline_create_bridge_token_chain33_USTD() { function offline_create_bridge_token_chain33_USDT() {
# 在chain33上创建bridgeToken USTD # 在chain33上创建bridgeToken USDT
echo -e "${GRE}======= 在 chain33 上创建 bridgeToken USTD ======${NOC}" echo -e "${GRE}======= 在 chain33 上创建 bridgeToken USDT ======${NOC}"
# shellcheck disable=SC2154 # shellcheck disable=SC2154
${Boss4xCLI} chain33 offline create_bridge_token -c "${chain33BridgeBank}" -s USTD -k "${chain33DeployKey}" --chainID "${chain33ID}" ${Boss4xCLI} chain33 offline create_bridge_token -c "${chain33BridgeBank}" -s USDT -k "${chain33DeployKey}" --chainID "${chain33ID}"
chain33_offline_send "create_bridge_token.txt" chain33_offline_send "create_bridge_token.txt"
chain33USTDBridgeTokenAddr=$(${Chain33Cli} evm query -a "${chain33BridgeBank}" -c "${chain33DeployAddr}" -b "getToken2address(USTD)") chain33USDTBridgeTokenAddr=$(${Chain33Cli} evm query -a "${chain33BridgeBank}" -c "${chain33DeployAddr}" -b "getToken2address(USDT)")
echo "USTD Bridge Token Addr = ${chain33USTDBridgeTokenAddr}" echo "USDT Bridge Token Addr = ${chain33USDTBridgeTokenAddr}"
cp BridgeToken.abi "${chain33USTDBridgeTokenAddr}.abi" cp BridgeToken.abi "${chain33USDTBridgeTokenAddr}.abi"
result=$(${Chain33Cli} evm query -a "${chain33USTDBridgeTokenAddr}" -c "${chain33USTDBridgeTokenAddr}" -b "symbol()") result=$(${Chain33Cli} evm query -a "${chain33USDTBridgeTokenAddr}" -c "${chain33USDTBridgeTokenAddr}" -b "symbol()")
is_equal "${result}" "USTD" is_equal "${result}" "USDT"
${CLIA} chain33 token set -t "${chain33USTDBridgeTokenAddr}" -s USTD ${CLIA} chain33 token set -t "${chain33USDTBridgeTokenAddr}" -s USDT
} }
function offline_deploy_erc20_chain33_YCC() { function offline_deploy_erc20_chain33_YCC() {
...@@ -340,31 +340,31 @@ function offline_transfer_multisign_EthByc() { ...@@ -340,31 +340,31 @@ function offline_transfer_multisign_EthByc() {
echo -e "${GRE}=========== $FUNCNAME end ===========${NOC}" echo -e "${GRE}=========== $FUNCNAME end ===========${NOC}"
} }
function offline_transfer_multisign_EthUSTD() { function offline_transfer_multisign_EthUSDT() {
echo -e "${GRE}=========== $FUNCNAME begin ===========${NOC}" echo -e "${GRE}=========== $FUNCNAME begin ===========${NOC}"
# transfer # transfer
${Boss4xCLI} ethereum offline multisign_transfer_prepare -a 8 -r "${ethBridgeBank}" -c "${multisignEthAddr}" -d "${ethTestAddr1}" -t "${ethereumUSTDERC20TokenAddr}" ${Boss4xCLI} ethereum offline multisign_transfer_prepare -a 8 -r "${ethBridgeBank}" -c "${multisignEthAddr}" -d "${ethTestAddr1}" -t "${ethereumUSDTERC20TokenAddr}"
${Boss4xCLI} ethereum offline sign_multisign_tx -k "${ethMultisignKeyA},${ethMultisignKeyB},${ethMultisignKeyC},${ethMultisignKeyD}" ${Boss4xCLI} ethereum offline sign_multisign_tx -k "${ethMultisignKeyA},${ethMultisignKeyB},${ethMultisignKeyC},${ethMultisignKeyD}"
${Boss4xCLI} ethereum offline create_multisign_tx ${Boss4xCLI} ethereum offline create_multisign_tx
ethereum_offline_sign_send create_multisign_tx.txt "${ethTestAddrKey1}" ethereum_offline_sign_send create_multisign_tx.txt "${ethTestAddrKey1}"
sleep 10 sleep 10
result=$(${CLIA} ethereum balance -o "${ethBridgeBank}" -t "${ethereumUSTDERC20TokenAddr}") result=$(${CLIA} ethereum balance -o "${ethBridgeBank}" -t "${ethereumUSDTERC20TokenAddr}")
cli_ret "${result}" "balance" ".balance" "80" cli_ret "${result}" "balance" ".balance" "80"
result=$(${CLIA} ethereum balance -o "${multisignEthAddr}" -t "${ethereumUSTDERC20TokenAddr}") result=$(${CLIA} ethereum balance -o "${multisignEthAddr}" -t "${ethereumUSDTERC20TokenAddr}")
cli_ret "${result}" "balance" ".balance" "80" cli_ret "${result}" "balance" ".balance" "80"
# transfer # transfer
# ${CLIA} ethereum multisign transfer -a 10 -r "${ethMultisignA}" -o "${ethValidatorAddrKeyB}" -t "${ethereumUSTDERC20TokenAddr}" -k "${ethMultisignKeyA},${ethMultisignKeyB},${ethMultisignKeyC},${ethMultisignKeyD}" # ${CLIA} ethereum multisign transfer -a 10 -r "${ethMultisignA}" -o "${ethValidatorAddrKeyB}" -t "${ethereumUSDTERC20TokenAddr}" -k "${ethMultisignKeyA},${ethMultisignKeyB},${ethMultisignKeyC},${ethMultisignKeyD}"
${Boss4xCLI} ethereum offline multisign_transfer_prepare -a 10 -r "${ethMultisignA}" -c "${multisignEthAddr}" -d "${ethTestAddr1}" -t "${ethereumUSTDERC20TokenAddr}" ${Boss4xCLI} ethereum offline multisign_transfer_prepare -a 10 -r "${ethMultisignA}" -c "${multisignEthAddr}" -d "${ethTestAddr1}" -t "${ethereumUSDTERC20TokenAddr}"
${Boss4xCLI} ethereum offline sign_multisign_tx -k "${ethMultisignKeyA},${ethMultisignKeyB},${ethMultisignKeyC},${ethMultisignKeyD}" ${Boss4xCLI} ethereum offline sign_multisign_tx -k "${ethMultisignKeyA},${ethMultisignKeyB},${ethMultisignKeyC},${ethMultisignKeyD}"
${Boss4xCLI} ethereum offline create_multisign_tx ${Boss4xCLI} ethereum offline create_multisign_tx
ethereum_offline_sign_send create_multisign_tx.txt "${ethTestAddrKey1}" ethereum_offline_sign_send create_multisign_tx.txt "${ethTestAddrKey1}"
sleep 10 sleep 10
result=$(${CLIA} ethereum balance -o "${ethMultisignA}" -t "${ethereumUSTDERC20TokenAddr}") result=$(${CLIA} ethereum balance -o "${ethMultisignA}" -t "${ethereumUSDTERC20TokenAddr}")
cli_ret "${result}" "balance" ".balance" "10" cli_ret "${result}" "balance" ".balance" "10"
result=$(${CLIA} ethereum balance -o "${multisignEthAddr}" -t "${ethereumUSTDERC20TokenAddr}") result=$(${CLIA} ethereum balance -o "${multisignEthAddr}" -t "${ethereumUSDTERC20TokenAddr}")
cli_ret "${result}" "balance" ".balance" "70" cli_ret "${result}" "balance" ".balance" "70"
echo -e "${GRE}=========== $FUNCNAME end ===========${NOC}" echo -e "${GRE}=========== $FUNCNAME end ===========${NOC}"
} }
......
plugin/dapp/bridgevmxgo/cmd/build/public/relayerPublic.sh
View file @ a0dd0a98
...@@ -656,10 +656,10 @@ function lock_ethereum_byc_multisign() { ...@@ -656,10 +656,10 @@ function lock_ethereum_byc_multisign() {
fi fi
} }
function lock_ethereum_ustd_multisign() { function lock_ethereum_usdt_multisign() {
local lockAmount=$1 local lockAmount=$1
# shellcheck disable=SC2154 # shellcheck disable=SC2154
result=$(${CLIA} ethereum lock -m "${lockAmount}" -k "${ethTestAddrKey1}" -r "${chain33ReceiverAddr}" -t "${ethereumUSTDERC20TokenAddr}") result=$(${CLIA} ethereum lock -m "${lockAmount}" -k "${ethTestAddrKey1}" -r "${chain33ReceiverAddr}" -t "${ethereumUSDTERC20TokenAddr}")
cli_ret "${result}" "lock" cli_ret "${result}" "lock"
if [[ $# -eq 3 ]]; then if [[ $# -eq 3 ]]; then
...@@ -669,9 +669,9 @@ function lock_ethereum_ustd_multisign() { ...@@ -669,9 +669,9 @@ function lock_ethereum_ustd_multisign() {
# eth 等待 2 个区块 # eth 等待 2 个区块
sleep 4 sleep 4
result=$(${CLIA} ethereum balance -o "${ethBridgeBank}" -t "${ethereumUSTDERC20TokenAddr}") result=$(${CLIA} ethereum balance -o "${ethBridgeBank}" -t "${ethereumUSDTERC20TokenAddr}")
cli_ret "${result}" "balance" ".balance" "${bridgeBankBalance}" cli_ret "${result}" "balance" ".balance" "${bridgeBankBalance}"
result=$(${CLIA} ethereum balance -o "${multisignEthAddr}" -t "${ethereumUSTDERC20TokenAddr}") result=$(${CLIA} ethereum balance -o "${multisignEthAddr}" -t "${ethereumUSDTERC20TokenAddr}")
cli_ret "${result}" "balance" ".balance" "${multisignBalance}" cli_ret "${result}" "balance" ".balance" "${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