Merge pull request #33 from 1inch/fix/dependabot-issues

[SC-1220][SC-1225] Fix dependabot issues
1inch · Aug 6, 2024 · f92d805 · f92d805
2 parents db90224 + 0ddcf6f
commit f92d805
Show file tree

Hide file tree

Showing 10 changed files with 1,289 additions and 1,075 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -28,7 +28,6 @@ jobs:
       - run: yarn
       - run: yarn test
         env:
-          RPC_AUTH_HEADER: ${{ secrets.RPC_AUTH_HEADER }}
           MAINNET_RPC_URL: ${{ secrets.MAINNET_RPC_URL }}
           AVAX_RPC_URL: ${{ secrets.AVAX_RPC_URL}}
           ARBITRUM_RPC_URL: ${{ secrets.ARBITRUM_RPC_URL }}
@@ -44,7 +43,6 @@ jobs:
       - run: yarn
       - run: yarn coverage
         env:
-          RPC_AUTH_HEADER: ${{ secrets.RPC_AUTH_HEADER }}
           MAINNET_RPC_URL: ${{ secrets.MAINNET_RPC_URL }}
           AVAX_RPC_URL: ${{ secrets.AVAX_RPC_URL}}
           ARBITRUM_RPC_URL: ${{ secrets.ARBITRUM_RPC_URL }}

diff --git a/hardhat.config.js b/hardhat.config.js
@@ -1,7 +1,5 @@
 require('@matterlabs/hardhat-zksync-deploy');
 require('@matterlabs/hardhat-zksync-solc');
-require('@matterlabs/hardhat-zksync-verify');
-require('@nomicfoundation/hardhat-verify');
 require('@nomicfoundation/hardhat-ethers');
 require('dotenv').config();
 require('hardhat-deploy');
@@ -10,7 +8,13 @@ require('solidity-coverage');
 require('hardhat-tracer');
 const { Networks, getNetwork } = require('@1inch/solidity-utils/hardhat-setup');
 
-const { networks, etherscan } = (new Networks()).registerAll();
+if (getNetwork().indexOf('zksync') !== -1) {
+    require('@matterlabs/hardhat-zksync-verify');
+} else {
+    require('@nomicfoundation/hardhat-verify');
+}
+
+const { networks, etherscan } = (new Networks(true, 'mainnet', true)).registerAll();
 
 module.exports = {
     etherscan,

diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@1inch/solidity-utils": "3.8.2",
+    "@1inch/solidity-utils": "5.2.1",
     "@openzeppelin/contracts": "5.0.1",
     "@uniswap/v3-core": "1.0.1"
   },

diff --git a/test/AlgebraHelper.js b/test/AlgebraHelper.js
@@ -1,25 +1,14 @@
 const { ethers, network } = require('hardhat');
 const { expect } = require('@1inch/solidity-utils');
