Merge pull request #23 from yoshidan/update_eth

Update ethereum-ibc-relay-chain/yui-ibc-solidity
datachainlab · Jan 3, 2024 · 12261ad · 12261ad
2 parents 663565c + 2317d83
commit 12261ad
Show file tree

Hide file tree

Showing 11 changed files with 320 additions and 538 deletions.
diff --git a/go.mod b/go.mod
@@ -9,7 +9,7 @@ replace (
 )
 
 require (
-	github.com/datachainlab/ethereum-ibc-relay-chain v0.2.9
+	github.com/datachainlab/ethereum-ibc-relay-chain v0.2.10
 	github.com/hyperledger-labs/yui-relayer v0.4.20
 )
 

diff --git a/go.sum b/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.9 h1:xikiZ7IKhxvcAEVW9vZmGBlTIU8k+nIfqL/9Ki4l0S0=
-github.com/datachainlab/ethereum-ibc-relay-chain v0.2.9/go.mod h1:FDKiZNh2r8kz/KAXBG9tNDcoT6jyiUR1EfiE9W7Xjbc=
+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/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

diff --git a/tests/cases/eth2eth/configs/chains/ibc-0.json b/tests/cases/eth2eth/configs/chains/ibc-0.json
@@ -9,7 +9,7 @@
       "mnemonic": "math razor capable expose worth grape metal sunset metal sudden usage scheme",
       "path": "m/44'/60'/0'/0/0"
     },
-    "ibc_address": "0x9eBF3956EE45B2b9F1fC85FB8990ce6be52F47a6",
+    "ibc_address": "0x727A5648832D2b317925CE043eA9b7fE04B4CD55",
     "initial_send_checkpoint": 1,
     "initial_recv_checkpoint": 1,
     "enable_debug_trace": true,

diff --git a/tests/cases/eth2eth/configs/chains/ibc-1.json b/tests/cases/eth2eth/configs/chains/ibc-1.json
@@ -9,7 +9,7 @@
       "mnemonic": "math razor capable expose worth grape metal sunset metal sudden usage scheme",
       "path": "m/44'/60'/0'/0/0"
     },
-    "ibc_address": "0x9eBF3956EE45B2b9F1fC85FB8990ce6be52F47a6",
+    "ibc_address": "0x727A5648832D2b317925CE043eA9b7fE04B4CD55",
     "initial_send_checkpoint": 1,
     "initial_recv_checkpoint": 1,
     "enable_debug_trace": true,

diff --git a/tests/cases/eth2eth/scripts/test-tx b/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="0x702E40245797c5a2108A566b3CE2Bf14Bc6aF841"
-ICS20_TRANSFER_BANK_ADDRESS="0xff77D90D6aA12db33d3Ba50A34fB25401f6e4c4F"
-ICS20_BANK_ADDRESS="0xaa43d337145E8930d01cb4E60Abf6595C692921E"
+ERC20_TOKEN_ADDRESS="0xaa43d337145E8930d01cb4E60Abf6595C692921E"
+ICS20_TRANSFER_BANK_ADDRESS="0x2F5703804E29F4252FA9405B8D357220d11b3bd9"
+ICS20_BANK_ADDRESS="0xff77D90D6aA12db33d3Ba50A34fB25401f6e4c4F"
 
 DENOM=$(echo "$ERC20_TOKEN_ADDRESS" | tr '[:upper:]' '[:lower:]')
 

diff --git a/tests/cases/tm2eth/configs/demo/ibc-1.json b/tests/cases/tm2eth/configs/demo/ibc-1.json
@@ -9,7 +9,7 @@
       "mnemonic": "math razor capable expose worth grape metal sunset metal sudden usage scheme",
       "path": "m/44'/60'/0'/0/0"
     },
-    "ibc_address": "0x9eBF3956EE45B2b9F1fC85FB8990ce6be52F47a6",
+    "ibc_address": "0x727A5648832D2b317925CE043eA9b7fE04B4CD55",
     "initial_send_checkpoint": 1,
     "initial_recv_checkpoint": 1,
     "enable_debug_trace": true,

diff --git a/tests/cases/tm2eth/scripts/test-tx b/tests/cases/tm2eth/scripts/test-tx
@@ -25,7 +25,7 @@ TX_INTERVAL=3
 
 TM_ADDRESS=$(${RLY} tendermint keys show ibc0 testkey)
 
-ICS20_BANK_ADDRESS="0xaa43d337145E8930d01cb4E60Abf6595C692921E"
+ICS20_BANK_ADDRESS="0xff77D90D6aA12db33d3Ba50A34fB25401f6e4c4F"
 
 PATH_JSON=${CONF_DIR}/path.json
 PORT_ID=$(jq -r '.dst."port-id"' ${PATH_JSON})

diff --git a/tests/chains/ethereum/contract/migrations/1_deploy_contracts.js b/tests/chains/ethereum/contract/migrations/1_deploy_contracts.js
@@ -1,8 +1,9 @@
 const MockClient = artifacts.require("MockClient");
 const IBCClient = artifacts.require("IBCClient");
-const IBCConnection = artifacts.require("IBCConnection");
+const IBCConnection = artifacts.require("IBCConnectionSelfStateNoValidation");
 const IBCChannelHandshake = artifacts.require("IBCChannelHandshake");
-const IBCPacket = artifacts.require("IBCPacket");
+const IBCChannelPacketSendRecv = artifacts.require("IBCChannelPacketSendRecv");
+const IBCChannelPacketTimeout = artifacts.require("IBCChannelPacketTimeout");
 const IBCHandler = artifacts.require("OwnableIBCHandler");
 const ERC20Token = artifacts.require("ERC20Token");
 const ICS20TransferBank = artifacts.require("ICS20TransferBank");
@@ -12,8 +13,9 @@ const deployCore = async (deployer) => {
   await deployer.deploy(IBCClient);
   await deployer.deploy(IBCConnection);
   await deployer.deploy(IBCChannelHandshake);
-  await deployer.deploy(IBCPacket);
-  await deployer.deploy(IBCHandler, IBCClient.address, IBCConnection.address, IBCChannelHandshake.address, IBCPacket.address);
+  await deployer.deploy(IBCChannelPacketSendRecv);
+  await deployer.deploy(IBCChannelPacketTimeout);
+  await deployer.deploy(IBCHandler, IBCClient.address, IBCConnection.address, IBCChannelHandshake.address, IBCChannelPacketSendRecv.address, IBCChannelPacketTimeout.address);
   await deployer.deploy(MockClient, IBCHandler.address);
 };