lint

Author: felipemadero

cmd/blockchaincmd/change_weight.go

@@ -25,12 +25,12 @@ import (
 	sdkutils "github.com/ava-labs/avalanche-cli/sdk/utils"
 	"github.com/ava-labs/avalanche-cli/sdk/validator"
 	"github.com/ava-labs/avalanchego/ids"
-	"github.com/ava-labs/avalanchego/vms/platformvm"
 	"github.com/ava-labs/avalanchego/utils/crypto/bls"
 	"github.com/ava-labs/avalanchego/utils/formatting"
 	"github.com/ava-labs/avalanchego/utils/formatting/address"
 	"github.com/ava-labs/avalanchego/utils/logging"
 	"github.com/ava-labs/avalanchego/utils/units"
+	"github.com/ava-labs/avalanchego/vms/platformvm"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/spf13/cobra"
@@ -424,11 +424,10 @@ func changeWeightACP99(
 	if !skipPChain {
 		txID, _, err := deployer.SetL1ValidatorWeight(signedMessage)
 		if err != nil {
-			if newWeight == 0 && strings.Contains(err.Error(), "could not load L1 validator: not found") {
-				ux.Logger.PrintToUser(logging.LightBlue.Wrap("The Weight was already set to 0 on the P-Chain. Proceeding to the next step"))
-			} else {
+			if newWeight != 0 || !strings.Contains(err.Error(), "could not load L1 validator: not found") {
 				return err
 			}
+			ux.Logger.PrintToUser(logging.LightBlue.Wrap("The Weight was already set to 0 on the P-Chain. Proceeding to the next step"))
 		} else {
 			ux.Logger.PrintToUser("SetL1ValidatorWeightTx ID: %s", txID)
 			if err := blockchain.UpdatePChainHeight(

pkg/validatormanager/helpers.go

@@ -3,8 +3,8 @@
 package validatormanager
 
 import (
-	"math/big"
 	"context"
+	"math/big"
 
 	"github.com/ava-labs/avalanche-cli/pkg/utils"
 	"github.com/ava-labs/avalanche-cli/sdk/evm"
@@ -33,19 +33,21 @@ func GetValidatorNonce(
 	count := uint64(0)
 	maxBlock := int64(height)
 	minBlock := int64(0)
-	for blockNumber := maxBlock; blockNumber >= minBlock; blockNumber-- {
+	blockStep := int64(5000)
+	for blockNumber := maxBlock; blockNumber >= minBlock; blockNumber -= blockStep {
 		select {
-	        case <-ctx.Done():
+		case <-ctx.Done():
 			return 0, ctx.Err()
 		default:
 		}
-		block, err := client.BlockByNumber(big.NewInt(blockNumber))
-		if err != nil {
-			return 0, err
+		fromBlock := big.NewInt(blockNumber - blockStep)
+		if fromBlock.Sign() < 0 {
+			fromBlock = big.NewInt(0)
 		}
-		blockHash := block.Hash()
+		toBlock := big.NewInt(blockNumber)
 		logs, err := client.FilterLogs(interfaces.FilterQuery{
-			BlockHash: &blockHash,
+			FromBlock: fromBlock,
+			ToBlock:   toBlock,
 			Addresses: []common.Address{subnetEvmWarp.Module.Address},
 		})
 		if err != nil {

pkg/validatormanager/registration.go

@@ -643,20 +643,20 @@ func SearchForRegisterL1ValidatorMessage(
 	maxBlock := int64(height)
 	minBlock := int64(0)
 	blockStep := int64(5000)
-	for blockNumber := maxBlock; blockNumber >= minBlock; blockNumber-=blockStep {
+	for blockNumber := maxBlock; blockNumber >= minBlock; blockNumber -= blockStep {
 		select {
-	        case <-ctx.Done():
+		case <-ctx.Done():
 			return nil, ctx.Err()
 		default:
 		}
-		fromBlock := big.NewInt(blockNumber-blockStep)
+		fromBlock := big.NewInt(blockNumber - blockStep)
 		if fromBlock.Sign() < 0 {
 			fromBlock = big.NewInt(0)
 		}
 		toBlock := big.NewInt(blockNumber)
 		logs, err := client.FilterLogs(interfaces.FilterQuery{
 			FromBlock: fromBlock,
-			ToBlock: toBlock,
+			ToBlock:   toBlock,
 			Addresses: []common.Address{subnetEvmWarp.Module.Address},
 		})
 		if err != nil {

pkg/validatormanager/weight_update.go

@@ -431,7 +431,7 @@ func SearchForL1ValidatorWeightMessage(
 	validationID ids.ID,
 	weight uint64,
 ) (*warp.UnsignedMessage, error) {
-	const maxBlocksToSearch = 500
+	maxBlocksToSearch := int64(5000000)
 	client, err := evm.GetClient(rpcURL)
 	if err != nil {
 		return nil, err
@@ -442,19 +442,21 @@ func SearchForL1ValidatorWeightMessage(
 	}
 	maxBlock := int64(height)
 	minBlock := max(maxBlock-maxBlocksToSearch, 0)
-	for blockNumber := maxBlock; blockNumber >= minBlock; blockNumber-- {
+	blockStep := int64(5000)
+	for blockNumber := maxBlock; blockNumber >= minBlock; blockNumber -= blockStep {
 		select {
-	        case <-ctx.Done():
+		case <-ctx.Done():
 			return nil, ctx.Err()
 		default:
 		}
-		block, err := client.BlockByNumber(big.NewInt(blockNumber))
-		if err != nil {
-			return nil, err
+		fromBlock := big.NewInt(blockNumber - blockStep)
+		if fromBlock.Sign() < 0 {
+			fromBlock = big.NewInt(0)
 		}
-		blockHash := block.Hash()
+		toBlock := big.NewInt(blockNumber)
 		logs, err := client.FilterLogs(interfaces.FilterQuery{
-			BlockHash: &blockHash,
+			FromBlock: fromBlock,
+			ToBlock:   toBlock,
 			Addresses: []common.Address{subnetEvmWarp.Module.Address},
 		})
 		if err != nil {