enable user to specify network id

Author: felipemadero

client/client.go

@@ -117,6 +117,7 @@ func (c *client) Start(ctx context.Context, execPath string, opts ...OpOption) (
 	ret.applyOpts(opts)
 
 	req := &rpcpb.StartRequest{
+		NetworkId:      ret.networkID,
 		ExecPath:       execPath,
 		NumNodes:       &ret.numNodes,
 		ChainConfigs:   ret.chainConfigs,
@@ -454,6 +455,7 @@ type Op struct {
 	subnetConfigs       map[string]string
 	reassignPortsIfUsed bool
 	dynamicPorts        bool
+	networkID           *uint32
 }
 
 type OpOption func(*Op)
@@ -470,6 +472,12 @@ func WithGlobalNodeConfig(nodeConfig string) OpOption {
 	}
 }
 
+func WithNetworkID(networkId uint32) OpOption {
+	return func(op *Op) {
+		op.networkID = &networkId
+	}
+}
+
 func WithNumNodes(numNodes uint32) OpOption {
 	return func(op *Op) {
 		op.numNodes = numNodes

cmd/control/control.go

@@ -104,6 +104,7 @@ var (
 	subnetConfigs       string
 	reassignPortsIfUsed bool
 	dynamicPorts        bool
+	networkId           uint32
 )
 
 func setLogs() error {
@@ -176,6 +177,12 @@ func newStartCommand() *cobra.Command {
 		"",
 		"avalanchego binary path",
 	)
+	cmd.PersistentFlags().Uint32Var(
+		&networkId,
+		"network-id",
+		0,
+		"network id to assign to the network",
+	)
 	cmd.PersistentFlags().Uint32Var(
 		&numNodes,
 		"number-of-nodes",
@@ -267,6 +274,10 @@ func startFunc(*cobra.Command, []string) error {
 		client.WithDynamicPorts(dynamicPorts),
 	}
 
+	if networkId != 0 {
+		opts = append(opts, client.WithNetworkID(networkId))
+	}
+
 	if globalNodeConfig != "" {
 		ux.Print(log, logging.Yellow.Wrap("global node config provided, will be applied to all nodes: %s"), globalNodeConfig)
 		// validate it's valid JSON

local/network.go

@@ -444,10 +444,19 @@ func (ln *localNetwork) loadConfig(ctx context.Context, networkConfig network.Co
 
 	ln.genesis = []byte(networkConfig.Genesis)
 
-	var err error
-	ln.networkID, err = utils.NetworkIDFromGenesis([]byte(networkConfig.Genesis))
-	if err != nil {
-		return fmt.Errorf("couldn't get network ID from genesis: %w", err)
+	if networkConfig.NetworkID != nil {
+		ln.networkID = *networkConfig.NetworkID
+		genesis, err := utils.SetGenesisNetworkID(ln.genesis, ln.networkID)
+		if err != nil {
+			return fmt.Errorf("couldn't set network ID to genesis: %w", err)
+		}
+		ln.genesis = genesis
+	} else {
+		var err error
+		ln.networkID, err = utils.NetworkIDFromGenesis(ln.genesis)
+		if err != nil {
+			return fmt.Errorf("couldn't get network ID from genesis: %w", err)
+		}
 	}
 
 	// save node defaults

network/config.go

@@ -50,7 +50,8 @@ type AddrAndBalance struct {
 // Config that defines a network when it is created.
 type Config struct {
 	// Must not be empty
-	Genesis string `json:"genesis"`
+	Genesis   string  `json:"genesis"`
+	NetworkID *uint32 `json:"networkID"`
 	// May have length 0
 	// (i.e. network may have no nodes on creation.)
 	NodeConfigs []node.Config `json:"nodeConfigs"`

rpcpb/rpc.pb.go

@@ -350,6 +350,8 @@ message StartRequest {
   // If specified, will create a file "subnetid.json" under subnets config dir with
   // the contents provided here.
   map<string, string> subnet_configs = 13;
+
+  optional uint32 network_id = 14;
 }
 
 message RPCVersionRequest {}

rpcpb/rpc.proto

@@ -109,6 +109,8 @@ type localNetworkOptions struct {
 	reassignPortsIfUsed bool
 
 	dynamicPorts bool
+
+	networkID *uint32
 }
 
 func newLocalNetwork(opts localNetworkOptions) (*localNetwork, error) {
@@ -161,6 +163,10 @@ func (lc *localNetwork) createConfig() error {
 		cfg.Flags[config.PluginDirKey] = lc.pluginDir
 	}
 
+	if lc.options.networkID != nil {
+		cfg.NetworkID = lc.options.networkID
+	}
+
 	for i := range cfg.NodeConfigs {
 		// NOTE: Naming convention for node names is currently `node` + number, i.e. `node1,node2,node3,...node101`
 		nodeName := fmt.Sprintf("node%d", i+1)

server/network.go

@@ -328,6 +328,7 @@ func (s *server) Start(_ context.Context, req *rpcpb.StartRequest) (*rpcpb.Start
 	}
 
 	s.network, err = newLocalNetwork(localNetworkOptions{
+		networkID:           req.NetworkId,
 		execPath:            execPath,
 		rootDataDir:         rootDataDir,
 		numNodes:            numNodes,

server/server.go

@@ -47,6 +47,20 @@ func NetworkIDFromGenesis(genesis []byte) (uint32, error) {
 	return uint32(networkID), nil
 }
 
+func SetGenesisNetworkID(genesis []byte, networkID uint32) ([]byte, error) {
+	genesisMap := map[string]interface{}{}
+	if err := json.Unmarshal(genesis, &genesisMap); err != nil {
+		return nil, fmt.Errorf("couldn't unmarshal genesis: %w", err)
+	}
+	genesisMap[genesisNetworkIDKey] = networkID
+	var err error
+	genesis, err = json.Marshal(genesisMap)
+	if err != nil {
+		return nil, fmt.Errorf("couldn't marshal genesis: %w", err)
+	}
+	return genesis, nil
+}
+
 var (
 	ErrEmptyExecPath   = errors.New("avalanche exec is not defined")
 	ErrNotExists       = errors.New("avalanche exec not exists")