Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
plugin
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
link33
plugin
Commits
b0456407
Commit
b0456407
authored
Dec 16, 2021
by
vipwzw
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
auto ci
parent
f7a27fa1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
18 deletions
+20
-18
dockerRelayerTestEvm.sh
plugin/dapp/bridgevmxgo/cmd/build/dockerRelayerTestEvm.sh
+5
-5
mainPubilcRelayerTest.sh
.../dapp/cross2eth/cmd/build/public/mainPubilcRelayerTest.sh
+11
-11
config.pb.go
plugin/dapp/cross2eth/ebrelayer/types/config.pb.go
+2
-1
relayer.pb.go
plugin/dapp/cross2eth/ebrelayer/types/relayer.pb.go
+2
-1
No files found.
plugin/dapp/bridgevmxgo/cmd/build/dockerRelayerTestEvm.sh
View file @
b0456407
...
@@ -141,18 +141,18 @@ function DeployEvmxgo() {
...
@@ -141,18 +141,18 @@ function DeployEvmxgo() {
function
TestETH2EVMToChain33
()
{
function
TestETH2EVMToChain33
()
{
# 查询 ETH 这端 bridgeBank 地址原来是 0
# 查询 ETH 这端 bridgeBank 地址原来是 0
result
=
$(${
CLIA
}
ethereum balance
-o
"
${
ethBridgeBank
}
"
)
result
=
$(${
CLIA
}
ethereum balance
-o
"
${
ethBridgeBank
}
"
)
cli_ret
"
${
result
}
"
"balance"
".balance"
"0"
cli_ret
"
${
result
}
"
"balance"
".balance"
"0"
# ETH 这端 lock 11个
# ETH 这端 lock 11个
result
=
$(${
CLIA
}
ethereum lock
-m
11
-k
"
${
ethTestAddrKey1
}
"
-r
"
${
chain33ReceiverAddr
}
"
)
result
=
$(${
CLIA
}
ethereum lock
-m
11
-k
"
${
ethTestAddrKey1
}
"
-r
"
${
chain33ReceiverAddr
}
"
)
cli_ret
"
${
result
}
"
"lock"
cli_ret
"
${
result
}
"
"lock"
# eth 等待 2 个区块
# eth 等待 2 个区块
sleep
4
sleep
4
# 查询 ETH 这端 bridgeBank 地址 11
# 查询 ETH 这端 bridgeBank 地址 11
result
=
$(${
CLIA
}
ethereum balance
-o
"
${
ethBridgeBank
}
"
)
result
=
$(${
CLIA
}
ethereum balance
-o
"
${
ethBridgeBank
}
"
)
cli_ret
"
${
result
}
"
"balance"
".balance"
"11"
cli_ret
"
${
result
}
"
"balance"
".balance"
"11"
sleep
${
maturityDegree
}
sleep
${
maturityDegree
}
...
@@ -177,7 +177,7 @@ function TestETH2EVMToChain33() {
...
@@ -177,7 +177,7 @@ function TestETH2EVMToChain33() {
function
Testethereum2EVMToChain33_usdt
()
{
function
Testethereum2EVMToChain33_usdt
()
{
# 查询 ETH 这端 bridgeBank 地址原来是
# 查询 ETH 这端 bridgeBank 地址原来是
result
=
$(${
CLIA
}
ethereum balance
-o
"
${
ethBridgeBank
}
"
-t
"
${
ethereumUSDTERC20TokenAddr
}
"
)
result
=
$(${
CLIA
}
ethereum balance
-o
"
${
ethBridgeBank
}
"
-t
"
${
ethereumUSDTERC20TokenAddr
}
"
)
cli_ret
"
${
result
}
"
"balance"
".balance"
"0"
cli_ret
"
${
result
}
"
"balance"
".balance"
"0"
# ETH 这端 lock 12个
# ETH 这端 lock 12个
result
=
$(${
CLIA
}
ethereum lock
-m
12
-k
"
${
ethTestAddrKey1
}
"
-r
"
${
chain33ReceiverAddr
}
"
-t
"
${
ethereumUSDTERC20TokenAddr
}
"
)
result
=
$(${
CLIA
}
ethereum lock
-m
12
-k
"
${
ethTestAddrKey1
}
"
-r
"
${
chain33ReceiverAddr
}
"
-t
"
${
ethereumUSDTERC20TokenAddr
}
"
)
...
@@ -188,7 +188,7 @@ function Testethereum2EVMToChain33_usdt() {
...
@@ -188,7 +188,7 @@ function Testethereum2EVMToChain33_usdt() {
# 查询 ETH 这端 bridgeBank 地址 12
# 查询 ETH 这端 bridgeBank 地址 12
result
=
$(${
CLIA
}
ethereum balance
-o
"
${
ethBridgeBank
}
"
-t
"
${
ethereumUSDTERC20TokenAddr
}
"
)
result
=
$(${
CLIA
}
ethereum balance
-o
"
${
ethBridgeBank
}
"
-t
"
${
ethereumUSDTERC20TokenAddr
}
"
)
cli_ret
"
${
result
}
"
"balance"
".balance"
"12"
cli_ret
"
${
result
}
"
"balance"
".balance"
"12"
sleep
${
maturityDegree
}
sleep
${
maturityDegree
}
...
...
plugin/dapp/cross2eth/cmd/build/public/mainPubilcRelayerTest.sh
View file @
b0456407
...
@@ -780,8 +780,8 @@ function StartDockerRelayerDeploy() {
...
@@ -780,8 +780,8 @@ function StartDockerRelayerDeploy() {
InitAndOfflineDeploy
InitAndOfflineDeploy
# 设置 ethereum symbol
# 设置 ethereum symbol
# ${Boss4xCLI} ethereum offline set_symbol -s "ETH" -c "${ethBridgeBank}" -d "${ethDeployAddr}"
# ${Boss4xCLI} ethereum offline set_symbol -s "ETH" -c "${ethBridgeBank}" -d "${ethDeployAddr}"
# ethereum_offline_sign_send "set_symbol.txt"
# ethereum_offline_sign_send "set_symbol.txt"
# 设置离线多签数据
# 设置离线多签数据
Chain33Cli
=
${
MainCli
}
Chain33Cli
=
${
MainCli
}
...
@@ -811,12 +811,12 @@ function StartDockerRelayerDeploy() {
...
@@ -811,12 +811,12 @@ function StartDockerRelayerDeploy() {
# InitTokenAddr
# InitTokenAddr
offline_create_bridge_token_eth_BTY
offline_create_bridge_token_eth_BTY
offline_create_bridge_token_chain33_ETH
"ETH"
offline_create_bridge_token_chain33_ETH
"ETH"
# offline_deploy_erc20_eth_BYC
# offline_deploy_erc20_eth_BYC
# offline_create_bridge_token_chain33_BYC
# offline_create_bridge_token_chain33_BYC
# offline_deploy_erc20_chain33_YCC
# offline_deploy_erc20_chain33_YCC
# offline_create_bridge_token_eth_YCC
# offline_create_bridge_token_eth_YCC
# offline_deploy_erc20_chain33_ZBC
# offline_deploy_erc20_chain33_ZBC
# offline_create_bridge_token_eth_ZBC
# offline_create_bridge_token_eth_ZBC
# offline_deploy_erc20_eth_USDT
# offline_deploy_erc20_eth_USDT
offline_deploy_erc20_create_tether_usdt_USDT
offline_deploy_erc20_create_tether_usdt_USDT
offline_create_bridge_token_chain33_USDT
offline_create_bridge_token_chain33_USDT
...
@@ -824,10 +824,10 @@ function StartDockerRelayerDeploy() {
...
@@ -824,10 +824,10 @@ function StartDockerRelayerDeploy() {
# shellcheck disable=SC2086
# shellcheck disable=SC2086
{
{
docker
cp
"
${
chain33EthBridgeTokenAddr
}
.abi"
"
${
dockerNamePrefix
}
_ebrelayera_1"
:/root/
${
chain33EthBridgeTokenAddr
}
.abi
docker
cp
"
${
chain33EthBridgeTokenAddr
}
.abi"
"
${
dockerNamePrefix
}
_ebrelayera_1"
:/root/
${
chain33EthBridgeTokenAddr
}
.abi
# docker cp "${chain33BycBridgeTokenAddr}.abi" "${dockerNamePrefix}_ebrelayera_1":/root/${chain33BycBridgeTokenAddr}.abi
# docker cp "${chain33BycBridgeTokenAddr}.abi" "${dockerNamePrefix}_ebrelayera_1":/root/${chain33BycBridgeTokenAddr}.abi
docker
cp
"
${
chain33USDTBridgeTokenAddr
}
.abi"
"
${
dockerNamePrefix
}
_ebrelayera_1"
:/root/
${
chain33USDTBridgeTokenAddr
}
.abi
docker
cp
"
${
chain33USDTBridgeTokenAddr
}
.abi"
"
${
dockerNamePrefix
}
_ebrelayera_1"
:/root/
${
chain33USDTBridgeTokenAddr
}
.abi
# docker cp "${chain33YccERC20TokenAddr}.abi" "${dockerNamePrefix}_ebrelayera_1":/root/${chain33YccERC20TokenAddr}.abi
# docker cp "${chain33YccERC20TokenAddr}.abi" "${dockerNamePrefix}_ebrelayera_1":/root/${chain33YccERC20TokenAddr}.abi
# docker cp "${ethereumYccBridgeTokenAddr}.abi" "${dockerNamePrefix}_ebrelayera_1":/root/${ethereumYccBridgeTokenAddr}.abi
# docker cp "${ethereumYccBridgeTokenAddr}.abi" "${dockerNamePrefix}_ebrelayera_1":/root/${ethereumYccBridgeTokenAddr}.abi
}
}
# 重启,因为relayerA的验证人地址和部署人的地址是一样的,所以需要重新启动relayer,更新nonce
# 重启,因为relayerA的验证人地址和部署人的地址是一样的,所以需要重新启动relayer,更新nonce
...
...
plugin/dapp/cross2eth/ebrelayer/types/config.pb.go
View file @
b0456407
...
@@ -5,8 +5,9 @@ package types
...
@@ -5,8 +5,9 @@ package types
import
(
import
(
fmt
"fmt"
fmt
"fmt"
proto
"github.com/golang/protobuf/proto"
math
"math"
math
"math"
proto
"github.com/golang/protobuf/proto"
)
)
// Reference imports to suppress errors if they are not otherwise used.
// Reference imports to suppress errors if they are not otherwise used.
...
...
plugin/dapp/cross2eth/ebrelayer/types/relayer.pb.go
View file @
b0456407
...
@@ -5,8 +5,9 @@ package types
...
@@ -5,8 +5,9 @@ package types
import
(
import
(
fmt
"fmt"
fmt
"fmt"
proto
"github.com/golang/protobuf/proto"
math
"math"
math
"math"
proto
"github.com/golang/protobuf/proto"
)
)
// Reference imports to suppress errors if they are not otherwise used.
// Reference imports to suppress errors if they are not otherwise used.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment