From 6d6f010a0e3a005c6ac093354f13cbd6af5f3ac6 Mon Sep 17 00:00:00 2001
From: refcell <abigger87@gmail.com>
Date: Fri, 18 Oct 2024 22:48:20 -0400
Subject: [PATCH] chore: re-org imports

---
 Cargo.lock                                  | 68 ++++++++++-----------
 Cargo.toml                                  | 67 ++++++++++----------
 bin/client/Cargo.toml                       | 40 ++++++------
 bin/client/src/l2/chain_provider.rs         |  1 -
 bin/host/Cargo.toml                         | 28 +++++----
 crates/common-proc/Cargo.toml               |  2 +-
 crates/common/Cargo.toml                    |  2 +-
 crates/derive/Cargo.toml                    | 36 +++++------
 crates/derive/src/batch/span_batch/batch.rs |  3 -
 crates/derive/src/stages/batch_queue.rs     |  2 -
 crates/executor/Cargo.toml                  | 26 +++++---
 crates/mpt/Cargo.toml                       | 27 ++++----
 crates/preimage/Cargo.toml                  |  8 +--
 crates/providers-alloy/Cargo.toml           | 12 ++--
 crates/providers/Cargo.toml                 |  2 +-
 15 files changed, 167 insertions(+), 157 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 86f0eba281..d3f63e806b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -64,9 +64,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-consensus"
