Transient storage for claims gate

foundry.toml

@@ -16,6 +16,8 @@ extra_output_files = ["metadata"]
 ignored_warnings_from = ["src/contracts/Proxy.sol"]
 optimizer = true
 optimizer_runs = 200
+solc = "0.8.36"
+evm_version = "cancun"
 ffi = true
 
 # About remappings: 

hardhat.config.js

@@ -109,10 +109,13 @@ module.exports = {
       chainId: 1,
     },
   },
-  solidity: "0.8.23",
-  settings: {
-    optimizer: {
-      enabled: true,
+  solidity: {
+    version: "0.8.36",
+    settings: {
+      evmVersion: "cancun",
+      optimizer: {
+        enabled: true,
+      },
     },
   },
   tracer: {

script/automation/UpdateGovernanceMetadata.s.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.23;
+pragma solidity ^0.8.36;
 
 // Foundry
 import {Script, console} from "forge-std/Script.sol";

script/deploy/Base.s.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.23;
+pragma solidity ^0.8.36;
 
 // Foundry
 import {Vm} from "forge-std/Vm.sol";

script/deploy/DeployManager.s.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.23;
+pragma solidity ^0.8.36;
 
 // Foundry
 import {Vm} from "forge-std/Vm.sol";

script/deploy/helpers/AbstractDeployScript.s.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.23;
+pragma solidity ^0.8.36;
 
 // Helpers
 import {Logger} from "script/deploy/helpers/Logger.sol";

script/deploy/helpers/DeploymentTypes.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.23;
+pragma solidity ^0.8.36;
 
 /// @title DeploymentTypes
 /// @notice Core data structures and enums used throughout the deployment framework.

script/deploy/helpers/GovHelper.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.23;
+pragma solidity ^0.8.36;
 
 // Foundry
 import {Vm} from "forge-std/Vm.sol";

script/deploy/helpers/Logger.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.23;
+pragma solidity ^0.8.36;
 
 import {Vm} from "forge-std/Vm.sol";
 import {console2} from "forge-std/console2.sol";

script/deploy/helpers/Resolver.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.23;
+pragma solidity ^0.8.36;
 
 import {State, Execution, Contract, Position} from "script/deploy/helpers/DeploymentTypes.sol";
 

script/deploy/mainnet/000_Example.s.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.23;
+pragma solidity ^0.8.36;
 
 // ==================== Example Deployment Script ==================== //
 //

script/deploy/mainnet/019_DeployPendleAdaptor_EtherFi.s.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.23;
+pragma solidity ^0.8.36;
 
 // Contract
 import {PendleOriginARMSY} from "contracts/pendle/PendleOriginARMSY.sol";

script/deploy/mainnet/020_UpgradeEthenaARMScript.s.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.23;
+pragma solidity ^0.8.36;
 
 // Contract imports
 import {Proxy} from "contracts/Proxy.sol";

script/deploy/mainnet/021_UpgradeEtherFiARMCrossPriceScript.s.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.23;
+pragma solidity ^0.8.36;
 
 // Deployment
 import {GovHelper, GovProposal} from "script/deploy/helpers/GovHelper.sol";

script/deploy/mainnet/022_UpgradeEtherFiARMDepositScript.s.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.23;
+pragma solidity ^0.8.36;
 
 // Contract
 import {Proxy} from "contracts/Proxy.sol";

script/deploy/mainnet/023_UpgradeEthenaARMDepositScript.s.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.23;
+pragma solidity ^0.8.36;
 
 // Contract
 import {Proxy} from "contracts/Proxy.sol";

script/deploy/mainnet/024_UpgradeOETHARMDepositScript.s.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.23;
+pragma solidity ^0.8.36;
 
 // Contract
 import {OriginARM} from "contracts/OriginARM.sol";

script/deploy/mainnet/025_UpgradeLidoARMDepositScript.s.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.23;
+pragma solidity ^0.8.36;
 
 // Contract
 import {LidoARM} from "contracts/LidoARM.sol";

script/deploy/mainnet/026_UpgradeEthenaARMScript.s.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.23;
+pragma solidity ^0.8.36;
 
 // Contract
 import {Proxy} from "contracts/Proxy.sol";

script/deploy/mainnet/027_UpgradeEthenaARMScript.s.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.23;
+pragma solidity ^0.8.36;
 
 // Contract
 import {Proxy} from "contracts/Proxy.sol";

script/deploy/mainnet/028_UpgradeARMsPauseScript.s.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.23;
+pragma solidity ^0.8.36;
 
 // Contracts
 import {Proxy} from "contracts/Proxy.sol";

script/deploy/mainnet/029_SetTalosKMSOperatorScript.s.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.23;
+pragma solidity ^0.8.36;
 
 // Contracts
 import {Mainnet} from "contracts/utils/Addresses.sol";

script/deploy/mainnet/030_SetEthenaTalosKMSOperatorScript.s.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.23;
+pragma solidity ^0.8.36;
 
 // Contracts
 import {Mainnet} from "contracts/utils/Addresses.sol";

script/deploy/mainnet/031_UpgradeEthenaARMScript.s.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.23;
+pragma solidity ^0.8.36;
 
 // Contract
 import {Proxy} from "contracts/Proxy.sol";

script/deploy/mainnet/034_UpgradeEthenaARMGetBaseAssetsScript.s.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.23;
+pragma solidity ^0.8.36;
 
 // Contract
 import {Proxy} from "contracts/Proxy.sol";

script/deploy/mainnet/035_UnpauseEthenaARMScript.s.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.23;
+pragma solidity ^0.8.36;
 
 // Deployment
 import {AbstractDeployScript} from "script/deploy/helpers/AbstractDeployScript.s.sol";

script/deploy/mainnet/036_DeployMultiAssetARMScript.s.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.23;
+pragma solidity ^0.8.36;
 
 // Contracts
 import {IWETH} from "contracts/Interfaces.sol";

script/deploy/mainnet/037_DeployUSDARMScript.s.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.23;
+pragma solidity ^0.8.36;
 
 // Contracts
 import {IERC20} from "contracts/Interfaces.sol";

script/deploy/mainnet/038_DeployWETHARMScript.s.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.23;
+pragma solidity ^0.8.36;
 
 // Contracts
 import {IWETH} from "contracts/Interfaces.sol";

script/deploy/mainnet/039_DeployUSDCARMScript.s.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.23;
+pragma solidity ^0.8.36;
 
 // Contracts
 import {IERC20} from "contracts/Interfaces.sol";

script/deploy/mainnet/040_UnpauseEtherFi.s.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.23;
+pragma solidity ^0.8.36;
 
 // Deployment
 import {AbstractDeployScript} from "script/deploy/helpers/AbstractDeployScript.s.sol";

script/deploy/mainnet/041_RedeployEtherFiAdaptersScript.s.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.23;
+pragma solidity ^0.8.36;
 
 // Contracts
 import {Proxy} from "contracts/Proxy.sol";

script/deploy/mainnet/042_DeployWETHMorphoMarketScript.s.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.23;
+pragma solidity ^0.8.36;
 
 // Contracts
 import {Proxy} from "contracts/Proxy.sol";

script/deploy/sonic/001_DeployOriginARMProxy.s.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.23;
+pragma solidity ^0.8.36;
 
 // Contract
 import {Proxy} from "contracts/Proxy.sol";

script/deploy/sonic/002_DeployOriginARM.s.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.23;
+pragma solidity ^0.8.36;
 
 // Contract
 import {Proxy} from "contracts/Proxy.sol";

script/deploy/sonic/003_UpgradeOriginARM.s.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.23;
+pragma solidity ^0.8.36;
 
 // Contract imports
 import {Proxy} from "contracts/Proxy.sol";

script/deploy/sonic/004_DeployPendleAdaptor.s.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.23;
+pragma solidity ^0.8.36;
 
 // Contract imports
 import {PendleOriginARMSY} from "contracts/pendle/PendleOriginARMSY.sol";

script/deploy/sonic/005_UpgradeOriginARMSetBufferScript.s.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.23;
+pragma solidity ^0.8.36;
 
 // Contract imports
 import {Proxy} from "contracts/Proxy.sol";

script/deploy/sonic/006_SetOriginARMTalosOperatorScript.s.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.23;
+pragma solidity ^0.8.36;
 
 // Contracts
 import {Sonic} from "contracts/utils/Addresses.sol";

script/deploy/sonic/006_UpgradeOriginARMSwapFeeScript.s.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.23;
+pragma solidity ^0.8.36;
 
 import {Proxy} from "contracts/Proxy.sol";
 import {OriginARM} from "contracts/OriginARM.sol";

src/contracts/AbstractARM.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity ^0.8.23;
+pragma solidity ^0.8.36;
 
 import {ERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";
 import {ReentrancyGuardUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/ReentrancyGuardUpgradeable.sol";

src/contracts/CapManager.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity ^0.8.23;
+pragma solidity ^0.8.36;
 
 import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 

src/contracts/EthenaARM.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity ^0.8.23;
+pragma solidity ^0.8.36;
 
 import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 

src/contracts/EthenaUnstaker.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity ^0.8.23;
+pragma solidity ^0.8.36;
 
 import {IStakedUSDe} from "./Interfaces.sol";
 

src/contracts/EtherFiARM.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity ^0.8.23;
+pragma solidity ^0.8.36;
 
 import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 

src/contracts/Interfaces.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.23;
+pragma solidity ^0.8.36;
 
 import {IERC4626} from "@openzeppelin/contracts/interfaces/IERC4626.sol";
 

src/contracts/LidoARM.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity ^0.8.23;
+pragma solidity ^0.8.36;
 
 import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 

src/contracts/MultiAssetARM.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity ^0.8.23;
+pragma solidity ^0.8.36;
 
 import {AbstractARM} from "./AbstractARM.sol";
 

src/contracts/OriginARM.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity ^0.8.23;
+pragma solidity ^0.8.36;
 
 import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 

src/contracts/Ownable.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.23;
+pragma solidity ^0.8.36;
 
 /**
  * @title Base contract that provides ownership control

src/contracts/OwnableOperable.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.23;
+pragma solidity ^0.8.36;
 
 import {Ownable} from "./Ownable.sol";
 

src/contracts/Proxy.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.23;
+pragma solidity ^0.8.36;
 
 import {Ownable} from "./Ownable.sol";
 

src/contracts/SonicHarvester.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.23;
+pragma solidity ^0.8.36;
 
 import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 import {IERC20, IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";

src/contracts/ZapperARM.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity ^0.8.23;
+pragma solidity ^0.8.36;
 
 // Contracts
 import {Ownable} from "./Ownable.sol";

src/contracts/ZapperLidoARM.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity ^0.8.23;
+pragma solidity ^0.8.36;
 
 // Contracts
 import {Ownable} from "./Ownable.sol";