Skip to content
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

chore(meta): manifest maintenance #5353

Merged
merged 6 commits into from
Nov 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
175 changes: 99 additions & 76 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,58 +1,59 @@
[workspace]
members = [
"bin/reth",
"crates/config",
"crates/consensus/auto-seal",
"crates/consensus/beacon",
"crates/consensus/common",
"crates/blockchain-tree",
"crates/interfaces",
"crates/payload/builder",
"crates/metrics",
"crates/metrics/metrics-derive",
"crates/net/common",
"crates/net/ecies",
"crates/net/eth-wire",
"crates/net/discv4",
"crates/net/dns",
"crates/net/nat",
"crates/net/network-api",
"crates/net/network",
"crates/net/downloaders",
"crates/payload/basic",
"crates/primitives",
"crates/prune",
"crates/revm",
"crates/revm/revm-inspectors",
"crates/rpc/ipc",
"crates/rpc/rpc",
"crates/rpc/rpc-api",
"crates/rpc/rpc-builder",
"crates/rpc/rpc-engine-api",
"crates/rpc/rpc-types",
"crates/rpc/rpc-testing-util",
"crates/snapshot",
"crates/stages",
"crates/storage/codecs",
"crates/storage/db",
"crates/storage/libmdbx-rs",
"crates/storage/libmdbx-rs/mdbx-sys",
"crates/storage/provider",
"crates/storage/nippy-jar",
"crates/tracing",
"crates/tasks",
"crates/transaction-pool",
"crates/trie",
"testing/ef-tests",
"crates/rpc/rpc-types-compat",
"crates/tokio-util",
"examples",
"examples/additional-rpc-namespace-in-cli",
"examples/cli-extension-event-hooks",
"examples/rpc-db",
"examples/manual-p2p",
"examples/beacon-api-sse",
"examples/trace-transaction-cli"
"bin/reth/",
"crates/blockchain-tree/",
"crates/config/",
"crates/consensus/auto-seal/",
"crates/consensus/beacon/",
"crates/consensus/common/",
"crates/interfaces/",
"crates/metrics/",
"crates/metrics/metrics-derive/",
"crates/net/common/",
"crates/net/discv4/",
"crates/net/dns/",
"crates/net/downloaders/",
"crates/net/ecies/",
"crates/net/eth-wire/",
"crates/net/nat/",
"crates/net/network/",
"crates/net/network-api/",
"crates/payload/basic/",
"crates/payload/builder/",
"crates/primitives/",
"crates/prune/",
"crates/revm/",
"crates/revm/revm-inspectors/",
"crates/rpc/ipc/",
"crates/rpc/rpc/",
"crates/rpc/rpc-api/",
"crates/rpc/rpc-builder/",
"crates/rpc/rpc-engine-api/",
"crates/rpc/rpc-testing-util/",
"crates/rpc/rpc-types/",
"crates/rpc/rpc-types-compat/",
"crates/snapshot/",
"crates/stages/",
"crates/storage/codecs/",
"crates/storage/codecs/derive/",
"crates/storage/db/",
"crates/storage/libmdbx-rs/",
"crates/storage/libmdbx-rs/mdbx-sys/",
"crates/storage/nippy-jar/",
"crates/storage/provider/",
"crates/tasks/",
"crates/tokio-util/",
"crates/tracing/",
"crates/transaction-pool/",
"crates/trie/",
"examples/",
"examples/additional-rpc-namespace-in-cli/",
"examples/beacon-api-sse/",
"examples/cli-extension-event-hooks/",
"examples/manual-p2p/",
"examples/rpc-db/",
"examples/trace-transaction-cli/",
"testing/ef-tests/",
]
default-members = ["bin/reth"]

Expand All @@ -74,8 +75,7 @@ exclude = [".github/"]
inherits = "release"
debug = true

# Meant for testing - all optimizations, but with debug assertions and overflow
# checks
# Meant for testing - all optimizations, but with debug assertions and overflow checks.
[profile.hivetests]
inherits = "test"
opt-level = 3
Expand All @@ -88,28 +88,51 @@ incremental = false

