diff --git a/e2e/chains/bsc/scripts/create_bls_key.sh b/e2e/chains/bsc/scripts/create_bls_key.sh index ff6a635..cde35e8 100644 --- a/e2e/chains/bsc/scripts/create_bls_key.sh +++ b/e2e/chains/bsc/scripts/create_bls_key.sh @@ -3,6 +3,7 @@ set wallet_password 1234567890 set timeout 5 +sleep 10 spawn geth bls account new --datadir [lindex $argv 0] expect "*assword:*" send "$wallet_password\r" diff --git a/e2e/config/demo/ibc-0.json b/e2e/config/demo/ibc-0.json index 8a929c8..f9985b5 100644 --- a/e2e/config/demo/ibc-0.json +++ b/e2e/config/demo/ibc-0.json @@ -5,7 +5,7 @@ "eth_chain_id": 9999, "rpc_addr": "http://localhost:8645", "signer": { - "@type": "/relayer.chains.ethereum.signers.hd.SignerConfig", + "@type": "/relayer.signers.hd.SignerConfig", "mnemonic": "math razor capable expose worth grape metal sunset metal sudden usage scheme", "path": "m/44'/60'/0'/0/0" }, diff --git a/e2e/config/demo/ibc-1.json b/e2e/config/demo/ibc-1.json index 3cbda27..cc65852 100644 --- a/e2e/config/demo/ibc-1.json +++ b/e2e/config/demo/ibc-1.json @@ -5,7 +5,7 @@ "eth_chain_id": 9999, "rpc_addr": "http://localhost:8545", "signer": { - "@type": "/relayer.chains.ethereum.signers.hd.SignerConfig", + "@type": "/relayer.signers.hd.SignerConfig", "mnemonic": "math razor capable expose worth grape metal sunset metal sudden usage scheme", "path": "m/44'/60'/0'/0/0" }, diff --git a/e2e/contracts/contracts/Dependencies.sol b/e2e/contracts/contracts/Dependencies.sol index 01c2262..e4ba2c5 100644 --- a/e2e/contracts/contracts/Dependencies.sol +++ b/e2e/contracts/contracts/Dependencies.sol @@ -17,4 +17,5 @@ import {IIBCHandler} from "@hyperledger-labs/yui-ibc-solidity/contracts/core/25- import {OwnableIBCHandler} from "@hyperledger-labs/yui-ibc-solidity/contracts/core/25-handler/OwnableIBCHandler.sol"; import {ERC20Token} from "@hyperledger-labs/yui-ibc-solidity/contracts/apps/20-transfer/ERC20Token.sol"; import {ICS20TransferBank} from "@hyperledger-labs/yui-ibc-solidity/contracts/apps/20-transfer/ICS20TransferBank.sol"; -import {ICS20Bank} from "@hyperledger-labs/yui-ibc-solidity/contracts/apps/20-transfer/ICS20Bank.sol"; \ No newline at end of file +import {ICS20Bank} from "@hyperledger-labs/yui-ibc-solidity/contracts/apps/20-transfer/ICS20Bank.sol"; + diff --git a/e2e/main.go b/e2e/main.go index 6c352ed..ba57d53 100644 --- a/e2e/main.go +++ b/e2e/main.go @@ -1,7 +1,7 @@ package main import ( - "github.com/datachainlab/ethereum-ibc-relay-chain/pkg/relay/ethereum/signers/hd" + "github.com/datachainlab/ibc-hd-signer/pkg/hd" "log" "github.com/datachainlab/ethereum-ibc-relay-chain/pkg/relay/ethereum" diff --git a/go.mod b/go.mod index bf722b3..1da22bc 100644 --- a/go.mod +++ b/go.mod @@ -7,13 +7,13 @@ require ( github.com/cosmos/cosmos-sdk v0.50.5 github.com/cosmos/gogoproto v1.4.11 github.com/cosmos/ibc-go/v8 v8.2.0 - github.com/datachainlab/ethereum-ibc-relay-chain v0.3.4 + github.com/datachainlab/ethereum-ibc-relay-chain v0.3.10 + github.com/datachainlab/ibc-hd-signer v0.1.0 github.com/ethereum/go-ethereum v1.13.15 - github.com/hyperledger-labs/yui-relayer v0.5.3 + github.com/hyperledger-labs/yui-relayer v0.5.8 github.com/spf13/cobra v1.8.0 github.com/stretchr/testify v1.9.0 google.golang.org/protobuf v1.33.0 - ) require ( diff --git a/go.sum b/go.sum index 31294de..763564a 100644 --- a/go.sum +++ b/go.sum @@ -415,8 +415,10 @@ github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7Do github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/danieljoos/wincred v1.1.2 h1:QLdCxFs1/Yl4zduvBdcHB8goaYk9RARS2SgLLRuAyr0= github.com/danieljoos/wincred v1.1.2/go.mod h1:GijpziifJoIBfYh+S7BbkdUTU4LfM+QnGqR5Vl2tAx0= -github.com/datachainlab/ethereum-ibc-relay-chain v0.3.4 h1:2mbvy6W/lm11SeQBgj1100A6D/70Wk9DooMoZfE8oXU= -github.com/datachainlab/ethereum-ibc-relay-chain v0.3.4/go.mod h1:PdSsegkRJiMWVGq+afDtXKRKg4p8hnmR1Yj5BgXkit0= +github.com/datachainlab/ethereum-ibc-relay-chain v0.3.10 h1:ce7/EiUZDjTWGHr8VGwP8Maqqur0koxK2qCOLty6gJs= +github.com/datachainlab/ethereum-ibc-relay-chain v0.3.10/go.mod h1:7goF50HLpKyL6bmisyY7t9QV338WC+68GqGpaZ9Te24= +github.com/datachainlab/ibc-hd-signer v0.1.0 h1:dmnFTAwFpl0m7Lx6+b+N/rrNpHQnXpyJAYnM25GhDi0= +github.com/datachainlab/ibc-hd-signer v0.1.0/go.mod h1:wUbLb2EryMCY+GfEsziU0T032Gch04jmrN0D4XGAfOI= github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -775,8 +777,8 @@ github.com/huandu/skiplist v1.2.0/go.mod h1:7v3iFjLcSAzO4fN5B8dvebvo/qsfumiLiDXM github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= github.com/huin/goupnp v1.3.0 h1:UvLUlWDNpoUdYzb2TCn+MuTWtcjXKSza2n6CBdQ0xXc= github.com/huin/goupnp v1.3.0/go.mod h1:gnGPsThkYa7bFi/KWmEysQRf48l2dvR5bxr2OFckNX8= -github.com/hyperledger-labs/yui-relayer v0.5.3 h1:K7lcqkaqsGtpXImcz/cuClZsTtWCobLC9zh76KGzhP8= -github.com/hyperledger-labs/yui-relayer v0.5.3/go.mod h1:GeCb1dtZjtQdkBNw1L9+LAUHzNQQhQK+kkoOnZYffw0= +github.com/hyperledger-labs/yui-relayer v0.5.8 h1:rIgWXSyKIVg/xjbfYjQ2biQaoL7jAoGIjJFgqLWWanY= +github.com/hyperledger-labs/yui-relayer v0.5.8/go.mod h1:GeCb1dtZjtQdkBNw1L9+LAUHzNQQhQK+kkoOnZYffw0= github.com/iancoleman/strcase v0.3.0 h1:nTXanmYxhfFAMjZL34Ov6gkzEsSJZ5DbhxWjvSASxEI= github.com/iancoleman/strcase v0.3.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= diff --git a/module/prover_test.go b/module/prover_test.go index a495104..6d7c553 100644 --- a/module/prover_test.go +++ b/module/prover_test.go @@ -2,7 +2,7 @@ package module import ( "context" - "github.com/datachainlab/ethereum-ibc-relay-chain/pkg/relay/ethereum/signers/hd" + "github.com/datachainlab/ibc-hd-signer/pkg/hd" "github.com/hyperledger-labs/yui-relayer/log" "math/big" "testing" diff --git a/tests/prover_network_test.go b/tests/prover_network_test.go index cc7f6ad..7f9876b 100644 --- a/tests/prover_network_test.go +++ b/tests/prover_network_test.go @@ -2,7 +2,7 @@ package tests import ( "context" - "github.com/datachainlab/ethereum-ibc-relay-chain/pkg/relay/ethereum/signers/hd" + "github.com/datachainlab/ibc-hd-signer/pkg/hd" "github.com/datachainlab/ibc-parlia-relay/module" "github.com/hyperledger-labs/yui-relayer/config" "github.com/hyperledger-labs/yui-relayer/log"