test: try back 0.8.24

morpho-org · Aug 16, 2024 · 19e31ac · 19e31ac
1 parent 142aeb9
commit 19e31ac
Show file tree

Hide file tree

Showing 25 changed files with 37 additions and 37 deletions.
diff --git a/.github/workflows/certora.yml b/.github/workflows/certora.yml
@@ -52,11 +52,11 @@ jobs:
           chmod +x solc-static-linux
           sudo mv solc-static-linux /usr/local/bin/solc-0.8.19
 
-      - name: Install solc (0.8.26)
+      - name: Install solc (0.8.24)
         run: |
-          wget https://github.com/ethereum/solidity/releases/download/v0.8.26/solc-static-linux
+          wget https://github.com/ethereum/solidity/releases/download/v0.8.24/solc-static-linux
           chmod +x solc-static-linux
-          sudo mv solc-static-linux /usr/local/bin/solc-0.8.26
+          sudo mv solc-static-linux /usr/local/bin/solc-0.8.24
 
       - name: Apply munging
         run: make -C certora munged

diff --git a/certora/README.md b/certora/README.md
@@ -4,7 +4,7 @@ This folder contains the verification of MetaMorpho using CVL, Certora's Verific
 
 The code is compiled using 2 versions of solidity, which must be installed to run the verification as:
 
-- `solc` for solidity compiler version 0.8.26 which is used for compiling MetaMorpho
+- `solc` for solidity compiler version 0.8.24 which is used for compiling MetaMorpho
 - `solc8.19` for solidity compiler version 0.8.19 which is used for compiling Morpho Blue.
 
 The verification is run on modified source files, which are made available by running:

diff --git a/certora/confs/ConsistentState.conf b/certora/confs/ConsistentState.conf
@@ -3,7 +3,7 @@
         "certora/helpers/MetaMorphoHarness.sol",
         "certora/helpers/Util.sol",
     ],
-    "solc": "solc-0.8.26",
+    "solc": "solc-0.8.24",
     "parametric_contracts": [
         "MetaMorphoHarness",
     ],

diff --git a/certora/confs/DistinctIdentifiers.conf b/certora/confs/DistinctIdentifiers.conf
@@ -2,7 +2,7 @@
     "files": [
         "certora/helpers/MetaMorphoHarness.sol",
     ],
-    "solc": "solc-0.8.26",
+    "solc": "solc-0.8.24",
     "verify": "MetaMorphoHarness:certora/specs/DistinctIdentifiers.spec",
     "loop_iter": "2",
     "optimistic_loop": true,

diff --git a/certora/confs/Enabled.conf b/certora/confs/Enabled.conf
@@ -2,7 +2,7 @@
     "files": [
         "certora/helpers/MetaMorphoHarness.sol",
     ],
-    "solc": "solc-0.8.26",
+    "solc": "solc-0.8.24",
     "verify": "MetaMorphoHarness:certora/specs/Enabled.spec",
     "loop_iter": "2",
     "optimistic_loop": true,

diff --git a/certora/confs/Immutability.conf b/certora/confs/Immutability.conf
@@ -2,7 +2,7 @@
     "files": [
         "certora/helpers/MetaMorphoHarness.sol",
     ],
-    "solc": "solc-0.8.26",
+    "solc": "solc-0.8.24",
     "verify": "MetaMorphoHarness:certora/specs/Immutability.spec",
     "loop_iter": "2",
     "optimistic_loop": true,

diff --git a/certora/confs/LastUpdated.conf b/certora/confs/LastUpdated.conf
@@ -6,8 +6,8 @@
     ],
     "solc_map": {
         "MorphoHarness": "solc-0.8.19",
-        "MetaMorphoHarness": "solc-0.8.26",
-        "Util": "solc-0.8.26",
+        "MetaMorphoHarness": "solc-0.8.24",
+        "Util": "solc-0.8.24",
     },
     "verify": "MetaMorphoHarness:certora/specs/LastUpdated.spec",
     "loop_iter": "2",

