Skip to content

perf(l1): optimize get closest nodes #4838

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
edg-l merged 4 commits into from
Oct 15, 2025
Merged

perf(l1): optimize get closest nodes #4838

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
caff76b
use indexmap for fastish lookup and fast iteration, instead of btreem…
edg-l Oct 10, 2025
2c3dd8a
changelog
edg-l Oct 10, 2025
15f3dcf
Merge branch 'main' into optimize_get_closest_nodes
edg-l Oct 14, 2025
b2cfa55
Merge branch 'main' into optimize_get_closest_nodes
edg-l Oct 14, 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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## Perf

### 2025-10-10

- Improve get_closest_nodes p2p performance [#4838](https://github.com/lambdaclass/ethrex/pull/4838)

### 2025-10-06

- Improve block headers vec handling in syncer [#4771](https://github.com/lambdaclass/ethrex/pull/4771)
Expand Down
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ rkyv = { version = "0.8.10", features = ["std", "unaligned"] }
tempfile = "3.8"
uuid = { version = "1.18.1", features = ["v4"] }
tower-http = { version = "0.6.2", features = ["cors"] }
indexmap = { version = "2.11.4" }

rocksdb = "0.24.0"

Expand Down
49 changes: 32 additions & 17 deletions crates/l2/tee/quote-gen/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions crates/networking/p2p/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ spawned-rt.workspace = true
spawned-concurrency.workspace = true
sha2.workspace = true
futures.workspace = true
indexmap.workspace = true
rocksdb = { workspace = true, optional = true }
prometheus = "0.14.0"

Expand Down
11 changes: 6 additions & 5 deletions crates/networking/p2p/discv4/peer_table.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@ use crate::{
types::{Node, NodeRecord},
};
use ethrex_common::{H256, U256};
use indexmap::{IndexMap, map::Entry};
use rand::seq::SliceRandom;
use spawned_concurrency::{
error::GenServerError,
tasks::{CallResponse, CastResponse, GenServer, GenServerHandle},
};
use spawned_rt::tasks::mpsc;
use std::{
collections::{BTreeMap, HashSet, btree_map::Entry},
collections::HashSet,
net::IpAddr,
sync::Arc,
time::{Duration, Instant},
Expand Down Expand Up @@ -546,8 +547,8 @@ impl PeerTableHandle {

#[derive(Debug, Default)]
pub struct PeerTable {
contacts: BTreeMap<H256, Contact>,
peers: BTreeMap<H256, PeerData>,
contacts: IndexMap<H256, Contact>,
peers: IndexMap<H256, PeerData>,
already_tried_peers: HashSet<H256>,
discarded_contacts: HashSet<H256>,
}
Expand Down Expand Up @@ -606,7 +607,7 @@ impl PeerTable {
.collect::<Vec<_>>();

for contact_to_discard_id in disposable_contacts {
self.contacts.remove(&contact_to_discard_id);
self.contacts.swap_remove(&contact_to_discard_id);
Copy link
Collaborator

@MegaRedHand MegaRedHand Oct 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does indexmap have something like Vec::retain ? We could replace this loop with that

Copy link
Contributor Author

@edg-l edg-l Oct 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i would prefer to look at this in another pr/change

self.discarded_contacts.insert(contact_to_discard_id);
}
}
Expand Down Expand Up @@ -1067,7 +1068,7 @@ impl GenServer for PeerTable {
self.peers.insert(new_peer_id, new_peer);
}
CastMessage::RemovePeer { node_id } => {
self.peers.remove(&node_id);
self.peers.swap_remove(&node_id);
}
CastMessage::SetUnwanted { node_id } => {
self.contacts
Expand Down
Loading