Stored keys on mainnet with improved pchain wait

cmd/blockchaincmd/add_validator.go

@@ -8,7 +8,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/ava-labs/avalanche-cli/pkg/signatureAggregator"
+	"github.com/ava-labs/avalanche-cli/pkg/signatureaggregator"
 
 	"github.com/ava-labs/avalanche-cli/cmd/flags"
 
@@ -513,7 +513,7 @@ func CallAddValidator(
 	if err != nil {
 		return err
 	}
-	aggregatorLogger, err := signatureAggregator.NewSignatureAggregatorLoggerNewLogger(
+	aggregatorLogger, err := signatureaggregator.NewSignatureAggregatorLoggerNewLogger(
 		addValidatorFlags.SigAggFlags.AggregatorLogLevel,
 		addValidatorFlags.SigAggFlags.AggregatorLogToStdout,
 		app.GetAggregatorLogDir(clusterNameFlagValue),

cmd/blockchaincmd/change_weight.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/ava-labs/avalanche-cli/pkg/signatureAggregator"
+	"github.com/ava-labs/avalanche-cli/pkg/signatureaggregator"
 
 	"github.com/ava-labs/avalanche-cli/cmd/flags"
 
@@ -365,7 +365,7 @@ func changeWeightACP99(
 	if err != nil {
 		return err
 	}
-	aggregatorLogger, err := signatureAggregator.NewSignatureAggregatorLoggerNewLogger(
+	aggregatorLogger, err := signatureaggregator.NewSignatureAggregatorLoggerNewLogger(
 		changeWeightFlags.SigAggFlags.AggregatorLogLevel,
 		changeWeightFlags.SigAggFlags.AggregatorLogToStdout,
 		app.GetAggregatorLogDir(clusterName),

cmd/blockchaincmd/convert.go

@@ -10,7 +10,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/ava-labs/avalanche-cli/pkg/signatureAggregator"
+	"github.com/ava-labs/avalanche-cli/pkg/signatureaggregator"
 
 	"github.com/ava-labs/avalanche-cli/cmd/flags"
 
@@ -277,7 +277,7 @@ func InitializeValidatorManager(
 	validatorManagerAddrStr string,
 	proxyContractOwner string,
 	useACP99 bool,
-	signatureAggregatorFlags flags.SignatureAggregatorFlags,
+	signatureaggregatorFlags flags.SignatureAggregatorFlags,
 ) (bool, error) {
 	if useACP99 {
 		ux.Logger.PrintToUser(logging.Yellow.Wrap("Validator Manager Protocol: ACP99"))
@@ -381,9 +381,9 @@ func InitializeValidatorManager(
 		RPC:                 rpcURL,
 		BootstrapValidators: avaGoBootstrapValidators,
 	}
-	aggregatorLogger, err := signatureAggregator.NewSignatureAggregatorLoggerNewLogger(
-		signatureAggregatorFlags.AggregatorLogLevel,
-		signatureAggregatorFlags.AggregatorLogToStdout,
+	aggregatorLogger, err := signatureaggregator.NewSignatureAggregatorLoggerNewLogger(
+		signatureaggregatorFlags.AggregatorLogLevel,
+		signatureaggregatorFlags.AggregatorLogToStdout,
 		app.GetAggregatorLogDir(clusterName),
 	)
 	if err != nil {
@@ -459,7 +459,6 @@ func convertSubnetToL1(
 	if err != nil {
 		return avaGoBootstrapValidators, false, false, err
 	}
-	deployer.CleanCacheWallet()
 	managerAddress := common.HexToAddress(validatorManagerAddressStr)
 
 	if doStrongInputsCheck {

cmd/blockchaincmd/deploy.go

@@ -733,6 +733,7 @@ func deployBlockchain(cmd *cobra.Command, args []string) error {
 		if err != nil {
 			return err
 		}
+		// TODO: remove once dynamic fees conf can be updated on wallet
 		deployer.CleanCacheWallet()
 		// get the control keys in the same order as the tx
 		_, controlKeys, threshold, err = txutils.GetOwners(network, subnetID)
@@ -761,7 +762,10 @@ func deployBlockchain(cmd *cobra.Command, args []string) error {
 			ux.Logger.PrintToUser(logging.Red.Wrap(
 				fmt.Sprintf("error deploying blockchain: %s. fix the issue and try again with a new deploy cmd", err),
 			))
+			return err
 		}
+		// TODO: remove once dynamic fees conf can be updated on wallet
+		deployer.CleanCacheWallet()
 
 		savePartialTx = !isFullySigned && err == nil
 	}

cmd/blockchaincmd/remove_validator.go

@@ -8,10 +8,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/ava-labs/avalanche-cli/pkg/signatureAggregator"
-
 	"github.com/ava-labs/avalanche-cli/cmd/flags"
-
 	"github.com/ava-labs/avalanche-cli/pkg/blockchain"
 	"github.com/ava-labs/avalanche-cli/pkg/cobrautils"
 	"github.com/ava-labs/avalanche-cli/pkg/constants"
@@ -20,6 +17,7 @@ import (
 	"github.com/ava-labs/avalanche-cli/pkg/models"
 	"github.com/ava-labs/avalanche-cli/pkg/networkoptions"
 	"github.com/ava-labs/avalanche-cli/pkg/prompts"
+	"github.com/ava-labs/avalanche-cli/pkg/signatureaggregator"
 	"github.com/ava-labs/avalanche-cli/pkg/subnet"
 	"github.com/ava-labs/avalanche-cli/pkg/txutils"
 	"github.com/ava-labs/avalanche-cli/pkg/utils"
@@ -319,7 +317,7 @@ func removeValidatorSOV(
 	if err != nil {
 		return err
 	}
-	aggregatorLogger, err := signatureAggregator.NewSignatureAggregatorLoggerNewLogger(
+	aggregatorLogger, err := signatureaggregator.NewSignatureAggregatorLoggerNewLogger(
 		removeValidatorFlags.SigAggFlags.AggregatorLogLevel,
 		removeValidatorFlags.SigAggFlags.AggregatorLogToStdout,
 		app.GetAggregatorLogDir(clusterName),

cmd/contractcmd/init_validator_manager.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"math/big"
 
-	"github.com/ava-labs/avalanche-cli/pkg/signatureAggregator"
+	"github.com/ava-labs/avalanche-cli/pkg/signatureaggregator"
 
 	"github.com/ava-labs/avalanche-cli/cmd/flags"
 
@@ -158,7 +158,7 @@ func initValidatorManager(_ *cobra.Command, args []string) error {
 	if err != nil {
 		return err
 	}
-	aggregatorLogger, err := signatureAggregator.NewSignatureAggregatorLoggerNewLogger(
+	aggregatorLogger, err := signatureaggregator.NewSignatureAggregatorLoggerNewLogger(
 		initValidatorManagerFlags.SigAggFlags.AggregatorLogLevel,
 		initValidatorManagerFlags.SigAggFlags.AggregatorLogToStdout,
 		app.GetAggregatorLogDir(clusterName),

cmd/nodecmd/local.go

@@ -8,7 +8,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/ava-labs/avalanche-cli/pkg/signatureAggregator"
+	"github.com/ava-labs/avalanche-cli/pkg/signatureaggregator"
 
 	"github.com/ava-labs/avalanche-cli/cmd/flags"
 	"github.com/ava-labs/avalanche-cli/pkg/blockchain"
@@ -536,7 +536,7 @@ func localValidate(_ *cobra.Command, args []string) error {
 	if err != nil {
 		return err
 	}
-	aggregatorLogger, err := signatureAggregator.NewSignatureAggregatorLoggerNewLogger(
+	aggregatorLogger, err := signatureaggregator.NewSignatureAggregatorLoggerNewLogger(
 		localValidateFlags.SigAggFlags.AggregatorLogLevel,
 		localValidateFlags.SigAggFlags.AggregatorLogToStdout,
 		app.GetAggregatorLogDir(clusterName),

cmd/validatorcmd/increaseBalance.go

@@ -86,7 +86,6 @@ func increaseBalance(_ *cobra.Command, _ []string) error {
 	if err != nil {
 		return err
 	}
-	deployer := subnet.NewPublicDeployer(app, kc, network)
 
 	var balance uint64
 	if balanceAVAX == 0 {
@@ -102,11 +101,11 @@ func increaseBalance(_ *cobra.Command, _ []string) error {
 	}
 	balance = uint64(balanceAVAX * float64(units.Avax))
 
-	_, err = deployer.IncreaseValidatorPChainBalance(validationID, balance)
-	if err != nil {
+	deployer := subnet.NewPublicDeployer(app, kc, network)
+	if _, err := deployer.IncreaseValidatorPChainBalance(validationID, balance); err != nil {
 		return err
 	}
-	deployer.CleanCacheWallet()
+
 	balance, err = validator.GetValidatorBalance(network.SDKNetwork(), validationID)
 	if err != nil {
 		return err

pkg/keychain/keychain.go

@@ -31,10 +31,8 @@ const (
 
 var (
 	ErrMutuallyExlusiveKeySource = errors.New("key source flags --key, --ewoq, --ledger/--ledger-addrs are mutually exclusive")
-	ErrStoredKeyOnMainnet        = errors.New("--key flag is not supported for mainnet operations, please use ledger instead")
-	ErrNonEwoqKeyOnMainnet       = errors.New("key source --ewoq is not available for mainnet operations, please use ledger instead")
 	ErrNonEwoqKeyOnDevnet        = errors.New("key source --ewoq is the only one available for devnet operations")
-	ErrEwoqKeyOnFuji             = errors.New("key source --ewoq is not available for fuji operations")
+	ErrEwoqKeyOnFujiOrMainnet    = errors.New("key source --ewoq is not available for mainnet/fuji operations")
 )
 
 type Keychain struct {
@@ -145,9 +143,9 @@ func GetKeychainFromCmdLineFlags(
 				return nil, err
 			}
 		}
-	case network.Kind == models.Fuji:
+	case network.Kind == models.Fuji || network.Kind == models.Mainnet:
 		if useEwoq {
-			return nil, ErrEwoqKeyOnFuji
+			return nil, ErrEwoqKeyOnFujiOrMainnet
 		}
 		// prompt the user if no key source was provided
 		if !useLedger && keyName == "" {
@@ -157,15 +155,6 @@ func GetKeychainFromCmdLineFlags(
 				return nil, err
 			}
 		}
-	case network.Kind == models.Mainnet:
-		// mainnet requires ledger usage
-		if keyName != "" {
-			return nil, ErrStoredKeyOnMainnet
-		}
-		if useEwoq {
-			return nil, ErrNonEwoqKeyOnMainnet
-		}
-		useLedger = true
 	}
 
 	network.HandlePublicNetworkSimulation()

pkg/signatureAggregator/signature-aggregator.go → pkg/signatureaggregator/signature-aggregator.go

@@ -1,6 +1,6 @@
 // Copyright (C) 2022, Ava Labs, Inc. All rights reserved.
 // See the file LICENSE for licensing terms.
-package signatureAggregator
+package signatureaggregator
 
 import (
 	"github.com/ava-labs/avalanche-cli/pkg/constants"

pkg/subnet/public.go

@@ -626,6 +626,8 @@ func (d *PublicDeployer) loadWallet(subnetIDs ...ids.ID) (*primary.Wallet, error
 
 func (d *PublicDeployer) CleanCacheWallet() {
 	d.wallet = nil
+	// wait some amount of time to avoid consumed utxos to be retrieved as free ones
+	time.Sleep(5 * time.Second)
 }
 
 func (d *PublicDeployer) loadCacheWallet(preloadTxs ...ids.ID) (*primary.Wallet, error) {

pkg/validatormanager/registration.go

@@ -268,7 +268,7 @@ func GetRegisterL1ValidatorMessage(
 		}
 		validationID = reg.ValidationID()
 	}
-	signatureAggregator, err := interchain.NewSignatureAggregator(
+	signatureaggregator, err := interchain.NewSignatureAggregator(
 		ctx,
 		network.SDKNetwork(),
 		aggregatorLogger,
@@ -279,7 +279,7 @@ func GetRegisterL1ValidatorMessage(
 	if err != nil {
 		return nil, ids.Empty, err
 	}
-	signedMessage, err := signatureAggregator.Sign(registerSubnetValidatorUnsignedMessage, nil)
+	signedMessage, err := signatureaggregator.Sign(registerSubnetValidatorUnsignedMessage, nil)
 	return signedMessage, validationID, err
 }
 
@@ -330,7 +330,7 @@ func GetPChainL1ValidatorRegistrationMessage(
 	if err != nil {
 		return nil, err
 	}
-	signatureAggregator, err := interchain.NewSignatureAggregator(
+	signatureaggregator, err := interchain.NewSignatureAggregator(
 		ctx,
 		network.SDKNetwork(),
 		aggregatorLogger,
@@ -348,7 +348,7 @@ func GetPChainL1ValidatorRegistrationMessage(
 			return nil, err
 		}
 	}
-	return signatureAggregator.Sign(subnetConversionUnsignedMessage, justificationBytes)
+	return signatureaggregator.Sign(subnetConversionUnsignedMessage, justificationBytes)
 }
 
 // last step of flow for adding a new validator

tests/e2e/commands/subnet.go

@@ -601,6 +601,7 @@ func SimulateMainnetDeployNonSOV(
 			SubnetCmd,
 			"deploy",
 			"--mainnet",
+			"--ledger",
 			"--threshold",
 			"1",
 			"--same-control-key",
@@ -640,6 +641,7 @@ func SimulateMainnetDeploySOV(
 			"deploy",
 			bootstrapFilepathFlag + "=" + utils.BootstrapValidatorPath,
 			"--mainnet",
+			"--ledger",
 			"--threshold",
 			"1",
 			"--same-control-key",
@@ -678,6 +680,7 @@ func SimulateMultisigMainnetDeployNonSOV(
 			SubnetCmd,
 			"deploy",
 			"--mainnet",
+			"--ledger",
 			"--control-keys",
 			strings.Join(subnetControlAddrs, ","),
 			"--auth-keys",
@@ -717,6 +720,7 @@ func SimulateMultisigMainnetDeploySOV(
 			SubnetCmd,
 			"deploy",
 			"--mainnet",
+			"--ledger",
 			bootstrapFilepathFlag + "=" + utils.BootstrapValidatorPath,
 			"--control-keys",
 			strings.Join(subnetControlAddrs, ","),
@@ -906,6 +910,7 @@ func SimulateMainnetAddValidator(
 			SubnetCmd,
 			"addValidator",
 			"--mainnet",
+			"--ledger",
 			"--node-id",
 			nodeID,
 			"--start-time",