Merge pull request #72 from darcys22/upgrade-solidity

Upgrade solidity
oxen-io · Aug 30, 2024 · 26fc3ab · 26fc3ab
2 parents c8357be + a51a8e2
commit 26fc3ab
Show file tree

Hide file tree

Showing 23 changed files with 24 additions and 24 deletions.
diff --git a/contracts/RewardRatePool.sol b/contracts/RewardRatePool.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.26;
 
 import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 import "@openzeppelin/contracts-upgradeable/access/Ownable2StepUpgradeable.sol";

diff --git a/contracts/SENT.sol b/contracts/SENT.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.26;
 
 import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";

diff --git a/contracts/ServiceNodeContribution.sol b/contracts/ServiceNodeContribution.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.26;
 
 import "./libraries/Shared.sol";
 import "./interfaces/IServiceNodeRewards.sol";

diff --git a/contracts/ServiceNodeContributionFactory.sol b/contracts/ServiceNodeContributionFactory.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.26;
 
 import "./ServiceNodeContribution.sol";
 import "./interfaces/IServiceNodeRewards.sol";

diff --git a/contracts/ServiceNodeRewards.sol b/contracts/ServiceNodeRewards.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.26;
 
 import "./interfaces/IServiceNodeRewards.sol";
 

diff --git a/contracts/interfaces/IServiceNodeRewards.sol b/contracts/interfaces/IServiceNodeRewards.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.26;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import "../libraries/BN256G1.sol";

diff --git a/contracts/interfaces/ITokenVestingNoStaking.sol b/contracts/interfaces/ITokenVestingNoStaking.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.26;
 
 import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 

diff --git a/contracts/interfaces/ITokenVestingStaking.sol b/contracts/interfaces/ITokenVestingStaking.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.26;
 
 import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 import "../interfaces/IServiceNodeRewards.sol";

diff --git a/contracts/libraries/BN256G1.sol b/contracts/libraries/BN256G1.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.26;
 
 library BN256G1 {
     uint256 internal constant FIELD_MODULUS = 0x30644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd47;

diff --git a/contracts/libraries/BN256G2.sol b/contracts/libraries/BN256G2.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.26;
 
 /**
  * @title Elliptic curve operations on twist points for alt_bn128

diff --git a/contracts/libraries/Pairing.sol b/contracts/libraries/Pairing.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.26;
 
 import "./BN256G1.sol";
 import "./BN256G2.sol";

diff --git a/contracts/libraries/Shared.sol b/contracts/libraries/Shared.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.26;
 
 /**
  * @title    Shared contract

diff --git a/contracts/test/BN256G2EchidnaTest.sol b/contracts/test/BN256G2EchidnaTest.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.26;
 
 import "../libraries/BN256G2.sol";
 
@@ -44,7 +44,7 @@ contract BN256G2EchidnaTest {
         Hm = BN256G2.hashToG2(message, dummyTag);
     }
 
-    function echidna_always_hashable() public returns (bool) {
+    function echidna_always_hashable() public view returns (bool) {
         return BN256G2.IsOnCurve(Hm.X[1], Hm.X[0], Hm.Y[1], Hm.Y[0]);
     }
 }
diff --git a/contracts/test/MockERC20.sol b/contracts/test/MockERC20.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.26;
 
 import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 

diff --git a/contracts/test/MockServiceNodeRewards.sol b/contracts/test/MockServiceNodeRewards.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.26;
 
 import "../interfaces/IServiceNodeRewards.sol";
 

diff --git a/contracts/test/ServiceNodeContributionEchidnaTest.sol b/contracts/test/ServiceNodeContributionEchidnaTest.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.26;
 
 import "../ServiceNodeContribution.sol";
 import "./MockERC20.sol";

diff --git a/contracts/test/TestModifierOnlyOperatorViaProxyContract.sol b/contracts/test/TestModifierOnlyOperatorViaProxyContract.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.26;
 
 interface IServiceNodeContribution {
     function cancelNode() external;

diff --git a/contracts/test/TestnetRewardRatePool.sol b/contracts/test/TestnetRewardRatePool.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.26;
 
 import "../RewardRatePool.sol";
 

diff --git a/contracts/test/TestnetServiceNodeRewards.sol b/contracts/test/TestnetServiceNodeRewards.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.26;
 
 import "../ServiceNodeRewards.sol";
 

diff --git a/contracts/utils/TokenConverter.sol b/contracts/utils/TokenConverter.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.26;
 
 import "@openzeppelin/contracts/utils/ReentrancyGuard.sol";
 import "@openzeppelin/contracts/access/Ownable.sol";

diff --git a/contracts/utils/TokenVestingNoStaking.sol b/contracts/utils/TokenVestingNoStaking.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.26;
 
 import "../libraries/Shared.sol";
 import "../interfaces/ITokenVestingNoStaking.sol";

diff --git a/contracts/utils/TokenVestingStaking.sol b/contracts/utils/TokenVestingStaking.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.26;
 
 import "../libraries/Shared.sol";
 import "../interfaces/ITokenVestingStaking.sol";

diff --git a/hardhat.config.js b/hardhat.config.js
@@ -21,7 +21,7 @@ module.exports = {
       }
   },
   solidity: {
-    version: '0.8.20',
+    version: '0.8.26',
     settings: {
       optimizer: {
         enabled: true,