chore(workspace): Hoist Dependencies (#466)

* chore(workspace): hoist dependencies to the workspace manifest * test
anton-rs · Aug 30, 2024 · fb88a7a · fb88a7a
1 parent f24e53c
commit fb88a7a
Show file tree

Hide file tree

Showing 11 changed files with 177 additions and 125 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -40,14 +40,59 @@ lto = "fat"
 anyhow = { version = "1.0.86", default-features = false }
 tracing = { version = "0.1.40", default-features = false }
 cfg-if = "1.0.0"
+hashbrown = "0.14.5"
 spin = { version = "0.9.8", features = ["mutex"] }
 lru = "0.12.3"
 async-trait = "0.1.80"
+lazy_static = "1.5.0"
+tracing-loki = "0.2.5"
+reqwest = "0.12"
+os_pipe = "1.2.1"
+actix-web = "4.8.0"
+rand = "0.8.5"
+futures = { version = "0.3.30", default-features = false }
+prometheus = { version = "0.13.4", features = ["process"] }
+tokio = { version = "1.38", features = ["full"] }
+tracing-subscriber = { version = "0.3.18", features = ["fmt"] }
+clap = { version = "4.5.4", features = ["derive", "env"] }
+sha2 = { version = "0.10.8", default-features = false }
+c-kzg = { version = "1.0.2", default-features = false }
+alloc-no-stdlib = "2.0.4"
+linked_list_allocator = "0.10.5"
+command-fds = { version = "0.3", features = ["tokio"] }
+
+# Encoding
+miniz_oxide = "0.8.0"
+brotli = { version = "6.0.0", default-features = false }
+
+# Testing
+proptest = "1.4"
+criterion = { version = "0.5.1", features = ["html_reports"] }
+pprof = { version = "0.13.0", features = ["criterion", "flamegraph", "frame-pointer"] } 
+
+# Serialization
+rkyv = "0.7.44"
+serde = { version = "1.0.203", default-features = false, features = ["derive"] }
+serde_json = { version = "1.0.125", default-features = false }
 
 # Ethereum
+unsigned-varint = "0.8.0"
+revm = { version = "13.0", default-features = false }
+
+# Superchain
+superchain = "0.3.1"
+superchain-primitives = { version = "0.3.1", default-features = false }
+
+# Alloy
+alloy-trie = { version = "0.4.1", default-features = false }
+alloy-provider = { version = "0.2", default-features = false }
 alloy-primitives = { version = "0.7.7", default-features = false }
 alloy-rlp = { version = "0.3.5", default-features = false }
+alloy-rpc-types = { version = "0.2" }
 alloy-consensus = { version = "0.2", default-features = false }
-op-alloy-consensus = { version = "0.1.4", default-features = false }
+alloy-transport = { version = "0.2", default-features = false }
+alloy-transport-http = { version = "0.2" }
 alloy-eips = { version = "0.2", default-features = false }
-revm = { version = "13.0", default-features = false }
+alloy-node-bindings = { version = "0.2", default-features = false }
+alloy-rpc-client = { version = "0.2", default-features = false }
+op-alloy-consensus = { version = "0.1.4", default-features = false }
diff --git a/bin/client/Cargo.toml b/bin/client/Cargo.toml
@@ -9,33 +9,35 @@ homepage.workspace = true
 publish = false
 
 [dependencies]
-# workspace
-cfg-if.workspace = true
+# Workspace
+kona-common = { path = "../../crates/common", version = "0.0.2" }
+kona-common-proc = { path = "../../crates/common-proc", version = "0.0.2" }
+kona-preimage = { path = "../../crates/preimage", version = "0.0.2" }
+kona-mpt = { path = "../../crates/mpt", version = "0.0.2" }
+kona-derive = { path = "../../crates/derive", default-features = false, version = "0.0.2" }
+kona-executor = { path = "../../crates/executor", version = "0.0.1" }
+kona-primitives = { path = "../../crates/primitives", version = "0.0.1", features = ["serde"] }
+
+# Revm + Alloy
+revm.workspace = true
 alloy-primitives.workspace = true
 alloy-consensus.workspace = true
 alloy-rlp.workspace = true
 alloy-eips.workspace = true
 op-alloy-consensus.workspace = true
+
+# General
+cfg-if.workspace = true
 anyhow.workspace = true
 lru.workspace = true
 spin.workspace = true
 async-trait.workspace = true
 tracing.workspace = true
-revm.workspace = true
-serde = { version = "1.0.208", default-features = false, features = ["derive"] }
-serde_json = { version = "1.0.125", default-features = false }
-
-# local
-kona-common = { path = "../../crates/common", version = "0.0.2" }
-kona-common-proc = { path = "../../crates/common-proc", version = "0.0.2" }
-kona-preimage = { path = "../../crates/preimage", version = "0.0.2" }
-kona-mpt = { path = "../../crates/mpt", version = "0.0.2" }
-kona-derive = { path = "../../crates/derive", default-features = false, version = "0.0.2" }
-kona-executor = { path = "../../crates/executor", version = "0.0.1" }
-kona-primitives = { path = "../../crates/primitives", version = "0.0.1", features = ["serde"] }
+serde.workspace = true
+serde_json.workspace = true
 
-# external
-tracing-subscriber = { version = "0.3.18", optional = true }
+# `tracing-subscriber` feature dependencies
+tracing-subscriber = { workspace = true, optional = true }
 
 [features]
 tracing-subscriber = ["dep:tracing-subscriber"]

diff --git a/bin/host/Cargo.toml b/bin/host/Cargo.toml
@@ -9,35 +9,35 @@ homepage.workspace = true
 publish = false
 
 [dependencies]
-# workspace
-anyhow.workspace = true
-tracing.workspace = true
-alloy-primitives = { workspace = true, features = ["serde"] }
-revm = { workspace = true, features = ["std", "c-kzg", "secp256k1", "portable", "blst"] }
-alloy-eips.workspace = true
-alloy-consensus.workspace = true
-alloy-rlp.workspace = true
-async-trait.workspace = true
-
-# local
+# Workspace
 kona-client = { path = "../client", version = "0.1.0" }
 kona-common = { path = "../../crates/common", version = "0.0.2" }
 kona-preimage = { path = "../../crates/preimage", version = "0.0.2" }
 kona-mpt = { path = "../../crates/mpt", version = "0.0.2" }
 kona-primitives = { path = "../../crates/primitives", version = "0.0.1", features = ["online"] }
 kona-derive = { path = "../../crates/derive", version = "0.0.2", features = ["online"] }
 
-# external
-alloy-provider = { version = "0.2" } 
-alloy-transport-http = { version = "0.2" } 
-alloy-rpc-client = { version = "0.2" } 
-alloy-rpc-types = { version = "0.2" } 
-reqwest = "0.12"
-tokio = { version = "1.37.0", features = ["full"] }
-futures = "0.3"
-clap = { version = "4.5.4", features = ["derive", "env"] }
-serde = { version = "1.0.208", features = ["derive"] }
-serde_json = "1.0.125"
-tracing-subscriber = "0.3.18"
-command-fds = { version = "0.3", features = ["tokio"] }
-os_pipe = "1.2.1"
+# Alloy & Revm
+alloy-eips.workspace = true
+alloy-consensus.workspace = true
+alloy-rlp.workspace = true
+alloy-primitives = { workspace = true, features = ["serde"] }
+alloy-provider.workspace = true
+alloy-transport-http.workspace = true 
+alloy-rpc-client.workspace = true 
+alloy-rpc-types.workspace = true
+revm = { workspace = true, features = ["std", "c-kzg", "secp256k1", "portable", "blst"] }
+
+# General
+anyhow.workspace = true
+tracing.workspace = true
+async-trait.workspace = true
+reqwest.workspace = true
+tokio.workspace = true
+futures.workspace = true
+clap.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+tracing-subscriber.workspace = true
+command-fds.workspace = true
+os_pipe.workspace = true
diff --git a/crates/common-proc/Cargo.toml b/crates/common-proc/Cargo.toml
@@ -12,14 +12,14 @@ homepage.workspace = true
 proc-macro = true
 
 [dependencies]
-# workspace
+# General
 anyhow.workspace = true
 cfg-if.workspace = true
 
-# local
+# Workspace
 kona-common = { path = "../common", version = "0.0.2" }
 
-# external (proc macros)
+# Proc Macros
 syn = { version = "2.0", features = ["full"] }
 quote = "1.0"
 proc-macro2 = "1.0"
diff --git a/crates/common/Cargo.toml b/crates/common/Cargo.toml
@@ -9,9 +9,6 @@ repository.workspace = true
 homepage.workspace = true
 
 [dependencies]
-# workspace
 anyhow.workspace = true
 cfg-if.workspace = true
-
-# external
-linked_list_allocator = "0.10.5"
+linked_list_allocator.workspace = true
diff --git a/crates/derive/Cargo.toml b/crates/derive/Cargo.toml
@@ -9,54 +9,52 @@ repository.workspace = true
 homepage.workspace = true
 
 [dependencies]
-# Workspace Alloy Dependencies
+# Alloy
 alloy-eips.workspace = true
 alloy-rlp = { workspace = true, features = ["derive"] }
 alloy-consensus = { workspace = true, features = ["k256"] }
 alloy-primitives = { workspace = true, features = ["rlp", "k256"] }
 op-alloy-consensus = { workspace = true, features = ["k256"] }
 
-# Other Workspace Dependencies
+# General
+hashbrown.workspace = true
+unsigned-varint.workspace = true
+miniz_oxide.workspace = true
+brotli.workspace = true
+alloc-no-stdlib.workspace = true
 lru.workspace = true
 anyhow.workspace = true
 tracing.workspace = true
 async-trait.workspace = true
 
-# Local
+# Workspace
 kona-primitives = { path = "../primitives", version = "0.0.1", default-features = false }
 
-# External
-hashbrown = "0.14.5"
-unsigned-varint = "0.8.0"
-miniz_oxide = "0.8.0"
-brotli = { version = "6.0.0", default-features = false }
-alloc-no-stdlib = "2.0.4"
-
 # `serde` feature dependencies
-serde = { version = "1.0.203", default-features = false, features = ["derive"], optional = true }
+serde = { workspace = true, optional = true }
 
 # `online` feature dependencies
-alloy-transport = { version = "0.2", default-features = false, optional = true }
-alloy-provider = { version = "0.2", default-features = false, optional = true }
-reqwest = { version = "0.12.4", default-features = false, optional = true }
+alloy-transport = { workspace = true, optional = true }
+alloy-provider = { workspace = true, optional = true }
+reqwest = { workspace = true, optional = true }
 
 # `metrics` feature dependencies
-lazy_static = { version = "1.5.0", optional = true }
-prometheus = { version = "0.13.4", features = ["process"], optional = true }
+lazy_static = { workspace = true, optional = true }
+prometheus = { workspace = true, optional = true }
 
 # `test-utils` feature dependencies
 spin = { workspace = true, optional = true }
-tracing-subscriber = { version = "0.3.18", optional = true }
-alloy-node-bindings = { version = "0.2", default-features = false, optional = true }
-alloy-transport-http = { version = "0.2", optional = true } 
-alloy-rpc-client = { version = "0.2", default-features = false, optional = true }
+alloy-rpc-client = { workspace = true, optional = true }
+tracing-subscriber = { workspace = true, optional = true }
+alloy-node-bindings = { workspace = true, optional = true }
+alloy-transport-http = { workspace = true, optional = true } 
 
 [dev-dependencies]
-tokio = { version = "1.38", features = ["full"] }
-proptest = "1.4.0"
-tracing-subscriber = "0.3.18"
-alloy-node-bindings = { version = "0.2", default-features = false }
-serde_json = { version = "1.0.117", default-features = false }
+tokio.workspace = true
+proptest.workspace = true
+tracing-subscriber.workspace = true
+alloy-node-bindings.workspace = true
+serde_json.workspace = true
 
 [features]
 default = ["serde"]

diff --git a/crates/executor/Cargo.toml b/crates/executor/Cargo.toml
@@ -9,7 +9,7 @@ repository.workspace = true
 homepage.workspace = true
 
 [dependencies]
-# workspace
+# General
 anyhow.workspace = true
 tracing.workspace = true
 alloy-primitives = { workspace = true, features = ["rlp"] }
@@ -18,17 +18,17 @@ alloy-consensus.workspace = true
 op-alloy-consensus.workspace = true
 revm = { workspace = true, features = ["optimism"] }
 
-# local
+# Workspace
 kona-mpt = { path = "../mpt", version = "0.0.2" }
 kona-primitives = { path = "../primitives", version = "0.0.1", default-features = false }
 
 [dev-dependencies]
 alloy-rlp.workspace = true
-serde = { version = "1.0.197", features = ["derive"] }
-serde_json = "1.0.117"
-rand = "0.8.5"
-criterion = { version = "0.5.1", features = ["html_reports"] }
-pprof = { version = "0.13.0", features = ["criterion", "flamegraph", "frame-pointer"] } 
+serde.workspace = true
+serde_json.workspace = true
+rand.workspace = true
+criterion.workspace = true
+pprof.workspace = true 
 
 [[bench]]
 name = "execution"

diff --git a/crates/mpt/Cargo.toml b/crates/mpt/Cargo.toml
@@ -18,22 +18,23 @@ alloy-consensus.workspace = true
 revm.workspace = true
 
 # External
-alloy-trie = { version = "0.4.1", default-features = false }
+alloy-trie.workspace = true
 
 [dev-dependencies]
+tokio.workspace = true
+reqwest.workspace = true
+futures.workspace = true
+tracing-subscriber.workspace = true
+
 alloy-consensus.workspace = true
-tokio = { version = "1.38.0", features = ["full"] }
-alloy-provider = { version = "0.2" }
-alloy-rpc-types = { version = "0.2" }
-alloy-transport-http = { version = "0.2" }
-reqwest = "0.12.4"
-tracing-subscriber = "0.3.18"
-futures = { version = "0.3.30", default-features = false }
+alloy-provider.workspace = true
+alloy-rpc-types.workspace = true
+alloy-transport-http.workspace = true
 
-proptest = "1.4"
-rand = "0.8.5"
-criterion = { version = "0.5.1", features = ["html_reports"] }
-pprof = { version = "0.13.0", features = ["criterion", "flamegraph", "frame-pointer"] } 
+rand.workspace = true
+proptest.workspace = true
+criterion.workspace = true
+pprof.workspace = true
 
 [[bench]]
 name = "trie_node"

diff --git a/crates/preimage/Cargo.toml b/crates/preimage/Cargo.toml
@@ -9,20 +9,24 @@ repository.workspace = true
 homepage.workspace = true
 
 [dependencies]
-# workspace
+# General
 anyhow.workspace = true
 tracing.workspace = true
 alloy-primitives.workspace = true
 async-trait.workspace = true
 
-# local
+# Workspace
 kona-common = { path = "../common", version = "0.0.2" }
-rkyv = { version = "0.7.44", optional = true }
-serde = { version = "1.0.203", features = ["derive"], optional = true }
+
+# `rkyv` feature dependencies
+rkyv = { workspace = true, optional = true }
+
+# `serde` feature dependencies
+serde = { workspace = true, optional = true }
 
 [dev-dependencies]
-tokio = { version = "1.38.0", features = ["full"] }
-os_pipe = "1.2.1"
+tokio.workspace = true
+os_pipe.workspace = true
 
 [features]
 default = []