-
Notifications
You must be signed in to change notification settings - Fork 1.4k
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.
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
implement part of reth p2p rlpx ping
#9762
Changes from 5 commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,104 @@ | ||
# reth p2p rlpx | ||
|
||
RLPx commands | ||
|
||
```bash | ||
$ reth p2p rlpx --help | ||
Usage: reth p2p rlpx [OPTIONS] <COMMAND> | ||
|
||
Commands: | ||
ping ping node | ||
help Print this message or the help of the given subcommand(s) | ||
|
||
Options: | ||
--instance <INSTANCE> | ||
Add a new instance of a node. | ||
|
||
Configures the ports of the node to avoid conflicts with the defaults. This is useful for running multiple nodes on the same machine. | ||
|
||
Max number of instances is 200. It is chosen in a way so that it's not possible to have port numbers that conflict with each other. | ||
|
||
Changes to the following port numbers: - `DISCOVERY_PORT`: default + `instance` - 1 - `AUTH_PORT`: default + `instance` * 100 - 100 - `HTTP_RPC_PORT`: default - `instance` + 1 - `WS_RPC_PORT`: default + `instance` * 2 - 2 | ||
|
||
[default: 1] | ||
|
||
-h, --help | ||
Print help (see a summary with '-h') | ||
|
||
Logging: | ||
--log.stdout.format <FORMAT> | ||
The format to use for logs written to stdout | ||
|
||
[default: terminal] | ||
|
||
Possible values: | ||
- json: Represents JSON formatting for logs. This format outputs log records as JSON objects, making it suitable for structured logging | ||
- log-fmt: Represents logfmt (key=value) formatting for logs. This format is concise and human-readable, typically used in command-line applications | ||
- terminal: Represents terminal-friendly formatting for logs | ||
|
||
--log.stdout.filter <FILTER> | ||
The filter to use for logs written to stdout | ||
|
||
[default: ] | ||
|
||
--log.file.format <FORMAT> | ||
The format to use for logs written to the log file | ||
|
||
[default: terminal] | ||
|
||
Possible values: | ||
- json: Represents JSON formatting for logs. This format outputs log records as JSON objects, making it suitable for structured logging | ||
- log-fmt: Represents logfmt (key=value) formatting for logs. This format is concise and human-readable, typically used in command-line applications | ||
- terminal: Represents terminal-friendly formatting for logs | ||
|
||
--log.file.filter <FILTER> | ||
The filter to use for logs written to the log file | ||
|
||
[default: debug] | ||
|
||
--log.file.directory <PATH> | ||
The path to put log files in | ||
|
||
[default: <CACHE_DIR>/logs] | ||
|
||
--log.file.max-size <SIZE> | ||
The maximum size (in MB) of one log file | ||
|
||
[default: 200] | ||
|
||
--log.file.max-files <COUNT> | ||
The maximum amount of log files that will be stored. If set to 0, background file logging is disabled | ||
|
||
[default: 5] | ||
|
||
--log.journald | ||
Write logs to journald | ||
|
||
--log.journald.filter <FILTER> | ||
The filter to use for logs written to journald | ||
|
||
[default: error] | ||
|
||
--color <COLOR> | ||
Sets whether or not the formatter emits ANSI terminal escape codes for colors and other text formatting | ||
|
||
[default: always] | ||
|
||
Possible values: | ||
- always: Colors on | ||
- auto: Colors on | ||
- never: Colors off | ||
|
||
Display: | ||
-v, --verbosity... | ||
Set the minimum log level. | ||
|
||
-v Errors | ||
-vv Warnings | ||
-vvv Info | ||
-vvvv Debug | ||
-vvvvv Traces (warning: very verbose!) | ||
|
||
-q, --quiet | ||
Silence all log output | ||
``` |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,103 @@ | ||
# reth p2p rlpx ping | ||
|
||
ping node | ||
|
||
```bash | ||
$ reth p2p rlpx ping --help | ||
Usage: reth p2p rlpx ping [OPTIONS] --node <NODE> | ||
|
||
Options: | ||
-n, --node <NODE> | ||
The node to ping | ||
|
||
--instance <INSTANCE> | ||
Add a new instance of a node. | ||
|
||
Configures the ports of the node to avoid conflicts with the defaults. This is useful for running multiple nodes on the same machine. | ||
|
||
Max number of instances is 200. It is chosen in a way so that it's not possible to have port numbers that conflict with each other. | ||
|
||
Changes to the following port numbers: - `DISCOVERY_PORT`: default + `instance` - 1 - `AUTH_PORT`: default + `instance` * 100 - 100 - `HTTP_RPC_PORT`: default - `instance` + 1 - `WS_RPC_PORT`: default + `instance` * 2 - 2 | ||
|
||
[default: 1] | ||
|
||
-h, --help | ||
Print help (see a summary with '-h') | ||
|
||
Logging: | ||
--log.stdout.format <FORMAT> | ||
The format to use for logs written to stdout | ||
|
||
[default: terminal] | ||
|
||
Possible values: | ||
- json: Represents JSON formatting for logs. This format outputs log records as JSON objects, making it suitable for structured logging | ||
- log-fmt: Represents logfmt (key=value) formatting for logs. This format is concise and human-readable, typically used in command-line applications | ||
- terminal: Represents terminal-friendly formatting for logs | ||
|
||
--log.stdout.filter <FILTER> | ||
The filter to use for logs written to stdout | ||
|
||
[default: ] | ||
|
||
--log.file.format <FORMAT> | ||
The format to use for logs written to the log file | ||
|
||
[default: terminal] | ||
|
||
Possible values: | ||
- json: Represents JSON formatting for logs. This format outputs log records as JSON objects, making it suitable for structured logging | ||
- log-fmt: Represents logfmt (key=value) formatting for logs. This format is concise and human-readable, typically used in command-line applications | ||
- terminal: Represents terminal-friendly formatting for logs | ||
|
||
--log.file.filter <FILTER> | ||
The filter to use for logs written to the log file | ||
|
||
[default: debug] | ||
|
||
--log.file.directory <PATH> | ||
The path to put log files in | ||
|
||
[default: <CACHE_DIR>/logs] | ||
|
||
--log.file.max-size <SIZE> | ||
The maximum size (in MB) of one log file | ||
|
||
[default: 200] | ||
|
||
--log.file.max-files <COUNT> | ||
The maximum amount of log files that will be stored. If set to 0, background file logging is disabled | ||
|
||
[default: 5] | ||
|
||
--log.journald | ||
Write logs to journald | ||
|
||
--log.journald.filter <FILTER> | ||
The filter to use for logs written to journald | ||
|
||
[default: error] | ||
|
||
--color <COLOR> | ||
Sets whether or not the formatter emits ANSI terminal escape codes for colors and other text formatting | ||
|
||
[default: always] | ||
|
||
Possible values: | ||
- always: Colors on | ||
- auto: Colors on | ||
- never: Colors off | ||
|
||
Display: | ||
-v, --verbosity... | ||
Set the minimum log level. | ||
|
||
-v Errors | ||
-vv Warnings | ||
-vvv Info | ||
-vvvv Debug | ||
-vvvvv Traces (warning: very verbose!) | ||
|
||
-q, --quiet | ||
Silence all log output | ||
``` |
Original file line number | Diff line number | Diff line change | ||
---|---|---|---|---|
@@ -0,0 +1,52 @@ | ||||
//! RLPx subcommand of P2P Debugging tool. | ||||
|
||||
use clap::{Parser, Subcommand}; | ||||
use enr::Enr; | ||||
use reth_ecies::stream::ECIESStream; | ||||
use reth_eth_wire::{HelloMessage, UnauthedP2PStream}; | ||||
use reth_network::config::rng_secret_key; | ||||
use reth_network_peers::{pk2id, NodeRecord}; | ||||
use secp256k1::SECP256K1; | ||||
use tokio::net::TcpStream; | ||||
|
||||
/// RLPx commands | ||||
#[derive(Parser, Debug)] | ||||
pub struct Command { | ||||
#[clap(subcommand)] | ||||
subcommand: Subcommands, | ||||
} | ||||
|
||||
impl Command { | ||||
// Execute `p2p rlpx` command. | ||||
pub async fn execute(self) -> eyre::Result<()> { | ||||
match self.subcommand { | ||||
Subcommands::Ping { node } => { | ||||
let key = rng_secret_key(); | ||||
let enr = node.parse::<Enr<secp256k1::SecretKey>>().unwrap(); | ||||
let node_record = NodeRecord::try_from(&enr)?; | ||||
let outgoing = | ||||
TcpStream::connect((node_record.address, node_record.tcp_port)).await?; | ||||
let ecies_stream = ECIESStream::connect(outgoing, key, node_record.id).await?; | ||||
|
||||
let peer_id = pk2id(&key.public_key(SECP256K1)); | ||||
let hello = HelloMessage::builder(peer_id).build(); | ||||
|
||||
let (_, their_hello) = | ||||
UnauthedP2PStream::new(ecies_stream).handshake(hello).await?; | ||||
|
||||
println!("{:#?}", their_hello); | ||||
Comment on lines
+34
to
+37
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this should follow on to use the established session returned by the handshake (the first index in the tuple), and use that to send a ping There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
@mattsse I try to implement this which need to refactor some core code of p2p, it may need some time. Or we could merge this first and I'll implement There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. cool, let's get this over the line and followup separately There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. please change the name of the pr then, since it only partially implements the ping command |
||||
} | ||||
} | ||||
Ok(()) | ||||
} | ||||
} | ||||
|
||||
#[derive(Subcommand, Debug)] | ||||
enum Subcommands { | ||||
/// ping node | ||||
Ping { | ||||
#[arg(long, short)] | ||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. we can remove this so that this will be compatible with devp2p command
Suggested change
|
||||
/// The node to ping. | ||||
node: String, | ||||
}, | ||||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
would be more helpful if this parsed an enode into an enr, rather than the serialised base 64 enr string, could open an issue for addressing this separately though