Request columns from global peer pool

pawanjay176 · pawanjay176 · commit 45401958713d · 2025-08-20T19:01:40.000-07:00
diff --git a/beacon_node/lighthouse_network/src/peer_manager/peerdb.rs b/beacon_node/lighthouse_network/src/peer_manager/peerdb.rs
@@ -323,6 +323,8 @@ impl<E: EthSpec> PeerDB<E> {
             .map(|(peer_id, _)| peer_id)
     }
 
+    /// Returns an iterator of all good gossipsub peers that are supposed to be custodying
+    /// the given subnet id.
     pub fn good_custody_subnet_peer_range_sync(
         &self,
         subnet: DataColumnSubnetId,
diff --git a/beacon_node/network/src/sync/range_sync/chain.rs b/beacon_node/network/src/sync/range_sync/chain.rs
@@ -957,7 +957,7 @@ impl<T: BeaconChainTypes> SyncingChain<T> {
                 .network_globals()
                 .peers
                 .read()
-                .synced_peers_for_epoch(batch_id, Some(&self.peers))
+                .synced_peers_for_epoch(batch_id, None)
                 .cloned()
                 .collect::<HashSet<_>>();
 
@@ -1034,7 +1034,7 @@ impl<T: BeaconChainTypes> SyncingChain<T> {
                 .network_globals()
                 .peers
                 .read()
-                .synced_peers_for_epoch(batch_id, Some(&self.peers))
+                .synced_peers_for_epoch(batch_id, None)
                 .cloned()
                 .collect::<HashSet<_>>();
 
@@ -1129,21 +1129,21 @@ impl<T: BeaconChainTypes> SyncingChain<T> {
     ) -> bool {
         if network.chain.spec.is_peer_das_enabled_for_epoch(epoch) {
             // Require peers on all sampling column subnets before sending batches
-            network
+            let peers_on_all_custody_subnets = network
                 .network_globals()
                 .sampling_subnets()
                 .iter()
                 .all(|subnet_id| {
-                    let peer_db = network.network_globals().peers.read();
-                    let peer_count = self
+                    let peer_count = network
+                        .network_globals()
                         .peers
-                        .iter()
-                        .filter(|peer| {
-                            peer_db.is_good_range_sync_custody_subnet_peer(*subnet_id, peer)
-                        })
+                        .read()
+                        .good_custody_subnet_peer_range_sync(*subnet_id, epoch)
                         .count();
+
                     peer_count > 0
-                })
+                });
+            peers_on_all_custody_subnets
         } else {
             true
         }

Original file line number	Diff line number	Diff line change
`@@ -323,6 +323,8 @@ impl<E: EthSpec> PeerDB<E> {`
`323`	`323`	`.map(\|(peer_id, _)\| peer_id)`
`324`	`324`	`}`
`325`	`325`
	`326`	`+ /// Returns an iterator of all good gossipsub peers that are supposed to be custodying`
	`327`	`+ /// the given subnet id.`
`326`	`328`	`pub fn good_custody_subnet_peer_range_sync(`
`327`	`329`	`&self,`
`328`	`330`	`subnet: DataColumnSubnetId,`