From e0c7a7cf94300b374f7c65fe9e8ac5d00c7e269a Mon Sep 17 00:00:00 2001 From: Shawn <44221603+shaspitz@users.noreply.github.com> Date: Fri, 30 Aug 2024 14:56:54 -0700 Subject: [PATCH] chore: bump solidity across repo (#379) * chore: bump solidity to 0.8.25 across repo * bump to 0.8.26 --- bridge/standard/bridge-v1/deploy_contracts.sh | 4 ++-- contracts/Makefile | 4 ++-- contracts/README.md | 2 +- contracts/contracts/core/BidderRegistry.sol | 2 +- contracts/contracts/core/BidderRegistryStorage.sol | 2 +- contracts/contracts/core/BlockTracker.sol | 2 +- contracts/contracts/core/BlockTrackerStorage.sol | 2 +- contracts/contracts/core/Oracle.sol | 2 +- contracts/contracts/core/OracleStorage.sol | 2 +- contracts/contracts/core/PreconfManager.sol | 2 +- contracts/contracts/core/PreconfManagerStorage.sol | 2 +- contracts/contracts/core/ProviderRegistry.sol | 2 +- contracts/contracts/core/ProviderRegistryStorage.sol | 2 +- contracts/contracts/interfaces/IBidderRegistry.sol | 2 +- contracts/contracts/interfaces/IBlockTracker.sol | 2 +- contracts/contracts/interfaces/IMevCommitAVS.sol | 2 +- contracts/contracts/interfaces/IOracle.sol | 2 +- contracts/contracts/interfaces/IPreconfManager.sol | 2 +- contracts/contracts/interfaces/IProviderRegistry.sol | 2 +- contracts/contracts/interfaces/IValidatorOptInRouter.sol | 2 +- contracts/contracts/interfaces/IVanillaRegistry.sol | 2 +- contracts/contracts/interfaces/IWhitelist.sol | 2 +- contracts/contracts/standard-bridge/Gateway.sol | 2 +- contracts/contracts/standard-bridge/L1Gateway.sol | 2 +- contracts/contracts/standard-bridge/SettlementGateway.sol | 2 +- contracts/contracts/standard-bridge/Whitelist.sol | 2 +- contracts/contracts/utils/Errors.sol | 2 +- contracts/contracts/utils/EventHeight.sol | 2 +- contracts/contracts/utils/FeePayout.sol | 2 +- contracts/contracts/utils/WindowFromBlockNumber.sol | 2 +- .../contracts/validator-registry/ValidatorOptInRouter.sol | 2 +- .../validator-registry/ValidatorOptInRouterStorage.sol | 2 +- .../contracts/validator-registry/VanillaRegistry.sol | 2 +- .../validator-registry/VanillaRegistryStorage.sol | 2 +- .../contracts/validator-registry/avs/MevCommitAVS.sol | 2 +- .../validator-registry/avs/MevCommitAVSStorage.sol | 2 +- contracts/entrypoint.sh | 8 ++++---- contracts/foundry.toml | 2 +- contracts/scripts/core/DeployCore.s.sol | 2 +- .../scripts/standard-bridge/DeployStandardBridge.s.sol | 2 +- .../validator-registry/DeployValidatorOptInRouter.s.sol | 2 +- .../validator-registry/DeployVanillaRegistry.s.sol | 2 +- .../validator-registry/ValidatorExampleScript.s.sol | 2 +- contracts/scripts/validator-registry/avs/DeployAVS.s.sol | 2 +- .../validator-registry/avs/DeployAVSWithMockEigen.s.sol | 2 +- .../scripts/validator-registry/avs/ReleaseAddrConsts.sol | 2 +- contracts/test/core/BidderRegistryTest.sol | 2 +- contracts/test/core/OracleTest.sol | 2 +- contracts/test/core/PreconfManagerTest.sol | 2 +- contracts/test/core/ProviderRegistryTest.sol | 2 +- contracts/test/standard-bridge/L1GatewayTest.sol | 2 +- contracts/test/standard-bridge/SettlementGatewayTest.sol | 2 +- contracts/test/standard-bridge/WhitelistTest.sol | 2 +- .../test/validator-registry/ValidatorOptInRouterTest.sol | 2 +- contracts/test/validator-registry/VanillaRegistryTest.sol | 2 +- .../test/validator-registry/avs/AVSDirectoryMock.sol | 2 +- contracts/test/validator-registry/avs/EigenPodMock.sol | 2 +- .../test/validator-registry/avs/MevCommitAVSTest.sol | 2 +- 58 files changed, 63 insertions(+), 63 deletions(-) diff --git a/bridge/standard/bridge-v1/deploy_contracts.sh b/bridge/standard/bridge-v1/deploy_contracts.sh index 47c6af4da..74a86a08f 100755 --- a/bridge/standard/bridge-v1/deploy_contracts.sh +++ b/bridge/standard/bridge-v1/deploy_contracts.sh @@ -119,7 +119,7 @@ RELAYER_ADDR="$RELAYER_ADDR" $FORGE_BIN_PATH script \ --broadcast \ --chain-id "$SETTLEMENT_CHAIN_ID" \ -vvvv \ - --use 0.8.20 | tee deploy_sg_output.txt + --use 0.8.26 | tee deploy_sg_output.txt awk -F"JSON_DEPLOY_ARTIFACT: " '/JSON_DEPLOY_ARTIFACT:/ {print $2}' deploy_sg_output.txt | sed '/^$/d' > SettlementGatewayArtifact.json mv SettlementGatewayArtifact.json "$ARTIFACT_OUT_PATH" @@ -131,7 +131,7 @@ RELAYER_ADDR="$RELAYER_ADDR" $FORGE_BIN_PATH script \ --broadcast \ --chain-id "$L1_CHAIN_ID" \ -vvvv \ - --use 0.8.20 | tee deploy_l1g_output.txt + --use 0.8.26 | tee deploy_l1g_output.txt awk -F"JSON_DEPLOY_ARTIFACT: " '/JSON_DEPLOY_ARTIFACT:/ {print $2}' deploy_l1g_output.txt | sed '/^$/d' > L1GatewayArtifact.json mv L1GatewayArtifact.json "$ARTIFACT_OUT_PATH" diff --git a/contracts/Makefile b/contracts/Makefile index 4ef58589e..4dcd6faa1 100644 --- a/contracts/Makefile +++ b/contracts/Makefile @@ -13,7 +13,7 @@ deploy-val-reg: --broadcast \ --chain-id 31337 \ -vvvv \ - --use 0.8.20 \ + --use 0.8.26 \ --via-ir \ deploy-opt-in-router-holesky: @@ -25,7 +25,7 @@ deploy-opt-in-router-holesky: --sender "${SENDER}" \ --via-ir \ --chain-id 17000 \ - --use 0.8.20 \ + --use 0.8.26 \ --broadcast deploy-core: diff --git a/contracts/README.md b/contracts/README.md index 488a4e247..32b468a68 100644 --- a/contracts/README.md +++ b/contracts/README.md @@ -39,7 +39,7 @@ Invoking the upgrade involves creating a script in which a new implementation co See example below ```solidity -pragma solidity 0.8.20; +pragma solidity 0.8.26; import {Script} from "forge-std/Script.sol"; import {console} from "forge-std/console.sol"; diff --git a/contracts/contracts/core/BidderRegistry.sol b/contracts/contracts/core/BidderRegistry.sol index 0417015b0..d6d9b5301 100644 --- a/contracts/contracts/core/BidderRegistry.sol +++ b/contracts/contracts/core/BidderRegistry.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity 0.8.20; +pragma solidity 0.8.26; import {Ownable2StepUpgradeable} from "@openzeppelin/contracts-upgradeable/access/Ownable2StepUpgradeable.sol"; import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol"; diff --git a/contracts/contracts/core/BidderRegistryStorage.sol b/contracts/contracts/core/BidderRegistryStorage.sol index b0c23311c..e80823485 100644 --- a/contracts/contracts/core/BidderRegistryStorage.sol +++ b/contracts/contracts/core/BidderRegistryStorage.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity 0.8.20; +pragma solidity 0.8.26; import {FeePayout} from "../utils/FeePayout.sol"; import {IBlockTracker} from "../interfaces/IBlockTracker.sol"; diff --git a/contracts/contracts/core/BlockTracker.sol b/contracts/contracts/core/BlockTracker.sol index a298bbb53..a6c505e18 100644 --- a/contracts/contracts/core/BlockTracker.sol +++ b/contracts/contracts/core/BlockTracker.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity 0.8.20; +pragma solidity 0.8.26; import {IBlockTracker} from "../interfaces/IBlockTracker.sol"; import {BlockTrackerStorage} from "./BlockTrackerStorage.sol"; diff --git a/contracts/contracts/core/BlockTrackerStorage.sol b/contracts/contracts/core/BlockTrackerStorage.sol index 33b7fa373..42d51c1ce 100644 --- a/contracts/contracts/core/BlockTrackerStorage.sol +++ b/contracts/contracts/core/BlockTrackerStorage.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity 0.8.20; +pragma solidity 0.8.26; abstract contract BlockTrackerStorage { /// @dev Permissioned address of the oracle account. diff --git a/contracts/contracts/core/Oracle.sol b/contracts/contracts/core/Oracle.sol index e5f01b9e5..d595058c9 100644 --- a/contracts/contracts/core/Oracle.sol +++ b/contracts/contracts/core/Oracle.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity 0.8.20; +pragma solidity 0.8.26; import {Ownable2StepUpgradeable} from "@openzeppelin/contracts-upgradeable/access/Ownable2StepUpgradeable.sol"; import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol"; diff --git a/contracts/contracts/core/OracleStorage.sol b/contracts/contracts/core/OracleStorage.sol index 5df915b76..489002f71 100644 --- a/contracts/contracts/core/OracleStorage.sol +++ b/contracts/contracts/core/OracleStorage.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity 0.8.20; +pragma solidity 0.8.26; import {IPreconfManager} from "../interfaces/IPreconfManager.sol"; import {IBlockTracker} from "../interfaces/IBlockTracker.sol"; diff --git a/contracts/contracts/core/PreconfManager.sol b/contracts/contracts/core/PreconfManager.sol index cfa17dfbc..74c75ec8c 100644 --- a/contracts/contracts/core/PreconfManager.sol +++ b/contracts/contracts/core/PreconfManager.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity 0.8.20; +pragma solidity 0.8.26; import {ECDSA} from "@openzeppelin-contracts/contracts/utils/cryptography/ECDSA.sol"; import {Ownable2StepUpgradeable} from "@openzeppelin/contracts-upgradeable/access/Ownable2StepUpgradeable.sol"; diff --git a/contracts/contracts/core/PreconfManagerStorage.sol b/contracts/contracts/core/PreconfManagerStorage.sol index f26e70e6e..8a5860ba5 100644 --- a/contracts/contracts/core/PreconfManagerStorage.sol +++ b/contracts/contracts/core/PreconfManagerStorage.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity 0.8.20; +pragma solidity 0.8.26; import {IProviderRegistry} from "../interfaces/IProviderRegistry.sol"; import {IBidderRegistry} from "../interfaces/IBidderRegistry.sol"; diff --git a/contracts/contracts/core/ProviderRegistry.sol b/contracts/contracts/core/ProviderRegistry.sol index ea344ab2a..4ef959a41 100644 --- a/contracts/contracts/core/ProviderRegistry.sol +++ b/contracts/contracts/core/ProviderRegistry.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity 0.8.20; +pragma solidity 0.8.26; import {Ownable2StepUpgradeable} from "@openzeppelin/contracts-upgradeable/access/Ownable2StepUpgradeable.sol"; import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol"; diff --git a/contracts/contracts/core/ProviderRegistryStorage.sol b/contracts/contracts/core/ProviderRegistryStorage.sol index e5eafbe32..670e398a5 100644 --- a/contracts/contracts/core/ProviderRegistryStorage.sol +++ b/contracts/contracts/core/ProviderRegistryStorage.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity 0.8.20; +pragma solidity 0.8.26; import {FeePayout} from "../utils/FeePayout.sol"; diff --git a/contracts/contracts/interfaces/IBidderRegistry.sol b/contracts/contracts/interfaces/IBidderRegistry.sol index c1feea902..eab3da5b7 100644 --- a/contracts/contracts/interfaces/IBidderRegistry.sol +++ b/contracts/contracts/interfaces/IBidderRegistry.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity 0.8.20; +pragma solidity 0.8.26; interface IBidderRegistry { struct OpenedCommitment { diff --git a/contracts/contracts/interfaces/IBlockTracker.sol b/contracts/contracts/interfaces/IBlockTracker.sol index c8ec4c221..c7516f709 100644 --- a/contracts/contracts/interfaces/IBlockTracker.sol +++ b/contracts/contracts/interfaces/IBlockTracker.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity 0.8.20; +pragma solidity 0.8.26; /// @title IBlockTracker interface for BlockTracker contract interface IBlockTracker { diff --git a/contracts/contracts/interfaces/IMevCommitAVS.sol b/contracts/contracts/interfaces/IMevCommitAVS.sol index ded01d6c8..9c625bcb8 100644 --- a/contracts/contracts/interfaces/IMevCommitAVS.sol +++ b/contracts/contracts/interfaces/IMevCommitAVS.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity 0.8.20; +pragma solidity 0.8.26; import {ISignatureUtils} from "eigenlayer-contracts/src/contracts/interfaces/ISignatureUtils.sol"; import {EventHeightLib} from "../utils/EventHeight.sol"; diff --git a/contracts/contracts/interfaces/IOracle.sol b/contracts/contracts/interfaces/IOracle.sol index 831e6b1fd..45e0c98e1 100644 --- a/contracts/contracts/interfaces/IOracle.sol +++ b/contracts/contracts/interfaces/IOracle.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity 0.8.20; +pragma solidity 0.8.26; interface IOracle { diff --git a/contracts/contracts/interfaces/IPreconfManager.sol b/contracts/contracts/interfaces/IPreconfManager.sol index 36f2592c5..1dea13ae1 100644 --- a/contracts/contracts/interfaces/IPreconfManager.sol +++ b/contracts/contracts/interfaces/IPreconfManager.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity 0.8.20; +pragma solidity 0.8.26; /** * @title IPreconfManager diff --git a/contracts/contracts/interfaces/IProviderRegistry.sol b/contracts/contracts/interfaces/IProviderRegistry.sol index 11f0fc0b3..ddb5761b5 100644 --- a/contracts/contracts/interfaces/IProviderRegistry.sol +++ b/contracts/contracts/interfaces/IProviderRegistry.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity 0.8.20; +pragma solidity 0.8.26; interface IProviderRegistry { diff --git a/contracts/contracts/interfaces/IValidatorOptInRouter.sol b/contracts/contracts/interfaces/IValidatorOptInRouter.sol index 906f9fe8e..3fdcbccd5 100644 --- a/contracts/contracts/interfaces/IValidatorOptInRouter.sol +++ b/contracts/contracts/interfaces/IValidatorOptInRouter.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity 0.8.20; +pragma solidity 0.8.26; import {IVanillaRegistry} from "./IVanillaRegistry.sol"; import {IMevCommitAVS} from "./IMevCommitAVS.sol"; diff --git a/contracts/contracts/interfaces/IVanillaRegistry.sol b/contracts/contracts/interfaces/IVanillaRegistry.sol index 8bb86587e..f2990b9ef 100644 --- a/contracts/contracts/interfaces/IVanillaRegistry.sol +++ b/contracts/contracts/interfaces/IVanillaRegistry.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity 0.8.20; +pragma solidity 0.8.26; import { EventHeightLib } from "../utils/EventHeight.sol"; diff --git a/contracts/contracts/interfaces/IWhitelist.sol b/contracts/contracts/interfaces/IWhitelist.sol index 641731c1f..9ebf92b33 100644 --- a/contracts/contracts/interfaces/IWhitelist.sol +++ b/contracts/contracts/interfaces/IWhitelist.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity 0.8.20; +pragma solidity 0.8.26; interface IWhitelist { function mint(address _mintTo, uint256 _amount) external; diff --git a/contracts/contracts/standard-bridge/Gateway.sol b/contracts/contracts/standard-bridge/Gateway.sol index 13c9b833e..910054522 100644 --- a/contracts/contracts/standard-bridge/Gateway.sol +++ b/contracts/contracts/standard-bridge/Gateway.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity 0.8.20; +pragma solidity 0.8.26; import {Ownable2StepUpgradeable} from "@openzeppelin/contracts-upgradeable/access/Ownable2StepUpgradeable.sol"; import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol"; diff --git a/contracts/contracts/standard-bridge/L1Gateway.sol b/contracts/contracts/standard-bridge/L1Gateway.sol index f08fdb1ec..74c2a3358 100644 --- a/contracts/contracts/standard-bridge/L1Gateway.sol +++ b/contracts/contracts/standard-bridge/L1Gateway.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity 0.8.20; +pragma solidity 0.8.26; import {Gateway} from "./Gateway.sol"; diff --git a/contracts/contracts/standard-bridge/SettlementGateway.sol b/contracts/contracts/standard-bridge/SettlementGateway.sol index 8a12e39b6..7e0adf241 100644 --- a/contracts/contracts/standard-bridge/SettlementGateway.sol +++ b/contracts/contracts/standard-bridge/SettlementGateway.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity 0.8.20; +pragma solidity 0.8.26; import {Gateway} from "./Gateway.sol"; import {IWhitelist} from "../interfaces/IWhitelist.sol"; diff --git a/contracts/contracts/standard-bridge/Whitelist.sol b/contracts/contracts/standard-bridge/Whitelist.sol index 3f246af20..76f74c76d 100644 --- a/contracts/contracts/standard-bridge/Whitelist.sol +++ b/contracts/contracts/standard-bridge/Whitelist.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity 0.8.20; +pragma solidity 0.8.26; import {Ownable2StepUpgradeable} from "@openzeppelin/contracts-upgradeable/access/Ownable2StepUpgradeable.sol"; import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol"; diff --git a/contracts/contracts/utils/Errors.sol b/contracts/contracts/utils/Errors.sol index 2662124f4..ce7975471 100644 --- a/contracts/contracts/utils/Errors.sol +++ b/contracts/contracts/utils/Errors.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity 0.8.20; +pragma solidity 0.8.26; library Errors { /// @dev Custom error for invalid fallback calls. diff --git a/contracts/contracts/utils/EventHeight.sol b/contracts/contracts/utils/EventHeight.sol index 23780a2cf..72d43bd73 100644 --- a/contracts/contracts/utils/EventHeight.sol +++ b/contracts/contracts/utils/EventHeight.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity 0.8.20; +pragma solidity 0.8.26; library EventHeightLib { /// @title EventHeight diff --git a/contracts/contracts/utils/FeePayout.sol b/contracts/contracts/utils/FeePayout.sol index 1e3db39b4..dfec9d73b 100644 --- a/contracts/contracts/utils/FeePayout.sol +++ b/contracts/contracts/utils/FeePayout.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity 0.8.20; +pragma solidity 0.8.26; library FeePayout { diff --git a/contracts/contracts/utils/WindowFromBlockNumber.sol b/contracts/contracts/utils/WindowFromBlockNumber.sol index 3a13e0a1e..b9251a083 100644 --- a/contracts/contracts/utils/WindowFromBlockNumber.sol +++ b/contracts/contracts/utils/WindowFromBlockNumber.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity 0.8.20; +pragma solidity 0.8.26; /** * @title WindowFromBlockNumber diff --git a/contracts/contracts/validator-registry/ValidatorOptInRouter.sol b/contracts/contracts/validator-registry/ValidatorOptInRouter.sol index 67528047d..f3669cb2d 100644 --- a/contracts/contracts/validator-registry/ValidatorOptInRouter.sol +++ b/contracts/contracts/validator-registry/ValidatorOptInRouter.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity 0.8.20; +pragma solidity 0.8.26; import {ValidatorOptInRouterStorage} from "./ValidatorOptInRouterStorage.sol"; import {IValidatorOptInRouter} from "../interfaces/IValidatorOptInRouter.sol"; diff --git a/contracts/contracts/validator-registry/ValidatorOptInRouterStorage.sol b/contracts/contracts/validator-registry/ValidatorOptInRouterStorage.sol index 18ce1c41e..f5ab74133 100644 --- a/contracts/contracts/validator-registry/ValidatorOptInRouterStorage.sol +++ b/contracts/contracts/validator-registry/ValidatorOptInRouterStorage.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity 0.8.20; +pragma solidity 0.8.26; import {IVanillaRegistry} from "../interfaces/IVanillaRegistry.sol"; import {IMevCommitAVS} from "../interfaces/IMevCommitAVS.sol"; diff --git a/contracts/contracts/validator-registry/VanillaRegistry.sol b/contracts/contracts/validator-registry/VanillaRegistry.sol index 5b21224bc..16b272c13 100644 --- a/contracts/contracts/validator-registry/VanillaRegistry.sol +++ b/contracts/contracts/validator-registry/VanillaRegistry.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity 0.8.20; +pragma solidity 0.8.26; import {IVanillaRegistry} from "../interfaces/IVanillaRegistry.sol"; import {VanillaRegistryStorage} from "./VanillaRegistryStorage.sol"; diff --git a/contracts/contracts/validator-registry/VanillaRegistryStorage.sol b/contracts/contracts/validator-registry/VanillaRegistryStorage.sol index a5fc8b54f..65beddee7 100644 --- a/contracts/contracts/validator-registry/VanillaRegistryStorage.sol +++ b/contracts/contracts/validator-registry/VanillaRegistryStorage.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity 0.8.20; +pragma solidity 0.8.26; import {IVanillaRegistry} from "../interfaces/IVanillaRegistry.sol"; diff --git a/contracts/contracts/validator-registry/avs/MevCommitAVS.sol b/contracts/contracts/validator-registry/avs/MevCommitAVS.sol index 2f1146a5a..abb54ba7b 100644 --- a/contracts/contracts/validator-registry/avs/MevCommitAVS.sol +++ b/contracts/contracts/validator-registry/avs/MevCommitAVS.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity 0.8.20; +pragma solidity 0.8.26; import {IMevCommitAVS} from "../../interfaces/IMevCommitAVS.sol"; import {MevCommitAVSStorage} from "./MevCommitAVSStorage.sol"; diff --git a/contracts/contracts/validator-registry/avs/MevCommitAVSStorage.sol b/contracts/contracts/validator-registry/avs/MevCommitAVSStorage.sol index a3dc90d59..3ca9479d1 100644 --- a/contracts/contracts/validator-registry/avs/MevCommitAVSStorage.sol +++ b/contracts/contracts/validator-registry/avs/MevCommitAVSStorage.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity 0.8.20; +pragma solidity 0.8.26; import {IMevCommitAVS} from "../../interfaces/IMevCommitAVS.sol"; diff --git a/contracts/entrypoint.sh b/contracts/entrypoint.sh index e312e7f4a..9ea461931 100755 --- a/contracts/entrypoint.sh +++ b/contracts/entrypoint.sh @@ -32,7 +32,7 @@ if [ "${DEPLOY_TYPE}" = "core" ]; then --password "${KEYSTORE_PASSWORD}" \ --sender "${SENDER}" \ --skip-simulation \ - --use 0.8.20 \ + --use 0.8.26 \ --broadcast \ --force \ --json \ @@ -53,7 +53,7 @@ elif [ "${DEPLOY_TYPE}" = "settlement-gateway" ]; then --broadcast \ --chain-id "${CHAIN_ID}" \ -vvvv \ - --use 0.8.20 \ + --use 0.8.26 \ --root "${CONTRACT_REPO_ROOT_PATH}" \ --via-ir @@ -72,7 +72,7 @@ elif [ "${DEPLOY_TYPE}" = "l1-gateway" ]; then --broadcast \ --chain-id "${CHAIN_ID}" \ -vvvv \ - --use 0.8.20 \ + --use 0.8.26 \ --root "${CONTRACT_REPO_ROOT_PATH}" \ --via-ir @@ -87,7 +87,7 @@ elif [ "${DEPLOY_TYPE}" = "vanilla-registry" ]; then --broadcast \ --chain-id "${CHAIN_ID}" \ -vvvv \ - --use 0.8.20 \ + --use 0.8.26 \ --root "${CONTRACT_REPO_ROOT_PATH}" \ --via-ir \ --skip-simulation \ diff --git a/contracts/foundry.toml b/contracts/foundry.toml index 2e0fbdb0f..1048f5d7a 100644 --- a/contracts/foundry.toml +++ b/contracts/foundry.toml @@ -1,6 +1,6 @@ [profile.default] src = 'contracts' -solc-version = '0.8.20' +solc-version = '0.8.26' script = 'scripts' out = 'out' libs = ['node_modules', 'lib'] diff --git a/contracts/scripts/core/DeployCore.s.sol b/contracts/scripts/core/DeployCore.s.sol index 67b8b70b4..ad162b7d8 100644 --- a/contracts/scripts/core/DeployCore.s.sol +++ b/contracts/scripts/core/DeployCore.s.sol @@ -3,7 +3,7 @@ // solhint-disable no-console // solhint-disable one-contract-per-file -pragma solidity 0.8.20; +pragma solidity 0.8.26; import {Script} from "forge-std/Script.sol"; import {BidderRegistry} from "../../contracts/core/BidderRegistry.sol"; diff --git a/contracts/scripts/standard-bridge/DeployStandardBridge.s.sol b/contracts/scripts/standard-bridge/DeployStandardBridge.s.sol index ca2bda24b..92fb47592 100644 --- a/contracts/scripts/standard-bridge/DeployStandardBridge.s.sol +++ b/contracts/scripts/standard-bridge/DeployStandardBridge.s.sol @@ -3,7 +3,7 @@ // solhint-disable no-console // solhint-disable one-contract-per-file -pragma solidity 0.8.20; +pragma solidity 0.8.26; import {Script} from "forge-std/Script.sol"; import {SettlementGateway} from "../../contracts/standard-bridge/SettlementGateway.sol"; diff --git a/contracts/scripts/validator-registry/DeployValidatorOptInRouter.s.sol b/contracts/scripts/validator-registry/DeployValidatorOptInRouter.s.sol index 207ab9db3..7f3a6ad8b 100644 --- a/contracts/scripts/validator-registry/DeployValidatorOptInRouter.s.sol +++ b/contracts/scripts/validator-registry/DeployValidatorOptInRouter.s.sol @@ -3,7 +3,7 @@ // solhint-disable no-console // solhint-disable one-contract-per-file -pragma solidity 0.8.20; +pragma solidity 0.8.26; import {Script} from "forge-std/Script.sol"; import {console} from "forge-std/console.sol"; diff --git a/contracts/scripts/validator-registry/DeployVanillaRegistry.s.sol b/contracts/scripts/validator-registry/DeployVanillaRegistry.s.sol index c11ca3c6e..296911959 100644 --- a/contracts/scripts/validator-registry/DeployVanillaRegistry.s.sol +++ b/contracts/scripts/validator-registry/DeployVanillaRegistry.s.sol @@ -3,7 +3,7 @@ // solhint-disable no-console // solhint-disable one-contract-per-file -pragma solidity 0.8.20; +pragma solidity 0.8.26; import {Script} from "forge-std/Script.sol"; import {Upgrades} from "openzeppelin-foundry-upgrades/Upgrades.sol"; diff --git a/contracts/scripts/validator-registry/ValidatorExampleScript.s.sol b/contracts/scripts/validator-registry/ValidatorExampleScript.s.sol index c08fdf92b..e5e48a7bb 100644 --- a/contracts/scripts/validator-registry/ValidatorExampleScript.s.sol +++ b/contracts/scripts/validator-registry/ValidatorExampleScript.s.sol @@ -3,7 +3,7 @@ // solhint-disable no-console // solhint-disable one-contract-per-file -pragma solidity 0.8.20; +pragma solidity 0.8.26; import {Script} from "forge-std/Script.sol"; import {console} from "forge-std/console.sol"; diff --git a/contracts/scripts/validator-registry/avs/DeployAVS.s.sol b/contracts/scripts/validator-registry/avs/DeployAVS.s.sol index 5e3bb4485..57aeee0b9 100644 --- a/contracts/scripts/validator-registry/avs/DeployAVS.s.sol +++ b/contracts/scripts/validator-registry/avs/DeployAVS.s.sol @@ -3,7 +3,7 @@ // solhint-disable no-console // solhint-disable one-contract-per-file -pragma solidity 0.8.20; +pragma solidity 0.8.26; import {Script} from "forge-std/Script.sol"; import {console} from "forge-std/console.sol"; diff --git a/contracts/scripts/validator-registry/avs/DeployAVSWithMockEigen.s.sol b/contracts/scripts/validator-registry/avs/DeployAVSWithMockEigen.s.sol index df084d2a4..372395b37 100644 --- a/contracts/scripts/validator-registry/avs/DeployAVSWithMockEigen.s.sol +++ b/contracts/scripts/validator-registry/avs/DeployAVSWithMockEigen.s.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity ^0.8.20; +pragma solidity 0.8.26; // solhint-disable no-console // solhint-disable one-contract-per-file diff --git a/contracts/scripts/validator-registry/avs/ReleaseAddrConsts.sol b/contracts/scripts/validator-registry/avs/ReleaseAddrConsts.sol index 5befe7b69..d17994556 100644 --- a/contracts/scripts/validator-registry/avs/ReleaseAddrConsts.sol +++ b/contracts/scripts/validator-registry/avs/ReleaseAddrConsts.sol @@ -3,7 +3,7 @@ // solhint-disable no-console // solhint-disable one-contract-per-file -pragma solidity 0.8.20; +pragma solidity 0.8.26; /// @notice Constants from https://github.com/Layr-Labs/eigenlayer-contracts?tab=readme-ov-file#deployments, /// @notice Last updated 07-26-2024 diff --git a/contracts/test/core/BidderRegistryTest.sol b/contracts/test/core/BidderRegistryTest.sol index b23f77943..9fd5ccebc 100644 --- a/contracts/test/core/BidderRegistryTest.sol +++ b/contracts/test/core/BidderRegistryTest.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity 0.8.20; +pragma solidity 0.8.26; import {Test} from "forge-std/Test.sol"; import {BidderRegistry} from "../../contracts/core/BidderRegistry.sol"; diff --git a/contracts/test/core/OracleTest.sol b/contracts/test/core/OracleTest.sol index 8181ee014..ad40b3897 100644 --- a/contracts/test/core/OracleTest.sol +++ b/contracts/test/core/OracleTest.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity 0.8.20; +pragma solidity 0.8.26; import {Test} from "forge-std/Test.sol"; import {Oracle} from "../../contracts/core/Oracle.sol"; diff --git a/contracts/test/core/PreconfManagerTest.sol b/contracts/test/core/PreconfManagerTest.sol index b81156a62..b9c009cec 100644 --- a/contracts/test/core/PreconfManagerTest.sol +++ b/contracts/test/core/PreconfManagerTest.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity 0.8.20; +pragma solidity 0.8.26; import {Test} from "forge-std/Test.sol"; import {PreconfManager} from "../../contracts/core/PreconfManager.sol"; diff --git a/contracts/test/core/ProviderRegistryTest.sol b/contracts/test/core/ProviderRegistryTest.sol index 5def57a0c..aea0c916f 100644 --- a/contracts/test/core/ProviderRegistryTest.sol +++ b/contracts/test/core/ProviderRegistryTest.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity 0.8.20; +pragma solidity 0.8.26; import {Test} from "forge-std/Test.sol"; import {ProviderRegistry} from "../../contracts/core/ProviderRegistry.sol"; diff --git a/contracts/test/standard-bridge/L1GatewayTest.sol b/contracts/test/standard-bridge/L1GatewayTest.sol index 872974c37..bf2477191 100644 --- a/contracts/test/standard-bridge/L1GatewayTest.sol +++ b/contracts/test/standard-bridge/L1GatewayTest.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity 0.8.20; +pragma solidity 0.8.26; import {Test} from "forge-std/Test.sol"; import {L1Gateway} from "../../contracts/standard-bridge/L1Gateway.sol"; diff --git a/contracts/test/standard-bridge/SettlementGatewayTest.sol b/contracts/test/standard-bridge/SettlementGatewayTest.sol index d5dd66429..f41edf970 100644 --- a/contracts/test/standard-bridge/SettlementGatewayTest.sol +++ b/contracts/test/standard-bridge/SettlementGatewayTest.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity 0.8.20; +pragma solidity 0.8.26; import {Test} from "forge-std/Test.sol"; import {SettlementGateway} from "../../contracts/standard-bridge/SettlementGateway.sol"; diff --git a/contracts/test/standard-bridge/WhitelistTest.sol b/contracts/test/standard-bridge/WhitelistTest.sol index e96afe60b..89fabab63 100644 --- a/contracts/test/standard-bridge/WhitelistTest.sol +++ b/contracts/test/standard-bridge/WhitelistTest.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity 0.8.20; +pragma solidity 0.8.26; import {Test} from "forge-std/Test.sol"; import {Whitelist} from "../../contracts/standard-bridge/Whitelist.sol"; diff --git a/contracts/test/validator-registry/ValidatorOptInRouterTest.sol b/contracts/test/validator-registry/ValidatorOptInRouterTest.sol index 9419294dc..5f008f86a 100644 --- a/contracts/test/validator-registry/ValidatorOptInRouterTest.sol +++ b/contracts/test/validator-registry/ValidatorOptInRouterTest.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity 0.8.20; +pragma solidity 0.8.26; import {Test} from "forge-std/Test.sol"; import {VanillaRegistry} from "../../contracts/validator-registry/VanillaRegistry.sol"; diff --git a/contracts/test/validator-registry/VanillaRegistryTest.sol b/contracts/test/validator-registry/VanillaRegistryTest.sol index 6462debda..4c8b47c70 100644 --- a/contracts/test/validator-registry/VanillaRegistryTest.sol +++ b/contracts/test/validator-registry/VanillaRegistryTest.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity 0.8.20; +pragma solidity 0.8.26; import {Test} from"forge-std/Test.sol"; import {VanillaRegistry} from"../../contracts/validator-registry/VanillaRegistry.sol"; diff --git a/contracts/test/validator-registry/avs/AVSDirectoryMock.sol b/contracts/test/validator-registry/avs/AVSDirectoryMock.sol index 5eb9f85b6..9d5274e87 100644 --- a/contracts/test/validator-registry/avs/AVSDirectoryMock.sol +++ b/contracts/test/validator-registry/avs/AVSDirectoryMock.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity 0.8.20; +pragma solidity 0.8.26; import "forge-std/Test.sol"; import {IAVSDirectory} from "eigenlayer-contracts/src/contracts/interfaces/IAVSDirectory.sol"; diff --git a/contracts/test/validator-registry/avs/EigenPodMock.sol b/contracts/test/validator-registry/avs/EigenPodMock.sol index c3be8499a..00ec1ac87 100644 --- a/contracts/test/validator-registry/avs/EigenPodMock.sol +++ b/contracts/test/validator-registry/avs/EigenPodMock.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity 0.8.20; +pragma solidity 0.8.26; import "forge-std/Test.sol"; import "eigenlayer-contracts/src/contracts/interfaces/IEigenPod.sol"; diff --git a/contracts/test/validator-registry/avs/MevCommitAVSTest.sol b/contracts/test/validator-registry/avs/MevCommitAVSTest.sol index c6dc7228f..0121c2cae 100644 --- a/contracts/test/validator-registry/avs/MevCommitAVSTest.sol +++ b/contracts/test/validator-registry/avs/MevCommitAVSTest.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity 0.8.20; +pragma solidity 0.8.26; import "forge-std/Test.sol"; import "../../../contracts/validator-registry/avs/MevCommitAVS.sol";