upgrade to solidity 0.8.26

DePayFi · Sep 17, 2024 · c4375b6 · c4375b6
1 parent 6306b90
commit c4375b6
Show file tree

Hide file tree

Showing 29 changed files with 170 additions and 472 deletions.
diff --git a/.github/workflows/test-foundry.yml b/.github/workflows/test-foundry.yml
@@ -28,7 +28,7 @@ jobs:
 
       - uses: actions/setup-node@v2
         with:
-          node-version: '16'
+          node-version: '18'
 
       # Runs a single command using the runners shell
       - name: Install packages

diff --git a/.github/workflows/test-on-arbitrum.yml b/.github/workflows/test-on-arbitrum.yml
@@ -31,7 +31,7 @@ jobs:
 
       - uses: actions/setup-node@v2
         with:
-          node-version: '16'
+          node-version: '18'
 
       # Runs a single command using the runners shell
       - name: Install packages

diff --git a/.github/workflows/test-on-avalanche.yml b/.github/workflows/test-on-avalanche.yml
@@ -31,7 +31,7 @@ jobs:
 
       - uses: actions/setup-node@v2
         with:
-          node-version: '16'
+          node-version: '18'
 
       # Runs a single command using the runners shell
       - name: Install packages

diff --git a/.github/workflows/test-on-bsc.yml b/.github/workflows/test-on-bsc.yml
@@ -31,7 +31,7 @@ jobs:
 
       - uses: actions/setup-node@v2
         with:
-          node-version: '16'
+          node-version: '18'
 
       # Runs a single command using the runners shell
       - name: Install packages

diff --git a/.github/workflows/test-on-ethereum.yml b/.github/workflows/test-on-ethereum.yml
@@ -31,7 +31,7 @@ jobs:
 
       - uses: actions/setup-node@v2
         with:
-          node-version: '16'
+          node-version: '18'
 
       # Runs a single command using the runners shell
       - name: Install packages

diff --git a/.github/workflows/test-on-fantom.yml b/.github/workflows/test-on-fantom.yml
@@ -31,7 +31,7 @@ jobs:
 
       - uses: actions/setup-node@v2
         with:
-          node-version: '16'
+          node-version: '18'
 
       # Runs a single command using the runners shell
       - name: Install packages

diff --git a/.github/workflows/test-on-gnosis.yml b/.github/workflows/test-on-gnosis.yml
@@ -31,7 +31,7 @@ jobs:
 
       - uses: actions/setup-node@v2
         with:
-          node-version: '16'
+          node-version: '18'
 
       # Runs a single command using the runners shell
       - name: Install packages

diff --git a/.github/workflows/test-on-optimism.yml b/.github/workflows/test-on-optimism.yml
@@ -31,7 +31,7 @@ jobs:
 
       - uses: actions/setup-node@v2
         with:
-          node-version: '16'
+          node-version: '18'
 
       # Runs a single command using the runners shell
       - name: Install packages

diff --git a/.github/workflows/test-on-polygon.yml b/.github/workflows/test-on-polygon.yml
@@ -31,7 +31,7 @@ jobs:
 
       - uses: actions/setup-node@v2
         with:
-          node-version: '16'
+          node-version: '18'
 
       # Runs a single command using the runners shell
       - name: Install packages

diff --git a/contracts/DePayForwarderV3.sol b/contracts/DePayForwarderV3.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: BUSL-1.1
 
-pragma solidity 0.8.18;
+pragma solidity 0.8.26;
 
 import "@openzeppelin/contracts/access/Ownable2Step.sol";
 import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";

diff --git a/contracts/DePayRouterV3.sol b/contracts/DePayRouterV3.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: BUSL-1.1
 
-pragma solidity 0.8.18;
+pragma solidity 0.8.26;
 
 import "@openzeppelin/contracts/access/Ownable2Step.sol";
 import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";

diff --git a/contracts/DePayWETHExchangeV1.sol b/contracts/DePayWETHExchangeV1.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: BUSL-1.1
 
-pragma solidity 0.8.18;
+pragma solidity 0.8.26;
 
 import './interfaces/IWETH.sol';
 

