fix: call SM only based on m2 quorums

Author: 8sunyuan

src/AVSRegistrar.sol

@@ -146,7 +146,7 @@ contract RegistryCoordinator is SlashingRegistryCoordinator, IRegistryCoordinato
         // Check that the quorum numbers are M2 quorums and not operator sets
         // if operator sets are enabled
         for (uint256 i = 0; i < quorumNumbers.length; i++) {
-            require(!isOperatorSetAVS || isM2Quorum[uint8(quorumNumbers[i])], OperatorSetsEnabled());
+            require(!isOperatorSetAVS || _isM2Quorum(uint8(quorumNumbers[i])), OperatorSetsEnabled());
         }
         _deregisterOperator({operator: msg.sender, quorumNumbers: quorumNumbers});
     }
@@ -155,23 +155,31 @@ contract RegistryCoordinator is SlashingRegistryCoordinator, IRegistryCoordinato
     function enableOperatorSets() external onlyOwner {
         require(!isOperatorSetAVS, OperatorSetsEnabled());
 
-        // Set all existing quorums as m2 quorums
-        for (uint8 i = 0; i < quorumCount; i++) {
-            isM2Quorum[i] = true;
-        }
+        // Set the bitmap for M2 quorums
+        M2quorumBitmap = _getQuorumBitmap(quorumCount);
 
         // Enable operator sets mode
         isOperatorSetAVS = true;
     }
 
     /// @dev Hook to allow for any post-deregister logic
     function _afterDeregisterOperator(address operator, bytes32 operatorId, bytes memory quorumNumbers, uint192 newBitmap) internal virtual override {
-        // If the operator is no longer registered for any quorums, update their status and deregister
+        uint256 operatorM2QuorumBitmap = newBitmap.minus(M2quorumBitmap);
+        // If the operator is no longer registered for any M2 quorums, update their status and deregister
         // them from the AVS via the EigenLayer core contracts
-        if (newBitmap.isEmpty()) {
-            _operatorInfo[operator].status = OperatorStatus.DEREGISTERED;
+        if (operatorM2QuorumBitmap.isEmpty()) {
             serviceManager.deregisterOperatorFromAVS(operator);
-            emit OperatorDeregistered(operator, operatorId);
         }
     }
+
+    /// @dev Returns a bitmap with all bits set up to `quorumCount`. Used for bit-masking quorum numbers
+    /// and differentiating between operator sets and M2 quorums
+    function _getQuorumBitmap(uint256 quorumCount) internal pure returns (uint256) {
+        // This creates a number where all bits up to quorumCount are set to 1
+        // For example: 
+        // quorumCount = 3 -> 0111 (7 in decimal)
+        // quorumCount = 5 -> 011111 (31 in decimal)
+        // This is a safe operation since we limit MAX_QUORUM_COUNT to 192
+        return (1 << quorumCount) - 1;
+    }
 }

src/RegistryCoordinator.sol

@@ -15,7 +15,6 @@ import {BitmapUtils} from "./libraries/BitmapUtils.sol";
 import {BN254} from "./libraries/BN254.sol";
 import {SignatureCheckerLib} from "./libraries/SignatureCheckerLib.sol";
 import {QuorumBitmapHistoryLib} from "./libraries/QuorumBitmapHistoryLib.sol";
-import {AVSRegistrar} from "./AVSRegistrar.sol";
 
 import {OwnableUpgradeable} from "@openzeppelin-upgrades/contracts/access/OwnableUpgradeable.sol";
 import {Initializable} from "@openzeppelin-upgrades/contracts/proxy/utils/Initializable.sol";
@@ -39,7 +38,7 @@ contract SlashingRegistryCoordinator is
     Pausable,
     OwnableUpgradeable,
     SlashingRegistryCoordinatorStorage,
-    AVSRegistrar,
+    IAVSRegistrar,
     ISocketUpdater,
     ISignatureUtils
 {
@@ -213,6 +212,7 @@ contract SlashingRegistryCoordinator is
         // and register them with this AVS in EigenLayer core (DelegationManager)
         if (_operatorInfo[operator].status != OperatorStatus.REGISTERED) {
             _operatorInfo[operator] = OperatorInfo(operatorId, OperatorStatus.REGISTERED);
+            emit OperatorRegistered(msg.sender, operatorId);
         }
     }
 
@@ -582,6 +582,13 @@ contract SlashingRegistryCoordinator is
         // Update operator's bitmap and status
         _updateOperatorBitmap({operatorId: operatorId, newBitmap: newBitmap});
 
+        // If the operator is no longer registered for any quorums, update their status and deregister
+        // them from the AVS via the EigenLayer core contracts
+        if (newBitmap.isEmpty()) {
+            _operatorInfo[operator].status = OperatorStatus.DEREGISTERED;
+            emit OperatorDeregistered(operator, operatorId);
+        }
+
         // Deregister operator with each of the registry contracts
         blsApkRegistry.deregisterOperator(operator, quorumNumbers);
         stakeRegistry.deregisterOperator(operatorId, quorumNumbers);
