Merge branch 'dev' of https://github.com/Layr-Labs/eigenlayer-middleware

into m2-mainnet
Layr-Labs · Apr 8, 2024 · 74efe8e · 74efe8e
2 parents a2b1847 + fb313de
commit 74efe8e
Show file tree

Hide file tree

Showing 66 changed files with 93 additions and 87 deletions.
diff --git a/foundry.toml b/foundry.toml
@@ -7,8 +7,14 @@ fs_permissions = [{ access = "read-write", path = "./" }]
 ffi = true
 no-match-contract = "FFI"
 
+# Enables or disables the optimizer
+optimizer = true
 # The number of optimizer runs
 optimizer_runs = 200
+# Whether or not to use the Yul intermediate representation compilation pipeline
+via_ir = false
+# Override the Solidity version (this overrides `auto_detect_solc`)
+solc_version = '0.8.12'
 
 [fmt]
 bracket_spacing = false

diff --git a/lib/eigenlayer-contracts b/lib/eigenlayer-contracts
diff --git a/script/ServiceManagerRouterDeploy.s.sol b/script/ServiceManagerRouterDeploy.s.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity =0.8.12;
+pragma solidity ^0.8.12;
 
 import {ServiceManagerRouter} from "../src/ServiceManagerRouter.sol";
 import "forge-std/Script.sol";
@@ -12,4 +12,4 @@ contract ServiceManagerRouterDeploy is Script {
 
         vm.stopBroadcast();
     }
-}
+}
diff --git a/src/BLSApkRegistry.sol b/src/BLSApkRegistry.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity =0.8.12;
+pragma solidity ^0.8.12;
 
 import {BLSApkRegistryStorage} from "./BLSApkRegistryStorage.sol";
 

diff --git a/src/BLSApkRegistryStorage.sol b/src/BLSApkRegistryStorage.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity =0.8.12;
+pragma solidity ^0.8.12;
 
 import {IBLSApkRegistry} from "./interfaces/IBLSApkRegistry.sol";
 import {IRegistryCoordinator} from "./interfaces/IRegistryCoordinator.sol";

diff --git a/src/BLSSignatureChecker.sol b/src/BLSSignatureChecker.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity =0.8.12;
+pragma solidity ^0.8.12;
 
 import {IBLSSignatureChecker} from "./interfaces/IBLSSignatureChecker.sol";
 import {IRegistryCoordinator} from "./interfaces/IRegistryCoordinator.sol";

diff --git a/src/IndexRegistry.sol b/src/IndexRegistry.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity =0.8.12;
+pragma solidity ^0.8.12;
 
 import {IndexRegistryStorage} from "./IndexRegistryStorage.sol";
 import {IRegistryCoordinator} from "./interfaces/IRegistryCoordinator.sol";

diff --git a/src/IndexRegistryStorage.sol b/src/IndexRegistryStorage.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity =0.8.12;
+pragma solidity ^0.8.12;
 
 import {Initializable} from "@openzeppelin-upgrades/contracts/proxy/utils/Initializable.sol";
 

diff --git a/src/OperatorStateRetriever.sol b/src/OperatorStateRetriever.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity =0.8.12;
+pragma solidity ^0.8.12;
 
 import {IRegistryCoordinator} from "./interfaces/IRegistryCoordinator.sol";
 import {IBLSApkRegistry} from "./interfaces/IBLSApkRegistry.sol";

diff --git a/src/RegistryCoordinator.sol b/src/RegistryCoordinator.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity =0.8.12;
+pragma solidity ^0.8.12;
 
 import {IPauserRegistry} from "eigenlayer-contracts/src/contracts/interfaces/IPauserRegistry.sol";
 import {ISignatureUtils} from "eigenlayer-contracts/src/contracts/interfaces/ISignatureUtils.sol";

diff --git a/src/RegistryCoordinatorStorage.sol b/src/RegistryCoordinatorStorage.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity =0.8.12;
+pragma solidity ^0.8.12;
 
 import {IBLSApkRegistry} from "./interfaces/IBLSApkRegistry.sol";
 import {IStakeRegistry} from "./interfaces/IStakeRegistry.sol";
