Skip to content

fix(l1): use correct target to get closest neighbors in discv4 #5595

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
MegaRedHand merged 3 commits into from
Dec 11, 2025
Merged

fix(l1): use correct target to get closest neighbors in discv4 #5595

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
23866e9
use target from message instead sender id
lakshya-sky Dec 10, 2025
49d7d21
Merge branch 'main' into fix/find-node-request
MegaRedHand Dec 10, 2025
d4fe293
Merge branch 'main' into fix/find-node-request
MegaRedHand Dec 11, 2025
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
13 changes: 9 additions & 4 deletions crates/networking/p2p/discv4/server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,8 @@ impl DiscoveryServer {
return Ok(());
}

self.handle_find_node(sender_public_key, from).await?;
self.handle_find_node(sender_public_key, find_node_message.target, from)
.await?;
}
Message::Neighbors(neighbors_message) => {
trace!(received = "Neighbors", msg = ?neighbors_message, from = %format!("{sender_public_key:#x}"));
Expand Down Expand Up @@ -425,14 +426,18 @@ impl DiscoveryServer {
async fn handle_find_node(
&mut self,
sender_public_key: H512,
target: H512,
from: SocketAddr,
) -> Result<(), DiscoveryServerError> {
let node_id = node_id(&sender_public_key);
let sender_id = node_id(&sender_public_key);
if let Ok(contact) = self
.validate_contact(sender_public_key, node_id, from, "FindNode")
.validate_contact(sender_public_key, sender_id, from, "FindNode")
.await
{
let neighbors = self.peer_table.get_closest_nodes(&node_id).await?;
// According to https://github.com/ethereum/devp2p/blob/master/discv4.md#findnode-packet-0x03
// reply closest 16 nodes to target
let target_id = node_id(&target);
let neighbors = self.peer_table.get_closest_nodes(&target_id).await?;

// A single node encodes to at most 89B, so 8 of them are at most 712B plus
// recursive length and expiration time, well within bound of 1280B per packet.
Expand Down