feat: add reportUnexitedValidator method to staking router

Author: mkurayan

contracts/0.8.9/StakingRouter.sol

@@ -133,6 +133,7 @@ contract StakingRouter is AccessControlEnumerable, BeaconChainDepositor, Version
     bytes32 public constant STAKING_MODULE_MANAGE_ROLE = keccak256("STAKING_MODULE_MANAGE_ROLE");
     bytes32 public constant STAKING_MODULE_UNVETTING_ROLE = keccak256("STAKING_MODULE_UNVETTING_ROLE");
     bytes32 public constant REPORT_EXITED_VALIDATORS_ROLE = keccak256("REPORT_EXITED_VALIDATORS_ROLE");
+    bytes32 public constant REPORT_UNEXITED_VALIDATORS_ROLE = keccak256("REPORT_UNEXITED_VALIDATORS_ROLE");
     bytes32 public constant UNSAFE_SET_EXITED_VALIDATORS_ROLE = keccak256("UNSAFE_SET_EXITED_VALIDATORS_ROLE");
     bytes32 public constant REPORT_REWARDS_MINTED_ROLE = keccak256("REPORT_REWARDS_MINTED_ROLE");
 
@@ -1321,6 +1322,27 @@ contract StakingRouter is AccessControlEnumerable, BeaconChainDepositor, Version
         emit WithdrawalCredentialsSet(_withdrawalCredentials, msg.sender);
     }
 
+    /// @notice Reports the duration a validator has remained eligible for exit after exit request.
+    /// @dev Notify staking module how many seconds have passed since a validator first became eligible
+    ///      to exit following an exit request but has not yet exited.
+    /// @param stakingModuleId The identifier of the staking module.
+    /// @param nodeOperatorId The identifier of the node operator.
+    /// @param publicKey The public key of the validator being reported.
+    /// @param secondsSinceEligibleExitRequest Seconds since the validator first
+    ///        became eligible to exit following an exit request but has not yet exited.
+    function reportUnexitedValidator(
+        uint256 stakingModuleId,
+        uint256 nodeOperatorId,
+        bytes calldata publicKey,
+        uint256 secondsSinceEligibleExitRequest
+    ) external onlyRole(REPORT_UNEXITED_VALIDATORS_ROLE)  {
+        _getIStakingModuleById(stakingModuleId).reportUnexitedValidator(
+            nodeOperatorId,
+            publicKey,
+            secondsSinceEligibleExitRequest
+        );
+    }
+
     /// @notice Returns current credentials to withdraw ETH on Consensus Layer side.
     /// @return Withdrawal credentials.
     function getWithdrawalCredentials() public view returns (bytes32) {

contracts/0.8.9/interfaces/IStakingModule.sol

@@ -169,6 +169,19 @@ interface IStakingModule {
     ///      Details about error data: https://docs.soliditylang.org/en/v0.8.9/control-structures.html#error-handling-assert-require-revert-and-exceptions
     function onWithdrawalCredentialsChanged() external;
 
+    /// @notice Reports the duration a validator has remained unexited after becoming eligible for exit.
+    /// @dev Notify staking module how many seconds have passed since a validator first became eligible
+    ///      to exit following an exit request but has not yet exited.
+    /// @param nodeOperatorId Id of the node operator.
+    /// @param publicKey The public key of the validator being reported.
+    /// @param secondsSinceEligibleExitRequest Seconds since the validator first
+    ///        became eligible to exit following an exit request but has not yet exited.
+    function reportUnexitedValidator(
+        uint256 nodeOperatorId,
+        bytes calldata publicKey,
+        uint256 secondsSinceEligibleExitRequest
+    ) external;
+
     /// @dev Event to be emitted on StakingModule's nonce change
     event NonceChanged(uint256 nonce);
 

test/0.8.9/contracts/StakingModule__MockForStakingRouter.sol

@@ -216,6 +216,20 @@ contract StakingModule__MockForStakingRouter is IStakingModule {
 
     event Mock__onExitedAndStuckValidatorsCountsUpdated();
 
+    function reportUnexitedValidator(
+        uint256 nodeOperatorId,
+        bytes calldata publicKey,
+        uint256 secondsSinceEligibleExitRequest
+    ) external {
+        emit Mock__UnexitedValidatorReported(nodeOperatorId, publicKey, secondsSinceEligibleExitRequest);
+    }
+
+    event Mock__UnexitedValidatorReported(
+        uint256 nodeOperatorId,
+        bytes publicKey,
+        uint256 secondsSinceEligibleExitRequest
+    );
+
     bool private onExitedAndStuckValidatorsCountsUpdatedShouldRevert = false;
     bool private onExitedAndStuckValidatorsCountsUpdatedShouldRunOutGas = false;
 

test/0.8.9/stakingRouter/stakingRouter.module-sync.test.ts

@@ -72,6 +72,7 @@ describe("StakingRouter.sol:module-sync", () => {
       stakingRouter.grantRole(await stakingRouter.STAKING_MODULE_UNVETTING_ROLE(), admin),
       stakingRouter.grantRole(await stakingRouter.UNSAFE_SET_EXITED_VALIDATORS_ROLE(), admin),
       stakingRouter.grantRole(await stakingRouter.REPORT_REWARDS_MINTED_ROLE(), admin),
+      stakingRouter.grantRole(await stakingRouter.REPORT_UNEXITED_VALIDATORS_ROLE(), admin),
     ]);
 
     // add staking module
@@ -864,6 +865,30 @@ describe("StakingRouter.sol:module-sync", () => {
     });
   });
 
+  context("reportUnexitedValidator", () => {
+    const nodeOperatorId = 2n;
+    const pubkey = "0x" + "01".repeat(48);
+    const secondsSinceEligibleExitRequest = 100;
+
+    it("Reverts if the caller does not have the role", async () => {
+      await expect(
+        stakingRouter
+          .connect(user)
+          .reportUnexitedValidator(moduleId, nodeOperatorId, pubkey, secondsSinceEligibleExitRequest),
+      ).to.be.revertedWithOZAccessControlError(user.address, await stakingRouter.REPORT_UNEXITED_VALIDATORS_ROLE());
+    });
+
+    it("Report unexited stuck validator", async () => {
+      await expect(
+        stakingRouter
+          .connect(admin)
+          .reportUnexitedValidator(moduleId, nodeOperatorId, pubkey, secondsSinceEligibleExitRequest),
+      )
+        .to.emit(stakingModule, "Mock__UnexitedValidatorReported")
+        .withArgs(nodeOperatorId, pubkey, secondsSinceEligibleExitRequest);
+    });
+  });
+
   context("onValidatorsCountsByNodeOperatorReportingFinished", () => {
     it("Reverts if the caller does not have the role", async () => {
       await expect(