Merge pull request #103 from 1inch/feature/bump-solidity

[SC-989][SC-990] Solidity 0.8.23, OZ 5.0.0
1inch · Dec 20, 2023 · 318ee4a · 318ee4a
2 parents 582d444 + 2732a8d
commit 318ee4a
Show file tree

Hide file tree

Showing 72 changed files with 575 additions and 1,525 deletions.
diff --git a/.solhint.json b/.solhint.json
@@ -1,7 +1,7 @@
 {
     "extends": "solhint:recommended",
     "rules": {
-        "compiler-version": ["error", "0.8.19"],
+        "compiler-version": ["error", "0.8.23"],
         "explicit-types": ["off"],
         "func-named-parameters": "off",
         "func-visibility": ["warn", { "ignoreConstructors": true }],

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/GasEstimator.sol b/contracts/GasEstimator.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 contract GasEstimator {
     function gasLimit() external view returns (uint256) {

diff --git a/contracts/MultiWrapper.sol b/contracts/MultiWrapper.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 import "@openzeppelin/contracts/access/Ownable.sol";
 import "@openzeppelin/contracts/utils/math/Math.sol";
@@ -29,7 +29,7 @@ contract MultiWrapper is Ownable {
      * @dev Initializes the MultiWrapper with an array of existing `IWrapper` contracts.
      * @param existingWrappers Initial wrappers to be added.
      */
-    constructor(IWrapper[] memory existingWrappers) {
+    constructor(IWrapper[] memory existingWrappers, address owner_) Ownable(owner_) {
         unchecked {
             for (uint256 i = 0; i < existingWrappers.length; i++) {
                 if (!_wrappers.add(address(existingWrappers[i]))) revert WrapperAlreadyAdded();

diff --git a/contracts/OffchainOracle.sol b/contracts/OffchainOracle.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 import "@openzeppelin/contracts/access/Ownable.sol";
 import "@openzeppelin/contracts/utils/math/Math.sol";
@@ -50,7 +50,7 @@ contract OffchainOracle is Ownable {
     IERC20 private constant _BASE = IERC20(0x0000000000000000000000000000000000000000);
     IERC20 private immutable _WBASE;
 
-    constructor(MultiWrapper _multiWrapper, IOracle[] memory existingOracles, OracleType[] memory oracleTypes, IERC20[] memory existingConnectors, IERC20 wBase, address owner) {
+    constructor(MultiWrapper _multiWrapper, IOracle[] memory existingOracles, OracleType[] memory oracleTypes, IERC20[] memory existingConnectors, IERC20 wBase, address owner_) Ownable(owner_) {
         unchecked {
             if(existingOracles.length != oracleTypes.length) revert ArraysLengthMismatch();
             multiWrapper = _multiWrapper;
@@ -74,7 +74,6 @@ contract OffchainOracle is Ownable {
             }
             _WBASE = wBase;
         }
-        if (owner != msg.sender) transferOwnership(owner);
     }
 
     /**

diff --git a/contracts/interfaces/IBzxProtocol.sol b/contracts/interfaces/IBzxProtocol.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 interface IBzxProtocol {
     function underlyingToLoanPool(address underlying) external view returns (address loanPool);

diff --git a/contracts/interfaces/ICToken.sol b/contracts/interfaces/ICToken.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 

diff --git a/contracts/interfaces/IChai.sol b/contracts/interfaces/IChai.sol
@@ -1,6 +1,8 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+// solhint-disable one-contract-per-file
+
+pragma solidity 0.8.23;
 
 interface IChai {
     function balanceOf(address) external view returns (uint256);

diff --git a/contracts/interfaces/IChainlink.sol b/contracts/interfaces/IChainlink.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 

diff --git a/contracts/interfaces/IComptroller.sol b/contracts/interfaces/IComptroller.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 import "./ICToken.sol";
 

diff --git a/contracts/interfaces/ICurveProvider.sol b/contracts/interfaces/ICurveProvider.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 // solhint-disable func-name-mixedcase
 

diff --git a/contracts/interfaces/ICurveRegistry.sol b/contracts/interfaces/ICurveRegistry.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 // solhint-disable func-name-mixedcase
 

diff --git a/contracts/interfaces/ICurveSwap.sol b/contracts/interfaces/ICurveSwap.sol
@@ -1,6 +1,8 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+// solhint-disable one-contract-per-file
+
+pragma solidity 0.8.23;
 
 // solhint-disable func-name-mixedcase
 

diff --git a/contracts/interfaces/IDodo.sol b/contracts/interfaces/IDodo.sol
@@ -1,6 +1,8 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+// solhint-disable one-contract-per-file
+
+pragma solidity 0.8.23;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 

diff --git a/contracts/interfaces/IDodoFactories.sol b/contracts/interfaces/IDodoFactories.sol
@@ -1,6 +1,8 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+// solhint-disable one-contract-per-file
+
+pragma solidity 0.8.23;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 

diff --git a/contracts/interfaces/IKyberDmmFactory.sol b/contracts/interfaces/IKyberDmmFactory.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 

diff --git a/contracts/interfaces/IKyberDmmPool.sol b/contracts/interfaces/IKyberDmmPool.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 interface IKyberDmmPool {
     function getTradeInfo() external view returns (uint112 reserve0, uint112 reserve1, uint112 _vReserve0, uint112 _vReserve1, uint256 feeInPrecision);

diff --git a/contracts/interfaces/ILendingPoolV1.sol b/contracts/interfaces/ILendingPoolV1.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 

diff --git a/contracts/interfaces/ILendingPoolV2.sol b/contracts/interfaces/ILendingPoolV2.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 

diff --git a/contracts/interfaces/ILoanToken.sol b/contracts/interfaces/ILoanToken.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 interface ILoanToken {
     function tokenPrice() external view returns (uint256 price);

diff --git a/contracts/interfaces/IMooniswap.sol b/contracts/interfaces/IMooniswap.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 

diff --git a/contracts/interfaces/IMooniswapFactory.sol b/contracts/interfaces/IMooniswapFactory.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 import "./IMooniswap.sol";
 

diff --git a/contracts/interfaces/IOracle.sol b/contracts/interfaces/IOracle.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 

diff --git a/contracts/interfaces/ISDai.sol b/contracts/interfaces/ISDai.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 interface ISDai {
     function previewDeposit(uint256 assets) external view returns (uint256);

diff --git a/contracts/interfaces/ISolidlyFactory.sol b/contracts/interfaces/ISolidlyFactory.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 

diff --git a/contracts/interfaces/ISynthetixAddressResolver.sol b/contracts/interfaces/ISynthetixAddressResolver.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 // https://docs.synthetix.io/contracts/source/interfaces/iaddressresolver
 interface ISynthetixAddressResolver {

diff --git a/contracts/interfaces/ISynthetixExchangeRates.sol b/contracts/interfaces/ISynthetixExchangeRates.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 interface ISynthetixExchangeRates {
     function rateAndInvalid(bytes32 currencyKey) external view returns (uint256 rate, bool isInvalid);

diff --git a/contracts/interfaces/ISynthetixProxy.sol b/contracts/interfaces/ISynthetixProxy.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 interface ISynthetixProxy {
     function target() external view returns (address);

diff --git a/contracts/interfaces/IUniswapFactory.sol b/contracts/interfaces/IUniswapFactory.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: UNLICENSED
 
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 

diff --git a/contracts/interfaces/IUniswapV2Pair.sol b/contracts/interfaces/IUniswapV2Pair.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: UNLICENSED
 
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 interface IUniswapV2Pair {
     function getReserves() external view returns (uint112 _reserve0, uint112 _reserve1, uint32 _blockTimestampLast);

diff --git a/contracts/interfaces/IUniswapV3Pool.sol b/contracts/interfaces/IUniswapV3Pool.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 

diff --git a/contracts/interfaces/IWrapper.sol b/contracts/interfaces/IWrapper.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 

diff --git a/contracts/interfaces/IWstETH.sol b/contracts/interfaces/IWstETH.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 interface IWstETH {
     function tokensPerStEth() external view returns (uint256);

diff --git a/contracts/interfaces/IYVault.sol b/contracts/interfaces/IYVault.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 

diff --git a/contracts/libraries/OraclePrices.sol b/contracts/libraries/OraclePrices.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
-import "@openzeppelin/contracts/utils/math/SafeMath.sol";
+import "@openzeppelin/contracts/utils/math/Math.sol";
 
 /**
  * @title OraclePrices
@@ -12,7 +12,7 @@ import "@openzeppelin/contracts/utils/math/SafeMath.sol";
  *         The level of low-weight pool filtering can be managed using the thresholdFilter parameter.
  */
 library OraclePrices {
-    using SafeMath for uint256;
+    using Math for uint256;
 
     /**
     * @title Oracle Price Data Structure

diff --git a/contracts/mocks/SimpleOracleMock.sol b/contracts/mocks/SimpleOracleMock.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import "../interfaces/IOracle.sol";

diff --git a/contracts/oracles/ChainlinkOracle.sol b/contracts/oracles/ChainlinkOracle.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 import "@openzeppelin/contracts/utils/math/SafeCast.sol";

diff --git a/contracts/oracles/CurveOracle.sol b/contracts/oracles/CurveOracle.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 import "@openzeppelin/contracts/utils/math/Math.sol";

diff --git a/contracts/oracles/DodoOracle.sol b/contracts/oracles/DodoOracle.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import "@openzeppelin/contracts/utils/math/Math.sol";

diff --git a/contracts/oracles/DodoV2Oracle.sol b/contracts/oracles/DodoV2Oracle.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import "@openzeppelin/contracts/utils/math/Math.sol";

diff --git a/contracts/oracles/KlaySwapOracle.sol b/contracts/oracles/KlaySwapOracle.sol
@@ -1,6 +1,8 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+// solhint-disable one-contract-per-file
+
+pragma solidity 0.8.23;
 
 import "./OracleBase.sol";
 import "../interfaces/IUniswapV2Pair.sol";

diff --git a/contracts/oracles/KyberDmmOracle.sol b/contracts/oracles/KyberDmmOracle.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import "@openzeppelin/contracts/utils/math/Math.sol";

diff --git a/contracts/oracles/MooniswapOracle.sol b/contracts/oracles/MooniswapOracle.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 import "../interfaces/IMooniswapFactory.sol";
 import "./OracleBase.sol";

diff --git a/contracts/oracles/OracleBase.sol b/contracts/oracles/OracleBase.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import "@openzeppelin/contracts/utils/math/Math.sol";