Use ibc-solidity v0.3.26, yui-relayer v0.4.25

Signed-off-by: Dongri Jin <[email protected]>

go.mod

@@ -5,12 +5,14 @@ go 1.20
 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 => /Users/dongri.jin/go/src/github.com/dongrie/ethereum-ibc-relay-chain
 	github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
 )
 
 require (
 	github.com/datachainlab/ethereum-ibc-relay-chain v0.2.10
-	github.com/hyperledger-labs/yui-relayer v0.4.20
+	github.com/hyperledger-labs/yui-relayer v0.4.25
 )
 
 require (
@@ -65,7 +67,7 @@ require (
 	github.com/cosmos/rosetta-sdk-go v0.10.0 // indirect
 	github.com/creachadair/taskgroup v0.4.2 // indirect
 	github.com/danieljoos/wincred v1.1.2 // indirect
-	github.com/datachainlab/ibc-mock-client v0.3.2 // indirect
+	github.com/datachainlab/ibc-mock-client v0.3.3 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/deckarep/golang-set/v2 v2.1.0 // indirect
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect

go.sum

@@ -399,10 +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.10 h1:2bAUn9yYFQTFj0gRIbWWXgZY48FGIrAwA9gH0YQLrxM=
-github.com/datachainlab/ethereum-ibc-relay-chain v0.2.10/go.mod h1:FDKiZNh2r8kz/KAXBG9tNDcoT6jyiUR1EfiE9W7Xjbc=
-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/datachainlab/ibc-mock-client v0.3.3 h1:jZQvvd88g/6Jq8LULaqeYviOSQYqWhgsUMYMtUzosiA=
+github.com/datachainlab/ibc-mock-client v0.3.3/go.mod h1:FfqyF+VJKp8jlIG21lTNJJIp8RCaxSrx6vjhNkfwgBM=
 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 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
@@ -740,8 +738,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.20 h1:kkE4XcgkKtPvVUNJZBXOdGPujLVMeL7LZ34a4Sw1boE=
-github.com/hyperledger-labs/yui-relayer v0.4.20/go.mod h1:Hdc/ERCPDhbipri45/U6+/3kDH7EttIWGdql+Rd3tZg=
+github.com/hyperledger-labs/yui-relayer v0.4.25 h1:KQRcHO/mzss6OKd5r6P3FmntFrBVsmPSMDSZyv761HM=
+github.com/hyperledger-labs/yui-relayer v0.4.25/go.mod h1:noot+qdFpngVV99bC4Pynu4S4Tg7K8JLPBgxsGLtE8Y=
 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=

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

@@ -14,7 +14,13 @@
     "initial_recv_checkpoint": 1,
     "enable_debug_trace": true,
     "average_block_time_msec": 1000,
-    "max_retry_for_inclusion": 5
+    "max_retry_for_inclusion": 5,
+    "gas_estimate_rate": {
+      "numerator": 3,
+      "denominator": 2
+    },
+    "max_gas_limit": 10000000,
+    "tx_type": "auto"
   },
   "prover": {
     "@type": "/relayer.provers.mock.config.ProverConfig",

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

@@ -14,7 +14,13 @@
     "initial_recv_checkpoint": 1,
     "enable_debug_trace": true,
     "average_block_time_msec": 1000,
-    "max_retry_for_inclusion": 5
+    "max_retry_for_inclusion": 5,
+    "gas_estimate_rate": {
+      "numerator": 3,
+      "denominator": 2
+    },
+    "max_gas_limit": 10000000,
+    "tx_type": "auto"
   },
   "prover": {
     "@type": "/relayer.provers.mock.config.ProverConfig",

tests/cases/eth2eth/scripts/test-tx

@@ -19,9 +19,9 @@ if ! which ${ICS20_CLI} > /dev/null 2>&1; then
   export PATH=$PATH:$(go env GOPATH)/bin
 fi
 
-ERC20_TOKEN_ADDRESS="0xaa43d337145E8930d01cb4E60Abf6595C692921E"
-ICS20_TRANSFER_BANK_ADDRESS="0x2F5703804E29F4252FA9405B8D357220d11b3bd9"
-ICS20_BANK_ADDRESS="0xff77D90D6aA12db33d3Ba50A34fB25401f6e4c4F"
+ERC20_TOKEN_ADDRESS="0x702E40245797c5a2108A566b3CE2Bf14Bc6aF841"
+ICS20_TRANSFER_BANK_ADDRESS="0xff77D90D6aA12db33d3Ba50A34fB25401f6e4c4F"
+ICS20_BANK_ADDRESS="0xaa43d337145E8930d01cb4E60Abf6595C692921E"
 
 DENOM=$(echo "$ERC20_TOKEN_ADDRESS" | tr '[:upper:]' '[:lower:]')
 

tests/chains/ethereum/Makefile

@@ -1,5 +1,6 @@
 include ../../docker.mk
 
+HARDHAT ?= npx hardhat
 SCRIPT_DIR ?= $(CURDIR)/scripts
 
 NETWORK_ID0 ?= 13370
@@ -18,7 +19,7 @@ docker-images:
 
 .PHONY: deploy-contract
 deploy-contract:
-	cd contract && npm install && npm run migrate
+	cd contracts && npm install && $(HARDHAT) run ./scripts/deploy.js --network ibc0 && $(HARDHAT) run ./scripts/deploy.js --network ibc1
 
 .PHONY: up-scaffold
 up-scaffold: