Switch Cargo.toml in packages to use workspace dependencies

Cargo.toml

@@ -13,67 +13,140 @@ categories = ["cryptography::cryptocurrencies"]
 description = "A Rust implementation of the Ethereum Portal Network"
 
 [dependencies]
+alloy-primitives.workspace = true
+anyhow.workspace = true
+clap.workspace = true
+dirs = "5.0.1"
+discv5.workspace = true
+e2store.workspace = true
+ethereum_ssz.workspace = true
+ethers = { version = "2.0"}
+ethers-providers = { version = "2.0", features = ["ws"] }
+ethportal-api.workspace = true
+futures.workspace = true
+jsonrpsee.workspace = true
+lazy_static.workspace = true
+parking_lot.workspace = true
+portal-bridge.workspace = true
+portalnet.workspace = true
+prometheus_exporter.workspace = true
+rand.workspace = true
+regex = "1.10.2"
+reth-ipc.workspace = true
+rpc.workspace = true
+serde_json = { workspace = true, features = ["preserve_order"]}
+sha3.workspace = true
+surf.workspace = true
+tempfile.workspace = true
+tokio.workspace = true
+tracing.workspace = true
+tracing-subscriber.workspace = true
+tree_hash.workspace = true
+trin-beacon.workspace = true
+trin-history.workspace = true
+trin-state.workspace = true
+trin-storage.workspace = true
+trin-utils.workspace = true
+trin-validation.workspace = true
+url.workspace = true
+utp-rs.workspace = true
+
+[dev-dependencies]
+ethers-core = { version = "2.0", default-features = false}
+ethers-providers = { version = "2.0", features = ["ipc"] }
+ethportal-peertest = { path = "ethportal-peertest" }
+serde_yaml.workspace = true
+serial_test.workspace = true
+ureq.workspace = true
+
+[workspace]
+members = [
+    "ethportal-api",
+    "ethportal-peertest",
+    "e2store",
+    "light-client",
+    "trin-metrics",
+    "portal-bridge",
+    "rpc",
+    "trin-beacon",
+    "trin-execution",
+    "trin-history",
+    "trin-state",
+    "trin-storage",
+    "trin-utils",
+    "trin-validation",
+    "utp-testing",
+]
+
+[workspace.dependencies]
+alloy-consensus = { git = "https://github.com/alloy-rs/alloy.git", rev = "d68a6b787b2904061f0ae7fcc02ece8513e3c500"}
 alloy-primitives = "0.7.0"
+alloy-rlp = "0.3.4"
 anyhow = "1.0.68"
+async-trait = "0.1.68"
+bytes = "1.3.0"
+chrono = "0.4.38"
 clap = { version = "4.2.1", features = ["derive"] }
-dirs = "5.0.1"
+directories = "3.0"
 discv5 = { version = "0.4.1", features = ["serde"] }
+e2store = { path = "e2store" }
+env_logger = "0.9.0"
+eth_trie = { git = "https://github.com/kolbyml/eth-trie.rs.git", rev = "7947a83091192a7988f359b750b05121d5d7ba8c" }
 ethereum_ssz = "0.5.3"
-ethers = { version = "2.0"}
-ethers-providers = { version = "2.0", features = ["ws"] }
+ethereum_ssz_derive = "0.5.3"
 ethportal-api = { path = "ethportal-api" }
-e2store = { path = "e2store" }
-futures = "0.3.21"
+futures = "0.3.23"
+hex = "0.4.3"
+hyper = "0.14.28"
 jsonrpsee = "0.20.0"
+keccak-hash = "0.10.0"
 lazy_static = "1.4.0"
+light-client = { path = "light-client" }
 parking_lot = "0.11.2"
-portalnet = { path = "portalnet" }
 portal-bridge = { path = "portal-bridge" }
+portalnet = { path = "portalnet" }
 prometheus_exporter = "0.8.4"
-rand = "0.8.4"
-regex = "1.10.2"
+quickcheck = "1.0.3"
+r2d2 = "0.8.9"
+r2d2_sqlite = "0.24.0"
+rand = "0.8.5"
 reth-ipc = { tag = "v0.2.0-beta.5", git = "https://github.com/paradigmxyz/reth.git"}
