Replay fix for Validator Manager

contracts/validator-manager/ValidatorManager.sol

@@ -94,7 +94,7 @@ contract ValidatorManager is Initializable, OwnableUpgradeable, ACP99Manager {
         0xe92546d698950ddd38910d2e15ed1d923cd0a7b3dde9e2a6a3f380565559cb00;
 
     uint8 public constant MAXIMUM_CHURN_PERCENTAGE_LIMIT = 20;
-    uint64 public constant MAXIMUM_REGISTRATION_EXPIRY_LENGTH = 2 days;
+    uint64 public constant MAXIMUM_REGISTRATION_EXPIRY_LENGTH = 1 days;
     uint32 public constant ADDRESS_LENGTH = 20; // This is only used as a packed uint32
     uint32 public constant NODE_ID_LENGTH = 20;
     uint8 public constant BLS_PUBLIC_KEY_LENGTH = 48;
@@ -388,6 +388,12 @@ contract ValidatorManager is Initializable, OwnableUpgradeable, ACP99Manager {
                 weight: weight
             })
         );
+
+        // Ensure that this validation ID has not been used before to prevent replays
+        if ($._validationPeriods[validationID].status != ValidatorStatus.Unknown) {
+            revert InvalidValidatorStatus($._validationPeriods[validationID].status);
+        }
+
         $._pendingRegisterValidationMessages[validationID] = registerL1ValidatorMessage;
         $._registeredValidators[nodeID] = validationID;
 

contracts/validator-manager/tests/StakingManagerTests.t.sol

@@ -1281,6 +1281,58 @@ abstract contract StakingManagerTest is ValidatorManagerTest {
         });
     }
 
