TmpNet on Local Networks

cmd/blockchaincmd/deploy.go

@@ -18,7 +18,6 @@ import (
 	"github.com/ava-labs/avalanche-cli/cmd/interchaincmd/messengercmd"
 	"github.com/ava-labs/avalanche-cli/cmd/interchaincmd/relayercmd"
 	"github.com/ava-labs/avalanche-cli/cmd/networkcmd"
-	"github.com/ava-labs/avalanche-cli/pkg/binutils"
 	"github.com/ava-labs/avalanche-cli/pkg/cobrautils"
 	"github.com/ava-labs/avalanche-cli/pkg/constants"
 	"github.com/ava-labs/avalanche-cli/pkg/contract"
@@ -517,7 +516,7 @@ func deployBlockchain(cmd *cobra.Command, args []string) error {
 
 		// check if blockchain rpc version matches what is currently running
 		// for the case version or binary was provided
-		_, _, networkRPCVersion, err := localnet.GetVersion()
+		_, _, networkRPCVersion, err := localnet.GetLocalNetworkAvalancheGoVersion(app)
 		if err != nil {
 			return err
 		}
@@ -534,7 +533,7 @@ func deployBlockchain(cmd *cobra.Command, args []string) error {
 		if !sidecar.Sovereign {
 			// sovereign blockchains are deployed into new local clusters,
 			// non sovereign blockchains are deployed into the local network itself
-			if b, err := networkcmd.AlreadyDeployed(blockchainName); err != nil {
+			if b, err := localnet.BlockchainAlreadyDeployedOnLocalNetwork(app, blockchainName); err != nil {
 				return err
 			} else if b {
 				return fmt.Errorf("blockchain %s has already been deployed", blockchainName)
@@ -675,29 +674,25 @@ func deployBlockchain(cmd *cobra.Command, args []string) error {
 				_ = node.StopLocalNode(app)
 				anrSettings := node.ANRSettings{}
 				avagoVersionSettings := node.AvalancheGoVersionSettings{}
-				if avagoBinaryPath == "" {
-					useLatestAvalanchegoPreReleaseVersion := true
-					useLatestAvalanchegoReleaseVersion := false
-					if userProvidedAvagoVersion != constants.DefaultAvalancheGoVersion {
-						useLatestAvalanchegoReleaseVersion = false
-						useLatestAvalanchegoPreReleaseVersion = false
-					} else {
-						userProvidedAvagoVersion = ""
-					}
-					avaGoVersionSetting := node.AvalancheGoVersionSettings{
-						UseCustomAvalanchegoVersion:           userProvidedAvagoVersion,
-						UseLatestAvalanchegoPreReleaseVersion: useLatestAvalanchegoPreReleaseVersion,
-						UseLatestAvalanchegoReleaseVersion:    useLatestAvalanchegoReleaseVersion,
-					}
-					avalancheGoVersion, err := node.GetAvalancheGoVersion(app, avaGoVersionSetting)
-					if err != nil {
-						return err
-					}
-					_, avagoDir, err := binutils.SetupAvalanchego(app, avalancheGoVersion)
+				// setup (install if needed) avalanchego binary
+				avagoVersion := userProvidedAvagoVersion
+				if userProvidedAvagoVersion == constants.DefaultAvalancheGoVersion && avagoBinaryPath == "" {
+					// nothing given: get avago version from RPC compat
+					avagoVersion, err = vm.GetLatestAvalancheGoByProtocolVersion(
+						app,
+						sidecar.RPCVersion,
+						constants.AvalancheGoCompatibilityURL,
+					)
 					if err != nil {
-						return fmt.Errorf("failed installing Avalanche Go version %s: %w", avalancheGoVersion, err)
+						if err != vm.ErrNoAvagoVersion {
+							return err
+						}
+						avagoVersion = constants.LatestPreReleaseVersionTag
 					}
-					avagoBinaryPath = filepath.Join(avagoDir, "avalanchego")
+				}
+				avagoBinaryPath, err := localnet.SetupAvalancheGoBinary(app, avagoVersion, avagoBinaryPath)
+				if err != nil {
+					return err
 				}
 				nodeConfig := map[string]interface{}{}
 				if app.AvagoNodeConfigExists(blockchainName) {
@@ -1133,10 +1128,12 @@ func deployBlockchain(cmd *cobra.Command, args []string) error {
 		}
 		if network.Kind == models.Local && !simulatedPublicNetwork() {
 			ux.Logger.PrintToUser("")
-			if err := networkcmd.TrackSubnet(
+			ctx, cancel := localnet.GetLocalNetworkDefaultContext()
+			defer cancel()
+			if err := localnet.LocalNetworkTrackSubnet(
+				ctx,
+				app,
 				blockchainName,
-				avagoBinaryPath,
-				sidecar.Sovereign,
 			); err != nil {
 				return err
 			}

cmd/blockchaincmd/validators.go

@@ -106,7 +106,7 @@ func printValidatorsFromList(validators []platformvm.ClientPermissionlessValidat
 
 		table.Append([]string{
 			validator.NodeID.String(),
-			strconv.FormatUint(*validator.StakeAmount, 10),
+			strconv.FormatUint(validator.Weight, 10),
 			strconv.FormatUint(delegatorWeight, 10),
 			formatUnixTime(validator.StartTime),
 			formatUnixTime(validator.EndTime),

cmd/blockchaincmd/vmid.go

@@ -6,8 +6,8 @@ import (
 	"fmt"
 
 	"github.com/ava-labs/avalanche-cli/pkg/cobrautils"
+	"github.com/ava-labs/avalanche-cli/pkg/utils"
 	"github.com/ava-labs/avalanche-cli/pkg/ux"
-	"github.com/ava-labs/avalanche-network-runner/utils"
 	"github.com/spf13/cobra"
 )
 

cmd/commands.md

@@ -2067,7 +2067,7 @@ avalanche network start [subcommand] [flags]
 --num-nodes uint32              number of nodes to be created on local network (default 2)
 --relayer-path string           use this relayer binary path
 --relayer-version string        use this relayer version (default "latest-prerelease")
---snapshot-name string          name of snapshot to use to start the network from (default "default-1654102509")
+--snapshot-name string          name of snapshot to use to start the network from (default "default")
 --config string                 config file (default is $HOME/.avalanche-cli/config.json)
 --log-level string              log level for the application (default "ERROR")
 --skip-update-check             skip check for new versions
@@ -2114,7 +2114,7 @@ avalanche network stop [subcommand] [flags]
 ```bash
 --dont-save               do not save snapshot, just stop the network
 -h, --help                help for stop
---snapshot-name string    name of snapshot to use to save network state into (default "default-1654102509")
+--snapshot-name string    name of snapshot to use to save network state into (default "default")
 --config string           config file (default is $HOME/.avalanche-cli/config.json)
 --log-level string        log level for the application (default "ERROR")
 --skip-update-check       skip check for new versions

cmd/interchaincmd/messengercmd/deploy.go

@@ -237,6 +237,8 @@ func CallDeploy(_ []string, flags DeployFlags, network models.Network) error {
 		if !alreadyDeployed {
 			if network.Kind == models.Local {
 				if err := localnet.WriteExtraLocalNetworkData(
+					app,
+					"",
 					"",
 					"",
 					messengerAddress,

cmd/interchaincmd/relayercmd/deploy.go

@@ -430,11 +430,10 @@ func CallDeploy(_ []string, flags DeployFlags, network models.Network) error {
 	storageDir := app.GetLocalRelayerStorageDir(network.Kind)
 	localNetworkRootDir := ""
 	if network.Kind == models.Local {
-		clusterInfo, err := localnet.GetClusterInfo()
+		localNetworkRootDir, err = localnet.GetLocalNetworkDir(app)
 		if err != nil {
 			return err
 		}
-		localNetworkRootDir = clusterInfo.GetRootDataDir()
 	}
 	configPath := app.GetLocalRelayerConfigPath(network.Kind, localNetworkRootDir)
 	logPath := app.GetLocalRelayerLogPath(network.Kind)
@@ -509,7 +508,7 @@ func CallDeploy(_ []string, flags DeployFlags, network models.Network) error {
 			return err
 		}
 		if network.Kind == models.Local {
-			if err := localnet.WriteExtraLocalNetworkData("", binPath, "", ""); err != nil {
+			if err := localnet.WriteExtraLocalNetworkData(app, "", "", binPath, "", ""); err != nil {
 				return err
 			}
 		}

cmd/interchaincmd/relayercmd/start.go

@@ -83,15 +83,14 @@ func start(_ *cobra.Command, _ []string) error {
 		}
 		localNetworkRootDir := ""
 		if network.Kind == models.Local {
-			clusterInfo, err := localnet.GetClusterInfo()
+			localNetworkRootDir, err = localnet.GetLocalNetworkDir(app)
 			if err != nil {
 				return err
 			}
-			localNetworkRootDir = clusterInfo.GetRootDataDir()
 		}
 		relayerConfigPath := app.GetLocalRelayerConfigPath(network.Kind, localNetworkRootDir)
 		if network.Kind == models.Local && binPath == "" {
-			if b, extraLocalNetworkData, err := localnet.GetExtraLocalNetworkData(""); err != nil {
+			if b, extraLocalNetworkData, err := localnet.GetExtraLocalNetworkData(app, ""); err != nil {
 				return err
 			} else if b {
 				binPath = extraLocalNetworkData.RelayerPath
@@ -110,7 +109,7 @@ func start(_ *cobra.Command, _ []string) error {
 		); err != nil {
 			return err
 		} else if network.Kind == models.Local {
-			if err := localnet.WriteExtraLocalNetworkData("", binPath, "", ""); err != nil {
+			if err := localnet.WriteExtraLocalNetworkData(app, "", "", binPath, "", ""); err != nil {
 				return err
 			}
 		}

cmd/networkcmd/clean.go

@@ -3,21 +3,20 @@
 package networkcmd
 
 import (
+	"errors"
 	"os"
 	"path/filepath"
-	"regexp"
 
-	"github.com/ava-labs/avalanche-cli/pkg/binutils"
 	"github.com/ava-labs/avalanche-cli/pkg/cobrautils"
 	"github.com/ava-labs/avalanche-cli/pkg/constants"
 	"github.com/ava-labs/avalanche-cli/pkg/interchain"
+	"github.com/ava-labs/avalanche-cli/pkg/localnet"
 	"github.com/ava-labs/avalanche-cli/pkg/models"
 	"github.com/ava-labs/avalanche-cli/pkg/node"
 	"github.com/ava-labs/avalanche-cli/pkg/subnet"
 	"github.com/ava-labs/avalanche-cli/pkg/ux"
-	"github.com/shirou/gopsutil/process"
+
 	"github.com/spf13/cobra"
-	"go.uber.org/zap"
 )
 
 var hard bool
@@ -44,16 +43,8 @@ configuration.`,
 }
 
 func clean(*cobra.Command, []string) error {
-	app.Log.Info("killing gRPC server process...")
-
-	if err := binutils.KillgRPCServerProcess(
-		app,
-		binutils.LocalNetworkGRPCServerEndpoint,
-		constants.ServerRunFileLocalNetworkPrefix,
-	); err != nil {
-		app.Log.Warn("failed killing server process", zap.Error(err))
-	} else {
-		ux.Logger.PrintToUser("Process terminated.")
+	if err := localnet.LocalNetworkStop(app); err != nil && !errors.Is(err, localnet.ErrNetworkNotBootstrapped) {
+		return err
 	}
 
 	if err := interchain.RelayerCleanup(
@@ -68,7 +59,6 @@ func clean(*cobra.Command, []string) error {
 		ux.Logger.PrintToUser("hard clean requested via flag, removing all downloaded avalanchego and plugin binaries")
 		binDir := filepath.Join(app.GetBaseDir(), constants.AvalancheCliBinDir)
 		cleanBins(binDir)
-		_ = killAllBackendsByName()
 	}
 
 	if err := app.ResetPluginsDir(); err != nil {
@@ -111,27 +101,7 @@ func removeLocalDeployInfoFromSidecars() error {
 func cleanBins(dir string) {
 	if err := os.RemoveAll(dir); err != nil {
 		ux.Logger.PrintToUser("Removal failed: %s", err)
+	} else {
+		ux.Logger.PrintToUser("All existing binaries removed.")
 	}
-	ux.Logger.PrintToUser("All existing binaries removed.")
-}
-
-func killAllBackendsByName() error {
-	procs, err := process.Processes()
-	if err != nil {
-		return err
-	}
-	regex := regexp.MustCompile(".* " + constants.BackendCmd + ".*")
-	for _, p := range procs {
-		name, err := p.Cmdline()
-		if err != nil {
-			// ignore errors for processes that just died (macos implementation)
-			continue
-		}
-		if regex.MatchString(name) {
-			if err := p.Terminate(); err != nil {
-				return err
-			}
-		}
-	}
-	return nil
 }