From 960642176c9abaf948250bb186b4a57f4634e8ec Mon Sep 17 00:00:00 2001 From: Alex Towle Date: Wed, 7 Aug 2024 11:04:38 -0500 Subject: [PATCH] Relaxed the version requirements for interfaces, libraries, and test contracts (#1123) * Relaxed the version requirements for interfaces, libraries, and test contracts * Addressed review feedback from @mcclurejt * Upgrades the Solidity version to `0.8.22` (#1124) * Updated from Solidity 0.8.20 to 0.8.22 * Removed unchecked blocks for loop counters * Updated the hardhat config --- .../templates/deployers/HyperdriveCoreDeployer.sol.jinja | 2 +- .../deployers/HyperdriveDeployerCoordinator.sol.jinja | 2 +- codegen/templates/deployers/Target0Deployer.sol.jinja | 2 +- codegen/templates/deployers/Target1Deployer.sol.jinja | 2 +- codegen/templates/deployers/Target2Deployer.sol.jinja | 2 +- codegen/templates/deployers/Target3Deployer.sol.jinja | 2 +- codegen/templates/deployers/Target4Deployer.sol.jinja | 2 +- codegen/templates/instances/Base.sol.jinja | 2 +- codegen/templates/instances/Hyperdrive.sol.jinja | 2 +- codegen/templates/instances/Target0.sol.jinja | 2 +- codegen/templates/instances/Target1.sol.jinja | 2 +- codegen/templates/instances/Target2.sol.jinja | 2 +- codegen/templates/instances/Target3.sol.jinja | 2 +- codegen/templates/instances/Target4.sol.jinja | 2 +- codegen/templates/interfaces/IHyperdrive.sol.jinja | 2 +- codegen/templates/interfaces/IYieldSource.sol.jinja | 2 +- .../src/deployers/HyperdriveDeployerCoordinator.sol | 2 +- .../src/deployers/aave/AaveHyperdriveCoreDeployer.sol | 2 +- .../deployers/aave/AaveHyperdriveDeployerCoordinator.sol | 2 +- contracts/src/deployers/aave/AaveTarget0Deployer.sol | 2 +- contracts/src/deployers/aave/AaveTarget1Deployer.sol | 2 +- contracts/src/deployers/aave/AaveTarget2Deployer.sol | 2 +- contracts/src/deployers/aave/AaveTarget3Deployer.sol | 2 +- contracts/src/deployers/aave/AaveTarget4Deployer.sol | 2 +- .../src/deployers/eeth/EETHHyperdriveCoreDeployer.sol | 2 +- .../deployers/eeth/EETHHyperdriveDeployerCoordinator.sol | 2 +- contracts/src/deployers/eeth/EETHTarget0Deployer.sol | 2 +- contracts/src/deployers/eeth/EETHTarget1Deployer.sol | 2 +- contracts/src/deployers/eeth/EETHTarget2Deployer.sol | 2 +- contracts/src/deployers/eeth/EETHTarget3Deployer.sol | 2 +- contracts/src/deployers/eeth/EETHTarget4Deployer.sol | 2 +- .../deployers/erc4626/ERC4626HyperdriveCoreDeployer.sol | 2 +- .../erc4626/ERC4626HyperdriveDeployerCoordinator.sol | 2 +- .../src/deployers/erc4626/ERC4626Target0Deployer.sol | 2 +- .../src/deployers/erc4626/ERC4626Target1Deployer.sol | 2 +- .../src/deployers/erc4626/ERC4626Target2Deployer.sol | 2 +- .../src/deployers/erc4626/ERC4626Target3Deployer.sol | 2 +- .../src/deployers/erc4626/ERC4626Target4Deployer.sol | 2 +- .../src/deployers/ezeth/EzETHHyperdriveCoreDeployer.sol | 2 +- .../ezeth/EzETHHyperdriveDeployerCoordinator.sol | 2 +- contracts/src/deployers/ezeth/EzETHTarget0Deployer.sol | 2 +- contracts/src/deployers/ezeth/EzETHTarget1Deployer.sol | 2 +- contracts/src/deployers/ezeth/EzETHTarget2Deployer.sol | 2 +- contracts/src/deployers/ezeth/EzETHTarget3Deployer.sol | 2 +- contracts/src/deployers/ezeth/EzETHTarget4Deployer.sol | 2 +- .../src/deployers/lseth/LsETHHyperdriveCoreDeployer.sol | 2 +- .../lseth/LsETHHyperdriveDeployerCoordinator.sol | 2 +- contracts/src/deployers/lseth/LsETHTarget0Deployer.sol | 2 +- contracts/src/deployers/lseth/LsETHTarget1Deployer.sol | 2 +- contracts/src/deployers/lseth/LsETHTarget2Deployer.sol | 2 +- contracts/src/deployers/lseth/LsETHTarget3Deployer.sol | 2 +- contracts/src/deployers/lseth/LsETHTarget4Deployer.sol | 2 +- .../morpho-blue/MorphoBlueHyperdriveCoreDeployer.sol | 2 +- .../MorphoBlueHyperdriveDeployerCoordinator.sol | 2 +- .../deployers/morpho-blue/MorphoBlueTarget0Deployer.sol | 2 +- .../deployers/morpho-blue/MorphoBlueTarget1Deployer.sol | 2 +- .../deployers/morpho-blue/MorphoBlueTarget2Deployer.sol | 2 +- .../deployers/morpho-blue/MorphoBlueTarget3Deployer.sol | 2 +- .../deployers/morpho-blue/MorphoBlueTarget4Deployer.sol | 2 +- .../src/deployers/reth/RETHHyperdriveCoreDeployer.sol | 2 +- .../deployers/reth/RETHHyperdriveDeployerCoordinator.sol | 2 +- contracts/src/deployers/reth/RETHTarget0Deployer.sol | 2 +- contracts/src/deployers/reth/RETHTarget1Deployer.sol | 2 +- contracts/src/deployers/reth/RETHTarget2Deployer.sol | 2 +- contracts/src/deployers/reth/RETHTarget3Deployer.sol | 2 +- contracts/src/deployers/reth/RETHTarget4Deployer.sol | 2 +- .../src/deployers/steth/StETHHyperdriveCoreDeployer.sol | 2 +- .../steth/StETHHyperdriveDeployerCoordinator.sol | 2 +- contracts/src/deployers/steth/StETHTarget0Deployer.sol | 2 +- contracts/src/deployers/steth/StETHTarget1Deployer.sol | 2 +- contracts/src/deployers/steth/StETHTarget2Deployer.sol | 2 +- contracts/src/deployers/steth/StETHTarget3Deployer.sol | 2 +- contracts/src/deployers/steth/StETHTarget4Deployer.sol | 2 +- contracts/src/external/Hyperdrive.sol | 2 +- contracts/src/external/HyperdriveTarget0.sol | 7 ++----- contracts/src/external/HyperdriveTarget1.sol | 2 +- contracts/src/external/HyperdriveTarget2.sol | 2 +- contracts/src/external/HyperdriveTarget3.sol | 2 +- contracts/src/external/HyperdriveTarget4.sol | 2 +- contracts/src/factory/HyperdriveFactory.sol | 7 ++----- contracts/src/factory/HyperdriveRegistry.sol | 2 +- contracts/src/instances/aave/AaveBase.sol | 2 +- contracts/src/instances/aave/AaveConversions.sol | 2 +- contracts/src/instances/aave/AaveHyperdrive.sol | 2 +- contracts/src/instances/aave/AaveTarget0.sol | 2 +- contracts/src/instances/aave/AaveTarget1.sol | 2 +- contracts/src/instances/aave/AaveTarget2.sol | 2 +- contracts/src/instances/aave/AaveTarget3.sol | 2 +- contracts/src/instances/aave/AaveTarget4.sol | 2 +- contracts/src/instances/eeth/EETHBase.sol | 2 +- contracts/src/instances/eeth/EETHConversions.sol | 2 +- contracts/src/instances/eeth/EETHHyperdrive.sol | 2 +- contracts/src/instances/eeth/EETHTarget0.sol | 2 +- contracts/src/instances/eeth/EETHTarget1.sol | 2 +- contracts/src/instances/eeth/EETHTarget2.sol | 2 +- contracts/src/instances/eeth/EETHTarget3.sol | 2 +- contracts/src/instances/eeth/EETHTarget4.sol | 2 +- contracts/src/instances/erc4626/ERC4626Base.sol | 2 +- contracts/src/instances/erc4626/ERC4626Conversions.sol | 2 +- contracts/src/instances/erc4626/ERC4626Hyperdrive.sol | 2 +- contracts/src/instances/erc4626/ERC4626Target0.sol | 2 +- contracts/src/instances/erc4626/ERC4626Target1.sol | 2 +- contracts/src/instances/erc4626/ERC4626Target2.sol | 2 +- contracts/src/instances/erc4626/ERC4626Target3.sol | 2 +- contracts/src/instances/erc4626/ERC4626Target4.sol | 2 +- contracts/src/instances/ezeth/EzETHBase.sol | 2 +- contracts/src/instances/ezeth/EzETHConversions.sol | 2 +- contracts/src/instances/ezeth/EzETHHyperdrive.sol | 2 +- contracts/src/instances/ezeth/EzETHTarget0.sol | 2 +- contracts/src/instances/ezeth/EzETHTarget1.sol | 2 +- contracts/src/instances/ezeth/EzETHTarget2.sol | 2 +- contracts/src/instances/ezeth/EzETHTarget3.sol | 2 +- contracts/src/instances/ezeth/EzETHTarget4.sol | 2 +- contracts/src/instances/lseth/LsETHBase.sol | 2 +- contracts/src/instances/lseth/LsETHConversions.sol | 2 +- contracts/src/instances/lseth/LsETHHyperdrive.sol | 2 +- contracts/src/instances/lseth/LsETHTarget0.sol | 2 +- contracts/src/instances/lseth/LsETHTarget1.sol | 2 +- contracts/src/instances/lseth/LsETHTarget2.sol | 2 +- contracts/src/instances/lseth/LsETHTarget3.sol | 2 +- contracts/src/instances/lseth/LsETHTarget4.sol | 2 +- contracts/src/instances/morpho-blue/MorphoBlueBase.sol | 2 +- .../src/instances/morpho-blue/MorphoBlueConversions.sol | 2 +- .../src/instances/morpho-blue/MorphoBlueHyperdrive.sol | 2 +- .../src/instances/morpho-blue/MorphoBlueTarget0.sol | 2 +- .../src/instances/morpho-blue/MorphoBlueTarget1.sol | 2 +- .../src/instances/morpho-blue/MorphoBlueTarget2.sol | 2 +- .../src/instances/morpho-blue/MorphoBlueTarget3.sol | 2 +- .../src/instances/morpho-blue/MorphoBlueTarget4.sol | 2 +- contracts/src/instances/reth/RETHBase.sol | 2 +- contracts/src/instances/reth/RETHConversions.sol | 2 +- contracts/src/instances/reth/RETHHyperdrive.sol | 2 +- contracts/src/instances/reth/RETHTarget0.sol | 2 +- contracts/src/instances/reth/RETHTarget1.sol | 2 +- contracts/src/instances/reth/RETHTarget2.sol | 2 +- contracts/src/instances/reth/RETHTarget3.sol | 2 +- contracts/src/instances/reth/RETHTarget4.sol | 2 +- contracts/src/instances/steth/StETHBase.sol | 2 +- contracts/src/instances/steth/StETHConversions.sol | 2 +- contracts/src/instances/steth/StETHHyperdrive.sol | 2 +- contracts/src/instances/steth/StETHTarget0.sol | 2 +- contracts/src/instances/steth/StETHTarget1.sol | 2 +- contracts/src/instances/steth/StETHTarget2.sol | 2 +- contracts/src/instances/steth/StETHTarget3.sol | 2 +- contracts/src/instances/steth/StETHTarget4.sol | 2 +- contracts/src/interfaces/IAToken.sol | 2 +- contracts/src/interfaces/IAaveHyperdrive.sol | 2 +- .../interfaces/IAaveHyperdriveDeployerCoordinator.sol | 2 +- contracts/src/interfaces/IAaveHyperdriveRead.sol | 2 +- contracts/src/interfaces/IEETHHyperdrive.sol | 2 +- contracts/src/interfaces/IERC20.sol | 2 +- contracts/src/interfaces/IERC20Forwarder.sol | 2 +- contracts/src/interfaces/IERC20ForwarderFactory.sol | 2 +- contracts/src/interfaces/IERC4626.sol | 2 +- .../interfaces/IERC4626HyperdriveDeployerCoordinator.sol | 2 +- contracts/src/interfaces/IEzETHHyperdrive.sol | 2 +- .../interfaces/IEzETHHyperdriveDeployerCoordinator.sol | 2 +- contracts/src/interfaces/IEzETHHyperdriveRead.sol | 2 +- contracts/src/interfaces/IHyperdrive.sol | 2 +- .../src/interfaces/IHyperdriveCheckpointRewarder.sol | 2 +- .../src/interfaces/IHyperdriveCheckpointSubrewarder.sol | 2 +- contracts/src/interfaces/IHyperdriveCore.sol | 2 +- contracts/src/interfaces/IHyperdriveCoreDeployer.sol | 2 +- .../src/interfaces/IHyperdriveDeployerCoordinator.sol | 2 +- contracts/src/interfaces/IHyperdriveEvents.sol | 2 +- contracts/src/interfaces/IHyperdriveFactory.sol | 2 +- contracts/src/interfaces/IHyperdriveGovernedRegistry.sol | 2 +- contracts/src/interfaces/IHyperdriveRead.sol | 2 +- contracts/src/interfaces/IHyperdriveRegistry.sol | 2 +- contracts/src/interfaces/IHyperdriveTargetDeployer.sol | 2 +- contracts/src/interfaces/ILido.sol | 2 +- .../interfaces/ILsETHHyperdriveDeployerCoordinator.sol | 2 +- contracts/src/interfaces/IMorphoBlueHyperdrive.sol | 2 +- contracts/src/interfaces/IMultiToken.sol | 2 +- contracts/src/interfaces/IMultiTokenCore.sol | 2 +- contracts/src/interfaces/IMultiTokenEvents.sol | 2 +- contracts/src/interfaces/IMultiTokenMetadata.sol | 2 +- contracts/src/interfaces/IMultiTokenRead.sol | 2 +- .../interfaces/IRETHHyperdriveDeployerCoordinator.sol | 2 +- contracts/src/interfaces/IRenzo.sol | 2 +- contracts/src/interfaces/IRiverV1.sol | 2 +- contracts/src/interfaces/IRocketDepositPool.sol | 2 +- contracts/src/interfaces/IRocketNetworkBalances.sol | 2 +- .../interfaces/IRocketPoolDAOProtocolSettingsDeposit.sol | 2 +- contracts/src/interfaces/IRocketStorage.sol | 2 +- contracts/src/interfaces/IRocketTokenRETH.sol | 2 +- contracts/src/interfaces/ISharesManagerV1.sol | 2 +- .../interfaces/IStETHHyperdriveDeployerCoordinator.sol | 2 +- contracts/src/internal/HyperdriveAdmin.sol | 2 +- contracts/src/internal/HyperdriveBase.sol | 2 +- contracts/src/internal/HyperdriveCheckpoint.sol | 2 +- contracts/src/internal/HyperdriveLP.sol | 2 +- contracts/src/internal/HyperdriveLong.sol | 2 +- contracts/src/internal/HyperdriveMultiToken.sol | 7 ++----- contracts/src/internal/HyperdriveShort.sol | 2 +- contracts/src/internal/HyperdriveStorage.sol | 2 +- contracts/src/libraries/AssetId.sol | 2 +- contracts/src/libraries/Constants.sol | 2 +- contracts/src/libraries/Errors.sol | 2 +- contracts/src/libraries/FixedPointMath.sol | 2 +- contracts/src/libraries/HyperdriveMath.sol | 2 +- contracts/src/libraries/LPMath.sol | 9 ++------- contracts/src/libraries/SafeCast.sol | 2 +- contracts/src/libraries/YieldSpaceMath.sol | 2 +- contracts/src/rewarder/HyperdriveCheckpointRewarder.sol | 2 +- .../src/rewarder/HyperdriveCheckpointSubrewarder.sol | 2 +- contracts/src/token/ERC20Forwarder.sol | 2 +- contracts/src/token/ERC20ForwarderFactory.sol | 2 +- contracts/test/ERC20Mintable.sol | 2 +- contracts/test/EtchingVault.sol | 2 +- contracts/test/MockAssetId.sol | 2 +- contracts/test/MockERC4626.sol | 2 +- contracts/test/MockERC4626Hyperdrive.sol | 2 +- contracts/test/MockEzEthPool.sol | 2 +- contracts/test/MockFixedPointMath.sol | 2 +- contracts/test/MockHyperdrive.sol | 2 +- contracts/test/MockHyperdriveDeployer.sol | 2 +- contracts/test/MockHyperdriveMath.sol | 2 +- contracts/test/MockLPMath.sol | 2 +- contracts/test/MockLido.sol | 2 +- contracts/test/MockRocketPool.sol | 2 +- contracts/test/MockSafeCast.sol | 2 +- contracts/test/MockYieldSpaceMath.sol | 2 +- foundry.toml | 2 +- hardhat.config.ts | 2 +- test/3rdPartyLibs/LogExpMath.sol | 2 +- test/combinatorial/MultiToken._transferFrom.t.sol | 2 +- test/debug/Debug.t.sol | 2 +- test/instances/aave/AaveHyperdrive.t.sol | 2 +- test/instances/eeth/EETHHyperdrive.t.sol | 2 +- test/instances/erc4626/ERC4626Hyperdrive.t.sol | 2 +- test/instances/erc4626/ERC4626Validation.t.sol | 2 +- test/instances/erc4626/Sweep.t.sol | 2 +- test/instances/erc4626/UsdcERC4626.t.sol | 2 +- test/instances/erc4626/sDai.t.sol | 2 +- test/instances/ezETH/EzETHHyperdrive.t.sol | 2 +- test/instances/lseth/LsETHHyperdrive.t.sol | 2 +- test/instances/morpho-blue/MorphoBlueHyperdrive.t.sol | 2 +- test/instances/reth/RETHHyperdrive.t.sol | 2 +- test/instances/steth/StETHHyperdrive.t.sol | 2 +- test/instances/steth/Sweep.t.sol | 2 +- test/instances/susde/SUSDe.t.sol | 2 +- test/integrations/deployers/DeployerCoordinator.t.sol | 2 +- .../deployers/ERC4626DeployerCoordinator.t.sol | 2 +- .../integrations/deployers/RethDeployerCoordinator.t.sol | 2 +- .../deployers/StethDeployerCoordinator.t.sol | 2 +- test/integrations/factory/HyperdriveFactory.t.sol | 2 +- test/integrations/hyperdrive/CheckpointRewards.t.sol | 2 +- test/integrations/hyperdrive/CircuitBreakerTest.t.sol | 2 +- .../hyperdrive/IntraCheckpointNettingTest.t.sol | 2 +- test/integrations/hyperdrive/LPWithdrawalTest.t.sol | 2 +- .../hyperdrive/NegativeInterestLongFeeTest.t.sol | 2 +- .../hyperdrive/NegativeInterestShortFeeTest.t.sol | 2 +- test/integrations/hyperdrive/NonstandardDecimals.sol | 2 +- test/integrations/hyperdrive/PresentValueTest.t.sol | 2 +- test/integrations/hyperdrive/PriceDiscovery.t.sol | 2 +- test/integrations/hyperdrive/ReentrancyTest.t.sol | 2 +- test/integrations/hyperdrive/RoundTripTest.t.sol | 2 +- test/integrations/hyperdrive/SandwichTest.t.sol | 2 +- .../hyperdrive/VariableInterestLongTest.t.sol | 2 +- .../hyperdrive/VariableInterestShortTest.t.sol | 2 +- test/integrations/hyperdrive/ZombieInterestTest.t.sol | 2 +- test/units/MultiToken.t.sol | 2 +- test/units/hyperdrive/AddLiquidityTest.t.sol | 2 +- test/units/hyperdrive/Admin.t.sol | 2 +- test/units/hyperdrive/CheckpointTest.t.sol | 2 +- test/units/hyperdrive/CloseLongTest.t.sol | 2 +- test/units/hyperdrive/CloseShortTest.t.sol | 2 +- test/units/hyperdrive/DataProvider.t.sol | 2 +- test/units/hyperdrive/ExtremeInputs.t.sol | 2 +- test/units/hyperdrive/FeeTest.t.sol | 2 +- test/units/hyperdrive/InitializeTest.t.sol | 2 +- test/units/hyperdrive/OpenLongTest.t.sol | 2 +- test/units/hyperdrive/OpenShortTest.t.sol | 2 +- test/units/hyperdrive/RedeemWithdrawalSharesTest.t.sol | 2 +- test/units/hyperdrive/RemoveLiquidityTest.t.sol | 2 +- test/units/hyperdrive/UpdateLiquidityTest.t.sol | 2 +- test/units/libraries/AssetId.t.sol | 2 +- test/units/libraries/FixedPointMath.t.sol | 2 +- test/units/libraries/HyperdriveMath.t.sol | 2 +- test/units/libraries/HyperdriveUtilsTest.t.sol | 2 +- test/units/libraries/LPMath.t.sol | 2 +- test/units/libraries/YieldSpaceMath.t.sol | 2 +- test/units/registry/HyperdriveRegistry.t.sol | 2 +- test/units/rewarder/HyperdriveCheckpointRewarder.t.sol | 2 +- .../units/rewarder/HyperdriveCheckpointSubrewarder.t.sol | 2 +- test/utils/BaseTest.sol | 2 +- test/utils/CombinatorialTest.sol | 2 +- test/utils/EtchingUtils.sol | 2 +- test/utils/HyperdriveTest.sol | 2 +- test/utils/HyperdriveUtils.sol | 2 +- test/utils/InstanceTest.sol | 2 +- test/utils/Lib.sol | 2 +- 293 files changed, 297 insertions(+), 311 deletions(-) diff --git a/codegen/templates/deployers/HyperdriveCoreDeployer.sol.jinja b/codegen/templates/deployers/HyperdriveCoreDeployer.sol.jinja index 01ccc8c1a..d607e254e 100644 --- a/codegen/templates/deployers/HyperdriveCoreDeployer.sol.jinja +++ b/codegen/templates/deployers/HyperdriveCoreDeployer.sol.jinja @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; import { IHyperdriveCoreDeployer } from "../../interfaces/IHyperdriveCoreDeployer.sol"; diff --git a/codegen/templates/deployers/HyperdriveDeployerCoordinator.sol.jinja b/codegen/templates/deployers/HyperdriveDeployerCoordinator.sol.jinja index f6d8a0869..fc89a0203 100644 --- a/codegen/templates/deployers/HyperdriveDeployerCoordinator.sol.jinja +++ b/codegen/templates/deployers/HyperdriveDeployerCoordinator.sol.jinja @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { ERC20 } from "openzeppelin/token/ERC20/ERC20.sol"; import { SafeERC20 } from "openzeppelin/token/ERC20/utils/SafeERC20.sol"; diff --git a/codegen/templates/deployers/Target0Deployer.sol.jinja b/codegen/templates/deployers/Target0Deployer.sol.jinja index 3b6e41410..3f3ec64ef 100644 --- a/codegen/templates/deployers/Target0Deployer.sol.jinja +++ b/codegen/templates/deployers/Target0Deployer.sol.jinja @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { {{ name.capitalized }}Target0 } from "../../instances/{{ name.lowercase }}/{{ name.capitalized }}Target0.sol"; import { I{{ name.capitalized }} } from "../../interfaces/I{{ name.capitalized }}.sol"; diff --git a/codegen/templates/deployers/Target1Deployer.sol.jinja b/codegen/templates/deployers/Target1Deployer.sol.jinja index 25264a14b..2c4eb8cb2 100644 --- a/codegen/templates/deployers/Target1Deployer.sol.jinja +++ b/codegen/templates/deployers/Target1Deployer.sol.jinja @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { {{ name.capitalized }}Target1 } from "../../instances/{{ name.lowercase }}/{{ name.capitalized }}Target1.sol"; import { I{{ name.capitalized }} } from "../../interfaces/I{{ name.capitalized }}.sol"; diff --git a/codegen/templates/deployers/Target2Deployer.sol.jinja b/codegen/templates/deployers/Target2Deployer.sol.jinja index 4f19f6240..fb882efbf 100644 --- a/codegen/templates/deployers/Target2Deployer.sol.jinja +++ b/codegen/templates/deployers/Target2Deployer.sol.jinja @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { {{ name.capitalized }}Target2 } from "../../instances/{{ name.lowercase }}/{{ name.capitalized }}Target2.sol"; import { I{{ name.capitalized }} } from "../../interfaces/I{{ name.capitalized }}.sol"; diff --git a/codegen/templates/deployers/Target3Deployer.sol.jinja b/codegen/templates/deployers/Target3Deployer.sol.jinja index eaccb9b13..c9bae85ff 100644 --- a/codegen/templates/deployers/Target3Deployer.sol.jinja +++ b/codegen/templates/deployers/Target3Deployer.sol.jinja @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { {{ name.capitalized }}Target3 } from "../../instances/{{ name.lowercase }}/{{ name.capitalized }}Target3.sol"; import { I{{ name.capitalized }} } from "../../interfaces/I{{ name.capitalized }}.sol"; diff --git a/codegen/templates/deployers/Target4Deployer.sol.jinja b/codegen/templates/deployers/Target4Deployer.sol.jinja index cf5bb6d3b..6494f31a3 100644 --- a/codegen/templates/deployers/Target4Deployer.sol.jinja +++ b/codegen/templates/deployers/Target4Deployer.sol.jinja @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { {{ name.capitalized }}Target4 } from "../../instances/{{ name.lowercase }}/{{ name.capitalized }}Target4.sol"; import { I{{ name.capitalized }} } from "../../interfaces/I{{ name.capitalized }}.sol"; diff --git a/codegen/templates/instances/Base.sol.jinja b/codegen/templates/instances/Base.sol.jinja index 1e78ca3f4..2af8cf171 100644 --- a/codegen/templates/instances/Base.sol.jinja +++ b/codegen/templates/instances/Base.sol.jinja @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { ERC20 } from "openzeppelin/token/ERC20/ERC20.sol"; import { SafeERC20 } from "openzeppelin/token/ERC20/utils/SafeERC20.sol"; diff --git a/codegen/templates/instances/Hyperdrive.sol.jinja b/codegen/templates/instances/Hyperdrive.sol.jinja index 38300fd9a..099ff87cd 100644 --- a/codegen/templates/instances/Hyperdrive.sol.jinja +++ b/codegen/templates/instances/Hyperdrive.sol.jinja @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { ERC20 } from "openzeppelin/token/ERC20/ERC20.sol"; import { SafeERC20 } from "openzeppelin/token/ERC20/utils/SafeERC20.sol"; diff --git a/codegen/templates/instances/Target0.sol.jinja b/codegen/templates/instances/Target0.sol.jinja index e5d3bb61b..09c876d70 100644 --- a/codegen/templates/instances/Target0.sol.jinja +++ b/codegen/templates/instances/Target0.sol.jinja @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { HyperdriveTarget0 } from "../../external/HyperdriveTarget0.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/codegen/templates/instances/Target1.sol.jinja b/codegen/templates/instances/Target1.sol.jinja index 711208bf7..dcc20c37d 100644 --- a/codegen/templates/instances/Target1.sol.jinja +++ b/codegen/templates/instances/Target1.sol.jinja @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { HyperdriveTarget1 } from "../../external/HyperdriveTarget1.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/codegen/templates/instances/Target2.sol.jinja b/codegen/templates/instances/Target2.sol.jinja index cf8b4326d..1c7023f66 100644 --- a/codegen/templates/instances/Target2.sol.jinja +++ b/codegen/templates/instances/Target2.sol.jinja @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { HyperdriveTarget2 } from "../../external/HyperdriveTarget2.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/codegen/templates/instances/Target3.sol.jinja b/codegen/templates/instances/Target3.sol.jinja index 3942f387a..868a67a9c 100644 --- a/codegen/templates/instances/Target3.sol.jinja +++ b/codegen/templates/instances/Target3.sol.jinja @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { HyperdriveTarget3 } from "../../external/HyperdriveTarget3.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/codegen/templates/instances/Target4.sol.jinja b/codegen/templates/instances/Target4.sol.jinja index 1d6066b69..70291d082 100644 --- a/codegen/templates/instances/Target4.sol.jinja +++ b/codegen/templates/instances/Target4.sol.jinja @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { HyperdriveTarget4 } from "../../external/HyperdriveTarget4.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/codegen/templates/interfaces/IHyperdrive.sol.jinja b/codegen/templates/interfaces/IHyperdrive.sol.jinja index 389c462f8..405a925c3 100644 --- a/codegen/templates/interfaces/IHyperdrive.sol.jinja +++ b/codegen/templates/interfaces/IHyperdrive.sol.jinja @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { IHyperdrive } from "./IHyperdrive.sol"; diff --git a/codegen/templates/interfaces/IYieldSource.sol.jinja b/codegen/templates/interfaces/IYieldSource.sol.jinja index ed83dad2b..b6cf2481d 100644 --- a/codegen/templates/interfaces/IYieldSource.sol.jinja +++ b/codegen/templates/interfaces/IYieldSource.sol.jinja @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { IERC4626 } from "./IERC4626.sol"; diff --git a/contracts/src/deployers/HyperdriveDeployerCoordinator.sol b/contracts/src/deployers/HyperdriveDeployerCoordinator.sol index 881fde6d3..2d78883ac 100644 --- a/contracts/src/deployers/HyperdriveDeployerCoordinator.sol +++ b/contracts/src/deployers/HyperdriveDeployerCoordinator.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { IHyperdrive } from "../interfaces/IHyperdrive.sol"; import { IHyperdriveCoreDeployer } from "../interfaces/IHyperdriveCoreDeployer.sol"; diff --git a/contracts/src/deployers/aave/AaveHyperdriveCoreDeployer.sol b/contracts/src/deployers/aave/AaveHyperdriveCoreDeployer.sol index fb271c605..2bf4dc873 100644 --- a/contracts/src/deployers/aave/AaveHyperdriveCoreDeployer.sol +++ b/contracts/src/deployers/aave/AaveHyperdriveCoreDeployer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; import { IHyperdriveCoreDeployer } from "../../interfaces/IHyperdriveCoreDeployer.sol"; diff --git a/contracts/src/deployers/aave/AaveHyperdriveDeployerCoordinator.sol b/contracts/src/deployers/aave/AaveHyperdriveDeployerCoordinator.sol index b94d3e940..976608bd5 100644 --- a/contracts/src/deployers/aave/AaveHyperdriveDeployerCoordinator.sol +++ b/contracts/src/deployers/aave/AaveHyperdriveDeployerCoordinator.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { IPool } from "aave/interfaces/IPool.sol"; import { ERC20 } from "openzeppelin/token/ERC20/ERC20.sol"; diff --git a/contracts/src/deployers/aave/AaveTarget0Deployer.sol b/contracts/src/deployers/aave/AaveTarget0Deployer.sol index 1bcc1cfed..ae50715e5 100644 --- a/contracts/src/deployers/aave/AaveTarget0Deployer.sol +++ b/contracts/src/deployers/aave/AaveTarget0Deployer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { AaveTarget0 } from "../../instances/aave/AaveTarget0.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/deployers/aave/AaveTarget1Deployer.sol b/contracts/src/deployers/aave/AaveTarget1Deployer.sol index 3212533df..868e1f3f4 100644 --- a/contracts/src/deployers/aave/AaveTarget1Deployer.sol +++ b/contracts/src/deployers/aave/AaveTarget1Deployer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { AaveTarget1 } from "../../instances/aave/AaveTarget1.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/deployers/aave/AaveTarget2Deployer.sol b/contracts/src/deployers/aave/AaveTarget2Deployer.sol index c5a89abb5..7a246dfe0 100644 --- a/contracts/src/deployers/aave/AaveTarget2Deployer.sol +++ b/contracts/src/deployers/aave/AaveTarget2Deployer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { AaveTarget2 } from "../../instances/aave/AaveTarget2.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/deployers/aave/AaveTarget3Deployer.sol b/contracts/src/deployers/aave/AaveTarget3Deployer.sol index 3821c3f37..8cda1202f 100644 --- a/contracts/src/deployers/aave/AaveTarget3Deployer.sol +++ b/contracts/src/deployers/aave/AaveTarget3Deployer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { AaveTarget3 } from "../../instances/aave/AaveTarget3.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/deployers/aave/AaveTarget4Deployer.sol b/contracts/src/deployers/aave/AaveTarget4Deployer.sol index 657854cfd..eb110fce6 100644 --- a/contracts/src/deployers/aave/AaveTarget4Deployer.sol +++ b/contracts/src/deployers/aave/AaveTarget4Deployer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { AaveTarget4 } from "../../instances/aave/AaveTarget4.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/deployers/eeth/EETHHyperdriveCoreDeployer.sol b/contracts/src/deployers/eeth/EETHHyperdriveCoreDeployer.sol index 82182c889..ec33866eb 100644 --- a/contracts/src/deployers/eeth/EETHHyperdriveCoreDeployer.sol +++ b/contracts/src/deployers/eeth/EETHHyperdriveCoreDeployer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; import { IHyperdriveCoreDeployer } from "../../interfaces/IHyperdriveCoreDeployer.sol"; diff --git a/contracts/src/deployers/eeth/EETHHyperdriveDeployerCoordinator.sol b/contracts/src/deployers/eeth/EETHHyperdriveDeployerCoordinator.sol index 28dc95181..3fab5d466 100644 --- a/contracts/src/deployers/eeth/EETHHyperdriveDeployerCoordinator.sol +++ b/contracts/src/deployers/eeth/EETHHyperdriveDeployerCoordinator.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { IERC20 } from "../../interfaces/IERC20.sol"; import { IEETH } from "../../interfaces/IEETH.sol"; diff --git a/contracts/src/deployers/eeth/EETHTarget0Deployer.sol b/contracts/src/deployers/eeth/EETHTarget0Deployer.sol index 6efa0a5a9..22ab20bea 100644 --- a/contracts/src/deployers/eeth/EETHTarget0Deployer.sol +++ b/contracts/src/deployers/eeth/EETHTarget0Deployer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { EETHTarget0 } from "../../instances/eeth/EETHTarget0.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/deployers/eeth/EETHTarget1Deployer.sol b/contracts/src/deployers/eeth/EETHTarget1Deployer.sol index 9f152cbd6..aad83bbeb 100644 --- a/contracts/src/deployers/eeth/EETHTarget1Deployer.sol +++ b/contracts/src/deployers/eeth/EETHTarget1Deployer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { EETHTarget1 } from "../../instances/eeth/EETHTarget1.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/deployers/eeth/EETHTarget2Deployer.sol b/contracts/src/deployers/eeth/EETHTarget2Deployer.sol index aedb711c5..8360d32a4 100644 --- a/contracts/src/deployers/eeth/EETHTarget2Deployer.sol +++ b/contracts/src/deployers/eeth/EETHTarget2Deployer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { EETHTarget2 } from "../../instances/eeth/EETHTarget2.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/deployers/eeth/EETHTarget3Deployer.sol b/contracts/src/deployers/eeth/EETHTarget3Deployer.sol index 555130f20..4adc7a853 100644 --- a/contracts/src/deployers/eeth/EETHTarget3Deployer.sol +++ b/contracts/src/deployers/eeth/EETHTarget3Deployer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { EETHTarget3 } from "../../instances/eeth/EETHTarget3.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/deployers/eeth/EETHTarget4Deployer.sol b/contracts/src/deployers/eeth/EETHTarget4Deployer.sol index 33689e3a2..20ae3f293 100644 --- a/contracts/src/deployers/eeth/EETHTarget4Deployer.sol +++ b/contracts/src/deployers/eeth/EETHTarget4Deployer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { EETHTarget4 } from "../../instances/eeth/EETHTarget4.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/deployers/erc4626/ERC4626HyperdriveCoreDeployer.sol b/contracts/src/deployers/erc4626/ERC4626HyperdriveCoreDeployer.sol index 47c580606..aff501286 100644 --- a/contracts/src/deployers/erc4626/ERC4626HyperdriveCoreDeployer.sol +++ b/contracts/src/deployers/erc4626/ERC4626HyperdriveCoreDeployer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; import { IHyperdriveCoreDeployer } from "../../interfaces/IHyperdriveCoreDeployer.sol"; diff --git a/contracts/src/deployers/erc4626/ERC4626HyperdriveDeployerCoordinator.sol b/contracts/src/deployers/erc4626/ERC4626HyperdriveDeployerCoordinator.sol index 73c1373aa..23cbe877f 100644 --- a/contracts/src/deployers/erc4626/ERC4626HyperdriveDeployerCoordinator.sol +++ b/contracts/src/deployers/erc4626/ERC4626HyperdriveDeployerCoordinator.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { ERC20 } from "openzeppelin/token/ERC20/ERC20.sol"; import { SafeERC20 } from "openzeppelin/token/ERC20/utils/SafeERC20.sol"; diff --git a/contracts/src/deployers/erc4626/ERC4626Target0Deployer.sol b/contracts/src/deployers/erc4626/ERC4626Target0Deployer.sol index 2d59afc8d..5bcbf42ec 100644 --- a/contracts/src/deployers/erc4626/ERC4626Target0Deployer.sol +++ b/contracts/src/deployers/erc4626/ERC4626Target0Deployer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { ERC4626Target0 } from "../../instances/erc4626/ERC4626Target0.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/deployers/erc4626/ERC4626Target1Deployer.sol b/contracts/src/deployers/erc4626/ERC4626Target1Deployer.sol index a9a3fd425..37a9d90ec 100644 --- a/contracts/src/deployers/erc4626/ERC4626Target1Deployer.sol +++ b/contracts/src/deployers/erc4626/ERC4626Target1Deployer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { ERC4626Target1 } from "../../instances/erc4626/ERC4626Target1.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/deployers/erc4626/ERC4626Target2Deployer.sol b/contracts/src/deployers/erc4626/ERC4626Target2Deployer.sol index 41e0a7a3e..64573131c 100644 --- a/contracts/src/deployers/erc4626/ERC4626Target2Deployer.sol +++ b/contracts/src/deployers/erc4626/ERC4626Target2Deployer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { ERC4626Target2 } from "../../instances/erc4626/ERC4626Target2.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/deployers/erc4626/ERC4626Target3Deployer.sol b/contracts/src/deployers/erc4626/ERC4626Target3Deployer.sol index 846f917ee..f308f5c56 100644 --- a/contracts/src/deployers/erc4626/ERC4626Target3Deployer.sol +++ b/contracts/src/deployers/erc4626/ERC4626Target3Deployer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { ERC4626Target3 } from "../../instances/erc4626/ERC4626Target3.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/deployers/erc4626/ERC4626Target4Deployer.sol b/contracts/src/deployers/erc4626/ERC4626Target4Deployer.sol index 7e539685d..bd793afaf 100644 --- a/contracts/src/deployers/erc4626/ERC4626Target4Deployer.sol +++ b/contracts/src/deployers/erc4626/ERC4626Target4Deployer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { ERC4626Target4 } from "../../instances/erc4626/ERC4626Target4.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/deployers/ezeth/EzETHHyperdriveCoreDeployer.sol b/contracts/src/deployers/ezeth/EzETHHyperdriveCoreDeployer.sol index 5d7fc9c7f..a1c345524 100644 --- a/contracts/src/deployers/ezeth/EzETHHyperdriveCoreDeployer.sol +++ b/contracts/src/deployers/ezeth/EzETHHyperdriveCoreDeployer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; import { IHyperdriveCoreDeployer } from "../../interfaces/IHyperdriveCoreDeployer.sol"; diff --git a/contracts/src/deployers/ezeth/EzETHHyperdriveDeployerCoordinator.sol b/contracts/src/deployers/ezeth/EzETHHyperdriveDeployerCoordinator.sol index 9159c1af9..8384af97e 100644 --- a/contracts/src/deployers/ezeth/EzETHHyperdriveDeployerCoordinator.sol +++ b/contracts/src/deployers/ezeth/EzETHHyperdriveDeployerCoordinator.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { ERC20 } from "openzeppelin/token/ERC20/ERC20.sol"; import { SafeERC20 } from "openzeppelin/token/ERC20/utils/SafeERC20.sol"; diff --git a/contracts/src/deployers/ezeth/EzETHTarget0Deployer.sol b/contracts/src/deployers/ezeth/EzETHTarget0Deployer.sol index fcdfc72d1..9d838f34f 100644 --- a/contracts/src/deployers/ezeth/EzETHTarget0Deployer.sol +++ b/contracts/src/deployers/ezeth/EzETHTarget0Deployer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { EzETHTarget0 } from "../../instances/ezeth/EzETHTarget0.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/deployers/ezeth/EzETHTarget1Deployer.sol b/contracts/src/deployers/ezeth/EzETHTarget1Deployer.sol index 21f23ab36..b147249a4 100644 --- a/contracts/src/deployers/ezeth/EzETHTarget1Deployer.sol +++ b/contracts/src/deployers/ezeth/EzETHTarget1Deployer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { EzETHTarget1 } from "../../instances/ezeth/EzETHTarget1.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/deployers/ezeth/EzETHTarget2Deployer.sol b/contracts/src/deployers/ezeth/EzETHTarget2Deployer.sol index dd6a86968..02e39afe4 100644 --- a/contracts/src/deployers/ezeth/EzETHTarget2Deployer.sol +++ b/contracts/src/deployers/ezeth/EzETHTarget2Deployer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { EzETHTarget2 } from "../../instances/ezeth/EzETHTarget2.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/deployers/ezeth/EzETHTarget3Deployer.sol b/contracts/src/deployers/ezeth/EzETHTarget3Deployer.sol index b280c1e01..cdf93e181 100644 --- a/contracts/src/deployers/ezeth/EzETHTarget3Deployer.sol +++ b/contracts/src/deployers/ezeth/EzETHTarget3Deployer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { EzETHTarget3 } from "../../instances/ezeth/EzETHTarget3.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/deployers/ezeth/EzETHTarget4Deployer.sol b/contracts/src/deployers/ezeth/EzETHTarget4Deployer.sol index c575408e2..f91d707b8 100644 --- a/contracts/src/deployers/ezeth/EzETHTarget4Deployer.sol +++ b/contracts/src/deployers/ezeth/EzETHTarget4Deployer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { EzETHTarget4 } from "../../instances/ezeth/EzETHTarget4.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/deployers/lseth/LsETHHyperdriveCoreDeployer.sol b/contracts/src/deployers/lseth/LsETHHyperdriveCoreDeployer.sol index b6d984c90..0d70428c8 100644 --- a/contracts/src/deployers/lseth/LsETHHyperdriveCoreDeployer.sol +++ b/contracts/src/deployers/lseth/LsETHHyperdriveCoreDeployer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; import { IHyperdriveCoreDeployer } from "../../interfaces/IHyperdriveCoreDeployer.sol"; diff --git a/contracts/src/deployers/lseth/LsETHHyperdriveDeployerCoordinator.sol b/contracts/src/deployers/lseth/LsETHHyperdriveDeployerCoordinator.sol index 92ceecba2..cbb6404a7 100644 --- a/contracts/src/deployers/lseth/LsETHHyperdriveDeployerCoordinator.sol +++ b/contracts/src/deployers/lseth/LsETHHyperdriveDeployerCoordinator.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { ERC20 } from "openzeppelin/token/ERC20/ERC20.sol"; import { SafeERC20 } from "openzeppelin/token/ERC20/utils/SafeERC20.sol"; diff --git a/contracts/src/deployers/lseth/LsETHTarget0Deployer.sol b/contracts/src/deployers/lseth/LsETHTarget0Deployer.sol index 4c8ca5656..e050885fe 100644 --- a/contracts/src/deployers/lseth/LsETHTarget0Deployer.sol +++ b/contracts/src/deployers/lseth/LsETHTarget0Deployer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { LsETHTarget0 } from "../../instances/lseth/LsETHTarget0.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/deployers/lseth/LsETHTarget1Deployer.sol b/contracts/src/deployers/lseth/LsETHTarget1Deployer.sol index bcdf43b1c..d03dafe51 100644 --- a/contracts/src/deployers/lseth/LsETHTarget1Deployer.sol +++ b/contracts/src/deployers/lseth/LsETHTarget1Deployer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { LsETHTarget1 } from "../../instances/lseth/LsETHTarget1.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/deployers/lseth/LsETHTarget2Deployer.sol b/contracts/src/deployers/lseth/LsETHTarget2Deployer.sol index e4b864e3f..f4e7ffe4c 100644 --- a/contracts/src/deployers/lseth/LsETHTarget2Deployer.sol +++ b/contracts/src/deployers/lseth/LsETHTarget2Deployer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { LsETHTarget2 } from "../../instances/lseth/LsETHTarget2.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/deployers/lseth/LsETHTarget3Deployer.sol b/contracts/src/deployers/lseth/LsETHTarget3Deployer.sol index 8930cd000..82793051c 100644 --- a/contracts/src/deployers/lseth/LsETHTarget3Deployer.sol +++ b/contracts/src/deployers/lseth/LsETHTarget3Deployer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { LsETHTarget3 } from "../../instances/lseth/LsETHTarget3.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/deployers/lseth/LsETHTarget4Deployer.sol b/contracts/src/deployers/lseth/LsETHTarget4Deployer.sol index a70b795a5..2e204411a 100644 --- a/contracts/src/deployers/lseth/LsETHTarget4Deployer.sol +++ b/contracts/src/deployers/lseth/LsETHTarget4Deployer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { LsETHTarget4 } from "../../instances/lseth/LsETHTarget4.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/deployers/morpho-blue/MorphoBlueHyperdriveCoreDeployer.sol b/contracts/src/deployers/morpho-blue/MorphoBlueHyperdriveCoreDeployer.sol index 21f481430..e0efb2cc1 100644 --- a/contracts/src/deployers/morpho-blue/MorphoBlueHyperdriveCoreDeployer.sol +++ b/contracts/src/deployers/morpho-blue/MorphoBlueHyperdriveCoreDeployer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; import { IHyperdriveCoreDeployer } from "../../interfaces/IHyperdriveCoreDeployer.sol"; diff --git a/contracts/src/deployers/morpho-blue/MorphoBlueHyperdriveDeployerCoordinator.sol b/contracts/src/deployers/morpho-blue/MorphoBlueHyperdriveDeployerCoordinator.sol index b0c46334e..2cec3b2db 100644 --- a/contracts/src/deployers/morpho-blue/MorphoBlueHyperdriveDeployerCoordinator.sol +++ b/contracts/src/deployers/morpho-blue/MorphoBlueHyperdriveDeployerCoordinator.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { IMorpho } from "morpho-blue/src/interfaces/IMorpho.sol"; import { ERC20 } from "openzeppelin/token/ERC20/ERC20.sol"; diff --git a/contracts/src/deployers/morpho-blue/MorphoBlueTarget0Deployer.sol b/contracts/src/deployers/morpho-blue/MorphoBlueTarget0Deployer.sol index e39cd943e..9f991d2cc 100644 --- a/contracts/src/deployers/morpho-blue/MorphoBlueTarget0Deployer.sol +++ b/contracts/src/deployers/morpho-blue/MorphoBlueTarget0Deployer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { MorphoBlueTarget0 } from "../../instances/morpho-blue/MorphoBlueTarget0.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/deployers/morpho-blue/MorphoBlueTarget1Deployer.sol b/contracts/src/deployers/morpho-blue/MorphoBlueTarget1Deployer.sol index 32fed5280..efec28c1b 100644 --- a/contracts/src/deployers/morpho-blue/MorphoBlueTarget1Deployer.sol +++ b/contracts/src/deployers/morpho-blue/MorphoBlueTarget1Deployer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { MorphoBlueTarget1 } from "../../instances/morpho-blue/MorphoBlueTarget1.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/deployers/morpho-blue/MorphoBlueTarget2Deployer.sol b/contracts/src/deployers/morpho-blue/MorphoBlueTarget2Deployer.sol index a159c20b6..f13039fff 100644 --- a/contracts/src/deployers/morpho-blue/MorphoBlueTarget2Deployer.sol +++ b/contracts/src/deployers/morpho-blue/MorphoBlueTarget2Deployer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { MorphoBlueTarget2 } from "../../instances/morpho-blue/MorphoBlueTarget2.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/deployers/morpho-blue/MorphoBlueTarget3Deployer.sol b/contracts/src/deployers/morpho-blue/MorphoBlueTarget3Deployer.sol index 02e875848..1b3f80863 100644 --- a/contracts/src/deployers/morpho-blue/MorphoBlueTarget3Deployer.sol +++ b/contracts/src/deployers/morpho-blue/MorphoBlueTarget3Deployer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { MorphoBlueTarget3 } from "../../instances/morpho-blue/MorphoBlueTarget3.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/deployers/morpho-blue/MorphoBlueTarget4Deployer.sol b/contracts/src/deployers/morpho-blue/MorphoBlueTarget4Deployer.sol index de10bd080..82f7a20ff 100644 --- a/contracts/src/deployers/morpho-blue/MorphoBlueTarget4Deployer.sol +++ b/contracts/src/deployers/morpho-blue/MorphoBlueTarget4Deployer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { MorphoBlueTarget4 } from "../../instances/morpho-blue/MorphoBlueTarget4.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/deployers/reth/RETHHyperdriveCoreDeployer.sol b/contracts/src/deployers/reth/RETHHyperdriveCoreDeployer.sol index dfdcdd08c..e023545d8 100644 --- a/contracts/src/deployers/reth/RETHHyperdriveCoreDeployer.sol +++ b/contracts/src/deployers/reth/RETHHyperdriveCoreDeployer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; import { IHyperdriveCoreDeployer } from "../../interfaces/IHyperdriveCoreDeployer.sol"; diff --git a/contracts/src/deployers/reth/RETHHyperdriveDeployerCoordinator.sol b/contracts/src/deployers/reth/RETHHyperdriveDeployerCoordinator.sol index df8cc4358..c63a106bc 100644 --- a/contracts/src/deployers/reth/RETHHyperdriveDeployerCoordinator.sol +++ b/contracts/src/deployers/reth/RETHHyperdriveDeployerCoordinator.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { ERC20 } from "openzeppelin/token/ERC20/ERC20.sol"; import { SafeERC20 } from "openzeppelin/token/ERC20/utils/SafeERC20.sol"; diff --git a/contracts/src/deployers/reth/RETHTarget0Deployer.sol b/contracts/src/deployers/reth/RETHTarget0Deployer.sol index 41504f16a..03f783a03 100644 --- a/contracts/src/deployers/reth/RETHTarget0Deployer.sol +++ b/contracts/src/deployers/reth/RETHTarget0Deployer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { RETHTarget0 } from "../../instances/reth/RETHTarget0.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/deployers/reth/RETHTarget1Deployer.sol b/contracts/src/deployers/reth/RETHTarget1Deployer.sol index ac963c1e3..40e06868a 100644 --- a/contracts/src/deployers/reth/RETHTarget1Deployer.sol +++ b/contracts/src/deployers/reth/RETHTarget1Deployer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { RETHTarget1 } from "../../instances/reth/RETHTarget1.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/deployers/reth/RETHTarget2Deployer.sol b/contracts/src/deployers/reth/RETHTarget2Deployer.sol index 4ca855a5f..5f807cd73 100644 --- a/contracts/src/deployers/reth/RETHTarget2Deployer.sol +++ b/contracts/src/deployers/reth/RETHTarget2Deployer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { RETHTarget2 } from "../../instances/reth/RETHTarget2.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/deployers/reth/RETHTarget3Deployer.sol b/contracts/src/deployers/reth/RETHTarget3Deployer.sol index 3ec2c38ce..fdfabeda3 100644 --- a/contracts/src/deployers/reth/RETHTarget3Deployer.sol +++ b/contracts/src/deployers/reth/RETHTarget3Deployer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { RETHTarget3 } from "../../instances/reth/RETHTarget3.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/deployers/reth/RETHTarget4Deployer.sol b/contracts/src/deployers/reth/RETHTarget4Deployer.sol index 965dc8e48..927e7b137 100644 --- a/contracts/src/deployers/reth/RETHTarget4Deployer.sol +++ b/contracts/src/deployers/reth/RETHTarget4Deployer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { RETHTarget4 } from "../../instances/reth/RETHTarget4.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/deployers/steth/StETHHyperdriveCoreDeployer.sol b/contracts/src/deployers/steth/StETHHyperdriveCoreDeployer.sol index 0dbc31836..988587be6 100644 --- a/contracts/src/deployers/steth/StETHHyperdriveCoreDeployer.sol +++ b/contracts/src/deployers/steth/StETHHyperdriveCoreDeployer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; import { IHyperdriveCoreDeployer } from "../../interfaces/IHyperdriveCoreDeployer.sol"; diff --git a/contracts/src/deployers/steth/StETHHyperdriveDeployerCoordinator.sol b/contracts/src/deployers/steth/StETHHyperdriveDeployerCoordinator.sol index b59fd3384..6a91a9623 100644 --- a/contracts/src/deployers/steth/StETHHyperdriveDeployerCoordinator.sol +++ b/contracts/src/deployers/steth/StETHHyperdriveDeployerCoordinator.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { StETHConversions } from "../../instances/steth/StETHConversions.sol"; import { IERC20 } from "../../interfaces/IERC20.sol"; diff --git a/contracts/src/deployers/steth/StETHTarget0Deployer.sol b/contracts/src/deployers/steth/StETHTarget0Deployer.sol index 79da20b86..0e253cdb6 100644 --- a/contracts/src/deployers/steth/StETHTarget0Deployer.sol +++ b/contracts/src/deployers/steth/StETHTarget0Deployer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { StETHTarget0 } from "../../instances/steth/StETHTarget0.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/deployers/steth/StETHTarget1Deployer.sol b/contracts/src/deployers/steth/StETHTarget1Deployer.sol index baa3f73e9..cdecae713 100644 --- a/contracts/src/deployers/steth/StETHTarget1Deployer.sol +++ b/contracts/src/deployers/steth/StETHTarget1Deployer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { StETHTarget1 } from "../../instances/steth/StETHTarget1.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/deployers/steth/StETHTarget2Deployer.sol b/contracts/src/deployers/steth/StETHTarget2Deployer.sol index 05252c10a..df601a962 100644 --- a/contracts/src/deployers/steth/StETHTarget2Deployer.sol +++ b/contracts/src/deployers/steth/StETHTarget2Deployer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { StETHTarget2 } from "../../instances/steth/StETHTarget2.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/deployers/steth/StETHTarget3Deployer.sol b/contracts/src/deployers/steth/StETHTarget3Deployer.sol index 29895679e..bc7658207 100644 --- a/contracts/src/deployers/steth/StETHTarget3Deployer.sol +++ b/contracts/src/deployers/steth/StETHTarget3Deployer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { StETHTarget3 } from "../../instances/steth/StETHTarget3.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/deployers/steth/StETHTarget4Deployer.sol b/contracts/src/deployers/steth/StETHTarget4Deployer.sol index 9cf00756a..142e27581 100644 --- a/contracts/src/deployers/steth/StETHTarget4Deployer.sol +++ b/contracts/src/deployers/steth/StETHTarget4Deployer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { StETHTarget4 } from "../../instances/steth/StETHTarget4.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/external/Hyperdrive.sol b/contracts/src/external/Hyperdrive.sol index a00aa4185..efacf900c 100644 --- a/contracts/src/external/Hyperdrive.sol +++ b/contracts/src/external/Hyperdrive.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { IERC20 } from "../interfaces/IERC20.sol"; import { HyperdriveTarget0 } from "../external/HyperdriveTarget0.sol"; diff --git a/contracts/src/external/HyperdriveTarget0.sol b/contracts/src/external/HyperdriveTarget0.sol index 25e22c81c..246eb99cf 100644 --- a/contracts/src/external/HyperdriveTarget0.sol +++ b/contracts/src/external/HyperdriveTarget0.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { IERC20 } from "../interfaces/IERC20.sol"; import { IHyperdrive } from "../interfaces/IHyperdrive.sol"; @@ -409,16 +409,13 @@ abstract contract HyperdriveTarget0 is bytes32[] memory loaded = new bytes32[](_slots.length); // Iterate on requested loads and then do them. - for (uint256 i = 0; i < _slots.length; ) { + for (uint256 i = 0; i < _slots.length; i++) { uint256 slot = _slots[i]; bytes32 data; assembly ("memory-safe") { data := sload(slot) } loaded[i] = data; - unchecked { - ++i; - } } _revert(abi.encode(loaded)); diff --git a/contracts/src/external/HyperdriveTarget1.sol b/contracts/src/external/HyperdriveTarget1.sol index d2609998c..2db77f283 100644 --- a/contracts/src/external/HyperdriveTarget1.sol +++ b/contracts/src/external/HyperdriveTarget1.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { IHyperdrive } from "../interfaces/IHyperdrive.sol"; import { HyperdriveAdmin } from "../internal/HyperdriveAdmin.sol"; diff --git a/contracts/src/external/HyperdriveTarget2.sol b/contracts/src/external/HyperdriveTarget2.sol index 18b8971ae..465066b73 100644 --- a/contracts/src/external/HyperdriveTarget2.sol +++ b/contracts/src/external/HyperdriveTarget2.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { IHyperdrive } from "../interfaces/IHyperdrive.sol"; import { HyperdriveAdmin } from "../internal/HyperdriveAdmin.sol"; diff --git a/contracts/src/external/HyperdriveTarget3.sol b/contracts/src/external/HyperdriveTarget3.sol index 17751c185..d2c253ca6 100644 --- a/contracts/src/external/HyperdriveTarget3.sol +++ b/contracts/src/external/HyperdriveTarget3.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { IHyperdrive } from "../interfaces/IHyperdrive.sol"; import { HyperdriveAdmin } from "../internal/HyperdriveAdmin.sol"; diff --git a/contracts/src/external/HyperdriveTarget4.sol b/contracts/src/external/HyperdriveTarget4.sol index 117477090..3f5e22757 100644 --- a/contracts/src/external/HyperdriveTarget4.sol +++ b/contracts/src/external/HyperdriveTarget4.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { IHyperdrive } from "../interfaces/IHyperdrive.sol"; import { HyperdriveAdmin } from "../internal/HyperdriveAdmin.sol"; diff --git a/contracts/src/factory/HyperdriveFactory.sol b/contracts/src/factory/HyperdriveFactory.sol index 14da14823..76c7d5908 100644 --- a/contracts/src/factory/HyperdriveFactory.sol +++ b/contracts/src/factory/HyperdriveFactory.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { IHyperdrive } from "../interfaces/IHyperdrive.sol"; import { IHyperdriveDeployerCoordinator } from "../interfaces/IHyperdriveDeployerCoordinator.sol"; @@ -814,11 +814,8 @@ contract HyperdriveFactory is IHyperdriveFactory { // Set the default pausers and transfer the governance status to the // hyperdrive governance address. - for (uint256 i = 0; i < _defaultPausers.length; ) { + for (uint256 i = 0; i < _defaultPausers.length; i++) { hyperdrive.setPauser(_defaultPausers[i], true); - unchecked { - ++i; - } } hyperdrive.setGovernance(hyperdriveGovernance); diff --git a/contracts/src/factory/HyperdriveRegistry.sol b/contracts/src/factory/HyperdriveRegistry.sol index 5bf06e30f..513a0d0d5 100644 --- a/contracts/src/factory/HyperdriveRegistry.sol +++ b/contracts/src/factory/HyperdriveRegistry.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { IHyperdrive } from "../interfaces/IHyperdrive.sol"; import { IHyperdriveFactory } from "../interfaces/IHyperdriveFactory.sol"; diff --git a/contracts/src/instances/aave/AaveBase.sol b/contracts/src/instances/aave/AaveBase.sol index e25d8963b..33e3861a8 100644 --- a/contracts/src/instances/aave/AaveBase.sol +++ b/contracts/src/instances/aave/AaveBase.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { IPool } from "aave/interfaces/IPool.sol"; import { ERC20 } from "openzeppelin/token/ERC20/ERC20.sol"; diff --git a/contracts/src/instances/aave/AaveConversions.sol b/contracts/src/instances/aave/AaveConversions.sol index 83c6021f1..14854bcde 100644 --- a/contracts/src/instances/aave/AaveConversions.sol +++ b/contracts/src/instances/aave/AaveConversions.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { IPool } from "aave/interfaces/IPool.sol"; import { IERC20 } from "../../interfaces/IERC20.sol"; diff --git a/contracts/src/instances/aave/AaveHyperdrive.sol b/contracts/src/instances/aave/AaveHyperdrive.sol index 296c04177..7432967f5 100644 --- a/contracts/src/instances/aave/AaveHyperdrive.sol +++ b/contracts/src/instances/aave/AaveHyperdrive.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { ERC20 } from "openzeppelin/token/ERC20/ERC20.sol"; import { SafeERC20 } from "openzeppelin/token/ERC20/utils/SafeERC20.sol"; diff --git a/contracts/src/instances/aave/AaveTarget0.sol b/contracts/src/instances/aave/AaveTarget0.sol index 03fe052bc..3466a6214 100644 --- a/contracts/src/instances/aave/AaveTarget0.sol +++ b/contracts/src/instances/aave/AaveTarget0.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { IPool } from "aave/interfaces/IPool.sol"; import { HyperdriveTarget0 } from "../../external/HyperdriveTarget0.sol"; diff --git a/contracts/src/instances/aave/AaveTarget1.sol b/contracts/src/instances/aave/AaveTarget1.sol index c3a2abc38..a990e7ca3 100644 --- a/contracts/src/instances/aave/AaveTarget1.sol +++ b/contracts/src/instances/aave/AaveTarget1.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { HyperdriveTarget1 } from "../../external/HyperdriveTarget1.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/instances/aave/AaveTarget2.sol b/contracts/src/instances/aave/AaveTarget2.sol index 508ec7822..5f98086b7 100644 --- a/contracts/src/instances/aave/AaveTarget2.sol +++ b/contracts/src/instances/aave/AaveTarget2.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { HyperdriveTarget2 } from "../../external/HyperdriveTarget2.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/instances/aave/AaveTarget3.sol b/contracts/src/instances/aave/AaveTarget3.sol index 98591cbae..37402a697 100644 --- a/contracts/src/instances/aave/AaveTarget3.sol +++ b/contracts/src/instances/aave/AaveTarget3.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { HyperdriveTarget3 } from "../../external/HyperdriveTarget3.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/instances/aave/AaveTarget4.sol b/contracts/src/instances/aave/AaveTarget4.sol index be103816d..6f732892f 100644 --- a/contracts/src/instances/aave/AaveTarget4.sol +++ b/contracts/src/instances/aave/AaveTarget4.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { HyperdriveTarget4 } from "../../external/HyperdriveTarget4.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/instances/eeth/EETHBase.sol b/contracts/src/instances/eeth/EETHBase.sol index 00e884812..59f549fc7 100644 --- a/contracts/src/instances/eeth/EETHBase.sol +++ b/contracts/src/instances/eeth/EETHBase.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { IEETH } from "../../interfaces/IEETH.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/instances/eeth/EETHConversions.sol b/contracts/src/instances/eeth/EETHConversions.sol index 9aeddca2f..826fe3a9d 100644 --- a/contracts/src/instances/eeth/EETHConversions.sol +++ b/contracts/src/instances/eeth/EETHConversions.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { IERC20 } from "../../interfaces/IERC20.sol"; import { ILiquidityPool } from "../../interfaces/ILiquidityPool.sol"; diff --git a/contracts/src/instances/eeth/EETHHyperdrive.sol b/contracts/src/instances/eeth/EETHHyperdrive.sol index 23008d613..90aade356 100644 --- a/contracts/src/instances/eeth/EETHHyperdrive.sol +++ b/contracts/src/instances/eeth/EETHHyperdrive.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; import { ILiquidityPool } from "../../interfaces/ILiquidityPool.sol"; diff --git a/contracts/src/instances/eeth/EETHTarget0.sol b/contracts/src/instances/eeth/EETHTarget0.sol index 5cb7c812c..3e6d91da2 100644 --- a/contracts/src/instances/eeth/EETHTarget0.sol +++ b/contracts/src/instances/eeth/EETHTarget0.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { HyperdriveTarget0 } from "../../external/HyperdriveTarget0.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/instances/eeth/EETHTarget1.sol b/contracts/src/instances/eeth/EETHTarget1.sol index fea002df4..b7e6745e0 100644 --- a/contracts/src/instances/eeth/EETHTarget1.sol +++ b/contracts/src/instances/eeth/EETHTarget1.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { HyperdriveTarget1 } from "../../external/HyperdriveTarget1.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/instances/eeth/EETHTarget2.sol b/contracts/src/instances/eeth/EETHTarget2.sol index ab9f265db..700137cb8 100644 --- a/contracts/src/instances/eeth/EETHTarget2.sol +++ b/contracts/src/instances/eeth/EETHTarget2.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { HyperdriveTarget2 } from "../../external/HyperdriveTarget2.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/instances/eeth/EETHTarget3.sol b/contracts/src/instances/eeth/EETHTarget3.sol index 90501dc12..e7c8cd17b 100644 --- a/contracts/src/instances/eeth/EETHTarget3.sol +++ b/contracts/src/instances/eeth/EETHTarget3.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { HyperdriveTarget3 } from "../../external/HyperdriveTarget3.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/instances/eeth/EETHTarget4.sol b/contracts/src/instances/eeth/EETHTarget4.sol index 33d0bb2e0..6aaaf464c 100644 --- a/contracts/src/instances/eeth/EETHTarget4.sol +++ b/contracts/src/instances/eeth/EETHTarget4.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { HyperdriveTarget4 } from "../../external/HyperdriveTarget4.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/instances/erc4626/ERC4626Base.sol b/contracts/src/instances/erc4626/ERC4626Base.sol index 3f023e76a..ce4f42fcf 100644 --- a/contracts/src/instances/erc4626/ERC4626Base.sol +++ b/contracts/src/instances/erc4626/ERC4626Base.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { ERC20 } from "openzeppelin/token/ERC20/ERC20.sol"; import { SafeERC20 } from "openzeppelin/token/ERC20/utils/SafeERC20.sol"; diff --git a/contracts/src/instances/erc4626/ERC4626Conversions.sol b/contracts/src/instances/erc4626/ERC4626Conversions.sol index 95daf22a2..5b4f053b7 100644 --- a/contracts/src/instances/erc4626/ERC4626Conversions.sol +++ b/contracts/src/instances/erc4626/ERC4626Conversions.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { IERC20 } from "../../interfaces/IERC20.sol"; import { IERC4626 } from "../../interfaces/IERC4626.sol"; diff --git a/contracts/src/instances/erc4626/ERC4626Hyperdrive.sol b/contracts/src/instances/erc4626/ERC4626Hyperdrive.sol index be601d4fd..dae32d590 100644 --- a/contracts/src/instances/erc4626/ERC4626Hyperdrive.sol +++ b/contracts/src/instances/erc4626/ERC4626Hyperdrive.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { ERC20 } from "openzeppelin/token/ERC20/ERC20.sol"; import { SafeERC20 } from "openzeppelin/token/ERC20/utils/SafeERC20.sol"; diff --git a/contracts/src/instances/erc4626/ERC4626Target0.sol b/contracts/src/instances/erc4626/ERC4626Target0.sol index 143ed8c83..9d7e1b318 100644 --- a/contracts/src/instances/erc4626/ERC4626Target0.sol +++ b/contracts/src/instances/erc4626/ERC4626Target0.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { HyperdriveTarget0 } from "../../external/HyperdriveTarget0.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/instances/erc4626/ERC4626Target1.sol b/contracts/src/instances/erc4626/ERC4626Target1.sol index a0471b8d1..691008ab3 100644 --- a/contracts/src/instances/erc4626/ERC4626Target1.sol +++ b/contracts/src/instances/erc4626/ERC4626Target1.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { HyperdriveTarget1 } from "../../external/HyperdriveTarget1.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/instances/erc4626/ERC4626Target2.sol b/contracts/src/instances/erc4626/ERC4626Target2.sol index 0b567391d..6dd504e75 100644 --- a/contracts/src/instances/erc4626/ERC4626Target2.sol +++ b/contracts/src/instances/erc4626/ERC4626Target2.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { HyperdriveTarget2 } from "../../external/HyperdriveTarget2.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/instances/erc4626/ERC4626Target3.sol b/contracts/src/instances/erc4626/ERC4626Target3.sol index 826e1f6c2..af9cc3836 100644 --- a/contracts/src/instances/erc4626/ERC4626Target3.sol +++ b/contracts/src/instances/erc4626/ERC4626Target3.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { HyperdriveTarget3 } from "../../external/HyperdriveTarget3.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/instances/erc4626/ERC4626Target4.sol b/contracts/src/instances/erc4626/ERC4626Target4.sol index bf19ea3c4..3141465ef 100644 --- a/contracts/src/instances/erc4626/ERC4626Target4.sol +++ b/contracts/src/instances/erc4626/ERC4626Target4.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { HyperdriveTarget4 } from "../../external/HyperdriveTarget4.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/instances/ezeth/EzETHBase.sol b/contracts/src/instances/ezeth/EzETHBase.sol index 22156f864..ea6bb80d9 100644 --- a/contracts/src/instances/ezeth/EzETHBase.sol +++ b/contracts/src/instances/ezeth/EzETHBase.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; import { IRestakeManager, IRenzoOracle } from "../../interfaces/IRenzo.sol"; diff --git a/contracts/src/instances/ezeth/EzETHConversions.sol b/contracts/src/instances/ezeth/EzETHConversions.sol index 84cf983d4..d40888f0a 100644 --- a/contracts/src/instances/ezeth/EzETHConversions.sol +++ b/contracts/src/instances/ezeth/EzETHConversions.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { IERC20 } from "../../interfaces/IERC20.sol"; import { IRestakeManager, IRenzoOracle } from "../../interfaces/IRenzo.sol"; diff --git a/contracts/src/instances/ezeth/EzETHHyperdrive.sol b/contracts/src/instances/ezeth/EzETHHyperdrive.sol index 9c386fa86..b440b44e9 100644 --- a/contracts/src/instances/ezeth/EzETHHyperdrive.sol +++ b/contracts/src/instances/ezeth/EzETHHyperdrive.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { Hyperdrive } from "../../external/Hyperdrive.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/instances/ezeth/EzETHTarget0.sol b/contracts/src/instances/ezeth/EzETHTarget0.sol index acc4cf9fd..b688ccbf0 100644 --- a/contracts/src/instances/ezeth/EzETHTarget0.sol +++ b/contracts/src/instances/ezeth/EzETHTarget0.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { ERC20 } from "openzeppelin/token/ERC20/ERC20.sol"; import { SafeERC20 } from "openzeppelin/token/ERC20/utils/SafeERC20.sol"; diff --git a/contracts/src/instances/ezeth/EzETHTarget1.sol b/contracts/src/instances/ezeth/EzETHTarget1.sol index 8acac5f01..b10914b6f 100644 --- a/contracts/src/instances/ezeth/EzETHTarget1.sol +++ b/contracts/src/instances/ezeth/EzETHTarget1.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { HyperdriveTarget1 } from "../../external/HyperdriveTarget1.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/instances/ezeth/EzETHTarget2.sol b/contracts/src/instances/ezeth/EzETHTarget2.sol index 1d2fb7a3e..780575c78 100644 --- a/contracts/src/instances/ezeth/EzETHTarget2.sol +++ b/contracts/src/instances/ezeth/EzETHTarget2.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { HyperdriveTarget2 } from "../../external/HyperdriveTarget2.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/instances/ezeth/EzETHTarget3.sol b/contracts/src/instances/ezeth/EzETHTarget3.sol index 422767f6b..24bca2ab4 100644 --- a/contracts/src/instances/ezeth/EzETHTarget3.sol +++ b/contracts/src/instances/ezeth/EzETHTarget3.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { HyperdriveTarget3 } from "../../external/HyperdriveTarget3.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/instances/ezeth/EzETHTarget4.sol b/contracts/src/instances/ezeth/EzETHTarget4.sol index 2d186a892..efe2bf427 100644 --- a/contracts/src/instances/ezeth/EzETHTarget4.sol +++ b/contracts/src/instances/ezeth/EzETHTarget4.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { HyperdriveTarget4 } from "../../external/HyperdriveTarget4.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/instances/lseth/LsETHBase.sol b/contracts/src/instances/lseth/LsETHBase.sol index 9997271cd..3b17246c8 100644 --- a/contracts/src/instances/lseth/LsETHBase.sol +++ b/contracts/src/instances/lseth/LsETHBase.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { ERC20 } from "openzeppelin/token/ERC20/ERC20.sol"; import { SafeERC20 } from "openzeppelin/token/ERC20/utils/SafeERC20.sol"; diff --git a/contracts/src/instances/lseth/LsETHConversions.sol b/contracts/src/instances/lseth/LsETHConversions.sol index 2f7fa3e8a..990beb817 100644 --- a/contracts/src/instances/lseth/LsETHConversions.sol +++ b/contracts/src/instances/lseth/LsETHConversions.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { IERC20 } from "../../interfaces/IERC20.sol"; import { IRiverV1 } from "../../interfaces/IRiverV1.sol"; diff --git a/contracts/src/instances/lseth/LsETHHyperdrive.sol b/contracts/src/instances/lseth/LsETHHyperdrive.sol index b94bf1204..32aab7bf6 100644 --- a/contracts/src/instances/lseth/LsETHHyperdrive.sol +++ b/contracts/src/instances/lseth/LsETHHyperdrive.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { Hyperdrive } from "../../external/Hyperdrive.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/instances/lseth/LsETHTarget0.sol b/contracts/src/instances/lseth/LsETHTarget0.sol index d89e97d4e..d823d321c 100644 --- a/contracts/src/instances/lseth/LsETHTarget0.sol +++ b/contracts/src/instances/lseth/LsETHTarget0.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { HyperdriveTarget0 } from "../../external/HyperdriveTarget0.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/instances/lseth/LsETHTarget1.sol b/contracts/src/instances/lseth/LsETHTarget1.sol index 14432ddd6..e3bdabc6e 100644 --- a/contracts/src/instances/lseth/LsETHTarget1.sol +++ b/contracts/src/instances/lseth/LsETHTarget1.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { HyperdriveTarget1 } from "../../external/HyperdriveTarget1.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/instances/lseth/LsETHTarget2.sol b/contracts/src/instances/lseth/LsETHTarget2.sol index ff5ded424..114c1930c 100644 --- a/contracts/src/instances/lseth/LsETHTarget2.sol +++ b/contracts/src/instances/lseth/LsETHTarget2.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { HyperdriveTarget2 } from "../../external/HyperdriveTarget2.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/instances/lseth/LsETHTarget3.sol b/contracts/src/instances/lseth/LsETHTarget3.sol index 5ad7672d3..45fbe2426 100644 --- a/contracts/src/instances/lseth/LsETHTarget3.sol +++ b/contracts/src/instances/lseth/LsETHTarget3.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { HyperdriveTarget3 } from "../../external/HyperdriveTarget3.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/instances/lseth/LsETHTarget4.sol b/contracts/src/instances/lseth/LsETHTarget4.sol index 3af1b1da6..e7995dbf8 100644 --- a/contracts/src/instances/lseth/LsETHTarget4.sol +++ b/contracts/src/instances/lseth/LsETHTarget4.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { HyperdriveTarget4 } from "../../external/HyperdriveTarget4.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/instances/morpho-blue/MorphoBlueBase.sol b/contracts/src/instances/morpho-blue/MorphoBlueBase.sol index 94aa33736..800e0a313 100644 --- a/contracts/src/instances/morpho-blue/MorphoBlueBase.sol +++ b/contracts/src/instances/morpho-blue/MorphoBlueBase.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { IMorpho, MarketParams } from "morpho-blue/src/interfaces/IMorpho.sol"; import { MarketParamsLib } from "morpho-blue/src/libraries/MarketParamsLib.sol"; diff --git a/contracts/src/instances/morpho-blue/MorphoBlueConversions.sol b/contracts/src/instances/morpho-blue/MorphoBlueConversions.sol index a1fe7c418..fc359fc7d 100644 --- a/contracts/src/instances/morpho-blue/MorphoBlueConversions.sol +++ b/contracts/src/instances/morpho-blue/MorphoBlueConversions.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { IMorpho, MarketParams } from "morpho-blue/src/interfaces/IMorpho.sol"; import { SharesMathLib } from "morpho-blue/src/libraries/SharesMathLib.sol"; diff --git a/contracts/src/instances/morpho-blue/MorphoBlueHyperdrive.sol b/contracts/src/instances/morpho-blue/MorphoBlueHyperdrive.sol index 3a8076631..a50e7980d 100644 --- a/contracts/src/instances/morpho-blue/MorphoBlueHyperdrive.sol +++ b/contracts/src/instances/morpho-blue/MorphoBlueHyperdrive.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { ERC20 } from "openzeppelin/token/ERC20/ERC20.sol"; import { SafeERC20 } from "openzeppelin/token/ERC20/utils/SafeERC20.sol"; diff --git a/contracts/src/instances/morpho-blue/MorphoBlueTarget0.sol b/contracts/src/instances/morpho-blue/MorphoBlueTarget0.sol index 7df812ef0..f664a0e55 100644 --- a/contracts/src/instances/morpho-blue/MorphoBlueTarget0.sol +++ b/contracts/src/instances/morpho-blue/MorphoBlueTarget0.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { IMorpho } from "morpho-blue/src/interfaces/IMorpho.sol"; import { HyperdriveTarget0 } from "../../external/HyperdriveTarget0.sol"; diff --git a/contracts/src/instances/morpho-blue/MorphoBlueTarget1.sol b/contracts/src/instances/morpho-blue/MorphoBlueTarget1.sol index b656db725..d24fdf17a 100644 --- a/contracts/src/instances/morpho-blue/MorphoBlueTarget1.sol +++ b/contracts/src/instances/morpho-blue/MorphoBlueTarget1.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { HyperdriveTarget1 } from "../../external/HyperdriveTarget1.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/instances/morpho-blue/MorphoBlueTarget2.sol b/contracts/src/instances/morpho-blue/MorphoBlueTarget2.sol index 0c422d462..f475305e9 100644 --- a/contracts/src/instances/morpho-blue/MorphoBlueTarget2.sol +++ b/contracts/src/instances/morpho-blue/MorphoBlueTarget2.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { HyperdriveTarget2 } from "../../external/HyperdriveTarget2.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/instances/morpho-blue/MorphoBlueTarget3.sol b/contracts/src/instances/morpho-blue/MorphoBlueTarget3.sol index 8b6ea43d6..d8d6f3d01 100644 --- a/contracts/src/instances/morpho-blue/MorphoBlueTarget3.sol +++ b/contracts/src/instances/morpho-blue/MorphoBlueTarget3.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { HyperdriveTarget3 } from "../../external/HyperdriveTarget3.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/instances/morpho-blue/MorphoBlueTarget4.sol b/contracts/src/instances/morpho-blue/MorphoBlueTarget4.sol index 14c852c27..0b1177025 100644 --- a/contracts/src/instances/morpho-blue/MorphoBlueTarget4.sol +++ b/contracts/src/instances/morpho-blue/MorphoBlueTarget4.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { HyperdriveTarget4 } from "../../external/HyperdriveTarget4.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/instances/reth/RETHBase.sol b/contracts/src/instances/reth/RETHBase.sol index f49b983db..b5cb2dfaf 100644 --- a/contracts/src/instances/reth/RETHBase.sol +++ b/contracts/src/instances/reth/RETHBase.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { ERC20 } from "openzeppelin/token/ERC20/ERC20.sol"; import { SafeERC20 } from "openzeppelin/token/ERC20/utils/SafeERC20.sol"; diff --git a/contracts/src/instances/reth/RETHConversions.sol b/contracts/src/instances/reth/RETHConversions.sol index 1f3556a7b..b9cb9fe84 100644 --- a/contracts/src/instances/reth/RETHConversions.sol +++ b/contracts/src/instances/reth/RETHConversions.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { IERC20 } from "../../interfaces/IERC20.sol"; import { IRocketTokenRETH } from "../../interfaces/IRocketTokenRETH.sol"; diff --git a/contracts/src/instances/reth/RETHHyperdrive.sol b/contracts/src/instances/reth/RETHHyperdrive.sol index 9acc8ba31..66d093290 100644 --- a/contracts/src/instances/reth/RETHHyperdrive.sol +++ b/contracts/src/instances/reth/RETHHyperdrive.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { Hyperdrive } from "../../external/Hyperdrive.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/instances/reth/RETHTarget0.sol b/contracts/src/instances/reth/RETHTarget0.sol index f468a56cb..fef04b7c4 100644 --- a/contracts/src/instances/reth/RETHTarget0.sol +++ b/contracts/src/instances/reth/RETHTarget0.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { HyperdriveTarget0 } from "../../external/HyperdriveTarget0.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/instances/reth/RETHTarget1.sol b/contracts/src/instances/reth/RETHTarget1.sol index 2d5dd572f..86982789c 100644 --- a/contracts/src/instances/reth/RETHTarget1.sol +++ b/contracts/src/instances/reth/RETHTarget1.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { HyperdriveTarget1 } from "../../external/HyperdriveTarget1.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/instances/reth/RETHTarget2.sol b/contracts/src/instances/reth/RETHTarget2.sol index 16afecb90..f460d3126 100644 --- a/contracts/src/instances/reth/RETHTarget2.sol +++ b/contracts/src/instances/reth/RETHTarget2.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { HyperdriveTarget2 } from "../../external/HyperdriveTarget2.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/instances/reth/RETHTarget3.sol b/contracts/src/instances/reth/RETHTarget3.sol index eef956ef8..d30173768 100644 --- a/contracts/src/instances/reth/RETHTarget3.sol +++ b/contracts/src/instances/reth/RETHTarget3.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { HyperdriveTarget3 } from "../../external/HyperdriveTarget3.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/instances/reth/RETHTarget4.sol b/contracts/src/instances/reth/RETHTarget4.sol index 3b3ac0904..4b498ba29 100644 --- a/contracts/src/instances/reth/RETHTarget4.sol +++ b/contracts/src/instances/reth/RETHTarget4.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { HyperdriveTarget4 } from "../../external/HyperdriveTarget4.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/instances/steth/StETHBase.sol b/contracts/src/instances/steth/StETHBase.sol index 9d7097511..d1b9cd553 100644 --- a/contracts/src/instances/steth/StETHBase.sol +++ b/contracts/src/instances/steth/StETHBase.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; import { ILido } from "../../interfaces/ILido.sol"; diff --git a/contracts/src/instances/steth/StETHConversions.sol b/contracts/src/instances/steth/StETHConversions.sol index f0b162b20..932179a4f 100644 --- a/contracts/src/instances/steth/StETHConversions.sol +++ b/contracts/src/instances/steth/StETHConversions.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { IERC20 } from "../../interfaces/IERC20.sol"; import { ILido } from "../../interfaces/ILido.sol"; diff --git a/contracts/src/instances/steth/StETHHyperdrive.sol b/contracts/src/instances/steth/StETHHyperdrive.sol index ff99c8a2d..8539da582 100644 --- a/contracts/src/instances/steth/StETHHyperdrive.sol +++ b/contracts/src/instances/steth/StETHHyperdrive.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { Hyperdrive } from "../../external/Hyperdrive.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/instances/steth/StETHTarget0.sol b/contracts/src/instances/steth/StETHTarget0.sol index a6001a3d0..a9f58f181 100644 --- a/contracts/src/instances/steth/StETHTarget0.sol +++ b/contracts/src/instances/steth/StETHTarget0.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { HyperdriveTarget0 } from "../../external/HyperdriveTarget0.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/instances/steth/StETHTarget1.sol b/contracts/src/instances/steth/StETHTarget1.sol index 806981531..995d624ed 100644 --- a/contracts/src/instances/steth/StETHTarget1.sol +++ b/contracts/src/instances/steth/StETHTarget1.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { HyperdriveTarget1 } from "../../external/HyperdriveTarget1.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/instances/steth/StETHTarget2.sol b/contracts/src/instances/steth/StETHTarget2.sol index acfedaacb..bf62ca0e0 100644 --- a/contracts/src/instances/steth/StETHTarget2.sol +++ b/contracts/src/instances/steth/StETHTarget2.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { HyperdriveTarget2 } from "../../external/HyperdriveTarget2.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/instances/steth/StETHTarget3.sol b/contracts/src/instances/steth/StETHTarget3.sol index 7f4441a47..b5cbd2b29 100644 --- a/contracts/src/instances/steth/StETHTarget3.sol +++ b/contracts/src/instances/steth/StETHTarget3.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { HyperdriveTarget3 } from "../../external/HyperdriveTarget3.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/instances/steth/StETHTarget4.sol b/contracts/src/instances/steth/StETHTarget4.sol index f18a7f62e..830c6dec5 100644 --- a/contracts/src/instances/steth/StETHTarget4.sol +++ b/contracts/src/instances/steth/StETHTarget4.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { HyperdriveTarget4 } from "../../external/HyperdriveTarget4.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/interfaces/IAToken.sol b/contracts/src/interfaces/IAToken.sol index 381605f6c..92c902336 100644 --- a/contracts/src/interfaces/IAToken.sol +++ b/contracts/src/interfaces/IAToken.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { IAToken as IAToken_ } from "aave/interfaces/IAToken.sol"; import { IPool } from "aave/interfaces/IPool.sol"; diff --git a/contracts/src/interfaces/IAaveHyperdrive.sol b/contracts/src/interfaces/IAaveHyperdrive.sol index dc7308c45..6946d83b3 100644 --- a/contracts/src/interfaces/IAaveHyperdrive.sol +++ b/contracts/src/interfaces/IAaveHyperdrive.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { IHyperdrive } from "./IHyperdrive.sol"; import { IAaveHyperdriveRead } from "./IAaveHyperdriveRead.sol"; diff --git a/contracts/src/interfaces/IAaveHyperdriveDeployerCoordinator.sol b/contracts/src/interfaces/IAaveHyperdriveDeployerCoordinator.sol index 1c30faada..bc64514f4 100644 --- a/contracts/src/interfaces/IAaveHyperdriveDeployerCoordinator.sol +++ b/contracts/src/interfaces/IAaveHyperdriveDeployerCoordinator.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { IPool } from "aave/interfaces/IPool.sol"; import { IERC20 } from "./IERC20.sol"; diff --git a/contracts/src/interfaces/IAaveHyperdriveRead.sol b/contracts/src/interfaces/IAaveHyperdriveRead.sol index 5960ddeb9..7a604eb58 100644 --- a/contracts/src/interfaces/IAaveHyperdriveRead.sol +++ b/contracts/src/interfaces/IAaveHyperdriveRead.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { IPool } from "aave/interfaces/IPool.sol"; import { IHyperdriveRead } from "./IHyperdriveRead.sol"; diff --git a/contracts/src/interfaces/IEETHHyperdrive.sol b/contracts/src/interfaces/IEETHHyperdrive.sol index 69edeb22f..8c6dafaf2 100644 --- a/contracts/src/interfaces/IEETHHyperdrive.sol +++ b/contracts/src/interfaces/IEETHHyperdrive.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { IHyperdrive } from "./IHyperdrive.sol"; diff --git a/contracts/src/interfaces/IERC20.sol b/contracts/src/interfaces/IERC20.sol index 4d7323518..e5ad0c50d 100644 --- a/contracts/src/interfaces/IERC20.sol +++ b/contracts/src/interfaces/IERC20.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; interface IERC20 { /// @notice Emitted when tokens are transferred from one account to another. diff --git a/contracts/src/interfaces/IERC20Forwarder.sol b/contracts/src/interfaces/IERC20Forwarder.sol index 7dca4d1c1..3ae79301f 100644 --- a/contracts/src/interfaces/IERC20Forwarder.sol +++ b/contracts/src/interfaces/IERC20Forwarder.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { IERC20 } from "./IERC20.sol"; import { IMultiToken } from "./IMultiToken.sol"; diff --git a/contracts/src/interfaces/IERC20ForwarderFactory.sol b/contracts/src/interfaces/IERC20ForwarderFactory.sol index 8a556d390..a6351f4dd 100644 --- a/contracts/src/interfaces/IERC20ForwarderFactory.sol +++ b/contracts/src/interfaces/IERC20ForwarderFactory.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { IERC20Forwarder } from "./IERC20Forwarder.sol"; import { IMultiToken } from "./IMultiToken.sol"; diff --git a/contracts/src/interfaces/IERC4626.sol b/contracts/src/interfaces/IERC4626.sol index 47022f10d..994aed1cf 100644 --- a/contracts/src/interfaces/IERC4626.sol +++ b/contracts/src/interfaces/IERC4626.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { IERC20 } from "./IERC20.sol"; diff --git a/contracts/src/interfaces/IERC4626HyperdriveDeployerCoordinator.sol b/contracts/src/interfaces/IERC4626HyperdriveDeployerCoordinator.sol index 512e5a649..6e2dcedd3 100644 --- a/contracts/src/interfaces/IERC4626HyperdriveDeployerCoordinator.sol +++ b/contracts/src/interfaces/IERC4626HyperdriveDeployerCoordinator.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { IERC20 } from "./IERC20.sol"; import { IHyperdriveDeployerCoordinator } from "./IHyperdriveDeployerCoordinator.sol"; diff --git a/contracts/src/interfaces/IEzETHHyperdrive.sol b/contracts/src/interfaces/IEzETHHyperdrive.sol index 5932d990a..3b9cd4d29 100644 --- a/contracts/src/interfaces/IEzETHHyperdrive.sol +++ b/contracts/src/interfaces/IEzETHHyperdrive.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { IHyperdrive } from "./IHyperdrive.sol"; import { IEzETHHyperdriveRead } from "./IEzETHHyperdriveRead.sol"; diff --git a/contracts/src/interfaces/IEzETHHyperdriveDeployerCoordinator.sol b/contracts/src/interfaces/IEzETHHyperdriveDeployerCoordinator.sol index 54ba97ae8..ebbfdac12 100644 --- a/contracts/src/interfaces/IEzETHHyperdriveDeployerCoordinator.sol +++ b/contracts/src/interfaces/IEzETHHyperdriveDeployerCoordinator.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { IERC20 } from "./IERC20.sol"; import { IHyperdriveDeployerCoordinator } from "./IHyperdriveDeployerCoordinator.sol"; diff --git a/contracts/src/interfaces/IEzETHHyperdriveRead.sol b/contracts/src/interfaces/IEzETHHyperdriveRead.sol index 8550ccac5..a7d9f434d 100644 --- a/contracts/src/interfaces/IEzETHHyperdriveRead.sol +++ b/contracts/src/interfaces/IEzETHHyperdriveRead.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { IHyperdriveRead } from "./IHyperdriveRead.sol"; import { IRestakeManager, IRenzoOracle } from "./IRenzo.sol"; diff --git a/contracts/src/interfaces/IHyperdrive.sol b/contracts/src/interfaces/IHyperdrive.sol index 3a2a6c751..b39e94b2c 100644 --- a/contracts/src/interfaces/IHyperdrive.sol +++ b/contracts/src/interfaces/IHyperdrive.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { IERC20 } from "./IERC20.sol"; import { IHyperdriveCore } from "./IHyperdriveCore.sol"; diff --git a/contracts/src/interfaces/IHyperdriveCheckpointRewarder.sol b/contracts/src/interfaces/IHyperdriveCheckpointRewarder.sol index 83685bef7..28fa34701 100644 --- a/contracts/src/interfaces/IHyperdriveCheckpointRewarder.sol +++ b/contracts/src/interfaces/IHyperdriveCheckpointRewarder.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { IERC20 } from "./IERC20.sol"; import { IHyperdriveCheckpointSubrewarder } from "../interfaces/IHyperdriveCheckpointSubrewarder.sol"; diff --git a/contracts/src/interfaces/IHyperdriveCheckpointSubrewarder.sol b/contracts/src/interfaces/IHyperdriveCheckpointSubrewarder.sol index 2dfb67706..1207a2db0 100644 --- a/contracts/src/interfaces/IHyperdriveCheckpointSubrewarder.sol +++ b/contracts/src/interfaces/IHyperdriveCheckpointSubrewarder.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { IERC20 } from "./IERC20.sol"; import { IHyperdriveRegistry } from "../interfaces/IHyperdriveRegistry.sol"; diff --git a/contracts/src/interfaces/IHyperdriveCore.sol b/contracts/src/interfaces/IHyperdriveCore.sol index 5bb91be6d..376aac7b3 100644 --- a/contracts/src/interfaces/IHyperdriveCore.sol +++ b/contracts/src/interfaces/IHyperdriveCore.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { IERC20 } from "./IERC20.sol"; import { IHyperdrive } from "./IHyperdrive.sol"; diff --git a/contracts/src/interfaces/IHyperdriveCoreDeployer.sol b/contracts/src/interfaces/IHyperdriveCoreDeployer.sol index b13417245..c4daf334d 100644 --- a/contracts/src/interfaces/IHyperdriveCoreDeployer.sol +++ b/contracts/src/interfaces/IHyperdriveCoreDeployer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { IHyperdrive } from "./IHyperdrive.sol"; diff --git a/contracts/src/interfaces/IHyperdriveDeployerCoordinator.sol b/contracts/src/interfaces/IHyperdriveDeployerCoordinator.sol index 8bcf3adc9..169f09739 100644 --- a/contracts/src/interfaces/IHyperdriveDeployerCoordinator.sol +++ b/contracts/src/interfaces/IHyperdriveDeployerCoordinator.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { IHyperdrive } from "./IHyperdrive.sol"; diff --git a/contracts/src/interfaces/IHyperdriveEvents.sol b/contracts/src/interfaces/IHyperdriveEvents.sol index 8fe7273a4..cd0d457be 100644 --- a/contracts/src/interfaces/IHyperdriveEvents.sol +++ b/contracts/src/interfaces/IHyperdriveEvents.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { IMultiTokenEvents } from "./IMultiTokenEvents.sol"; diff --git a/contracts/src/interfaces/IHyperdriveFactory.sol b/contracts/src/interfaces/IHyperdriveFactory.sol index ed632a59d..2874e4f67 100644 --- a/contracts/src/interfaces/IHyperdriveFactory.sol +++ b/contracts/src/interfaces/IHyperdriveFactory.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { IHyperdrive } from "./IHyperdrive.sol"; diff --git a/contracts/src/interfaces/IHyperdriveGovernedRegistry.sol b/contracts/src/interfaces/IHyperdriveGovernedRegistry.sol index 6dbea9c75..ac7009177 100644 --- a/contracts/src/interfaces/IHyperdriveGovernedRegistry.sol +++ b/contracts/src/interfaces/IHyperdriveGovernedRegistry.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { IHyperdriveRegistry } from "./IHyperdriveRegistry.sol"; diff --git a/contracts/src/interfaces/IHyperdriveRead.sol b/contracts/src/interfaces/IHyperdriveRead.sol index 6e3f936f5..4ca6d150b 100644 --- a/contracts/src/interfaces/IHyperdriveRead.sol +++ b/contracts/src/interfaces/IHyperdriveRead.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { IHyperdrive } from "./IHyperdrive.sol"; import { IMultiTokenRead } from "./IMultiTokenRead.sol"; diff --git a/contracts/src/interfaces/IHyperdriveRegistry.sol b/contracts/src/interfaces/IHyperdriveRegistry.sol index 06b6e7628..417c0087f 100644 --- a/contracts/src/interfaces/IHyperdriveRegistry.sol +++ b/contracts/src/interfaces/IHyperdriveRegistry.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; interface IHyperdriveRegistry { /// @dev The info collected for each Hyperdrive factory. diff --git a/contracts/src/interfaces/IHyperdriveTargetDeployer.sol b/contracts/src/interfaces/IHyperdriveTargetDeployer.sol index 36943b251..6f764124b 100644 --- a/contracts/src/interfaces/IHyperdriveTargetDeployer.sol +++ b/contracts/src/interfaces/IHyperdriveTargetDeployer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { IHyperdrive } from "./IHyperdrive.sol"; diff --git a/contracts/src/interfaces/ILido.sol b/contracts/src/interfaces/ILido.sol index 347de2188..bb8a2d7e8 100644 --- a/contracts/src/interfaces/ILido.sol +++ b/contracts/src/interfaces/ILido.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { IERC20 } from "./IERC20.sol"; diff --git a/contracts/src/interfaces/ILsETHHyperdriveDeployerCoordinator.sol b/contracts/src/interfaces/ILsETHHyperdriveDeployerCoordinator.sol index a1ea436d4..dd69daf07 100644 --- a/contracts/src/interfaces/ILsETHHyperdriveDeployerCoordinator.sol +++ b/contracts/src/interfaces/ILsETHHyperdriveDeployerCoordinator.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { IERC20 } from "./IERC20.sol"; import { IHyperdriveDeployerCoordinator } from "./IHyperdriveDeployerCoordinator.sol"; diff --git a/contracts/src/interfaces/IMorphoBlueHyperdrive.sol b/contracts/src/interfaces/IMorphoBlueHyperdrive.sol index f8db78006..e483114df 100644 --- a/contracts/src/interfaces/IMorphoBlueHyperdrive.sol +++ b/contracts/src/interfaces/IMorphoBlueHyperdrive.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { IMorpho } from "morpho-blue/src/interfaces/IMorpho.sol"; import { IHyperdrive } from "./IHyperdrive.sol"; diff --git a/contracts/src/interfaces/IMultiToken.sol b/contracts/src/interfaces/IMultiToken.sol index 285378c71..0fe703311 100644 --- a/contracts/src/interfaces/IMultiToken.sol +++ b/contracts/src/interfaces/IMultiToken.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { IMultiTokenCore } from "./IMultiTokenCore.sol"; import { IMultiTokenEvents } from "./IMultiTokenEvents.sol"; diff --git a/contracts/src/interfaces/IMultiTokenCore.sol b/contracts/src/interfaces/IMultiTokenCore.sol index e9b950a22..e3041ad92 100644 --- a/contracts/src/interfaces/IMultiTokenCore.sol +++ b/contracts/src/interfaces/IMultiTokenCore.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; interface IMultiTokenCore { /// @notice Transfers an amount of assets from the source to the destination. diff --git a/contracts/src/interfaces/IMultiTokenEvents.sol b/contracts/src/interfaces/IMultiTokenEvents.sol index 9b126de92..d75a52b46 100644 --- a/contracts/src/interfaces/IMultiTokenEvents.sol +++ b/contracts/src/interfaces/IMultiTokenEvents.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; interface IMultiTokenEvents { /// @notice Emitted when tokens are transferred from one account to another. diff --git a/contracts/src/interfaces/IMultiTokenMetadata.sol b/contracts/src/interfaces/IMultiTokenMetadata.sol index f2fdf21b2..e4bb38905 100644 --- a/contracts/src/interfaces/IMultiTokenMetadata.sol +++ b/contracts/src/interfaces/IMultiTokenMetadata.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; interface IMultiTokenMetadata { /// @notice Gets the EIP712 permit typehash of the MultiToken. diff --git a/contracts/src/interfaces/IMultiTokenRead.sol b/contracts/src/interfaces/IMultiTokenRead.sol index f2323028a..5f4943b71 100644 --- a/contracts/src/interfaces/IMultiTokenRead.sol +++ b/contracts/src/interfaces/IMultiTokenRead.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; interface IMultiTokenRead { /// @notice Gets the decimals of the MultiToken. diff --git a/contracts/src/interfaces/IRETHHyperdriveDeployerCoordinator.sol b/contracts/src/interfaces/IRETHHyperdriveDeployerCoordinator.sol index da02aeed3..1da45d2e0 100644 --- a/contracts/src/interfaces/IRETHHyperdriveDeployerCoordinator.sol +++ b/contracts/src/interfaces/IRETHHyperdriveDeployerCoordinator.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { IERC20 } from "./IERC20.sol"; import { IHyperdriveDeployerCoordinator } from "./IHyperdriveDeployerCoordinator.sol"; diff --git a/contracts/src/interfaces/IRenzo.sol b/contracts/src/interfaces/IRenzo.sol index e78de5953..5da3c5fa3 100644 --- a/contracts/src/interfaces/IRenzo.sol +++ b/contracts/src/interfaces/IRenzo.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { IERC20 } from "./IERC20.sol"; diff --git a/contracts/src/interfaces/IRiverV1.sol b/contracts/src/interfaces/IRiverV1.sol index 6368a3ad0..e1cfe664f 100644 --- a/contracts/src/interfaces/IRiverV1.sol +++ b/contracts/src/interfaces/IRiverV1.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { ISharesManagerV1 } from "./ISharesManagerV1.sol"; diff --git a/contracts/src/interfaces/IRocketDepositPool.sol b/contracts/src/interfaces/IRocketDepositPool.sol index f753dd7ce..bc936c198 100644 --- a/contracts/src/interfaces/IRocketDepositPool.sol +++ b/contracts/src/interfaces/IRocketDepositPool.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; interface IRocketDepositPool { function getBalance() external view returns (uint256); diff --git a/contracts/src/interfaces/IRocketNetworkBalances.sol b/contracts/src/interfaces/IRocketNetworkBalances.sol index 9b27a1daf..dfd297de4 100644 --- a/contracts/src/interfaces/IRocketNetworkBalances.sol +++ b/contracts/src/interfaces/IRocketNetworkBalances.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; interface IRocketNetworkBalances { function getBalancesBlock() external view returns (uint256); diff --git a/contracts/src/interfaces/IRocketPoolDAOProtocolSettingsDeposit.sol b/contracts/src/interfaces/IRocketPoolDAOProtocolSettingsDeposit.sol index 9d59ae758..488699b07 100644 --- a/contracts/src/interfaces/IRocketPoolDAOProtocolSettingsDeposit.sol +++ b/contracts/src/interfaces/IRocketPoolDAOProtocolSettingsDeposit.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; interface IRocketPoolDAOProtocolSettingsDeposit { function getDepositEnabled() external view returns (bool); diff --git a/contracts/src/interfaces/IRocketStorage.sol b/contracts/src/interfaces/IRocketStorage.sol index d6e6d3686..fa706c03d 100644 --- a/contracts/src/interfaces/IRocketStorage.sol +++ b/contracts/src/interfaces/IRocketStorage.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; interface IRocketStorage { // Deploy status diff --git a/contracts/src/interfaces/IRocketTokenRETH.sol b/contracts/src/interfaces/IRocketTokenRETH.sol index de81c3a9a..af8fe567a 100644 --- a/contracts/src/interfaces/IRocketTokenRETH.sol +++ b/contracts/src/interfaces/IRocketTokenRETH.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { IERC20 } from "./IERC20.sol"; diff --git a/contracts/src/interfaces/ISharesManagerV1.sol b/contracts/src/interfaces/ISharesManagerV1.sol index 8347eeb8b..be3ee8c6b 100644 --- a/contracts/src/interfaces/ISharesManagerV1.sol +++ b/contracts/src/interfaces/ISharesManagerV1.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { IERC20 } from "./IERC20.sol"; diff --git a/contracts/src/interfaces/IStETHHyperdriveDeployerCoordinator.sol b/contracts/src/interfaces/IStETHHyperdriveDeployerCoordinator.sol index cdc7c5c79..d94a806ce 100644 --- a/contracts/src/interfaces/IStETHHyperdriveDeployerCoordinator.sol +++ b/contracts/src/interfaces/IStETHHyperdriveDeployerCoordinator.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { IERC20 } from "./IERC20.sol"; import { IHyperdriveDeployerCoordinator } from "./IHyperdriveDeployerCoordinator.sol"; diff --git a/contracts/src/internal/HyperdriveAdmin.sol b/contracts/src/internal/HyperdriveAdmin.sol index 3d04658a7..219c5de7a 100644 --- a/contracts/src/internal/HyperdriveAdmin.sol +++ b/contracts/src/internal/HyperdriveAdmin.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { ERC20 } from "openzeppelin/token/ERC20/ERC20.sol"; import { SafeERC20 } from "openzeppelin/token/ERC20/utils/SafeERC20.sol"; diff --git a/contracts/src/internal/HyperdriveBase.sol b/contracts/src/internal/HyperdriveBase.sol index 70bcd34f5..b6ea75e4a 100644 --- a/contracts/src/internal/HyperdriveBase.sol +++ b/contracts/src/internal/HyperdriveBase.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { IHyperdrive } from "../interfaces/IHyperdrive.sol"; import { IHyperdriveEvents } from "../interfaces/IHyperdriveEvents.sol"; diff --git a/contracts/src/internal/HyperdriveCheckpoint.sol b/contracts/src/internal/HyperdriveCheckpoint.sol index 7cdc0cd76..21f5f2664 100644 --- a/contracts/src/internal/HyperdriveCheckpoint.sol +++ b/contracts/src/internal/HyperdriveCheckpoint.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { ExcessivelySafeCall } from "nomad/ExcessivelySafeCall.sol"; import { IHyperdrive } from "../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/internal/HyperdriveLP.sol b/contracts/src/internal/HyperdriveLP.sol index 290da717b..d549ff200 100644 --- a/contracts/src/internal/HyperdriveLP.sol +++ b/contracts/src/internal/HyperdriveLP.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { IHyperdrive } from "../interfaces/IHyperdrive.sol"; import { IHyperdriveEvents } from "../interfaces/IHyperdriveEvents.sol"; diff --git a/contracts/src/internal/HyperdriveLong.sol b/contracts/src/internal/HyperdriveLong.sol index b30693d15..c5a50fef5 100644 --- a/contracts/src/internal/HyperdriveLong.sol +++ b/contracts/src/internal/HyperdriveLong.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { IHyperdrive } from "../interfaces/IHyperdrive.sol"; import { IHyperdriveEvents } from "../interfaces/IHyperdriveEvents.sol"; diff --git a/contracts/src/internal/HyperdriveMultiToken.sol b/contracts/src/internal/HyperdriveMultiToken.sol index 10a33561b..51cbef56b 100644 --- a/contracts/src/internal/HyperdriveMultiToken.sol +++ b/contracts/src/internal/HyperdriveMultiToken.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { IHyperdrive } from "../interfaces/IHyperdrive.sol"; import { IHyperdriveEvents } from "../interfaces/IHyperdriveEvents.sol"; @@ -59,11 +59,8 @@ abstract contract HyperdriveMultiToken is IHyperdriveEvents, HyperdriveBase { } // Call internal transfer for each asset. - for (uint256 i = 0; i < ids.length; ) { + for (uint256 i = 0; i < ids.length; i++) { _transferFrom(ids[i], from, to, values[i], msg.sender); - unchecked { - ++i; - } } } diff --git a/contracts/src/internal/HyperdriveShort.sol b/contracts/src/internal/HyperdriveShort.sol index a2181508a..b2a6e92d3 100644 --- a/contracts/src/internal/HyperdriveShort.sol +++ b/contracts/src/internal/HyperdriveShort.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { IHyperdrive } from "../interfaces/IHyperdrive.sol"; import { IHyperdriveEvents } from "../interfaces/IHyperdriveEvents.sol"; diff --git a/contracts/src/internal/HyperdriveStorage.sol b/contracts/src/internal/HyperdriveStorage.sol index ac1c86c80..2fe28c81a 100644 --- a/contracts/src/internal/HyperdriveStorage.sol +++ b/contracts/src/internal/HyperdriveStorage.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { ReentrancyGuard } from "openzeppelin/utils/ReentrancyGuard.sol"; import { IERC20 } from "../interfaces/IERC20.sol"; diff --git a/contracts/src/libraries/AssetId.sol b/contracts/src/libraries/AssetId.sol index b01884915..da3906c4c 100644 --- a/contracts/src/libraries/AssetId.sol +++ b/contracts/src/libraries/AssetId.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { IHyperdrive } from "../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/libraries/Constants.sol b/contracts/src/libraries/Constants.sol index 2ad1d7713..19214c6a0 100644 --- a/contracts/src/libraries/Constants.sol +++ b/contracts/src/libraries/Constants.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; /// @dev The placeholder address for ETH. address constant ETH = 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE; diff --git a/contracts/src/libraries/Errors.sol b/contracts/src/libraries/Errors.sol index 9f93e14eb..b8175e827 100644 --- a/contracts/src/libraries/Errors.sol +++ b/contracts/src/libraries/Errors.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { IHyperdrive } from "../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/libraries/FixedPointMath.sol b/contracts/src/libraries/FixedPointMath.sol index 2956b55c8..8d9db96eb 100644 --- a/contracts/src/libraries/FixedPointMath.sol +++ b/contracts/src/libraries/FixedPointMath.sol @@ -1,5 +1,5 @@ /// SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { IHyperdrive } from "../interfaces/IHyperdrive.sol"; import { SafeCast } from "./SafeCast.sol"; diff --git a/contracts/src/libraries/HyperdriveMath.sol b/contracts/src/libraries/HyperdriveMath.sol index 3684fde8b..294fa87b1 100644 --- a/contracts/src/libraries/HyperdriveMath.sol +++ b/contracts/src/libraries/HyperdriveMath.sol @@ -1,5 +1,5 @@ /// SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { Errors } from "./Errors.sol"; import { FixedPointMath, ONE } from "./FixedPointMath.sol"; diff --git a/contracts/src/libraries/LPMath.sol b/contracts/src/libraries/LPMath.sol index dc0e88c0e..bc7de9797 100644 --- a/contracts/src/libraries/LPMath.sol +++ b/contracts/src/libraries/LPMath.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { SignedMath } from "openzeppelin/utils/math/SignedMath.sol"; import { IHyperdrive } from "../interfaces/IHyperdrive.sol"; @@ -802,7 +802,7 @@ library LPMath { if (_maxIterations < SHARE_PROCEEDS_MAX_ITERATIONS) { _maxIterations = SHARE_PROCEEDS_MAX_ITERATIONS; } - for (uint256 i = 0; i < _maxIterations; ) { + for (uint256 i = 0; i < _maxIterations; i++) { // Clamp the share proceeds to the max share reserves delta since // values above this threshold are always invalid. shareProceeds = shareProceeds.min(_maxShareReservesDelta); @@ -1007,11 +1007,6 @@ library LPMath { } else { break; } - - // Increment the loop counter. - unchecked { - ++i; - } } // Calculate the present value after applying the share proceeds. diff --git a/contracts/src/libraries/SafeCast.sol b/contracts/src/libraries/SafeCast.sol index 30b98b58f..70d6c1eee 100644 --- a/contracts/src/libraries/SafeCast.sol +++ b/contracts/src/libraries/SafeCast.sol @@ -1,5 +1,5 @@ /// SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { IHyperdrive } from "../interfaces/IHyperdrive.sol"; diff --git a/contracts/src/libraries/YieldSpaceMath.sol b/contracts/src/libraries/YieldSpaceMath.sol index b4e1ebbfe..3ca7b3b36 100644 --- a/contracts/src/libraries/YieldSpaceMath.sol +++ b/contracts/src/libraries/YieldSpaceMath.sol @@ -1,5 +1,5 @@ /// SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { Errors } from "./Errors.sol"; import { FixedPointMath, ONE } from "./FixedPointMath.sol"; diff --git a/contracts/src/rewarder/HyperdriveCheckpointRewarder.sol b/contracts/src/rewarder/HyperdriveCheckpointRewarder.sol index 57f6a7413..72a0faa8f 100644 --- a/contracts/src/rewarder/HyperdriveCheckpointRewarder.sol +++ b/contracts/src/rewarder/HyperdriveCheckpointRewarder.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { IERC20 } from "../interfaces/IERC20.sol"; import { IHyperdriveCheckpointRewarder } from "../interfaces/IHyperdriveCheckpointRewarder.sol"; diff --git a/contracts/src/rewarder/HyperdriveCheckpointSubrewarder.sol b/contracts/src/rewarder/HyperdriveCheckpointSubrewarder.sol index 8de601c6a..053b0b038 100644 --- a/contracts/src/rewarder/HyperdriveCheckpointSubrewarder.sol +++ b/contracts/src/rewarder/HyperdriveCheckpointSubrewarder.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { ERC20 } from "openzeppelin/token/ERC20/ERC20.sol"; import { SafeERC20 } from "openzeppelin/token/ERC20/utils/SafeERC20.sol"; diff --git a/contracts/src/token/ERC20Forwarder.sol b/contracts/src/token/ERC20Forwarder.sol index 215156734..e32de4f20 100644 --- a/contracts/src/token/ERC20Forwarder.sol +++ b/contracts/src/token/ERC20Forwarder.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { IERC20Forwarder } from "../interfaces/IERC20Forwarder.sol"; import { IERC20ForwarderFactory } from "../interfaces/IERC20ForwarderFactory.sol"; diff --git a/contracts/src/token/ERC20ForwarderFactory.sol b/contracts/src/token/ERC20ForwarderFactory.sol index b9208c237..cc08a94e5 100644 --- a/contracts/src/token/ERC20ForwarderFactory.sol +++ b/contracts/src/token/ERC20ForwarderFactory.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { IERC20Forwarder } from "../interfaces/IERC20Forwarder.sol"; import { IERC20ForwarderFactory } from "../interfaces/IERC20ForwarderFactory.sol"; diff --git a/contracts/test/ERC20Mintable.sol b/contracts/test/ERC20Mintable.sol index 66498831f..c7b81788a 100644 --- a/contracts/test/ERC20Mintable.sol +++ b/contracts/test/ERC20Mintable.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { Authority } from "solmate/auth/Auth.sol"; import { MultiRolesAuthority } from "solmate/auth/authorities/MultiRolesAuthority.sol"; diff --git a/contracts/test/EtchingVault.sol b/contracts/test/EtchingVault.sol index 6f8314709..5c817df4a 100644 --- a/contracts/test/EtchingVault.sol +++ b/contracts/test/EtchingVault.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; /// @author DELV /// @title EtchingVault diff --git a/contracts/test/MockAssetId.sol b/contracts/test/MockAssetId.sol index b8a331660..35fc3b373 100644 --- a/contracts/test/MockAssetId.sol +++ b/contracts/test/MockAssetId.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { AssetId } from "../src/libraries/AssetId.sol"; diff --git a/contracts/test/MockERC4626.sol b/contracts/test/MockERC4626.sol index 7168f0aaf..672213c34 100644 --- a/contracts/test/MockERC4626.sol +++ b/contracts/test/MockERC4626.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { Authority } from "solmate/auth/Auth.sol"; import { MultiRolesAuthority } from "solmate/auth/authorities/MultiRolesAuthority.sol"; diff --git a/contracts/test/MockERC4626Hyperdrive.sol b/contracts/test/MockERC4626Hyperdrive.sol index 4b111573d..7b53e92f8 100644 --- a/contracts/test/MockERC4626Hyperdrive.sol +++ b/contracts/test/MockERC4626Hyperdrive.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { ERC4626Hyperdrive } from "../src/instances/erc4626/ERC4626Hyperdrive.sol"; import { IHyperdrive } from "../src/interfaces/IHyperdrive.sol"; diff --git a/contracts/test/MockEzEthPool.sol b/contracts/test/MockEzEthPool.sol index beffe012b..2ff7fb5ed 100644 --- a/contracts/test/MockEzEthPool.sol +++ b/contracts/test/MockEzEthPool.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { MultiRolesAuthority } from "solmate/auth/authorities/MultiRolesAuthority.sol"; import { FixedPointMath } from "../src/libraries/FixedPointMath.sol"; diff --git a/contracts/test/MockFixedPointMath.sol b/contracts/test/MockFixedPointMath.sol index 4859f4b83..c5143b76c 100644 --- a/contracts/test/MockFixedPointMath.sol +++ b/contracts/test/MockFixedPointMath.sol @@ -1,5 +1,5 @@ /// SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { FixedPointMath } from "../src/libraries/FixedPointMath.sol"; diff --git a/contracts/test/MockHyperdrive.sol b/contracts/test/MockHyperdrive.sol index 928f4f93d..7f7410528 100644 --- a/contracts/test/MockHyperdrive.sol +++ b/contracts/test/MockHyperdrive.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { Hyperdrive } from "../src/external/Hyperdrive.sol"; import { HyperdriveTarget0 } from "../src/external/HyperdriveTarget0.sol"; diff --git a/contracts/test/MockHyperdriveDeployer.sol b/contracts/test/MockHyperdriveDeployer.sol index 42c431ed4..276e1f83e 100644 --- a/contracts/test/MockHyperdriveDeployer.sol +++ b/contracts/test/MockHyperdriveDeployer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { IERC20 } from "../src/interfaces/IERC20.sol"; import { IHyperdrive } from "../src/interfaces/IHyperdrive.sol"; diff --git a/contracts/test/MockHyperdriveMath.sol b/contracts/test/MockHyperdriveMath.sol index 0314373da..1ab5c287f 100644 --- a/contracts/test/MockHyperdriveMath.sol +++ b/contracts/test/MockHyperdriveMath.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { HyperdriveMath } from "../src/libraries/HyperdriveMath.sol"; import { HyperdriveUtils } from "../../test/utils/HyperdriveUtils.sol"; diff --git a/contracts/test/MockLPMath.sol b/contracts/test/MockLPMath.sol index 6889c08cd..ae2e08a11 100644 --- a/contracts/test/MockLPMath.sol +++ b/contracts/test/MockLPMath.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { LPMath } from "../src/libraries/LPMath.sol"; diff --git a/contracts/test/MockLido.sol b/contracts/test/MockLido.sol index f30139cd2..e0b9382ee 100644 --- a/contracts/test/MockLido.sol +++ b/contracts/test/MockLido.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { ERC20 } from "openzeppelin/token/ERC20/ERC20.sol"; import { Authority } from "solmate/auth/Auth.sol"; diff --git a/contracts/test/MockRocketPool.sol b/contracts/test/MockRocketPool.sol index 5338e0753..2704896b7 100644 --- a/contracts/test/MockRocketPool.sol +++ b/contracts/test/MockRocketPool.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { MultiRolesAuthority } from "solmate/auth/authorities/MultiRolesAuthority.sol"; import { FixedPointMath } from "../src/libraries/FixedPointMath.sol"; diff --git a/contracts/test/MockSafeCast.sol b/contracts/test/MockSafeCast.sol index 529901211..c4e591614 100644 --- a/contracts/test/MockSafeCast.sol +++ b/contracts/test/MockSafeCast.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity ^0.8.18; +pragma solidity ^0.8.20; import { SafeCast } from "../src/libraries/SafeCast.sol"; diff --git a/contracts/test/MockYieldSpaceMath.sol b/contracts/test/MockYieldSpaceMath.sol index a9347ab34..e565c1638 100644 --- a/contracts/test/MockYieldSpaceMath.sol +++ b/contracts/test/MockYieldSpaceMath.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { YieldSpaceMath } from "../src/libraries/YieldSpaceMath.sol"; diff --git a/foundry.toml b/foundry.toml index 6c13dcd4c..0e993e5c7 100644 --- a/foundry.toml +++ b/foundry.toml @@ -1,5 +1,5 @@ [profile.default] -solc_version = '0.8.20' +solc_version = '0.8.22' # The source directory src = 'contracts' # The artifact directory diff --git a/hardhat.config.ts b/hardhat.config.ts index 9fdcb6698..8bfac322e 100644 --- a/hardhat.config.ts +++ b/hardhat.config.ts @@ -8,7 +8,7 @@ import "./tasks"; const config: HardhatUserConfig = { solidity: { - version: "0.8.20", + version: "0.8.22", settings: { viaIR: false, optimizer: { diff --git a/test/3rdPartyLibs/LogExpMath.sol b/test/3rdPartyLibs/LogExpMath.sol index 242b713af..52813cd72 100644 --- a/test/3rdPartyLibs/LogExpMath.sol +++ b/test/3rdPartyLibs/LogExpMath.sol @@ -12,7 +12,7 @@ // COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { BalancerErrors, _require } from "./BalancerErrors.sol"; diff --git a/test/combinatorial/MultiToken._transferFrom.t.sol b/test/combinatorial/MultiToken._transferFrom.t.sol index 505a22f1d..eee6b900d 100644 --- a/test/combinatorial/MultiToken._transferFrom.t.sol +++ b/test/combinatorial/MultiToken._transferFrom.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import "forge-std/Test.sol"; import "forge-std/console2.sol"; diff --git a/test/debug/Debug.t.sol b/test/debug/Debug.t.sol index be0186c32..49bb96fc0 100644 --- a/test/debug/Debug.t.sol +++ b/test/debug/Debug.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { console2 as console } from "forge-std/console2.sol"; import { IHyperdriveCore } from "../../contracts/src/interfaces/IHyperdriveCore.sol"; diff --git a/test/instances/aave/AaveHyperdrive.t.sol b/test/instances/aave/AaveHyperdrive.t.sol index 0a12a956e..bfc4fd2c6 100644 --- a/test/instances/aave/AaveHyperdrive.t.sol +++ b/test/instances/aave/AaveHyperdrive.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { IPool } from "aave/interfaces/IPool.sol"; import { DataTypes } from "aave/protocol/libraries/types/DataTypes.sol"; diff --git a/test/instances/eeth/EETHHyperdrive.t.sol b/test/instances/eeth/EETHHyperdrive.t.sol index 317ae725e..4f01d7363 100644 --- a/test/instances/eeth/EETHHyperdrive.t.sol +++ b/test/instances/eeth/EETHHyperdrive.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { ILiquidityPool } from "../../../contracts/src/interfaces/ILiquidityPool.sol"; import { IEETH } from "../../../contracts/src/interfaces/IEETH.sol"; diff --git a/test/instances/erc4626/ERC4626Hyperdrive.t.sol b/test/instances/erc4626/ERC4626Hyperdrive.t.sol index 2d7868737..bbae3817c 100644 --- a/test/instances/erc4626/ERC4626Hyperdrive.t.sol +++ b/test/instances/erc4626/ERC4626Hyperdrive.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { ERC4626HyperdriveCoreDeployer } from "../../../contracts/src/deployers/erc4626/ERC4626HyperdriveCoreDeployer.sol"; import { ERC4626HyperdriveDeployerCoordinator } from "../../../contracts/src/deployers/erc4626/ERC4626HyperdriveDeployerCoordinator.sol"; diff --git a/test/instances/erc4626/ERC4626Validation.t.sol b/test/instances/erc4626/ERC4626Validation.t.sol index 04ab62b26..4e71ecac6 100644 --- a/test/instances/erc4626/ERC4626Validation.t.sol +++ b/test/instances/erc4626/ERC4626Validation.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { ERC4626HyperdriveCoreDeployer } from "../../../contracts/src/deployers/erc4626/ERC4626HyperdriveCoreDeployer.sol"; import { ERC4626HyperdriveDeployerCoordinator } from "../../../contracts/src/deployers/erc4626/ERC4626HyperdriveDeployerCoordinator.sol"; diff --git a/test/instances/erc4626/Sweep.t.sol b/test/instances/erc4626/Sweep.t.sol index 9cfd2e897..e2fda3881 100644 --- a/test/instances/erc4626/Sweep.t.sol +++ b/test/instances/erc4626/Sweep.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { ERC4626Hyperdrive } from "../../../contracts/src/instances/erc4626/ERC4626Hyperdrive.sol"; import { ERC4626Target0 } from "../../../contracts/src/instances/erc4626/ERC4626Target0.sol"; diff --git a/test/instances/erc4626/UsdcERC4626.t.sol b/test/instances/erc4626/UsdcERC4626.t.sol index 6c383ffd2..74c05a3c9 100644 --- a/test/instances/erc4626/UsdcERC4626.t.sol +++ b/test/instances/erc4626/UsdcERC4626.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { ERC4626HyperdriveCoreDeployer } from "../../../contracts/src/deployers/erc4626/ERC4626HyperdriveCoreDeployer.sol"; import { ERC4626HyperdriveDeployerCoordinator } from "../../../contracts/src/deployers/erc4626/ERC4626HyperdriveDeployerCoordinator.sol"; diff --git a/test/instances/erc4626/sDai.t.sol b/test/instances/erc4626/sDai.t.sol index aa4e3d4aa..3b4a36201 100644 --- a/test/instances/erc4626/sDai.t.sol +++ b/test/instances/erc4626/sDai.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { IERC20 } from "../../../contracts/src/interfaces/IERC20.sol"; import { IERC4626 } from "../../../contracts/src/interfaces/IERC4626.sol"; diff --git a/test/instances/ezETH/EzETHHyperdrive.t.sol b/test/instances/ezETH/EzETHHyperdrive.t.sol index 5f260d6a8..aa9b7d8a0 100644 --- a/test/instances/ezETH/EzETHHyperdrive.t.sol +++ b/test/instances/ezETH/EzETHHyperdrive.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { stdStorage, StdStorage } from "forge-std/Test.sol"; import { EzETHHyperdriveCoreDeployer } from "../../../contracts/src/deployers/ezeth/EzETHHyperdriveCoreDeployer.sol"; diff --git a/test/instances/lseth/LsETHHyperdrive.t.sol b/test/instances/lseth/LsETHHyperdrive.t.sol index ed1711136..910bdc7f0 100644 --- a/test/instances/lseth/LsETHHyperdrive.t.sol +++ b/test/instances/lseth/LsETHHyperdrive.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { stdStorage, StdStorage } from "forge-std/Test.sol"; import { ERC20ForwarderFactory } from "../../../contracts/src/token/ERC20ForwarderFactory.sol"; diff --git a/test/instances/morpho-blue/MorphoBlueHyperdrive.t.sol b/test/instances/morpho-blue/MorphoBlueHyperdrive.t.sol index 9e63be690..569b080f1 100644 --- a/test/instances/morpho-blue/MorphoBlueHyperdrive.t.sol +++ b/test/instances/morpho-blue/MorphoBlueHyperdrive.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { Id, IMorpho, Market, MarketParams } from "morpho-blue/src/interfaces/IMorpho.sol"; import { MarketParamsLib } from "morpho-blue/src/libraries/MarketParamsLib.sol"; diff --git a/test/instances/reth/RETHHyperdrive.t.sol b/test/instances/reth/RETHHyperdrive.t.sol index 22fe8b665..fdafc0f29 100644 --- a/test/instances/reth/RETHHyperdrive.t.sol +++ b/test/instances/reth/RETHHyperdrive.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { stdStorage, StdStorage } from "forge-std/Test.sol"; import { ETH } from "../../../contracts/src/libraries/Constants.sol"; diff --git a/test/instances/steth/StETHHyperdrive.t.sol b/test/instances/steth/StETHHyperdrive.t.sol index 837ae342b..999eecc2d 100644 --- a/test/instances/steth/StETHHyperdrive.t.sol +++ b/test/instances/steth/StETHHyperdrive.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { stdStorage, StdStorage } from "forge-std/Test.sol"; import { StETHHyperdriveCoreDeployer } from "../../../contracts/src/deployers/steth/StETHHyperdriveCoreDeployer.sol"; diff --git a/test/instances/steth/Sweep.t.sol b/test/instances/steth/Sweep.t.sol index 7729a4fdf..9434f5bc2 100644 --- a/test/instances/steth/Sweep.t.sol +++ b/test/instances/steth/Sweep.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { StETHHyperdrive } from "../../../contracts/src/instances/steth/StETHHyperdrive.sol"; import { StETHTarget0 } from "../../../contracts/src/instances/steth/StETHTarget0.sol"; diff --git a/test/instances/susde/SUSDe.t.sol b/test/instances/susde/SUSDe.t.sol index 12b220d61..e18fa5fb7 100644 --- a/test/instances/susde/SUSDe.t.sol +++ b/test/instances/susde/SUSDe.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { stdStorage, StdStorage } from "forge-std/Test.sol"; import { ERC4626HyperdriveCoreDeployer } from "../../../contracts/src/deployers/erc4626/ERC4626HyperdriveCoreDeployer.sol"; diff --git a/test/integrations/deployers/DeployerCoordinator.t.sol b/test/integrations/deployers/DeployerCoordinator.t.sol index ddabf82ac..fa81d4056 100644 --- a/test/integrations/deployers/DeployerCoordinator.t.sol +++ b/test/integrations/deployers/DeployerCoordinator.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { IERC20 } from "../../../contracts/src/interfaces/IERC20.sol"; import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; diff --git a/test/integrations/deployers/ERC4626DeployerCoordinator.t.sol b/test/integrations/deployers/ERC4626DeployerCoordinator.t.sol index 92303dc08..6a9a0e12c 100644 --- a/test/integrations/deployers/ERC4626DeployerCoordinator.t.sol +++ b/test/integrations/deployers/ERC4626DeployerCoordinator.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { IERC20 } from "../../../contracts/src/interfaces/IERC20.sol"; import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; diff --git a/test/integrations/deployers/RethDeployerCoordinator.t.sol b/test/integrations/deployers/RethDeployerCoordinator.t.sol index 1d04ac79c..c884d6183 100644 --- a/test/integrations/deployers/RethDeployerCoordinator.t.sol +++ b/test/integrations/deployers/RethDeployerCoordinator.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { IERC20 } from "../../../contracts/src/interfaces/IERC20.sol"; import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; diff --git a/test/integrations/deployers/StethDeployerCoordinator.t.sol b/test/integrations/deployers/StethDeployerCoordinator.t.sol index 0632315af..94bdd00d7 100644 --- a/test/integrations/deployers/StethDeployerCoordinator.t.sol +++ b/test/integrations/deployers/StethDeployerCoordinator.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { IERC20 } from "../../../contracts/src/interfaces/IERC20.sol"; import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; diff --git a/test/integrations/factory/HyperdriveFactory.t.sol b/test/integrations/factory/HyperdriveFactory.t.sol index 28880919b..d5041e2a5 100644 --- a/test/integrations/factory/HyperdriveFactory.t.sol +++ b/test/integrations/factory/HyperdriveFactory.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { ERC4626HyperdriveCoreDeployer } from "../../../contracts/src/deployers/erc4626/ERC4626HyperdriveCoreDeployer.sol"; import { ERC4626HyperdriveDeployerCoordinator } from "../../../contracts/src/deployers/erc4626/ERC4626HyperdriveDeployerCoordinator.sol"; diff --git a/test/integrations/hyperdrive/CheckpointRewards.t.sol b/test/integrations/hyperdrive/CheckpointRewards.t.sol index 824ab2b21..4ea1d32ca 100644 --- a/test/integrations/hyperdrive/CheckpointRewards.t.sol +++ b/test/integrations/hyperdrive/CheckpointRewards.t.sol @@ -1,5 +1,5 @@ /// SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { VmSafe } from "forge-std/Vm.sol"; import { IERC20 } from "../../../contracts/src/interfaces/IERC20.sol"; diff --git a/test/integrations/hyperdrive/CircuitBreakerTest.t.sol b/test/integrations/hyperdrive/CircuitBreakerTest.t.sol index 69ae611b0..3dd09f8e6 100644 --- a/test/integrations/hyperdrive/CircuitBreakerTest.t.sol +++ b/test/integrations/hyperdrive/CircuitBreakerTest.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { stdError } from "forge-std/StdError.sol"; import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; diff --git a/test/integrations/hyperdrive/IntraCheckpointNettingTest.t.sol b/test/integrations/hyperdrive/IntraCheckpointNettingTest.t.sol index 9218b612a..e712026db 100644 --- a/test/integrations/hyperdrive/IntraCheckpointNettingTest.t.sol +++ b/test/integrations/hyperdrive/IntraCheckpointNettingTest.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { FixedPointMath, ONE } from "../../../contracts/src/libraries/FixedPointMath.sol"; import { HyperdriveMath } from "../../../contracts/src/libraries/HyperdriveMath.sol"; diff --git a/test/integrations/hyperdrive/LPWithdrawalTest.t.sol b/test/integrations/hyperdrive/LPWithdrawalTest.t.sol index e5aaaf27a..cea29e262 100644 --- a/test/integrations/hyperdrive/LPWithdrawalTest.t.sol +++ b/test/integrations/hyperdrive/LPWithdrawalTest.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { stdError } from "forge-std/StdError.sol"; import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; diff --git a/test/integrations/hyperdrive/NegativeInterestLongFeeTest.t.sol b/test/integrations/hyperdrive/NegativeInterestLongFeeTest.t.sol index 77f11294e..ff68e3129 100644 --- a/test/integrations/hyperdrive/NegativeInterestLongFeeTest.t.sol +++ b/test/integrations/hyperdrive/NegativeInterestLongFeeTest.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { FixedPointMath, ONE } from "../../../contracts/src/libraries/FixedPointMath.sol"; import { HyperdriveMath } from "../../../contracts/src/libraries/HyperdriveMath.sol"; diff --git a/test/integrations/hyperdrive/NegativeInterestShortFeeTest.t.sol b/test/integrations/hyperdrive/NegativeInterestShortFeeTest.t.sol index 0e6aed859..455e9ae7d 100644 --- a/test/integrations/hyperdrive/NegativeInterestShortFeeTest.t.sol +++ b/test/integrations/hyperdrive/NegativeInterestShortFeeTest.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { FixedPointMath, ONE } from "../../../contracts/src/libraries/FixedPointMath.sol"; import { HyperdriveMath } from "../../../contracts/src/libraries/HyperdriveMath.sol"; diff --git a/test/integrations/hyperdrive/NonstandardDecimals.sol b/test/integrations/hyperdrive/NonstandardDecimals.sol index 6d2bb164b..3dd8c48c6 100644 --- a/test/integrations/hyperdrive/NonstandardDecimals.sol +++ b/test/integrations/hyperdrive/NonstandardDecimals.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { AssetId } from "../../../contracts/src/libraries/AssetId.sol"; import { FixedPointMath } from "../../../contracts/src/libraries/FixedPointMath.sol"; diff --git a/test/integrations/hyperdrive/PresentValueTest.t.sol b/test/integrations/hyperdrive/PresentValueTest.t.sol index eb16fd7f2..3862c3330 100644 --- a/test/integrations/hyperdrive/PresentValueTest.t.sol +++ b/test/integrations/hyperdrive/PresentValueTest.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { console2 as console } from "forge-std/console2.sol"; import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; diff --git a/test/integrations/hyperdrive/PriceDiscovery.t.sol b/test/integrations/hyperdrive/PriceDiscovery.t.sol index c50aefa84..6bd274646 100644 --- a/test/integrations/hyperdrive/PriceDiscovery.t.sol +++ b/test/integrations/hyperdrive/PriceDiscovery.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { AssetId } from "../../../contracts/src/libraries/AssetId.sol"; import { FixedPointMath, ONE } from "../../../contracts/src/libraries/FixedPointMath.sol"; diff --git a/test/integrations/hyperdrive/ReentrancyTest.t.sol b/test/integrations/hyperdrive/ReentrancyTest.t.sol index c8fa559aa..e313cc7a7 100644 --- a/test/integrations/hyperdrive/ReentrancyTest.t.sol +++ b/test/integrations/hyperdrive/ReentrancyTest.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { stdError } from "forge-std/StdError.sol"; import { ReentrancyGuard } from "openzeppelin/utils/ReentrancyGuard.sol"; diff --git a/test/integrations/hyperdrive/RoundTripTest.t.sol b/test/integrations/hyperdrive/RoundTripTest.t.sol index e6a48ae1b..b16f120cb 100644 --- a/test/integrations/hyperdrive/RoundTripTest.t.sol +++ b/test/integrations/hyperdrive/RoundTripTest.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { stdError } from "forge-std/StdError.sol"; import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; diff --git a/test/integrations/hyperdrive/SandwichTest.t.sol b/test/integrations/hyperdrive/SandwichTest.t.sol index 3fb473718..e05bc0686 100644 --- a/test/integrations/hyperdrive/SandwichTest.t.sol +++ b/test/integrations/hyperdrive/SandwichTest.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { AssetId } from "../../../contracts/src/libraries/AssetId.sol"; import { FixedPointMath, ONE } from "../../../contracts/src/libraries/FixedPointMath.sol"; diff --git a/test/integrations/hyperdrive/VariableInterestLongTest.t.sol b/test/integrations/hyperdrive/VariableInterestLongTest.t.sol index e31fa8a4f..21249176f 100644 --- a/test/integrations/hyperdrive/VariableInterestLongTest.t.sol +++ b/test/integrations/hyperdrive/VariableInterestLongTest.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { FixedPointMath } from "../../../contracts/src/libraries/FixedPointMath.sol"; import { HyperdriveMath } from "../../../contracts/src/libraries/HyperdriveMath.sol"; diff --git a/test/integrations/hyperdrive/VariableInterestShortTest.t.sol b/test/integrations/hyperdrive/VariableInterestShortTest.t.sol index e51ce4263..37ef85902 100644 --- a/test/integrations/hyperdrive/VariableInterestShortTest.t.sol +++ b/test/integrations/hyperdrive/VariableInterestShortTest.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { FixedPointMath } from "../../../contracts/src/libraries/FixedPointMath.sol"; import { HyperdriveMath } from "../../../contracts/src/libraries/HyperdriveMath.sol"; diff --git a/test/integrations/hyperdrive/ZombieInterestTest.t.sol b/test/integrations/hyperdrive/ZombieInterestTest.t.sol index 4c5f97b21..d6bf44cad 100644 --- a/test/integrations/hyperdrive/ZombieInterestTest.t.sol +++ b/test/integrations/hyperdrive/ZombieInterestTest.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { FixedPointMath } from "../../../contracts/src/libraries/FixedPointMath.sol"; import { HyperdriveTest, HyperdriveUtils } from "../../utils/HyperdriveTest.sol"; diff --git a/test/units/MultiToken.t.sol b/test/units/MultiToken.t.sol index f6ee91dfd..1ce9b85dd 100644 --- a/test/units/MultiToken.t.sol +++ b/test/units/MultiToken.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { IHyperdrive } from "../../contracts/src/interfaces/IHyperdrive.sol"; import { IERC20 } from "../../contracts/src/interfaces/IERC20.sol"; diff --git a/test/units/hyperdrive/AddLiquidityTest.t.sol b/test/units/hyperdrive/AddLiquidityTest.t.sol index fdfae275c..09e302fa4 100644 --- a/test/units/hyperdrive/AddLiquidityTest.t.sol +++ b/test/units/hyperdrive/AddLiquidityTest.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { VmSafe } from "forge-std/Vm.sol"; import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; diff --git a/test/units/hyperdrive/Admin.t.sol b/test/units/hyperdrive/Admin.t.sol index b32a1137e..20ba0ee2e 100644 --- a/test/units/hyperdrive/Admin.t.sol +++ b/test/units/hyperdrive/Admin.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; import { HyperdriveTest } from "../../utils/HyperdriveTest.sol"; diff --git a/test/units/hyperdrive/CheckpointTest.t.sol b/test/units/hyperdrive/CheckpointTest.t.sol index 2357a1289..1aede01ae 100644 --- a/test/units/hyperdrive/CheckpointTest.t.sol +++ b/test/units/hyperdrive/CheckpointTest.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { VmSafe } from "forge-std/Vm.sol"; import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; diff --git a/test/units/hyperdrive/CloseLongTest.t.sol b/test/units/hyperdrive/CloseLongTest.t.sol index 50b40f722..21b18d6bb 100644 --- a/test/units/hyperdrive/CloseLongTest.t.sol +++ b/test/units/hyperdrive/CloseLongTest.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { stdError } from "forge-std/StdError.sol"; import { VmSafe } from "forge-std/Vm.sol"; diff --git a/test/units/hyperdrive/CloseShortTest.t.sol b/test/units/hyperdrive/CloseShortTest.t.sol index e5aa898e2..195dcad05 100644 --- a/test/units/hyperdrive/CloseShortTest.t.sol +++ b/test/units/hyperdrive/CloseShortTest.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { stdError } from "forge-std/StdError.sol"; import { VmSafe } from "forge-std/Vm.sol"; diff --git a/test/units/hyperdrive/DataProvider.t.sol b/test/units/hyperdrive/DataProvider.t.sol index 772cfbce7..a62834ab9 100644 --- a/test/units/hyperdrive/DataProvider.t.sol +++ b/test/units/hyperdrive/DataProvider.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { HyperdriveTest } from "../../utils/HyperdriveTest.sol"; diff --git a/test/units/hyperdrive/ExtremeInputs.t.sol b/test/units/hyperdrive/ExtremeInputs.t.sol index 872118237..0a4ec5e96 100644 --- a/test/units/hyperdrive/ExtremeInputs.t.sol +++ b/test/units/hyperdrive/ExtremeInputs.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; import { FixedPointMath } from "../../../contracts/src/libraries/FixedPointMath.sol"; diff --git a/test/units/hyperdrive/FeeTest.t.sol b/test/units/hyperdrive/FeeTest.t.sol index 7672e7277..6e470bd48 100644 --- a/test/units/hyperdrive/FeeTest.t.sol +++ b/test/units/hyperdrive/FeeTest.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { stdError } from "forge-std/StdError.sol"; import { VmSafe } from "forge-std/Vm.sol"; diff --git a/test/units/hyperdrive/InitializeTest.t.sol b/test/units/hyperdrive/InitializeTest.t.sol index 1e98b7b99..090840403 100644 --- a/test/units/hyperdrive/InitializeTest.t.sol +++ b/test/units/hyperdrive/InitializeTest.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { VmSafe } from "forge-std/Vm.sol"; import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; diff --git a/test/units/hyperdrive/OpenLongTest.t.sol b/test/units/hyperdrive/OpenLongTest.t.sol index 5f5a040c8..4d0dceb0e 100644 --- a/test/units/hyperdrive/OpenLongTest.t.sol +++ b/test/units/hyperdrive/OpenLongTest.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { stdError } from "forge-std/StdError.sol"; import { VmSafe } from "forge-std/Vm.sol"; diff --git a/test/units/hyperdrive/OpenShortTest.t.sol b/test/units/hyperdrive/OpenShortTest.t.sol index 1cefc05a3..753832dbf 100644 --- a/test/units/hyperdrive/OpenShortTest.t.sol +++ b/test/units/hyperdrive/OpenShortTest.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { stdError } from "forge-std/StdError.sol"; import { VmSafe } from "forge-std/Vm.sol"; diff --git a/test/units/hyperdrive/RedeemWithdrawalSharesTest.t.sol b/test/units/hyperdrive/RedeemWithdrawalSharesTest.t.sol index 15696cc1d..ce45205e6 100644 --- a/test/units/hyperdrive/RedeemWithdrawalSharesTest.t.sol +++ b/test/units/hyperdrive/RedeemWithdrawalSharesTest.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { VmSafe } from "forge-std/Vm.sol"; import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; diff --git a/test/units/hyperdrive/RemoveLiquidityTest.t.sol b/test/units/hyperdrive/RemoveLiquidityTest.t.sol index b242cda53..1a3bcedf7 100644 --- a/test/units/hyperdrive/RemoveLiquidityTest.t.sol +++ b/test/units/hyperdrive/RemoveLiquidityTest.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { stdError } from "forge-std/StdError.sol"; import { VmSafe } from "forge-std/Vm.sol"; diff --git a/test/units/hyperdrive/UpdateLiquidityTest.t.sol b/test/units/hyperdrive/UpdateLiquidityTest.t.sol index d761213c8..55873eab9 100644 --- a/test/units/hyperdrive/UpdateLiquidityTest.t.sol +++ b/test/units/hyperdrive/UpdateLiquidityTest.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { IERC20 } from "../../../contracts/src/interfaces/IERC20.sol"; import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; diff --git a/test/units/libraries/AssetId.t.sol b/test/units/libraries/AssetId.t.sol index 44786acb2..cbe03f159 100644 --- a/test/units/libraries/AssetId.t.sol +++ b/test/units/libraries/AssetId.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; import { AssetId } from "../../../contracts/src/libraries/AssetId.sol"; diff --git a/test/units/libraries/FixedPointMath.t.sol b/test/units/libraries/FixedPointMath.t.sol index ec377f370..84707b703 100644 --- a/test/units/libraries/FixedPointMath.t.sol +++ b/test/units/libraries/FixedPointMath.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { stdError, Test } from "forge-std/Test.sol"; import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; diff --git a/test/units/libraries/HyperdriveMath.t.sol b/test/units/libraries/HyperdriveMath.t.sol index e98f5eef9..a0f8cc737 100644 --- a/test/units/libraries/HyperdriveMath.t.sol +++ b/test/units/libraries/HyperdriveMath.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; import { FixedPointMath, ONE } from "../../../contracts/src/libraries/FixedPointMath.sol"; diff --git a/test/units/libraries/HyperdriveUtilsTest.t.sol b/test/units/libraries/HyperdriveUtilsTest.t.sol index 88594ef86..33d786cd3 100644 --- a/test/units/libraries/HyperdriveUtilsTest.t.sol +++ b/test/units/libraries/HyperdriveUtilsTest.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; import { FixedPointMath } from "../../../contracts/src/libraries/FixedPointMath.sol"; diff --git a/test/units/libraries/LPMath.t.sol b/test/units/libraries/LPMath.t.sol index 1c6d1bc5e..8c1979972 100644 --- a/test/units/libraries/LPMath.t.sol +++ b/test/units/libraries/LPMath.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { FixedPointMath, ONE } from "../../../contracts/src/libraries/FixedPointMath.sol"; import { LPMath } from "../../../contracts/src/libraries/LPMath.sol"; diff --git a/test/units/libraries/YieldSpaceMath.t.sol b/test/units/libraries/YieldSpaceMath.t.sol index 57b19a04b..b2f9457c5 100644 --- a/test/units/libraries/YieldSpaceMath.t.sol +++ b/test/units/libraries/YieldSpaceMath.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { Test } from "forge-std/Test.sol"; import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; diff --git a/test/units/registry/HyperdriveRegistry.t.sol b/test/units/registry/HyperdriveRegistry.t.sol index 39c30ff16..e25d72adb 100644 --- a/test/units/registry/HyperdriveRegistry.t.sol +++ b/test/units/registry/HyperdriveRegistry.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { VmSafe } from "forge-std/Vm.sol"; import { ERC4626HyperdriveCoreDeployer } from "../../../contracts/src/deployers/erc4626/ERC4626HyperdriveCoreDeployer.sol"; diff --git a/test/units/rewarder/HyperdriveCheckpointRewarder.t.sol b/test/units/rewarder/HyperdriveCheckpointRewarder.t.sol index 168832a74..49b7bc4ff 100644 --- a/test/units/rewarder/HyperdriveCheckpointRewarder.t.sol +++ b/test/units/rewarder/HyperdriveCheckpointRewarder.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { VmSafe } from "forge-std/Vm.sol"; import { IERC20 } from "../../../contracts/src/interfaces/IERC20.sol"; diff --git a/test/units/rewarder/HyperdriveCheckpointSubrewarder.t.sol b/test/units/rewarder/HyperdriveCheckpointSubrewarder.t.sol index a64ae693b..b3bde142b 100644 --- a/test/units/rewarder/HyperdriveCheckpointSubrewarder.t.sol +++ b/test/units/rewarder/HyperdriveCheckpointSubrewarder.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.22; import { VmSafe } from "forge-std/Vm.sol"; import { IERC20 } from "../../../contracts/src/interfaces/IERC20.sol"; diff --git a/test/utils/BaseTest.sol b/test/utils/BaseTest.sol index 2e06fcb4e..65e55f74b 100644 --- a/test/utils/BaseTest.sol +++ b/test/utils/BaseTest.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { console2 } from "forge-std/console2.sol"; import { Test } from "forge-std/Test.sol"; diff --git a/test/utils/CombinatorialTest.sol b/test/utils/CombinatorialTest.sol index d5d5c3905..5aecbbb85 100644 --- a/test/utils/CombinatorialTest.sol +++ b/test/utils/CombinatorialTest.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { HyperdriveTest } from "./HyperdriveTest.sol"; import { Lib } from "./Lib.sol"; diff --git a/test/utils/EtchingUtils.sol b/test/utils/EtchingUtils.sol index 4ec168855..e0e01aae0 100644 --- a/test/utils/EtchingUtils.sol +++ b/test/utils/EtchingUtils.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { Test } from "forge-std/Test.sol"; import { ERC4626Hyperdrive } from "../../contracts/src/instances/erc4626/ERC4626Hyperdrive.sol"; diff --git a/test/utils/HyperdriveTest.sol b/test/utils/HyperdriveTest.sol index fab45d2cb..4cb4c63bf 100644 --- a/test/utils/HyperdriveTest.sol +++ b/test/utils/HyperdriveTest.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { VmSafe } from "forge-std/Vm.sol"; import { HyperdriveFactory } from "../../contracts/src/factory/HyperdriveFactory.sol"; diff --git a/test/utils/HyperdriveUtils.sol b/test/utils/HyperdriveUtils.sol index a120bc95b..f53344479 100644 --- a/test/utils/HyperdriveUtils.sol +++ b/test/utils/HyperdriveUtils.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { IHyperdrive } from "../../contracts/src/interfaces/IHyperdrive.sol"; import { AssetId } from "../../contracts/src/libraries/AssetId.sol"; diff --git a/test/utils/InstanceTest.sol b/test/utils/InstanceTest.sol index 6224a556e..14400ade7 100644 --- a/test/utils/InstanceTest.sol +++ b/test/utils/InstanceTest.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { ERC20ForwarderFactory } from "../../contracts/src/token/ERC20ForwarderFactory.sol"; import { HyperdriveFactory } from "../../contracts/src/factory/HyperdriveFactory.sol"; diff --git a/test/utils/Lib.sol b/test/utils/Lib.sol index 30957a5f3..d2d96f758 100644 --- a/test/utils/Lib.sol +++ b/test/utils/Lib.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.20; +pragma solidity ^0.8.20; import { console2 } from "forge-std/console2.sol"; import { stdMath } from "forge-std/StdMath.sol";