Merge branch 'main' into version-to-1.7.1

local/network.go

@@ -478,6 +478,18 @@ func (ln *localNetwork) loadConfig(ctx context.Context, networkConfig network.Co
 	return nil
 }
 
+// See network.Network
+func (ln *localNetwork) GetNetworkID() (uint32, error) {
+	ln.lock.Lock()
+	defer ln.lock.Unlock()
+
+	if ln.stopCalled() {
+		return 0, network.ErrStopped
+	}
+
+	return ln.networkID, nil
+}
+
 // See network.Network
 func (ln *localNetwork) AddNode(nodeConfig node.Config) (node.Node, error) {
 	ln.lock.Lock()

network/network.go

@@ -65,6 +65,9 @@ type BlockchainSpec struct {
 
 // Network is an abstraction of an Avalanche network
 type Network interface {
+	// Returns the network ID for the currently running network
+	// Returns ErrStopped if Stop() was previously called.
+	GetNetworkID() (uint32, error)
 	// Returns nil if all the nodes in the network are healthy.
 	// A stopped network is considered unhealthy.
 	// Timeout is given by the context parameter.