fix removal for pos (not ACP99 yet)

ava-labs · Mar 1, 2025 · bb1beb5 · bb1beb5
1 parent b7da868
commit bb1beb5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/cmd/blockchaincmd/remove_validator.go b/cmd/blockchaincmd/remove_validator.go
@@ -416,7 +416,7 @@ func removeValidatorSOV(
 		aggregatorAllowPrivatePeers,
 		aggregatorLogger,
 		validatorManagerAddress,
-		sc.UseACP99,
+		sc.PoA() && sc.UseACP99,
 	)
 	if err != nil {
 		return err

diff --git a/pkg/validatormanager/removal.go b/pkg/validatormanager/removal.go
@@ -159,7 +159,7 @@ func InitValidatorRemoval(
 	aggregatorExtraPeerEndpoints []info.Peer,
 	aggregatorAllowPrivatePeers bool,
 	aggregatorLogger logging.Logger,
-	initWithPos bool,
+	isPoS bool,
 	uptimeSec uint64,
 	force bool,
 	validatorManagerAddressStr string,
@@ -196,7 +196,7 @@ func InitValidatorRemoval(
 	}
 
 	signedUptimeProof := &warp.Message{}
-	if initWithPos {
+	if isPoS {
 		if uptimeSec == 0 {
 			uptimeSec, err = utils.GetL1ValidatorUptimeSeconds(rpcURL, nodeID)
 			if err != nil {
@@ -226,7 +226,7 @@ func InitValidatorRemoval(
 		ownerAddress,
 		ownerPrivateKey,
 		validationID,
-		initWithPos,
+		isPoS,
 		signedUptimeProof, // is empty for non-PoS
 		force,
 		useACP99,