Bump oz, use networks from solidity-utils

1inch · Dec 18, 2023 · c791cb6 · c791cb6
1 parent 4ddde9c
commit c791cb6
Show file tree

Hide file tree

Showing 6 changed files with 461 additions and 85 deletions.
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
@@ -8,10 +8,10 @@
     },
     "license": "MIT",
     "dependencies": {
-        "@openzeppelin/contracts": "4.9.2"
+        "@openzeppelin/contracts": "5.0.1"
     },
     "devDependencies": {
-        "@1inch/solidity-utils": "3.0.1",
+        "@1inch/solidity-utils": "3.5.5",
         "@nomicfoundation/hardhat-chai-matchers": "2.0.1",
         "@nomicfoundation/hardhat-ethers": "3.0.4",
         "@nomicfoundation/hardhat-network-helpers": "1.0.8",