Add tests for validator locking

Author: kanewallmann

contracts/contract/megapool/RocketMegapoolDelegate.sol

@@ -508,7 +508,7 @@ contract RocketMegapoolDelegate is RocketMegapoolDelegateBase, RocketMegapoolDel
     function notifyNotExit(uint32 _validatorId, uint64 _slot) override external onlyRocketMegapoolManager {
         ValidatorInfo memory validator = validators[_validatorId];
         // Check required state
-        require(validator.locked, "Validator is not locked");
+        require(validator.locked, "Validator not locked");
         require(_slot >= validator.lockedSlot, "Proof is older than challenge");
         // Update validator state to exiting/locked
         validator.locked = false;
@@ -580,7 +580,7 @@ contract RocketMegapoolDelegate is RocketMegapoolDelegateBase, RocketMegapoolDel
     function _notifyFinalBalance(uint32 _validatorId, uint64 _amountInGwei, uint64 _withdrawalSlot) internal {
         ValidatorInfo memory validator = validators[_validatorId];
         require(!validator.exited, "Already exited");
-        require(validator.exiting, "Validator is not exiting");
+        require(validator.exiting, "Validator not exiting");
         require(!validator.dissolved, "Validator dissolved");
         require(_withdrawalSlot >= validator.withdrawableEpoch * slotsPerEpoch, "Not full withdrawal");
         // Mark as exited

contracts/contract/megapool/RocketMegapoolManager.sol

@@ -37,6 +37,11 @@ contract RocketMegapoolManager is RocketBase, RocketMegapoolManagerInterface {
         setUint(keccak256(abi.encodePacked("megapool.validator.set", index)), encoded);
     }
 
+    /// @notice Returns the last trusted member to execute a challenge
+    function getLastChallenger() override external view returns (address) {
+        return getAddress(challengerKey);
+    }
+
     /// @notice Returns validator info for the given global megapool validator index
     /// @param _index The index of the validator to query
     function getValidatorInfo(uint256 _index) override external view returns (RocketMegapoolStorageLayout.ValidatorInfo memory validatorInfo, address megapool, uint32 validatorId) {
@@ -93,7 +98,7 @@ contract RocketMegapoolManager is RocketBase, RocketMegapoolManagerInterface {
         BeaconStateVerifierInterface beaconStateVerifier = BeaconStateVerifierInterface(getContractAddress("beaconStateVerifier"));
         require(beaconStateVerifier.verifyValidator(_proof), "Invalid proof");
         // Verify correct withdrawable_epoch
-        require(_proof.validator.withdrawableEpoch < farFutureEpoch, "Validator is not exiting");
+        require(_proof.validator.withdrawableEpoch < farFutureEpoch, "Validator not exiting");
         // Verify matching validator index
         RocketMegapoolStorageLayout.ValidatorInfo memory validatorInfo = _megapool.getValidatorInfo(_validatorId);
         require(_proof.validatorIndex == validatorInfo.validatorIndex, "Invalid proof");

contracts/interface/megapool/RocketMegapoolManagerInterface.sol

@@ -13,6 +13,7 @@ interface RocketMegapoolManagerInterface {
 
     function getValidatorCount() external view returns (uint256);
     function addValidator(address _megapoolAddress, uint32 _validatorId) external;
+    function getLastChallenger() external view returns (address);
     function getValidatorInfo(uint256 _index) external view returns (RocketMegapoolStorageLayout.ValidatorInfo memory validatorInfo, address megapool, uint32 validatorId);
     function stake(RocketMegapoolInterface megapool, uint32 _validatorId, ValidatorProof calldata _proof) external;
     function dissolve(RocketMegapoolInterface megapool, uint32 _validatorId, ValidatorProof calldata _proof) external;