From 08011a829e3c5eb62cf8e9c3c0a0ff6c439331c0 Mon Sep 17 00:00:00 2001
From: Emilia Hane <elsaemiliaevahane@gmail.com>
Date: Thu, 13 Feb 2025 16:22:02 +0100
Subject: [PATCH] Disable default features for optimism crates in workspace
 manifest (#14467)

---
 Cargo.toml                            | 10 +++++-----
 crates/optimism/evm/Cargo.toml        |  1 +
 crates/optimism/primitives/Cargo.toml |  1 +
 crates/optimism/reth/Cargo.toml       |  8 ++++++--
 crates/revm/Cargo.toml                |  7 ++++---
 5 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 5b0401fe6..74bdcaee8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -348,7 +348,7 @@ reth-ethereum = { path = "crates/ethereum/reth" }
 reth-etl = { path = "crates/etl" }
 reth-evm = { path = "crates/evm" }
 reth-evm-ethereum = { path = "crates/ethereum/evm" }
-reth-optimism-evm = { path = "crates/optimism/evm" }
+reth-optimism-evm = { path = "crates/optimism/evm", default-features = false }
 reth-execution-errors = { path = "crates/evm/execution-errors", default-features = false }
 reth-execution-types = { path = "crates/evm/execution-types", default-features = false }
 reth-exex = { path = "crates/exex/exex" }
@@ -376,14 +376,14 @@ reth-node-events = { path = "crates/node/events" }
 reth-node-metrics = { path = "crates/node/metrics" }
 reth-optimism-node = { path = "crates/optimism/node" }
 reth-node-types = { path = "crates/node/types" }
-reth-op = { path = "crates/optimism/reth" }
-reth-optimism-chainspec = { path = "crates/optimism/chainspec" }
+reth-op = { path = "crates/optimism/reth", default-features = false }
+reth-optimism-chainspec = { path = "crates/optimism/chainspec", default-features = false }
 reth-optimism-chain-resitry = { path = "crates/optimism/chain-registry" }
 reth-optimism-cli = { path = "crates/optimism/cli" }
-reth-optimism-consensus = { path = "crates/optimism/consensus" }
+reth-optimism-consensus = { path = "crates/optimism/consensus", default-features = false }
 reth-optimism-forks = { path = "crates/optimism/hardforks", default-features = false }
 reth-optimism-payload-builder = { path = "crates/optimism/payload" }
-reth-optimism-primitives = { path = "crates/optimism/primitives" }
+reth-optimism-primitives = { path = "crates/optimism/primitives", default-features = false }
 reth-optimism-rpc = { path = "crates/optimism/rpc" }
 reth-optimism-storage = { path = "crates/optimism/storage" }
 reth-optimism-txpool = { path = "crates/optimism/txpool" }
diff --git a/crates/optimism/evm/Cargo.toml b/crates/optimism/evm/Cargo.toml
index 1579cbd16..b1b2aaedc 100644
--- a/crates/optimism/evm/Cargo.toml
+++ b/crates/optimism/evm/Cargo.toml
@@ -71,6 +71,7 @@ std = [
     "reth-chainspec/std",
     "reth-optimism-consensus/std",
     "reth-consensus-common/std",
+    "reth-optimism-chainspec/std",
     "reth-execution-errors/std",
     "reth-execution-types/std",
 ]
diff --git a/crates/optimism/primitives/Cargo.toml b/crates/optimism/primitives/Cargo.toml
index c2de3d6e4..a33c54652 100644
--- a/crates/optimism/primitives/Cargo.toml
+++ b/crates/optimism/primitives/Cargo.toml
@@ -104,6 +104,7 @@ serde-bincode-compat = [
     "reth-primitives-traits/serde-bincode-compat",
 ]
 arbitrary = [
+    "std",
     "dep:arbitrary",
     "dep:secp256k1",
     "secp256k1?/rand",
diff --git a/crates/optimism/reth/Cargo.toml b/crates/optimism/reth/Cargo.toml
index f5a2933c9..e98b67c47 100644
--- a/crates/optimism/reth/Cargo.toml
+++ b/crates/optimism/reth/Cargo.toml
@@ -39,10 +39,14 @@ reth-optimism-rpc = { workspace = true, optional = true }
 default = ["std"]
 std = [
     "reth-chainspec/std",
-    "reth-optimism-primitives/std",
-    "reth-primitives-traits/std",
     "reth-consensus?/std",
     "reth-consensus-common?/std",
+    "reth-optimism-chainspec/std",
+    "reth-optimism-consensus?/std",
+    "reth-optimism-evm?/std",
+    "reth-optimism-primitives/std",
+    "reth-primitives-traits/std",
+    "reth-storage-api?/std",
 ]
 arbitrary = [
     "std",
diff --git a/crates/revm/Cargo.toml b/crates/revm/Cargo.toml
index e001b138d..9edaad908 100644
--- a/crates/revm/Cargo.toml
+++ b/crates/revm/Cargo.toml
@@ -33,12 +33,13 @@ alloy-consensus.workspace = true
 [features]
 default = ["std"]
 std = [
-    "reth-primitives-traits/std",
-    "alloy-primitives/std",
-    "revm/std",
     "alloy-consensus/std",
+    "alloy-primitives/std",
     "reth-ethereum-forks/std",
+    "reth-primitives-traits/std",
     "reth-storage-errors/std",
+    "revm/std",
+    "reth-storage-api/std",
 ]
 witness = ["dep:reth-trie"]
 test-utils = [