Validate peers on startup

config/config.go

@@ -68,8 +68,10 @@ type SourceBlockchain struct {
 	SupportedDestinations             []string                         `mapstructure:"supported-destinations" json:"supported-destinations"`
 	ProcessHistoricalBlocksFromHeight uint64                           `mapstructure:"process-historical-blocks-from-height" json:"process-historical-blocks-from-height"`
 
-	// convenience field to access the supported destinations after initialization
+	// convenience fields to access parsed data after initialization
 	supportedDestinations set.Set[ids.ID]
+	subnetID              ids.ID
+	blockchainID          ids.ID
 }
 
 type DestinationBlockchain struct {
@@ -81,6 +83,10 @@ type DestinationBlockchain struct {
 
 	// Fetched from the chain after startup
 	warpQuorum WarpQuorum
+
+	// convenience fields to access parsed data after initialization
+	subnetID     ids.ID
+	blockchainID ids.ID
 }
 
 type WarpQuorum struct {
@@ -97,10 +103,6 @@ type Config struct {
 	DestinationBlockchains []*DestinationBlockchain `mapstructure:"destination-blockchains" json:"destination-blockchains"`
 	ProcessMissedBlocks    bool                     `mapstructure:"process-missed-blocks" json:"process-missed-blocks"`
 	ManualWarpMessages     []*ManualWarpMessage     `mapstructure:"manual-warp-messages" json:"manual-warp-messages"`
-
-	// convenience fields to access the source subnet and chain IDs after initialization
-	sourceSubnetIDs     []ids.ID
-	sourceBlockchainIDs []ids.ID
 }
 
 func SetDefaultConfigValues(v *viper.Viper) {
@@ -208,8 +210,6 @@ func (c *Config) Validate() error {
 
 	// Validate the source chains and store the source subnet and chain IDs for future use
 	sourceBlockchains := set.NewSet[string](len(c.SourceBlockchains))
-	var sourceSubnetIDs []ids.ID
-	var sourceBlockchainIDs []ids.ID
 	for _, s := range c.SourceBlockchains {
 		// Validate configuration
 		if err := s.Validate(&destinationChains); err != nil {
@@ -220,24 +220,8 @@ func (c *Config) Validate() error {
 			return errors.New("configured source subnets must have unique chain IDs")
 		}
 		sourceBlockchains.Add(s.BlockchainID)
-
-		// Save IDs for future use
-		subnetID, err := ids.FromString(s.SubnetID)
-		if err != nil {
-			return fmt.Errorf("invalid subnetID in configuration. error: %w", err)
-		}
-		sourceSubnetIDs = append(sourceSubnetIDs, subnetID)
-
-		blockchainID, err := ids.FromString(s.BlockchainID)
-		if err != nil {
-			return fmt.Errorf("invalid subnetID in configuration. error: %w", err)
-		}
-		sourceBlockchainIDs = append(sourceBlockchainIDs, blockchainID)
 	}
 
-	c.sourceSubnetIDs = sourceSubnetIDs
-	c.sourceBlockchainIDs = sourceBlockchainIDs
-
 	// Validate the manual warp messages
 	for i, msg := range c.ManualWarpMessages {
 		if err := msg.Validate(); err != nil {
@@ -417,6 +401,18 @@ func (s *SourceBlockchain) Validate(destinationBlockchainIDs *set.Set[string]) e
 		}
 	}
 
+	// Validate and store the subnet and blockchain IDs for future use
+	blockchainID, err := ids.FromString(s.BlockchainID)
+	if err != nil {
+		return fmt.Errorf("invalid blockchainID in configuration. error: %w", err)
+	}
+	s.blockchainID = blockchainID
+	subnetID, err := ids.FromString(s.SubnetID)
+	if err != nil {
+		return fmt.Errorf("invalid subnetID in configuration. error: %w", err)
+	}
+	s.subnetID = subnetID
+
 	// Validate and store the allowed destinations for future use
 	s.supportedDestinations = set.Set[ids.ID]{}
 
@@ -447,6 +443,14 @@ func (s *SourceBlockchain) Validate(destinationBlockchainIDs *set.Set[string]) e
 	return nil
 }
 
+func (s *SourceBlockchain) GetSubnetID() ids.ID {
+	return s.subnetID
+}
+
+func (s *SourceBlockchain) GetBlockchainID() ids.ID {
+	return s.blockchainID
+}
+
 // Validatees the destination subnet configuration
 func (s *DestinationBlockchain) Validate() error {
 	if _, err := ids.FromString(s.SubnetID); err != nil {
@@ -473,9 +477,29 @@ func (s *DestinationBlockchain) Validate() error {
 		return fmt.Errorf("unsupported VM type for source subnet: %s", s.VM)
 	}
 
+	// Validate and store the subnet and blockchain IDs for future use
+	blockchainID, err := ids.FromString(s.BlockchainID)
+	if err != nil {
+		return fmt.Errorf("invalid blockchainID in configuration. error: %w", err)
+	}
+	s.blockchainID = blockchainID
+	subnetID, err := ids.FromString(s.SubnetID)
+	if err != nil {
+		return fmt.Errorf("invalid subnetID in configuration. error: %w", err)
+	}
+	s.subnetID = subnetID
+
 	return nil
 }
 
+func (s *DestinationBlockchain) GetSubnetID() ids.ID {
+	return s.subnetID
+}
+
+func (s *DestinationBlockchain) GetBlockchainID() ids.ID {
+	return s.blockchainID
+}
+
 func (s *DestinationBlockchain) initializeWarpQuorum() error {
 	blockchainID, err := ids.FromString(s.BlockchainID)
 	if err != nil {
@@ -514,11 +538,6 @@ func (s *DestinationBlockchain) GetRelayerAccountInfo() (*ecdsa.PrivateKey, comm
 // Top-level config getters
 //
 
-// GetSourceIDs returns the Subnet and Chain IDs of all subnets configured as a source
-func (c *Config) GetSourceIDs() ([]ids.ID, []ids.ID) {
-	return c.sourceSubnetIDs, c.sourceBlockchainIDs
-}
-
 func (c *Config) GetWarpQuorum(blockchainID ids.ID) (WarpQuorum, error) {
 	for _, s := range c.DestinationBlockchains {
 		if blockchainID.String() == s.BlockchainID {

database/json_file_storage.go

@@ -34,30 +34,30 @@ type JSONFileStorage struct {
 }
 
 // NewJSONFileStorage creates a new JSONFileStorage instance
-func NewJSONFileStorage(logger logging.Logger, dir string, networks []ids.ID) (*JSONFileStorage, error) {
+func NewJSONFileStorage(logger logging.Logger, dir string, chainIDs []ids.ID) (*JSONFileStorage, error) {
 	storage := &JSONFileStorage{
 		dir:          filepath.Clean(dir),
 		mutexes:      make(map[ids.ID]*sync.RWMutex),
 		logger:       logger,
 		currentState: make(map[ids.ID]chainState),
 	}
 
-	for _, network := range networks {
-		storage.currentState[network] = make(chainState)
-		storage.mutexes[network] = &sync.RWMutex{}
+	for _, chainID := range chainIDs {
+		storage.currentState[chainID] = make(chainState)
+		storage.mutexes[chainID] = &sync.RWMutex{}
 	}
 
 	_, err := os.Stat(dir)
 	if err == nil {
 		// Directory already exists.
 		// Read the existing storage.
-		for _, network := range networks {
-			currentState, fileExists, err := storage.getCurrentState(network)
+		for _, chainID := range chainIDs {
+			currentState, fileExists, err := storage.getCurrentState(chainID)
 			if err != nil {
 				return nil, err
 			}
 			if fileExists {
-				storage.currentState[network] = currentState
+				storage.currentState[chainID] = currentState
 			}
 		}
 		return storage, nil

main/main.go

@@ -12,6 +12,7 @@ import (
 	"os"
 
 	"github.com/alexliesenfeld/health"
+	"github.com/ava-labs/avalanchego/api/info"
 	"github.com/ava-labs/avalanchego/api/metrics"
 	"github.com/ava-labs/avalanchego/ids"
 	"github.com/ava-labs/avalanchego/message"
@@ -74,8 +75,9 @@ func main() {
 	}
 	logger.Info(fmt.Sprintf("Set config options.%s", overwrittenLog))
 
-	// Global P-Chain client used to get subnet validator sets
+	// Global P-Chain and Info clients used to get subnet validator sets
 	pChainClient := platformvm.NewClient(cfg.PChainAPIURL)
+	infoClient := info.NewClient(cfg.InfoAPIURL)
 
 	// Initialize all destination clients
 	logger.Info("Initializing destination clients")
@@ -98,15 +100,20 @@ func main() {
 
 	// Initialize the global app request network
 	logger.Info("Initializing app request network")
-	sourceSubnetIDs, sourceBlockchainIDs := cfg.GetSourceIDs()
 
 	// The app request network generates P2P networking logs that are verbose at the info level.
 	// Unless the log level is debug or lower, set the network log level to error to avoid spamming the logs.
 	networkLogLevel := logging.Error
 	if logLevel <= logging.Debug {
 		networkLogLevel = logLevel
 	}
-	network, responseChans, err := peers.NewNetwork(networkLogLevel, registerer, sourceSubnetIDs, sourceBlockchainIDs, cfg.InfoAPIURL)
+	network, responseChans, err := peers.NewNetwork(
+		networkLogLevel,
+		registerer,
+		&cfg,
+		infoClient,
+		pChainClient,
+	)
 	if err != nil {
 		logger.Error(
 			"Failed to create app request network",
@@ -167,7 +174,12 @@ func main() {
 	}
 
 	// Initialize the database
-	db, err := database.NewJSONFileStorage(logger, cfg.StorageLocation, sourceBlockchainIDs)
+	sourceChainIDs := make([]ids.ID, len(cfg.SourceBlockchains))
+	for i, sourceBlockchain := range cfg.SourceBlockchains {
+		sourceChainIDs[i] = sourceBlockchain.GetBlockchainID()
+	}
+
+	db, err := database.NewJSONFileStorage(logger, cfg.StorageLocation, sourceChainIDs)
 	if err != nil {
 		logger.Error(
 			"Failed to create database",