build(workspace): use workspace dependency imports for legibility

Cargo.toml

@@ -14,26 +14,49 @@ clap = { version = "4.4.10", features = ["derive"] }
 criterion = { version = "0.5.1", features = ["html_reports"] }
 dotenv = "0.15.0"
 dotenvy = "0.15.7"
+env_logger = "0.11.2"
+ethereum-types = "=0.14.1"
 ethportal-api = { git = "https://github.com/ethereum/trin.git", version = "0.2.2", tag = "v0.1.0-alpha.35" }
 futures = "0.3.31"
 hex = "0.4.3"
 http = "1.1.0"
 insta = "1.39.0"
+log = "0.4.20"
 merkle_proof = { git = "https://github.com/semiotic-ai/lighthouse.git", branch = "stable" }
+object_store = { version = "0.9.0", features = ["gcp", "http", "aws"] }
 once_cell = "1.20.2"
 primitive-types = "0.12.2"
+prost = "0.13.1"
+prost-build = "0.13.1"
+prost-types = "0.13.1"
+prost-wkt = "0.6.0"
+prost-wkt-types = "0.6.0"
+prost-wkt-build = "0.6.0"
+rand = "0.8.5"
+rayon = "1.8.0"
 reqwest = { version = "0.12.8", features = ["json"] }
+reth-primitives = { git = "https://github.com/paradigmxyz/reth", version = "1.0.1", tag = "v1.0.1" }
+reth-trie-common = { git = "https://github.com/paradigmxyz/reth", version = "1.0.1", tag = "v1.0.1" }
+revm-primitives = "=6.0.0"
+rlp = "0.5.2"
 rustls = { version = "0.23.12", features = ["ring"] }
-serde = { version = "1.0.208", features = ["derive"] }
+serde = "1.0.208"
 serde_derive = "1.0.208"
 serde_json = "1.0.127"
+simple-log = "1.6.0"
+ssz_types = "0.6"
+tempfile = "3.0"
 thiserror = "1.0.63"
 tokio = "1.39.2"
 tokio-stream = "0.1.16"
 tokio-test = "0.4.3"
 tonic = "0.12.0"
+tonic-build = "0.12.0"
 tree_hash = "0.6.0"
+trin-validation = { git = "https://github.com/ethereum/trin.git", version = "0.1.0", tag = "v0.1.0-alpha.35" }
 types = { git = "https://github.com/semiotic-ai/lighthouse.git", branch = "stable" }
+url = "2.5"
+zstd = "0.13.0"
 
 [profile.dev.build-override]
 opt-level = 3

crates/firehose-client/Cargo.toml

@@ -16,7 +16,7 @@ futures.workspace = true
 http.workspace = true
 once_cell.workspace = true
 rustls.workspace = true
-serde.workspace = true
+serde = { workspace = true, features = ["derive"] }
 serde_derive.workspace = true
 thiserror.workspace = true
 tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }

crates/flat-files-decoder/Cargo.toml

@@ -6,29 +6,27 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-sf-protos = { path = "../sf-protos" }
 alloy-primitives.workspace = true
-
-alloy-rlp = "0.3.7"
-bincode = "1.3.3"
-clap = { version = "4.3.21", features = ["derive"] }
-prost = "0.13.1"
-prost-types = "0.13.1"
-rand = "0.8.5"
-rayon = "1.8.0"
-reth-primitives = { git = "https://github.com/paradigmxyz/reth", version = "1.0.1", tag = "v1.0.1" }
-reth-trie-common = { git = "https://github.com/paradigmxyz/reth", version = "1.0.1", tag = "v1.0.1" }
-revm-primitives = "=6.0.0"
-serde = { version = "1.0.196", features = ["derive"] }
-serde_json = "1.0.108"
-simple-log = "1.6.0"
-thiserror = "1.0.44"
-tokio = { version = "1.35.0", features = ["full"] }
-zstd = "0.13.0"
+alloy-rlp.workspace = true
+bincode.workspace = true
+clap.workspace = true
+prost.workspace = true
+rand.workspace = true
+rayon.workspace = true
+reth-primitives.workspace = true
+reth-trie-common.workspace = true
+revm-primitives.workspace = true
+serde = { workspace = true, features = ["derive"] }
+serde_json.workspace = true
+sf-protos = { path = "../sf-protos" }
+simple-log.workspace = true
+thiserror.workspace = true
+tokio = { workspace = true, features = ["full"] }
+zstd.workspace = true
 
 [dev-dependencies]
-criterion = { version = "0.5.1", features = ["html_reports"] }
-tokio-test = "0.4.3"
+criterion.workspace = true
+tokio-test.workspace = true
 
 [[bench]]
 name = "decoder"
@@ -38,7 +36,6 @@ harness = false
 name = "stream_blocks"
 harness = false
 
-
 [build-dependencies]
-prost-build = "0.13.1"
-prost-wkt-build = "0.6.0"
+prost-build.workspace = true
+prost-wkt-build.workspace = true

crates/flat-head/Cargo.toml

