From 8f87045e4c0d73b77083afe8c17e136f52a85083 Mon Sep 17 00:00:00 2001 From: Subh Date: Mon, 30 Mar 2026 12:36:33 +0800 Subject: [PATCH] prefer peer-reported block number in session activation --- crates/net/network/src/state.rs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/crates/net/network/src/state.rs b/crates/net/network/src/state.rs index 469e787e3b8..b9e15288ec7 100644 --- a/crates/net/network/src/state.rs +++ b/crates/net/network/src/state.rs @@ -155,9 +155,11 @@ impl NetworkState { ) { debug_assert!(!self.active_peers.contains_key(&peer), "Already connected; not possible"); - // find the corresponding block number - let block_number = - self.client.block_number(status.blockhash).ok().flatten().unwrap_or_default(); + // Use the block number from the peer's status (eth/69+) if available, + // otherwise fall back to a local lookup by hash. + let block_number = status.latest_block.unwrap_or_else(|| { + self.client.block_number(status.blockhash).ok().flatten().unwrap_or_default() + }); self.state_fetcher.new_active_peer( peer, status.blockhash,