[workspace.dependencies]
# reth
reth = { path = "./bin/reth" }
reth-primitives = { path = "./crates/primitives" }
reth-interfaces = { path = "./crates/interfaces" }
reth-provider = { path = "./crates/storage/provider" }
reth-db = { path = "./crates/storage/db" }
reth-rpc-types = { path = "./crates/rpc/rpc-types" }
reth-rpc-builder = { path = "./crates/rpc/rpc-builder" }
reth-blockchain-tree = { path = "./crates/blockchain-tree" }
reth-beacon-consensus = { path = "./crates/consensus/beacon" }
reth-metrics = { path = "./crates/metrics" }
reth-revm = { path = "./crates/revm" }
reth-payload-builder = { path = "./crates/payload/builder" }
reth-transaction-pool = { path = "./crates/transaction-pool" }
reth-tasks = { path = "./crates/tasks" }
reth-network = { path = "./crates/net/network" }
reth-network-api = { path = "./crates/net/network-api" }
reth-rpc-types-compat = { path = "./crates/rpc/rpc-types-compat" }
reth-discv4 = { path = "./crates/net/discv4" }
reth-eth-wire = { path = "./crates/net/eth-wire" }
reth-ecies = { path = "./crates/net/ecies" }
reth-tracing = { path = "./crates/tracing" }
reth = { path = "bin/reth" }
reth-auto-seal-consensus = { path = "crates/consensus/auto-seal" }
reth-basic-payload-builder = { path = "crates/payload/basic" }
reth-beacon-consensus = { path = "crates/consensus/beacon" }
reth-blockchain-tree = { path = "crates/blockchain-tree" }
reth-codecs = { path = "crates/storage/codecs" }
reth-config = { path = "crates/config" }
reth-consensus-common = { path = "crates/consensus/common" }
reth-db = { path = "crates/storage/db" }
reth-discv4 = { path = "crates/net/discv4" }
reth-dns-discovery = { path = "crates/net/dns" }
reth-downloaders = { path = "crates/net/downloaders" }
reth-ecies = { path = "crates/net/ecies" }
reth-eth-wire = { path = "crates/net/eth-wire" }
reth-interfaces = { path = "crates/interfaces" }
reth-ipc = { path = "crates/rpc/ipc" }
reth-libmdbx = { path = "crates/storage/libmdbx-rs" }
reth-mdbx-sys = { path = "crates/storage/libmdbx-rs/mdbx-sys" }
reth-metrics = { path = "crates/metrics" }
reth-metrics-derive = { path = "crates/metrics/metrics-derive" }
reth-net-common = { path = "crates/net/common" }
reth-net-nat = { path = "crates/net/nat" }
reth-network = { path = "crates/net/network" }
reth-network-api = { path = "crates/net/network-api" }
reth-nippy-jar = { path = "crates/storage/nippy-jar" }
reth-payload-builder = { path = "crates/payload/builder" }
reth-primitives = { path = "crates/primitives" }
reth-provider = { path = "crates/storage/provider" }
reth-prune = { path = "crates/prune" }
reth-revm = { path = "crates/revm" }
reth-revm-inspectors = { path = "crates/revm/revm-inspectors" }
reth-rpc = { path = "crates/rpc/rpc" }
reth-rpc-api = { path = "crates/rpc/rpc-api" }
reth-rpc-api-testing-util = { path = "crates/rpc/rpc-testing-util" }
reth-rpc-builder = { path = "crates/rpc/rpc-builder" }
reth-rpc-engine-api = { path = "crates/rpc/rpc-engine-api" }
reth-rpc-types = { path = "crates/rpc/rpc-types" }
reth-rpc-types-compat = { path = "crates/rpc/rpc-types-compat" }
reth-snapshot = { path = "crates/snapshot" }
reth-stages = { path = "crates/stages" }
reth-tasks = { path = "crates/tasks" }
reth-tokio-util = { path = "crates/tokio-util" }
reth-tracing = { path = "crates/tracing" }
reth-transaction-pool = { path = "crates/transaction-pool" }
reth-trie = { path = "crates/trie" }

# revm
revm = { git = "https://github.com/bluealloy/revm", rev = "1609e07c68048909ad1682c98cf2b9baa76310b5" }
Expand Down
72 changes: 35 additions & 37 deletions bin/reth/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@ rust-version.workspace = true
license.workspace = true
homepage.workspace = true
repository.workspace = true
description = """
Reth node implementation
"""
description = "Reth node implementation"

