Merge branch 'main' into remove-permission-err

ava-labs · Dec 13, 2024 · f409617 · f409617
2 parents c7facd4 + ae77533
commit f409617
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 4 deletions.
diff --git a/cmd/blockchaincmd/deploy.go b/cmd/blockchaincmd/deploy.go
@@ -712,6 +712,9 @@ func deployBlockchain(cmd *cobra.Command, args []string) error {
 				if network.Kind == models.Fuji {
 					globalNetworkFlags.UseFuji = true
 				}
+				if network.Kind == models.Mainnet {
+					globalNetworkFlags.UseMainnet = true
+				}
 				// anrSettings, avagoVersionSettings, globalNetworkFlags are empty
 				if err = node.StartLocalNode(
 					app,
@@ -1228,7 +1231,6 @@ func setBootstrapValidatorValidationID(avaGoBootstrapValidators []*txs.ConvertSu
 	}
 }
 
-
 func getClusterBootstrapValidators(
 	clusterName string,
 	network models.Network,

diff --git a/cmd/nodecmd/create.go b/cmd/nodecmd/create.go
@@ -45,7 +45,7 @@ const (
 )
 
 var (
-	createSupportedNetworkOptions         = []networkoptions.NetworkOption{networkoptions.Fuji, networkoptions.Devnet, networkoptions.EtnaDevnet}
+	createSupportedNetworkOptions         = []networkoptions.NetworkOption{networkoptions.Fuji, networkoptions.Devnet, networkoptions.EtnaDevnet, networkoptions.Mainnet}
 	globalNetworkFlags                    networkoptions.NetworkFlags
 	useAWS                                bool
 	useGCP                                bool

diff --git a/pkg/constants/constants.go b/pkg/constants/constants.go
@@ -58,7 +58,8 @@ const (
 	APIRequestLargeTimeout = 10 * time.Second
 	FastGRPCDialTimeout    = 100 * time.Millisecond
 
-	FujiBootstrapTimeout = 15 * time.Minute
+	FujiBootstrapTimeout    = 15 * time.Minute
+	MainnetBootstrapTimeout = 2 * time.Hour
 
 	SSHServerStartTimeout       = 1 * time.Minute
 	SSHScriptTimeout            = 2 * time.Minute

diff --git a/pkg/models/network.go b/pkg/models/network.go
@@ -232,8 +232,11 @@ func (n *Network) Equals(n2 Network) bool {
 // Context for bootstrapping a partial synced Node
 func (n *Network) BootstrappingContext() (context.Context, context.CancelFunc) {
 	timeout := constants.ANRRequestTimeout
-	if n.Kind == Fuji {
+	switch n.Kind {
+	case Fuji:
 		timeout = constants.FujiBootstrapTimeout
+	case Mainnet:
+		timeout = constants.MainnetBootstrapTimeout
 	}
 	return context.WithTimeout(context.Background(), timeout)
 }

diff --git a/pkg/node/local.go b/pkg/node/local.go
@@ -321,6 +321,13 @@ func StartLocalNode(
 				constants.FujiAPIEndpoint,
 				clusterName,
 			)
+		case globalNetworkFlags.UseMainnet:
+			network = models.NewNetwork(
+				models.Mainnet,
+				avagoconstants.MainnetID,
+				constants.MainnetAPIEndpoint,
+				clusterName,
+			)
 		default:
 			network, err = networkoptions.GetNetworkFromCmdLineFlags(
 				app,
@@ -337,6 +344,8 @@ func StartLocalNode(
 		}
 		if network.Kind == models.Fuji {
 			ux.Logger.PrintToUser(logging.Yellow.Wrap("Warning: Fuji Bootstrapping can take several minutes"))
+		} else if network.Kind == models.Mainnet {
+			ux.Logger.PrintToUser(logging.Yellow.Wrap("Warning: Mainnet Bootstrapping can take 1-2 hours"))
 		}
 		if err := preLocalChecks(anrSettings, avaGoVersionSetting, useEtnaDevnet, globalNetworkFlags); err != nil {
 			return err