Rename beacon to boostrapper, define bootstrappers in JSON file for cross-language compatiblity

config/config.go

@@ -62,8 +62,11 @@ const (
 
 var (
 	// Deprecated key --> deprecation message (i.e. which key replaces it)
+        // TODO: deprecate "BootstrapIDsKey" and "BootstrapIPsKey"
 	deprecatedKeys = map[string]string{
 		NetworkCompressionEnabledKey:           fmt.Sprintf("use --%s instead", NetworkCompressionTypeKey),
+		BootstrapIDsKey:                        fmt.Sprintf("use --%s instead", BootstrappersKey),
+		BootstrapIPsKey:                        fmt.Sprintf("use --%s instead", BootstrappersKey),
 		GenesisConfigFileKey:                   fmt.Sprintf("use --%s instead", GenesisFileKey),
 		GenesisConfigContentKey:                fmt.Sprintf("use --%s instead", GenesisFileContentKey),
 		InboundConnUpgradeThrottlerCooldownKey: fmt.Sprintf("use --%s instead", NetworkInboundConnUpgradeThrottlerCooldownKey),
@@ -532,6 +535,12 @@ func getBootstrapConfig(v *viper.Viper, networkID uint32) (node.BootstrapConfig,
 		BootstrapAncestorsMaxContainersReceived: int(v.GetUint(BootstrapAncestorsMaxContainersReceivedKey)),
 	}
 
+	if v.IsSet(BootstrappersKey) {
+		s := v.GetString(BootstrappersKey)
+		return config, json.Unmarshal([]byte(s), &config.Bootstrappers)
+	}
+
+	// "--bootstrappers" is not set, so fallback to old flags
 	ipsSet := v.IsSet(BootstrapIPsKey)
 	idsSet := v.IsSet(BootstrapIDsKey)
 	if ipsSet && !idsSet {
@@ -541,39 +550,48 @@ func getBootstrapConfig(v *viper.Viper, networkID uint32) (node.BootstrapConfig,
 		return node.BootstrapConfig{}, fmt.Errorf("set %q but didn't set %q", BootstrapIDsKey, BootstrapIPsKey)
 	}
 
-	bootstrapIPs, bootstrapIDs := genesis.SampleBeacons(networkID, 5)
+	bootstrappers := genesis.SampleBootstrappers(networkID, 5)
 	if ipsSet {
-		bootstrapIPs = strings.Split(v.GetString(BootstrapIPsKey), ",")
-	}
-	for _, ip := range bootstrapIPs {
-		if ip == "" {
-			continue
-		}
-		addr, err := ips.ToIPPort(ip)
-		if err != nil {
-			return node.BootstrapConfig{}, fmt.Errorf("couldn't parse bootstrap ip %s: %w", ip, err)
+		bootstrapIPs := strings.Split(v.GetString(BootstrapIPsKey), ",")
+
+		bootstrappers = make([]genesis.Bootstrapper, 0, len(bootstrapIPs))
+		for _, bootstrapIP := range bootstrapIPs {
+			ip := strings.TrimSpace(bootstrapIP)
+			if ip == "" {
+				continue
+			}
+
+			addr, err := ips.ToIPPort(ip)
+			if err != nil {
+				return node.BootstrapConfig{}, fmt.Errorf("couldn't parse bootstrap ip %s: %w", ip, err)
+			}
+			bootstrappers = append(bootstrappers, genesis.Bootstrapper{ID: ids.EmptyNodeID, IP: ips.IPDesc(addr)})
 		}
-		config.BootstrapIPs = append(config.BootstrapIPs, addr)
 	}
+	config.Bootstrappers = bootstrappers
 
 	if idsSet {
-		bootstrapIDs = strings.Split(v.GetString(BootstrapIDsKey), ",")
-	}
-	for _, id := range bootstrapIDs {
-		if id == "" {
-			continue
-		}
-		nodeID, err := ids.NodeIDFromString(id)
-		if err != nil {
-			return node.BootstrapConfig{}, fmt.Errorf("couldn't parse bootstrap peer id %s: %w", id, err)
+		bootstrapIDs := strings.Split(v.GetString(BootstrapIDsKey), ",")
+
+		bootstrapNodeIDs := make([]ids.NodeID, 0, len(bootstrapIDs))
+		for _, bootstrapID := range bootstrapIDs {
+			id := strings.TrimSpace(bootstrapID)
+			if id == "" {
+				continue
+			}
+			nodeID, err := ids.NodeIDFromString(id)
+			if err != nil {
+				return node.BootstrapConfig{}, fmt.Errorf("couldn't parse bootstrap peer id %s: %w", nodeID, err)
+			}
+			bootstrapNodeIDs = append(bootstrapNodeIDs, nodeID)
 		}
-		config.BootstrapIDs = append(config.BootstrapIDs, nodeID)
-	}
 
-	lenIPs := len(config.BootstrapIPs)
-	lenIDs := len(config.BootstrapIDs)
-	if lenIPs != lenIDs {
-		return node.BootstrapConfig{}, fmt.Errorf("expected the number of bootstrapIPs (%d) to match the number of bootstrapIDs (%d)", lenIPs, lenIDs)
+		if len(config.Bootstrappers) != len(bootstrapNodeIDs) {
+			return node.BootstrapConfig{}, fmt.Errorf("expected the number of bootstrapIPs (%d) to match the number of bootstrapNodeIDs (%d)", len(config.Bootstrappers), len(bootstrapNodeIDs))
+		}
+		for i, nodeID := range bootstrapNodeIDs {
+			config.Bootstrappers[i].ID = nodeID
+		}
 	}
 
 	return config, nil

config/flags.go

@@ -297,6 +297,8 @@ func addNodeFlags(fs *pflag.FlagSet) {
 	fs.String(StateSyncIDsKey, "", "Comma separated list of state sync peer ids to connect to. Example: NodeID-JR4dVmy6ffUGAKCBDkyCbeZbyHQBeDsET,NodeID-8CrVPQZ4VSqgL8zTdvL14G8HqAfrBr4z")
 
 	// Bootstrapping
+	fs.String(BootstrappersKey, "", "JSON-encoded list of bootstrap node ids and ips to connect to. If set, overrides --bootstrap-ips/ids. Example: '[{\"id\":\"NodeID-JR4dVmy6ffUGAKCBDkyCbeZbyHQBeDsET\",\"ip\":\"127.0.0.1:9630\"}]'")
+        // TODO: add [DEPRECATED] and deprecate
 	fs.String(BootstrapIPsKey, "", "Comma separated list of bootstrap peer ips to connect to. Example: 127.0.0.1:9630,127.0.0.1:9631")
 	fs.String(BootstrapIDsKey, "", "Comma separated list of bootstrap peer ids to connect to. Example: NodeID-JR4dVmy6ffUGAKCBDkyCbeZbyHQBeDsET,NodeID-8CrVPQZ4VSqgL8zTdvL14G8HqAfrBr4z")
 	fs.Bool(RetryBootstrapKey, true, "Specifies whether bootstrap should be retried")

config/keys.go

@@ -65,6 +65,7 @@ const (
 	APIAuthPasswordFileKey                             = "api-auth-password-file"
 	StateSyncIPsKey                                    = "state-sync-ips"
 	StateSyncIDsKey                                    = "state-sync-ids"
+	BootstrappersKey                                   = "bootstrappers"
 	BootstrapIPsKey                                    = "bootstrap-ips"
 	BootstrapIDsKey                                    = "bootstrap-ids"
 	StakingPortKey                                     = "staking-port"

genesis/bootstrappers.go

@@ -0,0 +1,54 @@
+// Copyright (C) 2019-2023, Ava Labs, Inc. All rights reserved.
+// See the file LICENSE for licensing terms.
+
+package genesis
+
+import (
+	_ "embed"
+	"encoding/json"
+	"fmt"
+
+	"github.com/ava-labs/avalanchego/ids"
+	"github.com/ava-labs/avalanchego/utils/constants"
+	"github.com/ava-labs/avalanchego/utils/ips"
+	"github.com/ava-labs/avalanchego/utils/math"
+	"github.com/ava-labs/avalanchego/utils/sampler"
+)
+
+var (
+	//go:embed bootstrappers.json
+	bootstrappersPerNetworkJSON []byte
+
+	bootstrappersPerNetwork map[string][]Bootstrapper
+)
+
+func init() {
+	if err := json.Unmarshal(bootstrappersPerNetworkJSON, &bootstrappersPerNetwork); err != nil {
+		panic(fmt.Sprintf("failed to decode bootstrappers.json %v", err))
+	}
+}
+
+// Represents the relationship between the nodeID and the nodeIP.
+// The bootstrapper is sometimes called "anchor" or "beacon" node.
+type Bootstrapper struct {
+	ID ids.NodeID `json:"id"`
+	IP ips.IPDesc `json:"ip"`
+}
+
+// SampleBootstrappers returns the some beacons this node should connect to
+func SampleBootstrappers(networkID uint32, count int) []Bootstrapper {
+	networkName := constants.NetworkIDToNetworkName[networkID]
+	bootstrappers := bootstrappersPerNetwork[networkName]
+	count = math.Min(count, len(bootstrappers))
+
+	s := sampler.NewUniform()
+	s.Initialize(uint64(len(bootstrappers)))
+	indices, _ := s.Sample(count)
+
+	sampled := make([]Bootstrapper, 0, len(indices))
+	for _, index := range indices {
+		sampled = append(sampled, bootstrappers[int(index)])
+	}
+
+	return sampled
+}