@@ -79,4 +79,4 @@ abstract contract RegistryCoordinatorStorage is IRegistryCoordinator {
     // storage gap for upgradeability
     // slither-disable-next-line shadowing-state
     uint256[41] private __GAP;
-}
+}
diff --git a/src/ServiceManagerBase.sol b/src/ServiceManagerBase.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity =0.8.12;
+pragma solidity ^0.8.12;
 
 import {OwnableUpgradeable} from "@openzeppelin-upgrades/contracts/access/OwnableUpgradeable.sol";
 

diff --git a/src/ServiceManagerRouter.sol b/src/ServiceManagerRouter.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity =0.8.12;
+pragma solidity ^0.8.12;
 
 import {IServiceManager} from "./interfaces/IServiceManager.sol";
 
@@ -53,4 +53,4 @@ contract ServiceManagerRouter {
             return failedCall;
         }
     }
-}
+}
diff --git a/src/StakeRegistry.sol b/src/StakeRegistry.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity =0.8.12;
+pragma solidity ^0.8.12;
 
 import {IDelegationManager} from "eigenlayer-contracts/src/contracts/interfaces/IDelegationManager.sol";
 

diff --git a/src/StakeRegistryStorage.sol b/src/StakeRegistryStorage.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity =0.8.12;
+pragma solidity ^0.8.12;
 
 import {IDelegationManager} from "eigenlayer-contracts/src/contracts/interfaces/IDelegationManager.sol";
 import {IStrategyManager, IStrategy} from "eigenlayer-contracts/src/contracts/interfaces/IStrategyManager.sol";

diff --git a/src/interfaces/IBLSApkRegistry.sol b/src/interfaces/IBLSApkRegistry.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity =0.8.12;
+pragma solidity ^0.8.12;
 
 import {IRegistry} from "./IRegistry.sol";
 

diff --git a/src/interfaces/IBLSSignatureChecker.sol b/src/interfaces/IBLSSignatureChecker.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity =0.8.12;
+pragma solidity ^0.8.12;
 
 import {IRegistryCoordinator} from "./IRegistryCoordinator.sol";
 import {IBLSApkRegistry} from "./IBLSApkRegistry.sol";

diff --git a/src/interfaces/IIndexRegistry.sol b/src/interfaces/IIndexRegistry.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity =0.8.12;
+pragma solidity ^0.8.12;
 
 import {IRegistry} from "./IRegistry.sol";
 
@@ -87,4 +87,4 @@ interface IIndexRegistry is IRegistry {
 
     /// @notice Returns an ordered list of operators of the services for the given `quorumNumber` at the given `blockNumber`
     function getOperatorListAtBlockNumber(uint8 quorumNumber, uint32 blockNumber) external view returns (bytes32[] memory);
-}
+}
diff --git a/src/interfaces/IRegistryCoordinator.sol b/src/interfaces/IRegistryCoordinator.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity =0.8.12;
+pragma solidity ^0.8.12;
 
 import {IBLSApkRegistry} from "./IBLSApkRegistry.sol";
 import {IStakeRegistry} from "./IStakeRegistry.sol";