[package.metadata.cargo-udeps.ignore]
normal = [
Expand All @@ -18,39 +16,39 @@ normal = [

[dependencies]
# reth
reth-config = { path = "../../crates/config" }
reth-config.workspace = true
reth-primitives = { workspace = true, features = ["arbitrary", "clap"] }
reth-db = { workspace = true, features = ["mdbx", "test-utils"] }
# TODO: Temporary use of the test-utils feature
reth-provider = { workspace = true, features = ["test-utils"] }
reth-revm = { path = "../../crates/revm" }
reth-revm-inspectors = { path = "../../crates/revm/revm-inspectors" }
reth-stages = { path = "../../crates/stages" }
reth-revm.workspace = true
reth-revm-inspectors.workspace = true
reth-stages.workspace = true
reth-interfaces = { workspace = true, features = ["test-utils", "clap"] }
reth-transaction-pool.workspace = true
reth-beacon-consensus = { path = "../../crates/consensus/beacon" }
reth-auto-seal-consensus = { path = "../../crates/consensus/auto-seal" }
reth-consensus-common = { path = "../../crates/consensus/common" }
reth-blockchain-tree = { path = "../../crates/blockchain-tree" }
reth-rpc-engine-api = { path = "../../crates/rpc/rpc-engine-api" }
reth-rpc-builder = { path = "../../crates/rpc/rpc-builder" }
reth-rpc = { path = "../../crates/rpc/rpc" }
reth-rpc-types = { path = "../../crates/rpc/rpc-types" }
reth-rpc-types-compat = { path = "../../crates/rpc/rpc-types-compat" }
reth-rpc-api = { path = "../../crates/rpc/rpc-api", features = ["client"] }
reth-network = { path = "../../crates/net/network", features = ["serde"] }
reth-beacon-consensus.workspace = true
reth-auto-seal-consensus.workspace = true
reth-consensus-common.workspace = true
reth-blockchain-tree.workspace = true
reth-rpc-engine-api.workspace = true
reth-rpc-builder.workspace = true
reth-rpc.workspace = true
reth-rpc-types.workspace = true
reth-rpc-types-compat.workspace = true
reth-rpc-api = { workspace = true, features = ["client"] }
reth-network = { workspace = true, features = ["serde"] }
reth-network-api.workspace = true
reth-downloaders = { path = "../../crates/net/downloaders", features = ["test-utils"] }
reth-downloaders = { workspace = true, features = ["test-utils"] }
reth-tracing.workspace = true
reth-tasks.workspace = true
reth-net-nat = { path = "../../crates/net/nat" }
reth-net-nat.workspace = true
reth-payload-builder.workspace = true
reth-basic-payload-builder = { path = "../../crates/payload/basic" }
reth-discv4 = { path = "../../crates/net/discv4" }
reth-prune = { path = "../../crates/prune" }
reth-snapshot = { path = "../../crates/snapshot", features = ["clap"] }
reth-trie = { path = "../../crates/trie" }
reth-nippy-jar = { path = "../../crates/storage/nippy-jar" }
reth-basic-payload-builder.workspace = true
reth-discv4.workspace = true
reth-prune.workspace = true
reth-snapshot = { workspace = true, features = ["clap"] }
reth-trie.workspace = true
reth-nippy-jar.workspace = true

# crypto
alloy-rlp.workspace = true
Expand Down Expand Up @@ -120,17 +118,17 @@ min-info-logs = ["tracing/release_max_level_info"]
min-debug-logs = ["tracing/release_max_level_debug"]
min-trace-logs = ["tracing/release_max_level_trace"]
optimism = [
"reth-primitives/optimism",
"reth-revm/optimism",
"reth-interfaces/optimism",
"reth-rpc/optimism",
"reth-rpc-engine-api/optimism",
"reth-transaction-pool/optimism",
"reth-provider/optimism",
"reth-beacon-consensus/optimism",
"reth-basic-payload-builder/optimism",
"reth-network/optimism",
"reth-network-api/optimism"
"reth-primitives/optimism",
"reth-revm/optimism",
"reth-interfaces/optimism",
"reth-rpc/optimism",
"reth-rpc-engine-api/optimism",
"reth-transaction-pool/optimism",
"reth-provider/optimism",
"reth-beacon-consensus/optimism",
"reth-basic-payload-builder/optimism",
"reth-network/optimism",
"reth-network-api/optimism",
]
# no-op feature flag for switching between the `optimism` and default functionality in CI matrices
ethereum = []
Expand Down
2 changes: 1 addition & 1 deletion crates/blockchain-tree/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ reth-primitives.workspace = true
reth-interfaces.workspace = true
reth-db.workspace = true
reth-provider.workspace = true
reth-stages = { path = "../stages" }
reth-stages.workspace = true

# common
parking_lot.workspace = true
Expand Down
12 changes: 6 additions & 6 deletions crates/config/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ repository.workspace = true

[dependencies]
# reth
reth-network = { path = "../net/network" }
reth-net-nat = { path = "../net/nat" }
reth-discv4 = { path = "../net/discv4" }
reth-downloaders = { path = "../net/downloaders" }
reth-primitives = { path = "../primitives" }
reth-network.workspace = true
reth-net-nat.workspace = true
reth-discv4.workspace = true
reth-downloaders.workspace = true
reth-primitives.workspace = true

# io
serde.workspace = true
Expand All @@ -27,4 +27,4 @@ tempfile.workspace = true

[dev-dependencies]
confy.workspace = true
toml.workspace = true
toml.workspace = true
18 changes: 9 additions & 9 deletions crates/consensus/auto-seal/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ description = "A consensus impl for local testing purposes"

[dependencies]
# reth
reth-beacon-consensus = { path = "../beacon" }
reth-beacon-consensus.workspace = true
reth-primitives.workspace = true
reth-interfaces.workspace = true
reth-provider.workspace = true
reth-stages = { path = "../../stages" }
reth-revm = { path = "../../revm" }
reth-stages.workspace = true
reth-revm.workspace = true
reth-transaction-pool.workspace = true

# async
Expand All @@ -26,12 +26,12 @@ tracing.workspace = true

[dev-dependencies]
reth-interfaces = { workspace = true, features = ["test-utils"] }
reth = { workspace = true }
tempfile = { workspace = true }
clap = { workspace = true }
jsonrpsee = { workspace = true }
eyre = { workspace = true }
serde_json = { workspace = true }
reth.workspace = true
tempfile.workspace = true
clap.workspace = true
jsonrpsee.workspace = true
eyre.workspace = true
serde_json.workspace = true

[features]
# Included solely to ignore certain tests.
Expand Down
Loading
Loading