diff --git a/certora/confs/Liveness.conf b/certora/confs/Liveness.conf
@@ -9,8 +9,8 @@
     ],
     "solc_map": {
         "MorphoHarness": "solc-0.8.19",
-        "MetaMorphoHarness": "solc-0.8.26",
-        "Util": "solc-0.8.26",
+        "MetaMorphoHarness": "solc-0.8.24",
+        "Util": "solc-0.8.24",
     },
     "verify": "MetaMorphoHarness:certora/specs/Liveness.spec",
     "loop_iter": "2",

diff --git a/certora/confs/LostAssetsLink.conf b/certora/confs/LostAssetsLink.conf
@@ -5,9 +5,9 @@
         "certora/helpers/Util.sol",
     ],
     "solc_map": {
-        "MetaMorphoHarness": "solc-0.8.26",
+        "MetaMorphoHarness": "solc-0.8.24",
         "MorphoHarness": "solc-0.8.19",
-        "Util": "solc-0.8.26"
+        "Util": "solc-0.8.24"
     },
     "link": [
         "MetaMorphoHarness:MORPHO=MorphoHarness",

diff --git a/certora/confs/LostAssetsNoLink.conf b/certora/confs/LostAssetsNoLink.conf
@@ -2,7 +2,7 @@
     "files": [
         "certora/helpers/MetaMorphoHarness.sol",
     ],
-    "solc": "solc-0.8.26",
+    "solc": "solc-0.8.24",
     "verify": "MetaMorphoHarness:certora/specs/LostAssetsNoLink.spec",
     "loop_iter": "2",
     "optimistic_loop": true,

diff --git a/certora/confs/MarketInteractions.conf b/certora/confs/MarketInteractions.conf
@@ -3,7 +3,7 @@
         "certora/helpers/MetaMorphoHarness.sol",
         "certora/helpers/Util.sol",
     ],
-    "solc": "solc-0.8.26",
+    "solc": "solc-0.8.24",
     "parametric_contracts": [
         "MetaMorphoHarness",
     ],

diff --git a/certora/confs/PendingValues.conf b/certora/confs/PendingValues.conf
@@ -2,7 +2,7 @@
     "files": [
         "certora/helpers/MetaMorphoHarness.sol",
     ],
-    "solc": "solc-0.8.26",
+    "solc": "solc-0.8.24",
     "verify": "MetaMorphoHarness:certora/specs/PendingValues.spec",
     "loop_iter": "2",
     "optimistic_loop": true,

diff --git a/certora/confs/Range.conf b/certora/confs/Range.conf
@@ -2,7 +2,7 @@
     "files": [
         "certora/helpers/MetaMorphoHarness.sol",
     ],
-    "solc": "solc-0.8.26",
+    "solc": "solc-0.8.24",
     "verify": "MetaMorphoHarness:certora/specs/Range.spec",
     "loop_iter": "2",
     "optimistic_loop": true,

diff --git a/certora/confs/Reentrancy.conf b/certora/confs/Reentrancy.conf
@@ -2,7 +2,7 @@
     "files": [
         "certora/helpers/MetaMorphoHarness.sol",
     ],
-    "solc": "solc-0.8.26",
+    "solc": "solc-0.8.24",
     "verify": "MetaMorphoHarness:certora/specs/Reentrancy.spec",
     "loop_iter": "2",
     "optimistic_loop": true,

diff --git a/certora/confs/Reverts.conf b/certora/confs/Reverts.conf
@@ -10,9 +10,9 @@
     ],
     "solc_map": {
         "MorphoHarness": "solc-0.8.19",
-        "MetaMorphoHarness": "solc-0.8.26",
-        "Util": "solc-0.8.26",
-        "ERC20Standard": "solc-0.8.26",
+        "MetaMorphoHarness": "solc-0.8.24",
+        "Util": "solc-0.8.24",
+        "ERC20Standard": "solc-0.8.24",
     },
     "verify": "MetaMorphoHarness:certora/specs/Reverts.spec",
     "loop_iter": "2",

