From 572fb4c46fa8ef9e3c817227e9c5a65c9a4cd406 Mon Sep 17 00:00:00 2001 From: Masanori Yoshida Date: Thu, 2 May 2024 13:51:23 +0900 Subject: [PATCH] update yui-ibc-solidity version from v0.3.26 to v0.3.27 Signed-off-by: Masanori Yoshida --- tests/cases/eth2eth/configs/chains/ibc-0.json | 2 +- tests/cases/eth2eth/configs/chains/ibc-1.json | 2 +- tests/cases/tm2eth/configs/demo/ibc-1.json | 2 +- tests/chains/ethereum/contracts/contracts/Dependencies.sol | 5 +++++ tests/chains/ethereum/contracts/package-lock.json | 6 +++--- tests/chains/ethereum/contracts/package.json | 2 +- tests/chains/ethereum/contracts/scripts/deploy.js | 4 +++- 7 files changed, 15 insertions(+), 8 deletions(-) diff --git a/tests/cases/eth2eth/configs/chains/ibc-0.json b/tests/cases/eth2eth/configs/chains/ibc-0.json index a7f68d4..7bf0b90 100644 --- 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": "0x727A5648832D2b317925CE043eA9b7fE04B4CD55", + "ibc_address": "0xaa43d337145E8930d01cb4E60Abf6595C692921E", "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 index 3143cfd..a182a22 100644 --- 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": "0x727A5648832D2b317925CE043eA9b7fE04B4CD55", + "ibc_address": "0xaa43d337145E8930d01cb4E60Abf6595C692921E", "initial_send_checkpoint": 1, "initial_recv_checkpoint": 1, "enable_debug_trace": true, diff --git a/tests/cases/tm2eth/configs/demo/ibc-1.json b/tests/cases/tm2eth/configs/demo/ibc-1.json index 8237a5e..55bc0f9 100644 --- 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": "0x727A5648832D2b317925CE043eA9b7fE04B4CD55", + "ibc_address": "0xaa43d337145E8930d01cb4E60Abf6595C692921E", "initial_send_checkpoint": 1, "initial_recv_checkpoint": 1, "enable_debug_trace": true, diff --git a/tests/chains/ethereum/contracts/contracts/Dependencies.sol b/tests/chains/ethereum/contracts/contracts/Dependencies.sol index 0676cce..589a1bf 100644 --- a/tests/chains/ethereum/contracts/contracts/Dependencies.sol +++ b/tests/chains/ethereum/contracts/contracts/Dependencies.sol @@ -9,6 +9,11 @@ import {IBCChannelPacketSendRecv} from "@hyperledger-labs/yui-ibc-solidity/contracts/core/04-channel/IBCChannelPacketSendRecv.sol"; import {IBCChannelPacketTimeout} from "@hyperledger-labs/yui-ibc-solidity/contracts/core/04-channel/IBCChannelPacketTimeout.sol"; +import { + IBCChannelUpgradeInitTryAck, + IBCChannelUpgradeConfirmTimeoutCancel +} from "@hyperledger-labs/yui-ibc-solidity/contracts/core/04-channel/IBCChannelUpgrade.sol"; + import {IIBCHandler} from "@hyperledger-labs/yui-ibc-solidity/contracts/core/25-handler/IIBCHandler.sol"; import {OwnableIBCHandler} from "@hyperledger-labs/yui-ibc-solidity/contracts/core/25-handler/OwnableIBCHandler.sol"; import {MockClient} from "@hyperledger-labs/yui-ibc-solidity/contracts/clients/MockClient.sol"; diff --git a/tests/chains/ethereum/contracts/package-lock.json b/tests/chains/ethereum/contracts/package-lock.json index 54a6a06..009c6a2 100644 --- a/tests/chains/ethereum/contracts/package-lock.json +++ b/tests/chains/ethereum/contracts/package-lock.json @@ -7,9 +7,9 @@ "": { "name": "contracts", "version": "1.0.0", - "license": "TBD", + "license": "Apache-2.0", "devDependencies": { - "@hyperledger-labs/yui-ibc-solidity": "git+https://github.com/hyperledger-labs/yui-ibc-solidity.git#v0.3.26", + "@hyperledger-labs/yui-ibc-solidity": "git+https://github.com/hyperledger-labs/yui-ibc-solidity.git#v0.3.27", "@nomicfoundation/hardhat-toolbox": "^4.0.0", "hardhat": "^2.19.1" } @@ -855,7 +855,7 @@ "node_modules/@hyperledger-labs/yui-ibc-solidity": { "name": "ibc-solidity", "version": "0.1.0", - "resolved": "git+ssh://git@github.com/hyperledger-labs/yui-ibc-solidity.git#aed4572d1350317925364b794287d5c542398128", + "resolved": "git+ssh://git@github.com/hyperledger-labs/yui-ibc-solidity.git#3ccaf71d63dc9fd54bd629a3800d74c0fcea1237", "dev": true, "license": "Apache-2.0", "dependencies": { diff --git a/tests/chains/ethereum/contracts/package.json b/tests/chains/ethereum/contracts/package.json index e5adeb0..e55c67e 100644 --- a/tests/chains/ethereum/contracts/package.json +++ b/tests/chains/ethereum/contracts/package.json @@ -4,7 +4,7 @@ "description": "", "license": "Apache-2.0", "devDependencies": { - "@hyperledger-labs/yui-ibc-solidity": "git+https://github.com/hyperledger-labs/yui-ibc-solidity.git#v0.3.26", + "@hyperledger-labs/yui-ibc-solidity": "git+https://github.com/hyperledger-labs/yui-ibc-solidity.git#v0.3.27", "@nomicfoundation/hardhat-toolbox": "^4.0.0", "hardhat": "^2.19.1" } diff --git a/tests/chains/ethereum/contracts/scripts/deploy.js b/tests/chains/ethereum/contracts/scripts/deploy.js index 960be51..f9fb67f 100644 --- a/tests/chains/ethereum/contracts/scripts/deploy.js +++ b/tests/chains/ethereum/contracts/scripts/deploy.js @@ -12,7 +12,9 @@ async function deployIBC(deployer) { "IBCConnectionSelfStateNoValidation", "IBCChannelHandshake", "IBCChannelPacketSendRecv", - "IBCChannelPacketTimeout" + "IBCChannelPacketTimeout", + "IBCChannelUpgradeInitTryAck", + "IBCChannelUpgradeConfirmTimeoutCancel" ]; const logics = []; for (const name of logicNames) {