+const { resetHardhatNetworkFork } = require('@1inch/solidity-utils/hardhat-setup');
 
 describe('AlgebraHelper', function () {
     before(async function () {
-        await network.provider.request({ // take arbitrum fork
-            method: 'hardhat_reset',
-            params: [
-                {
-                    forking: {
-                        jsonRpcUrl: process.env.ARBITRUM_RPC_URL,
-                    },
-                },
-            ],
-        });
+        await resetHardhatNetworkFork(network, 'arbitrum');
     });
 
     after(async function () {
-        await network.provider.request({ // reset back to local network
-            method: 'hardhat_reset',
-            params: [],
-        });
+        await resetHardhatNetworkFork(network, 'hardhat');
     });
 
     it('should show some ticks for weth-usdc pair', async function () {

diff --git a/test/CurveLlammaHelper.js b/test/CurveLlammaHelper.js
@@ -1,27 +1,13 @@
+const { resetHardhatNetworkFork } = require('@1inch/solidity-utils/hardhat-setup');
 const { ethers, network } = require('hardhat');
 
 describe('CurveLlammaHelper', function () {
     before(async function () {
-        await network.provider.request({ // take mainnet fork
-            method: 'hardhat_reset',
-            params: [
-                {
-                    forking: {
-                        jsonRpcUrl: process.env.MAINNET_RPC_URL,
-                        httpHeaders: {
-                            'auth-key': process.env.RPC_AUTH_HEADER,
-                        },
-                    },
-                },
-            ],
-        });
+        await resetHardhatNetworkFork(network, 'mainnet');
     });
 
     after(async function () {
-        await network.provider.request({ // reset back to local network
-            method: 'hardhat_reset',
-            params: [],
-        });
+        await resetHardhatNetworkFork(network, 'hardhat');
     });
 
     it('should show some ticks for sFRX-crvUSD pair', async function () {

diff --git a/test/SolidlyV3Helper.js b/test/SolidlyV3Helper.js
@@ -1,28 +1,14 @@
 const { ethers, network } = require('hardhat');
 const { expect } = require('@1inch/solidity-utils');
+const { resetHardhatNetworkFork } = require('@1inch/solidity-utils/hardhat-setup');
 
 describe('SolidlyV3Helper', function () {
     before(async function () {
-        await network.provider.request({ // take mainnet fork
-            method: 'hardhat_reset',
-            params: [
-                {
-                    forking: {
-                        jsonRpcUrl: process.env.MAINNET_RPC_URL,
-                        httpHeaders: {
-                            'auth-key': process.env.RPC_AUTH_HEADER,
-                        },
-                    },
-                },
-            ],
-        });
+        await resetHardhatNetworkFork(network, 'mainnet');
     });
 
     after(async function () {
-        await network.provider.request({ // reset back to local network
-            method: 'hardhat_reset',
-            params: [],
-        });
+        await resetHardhatNetworkFork(network, 'hardhat');
     });
 
     it('should show some ticks for weth-usdc pair', async function () {

diff --git a/test/TraderJoeHelper.js b/test/TraderJoeHelper.js
@@ -1,25 +1,14 @@
 const { ethers, network } = require('hardhat');
 const { expect } = require('@1inch/solidity-utils');
+const { resetHardhatNetworkFork } = require('@1inch/solidity-utils/hardhat-setup');
 
 describe('TraderJoeHelper', function () {
     before(async function () {
-        await network.provider.request({ // take avalanch fork
-            method: 'hardhat_reset',
-            params: [
-                {
-                    forking: {
-                        jsonRpcUrl: process.env.AVAX_RPC_URL,
-                    },
-                },
-            ],
-        });
+        await resetHardhatNetworkFork(network, 'avax');
     });
 
     after(async function () {
-        await network.provider.request({ // reset back to local network
-            method: 'hardhat_reset',
-            params: [],
-        });
+        await resetHardhatNetworkFork(network, 'hardhat');
     });
 
     it('should show some bins for usdc-usdc.e pair', async function () {

diff --git a/test/TraderJoeHelper_v2_1.js b/test/TraderJoeHelper_v2_1.js
@@ -1,25 +1,14 @@
 const { ethers, network } = require('hardhat');
 const { expect } = require('@1inch/solidity-utils');
+const { resetHardhatNetworkFork } = require('@1inch/solidity-utils/hardhat-setup');
 
 describe('TraderJoeHelper_v2_1', function () {
     before(async function () {
-        await network.provider.request({ // take avalanch fork
-            method: 'hardhat_reset',
-            params: [
-                {
-                    forking: {
-                        jsonRpcUrl: process.env.AVAX_RPC_URL,
-                    },
-                },
-            ],
-        });
+        await resetHardhatNetworkFork(network, 'avax');
     });
 
     after(async function () {
-        await network.provider.request({ // reset back to local network
-            method: 'hardhat_reset',
-            params: [],
-        });
+        await resetHardhatNetworkFork(network, 'hardhat');
     });
 
     it('should show some bins for usdc-dai.e pair', async function () {

diff --git a/test/UniV3Helper.js b/test/UniV3Helper.js
@@ -1,28 +1,14 @@
 const { ethers, network } = require('hardhat');
 const { expect } = require('@1inch/solidity-utils');
+const { resetHardhatNetworkFork } = require('@1inch/solidity-utils/hardhat-setup');
 
 describe('UniV3Helper', function () {
     before(async function () {
-        await network.provider.request({ // take mainnet fork
-            method: 'hardhat_reset',
-            params: [
-                {
-                    forking: {
-                        jsonRpcUrl: process.env.MAINNET_RPC_URL,
-                        httpHeaders: {
-                            'auth-key': process.env.RPC_AUTH_HEADER,
-                        },
-                    },
-                },
-            ],
-        });
+        await resetHardhatNetworkFork(network, 'mainnet');
     });
 
     after(async function () {
-        await network.provider.request({ // reset back to local network
-            method: 'hardhat_reset',
-            params: [],
-        });
+        await resetHardhatNetworkFork(network, 'hardhat');
     });
 
     it('should show some ticks for dai-usdc pair', async function () {