diff --git a/certora/confs/Roles.conf b/certora/confs/Roles.conf
@@ -2,7 +2,7 @@
     "files": [
         "certora/helpers/MetaMorphoHarness.sol",
     ],
-    "solc": "solc-0.8.26",
+    "solc": "solc-0.8.24",
     "verify": "MetaMorphoHarness:certora/specs/Roles.spec",
     "loop_iter": "2",
     "optimistic_loop": true,

diff --git a/certora/confs/Timelock.conf b/certora/confs/Timelock.conf
@@ -8,7 +8,7 @@
     ],
     "solc_map": {
         "MorphoHarness": "solc-0.8.19",
-        "MetaMorphoHarness": "solc-0.8.26",
+        "MetaMorphoHarness": "solc-0.8.24",
     },
     "verify": "MetaMorphoHarness:certora/specs/Timelock.spec",
     "loop_iter": "2",

diff --git a/certora/confs/Tokens.conf b/certora/confs/Tokens.conf
@@ -12,11 +12,11 @@
     ],
     "solc_map": {
         "MorphoHarness": "solc-0.8.19",
-        "MetaMorphoHarness": "solc-0.8.26",
-        "Util": "solc-0.8.26",
-        "ERC20NoRevert": "solc-0.8.26",
-        "ERC20Standard": "solc-0.8.26",
-        "ERC20USDT": "solc-0.8.26",
+        "MetaMorphoHarness": "solc-0.8.24",
+        "Util": "solc-0.8.24",
+        "ERC20NoRevert": "solc-0.8.24",
+        "ERC20Standard": "solc-0.8.24",
+        "ERC20USDT": "solc-0.8.24",
     },
     "verify": "MetaMorphoHarness:certora/specs/Tokens.spec",
     "loop_iter": "2",

diff --git a/certora/helpers/IMorphoHarness.sol b/certora/helpers/IMorphoHarness.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
-pragma solidity 0.8.26;
+pragma solidity 0.8.24;
 
 import {Id, MarketParams, Market, IMorpho} from "../../lib/morpho-blue/src/interfaces/IMorpho.sol";
 

diff --git a/certora/helpers/MetaMorphoHarness.sol b/certora/helpers/MetaMorphoHarness.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
-pragma solidity 0.8.26;
+pragma solidity 0.8.24;
 
 import {
     Math, MetaMorpho, Id, ConstantsLib, PendingUint192, PendingAddress, MarketConfig

diff --git a/certora/helpers/Util.sol b/certora/helpers/Util.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
-pragma solidity 0.8.26;
+pragma solidity 0.8.24;
 
 import {
     MarketParams,

diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -68,7 +68,7 @@ const config: HardhatUserConfig = {
   solidity: {
     compilers: [
       {
-        version: "0.8.26",
+        version: "0.8.24",
         settings: {
           optimizer: {
             enabled: false,

diff --git a/src/MetaMorpho.sol b/src/MetaMorpho.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
-pragma solidity 0.8.26;
+pragma solidity 0.8.24;
 
 import {
     MarketConfig,

diff --git a/src/MetaMorphoFactory.sol b/src/MetaMorphoFactory.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
-pragma solidity 0.8.26;
+pragma solidity 0.8.24;
 
 import {IMetaMorpho} from "./interfaces/IMetaMorpho.sol";
 import {IMetaMorphoFactory} from "./interfaces/IMetaMorphoFactory.sol";

diff --git a/test/forge/helpers/IntegrationTest.sol b/test/forge/helpers/IntegrationTest.sol
@@ -41,8 +41,8 @@ contract IntegrationTest is BaseTest {
     }
 
     // Deploy MetaMorpho from artifacts
-    // Replaces using `new MetaMorpho` which would force 0.8.26 on all tests
-    // (since MetaMorpho has pragma solidity 0.8.26)
+    // Replaces using `new MetaMorpho` which would force 0.8.24 on all tests
+    // (since MetaMorpho has pragma solidity 0.8.24)
     function createMetaMorpho(
         address owner,
         address morpho,