Feat/operator sets (#579)

* feat: operator set scaffold

* fix: impl/storage compile errors; pending updating of tests

* chore: `forge fmt`

* fix: `OperatorSet` struct misuse

* fix: comment

* chore: verbose use of `OperatorSet`

* test: `registerOperatorToOperatorSet`

* feat: `registerOperatorToOperatorSets`

Enables registering multiple operator sets in a single call.

* chore: `forge fmt`

* feat: interface changes

* fix: operator set digest

* fix: `OPERATOR_SET_REGISTRATION_TYPEHASH`

* chore: `forge fmt`

* test: wrong avs using signature

* fix: optimize for SSTOREs

* test: `deregisterOperatorFromOperatorSets`

* chore: rename `operatorSetStrategies`

* test: `addStrategiesToOperatorSet`

* test: `removeStrategiesFromOperatorSet`

* test: more coverage

* chore: improve natspec

* WIP: simp mode

* WIP: simp mode

* WIP: simp mode

- includes interface change, specifically the `StandbyParams` structure. `id` isn't needed for storage.

* test: simp mode

* test: simp mode

* test: simp mode

* refactor: simp mode storage

* Revert "refactor: simp mode storage"

This reverts commit 3b0450e.

* Reapply "refactor: simp mode storage"

This reverts commit 5f90d78.

* feat: simp mode

* fix(optimize): salt cancellation

- remove check

* test: improvements

* test: improvements

* fix: move `isOperatorSetAVS` update out of loop

ooops

* fix: standby update typehash

* test: cleanup

* fix: move mutation out of loop

* nit: cleanup

* fix: remove unused events

---------

Co-authored-by: clandestine.eth <[email protected]>

Author: 2 people

.gitignore

@@ -45,3 +45,8 @@ InheritanceGraph.png
 surya_report.md
 
 .idea
+
+*_state.json
+**/deployed_strategies.json
+
+**/Populate*

script/deploy/devnet/M2_Deploy_From_Scratch.s.sol

@@ -217,7 +217,7 @@ contract Deployer_M2 is Script, Test {
         // Second, deploy the *implementation* contracts, using the *proxy contracts* as inputs
         delegationImplementation = new DelegationManager(strategyManager, slasher, eigenPodManager);
         strategyManagerImplementation = new StrategyManager(delegation, eigenPodManager, slasher);
-        avsDirectoryImplementation = new AVSDirectory(delegation);
+        avsDirectoryImplementation = new AVSDirectory(delegation, strategyManager);
         slasherImplementation = new Slasher(strategyManager, delegation);
         eigenPodManagerImplementation = new EigenPodManager(
             ethPOSDeposit,

script/deploy/holesky/M2_Deploy_From_Scratch.s.sol

@@ -75,7 +75,7 @@ contract M2_Deploy_Holesky_From_Scratch is ExistingDeploymentParser {
         );
 
         eigenPodBeacon = new UpgradeableBeacon(address(eigenPodImplementation));
-        avsDirectoryImplementation = new AVSDirectory(delegationManager);
+        avsDirectoryImplementation = new AVSDirectory(delegationManager, strategyManager);
         delegationManagerImplementation = new DelegationManager(strategyManager, slasher, eigenPodManager);
         strategyManagerImplementation = new StrategyManager(delegationManager, eigenPodManager, slasher);
         slasherImplementation = new Slasher(strategyManager, delegationManager);

script/deploy/mainnet/M2_Mainnet_Upgrade.s.sol

@@ -45,7 +45,7 @@ contract M2_Mainnet_Upgrade is ExistingDeploymentParser {
      */
     function _deployImplementationContracts() internal {
         // 1. Deploy New TUPS
-        avsDirectoryImplementation = new AVSDirectory(delegationManager);
+        avsDirectoryImplementation = new AVSDirectory(delegationManager, strategyManager);
         avsDirectory = AVSDirectory(
             address(
                 new TransparentUpgradeableProxy(

src/contracts/core/AVSDirectory.sol

@@ -26,6 +26,9 @@ contract AVSDirectory is
     /// @dev Returns the chain ID from the time the contract was deployed.
     uint256 internal immutable ORIGINAL_CHAIN_ID;
 
+    /// @notice Canonical, virtual beacon chain ETH strategy
+    IStrategy public constant beaconChainETHStrategy = IStrategy(0xbeaC0eeEeeeeEEeEeEEEEeeEEeEeeeEeeEEBEaC0);
+
     /**
      *
      *                         INITIALIZING FUNCTIONS
@@ -36,7 +39,10 @@ contract AVSDirectory is
      * @dev Initializes the immutable addresses of the strategy mananger, delegationManager, slasher,
      * and eigenpodManager contracts
      */
-    constructor(IDelegationManager _delegation) AVSDirectoryStorage(_delegation) {
+    constructor(
+        IDelegationManager _delegation,
+        IStrategyManager _strategyManager
+    ) AVSDirectoryStorage(_delegation, _strategyManager) {
         _disableInitializers();
         ORIGINAL_CHAIN_ID = block.chainid;
     }
@@ -314,6 +320,10 @@ contract AVSDirectory is
             delegation.isOperator(operator),
             "AVSDirectory.registerOperatorToAVS: operator not registered to EigenLayer yet"
         );
+        require(
+            !isOperatorSetAVS[msg.sender],
+            "AVSDirectory.registerOperatorToAVS: operator set AVS cannot register operators with legacy method"
+        );
 
         // Assert that `operatorSignature.signature` is a valid signature for the operator AVS registration.
         EIP1271SignatureUtils.checkSignature_EIP1271({

src/contracts/core/AVSDirectoryStorage.sol

@@ -28,6 +28,9 @@ abstract contract AVSDirectoryStorage is IAVSDirectory {
     /// @notice The DelegationManager contract for EigenLayer
     IDelegationManager public immutable delegation;
 
+    /// @notice The StrategyManager contract for EigenLayer
+    IStrategyManager public immutable strategyManager;
+
     /**
      * @notice Original EIP-712 Domain separator for this contract.
      * @dev The domain separator may change in the event of a fork that modifies the ChainID.
@@ -57,6 +60,7 @@ abstract contract AVSDirectoryStorage is IAVSDirectory {
 
     constructor(IDelegationManager _delegation) {
         delegation = _delegation;
+        strategyManager = _strategyManager;
     }
 
     /**

src/contracts/interfaces/IAVSDirectory.sol

@@ -2,13 +2,14 @@
 pragma solidity >=0.5.0;
 
 import "./ISignatureUtils.sol";
+import "./IStrategy.sol";
 
 interface IAVSDirectory is ISignatureUtils {
     /// @notice Enum representing the registration status of an operator with an AVS.
     /// @notice Only used by legacy M2 AVSs that have not integrated with operatorSets.
     enum OperatorAVSRegistrationStatus {
-        UNREGISTERED, // Operator not registered to AVS
-        REGISTERED // Operator registered to AVS
+        UNREGISTERED, // Operator is not registered with the AVS.
+        REGISTERED // Operator is registered with the AVS.
 
     }
 

src/test/unit/AVSDirectoryUnit.t.sol

@@ -72,7 +72,7 @@ contract AVSDirectoryUnitTests is EigenLayerUnitTestSetup, IAVSDirectoryEvents {
         );
 
         // Deploy AVSDirectory implmentation and proxy
-        avsDirectoryImplementation = new AVSDirectory(delegationManager);
+        avsDirectoryImplementation = new AVSDirectory(delegationManager, IStrategyManager(address(strategyManagerMock)));
         avsDirectory = AVSDirectory(
             address(
                 new TransparentUpgradeableProxy(