update & integrate bindings

ava-labs · Jan 15, 2025 · 1c90d16 · 1c90d16
1 parent 23dc08d
commit 1c90d16
Show file tree

Hide file tree

Showing 8 changed files with 1,190 additions and 1,216 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/tests/flows/validator-manager/erc20_token_staking.go b/tests/flows/validator-manager/erc20_token_staking.go
@@ -142,7 +142,7 @@ func ERC20TokenStakingManager(network *localnetwork.LocalNetwork) {
 		)
 		initRegistrationEvent, err := utils.GetEventFromLogs(
 			receipt.Logs,
-			erc20StakingManager.ParseDelegatorAdded,
+			erc20StakingManager.ParseInitiatedDelegatorRegistration,
 		)
 		Expect(err).Should(BeNil())
 		delegationID = initRegistrationEvent.DelegationID
@@ -185,7 +185,7 @@ func ERC20TokenStakingManager(network *localnetwork.LocalNetwork) {
 		// Check that the validator is registered in the staking contract
 		registrationEvent, err := utils.GetEventFromLogs(
 			receipt.Logs,
-			erc20StakingManager.ParseDelegatorRegistered,
+			erc20StakingManager.ParseCompletedDelegatorRegistration,
 		)
 		Expect(err).Should(BeNil())
 		Expect(registrationEvent.ValidationID[:]).Should(Equal(validationID[:]))
@@ -207,7 +207,7 @@ func ERC20TokenStakingManager(network *localnetwork.LocalNetwork) {
 		)
 		delegatorRemovalEvent, err := utils.GetEventFromLogs(
 			receipt.Logs,
-			erc20StakingManager.ParseDelegatorRemovalInitialized,
+			erc20StakingManager.ParseInitiatedDelegatorRemoval,
 		)
 		Expect(err).Should(BeNil())
 		Expect(delegatorRemovalEvent.ValidationID[:]).Should(Equal(validationID[:]))
@@ -254,7 +254,7 @@ func ERC20TokenStakingManager(network *localnetwork.LocalNetwork) {
 		// Check that the delegator has been delisted from the staking contract
 		registrationEvent, err := utils.GetEventFromLogs(
 			receipt.Logs,
-			erc20StakingManager.ParseDelegationEnded,
+			erc20StakingManager.ParseCompletedDelegatorRemoval,
 		)
 		Expect(err).Should(BeNil())
 		Expect(registrationEvent.ValidationID[:]).Should(Equal(validationID[:]))

diff --git a/tests/flows/validator-manager/native_token_staking.go b/tests/flows/validator-manager/native_token_staking.go
@@ -136,7 +136,7 @@ func NativeTokenStakingManager(network *localnetwork.LocalNetwork) {
 		)
 		initRegistrationEvent, err := utils.GetEventFromLogs(
 			receipt.Logs,
-			nativeStakingManager.ParseDelegatorAdded,
+			nativeStakingManager.ParseInitiatedDelegatorRegistration,
 		)
 		Expect(err).Should(BeNil())
 		delegationID = initRegistrationEvent.DelegationID
@@ -179,7 +179,7 @@ func NativeTokenStakingManager(network *localnetwork.LocalNetwork) {
 		// Check that the validator is registered in the staking contract
 		registrationEvent, err := utils.GetEventFromLogs(
 			receipt.Logs,
-			nativeStakingManager.ParseDelegatorRegistered,
+			nativeStakingManager.ParseCompletedDelegatorRegistration,
 		)
 		Expect(err).Should(BeNil())
 		Expect(registrationEvent.ValidationID[:]).Should(Equal(validationID[:]))
@@ -200,7 +200,7 @@ func NativeTokenStakingManager(network *localnetwork.LocalNetwork) {
 		)
 		delegatorRemovalEvent, err := utils.GetEventFromLogs(
 			receipt.Logs,
-			nativeStakingManager.ParseDelegatorRemovalInitialized,
+			nativeStakingManager.ParseInitiatedDelegatorRemoval,
 		)
 		Expect(err).Should(BeNil())
 		Expect(delegatorRemovalEvent.ValidationID[:]).Should(Equal(validationID[:]))
@@ -247,7 +247,7 @@ func NativeTokenStakingManager(network *localnetwork.LocalNetwork) {
 		// Check that the delegator has been delisted from the staking contract
 		registrationEvent, err := utils.GetEventFromLogs(
 			receipt.Logs,
-			nativeStakingManager.ParseDelegationEnded,
+			nativeStakingManager.ParseCompletedDelegatorRemoval,
 		)
 		Expect(err).Should(BeNil())
 		Expect(registrationEvent.ValidationID[:]).Should(Equal(validationID[:]))

diff --git a/tests/flows/validator-manager/poa_to_pos.go b/tests/flows/validator-manager/poa_to_pos.go
@@ -104,13 +104,13 @@ func PoAMigrationToPoS(network *localnetwork.LocalNetwork) {
 	opts, err := bind.NewKeyedTransactorWithChainID(fundedKey, l1AInfo.EVMChainID)
 	Expect(err).Should(BeNil())
 
-	_, err = poaValidatorManager.InitializeValidatorRegistration(
+	_, err = poaValidatorManager.InitiateValidatorRegistration(
 		opts,
-		poavalidatormanager.ValidatorRegistrationInput{
-			NodeID:             nodes[0].NodeID[:],
-			RegistrationExpiry: uint64(time.Now().Add(24 * time.Hour).Unix()),
-			BlsPublicKey:       nodes[0].NodePoP.PublicKey[:],
-		},
+		nodes[0].NodeID[:],
+		nodes[0].NodePoP.PublicKey[:],
+		uint64(time.Now().Add(24*time.Hour).Unix()),
+		poavalidatormanager.PChainOwner{},
+		poavalidatormanager.PChainOwner{},
 		nodes[0].Weight,
 	)
 	Expect(err).ShouldNot(BeNil())

diff --git a/tests/utils/validator_manager.go b/tests/utils/validator_manager.go
@@ -385,13 +385,13 @@ func InitializeNativeValidatorRegistration(
 	Expect(err).Should(BeNil())
 	opts.Value = stakeAmount
 
-	tx, err := stakingManager.InitializeValidatorRegistration(
+	tx, err := stakingManager.InitiateValidatorRegistration(
 		opts,
-		nativetokenstakingmanager.ValidatorRegistrationInput{
-			NodeID:             node.NodeID[:],
-			RegistrationExpiry: expiry,
-			BlsPublicKey:       node.NodePoP.PublicKey[:],
-		},
+		node.NodeID[:],
+		node.NodePoP.PublicKey[:],
+		expiry,
+		nativetokenstakingmanager.PChainOwner{},
+		nativetokenstakingmanager.PChainOwner{},
 		DefaultMinDelegateFeeBips,
 		DefaultMinStakeDurationSeconds,
 	)
@@ -431,13 +431,13 @@ func InitializeERC20ValidatorRegistration(
 	opts, err := bind.NewKeyedTransactorWithChainID(senderKey, l1.EVMChainID)
 	Expect(err).Should(BeNil())
 
-	tx, err := stakingManager.InitializeValidatorRegistration(
+	tx, err := stakingManager.InitiateValidatorRegistration(
 		opts,
-		erc20tokenstakingmanager.ValidatorRegistrationInput{
-			NodeID:             node.NodeID[:],
-			RegistrationExpiry: expiry,
-			BlsPublicKey:       node.NodePoP.PublicKey[:],
-		},
+		node.NodeID[:],
+		node.NodePoP.PublicKey[:],
+		expiry,
+		erc20tokenstakingmanager.PChainOwner{},
+		erc20tokenstakingmanager.PChainOwner{},
 		DefaultMinDelegateFeeBips,
 		DefaultMinStakeDurationSeconds,
 		stakeAmount,
@@ -467,13 +467,13 @@ func InitializePoAValidatorRegistration(
 	opts, err := bind.NewKeyedTransactorWithChainID(senderKey, l1.EVMChainID)
 	Expect(err).Should(BeNil())
 
-	tx, err := validatorManager.InitializeValidatorRegistration(
+	tx, err := validatorManager.InitiateValidatorRegistration(
 		opts,
-		poavalidatormanager.ValidatorRegistrationInput{
-			NodeID:             node.NodeID[:],
-			RegistrationExpiry: expiry,
-			BlsPublicKey:       node.NodePoP.PublicKey[:],
-		},
+		node.NodeID[:],
+		node.NodePoP.PublicKey[:],
+		expiry,
+		poavalidatormanager.PChainOwner{},
+		poavalidatormanager.PChainOwner{},
 		node.Weight,
 	)
 	Expect(err).Should(BeNil())
@@ -774,11 +774,12 @@ func InitializeEndPoSValidation(
 ) *types.Receipt {
 	opts, err := bind.NewKeyedTransactorWithChainID(senderKey, l1.EVMChainID)
 	Expect(err).Should(BeNil())
-	tx, err := stakingManager.InitializeEndValidation0(
+	tx, err := stakingManager.InitiateValidatorRemoval0(
 		opts,
 		validationID,
 		false,
 		0,
+		common.Address{},
 	)
 	Expect(err).Should(BeNil())
 	return WaitForTransactionSuccess(ctx, l1, tx.Hash())
@@ -793,7 +794,7 @@ func ForceInitializeEndPoSValidation(
 ) *types.Receipt {
 	opts, err := bind.NewKeyedTransactorWithChainID(senderKey, l1.EVMChainID)
 	Expect(err).Should(BeNil())
-	tx, err := stakingManager.ForceInitializeEndValidation(
+	tx, err := stakingManager.ForceInitiateValidatorRemoval(
 		opts,
 		validationID,
 		false,
@@ -851,7 +852,7 @@ func ForceInitializeEndPoSValidationWithUptime(
 
 	abi, err := iposvalidatormanager.IPoSValidatorManagerMetaData.GetAbi()
 	Expect(err).Should(BeNil())
-	callData, err := abi.Pack("forceInitializeEndValidation", validationID, true, uint32(0))
+	callData, err := abi.Pack("forceInitiateValidatorRemoval", validationID, true, uint32(0))
 	Expect(err).Should(BeNil())
 	return CallWarpReceiver(
 		ctx,
@@ -883,7 +884,7 @@ func InitializeEndPoSValidationWithUptime(
 
 	abi, err := iposvalidatormanager.IPoSValidatorManagerMetaData.GetAbi()
 	Expect(err).Should(BeNil())
-	callData, err := abi.Pack("initializeEndValidation", validationID, true, uint32(0))
+	callData, err := abi.Pack("initiateValidatorRemoval", validationID, true, uint32(0))
 	Expect(err).Should(BeNil())
 	return CallWarpReceiver(
 		ctx,
@@ -904,7 +905,7 @@ func InitializeEndPoAValidation(
 ) *types.Receipt {
 	opts, err := bind.NewKeyedTransactorWithChainID(senderKey, l1.EVMChainID)
 	Expect(err).Should(BeNil())
-	tx, err := validatorManager.InitializeEndValidation(
+	tx, err := validatorManager.InitiateValidatorRemoval(
 		opts,
 		validationID,
 	)
@@ -955,7 +956,7 @@ func InitializeERC20DelegatorRegistration(
 	opts, err := bind.NewKeyedTransactorWithChainID(senderKey, l1.EVMChainID)
 	Expect(err).Should(BeNil())
 
-	tx, err := stakingManager.InitializeDelegatorRegistration(
+	tx, err := stakingManager.InitiateDelegatorRegistration(
 		opts,
 		validationID,
 		delegationAmount,
@@ -964,7 +965,7 @@ func InitializeERC20DelegatorRegistration(
 	receipt := WaitForTransactionSuccess(ctx, l1, tx.Hash())
 	_, err = GetEventFromLogs(
 		receipt.Logs,
-		stakingManager.ParseDelegatorAdded,
+		stakingManager.ParseInitiatedDelegatorRegistration,
 	)
 	Expect(err).Should(BeNil())
 	return receipt
@@ -983,15 +984,15 @@ func InitializeNativeDelegatorRegistration(
 	Expect(err).Should(BeNil())
 	opts.Value = delegationAmount
 
-	tx, err := stakingManager.InitializeDelegatorRegistration(
+	tx, err := stakingManager.InitiateDelegatorRegistration(
 		opts,
 		validationID,
 	)
 	Expect(err).Should(BeNil())
 	receipt := WaitForTransactionSuccess(ctx, l1, tx.Hash())
 	_, err = GetEventFromLogs(
 		receipt.Logs,
-		stakingManager.ParseDelegatorAdded,
+		stakingManager.ParseInitiatedDelegatorRegistration,
 	)
 	Expect(err).Should(BeNil())
 	return receipt
@@ -1031,7 +1032,7 @@ func InitializeEndDelegation(
 	WaitMinStakeDuration(ctx, l1, senderKey)
 	opts, err := bind.NewKeyedTransactorWithChainID(senderKey, l1.EVMChainID)
 	Expect(err).Should(BeNil())
-	tx, err := stakingManager.ForceInitializeEndDelegation(
+	tx, err := stakingManager.ForceInitiateDelegatorRemoval(
 		opts,
 		delegationID,
 		false,