Merge 5b3f05b7eb into merged_master (Bitcoin PR bitcoin/bitcoin#24226)

This commit is contained in:
Byron Hambly 2025-03-04 13:22:16 +02:00
commit 028fd5fcbb
2 changed files with 5 additions and 1 deletions

View file

@ -1747,6 +1747,8 @@ std::optional<std::string> PeerManagerImpl::FetchBlock(NodeId peer_id, const CBl
LOCK(cs_main);
// Mark block as in-flight unless it already is (for this peer).
// If the peer does not send us a block, vBlocksInFlight remains non-empty,
// causing us to timeout and disconnect.
// If a block was already in-flight for a different peer, its BLOCKTXN
// response will be dropped.
if (!BlockRequested(peer_id, block_index)) return "Already requested from this peer";