Skip to content

fix: push header before limit check in get_headers_response #318

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

Merged
greged93 merged 1 commit into from
Aug 11, 2025
Merged

fix: push header before limit check in get_headers_response #318

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
23 changes: 13 additions & 10 deletions crates/net/network/src/eth_requests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,19 @@ where

for _ in 0..limit {
if let Some(header) = self.client.header_by_hash_or_number(block).unwrap_or_default() {
let number = header.number();
let parent_hash = header.parent_hash();

total_bytes += header.length();
headers.push(header);

if headers.len() >= MAX_HEADERS_SERVE || total_bytes > SOFT_RESPONSE_LIMIT {
break
}

match direction {
HeadersDirection::Rising => {
if let Some(next) = (header.number() + 1).checked_add(skip) {
if let Some(next) = number.checked_add(skip) {
block = next.into()
} else {
break
Expand All @@ -117,24 +127,17 @@ where
// prevent under flows for block.number == 0 and `block.number - skip <
// 0`
if let Some(next) =
header.number().checked_sub(1).and_then(|num| num.checked_sub(skip))
number.checked_sub(1).and_then(|num| num.checked_sub(skip))
{
block = next.into()
} else {
break
}
} else {
block = header.parent_hash().into()
block = parent_hash.into()
}
}
}

total_bytes += header.length();
headers.push(header);

if headers.len() >= MAX_HEADERS_SERVE || total_bytes > SOFT_RESPONSE_LIMIT {
break
}
} else {
break
}
Expand Down
Loading