feat(l1): admin_addPeer endpoint #5004
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
mpaulucci
reviewed
Nov 3, 2025
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR implements the admin_addPeer RPC method to allow manually adding peers to the P2P network. The changes refactor the initialization of the RLPx initiator and peer handler to support this new functionality.
Key changes:
- Added
admin_addPeerRPC endpoint implementation - Refactored
PeerHandlerandSyncManagerdummy methods to be async - Modified
RLPxInitiator::spawnto return a handle for external peer initiation - Updated dependency injection patterns for P2P components in initializers
Reviewed Changes
Copilot reviewed 16 out of 17 changed files in this pull request and generated 7 comments.
Show a summary per file
| File | Description |
|---|---|
| crates/networking/rpc/admin/peers.rs | Added add_peer function with connection verification loop and helper function |
| crates/networking/rpc/rpc.rs | Registered new admin_addPeer RPC method |
| crates/networking/rpc/admin/mod.rs | Exported add_peer function |
| crates/networking/p2p/peer_handler.rs | Added initiator field and updated constructor |
| crates/networking/p2p/rlpx/initiator.rs | Added Initiate message variant and modified spawn to return handle |
| crates/networking/p2p/sync_manager.rs | Made dummy method async |
| crates/networking/p2p/sync.rs | Made dummy method async |
| cmd/ethrex/initializers.rs | Refactored P2P context and initiator initialization |
| cmd/ethrex/l2/initializers.rs | Refactored P2P context and initiator initialization for L2 |
| tooling/sync/Makefile | Added quotes around JWT secret path |
| crates/networking/rpc/Cargo.toml | Added test-utils feature dependency |
| crates/networking/p2p/Cargo.toml | Added test-utils feature flag |
| .github/workflows/pr-main_l1.yaml | Increased simulation parallelism from 4 to 8 |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
ElFantasma
reviewed
Nov 4, 2025
ElFantasma
reviewed
Nov 4, 2025
ElFantasma
reviewed
Nov 4, 2025
ElFantasma
reviewed
Nov 4, 2025
ElFantasma
approved these changes
Nov 4, 2025
Contributor
ElFantasma
left a comment
ElFantasma
left a comment
There was a problem hiding this comment.
Left some comments, but it LGTM!
github-merge-queue bot
pushed a commit
that referenced
this pull request
Nov 7, 2025
**Motivation** PR #5004 led to changes in `init_l2()` that weren't properly updated, so now when initializing L2 there are 2 Peer Tables. **Description** This pr uses the Peer Table created in the first place to initialize the Peer Handler instead of creating a new one. It also updates the gen server initialization for the gen server dummy.
xqft
pushed a commit
that referenced
this pull request
Nov 11, 2025
**Motivation** Include geth's [admin_addPeer](https://geth.ethereum.org/docs/interacting-with-geth/rpc/ns-admin#admin-addpeer) endpoint since we found it necessary for running eip7934 hive tests with the `ethereum/eels/consume-sync ` simulation. Besides Nethermind, Reth, Besu, Erigon and other execution clients implement it. **Description** This pr introduces the RPC endpoint `admin_addPeer`. Since this endpoint needed to access p2p's generic server used to establish connections, the `init_l1` function was restructure so the genserver is saved within the peer_handler struct and can later be accessed from the `RPCApiContext`. In `admin_addPeer` the connection is tried in a period of 10 seconds waiting 100 milliseconds in between each message casted. This is because connections are asynchronous so to check if the connection with the peer was made we need to wait until it's established. --------- Co-authored-by: SDartayet <sofiadartayet@gmail.com> Co-authored-by: SDartayet <44068466+SDartayet@users.noreply.github.com> Co-authored-by: ElFantasma <estebandh@gmail.com>
xqft
pushed a commit
that referenced
this pull request
Nov 11, 2025
**Motivation** PR #5004 led to changes in `init_l2()` that weren't properly updated, so now when initializing L2 there are 2 Peer Tables. **Description** This pr uses the Peer Table created in the first place to initialize the Peer Handler instead of creating a new one. It also updates the gen server initialization for the gen server dummy.
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
Include geth's admin_addPeer endpoint since we found it necessary for running eip7934 hive tests with the
ethereum/eels/consume-syncsimulation.Besides Nethermind, Reth, Besu, Erigon and other execution clients implement it.
Description
This pr introduces the RPC endpoint
admin_addPeer. Since this endpoint needed to access p2p's generic server used to establish connections, theinit_l1function was restructure so the genserver is saved within the peer_handler struct and can later be accessed from theRPCApiContext.In
admin_addPeerthe connection is tried in a period of 10 seconds waiting 100 milliseconds in between each message casted. This is because connections are asynchronous so to check if the connection with the peer was made we need to wait until it's established.