Stuck lookup v6 (#6658)

Squashed commit of the following: commit 9d82a1d Merge: 193c7f8 4946343 Author: Michael Sproul <[email protected]> Date: Fri Dec 13 11:48:03 2024 +1100 Merge branch 'release-v6.0.1' into stuck-lookup-v6 commit 193c7f8 Author: dapplion <[email protected]> Date: Thu Dec 5 09:32:57 2024 +0800 Fix stuck lookups if no peers on v6
sigp · Dec 13, 2024 · 92edebd · 92edebd
1 parent 4946343
commit 92edebd
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/beacon_node/network/src/sync/block_lookups/single_block_lookup.rs b/beacon_node/network/src/sync/block_lookups/single_block_lookup.rs
@@ -171,7 +171,10 @@ impl<T: BeaconChainTypes> SingleBlockLookup<T> {
         self.awaiting_parent.is_some()
             || self.block_request_state.state.is_awaiting_event()
             || match &self.component_requests {
-                ComponentRequests::WaitingForBlock => true,
+                // If components are waiting for the block request to complete, here we should
+                // check if the`block_request_state.state.is_awaiting_event(). However we already
+                // checked that above, so `WaitingForBlock => false` is equivalent.
+                ComponentRequests::WaitingForBlock => false,
                 ComponentRequests::ActiveBlobRequest(request, _) => {
                     request.state.is_awaiting_event()
                 }