diff --git a/contracts/TestReceiver.sol b/contracts/TestReceiver.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: BUSL-1.1
 
-pragma solidity 0.8.18;
+pragma solidity 0.8.26;
 
 import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 

diff --git a/contracts/interfaces/IDePayForwarderV3.sol b/contracts/interfaces/IDePayForwarderV3.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: BUSL-1.1
 
-pragma solidity 0.8.18;
+pragma solidity 0.8.26;
 
 import './IDePayRouterV3.sol';
 

diff --git a/contracts/interfaces/IDePayRouterV3.sol b/contracts/interfaces/IDePayRouterV3.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: BUSL-1.1
 
-pragma solidity 0.8.18;
+pragma solidity 0.8.26;
 
 import './IPermit2.sol';
 

diff --git a/contracts/interfaces/IPermit2.sol b/contracts/interfaces/IPermit2.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.18;
+pragma solidity 0.8.26;
 
 interface IPermit2 {
 

diff --git a/contracts/interfaces/IWETH.sol b/contracts/interfaces/IWETH.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.18;
+pragma solidity 0.8.26;
 
 interface IWETH {
 

diff --git a/flatten/DePayForwarderV3.sol b/flatten/DePayForwarderV3.sol
@@ -712,7 +712,7 @@ library SafeERC20 {
 // Dependency file: contracts/interfaces/IPermit2.sol
 
 
-// pragma solidity 0.8.18;
+// pragma solidity 0.8.26;
 
 interface IPermit2 {
 
@@ -759,7 +759,7 @@ interface IPermit2 {
 // Dependency file: contracts/interfaces/IDePayRouterV3.sol
 
 
-// pragma solidity 0.8.18;
+// pragma solidity 0.8.26;
 
 // import 'contracts/interfaces/IPermit2.sol';
 
@@ -813,7 +813,7 @@ interface IDePayRouterV3 {
 // Root file: contracts/DePayForwarderV3.sol
 
 
-pragma solidity 0.8.18;
+pragma solidity 0.8.26;
 
 // import "@openzeppelin/contracts/access/Ownable2Step.sol";
 // import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";

diff --git a/flatten/DePayRouterV3.sol b/flatten/DePayRouterV3.sol
@@ -712,7 +712,7 @@ library SafeERC20 {
 // Dependency file: contracts/interfaces/IPermit2.sol
 
 
-// pragma solidity 0.8.18;
+// pragma solidity 0.8.26;
 
 interface IPermit2 {
 
@@ -759,7 +759,7 @@ interface IPermit2 {
 // Dependency file: contracts/interfaces/IDePayRouterV3.sol
 
 
-// pragma solidity 0.8.18;
+// pragma solidity 0.8.26;
 
 // import 'contracts/interfaces/IPermit2.sol';
 
@@ -813,7 +813,7 @@ interface IDePayRouterV3 {
 // Dependency file: contracts/interfaces/IDePayForwarderV3.sol
 
 
-// pragma solidity 0.8.18;
+// pragma solidity 0.8.26;
 
 // import 'contracts/interfaces/IDePayRouterV3.sol';
 
@@ -831,7 +831,7 @@ interface IDePayForwarderV3 {
 // Root file: contracts/DePayRouterV3.sol
 
 
-pragma solidity 0.8.18;
+pragma solidity 0.8.26;
 
 // import "@openzeppelin/contracts/access/Ownable2Step.sol";
 // import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";

diff --git a/flatten/DePayWETHExchangeV1.sol b/flatten/DePayWETHExchangeV1.sol
@@ -2,7 +2,7 @@
 
 // SPDX-License-Identifier: MIT
 
-// pragma solidity 0.8.18;
+// pragma solidity 0.8.26;
 
 interface IWETH {
 
@@ -15,7 +15,7 @@ interface IWETH {
 // Root file: contracts/DePayWETHExchangeV1.sol
 
 
-pragma solidity 0.8.18;
+pragma solidity 0.8.26;
 
 // import 'contracts/interfaces/IWETH.sol';
 

diff --git a/flatten/IDePayForwarderV3.sol b/flatten/IDePayForwarderV3.sol
@@ -2,7 +2,7 @@
 
 // SPDX-License-Identifier: MIT
 
-// pragma solidity 0.8.18;
+// pragma solidity 0.8.26;
 
 interface IPermit2 {
 
@@ -49,7 +49,7 @@ interface IPermit2 {
 // Dependency file: contracts/interfaces/IDePayRouterV3.sol
 
 
-// pragma solidity 0.8.18;
+// pragma solidity 0.8.26;
 
 // import 'contracts/interfaces/IPermit2.sol';
 
@@ -103,7 +103,7 @@ interface IDePayRouterV3 {
 // Root file: contracts/interfaces/IDePayForwarderV3.sol
 
 
-pragma solidity 0.8.18;
+pragma solidity 0.8.26;
 
 // import 'contracts/interfaces/IDePayRouterV3.sol';
 

diff --git a/flatten/IDePayRouterV3.sol b/flatten/IDePayRouterV3.sol
@@ -2,7 +2,7 @@
 
 // SPDX-License-Identifier: MIT
 
-// pragma solidity 0.8.18;
+// pragma solidity 0.8.26;
 
 interface IPermit2 {
 
@@ -49,7 +49,7 @@ interface IPermit2 {
 // Root file: contracts/interfaces/IDePayRouterV3.sol
 
 
-pragma solidity 0.8.18;
+pragma solidity 0.8.26;
 
 // import 'contracts/interfaces/IPermit2.sol';
 

diff --git a/flatten/IPermit2.sol b/flatten/IPermit2.sol
@@ -2,7 +2,7 @@
 
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.18;
+pragma solidity 0.8.26;
 
 interface IPermit2 {
 

diff --git a/flatten/IWETH.sol b/flatten/IWETH.sol
@@ -2,7 +2,7 @@
 
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.18;
+pragma solidity 0.8.26;
 
 interface IWETH {
 

diff --git a/flatten/TestReceiver.sol b/flatten/TestReceiver.sol
@@ -539,7 +539,7 @@ library SafeERC20 {
 // Root file: contracts/TestReceiver.sol
 
 
-pragma solidity 0.8.18;
+pragma solidity 0.8.26;
 
 // import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 

diff --git a/hardhat.config.shared.ts b/hardhat.config.shared.ts
@@ -21,7 +21,7 @@ var {
 
 const sharedConfig = {
   solidity: {
-    version: '0.8.18',
+    version: '0.8.26',
     settings: {
       optimizer: {
         enabled: true,

diff --git a/package.json b/package.json
@@ -30,9 +30,8 @@
     "@depay/web3-client-evm": "^10.16.3",
     "@depay/web3-exchanges-evm": "^13.2.3",
     "@depay/web3-tokens-evm": "^10.1.0",
-    "@nomiclabs/hardhat-ethers": "^2.0.2",
-    "@nomiclabs/hardhat-etherscan": "^2.1.1",
-    "@nomiclabs/hardhat-waffle": "^2.0.1",
+    "@nomiclabs/hardhat-ethers": "^2.2.3",
+    "@nomiclabs/hardhat-waffle": "^2.0.6",
     "@typechain/ethers-v5": "^4.0.0",
     "@types/chai": "^4.2.6",
     "@types/mocha": "^5.2.7",
@@ -42,7 +41,7 @@
     "dotenv": "^16.3.0",
     "ethereum-waffle": "^3.0.2",
     "ethers": "^5.0.8",
-    "hardhat": "^2.17.1",
+    "hardhat": "^2.22.10",
     "hardhat-typechain": "^0.3.5",
     "import-toml": "1.0.0",
     "mocha": "^6.2.2",

diff --git a/waffle.json b/waffle.json
@@ -1,6 +1,6 @@
 {
   "compilerType": "solcjs",
-  "compilerVersion": "0.8.18",
+  "compilerVersion": "0.8.26",
   "sourceDirectory": "./contracts",
   "outputDirectory": "./build"
 }