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
6939749a
Commit
6939749a
authored
Dec 09, 2021
by
QM
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix ci
parent
9595a5a3
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
5 deletions
+13
-5
dockerRelayerTestEvm.sh
plugin/dapp/bridgevmxgo/cmd/build/dockerRelayerTestEvm.sh
+4
-0
createERC20.go
plugin/dapp/cross2eth/boss4x/chain33/offline/createERC20.go
+2
-2
Erc20AndBridgeToken.go
.../cross2eth/boss4x/ethereum/offline/Erc20AndBridgeToken.go
+1
-1
dockerRelayerTest.sh
plugin/dapp/cross2eth/cmd/build/dockerRelayerTest.sh
+4
-0
contracts_test.go
...s2eth/ebrelayer/relayer/ethereum/ethtxs/contracts_test.go
+2
-2
No files found.
plugin/dapp/bridgevmxgo/cmd/build/dockerRelayerTestEvm.sh
View file @
6939749a
...
@@ -782,6 +782,10 @@ function StartDockerRelayerDeploy() {
...
@@ -782,6 +782,10 @@ function StartDockerRelayerDeploy() {
# 部署合约 设置 bridgeRegistry 地址
# 部署合约 设置 bridgeRegistry 地址
InitAndOfflineDeploy
InitAndOfflineDeploy
# 设置 ethereum symbol
${
Boss4xCLI
}
ethereum offline set_symbol
-s
"ETH"
-c
"
${
ethBridgeBank
}
"
-d
"
${
ethDeployAddr
}
"
ethereum_offline_sign_send
"set_symbol.txt"
# 设置离线多签数据
# 设置离线多签数据
Chain33Cli
=
${
MainCli
}
Chain33Cli
=
${
MainCli
}
initMultisignChain33Addr
initMultisignChain33Addr
...
...
plugin/dapp/cross2eth/boss4x/chain33/offline/createERC20.go
View file @
6939749a
...
@@ -73,10 +73,10 @@ func CreateERC20(cmd *cobra.Command, _ []string) {
...
@@ -73,10 +73,10 @@ func CreateERC20(cmd *cobra.Command, _ []string) {
Addr
:
fromAddr
,
Addr
:
fromAddr
,
}
}
createPara
:=
fmt
.
Sprintf
(
"%s,%s,%s,%s"
,
symbol
,
symbol
,
fmt
.
Sprintf
(
"%d"
,
amountInt64
),
owner
)
createPara
:=
fmt
.
Sprintf
(
"%s,%s,%s,%s
,8
"
,
symbol
,
symbol
,
fmt
.
Sprintf
(
"%d"
,
amountInt64
),
owner
)
content
,
txHash
,
err
:=
utils
.
CreateContractAndSign
(
getTxInfo
(
cmd
),
erc20
.
ERC20Bin
,
erc20
.
ERC20ABI
,
createPara
,
"ERC20:"
+
symbol
)
content
,
txHash
,
err
:=
utils
.
CreateContractAndSign
(
getTxInfo
(
cmd
),
erc20
.
ERC20Bin
,
erc20
.
ERC20ABI
,
createPara
,
"ERC20:"
+
symbol
)
if
nil
!=
err
{
if
nil
!=
err
{
fmt
.
Println
(
"CreateContractAndSign erc20 fail"
)
fmt
.
Println
(
"CreateContractAndSign erc20 fail"
,
err
.
Error
()
)
return
return
}
}
...
...
plugin/dapp/cross2eth/boss4x/ethereum/offline/Erc20AndBridgeToken.go
View file @
6939749a
...
@@ -81,7 +81,7 @@ func DeployERC20(cmd *cobra.Command, _ []string) {
...
@@ -81,7 +81,7 @@ func DeployERC20(cmd *cobra.Command, _ []string) {
}
}
bin
:=
common
.
FromHex
(
erc20
.
ERC20Bin
)
bin
:=
common
.
FromHex
(
erc20
.
ERC20Bin
)
Erc20OwnerAddr
:=
common
.
HexToAddress
(
owner
)
Erc20OwnerAddr
:=
common
.
HexToAddress
(
owner
)
packdata
,
err
:=
parsed
.
Pack
(
""
,
symbol
,
symbol
,
bnAmount
,
Erc20OwnerAddr
)
packdata
,
err
:=
parsed
.
Pack
(
""
,
symbol
,
symbol
,
bnAmount
,
Erc20OwnerAddr
,
uint8
(
8
)
)
if
err
!=
nil
{
if
err
!=
nil
{
fmt
.
Println
(
"Pack error"
,
err
.
Error
())
fmt
.
Println
(
"Pack error"
,
err
.
Error
())
return
return
...
...
plugin/dapp/cross2eth/cmd/build/dockerRelayerTest.sh
View file @
6939749a
...
@@ -665,6 +665,10 @@ function StartDockerRelayerDeploy() {
...
@@ -665,6 +665,10 @@ function StartDockerRelayerDeploy() {
# 部署合约 设置 bridgeRegistry 地址
# 部署合约 设置 bridgeRegistry 地址
InitAndOfflineDeploy
InitAndOfflineDeploy
# 设置 ethereum symbol
${
Boss4xCLI
}
ethereum offline set_symbol
-s
"ETH"
-c
"
${
ethBridgeBank
}
"
-d
"
${
ethDeployAddr
}
"
ethereum_offline_sign_send
"set_symbol.txt"
# 设置离线多签数据
# 设置离线多签数据
Chain33Cli
=
${
MainCli
}
Chain33Cli
=
${
MainCli
}
initMultisignChain33Addr
initMultisignChain33Addr
...
...
plugin/dapp/cross2eth/ebrelayer/relayer/ethereum/ethtxs/contracts_test.go
View file @
6939749a
...
@@ -99,10 +99,10 @@ func (c *suiteContracts) Test_LogLockToEthBridgeClaim() {
...
@@ -99,10 +99,10 @@ func (c *suiteContracts) Test_LogLockToEthBridgeClaim() {
assert
.
Equal
(
c
.
T
(),
witnessClaim
.
Nonce
,
event
.
Nonce
.
Int64
())
assert
.
Equal
(
c
.
T
(),
witnessClaim
.
Nonce
,
event
.
Nonce
.
Int64
())
assert
.
Equal
(
c
.
T
(),
witnessClaim
.
Decimal
,
int64
(
18
))
assert
.
Equal
(
c
.
T
(),
witnessClaim
.
Decimal
,
int64
(
18
))
event
.
To
ken
=
common
.
HexToAddress
(
"0x0000000000000000000000000000000000000001"
)
event
.
To
=
nil
_
,
err
=
LogLockToEthBridgeClaim
(
event
,
1
,
c
.
x2EthDeployInfo
.
BridgeBank
.
Address
.
String
(),
""
,
18
)
_
,
err
=
LogLockToEthBridgeClaim
(
event
,
1
,
c
.
x2EthDeployInfo
.
BridgeBank
.
Address
.
String
(),
""
,
18
)
require
.
NotNil
(
c
.
T
(),
err
)
require
.
NotNil
(
c
.
T
(),
err
)
assert
.
Equal
(
c
.
T
(),
err
,
ebrelayerTypes
.
Err
Address4Eth
)
assert
.
Equal
(
c
.
T
(),
err
,
ebrelayerTypes
.
Err
EmptyAddress
)
}
}
func
(
c
*
suiteContracts
)
Test_LogBurnToEthBridgeClaim
()
{
func
(
c
*
suiteContracts
)
Test_LogBurnToEthBridgeClaim
()
{
...
...
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