From b79657ed2fd705168e7d8f32c918d8721561632f Mon Sep 17 00:00:00 2001 From: Jaechang Namgoong Date: Tue, 25 Jul 2023 17:12:41 +0900 Subject: [PATCH 1/2] Upgrade dependencies --- e2edemo/package-lock.json | 64 ++++++++++++++++++++++----------------- e2edemo/package.json | 4 +-- 2 files changed, 39 insertions(+), 29 deletions(-) diff --git a/e2edemo/package-lock.json b/e2edemo/package-lock.json index fa8d194..333b8e4 100644 --- a/e2edemo/package-lock.json +++ b/e2edemo/package-lock.json @@ -7,9 +7,9 @@ "devDependencies": { "@iconfoundation/btp2-solidity-library": "^0.2.0", "@nomicfoundation/hardhat-toolbox": "^2.0.2", - "@openzeppelin/contracts-upgradeable": "^4.7.3", + "@openzeppelin/contracts-upgradeable": "^4.9.2", "hardhat": "^2.12.7", - "icon-sdk-js": "^1.4.5", + "icon-sdk-js": "^1.5.1", "ts-node": "^10.9.1", "typescript": "^4.8.4" }, @@ -1421,9 +1421,9 @@ } }, "node_modules/@openzeppelin/contracts-upgradeable": { - "version": "4.9.0", - "resolved": "https://registry.npmjs.org/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-4.9.0.tgz", - "integrity": "sha512-+6i2j6vr2fdudTqkBvG+UOosankukxYzg3WN1nqU7ijjQ5A4osWaD3ip6CEz6YvDoSdZgcFVZoiGr7zRlUUoZw==", + "version": "4.9.2", + "resolved": "https://registry.npmjs.org/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-4.9.2.tgz", + "integrity": "sha512-siviV3PZV/fHfPaoIC51rf1Jb6iElkYWnNYZ0leO23/ukXuvOyoC/ahy8jqiV7g+++9Nuo3n/rk5ajSN/+d/Sg==", "dev": true }, "node_modules/@scure/base": { @@ -5119,9 +5119,9 @@ } }, "node_modules/icon-sdk-js": { - "version": "1.4.5", - "resolved": "https://registry.npmjs.org/icon-sdk-js/-/icon-sdk-js-1.4.5.tgz", - "integrity": "sha512-+q9WJaPKBUXLdg4uQSFkAtk7oclN+5oW5Y5xSMvs52wZArhb94qrdz/wgNal+nP7HWQMGM9SGKmviysgu8XEuA==", + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/icon-sdk-js/-/icon-sdk-js-1.5.1.tgz", + "integrity": "sha512-UbSuBrUgE4Ct8KZqpmD1k+S7g6qM2//B66O7dmUUU+tjQgut9ZIXkz1FZxBmuhi9ns6okk82mmXgqAxD/AAPdw==", "dev": true, "dependencies": { "@babel/runtime-corejs3": "^7.20.7", @@ -6382,9 +6382,9 @@ } }, "node_modules/node-environment-flags/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "dev": true, "peer": true, "bin": { @@ -7441,9 +7441,9 @@ } }, "node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "bin": { "semver": "bin/semver.js" @@ -7656,23 +7656,23 @@ } }, "node_modules/solc/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "dev": true, "bin": { "semver": "bin/semver" } }, "node_modules/solidity-coverage": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/solidity-coverage/-/solidity-coverage-0.8.2.tgz", - "integrity": "sha512-cv2bWb7lOXPE9/SSleDO6czkFiMHgP4NXPj+iW9W7iEKLBk7Cj0AGBiNmGX3V1totl9wjPrT0gHmABZKZt65rQ==", + "version": "0.8.4", + "resolved": "https://registry.npmjs.org/solidity-coverage/-/solidity-coverage-0.8.4.tgz", + "integrity": "sha512-xeHOfBOjdMF6hWTbt42iH4x+7j1Atmrf5OldDPMxI+i/COdExUxszOswD9qqvcBTaLGiOrrpnh9UZjSpt4rBsg==", "dev": true, "peer": true, "dependencies": { "@ethersproject/abi": "^5.0.9", - "@solidity-parser/parser": "^0.14.1", + "@solidity-parser/parser": "^0.16.0", "chalk": "^2.4.2", "death": "^1.1.0", "detect-port": "^1.3.0", @@ -7699,6 +7699,16 @@ "hardhat": "^2.11.0" } }, + "node_modules/solidity-coverage/node_modules/@solidity-parser/parser": { + "version": "0.16.1", + "resolved": "https://registry.npmjs.org/@solidity-parser/parser/-/parser-0.16.1.tgz", + "integrity": "sha512-PdhRFNhbTtu3x8Axm0uYpqOy/lODYQK+MlYSgqIsq2L8SFYEHJPHNUiOTAJbDGzNjjr1/n9AcIayxafR/fWmYw==", + "dev": true, + "peer": true, + "dependencies": { + "antlr4ts": "^0.5.0-alpha.4" + } + }, "node_modules/solidity-coverage/node_modules/ansi-colors": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz", @@ -8084,9 +8094,9 @@ } }, "node_modules/solidity-coverage/node_modules/semver": { - "version": "7.5.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz", - "integrity": "sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "peer": true, "dependencies": { @@ -9232,9 +9242,9 @@ } }, "node_modules/word-wrap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", + "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", "dev": true, "peer": true, "engines": { diff --git a/e2edemo/package.json b/e2edemo/package.json index f083441..dc97b4a 100644 --- a/e2edemo/package.json +++ b/e2edemo/package.json @@ -2,9 +2,9 @@ "devDependencies": { "@iconfoundation/btp2-solidity-library": "^0.2.0", "@nomicfoundation/hardhat-toolbox": "^2.0.2", - "@openzeppelin/contracts-upgradeable": "^4.7.3", + "@openzeppelin/contracts-upgradeable": "^4.9.2", "hardhat": "^2.12.7", - "icon-sdk-js": "^1.4.5", + "icon-sdk-js": "^1.5.1", "ts-node": "^10.9.1", "typescript": "^4.8.4" }, From cf984007c388f21b982bbdc823bd70623b347225 Mon Sep 17 00:00:00 2001 From: Jaechang Namgoong Date: Tue, 25 Jul 2023 17:16:07 +0900 Subject: [PATCH 2/2] Increase gasLimit for executeCall/executeRollback --- e2edemo/scripts/demo_dapp.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/e2edemo/scripts/demo_dapp.ts b/e2edemo/scripts/demo_dapp.ts index 088d9d4..330fe63 100644 --- a/e2edemo/scripts/demo_dapp.ts +++ b/e2edemo/scripts/demo_dapp.ts @@ -219,7 +219,7 @@ async function checkCallMessage(dst: string, srcChain: any, dstChain: any, sn: B async function invokeExecuteCall(dst: string, dstChain: any, reqId: BigNumber, data: string) { if (isEVMChain(dstChain)) { const xcallDst = await ethers.getContractAt('CallService', dstChain.contracts.xcall); - return await xcallDst.executeCall(reqId, data, {gasLimit: 300000}) + return await xcallDst.executeCall(reqId, data, {gasLimit: 600000}) .then((tx) => tx.wait(1)) .then((receipt) => { if (receipt.status != 1) { @@ -376,7 +376,7 @@ async function checkRollbackMessage(src: string, srcChain: any, blockNum: number async function invokeExecuteRollback(src: string, srcChain: any, sn: BigNumber) { if (isEVMChain(srcChain)) { const xcallSrc = await ethers.getContractAt('CallService', srcChain.contracts.xcall); - return await xcallSrc.executeRollback(sn, {gasLimit: 300000}) + return await xcallSrc.executeRollback(sn, {gasLimit: 600000}) .then((tx) => tx.wait(1)) .then((receipt) => { if (receipt.status != 1) {