Filter network

cmd/blockchaincmd/add_validator.go

@@ -41,6 +41,7 @@ var (
 		networkoptions.Devnet,
 		networkoptions.Fuji,
 		networkoptions.Mainnet,
+		networkoptions.EtnaDevnet,
 	}
 
 	nodeIDStr                 string
@@ -128,18 +129,36 @@ func addValidator(_ *cobra.Command, args []string) error {
 		return err
 	}
 
+	sc, err := app.LoadSidecar(blockchainName)
+	if err != nil {
+		return fmt.Errorf("failed to load sidecar: %w", err)
+	}
+
+	networkOptionsList := []networkoptions.NetworkOption{}
+	for scNetwork := range sc.Networks {
+		if networkoptions.NetworkOptionFromString(scNetwork) != networkoptions.Undefined {
+			networkOptionsList = append(networkOptionsList, networkoptions.NetworkOptionFromString(scNetwork))
+		}
+	}
+
+	// default network options to add validator options
+	if len(networkOptionsList) == 0 {
+		networkOptionsList = addValidatorSupportedNetworkOptions
+	}
+
 	network, err := networkoptions.GetNetworkFromCmdLineFlags(
 		app,
 		"",
 		globalNetworkFlags,
 		true,
 		false,
-		addValidatorSupportedNetworkOptions,
+		networkOptionsList,
 		"",
 	)
 	if err != nil {
 		return err
 	}
+
 	if network.ClusterName != "" {
 		clusterNameFlagValue = network.ClusterName
 		network = models.ConvertClusterToNetwork(network)
@@ -183,10 +202,6 @@ func addValidator(_ *cobra.Command, args []string) error {
 		return err
 	}
 
-	sc, err := app.LoadSidecar(blockchainName)
-	if err != nil {
-		return fmt.Errorf("failed to load sidecar: %w", err)
-	}
 	sovereign := sc.Sovereign
 
 	if sovereign && network.Kind == models.Mainnet {

cmd/blockchaincmd/change_weight.go

@@ -48,24 +48,36 @@ func setWeight(_ *cobra.Command, args []string) error {
 		return err
 	}
 
+	sc, err := app.LoadSidecar(blockchainName)
+	if err != nil {
+		return fmt.Errorf("failed to load sidecar: %w", err)
+	}
+
+	networkOptionsList := []networkoptions.NetworkOption{}
+	for scNetwork := range sc.Networks {
+		if networkoptions.NetworkOptionFromString(scNetwork) != networkoptions.Undefined {
+			networkOptionsList = append(networkOptionsList, networkoptions.NetworkOptionFromString(scNetwork))
+		}
+	}
+
+	// default network options to remove validator options
+	if len(networkOptionsList) == 0 {
+		networkOptionsList = removeValidatorSupportedNetworkOptions
+	}
+
 	network, err := networkoptions.GetNetworkFromCmdLineFlags(
 		app,
 		"",
 		globalNetworkFlags,
 		true,
 		false,
-		removeValidatorSupportedNetworkOptions,
+		networkOptionsList,
 		"",
 	)
 	if err != nil {
 		return err
 	}
 
-	sc, err := app.LoadSidecar(blockchainName)
-	if err != nil {
-		return err
-	}
-
 	if network.Kind == models.Mainnet && sc.Sovereign {
 		return errNotSupportedOnMainnet
 	}

cmd/blockchaincmd/remove_validator.go

@@ -33,6 +33,7 @@ var removeValidatorSupportedNetworkOptions = []networkoptions.NetworkOption{
 	networkoptions.Devnet,
 	networkoptions.Fuji,
 	networkoptions.Mainnet,
+	networkoptions.EtnaDevnet,
 }
 
 // avalanche blockchain removeValidator
@@ -70,13 +71,30 @@ func removeValidator(_ *cobra.Command, args []string) error {
 		return err
 	}
 
+	sc, err := app.LoadSidecar(blockchainName)
+	if err != nil {
+		return err
+	}
+
+	networkOptionsList := []networkoptions.NetworkOption{}
+	for scNetwork := range sc.Networks {
+		if networkoptions.NetworkOptionFromString(scNetwork) != networkoptions.Undefined {
+			networkOptionsList = append(networkOptionsList, networkoptions.NetworkOptionFromString(scNetwork))
+		}
+	}
+
+	// default network options to remove validator options
+	if len(networkOptionsList) == 0 {
+		networkOptionsList = removeValidatorSupportedNetworkOptions
+	}
+
 	network, err := networkoptions.GetNetworkFromCmdLineFlags(
 		app,
 		"",
 		globalNetworkFlags,
 		true,
 		false,
-		removeValidatorSupportedNetworkOptions,
+		networkOptionsList,
 		"",
 	)
 	if err != nil {
@@ -101,11 +119,6 @@ func removeValidator(_ *cobra.Command, args []string) error {
 	}
 	network.HandlePublicNetworkSimulation()
 
-	sc, err := app.LoadSidecar(blockchainName)
-	if err != nil {
-		return err
-	}
-
 	if sc.Sovereign && network.Kind == models.Mainnet {
 		return errNotSupportedOnMainnet
 	}

pkg/networkoptions/network_options.go

@@ -64,6 +64,12 @@ func NetworkOptionFromString(s string) NetworkOption {
 		return Devnet
 	case "Cluster":
 		return Cluster
+	default:
+		if strings.Contains(s, "Devnet") {
+			return Devnet
+		} else if strings.Contains(s, "Cluster") {
+			return Cluster
+		}
 	}
 	return Undefined
 }