Make improvements to ValidatorRegistry contract

stader-labs · Sep 16, 2024 · 1fb4937 · 1fb4937
1 parent fb5107a
commit 1fb4937
Show file tree

Hide file tree

Showing 3 changed files with 435 additions and 47 deletions.
diff --git a/contracts/MaticX.sol b/contracts/MaticX.sol
@@ -60,7 +60,7 @@ contract MaticX is
 		reentrancyGuardStatus = NOT_ENTERED;
 	}
 
-	/// -------------------------- initialize ----------------------------------
+	/// -------------------------- Initialize ----------------------------------
 
 	/// @notice Initializes the current contract.
 	/// @param _validatorRegistry - Address of the validator registry

diff --git a/contracts/ValidatorRegistry.sol b/contracts/ValidatorRegistry.sol
@@ -63,7 +63,7 @@ contract ValidatorRegistry is
 		_;
 	}
 
-	/// -------------------------- initialize ----------------------------------
+	/// -------------------------- Initialize ----------------------------------
 
 	/// @notice Initialize the ValidatorRegistry contract.
 	/// @param _stakeManager address of the polygon stake manager.
@@ -124,12 +124,12 @@ contract ValidatorRegistry is
 
 		require(
 			smValidator.contractAddress != address(0),
-			"Validator has no ValidatorShare"
+			"Validator has no validator share"
 		);
 		require(
 			(smValidator.status == IStakeManager.Status.Active) &&
 				smValidator.deactivationEpoch == 0,
-			"Validator isn't ACTIVE"
+			"Validator isn't active"
 		);
 
 		validators.push(_validatorId);
@@ -175,8 +175,8 @@ contract ValidatorRegistry is
 				++i;
 			}
 		}
-		validators.pop();
 
+		validators.pop();
 		delete validatorIdExists[_validatorId];
 
 		emit RemoveValidator(_validatorId);
@@ -272,6 +272,7 @@ contract ValidatorRegistry is
 	function getValidatorId(
 		uint256 _index
 	) external view override returns (uint256) {
+		require(_index < validators.length, "Invalid validator index");
 		return validators[_index];
 	}