refactor(l1): discovery service #1768
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…o its own folder and files
MarcosNicolau
added a commit
that referenced
this pull request
Jan 22, 2025
allow many arguments is a temprarily fix, this will be soled in #1768
MarcosNicolau
force-pushed
the
refactor/discovery
branch
from
f34f403 to
e3e68a4
Compare
|
MarcosNicolau
commented
Jan 23, 2025
Comment on lines
-146
to
-154
| let digest = Keccak256::digest(msg.get(65..).ok_or(RLPxError::InvalidMessageLength())?); | ||
| let signature = &Signature::from_bytes( | ||
| msg.get(..64) | ||
| .ok_or(RLPxError::InvalidMessageLength())? | ||
| .into(), | ||
| )?; | ||
| let rid = RecoveryId::from_byte(*msg.get(64).ok_or(RLPxError::InvalidMessageLength())?) | ||
| .ok_or(RLPxError::InvalidRecoveryId())?; | ||
| let peer_pk = VerifyingKey::recover_from_prehash(&digest, signature, rid)?; |
Contributor
Author
There was a problem hiding this comment.
I remove this because it is recovering the pubkey points bytes (node_id) from the msg, something we already do when decoding the packet (see https://github.com/lambdaclass/ethrex/blob/main/crates/networking/p2p/discv4.rs#L87-L97).
Contributor
There was a problem hiding this comment.
This is great, missed to comment this on previous review!
MarcosNicolau
commented
Jan 23, 2025
| pub(crate) type RLPxConnBroadcastSender = broadcast::Sender<(tokio::task::Id, Arc<Message>)>; | ||
|
|
||
| // https://github.com/ethereum/go-ethereum/blob/master/p2p/peer.go#L44 | ||
| pub const P2P_MAX_MESSAGE_SIZE: usize = 2048; |
Contributor
Author
There was a problem hiding this comment.
The spec doesn't mention a max size but we were using the max size of the discovery protocol, and reading geth code they define 2048 as the max packet size in rlpx, see here.
MarcosNicolau
commented
Jan 23, 2025
Comment on lines
-278
to
+275
| tracker.spawn(networking); | ||
| .await.expect("Network starts"); |
Contributor
Author
There was a problem hiding this comment.
Note that we don't need to spawn the networking as a task. This allows us to panic if there is an err during the network startup.
ElFantasma
requested changes
Jan 27, 2025
Contributor
ElFantasma
left a comment
ElFantasma
left a comment
There was a problem hiding this comment.
Most comments are minor issues. And some may be wrong 😬
Good work overall!
pedrobergamini
pushed a commit
to pedrobergamini/ethrex
that referenced
this pull request
Aug 24, 2025
**Motivation** Discovery service was becoming too big and unmanageable to be inside `net.rs`. **Description** This refactor splits the discovery service into its own structs and files, now the flow is: - `Discv4` struct: handles the core logic of the `discv4` protocol - Loading bootnodes - Listening for incoming connections and handling messages - Managing revalidations - Initiating lookups - `Discv4LookupHandler`: the complexity of the lookups is encapsulated in this struct. The following improvements have also been made: - All Tokio tasks are now spawned using the tracker. - When receiving neighbors' messages, now we check we do not add ourselves to the table (which could occur occasionally). - Error handling has been improved, and the verification logic is now more readable, especially within message handling. Closes None
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation
Discovery service was becoming too big and unmanageable to be inside
net.rs.Description
This refactor splits the discovery service into its own structs and files, now the flow is:
Discv4struct: handles the core logic of thediscv4protocolDiscv4LookupHandler: the complexity of the lookups is encapsulated in this struct.The following improvements have also been made:
Closes None