-version = "0.5.0"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8628f840dfddef51520dc2d5694e14e1d2098069de4ad9812964adb8309c1dc4"
+checksum = "42642aed67f938363d9c7543e5ca4163cfb4205d9ec15fe933dc4e865d2932dd"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -103,9 +103,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-eips"
-version = "0.5.0"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6a888c285255f82a60acecd06a719b84057d233ae281220532a8633e9220574"
+checksum = "9fbc52a30df46f9831ed74557dfad0d94b12420393662a8b9ef90e2d6c8cb4b0"
 dependencies = [
  "alloy-eip2930",
  "alloy-eip7702",
@@ -121,9 +121,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-genesis"
-version = "0.5.0"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "635d51aabd49374a3f2276acb4029fbc54c7436c69e4ee8a2c900ba7bbf03891"
+checksum = "0787d1688b9806290313cc335d416cc7ee39b11e3245f3d218544c62572d92ba"
 dependencies = [
  "alloy-primitives",
  "alloy-serde",
@@ -132,9 +132,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-json-rpc"
-version = "0.5.0"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed9e5a6ea33a1b9c83c699f1cb476196e003d3b25d5afdd00b582655486b02ff"
+checksum = "d55a16a5f9ca498a217c060414bcd1c43e934235dc8058b31b87dcd69ff4f105"
 dependencies = [
  "alloy-primitives",
  "alloy-sol-types",
@@ -146,9 +146,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-network"
-version = "0.5.0"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1127a67e9995b8a33d06af5a06b79a87bc57e4f61276f21da5c5ed22afe3161"
+checksum = "3d236a8c3e1d5adc09b1b63c81815fc9b757d9a4ba9482cc899f9679b55dd437"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -167,9 +167,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-network-primitives"
-version = "0.5.0"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efde0a98f2bd155538273430d6a50888544fe7c0df53b37bf8acf68805f4aa2a"
+checksum = "cd15a0990fa8a56d85a42d6a689719aa4eebf5e2f1a5c5354658c0bfc52cac9a"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -180,9 +180,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-node-bindings"
-version = "0.5.0"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bcdf1fae99f4991dd5e843a49937d493573f2ccafa8e8ddb185b00042906c20"
+checksum = "2249f3c3ce446cf4063fe3d1aa7530823643c2706a1cc63045e0683ebc497a0a"
 dependencies = [
  "alloy-genesis",
  "alloy-primitives",
@@ -228,9 +228,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-provider"
-version = "0.5.0"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28c67843e23cbf540e04cf5ea717f03d08d58299eaebaefbcc549f4e74b3e272"
+checksum = "316f522bb6f9ac3805132112197957013b570e20cfdad058e8339dae6030c849"
 dependencies = [
  "alloy-chains",
  "alloy-consensus",
@@ -287,9 +287,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-client"
-version = "0.5.0"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "559c7a1056576ab63b2ba371ce8a066765509423531c0231a8a0d1c81457a5e7"
+checksum = "5b2ab59712c594c9624aaa69e38e4d38f180cb569f1fa46cdaf8c21fd50793e5"
 dependencies = [
  "alloy-json-rpc",
  "alloy-primitives",
@@ -310,9 +310,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types"
-version = "0.5.0"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ff2186aa29bb0d5eb1e7239625b3553d0a6eff7194531c4a73210a284dbc2be"
+checksum = "ba21284319e12d053baa204d438db6c1577aedd94c1298e4becefdac1f9cec87"
 dependencies = [
  "alloy-primitives",
  "alloy-rpc-types-eth",
@@ -322,9 +322,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types-engine"
-version = "0.5.0"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6bbb60e151977865c3edd9b9a27b50c292da66e286fae461053ff9b2c6175ef"
+checksum = "44848fced3b42260b9cb61f22102246636dfe5a2d0132f8d10a617df3cb1a74b"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -338,9 +338,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types-eth"
-version = "0.5.0"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd7bc4a8d5a4a33168e35535ef261a408e0c72c17f469bcb1eae4c852734ba0f"
+checksum = "35894711990019fafff0012b82b9176cbb744516eb2a9bbe6b8e5cae522163ee"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -357,9 +357,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-serde"
-version = "0.5.0"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5b06099d7f448b55a418289d2d642f5e38c0207fc188c9cd7afe44382218a20"
+checksum = "2843c195675f06b29c09a4315cccdc233ab5bdc7c0a3775909f9f0cab5e9ae0f"
 dependencies = [
  "alloy-primitives",
  "serde",
@@ -368,9 +368,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-signer"
-version = "0.5.0"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bea89fb419de02a0e5222c0452b77701c5b52af74ec35334ac59e7b2b1a86c0f"
+checksum = "88b2a00d9803dfef99963303ffe41a7bf2221f3342f0a503d6741a9f4a18e5e5"
 dependencies = [
  "alloy-primitives",
  "async-trait",
@@ -440,9 +440,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-transport"
-version = "0.5.0"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac1c13d075c204fa4a3cba2a93555f9f5784a7412c1dbd3e4b652c29453d5dd2"
+checksum = "9dc2c8f6b8c227ef0398f702d954c4ab572c2ead3c1ed4a5157aa1cbaf959747"
 dependencies = [
  "alloy-json-rpc",
  "base64",
@@ -460,9 +460,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-transport-http"
-version = "0.5.0"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0038d95aaef539d9aed586d662914b232bd49ba9b4133670e514f5bb6d432bb"
+checksum = "dd328e990d57f4c4e63899fb2c26877597d6503f8e0022a3d71b2d753ecbfc0c"
 dependencies = [
  "alloy-json-rpc",
  "alloy-transport",
@@ -3744,9 +3744,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.129"
+version = "1.0.131"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6dbcf9b78a125ee667ae19388837dd12294b858d101fdd393cb9d5501ef09eb2"
+checksum = "67d42a0bd4ac281beff598909bb56a86acaf979b84483e1c79c10dcaf98f8cf3"
 dependencies = [
  "indexmap",
  "itoa",
diff --git a/Cargo.toml b/Cargo.toml
index 26fe27dc74..371bfbe48f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,11 +1,10 @@
 [workspace.package]
-version = "0.0.0"
 edition = "2021"
 license = "MIT"
 rust-version = "1.81"
 authors = ["clabby", "refcell"]
-repository = "https://github.com/anton-rs/kona"
 homepage = "https://github.com/anton-rs/kona"
+repository = "https://github.com/anton-rs/kona"
 keywords = ["ethereum", "optimism", "crypto"]
 categories = ["cryptography", "cryptography::cryptocurrencies"]
 exclude = ["**/target"]
@@ -66,12 +65,6 @@ kona-providers = { path = "crates/providers", version = "0.0.1", default-feature
 kona-common-proc = { path = "crates/common-proc", version = "0.0.3", default-features = false }
 kona-providers-alloy = { path = "crates/providers-alloy", version = "0.0.1", default-features = false }
 
-# OP Alloy
-op-alloy-genesis = { version = "0.5.0", default-features = false }
-op-alloy-protocol = { version = "0.5.0", default-features = false }
-op-alloy-consensus = { version = "0.5.0", default-features = false }
-op-alloy-rpc-types-engine = { version = "0.5.0", default-features = false }
-
 # Alloy
 alloy-rlp = { version = "0.3.8", default-features = false }
 alloy-trie = { version = "0.7.2", default-features = false }
@@ -87,54 +80,60 @@ alloy-node-bindings = { version = "0.5.0", default-features = false }
 alloy-transport-http = { version = "0.5.0", default-features = false }
 alloy-rpc-types-engine = { version = "0.5.0", default-features = false }
 
-# General
-anyhow = { version = "1.0.89", default-features = false }
+# OP Alloy
+op-alloy-genesis = { version = "0.5.0", default-features = false }
+op-alloy-protocol = { version = "0.5.0", default-features = false }
+op-alloy-consensus = { version = "0.5.0", default-features = false }
+op-alloy-rpc-types-engine = { version = "0.5.0", default-features = false }
+
+# thiserror with `no_std` support
 thiserror = { git = "https://github.com/quartiq/thiserror", branch = "no-std", default-features = false }
-cfg-if = "1.0.0"
-spin = { version = "0.9.8", features = ["mutex"] }
+
+# General
 lru = "0.12.4"
-async-trait = "0.1.83"
-lazy_static = "1.5.0"
-reqwest = "0.12"
-os_pipe = "1.2.1"
-actix-web = "4.9.0"
+spin = "0.9.8"
 rand = "0.8.5"
-futures = { version = "0.3.30", default-features = false }
-prometheus = { version = "0.13.4", features = ["process"] }
-tokio = { version = "1.40", features = ["full"] }
-clap = { version = "4.5.19", features = ["derive", "env"] }
-sha2 = { version = "0.10.8", default-features = false }
-c-kzg = { version = "1.0.3", default-features = false }
+clap = "4.5.19"
+tokio = "1.40.0"
+cfg-if = "1.0.0"
+os_pipe = "1.2.1"
+reqwest = "0.12.8"
+command-fds = "0.3.0"
+prometheus = "0.13.4"
+lazy_static = "1.5.0"
+async-trait = "0.1.83"
 alloc-no-stdlib = "2.0.4"
 linked_list_allocator = "0.10.5"
-command-fds = { version = "0.3", features = ["tokio"] }
-derive_more = { version = "1.0.0", default-features = false, features = ["full"] }
+
+# General
+sha2 = { version = "0.10.8", default-features = false }
+c-kzg = { version = "1.0.3", default-features = false }
+anyhow = { version = "1.0.89", default-features = false }
+futures = { version = "0.3.30", default-features = false }
+derive_more = { version = "1.0.0", default-features = false }
 
 # Tracing
-tracing = { version = "0.1.40", default-features = false }
 tracing-loki = "0.2.5"
-tracing-subscriber = { version = "0.3.18", features = ["fmt"] }
+tracing-subscriber = "0.3.18"
+tracing = { version = "0.1.40", default-features = false }
 
 # Encoding
 miniz_oxide = "0.8.0"
 brotli = { version = "7.0.0", default-features = false }
 
 # Testing
+pprof = "0.13.0" 
 proptest = "1.5"
-criterion = { version = "0.5.1", features = ["html_reports"] }
-pprof = { version = "0.13.0", features = ["criterion", "flamegraph", "frame-pointer"] } 
+criterion = "0.5.1"
 
 # Serialization
 rkyv = "0.8.8"
-serde = { version = "1.0.210", default-features = false, features = ["derive"] }
+serde = { version = "1.0.210", default-features = false }
 serde_json = { version = "1.0.128", default-features = false }
 
 # Ethereum
 unsigned-varint = "0.8.0"
 revm = { version = "16.0.0", default-features = false }
 
-# Optimism
-superchain = { version = "0.7", default-features = false }
-
 # K/V database
-rocksdb = { version = "0.22", default-features = false, features = ["snappy"] }
+rocksdb = { version = "0.22", default-features = false }
diff --git a/bin/client/Cargo.toml b/bin/client/Cargo.toml
index ffe47631d1..b7f8f5b196 100644
--- a/bin/client/Cargo.toml
+++ b/bin/client/Cargo.toml
@@ -1,47 +1,51 @@
 [package]
 name = "kona-client"
 version = "0.1.0"
+publish = false
 edition.workspace = true
 authors.workspace = true
 license.workspace = true
-repository.workspace = true
 homepage.workspace = true
-publish = false
+repository.workspace = true
 
 [dependencies]
 # Workspace
-kona-common.workspace = true
-kona-common-proc.workspace = true
-kona-preimage.workspace = true
 kona-mpt.workspace = true
+kona-common.workspace = true
 kona-derive.workspace = true
+kona-preimage.workspace = true
 kona-executor.workspace = true
 kona-providers.workspace = true
-op-alloy-genesis = { workspace = true, features = ["serde"] }
-op-alloy-protocol.workspace = true
-op-alloy-rpc-types-engine.workspace = true
-alloy-rpc-types-engine.workspace = true
+kona-common-proc.workspace = true
 
-# Revm + Alloy
-revm.workspace = true
-alloy-primitives.workspace = true
-alloy-consensus.workspace = true
+# Alloy
 alloy-rlp.workspace = true
 alloy-eips.workspace = true
+alloy-consensus.workspace = true
+alloy-primitives.workspace = true
+alloy-rpc-types-engine.workspace = true
+
+# Op Alloy
+op-alloy-protocol.workspace = true
 op-alloy-consensus.workspace = true
+op-alloy-rpc-types-engine.workspace = true
+op-alloy-genesis = { workspace = true, features = ["serde"] }
+
+# Revm
+revm.workspace = true
 
 # General
-cfg-if.workspace = true
-anyhow.workspace = true
 lru.workspace = true
 spin.workspace = true
-async-trait.workspace = true
-tracing.workspace = true
 serde.workspace = true
+cfg-if.workspace = true
+anyhow.workspace = true
+tracing.workspace = true
 serde_json.workspace = true
+async-trait.workspace = true
 
 # `tracing-subscriber` feature dependencies
-tracing-subscriber = { workspace = true, optional = true }
+tracing-subscriber = { workspace = true, optional = true, features = ["fmt"] }
 
 [features]
 tracing-subscriber = ["dep:tracing-subscriber"]
diff --git a/bin/client/src/l2/chain_provider.rs b/bin/client/src/l2/chain_provider.rs
index b7d8ca9722..8055d7c984 100644
--- a/bin/client/src/l2/chain_provider.rs
+++ b/bin/client/src/l2/chain_provider.rs
@@ -112,7 +112,6 @@ impl<T: CommsClient + Send + Sync> L2ChainProvider for OracleL2ChainProvider<T>
                     .rollup_config
                     .is_canyon_active(timestamp)
                     .then(Vec::new),
-                requests: None,
             },
         };
         Ok(optimism_block)
diff --git a/bin/host/Cargo.toml b/bin/host/Cargo.toml
index 9ba44974c4..2ae2bb7c98 100644
--- a/bin/host/Cargo.toml
+++ b/bin/host/Cargo.toml
@@ -20,33 +20,37 @@ kona-common.workspace = true
 kona-preimage.workspace = true
 kona-providers-alloy.workspace = true
 
-# Alloy & Revm
-alloy-eips.workspace = true
-alloy-consensus.workspace = true
+# Alloy
 alloy-rlp.workspace = true
+alloy-eips.workspace = true
 alloy-provider.workspace = true
-alloy-transport-http.workspace = true 
+alloy-consensus.workspace = true
 alloy-rpc-client.workspace = true 
+alloy-transport-http.workspace = true 
 alloy-rpc-types = { workspace = true, features = ["eth"] }
 alloy-primitives = { workspace = true, features = ["serde"] }
+
+# Op Alloy
 op-alloy-genesis = { workspace = true, features = ["std", "serde"] }
 op-alloy-protocol = { workspace = true, features = ["std", "serde"] }
+
+# Revm
 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
-rocksdb.workspace = true
+serde_json.workspace = true
+async-trait.workspace = true
+tokio = { workspace = true, features = ["full"] }
+serde = { workspace = true, features = ["derive"] }
+rocksdb = { workspace = true, features = ["snappy"] }
+command-fds = { workspace = true, features = ["tokio"] }
+clap = { workspace = true, features = ["derive", "env"] }
+tracing-subscriber = { workspace = true, features = ["fmt"] }
 
 [dev-dependencies]
 proptest.workspace = true
diff --git a/crates/common-proc/Cargo.toml b/crates/common-proc/Cargo.toml
index becf9ce300..f0accccc88 100644
--- a/crates/common-proc/Cargo.toml
+++ b/crates/common-proc/Cargo.toml
@@ -20,6 +20,6 @@ cfg-if.workspace = true
 kona-common.workspace = true
 
 # Proc Macros
-syn = { version = "2.0", features = ["full"] }
 quote = "1.0"
 proc-macro2 = "1.0"
+syn = { version = "2.0", features = ["full"] }
diff --git a/crates/common/Cargo.toml b/crates/common/Cargo.toml
index c6d85d2c2d..1e7e243526 100644
--- a/crates/common/Cargo.toml
+++ b/crates/common/Cargo.toml
@@ -12,6 +12,6 @@ homepage.workspace = true
 workspace = true
 
 [dependencies]
-thiserror.workspace = true
 cfg-if.workspace = true
+thiserror.workspace = true
 linked_list_allocator.workspace = true
diff --git a/crates/derive/Cargo.toml b/crates/derive/Cargo.toml
index 4a9b1655e4..417144be81 100644
--- a/crates/derive/Cargo.toml
+++ b/crates/derive/Cargo.toml
@@ -14,54 +14,56 @@ workspace = true
 [dependencies]
 # Alloy
 alloy-eips.workspace = true
+alloy-rpc-types-engine.workspace = true
 alloy-rlp = { workspace = true, features = ["derive"] }
 alloy-consensus = { workspace = true, features = ["k256"] }
 alloy-primitives = { workspace = true, features = ["rlp", "k256", "map"] }
-alloy-rpc-types-engine.workspace = true
-op-alloy-consensus = { workspace = true, features = ["k256"] }
-op-alloy-protocol.workspace = true
+
+# Op Alloy
 op-alloy-genesis.workspace = true
+op-alloy-protocol.workspace = true
 op-alloy-rpc-types-engine.workspace = true
+op-alloy-consensus = { workspace = true, features = ["k256"] }
 
 # General
-unsigned-varint.workspace = true
-miniz_oxide.workspace = true
 brotli.workspace = true
-alloc-no-stdlib.workspace = true
-thiserror.workspace = true
 tracing.workspace = true
+thiserror.workspace = true
+miniz_oxide.workspace = true
 async-trait.workspace = true
+unsigned-varint.workspace = true
+alloc-no-stdlib.workspace = true
 
 # Workspace
 kona-providers.workspace = true
 
 # `serde` feature dependencies
-serde = { workspace = true, optional = true }
+serde = { workspace = true, optional = true, features = ["derive"] }
 
 # `metrics` feature dependencies
 lazy_static = { workspace = true, optional = true }
-prometheus = { workspace = true, optional = true }
+prometheus = { workspace = true, optional = true, features = ["process"] }
 
 # `test-utils` feature dependencies
 spin = { workspace = true, optional = true }
+anyhow = { workspace = true, 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 } 
-anyhow = { workspace = true, optional = true }
+tracing-subscriber = { workspace = true, optional = true, features = ["fmt"] }
 
 [dev-dependencies]
 spin.workspace = true
 anyhow.workspace = true
-alloy-rpc-client.workspace = true
-alloy-transport-http.workspace = true
-alloy-primitives = { workspace = true, features = ["rlp", "k256", "map", "arbitrary"] }
-tokio.workspace = true
 proptest.workspace = true
-tracing-subscriber.workspace = true
-alloy-node-bindings.workspace = true
 serde_json.workspace = true
+alloy-rpc-client.workspace = true
+alloy-node-bindings.workspace = true
+alloy-transport-http.workspace = true
+tokio = { workspace = true, features = ["full"] }
+tracing-subscriber = { workspace = true, features = ["fmt"] }
 kona-providers = { workspace = true, features = ["test-utils"] }
+alloy-primitives = { workspace = true, features = ["rlp", "k256", "map", "arbitrary"] }
 
 [features]
 default = ["serde"]
diff --git a/crates/derive/src/batch/span_batch/batch.rs b/crates/derive/src/batch/span_batch/batch.rs
index 5795240aa4..5cdfb5ef80 100644
--- a/crates/derive/src/batch/span_batch/batch.rs
+++ b/crates/derive/src/batch/span_batch/batch.rs
@@ -1459,7 +1459,6 @@ mod tests {
                 transactions: Vec::new(),
                 ommers: Vec::new(),
                 withdrawals: None,
-                requests: None,
             },
         };
         let mut fetcher = TestL2ChainProvider {
@@ -1534,7 +1533,6 @@ mod tests {
                 transactions: Vec::new(),
                 ommers: Vec::new(),
                 withdrawals: None,
-                requests: None,
             },
         };
         let mut fetcher = TestL2ChainProvider {
@@ -1611,7 +1609,6 @@ mod tests {
                 transactions: Vec::new(),
                 ommers: Vec::new(),
                 withdrawals: None,
-                requests: None,
             },
         };
         let mut fetcher = TestL2ChainProvider {
diff --git a/crates/derive/src/stages/batch_queue.rs b/crates/derive/src/stages/batch_queue.rs
index 8b1baf3cd2..d20340c5bd 100644
--- a/crates/derive/src/stages/batch_queue.rs
+++ b/crates/derive/src/stages/batch_queue.rs
@@ -1076,7 +1076,6 @@ mod tests {
                 transactions: batch_txs,
                 ommers: Vec::new(),
                 withdrawals: None,
-                requests: None,
             },
         };
         let second = OpBlock {
@@ -1085,7 +1084,6 @@ mod tests {
                 transactions: second_batch_txs,
                 ommers: Vec::new(),
                 withdrawals: None,
-                requests: None,
             },
         };
         let fetcher = TestL2ChainProvider {
diff --git a/crates/executor/Cargo.toml b/crates/executor/Cargo.toml
index eaadf5be1b..45f5b693d6 100644
--- a/crates/executor/Cargo.toml
+++ b/crates/executor/Cargo.toml
@@ -12,29 +12,35 @@ homepage.workspace = true
 workspace = true
 
 [dependencies]
-# General
-thiserror.workspace = true
-tracing.workspace = true
-alloy-primitives = { workspace = true, features = ["rlp"] }
+# Workspace
+kona-mpt.workspace = true
+
+# Alloy
 alloy-eips.workspace = true
 alloy-consensus = { workspace = true, features = ["k256"] }
+alloy-primitives = { workspace = true, features = ["rlp"] }
+
+# Op Alloy
 op-alloy-consensus.workspace = true
 op-alloy-genesis.workspace = true
 op-alloy-rpc-types-engine.workspace = true
+
+# Revm
 revm = { workspace = true, features = ["optimism"] }
 
-# Workspace
-kona-mpt.workspace = true
+# General
+thiserror.workspace = true
+tracing.workspace = true
 
 [dev-dependencies]
+rand.workspace = true
 anyhow.workspace = true
 alloy-rlp.workspace = true
-serde.workspace = true
 serde_json.workspace = true
-rand.workspace = true
-criterion.workspace = true
-pprof.workspace = true 
 alloy-rpc-types-engine.workspace = true
+serde = { workspace = true, features = ["derive"] }
+criterion = { workspace = true, features = ["html_reports"] }
+pprof = { workspace = true, features = ["criterion", "flamegraph", "frame-pointer"] }
 
 [[bench]]
 name = "execution"
diff --git a/crates/mpt/Cargo.toml b/crates/mpt/Cargo.toml
index e518db7f3c..ba1d912b81 100644
--- a/crates/mpt/Cargo.toml
+++ b/crates/mpt/Cargo.toml
@@ -15,31 +15,32 @@ workspace = true
 # General
 tracing.workspace = true
 thiserror.workspace = true
-derive_more.workspace = true
+derive_more = { workspace = true, features = ["full"] }
 
 # Revm + Alloy
 revm.workspace = true
-alloy-primitives = { workspace = true, features = ["rlp"] }
 alloy-rlp.workspace = true
-alloy-consensus.workspace = true
 alloy-trie.workspace = true
+alloy-consensus.workspace = true
+alloy-primitives = { workspace = true, features = ["rlp"] }
 
 [dev-dependencies]
-tokio.workspace = true
-anyhow.workspace = true
-reqwest.workspace = true
-futures.workspace = true
-tracing-subscriber.workspace = true
-
-alloy-consensus.workspace = true
+# Alloy
 alloy-provider.workspace = true
-alloy-rpc-types = { workspace = true, features = ["eth"] }
+alloy-consensus.workspace = true
 alloy-transport-http.workspace = true
+alloy-rpc-types = { workspace = true, features = ["eth"] }
 
+# General
 rand.workspace = true
+anyhow.workspace = true
+reqwest.workspace = true
+futures.workspace = true
 proptest.workspace = true
-criterion.workspace = true
-pprof.workspace = true
+tokio = { workspace = true, features = ["full"] }
+criterion = { workspace = true, features = ["html_reports"] }
+tracing-subscriber = { workspace = true, features = ["fmt"] }
+pprof = { workspace = true, features = ["criterion", "flamegraph", "frame-pointer"] }
 
 [[bench]]
 name = "trie_node"
diff --git a/crates/preimage/Cargo.toml b/crates/preimage/Cargo.toml
index 159d500e0c..cc12bff905 100644
--- a/crates/preimage/Cargo.toml
+++ b/crates/preimage/Cargo.toml
@@ -13,10 +13,10 @@ workspace = true
 
 [dependencies]
 # General
-thiserror.workspace = true
 tracing.workspace = true
-alloy-primitives.workspace = true
+thiserror.workspace = true
 async-trait.workspace = true
+alloy-primitives.workspace = true
 
 # Workspace
 kona-common.workspace = true
@@ -25,11 +25,11 @@ kona-common.workspace = true
 rkyv = { workspace = true, optional = true }
 
 # `serde` feature dependencies
-serde = { workspace = true, optional = true }
+serde = { workspace = true, optional = true, features = ["derive"] }
 
 [dev-dependencies]
-tokio.workspace = true
 os_pipe.workspace = true
+tokio = { workspace = true, features = ["full"] }
 
 [features]
 default = []
diff --git a/crates/providers-alloy/Cargo.toml b/crates/providers-alloy/Cargo.toml
index ca8aca7517..a50b0e54e4 100644
--- a/crates/providers-alloy/Cargo.toml
+++ b/crates/providers-alloy/Cargo.toml
@@ -13,24 +13,24 @@ workspace = true
 
 [dependencies]
 # Alloy
-alloy-eips = { workspace = true, features = ["kzg"] }
 alloy-transport.workspace = true
-alloy-provider = { workspace = true, features = ["reqwest"] }
+alloy-eips = { workspace = true, features = ["kzg"] }
 alloy-rlp = { workspace = true, features = ["derive"] }
+alloy-provider = { workspace = true, features = ["reqwest"] }
 alloy-consensus = { workspace = true, features = ["k256", "serde", "std"] }
 alloy-primitives = { workspace = true, features = ["rlp", "k256", "serde"] }
 
 # OP Alloy
 op-alloy-consensus = { workspace = true, features = ["k256"] }
-op-alloy-protocol = { workspace = true, features = ["serde", "std"] }
 op-alloy-genesis = { workspace = true, features = ["serde", "std"] }
+op-alloy-protocol = { workspace = true, features = ["serde", "std"] }
 
 # General
 lru.workspace = true
 serde.workspace = true
-alloy-serde.workspace = true
 reqwest.workspace = true
 tracing.workspace = true
+alloy-serde.workspace = true
 async-trait.workspace = true
 
 # Workspace
@@ -39,7 +39,7 @@ kona-derive = { workspace = true, features = ["serde"] }
 
 # `metrics` feature dependencies
 lazy_static = { workspace = true, optional = true }
-prometheus = { workspace = true, optional = true }
+prometheus = { workspace = true, optional = true, features = ["process"] }
 
 # `test-utils` feature dependencies
 thiserror = { workspace = true, optional = true }
@@ -48,12 +48,12 @@ alloy-node-bindings = { workspace = true, optional = true }
 alloy-transport-http = { workspace = true, optional = true, features = ["reqwest"] } 
 
 [dev-dependencies]
-tokio.workspace = true
 thiserror.workspace = true
 serde_json.workspace = true
 alloy-rpc-client.workspace = true
 alloy-node-bindings.workspace = true
 alloy-transport-http.workspace = true
+tokio = { workspace = true, features = ["full"] }
 kona-providers = { workspace = true, features = ["test-utils"] }
 kona-derive = { workspace = true, features = ["serde", "test-utils"] }
 
diff --git a/crates/providers/Cargo.toml b/crates/providers/Cargo.toml
index 1321c74e37..b2ce352507 100644
--- a/crates/providers/Cargo.toml
+++ b/crates/providers/Cargo.toml
@@ -17,8 +17,8 @@ alloy-consensus.workspace = true
 alloy-primitives.workspace = true
 
 # OP Alloy
-op-alloy-protocol.workspace = true
 op-alloy-genesis.workspace = true
+op-alloy-protocol.workspace = true
 op-alloy-consensus = { workspace = true, features = ["k256"] }
 
 # Misc