Validate convert txs

cmd/blockchaincmd/convert.go

@@ -11,6 +11,7 @@ import (
 	"time"
 
 	"github.com/ava-labs/avalanche-cli/pkg/blockchain"
+	"github.com/ava-labs/avalanche-cli/pkg/clierrors"
 	"github.com/ava-labs/avalanche-cli/pkg/cobrautils"
 	"github.com/ava-labs/avalanche-cli/pkg/constants"
 	"github.com/ava-labs/avalanche-cli/pkg/contract"
@@ -41,6 +42,8 @@ import (
 	"github.com/spf13/cobra"
 )
 
+var doStrongInputChecks bool
+
 // avalanche blockchain convert
 func newConvertCmd() *cobra.Command {
 	cmd := &cobra.Command{
@@ -97,6 +100,7 @@ Sovereign L1s require bootstrap validators. avalanche blockchain convert command
 	cmd.Flags().StringVar(&createFlags.proxyContractOwner, "proxy-contract-owner", "", "EVM address that controls ProxyAdmin for TransparentProxy of ValidatorManager contract")
 	cmd.Flags().Uint64Var(&createFlags.rewardBasisPoints, "reward-basis-points", 100, "(PoS only) reward basis points for PoS Reward Calculator")
 	cmd.Flags().StringVar(&validatorManagerAddress, "validator-manager-address", "", "validator manager address")
+	cmd.Flags().BoolVar(&doStrongInputChecks, "verify-input", true, "check for input confirmation")
 	return cmd
 }
 
@@ -106,7 +110,7 @@ func StartLocalMachine(
 	blockchainName string,
 	deployBalance,
 	availableBalance uint64,
-) error {
+) (bool, error) {
 	var err error
 	if network.Kind == models.Local {
 		useLocalMachine = true
@@ -117,15 +121,15 @@ func StartLocalMachine(
 		clusterName = clusterNameFlagValue
 		clusterConfig, err := app.GetClusterConfig(clusterName)
 		if err != nil {
-			return err
+			return false, err
 		}
 		// check if cluster is local
 		if clusterConfig.Local {
 			useLocalMachine = true
 			if len(bootstrapEndpoints) == 0 {
 				bootstrapEndpoints, err = getLocalBootstrapEndpoints()
 				if err != nil {
-					return fmt.Errorf("error getting local host bootstrap endpoints: %w, "+
+					return false, fmt.Errorf("error getting local host bootstrap endpoints: %w, "+
 						"please create your local node again and call blockchain deploy command again", err)
 				}
 			}
@@ -142,7 +146,7 @@ func StartLocalMachine(
 
 		useLocalMachine, err = app.Prompt.CaptureYesNo("Do you want to use your local machine as a bootstrap validator?")
 		if err != nil {
-			return err
+			return false, err
 		}
 	}
 	// default number of local machine nodes to be 1
@@ -153,7 +157,7 @@ func StartLocalMachine(
 	// if no cluster provided - we create one with fmt.Sprintf("%s-local-node-%s", blockchainName, networkNameComponent) name
 	if useLocalMachine && clusterNameFlagValue == "" {
 		if clusterExists, err := node.CheckClusterIsLocal(app, clusterName); err != nil {
-			return err
+			return false, err
 		} else if clusterExists {
 			ux.Logger.PrintToUser("")
 			ux.Logger.PrintToUser(
@@ -165,16 +169,16 @@ func StartLocalMachine(
 				fmt.Sprintf("Do you want to overwrite the current local L1 deploy for %s?", blockchainName),
 			)
 			if err != nil {
-				return err
+				return false, err
 			}
 			if !yes {
-				return nil
+				return true, nil
 			}
 			_ = node.DestroyLocalNode(app, clusterName)
 		}
 		requiredBalance := deployBalance * uint64(numLocalNodes)
 		if availableBalance < requiredBalance {
-			return fmt.Errorf(
+			return false, fmt.Errorf(
 				"required balance for %d validators dynamic fee on PChain is %d but the given key has %d",
 				numLocalNodes,
 				requiredBalance,
@@ -196,20 +200,20 @@ func StartLocalMachine(
 			)
 			if err != nil {
 				if err != vm.ErrNoAvagoVersion {
-					return err
+					return false, err
 				}
 				avagoVersion = constants.LatestPreReleaseVersionTag
 			}
 		}
 		avagoBinaryPath, err := localnet.SetupAvalancheGoBinary(app, avagoVersion, avagoBinaryPath)
 		if err != nil {
-			return err
+			return false, err
 		}
 		nodeConfig := map[string]interface{}{}
 		if app.AvagoNodeConfigExists(blockchainName) {
 			nodeConfig, err = utils.ReadJSON(app.GetAvagoNodeConfigPath(blockchainName))
 			if err != nil {
-				return err
+				return false, err
 			}
 		}
 		if partialSync {
@@ -234,18 +238,18 @@ func StartLocalMachine(
 			networkoptions.NetworkFlags{},
 			nil,
 		); err != nil {
-			return err
+			return false, err
 		}
 		clusterNameFlagValue = clusterName
 		if len(bootstrapEndpoints) == 0 {
 			bootstrapEndpoints, err = getLocalBootstrapEndpoints()
 			if err != nil {
-				return fmt.Errorf("error getting local host bootstrap endpoints: %w, "+
+				return false, fmt.Errorf("error getting local host bootstrap endpoints: %w, "+
 					"please create your local node again and call blockchain deploy command again", err)
 			}
 		}
 	}
-	return nil
+	return false, nil
 }
 
 func InitializeValidatorManager(
@@ -418,13 +422,44 @@ func convertSubnetToL1(
 	controlKeysList,
 	subnetAuthKeysList []string,
 	validatorManagerAddressStr string,
-) ([]*txs.ConvertSubnetToL1Validator, bool, error) {
+	doStrongInputsCheck bool,
+) ([]*txs.ConvertSubnetToL1Validator, bool, bool, error) {
+	if subnetID == ids.Empty {
+		return nil, false, false, clierrors.ErrNoSubnetID
+	}
+	if blockchainID == ids.Empty {
+		return nil, false, false, clierrors.ErrNoBlockchainID
+	}
+	if !common.IsHexAddress(validatorManagerAddressStr) {
+		return nil, false, false, clierrors.ErrInvalidValidatorManagerAddress
+	}
 	avaGoBootstrapValidators, err := ConvertToAvalancheGoSubnetValidator(bootstrapValidators)
 	if err != nil {
-		return avaGoBootstrapValidators, false, err
+		return avaGoBootstrapValidators, false, false, err
 	}
 	deployer.CleanCacheWallet()
 	managerAddress := common.HexToAddress(validatorManagerAddressStr)
+
+	if doStrongInputsCheck {
+		ux.Logger.PrintToUser("You are about to create a ConvertSubnetToL1Tx on %s with the following content:", network.Name())
+		ux.Logger.PrintToUser("  Subnet ID: %s", subnetID)
+		ux.Logger.PrintToUser("  Blockchain ID: %s", blockchainID)
+		ux.Logger.PrintToUser("  Manager Address: %s", managerAddress.Hex())
+		ux.Logger.PrintToUser("  Validators:")
+		for _, val := range bootstrapValidators {
+			ux.Logger.PrintToUser("    Node ID: %s", val.NodeID)
+			ux.Logger.PrintToUser("    Balance: %.5f", float64(val.Balance)/float64(units.Avax))
+		}
+		ux.Logger.PrintToUser("")
+		ux.Logger.PrintToUser("Please review the details of the ConvertSubnetToL1 Transaction")
+		ux.Logger.PrintToUser("")
+		if doContinue, err := app.Prompt.CaptureYesNo("Do you want to create the transaction?"); err != nil {
+			return avaGoBootstrapValidators, false, false, err
+		} else if !doContinue {
+			return avaGoBootstrapValidators, true, false, err
+		}
+	}
+
 	isFullySigned, convertL1TxID, tx, remainingSubnetAuthKeys, err := deployer.ConvertL1(
 		controlKeysList,
 		subnetAuthKeysList,
@@ -435,7 +470,7 @@ func convertSubnetToL1(
 	)
 	if err != nil {
 		ux.Logger.RedXToUser("error converting blockchain: %s. fix the issue and try again with a new convert cmd", err)
-		return avaGoBootstrapValidators, false, err
+		return avaGoBootstrapValidators, false, false, err
 	}
 
 	savePartialTx := !isFullySigned && err == nil
@@ -450,7 +485,7 @@ func convertSubnetToL1(
 			outputTxPath,
 			false,
 		); err != nil {
-			return avaGoBootstrapValidators, savePartialTx, err
+			return avaGoBootstrapValidators, false, savePartialTx, err
 		}
 	} else {
 		ux.Logger.PrintToUser("ConvertSubnetToL1Tx ID: %s", convertL1TxID)
@@ -460,13 +495,13 @@ func convertSubnetToL1(
 			0,
 		)
 		if err != nil {
-			return avaGoBootstrapValidators, savePartialTx, err
+			return avaGoBootstrapValidators, false, savePartialTx, err
 		}
 	}
 
 	ux.Logger.PrintToUser("")
 	setBootstrapValidatorValidationID(avaGoBootstrapValidators, bootstrapValidators, subnetID)
-	return avaGoBootstrapValidators, savePartialTx, app.UpdateSidecarNetworks(
+	return avaGoBootstrapValidators, false, savePartialTx, app.UpdateSidecarNetworks(
 		&sidecar,
 		network,
 		subnetID,
@@ -526,6 +561,36 @@ func convertBlockchain(_ *cobra.Command, args []string) error {
 	subnetID := sidecar.Networks[network.Name()].SubnetID
 	blockchainID := sidecar.Networks[network.Name()].BlockchainID
 
+	if doStrongInputChecks && subnetID != ids.Empty {
+		ux.Logger.PrintToUser("Subnet ID to be used is %s", subnetID)
+		if acceptValue, err := app.Prompt.CaptureYesNo("Is this value correct?"); err != nil {
+			return err
+		} else if !acceptValue {
+			subnetID = ids.Empty
+		}
+	}
+	if subnetID == ids.Empty {
+		subnetID, err = app.Prompt.CaptureID("What is the subnet ID?")
+		if err != nil {
+			return err
+		}
+	}
+
+	if doStrongInputChecks && blockchainID != ids.Empty {
+		ux.Logger.PrintToUser("Blockchain ID to be used is %s", blockchainID)
+		if acceptValue, err := app.Prompt.CaptureYesNo("Is this value correct?"); err != nil {
+			return err
+		} else if !acceptValue {
+			blockchainID = ids.Empty
+		}
+	}
+	if blockchainID == ids.Empty {
+		blockchainID, err = app.Prompt.CaptureID("What is the blockchain ID?")
+		if err != nil {
+			return err
+		}
+	}
+
 	if validatorManagerAddress == "" {
 		validatorManagerAddressAddrFmt, err := app.Prompt.CaptureAddress("What is the address of the Validator Manager?")
 		if err != nil {
@@ -577,8 +642,10 @@ func convertBlockchain(_ *cobra.Command, args []string) error {
 			}
 		}
 		if !generateNodeID {
-			if err = StartLocalMachine(network, sidecar, blockchainName, deployBalance, availableBalance); err != nil {
+			if cancel, err := StartLocalMachine(network, sidecar, blockchainName, deployBalance, availableBalance); err != nil {
 				return err
+			} else if cancel {
+				return nil
 			}
 		}
 		switch {
@@ -666,7 +733,7 @@ func convertBlockchain(_ *cobra.Command, args []string) error {
 	// deploy to public network
 	deployer := subnet.NewPublicDeployer(app, kc, network)
 
-	avaGoBootstrapValidators, savePartialTx, err := convertSubnetToL1(
+	avaGoBootstrapValidators, cancel, savePartialTx, err := convertSubnetToL1(
 		bootstrapValidators,
 		deployer,
 		subnetID,
@@ -677,10 +744,14 @@ func convertBlockchain(_ *cobra.Command, args []string) error {
 		controlKeys,
 		subnetAuthKeys,
 		validatorManagerAddress,
+		doStrongInputChecks,
 	)
 	if err != nil {
 		return err
 	}
+	if cancel {
+		return nil
+	}
 
 	if savePartialTx {
 		return nil

cmd/blockchaincmd/deploy.go

@@ -584,8 +584,10 @@ func deployBlockchain(cmd *cobra.Command, args []string) error {
 			}
 		}
 		if !generateNodeID {
-			if err = StartLocalMachine(network, sidecar, blockchainName, deployBalance, availableBalance); err != nil {
+			if cancel, err := StartLocalMachine(network, sidecar, blockchainName, deployBalance, availableBalance); err != nil {
 				return err
+			} else if cancel {
+				return nil
 			}
 		}
 		switch {
@@ -773,7 +775,7 @@ func deployBlockchain(cmd *cobra.Command, args []string) error {
 
 	if sidecar.Sovereign {
 		validatorManagerStr := validatorManagerSDK.ProxyContractAddress
-		avaGoBootstrapValidators, savePartialTx, err := convertSubnetToL1(
+		avaGoBootstrapValidators, cancel, savePartialTx, err := convertSubnetToL1(
 			bootstrapValidators,
 			deployer,
 			subnetID,
@@ -784,10 +786,14 @@ func deployBlockchain(cmd *cobra.Command, args []string) error {
 			controlKeys,
 			subnetAuthKeys,
 			validatorManagerStr,
+			false,
 		)
 		if err != nil {
 			return err
 		}
+		if cancel {
+			return nil
+		}
 
 		if savePartialTx {
 			return nil

cmd/blockchaincmd/helpers.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/ava-labs/avalanche-cli/pkg/application"
 	"github.com/ava-labs/avalanche-cli/pkg/binutils"
+	"github.com/ava-labs/avalanche-cli/pkg/clierrors"
 	"github.com/ava-labs/avalanche-cli/pkg/contract"
 	"github.com/ava-labs/avalanche-cli/pkg/keychain"
 	"github.com/ava-labs/avalanche-cli/pkg/models"
@@ -85,7 +86,7 @@ func UpdateKeychainWithSubnetControlKeys(
 	}
 	subnetID := sc.Networks[network.Name()].SubnetID
 	if subnetID == ids.Empty {
-		return errNoSubnetID
+		return clierrors.ErrNoSubnetID
 	}
 	_, controlKeys, _, err := txutils.GetOwners(network, subnetID)
 	if err != nil {

cmd/blockchaincmd/remove_validator.go

@@ -9,6 +9,7 @@ import (
 	"strings"
 
 	"github.com/ava-labs/avalanche-cli/pkg/blockchain"
+	"github.com/ava-labs/avalanche-cli/pkg/clierrors"
 	"github.com/ava-labs/avalanche-cli/pkg/cobrautils"
 	"github.com/ava-labs/avalanche-cli/pkg/constants"
 	"github.com/ava-labs/avalanche-cli/pkg/contract"
@@ -117,7 +118,7 @@ func removeValidator(_ *cobra.Command, args []string) error {
 	scNetwork := sc.Networks[network.Name()]
 	subnetID := scNetwork.SubnetID
 	if subnetID == ids.Empty {
-		return errNoSubnetID
+		return clierrors.ErrNoSubnetID
 	}
 
 	var nodeID ids.NodeID

cmd/nodecmd/status.go

@@ -8,18 +8,19 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/ava-labs/avalanche-cli/pkg/node"
-
 	"github.com/ava-labs/avalanche-cli/cmd/blockchaincmd"
 	"github.com/ava-labs/avalanche-cli/pkg/ansible"
+	"github.com/ava-labs/avalanche-cli/pkg/clierrors"
 	"github.com/ava-labs/avalanche-cli/pkg/cobrautils"
 	"github.com/ava-labs/avalanche-cli/pkg/models"
+	"github.com/ava-labs/avalanche-cli/pkg/node"
 	"github.com/ava-labs/avalanche-cli/pkg/ssh"
 	"github.com/ava-labs/avalanche-cli/pkg/utils"
 	"github.com/ava-labs/avalanche-cli/pkg/ux"
 	"github.com/ava-labs/avalanchego/ids"
 	"github.com/ava-labs/avalanchego/utils/logging"
 	"github.com/ava-labs/avalanchego/vms/platformvm/status"
+
 	"github.com/olekukonko/tablewriter"
 	"github.com/pborman/ansi"
 	"github.com/spf13/cobra"
@@ -71,7 +72,7 @@ func statusNode(_ *cobra.Command, args []string) error {
 		}
 		blockchainID = sc.Networks[clusterConf.Network.Name()].BlockchainID
 		if blockchainID == ids.Empty {
-			return ErrNoBlockchainID
+			return clierrors.ErrNoBlockchainID
 		}
 	}
 

cmd/nodecmd/validate_primary.go

@@ -43,8 +43,6 @@ var (
 	useCustomDuration            bool
 	ErrMutuallyExlusiveKeyLedger = errors.New("--key and --ledger,--ledger-addrs are mutually exclusive")
 	ErrStoredKeyOnMainnet        = errors.New("--key is not available for mainnet operations")
-	ErrNoBlockchainID            = errors.New("failed to find the blockchain ID for this subnet, has it been deployed/created on this network?")
-	ErrNoSubnetID                = errors.New("failed to find the subnet ID for this subnet, has it been deployed/created on this network?")
 )
 
 func newValidatePrimaryCmd() *cobra.Command {