Skip to content

refactor(p2p): move rlpx into separate package #21464#2435

Open
gzliudan wants to merge 1 commit into
XinFinOrg:dev-upgradefrom
gzliudan:separate-rlpx
Open

refactor(p2p): move rlpx into separate package #21464#2435
gzliudan wants to merge 1 commit into
XinFinOrg:dev-upgradefrom
gzliudan:separate-rlpx

Conversation

@gzliudan

@gzliudan gzliudan commented Jul 3, 2026

Copy link
Copy Markdown
Collaborator

Proposed changes

This change moves the RLPx protocol implementation into a separate package, p2p/rlpx. The new package can be used to establish RLPx connections for protocol testing purposes.

Ref: ethereum#21464

Types of changes

What types of changes does your code introduce to XDC network?
Put an in the boxes that apply

  • build: Changes that affect the build system or external dependencies
  • ci: Changes to CI configuration files and scripts
  • chore: Changes that don't change source code or tests
  • docs: Documentation only changes
  • feat: A new feature
  • fix: A bug fix
  • perf: A code change that improves performance
  • refactor: A code change that neither fixes a bug nor adds a feature
  • revert: Revert something
  • style: Changes that do not affect the meaning of the code
  • test: Adding missing tests or correcting existing tests

Impacted Components

Which parts of the codebase does this PR touch?
Put an in the boxes that apply

  • Consensus
  • Account
  • Network
  • Geth
  • Smart Contract
  • External components
  • Not sure (Please specify below)

Checklist

Put an in the boxes once you have confirmed below actions (or provide reasons on not doing so) that

  • This PR has sufficient test coverage (unit/integration test) OR I have provided reason in the PR description for not having test coverage
  • Tested on a private network from the genesis block and monitored the chain operating correctly for multiple epochs.
  • Provide an end-to-end test plan in the PR description on how to manually test it on the devnet/testnet.
  • Tested the backwards compatibility.
  • Tested with XDC nodes running this version co-exist with those running the previous version.
  • Relevant documentation has been updated as part of this PR
  • N/A

@coderabbitai

coderabbitai Bot commented Jul 3, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro

Run ID: 239619e1-52f6-4544-82b3-397d718a7eae

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Pull request overview

Refactors the devp2p networking stack by extracting the RLPx transport implementation into a dedicated p2p/rlpx package, and adjusts p2p server/transport glue and tests accordingly. It also adds a devp2p rlpx ping command to perform an RLPx handshake for protocol/testing purposes.

Changes:

  • Introduces p2p/rlpx.Conn as a standalone RLPx connection type with handshake + frame read/write APIs.
  • Adds a p2p-level rlpxTransport wrapper (p2p/transport.go) that handles deadlines/locking/metrics on top of p2p/rlpx.Conn.
  • Adds cmd/devp2p rlpx ping command and updates test suites to use the new package layout.

Reviewed changes

Copilot reviewed 10 out of 10 changed files in this pull request and generated 5 comments.

Show a summary per file
File Description
p2p/transport.go New p2p transport wrapper around p2p/rlpx.Conn plus protocol-handshake helpers.
p2p/transport_test.go New tests covering encryption + protocol handshake flows via the new transport wrapper.
p2p/server.go Updates transport hook signature and handshake call sites to use the refactored transport API.
p2p/server_test.go Updates server tests to work with the new rlpxTransport wrapper + new p2p/rlpx.Secrets init.
p2p/peer_test.go Adjusts peer test setup to use updated test transport constructor/signature.
p2p/message_test.go Removes local unhex helper (moved to RLPx test package).
p2p/rlpx/rlpx.go Moves RLPx implementation into new p2p/rlpx package and exposes Conn, Secrets, and frame read/write.
p2p/rlpx/rlpx_test.go Updates/rewrites tests to target p2p/rlpx.Conn and related helpers directly.
cmd/devp2p/rlpxcmd.go Adds devp2p rlpx ping CLI for performing an RLPx handshake and reading the first devp2p message.
cmd/devp2p/main.go Registers the new rlpx command.

Comment thread p2p/transport.go Outdated
Comment thread p2p/transport.go
Comment thread cmd/devp2p/rlpxcmd.go
Comment thread cmd/devp2p/rlpxcmd.go Outdated
Comment thread cmd/devp2p/rlpxcmd.go
This change moves the RLPx protocol implementation into a separate package,
p2p/rlpx. The new package can be used to establish RLPx connections for
protocol testing purposes.

Co-authored-by: Felix Lange <fjl@twurst.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants