fix(deps): Optionally enable op feature for reth-optimism-primitives

crates/optimism/bin/Cargo.toml

@@ -17,7 +17,7 @@ reth-optimism-chainspec.workspace = true
 reth-optimism-consensus.workspace = true
 reth-optimism-evm.workspace = true
 reth-optimism-payload-builder.workspace = true
-reth-optimism-primitives.workspace = true
+reth-optimism-primitives = { workspace = true, features = ["reth-codec"] }
 reth-optimism-forks.workspace = true
 
 clap = { workspace = true, features = ["derive", "env"] }

crates/optimism/evm/Cargo.toml

@@ -14,7 +14,7 @@ workspace = true
 # Reth
 reth-chainspec.workspace = true
 reth-evm = { workspace = true, features = ["op"] }
-reth-primitives-traits.workspace = true
+reth-primitives-traits = { workspace = true, features = ["op"] }
 reth-execution-errors.workspace = true
 reth-execution-types.workspace = true
 reth-storage-errors.workspace = true
@@ -34,7 +34,7 @@ alloy-consensus.workspace = true
 reth-optimism-chainspec.workspace = true
 reth-optimism-consensus.workspace = true
 reth-optimism-forks.workspace = true
-reth-optimism-primitives.workspace = true
+reth-optimism-primitives = { workspace = true, features = ["op"] }
 
 # revm
 revm.workspace = true

crates/optimism/node/Cargo.toml

@@ -41,7 +41,7 @@ reth-optimism-txpool.workspace = true
 reth-optimism-chainspec.workspace = true
 reth-optimism-consensus = { workspace = true, features = ["std"] }
 reth-optimism-forks.workspace = true
-reth-optimism-primitives = { workspace = true, features = ["serde", "serde-bincode-compat", "reth-codec"] }
+reth-optimism-primitives = { workspace = true, features = ["serde", "serde-bincode-compat"] }
 
 # revm with required optimism features
 # Note: this must be kept to ensure all features are properly enabled/forwarded

crates/optimism/primitives/Cargo.toml

@@ -13,8 +13,8 @@ workspace = true
 
 [dependencies]
 # reth
-reth-primitives-traits = { workspace = true, features = ["op"] }
-reth-codecs = { workspace = true, optional = true, features = ["op"] }
+reth-primitives-traits.workspace = true
+reth-codecs = { workspace = true, optional = true }
 reth-zstd-compressors = { workspace = true, optional = true }
 
 # ethereum
@@ -37,6 +37,7 @@ arbitrary = { workspace = true, features = ["derive"], optional = true }
 
 [dev-dependencies]
 reth-codecs = { workspace = true, features = ["test-utils", "op"] }
+reth-primitives-traits = { workspace = true, features = ["op"] }
 
 rand.workspace = true
 arbitrary.workspace = true
@@ -70,6 +71,7 @@ alloy-compat = ["op-alloy-consensus/alloy-compat"]
 reth-codec = [
     "dep:reth-codecs",
     "std",
+    "op",
     "reth-primitives-traits/reth-codec",
     "reth-codecs?/op",
     "dep:bytes",
@@ -107,3 +109,7 @@ arbitrary = [
     "alloy-primitives/arbitrary",
     "alloy-eips/arbitrary",
 ]
+op = [
+    "reth-primitives-traits/op",
+    "reth-codecs?/op",
+]

crates/optimism/primitives/src/lib.rs

@@ -33,6 +33,7 @@ pub type OpBlockBody = <OpBlock as reth_primitives_traits::Block>::Body;
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct OpPrimitives;
 
+#[cfg(feature = "op")]
 impl reth_primitives_traits::NodePrimitives for OpPrimitives {
     type Block = OpBlock;
     type BlockHeader = alloy_consensus::Header;

crates/rpc/rpc-convert/Cargo.toml

@@ -59,4 +59,5 @@ op = [
     "dep:op-revm",
     "reth-evm/op",
     "reth-primitives-traits/op",
+    "reth-optimism-primitives?/op",
 ]

crates/storage/db-api/Cargo.toml

@@ -89,5 +89,6 @@ op = [
     "dep:reth-optimism-primitives",
     "reth-codecs/op",
     "reth-primitives-traits/op",
+    "reth-optimism-primitives?/op",
 ]
 bench = []