Merge pull request #698 from ava-labs/event-indexing-improvements

Event indexing improvements
ava-labs · Jan 13, 2025 · 8f7c7b3 · 8f7c7b3
2 parents 3ee1922 + ded13cc
commit 8f7c7b3
Show file tree

Hide file tree

Showing 10 changed files with 141 additions and 221 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/abi-bindings/go/validator-manager/interfaces/IPoSValidatorManager/IPoSValidatorManager.go b/abi-bindings/go/validator-manager/interfaces/IPoSValidatorManager/IPoSValidatorManager.go
diff --git a/abi-bindings/go/validator-manager/interfaces/IValidatorManager/IValidatorManager.go b/abi-bindings/go/validator-manager/interfaces/IValidatorManager/IValidatorManager.go
diff --git a/contracts/validator-manager/ValidatorManager.sol b/contracts/validator-manager/ValidatorManager.sol
@@ -189,7 +189,7 @@ abstract contract ValidatorManager is Initializable, ContextUpgradeable, IValida
             totalWeight += initialValidator.weight;
 
             emit InitialValidatorCreated(
-                validationID, initialValidator.nodeID, initialValidator.weight
+                validationID, initialValidator.weight, initialValidator.nodeID
             );
         }
         $._churnTracker.totalWeight = totalWeight;
@@ -300,7 +300,7 @@ abstract contract ValidatorManager is Initializable, ContextUpgradeable, IValida
         $._validationPeriods[validationID].endedAt = 0;
 
         emit ValidationPeriodCreated(
-            validationID, input.nodeID, messageID, weight, input.registrationExpiry
+            validationID, messageID, weight, input.nodeID, input.registrationExpiry
         );
 
         return validationID;

diff --git a/contracts/validator-manager/interfaces/IValidatorManager.sol b/contracts/validator-manager/interfaces/IValidatorManager.sol
@@ -112,15 +112,13 @@ interface IValidatorManager {
      */
     event ValidationPeriodCreated(
         bytes32 indexed validationID,
-        bytes indexed nodeID,
         bytes32 indexed registerValidationMessageID,
         uint64 weight,
+        bytes nodeID,
         uint64 registrationExpiry
     );
 
-    event InitialValidatorCreated(
-        bytes32 indexed validationID, bytes indexed nodeID, uint64 weight
-    );
+    event InitialValidatorCreated(bytes32 indexed validationID, uint64 weight, bytes nodeID);
 
     /**
      * @notice Emitted when the staking manager learns that the validation period has been successfully registered

diff --git a/contracts/validator-manager/tests/PoSValidatorManagerTests.t.sol b/contracts/validator-manager/tests/PoSValidatorManagerTests.t.sol
@@ -55,8 +55,6 @@ abstract contract PoSValidatorManagerTest is ValidatorManagerTest {
         disableOwner: DEFAULT_P_CHAIN_OWNER
     });
 
-    event ValidationUptimeUpdated(bytes32 indexed validationID, uint64 uptime);
-
     event DelegatorAdded(
         bytes32 indexed delegationID,
         bytes32 indexed validationID,
@@ -73,13 +71,6 @@ abstract contract PoSValidatorManagerTest is ValidatorManagerTest {
 
     event DelegatorRemovalInitialized(bytes32 indexed delegationID, bytes32 indexed validationID);
 
-    event ValidatorWeightUpdate(
-        bytes32 indexed validationID,
-        uint64 indexed nonce,
-        uint64 weight,
-        bytes32 setWeightMessageID
-    );
-
     event DelegationEnded(
         bytes32 indexed delegationID, bytes32 indexed validationID, uint256 rewards, uint256 fees
     );

diff --git a/contracts/validator-manager/tests/ValidatorManagerTests.t.sol b/contracts/validator-manager/tests/ValidatorManagerTests.t.sol
@@ -64,15 +64,13 @@ abstract contract ValidatorManagerTest is Test {
 
     event ValidationPeriodCreated(
         bytes32 indexed validationID,
-        bytes indexed nodeID,
         bytes32 indexed registerValidationMessageID,
         uint64 weight,
+        bytes nodeID,
         uint64 registrationExpiry
     );
 
-    event InitialValidatorCreated(
-        bytes32 indexed validationID, bytes indexed nodeID, uint64 weight
-    );
+    event InitialValidatorCreated(bytes32 indexed validationID, uint64 weight, bytes nodeID);
 
     event ValidationPeriodRegistered(
         bytes32 indexed validationID, uint64 weight, uint256 timestamp
@@ -87,6 +85,13 @@ abstract contract ValidatorManagerTest is Test {
 
     event ValidationPeriodEnded(bytes32 indexed validationID, ValidatorStatus indexed status);
 
+    event ValidatorWeightUpdate(
+        bytes32 indexed validationID,
+        uint64 indexed nonce,
+        uint64 weight,
+        bytes32 setWeightMessageID
+    );
+
     receive() external payable {}
     fallback() external payable {}
 
@@ -446,7 +451,7 @@ abstract contract ValidatorManagerTest is Test {
 
         _beforeSend(_weightToValue(weight), address(this));
         vm.expectEmit(true, true, true, true, address(validatorManager));
-        emit ValidationPeriodCreated(validationID, nodeID, bytes32(0), weight, registrationExpiry);
+        emit ValidationPeriodCreated(validationID, bytes32(0), weight, nodeID, registrationExpiry);
 
         _initializeValidatorRegistration(
             ValidatorRegistrationInput({

diff --git a/tests/utils/validator_manager.go b/tests/utils/validator_manager.go
@@ -324,11 +324,14 @@ func InitializeValidatorSet(
 	)
 	manager, err := ivalidatormanager.NewIValidatorManager(validatorManagerAddress, l1Info.RPCClient)
 	Expect(err).Should(BeNil())
+
+	// Check that the first initial validator was registered successfully
 	initialValidatorCreatedEvent, err := GetEventFromLogs(
 		receipt.Logs,
 		manager.ParseInitialValidatorCreated,
 	)
 	Expect(err).Should(BeNil())
+	Expect(initialValidatorCreatedEvent.NodeID).Should(Equal(nodes[0].NodeID.Bytes()))
 	var validationIDs []ids.ID
 	for i := range nodes {
 		validationIDs = append(validationIDs, l1Info.SubnetID.Append(uint32(i)))
@@ -398,6 +401,7 @@ func InitializeNativeValidatorRegistration(
 		stakingManager.ParseValidationPeriodCreated,
 	)
 	Expect(err).Should(BeNil())
+	Expect(registrationInitiatedEvent.NodeID).Should(Equal(node.NodeID.Bytes()))
 	return receipt, ids.ID(registrationInitiatedEvent.ValidationID)
 }
 
@@ -442,6 +446,7 @@ func InitializeERC20ValidatorRegistration(
 		stakingManager.ParseValidationPeriodCreated,
 	)
 	Expect(err).Should(BeNil())
+	Expect(registrationInitiatedEvent.NodeID).Should(Equal(node.NodeID.Bytes()))
 	return receipt, ids.ID(registrationInitiatedEvent.ValidationID)
 }
 
@@ -472,6 +477,7 @@ func InitializePoAValidatorRegistration(
 		validatorManager.ParseValidationPeriodCreated,
 	)
 	Expect(err).Should(BeNil())
+	Expect(registrationInitiatedEvent.NodeID).Should(Equal(node.NodeID.Bytes()))
 	return receipt, ids.ID(registrationInitiatedEvent.ValidationID)
 }