diff --git a/Cargo.toml b/Cargo.toml index ff2fbf848fea..678cbcdd2f4a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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"] @@ -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 @@ -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" } diff --git a/bin/reth/Cargo.toml b/bin/reth/Cargo.toml index b4922b37df3a..6b04ae2996c9 100644 --- a/bin/reth/Cargo.toml +++ b/bin/reth/Cargo.toml @@ -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 = [ @@ -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 @@ -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 = [] diff --git a/crates/blockchain-tree/Cargo.toml b/crates/blockchain-tree/Cargo.toml index b8c2c75c192a..b3c554cdc913 100644 --- a/crates/blockchain-tree/Cargo.toml +++ b/crates/blockchain-tree/Cargo.toml @@ -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 diff --git a/crates/config/Cargo.toml b/crates/config/Cargo.toml index 80d9a464b233..ed8eba877351 100644 --- a/crates/config/Cargo.toml +++ b/crates/config/Cargo.toml @@ -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 @@ -27,4 +27,4 @@ tempfile.workspace = true [dev-dependencies] confy.workspace = true -toml.workspace = true \ No newline at end of file +toml.workspace = true diff --git a/crates/consensus/auto-seal/Cargo.toml b/crates/consensus/auto-seal/Cargo.toml index 11411aed04b7..704b7a97ae10 100644 --- a/crates/consensus/auto-seal/Cargo.toml +++ b/crates/consensus/auto-seal/Cargo.toml @@ -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 @@ -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. diff --git a/crates/consensus/beacon/Cargo.toml b/crates/consensus/beacon/Cargo.toml index 1676dc93c08a..c650d1078e37 100644 --- a/crates/consensus/beacon/Cargo.toml +++ b/crates/consensus/beacon/Cargo.toml @@ -9,17 +9,17 @@ repository.workspace = true [dependencies] # reth -reth-consensus-common = { path = "../common" } +reth-consensus-common.workspace = true reth-primitives.workspace = true reth-interfaces.workspace = true -reth-stages = { path = "../../stages" } +reth-stages.workspace = true reth-db.workspace = true reth-provider.workspace = true reth-rpc-types.workspace = true reth-tasks.workspace = true reth-payload-builder.workspace = true -reth-prune = { path = "../../prune" } -reth-snapshot = { path = "../../snapshot" } +reth-prune.workspace = true +reth-snapshot.workspace = true reth-rpc-types-compat.workspace = true reth-tokio-util.workspace = true # async @@ -41,13 +41,13 @@ cfg-if = "1.0.0" # reth reth-payload-builder = { workspace = true, features = ["test-utils"] } reth-interfaces = { workspace = true, features = ["test-utils"] } -reth-stages = { path = "../../stages", features = ["test-utils"] } -reth-blockchain-tree = { path = "../../blockchain-tree", features = ["test-utils"] } +reth-stages = { workspace = true, features = ["test-utils"] } +reth-blockchain-tree = { workspace = true, features = ["test-utils"] } reth-db = { workspace = true, features = ["test-utils"] } reth-provider = { workspace = true, features = ["test-utils"] } reth-tracing.workspace = true -reth-revm = { path = "../../revm" } -reth-downloaders = { path = "../../net/downloaders" } +reth-revm.workspace = true +reth-downloaders.workspace = true assert_matches.workspace = true diff --git a/crates/interfaces/Cargo.toml b/crates/interfaces/Cargo.toml index 2be1e314d939..3071fc5926e6 100644 --- a/crates/interfaces/Cargo.toml +++ b/crates/interfaces/Cargo.toml @@ -8,13 +8,13 @@ homepage.workspace = true repository.workspace = true [dependencies] -reth-codecs = { path = "../storage/codecs" } -reth-nippy-jar = { path = "../storage/nippy-jar" } +reth-codecs.workspace = true +reth-nippy-jar.workspace = true reth-primitives.workspace = true reth-rpc-types.workspace = true reth-network-api.workspace = true # TODO(onbjerg): We only need this for [BlockBody] -reth-eth-wire = { path = "../net/eth-wire" } +reth-eth-wire.workspace = true # eth revm-primitives.workspace = true diff --git a/crates/metrics/Cargo.toml b/crates/metrics/Cargo.toml index 35619a9f8da7..dcec46cd46b1 100644 --- a/crates/metrics/Cargo.toml +++ b/crates/metrics/Cargo.toml @@ -10,7 +10,7 @@ description = "reth metrics utilities" [dependencies] # reth -reth-metrics-derive = { path = "./metrics-derive" } +reth-metrics-derive.workspace = true # metrics metrics.workspace = true diff --git a/crates/net/common/Cargo.toml b/crates/net/common/Cargo.toml index 17c953dff8c8..0535b58be4b9 100644 --- a/crates/net/common/Cargo.toml +++ b/crates/net/common/Cargo.toml @@ -6,9 +6,7 @@ rust-version.workspace = true license.workspace = true homepage.workspace = true repository.workspace = true -description = """ -Types shared across network code -""" +description = "Types shared across network code" [dependencies] # reth diff --git a/crates/net/discv4/Cargo.toml b/crates/net/discv4/Cargo.toml index bdc752d3e699..274a32893ea4 100644 --- a/crates/net/discv4/Cargo.toml +++ b/crates/net/discv4/Cargo.toml @@ -6,15 +6,13 @@ rust-version.workspace = true license.workspace = true homepage.workspace = true repository.workspace = true -description = """ -Ethereum network discovery -""" +description = "Ethereum network discovery" [dependencies] # reth reth-primitives.workspace = true -reth-net-common = { path = "../common" } -reth-net-nat = { path = "../nat" } +reth-net-common.workspace = true +reth-net-nat.workspace = true # ethereum alloy-rlp = { workspace = true, features = ["derive"] } diff --git a/crates/net/dns/Cargo.toml b/crates/net/dns/Cargo.toml index 090ad7af564c..f2f111fb30d7 100644 --- a/crates/net/dns/Cargo.toml +++ b/crates/net/dns/Cargo.toml @@ -11,7 +11,7 @@ description = "Support for EIP-1459 Node Discovery via DNS" [dependencies] # reth reth-primitives.workspace = true -reth-net-common = { path = "../common" } +reth-net-common.workspace = true # ethereum alloy-rlp.workspace = true diff --git a/crates/net/ecies/Cargo.toml b/crates/net/ecies/Cargo.toml index 615dd0387420..f578c4f09a7f 100644 --- a/crates/net/ecies/Cargo.toml +++ b/crates/net/ecies/Cargo.toml @@ -9,7 +9,7 @@ repository.workspace = true [dependencies] reth-primitives.workspace = true -reth-net-common = { path = "../common" } +reth-net-common.workspace = true alloy-rlp = { workspace = true, features = ["derive"] } futures.workspace = true diff --git a/crates/net/eth-wire/Cargo.toml b/crates/net/eth-wire/Cargo.toml index d3486495e23f..a5f691ef383f 100644 --- a/crates/net/eth-wire/Cargo.toml +++ b/crates/net/eth-wire/Cargo.toml @@ -10,11 +10,11 @@ repository.workspace = true [dependencies] # reth -reth-codecs = { path = "../../storage/codecs" } +reth-codecs.workspace = true reth-primitives.workspace = true -reth-ecies = { path = "../ecies" } +reth-ecies.workspace = true alloy-rlp = { workspace = true, features = ["derive"] } -reth-discv4 = { path = "../discv4" } +reth-discv4.workspace = true # metrics reth-metrics.workspace = true diff --git a/crates/net/nat/Cargo.toml b/crates/net/nat/Cargo.toml index 80b69e713f4e..86ba73b931c5 100644 --- a/crates/net/nat/Cargo.toml +++ b/crates/net/nat/Cargo.toml @@ -6,9 +6,7 @@ rust-version.workspace = true license.workspace = true homepage.workspace = true repository.workspace = true -description = """ -Helpers for working around NAT -""" +description = "Helpers for working around NAT" [dependencies] diff --git a/crates/net/network-api/Cargo.toml b/crates/net/network-api/Cargo.toml index 90cea6f875d9..51bd3a58a21a 100644 --- a/crates/net/network-api/Cargo.toml +++ b/crates/net/network-api/Cargo.toml @@ -11,9 +11,9 @@ description = "Network interfaces" [dependencies] # reth reth-primitives.workspace = true -reth-eth-wire = { path = "../eth-wire" } +reth-eth-wire.workspace = true reth-rpc-types.workspace = true -reth-discv4 = { path = "../discv4" } +reth-discv4.workspace = true # io serde = { workspace = true, features = ["derive"], optional = true } diff --git a/crates/net/network/Cargo.toml b/crates/net/network/Cargo.toml index 49a574568961..fe71a9d3ef11 100644 --- a/crates/net/network/Cargo.toml +++ b/crates/net/network/Cargo.toml @@ -6,9 +6,7 @@ rust-version.workspace = true license.workspace = true homepage.workspace = true repository.workspace = true -description = """ -Ethereum network support -""" +description = "Ethereum network support" [package.metadata.cargo-udeps.ignore] normal = [ @@ -20,12 +18,12 @@ normal = [ # reth reth-interfaces.workspace = true reth-primitives.workspace = true -reth-net-common = { path = "../common" } +reth-net-common.workspace = true reth-network-api.workspace = true -reth-discv4 = { path = "../discv4" } -reth-dns-discovery = { path = "../dns" } -reth-eth-wire = { path = "../eth-wire" } -reth-ecies = { path = "../ecies" } +reth-discv4.workspace = true +reth-dns-discovery.workspace = true +reth-eth-wire.workspace = true +reth-ecies.workspace = true reth-tasks.workspace = true reth-transaction-pool.workspace = true reth-provider.workspace = true @@ -68,13 +66,13 @@ tempfile = { workspace = true, optional = true } [dev-dependencies] # reth -reth-discv4 = { path = "../discv4", features = ["test-utils"] } +reth-discv4 = { workspace = true, features = ["test-utils"] } reth-interfaces = { workspace = true, features = ["test-utils"] } reth-primitives = { workspace = true, features = ["test-utils"] } # we need to enable the test-utils feature in our own crate to use utils in # integration tests -reth-network = { path = ".", features = ["test-utils"] } +reth-network = { workspace = true, features = ["test-utils"] } reth-provider = { workspace = true, features = ["test-utils"] } reth-tracing.workspace = true @@ -96,4 +94,10 @@ default = ["serde"] serde = ["dep:serde", "dep:humantime-serde", "secp256k1/serde", "enr?/serde", "dep:serde_json"] test-utils = ["reth-provider/test-utils", "dep:enr", "dep:tempfile"] geth-tests = [] -optimism = ["reth-primitives/optimism", "reth-transaction-pool/optimism", "reth-provider/optimism", "reth-network-api/optimism", "reth-rpc-types/optimism"] +optimism = [ + "reth-primitives/optimism", + "reth-transaction-pool/optimism", + "reth-provider/optimism", + "reth-network-api/optimism", + "reth-rpc-types/optimism", +] diff --git a/crates/payload/basic/Cargo.toml b/crates/payload/basic/Cargo.toml index fb053951fcbe..6d06aa4b032f 100644 --- a/crates/payload/basic/Cargo.toml +++ b/crates/payload/basic/Cargo.toml @@ -11,7 +11,7 @@ description = "A basic payload builder for reth that uses the txpool API to buil [dependencies] # reth reth-primitives.workspace = true -reth-revm = { path = "../../revm" } +reth-revm.workspace = true reth-transaction-pool.workspace = true reth-provider.workspace = true reth-payload-builder.workspace = true diff --git a/crates/primitives/Cargo.toml b/crates/primitives/Cargo.toml index 241624fa7c4f..a7245fa7f384 100644 --- a/crates/primitives/Cargo.toml +++ b/crates/primitives/Cargo.toml @@ -10,7 +10,7 @@ description = "Commonly used types in reth." [dependencies] # reth -reth-codecs = { path = "../storage/codecs" } +reth-codecs.workspace = true reth-rpc-types.workspace = true revm-primitives = { workspace = true, features = ["serde"] } diff --git a/crates/prune/Cargo.toml b/crates/prune/Cargo.toml index 27ed8cbd7dc2..c451667a30ab 100644 --- a/crates/prune/Cargo.toml +++ b/crates/prune/Cargo.toml @@ -6,9 +6,7 @@ rust-version.workspace = true license.workspace = true homepage.workspace = true repository.workspace = true -description = """ -Pruning implementation -""" +description = "Pruning implementation" [dependencies] # reth @@ -16,7 +14,7 @@ reth-primitives.workspace = true reth-db.workspace = true reth-provider.workspace = true reth-interfaces.workspace = true -reth-snapshot = { path = "../snapshot" } +reth-snapshot.workspace = true reth-tokio-util.workspace = true # async @@ -36,7 +34,7 @@ tokio-stream.workspace = true [dev-dependencies] # reth reth-db = { workspace = true, features = ["test-utils"] } -reth-stages = { path = "../stages", features = ["test-utils"] } +reth-stages = { workspace = true, features = ["test-utils"] } # misc diff --git a/crates/revm/Cargo.toml b/crates/revm/Cargo.toml index fb7026860522..30c6c351c570 100644 --- a/crates/revm/Cargo.toml +++ b/crates/revm/Cargo.toml @@ -13,8 +13,8 @@ description = "reth specific revm utilities" reth-primitives.workspace = true reth-interfaces.workspace = true reth-provider.workspace = true -reth-revm-inspectors = { path = "./revm-inspectors" } -reth-consensus-common = { path = "../consensus/common" } +reth-revm-inspectors.workspace = true +reth-consensus-common.workspace = true # revm revm.workspace = true diff --git a/crates/rpc/ipc/Cargo.toml b/crates/rpc/ipc/Cargo.toml index 0dc0bebee6da..df904112c46d 100644 --- a/crates/rpc/ipc/Cargo.toml +++ b/crates/rpc/ipc/Cargo.toml @@ -6,9 +6,7 @@ rust-version.workspace = true license.workspace = true homepage.workspace = true repository.workspace = true -description = """ -IPC support for reth -""" +description = "IPC support for reth" [dependencies] diff --git a/crates/rpc/rpc-api/Cargo.toml b/crates/rpc/rpc-api/Cargo.toml index 53a7676b1126..58d0349d388a 100644 --- a/crates/rpc/rpc-api/Cargo.toml +++ b/crates/rpc/rpc-api/Cargo.toml @@ -6,9 +6,7 @@ rust-version.workspace = true license.workspace = true homepage.workspace = true repository.workspace = true -description = """ -Reth RPC interfaces -""" +description = "Reth RPC interfaces" [dependencies] # reth diff --git a/crates/rpc/rpc-builder/Cargo.toml b/crates/rpc/rpc-builder/Cargo.toml index 8b27c2cc4d65..6ae2e8a1dc46 100644 --- a/crates/rpc/rpc-builder/Cargo.toml +++ b/crates/rpc/rpc-builder/Cargo.toml @@ -11,13 +11,13 @@ description = "Helpers for configuring RPC" [dependencies] # reth reth-primitives.workspace = true -reth-ipc = { path = "../ipc" } +reth-ipc.workspace = true reth-interfaces.workspace = true reth-network-api.workspace = true reth-provider.workspace = true -reth-rpc = { path = "../rpc" } -reth-rpc-api = { path = "../rpc-api" } -reth-rpc-engine-api = { path = "../rpc-engine-api" } +reth-rpc.workspace = true +reth-rpc-api.workspace = true +reth-rpc-engine-api.workspace = true reth-rpc-types.workspace = true reth-tasks.workspace = true reth-transaction-pool.workspace = true @@ -41,12 +41,12 @@ tracing.workspace = true [dev-dependencies] reth-tracing.workspace = true -reth-rpc-api = { path = "../rpc-api", features = ["client"] } +reth-rpc-api = { workspace = true, features = ["client"] } reth-transaction-pool = { workspace = true, features = ["test-utils"] } reth-provider = { workspace = true, features = ["test-utils"] } reth-network-api.workspace = true reth-interfaces = { workspace = true, features = ["test-utils"] } -reth-beacon-consensus = { path = "../../consensus/beacon" } +reth-beacon-consensus.workspace = true reth-payload-builder = { workspace = true, features = ["test-utils"] } tokio = { workspace = true, features = ["rt", "rt-multi-thread"] } diff --git a/crates/rpc/rpc-engine-api/Cargo.toml b/crates/rpc/rpc-engine-api/Cargo.toml index 913aeeb4d982..b718862a9ccb 100644 --- a/crates/rpc/rpc-engine-api/Cargo.toml +++ b/crates/rpc/rpc-engine-api/Cargo.toml @@ -14,8 +14,8 @@ reth-primitives.workspace = true reth-interfaces.workspace = true reth-provider.workspace = true reth-rpc-types.workspace = true -reth-rpc-api = { path = "../rpc-api" } -reth-beacon-consensus = { path = "../../consensus/beacon" } +reth-rpc-api.workspace = true +reth-beacon-consensus.workspace = true reth-payload-builder.workspace = true reth-tasks.workspace = true reth-rpc-types-compat.workspace = true diff --git a/crates/rpc/rpc-testing-util/Cargo.toml b/crates/rpc/rpc-testing-util/Cargo.toml index 5d0d1a2b2cf2..d69659103cab 100644 --- a/crates/rpc/rpc-testing-util/Cargo.toml +++ b/crates/rpc/rpc-testing-util/Cargo.toml @@ -6,15 +6,13 @@ rust-version.workspace = true license.workspace = true homepage.workspace = true repository.workspace = true -description = """ -Reth RPC testing helpers -""" +description = "Reth RPC testing helpers" [dependencies] # reth reth-primitives.workspace = true reth-rpc-types.workspace = true -reth-rpc-api = { path = "../rpc-api", default-features = false, features = ["client"] } +reth-rpc-api = { workspace = true, default-features = false, features = ["client"] } # async async-trait.workspace = true @@ -26,4 +24,3 @@ serde_json.workspace = true [dev-dependencies] tokio = { workspace = true, features = ["rt-multi-thread", "macros", "rt"] } - diff --git a/crates/rpc/rpc-types-compat/Cargo.toml b/crates/rpc/rpc-types-compat/Cargo.toml index 53af74d04b58..e85060334f54 100644 --- a/crates/rpc/rpc-types-compat/Cargo.toml +++ b/crates/rpc/rpc-types-compat/Cargo.toml @@ -6,9 +6,7 @@ rust-version.workspace = true license.workspace = true homepage.workspace = true repository.workspace = true -description = """ -Compatibility layer for reth-primitives and ethereum RPC types -""" +description = "Compatibility layer for reth-primitives and ethereum RPC types" [dependencies] reth-primitives.workspace = true diff --git a/crates/rpc/rpc-types/Cargo.toml b/crates/rpc/rpc-types/Cargo.toml index d585cf303c9d..0c0d2127ff5a 100644 --- a/crates/rpc/rpc-types/Cargo.toml +++ b/crates/rpc/rpc-types/Cargo.toml @@ -6,9 +6,7 @@ rust-version.workspace = true license.workspace = true homepage.workspace = true repository.workspace = true -description = """ -Reth RPC types -""" +description = "Reth RPC types" [dependencies] # # ethereum diff --git a/crates/rpc/rpc/Cargo.toml b/crates/rpc/rpc/Cargo.toml index 5ad278375e59..d32e5a3d8619 100644 --- a/crates/rpc/rpc/Cargo.toml +++ b/crates/rpc/rpc/Cargo.toml @@ -6,22 +6,20 @@ rust-version.workspace = true license.workspace = true homepage.workspace = true repository.workspace = true -description = """ -Reth RPC implementation -""" +description = "Reth RPC implementation" [dependencies] # reth reth-interfaces.workspace = true reth-primitives.workspace = true -reth-rpc-api = { path = "../rpc-api" } +reth-rpc-api.workspace = true reth-rpc-types.workspace = true reth-provider = { workspace = true, features = ["test-utils"] } reth-transaction-pool = { workspace = true, features = ["test-utils"] } reth-network-api.workspace = true -reth-rpc-engine-api = { path = "../rpc-engine-api" } -reth-revm = { path = "../../revm" } +reth-rpc-engine-api.workspace = true +reth-revm.workspace = true reth-tasks.workspace = true -reth-consensus-common = { path = "../../consensus/common" } +reth-consensus-common.workspace = true reth-rpc-types-compat.workspace = true lazy_static = "*" @@ -78,4 +76,9 @@ tempfile.workspace = true reth-interfaces = { workspace = true, features = ["test-utils"] } [features] -optimism = ["dep:reqwest", "reth-primitives/optimism", "reth-rpc-types-compat/optimism", "reth-network-api/optimism"] +optimism = [ + "dep:reqwest", + "reth-primitives/optimism", + "reth-rpc-types-compat/optimism", + "reth-network-api/optimism", +] diff --git a/crates/snapshot/Cargo.toml b/crates/snapshot/Cargo.toml index 5597331fd2d2..76b48e680536 100644 --- a/crates/snapshot/Cargo.toml +++ b/crates/snapshot/Cargo.toml @@ -6,9 +6,7 @@ rust-version.workspace = true license.workspace = true homepage.workspace = true repository.workspace = true -description = """ -Snapshotting implementation -""" +description = "Snapshotting implementation" [dependencies] # reth @@ -16,7 +14,7 @@ reth-primitives.workspace = true reth-db.workspace = true reth-provider.workspace = true reth-interfaces.workspace = true -reth-nippy-jar = { path = "../storage/nippy-jar" } +reth-nippy-jar.workspace = true # async tokio = { workspace = true, features = ["sync"] } @@ -29,11 +27,11 @@ clap = { workspace = true, features = ["derive"], optional = true } [dev-dependencies] # reth reth-db = { workspace = true, features = ["test-utils"] } -reth-stages = { path = "../stages", features = ["test-utils"] } +reth-stages = { workspace = true, features = ["test-utils"] } # misc assert_matches.workspace = true [features] -clap = ["dep:clap"] \ No newline at end of file +clap = ["dep:clap"] diff --git a/crates/stages/Cargo.toml b/crates/stages/Cargo.toml index 6a7a54261306..2eb4a8e07a1a 100644 --- a/crates/stages/Cargo.toml +++ b/crates/stages/Cargo.toml @@ -19,9 +19,9 @@ normal = [ reth-primitives.workspace = true reth-interfaces.workspace = true reth-db.workspace = true -reth-codecs = { path = "../storage/codecs" } +reth-codecs.workspace = true reth-provider.workspace = true -reth-trie = { path = "../trie" } +reth-trie.workspace = true reth-tokio-util.workspace = true # revm @@ -56,11 +56,11 @@ num-traits = "0.2.15" reth-primitives = { workspace = true, features = ["test-utils", "arbitrary"] } reth-db = { workspace = true, features = ["test-utils", "mdbx"] } reth-interfaces = { workspace = true, features = ["test-utils"] } -reth-downloaders = { path = "../net/downloaders" } -reth-eth-wire = { path = "../net/eth-wire" } # TODO(onbjerg): We only need this for [BlockBody] -reth-blockchain-tree = { path = "../blockchain-tree" } -reth-revm = { path = "../revm" } -reth-trie = { path = "../trie", features = ["test-utils"] } +reth-downloaders.workspace = true +reth-eth-wire.workspace = true # TODO(onbjerg): We only need this for [BlockBody] +reth-blockchain-tree.workspace = true +reth-revm.workspace = true +reth-trie = { workspace = true, features = ["test-utils"] } alloy-rlp.workspace = true itertools.workspace = true diff --git a/crates/storage/db/Cargo.toml b/crates/storage/db/Cargo.toml index 2920ffd68b23..c6103d732954 100644 --- a/crates/storage/db/Cargo.toml +++ b/crates/storage/db/Cargo.toml @@ -12,9 +12,9 @@ description = "Staged syncing primitives used in reth." # reth reth-primitives.workspace = true reth-interfaces.workspace = true -reth-codecs = { path = "../codecs" } -reth-libmdbx = { path = "../libmdbx-rs", optional = true, features = ["return-borrowed"] } -reth-nippy-jar = { path = "../nippy-jar" } +reth-codecs.workspace = true +reth-libmdbx = { workspace = true, optional = true, features = ["return-borrowed"] } +reth-nippy-jar.workspace = true reth-tracing.workspace = true # codecs @@ -56,7 +56,7 @@ proptest-derive = { workspace = true, optional = true } [dev-dependencies] # reth libs with arbitrary reth-primitives = { workspace = true, features = ["arbitrary"] } -reth-codecs = { path = "../codecs", features = ["arbitrary"] } +reth-codecs = { workspace = true, features = ["arbitrary"] } reth-interfaces.workspace = true tempfile.workspace = true diff --git a/crates/storage/provider/Cargo.toml b/crates/storage/provider/Cargo.toml index a79dd53167fb..d022ca972017 100644 --- a/crates/storage/provider/Cargo.toml +++ b/crates/storage/provider/Cargo.toml @@ -13,8 +13,8 @@ description = "Reth storage provider." reth-primitives.workspace = true reth-interfaces.workspace = true reth-db.workspace = true -reth-trie = { path = "../../trie" } -reth-nippy-jar = { path = "../nippy-jar" } +reth-trie.workspace = true +reth-nippy-jar.workspace = true revm.workspace = true @@ -45,7 +45,7 @@ rayon.workspace = true [dev-dependencies] reth-db = { workspace = true, features = ["test-utils"] } reth-primitives = { workspace = true, features = ["arbitrary", "test-utils"] } -reth-trie = { path = "../../trie", features = ["test-utils"] } +reth-trie = { workspace = true, features = ["test-utils"] } reth-interfaces = { workspace = true, features = ["test-utils"] } alloy-rlp.workspace = true diff --git a/crates/tokio-util/Cargo.toml b/crates/tokio-util/Cargo.toml index 5b8d24337cb9..573bd78c9930 100644 --- a/crates/tokio-util/Cargo.toml +++ b/crates/tokio-util/Cargo.toml @@ -6,9 +6,7 @@ rust-version.workspace = true license.workspace = true homepage.workspace = true repository.workspace = true -description = """ -Additional utilities for working with Tokio in reth. -""" +description = "Additional utilities for working with Tokio in reth." [dependencies] diff --git a/crates/transaction-pool/Cargo.toml b/crates/transaction-pool/Cargo.toml index 2ac468a53a2b..8aa44b598d5d 100644 --- a/crates/transaction-pool/Cargo.toml +++ b/crates/transaction-pool/Cargo.toml @@ -6,9 +6,7 @@ rust-version.workspace = true license.workspace = true homepage.workspace = true repository.workspace = true -description = """ -Transaction pool implementation -""" +description = "Transaction pool implementation" [package.metadata.cargo-udeps.ignore] normal = [ @@ -24,7 +22,7 @@ reth-interfaces.workspace = true reth-tasks.workspace = true revm.workspace = true alloy-rlp.workspace = true -reth-revm = { path = "../revm", optional = true } +reth-revm = { workspace = true, optional = true } # async/futures async-trait.workspace = true @@ -70,7 +68,7 @@ optimism = [ "reth-primitives/optimism", "reth-provider/test-utils", "reth-provider/optimism", - "revm/optimism" + "revm/optimism", ] [[bench]] diff --git a/crates/trie/Cargo.toml b/crates/trie/Cargo.toml index 643988501bc9..f4cd70f21158 100644 --- a/crates/trie/Cargo.toml +++ b/crates/trie/Cargo.toml @@ -6,15 +6,13 @@ rust-version.workspace = true license.workspace = true homepage.workspace = true repository.workspace = true -description = """ -Merkle trie implementation -""" +description = "Merkle trie implementation" [dependencies] # reth reth-primitives.workspace = true reth-interfaces.workspace = true -reth-db = { path = "../storage/db" } +reth-db.workspace = true alloy-rlp.workspace = true diff --git a/testing/ef-tests/Cargo.toml b/testing/ef-tests/Cargo.toml index a47990e7c905..29813d1dbeca 100644 --- a/testing/ef-tests/Cargo.toml +++ b/testing/ef-tests/Cargo.toml @@ -15,9 +15,9 @@ ef-tests = [] reth-primitives.workspace = true reth-db = { workspace = true, features = ["mdbx", "test-utils"] } reth-provider.workspace = true -reth-stages = { path = "../../crates/stages" } +reth-stages.workspace = true reth-interfaces.workspace = true -reth-revm = { path = "../../crates/revm" } +reth-revm.workspace = true alloy-rlp.workspace = true tokio = "1.28.1"