fix: update references from registry coordinator to new slashing registry coordinator (#384)

afkbyte · web-flow · commit 6c1eeb220cab · 2025-02-05T16:22:37.000-05:00
* update references from old registryCoordinator to new slashingRegistryCoordinator in SocketRegistry

* update references from old registryCoordinator to new slashingRegistryCoordinator in EjectionManager

* fix: forge fmt

* fix: update IEjectionManager to use new SlashingRegistryCoordinator

* fix: update error string in SocketRegistry unit test
diff --git a/src/EjectionManager.sol b/src/EjectionManager.sol
@@ -5,21 +5,21 @@ import {OwnableUpgradeable} from "@openzeppelin-upgrades/contracts/access/Ownabl
 import {
     EjectionManagerStorage,
     IEjectionManager,
-    IRegistryCoordinator,
+    ISlashingRegistryCoordinator,
     IStakeRegistry
 } from "./EjectionManagerStorage.sol";
 
 // TODO: double check order of inheritance since we separated storage from logic...
 
 /**
- * @title Used for automated ejection of operators from the RegistryCoordinator under a ratelimit
+ * @title Used for automated ejection of operators from the SlashingRegistryCoordinator under a ratelimit
  * @author Layr Labs, Inc.
  */
 contract EjectionManager is OwnableUpgradeable, EjectionManagerStorage {
     constructor(
-        IRegistryCoordinator _registryCoordinator,
+        ISlashingRegistryCoordinator _slashingRegistryCoordinator,
         IStakeRegistry _stakeRegistry
-    ) EjectionManagerStorage(_registryCoordinator, _stakeRegistry) {
+    ) EjectionManagerStorage(_slashingRegistryCoordinator, _stakeRegistry) {
         _disableInitializers();
     }
 
@@ -67,8 +67,8 @@ contract EjectionManager is OwnableUpgradeable, EjectionManagerStorage {
                         stakeForEjection += operatorStake;
                         ++ejectedOperators;
 
-                        registryCoordinator.ejectOperator(
-                            registryCoordinator.getOperatorFromId(operatorIds[i][j]),
+                        slashingRegistryCoordinator.ejectOperator(
+                            slashingRegistryCoordinator.getOperatorFromId(operatorIds[i][j]),
                             abi.encodePacked(quorumNumber)
                         );
 
@@ -80,8 +80,8 @@ contract EjectionManager is OwnableUpgradeable, EjectionManagerStorage {
                     stakeForEjection += operatorStake;
                     ++ejectedOperators;
 
-                    registryCoordinator.ejectOperator(
-                        registryCoordinator.getOperatorFromId(operatorIds[i][j]),
+                    slashingRegistryCoordinator.ejectOperator(
+                        slashingRegistryCoordinator.getOperatorFromId(operatorIds[i][j]),
                         abi.encodePacked(quorumNumber)
                     );
 
diff --git a/src/EjectionManagerStorage.sol b/src/EjectionManagerStorage.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.27;
 
-import {IRegistryCoordinator} from "./interfaces/IRegistryCoordinator.sol";
+import {ISlashingRegistryCoordinator} from "./interfaces/ISlashingRegistryCoordinator.sol";
 import {IStakeRegistry} from "./interfaces/IStakeRegistry.sol";
 import {IEjectionManager} from "./interfaces/IEjectionManager.sol";
 
@@ -12,7 +12,7 @@ abstract contract EjectionManagerStorage is IEjectionManager {
     uint8 internal constant MAX_QUORUM_COUNT = 192;
 
     /// @inheritdoc IEjectionManager
-    IRegistryCoordinator public immutable registryCoordinator;
+    ISlashingRegistryCoordinator public immutable slashingRegistryCoordinator;
     /// @inheritdoc IEjectionManager
     IStakeRegistry public immutable stakeRegistry;
 
@@ -23,8 +23,11 @@ abstract contract EjectionManagerStorage is IEjectionManager {
     /// @inheritdoc IEjectionManager
     mapping(uint8 => QuorumEjectionParams) public quorumEjectionParams;
 
-    constructor(IRegistryCoordinator _registryCoordinator, IStakeRegistry _stakeRegistry) {
-        registryCoordinator = _registryCoordinator;
+    constructor(
+        ISlashingRegistryCoordinator _slashingRegistryCoordinator,
+        IStakeRegistry _stakeRegistry
+    ) {
+        slashingRegistryCoordinator = _slashingRegistryCoordinator;
         stakeRegistry = _stakeRegistry;
     }
 
diff --git a/src/SocketRegistry.sol b/src/SocketRegistry.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.12;
 
-import {IRegistryCoordinator} from "./interfaces/IRegistryCoordinator.sol";
+import {ISlashingRegistryCoordinator} from "./interfaces/ISlashingRegistryCoordinator.sol";
 import {ISocketRegistry} from "./interfaces/ISocketRegistry.sol";
 import {SocketRegistryStorage} from "./SocketRegistryStorage.sol";
 
@@ -11,32 +11,32 @@ import {SocketRegistryStorage} from "./SocketRegistryStorage.sol";
  */
 contract SocketRegistry is ISocketRegistry, SocketRegistryStorage {
     /// @notice A modifier that only allows the RegistryCoordinator to call a function
-    modifier onlyRegistryCoordinator() {
+    modifier onlySlashingRegistryCoordinator() {
         require(
-            msg.sender == address(registryCoordinator),
-            "SocketRegistry.onlyRegistryCoordinator: caller is not the RegistryCoordinator"
+            msg.sender == address(slashingRegistryCoordinator),
+            "SocketRegistry.onlySlashingRegistryCoordinator: caller is not the SlashingRegistryCoordinator"
         );
         _;
     }
 
-    /// @notice A modifier that only allows the owner of the RegistryCoordinator to call a function
+    /// @notice A modifier that only allows the owner of the SlashingRegistryCoordinator to call a function
     modifier onlyCoordinatorOwner() {
         require(
-            msg.sender == IRegistryCoordinator(registryCoordinator).owner(),
-            "SocketRegistry.onlyCoordinatorOwner: caller is not the owner of the registryCoordinator"
+            msg.sender == ISlashingRegistryCoordinator(slashingRegistryCoordinator).owner(),
+            "SocketRegistry.onlyCoordinatorOwner: caller is not the owner of the slashingRegistryCoordinator"
         );
         _;
     }
 
     constructor(
-        IRegistryCoordinator _registryCoordinator
-    ) SocketRegistryStorage(address(_registryCoordinator)) {}
+        ISlashingRegistryCoordinator _slashingRegistryCoordinator
+    ) SocketRegistryStorage(address(_slashingRegistryCoordinator)) {}
 
     /// @notice sets the socket for an operator only callable by the RegistryCoordinator
     function setOperatorSocket(
         bytes32 _operatorId,
         string memory _socket
-    ) external onlyRegistryCoordinator {
+    ) external onlySlashingRegistryCoordinator {
         operatorIdToSocket[_operatorId] = _socket;
     }
 
diff --git a/src/SocketRegistryStorage.sol b/src/SocketRegistryStorage.sol
@@ -7,15 +7,15 @@ pragma solidity ^0.8.12;
  */
 contract SocketRegistryStorage {
     /// @notice The address of the RegistryCoordinator
-    address public immutable registryCoordinator;
+    address public immutable slashingRegistryCoordinator;
 
     /// @notice A mapping from operator IDs to their sockets
     mapping(bytes32 => string) public operatorIdToSocket;
 
     constructor(
-        address _registryCoordinator
+        address _slashingRegistryCoordinator
     ) {
-        registryCoordinator = _registryCoordinator;
+        slashingRegistryCoordinator = _slashingRegistryCoordinator;
     }
 
     uint256[48] private __GAP;
diff --git a/src/interfaces/IEjectionManager.sol b/src/interfaces/IEjectionManager.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.27;
 
-import {IRegistryCoordinator} from "./IRegistryCoordinator.sol";
+import {ISlashingRegistryCoordinator} from "./ISlashingRegistryCoordinator.sol";
 import {IStakeRegistry} from "./IStakeRegistry.sol";
 
 interface IEjectionManagerErrors {
@@ -66,11 +66,11 @@ interface IEjectionManager is IEjectionManagerErrors, IEjectionManagerEvents {
     /* STATE */
 
     /*
-     * @notice Returns the address of the registry coordinator contract.
-     * @return The address of the registry coordinator.
+     * @notice Returns the address of the slashing registry coordinator contract.
+     * @return The address of the slashing registry coordinator.
      * @dev This value is immutable and set during contract construction.
      */
-    function registryCoordinator() external view returns (IRegistryCoordinator);
+    function slashingRegistryCoordinator() external view returns (ISlashingRegistryCoordinator);
 
     /*
      * @notice Returns the address of the stake registry contract.
diff --git a/test/unit/SocketRegistryUnit.t.sol b/test/unit/SocketRegistryUnit.t.sol
@@ -17,10 +17,10 @@ contract SocketRegistryUnitTests is MockAVSDeployer {
         assertEq(socketRegistry.getOperatorSocket(defaultOperatorId), "testSocket");
     }
 
-    function test_setOperatorSocket_revert_notRegistryCoordinator() public {
+    function test_setOperatorSocket_revert_notSlashingRegistryCoordinator() public {
         vm.startPrank(address(0));
         vm.expectRevert(
-            "SocketRegistry.onlyRegistryCoordinator: caller is not the RegistryCoordinator"
+            "SocketRegistry.onlySlashingRegistryCoordinator: caller is not the SlashingRegistryCoordinator"
         );
         socketRegistry.setOperatorSocket(defaultOperatorId, "testSocket");
     }

Original file line number	Diff line number	Diff line change
`@@ -17,10 +17,10 @@ contract SocketRegistryUnitTests is MockAVSDeployer {`
`17`	`17`	`assertEq(socketRegistry.getOperatorSocket(defaultOperatorId), "testSocket");`
`18`	`18`	`}`
`19`	`19`
`20`		`- function test_setOperatorSocket_revert_notRegistryCoordinator() public {`
	`20`	`+ function test_setOperatorSocket_revert_notSlashingRegistryCoordinator() public {`
`21`	`21`	`vm.startPrank(address(0));`
`22`	`22`	`vm.expectRevert(`
`23`		`- "SocketRegistry.onlyRegistryCoordinator: caller is not the RegistryCoordinator"`
	`23`	`+ "SocketRegistry.onlySlashingRegistryCoordinator: caller is not the SlashingRegistryCoordinator"`
`24`	`24`	`);`
`25`	`25`	`socketRegistry.setOperatorSocket(defaultOperatorId, "testSocket");`
`26`	`26`	`}`