* Change ethereum-ibc{0,1} to ethereum-geth{0,1}

* Change relay-chain, Yui-relayer version
* Change ibc-solidity version
* Fix ethereum run command

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

.github/workflows/v0.4-build.yml

@@ -79,4 +79,4 @@ jobs:
         if: steps.cache-docker-ethereum.outputs.cache-hit != 'true'
         working-directory: ./tests/scripts
         run: |
-          ./save_docker_images $CACHE_DOCKER_ETHEREUM_DIR ethereum-ibc0:latest ethereum-ibc1:latest
+          ./save_docker_images $CACHE_DOCKER_ETHEREUM_DIR ethereum-geth0:latest ethereum-geth1:latest

.github/workflows/v0.4-eth2eth.yml

@@ -33,7 +33,7 @@ jobs:
       - name: Load Ethereum docker images
         working-directory: ./tests/scripts
         run: |
-          ./load_docker_images $CACHE_DOCKER_ETHEREUM_DIR ethereum-ibc0:latest ethereum-ibc1:latest
+          ./load_docker_images $CACHE_DOCKER_ETHEREUM_DIR ethereum-geth0:latest ethereum-geth1:latest
       - name: Run Test
         working-directory: ./tests/cases/eth2eth
         run: |

.github/workflows/v0.4-tm2eth.yml

@@ -41,7 +41,7 @@ jobs:
         working-directory: ./tests/scripts
         run: |
           ./load_docker_images $CACHE_DOCKER_TENDERMINT_DIR tendermint-chain0:latest
-          ./load_docker_images $CACHE_DOCKER_ETHEREUM_DIR ethereum-ibc0:latest
+          ./load_docker_images $CACHE_DOCKER_ETHEREUM_DIR ethereum-geth0:latest
       - name: Run Test
         working-directory: ./tests/cases/tm2eth
         run: |

go.mod

@@ -9,8 +9,8 @@ replace (
 )
 
 require (
-	github.com/datachainlab/ethereum-ibc-relay-chain v0.2.10
-	github.com/hyperledger-labs/yui-relayer v0.4.20
+	github.com/datachainlab/ethereum-ibc-relay-chain v0.2.13
+	github.com/hyperledger-labs/yui-relayer v0.4.23
 )
 
 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.10 h1:2bAUn9yYFQTFj0gRIbWWXgZY48FGIrAwA9gH0YQLrxM=
-github.com/datachainlab/ethereum-ibc-relay-chain v0.2.10/go.mod h1:FDKiZNh2r8kz/KAXBG9tNDcoT6jyiUR1EfiE9W7Xjbc=
+github.com/datachainlab/ethereum-ibc-relay-chain v0.2.13 h1:FNyFLkvDwz6vEVVb+1lERbGNBLzh14S0Gv5YnfPj6AY=
+github.com/datachainlab/ethereum-ibc-relay-chain v0.2.13/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/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.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.23 h1:/N+sg3pSDIS/NUDfenTM9JfeAdl+R5AbkBrONukec0E=
+github.com/hyperledger-labs/yui-relayer v0.4.23/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=

tests/cases/docker-compose-test.yaml

@@ -46,9 +46,9 @@ services:
       USE_MOCK_CLIENT: 1
 
 # Ethereum
-  ethereum-ibc0:
-    container_name: ethereum-ibc0
-    image: ethereum-ibc0:${TAG}
+  ethereum-geth0:
+    container_name: ethereum-geth0
+    image: ethereum-geth0:${TAG}
     ports:
       - 8645:8545
     healthcheck:
@@ -58,9 +58,9 @@ services:
       retries: 5
     networks:
       - *network-common
-  ethereum-ibc1:
-    container_name: ethereum-ibc1
-    image: ethereum-ibc1:${TAG}
+  ethereum-geth1:
+    container_name: ethereum-geth1
+    image: ethereum-geth1:${TAG}
     ports:
       - 8745:8545
     healthcheck:

tests/cases/eth2eth/Makefile

@@ -5,7 +5,7 @@ network:
 	TAG=${DOCKER_TAG} $(DOCKER_COMPOSE) \
 		-f ../docker-compose-test.yaml \
 		up -d \
-		ethereum-ibc0 ethereum-ibc1
+		ethereum-geth0 ethereum-geth1
 
 .PHONY: test
 test:

tests/cases/tm2eth/Makefile

@@ -5,7 +5,7 @@ network:
 	TAG=${DOCKER_TAG} $(DOCKER_COMPOSE) \
 		-f ../docker-compose-test.yaml \
 		up -d \
-		tendermint-chain0-mock ethereum-ibc0
+		tendermint-chain0-mock ethereum-geth0
 
 .PHONY: test
 test:

tests/chains/ethereum/Makefile

@@ -35,5 +35,5 @@ save-contract-address:
 
 .PHONY: docker-commit
 docker-commit:
-	$(SCRIPT_DIR)/docker/commitImage.sh  $(DOCKER_REPO) $(DOCKER_TAG) ethereum-ibc0 ethereum-geth0-scaffold $(NETWORK_ID0)
-	$(SCRIPT_DIR)/docker/commitImage.sh  $(DOCKER_REPO) $(DOCKER_TAG) ethereum-ibc1 ethereum-geth1-scaffold $(NETWORK_ID1)
+	$(SCRIPT_DIR)/docker/commitImage.sh  $(DOCKER_REPO) $(DOCKER_TAG) ethereum-geth0 ethereum-geth0-scaffold $(NETWORK_ID0)
+	$(SCRIPT_DIR)/docker/commitImage.sh  $(DOCKER_REPO) $(DOCKER_TAG) ethereum-geth1 ethereum-geth1-scaffold $(NETWORK_ID1)