Merge pull request #67 from stabilitydao/fixing

solidity 0.8.23
stabilitydao · Dec 1, 2023 · ea680dc · ea680dc
2 parents a283c69 + 598a791
commit ea680dc
Show file tree

Hide file tree

Showing 146 changed files with 146 additions and 146 deletions.
diff --git a/chains/PolygonLib.sol b/chains/PolygonLib.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.22;
+pragma solidity ^0.8.23;
 
 import "../src/core/proxy/Proxy.sol";
 import "../src/adapters/libs/AmmAdapterIdLib.sol";

diff --git a/script/Deploy.Polygon.s.sol b/script/Deploy.Polygon.s.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.22;
+pragma solidity ^0.8.23;
 
 import "forge-std/Script.sol";
 import "../chains/PolygonLib.sol";

diff --git a/script/Deploy.PolygonForking.s.sol b/script/Deploy.PolygonForking.s.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.22;
+pragma solidity ^0.8.23;
 
 import "forge-std/Script.sol";
 import "../src/interfaces/IPlatform.sol";

diff --git a/script/libs/DeployAdapterLib.sol b/script/libs/DeployAdapterLib.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.22;
+pragma solidity ^0.8.23;
 
 import "../../src/core/proxy/Proxy.sol";
 import "../../src/adapters/libs/AmmAdapterIdLib.sol";

diff --git a/script/libs/DeployLib.sol b/script/libs/DeployLib.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.22;
+pragma solidity ^0.8.23;
 
 import {console} from "forge-std/Test.sol";
 import "../../src/core/proxy/Proxy.sol";

diff --git a/script/libs/DeployStrategyLib.sol b/script/libs/DeployStrategyLib.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.22;
+pragma solidity ^0.8.23;
 
 import "../../src/core/proxy/Proxy.sol";
 import "../../src/interfaces/IPlatform.sol";

diff --git a/src/adapters/AlgebraAdapter.sol b/src/adapters/AlgebraAdapter.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.22;
+pragma solidity ^0.8.23;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";

diff --git a/src/adapters/ChainlinkAdapter.sol b/src/adapters/ChainlinkAdapter.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.22;
+pragma solidity ^0.8.23;
 
 import "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
 import "../interfaces/IOracleAdapter.sol";

diff --git a/src/adapters/KyberAdapter.sol b/src/adapters/KyberAdapter.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.22;
+pragma solidity ^0.8.23;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";

diff --git a/src/adapters/UniswapV3Adapter.sol b/src/adapters/UniswapV3Adapter.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.22;
+pragma solidity ^0.8.23;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";

diff --git a/src/core/AprOracle.sol b/src/core/AprOracle.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.22;
+pragma solidity ^0.8.23;
 
 import "./base/Controllable.sol";
 import "../interfaces/IAprOracle.sol";

diff --git a/src/core/Factory.sol b/src/core/Factory.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.22;
+pragma solidity ^0.8.23;
 
 import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 import "@openzeppelin/contracts/token/ERC721/extensions/IERC721Enumerable.sol";

diff --git a/src/core/HardWorker.sol b/src/core/HardWorker.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.22;
+pragma solidity ^0.8.23;
 
 import "@openzeppelin/contracts/utils/Strings.sol";
 import "./base/Controllable.sol";

diff --git a/src/core/Platform.sol b/src/core/Platform.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.22;
+pragma solidity ^0.8.23;
 
 import "@openzeppelin/contracts/utils/structs/EnumerableMap.sol";
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";

diff --git a/src/core/PriceReader.sol b/src/core/PriceReader.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.22;
+pragma solidity ^0.8.23;
 
 import "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 import "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";

diff --git a/src/core/StrategyLogic.sol b/src/core/StrategyLogic.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.22;
+pragma solidity ^0.8.23;
 
 import "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721EnumerableUpgradeable.sol";
 import "./base/Controllable.sol";

diff --git a/src/core/Swapper.sol b/src/core/Swapper.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.22;
+pragma solidity ^0.8.23;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";

diff --git a/src/core/VaultManager.sol b/src/core/VaultManager.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.22;
+pragma solidity ^0.8.23;
 
 import "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 import "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721EnumerableUpgradeable.sol";

diff --git a/src/core/Zap.sol b/src/core/Zap.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.22;
+pragma solidity ^0.8.23;
 
 import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 import "@openzeppelin/contracts-upgradeable/utils/ReentrancyGuardUpgradeable.sol";

diff --git a/src/core/base/Controllable.sol b/src/core/base/Controllable.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.22;
+pragma solidity ^0.8.23;
 
 import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 import "@openzeppelin/contracts/utils/introspection/ERC165.sol";

diff --git a/src/core/base/RVaultBase.sol b/src/core/base/RVaultBase.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.22;
+pragma solidity ^0.8.23;
 
 import "@openzeppelin/contracts/utils/math/Math.sol";
 import "./VaultBase.sol";

