Add public network support to tmpnet (#4267)

Signed-off-by: Ron Kuris <[email protected]>
Signed-off-by: maru <[email protected]>
Signed-off-by: Sam Liokumovich <[email protected]>
Co-authored-by: Ron Kuris <[email protected]>
Co-authored-by: Copilot <[email protected]>
Co-authored-by: maru <[email protected]>
Co-authored-by: rodrigo <[email protected]>
Co-authored-by: Sam Liokumovich <[email protected]>

Author: 6 people

tests/fixture/tmpnet/network_config.go

@@ -154,6 +154,7 @@ func (n *Network) readConfig() error {
 type serializedNetworkConfig struct {
 	UUID                 string                  `json:"uuid,omitempty"`
 	Owner                string                  `json:"owner,omitempty"`
+	NetworkID            uint32                  `json:"networkID,omitempty"`
 	PrimarySubnetConfig  ConfigMap               `json:"primarySubnetConfig,omitempty"`
 	PrimaryChainConfigs  map[string]ConfigMap    `json:"primaryChainConfigs,omitempty"`
 	DefaultFlags         FlagsMap                `json:"defaultFlags,omitempty"`
@@ -165,6 +166,7 @@ func (n *Network) writeNetworkConfig() error {
 	config := &serializedNetworkConfig{
 		UUID:                 n.UUID,
 		Owner:                n.Owner,
+		NetworkID:            n.NetworkID,
 		PrimarySubnetConfig:  n.PrimarySubnetConfig,
 		PrimaryChainConfigs:  n.PrimaryChainConfigs,
 		DefaultFlags:         n.DefaultFlags,

tests/fixture/tmpnet/node.go

@@ -22,6 +22,7 @@ import (
 	"github.com/ava-labs/avalanchego/ids"
 	"github.com/ava-labs/avalanchego/staking"
 	"github.com/ava-labs/avalanchego/tests/fixture/stacktrace"
+	"github.com/ava-labs/avalanchego/utils/constants"
 	"github.com/ava-labs/avalanchego/utils/crypto/bls/signer/localsigner"
 	"github.com/ava-labs/avalanchego/vms/platformvm/signer"
 )
@@ -369,10 +370,14 @@ func (n *Node) composeFlags() (FlagsMap, error) {
 	// Convert the network id to a string to ensure consistency in JSON round-tripping.
 	flags.SetDefault(config.NetworkNameKey, strconv.FormatUint(uint64(n.network.GetNetworkID()), 10))
 
-	// Set the bootstrap configuration
-	bootstrapIPs, bootstrapIDs := n.network.GetBootstrapIPsAndIDs(n)
-	flags.SetDefault(config.BootstrapIDsKey, strings.Join(bootstrapIDs, ","))
-	flags.SetDefault(config.BootstrapIPsKey, strings.Join(bootstrapIPs, ","))
+	// Set the bootstrap configuration only for non-public networks
+	// Public networks should use avalanchego's built-in bootstrappers
+	networkID := n.network.GetNetworkID()
+	if networkID != constants.FujiID && networkID != constants.MainnetID {
+		bootstrapIPs, bootstrapIDs := n.network.GetBootstrapIPsAndIDs(n)
+		flags.SetDefault(config.BootstrapIDsKey, strings.Join(bootstrapIDs, ","))
+		flags.SetDefault(config.BootstrapIPsKey, strings.Join(bootstrapIPs, ","))
+	}
 
 	// TODO(marun) Maybe avoid computing content flags for each node start?