+reth-rpc-types = { rev = "8d1d13ef89cf19459adc37ba0c45e7aac6270dc1", git = "https://github.com/paradigmxyz/reth.git"}
+revm = { version = "8.0.0", features = ["std", "secp256k1", "serde-json"], default-features = false }
+revm-primitives = { version = "3.1.0", features = ["std", "serde"], default-features = false }
 rpc = { path = "rpc"}
-serde_json = {version = "1.0.89", features = ["preserve_order"]}
+rstest = "0.18.2"
+rusqlite = { version = "0.31.0", features = ["bundled"] }
+scraper = "0.18.1"
+serde = { version = "1.0.150", features = ["derive"] }
+serde_json = "1.0.95"
+serde_yaml = "0.9.33"
+serde-this-or-that = "0.4.2"
+serial_test = "0.5.1"
 sha3 = "0.9.1"
+snap = "1.1.1"
+ssz_types = { git = "https://github.com/KolbyML/ssz_types.git", rev = "2a5922de75f00746890bf4ea9ad663c9d5d58efe" }
+strum = { version = "0.26.1", features = ["derive"] }
 surf = { version = "2.3.2", default-features = false, features = ["h1-client-rustls", "middleware-logger", "encoding"] } # we use rustls because OpenSSL cause issues compiling on aarch64
 tempfile = "3.3.0"
+test-log = { version = "0.2.11", features = ["trace"] }
+thiserror = "1.0.57"
 tokio = { version = "1.14.0", features = ["full"] }
+tokio-test = "0.4.2"
 tracing = "0.1.36"
 tracing-subscriber = "0.3.15"
+tracing-test = "0.1"
 tree_hash = { git = "https://github.com/KolbyML/tree_hash.git", rev = "8aaf8bb4184148768d48e2cfbbdd0b95d1da8730" }
+tree_hash_derive = { git = "https://github.com/KolbyML/tree_hash.git", rev = "8aaf8bb4184148768d48e2cfbbdd0b95d1da8730" }
 trin-beacon = { path = "trin-beacon" }
+trin-execution = { path = "trin-execution" }
 trin-history = { path = "trin-history" }
+trin-metrics = { path = "trin-metrics" }
 trin-state = { path = "trin-state" }
 trin-storage = { path = "trin-storage" }
 trin-utils = { path = "trin-utils" }
 trin-validation = { path = "trin-validation" }
+uds_windows = "1.0.1"
+ureq = { version = "2.5.0", features = ["json"] }
 url = "2.3.1"
 utp-rs = { git = "https://github.com/ethereum/utp", tag = "v0.1.0-alpha.13" }
-
-[dev-dependencies]
-ethers-core = { version = "2.0", default-features = false}
-ethers-providers = { version = "2.0", default-features = false, features = ["ipc"] }
-ethportal-peertest = { path = "ethportal-peertest" }
-serde_yaml = "0.9"
-serial_test = "0.5.1"
-ureq = { version = "2.5.0", features = ["json"] }
-
-[workspace]
-members = [
-    "ethportal-api",
-    "ethportal-peertest",
-    "e2store",
-    "light-client",
-    "trin-metrics",
-    "portal-bridge",
-    "rpc",
-    "trin-beacon",
-    "trin-execution",
-    "trin-history",
-    "trin-state",
-    "trin-storage",
-    "trin-utils",
-    "trin-validation",
-    "utp-testing",
-]

e2store/Cargo.toml

@@ -12,18 +12,18 @@ authors = ["https://github.com/ethereum/trin/graphs/contributors"]
 
 
 [dependencies]
