update to solidity 0.8.23

bcnmy · Jan 10, 2024 · 7ecc9b4 · 7ecc9b4
1 parent 528172e
commit 7ecc9b4
Show file tree

Hide file tree

Showing 49 changed files with 49 additions and 55 deletions.
diff --git a/.solhint.json b/.solhint.json
@@ -1,7 +1,7 @@
 {
   "extends": "solhint:recommended",
   "rules": {
-    "compiler-version": ["error", "0.8.20"],
+    "compiler-version": ["error", "0.8.23"],
     "func-visibility": ["warn", { "ignoreConstructors": true }],
     "reentrancy": "error",
     "state-visibility": "error",

diff --git a/contracts/BasePaymaster.sol b/contracts/BasePaymaster.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 /* solhint-disable reason-string */
 

diff --git a/contracts/common/Errors.sol b/contracts/common/Errors.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: LGPL-3.0-only
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 contract BasePaymasterErrors {
     /**

diff --git a/contracts/deployer/Create3.sol b/contracts/deployer/Create3.sol
@@ -1,5 +1,5 @@
 //SPDX-License-Identifier: Unlicense
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 /**
  * @title A library for deploying contracts EIP-3171 style.

diff --git a/contracts/deployer/Deployer.sol b/contracts/deployer/Deployer.sol
@@ -1,5 +1,5 @@
 //SPDX-License-Identifier: Unlicense
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 import "./Create3.sol";
 

diff --git a/contracts/interfaces/IWETH9.sol b/contracts/interfaces/IWETH9.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 

diff --git a/contracts/interfaces/paymasters/IBiconomyTokenPaymaster.sol b/contracts/interfaces/paymasters/IBiconomyTokenPaymaster.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 interface IBiconomyTokenPaymaster {
     /**

diff --git a/contracts/interfaces/paymasters/ISponsorshipPaymaster.sol b/contracts/interfaces/paymasters/ISponsorshipPaymaster.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 interface ISponsorshipPaymaster {
     event EPGasOverheadChanged(uint256 indexed _oldValue, uint256 indexed _newValue);

diff --git a/contracts/libs/AddressUtils.sol b/contracts/libs/AddressUtils.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 /**
  * Utility library of inline functions on addresses

diff --git a/contracts/libs/CalldataHelper.sol b/contracts/libs/CalldataHelper.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 library CalldataHelper {
     function calldataKeccak(bytes calldata data) internal pure returns (bytes32 ret) {

diff --git a/contracts/libs/MathLib.sol b/contracts/libs/MathLib.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 library MathLib {
     function minuint256(uint256 a, uint256 b) internal pure returns (uint256 result) {

diff --git a/contracts/references/AdvancedVerifyingPaymaster.sol b/contracts/references/AdvancedVerifyingPaymaster.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 import {IEntryPoint} from "@account-abstraction/contracts/interfaces/IEntryPoint.sol";
 import {UserOperation} from "@account-abstraction/contracts/interfaces/UserOperation.sol";

diff --git a/contracts/references/infinitism/OracleHelper.sol b/contracts/references/infinitism/OracleHelper.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 /* solhint-disable not-rely-on-time */
 

diff --git a/contracts/references/infinitism/SampleTokenPaymaster.sol b/contracts/references/infinitism/SampleTokenPaymaster.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 // Import the required libraries and contracts
 import "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";

diff --git a/contracts/references/infinitism/UniswapHelper.sol b/contracts/references/infinitism/UniswapHelper.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 /* solhint-disable not-rely-on-time */
 

diff --git a/contracts/references/pimlico/IOracle.sol b/contracts/references/pimlico/IOracle.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 interface IOracle {
     function decimals() external view returns (uint8);

diff --git a/contracts/references/pimlico/PimlicoERC20Paymaster.sol b/contracts/references/pimlico/PimlicoERC20Paymaster.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 // Import the required libraries and contracts
 import "@account-abstraction/contracts/core/BasePaymaster.sol";

diff --git a/contracts/references/soul/IPriceOracle.sol b/contracts/references/soul/IPriceOracle.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 interface IPriceOracle {
     function exchangePrice(address _token) external view returns (uint256 price, uint8 decimals);

diff --git a/contracts/references/soul/ITokenPaymaster.sol b/contracts/references/soul/ITokenPaymaster.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 import "@account-abstraction/contracts/interfaces/IPaymaster.sol";
 import "@openzeppelin/contracts/utils/introspection/ERC165.sol";

diff --git a/contracts/references/soul/PriceOracle.sol b/contracts/references/soul/PriceOracle.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 import "./IPriceOracle.sol";
 import "@chainlink/contracts/src/v0.8/interfaces/AggregatorV3Interface.sol";

diff --git a/contracts/references/soul/TokenPaymaster.sol b/contracts/references/soul/TokenPaymaster.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 import "@openzeppelin/contracts/access/Ownable.sol";
 import "./ITokenPaymaster.sol";

diff --git a/contracts/sponsorship/PaymasterHelpers.sol b/contracts/sponsorship/PaymasterHelpers.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 import {ECDSA} from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
 import {UserOperation} from "@account-abstraction/contracts/interfaces/UserOperation.sol";

diff --git a/contracts/sponsorship/SponsorshipPaymaster.sol b/contracts/sponsorship/SponsorshipPaymaster.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 /* solhint-disable reason-string */
 /* solhint-disable no-inline-assembly */

diff --git a/contracts/test/accounts/BiconomyAccountFactory.sol b/contracts/test/accounts/BiconomyAccountFactory.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20; // temp
+pragma solidity ^0.8.23; // temp
 
 // Could also use published package or added submodule.
 

diff --git a/contracts/test/accounts/BiconomyAccountImpl.sol b/contracts/test/accounts/BiconomyAccountImpl.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 import {IEntryPoint} from "@account-abstraction/contracts/interfaces/IEntryPoint.sol";
 import {SmartAccount} from "@biconomy-devx/account-contracts-v2/contracts/smart-account/SmartAccount.sol";

diff --git a/contracts/test/accounts/SimpleAccount.sol b/contracts/test/accounts/SimpleAccount.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 /* solhint-disable avoid-low-level-calls */
 /* solhint-disable no-inline-assembly */

diff --git a/contracts/test/dex/UniV3Integration.sol b/contracts/test/dex/UniV3Integration.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 import "@uniswap/v3-periphery/contracts/interfaces/ISwapRouter.sol";
 

diff --git a/contracts/test/dex/UniswapV3SwapExamples.sol b/contracts/test/dex/UniswapV3SwapExamples.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 // swap reference: https://solidity-by-example.org/defi/uniswap-v3-swap/ for adding tests
 // https://docs.uniswap.org/contracts/v3/reference/periphery/SwapRouter

diff --git a/contracts/test/helpers/MockOracle.sol b/contracts/test/helpers/MockOracle.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 import "@chainlink/contracts/src/v0.8/interfaces/AggregatorV3Interface.sol";
 

diff --git a/contracts/test/helpers/MockPriceFeed.sol b/contracts/test/helpers/MockPriceFeed.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 import "@chainlink/contracts/src/v0.8/interfaces/AggregatorV3Interface.sol";
 

diff --git a/contracts/test/helpers/MockStaleOracle.sol b/contracts/test/helpers/MockStaleOracle.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 import "@chainlink/contracts/src/v0.8/interfaces/AggregatorV3Interface.sol";
 

diff --git a/contracts/test/helpers/MockStalePriceFeed.sol b/contracts/test/helpers/MockStalePriceFeed.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 import "@chainlink/contracts/src/v0.8/interfaces/AggregatorV3Interface.sol";
 

diff --git a/contracts/test/helpers/MockToken.sol b/contracts/test/helpers/MockToken.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 

diff --git a/contracts/token/BiconomyTokenPaymaster.sol b/contracts/token/BiconomyTokenPaymaster.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 import {ECDSA} from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
 import {ReentrancyGuard} from "@openzeppelin/contracts/security/ReentrancyGuard.sol";

diff --git a/contracts/token/TokenPaymasterErrors.sol b/contracts/token/TokenPaymasterErrors.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: LGPL-3.0-only
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 contract TokenPaymasterErrors {
     /**

diff --git a/contracts/token/adapters/IUniversalRouter.sol b/contracts/token/adapters/IUniversalRouter.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 import {IERC721Receiver} from "@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol";
 import {IERC1155Receiver} from "@openzeppelin/contracts/token/ERC1155/IERC1155Receiver.sol";

diff --git a/contracts/token/adapters/UniswapExample.sol b/contracts/token/adapters/UniswapExample.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 import "@uniswap/v3-periphery/contracts/interfaces/ISwapRouter.sol";
 import "@uniswap/v3-periphery/contracts/interfaces/IQuoter.sol";

diff --git a/contracts/token/feemanager/FeeManager.sol b/contracts/token/feemanager/FeeManager.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 import "@openzeppelin/contracts/access/Ownable.sol";
 

diff --git a/contracts/token/oracles/DerivedPriceFeed.sol b/contracts/token/oracles/DerivedPriceFeed.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 import "@chainlink/contracts/src/v0.8/interfaces/AggregatorV3Interface.sol";
 

diff --git a/contracts/token/oracles/FeedInterface.sol b/contracts/token/oracles/FeedInterface.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 /**
  */

diff --git a/contracts/token/oracles/IOracleAggregator.sol b/contracts/token/oracles/IOracleAggregator.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 interface IOracleAggregator {
     error MismatchInBaseAndQuoteDecimals();

diff --git a/contracts/token/oracles/IPriceOracle.sol b/contracts/token/oracles/IPriceOracle.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 interface IPriceOracle {
     function latestRoundData()

diff --git a/contracts/token/oracles/OracleAggregator.sol b/contracts/token/oracles/OracleAggregator.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 import "@openzeppelin/contracts/access/Ownable.sol";
 import "./IOracleAggregator.sol";

diff --git a/contracts/utils/Exec.sol b/contracts/utils/Exec.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: LGPL-3.0-only
-pragma solidity 0.8.20;
+pragma solidity ^0.8.23;
 
 /**
  * Utility functions helpful when making different kinds of contract calls in Solidity.

diff --git a/contracts/utils/LibAddress.sol b/contracts/utils/LibAddress.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 library LibAddress {
     /**

diff --git a/contracts/utils/SafeTransferLib.sol b/contracts/utils/SafeTransferLib.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 /// @notice Safe ETH and ERC20 transfer library that gracefully handles missing return values.
 /// @author Solady (https://github.com/vectorized/solady/blob/main/src/utils/SafeTransferLib.sol)

diff --git a/foundry.toml b/foundry.toml
@@ -6,4 +6,5 @@ test = 'test/foundry'
 cache_path = 'forge-cache'
 viaIr = true
 evm_version = "paris"
+auto_detect_solc = true
 # See more config options https://book.getfoundry.sh/reference/config.html
diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -21,14 +21,7 @@ const config: HardhatUserConfig = {
   solidity: {
     compilers: [
       {
-        version: "0.8.17",
-        settings: {
-          optimizer: { enabled: true, runs: 800 },
-          viaIR: true,
-        },
-      },
-      {
-        version: "0.8.20",
+        version: "0.8.23",
         settings: {
           optimizer: { enabled: true, runs: 800 },
           evmVersion: "paris",

diff --git a/test/foundry/base/SATestBase.sol b/test/foundry/base/SATestBase.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 import {Test, Vm} from "forge-std/Test.sol";
 import {MockToken} from "../../../contracts/test/helpers/MockToken.sol";