Merge pull request #19 from siburu/signer-module-test

Signer module test

go.mod

@@ -9,8 +9,8 @@ replace (
 )
 
 require (
-	github.com/datachainlab/ethereum-ibc-relay-chain v0.2.7
-	github.com/hyperledger-labs/yui-relayer v0.4.17
+	github.com/datachainlab/ethereum-ibc-relay-chain v0.2.8
+	github.com/hyperledger-labs/yui-relayer v0.4.18
 )
 
 require (

go.sum

@@ -399,8 +399,8 @@ github.com/cucumber/common/gherkin/go/v22 v22.0.0 h1:4K8NqptbvdOrjL9DEea6HFjSpbd
 github.com/cucumber/common/messages/go/v17 v17.1.1 h1:RNqopvIFyLWnKv0LfATh34SWBhXeoFTJnSrgm9cT/Ts=
 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.2.7 h1:8se6ilNleijA+kO0yQe+nWyaBoGdTQHA9Qs/zvL9FAM=
-github.com/datachainlab/ethereum-ibc-relay-chain v0.2.7/go.mod h1:Y+N8eThA6jBz6TrwwhliDDRxhd6UwT3M3gMLu2YvbNA=
+github.com/datachainlab/ethereum-ibc-relay-chain v0.2.8 h1:ioWIMgDP7frp28wviMMgfUUHmS51nrWm6EDHM3mXXXI=
+github.com/datachainlab/ethereum-ibc-relay-chain v0.2.8/go.mod h1:MSOxcWJk34Esrm0aEITdLO823RASq6mXz/vPjxjaEag=
 github.com/datachainlab/ibc-mock-client v0.3.2 h1:SxBkaiuHWQ+1L085m2L35Fku3am7I6YL6B7dwurtDOM=
 github.com/datachainlab/ibc-mock-client v0.3.2/go.mod h1:FfqyF+VJKp8jlIG21lTNJJIp8RCaxSrx6vjhNkfwgBM=
 github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -740,8 +740,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.0.3 h1:N8No57ls+MnjlB+JPiCVSOyy/ot7MJTqlo7rn+NYSqQ=
 github.com/hydrogen18/memlistener v0.0.0-20200120041712-dcc25e7acd91/go.mod h1:qEIFzExnS6016fRpRfxrExeVn2gbClQA99gQhnIcdhE=
-github.com/hyperledger-labs/yui-relayer v0.4.17 h1:cjXYvfkTFiJEpXLtaMPQ7Q6Kd3vFvwQ0FAZ3JncoEz0=
-github.com/hyperledger-labs/yui-relayer v0.4.17/go.mod h1:Hdc/ERCPDhbipri45/U6+/3kDH7EttIWGdql+Rd3tZg=
+github.com/hyperledger-labs/yui-relayer v0.4.18 h1:JNPZUPpMVoz9DDTl3mQ7eexsZceKZ0WaUootyJqDNww=
+github.com/hyperledger-labs/yui-relayer v0.4.18/go.mod h1:Hdc/ERCPDhbipri45/U6+/3kDH7EttIWGdql+Rd3tZg=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/imkira/go-interpol v1.1.0/go.mod h1:z0h2/2T3XF8kyEPpRgJ3kmNv+C43p+I/CoI+jC3w2iA=

relayer/main.go

@@ -4,6 +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"
 	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"
@@ -14,6 +15,7 @@ func main() {
 		tendermint.Module{},
 		mock.Module{},
 		ethereum.Module{},
+		hd.Module{},
 	); err != nil {
 		log.Fatal(err)
 	}

tests/cases/eth2eth/configs/chains/ibc-0.json

@@ -4,8 +4,11 @@
     "chain_id": "ibc0",
     "eth_chain_id": 2018,
     "rpc_addr": "http://localhost:8645",
-    "hdw_mnemonic": "math razor capable expose worth grape metal sunset metal sudden usage scheme",
-    "hdw_path": "m/44'/60'/0'/0/0",
+    "signer": {
+      "@type": "/relayer.chains.ethereum.signers.hd.SignerConfig",
+      "mnemonic": "math razor capable expose worth grape metal sunset metal sudden usage scheme",
+      "path": "m/44'/60'/0'/0/0"
+    },
     "ibc_address": "0x9eBF3956EE45B2b9F1fC85FB8990ce6be52F47a6",
     "initial_send_checkpoint": 1,
     "initial_recv_checkpoint": 1,

tests/cases/eth2eth/configs/chains/ibc-1.json

@@ -4,8 +4,11 @@
     "chain_id": "ibc1",
     "eth_chain_id": 2019,
     "rpc_addr": "http://localhost:8745",
-    "hdw_mnemonic": "math razor capable expose worth grape metal sunset metal sudden usage scheme",
-    "hdw_path": "m/44'/60'/0'/0/0",
+    "signer": {
+      "@type": "/relayer.chains.ethereum.signers.hd.SignerConfig",
+      "mnemonic": "math razor capable expose worth grape metal sunset metal sudden usage scheme",
+      "path": "m/44'/60'/0'/0/0"
+    },
     "ibc_address": "0x9eBF3956EE45B2b9F1fC85FB8990ce6be52F47a6",
     "initial_send_checkpoint": 1,
     "initial_recv_checkpoint": 1,

tests/cases/eth2eth/scripts/test-tx

@@ -32,8 +32,8 @@ PATH_JSON=${CONF_DIR}/path.json
 CHAIN_A_ID=$(jq -r '.chain."eth_chain_id"' ${CHAIN_A_JSON})
 CHAIN_B_ID=$(jq -r '.chain."eth_chain_id"' ${CHAIN_B_JSON})
 
-MNEMONIC_A=$(jq -r '.chain."hdw_mnemonic"' ${CHAIN_A_JSON})
-MNEMONIC_B=$(jq -r '.chain."hdw_mnemonic"' ${CHAIN_B_JSON})
+MNEMONIC_A=$(jq -r '.chain.signer.mnemonic' ${CHAIN_A_JSON})
+MNEMONIC_B=$(jq -r '.chain.signer.mnemonic' ${CHAIN_B_JSON})
 
 RPC_ADDRESS_A=$(jq -r '.chain."rpc_addr"' ${CHAIN_A_JSON})
 RPC_ADDRESS_B=$(jq -r '.chain."rpc_addr"' ${CHAIN_B_JSON})

tests/cases/tm2eth/configs/demo/ibc-1.json

@@ -4,8 +4,11 @@
     "chain_id": "ibc1",
     "eth_chain_id": 2018,
     "rpc_addr": "http://localhost:8645",
-    "hdw_mnemonic": "math razor capable expose worth grape metal sunset metal sudden usage scheme",
-    "hdw_path": "m/44'/60'/0'/0/0",
+    "signer": {
+      "@type": "/relayer.chains.ethereum.signers.hd.SignerConfig",
+      "mnemonic": "math razor capable expose worth grape metal sunset metal sudden usage scheme",
+      "path": "m/44'/60'/0'/0/0"
+    },
     "ibc_address": "0x9eBF3956EE45B2b9F1fC85FB8990ce6be52F47a6",
     "initial_send_checkpoint": 1,
     "initial_recv_checkpoint": 1,

tests/cases/tm2eth/scripts/test-tx

@@ -33,7 +33,7 @@ CHANNEL_ID=$(jq -r '.dst."channel-id"' ${PATH_JSON})
 
 ETH_JSON=${CONF_DIR}/demo/ibc-1.json
 RPC_ADDRESS=$(jq -r '.chain."rpc_addr"' ${ETH_JSON})
-MNEMONIC=$(jq -r '.chain."hdw_mnemonic"' ${ETH_JSON})
+MNEMONIC=$(jq -r '.chain.signer.mnemonic' ${ETH_JSON})
 ETH_ADDRESS=$(${ICS20_CLI} wallet address --mnemonic="${MNEMONIC}" --wallet-index=2)
 
 DENOM="samoleans"