-alloy-primitives = "0.7.0"
-alloy-rlp = "0.3.4"
-anyhow = "1.0.68"
-ethereum_ssz = "0.5.3"
-ethereum_ssz_derive = "0.5.3"
-ethportal-api = { path = "../ethportal-api" }
-rand = "0.8.4"
-scraper = "0.18.1"
-snap = "1.1.1"
-surf = { version = "2.3.2", default-features = false, features = ["h1-client-rustls", "middleware-logger", "encoding"] } # we use rustls because OpenSSL cause issues compiling on aarch64
+alloy-primitives.workspace = true
+alloy-rlp.workspace = true
+anyhow.workspace = true
+ethereum_ssz.workspace = true
+ethereum_ssz_derive.workspace = true
+ethportal-api.workspace = true
+rand.workspace = true
+scraper.workspace = true
+snap.workspace = true
+surf.workspace = true
 
 [dev-dependencies]
-rstest = "0.18.2"
-tempfile = "3.3.0"
-tokio = { version = "1.14.0", features = ["full"] }
+rstest.workspace = true
+tempfile.workspace = true
+tokio.workspace = true

ethportal-api/Cargo.toml

@@ -11,55 +11,55 @@ categories = ["cryptography::cryptocurrencies"]
 authors = ["https://github.com/ethereum/trin/graphs/contributors"]
 
 [dependencies]
-alloy-primitives = { version = "0.7.0", features = ["ssz"] }
-alloy-rlp = "0.3.4"
-anyhow = "1.0.68"
+alloy-primitives.workspace = true
+alloy-rlp.workspace = true
+anyhow.workspace = true
 base64 = "0.13.0"
 bimap = "0.6.3"
-bytes = "1.3.0"
-clap = { version = "4.2.1", features = ["derive"] }
-const_format = {version = "0.2.0", features = ["rust_1_64"]}
+bytes.workspace = true
 c-kzg = "1.0.0"
-discv5 = { version = "0.4.1", features = ["serde"] }
+clap.workspace = true
+const_format = {version = "0.2.0", features = ["rust_1_64"]}
+discv5.workspace = true
+eth_trie.workspace = true
 ethereum_hashing = "0.6.0"
-eth_trie = { git = "https://github.com/kolbyml/eth-trie.rs.git", rev = "7947a83091192a7988f359b750b05121d5d7ba8c" }
 ethereum_serde_utils = "0.5.2"
-ethereum_ssz = "0.5.3"
-ethereum_ssz_derive = "0.5.3"
-hex = "0.4.3"
-jsonrpsee = {version="0.20.0", features = ["async-client", "client", "macros", "server"]}
-keccak-hash = "0.10.0"
-lazy_static = "1.4.0"
+ethereum_ssz.workspace = true
+ethereum_ssz_derive.workspace = true
+hex.workspace = true
+jsonrpsee = { workspace = true, features = ["async-client", "client", "macros", "server"]}
+keccak-hash.workspace = true
+lazy_static.workspace = true
 nanotemplate = "0.3.0"
 once_cell = "1.17"
-quickcheck = "1.0.3"
-rand = "0.8.5"
-reth-rpc-types = { rev = "8d1d13ef89cf19459adc37ba0c45e7aac6270dc1", git = "https://github.com/paradigmxyz/reth.git"}
+quickcheck.workspace = true
+rand.workspace = true
+reth-rpc-types.workspace = true
 rlp = "0.5.0"
 rs_merkle = "1.4.2"
 secp256k1 = { version = "0.29.0", features = ["global-context", "recovery", "rand"] }
-serde = { version = "1.0.150", features = ["derive", "rc"] }
-serde_json = "1.0.89"
-serde-this-or-that = "0.4.2"
+serde = { workspace = true, features = ["rc"] }
+serde-this-or-that.workspace = true
+serde_json.workspace = true
 sha2 = "0.10.1"
-sha3 = "0.9.1"
+sha3.workspace = true
+ssz_types.workspace = true
 superstruct = "0.7.0"
