From ac4d36a0be1625ba71b040f6df67346b1c26ee28 Mon Sep 17 00:00:00 2001 From: Shawn <44221603+shaspitz@users.noreply.github.com> Date: Thu, 11 Jul 2024 16:54:03 -0700 Subject: [PATCH] chore: standardize solidity version to 0.8.20 across repo --- bridge/standard/bridge-v1/deploy_contracts.sh | 4 ++-- contracts/Dockerfile | 4 ++-- contracts/Makefile | 2 +- contracts/README.md | 8 ++++---- contracts/contracts/BidderRegistry.sol | 2 +- contracts/contracts/BlockTracker.sol | 2 +- contracts/contracts/Oracle.sol | 2 +- contracts/contracts/PreConfCommitmentStore.sol | 2 +- contracts/contracts/ProviderRegistry.sol | 2 +- contracts/contracts/Whitelist.sol | 2 +- contracts/contracts/interfaces/IBidderRegistry.sol | 2 +- contracts/contracts/interfaces/IBlockTracker.sol | 2 +- contracts/contracts/interfaces/IMevCommitAVS.sol | 2 +- .../contracts/interfaces/IPreConfCommitmentStore.sol | 2 +- contracts/contracts/interfaces/IProviderRegistry.sol | 2 +- .../contracts/interfaces/IValidatorOptInRouter.sol | 2 +- .../contracts/interfaces/IValidatorRegistryV1.sol | 2 +- contracts/contracts/interfaces/IWhitelist.sol | 2 +- contracts/contracts/standard-bridge/Gateway.sol | 2 +- contracts/contracts/standard-bridge/L1Gateway.sol | 2 +- .../contracts/standard-bridge/SettlementGateway.sol | 2 +- contracts/contracts/utils/EnumerableMap.sol | 2 +- contracts/contracts/utils/EnumerableSet.sol | 2 +- contracts/contracts/utils/EventHeight.sol | 2 +- contracts/contracts/utils/WindowFromBlockNumber.sol | 2 +- .../validator-registry/ValidatorOptInRouter.sol | 2 +- .../ValidatorOptInRouterStorage.sol | 2 +- .../validator-registry/ValidatorRegistryV1.sol | 2 +- .../ValidatorRegistryV1Storage.sol | 2 +- .../validator-registry/avs/MevCommitAVS.sol | 2 +- .../validator-registry/avs/MevCommitAVSStorage.sol | 2 +- contracts/entrypoint.sh | 12 ++++++------ contracts/scripts/DeployScripts.s.sol | 2 +- contracts/scripts/DeployStandardBridge.s.sol | 2 +- .../DeployValidatorRegistryV1.s.sol | 2 +- contracts/test/BidderRegistryTest.sol | 2 +- contracts/test/OracleTest.sol | 2 +- contracts/test/PreConfirmationConfTest.sol | 2 +- contracts/test/ProviderRegistryTest.sol | 2 +- contracts/test/WhitelistTest.sol | 2 +- contracts/test/standard-bridge/L1GatewayTest.sol | 2 +- .../test/standard-bridge/SettlementGatewayTest.sol | 2 +- contracts/test/utils/EnumerableMapTest.sol | 2 +- contracts/test/utils/EnumerableSetTest.sol | 2 +- .../validator-registry/ValidatorRegistryV1Test.sol | 2 +- .../test/validator-registry/avs/AVSDirectoryMock.sol | 2 +- .../test/validator-registry/avs/EigenPodMock.sol | 2 +- .../test/validator-registry/avs/MevCommitAVSTest.sol | 2 +- 48 files changed, 58 insertions(+), 58 deletions(-) diff --git a/bridge/standard/bridge-v1/deploy_contracts.sh b/bridge/standard/bridge-v1/deploy_contracts.sh index 391123bab..47c6af4da 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.23 | tee deploy_sg_output.txt + --use 0.8.20 | 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.23 | tee deploy_l1g_output.txt + --use 0.8.20 | 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/Dockerfile b/contracts/Dockerfile index 34a26dc97..0494f3f69 100644 --- a/contracts/Dockerfile +++ b/contracts/Dockerfile @@ -7,8 +7,8 @@ WORKDIR /app # Copy our source code into the container COPY . . -# Compile contracts using solidity compiler version 0.8.23 -RUN forge build --use 0.8.23 --via-ir +# Compile contracts using solidity compiler version 0.8.20 +RUN forge build --use 0.8.20 --via-ir # Set environment variables for RPC URL and private key # These should be passed during the Docker build process diff --git a/contracts/Makefile b/contracts/Makefile index e786bd067..0d1e4139a 100644 --- a/contracts/Makefile +++ b/contracts/Makefile @@ -6,7 +6,7 @@ deploy-val-reg: --broadcast \ --chain-id 31337 \ -vvvv \ - --use 0.8.23 \ + --use 0.8.20 \ --via-ir \ deploy-core: diff --git a/contracts/README.md b/contracts/README.md index 5e920d2f7..3a1d97774 100644 --- a/contracts/README.md +++ b/contracts/README.md @@ -163,26 +163,26 @@ export CHAIN_ID=17864 - Run the deploy script for core contracts ``` -forge script scripts/DeployScripts.s.sol:DeployScript --rpc-url $RPC_URL --private-key $PRIVATE_KEY --broadcast --chain-id $CHAIN_ID -vvvv --use 0.8.23 +forge script scripts/DeployScripts.s.sol:DeployScript --rpc-url $RPC_URL --private-key $PRIVATE_KEY --broadcast --chain-id $CHAIN_ID -vvvv --use 0.8.20 ``` - Run deploy script for whitelist contract, HYP_ERC20_ADDR denotes the HypERC20.sol contract address to give native mint/burn privileges. ``` -HYP_ERC20_ADDR=0xBe3dEF3973584FdcC1326634aF188f0d9772D57D forge script scripts/DeployScripts.s.sol:DeployWhitelist --rpc-url $RPC_URL --private-key $PRIVATE_KEY --broadcast --chain-id $CHAIN_ID -vvvv --use 0.8.23 +HYP_ERC20_ADDR=0xBe3dEF3973584FdcC1326634aF188f0d9772D57D forge script scripts/DeployScripts.s.sol:DeployWhitelist --rpc-url $RPC_URL --private-key $PRIVATE_KEY --broadcast --chain-id $CHAIN_ID -vvvv --use 0.8.20 ``` #### Note on CREATE2 Foundry scripts in this repo use the CREATE2 opcode to deploy for every contract. Meaning deployment on any chain will yield the same contract addresses, given a constant deployer account, contract bytecode, and salt. -This means the solidity version used for contract compilation affects the addresses those contracts will be deployed to. Solidity 0.8.23 is the canonical version to use. +This means the solidity version used for contract compilation affects the addresses those contracts will be deployed to. Solidity 0.8.20 is the canonical version to use. It's recommended to use `0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266` as the deployer account so that contract addresses will match external facing documentation. In production this address will have proper key management, for now here's the private key: `ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80`. The CREATE2 proxy needs to be deployed prior to these contracts. See [this repo](https://github.com/primev/deterministic-deployment-proxy), or this [make command](https://github.com/primev/mev-commit-geth/blob/d29cfe94205e852cc57a8184585ccc895d32a517/geth-poa/Makefile#L48) to deploy. Anvil automatically deploys this proxy to the expected address. -Using the above private key and compiling with solidity 0.8.23, expected contract addresses are: +Using the above private key and compiling with solidity 0.8.20, expected contract addresses are: ```bash UserRegistry deployed to: 0xe38B5a8C41f307646F395030992Aa008978E2699 diff --git a/contracts/contracts/BidderRegistry.sol b/contracts/contracts/BidderRegistry.sol index efcbbed87..7721078b4 100644 --- a/contracts/contracts/BidderRegistry.sol +++ b/contracts/contracts/BidderRegistry.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity ^0.8.20; +pragma solidity 0.8.20; import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol"; import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol"; diff --git a/contracts/contracts/BlockTracker.sol b/contracts/contracts/BlockTracker.sol index c9f228656..56649364b 100644 --- a/contracts/contracts/BlockTracker.sol +++ b/contracts/contracts/BlockTracker.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity ^0.8.20; +pragma solidity 0.8.20; import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol"; import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol"; diff --git a/contracts/contracts/Oracle.sol b/contracts/contracts/Oracle.sol index c550891c0..0448b0e0f 100644 --- a/contracts/contracts/Oracle.sol +++ b/contracts/contracts/Oracle.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity ^0.8.20; +pragma solidity 0.8.20; import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol"; import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol"; diff --git a/contracts/contracts/PreConfCommitmentStore.sol b/contracts/contracts/PreConfCommitmentStore.sol index 64144ba64..23afcdafb 100644 --- a/contracts/contracts/PreConfCommitmentStore.sol +++ b/contracts/contracts/PreConfCommitmentStore.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity ^0.8.20; +pragma solidity 0.8.20; import {ECDSA} from "@openzeppelin-contracts/contracts/utils/cryptography/ECDSA.sol"; import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol"; diff --git a/contracts/contracts/ProviderRegistry.sol b/contracts/contracts/ProviderRegistry.sol index f3575784f..ad71e6278 100644 --- a/contracts/contracts/ProviderRegistry.sol +++ b/contracts/contracts/ProviderRegistry.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity ^0.8.20; +pragma solidity 0.8.20; import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol"; import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol"; diff --git a/contracts/contracts/Whitelist.sol b/contracts/contracts/Whitelist.sol index d6a04eee2..e2f44184f 100644 --- a/contracts/contracts/Whitelist.sol +++ b/contracts/contracts/Whitelist.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity ^0.8.20; +pragma solidity 0.8.20; import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol"; import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol"; diff --git a/contracts/contracts/interfaces/IBidderRegistry.sol b/contracts/contracts/interfaces/IBidderRegistry.sol index 21b59e998..13e6950a8 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.20; interface IBidderRegistry { struct PreConfCommitment { diff --git a/contracts/contracts/interfaces/IBlockTracker.sol b/contracts/contracts/interfaces/IBlockTracker.sol index 056b7651d..2736bc10e 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.20; /// @title IBlockTracker interface for BlockTracker contract interface IBlockTracker { diff --git a/contracts/contracts/interfaces/IMevCommitAVS.sol b/contracts/contracts/interfaces/IMevCommitAVS.sol index 590bb30d4..b2ac1249f 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.20; import {ISignatureUtils} from "eigenlayer-contracts/src/contracts/interfaces/ISignatureUtils.sol"; import {EventHeightLib} from "../utils/EventHeight.sol"; diff --git a/contracts/contracts/interfaces/IPreConfCommitmentStore.sol b/contracts/contracts/interfaces/IPreConfCommitmentStore.sol index 214b0429a..3cf5983f2 100644 --- a/contracts/contracts/interfaces/IPreConfCommitmentStore.sol +++ b/contracts/contracts/interfaces/IPreConfCommitmentStore.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity ^0.8.20; +pragma solidity 0.8.20; /** * @title IPreConfCommitmentStore diff --git a/contracts/contracts/interfaces/IProviderRegistry.sol b/contracts/contracts/interfaces/IProviderRegistry.sol index e5cbc929b..5ecc087df 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.20; interface IProviderRegistry { function registerAndStake(bytes calldata blsPublicKey) external payable; diff --git a/contracts/contracts/interfaces/IValidatorOptInRouter.sol b/contracts/contracts/interfaces/IValidatorOptInRouter.sol index 5a4928c48..fdefb2bd6 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.20; interface IValidatorOptInRouter { /// @notice Initializes the contract with the validator registry and mev-commit AVS contracts. diff --git a/contracts/contracts/interfaces/IValidatorRegistryV1.sol b/contracts/contracts/interfaces/IValidatorRegistryV1.sol index 49a36ae1a..a643f4e82 100644 --- a/contracts/contracts/interfaces/IValidatorRegistryV1.sol +++ b/contracts/contracts/interfaces/IValidatorRegistryV1.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity ^0.8.20; +pragma solidity 0.8.20; import { EventHeightLib } from "../utils/EventHeight.sol"; diff --git a/contracts/contracts/interfaces/IWhitelist.sol b/contracts/contracts/interfaces/IWhitelist.sol index c059cdd48..641731c1f 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.20; 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 524805a15..4c637f52f 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.20; import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.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 4bd03d4e1..be8691c92 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.20; import {Gateway} from "./Gateway.sol"; diff --git a/contracts/contracts/standard-bridge/SettlementGateway.sol b/contracts/contracts/standard-bridge/SettlementGateway.sol index e96bbaa3d..497ba890a 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.20; import {Gateway} from "./Gateway.sol"; import {IWhitelist} from "../interfaces/IWhitelist.sol"; diff --git a/contracts/contracts/utils/EnumerableMap.sol b/contracts/contracts/utils/EnumerableMap.sol index dd238b81e..0cac73bea 100644 --- a/contracts/contracts/utils/EnumerableMap.sol +++ b/contracts/contracts/utils/EnumerableMap.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity ^0.8.20; +pragma solidity 0.8.20; import {EnumerableSet} from "./EnumerableSet.sol"; diff --git a/contracts/contracts/utils/EnumerableSet.sol b/contracts/contracts/utils/EnumerableSet.sol index 68dde8a50..7e8254930 100644 --- a/contracts/contracts/utils/EnumerableSet.sol +++ b/contracts/contracts/utils/EnumerableSet.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity ^0.8.20; +pragma solidity 0.8.20; /// @title Implements an enumerable set of bytes arrays. /// @notice Adapted from OpenZeppelin's EnumerableSet.sol implementation. diff --git a/contracts/contracts/utils/EventHeight.sol b/contracts/contracts/utils/EventHeight.sol index f8904588d..23780a2cf 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.20; library EventHeightLib { /// @title EventHeight diff --git a/contracts/contracts/utils/WindowFromBlockNumber.sol b/contracts/contracts/utils/WindowFromBlockNumber.sol index 493fb8bdc..3a13e0a1e 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.20; /** * @title WindowFromBlockNumber diff --git a/contracts/contracts/validator-registry/ValidatorOptInRouter.sol b/contracts/contracts/validator-registry/ValidatorOptInRouter.sol index 9e8e6cbdf..c38105a4b 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.20; 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 7665fc04b..cb99aa34c 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.20; import {IValidatorRegistryV1} from "../interfaces/IValidatorRegistryV1.sol"; import {IMevCommitAVS} from "../interfaces/IMevCommitAVS.sol"; diff --git a/contracts/contracts/validator-registry/ValidatorRegistryV1.sol b/contracts/contracts/validator-registry/ValidatorRegistryV1.sol index 5e7184d2c..ebec125fc 100644 --- a/contracts/contracts/validator-registry/ValidatorRegistryV1.sol +++ b/contracts/contracts/validator-registry/ValidatorRegistryV1.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity ^0.8.20; +pragma solidity 0.8.20; import {IValidatorRegistryV1} from "../interfaces/IValidatorRegistryV1.sol"; import {ValidatorRegistryV1Storage} from "./ValidatorRegistryV1Storage.sol"; diff --git a/contracts/contracts/validator-registry/ValidatorRegistryV1Storage.sol b/contracts/contracts/validator-registry/ValidatorRegistryV1Storage.sol index d2323f54d..d007ea11d 100644 --- a/contracts/contracts/validator-registry/ValidatorRegistryV1Storage.sol +++ b/contracts/contracts/validator-registry/ValidatorRegistryV1Storage.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity ^0.8.20; +pragma solidity 0.8.20; import {IValidatorRegistryV1} from "../interfaces/IValidatorRegistryV1.sol"; diff --git a/contracts/contracts/validator-registry/avs/MevCommitAVS.sol b/contracts/contracts/validator-registry/avs/MevCommitAVS.sol index 7f364a63a..3b4205409 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.20; 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 7bd5814e7..9c2b4ea17 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.20; import {IMevCommitAVS} from "../../interfaces/IMevCommitAVS.sol"; diff --git a/contracts/entrypoint.sh b/contracts/entrypoint.sh index a83054442..75d3789e2 100755 --- a/contracts/entrypoint.sh +++ b/contracts/entrypoint.sh @@ -27,7 +27,7 @@ if [ "${DEPLOY_TYPE}" = "core" ]; then --password "${KEYSTORE_PASSWORD}" \ --sender "${SENDER}" \ --skip-simulation \ - --use 0.8.23 \ + --use 0.8.20 \ --broadcast \ --force \ --json \ @@ -61,7 +61,7 @@ elif [ "${DEPLOY_TYPE}" = "transfer-ownership" ]; then --password "${KEYSTORE_PASSWORD}" \ --sender "${SENDER}" \ --skip-simulation \ - --use 0.8.23 \ + --use 0.8.20 \ --broadcast \ --force \ --json \ @@ -82,7 +82,7 @@ elif [ "${DEPLOY_TYPE}" = "whitelist" ]; then --broadcast \ --chain-id "${CHAIN_ID}" \ -vvvv \ - --use 0.8.23 \ + --use 0.8.20 \ --root "${CONTRACT_REPO_ROOT_PATH}" \ --via-ir @@ -101,7 +101,7 @@ elif [ "${DEPLOY_TYPE}" = "settlement-gateway" ]; then --broadcast \ --chain-id "${CHAIN_ID}" \ -vvvv \ - --use 0.8.23 \ + --use 0.8.20 \ --root "${CONTRACT_REPO_ROOT_PATH}" \ --via-ir @@ -120,7 +120,7 @@ elif [ "${DEPLOY_TYPE}" = "l1-gateway" ]; then --broadcast \ --chain-id "${CHAIN_ID}" \ -vvvv \ - --use 0.8.23 \ + --use 0.8.20 \ --root "${CONTRACT_REPO_ROOT_PATH}" \ --via-ir @@ -135,7 +135,7 @@ elif [ "${DEPLOY_TYPE}" = "validator-registry" ]; then --broadcast \ --chain-id "${CHAIN_ID}" \ -vvvv \ - --use 0.8.23 \ + --use 0.8.20 \ --root "${CONTRACT_REPO_ROOT_PATH}" \ --via-ir \ --skip-simulation \ diff --git a/contracts/scripts/DeployScripts.s.sol b/contracts/scripts/DeployScripts.s.sol index d6c7737f1..91a66b20e 100644 --- a/contracts/scripts/DeployScripts.s.sol +++ b/contracts/scripts/DeployScripts.s.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity ^0.8.20; +pragma solidity 0.8.20; import "forge-std/Script.sol"; import "../contracts/BidderRegistry.sol"; import "../contracts/ProviderRegistry.sol"; diff --git a/contracts/scripts/DeployStandardBridge.s.sol b/contracts/scripts/DeployStandardBridge.s.sol index cc4719cec..5cbff6668 100644 --- a/contracts/scripts/DeployStandardBridge.s.sol +++ b/contracts/scripts/DeployStandardBridge.s.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity ^0.8.20; +pragma solidity 0.8.20; import "forge-std/Script.sol"; import {SettlementGateway} from "../contracts/standard-bridge/SettlementGateway.sol"; import {L1Gateway} from "../contracts/standard-bridge/L1Gateway.sol"; diff --git a/contracts/scripts/validator-registry/DeployValidatorRegistryV1.s.sol b/contracts/scripts/validator-registry/DeployValidatorRegistryV1.s.sol index 40f66ca8e..0738e7e2d 100644 --- a/contracts/scripts/validator-registry/DeployValidatorRegistryV1.s.sol +++ b/contracts/scripts/validator-registry/DeployValidatorRegistryV1.s.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity ^0.8.20; +pragma solidity 0.8.20; import "forge-std/Script.sol"; import {Upgrades} from "openzeppelin-foundry-upgrades/Upgrades.sol"; diff --git a/contracts/test/BidderRegistryTest.sol b/contracts/test/BidderRegistryTest.sol index bce8f2b00..0f6d0ef61 100644 --- a/contracts/test/BidderRegistryTest.sol +++ b/contracts/test/BidderRegistryTest.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity ^0.8.20; +pragma solidity 0.8.20; import "forge-std/Test.sol"; import {BidderRegistry} from "../contracts/BidderRegistry.sol"; diff --git a/contracts/test/OracleTest.sol b/contracts/test/OracleTest.sol index 21529cfdb..ed8d33a10 100644 --- a/contracts/test/OracleTest.sol +++ b/contracts/test/OracleTest.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity ^0.8.20; +pragma solidity 0.8.20; import "forge-std/Test.sol"; import "../contracts/Oracle.sol"; diff --git a/contracts/test/PreConfirmationConfTest.sol b/contracts/test/PreConfirmationConfTest.sol index 84e613c82..f9ccc2cd0 100644 --- a/contracts/test/PreConfirmationConfTest.sol +++ b/contracts/test/PreConfirmationConfTest.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity ^0.8.20; +pragma solidity 0.8.20; import "forge-std/Test.sol"; diff --git a/contracts/test/ProviderRegistryTest.sol b/contracts/test/ProviderRegistryTest.sol index b342edc67..e3281f3a2 100644 --- a/contracts/test/ProviderRegistryTest.sol +++ b/contracts/test/ProviderRegistryTest.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity ^0.8.20; +pragma solidity 0.8.20; import "forge-std/Test.sol"; import {ProviderRegistry} from "../contracts/ProviderRegistry.sol"; diff --git a/contracts/test/WhitelistTest.sol b/contracts/test/WhitelistTest.sol index 839789788..f923c13f2 100644 --- a/contracts/test/WhitelistTest.sol +++ b/contracts/test/WhitelistTest.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity ^0.8.20; +pragma solidity 0.8.20; import "forge-std/Test.sol"; import "../contracts/Whitelist.sol"; diff --git a/contracts/test/standard-bridge/L1GatewayTest.sol b/contracts/test/standard-bridge/L1GatewayTest.sol index b5a6e968b..0a138c9bd 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.20; import "forge-std/Test.sol"; import "../../contracts/standard-bridge/L1Gateway.sol"; diff --git a/contracts/test/standard-bridge/SettlementGatewayTest.sol b/contracts/test/standard-bridge/SettlementGatewayTest.sol index 2efb8c9ed..71822d1fb 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.20; import "forge-std/Test.sol"; import "../../contracts/standard-bridge/SettlementGateway.sol"; diff --git a/contracts/test/utils/EnumerableMapTest.sol b/contracts/test/utils/EnumerableMapTest.sol index de5271a39..8c6345f84 100644 --- a/contracts/test/utils/EnumerableMapTest.sol +++ b/contracts/test/utils/EnumerableMapTest.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity ^0.8.20; +pragma solidity 0.8.20; import "forge-std/Test.sol"; import "../../contracts/utils/EnumerableMap.sol"; diff --git a/contracts/test/utils/EnumerableSetTest.sol b/contracts/test/utils/EnumerableSetTest.sol index 61df20ea3..cf27e583a 100644 --- a/contracts/test/utils/EnumerableSetTest.sol +++ b/contracts/test/utils/EnumerableSetTest.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity ^0.8.20; +pragma solidity 0.8.20; import "forge-std/Test.sol"; import "../../contracts/utils/EnumerableSet.sol"; diff --git a/contracts/test/validator-registry/ValidatorRegistryV1Test.sol b/contracts/test/validator-registry/ValidatorRegistryV1Test.sol index 47f73fcdb..0001c64a5 100644 --- a/contracts/test/validator-registry/ValidatorRegistryV1Test.sol +++ b/contracts/test/validator-registry/ValidatorRegistryV1Test.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSL 1.1 -pragma solidity ^0.8.20; +pragma solidity 0.8.20; import "forge-std/Test.sol"; import "../../contracts/validator-registry/ValidatorRegistryV1.sol"; diff --git a/contracts/test/validator-registry/avs/AVSDirectoryMock.sol b/contracts/test/validator-registry/avs/AVSDirectoryMock.sol index 950fefb7f..28967fef4 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.20; 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 8275200e5..c3be8499a 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.20; 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 f41c23f21..da8a37a59 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.20; import "forge-std/Test.sol"; import "../../../contracts/validator-registry/avs/MevCommitAVS.sol";