diff --git a/src/core/base/UpgradeableProxy.sol b/src/core/base/UpgradeableProxy.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.22;
+pragma solidity ^0.8.23;
 
 /// @title Simple ERC-1967 upgradeable proxy implementation
 abstract contract UpgradeableProxy {

diff --git a/src/core/base/VaultBase.sol b/src/core/base/VaultBase.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.22;
+pragma solidity ^0.8.23;
 
 import "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";
 import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";

diff --git a/src/core/libs/CommonLib.sol b/src/core/libs/CommonLib.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.22;
+pragma solidity ^0.8.23;
 
 import "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 import "@openzeppelin/contracts/utils/Strings.sol";

diff --git a/src/core/libs/ConstantsLib.sol b/src/core/libs/ConstantsLib.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.22;
+pragma solidity ^0.8.23;
 
 library ConstantsLib {
     uint internal constant SWAP_REVENUE_PRICE_IMPACT_TOLERANCE = 1_000;

diff --git a/src/core/libs/DeployerLib.sol b/src/core/libs/DeployerLib.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.22;
+pragma solidity ^0.8.23;
 
 import "../proxy/VaultProxy.sol";
 import "../proxy/StrategyProxy.sol";

diff --git a/src/core/libs/FactoryLib.sol b/src/core/libs/FactoryLib.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.22;
+pragma solidity ^0.8.23;
 
 import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 import "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";

diff --git a/src/core/libs/RVaultLib.sol b/src/core/libs/RVaultLib.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.22;
+pragma solidity ^0.8.23;
 
 import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 import "@openzeppelin/contracts/utils/math/Math.sol";

diff --git a/src/core/libs/SlotsLib.sol b/src/core/libs/SlotsLib.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.22;
+pragma solidity ^0.8.23;
 
 /// @title Minimal library for setting / getting slot variables (used in upgradable proxy contracts)
 library SlotsLib {

diff --git a/src/core/libs/StrategyLogicLib.sol b/src/core/libs/StrategyLogicLib.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.22;
+pragma solidity ^0.8.23;
 
 import "@openzeppelin/contracts/utils/Base64.sol";
 import "@openzeppelin/contracts/utils/Strings.sol";

diff --git a/src/core/libs/VaultManagerLib.sol b/src/core/libs/VaultManagerLib.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.22;
+pragma solidity ^0.8.23;
 
 import {Base64} from "@openzeppelin/contracts/utils/Base64.sol";
 import "@openzeppelin/contracts/utils/Strings.sol";

diff --git a/src/core/libs/VaultStatusLib.sol b/src/core/libs/VaultStatusLib.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.22;
+pragma solidity ^0.8.23;
 
 library VaultStatusLib {
     uint internal constant NOT_EXIST = 0;

diff --git a/src/core/libs/VaultTypeLib.sol b/src/core/libs/VaultTypeLib.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.22;
+pragma solidity ^0.8.23;
 
 library VaultTypeLib {
     string internal constant COMPOUNDING = "Compounding";

diff --git a/src/core/proxy/Proxy.sol b/src/core/proxy/Proxy.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.22;
+pragma solidity ^0.8.23;
 
 import "../base/UpgradeableProxy.sol";
 import "../../interfaces/IControllable.sol";

diff --git a/src/core/proxy/StrategyProxy.sol b/src/core/proxy/StrategyProxy.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.22;
+pragma solidity ^0.8.23;
 
 import "../../core/base/UpgradeableProxy.sol";
 import "../../interfaces/IControllable.sol";

diff --git a/src/core/proxy/VaultProxy.sol b/src/core/proxy/VaultProxy.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.22;
+pragma solidity ^0.8.23;
 
 import "../../core/base/UpgradeableProxy.sol";
 import "../../interfaces/IControllable.sol";

diff --git a/src/core/vaults/CVault.sol b/src/core/vaults/CVault.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.22;
+pragma solidity ^0.8.23;
 
 import "../base/VaultBase.sol";
 import "../libs/VaultTypeLib.sol";

diff --git a/src/core/vaults/RMVault.sol b/src/core/vaults/RMVault.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.22;
+pragma solidity ^0.8.23;
 
 import "@openzeppelin/contracts/utils/math/Math.sol";
 import "../base/VaultBase.sol";

diff --git a/src/core/vaults/RVault.sol b/src/core/vaults/RVault.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.22;
+pragma solidity ^0.8.23;
 
 import "@openzeppelin/contracts/utils/math/Math.sol";
 import "../base/VaultBase.sol";

diff --git a/src/integrations/algebra/IAlgebraEternalFarming.sol b/src/integrations/algebra/IAlgebraEternalFarming.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.22;
+pragma solidity ^0.8.23;
 
 import "./IncentiveKey.sol";
 

diff --git a/src/integrations/algebra/IAlgebraPool.sol b/src/integrations/algebra/IAlgebraPool.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
-pragma solidity ^0.8.22;
+pragma solidity ^0.8.23;
 
 import './pool/IAlgebraPoolImmutables.sol';
 import './pool/IAlgebraPoolState.sol';

diff --git a/src/integrations/algebra/IAlgebraQuoter.sol b/src/integrations/algebra/IAlgebraQuoter.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.22;
+pragma solidity ^0.8.23;
 
 /// @notice Restored from 0xa15F0D7377B2A0C0c10db057f641beD21028FC89
 interface IAlgebraQuoter {

diff --git a/src/integrations/algebra/IDataStorageOperator.sol b/src/integrations/algebra/IDataStorageOperator.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
-pragma solidity ^0.8.22;
+pragma solidity ^0.8.23;
 pragma abicoder v2;
 
 // coefficients for sigmoids: α / (1 + e^( (β-x) / γ))

diff --git a/src/integrations/algebra/IFarmingCenter.sol b/src/integrations/algebra/IFarmingCenter.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.22;
+pragma solidity ^0.8.23;
 
 import "./IAlgebraEternalFarming.sol";
 import "./IncentiveKey.sol";

diff --git a/src/integrations/algebra/INonfungiblePositionManager.sol b/src/integrations/algebra/INonfungiblePositionManager.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.22;
+pragma solidity ^0.8.23;
 
 interface INonfungiblePositionManager {
     struct MintParams {

diff --git a/src/integrations/algebra/IncentiveKey.sol b/src/integrations/algebra/IncentiveKey.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.22;
+pragma solidity ^0.8.23;
 
 struct IncentiveKey {
     address rewardToken;

diff --git a/src/integrations/algebra/pool/IAlgebraPoolActions.sol b/src/integrations/algebra/pool/IAlgebraPoolActions.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
-pragma solidity ^0.8.22;
+pragma solidity ^0.8.23;
 
 /// @title Permissionless pool actions
 /// @dev Credit to Uniswap Labs under GPL-2.0-or-later license:

diff --git a/src/integrations/algebra/pool/IAlgebraPoolDerivedState.sol b/src/integrations/algebra/pool/IAlgebraPoolDerivedState.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
-pragma solidity ^0.8.22;
+pragma solidity ^0.8.23;
 
 /**
  * @title Pool state that is not stored

diff --git a/src/integrations/algebra/pool/IAlgebraPoolEvents.sol b/src/integrations/algebra/pool/IAlgebraPoolEvents.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
-pragma solidity ^0.8.22;
+pragma solidity ^0.8.23;
 
 /// @title Events emitted by a pool
 /// @dev Credit to Uniswap Labs under GPL-2.0-or-later license:

diff --git a/src/integrations/algebra/pool/IAlgebraPoolImmutables.sol b/src/integrations/algebra/pool/IAlgebraPoolImmutables.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
-pragma solidity ^0.8.22;
+pragma solidity ^0.8.23;
 
 import '../IDataStorageOperator.sol';
 

diff --git a/src/integrations/algebra/pool/IAlgebraPoolPermissionedActions.sol b/src/integrations/algebra/pool/IAlgebraPoolPermissionedActions.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
-pragma solidity ^0.8.22;
+pragma solidity ^0.8.23;
 
 /**
  * @title Permissioned pool actions

diff --git a/src/integrations/algebra/pool/IAlgebraPoolState.sol b/src/integrations/algebra/pool/IAlgebraPoolState.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
-pragma solidity ^0.8.22;
+pragma solidity ^0.8.23;
 
 /// @title Pool state that can change
 /// @dev Credit to Uniswap Labs under GPL-2.0-or-later license:

diff --git a/src/integrations/chainlink/IAggregatorV3Interface.sol b/src/integrations/chainlink/IAggregatorV3Interface.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.22;
+pragma solidity ^0.8.23;
 
 interface IAggregatorV3Interface {
     function latestRoundData() external view returns (

diff --git a/src/integrations/gamma/IHypervisor.sol b/src/integrations/gamma/IHypervisor.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.22;
+pragma solidity ^0.8.23;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 

diff --git a/src/integrations/gamma/IUniProxy.sol b/src/integrations/gamma/IUniProxy.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.22;
+pragma solidity ^0.8.23;
 
 interface IUniProxy {
     /// @notice Get the amount of token to deposit for the given amount of pair token

diff --git a/src/integrations/gelato/IAutomate.sol b/src/integrations/gelato/IAutomate.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.22;
+pragma solidity ^0.8.23;
 
 import "./ITaskTreasuryUpgradable.sol";
 

diff --git a/src/integrations/gelato/IOpsProxyFactory.sol b/src/integrations/gelato/IOpsProxyFactory.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.22;
+pragma solidity ^0.8.23;
 
 interface IOpsProxyFactory {
     /**