chore: Improve peer persistence and bootnode loading

command/server/init.go

@@ -339,7 +339,12 @@ func (p *serverParams) getBootnodeConfig() (*chain.Bootnode, error) {
 			defaultBootnodes = p.genesisConfig.Params.Bootnodes
 		}
 	} else {
-		// For custom networks, try to load from bootnode.json
+		// For custom networks, first load bootnodes from genesis params if present
+		if p.genesisConfig != nil && p.genesisConfig.Params != nil && len(p.genesisConfig.Params.Bootnodes) > 0 {
+			defaultBootnodes = append(defaultBootnodes, p.genesisConfig.Params.Bootnodes...)
+		}
+
+		// Then try to load additional bootnodes from adjacent bootnode.json
 		configPath := filepath.Join(filepath.Dir(p.rawConfig.GenesisFile), "bootnode.json")
 		if _, err := os.Stat(configPath); err == nil {
 			if data, err := os.ReadFile(configPath); err == nil {
@@ -352,7 +357,7 @@ func (p *serverParams) getBootnodeConfig() (*chain.Bootnode, error) {
 				}
 
 				if err := json.Unmarshal(data, &nodeConfig); err == nil {
-					defaultBootnodes = nodeConfig.Node.P2P.StaticNodes
+					defaultBootnodes = append(defaultBootnodes, nodeConfig.Node.P2P.StaticNodes...)
 				}
 			}
 		}
@@ -417,8 +422,8 @@ func (p *serverParams) getBootnodeConfig() (*chain.Bootnode, error) {
 	}
 
 	if len(allBootnodes) == 0 {
-		return nil, fmt.Errorf("no bootnodes found from any source. Please specify bootnodes via " +
-			"--bootnode-path, use mainnet/testnet, or ensure bootnode.json exists for custom networks")
+		return nil, fmt.Errorf("no bootnodes found. Provide them via genesis params.bootnodes, " +
+			"adjacent bootnode.json, or --bootnodes <./path/to/bootnode.json> or use mainnet/testnet")
 	}
 
 	return &chain.Bootnode{

network/server.go

@@ -512,9 +512,12 @@ func (s *Server) Peers() []*PeerConnInfo {
 
 	peers := make([]*PeerConnInfo, 0)
 	for id, connectionInfo := range s.peers {
-		s.logger.Info("Peers() entry", "peerID", id)
+		// Only include peers that are actually connected
+		if s.host.Network().Connectedness(id) == network.Connected {
+			s.logger.Info("Peers() entry", "peerID", id)
 
-		peers = append(peers, connectionInfo)
+			peers = append(peers, connectionInfo)
+		}
 	}
 
 	s.logger.Info("Peers to persist", "addrs", peers)
@@ -673,8 +676,16 @@ func (s *Server) Close() error {
 	addrs := []string{}
 
 	for _, p := range peers {
-		addrStr, err := common.AddrInfoToString(&p.Info)
-		if err == nil {
+		// Build a complete AddrInfo for the peer. The stored Info may not
+		// have addresses populated at shutdown, so pull from the peerstore.
+		addrInfo := peer.AddrInfo{ID: p.Info.ID, Addrs: p.Info.Addrs}
+		if len(addrInfo.Addrs) == 0 {
+			addrInfo.Addrs = s.host.Peerstore().Addrs(p.Info.ID)
+		}
+
+		// Only include peers that we can serialize into a multiaddr string
+		addrStr, err := common.AddrInfoToString(&addrInfo)
+		if err == nil && addrStr != "" {
 			addrs = append(addrs, addrStr)
 		}
 	}

network/server_test.go

@@ -1010,7 +1010,7 @@ func TestPeerAdditionDeletion(t *testing.T) {
 			assert.True(t, true, server.hasPeer(randomPeer.peerID))
 		}
 
-		assert.Len(t, server.Peers(), peersNum)
+		assert.Equal(t, int64(peersNum), server.numPeers())
 
 		return randomPeers
 	}
@@ -1061,7 +1061,7 @@ func TestPeerAdditionDeletion(t *testing.T) {
 
 		server.AddPeer(randomPeer.peerID, randomPeer.direction)
 
-		assert.Len(t, server.Peers(), 1)
+		assert.Equal(t, int64(1), server.numPeers())
 
 		outbound, inbound := extractExpectedDirectionCounts(randomPeers)
 		validateConnectionCounts(server, outbound, inbound)
@@ -1095,14 +1095,16 @@ func TestPeerAdditionDeletion(t *testing.T) {
 			assert.True(t, true, server.hasPeer(peer.peerID))
 		}
 
-		assert.Len(t, server.Peers(), 1)
+		assert.Equal(t, int64(1), server.numPeers())
 
 		// Make sure the directions match
-		for indx, connInfo := range server.Peers() {
-			assert.Equal(t, randomPeers[indx].peerID, connInfo.Info.ID)
-			assert.True(t, connInfo.connDirections[network.DirOutbound])
-			assert.True(t, connInfo.connDirections[network.DirInbound])
-		}
+		server.peersLock.Lock()
+		connInfo := server.peers[randomPeers[0].peerID]
+		server.peersLock.Unlock()
+		assert.NotNil(t, connInfo)
+		assert.Equal(t, randomPeers[0].peerID, connInfo.Info.ID)
+		assert.True(t, connInfo.connDirections[network.DirOutbound])
+		assert.True(t, connInfo.connDirections[network.DirInbound])
 
 		outbound, inbound := extractExpectedDirectionCounts(randomPeers)
 		validateConnectionCounts(server, outbound, inbound)
@@ -1130,7 +1132,7 @@ func TestPeerAdditionDeletion(t *testing.T) {
 		}
 
 		// Make sure the peers lists match
-		assert.Len(t, server.Peers(), peersNum-prunedPeers)
+		assert.Equal(t, int64(peersNum-prunedPeers), server.numPeers())
 
 		outbound, inbound := extractExpectedDirectionCounts(leftoverPeers)
 		validateConnectionCounts(server, outbound, inbound)