refactor: whitelister addr (#110)

* refactor: wihtelister addr * fix: set whitelister during init * Update contracts/src/core/MachServiceManager.sol Co-authored-by: Noel <[email protected]> * fix: rename error --------- Co-authored-by: Noel <[email protected]>
alt-research · Apr 8, 2024 · e0531e5 · e0531e5
1 parent 6d02245
commit e0531e5
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 4 deletions.
diff --git a/contracts/src/core/MachServiceManager.sol b/contracts/src/core/MachServiceManager.sol
@@ -21,6 +21,7 @@ import {ServiceManagerBase} from "eigenlayer-middleware/ServiceManagerBase.sol";
 import {MachServiceManagerStorage} from "./MachServiceManagerStorage.sol";
 import {
     InvalidConfirmer,
+    NotWhitelister,
     ZeroAddress,
     AlreadyInAllowlist,
     NotInAllowlist,
@@ -63,6 +64,14 @@ contract MachServiceManager is
         _;
     }
 
+    /// @notice when applied to a function, ensures that the function is only callable by the `whitelister`.
+    modifier onlyWhitelister() {
+        if (_msgSender() != whitelister) {
+            revert NotWhitelister();
+        }
+        _;
+    }
+
     constructor(
         IAVSDirectory __avsDirectory,
         IRegistryCoordinator __registryCoordinator,
@@ -80,11 +89,13 @@ contract MachServiceManager is
         IPauserRegistry _pauserRegistry,
         uint256 _initialPausedStatus,
         address _initialOwner,
-        address _alertConfirmer
+        address _alertConfirmer,
+        address _whitelister
     ) public initializer {
         _initializePauser(_pauserRegistry, _initialPausedStatus);
         __ServiceManagerBase_init(_initialOwner);
         _setAlertConfirmer(_alertConfirmer);
+        _setWhitelister(_whitelister);
         allowlistEnabled = true;
         quorumThresholdPercentage = 66;
     }
@@ -97,7 +108,7 @@ contract MachServiceManager is
      * @notice Add an operator to the allowlist.
      * @param operator The operator to add
      */
-    function addToAllowlist(address operator) external onlyOwner {
+    function addToAllowlist(address operator) external onlyWhitelister {
         if (operator == address(0)) {
             revert ZeroAddress();
         }
@@ -112,7 +123,7 @@ contract MachServiceManager is
      * @notice Remove an operator from the allowlist.
      * @param operator The operator to remove
      */
-    function removeFromAllowlist(address operator) external onlyOwner {
+    function removeFromAllowlist(address operator) external onlyWhitelister {
         if (!allowlist[operator]) {
             revert NotInAllowlist();
         }
@@ -151,6 +162,13 @@ contract MachServiceManager is
         _setAlertConfirmer(confirmer);
     }
 
+    /**
+     * @notice Set whitelister address.
+     */
+    function setWhitelister(address whitelister) external onlyOwner {
+        _setWhitelister(whitelister);
+    }
+
     /**
      * @notice Remove an Alert.
      * @param messageHash The message hash of the alert
@@ -339,10 +357,17 @@ contract MachServiceManager is
         emit AlertConfirmerChanged(previousBatchConfirmer, alertConfirmer);
     }
 
+    /// @notice changes the whitelister
+    function _setWhitelister(address _whitelister) internal {
+        address previousWhitelister = whitelister;
+        whitelister = _whitelister;
+        emit WhitelisterChanged(previousWhitelister, _whitelister);
+    }
     /**
      * @notice converts a alert header to a reduced alert header
      * @param alertHeader the alert header to convert
      */
+
     function _convertAlertHeaderToReducedAlertHeader(AlertHeader calldata alertHeader)
         internal
         pure

diff --git a/contracts/src/core/MachServiceManagerStorage.sol b/contracts/src/core/MachServiceManagerStorage.sol
@@ -37,9 +37,12 @@ abstract contract MachServiceManagerStorage {
     /// @notice Resolved message hashes, prevent aggregator from replay any resolved alert
     EnumerableSet.Bytes32Set internal _resolvedMessageHashes;
 
+    /// @notice Role for whitelisting operators
+    address public whitelister;
+
     // storage gap for upgradeability
     // slither-disable-next-line shadowing-state
-    uint256[45] private __GAP;
+    uint256[44] private __GAP;
 
     constructor(uint256 _rollupChainId) {
         rollupChainId = _rollupChainId;

diff --git a/contracts/src/error/Errors.sol b/contracts/src/error/Errors.sol
@@ -4,6 +4,7 @@ pragma solidity ^0.8.12;
 error ZeroAddress();
 error InvalidStartIndex();
 error InvalidConfirmer();
+error NotWhitelister();
 error InvalidSender();
 error InvalidReferenceBlockNum();
 error InsufficientThreshold();

diff --git a/contracts/src/interfaces/IMachServiceManager.sol b/contracts/src/interfaces/IMachServiceManager.sol
@@ -43,6 +43,13 @@ interface IMachServiceManager is IServiceManager {
      */
     event AlertConfirmerChanged(address previousAddress, address newAddress);
 
+    /**
+     * @notice Emitted when the whitelister is changed.
+     * @param previousAddress The address of the previous whitelister
+     * @param newAddress The address of the new whitelister
+     */
+    event WhitelisterChanged(address previousAddress, address newAddress);
+
     /**
      * @notice Emitted when the quorum threshold percentage is changed.
      * @param thresholdPercentages The new quorum threshold percentage