Skip to content

Remove needless loop in presync #52

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
rustaceanrob merged 1 commit into from
Sep 9, 2025
Merged

Remove needless loop in presync #52

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
111 changes: 57 additions & 54 deletions node/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,66 +99,69 @@ pub fn sync_block_headers(
Err(_) => continue,
};
tracing::info!("Connection established");
let mut get_next = true;
loop {
let mut kill = false;
if get_next {
let curr = chainman.best_header().block_hash().hash;
let locator = BlockHash::from_byte_array(curr);
let getheaders = GetHeadersMessage {
version: PROTOCOL_VERSION,
locator_hashes: vec![locator],
stop_hash: BlockHash::GENESIS_PREVIOUS_BLOCK_HASH,
};
tracing::info!("Requesting {locator}");
if writer
.send_message(NetworkMessage::GetHeaders(getheaders))
.is_err()
{
break;
}
}
while let Ok(Some(message)) = reader.read_message() {
match message {
NetworkMessage::Headers(message) => {
for header in message.0 {
chainman
.process_new_block_headers(&consensus::serialize(&header), true)
.expect("process headers failed");
get_next = true;
if header.block_hash().eq(&stop_hash) {
tracing::info!("Done syncing block headers");
if let Some(message_rate) =
metrics.message_rate(p2p::TimedMessage::BlockHeaders)
{
let mps = message_rate
.messages_per_secs(Instant::now())
.unwrap_or(0.);
tracing::info!("Peer responses per second: {mps}");
}
elapsed_time(then);
return;
let curr = chainman.best_header().block_hash().hash;
let locator = BlockHash::from_byte_array(curr);
if locator.eq(&stop_hash) {
tracing::info!("Using existing header state");
return;
}
let getheaders = GetHeadersMessage {
version: PROTOCOL_VERSION,
locator_hashes: vec![locator],
stop_hash: BlockHash::GENESIS_PREVIOUS_BLOCK_HASH,
};
tracing::info!("Requesting {locator}");
if writer
.send_message(NetworkMessage::GetHeaders(getheaders))
.is_err()
{
continue;
}
while let Ok(Some(message)) = reader.read_message() {
match message {
NetworkMessage::Headers(message) => {
for header in message.0 {
chainman
.process_new_block_headers(&consensus::serialize(&header), true)
.expect("process headers failed");
if header.block_hash().eq(&stop_hash) {
tracing::info!("Done syncing block headers");
if let Some(message_rate) =
metrics.message_rate(p2p::TimedMessage::BlockHeaders)
{
let mps =
message_rate.messages_per_secs(Instant::now()).unwrap_or(0.);
tracing::info!("Peer responses per second: {mps}");
}
elapsed_time(then);
return;
}
tracing::info!("Update chain tip: {}", chainman.best_header().height());
break;
}
NetworkMessage::Inv(_) => {
kill = true;
tracing::info!("Update chain tip: {}", chainman.best_header().height());
let curr = chainman.best_header().block_hash().hash;
let locator = BlockHash::from_byte_array(curr);
let getheaders = GetHeadersMessage {
version: PROTOCOL_VERSION,
locator_hashes: vec![locator],
stop_hash: BlockHash::GENESIS_PREVIOUS_BLOCK_HASH,
};
tracing::info!("Requesting {locator}");
if writer
.send_message(NetworkMessage::GetHeaders(getheaders))
.is_err()
{
break;
}
NetworkMessage::Ping(nonce) => {
get_next = false;
let _ = writer.send_message(NetworkMessage::Pong(nonce));
}
e => {
get_next = false;
tracing::info!("Ignoring message {}", e.command());
}
}
}
if kill {
break;
NetworkMessage::Inv(_) => {
break;
}
NetworkMessage::Ping(nonce) => {
let _ = writer.send_message(NetworkMessage::Pong(nonce));
}
e => {
tracing::info!("Ignoring message {}", e.command());
}
}
}
}
Expand Down