fix: quorum creation

Author: gpsanant

src/RegistryCoordinator.sol

@@ -139,7 +139,7 @@ contract RegistryCoordinator is RegistryCoordinatorStorage {
 
     /// @inheritdoc IRegistryCoordinator
     function disableM2QuorumRegistration() external onlyOwner {
-        require(operatorSetsEnabled, OperatorSetsNotEnabled());
+        require(!isM2QuorumRegistrationDisabled, M2QuorumRegistrationIsDisabled());
 
         isM2QuorumRegistrationDisabled = true;
 
@@ -154,16 +154,21 @@ contract RegistryCoordinator is RegistryCoordinatorStorage {
 
     /// @dev override the _forceDeregisterOperator function to handle M2 quorum deregistration
     function _forceDeregisterOperator(address operator, bytes memory quorumNumbers) internal virtual override {
-        if (operatorSetsEnabled) {
-            // filter out M2 quorums from the quorum numbers
-            uint256 operatorSetBitmap = quorumNumbers.orderedBytesArrayToBitmap().minus(m2QuorumBitmap);
-            if (!operatorSetBitmap.isEmpty()) {
-                // call the parent _forceDeregisterOperator function for operator sets quorums
-                super._forceDeregisterOperator(operator, operatorSetBitmap.bitmapToBytesArray());
-            }
+        // filter out M2 quorums from the quorum numbers
+        uint256 operatorSetBitmap = quorumNumbers.orderedBytesArrayToBitmap().minus(m2QuorumBitmap);
+        if (!operatorSetBitmap.isEmpty()) {
+            // call the parent _forceDeregisterOperator function for operator sets quorums
+            super._forceDeregisterOperator(operator, operatorSetBitmap.bitmapToBytesArray());
         }
     }
 
+    /// @dev Hook to prevent any new quorums from being created if operator sets are not enabled
+    function _beforeCreateQuorum(
+        uint8 quorumNumber
+    ) internal virtual override {
+        require(operatorSetsEnabled, OperatorSetsNotEnabled());
+    }
+
     /// @dev Hook to allow for any post-deregister logic
     function _afterDeregisterOperator(
         address operator,

src/RegistryCoordinatorStorage.sol

@@ -29,8 +29,8 @@ abstract contract RegistryCoordinatorStorage is IRegistryCoordinator, SlashingRe
      *
      */
 
-    /// @notice Whether this AVS allows operator sets for registration
-    /// @dev If true, operators may register to operator sets via the AllocationManager
+    /// @notice Whether this AVS allows operator sets for creation/registration
+    /// @dev If true, then operator sets may be created and operators may register to operator sets via the AllocationManager
     bool public operatorSetsEnabled;
 
     /// @notice Whether this AVS allows M2 quorums for registration

src/SlashingRegistryCoordinator.sol

@@ -822,6 +822,9 @@ contract SlashingRegistryCoordinator is
         // The previous count is the new quorum's number
         uint8 quorumNumber = prevQuorumCount;
 
+        // Hook to allow for any pre-create quorum logic
+        _beforeCreateQuorum(quorumNumber);
+
         // Initialize the quorum here and in each registry
         _setOperatorSetParams(quorumNumber, operatorSetParams);
 
@@ -853,6 +856,9 @@ contract SlashingRegistryCoordinator is
 
         indexRegistry.initializeQuorum(quorumNumber);
         blsApkRegistry.initializeQuorum(quorumNumber);
+
+        // Hook to allow for any post-create quorum logic
+        _afterCreateQuorum(quorumNumber);
     }
 
     /**
@@ -935,6 +941,16 @@ contract SlashingRegistryCoordinator is
         accountIdentifier = _accountIdentifier;
     }
 
+    /// @dev Hook to allow for any pre-create quorum logic
+    function _beforeCreateQuorum(
+        uint8 quorumNumber
+    ) internal virtual {}
+
+    /// @dev Hook to allow for any post-create quorum logic
+    function _afterCreateQuorum(
+        uint8 quorumNumber
+    ) internal virtual {}
+    
     /// @dev Hook to allow for any pre-register logic in `_registerOperator`
     function _beforeRegisterOperator(
         address operator,