Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(p2p/client/peer_agnostic): limit sync request block ranges #2227

Merged
merged 1 commit into from
Sep 13, 2024
Merged

fix(p2p/client/peer_agnostic): limit sync request block ranges #2227

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 34 additions & 10 deletions crates/p2p/src/client/peer_agnostic.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,6 +590,9 @@ impl BlockClient for Client {
}
}

/// Maximum number of blocks to request in a single request
const MAX_BLOCKS_COUNT: u64 = 500;
kkovaacs marked this conversation as resolved.
Show resolved Hide resolved

mod header_stream {
use super::*;

Expand Down Expand Up @@ -696,13 +699,14 @@ mod header_stream {
}

fn make_request(start: i64, stop: i64, dir: Direction) -> BlockHeadersRequest {
let limit = start.max(stop) - start.min(stop) + 1;
let limit = start.abs_diff(stop) + 1;
let limit = limit.min(MAX_BLOCKS_COUNT);

BlockHeadersRequest {
iteration: Iteration {
start: u64::try_from(start).expect("start >= 0").into(),
direction: dir,
limit: limit.try_into().expect("limit >= 0"),
limit,
step: 1.into(),
},
}
Expand Down Expand Up @@ -839,11 +843,16 @@ mod transaction_stream {
}

fn make_request(start: BlockNumber, stop: BlockNumber) -> TransactionsRequest {
let start = start.get();
let stop = stop.get();
let limit = start.abs_diff(stop) + 1;
let limit = limit.min(MAX_BLOCKS_COUNT);

TransactionsRequest {
iteration: Iteration {
start: start.get().into(),
start: start.into(),
direction: Direction::Forward,
limit: stop.get() - start.get() + 1,
limit,
step: 1.into(),
},
}
Expand Down Expand Up @@ -1055,11 +1064,16 @@ mod state_diff_stream {
}

fn make_request(start: BlockNumber, stop: BlockNumber) -> StateDiffsRequest {
let start = start.get();
let stop = stop.get();
let limit = start.abs_diff(stop) + 1;
let limit = limit.min(MAX_BLOCKS_COUNT);

StateDiffsRequest {
iteration: Iteration {
start: start.get().into(),
start: start.into(),
direction: Direction::Forward,
limit: stop.get() - start.get() + 1,
limit,
step: 1.into(),
},
}
Expand Down Expand Up @@ -1189,11 +1203,16 @@ mod class_definition_stream {
}

fn make_request(start: BlockNumber, stop: BlockNumber) -> ClassesRequest {
let start = start.get();
let stop = stop.get();
let limit = start.abs_diff(stop) + 1;
let limit = limit.min(MAX_BLOCKS_COUNT);

ClassesRequest {
iteration: Iteration {
start: start.get().into(),
start: start.into(),
direction: Direction::Forward,
limit: stop.get() - start.get() + 1,
limit,
step: 1.into(),
},
}
Expand Down Expand Up @@ -1366,11 +1385,16 @@ mod event_stream {
}

fn make_request(start: BlockNumber, stop: BlockNumber) -> EventsRequest {
let start = start.get();
let stop = stop.get();
let limit = start.abs_diff(stop) + 1;
let limit = limit.min(MAX_BLOCKS_COUNT);

EventsRequest {
iteration: Iteration {
start: start.get().into(),
start: start.into(),
direction: Direction::Forward,
limit: stop.get() - start.get() + 1,
limit,
step: 1.into(),
},
}
Expand Down