m2-mainnet Contracts Update

contracts/foundry.toml

@@ -4,15 +4,6 @@ out = 'out'
 libs = ['lib']
 fs_permissions = [{ access = "read-write", path = "./"}]
 
-remappings = [
-    "@eigenlayer-middleware/=lib/eigenlayer-middleware/src/",
-    "@eigenlayer-core/=lib/eigenlayer-contracts/src/",
-    "@eigenlayer-scripts/=lib/eigenlayer-contracts/script/",
-    "@openzeppelin/=lib/openzeppelin-contracts/",
-    "@openzeppelin-upgrades/=lib/openzeppelin-contracts-upgradeable/",
-    "forge-std/=lib/forge-std/src/"
-]
-
 gas_reports = ["*"]
 
 # A list of ignored solc error codes

contracts/remappings.txt

@@ -0,0 +1,6 @@
+@openzeppelin-upgrades/=lib/openzeppelin-contracts-upgradeable/
+@openzeppelin/=lib/openzeppelin-contracts/
+eigenlayer-middleware/=lib/eigenlayer-middleware/src/
+eigenlayer-core/=lib/eigenlayer-contracts/src/
+eigenlayer-scripts/=lib/eigenlayer-contracts/script/
+forge-std/=lib/forge-std/src/

contracts/script/EigenDADeployer.s.sol

@@ -1,23 +1,20 @@
-// SPDX-License-Identifier: UNLICENSED
+// SPDX-License-Identifier: UNLICENSED 
+/*
 pragma solidity ^0.8.9;
 
-import "@eigenlayer-scripts/middleware/DeployOpenEigenLayer.s.sol";
-
-import "@eigenlayer-core/contracts/permissions/PauserRegistry.sol";
-import "@eigenlayer-core/test/mocks/EmptyContract.sol";
-
-import "@eigenlayer-middleware/BLSPublicKeyCompendium.sol";
-import "@eigenlayer-middleware/BLSRegistryCoordinatorWithIndices.sol";
-import "@eigenlayer-middleware/BLSPubkeyRegistry.sol";
-import "@eigenlayer-middleware/IndexRegistry.sol";
-import "@eigenlayer-middleware/StakeRegistry.sol";
-import "@eigenlayer-middleware/BLSOperatorStateRetriever.sol";
-
+import "eigenlayer-scripts/middleware/DeployOpenEigenLayer.s.sol";
+import {PauserRegistry} from "eigenlayer-core/contracts/permissions/PauserRegistry.sol";
+import {EmptyContract} from "eigenlayer-core/test/mocks/EmptyContract.sol";
+import {BLSPublicKeyCompendium} from "eigenlayer-middleware/BLSPublicKeyCompendium.sol";
+import {BLSRegistryCoordinatorWithIndices, IBLSRegistryCoordinatorWithIndices} from "eigenlayer-middleware/BLSRegistryCoordinatorWithIndices.sol";
+import {BLSPubkeyRegistry, IBLSPubkeyRegistry} from "eigenlayer-middleware/BLSPubkeyRegistry.sol";
+import {IndexRegistry, IIndexRegistry} from "eigenlayer-middleware/IndexRegistry.sol";
+import {StakeRegistry, IStakeRegistry, IServiceManager} from "eigenlayer-middleware/StakeRegistry.sol";
+import {BLSOperatorStateRetriever} from "eigenlayer-middleware/BLSOperatorStateRetriever.sol";
 import {EigenDAServiceManager} from "../src/core/EigenDAServiceManager.sol";
-import "../src/libraries/EigenDAHasher.sol";
+import {EigenDAHasher} from "../src/libraries/EigenDAHasher.sol";
 
 import "forge-std/Test.sol";
-
 import "forge-std/Script.sol";
 import "forge-std/StdJson.sol";
 
@@ -96,7 +93,7 @@ contract EigenDADeployer is DeployOpenEigenLayer {
         /**
          * First, deploy upgradeable proxy contracts that **will point** to the implementations. Since the implementation contracts are
          * not yet deployed, we give these proxies an empty contract as the initial implementation, to act as if they have no code.
-         */
+         *//*
         eigenDAServiceManager = EigenDAServiceManager(
             address(new TransparentUpgradeableProxy(address(emptyContract), address(eigenDAProxyAdmin), ""))
         );
