From 59ec4cb0718b9ff16efdeace66678397b120cc98 Mon Sep 17 00:00:00 2001
From: Arkadiy Paronyan <arkady.paronyan@gmail.com>
Date: Mon, 11 Nov 2019 11:34:53 +0100
Subject: [PATCH] Don't request old obsolete blocks (#4084)
---
substrate/core/network/src/protocol/sync.rs | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/substrate/core/network/src/protocol/sync.rs b/substrate/core/network/src/protocol/sync.rs
index 12839136a50..a7e6139e48d 100644
--- a/substrate/core/network/src/protocol/sync.rs
+++ b/substrate/core/network/src/protocol/sync.rs
@@ -597,7 +597,14 @@ impl<B: BlockT> ChainSync<B> {
peer.state = PeerSyncState::DownloadingStale(hash);
have_requests = true;
Some((id.clone(), req))
- } else if let Some((range, req)) = peer_block_request(id, peer, blocks, attrs, max_parallel) {
+ } else if let Some((range, req)) = peer_block_request(
+ id,
+ peer,
+ blocks,
+ attrs,
+ max_parallel,
+ last_finalized
+ ) {
peer.state = PeerSyncState::DownloadingNew(range.start);
trace!(
target: "sync",
@@ -1236,7 +1243,11 @@ fn peer_block_request<B: BlockT>(
blocks: &mut BlockCollection<B>,
attrs: &message::BlockAttributes,
max_parallel_downloads: u32,
+ finalized: NumberFor<B>,
) -> Option<(Range<NumberFor<B>>, BlockRequest<B>)> {
+ if peer.common_number < finalized {
+ return None;
+ }
if let Some(range) = blocks.needed_blocks(
id.clone(),
MAX_BLOCKS_TO_REQUEST,
--
GitLab