From dcf03b9c458f113edb6d5a1754514bb3a01f7a11 Mon Sep 17 00:00:00 2001 From: Masanori Yoshida Date: Wed, 9 Oct 2024 00:46:09 +0900 Subject: [PATCH] update tests/chains/ethereum/contracts Signed-off-by: Masanori Yoshida --- tests/chains/ethereum/contracts/package-lock.json | 13 +++++++------ tests/chains/ethereum/contracts/package.json | 4 ++-- tests/chains/ethereum/contracts/scripts/deploy.js | 10 +++++----- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/tests/chains/ethereum/contracts/package-lock.json b/tests/chains/ethereum/contracts/package-lock.json index 82e323c..33ee966 100644 --- a/tests/chains/ethereum/contracts/package-lock.json +++ b/tests/chains/ethereum/contracts/package-lock.json @@ -9,8 +9,8 @@ "version": "1.0.0", "license": "Apache-2.0", "devDependencies": { - "@datachainlab/ethereum-ibc-relay-chain": "git+https://github.com/datachainlab/ethereum-ibc-relay-chain.git#semver:v0.3.10", - "@hyperledger-labs/yui-ibc-solidity": "git+https://github.com/hyperledger-labs/yui-ibc-solidity.git#semver:v0.3.35", + "@datachainlab/ethereum-ibc-relay-chain": "git+https://github.com/siburu/ethereum-ibc-relay-chain.git#fix-proposeAppVersion", + "@hyperledger-labs/yui-ibc-solidity": "git+https://github.com/hyperledger-labs/yui-ibc-solidity.git#semver:v0.3.38", "@nomicfoundation/hardhat-toolbox": "^4.0.0", "@openzeppelin/hardhat-upgrades": "^3.2.1", "hardhat": "^2.19.1" @@ -108,11 +108,11 @@ "node_modules/@datachainlab/ethereum-ibc-relay-chain": { "name": "ethereum-ibc-relay-chain", "version": "1.0.0", - "resolved": "git+ssh://git@github.com/datachainlab/ethereum-ibc-relay-chain.git#b2579e90b67f671db932032af2ca5cac6e693244", + "resolved": "git+ssh://git@github.com/siburu/ethereum-ibc-relay-chain.git#4316b5eb7626b7fada2d49a00d150051f018afff", "dev": true, "license": "Apache-2.0", "dependencies": { - "@hyperledger-labs/yui-ibc-solidity": "git+https://github.com/hyperledger-labs/yui-ibc-solidity.git#semver:v0.3.35", + "@hyperledger-labs/yui-ibc-solidity": "git+https://github.com/hyperledger-labs/yui-ibc-solidity.git#semver:v0.3.38", "@openzeppelin/contracts-upgradeable": "^5.0.2" } }, @@ -937,11 +937,12 @@ "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#cd49bc000d99b498026706ed028a89123a8e05a2", + "resolved": "git+ssh://git@github.com/hyperledger-labs/yui-ibc-solidity.git#ca7a56c85749b83d5fb35aae7cd7e0b07e655b61", "dev": true, "license": "Apache-2.0", "dependencies": { - "@openzeppelin/contracts": "^5.0.1" + "@openzeppelin/contracts": "^5.0.1", + "@openzeppelin/contracts-upgradeable": "^5.0.1" } }, "node_modules/@jridgewell/resolve-uri": { diff --git a/tests/chains/ethereum/contracts/package.json b/tests/chains/ethereum/contracts/package.json index c83d90c..254cfea 100644 --- a/tests/chains/ethereum/contracts/package.json +++ b/tests/chains/ethereum/contracts/package.json @@ -4,8 +4,8 @@ "description": "", "license": "Apache-2.0", "devDependencies": { - "@datachainlab/ethereum-ibc-relay-chain": "git+https://github.com/datachainlab/ethereum-ibc-relay-chain.git#semver:v0.3.10", - "@hyperledger-labs/yui-ibc-solidity": "git+https://github.com/hyperledger-labs/yui-ibc-solidity.git#semver:v0.3.35", + "@datachainlab/ethereum-ibc-relay-chain": "git+https://github.com/siburu/ethereum-ibc-relay-chain.git#fix-proposeAppVersion", + "@hyperledger-labs/yui-ibc-solidity": "git+https://github.com/hyperledger-labs/yui-ibc-solidity.git#semver:v0.3.38", "@nomicfoundation/hardhat-toolbox": "^4.0.0", "@openzeppelin/hardhat-upgrades": "^3.2.1", "hardhat": "^2.19.1" diff --git a/tests/chains/ethereum/contracts/scripts/deploy.js b/tests/chains/ethereum/contracts/scripts/deploy.js index b8efdf4..e894290 100644 --- a/tests/chains/ethereum/contracts/scripts/deploy.js +++ b/tests/chains/ethereum/contracts/scripts/deploy.js @@ -86,11 +86,11 @@ async function deployApp(deployer, ibcHandler) { const impl = await prepareImplementation(deployer, proxyV1, contractName, [ibcHandler.target], unsafeAllow); saveAddress(contractName, impl); - await proxyV1.proposeAppVersion(`mockapp-${i}`, { - implementation: impl.target, - initialCalldata: impl.interface.encodeFunctionData(`__${contractName}_init(string)`, [contractName]), - consumed: false, - }).then(tx => tx.wait()); + await proxyV1.proposeAppVersion( + `mockapp-${i}`, + impl.target, + impl.interface.encodeFunctionData(`__${contractName}_init(string)`, [contractName]), + ).then(tx => tx.wait()); } return proxyV1;