Register validator local

cmd/blockchaincmd/change_weight.go

@@ -33,7 +33,7 @@ The Subnet has to be a Proof of Authority Subnet-Only Validator Subnet.`,
 	networkoptions.AddNetworkFlagsToCmd(cmd, &globalNetworkFlags, true, addValidatorSupportedNetworkOptions)
 
 	cmd.Flags().StringVarP(&keyName, "key", "k", "", "select the key to use [fuji/devnet only]")
-	cmd.Flags().Uint64Var(&weight, "weight", constants.BootstrapValidatorWeight, "set the new staking weight of the validator")
+	cmd.Flags().Uint64Var(&weight, "weight", constants.NonBootstrapValidatorWeight, "set the new staking weight of the validator")
 	cmd.Flags().BoolVarP(&useEwoq, "ewoq", "e", false, "use ewoq key [fuji/devnet only]")
 	cmd.Flags().StringVar(&nodeIDStr, "node-id", "", "node-id of the validator")
 	cmd.Flags().BoolVarP(&useLedger, "ledger", "g", false, "use ledger instead of key (always true on mainnet, defaults to false on fuji/devnet)")
@@ -166,13 +166,13 @@ func setWeight(_ *cobra.Command, args []string) error {
 		return err
 	}
 
-	changeAddr, err = getChangeAddrFromPChain()
+	remainingBalanceOwnerAddr, err = getChangeAddrFromPChain()
 	if err != nil {
 		return fmt.Errorf("failure parsing change owner address: %w", err)
 	}
 
 	// add back validator to subnet with updated weight
-	return CallAddValidator(deployer, network, kc, useLedger, blockchainName, nodeID.String())
+	return CallAddValidator(deployer, network, kc, blockchainName, nodeID.String(), publicKey, pop)
 }
 
 // getValidatorBalanceFromPChain gets remaining balance of validator from p chain

cmd/blockchaincmd/deploy.go

@@ -1,4 +1,4 @@
-// Copyright (C) 2022, Ava Labs, Inc. All rights reserved.
+// / Copyright (C) 2022, Ava Labs, Inc. All rights reserved.
 // See the file LICENSE for licensing terms.
 package blockchaincmd
 
@@ -13,6 +13,7 @@ import (
 	"time"
 
 	"github.com/ava-labs/avalanchego/api/info"
+	"github.com/ava-labs/avalanchego/network/peer"
 
 	"github.com/ava-labs/avalanche-cli/pkg/evm"
 	"github.com/ava-labs/avalanche-cli/pkg/node"
@@ -81,6 +82,7 @@ var (
 	bootstrapValidatorsJSONFilePath string
 	privateKeyFlags                 contract.PrivateKeyFlags
 	bootstrapEndpoints              []string
+	convertOnly                     bool
 
 	errMutuallyExlusiveControlKeys = errors.New("--control-keys and --same-control-key are mutually exclusive")
 	ErrMutuallyExlusiveKeyLedger   = errors.New("key source flags --key, --ledger/--ledger-addrs are mutually exclusive")
@@ -136,6 +138,7 @@ so you can take your locally tested Subnet and deploy it on Fuji or Mainnet.`,
 	cmd.Flags().StringVar(&bootstrapValidatorsJSONFilePath, "bootstrap-filepath", "", "JSON file path that provides details about bootstrap validators, leave Node-ID and BLS values empty if using --generate-node-id=true")
 	cmd.Flags().BoolVar(&generateNodeID, "generate-node-id", false, "whether to create new node id for bootstrap validators (Node-ID and BLS values in bootstrap JSON file will be overridden if --bootstrap-filepath flag is used)")
 	cmd.Flags().StringSliceVar(&bootstrapEndpoints, "bootstrap-endpoints", nil, "take validator node info from the given endpoints")
