Commit 6939749a authored by QM's avatar QM

fix ci

parent 9595a5a3
...@@ -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
......
...@@ -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
} }
......
...@@ -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
......
...@@ -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
......
...@@ -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.Token = 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.ErrAddress4Eth) assert.Equal(c.T(), err, ebrelayerTypes.ErrEmptyAddress)
} }
func (c *suiteContracts) Test_LogBurnToEthBridgeClaim() { func (c *suiteContracts) Test_LogBurnToEthBridgeClaim() {
......
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