review comments

ava-labs · Jan 23, 2025 · 5ec426b · 5ec426b
1 parent 88b175d
commit 5ec426b
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 10 deletions.
diff --git a/abi-bindings/go/validator-manager/ERC20TokenStakingManager/ERC20TokenStakingManager.go b/abi-bindings/go/validator-manager/ERC20TokenStakingManager/ERC20TokenStakingManager.go
diff --git a/abi-bindings/go/validator-manager/NativeTokenStakingManager/NativeTokenStakingManager.go b/abi-bindings/go/validator-manager/NativeTokenStakingManager/NativeTokenStakingManager.go
diff --git a/abi-bindings/go/validator-manager/PoAValidatorManager/PoAValidatorManager.go b/abi-bindings/go/validator-manager/PoAValidatorManager/PoAValidatorManager.go
diff --git a/contracts/validator-manager/PoSValidatorManager.sol b/contracts/validator-manager/PoSValidatorManager.sol
@@ -324,6 +324,9 @@ abstract contract PoSValidatorManager is
         PoSValidatorManagerStorage storage $ = _getPoSValidatorManagerStorage();
 
         _initiateValidatorRemoval(validationID);
+
+        // The validator must be fetched after the removal has been initiated, since the above call modifies
+        // the validator's state.
         Validator memory validator = getValidator(validationID);
 
         // Non-PoS validators are required to boostrap the network, but are not eligible for rewards.
@@ -439,7 +442,7 @@ abstract contract PoSValidatorManager is
         (bytes32 uptimeValidationID, uint64 uptime) =
             ValidatorMessages.unpackValidationUptimeMessage(warpMessage.payload);
         if (validationID != uptimeValidationID) {
-            revert InvalidValidationID(validationID);
+            revert UnexpectedValidationID(uptimeValidationID, validationID);
         }
 
         if (uptime > $._posValidatorInfo[validationID].uptimeSeconds) {
@@ -613,8 +616,9 @@ abstract contract PoSValidatorManager is
         if (validator.receivedNonce < delegator.startingNonce) {
             (bytes32 messageValidationID, uint64 nonce) =
                 completeValidatorWeightUpdate(messageIndex);
+
             if (validationID != messageValidationID) {
-                revert InvalidValidationID(delegator.validationID);
+                revert UnexpectedValidationID(messageValidationID, validationID);
             }
             if (nonce < delegator.startingNonce) {
                 revert InvalidNonce(nonce);
@@ -875,7 +879,7 @@ abstract contract PoSValidatorManager is
         ) {
             (bytes32 validationID, uint64 nonce) = completeValidatorWeightUpdate(messageIndex);
             if (delegator.validationID != validationID) {
-                revert InvalidValidationID(validationID);
+                revert UnexpectedValidationID(validationID, delegator.validationID);
             }
 
             // The received nonce should be at least as high as the delegation's ending nonce. This allows a weight

diff --git a/contracts/validator-manager/ValidatorManager.sol b/contracts/validator-manager/ValidatorManager.sol
@@ -83,6 +83,7 @@ abstract contract ValidatorManager is
     error InvalidNodeID(bytes nodeID);
     error InvalidConversionID(bytes32 encodedConversionID, bytes32 expectedConversionID);
     error InvalidTotalWeight(uint64 weight);
+    error UnexpectedValidationID(bytes32 validationID, bytes32 expectedValidationID);
     error InvalidValidationID(bytes32 validationID);
     error InvalidValidatorStatus(ValidatorStatus status);
     error InvalidNonce(uint64 nonce);

diff --git a/contracts/validator-manager/tests/PoSValidatorManagerTests.t.sol b/contracts/validator-manager/tests/PoSValidatorManagerTests.t.sol
@@ -219,7 +219,9 @@ abstract contract PoSValidatorManagerTest is ValidatorManagerTest {
 
         vm.warp(DEFAULT_COMPLETION_TIMESTAMP);
         vm.expectRevert(
-            abi.encodeWithSelector(ValidatorManager.InvalidValidationID.selector, validationID)
+            abi.encodeWithSelector(
+                ValidatorManager.UnexpectedValidationID.selector, bytes32(0), validationID
+            )
         );
         posValidatorManager.initializeEndValidation(validationID, true, 0);
     }