[Feat] L1 contracts bump to solidity 0.8.28 (#656)

* working hardhat compile * bump solhint version * bump hardhat version * remove 0.8.26 refs * remove solhint join discord cli message * update upgrades-core dependency * silence openzeppelin-upgrades error for test fixtures * fix floating version for integrationtesttrue * remove 0.8.26
Consensys · Feb 6, 2025 · aa64956 · aa64956
1 parent 4d85082
commit aa64956
Show file tree

Hide file tree

Showing 36 changed files with 172 additions and 154 deletions.
diff --git a/contracts/hardhat.config.ts b/contracts/hardhat.config.ts
@@ -37,7 +37,7 @@ const config: HardhatUserConfig = {
     // NB: double check the autoupdate shell script version complies to the latest solidity version if you add a new one.
     compilers: [
       {
-        version: "0.8.26",
+        version: "0.8.28",
         settings: {
           viaIR: useViaIR,
           optimizer: {
@@ -47,6 +47,11 @@ const config: HardhatUserConfig = {
           evmVersion: "cancun",
         },
       },
+      /**
+       * Maintain for Mimc contract
+       * src/libraries/Mimc.sol (0.8.25)
+       * src/libraries/SparseMerkleProof.sol (0.8.25)
+       */
       {
         version: "0.8.25",
         settings: {
@@ -58,17 +63,6 @@ const config: HardhatUserConfig = {
           evmVersion: "cancun",
         },
       },
-      {
-        version: "0.8.24",
-        settings: {
-          viaIR: useViaIR,
-          optimizer: {
-            enabled: true,
-            runs: 10_000,
-          },
-          evmVersion: "cancun",
-        },
-      },
       {
         version: "0.8.19",
         settings: {

diff --git a/contracts/package.json b/contracts/package.json
@@ -13,8 +13,8 @@
     "balance": "ts-node scripts/balanceOf.ts",
     "prettier": "prettier -c '**/*.{js,ts,sol}'",
     "prettier:fix": "prettier -w '**/*.{js,ts,sol}'",
-    "lint:sol": "solhint 'contracts/**/*.sol'",
-    "lint:sol:fix": "solhint --fix --noPrompt 'contracts/**/*.sol'",
+    "lint:sol": "solhint -f stylish 'src/**/*.sol'",
+    "lint:sol:fix": "solhint --fix --noPrompt -f stylish 'src/**/*.sol'",
     "lint:ts": "npx eslint '**/*.{js,ts}'",
     "lint:ts:fix": "npx eslint --fix '**/*.{js,ts}'",
     "lint": "pnpm run lint:sol && npm run lint:ts && npm run prettier",
@@ -44,13 +44,13 @@
     "dotenv": "16.4.5",
     "edit-json-file": "1.8.0",
     "ethers": "6.12.0",
-    "hardhat": "2.22.17",
+    "hardhat": "2.22.18",
     "hardhat-deploy": "0.12.4",
     "hardhat-storage-layout": "0.1.7",
     "hardhat-tracer": "2.8.2",
     "node-gyp": "10.1.0",
     "prettier-plugin-solidity": "1.3.1",
-    "solhint": "4.5.4",
+    "solhint": "5.0.5",
     "yargs": "17.7.2"
   },
   "dependencies": {

diff --git a/contracts/src/_testing/integration/IntegrationTestTrueVerifier.sol b/contracts/src/_testing/integration/IntegrationTestTrueVerifier.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPL-3.0
-pragma solidity 0.8.26;
+pragma solidity 0.8.28;
 
 import { IPlonkVerifier } from "../../verifiers/interfaces/IPlonkVerifier.sol";
 

diff --git a/contracts/src/_testing/mocks/base/RevertingVerifier.sol b/contracts/src/_testing/mocks/base/RevertingVerifier.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPL-3.0
-pragma solidity ^0.8.26;
+pragma solidity 0.8.28;
 
 import { IPlonkVerifier } from "../../../verifiers/interfaces/IPlonkVerifier.sol";
 

diff --git a/contracts/src/_testing/mocks/base/TestClaimingCaller.sol b/contracts/src/_testing/mocks/base/TestClaimingCaller.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPL-3.0
-pragma solidity 0.8.26;
+pragma solidity 0.8.28;
 
 import { IMessageService } from "../../../messaging/interfaces/IMessageService.sol";
 

diff --git a/contracts/src/_testing/mocks/base/TestL1RevertContract.sol b/contracts/src/_testing/mocks/base/TestL1RevertContract.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: AGPL-3.0
 
-pragma solidity 0.8.26;
+pragma solidity 0.8.28;
 
 contract TestL1RevertContract {
   function errorWithMessage() external pure {

diff --git a/contracts/src/_testing/mocks/base/TestReceivingContract.sol b/contracts/src/_testing/mocks/base/TestReceivingContract.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: AGPL-3.0
 
-pragma solidity 0.8.19;
+pragma solidity ^0.8.19;
 
 contract TestReceivingContract {
   fallback() external payable {}

diff --git a/contracts/src/_testing/mocks/bridging/MockMessageServiceV2.sol b/contracts/src/_testing/mocks/bridging/MockMessageServiceV2.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity >=0.8.19 <=0.8.26;
+pragma solidity 0.8.28;
 
 import { IMessageService } from "../../../messaging/interfaces/IMessageService.sol";
 import { IGenericErrors } from "../../../interfaces/IGenericErrors.sol";

diff --git a/contracts/src/_testing/mocks/bridging/TestTokenBridge.sol b/contracts/src/_testing/mocks/bridging/TestTokenBridge.sol
@@ -3,6 +3,7 @@ pragma solidity 0.8.19;
 
 import { TokenBridge } from "../../../bridging/token/TokenBridge.sol";
 
+  /// @custom:oz-upgrades-unsafe-allow missing-initializer
 contract TestTokenBridge is TokenBridge {
   function testReturnDataToString(bytes memory _data) public pure returns (string memory) {
     return _returnDataToString(_data);

diff --git a/contracts/src/_testing/mocks/security/reentrancy/MaliciousERC777.sol b/contracts/src/_testing/mocks/security/reentrancy/MaliciousERC777.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.0;
+pragma solidity ^0.8.19;
 
 import { ReentrancyContract } from "./ReentrancyContract.sol";
 

diff --git a/contracts/src/_testing/unit/TestExternalCalls.sol b/contracts/src/_testing/unit/TestExternalCalls.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: AGPL-3.0
 
-pragma solidity 0.8.26;
+pragma solidity 0.8.28;
 
 interface ITestExternalCalls {
   function revertWithError() external pure;

diff --git a/contracts/src/_testing/unit/libraries/TestEfficientLeftRightKeccak.sol b/contracts/src/_testing/unit/libraries/TestEfficientLeftRightKeccak.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPL-3.0
-pragma solidity 0.8.26;
+pragma solidity 0.8.28;
 
 import { EfficientLeftRightKeccak } from "../../../libraries/EfficientLeftRightKeccak.sol";
 

diff --git a/contracts/src/_testing/unit/messaging/TestL1MessageManager.sol b/contracts/src/_testing/unit/messaging/TestL1MessageManager.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPL-3.0
-pragma solidity 0.8.26;
+pragma solidity 0.8.28;
 
 import { L1MessageManager } from "../../../messaging/l1/L1MessageManager.sol";
 

diff --git a/contracts/src/_testing/unit/messaging/TestL1MessageService.sol b/contracts/src/_testing/unit/messaging/TestL1MessageService.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPL-3.0
-pragma solidity 0.8.26;
+pragma solidity 0.8.28;
 
 import { L1MessageService } from "../../../messaging/l1/L1MessageService.sol";
 import { TestSetPauseTypeRoles } from "../security/TestSetPauseTypeRoles.sol";

diff --git a/contracts/src/_testing/unit/messaging/TestL1MessageServiceMerkleProof.sol b/contracts/src/_testing/unit/messaging/TestL1MessageServiceMerkleProof.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPL-3.0
-pragma solidity 0.8.26;
+pragma solidity 0.8.28;
 
 import { L1MessageService } from "../../../messaging/l1/L1MessageService.sol";
 import { IL1MessageService } from "../../../messaging/l1/interfaces/IL1MessageService.sol";

diff --git a/contracts/src/_testing/unit/messaging/TestL2MessageService.sol b/contracts/src/_testing/unit/messaging/TestL2MessageService.sol
@@ -3,6 +3,7 @@ pragma solidity 0.8.19;
 
 import { L2MessageService } from "../../../messaging/l2/L2MessageService.sol";
 
+  /// @custom:oz-upgrades-unsafe-allow missing-initializer
 contract TestL2MessageService is L2MessageService {
   address public originalSender;
   bool private reentryDone;

diff --git a/contracts/src/_testing/unit/messaging/TestMessageServiceBase.sol b/contracts/src/_testing/unit/messaging/TestMessageServiceBase.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPL-3.0
-pragma solidity >=0.8.19 <=0.8.26;
+pragma solidity 0.8.28;
 
 import { MessageServiceBase } from "../../../messaging/MessageServiceBase.sol";
 

diff --git a/contracts/src/_testing/unit/messaging/TestSparseMerkleTreeVerifier.sol b/contracts/src/_testing/unit/messaging/TestSparseMerkleTreeVerifier.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPL-3.0
-pragma solidity 0.8.26;
+pragma solidity 0.8.28;
 
 import { SparseMerkleTreeVerifier } from "../../../messaging/libraries/SparseMerkleTreeVerifier.sol";
 import { EfficientLeftRightKeccak } from "../../../libraries/EfficientLeftRightKeccak.sol";

diff --git a/contracts/src/_testing/unit/rollup/TestLineaRollup.sol b/contracts/src/_testing/unit/rollup/TestLineaRollup.sol
@@ -1,8 +1,9 @@
 // SPDX-License-Identifier: AGPL-3.0
-pragma solidity 0.8.26;
+pragma solidity 0.8.28;
 
 import { LineaRollup } from "../../../rollup/LineaRollup.sol";
 
+/// @custom:oz-upgrades-unsafe-allow missing-initializer
 contract TestLineaRollup is LineaRollup {
   function addRollingHash(uint256 _messageNumber, bytes32 _messageHash) external {
     _addRollingHash(_messageNumber, _messageHash);

diff --git a/contracts/src/_testing/unit/security/TestPauseManager.sol b/contracts/src/_testing/unit/security/TestPauseManager.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPL-3.0
-pragma solidity >=0.8.19 <=0.8.26;
+pragma solidity 0.8.19;
 
 import { PauseManager } from "../../../security/pausing/PauseManager.sol";
 import { TestSetPauseTypeRoles } from "./TestSetPauseTypeRoles.sol";

diff --git a/contracts/src/_testing/unit/security/TestRateLimiter.sol b/contracts/src/_testing/unit/security/TestRateLimiter.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPL-3.0
-pragma solidity >=0.8.19 <=0.8.26;
+pragma solidity 0.8.19;
 
 import { Initializable } from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 import { RateLimiter } from "../../../security/limiting/RateLimiter.sol";

diff --git a/contracts/src/_testing/unit/security/TestSetPauseTypeRoles.sol b/contracts/src/_testing/unit/security/TestSetPauseTypeRoles.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: AGPL-3.0
-pragma solidity >=0.8.19 <=0.8.26;
+pragma solidity ^0.8.19;
 
 import { PauseManager } from "../../../security/pausing/PauseManager.sol";
 
-contract TestSetPauseTypeRoles is PauseManager {
+abstract contract TestSetPauseTypeRoles is PauseManager {
   function initializePauseTypesAndPermissions(
     PauseTypeRole[] calldata _pauseTypeRoles,
     PauseTypeRole[] calldata _unpauseTypeRoles

diff --git a/contracts/src/_testing/unit/verifiers/TestPlonkVerifierForDataAggregation.sol b/contracts/src/_testing/unit/verifiers/TestPlonkVerifierForDataAggregation.sol
@@ -16,7 +16,7 @@
 
 // Code generated by gnark DO NOT EDIT
 
-pragma solidity 0.8.26;
+pragma solidity 0.8.28;
 
 contract TestPlonkVerifierForDataAggregation {
   uint256 private constant R_MOD = 21888242871839275222246405745257275088548364400416034343698204186575808495617;

diff --git a/contracts/src/governance/TimeLock.sol b/contracts/src/governance/TimeLock.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPL-3.0
-pragma solidity >=0.8.19 <=0.8.26;
+pragma solidity 0.8.19;
 
 import { TimelockController } from "@openzeppelin/contracts/governance/TimelockController.sol";
 

diff --git a/contracts/src/proxies/CallForwardingProxy.sol b/contracts/src/proxies/CallForwardingProxy.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPL-3.0
-pragma solidity 0.8.26;
+pragma solidity 0.8.28;
 
 /**
  * @title Contract to forward calls to an underlying contract.

diff --git a/contracts/src/recovery/RecoverFunds.sol b/contracts/src/recovery/RecoverFunds.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPL-3.0
-pragma solidity 0.8.26;
+pragma solidity 0.8.28;
 
 import { AccessControlUpgradeable } from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";
 import { IGenericErrors } from "../interfaces/IGenericErrors.sol";

diff --git a/contracts/src/rollup/LineaRollup.sol b/contracts/src/rollup/LineaRollup.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPL-3.0
-pragma solidity 0.8.26;
+pragma solidity 0.8.28;
 
 import { AccessControlUpgradeable } from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";
 import { L1MessageService } from "../messaging/l1/L1MessageService.sol";

diff --git a/contracts/src/verifiers/PlonkVerifierDev.sol b/contracts/src/verifiers/PlonkVerifierDev.sol
@@ -16,7 +16,7 @@
 
 // Code generated by gnark DO NOT EDIT
 
-pragma solidity 0.8.26;
+pragma solidity 0.8.28;
 
 contract PlonkVerifierDev {
   uint256 private constant R_MOD = 21888242871839275222246405745257275088548364400416034343698204186575808495617;

diff --git a/contracts/src/verifiers/PlonkVerifierForDataAggregation.sol b/contracts/src/verifiers/PlonkVerifierForDataAggregation.sol
@@ -16,7 +16,7 @@
 
 // Code generated by gnark DO NOT EDIT
 
-pragma solidity 0.8.26;
+pragma solidity 0.8.28;
 
 contract PlonkVerifierForDataAggregation {
   uint256 private constant R_MOD = 21888242871839275222246405745257275088548364400416034343698204186575808495617;

diff --git a/contracts/src/verifiers/PlonkVerifierForMultiTypeDataAggregation.sol b/contracts/src/verifiers/PlonkVerifierForMultiTypeDataAggregation.sol
@@ -16,7 +16,7 @@
 
 // Code generated by gnark DO NOT EDIT
 
-pragma solidity 0.8.26;
+pragma solidity 0.8.28;
 
 contract PlonkVerifierForMultiTypeDataAggregation {
   uint256 private constant R_MOD = 21888242871839275222246405745257275088548364400416034343698204186575808495617;

diff --git a/contracts/src/verifiers/PlonkVerifierSepoliaFull.sol b/contracts/src/verifiers/PlonkVerifierSepoliaFull.sol
@@ -16,7 +16,7 @@
 
 // Code generated by gnark DO NOT EDIT
 
-pragma solidity 0.8.26;
+pragma solidity 0.8.28;
 
 contract PlonkVerifierSepoliaFull {
   uint256 private constant R_MOD = 21888242871839275222246405745257275088548364400416034343698204186575808495617;

diff --git a/contracts/test/foundry/ExampleFoundryTest.t.sol b/contracts/test/foundry/ExampleFoundryTest.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity 0.8.26;
+pragma solidity 0.8.28;
 
 import "forge-std/Test.sol";
 

diff --git a/contracts/test/foundry/LineaRollup.t.sol b/contracts/test/foundry/LineaRollup.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPL-3.0
-pragma solidity 0.8.26;
+pragma solidity 0.8.28;
 
 import "forge-std/Test.sol";
 import "../../contracts/LineaRollup.sol";

diff --git a/e2e/package.json b/e2e/package.json
@@ -19,7 +19,7 @@
   "license": "ISC",
   "devDependencies": {
     "@jest/globals": "29.7.0",
-    "@openzeppelin/upgrades-core": "1.33.1",
+    "@openzeppelin/upgrades-core": "1.42.1",
     "@typechain/ethers-v6": "0.5.1",
     "@types/jest": "29.5.13",
     "async-mutex": "^0.5.0",