@@ -6,21 +6,21 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-sf-protos = { path = "../sf-protos" }
-anyhow = "1"
-bincode = "1.3.3"
-bytes = "1.5"
-clap = { version = "4.3.21", features = ["derive"] }
+anyhow.workspace = true
+bincode.workspace = true
+bytes.workspace = true
+clap.workspace = true
 decoder = { path = "../flat-files-decoder" }
-dotenv = "0.15.0"
-env_logger = "0.11.2"
-futures = "0.3"
+dotenv.workspace = true
+env_logger.workspace = true
+futures.workspace = true
 header_accumulator = { path = "../header-accumulator" }
-log = "0.4.20"
-object_store = { version = "0.9.0", features = ["gcp", "http", "aws"] }
-thiserror = "1"
-tokio = { version = "1.0", features = ["full"] }
-tree_hash = { git = "https://github.com/KolbyML/tree_hash.git", rev = "8aaf8bb4184148768d48e2cfbbdd0b95d1da8730" }
-trin-validation = { git = "https://github.com/ethereum/trin.git", version = "0.1.0", tag = "v0.1.0-alpha.35" }
-url = "2.5"
-zstd = "0.13.0"
+log.workspace = true
+object_store.workspace = true
+sf-protos = { path = "../sf-protos" }
+thiserror.workspace = true
+tokio = { workspace = true, features = ["full"] }
+tree_hash.workspace = true
+trin-validation.workspace = true
+url.workspace = true
+zstd.workspace = true

crates/forrestrie/Cargo.toml

@@ -13,16 +13,16 @@ name = "forrestrie"
 path = "src/main.rs"
 
 [dependencies]
-firehose-client = { path = "../firehose-client" }
 merkle_proof.workspace = true
 primitive-types.workspace = true
-serde.workspace = true
+serde = { workspace = true, features = ["derive"] }
+sf-protos = { path = "../sf-protos" }
 tree_hash.workspace = true
 types.workspace = true
-sf-protos = { path = "../sf-protos" }
 
 [dev-dependencies]
+firehose-client = { path = "../firehose-client" }
 insta.workspace = true
 reqwest.workspace = true
 serde_json.workspace = true
-tokio.workspace = true
+tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }

crates/header-accumulator/Cargo.toml

@@ -6,24 +6,22 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-sf-protos = { path = "../sf-protos" }
-
+alloy-primitives.workspace = true
+base64.workspace = true
+clap.workspace = true
+env_logger.workspace = true
+ethereum-types.workspace = true
 ethportal-api.workspace = true
+log.workspace = true
 primitive-types.workspace = true
-serde.workspace = true
+rlp.workspace = true
+serde = { workspace = true, features = ["derive"] }
 serde_json.workspace = true
-
-alloy-primitives = "=0.7.7"
-base64 = "0.21.7"
-clap = { version = "4.4.10", features = ["derive"] }
-env_logger = "0.10.1"
-ethereum-types = "=0.14.1"
-log = "0.4.20"
-rlp = "0.5.2"
+sf-protos = { path = "../sf-protos" }
 # Needs to match that transitively depended on by trin-validation
 tree_hash = { git = "https://github.com/KolbyML/tree_hash.git", rev = "8aaf8bb4184148768d48e2cfbbdd0b95d1da8730" }
-trin-validation = { git = "https://github.com/ethereum/trin.git", version = "0.1.0", tag = "v0.1.0-alpha.35" }
+trin-validation.workspace = true
 
 [dev-dependencies]
 decoder = { path = "../flat-files-decoder" }
-tempfile = "3.0"
+tempfile.workspace = true

crates/sf-protos/Cargo.toml

@@ -10,23 +10,22 @@ path = "src/lib.rs"
 [dependencies]
 alloy-primitives.workspace = true
 bls.workspace = true
+ethportal-api.workspace = true
 primitive-types.workspace = true
+prost.workspace = true
+prost-wkt.workspace = true
+prost-wkt-types.workspace = true
+reth-primitives = { git = "https://github.com/paradigmxyz/reth", version = "1.0.1", tag = "v1.0.1" }
+serde.workspace = true
+ssz_types.workspace = true
 thiserror.workspace = true
 tonic.workspace = true
 types.workspace = true
 
-ethportal-api = { git = "https://github.com/ethereum/trin.git", version = "0.2.2", tag = "v0.1.0-alpha.35" }
-prost = "0.13.1"
-prost-wkt = "0.6.0"
-prost-wkt-types = "0.6.0"
-reth-primitives = { git = "https://github.com/paradigmxyz/reth", version = "1.0.1", tag = "v1.0.1" }
-serde = "1.0.196"
-ssz_types = "0.6"
-
 [dev-dependencies]
-hex = "0.4.3"
-serde_json = "1.0.127"
+hex.workspace = true
+serde_json.workspace = true
 
 [build-dependencies]
-prost-build = "0.13.1"
-tonic-build = "0.12.0"
+prost-build.workspace = true
+tonic-build.workspace = true