Merge pull request #5 from 1inch/feature/bump-solidity

[SC-989][SC-990] Solidity 0.8.23, OZ 5.0.0
1inch · Dec 20, 2023 · 9a8a94b · 9a8a94b
2 parents 4ddde9c + 9fe3c27
commit 9a8a94b
Show file tree

Hide file tree

Showing 7 changed files with 1,123 additions and 466 deletions.
diff --git a/.solcover.js b/.solcover.js
@@ -4,22 +4,22 @@ module.exports = {
         yul: true,
         yulDetails: {
             optimizerSteps:
-                "dhfoDgvlfnTUtnIf" +               // None of these can make stack problems worse
-                "[" +
-                    "xa[r]EscLM" +                 // Turn into SSA and simplify
-                    "cCTUtTOntnfDIl" +             // Perform structural simplification
-                    "Lcl" +                        // Simplify again
-                    "Vcl [j]" +                    // Reverse SSA
+                'dhfoDgvlfnTUtnIf' +                // None of these can make stack problems worse
+                '[' +
+                    'xa[r]EscLM' +                  // Turn into SSA and simplify
+                    'cCTUtTOntnfDIl' +              // Perform structural simplification
+                    'Lcl' +                         // Simplify again
+                    'Vcl [j]' +                     // Reverse SSA
 
-                    // should have good "compilability" property here.
+                // should have good 'compilability' property here.
 
-                    "Tpel" +                       // Run functional expression inliner
-                    "xa[rl]" +                     // Prune a bit more in SSA
-                    "xa[r]cL" +                    // Turn into SSA again and simplify
-                    "gvf" +                        // Run full inliner
-                    "CTUca[r]LSsTFOtfDnca[r]Ilc" + // SSA plus simplify
-                "]" +
-                "jml[jl] VcTOcl jml",
+                    'Tpel' +                        // Run functional expression inliner
+                    'xa[rl]' +                      // Prune a bit more in SSA
+                    'xa[r]cL' +                     // Turn into SSA again and simplify
+                    'gvf' +                         // Run full inliner
+                    'CTUca[r]LSsTFOtfDnca[r]Ilc' +  // SSA plus simplify
+                ']' +
+                'jml[jl] VcTOcl jml : fDnTOcm',     // Make source short and pretty
         },
     },
     skipFiles: ['mocks', 'interfaces'],

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,3 +1,3 @@
 {
-    "solidity.compileUsingRemoteVersion": "0.8.19"
+    "solidity.compileUsingRemoteVersion": "0.8.23"
 }
diff --git a/contracts/mocks/DecompressorExtensionMock.sol b/contracts/mocks/DecompressorExtensionMock.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 import { TokenMock } from "@1inch/solidity-utils/contracts/mocks/TokenMock.sol";
 import { DecompressorExtension } from "../DecompressorExtension.sol";

diff --git a/hardhat.config.js b/hardhat.config.js
@@ -7,21 +7,24 @@ require('hardhat-deploy');
 require('hardhat-gas-reporter');
 require('hardhat-tracer');
 require('dotenv').config();
+const { Networks, getNetwork } = require('@1inch/solidity-utils/hardhat-setup');
 
-const { networks } = require('./hardhat.networks');
+const { networks, etherscan } = (new Networks()).registerAll();
 
 module.exports = {
     solidity: {
-        version: '0.8.19',
+        version: '0.8.23',
         settings: {
             optimizer: {
                 enabled: true,
                 runs: 1000000,
             },
+            evmVersion: networks[getNetwork()]?.hardfork || 'shanghai',
             viaIR: true,
         },
     },
     networks,
+    etherscan,
     gasReporter: {
         enabled: true,
         currency: 'USD',

diff --git a/hardhat.networks.js b/hardhat.networks.js
diff --git a/package.json b/package.json
@@ -1,38 +1,38 @@
 {
     "name": "@1inch/calldata-compressor",
-    "version": "0.0.5",
+    "version": "0.0.6",
     "description": "1inch calldata compressor",
     "repository": {
         "type": "git",
         "url": "[email protected]:1inch/calldata-compressor.git"
     },
     "license": "MIT",
     "dependencies": {
-        "@openzeppelin/contracts": "4.9.2"
+        "@openzeppelin/contracts": "5.0.1"
     },
     "devDependencies": {
-        "@1inch/solidity-utils": "3.0.1",
-        "@nomicfoundation/hardhat-chai-matchers": "2.0.1",
-        "@nomicfoundation/hardhat-ethers": "3.0.4",
-        "@nomicfoundation/hardhat-network-helpers": "1.0.8",
-        "@nomicfoundation/hardhat-verify": "1.0.4",
-        "chai": "4.3.7",
+        "@1inch/solidity-utils": "3.5.5",
+        "@nomicfoundation/hardhat-chai-matchers": "2.0.2",
+        "@nomicfoundation/hardhat-ethers": "3.0.5",
+        "@nomicfoundation/hardhat-network-helpers": "1.0.10",
+        "@nomicfoundation/hardhat-verify": "2.0.2",
+        "chai": "4.3.10",
         "dotenv": "16.3.1",
-        "eslint": "8.45.0",
+        "eslint": "8.56.0",
         "eslint-config-standard": "17.1.0",
-        "eslint-plugin-import": "2.27.5",
-        "eslint-plugin-n": "16.0.1",
+        "eslint-plugin-import": "2.29.1",
+        "eslint-plugin-n": "16.4.0",
         "eslint-plugin-promise": "6.1.1",
-        "ethers": "6.6.5",
-        "hardhat": "2.17.0",
+        "ethers": "6.9.0",
+        "hardhat": "2.19.2",
         "hardhat-dependency-compiler": "1.1.3",
-        "hardhat-deploy": "0.11.34",
+        "hardhat-deploy": "0.11.45",
         "hardhat-gas-reporter": "1.0.9",
-        "hardhat-tracer": "2.5.1",
-        "rimraf": "5.0.1",
-        "solc": "0.8.21",
-        "solhint": "3.4.1",
-        "solidity-coverage": "0.8.4"
+        "hardhat-tracer": "2.7.0",
+        "rimraf": "5.0.5",
+        "solc": "0.8.23",
+        "solhint": "4.0.0",
+        "solidity-coverage": "0.8.5"
     },
     "scripts": {
         "clean": "rimraf artifacts cache coverage contracts/hardhat-dependency-compiler",