@@ -605,7 +612,7 @@ contract SlashingRegistryCoordinator is
         // Check each quorum's stake type
         for (uint256 i = 0; i < quorumNumbers.length; i++) {
             uint8 quorumNumber = uint8(quorumNumbers[i]);
-            if (isM2Quorum[quorumNumber]) {
+            if (_isM2Quorum(quorumNumber)) {
                 operatorSetIds[numOperatorSetQuorums++] = quorumNumber;
             }
         }
@@ -832,7 +839,7 @@ contract SlashingRegistryCoordinator is
         _setOperatorSetParams(quorumNumber, operatorSetParams);
 
         /// Update the AllocationManager if operatorSetQuorum
-        if (isOperatorSetAVS && !isM2Quorum[quorumNumber]) {
+        if (isOperatorSetAVS && !_isM2Quorum(quorumNumber)) {
             // Create array of CreateSetParams for the new quorum
             IAllocationManagerTypes.CreateSetParams[] memory createSetParams = new IAllocationManagerTypes.CreateSetParams[](1);
 
@@ -899,6 +906,12 @@ contract SlashingRegistryCoordinator is
         return quorumNumbers;
     }
 
+    /// @notice Returns true if the quorum number is an M2 quorum
+    /// @dev We use bitwise and to check if the quorum number is an M2 quorum
+    function _isM2Quorum(uint8 quorumNumber) internal view returns (bool) {
+        return M2quorumBitmap.isSet(quorumNumber);
+    }
+
     function _setOperatorSetParams(
         uint8 quorumNumber,
         OperatorSetParam memory operatorSetParams
@@ -972,6 +985,11 @@ contract SlashingRegistryCoordinator is
         return _operatorInfo[operator].status;
     }
 
+    /// @notice Returns true if the quorum number is an M2 quorum
+    function isM2Quorum(uint8 quorumNumber) external view returns (bool) {
+        return _isM2Quorum(quorumNumber);
+    }
+
     /**
      * @notice Returns the indices of the quorumBitmaps for the provided `operatorIds` at the given `blockNumber`
      * @dev Reverts if any of the `operatorIds` was not (yet) registered at `blockNumber`

src/SlashingRegistryCoordinator.sol

@@ -86,9 +86,9 @@ abstract contract SlashingRegistryCoordinatorStorage is ISlashingRegistryCoordin
     /// This value should only be set once.
     address public accountIdentifier;
 
-    /// @notice Mapping from quorum number to whether the quorum is an M2 quorum
-    /// @dev M2 quorums are pre-operator sets and track total delegated stake only
-    mapping(uint8 => bool) public isM2Quorum;
+    /// @notice The bitmap containing all M2 quorums. This is only used for existing AVS middlewares that have M2 quorums
+    /// and need to call `enableOperatorSets()` to enable operator sets mode.
+    uint256 internal M2quorumBitmap;
 
     constructor(
         IStakeRegistry _stakeRegistry,

src/SlashingRegistryCoordinatorStorage.sol

@@ -6,11 +6,6 @@ import {IBLSApkRegistry} from "./IBLSApkRegistry.sol";
 import {ISlashingRegistryCoordinator} from "./ISlashingRegistryCoordinator.sol";
 
 interface IRegistryCoordinator {
-
-    /// Emits when an operator is registered
-    event OperatorRegistered(address indexed operator, bytes32 indexed operatorId);
-    /// Emits when an operator is deregistered
-    event OperatorDeregistered(address indexed operator, bytes32 indexed operatorId);
 
     /**
      * @notice Registers msg.sender as an operator for one or more quorums. If any quorum exceeds its maximum

src/interfaces/IRegistryCoordinator.sol

@@ -39,6 +39,11 @@ interface IRegistryCoordinatorErrors {
 interface ISlashingRegistryCoordinator is IRegistryCoordinatorErrors {
     // EVENTS
 
+    /// Emits when an operator is registered
+    event OperatorRegistered(address indexed operator, bytes32 indexed operatorId);
+    /// Emits when an operator is deregistered
+    event OperatorDeregistered(address indexed operator, bytes32 indexed operatorId);
+
     event OperatorSetParamsUpdated(uint8 indexed quorumNumber, OperatorSetParam operatorSetParams);
 
     event ChurnApproverUpdated(address prevChurnApprover, address newChurnApprover);

src/interfaces/ISlashingRegistryCoordinator.sol

@@ -1,9 +1,10 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.27;
 
-import {AVSRegistrar} from "../../src/AVSRegistrar.sol";
+import {IAVSRegistrar} from "eigenlayer-contracts/src/contracts/interfaces/IAVSRegistrar.sol";
 
-contract AVSRegistrarMock is AVSRegistrar {
+
+contract AVSRegistrarMock is IAVSRegistrar {
     function registerOperator(
         address operator,
         uint32[] calldata operatorSetIds,

test/mocks/AVSRegistrarMock.sol

@@ -1560,15 +1560,14 @@ contract RegistryCoordinatorUnitTests_RegisterOperatorWithChurn is RegistryCoord
         emit QuorumIndexUpdate(operatorToRegisterId, defaultQuorumNumber, numOperators);
 
         // Then expect the deregistration events
+        cheats.expectEmit(true, true, true, true, address(registryCoordinator));
+        emit OperatorDeregistered(operatorKickParams[0].operator, operatorToKickId);
         cheats.expectEmit(true, true, true, true, address(blsApkRegistry));
         emit OperatorRemovedFromQuorums(operatorKickParams[0].operator, operatorToKickId, quorumNumbers);
         cheats.expectEmit(true, true, true, true, address(stakeRegistry));
         emit OperatorStakeUpdate(operatorToKickId, defaultQuorumNumber, 0);
         cheats.expectEmit(true, true, true, true, address(indexRegistry));
         emit QuorumIndexUpdate(operatorToRegisterId, defaultQuorumNumber, numOperators - 1);
-        cheats.expectEmit(true, true, true, true, address(registryCoordinator));
-        emit OperatorDeregistered(operatorKickParams[0].operator, operatorToKickId);
-
         cheats.expectEmit(true, true, true, true, address(registryCoordinator));
         emit OperatorRegistered(operatorToRegister, operatorToRegisterId);