From baae0f500e8478c865a700ff01dfd5c0382e05eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20James=20Toussaint?= <33313130+jeremyjams@users.noreply.github.com> Date: Mon, 16 Sep 2024 15:15:22 +0200 Subject: [PATCH] Upgrade Solidity Compiler to v0.8.27 --- CHANGELOG.md | 1 + contracts/mocks/IexecPocoMock.sol | 2 +- hardhat.config.ts | 12 ++---------- scripts/voucherHubUtils.ts | 2 +- 4 files changed, 5 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ccff15a..c759073 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # Changelog ## vNEXT +- Upgrade Solidity Compiler to `v0.8.27`. (#45) - Bump dependencies: (#44) - `@openzeppelin/hardhat-upgrades`, `hardhat`, `ethers`, `prettier`, and others [minor version bump] - `prettier-plugin-organize-imports@4` diff --git a/contracts/mocks/IexecPocoMock.sol b/contracts/mocks/IexecPocoMock.sol index ac002ac..ae39fb7 100644 --- a/contracts/mocks/IexecPocoMock.sol +++ b/contracts/mocks/IexecPocoMock.sol @@ -29,7 +29,7 @@ contract IexecPocoMock is ERC20 { uint256 public mockTaskIndex = 0; bytes32 public mockTaskId = keccak256(abi.encode(mockDealId, mockTaskIndex)); - IexecLibCore_v5.Deal public deal; + IexecLibCore_v5.Deal deal; IexecLibCore_v5.DealBoost public dealBoost; mapping(bytes32 => IexecLibCore_v5.Task) public tasks; diff --git a/hardhat.config.ts b/hardhat.config.ts index 80e4e7d..e34a654 100644 --- a/hardhat.config.ts +++ b/hardhat.config.ts @@ -20,7 +20,7 @@ const config: HardhatUserConfig = { solidity: { compilers: [ { - version: '0.8.24', + version: '0.8.27', settings: { /** * Enable Intermediate Representation (IR) to reduce `Stack too deep` occurrences @@ -34,15 +34,7 @@ const config: HardhatUserConfig = { details: { yul: true, yulDetails: { - /** - * Disable temporarily. - * Causes: - * YulException: Cannot swap Slot RET with Variable value10: too deep in the stack - * by 1 slots in [ RET value15 value14 value13 value12 value11 headStart value9 - * value8 value7 value6 value5 value4 value3 value2 value1 value0 value10 ] - * memoryguard was present. - */ - // optimizerSteps: 'u', + optimizerSteps: 'u', }, }, }, diff --git a/scripts/voucherHubUtils.ts b/scripts/voucherHubUtils.ts index b2a7562..629e467 100644 --- a/scripts/voucherHubUtils.ts +++ b/scripts/voucherHubUtils.ts @@ -94,6 +94,6 @@ export async function getExpectedVoucherProxyCodeHash(voucherBeaconAddress: stri * Note: Look very carefully before updating this value to avoid messing with * existing vouchers already deployed in production. */ - return '0xebe0c40d5e931d865b61665b4e9435cc65ece10955457af1b4271e3438e4949e'; + return '0x386d2735c0e7b2144a00e43bc5451acd8063573f30f1edc7b8e8891039cbd84f'; } }