From 922c248409f2813a4872e6aa00888181e6fef86d Mon Sep 17 00:00:00 2001 From: Daisuke Kanda Date: Tue, 25 Jun 2024 09:24:30 +0000 Subject: [PATCH] use ibc-hd-signer Signed-off-by: Daisuke Kanda --- go.mod | 8 ++++++-- go.sum | 10 ++++++---- relayer/main.go | 2 +- .../cases/eth2eth/configs/template/ibc-0.template.json | 2 +- .../cases/eth2eth/configs/template/ibc-1.template.json | 2 +- .../cases/tm2eth/configs/template/ibc-1.template.json | 2 +- 6 files changed, 16 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index 17a2fb6..a4d2cf7 100644 --- a/go.mod +++ b/go.mod @@ -5,12 +5,16 @@ go 1.21 replace ( // https://github.com/cosmos/cosmos-sdk/blob/v0.47.3/go.mod#L171-L182 github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 + github.com/datachainlab/ethereum-ibc-relay-chain => github.com/dai1975/ethereum-ibc-relay-chain v0.0.0-20240625081645-d6978a0ef5bf + //github.com/datachainlab/ibc-hd-signer => ../ibc-hd-signer + github.com/datachainlab/ibc-hd-signer => github.com/datachainlab/ibc-hd-signer v0.0.0-20240625084331-f141d93a55f8 github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 ) require ( - github.com/datachainlab/ethereum-ibc-relay-chain v0.3.2 - github.com/hyperledger-labs/yui-relayer v0.5.3 + github.com/datachainlab/ethereum-ibc-relay-chain v0.3.4 + github.com/datachainlab/ibc-hd-signer v0.0.0 + github.com/hyperledger-labs/yui-relayer v0.5.4 ) require ( diff --git a/go.sum b/go.sum index 9d79cff..0b16beb 100644 --- a/go.sum +++ b/go.sum @@ -413,10 +413,12 @@ github.com/crate-crypto/go-kzg-4844 v0.7.0 h1:C0vgZRk4q4EZ/JgPfzuSoxdCq3C3mOZMBS github.com/crate-crypto/go-kzg-4844 v0.7.0/go.mod h1:1kMhvPgI0Ky3yIa+9lFySEBUBXkYxeOi8ZF1sYioxhc= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/dai1975/ethereum-ibc-relay-chain v0.0.0-20240625081645-d6978a0ef5bf h1:FqcWzcIwvjfhnqIfHFO5LzPVcII2FGKI2Yw0BMWiRlI= +github.com/dai1975/ethereum-ibc-relay-chain v0.0.0-20240625081645-d6978a0ef5bf/go.mod h1:9rJTxXmEFVw8VrHYbKSK7bIQk1PVJm8pzyAYknMNNqc= 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.2 h1:obAxG44znqLUY0wpsTeRrWlQ/A6ls0uYLL1USEM5nko= -github.com/datachainlab/ethereum-ibc-relay-chain v0.3.2/go.mod h1:PdSsegkRJiMWVGq+afDtXKRKg4p8hnmR1Yj5BgXkit0= +github.com/datachainlab/ibc-hd-signer v0.0.0-20240625084331-f141d93a55f8 h1:FqN2/G/EPcDddCnVYGmNB/fO5AdD6lG6bl+FMkcKU2w= +github.com/datachainlab/ibc-hd-signer v0.0.0-20240625084331-f141d93a55f8/go.mod h1:wUbLb2EryMCY+GfEsziU0T032Gch04jmrN0D4XGAfOI= github.com/datachainlab/ibc-mock-client v0.4.1 h1:FQfyFOodgnchCIicpS7Vzji3yxXDe4Jl5hmE5Vz7M1s= github.com/datachainlab/ibc-mock-client v0.4.1/go.mod h1:2wGddiF2uHFhiMBpSskzKT/wA8naXi5DLoXt1KEZA1o= github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -774,8 +776,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.4 h1:yhvWI28Rcel55UsdmYWX0QE0W3P9aBSRetQh1k8VpZA= +github.com/hyperledger-labs/yui-relayer v0.5.4/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/relayer/main.go b/relayer/main.go index 6e36120..b5e6900 100644 --- a/relayer/main.go +++ b/relayer/main.go @@ -4,7 +4,7 @@ import ( "log" "github.com/datachainlab/ethereum-ibc-relay-chain/pkg/relay/ethereum" - "github.com/datachainlab/ethereum-ibc-relay-chain/pkg/relay/ethereum/signers/hd" + "github.com/datachainlab/ibc-hd-signer/pkg/hd" tendermint "github.com/hyperledger-labs/yui-relayer/chains/tendermint/module" "github.com/hyperledger-labs/yui-relayer/cmd" mock "github.com/hyperledger-labs/yui-relayer/provers/mock/module" diff --git a/tests/cases/eth2eth/configs/template/ibc-0.template.json b/tests/cases/eth2eth/configs/template/ibc-0.template.json index 78aab12..4633800 100644 --- a/tests/cases/eth2eth/configs/template/ibc-0.template.json +++ b/tests/cases/eth2eth/configs/template/ibc-0.template.json @@ -5,7 +5,7 @@ "eth_chain_id": 2018, "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/tests/cases/eth2eth/configs/template/ibc-1.template.json b/tests/cases/eth2eth/configs/template/ibc-1.template.json index df7996d..314a863 100644 --- a/tests/cases/eth2eth/configs/template/ibc-1.template.json +++ b/tests/cases/eth2eth/configs/template/ibc-1.template.json @@ -5,7 +5,7 @@ "eth_chain_id": 2019, "rpc_addr": "http://localhost:8745", "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/tests/cases/tm2eth/configs/template/ibc-1.template.json b/tests/cases/tm2eth/configs/template/ibc-1.template.json index f4ab8c6..638e3cb 100644 --- a/tests/cases/tm2eth/configs/template/ibc-1.template.json +++ b/tests/cases/tm2eth/configs/template/ibc-1.template.json @@ -5,7 +5,7 @@ "eth_chain_id": 2018, "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" },