-ssz_types = { git = "https://github.com/KolbyML/ssz_types.git", rev = "2a5922de75f00746890bf4ea9ad663c9d5d58efe" }
-thiserror = "1.0.57"
-tree_hash = { git = "https://github.com/KolbyML/tree_hash.git", rev = "8aaf8bb4184148768d48e2cfbbdd0b95d1da8730" }
-tree_hash_derive = { git = "https://github.com/KolbyML/tree_hash.git", rev = "8aaf8bb4184148768d48e2cfbbdd0b95d1da8730" }
-trin-utils = { path = "../trin-utils" }
-tokio = { version = "1.14.0", features = ["full"] }
-ureq = { version = "2.5.0", features = ["json"] }
-url = "2.3.1"
+thiserror.workspace = true
+tokio.workspace = true
+tree_hash.workspace = true
+tree_hash_derive.workspace = true
+trin-utils.workspace = true
+ureq.workspace = true
+url.workspace = true
 validator = { version = "0.13.0", features = ["derive"] }
 
 [dev-dependencies]
-env_logger = "0.9.0"
-quickcheck = "1.0.3"
-rstest = "0.18.2"
-serde_yaml = "0.9"
-snap = "1.1.0"
-test-log = { version = "0.2.11", features = ["trace"] }
-tracing = "0.1.36"
-tracing-subscriber = "0.3.15"
+env_logger.workspace = true
+quickcheck.workspace = true
+rstest.workspace = true
+serde_yaml.workspace = true
+snap.workspace = true
+test-log.workspace = true
+tracing.workspace = true
+tracing-subscriber.workspace = true

ethportal-peertest/Cargo.toml

@@ -11,36 +11,36 @@ description = "Testing utilities for trin"
 authors = ["https://github.com/ethereum/trin/graphs/contributors"]
 
 [dependencies]
-alloy-primitives = "0.7.0"
-alloy-rlp = "0.3.4"
-anyhow = "1.0.68"
-discv5 = { version = "0.4.1", features = ["serde"] }
-ethereum_ssz = "0.5.3"
-ethportal-api = { path="../ethportal-api"}
-futures = "0.3.21"
-hex = "0.4.3"
-hyper = { version = "0.14", features = ["full"] }
-jsonrpsee = {version="0.20.0", features = ["async-client", "client", "macros", "server"]}
-rand = "0.8.4"
-reth-ipc = { tag = "v0.2.0-beta.5", git = "https://github.com/paradigmxyz/reth.git"}
-rpc = { path = "../rpc" }
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0.89"
-serde_yaml = "0.9"
-surf = { version = "2.3.2", default-features = false, features = ["h1-client-rustls", "middleware-logger", "encoding"] } # we use rustls because OpenSSL cause issues compiling on aarch64
-tempfile = "3.3.0"
-tokio = {version = "1.14.0", features = ["full"]}
-tracing = "0.1.36"
-tracing-subscriber = "0.3.15"
-tree_hash = { git = "https://github.com/KolbyML/tree_hash.git", rev = "8aaf8bb4184148768d48e2cfbbdd0b95d1da8730" }
+alloy-primitives.workspace = true
+alloy-rlp.workspace = true
+anyhow.workspace = true
+discv5.workspace = true
+ethereum_ssz.workspace = true
+ethportal-api.workspace = true
+futures.workspace = true
+hex.workspace = true
+hyper = { workspace = true, features = ["full"] }
+jsonrpsee = { workspace = true, features = ["async-client", "client", "macros", "server"]}
+portal-bridge.workspace = true
+rand.workspace = true
+reth-ipc.workspace = true
+rpc.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+serde_yaml.workspace = true
+surf.workspace = true
+tempfile.workspace = true
+tokio.workspace = true
+tracing.workspace = true
+tracing-subscriber.workspace = true
+tree_hash.workspace = true
 trin = { path = ".." }
-portal-bridge = { path = "../portal-bridge" }
-trin-history = { path = "../trin-history" }
-trin-state = { path = "../trin-state" }
-trin-utils = { path = "../trin-utils" }
-trin-validation = { path = "../trin-validation" }
-ureq = { version = "2.5.0", features = ["json"] }
-url = "2.3.1"
+trin-history.workspace = true
+trin-state.workspace = true
+trin-utils.workspace = true
+trin-validation.workspace = true
+ureq.workspace = true
+url.workspace = true
 
 [target.'cfg(windows)'.dependencies]
-uds_windows = "1.0.1"
+uds_windows.workspace = true