Skip to content

Commit 9d99875

Browse files
RomanHodulakHaxry
andauthored
refactor(reth): Extract Cli into ethereum-cli crate (paradigmxyz#15857)
Co-authored-by: Harrish Bansal <[email protected]>
1 parent 211ecb6 commit 9d99875

File tree

13 files changed

+572
-457
lines changed

13 files changed

+572
-457
lines changed

Cargo.lock

Lines changed: 48 additions & 29 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bin/reth/Cargo.toml

Lines changed: 36 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,15 @@ workspace = true
1414

1515
[dependencies]
1616
# reth
17-
reth-cli.workspace = true
1817
reth-ethereum-cli.workspace = true
1918
reth-chainspec.workspace = true
20-
reth-config.workspace = true
2119
reth-primitives.workspace = true
22-
reth-primitives-traits.workspace = true
23-
reth-fs-util.workspace = true
2420
reth-db = { workspace = true, features = ["mdbx"] }
25-
reth-db-api.workspace = true
26-
reth-exex.workspace = true
2721
reth-provider.workspace = true
2822
reth-evm.workspace = true
2923
reth-revm.workspace = true
30-
reth-stages.workspace = true
31-
reth-execution-types.workspace = true
32-
reth-errors.workspace = true
3324
reth-transaction-pool.workspace = true
3425
reth-cli-runner.workspace = true
35-
reth-cli-commands.workspace = true
3626
reth-cli-util.workspace = true
3727
reth-consensus-common.workspace = true
3828
reth-rpc-builder.workspace = true
@@ -42,91 +32,95 @@ reth-rpc-api = { workspace = true, features = ["client"] }
4232
reth-rpc-eth-types.workspace = true
4333
reth-rpc-server-types.workspace = true
4434
reth-network = { workspace = true, features = ["serde"] }
45-
reth-network-p2p.workspace = true
4635
reth-network-api.workspace = true
47-
reth-downloaders.workspace = true
48-
reth-tracing.workspace = true
4936
reth-tasks.workspace = true
5037
reth-payload-builder.workspace = true
5138
reth-payload-primitives.workspace = true
52-
reth-basic-payload-builder.workspace = true
53-
reth-static-file.workspace = true
54-
reth-trie = { workspace = true, features = ["metrics"] }
55-
reth-trie-db = { workspace = true, features = ["metrics"] }
5639
reth-node-api.workspace = true
5740
reth-node-core.workspace = true
5841
reth-ethereum-payload-builder.workspace = true
5942
reth-ethereum-primitives.workspace = true
6043
reth-node-ethereum = { workspace = true, features = ["js-tracer"] }
6144
reth-node-builder.workspace = true
62-
reth-node-events.workspace = true
6345
reth-node-metrics.workspace = true
6446
reth-consensus.workspace = true
65-
reth-prune.workspace = true
6647
reth-tokio-util.workspace = true
6748
reth-ress-protocol.workspace = true
6849
reth-ress-provider.workspace = true
6950

7051
# alloy
71-
alloy-eips = { workspace = true, features = ["kzg"] }
72-
alloy-rlp.workspace = true
7352
alloy-rpc-types = { workspace = true, features = ["engine"] }
74-
alloy-consensus.workspace = true
75-
alloy-primitives.workspace = true
7653

7754
# tracing
7855
tracing.workspace = true
7956

80-
# io
81-
serde_json.workspace = true
82-
8357
# async
8458
tokio = { workspace = true, features = ["sync", "macros", "time", "rt-multi-thread"] }
85-
futures.workspace = true
8659

8760
# misc
8861
aquamarine.workspace = true
8962
eyre.workspace = true
9063
clap = { workspace = true, features = ["derive", "env"] }
91-
backon.workspace = true
92-
similar-asserts.workspace = true
93-
94-
[dev-dependencies]
95-
tempfile.workspace = true
9664

9765
[features]
9866
default = ["jemalloc", "reth-revm/portable"]
9967

100-
dev = ["reth-cli-commands/arbitrary"]
68+
dev = ["reth-ethereum-cli/dev"]
10169

10270
asm-keccak = [
10371
"reth-node-core/asm-keccak",
10472
"reth-primitives/asm-keccak",
105-
"alloy-primitives/asm-keccak",
73+
"reth-ethereum-cli/asm-keccak",
10674
]
10775

10876
jemalloc = [
10977
"reth-cli-util/jemalloc",
11078
"reth-node-core/jemalloc",
11179
"reth-node-metrics/jemalloc",
80+
"reth-ethereum-cli/jemalloc",
11281
]
11382
jemalloc-prof = [
11483
"reth-cli-util/jemalloc",
11584
"reth-cli-util/jemalloc-prof",
85+
"reth-ethereum-cli/jemalloc-prof",
86+
]
87+
tracy-allocator = [
88+
"reth-cli-util/tracy-allocator",
89+
"reth-ethereum-cli/tracy-allocator",
11690
]
117-
tracy-allocator = ["reth-cli-util/tracy-allocator"]
11891

11992
# Because jemalloc is default and preferred over snmalloc when both features are
12093
# enabled, `--no-default-features` should be used when enabling snmalloc or
12194
# snmalloc-native.
122-
snmalloc = ["reth-cli-util/snmalloc"]
123-
snmalloc-native = ["reth-cli-util/snmalloc-native"]
95+
snmalloc = [
96+
"reth-cli-util/snmalloc",
97+
"reth-ethereum-cli/snmalloc",
98+
]
99+
snmalloc-native = [
100+
"reth-cli-util/snmalloc-native",
101+
"reth-ethereum-cli/snmalloc-native",
102+
]
124103

125-
min-error-logs = ["tracing/release_max_level_error"]
126-
min-warn-logs = ["tracing/release_max_level_warn"]
127-
min-info-logs = ["tracing/release_max_level_info"]
128-
min-debug-logs = ["tracing/release_max_level_debug"]
129-
min-trace-logs = ["tracing/release_max_level_trace"]
104+
min-error-logs = [
105+
"tracing/release_max_level_error",
106+
"reth-ethereum-cli/min-error-logs",
107+
]
108+
min-warn-logs = [
109+
"tracing/release_max_level_warn",
110+
"reth-ethereum-cli/min-warn-logs",
111+
]
112+
min-info-logs = [
113+
"tracing/release_max_level_info",
114+
"reth-ethereum-cli/min-info-logs",
115+
]
116+
min-debug-logs = [
117+
"tracing/release_max_level_debug",
118+
"reth-ethereum-cli/min-debug-logs",
119+
]
120+
min-trace-logs = [
121+
"tracing/release_max_level_trace",
122+
"reth-ethereum-cli/min-trace-logs",
123+
]
130124

131125
[[bin]]
132126
name = "reth"

0 commit comments

Comments
 (0)