diff --git a/Cargo.lock b/Cargo.lock index 7b5b13f9d5d6..108fef2e4ffc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1503,7 +1503,7 @@ version = "7.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c64043d6c7b7a4c58e39e7efccfdea7b93d885a795d0c054a69dbbf4dd52686" dependencies = [ - "crossterm 0.27.0", + "crossterm", "strum", "strum_macros", "unicode-width", @@ -1718,22 +1718,6 @@ version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" -[[package]] -name = "crossterm" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67" -dependencies = [ - "bitflags 1.3.2", - "crossterm_winapi", - "libc", - "mio", - "parking_lot 0.12.1", - "signal-hook", - "signal-hook-mio", - "winapi", -] - [[package]] name = "crossterm" version = "0.27.0" @@ -5594,7 +5578,7 @@ checksum = "a5659e52e4ba6e07b2dad9f1158f578ef84a73762625ddb51536019f34d180eb" dependencies = [ "bitflags 2.4.2", "cassowary", - "crossterm 0.27.0", + "crossterm", "indoc", "itertools 0.12.0", "lru 0.12.1", @@ -5776,26 +5760,20 @@ dependencies = [ "alloy-chains", "alloy-rlp", "aquamarine", - "assert_matches", "backon", - "boyer-moore-magiclen", "clap", "comfy-table", "confy", - "const-str", - "crossterm 0.27.0", - "dirs-next", + "crossterm", "eyre", "fdlimit", "futures", - "futures-util", "human_bytes", "humantime", "hyper", "itertools 0.12.0", "jemalloc-ctl", "jemallocator", - "jsonrpsee", "metrics", "metrics-exporter-prometheus", "metrics-process", @@ -5820,7 +5798,6 @@ dependencies = [ "reth-ethereum-payload-builder", "reth-interfaces", "reth-metrics", - "reth-net-nat", "reth-network", "reth-network-api", "reth-nippy-jar", @@ -5850,9 +5827,7 @@ dependencies = [ "secp256k1 0.27.0", "serde", "serde_json", - "shellexpand", "tempfile", - "thiserror", "tokio", "toml 0.8.8", "tracing", @@ -6468,46 +6443,26 @@ dependencies = [ name = "reth-node-core" version = "0.1.0-alpha.15" dependencies = [ - "alloy-chains", "alloy-rlp", - "backon", "boyer-moore-magiclen", "clap", - "comfy-table", - "confy", "const-str", - "crossterm 0.27.0", "dirs-next", "eyre", - "fdlimit", "futures", - "human_bytes", "humantime", - "hyper", - "itertools 0.12.0", - "metrics", - "metrics-exporter-prometheus", - "metrics-process", - "metrics-util", - "once_cell", - "pin-project", - "pretty_assertions", "proptest", "rand 0.8.5", - "rayon", "reth-basic-payload-builder", "reth-config", "reth-consensus-common", "reth-db", "reth-discv4", - "reth-ethereum-payload-builder", "reth-interfaces", - "reth-metrics", "reth-net-nat", "reth-network", "reth-network-api", "reth-node-api", - "reth-optimism-payload-builder", "reth-payload-builder", "reth-primitives", "reth-provider", @@ -6520,17 +6475,11 @@ dependencies = [ "reth-tasks", "reth-tracing", "reth-transaction-pool", - "revm-inspectors", "secp256k1 0.27.0", - "serde", "serde_json", "shellexpand", - "tempfile", "thiserror", - "tokio", - "toml 0.8.8", "tracing", - "tui", "vergen", ] @@ -8835,19 +8784,6 @@ dependencies = [ "termcolor", ] -[[package]] -name = "tui" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccdd26cbd674007e649a272da4475fb666d3aa0ad0531da7136db6fab0e5bad1" -dependencies = [ - "bitflags 1.3.2", - "cassowary", - "crossterm 0.25.0", - "unicode-segmentation", - "unicode-width", -] - [[package]] name = "tungstenite" version = "0.20.1" diff --git a/bin/reth/Cargo.toml b/bin/reth/Cargo.toml index 600e2f0ff5cb..b692fbc9fcf7 100644 --- a/bin/reth/Cargo.toml +++ b/bin/reth/Cargo.toml @@ -43,7 +43,6 @@ reth-network-api.workspace = true reth-downloaders.workspace = true reth-tracing.workspace = true reth-tasks.workspace = true -reth-net-nat.workspace = true reth-optimism-payload-builder = { path = "../../crates/payload/optimism", optional = true } reth-ethereum-payload-builder.workspace = true reth-payload-builder.workspace = true @@ -71,8 +70,6 @@ tracing.workspace = true fdlimit = "0.3.0" serde.workspace = true serde_json.workspace = true -shellexpand = "3.0.0" -dirs-next = "2.0.0" confy.workspace = true toml = { workspace = true, features = ["display"] } @@ -108,18 +105,10 @@ eyre.workspace = true clap = { workspace = true, features = ["derive"] } tempfile.workspace = true backon = "0.4" -thiserror.workspace = true pretty_assertions = "1.3.0" humantime = "2.1.0" -const-str = "0.5.6" -boyer-moore-magiclen = "0.2.16" itertools.workspace = true rayon.workspace = true -futures-util.workspace = true - -[dev-dependencies] -jsonrpsee.workspace = true -assert_matches = "1.5.0" [target.'cfg(not(windows))'.dependencies] jemallocator = { version = "0.5.0", optional = true } @@ -128,6 +117,10 @@ jemalloc-ctl = { version = "0.5.0", optional = true } [target.'cfg(target_os = "linux")'.dependencies] procfs = { version = "0.16.0" } +[dev-dependencies] +jsonrpsee.workspace = true +assert_matches = "1.5.0" + [features] default = ["jemalloc"] diff --git a/bin/reth/src/builder/mod.rs b/bin/reth/src/builder/mod.rs index ec0cdb720e4a..dca86631cfa3 100644 --- a/bin/reth/src/builder/mod.rs +++ b/bin/reth/src/builder/mod.rs @@ -986,6 +986,7 @@ impl Default for NodeConfig { /// [NodeHandle]. /// /// This also contains a path to a data dir that cannot be changed. +#[derive(Debug)] pub struct NodeBuilderWithDatabase { /// The node config pub config: NodeConfig, diff --git a/bin/reth/src/lib.rs b/bin/reth/src/lib.rs index 7d505cd5cce1..b76a014ad947 100644 --- a/bin/reth/src/lib.rs +++ b/bin/reth/src/lib.rs @@ -24,8 +24,6 @@ html_favicon_url = "https://avatars0.githubusercontent.com/u/97369466?s=256", issue_tracker_base_url = "https://github.com/paradigmxyz/reth/issues/" )] -#![allow(missing_debug_implementations)] -#![allow(dead_code)] #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))] pub mod builder; diff --git a/bin/reth/src/runner.rs b/bin/reth/src/runner.rs index 19b459165f41..963cb364d15b 100644 --- a/bin/reth/src/runner.rs +++ b/bin/reth/src/runner.rs @@ -108,6 +108,7 @@ impl AsyncCliRunner { } /// Additional context provided by the [CliRunner] when executing commands +#[derive(Debug)] pub struct CliContext { /// Used to execute/spawn tasks pub task_executor: TaskExecutor, diff --git a/crates/node-core/Cargo.toml b/crates/node-core/Cargo.toml index 92e52a9dc185..b9153c96db15 100644 --- a/crates/node-core/Cargo.toml +++ b/crates/node-core/Cargo.toml @@ -35,80 +35,42 @@ reth-node-api.workspace = true reth-tasks.workspace = true reth-payload-builder.workspace = true reth-basic-payload-builder.workspace = true -reth-optimism-payload-builder = { path = "../../crates/payload/optimism", optional = true } -reth-ethereum-payload-builder.workspace = true reth-consensus-common.workspace = true - - - # misc boyer-moore-magiclen = "0.2.16" eyre.workspace = true clap = { workspace = true, features = ["derive"] } humantime = "2.1.0" thiserror.workspace = true -tempfile.workspace = true const-str = "0.5.6" -rayon.workspace = true -itertools.workspace = true -backon = "0.4" -pretty_assertions = "1.3.0" - -# http/rpc -hyper = "0.14.25" - - -# test vectors generation -proptest.workspace = true rand.workspace = true - # io dirs-next = "2.0.0" shellexpand = "3.0.0" -serde.workspace = true serde_json.workspace = true -fdlimit = "0.3.0" -confy.workspace = true -toml = { workspace = true, features = ["display"] } # tracing tracing.workspace = true -# tui -comfy-table = "7.0" -crossterm = "0.27.0" -tui = "0.19.0" -human_bytes = "0.4.1" - - # crypto alloy-rlp.workspace = true -alloy-chains.workspace = true secp256k1 = { workspace = true, features = ["global-context", "rand-std", "recovery"] } -revm-inspectors.workspace = true - # async -tokio = { workspace = true, features = ["sync", "macros", "time", "rt-multi-thread"] } futures.workspace = true -pin-project.workspace = true -# metrics -metrics-exporter-prometheus = "0.12.1" -metrics-util = "0.15.0" -metrics-process = "=1.0.14" -reth-metrics.workspace = true -metrics.workspace = true -once_cell.workspace = true +[dev-dependencies] +# test vectors generation +proptest.workspace = true + [features] optimism = [ "reth-primitives/optimism", - "reth-optimism-payload-builder/optimism", "reth-interfaces/optimism", "reth-rpc/optimism", "reth-rpc-engine-api/optimism", @@ -117,8 +79,6 @@ optimism = [ "reth-network/optimism", "reth-network-api/optimism", "reth-payload-builder/optimism", - "reth-optimism-payload-builder/optimism", - "reth-ethereum-payload-builder/optimism", "reth-node-api/optimism", ] diff --git a/crates/node-core/src/cli/mod.rs b/crates/node-core/src/cli/mod.rs index 2de45d36ea39..9970fd1fc333 100644 --- a/crates/node-core/src/cli/mod.rs +++ b/crates/node-core/src/cli/mod.rs @@ -1,3 +1,5 @@ +//! Types for the CLI. + pub mod components; pub mod config; pub mod ext; diff --git a/crates/node-core/src/lib.rs b/crates/node-core/src/lib.rs index 34ed56880980..335da6d636d1 100644 --- a/crates/node-core/src/lib.rs +++ b/crates/node-core/src/lib.rs @@ -1,8 +1,12 @@ //! The core of the Ethereum node. Collection of utilities and libraries that are used by the node. -#![allow(missing_docs)] -#![allow(missing_debug_implementations)] -#![allow(dead_code)] +#![doc( + html_logo_url = "https://raw.githubusercontent.com/paradigmxyz/reth/main/assets/reth-docs.png", + html_favicon_url = "https://avatars0.githubusercontent.com/u/97369466?s=256", + issue_tracker_base_url = "https://github.com/paradigmxyz/reth/issues/" +)] +#![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))] +#![warn(unused_crate_dependencies)] pub mod args; pub mod cli; diff --git a/crates/node-core/src/utils.rs b/crates/node-core/src/utils.rs index 7b92ec7f121a..8b63fda6dabf 100644 --- a/crates/node-core/src/utils.rs +++ b/crates/node-core/src/utils.rs @@ -101,6 +101,7 @@ where } /// Wrapper over DB that implements many useful DB queries. +#[derive(Debug)] pub struct DbTool<'a, DB: Database> { /// The database that the db tool will use. pub db: &'a DB,