From 4565cda599461146d54431a3389e07350017d9e5 Mon Sep 17 00:00:00 2001
From: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Thu, 27 Feb 2025 09:47:08 +0200
Subject: [PATCH] chore(deps): avoid duplicate crates (#14681)

---
 Cargo.toml                                    | 49 +++++++++++++++++++
 bin/reth-bench/Cargo.toml                     |  4 +-
 crates/cli/commands/Cargo.toml                | 10 ++--
 crates/consensus/debug-client/Cargo.toml      |  2 +-
 crates/engine/invalid-block-hooks/Cargo.toml  |  2 +-
 crates/engine/tree/Cargo.toml                 |  2 +-
 crates/exex/exex/Cargo.toml                   |  2 +-
 crates/net/dns/Cargo.toml                     |  4 +-
 crates/net/ecies/Cargo.toml                   | 18 +++----
 crates/net/eth-wire/Cargo.toml                |  2 +-
 crates/node/core/Cargo.toml                   |  4 +-
 crates/node/metrics/Cargo.toml                |  2 +-
 crates/rpc/ipc/Cargo.toml                     |  4 +-
 crates/stages/stages/Cargo.toml               |  2 +-
 crates/storage/codecs/Cargo.toml              |  4 +-
 crates/storage/codecs/derive/Cargo.toml       |  2 +-
 crates/storage/db-api/Cargo.toml              |  4 +-
 crates/storage/db/Cargo.toml                  |  4 +-
 crates/storage/libmdbx-rs/Cargo.toml          |  2 +-
 crates/storage/libmdbx-rs/mdbx-sys/Cargo.toml |  4 +-
 crates/storage/nippy-jar/Cargo.toml           |  6 +--
 crates/tracing/Cargo.toml                     |  8 +--
 crates/trie/common/Cargo.toml                 |  8 +--
 crates/trie/db/Cargo.toml                     |  4 +-
 crates/trie/sparse/Cargo.toml                 |  2 +-
 crates/trie/trie/Cargo.toml                   |  4 +-
 examples/beacon-api-sse/Cargo.toml            |  2 +-
 examples/custom-beacon-withdrawals/Cargo.toml |  2 +-
 testing/ef-tests/Cargo.toml                   |  2 +-
 29 files changed, 107 insertions(+), 58 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 19b2c6eb05..eede14e276 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -621,6 +621,55 @@ snmalloc-rs = { version = "0.3.7", features = ["build_cc"] }
 #
 # See: https://github.com/eira-fransham/crunchy/issues/13
 crunchy = "=0.2.2"
+aes = "0.8.1"
+ahash = "0.8"
+alloy-sol-macro = "0.8.9"
+anyhow = "1.0"
+bindgen = { version = "0.70", default-features = false }
+block-padding = "0.3.2"
+cc = "1.0"
+cipher = "0.4.3"
+comfy-table = "7.0"
+concat-kdf = "0.1.0"
+convert_case = "0.7.0"
+crossbeam-channel = "0.5.13"
+crossterm = "0.28.0"
+csv = "1.3.0"
+ctr = "0.9.2"
+data-encoding = "2"
+delegate = "0.13"
+digest = "0.10.5"
+hash-db = "=0.15.2"
+hickory-resolver = "0.25.0-alpha.5"
+hmac = "0.12.1"
+human_bytes = "0.4.1"
+indexmap = "2"
+interprocess = "2.2.0"
+lz4_flex = { version = "0.11", default-features = false }
+memmap2 = "0.9.4"
+mev-share-sse = { version = "0.4.0", default-features = false }
+num-traits = "0.2.15"
+page_size = "0.6.0"
+parity-scale-codec = "3.2.1"
+plain_hasher = "0.2"
+pretty_assertions = "1.4"
+ratatui = { version = "0.29", default-features = false }
+ringbuffer = "0.15.0"
+rmp-serde = "1.3"
+roaring = "0.10.2"
+rolling-file = "0.2.0"
+sha3 = "0.10.5"
+snap = "1.0.5"
+socket2 = { version = "0.5", default-features = false }
+sysinfo = { version = "0.33", default-features = false }
+tracing-journald = "0.3"
+tracing-logfmt = "0.3.3"
+tracing-subscriber = { version = "0.3", default-features = false }
+triehash = "0.8"
+typenum = "1.15.0"
+vergen = "8.0.0"
+visibility = "0.1.1"
+walkdir = "2.3.3"
 
 [patch.crates-io]
 alloy-evm = { git = "https://github.com/alloy-rs/evm", rev = "04fa394" }
diff --git a/bin/reth-bench/Cargo.toml b/bin/reth-bench/Cargo.toml
index 4e13ebd608..91a134b00b 100644
--- a/bin/reth-bench/Cargo.toml
+++ b/bin/reth-bench/Cargo.toml
@@ -58,12 +58,12 @@ tokio = { workspace = true, features = ["sync", "macros", "time", "rt-multi-thre
 
 # misc
 clap = { workspace = true, features = ["derive", "env"] }
-delegate = "0.13"
+delegate.workspace = true
 eyre.workspace = true
 thiserror.workspace = true
 
 # for writing data
-csv = "1.3.0"
+csv.workspace = true
 
 [dev-dependencies]
 reth-tracing.workspace = true
diff --git a/crates/cli/commands/Cargo.toml b/crates/cli/commands/Cargo.toml
index a4fc4dd982..f588851dac 100644
--- a/crates/cli/commands/Cargo.toml
+++ b/crates/cli/commands/Cargo.toml
@@ -60,8 +60,8 @@ futures.workspace = true
 tokio.workspace = true
 
 # misc
-ahash = "0.8"
-human_bytes = "0.4.1"
+ahash.workspace = true
+human_bytes.workspace = true
 eyre.workspace = true
 clap = { workspace = true, features = ["derive", "env"] }
 serde.workspace = true
@@ -75,9 +75,9 @@ fdlimit.workspace = true
 toml = { workspace = true, features = ["display"] }
 
 # tui
-comfy-table = "7.0"
-crossterm = "0.28.0"
-ratatui = { version = "0.29", default-features = false, features = ["crossterm"] }
+comfy-table.workspace = true
+crossterm.workspace = true
+ratatui = { workspace = true, features = ["crossterm"] }
 
 # reth test-vectors
 proptest = { workspace = true, optional = true }
diff --git a/crates/consensus/debug-client/Cargo.toml b/crates/consensus/debug-client/Cargo.toml
index 18e7aead30..e84f235bea 100644
--- a/crates/consensus/debug-client/Cargo.toml
+++ b/crates/consensus/debug-client/Cargo.toml
@@ -32,4 +32,4 @@ reqwest = { workspace = true, features = ["rustls-tls", "json"] }
 serde = { workspace = true, features = ["derive"] }
 tokio = { workspace = true, features = ["time"] }
 
-ringbuffer = "0.15.0"
+ringbuffer.workspace = true
diff --git a/crates/engine/invalid-block-hooks/Cargo.toml b/crates/engine/invalid-block-hooks/Cargo.toml
index a7b0153d0d..045cccdba3 100644
--- a/crates/engine/invalid-block-hooks/Cargo.toml
+++ b/crates/engine/invalid-block-hooks/Cargo.toml
@@ -35,6 +35,6 @@ futures.workspace = true
 # misc
 eyre.workspace = true
 jsonrpsee.workspace = true
-pretty_assertions = "1.4"
+pretty_assertions.workspace = true
 serde.workspace = true
 serde_json.workspace = true
diff --git a/crates/engine/tree/Cargo.toml b/crates/engine/tree/Cargo.toml
index 7f2e84408b..3ff7809340 100644
--- a/crates/engine/tree/Cargo.toml
+++ b/crates/engine/tree/Cargo.toml
@@ -90,7 +90,7 @@ revm-state.workspace = true
 
 assert_matches.workspace = true
 criterion.workspace = true
-crossbeam-channel = "0.5.13"
+crossbeam-channel.workspace = true
 proptest.workspace = true
 rand.workspace = true
 
diff --git a/crates/exex/exex/Cargo.toml b/crates/exex/exex/Cargo.toml
index 43734040ed..c06005200d 100644
--- a/crates/exex/exex/Cargo.toml
+++ b/crates/exex/exex/Cargo.toml
@@ -47,7 +47,7 @@ eyre.workspace = true
 itertools = { workspace = true, features = ["use_std"] }
 metrics.workspace = true
 parking_lot.workspace = true
-rmp-serde = "1.3"
+rmp-serde.workspace = true
 thiserror.workspace = true
 tracing.workspace = true
 
diff --git a/crates/net/dns/Cargo.toml b/crates/net/dns/Cargo.toml
index d078d434ad..eeeed91ab8 100644
--- a/crates/net/dns/Cargo.toml
+++ b/crates/net/dns/Cargo.toml
@@ -27,10 +27,10 @@ tokio = { workspace = true, features = ["io-util", "net", "time"] }
 tokio-stream.workspace = true
 
 # trust-dns
-hickory-resolver = { version = "0.25.0-alpha.5" }
+hickory-resolver.workspace = true
 
 # misc
-data-encoding = "2"
+data-encoding.workspace = true
 linked_hash_set.workspace = true
 schnellru.workspace = true
 thiserror.workspace = true
diff --git a/crates/net/ecies/Cargo.toml b/crates/net/ecies/Cargo.toml
index f16e736173..c692ea51ed 100644
--- a/crates/net/ecies/Cargo.toml
+++ b/crates/net/ecies/Cargo.toml
@@ -27,18 +27,18 @@ tracing = { workspace = true, features = ["attributes"] }
 
 # HeaderBytes
 generic-array.workspace = true
-typenum = "1.15.0"
+typenum.workspace = true
 byteorder.workspace = true
 
 # crypto
 rand.workspace = true
-ctr = "0.9.2"
-digest = "0.10.5"
+ctr.workspace = true
+digest.workspace = true
 secp256k1 = { workspace = true, features = ["global-context", "std", "recovery", "rand"] }
-concat-kdf = "0.1.0"
+concat-kdf.workspace = true
 sha2.workspace = true
-sha3 = "0.10.5"
-aes = "0.8.1"
-hmac = "0.12.1"
-block-padding = "0.3.2"
-cipher = { version = "0.4.3", features = ["block-padding"] }
+sha3.workspace = true
+aes.workspace = true
+hmac.workspace = true
+block-padding.workspace = true
+cipher = { workspace = true, features = ["block-padding"] }
diff --git a/crates/net/eth-wire/Cargo.toml b/crates/net/eth-wire/Cargo.toml
index 9a01f4607c..75e6e90912 100644
--- a/crates/net/eth-wire/Cargo.toml
+++ b/crates/net/eth-wire/Cargo.toml
@@ -38,7 +38,7 @@ futures.workspace = true
 tokio-stream.workspace = true
 pin-project.workspace = true
 tracing.workspace = true
-snap = "1.0.5"
+snap.workspace = true
 
 # arbitrary utils
 arbitrary = { workspace = true, features = ["derive"], optional = true }
diff --git a/crates/node/core/Cargo.toml b/crates/node/core/Cargo.toml
index 4743a722b6..8cb70bf0d2 100644
--- a/crates/node/core/Cargo.toml
+++ b/crates/node/core/Cargo.toml
@@ -54,7 +54,7 @@ strum = { workspace = true, features = ["derive"] }
 thiserror.workspace = true
 
 # io
-dirs-next = "2.0.0"
+dirs-next.workspace = true
 shellexpand.workspace = true
 
 # tracing
@@ -77,4 +77,4 @@ jemalloc = ["reth-cli-util/jemalloc"]
 asm-keccak = ["reth-primitives/asm-keccak", "alloy-primitives/asm-keccak"]
 
 [build-dependencies]
-vergen = { version = "8.0.0", features = ["build", "cargo", "git", "gitcl"] }
+vergen = { workspace = true, features = ["build", "cargo", "git", "gitcl"] }
diff --git a/crates/node/metrics/Cargo.toml b/crates/node/metrics/Cargo.toml
index afb6bf10c4..39884fa73e 100644
--- a/crates/node/metrics/Cargo.toml
+++ b/crates/node/metrics/Cargo.toml
@@ -33,7 +33,7 @@ procfs = "0.17.0"
 
 [dev-dependencies]
 reqwest.workspace = true
-socket2 = { version = "0.5", default-features = false }
+socket2.workspace = true
 
 [lints]
 workspace = true
diff --git a/crates/rpc/ipc/Cargo.toml b/crates/rpc/ipc/Cargo.toml
index bd34c474fc..3314384531 100644
--- a/crates/rpc/ipc/Cargo.toml
+++ b/crates/rpc/ipc/Cargo.toml
@@ -27,8 +27,8 @@ serde_json.workspace = true
 tracing.workspace = true
 bytes.workspace = true
 thiserror.workspace = true
-futures-util = "0.3.30"
-interprocess = { version = "2.2.0", features = ["tokio"] }
+futures-util.workspace = true
+interprocess = { workspace = true, features = ["tokio"] }
 
 [dev-dependencies]
 tokio-stream = { workspace = true, features = ["sync"] }
diff --git a/crates/stages/stages/Cargo.toml b/crates/stages/stages/Cargo.toml
index 4f1564fd3c..15a04dcb09 100644
--- a/crates/stages/stages/Cargo.toml
+++ b/crates/stages/stages/Cargo.toml
@@ -53,7 +53,7 @@ tracing.workspace = true
 thiserror.workspace = true
 itertools.workspace = true
 rayon.workspace = true
-num-traits = "0.2.15"
+num-traits.workspace = true
 tempfile = { workspace = true, optional = true }
 bincode.workspace = true
 blake3.workspace = true
diff --git a/crates/storage/codecs/Cargo.toml b/crates/storage/codecs/Cargo.toml
index 9ad7f645fb..7e35f40056 100644
--- a/crates/storage/codecs/Cargo.toml
+++ b/crates/storage/codecs/Cargo.toml
@@ -12,7 +12,7 @@ workspace = true
 
 [dependencies]
 # reth
-reth-codecs-derive = { path = "./derive", default-features = false }
+reth-codecs-derive.workspace = true
 
 # eth
 alloy-consensus = { workspace = true, optional = true }
@@ -27,7 +27,7 @@ op-alloy-consensus = { workspace = true, optional = true }
 # misc
 bytes.workspace = true
 modular-bitfield.workspace = true
-visibility = { version = "0.1.1", optional = true }
+visibility = { workspace = true, optional = true }
 serde.workspace = true
 arbitrary = { workspace = true, features = ["derive"], optional = true }
 
diff --git a/crates/storage/codecs/derive/Cargo.toml b/crates/storage/codecs/derive/Cargo.toml
index f27ce7b30c..6d1bffb4ab 100644
--- a/crates/storage/codecs/derive/Cargo.toml
+++ b/crates/storage/codecs/derive/Cargo.toml
@@ -15,7 +15,7 @@ workspace = true
 proc-macro = true
 
 [dependencies]
-convert_case = "0.7.0"
+convert_case.workspace = true
 proc-macro2.workspace = true
 quote.workspace = true
 syn.workspace = true
diff --git a/crates/storage/db-api/Cargo.toml b/crates/storage/db-api/Cargo.toml
index ddd806de74..c8226198e2 100644
--- a/crates/storage/db-api/Cargo.toml
+++ b/crates/storage/db-api/Cargo.toml
@@ -32,8 +32,8 @@ reth-optimism-primitives = { workspace = true, optional = true }
 
 # codecs
 modular-bitfield.workspace = true
-roaring = "0.10.2"
-parity-scale-codec = { version = "3.2.1", features = ["bytes"] }
+roaring.workspace = true
+parity-scale-codec = { workspace = true, features = ["bytes"] }
 serde = { workspace = true, default-features = false }
 
 # metrics
diff --git a/crates/storage/db/Cargo.toml b/crates/storage/db/Cargo.toml
index 1762cfab74..912b241c26 100644
--- a/crates/storage/db/Cargo.toml
+++ b/crates/storage/db/Cargo.toml
@@ -32,12 +32,12 @@ reth-metrics = { workspace = true, optional = true }
 metrics = { workspace = true, optional = true }
 
 # misc
-page_size = { version = "0.6.0", optional = true }
+page_size = { workspace = true, optional = true }
 thiserror.workspace = true
 tempfile = { workspace = true, optional = true }
 derive_more.workspace = true
 rustc-hash = { workspace = true, optional = true }
-sysinfo = { version = "0.33", default-features = false, features = ["system"] }
+sysinfo = { workspace = true, features = ["system"] }
 parking_lot = { workspace = true, optional = true }
 
 # arbitrary utils
diff --git a/crates/storage/libmdbx-rs/Cargo.toml b/crates/storage/libmdbx-rs/Cargo.toml
index a61b884ae6..74896ec016 100644
--- a/crates/storage/libmdbx-rs/Cargo.toml
+++ b/crates/storage/libmdbx-rs/Cargo.toml
@@ -17,7 +17,7 @@ reth-mdbx-sys.workspace = true
 bitflags.workspace = true
 byteorder.workspace = true
 derive_more.workspace = true
-indexmap = "2"
+indexmap.workspace = true
 parking_lot.workspace = true
 smallvec.workspace = true
 thiserror.workspace = true
diff --git a/crates/storage/libmdbx-rs/mdbx-sys/Cargo.toml b/crates/storage/libmdbx-rs/mdbx-sys/Cargo.toml
index 433de2684f..1fb1b9b4a3 100644
--- a/crates/storage/libmdbx-rs/mdbx-sys/Cargo.toml
+++ b/crates/storage/libmdbx-rs/mdbx-sys/Cargo.toml
@@ -9,5 +9,5 @@ homepage.workspace = true
 repository.workspace = true
 
 [build-dependencies]
-cc = "1.0"
-bindgen = { version = "0.70", default-features = false, features = ["runtime"] }
+cc.workspace = true
+bindgen = { workspace = true, features = ["runtime"] }
diff --git a/crates/storage/nippy-jar/Cargo.toml b/crates/storage/nippy-jar/Cargo.toml
index 56f140afbd..be6699d19c 100644
--- a/crates/storage/nippy-jar/Cargo.toml
+++ b/crates/storage/nippy-jar/Cargo.toml
@@ -20,13 +20,13 @@ reth-fs-util.workspace = true
 
 # compression
 zstd = { workspace = true, features = ["experimental", "zdict_builder"] }
-lz4_flex = { version = "0.11", default-features = false }
+lz4_flex.workspace = true
 
-memmap2 = "0.9.4"
+memmap2.workspace = true
 bincode.workspace = true
 serde = { workspace = true, features = ["derive"] }
 tracing.workspace = true
-anyhow = "1.0"
+anyhow.workspace = true
 thiserror.workspace = true
 derive_more.workspace = true
 
diff --git a/crates/tracing/Cargo.toml b/crates/tracing/Cargo.toml
index e50de1ebc0..a5c09c23a3 100644
--- a/crates/tracing/Cargo.toml
+++ b/crates/tracing/Cargo.toml
@@ -13,10 +13,10 @@ workspace = true
 
 [dependencies]
 tracing.workspace = true
-tracing-subscriber = { version = "0.3", default-features = false, features = ["env-filter", "fmt", "ansi", "json"] }
+tracing-subscriber = { workspace = true, features = ["env-filter", "fmt", "ansi", "json"] }
 tracing-appender.workspace = true
-tracing-journald = "0.3"
-tracing-logfmt = "0.3.3"
-rolling-file = "0.2.0"
+tracing-journald.workspace = true
+tracing-logfmt.workspace = true
+rolling-file.workspace = true
 eyre.workspace = true
 clap = { workspace = true, features = ["derive"] }
diff --git a/crates/trie/common/Cargo.toml b/crates/trie/common/Cargo.toml
index a72b9f4352..4c22c18247 100644
--- a/crates/trie/common/Cargo.toml
+++ b/crates/trie/common/Cargo.toml
@@ -37,8 +37,8 @@ serde = { workspace = true, optional = true }
 serde_with = { workspace = true, optional = true }
 
 # `test-utils` feature
-hash-db = { version = "=0.15.2", optional = true }
-plain_hasher = { version = "0.2", optional = true }
+hash-db = { workspace = true, optional = true }
+plain_hasher = { workspace = true, optional = true }
 arbitrary = { workspace = true, features = ["derive"], optional = true }
 
 # misc
@@ -52,8 +52,8 @@ alloy-genesis.workspace = true
 alloy-primitives = { workspace = true, features = ["getrandom"] }
 alloy-trie = { workspace = true, features = ["arbitrary", "serde"] }
 bytes.workspace = true
-hash-db = "=0.15.2"
-plain_hasher = "0.2"
+hash-db.workspace = true
+plain_hasher.workspace = true
 arbitrary = { workspace = true, features = ["derive"] }
 proptest.workspace = true
 proptest-arbitrary-interop.workspace = true
diff --git a/crates/trie/db/Cargo.toml b/crates/trie/db/Cargo.toml
index 18060e7749..274c2c9715 100644
--- a/crates/trie/db/Cargo.toml
+++ b/crates/trie/db/Cargo.toml
@@ -35,7 +35,7 @@ reth-metrics = { workspace = true, optional = true }
 metrics = { workspace = true, optional = true }
 
 # `test-utils` feature
-triehash = { version = "0.8", optional = true }
+triehash = { workspace = true, optional = true }
 
 # `serde` feature
 serde = { workspace = true, optional = true }
@@ -54,7 +54,7 @@ alloy-consensus.workspace = true
 revm-database.workspace = true
 
 # trie
-triehash = "0.8"
+triehash.workspace = true
 
 # misc
 proptest.workspace = true
diff --git a/crates/trie/sparse/Cargo.toml b/crates/trie/sparse/Cargo.toml
index 908d03950e..a8784a086b 100644
--- a/crates/trie/sparse/Cargo.toml
+++ b/crates/trie/sparse/Cargo.toml
@@ -39,7 +39,7 @@ arbitrary.workspace = true
 assert_matches.workspace = true
 criterion.workspace = true
 itertools.workspace = true
-pretty_assertions = "1.4"
+pretty_assertions.workspace = true
 proptest-arbitrary-interop.workspace = true
 proptest.workspace = true
 rand.workspace = true
diff --git a/crates/trie/trie/Cargo.toml b/crates/trie/trie/Cargo.toml
index 33b0438e5c..1948206437 100644
--- a/crates/trie/trie/Cargo.toml
+++ b/crates/trie/trie/Cargo.toml
@@ -41,7 +41,7 @@ reth-metrics = { workspace = true, optional = true }
 metrics = { workspace = true, optional = true }
 
 # `test-utils` feature
-triehash = { version = "0.8", optional = true }
+triehash = { workspace = true, optional = true }
 
 [dev-dependencies]
 # reth
@@ -53,7 +53,7 @@ reth-trie-common = { workspace = true, features = ["test-utils", "arbitrary"] }
 revm-state.workspace = true
 
 # trie
-triehash = "0.8"
+triehash.workspace = true
 
 # misc
 proptest.workspace = true
diff --git a/examples/beacon-api-sse/Cargo.toml b/examples/beacon-api-sse/Cargo.toml
index ca49897c9e..46941bdfea 100644
--- a/examples/beacon-api-sse/Cargo.toml
+++ b/examples/beacon-api-sse/Cargo.toml
@@ -13,6 +13,6 @@ alloy-rpc-types-beacon.workspace = true
 
 clap.workspace = true
 futures-util.workspace = true
-mev-share-sse = { version = "0.4.0", default-features = false }
+mev-share-sse.workspace = true
 tokio = { workspace = true, features = ["time"] }
 tracing.workspace = true
diff --git a/examples/custom-beacon-withdrawals/Cargo.toml b/examples/custom-beacon-withdrawals/Cargo.toml
index d58da7d2c1..0db00caa51 100644
--- a/examples/custom-beacon-withdrawals/Cargo.toml
+++ b/examples/custom-beacon-withdrawals/Cargo.toml
@@ -13,7 +13,7 @@ reth-chainspec.workspace = true
 reth-evm.workspace = true
 reth-primitives.workspace = true
 
-alloy-sol-macro = "0.8.9"
+alloy-sol-macro.workspace = true
 alloy-sol-types.workspace = true
 alloy-eips.workspace = true
 alloy-consensus.workspace = true
diff --git a/testing/ef-tests/Cargo.toml b/testing/ef-tests/Cargo.toml
index d75dd7e5f3..43cc970fab 100644
--- a/testing/ef-tests/Cargo.toml
+++ b/testing/ef-tests/Cargo.toml
@@ -37,7 +37,7 @@ alloy-primitives.workspace = true
 alloy-eips.workspace = true
 alloy-consensus.workspace = true
 
-walkdir = "2.3.3"
+walkdir.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 thiserror.workspace = true