@@ -218,3 +215,4 @@ contract EigenDADeployer is DeployOpenEigenLayer {
         blsOperatorStateRetriever = new BLSOperatorStateRetriever();
     }
 }
+*/

contracts/script/MockRollupDeployer.s.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.9;
 
 import "forge-std/Script.sol";
-import "../test/mocks/MockRollup.sol";
+import "../src/rollup/MockRollup.sol";
 import {IEigenDAServiceManager} from "../src/interfaces/IEigenDAServiceManager.sol";
 
 contract MockRollupDeployer is Script {

contracts/script/SetUpEigenDA.s.sol

@@ -1,26 +1,22 @@
-// SPDX-License-Identifier: UNLICENSED
+// SPDX-License-Identifier: UNLICENSED 
+/*
 pragma solidity ^0.8.9;
 
-import "@eigenlayer-scripts/middleware/DeployOpenEigenLayer.s.sol";
-
-import "@eigenlayer-core/contracts/permissions/PauserRegistry.sol";
-import "@eigenlayer-core/test/mocks/EmptyContract.sol";
-
-import "@eigenlayer-middleware/BLSPublicKeyCompendium.sol";
-import "@eigenlayer-middleware/BLSRegistryCoordinatorWithIndices.sol";
-import "@eigenlayer-middleware/BLSPubkeyRegistry.sol";
-import "@eigenlayer-middleware/IndexRegistry.sol";
-import "@eigenlayer-middleware/StakeRegistry.sol";
-
-
+import "eigenlayer-scripts/middleware/DeployOpenEigenLayer.s.sol";
+import {PauserRegistry} from "eigenlayer-core/contracts/permissions/PauserRegistry.sol";
+import {EmptyContract} from "eigenlayer-core/test/mocks/EmptyContract.sol";
+import {BLSPublicKeyCompendium} from "eigenlayer-middleware/BLSPublicKeyCompendium.sol";
+import {BLSRegistryCoordinatorWithIndices} from "eigenlayer-middleware/BLSRegistryCoordinatorWithIndices.sol";
+import {BLSPubkeyRegistry} from "eigenlayer-middleware/BLSPubkeyRegistry.sol";
+import {IndexRegistry} from "eigenlayer-middleware/IndexRegistry.sol";
+import {IIndexRegistry} from "eigenlayer-middleware/interfaces/IIndexRegistry.sol";
+import {StakeRegistry} from "eigenlayer-middleware/StakeRegistry.sol";
 import {EigenDAServiceManager} from "../src/core/EigenDAServiceManager.sol";
-import "../src/libraries/EigenDAHasher.sol";
-
-import "./EigenDADeployer.s.sol";
-import "./EigenLayerUtils.s.sol";
+import {EigenDAHasher} from "../src/libraries/EigenDAHasher.sol";
+import {EigenDADeployer} from "./EigenDADeployer.s.sol";
+import {EigenLayerUtils} from "./EigenLayerUtils.s.sol";
 
 import "forge-std/Test.sol";
-
 import "forge-std/Script.sol";
 import "forge-std/StdJson.sol";
 
@@ -189,3 +185,4 @@ contract SetupEigenDA is EigenDADeployer, EigenLayerUtils {
         vm.writeJson(finalJson, "./script/output/eigenda_deploy_output.json");        
     }
 }
+*/

contracts/script/m2/M2_Deploy.s.sol

@@ -1,16 +1,17 @@
 // SPDX-License-Identifier: BUSL-1.1
+/*
 pragma solidity =0.8.12;
 
-import "@eigenlayer-scripts/utils/ExistingDeploymentParser.sol";
+import "eigenlayer-scripts/utils/ExistingDeploymentParser.sol";
 
-import "@eigenlayer-middleware/BLSPublicKeyCompendium.sol";
-import "@eigenlayer-middleware/BLSRegistryCoordinatorWithIndices.sol";
-import "@eigenlayer-middleware/BLSPubkeyRegistry.sol";
-import "@eigenlayer-middleware/IndexRegistry.sol";
-import "@eigenlayer-middleware/StakeRegistry.sol";
-import "@eigenlayer-middleware/BLSOperatorStateRetriever.sol";
+import "eigenlayer-middleware/BLSPublicKeyCompendium.sol";
+import "eigenlayer-middleware/BLSRegistryCoordinatorWithIndices.sol";
+import "eigenlayer-middleware/BLSPubkeyRegistry.sol";
+import "eigenlayer-middleware/IndexRegistry.sol";
+import "eigenlayer-middleware/StakeRegistry.sol";
+import "eigenlayer-middleware/BLSOperatorStateRetriever.sol";
 
-import "@eigenlayer-core/contracts/permissions/PauserRegistry.sol";
+import "eigenlayer-core/contracts/permissions/PauserRegistry.sol";
 
 import {EigenDAServiceManager} from "../../src/core/EigenDAServiceManager.sol";
 
@@ -336,5 +337,5 @@ contract Deployer_M2 is ExistingDeploymentParser {
         string memory finalJson = vm.serializeString(parent_object, permissions, permissions_output);
         vm.writeJson(finalJson, outputPath);
     } 
-
-}
+}
+*/

contracts/src/Imports.sol

@@ -1,5 +1,5 @@
 // Imports used for compiling for bindings for clients
 
-import "@eigenlayer-middleware/BLSOperatorStateRetriever.sol";
-import "@eigenlayer-middleware/BLSPublicKeyCompendium.sol";
-import "@eigenlayer-middleware/BLSRegistryCoordinatorWithIndices.sol";
+import "eigenlayer-middleware/OperatorStateRetriever.sol";
+import "eigenlayer-middleware/BLSApkRegistry.sol";
+import "eigenlayer-middleware/RegistryCoordinator.sol";

contracts/src/core/EigenDAServiceManager.sol

@@ -1,19 +1,23 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity ^0.8.9;
 
-import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import "@openzeppelin-upgrades/contracts/proxy/utils/Initializable.sol";
-import "@openzeppelin-upgrades/contracts/access/OwnableUpgradeable.sol";
+import {OwnableUpgradeable} from "@openzeppelin-upgrades/contracts/access/OwnableUpgradeable.sol";
 
-import "@eigenlayer-core/contracts/interfaces/IDelegationManager.sol";
+import {Pausable} from "eigenlayer-core/contracts/permissions/Pausable.sol";
+import {IDelegationManager} from "eigenlayer-core/contracts/interfaces/IDelegationManager.sol";
+import {IStrategyManager} from "eigenlayer-core/contracts/interfaces/IStrategyManager.sol";
+import {ISlasher} from "eigenlayer-core/contracts/interfaces/ISlasher.sol";
+import {IPauserRegistry} from "eigenlayer-core/contracts/interfaces/IPauserRegistry.sol";
+import {ISignatureUtils} from "eigenlayer-core/contracts/interfaces/ISignatureUtils.sol";
 
-import "@eigenlayer-core/contracts/libraries/BytesLib.sol";
-import "@eigenlayer-core/contracts/libraries/Merkle.sol";
-import "@eigenlayer-core/contracts/permissions/Pausable.sol";
+import {ServiceManagerBase} from "eigenlayer-middleware/ServiceManagerBase.sol";
+import {BLSSignatureChecker} from "eigenlayer-middleware/BLSSignatureChecker.sol";
+import {IRegistryCoordinator} from "eigenlayer-middleware/interfaces/IRegistryCoordinator.sol";
+import {IStakeRegistry} from "eigenlayer-middleware/interfaces/IStakeRegistry.sol";
 
-import "../libraries/EigenDAHasher.sol";
+import {EigenDAServiceManagerStorage} from "./EigenDAServiceManagerStorage.sol";
+import {EigenDAHasher} from "../libraries/EigenDAHasher.sol";
 
-import "./EigenDAServiceManagerStorage.sol";
 
 /**
  * @title Primary entrypoint for procuring services from EigenDA.
@@ -23,54 +27,47 @@ import "./EigenDAServiceManagerStorage.sol";
  * - confirming the data store by the disperser with inferred aggregated signatures of the quorum
  * - freezing operators as the result of various "challenges"
  */
-contract EigenDAServiceManager is Initializable, OwnableUpgradeable, EigenDAServiceManagerStorage, BLSSignatureChecker, Pausable {
-    using BytesLib for bytes;
+contract EigenDAServiceManager is EigenDAServiceManagerStorage, ServiceManagerBase, BLSSignatureChecker, Pausable {
     using EigenDAHasher for BatchHeader;
     using EigenDAHasher for ReducedBatchHeader;
 
     uint8 internal constant PAUSED_CONFIRM_BATCH = 0;
 
-    /**
-     * @notice The EigenLayer delegation contract for this EigenDA which is primarily used by
-     * delegators to delegate their stake to operators who would serve as EigenDA
-     * nodes and so on.
-     * @dev For more details, see DelegationManager.sol.
-     */
-    IDelegationManager public immutable delegationManager;
-
-    IStrategyManager public immutable strategyManager;
-
-    ISlasher public immutable slasher;
+    IStrategyManager public immutable _strategyManager;
+    ISlasher public immutable _slasher;
 
-    /// @notice when applied to a function, ensures that the function is only callable by the `registryCoordinator`.
-    modifier onlyRegistryCoordinator() {
-        require(msg.sender == address(registryCoordinator), "onlyRegistryCoordinator: not from registry coordinator");
+    /// @notice when applied to a function, ensures that the function is only callable by the `batchConfirmer`.
+    modifier onlyBatchConfirmer() {
+        require(msg.sender == batchConfirmer, "onlyBatchConfirmer: not from batch confirmer");
         _;
     }
 
     constructor(
-        IBLSRegistryCoordinatorWithIndices _registryCoordinator,
-        IStrategyManager _strategyManager,
-        IDelegationManager _delegationMananger,
-        ISlasher _slasher
+        IDelegationManager __delegationMananger,
+        IRegistryCoordinator __registryCoordinator,
+        IStrategyManager __strategyManager,
+        IStakeRegistry __stakeRegistry,
+        ISlasher __slasher
     )
-        BLSSignatureChecker(_registryCoordinator)
+        BLSSignatureChecker(__registryCoordinator)
+        ServiceManagerBase(__delegationMananger, __registryCoordinator, __stakeRegistry)
     {
-        strategyManager = _strategyManager;
-        delegationManager = _delegationMananger;
-        slasher = _slasher;
+        _strategyManager = __strategyManager;
+        _slasher = __slasher;
         _disableInitializers();
     }
 
     function initialize(
         IPauserRegistry _pauserRegistry,
-        address initialOwner
+        address _initialOwner,
+        address _batchConfirmer
     )
         public
         initializer
     {
         _initializePauser(_pauserRegistry, UNPAUSE_ALL);
-        _transferOwnership(initialOwner);
+        _transferOwnership(_initialOwner);
+        _setBatchConfirmer(_batchConfirmer);
     }
 
     /**
@@ -82,7 +79,7 @@ contract EigenDAServiceManager is Initializable, OwnableUpgradeable, EigenDAServ
     function confirmBatch(
         BatchHeader calldata batchHeader,
         NonSignerStakesAndSignature memory nonSignerStakesAndSignature
-    ) external onlyWhenNotPaused(PAUSED_CONFIRM_BATCH) {
+    ) external onlyWhenNotPaused(PAUSED_CONFIRM_BATCH) onlyBatchConfirmer() {
         // make sure the information needed to derive the non-signers and batch is in calldata to avoid emitting events
         require(tx.origin == msg.sender, "EigenDAServiceManager.confirmBatch: header and nonsigner data must be in calldata");
         // make sure the stakes against which the Batch is being confirmed are not stale
@@ -126,53 +123,56 @@ contract EigenDAServiceManager is Initializable, OwnableUpgradeable, EigenDAServ
         bytes32 batchHeaderHash = batchHeader.hashBatchHeader();
         batchIdToBatchMetadataHash[batchIdMemory] = EigenDAHasher.hashBatchHashedMetadata(batchHeaderHash, signatoryRecordHash, fee, uint32(block.number));
 
-        emit BatchConfirmed(reducedBatchHeaderHash, batchIdMemory, fee);
+        emit BatchConfirmed(reducedBatchHeaderHash, batchIdMemory, fee, false);
 
         // increment the batchId
         batchId = batchIdMemory + 1;
     }
 
-    /// @notice Called in the event of challenge resolution, in order to forward a call to the Slasher, which 'freezes' the `operator`.
-    function freezeOperator(address /*operator*/) external {
-        revert("EigenDAServiceManager.freezeOperator: not implemented");
-        // require(
-        //     msg.sender == address(eigenDAChallenge)
-        //         || msg.sender == address(eigenDABombVerifier),
-        //     "EigenDAServiceManager.freezeOperator: Only challenge resolvers can slash operators"
-        // );
-        // slasher.freezeOperator(operator);
-    }
+    /// @notice This function is used for submitting data availabilty certificates optimistically
+    function confirmBatchOptimistically(
+        BatchHeader calldata batchHeader
+    ) external onlyWhenNotPaused(PAUSED_CONFIRM_BATCH) onlyBatchConfirmer() {
+        // make sure the information needed to derive the non-signers and batch is in calldata to avoid emitting events
+        require(tx.origin == msg.sender, "EigenDAServiceManager.confirmBatch: header and nonsigner data must be in calldata");
+        // make sure the stakes against which the Batch is being confirmed are not stale
+        require(
+            batchHeader.referenceBlockNumber <= block.number, "EigenDAServiceManager.confirmBatch: specified referenceBlockNumber is in future"
+        );
 
-    /**
-     * @notice Called by the Registry in the event of a new registration, to forward a call to the Slasher
-     * @param operator The operator whose stake is being updated
-     * @param serveUntilBlock The block until which the stake accounted for in the first update is slashable by this middleware
-     */ 
-    function recordFirstStakeUpdate(address operator, uint32 serveUntilBlock) external onlyRegistryCoordinator {
-        // slasher.recordFirstStakeUpdate(operator, serveUntilBlock);
+        require(
+            (batchHeader.referenceBlockNumber + BLOCK_STALE_MEASURE) >= uint32(block.number),
+            "EigenDAServiceManager.confirmBatch: specified referenceBlockNumber is too far in past"
+        );
+
+        // calculate reducedBatchHeaderHash which nodes signed
+        bytes32 reducedBatchHeaderHash = batchHeader.hashBatchHeaderToReducedBatchHeader();
+
+        // store the metadata hash
+        uint96 fee = 0;
+        uint32 batchIdMemory = batchIdOptimistic;
+        bytes32 batchHeaderHash = batchHeader.hashBatchHeader();
+        batchIdToBatchMetadataHashOptimistic[batchIdMemory] = EigenDAHasher.hashBatchHashedMetadata(batchHeaderHash, fee, uint32(block.number));
+
+        emit BatchConfirmed(reducedBatchHeaderHash, batchIdMemory, fee, true);
+
+        // increment the batchId
+        batchIdOptimistic = batchIdMemory + 1;
     }
 
-    /** 
-     * @notice Called by the registryCoordinator, in order to forward a call to the Slasher, informing it of a stake update
-     * @param operator The operator whose stake is being updated
-     * @param updateBlock The block at which the update is being made
-     * @param serveUntilBlock The block until which the stake withdrawn from the operator in this update is slashable by this middleware
-     * @param prevElement The value of the previous element in the linked list of stake updates (generated offchain)
-     */
-    function recordStakeUpdate(address operator, uint32 updateBlock, uint32 serveUntilBlock, uint256 prevElement) external onlyRegistryCoordinator {
-        // slasher.recordStakeUpdate(operator, updateBlock, serveUntilBlock, prevElement);
+    /// @notice This function is used for changing the batch confirmer
+    function setBatchConfirmer(address _batchConfirmer) external onlyOwner() {
+        _setBatchConfirmer(_batchConfirmer);
     }
 
-    /**
-     * @notice Called by the registryCoordinator in the event of deregistration, to forward a call to the Slasher
-     * @param operator The operator being deregistered
-     * @param serveUntilBlock The block until which the stake delegated to the operator is slashable by this middleware
-     */ 
-    function recordLastStakeUpdateAndRevokeSlashingAbility(address operator, uint32 serveUntilBlock) external onlyRegistryCoordinator {
-        // slasher.recordLastStakeUpdateAndRevokeSlashingAbility(operator, serveUntilBlock);
+    /// @notice changes the batch confirmer
+    function _setBatchConfirmer(address _batchConfirmer) internal {
+        address previousBatchConfirmer = batchConfirmer;
+        batchConfirmer = _batchConfirmer;
+        emit BatchConfirmerChanged(previousBatchConfirmer, batchConfirmer);
     }
 
-    // VIEW FUNCTIONS
+    /// @notice Returns the current batchId
     function taskNumber() external view returns (uint32) {
         return batchId;
     }
@@ -182,8 +182,4 @@ contract EigenDAServiceManager is Initializable, OwnableUpgradeable, EigenDAServ
         return uint32(block.number) + STORE_DURATION_BLOCKS + BLOCK_STALE_MEASURE;
     }
 
-    /// @dev need to override function here since its defined in both these contracts
-    function owner() public view override(OwnableUpgradeable, IServiceManager) returns (address) {
-        return OwnableUpgradeable.owner();
-    }
 }