+	cmd.Flags().BoolVar(&convertOnly, "convert-only", false, "avoid node track, restart and poa manager setup")
 	cmd.Flags().BoolVar(&useLocalMachine, "use-local-machine", false, "use local machine as a blockchain validator")
 	cmd.Flags().StringVar(&localMachineCluster, "local-machine-cluster", "", "existing local machine to be used as a blockchain validator")
 
@@ -474,45 +477,47 @@ func deployBlockchain(cmd *cobra.Command, args []string) error {
 	}
 
 	if sidecar.Sovereign {
-		if !useLocalMachine {
-			ux.Logger.PrintToUser("You can use your local machine as a bootstrap validator on the blockchain")
-			ux.Logger.PrintToUser("This means that you don't have to to set up a remote server on a cloud service (e.g. AWS / GCP) to be a validator on the blockchain.")
+		if !convertOnly {
+			if !useLocalMachine {
+				ux.Logger.PrintToUser("You can use your local machine as a bootstrap validator on the blockchain")
+				ux.Logger.PrintToUser("This means that you don't have to to set up a remote server on a cloud service (e.g. AWS / GCP) to be a validator on the blockchain.")
 
-			useLocalMachine, err = app.Prompt.CaptureYesNo("Do you want to use your local machine as a bootstrap validator?")
-			if err != nil {
-				return err
-			}
-		}
-		if useLocalMachine {
-			// stop any local avalanche go process running before we start local node
-			_ = node.StopLocalNode(app)
-			clusterName := fmt.Sprintf("%s-local-node", blockchainName)
-			if localMachineCluster != "" {
-				// don't destroy cluster if local cluster name is provided
-				clusterName = localMachineCluster
-			} else if utils.DirectoryExists(app.GetLocalDir(clusterName)) {
-				_ = node.DestroyLocalNode(app, clusterName)
-			}
-			// destroy any cluster with same name before we start local node
-			// we don't want to reuse snapshots from previous sessions
-			// TODO: replace bootstrapEndpoints with dynamic port number
-			bootstrapEndpoints = []string{"http://127.0.0.1:9650"}
-			anrSettings := node.ANRSettings{}
-			avagoVersionSettings := node.AvalancheGoVersionSettings{}
-			useEtnaDevnet := network.Kind == models.EtnaDevnet
-			if avagoBinaryPath == "" {
-				ux.Logger.PrintToUser("Local build of Avalanche Go is required to create an Avalanche node using local machine")
-				ux.Logger.PrintToUser("Please download Avalanche Go repo at https://github.com/ava-labs/avalanchego and build from source through ./scripts/build.sh")
-				ux.Logger.PrintToUser("Please provide the full path to Avalanche Go binary in the build directory (e.g, xxx/build/avalanchego)")
-				avagoBinaryPath, err = app.Prompt.CaptureString("Path to Avalanche Go build")
+				useLocalMachine, err = app.Prompt.CaptureYesNo("Do you want to use your local machine as a bootstrap validator?")
 				if err != nil {
 					return err
 				}
 			}
-			network = models.NewNetworkFromCluster(network, clusterName)
-			// anrSettings, avagoVersionSettings, globalNetworkFlags are empty
-			if err = node.StartLocalNode(app, clusterName, useEtnaDevnet, avagoBinaryPath, anrSettings, avagoVersionSettings, globalNetworkFlags, nil); err != nil {
-				return err
+			if useLocalMachine {
+				// stop any local avalanche go process running before we start local node
+				_ = node.StopLocalNode(app)
+				clusterName := fmt.Sprintf("%s-local-node", blockchainName)
+				if localMachineCluster != "" {
+					// don't destroy cluster if local cluster name is provided
+					clusterName = localMachineCluster
+				} else if utils.DirectoryExists(app.GetLocalDir(clusterName)) {
+					_ = node.DestroyLocalNode(app, clusterName)
+				}
+				// destroy any cluster with same name before we start local node
+				// we don't want to reuse snapshots from previous sessions
+				// TODO: replace bootstrapEndpoints with dynamic port number
+				bootstrapEndpoints = []string{"http://127.0.0.1:9650"}
+				anrSettings := node.ANRSettings{}
+				avagoVersionSettings := node.AvalancheGoVersionSettings{}
+				useEtnaDevnet := network.Kind == models.EtnaDevnet
+				if avagoBinaryPath == "" {
+					ux.Logger.PrintToUser("Local build of Avalanche Go is required to create an Avalanche node using local machine")
+					ux.Logger.PrintToUser("Please download Avalanche Go repo at https://github.com/ava-labs/avalanchego and build from source through ./scripts/build.sh")
+					ux.Logger.PrintToUser("Please provide the full path to Avalanche Go binary in the build directory (e.g, xxx/build/avalanchego)")
+					avagoBinaryPath, err = app.Prompt.CaptureString("Path to Avalanche Go build")
+					if err != nil {
+						return err
+					}
+				}
+				network = models.NewNetworkFromCluster(network, clusterName)
+				// anrSettings, avagoVersionSettings, globalNetworkFlags are empty
+				if err = node.StartLocalNode(app, clusterName, useEtnaDevnet, avagoBinaryPath, anrSettings, avagoVersionSettings, globalNetworkFlags, nil); err != nil {
+					return err
+				}
 			}
 		}
 		if len(bootstrapEndpoints) > 0 {
@@ -775,7 +780,7 @@ func deployBlockchain(cmd *cobra.Command, args []string) error {
 			return err
 		}
 
-		if !generateNodeID {
+		if !convertOnly {
 			clusterName := network.ClusterName
 			if clusterName == "" {
 				clusterName, err = node.GetClusterNameFromList(app)
@@ -842,7 +847,7 @@ func deployBlockchain(cmd *cobra.Command, args []string) error {
 			}
 			ux.Logger.GreenCheckmarkToUser("Proof of Authority Validator Manager contract successfully initialized on blockchain %s", blockchainName)
 		} else {
-			ux.Logger.GreenCheckmarkToUser("Generated Node ID and BLS info for bootstrap validator(s)")
+			ux.Logger.GreenCheckmarkToUser("Converted subnet successfully generated")
 			ux.Logger.PrintToUser("To convert L1 to sovereign blockchain, create the corresponding Avalanche node(s) with the provided Node ID and BLS Info")
 			ux.Logger.PrintToUser("Created Node ID and BLS Info can be found at %s", app.GetSidecarPath(blockchainName))
 			ux.Logger.PrintToUser("Once the Avalanche Node(s) are created and are tracking the blockchain, call `avalanche contract initPoaManager %s` to finish converting L1 to sovereign blockchain", blockchainName)
@@ -1110,8 +1115,54 @@ func LoadBootstrapValidator(filepath string) ([]models.SubnetValidator, error) {
 	return subnetValidators, nil
 }
 
-func GetAggregatorExtraPeerEndpoints(network models.Network) ([]string, error) {
-	aggregatorExtraPeerEndpoints := []string{}
+func UrisToPeers(uris []string) ([]info.Peer, error) {
+	peers := []info.Peer{}
+	ctx, cancel := utils.GetANRContext()
+	defer cancel()
+	for _, uri := range uris {
+		client := info.NewClient(uri)
+		nodeID, _, err := client.GetNodeID(ctx)
+		if err != nil {
+			return nil, err
+		}
+		ip, err := client.GetNodeIP(ctx)
+		if err != nil {
+			return nil, err
+		}
+		peers = append(peers, info.Peer{
+			Info: peer.Info{
+				ID:       nodeID,
+				PublicIP: ip,
+			},
+		})
+	}
+	return peers, nil
+}
+
+func GetAggregatorExtraPeerEndpoints(network models.Network) ([]info.Peer, error) {
+	aggregatorExtraPeerEndpointsUris, err := GetAggregatorExtraPeerEndpointsUris(network)
+	if err != nil {
+		return nil, err
+	}
+	aggregatorPeers, err := UrisToPeers(aggregatorExtraPeerEndpointsUris)
+	if err != nil {
+		return nil, err
+	}
+	for _, uri := range aggregatorExtraPeerEndpointsUris {
+		infoClient := info.NewClient(uri)
+		ctx, cancel := utils.GetAPILargeContext()
+		defer cancel()
+		peers, err := infoClient.Peers(ctx)
+		if err != nil {
+			return nil, err
+		}
+		aggregatorPeers = append(aggregatorPeers, peers...)
+	}
+	return aggregatorPeers, nil
+}
+
+func GetAggregatorExtraPeerEndpointsUris(network models.Network) ([]string, error) {
+	aggregatorExtraPeerEndpointsUris := []string{}
 	if network.ClusterName != "" {
 		clustersConfig, err := app.LoadClustersConfig()
 		if err != nil {
@@ -1134,9 +1185,9 @@ func GetAggregatorExtraPeerEndpoints(network models.Network) ([]string, error) {
 				return nil, err
 			}
 			for _, nodeInfo := range status.ClusterInfo.NodeInfos {
-				aggregatorExtraPeerEndpoints = append(aggregatorExtraPeerEndpoints, nodeInfo.Uri)
+				aggregatorExtraPeerEndpointsUris = append(aggregatorExtraPeerEndpointsUris, nodeInfo.Uri)
 			}
 		}
 	}
-	return aggregatorExtraPeerEndpoints, nil
+	return aggregatorExtraPeerEndpointsUris, nil
 }

cmd/blockchaincmd/helpers.go

@@ -4,11 +4,14 @@ package blockchaincmd
 
 import (
 	"fmt"
+	"time"
 
 	"github.com/ava-labs/avalanche-cli/pkg/keychain"
 	"github.com/ava-labs/avalanche-cli/pkg/models"
 	"github.com/ava-labs/avalanche-cli/pkg/networkoptions"
+	"github.com/ava-labs/avalanche-cli/pkg/subnet"
 	"github.com/ava-labs/avalanche-cli/pkg/txutils"
+	"github.com/ava-labs/avalanche-cli/pkg/ux"
 	"github.com/ava-labs/avalanchego/ids"
 	"github.com/spf13/cobra"
 )
@@ -93,3 +96,37 @@ func UpdateKeychainWithSubnetControlKeys(
 	}
 	return nil
 }
+
+func UpdatePChainHeight(
+	deployer *subnet.PublicDeployer,
+	destinationAddress ids.ShortID,
+	title string,
+) error {
+	bar, err := ux.TimedProgressBar(
+		30*time.Second,
+		title,
+		2,
+	)
+	if err != nil {
+		return err
+	}
+	// Issue random transaction >30s after ConverSubnetTx to evict its block from the block map
+	_, _, err = deployer.PChainTransfer(destinationAddress, 1)
+	if err != nil {
+		return err
+	}
+	if err := ux.ExtraStepExecuted(bar); err != nil {
+		return err
+	}
+	// Issue random transaction to advance the p-chain height now that the
+	// ConvertSubnetTx block isn't in the block map
+	_, _, err = deployer.PChainTransfer(destinationAddress, 1)
+	if err != nil {
+		return err
+	}
+	if err := ux.ExtraStepExecuted(bar); err != nil {
+		return err
+	}
+	fmt.Println()
+	return nil
+}

cmd/blockchaincmd/prompt_genesis_input.go

@@ -32,8 +32,10 @@ func getValidatorContractManagerAddr() (string, error) {
 }
 
 func promptProofOfPossession(promptPublicKey, promptPop bool) (string, string, error) {
-	ux.Logger.PrintToUser("Next, we need the public key and proof of possession of the node's BLS")
-	ux.Logger.PrintToUser("Check https://docs.avax.network/api-reference/info-api#infogetnodeid for instructions on calling info.getNodeID API")
+	if promptPublicKey || promptPop {
+		ux.Logger.PrintToUser("Next, we need the public key and proof of possession of the node's BLS")
+		ux.Logger.PrintToUser("Check https://docs.avax.network/api-reference/info-api#infogetnodeid for instructions on calling info.getNodeID API")
+	}
 	var err error
 	publicKey := ""
 	proofOfPossesion := ""

cmd/contractcmd/init_poa_validator_manager.go

@@ -38,7 +38,7 @@ var (
 // avalanche contract initpoamanager
 func newInitPOAManagerCmd() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "initPoaManager",
+		Use:   "initPoaManager blockchainName",
 		Short: "Initializes a Proof of Authority Validator Manager on a given Network and Blockchain",
 		Long:  "Initializes Proof of Authority Validator Manager contract on a Blockchain and sets up initial validator set on the Blockchain. For more info on Validator Manager, please head to https://github.com/ava-labs/teleporter/tree/staking-contract/contracts/validator-manager",
 		RunE:  initPOAManager,
@@ -96,7 +96,7 @@ func initPOAManager(_ *cobra.Command, args []string) error {
 	if privateKey == "" {
 		privateKey, err = prompts.PromptPrivateKey(
 			app.Prompt,
-			"Which key to you want to use to pay for initializing Proof of Authority Validator Manager contract? (Uses Blockchain gas token)",
+			"pay for initializing Proof of Authority Validator Manager contract? (Uses Blockchain gas token)",
 			app.GetKeyDir(),
 			app.GetKey,
 			genesisAddress,
@@ -118,12 +118,17 @@ func initPOAManager(_ *cobra.Command, args []string) error {
 	if err != nil {
 		return err
 	}
-	if len(privateAggregatorEndpoints) == 0 {
-		privateAggregatorEndpoints, err = blockchaincmd.GetAggregatorExtraPeerEndpoints(network)
-		if err != nil {
-			return err
-		}
+	// given by users
+	extraAggregatorPeers, err := blockchaincmd.UrisToPeers(privateAggregatorEndpoints)
+	if err != nil {
+		return err
+	}
+	// available in local cluster
+	networkAggregatorEndpoints, err := blockchaincmd.GetAggregatorExtraPeerEndpoints(network)
+	if err != nil {
+		return err
 	}
+	extraAggregatorPeers = append(extraAggregatorPeers, networkAggregatorEndpoints...)
 	if err := validatormanager.SetupPoA(
 		app,
 		network,
@@ -132,7 +137,7 @@ func initPOAManager(_ *cobra.Command, args []string) error {
 		privateKey,
 		common.HexToAddress(sc.PoAValidatorManagerOwner),
 		avaGoBootstrapValidators,
-		privateAggregatorEndpoints,
+		extraAggregatorPeers,
 	); err != nil {
 		return err
 	}

cmd/nodecmd/local.go

@@ -22,6 +22,7 @@ var (
 	stakingTLSKeyPath    string
 	stakingCertKeyPath   string
 	stakingSignerKeyPath string
+	numNodes             uint32
 )
 
 // const snapshotName = "local_snapshot"
@@ -79,6 +80,7 @@ status by running avalanche node status local
 	cmd.Flags().StringVar(&stakingTLSKeyPath, "staking-tls-key-path", "", "path to provided staking tls key for node")
 	cmd.Flags().StringVar(&stakingCertKeyPath, "staking-cert-key-path", "", "path to provided staking cert key for node")
 	cmd.Flags().StringVar(&stakingSignerKeyPath, "staking-signer-key-path", "", "path to provided staking signer key for node")
+	cmd.Flags().Uint32Var(&numNodes, "num-nodes", 1, "number of nodes to start")
 	return cmd
 }