diff --git a/src/interfaces/ISocketUpdater.sol b/src/interfaces/ISocketUpdater.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity =0.8.12;
+pragma solidity ^0.8.12;
 
 /**
  * @title Interface for an `ISocketUpdater` where operators can update their sockets.

diff --git a/src/interfaces/IStakeRegistry.sol b/src/interfaces/IStakeRegistry.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity =0.8.12;
+pragma solidity ^0.8.12;
 
 import {IDelegationManager} from "eigenlayer-contracts/src/contracts/interfaces/IDelegationManager.sol";
 import {IStrategy} from "eigenlayer-contracts/src/contracts/interfaces/IStrategy.sol";
@@ -245,4 +245,4 @@ interface IStakeRegistry is IRegistry {
         bytes32 operatorId, 
         bytes calldata quorumNumbers
     ) external returns (uint192);
-}
+}
diff --git a/src/libraries/BN254.sol b/src/libraries/BN254.sol
@@ -19,7 +19,7 @@
 
 // The remainder of the code in this library is written by LayrLabs Inc. and is also under an MIT license
 
-pragma solidity =0.8.12;
+pragma solidity ^0.8.12;
 
 /**
  * @title Library for operations on the BN254 elliptic curve.

diff --git a/src/libraries/BitmapUtils.sol b/src/libraries/BitmapUtils.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity =0.8.12;
+pragma solidity ^0.8.12;
 
 /**
  * @title Library for Bitmap utilities such as converting between an array of bytes and a bitmap and finding the number of 1s in a bitmap.
@@ -196,4 +196,4 @@ library BitmapUtils {
     function minus(uint256 a, uint256 b) internal pure returns (uint256) {
         return a & ~b;
     }
-}
+}
diff --git a/test/events/IBLSApkRegistryEvents.sol b/test/events/IBLSApkRegistryEvents.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity =0.8.12;
+pragma solidity ^0.8.12;
 
 import {BN254} from "../../src/libraries/BN254.sol";
 

diff --git a/test/events/IIndexRegistryEvents.sol b/test/events/IIndexRegistryEvents.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity =0.8.12;
+pragma solidity ^0.8.12;
 
 interface IIndexRegistryEvents {
     // emitted when an operator's index in the ordered operator list for the quorum with number `quorumNumber` is updated

diff --git a/test/events/IStakeRegistryEvents.sol b/test/events/IStakeRegistryEvents.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity =0.8.12;
+pragma solidity ^0.8.12;
 
 import {IStakeRegistry, IStrategy} from "src/interfaces/IStakeRegistry.sol";
 
@@ -20,4 +20,4 @@ interface IStakeRegistryEvents {
     event StrategyRemovedFromQuorum(uint8 indexed quorumNumber, IStrategy strategy);
     /// @notice emitted when `strategy` has its `multiplier` updated in the array at `strategyParams[quorumNumber]`
     event StrategyMultiplierUpdated(uint8 indexed quorumNumber, IStrategy strategy, uint256 multiplier);
-}
+}
diff --git a/test/ffi/BLSPubKeyCompendiumFFI.t.sol b/test/ffi/BLSPubKeyCompendiumFFI.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity =0.8.12;
+pragma solidity ^0.8.12;
 
 import "../../src/BLSApkRegistry.sol";
 import "../ffi/util/G2Operations.sol";

diff --git a/test/ffi/BLSSignatureCheckerFFI.t.sol b/test/ffi/BLSSignatureCheckerFFI.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity =0.8.12;
+pragma solidity ^0.8.12;
 
 import {G2Operations} from "../ffi/util/G2Operations.sol";
 import {MockAVSDeployer} from "../utils/MockAVSDeployer.sol";

diff --git a/test/ffi/UpdateOperators.t.sol b/test/ffi/UpdateOperators.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity =0.8.12;
+pragma solidity ^0.8.12;
 
 import "test/integration/User.t.sol";
 
@@ -159,4 +159,4 @@ contract Integration_AVS_Sync_GasCosts_FFI is IntegrationChecks {
         }
         return arr;
     }
-}
+}
diff --git a/test/ffi/util/G2Operations.sol b/test/ffi/util/G2Operations.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity =0.8.12;
+pragma solidity ^0.8.12;
 
 import "forge-std/Test.sol";
 import "openzeppelin-contracts/contracts/utils/Strings.sol";

diff --git a/test/harnesses/BLSApkRegistryHarness.sol b/test/harnesses/BLSApkRegistryHarness.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity =0.8.12;
+pragma solidity ^0.8.12;
 
 import "../../src/BLSApkRegistry.sol";
 

diff --git a/test/harnesses/BitmapUtilsWrapper.sol b/test/harnesses/BitmapUtilsWrapper.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity =0.8.12;
+pragma solidity ^0.8.12;
 
 import "../../src/libraries/BitmapUtils.sol";
 

diff --git a/test/harnesses/RegistryCoordinatorHarness.t.sol b/test/harnesses/RegistryCoordinatorHarness.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity =0.8.12;
+pragma solidity ^0.8.12;
 
 import "../../src/RegistryCoordinator.sol";
 

diff --git a/test/harnesses/StakeRegistryHarness.sol b/test/harnesses/StakeRegistryHarness.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity =0.8.12;
+pragma solidity ^0.8.12;
 
 import "../../src/StakeRegistry.sol";
 

diff --git a/test/integration/CoreRegistration.t.sol b/test/integration/CoreRegistration.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity =0.8.12;
+pragma solidity ^0.8.12;
 
 import "../utils/MockAVSDeployer.sol";
 import { AVSDirectory } from "eigenlayer-contracts/src/contracts/core/AVSDirectory.sol";

diff --git a/test/integration/IntegrationBase.t.sol b/test/integration/IntegrationBase.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity =0.8.12;
+pragma solidity ^0.8.12;
 
 import "forge-std/Test.sol";
 
@@ -917,4 +917,4 @@ abstract contract IntegrationBase is IntegrationConfig {
     function _getPrevOperatorLists(bytes memory quorums) internal timewarp() returns (bytes32[][] memory) {
         return _getOperatorLists(quorums);
     }
-}
+}
diff --git a/test/integration/IntegrationChecks.t.sol b/test/integration/IntegrationChecks.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity =0.8.12;
+pragma solidity ^0.8.12;
 
 import "test/integration/IntegrationBase.t.sol";
 import "test/integration/User.t.sol";
@@ -418,4 +418,4 @@ contract IntegrationChecks is IntegrationBase {
     function _log(string memory s, User user) internal {
         emit log(string.concat("- ", s, "(", user.NAME(), ")"));
     }
-}
+}
diff --git a/test/integration/IntegrationConfig.t.sol b/test/integration/IntegrationConfig.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity =0.8.12;
+pragma solidity ^0.8.12;
 
 import "forge-std/Test.sol";
 
@@ -569,4 +569,4 @@ contract IntegrationConfig is IntegrationDeployer, G2Operations, Constants {
         }
         return bytesArray;
     }
-}
+}
diff --git a/test/integration/IntegrationDeployer.t.sol b/test/integration/IntegrationDeployer.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity =0.8.12;
+pragma solidity ^0.8.12;
 
 import "forge-std/Test.sol";
 

diff --git a/test/integration/TimeMachine.t.sol b/test/integration/TimeMachine.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity =0.8.12;
+pragma solidity ^0.8.12;
 
 import "forge-std/Test.sol";
 
@@ -30,4 +30,4 @@ contract TimeMachine is Test {
     function warpToPresent(uint curState) public {
         cheats.revertTo(curState);
     }
-}
+}
diff --git a/test/integration/User.t.sol b/test/integration/User.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity =0.8.12;
+pragma solidity ^0.8.12;
 
 import "forge-std/Test.sol";
 import "@openzeppelin/contracts/utils/Strings.sol";
@@ -402,4 +402,4 @@ contract User_AltMethods is User {
 
         registryCoordinator.updateOperatorsForQuorum(operatorsPerQuorum, allQuorums);        
     }
-}
+}
diff --git a/test/integration/mocks/BeaconChainOracleMock.t.sol b/test/integration/mocks/BeaconChainOracleMock.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity =0.8.12;
+pragma solidity ^0.8.12;
 
 import "eigenlayer-contracts/src/contracts/interfaces/IBeaconChainOracle.sol";
 
@@ -17,4 +17,4 @@ contract BeaconChainOracleMock is IBeaconChainOracle {
     function setBlockRoot(uint64 timestamp, bytes32 blockRoot) public {
         blockRoots[timestamp] = blockRoot;
     }
-}
+}