Merge pull request #3 from datachainlab/update-ethereum-chain

Update ethereum-ibc-relay-chain version

Signed-off-by: Jun Kimura <jun.kimura@datachain.jp>

e2e/package.json

@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "description": "A hardhat example project with ibc-solidity",
   "devDependencies": {
-    "@hyperledger-labs/yui-ibc-solidity": "git+https://github.com/hyperledger-labs/yui-ibc-solidity.git#v0.3.22",
+    "@hyperledger-labs/yui-ibc-solidity": "git+https://github.com/hyperledger-labs/yui-ibc-solidity.git#v0.3.23",
     "@nomicfoundation/hardhat-toolbox": "^4.0.0",
     "chai": "^4.3.10",
     "hardhat": "^2.19.1"

e2e/relayer/configs/templates/ibc0.json.tpl

@@ -14,7 +14,14 @@
     "initial_recv_checkpoint": 1,
     "enable_debug_trace": false,
     "average_block_time_msec": 1000,
-    "max_retry_for_inclusion": 5
+    "max_retry_for_inclusion": 5,
+    "allow_lc_functions": {
+      "lc_address": "$IBFT2_CLIENT_ADDRESS",
+      "allow_all": false,
+      "selectors": [
+        "0xa4f1ec28"
+      ]
+    }
   },
   "prover": {
     "@type": "/relayer.provers.ibft2.config.ProverConfig",

e2e/relayer/configs/templates/ibc1.json.tpl

@@ -14,7 +14,11 @@
     "initial_recv_checkpoint": 1,
     "enable_debug_trace": false,
     "average_block_time_msec": 1000,
-    "max_retry_for_inclusion": 5
+    "max_retry_for_inclusion": 5,
+    "allow_lc_functions": {
+      "lc_address": "$IBFT2_CLIENT_ADDRESS",
+      "allow_all": true
+    }
   },
   "prover": {
     "@type": "/relayer.provers.ibft2.config.ProverConfig",

e2e/relayer/scripts/gen-config

@@ -1,16 +1,24 @@
 #!/bin/bash
-set -eux
+set -e
 
 RELAYER_DIR=$(dirname $(dirname "$0"))
 
-if [ $# -ne 2 ]; then
-  echo "Usage: $0 <chain-id> <ibc-address>"
+if [ $# -ne 1 ]; then
+  echo "Usage: $0 <chain-id>" >&2
   exit 1
 fi
+if [ -z "${IBC_HANDLER}" ]; then
+  echo "Error: env var 'IBC_HANDLER' is not set." >&2
+  exit 1
+fi
+if [ -z "${IBFT2_CLIENT}" ]; then
+  echo "Error: env var 'IBFT2_CLIENT' is not set." >&2
+  exit 1
+fi
+
 CHAINID=$1
-IBC_ADDRESS=$2
 
 TEMPLATE_DIR=${RELAYER_DIR}/configs/templates
 CONFIG_DIR=${RELAYER_DIR}/configs/demo
 mkdir -p $CONFIG_DIR
-jq --arg IBC_ADDRESS ${IBC_ADDRESS} -r '.chain.ibc_address = $IBC_ADDRESS' ${TEMPLATE_DIR}/${CHAINID}.json.tpl > ${CONFIG_DIR}/${CHAINID}.json
+jq '.chain.ibc_address = env.IBC_HANDLER | .chain.allow_lc_functions.lc_address = env.IBFT2_CLIENT' ${TEMPLATE_DIR}/${CHAINID}.json.tpl > ${CONFIG_DIR}/${CHAINID}.json

e2e/relayer/scripts/init-rly

@@ -20,8 +20,8 @@ fi
 
 rm -rf ${RLY_HOME} &> /dev/null
 
-source ./chain0.env.sh && ${SCRIPT_DIR}/gen-config ibc0 ${IBC_HANDLER}
-source ./chain1.env.sh && ${SCRIPT_DIR}/gen-config ibc1 ${IBC_HANDLER}
+source ./chain0.env.sh && ${SCRIPT_DIR}/gen-config ibc0
+source ./chain1.env.sh && ${SCRIPT_DIR}/gen-config ibc1
 ${RLY} config init
 ${RLY} chains add-dir ${RELAYER_DIR}/configs/demo/
 # add a path between chain0 and chain1

go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/cosmos/cosmos-sdk v0.47.3
 	github.com/cosmos/gogoproto v1.4.10
 	github.com/cosmos/ibc-go/v7 v7.2.0
-	github.com/datachainlab/ethereum-ibc-relay-chain v0.2.11
+	github.com/datachainlab/ethereum-ibc-relay-chain v0.2.13
 	github.com/ethereum/go-ethereum v1.12.0
 	github.com/hyperledger-labs/yui-relayer v0.4.22
 	github.com/spf13/cobra v1.7.0

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.11 h1:Gt6hPFdZ8NnaqpqnlfFqTc5vubqa4wqi0z+ublHkvFA=
-github.com/datachainlab/ethereum-ibc-relay-chain v0.2.11/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/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=