feat: merge slashing branch from upstream

Author: avilagaston9

.github/workflows/tests.yml

@@ -13,9 +13,6 @@ on:
       - dev
   pull_request:
 
-env:
-  FOUNDRY_PROFILE: ci
-
 jobs:
   check:
     strategy:

README.md

@@ -15,6 +15,7 @@ EigenLayer is a set of smart contracts deployed on Ethereum that enable restakin
 ## Branching
 
 The main branches we use are:
+
 * [`dev (default)`](https://github.com/Layr-Labs/eigenlayer-middleware/tree/dev): The most up-to-date branch, containing the work-in-progress code for upcoming releases
 * [`testnet-holesky`](https://github.com/Layr-Labs/eigenlayer-middleware/tree/testnet-holesky): Our current testnet deployment
 * [`mainnet`](https://github.com/Layr-Labs/eigenlayer-middleware/tree/mainnet): Our current mainnet deployment
@@ -24,6 +25,7 @@ The main branches we use are:
 ### Basics
 
 To get a basic understanding of EigenLayer, check out [You Could've Invented EigenLayer](https://www.blog.eigenlayer.xyz/ycie/). Note that some of the document's content describes features that do not exist yet (like the Slasher). To understand more about how restakers and operators interact with EigenLayer, check out these guides:
+
 * [Restaking User Guide](https://docs.eigenlayer.xyz/restaking-guides/restaking-user-guide)
 * [Operator Guide](https://docs.eigenlayer.xyz/operator-guides/operator-introduction)
 
@@ -32,10 +34,25 @@ Most of this content is intro-level and describes user interactions with the Eig
 ### Deep Dive
 
 For shadowy super-coders:
+
 * The most up-to-date technical documentation can be found in [/docs](/docs).
 * To get an idea of how users interact with these contracts, check out the integration tests: [/test/integration](./test/integration)
 * To explore the EigenLayer core contracts, check out the core repo technical docs [here][core-docs-dev].
 
+### Note On Slashing
+
+The middleware contracts are available for testnet integration and experimentation. As with the rest of the testnet code, these contracts have not yet been fully audited. Internal security reviews are in progress, and we're preparing to engage external auditors. We're providing these now so AVSs can begin testing slashing conditions, Operator Sets, and related functionality, and so Operators can simulate slashing and test allocations. For more details, see [ELIP-002](https://github.com/eigenfoundation/ELIPs/blob/main/ELIPs/ELIP-002.md).
+
+For Operators:
+
+We provide scripts to deploy a mock service manager and allocate some stake to a mock Operator Set in [these scripts](https://github.com/Layr-Labs/eigenlayer-middleware/pull/335).
+We've reduced various safety delays on testnet to better simulate operational flows. Additional information on these delays is in [ELIP-002](https://github.com/eigenfoundation/ELIPs/blob/main/ELIPs/ELIP-002.md).
+For AVSs:
+
+We provide a migration path for existing M2 environments (LINK). While this requires understanding the provided script, the Developer Experience will improve before Mainnet launch. Note that this is a gradual migration process to new Operator Sets, not a direct upgrade of existing Operator Sets.
+We also provide scripts to spin up new service managers from scratch.
+In all cases, you’ll need to register existing Operators or spin up new Operators and allocate funds to them. These testing flows will improve as we refine the scripts and contracts. Stay tuned for updates, and feel free to reach out with any questions.
+
 ## Building and Running Tests
 
 This repository uses Foundry. See the [Foundry docs](https://book.getfoundry.sh/) for more info on installation and usage. If you already have foundry, you can build this project and run tests with these commands:
@@ -80,4 +97,3 @@ The current testnet deployment is on holesky, is from our M2 beta release. You c
 [`ServiceManagerRouter`](https://github.com/Layr-Labs/eigenlayer-middleware/blob/testnet-holesky/src/ServiceManagerRouter.sol) | - | [`0x4463...5a37`](https://holesky.etherscan.io/address/0x44632dfBdCb6D3E21EF613B0ca8A6A0c618F5a37#code) | |
 [`ProxyAdmin`](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v4.7.1/contracts/proxy/transparent/ProxyAdmin.sol) | - | [`0xB043...5c15`](https://holesky.etherscan.io/address/0xB043055dd967A382577c2f5261fA6428f2905c15) | |
 [`eigenda/EigenDAServiceManager`](https://github.com/Layr-Labs/eigenda/blob/a33b41561cc3fb4cd6d50a8738e4c5dca43ec0a5/contracts/src/core/EigenDAServiceManager.sol) | [`0xD4A7E1Bd8015057293f0D0A557088c286942e84b`](https://holesky.etherscan.io/address/0xD4A7E1Bd8015057293f0D0A557088c286942e84b) | [`0xa722...67f3`](https://holesky.etherscan.io/address/0xa7227485e6C693AC4566fe168C5E3647c5c267f3) | Proxy: [`[email protected]`](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v4.7.1/contracts/proxy/transparent/TransparentUpgradeableProxy.sol) |
-

foundry.toml

@@ -3,18 +3,23 @@ src = "src"
 out = "out"
 libs = ["lib"]
 fs_permissions = [{ access = "read-write", path = "./" }]
+gas_limit = 5000000000
 
 ffi = true
 no-match-contract = "FFI"
 
 # Enables or disables the optimizer
 optimizer = true
-# The number of optimizer runs
+# Sets 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'
+solc_version = '0.8.27'
+
+[etherscan]
+mainnet = { key = "${ETHERSCAN_API_KEY}" }
+holesky = { key = "${ETHERSCAN_API_KEY}" }
 
 [fmt]
 bracket_spacing = false

lib/eigenlayer-contracts

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity ^0.8.12;
+pragma solidity ^0.8.27;
 
 import {ServiceManagerRouter} from "../src/ServiceManagerRouter.sol";
 import "forge-std/Script.sol";

lib/forge-std

@@ -0,0 +1,52 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+// Deploy L2AVS proxy
+
+import {TransparentUpgradeableProxy} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
+import {ProxyAdmin} from "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
+
+import {Vm} from "forge-std/Vm.sol";
+import {stdJson} from "forge-std/StdJson.sol";
+
+library OperatorSetUpgradeLib {
+    using stdJson for string;
+
+    // address(uint160(uint256(keccak256("hevm cheat code")))) == 0x7109709ECfa91a80626fF3989D68f67F5b1DD12D
+    // solhint-disable-next-line const-name-snakecase
+    Vm private constant vm = Vm(0x7109709ECfa91a80626fF3989D68f67F5b1DD12D);
+
+    /**
+     * @dev Storage slot with the address of the current implementation.
+     * This is the keccak-256 hash of "eip1967.proxy.implementation" subtracted by 1.
+     */
+    bytes32 internal constant IMPLEMENTATION_SLOT =
+        0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc;
+
+    /**
+     * @dev Storage slot with the admin of the contract.
+     * This is the keccak-256 hash of "eip1967.proxy.admin" subtracted by 1.
+     */
+    bytes32 internal constant ADMIN_SLOT =
+     0xb53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103;
+
+
+    function upgrade(address proxy, address implementation, bytes memory data) internal {
+        ProxyAdmin admin = ProxyAdmin(getAdmin(proxy));
+        admin.upgradeAndCall(TransparentUpgradeableProxy(payable(proxy)), implementation, data);
+    }
+
+    function upgrade(address proxy, address implementation) internal {
+        ProxyAdmin admin = ProxyAdmin(getAdmin(proxy));
+        admin.upgrade(TransparentUpgradeableProxy(payable(proxy)), implementation);
+    }
+
+    function getAdmin(address proxy) internal view returns (address) {
+        bytes32 value = vm.load(proxy, ADMIN_SLOT);
+        return address(uint160(uint256(value)));
+    }
+
+    function getImplementation(address proxy) internal view returns (address) {
+        bytes32 value = vm.load(proxy, IMPLEMENTATION_SLOT);
+        return address(uint160(uint256(value)));
+    }
+}

script/ServiceManagerRouterDeploy.s.sol

@@ -0,0 +1,23 @@
+{
+    "addresses":{
+    "avsDirectory": "0x141d6995556135D4997b2ff72EB443Be300353bC",
+    "avsDirectoryImplementation": "0x357978adC03375BD6a3605DE055fABb84695d79A",
+    "baseStrategyImplementation": "0x62450517EfA1CE60d79801daf8f95973865e8D40",
+    "beaconOracle": "0x4C116BB629bff7A8373c2378bBd919f8349B8f25",
+    "delayedWithdrawalRouter": "0xC4BC46a87A67a531eCF7f74338E1FA79533334Fa",
+    "delayedWithdrawalRouterImplementation": "0x0011FA2c512063C495f77296Af8d195F33A8Dd38",
+    "delegationManager": "0x75dfE5B44C2E530568001400D3f704bC8AE350CC",
+    "delegationManagerImplementation": "0x56E88cb4f0136fC27D95499dE4BE2acf47946Fa1",
+    "eigenLayerPauserReg": "0x9Ab2FEAf0465f0eD51Fc2b663eF228B418c9Dad1",
+    "eigenLayerProxyAdmin": "0x1BEF05C7303d44e0E2FCD2A19d993eDEd4c51b5B",
+    "eigenPodBeacon": "0x92Cc4a800A1513E85C481dDDf3A06C6921211eaC",
+    "eigenPodImplementation": "0x2D6c7f9862BD80Cf0d9d93FC6b513D69E7Db7869",
+    "eigenPodManager": "0xB8d8952f572e67B11e43bC21250967772fa883Ff",
+    "eigenPodManagerImplementation": "0xc5B857A92245f64e9D90cCc5b096Db82eB77eB5c",
+    "emptyContract": "0x9690d52B1Ce155DB2ec5eCbF5a262ccCc7B3A6D2",
+    "rewardsCoordinator": "0xb22Ef643e1E067c994019A4C19e403253C05c2B0",
+    "rewardsCoordinatorImplementation": "0x76d4D84c90a2AFf213F7D859d2a288685A1a2Ede",
+    "slasher": "0x12699471dF8dca329C76D72823B1b79d55709384",
+    "slasherImplementation": "0x9460fCe11E1e0365419fa860599903B4E5097cf0"
+    }
+}

script/utils/OperatorSetUpgradeLib.sol

@@ -0,0 +1,18 @@
+{
+    "addresses":{
+      "blsApkRegistry": "0xAd7f9e558170a149Ca8E90f41Ab2444A5d3bd6aD",
+      "blsApkRegistryImplementation": "0x482a96D5879e32347d8df125f038D7eC8Ab358dd",
+      "eigenDAProxyAdmin": "0x9Fd7E279f5bD692Dc04792151E14Ad814FC60eC1",
+      "eigenDAServiceManager": "0x54A03db2784E3D0aCC08344D05385d0b62d4F432",
+      "eigenDAServiceManagerImplementation": "0xEB11a0f320E39d3371Fec4Bf5C76944DfBA8ee10",
+      "indexRegistry": "0x8cE5F2a53cBd29710eb94A04e40C07A4DdF15d10",
+      "indexRegistryImplementation": "0x1D4d6054BD11A5711ad7c5d3E376C987a603e17C",
+      "mockRollup": "0x0433646AdCeE95fbF89b3BFDb8157e75c19b6C2e",
+      "operatorStateRetriever": "0x17cA8C41a59466710443143b2ECF08CaA35d80ad",
+      "registryCoordinator": "0x2c61EA360D6500b58E7f481541A36B443Bc858c6",
+      "registryCoordinatorImplementation": "0x6f21A84E7f185cCBA248B436e3b583E609d1dE1D",
+      "serviceManagerRouter": "0xDb028E067fe81e9f406C2DE382Ba82e9cD7cBD03",
+      "stakeRegistry": "0x53668EBf2e28180e38B122c641BC51Ca81088871",
+      "stakeRegistryImplementation": "0x854dc9e5d011B060bf77B1a492302C349f2f00b5"
+    }
+}

script/utils/testdata/17000/core_testdata.json

@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: BUSL-1.1
+pragma solidity ^0.8.27;
+
+import {IAVSRegistrar} from "eigenlayer-contracts/src/contracts/interfaces/IAVSRegistrar.sol";
+import {IRegistryCoordinator} from "./interfaces/IRegistryCoordinator.sol";
+import {IBLSApkRegistry} from "./interfaces/IBLSApkRegistry.sol";
+import {IStakeRegistry} from "./interfaces/IStakeRegistry.sol";
+import {IIndexRegistry} from "./interfaces/IIndexRegistry.sol";
+
+abstract contract AVSRegistrar is IAVSRegistrar {
+    function registerOperator(
+        address operator,
+        uint32[] calldata operatorSetIds,
+        bytes calldata data
+    ) external virtual;
+
+    function deregisterOperator(
+        address operator,
+        uint32[] calldata operatorSetIds
+    ) external virtual;
+}

script/utils/testdata/17000/middlware_testdata.json

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity ^0.8.12;
+pragma solidity ^0.8.27;
 
 import {BLSApkRegistryStorage} from "./BLSApkRegistryStorage.sol";
 
@@ -12,10 +12,7 @@ contract BLSApkRegistry is BLSApkRegistryStorage {
 
     /// @notice when applied to a function, only allows the RegistryCoordinator to call it
     modifier onlyRegistryCoordinator() {
-        require(
-            msg.sender == address(registryCoordinator),
-            "BLSApkRegistry.onlyRegistryCoordinator: caller is not the registry coordinator"
-        );
+        _checkRegistryCoordinator();
         _;
     }
 
@@ -117,17 +114,17 @@ contract BLSApkRegistry is BLSApkRegistryStorage {
 
         // gamma = h(sigma, P, P', H(m))
         uint256 gamma = uint256(keccak256(abi.encodePacked(
-            params.pubkeyRegistrationSignature.X, 
-            params.pubkeyRegistrationSignature.Y, 
-            params.pubkeyG1.X, 
-            params.pubkeyG1.Y, 
-            params.pubkeyG2.X, 
-            params.pubkeyG2.Y, 
-            pubkeyRegistrationMessageHash.X, 
+            params.pubkeyRegistrationSignature.X,
+            params.pubkeyRegistrationSignature.Y,
+            params.pubkeyG1.X,
+            params.pubkeyG1.Y,
+            params.pubkeyG2.X,
+            params.pubkeyG2.Y,
+            pubkeyRegistrationMessageHash.X,
             pubkeyRegistrationMessageHash.Y
         ))) % BN254.FR_MODULUS;
-        
-        // e(sigma + P * gamma, [-1]_2) = e(H(m) + [1]_1 * gamma, P') 
+
+        // e(sigma + P * gamma, [-1]_2) = e(H(m) + [1]_1 * gamma, P')
         require(BN254.pairing(
             params.pubkeyRegistrationSignature.plus(params.pubkeyG1.scalar_mul(gamma)),
             BN254.negGeneratorG2(),
@@ -192,7 +189,7 @@ contract BLSApkRegistry is BLSApkRegistryStorage {
             pubkeyHash != bytes32(0),
             "BLSApkRegistry.getRegisteredPubkey: operator is not registered"
         );
-        
+
         return (pubkey, pubkeyHash);
     }
 
@@ -205,10 +202,10 @@ contract BLSApkRegistry is BLSApkRegistryStorage {
         uint256 blockNumber
     ) external view returns (uint32[] memory) {
         uint32[] memory indices = new uint32[](quorumNumbers.length);
-        
+
         for (uint256 i = 0; i < quorumNumbers.length; i++) {
             uint8 quorumNumber = uint8(quorumNumbers[i]);
-            
+
             uint256 quorumApkUpdatesLength = apkHistory[quorumNumber].length;
             if (quorumApkUpdatesLength == 0 || blockNumber < apkHistory[quorumNumber][0].updateBlockNumber) {
                 revert("BLSApkRegistry.getApkIndicesAtBlockNumber: blockNumber is before the first update");
@@ -256,11 +253,11 @@ contract BLSApkRegistry is BLSApkRegistryStorage {
          */
         require(
             blockNumber >= quorumApkUpdate.updateBlockNumber,
-            "BLSApkRegistry._validateApkHashAtBlockNumber: index too recent"
+            "BLSApkRegistry.getApkHashAtBlockNumberAndIndex: index too recent"
         );
         require(
             quorumApkUpdate.nextUpdateBlockNumber == 0 || blockNumber < quorumApkUpdate.nextUpdateBlockNumber,
-            "BLSApkRegistry._validateApkHashAtBlockNumber: not latest apk update"
+            "BLSApkRegistry.getApkHashAtBlockNumberAndIndex: not latest apk update"
         );
 
         return quorumApkUpdate.apkHash;
@@ -281,4 +278,11 @@ contract BLSApkRegistry is BLSApkRegistryStorage {
     function getOperatorId(address operator) public view returns (bytes32) {
         return operatorToPubkeyHash[operator];
     }
+
+    function _checkRegistryCoordinator() internal view {
+        require(
+            msg.sender == address(registryCoordinator),
+            "BLSApkRegistry._checkRegistryCoordinator: caller is not the registry coordinator"
+        );
+    }
 }

src/AVSRegistrar.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity ^0.8.12;
+pragma solidity ^0.8.27;
 
 import {IBLSApkRegistry} from "./interfaces/IBLSApkRegistry.sol";
 import {IRegistryCoordinator} from "./interfaces/IRegistryCoordinator.sol";

src/BLSApkRegistry.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity ^0.8.12;
+pragma solidity ^0.8.27;
 
 import {IBLSSignatureChecker} from "./interfaces/IBLSSignatureChecker.sol";
 import {IRegistryCoordinator} from "./interfaces/IRegistryCoordinator.sol";