+    function testReplayValidatorRegistration() public virtual override {
+        bytes32 validationID = _registerDefaultValidator();
+        bytes memory setWeightMessage =
+            ValidatorMessages.packL1ValidatorWeightMessage(validationID, 1, 0);
+        bytes memory uptimeMessage = ValidatorMessages.packValidationUptimeMessage(
+            validationID, DEFAULT_COMPLETION_TIMESTAMP - DEFAULT_REGISTRATION_TIMESTAMP
+        );
+        _initiateValidatorRemoval({
+            validationID: validationID,
+            completionTimestamp: DEFAULT_COMPLETION_TIMESTAMP,
+            setWeightMessage: setWeightMessage,
+            includeUptime: true,
+            uptimeMessage: uptimeMessage,
+            force: false
+        });
+
+        uint256 expectedReward = rewardCalculator.calculateReward({
+            stakeAmount: _weightToValue(DEFAULT_WEIGHT),
+            validatorStartTime: DEFAULT_REGISTRATION_TIMESTAMP,
+            stakingStartTime: DEFAULT_REGISTRATION_TIMESTAMP,
+            stakingEndTime: DEFAULT_COMPLETION_TIMESTAMP,
+            uptimeSeconds: DEFAULT_COMPLETION_TIMESTAMP - DEFAULT_REGISTRATION_TIMESTAMP
+        });
+
+        address validatorOwner = address(this);
+
+        _completeEndValidationWithChecks({
+            validationID: validationID,
+            validatorOwner: validatorOwner,
+            expectedReward: expectedReward,
+            validatorWeight: DEFAULT_WEIGHT,
+            rewardRecipient: validatorOwner
+        });
+
+        vm.warp(DEFAULT_EXPIRY - 1);
+        _beforeSend(_weightToValue(DEFAULT_WEIGHT), address(this));
+
+        vm.expectRevert(
+            abi.encodeWithSelector(
+                ValidatorManager.InvalidValidatorStatus.selector, ValidatorStatus.Completed
+            )
+        );
+        _initiateValidatorRegistration({
+            nodeID: DEFAULT_NODE_ID,
+            blsPublicKey: DEFAULT_BLS_PUBLIC_KEY,
+            remainingBalanceOwner: DEFAULT_P_CHAIN_OWNER,
+            disableOwner: DEFAULT_P_CHAIN_OWNER,
+            registrationExpiry: DEFAULT_EXPIRY,
+            weight: DEFAULT_WEIGHT
+        });
+    }
+
     function testCompleteEndValidationWithNonValidatorRewardRecipient() public virtual {
         bytes32 validationID = _registerDefaultValidator();
         bytes memory setWeightMessage =

contracts/validator-manager/tests/ValidatorManagerTests.t.sol

@@ -12,7 +12,13 @@ import {
     WarpMessage,
     IWarpMessenger
 } from "@avalabs/[email protected]/contracts/interfaces/IWarpMessenger.sol";
-import {ACP99Manager, ConversionData, InitialValidator, PChainOwner} from "../ACP99Manager.sol";
+import {
+    ACP99Manager,
+    ConversionData,
+    InitialValidator,
+    PChainOwner,
+    ValidatorStatus
+} from "../ACP99Manager.sol";
 import {OwnableUpgradeable} from
     "@openzeppelin/[email protected]/access/OwnableUpgradeable.sol";
 
@@ -279,6 +285,48 @@ abstract contract ValidatorManagerTest is Test {
         _completeValidatorRemoval(0);
     }
 
+    function testReplayValidatorRegistration() public virtual {
+        bytes32 validationID = _registerDefaultValidator();
+        bytes memory setWeightMessage =
+            ValidatorMessages.packL1ValidatorWeightMessage(validationID, 1, 0);
+        bytes memory uptimeMessage;
+        _initiateValidatorRemoval({
+            validationID: validationID,
+            completionTimestamp: DEFAULT_COMPLETION_TIMESTAMP,
+            setWeightMessage: setWeightMessage,
+            includeUptime: false,
+            uptimeMessage: uptimeMessage,
+            force: false
+        });
+
+        bytes memory l1ValidatorRegistrationMessage =
+            ValidatorMessages.packL1ValidatorRegistrationMessage(validationID, false);
+
+        _mockGetPChainWarpMessage(l1ValidatorRegistrationMessage, true);
+
+        vm.expectEmit(true, true, true, true, address(validatorManager));
+        emit CompletedValidatorRemoval(validationID);
+
+        _completeValidatorRemoval(0);
+
+        vm.warp(DEFAULT_EXPIRY - 1);
+        _beforeSend(_weightToValue(DEFAULT_WEIGHT), address(this));
+
+        vm.expectRevert(
+            abi.encodeWithSelector(
+                ValidatorManager.InvalidValidatorStatus.selector, ValidatorStatus.Completed
+            )
+        );
+        _initiateValidatorRegistration({
+            nodeID: DEFAULT_NODE_ID,
+            blsPublicKey: DEFAULT_BLS_PUBLIC_KEY,
+            remainingBalanceOwner: DEFAULT_P_CHAIN_OWNER,
+            disableOwner: DEFAULT_P_CHAIN_OWNER,
+            registrationExpiry: DEFAULT_EXPIRY,
+            weight: DEFAULT_WEIGHT
+        });
+    }
+
     function testCompleteInvalidatedValidation() public {
         bytes32 validationID = _setUpInitializeValidatorRegistration(
             DEFAULT_NODE_ID,
@@ -482,8 +530,9 @@ abstract contract ValidatorManagerTest is Test {
         uint64 weight,
         uint64 registrationExpiry,
         bytes memory blsPublicKey
-    ) internal returns (bytes32 validationID) {
-        (validationID,) = ValidatorMessages.packRegisterL1ValidatorMessage(
+    ) internal returns (bytes32) {
+        (bytes32 validationID, bytes memory registerL1ValidatorMessage) = ValidatorMessages
+            .packRegisterL1ValidatorMessage(
             ValidatorMessages.ValidationPeriod({
                 nodeID: nodeID,
                 subnetID: subnetID,
@@ -494,19 +543,8 @@ abstract contract ValidatorManagerTest is Test {
                 weight: weight
             })
         );
+
         bytes20 fixedID = _fixedNodeID(nodeID);
-        (, bytes memory registerL1ValidatorMessage) = ValidatorMessages
-            .packRegisterL1ValidatorMessage(
-            ValidatorMessages.ValidationPeriod({
-                subnetID: subnetID,
-                nodeID: nodeID,
-                blsPublicKey: blsPublicKey,
-                registrationExpiry: registrationExpiry,
-                remainingBalanceOwner: DEFAULT_P_CHAIN_OWNER,
-                disableOwner: DEFAULT_P_CHAIN_OWNER,
-                weight: weight
-            })
-        );
         vm.warp(registrationExpiry - 1);
         _mockSendWarpMessage(registerL1ValidatorMessage, bytes32(0));
 
@@ -524,6 +562,8 @@ abstract contract ValidatorManagerTest is Test {
             registrationExpiry: registrationExpiry,
             weight: weight
         });
+
+        return validationID;
     }
 
     function _registerValidator(

tests/flows/validator-manager/poa_to_pos.go

@@ -176,6 +176,10 @@ func PoAMigrationToPoS(network *localnetwork.LocalNetwork) {
 	Expect(err).Should(BeNil())
 	Expect(validationID[:]).Should(Equal(poaValidationID[:]))
 
+	validator, err := validatorManager.GetValidator(&bind.CallOpts{}, validationID)
+	Expect(err).Should(BeNil())
+	Expect(validator.EndTime).Should(Equal(uint64(0)))
+
 	//
 	// Remove the PoA validator and re-register as a PoS validator
 	//