Commit 9b764957 authored by QM's avatar QM

update

parent 71dc43a1
...@@ -36,8 +36,10 @@ multisignEthAddr="" ...@@ -36,8 +36,10 @@ multisignEthAddr=""
chain33ID=0 chain33ID=0
EvmxgoBoss4xCLI="./evmxgoboss4x" EvmxgoBoss4xCLI="./evmxgoboss4x"
BscProvider="wss://data-seed-prebsc-1-s1.binance.org:8545" #BscProvider="wss://data-seed-prebsc-1-s1.binance.org:8545"
BscProviderUrl="https://data-seed-prebsc-1-s1.binance.org:8545" #BscProviderUrl="https://data-seed-prebsc-1-s1.binance.org:8545"
BscProvider="wss://ws-testnet.hecochain.com"
BscProviderUrl="https://http-testnet.hecochain.com"
# shellcheck disable=SC2034 # shellcheck disable=SC2034
{ {
...@@ -741,7 +743,7 @@ function StartDockerRelayerDeploy() { ...@@ -741,7 +743,7 @@ function StartDockerRelayerDeploy() {
updata_relayer_a_toml "${dockerAddr}" "${dockerNamePrefix}_ebrelayera_1" "./relayer.toml" updata_relayer_a_toml "${dockerAddr}" "${dockerNamePrefix}_ebrelayera_1" "./relayer.toml"
# shellcheck disable=SC2155 # shellcheck disable=SC2155
local line=$(delete_line_show "./relayer.toml" 'EthProvider="ws:') local line=$(delete_line_show "./relayer.toml" 'EthProvider="ws:')
sed -i ''"${line}"' a EthProvider="'"${BscProviderUrl}"'"' "./relayer.toml" sed -i ''"${line}"' a EthProvider="'"${BscProvider}"'"' "./relayer.toml"
line=$(delete_line_show "./relayer.toml" 'EthProviderCli="http:') line=$(delete_line_show "./relayer.toml" 'EthProviderCli="http:')
sed -i ''"${line}"' a EthProviderCli="'"${BscProviderUrl}"'"' "./relayer.toml" sed -i ''"${line}"' a EthProviderCli="'"${BscProviderUrl}"'"' "./relayer.toml"
...@@ -895,7 +897,7 @@ function DeployEvmxgo() { ...@@ -895,7 +897,7 @@ function DeployEvmxgo() {
XgoChain33BridgeBank=$(${Chain33Cli} evm query -c "${chain33DeployAddr}" -b "bridgeBank()" -a "${XgoBridgeRegistryOnChain33}") XgoChain33BridgeBank=$(${Chain33Cli} evm query -c "${chain33DeployAddr}" -b "bridgeBank()" -a "${XgoBridgeRegistryOnChain33}")
cp XgoChain33BridgeBank.abi "${XgoChain33BridgeBank}.abi" cp XgoChain33BridgeBank.abi "${XgoChain33BridgeBank}.abi"
${EvmxgoBoss4xCLI} chain33 offline create_add_lock_list -s BNB -t "${chain33EthBridgeTokenAddr}" -c "${XgoChain33BridgeBank}" -k "${chain33DeployKey}" -f 1 --chainID "${chain33ID}" ${EvmxgoBoss4xCLI} chain33 offline create_add_lock_list -s HT -t "${chain33EthBridgeTokenAddr}" -c "${XgoChain33BridgeBank}" -k "${chain33DeployKey}" -f 1 --chainID "${chain33ID}"
chain33_offline_send_evm "create_add_lock_list.txt" chain33_offline_send_evm "create_add_lock_list.txt"
${EvmxgoBoss4xCLI} chain33 offline create_add_lock_list -s BYC -t "${chain33BycBridgeTokenAddr}" -c "${XgoChain33BridgeBank}" -k "${chain33DeployKey}" -f 1 --chainID "${chain33ID}" ${EvmxgoBoss4xCLI} chain33 offline create_add_lock_list -s BYC -t "${chain33BycBridgeTokenAddr}" -c "${XgoChain33BridgeBank}" -k "${chain33DeployKey}" -f 1 --chainID "${chain33ID}"
...@@ -959,7 +961,7 @@ function TestETH2EVMToChain33() { ...@@ -959,7 +961,7 @@ function TestETH2EVMToChain33() {
# 结果是 11 * le8 # 结果是 11 * le8
# is_equal "${result}" "4700000000" # is_equal "${result}" "4700000000"
updateConfig "BNB" "${chain33EthBridgeTokenAddr}" updateConfig "HT" "${chain33EthBridgeTokenAddr}"
configbridgevmxgoAddr "${XgoChain33BridgeBank}" configbridgevmxgoAddr "${XgoChain33BridgeBank}"
${EvmxgoBoss4xCLI} chain33 offline approve_erc20 -a 330000000000 -s "${XgoChain33BridgeBank}" -c "${chain33EthBridgeTokenAddr}" -k "${chain33ReceiverAddrKey}" -f 1 --chainID "${chain33ID}" ${EvmxgoBoss4xCLI} chain33 offline approve_erc20 -a 330000000000 -s "${XgoChain33BridgeBank}" -c "${chain33EthBridgeTokenAddr}" -k "${chain33ReceiverAddrKey}" -f 1 --chainID "${chain33ID}"
......
...@@ -217,17 +217,17 @@ function offline_create_bridge_token_eth_BTY() { ...@@ -217,17 +217,17 @@ function offline_create_bridge_token_eth_BTY() {
function offline_create_bridge_token_chain33_ETH() { function offline_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}"
${Boss4xCLI} chain33 offline create_bridge_token -c "${chain33BridgeBank}" -s BNB -k "${chain33DeployKey}" --chainID "${chain33ID}" -n "create_bridge_token:BNB" ${Boss4xCLI} chain33 offline create_bridge_token -c "${chain33BridgeBank}" -s HT -k "${chain33DeployKey}" --chainID "${chain33ID}" -n "create_bridge_token:HT"
chain33_offline_send "create_bridge_token.txt" chain33_offline_send "create_bridge_token.txt"
chain33EthBridgeTokenAddr=$(${Chain33Cli} evm query -a "${chain33BridgeBank}" -c "${chain33DeployAddr}" -b "getToken2address(BNB)") chain33EthBridgeTokenAddr=$(${Chain33Cli} evm query -a "${chain33BridgeBank}" -c "${chain33DeployAddr}" -b "getToken2address(HT)")
echo "BNB Token Addr= ${chain33EthBridgeTokenAddr}" echo "HT Token Addr= ${chain33EthBridgeTokenAddr}"
cp BridgeToken.abi "${chain33EthBridgeTokenAddr}.abi" cp BridgeToken.abi "${chain33EthBridgeTokenAddr}.abi"
result=$(${Chain33Cli} evm query -a "${chain33EthBridgeTokenAddr}" -c "${chain33EthBridgeTokenAddr}" -b "symbol()") result=$(${Chain33Cli} evm query -a "${chain33EthBridgeTokenAddr}" -c "${chain33EthBridgeTokenAddr}" -b "symbol()")
is_equal "${result}" "BNB" is_equal "${result}" "HT"
${CLIA} chain33 token set -t "${chain33EthBridgeTokenAddr}" -s BNB ${CLIA} chain33 token set -t "${chain33EthBridgeTokenAddr}" -s HT
} }
function offline_create_bridge_token_eth_YCC() { function offline_create_bridge_token_eth_YCC() {
......
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