Skip to content

fix(op): Optionally disable op feature for reth-optimism-primitives #19018

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
emhane wants to merge 5 commits into from
Closed

fix(op): Optionally disable op feature for reth-optimism-primitives #19018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
82242c5
Disable op feature for reth-optimism-primitives unless reth-codec is …
emhane Oct 15, 2025
d1c3b18
Fix feature propagation
emhane Oct 15, 2025
79bf7ea
Fix lint
emhane Oct 15, 2025
72bac36
Feature gate NodePrimitives impl behind op feat
emhane Oct 15, 2025
f664e60
Enable op feature for reth-optimism-evm
emhane Oct 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crates/optimism/bin/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand Down
4 changes: 2 additions & 2 deletions crates/optimism/evm/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion crates/optimism/node/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 8 additions & 2 deletions crates/optimism/primitives/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -107,3 +109,7 @@ arbitrary = [
"alloy-primitives/arbitrary",
"alloy-eips/arbitrary",
]
op = [
"reth-primitives-traits/op",
"reth-codecs?/op",
]
1 change: 1 addition & 0 deletions crates/optimism/primitives/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions crates/rpc/rpc-convert/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,5 @@ op = [
"dep:op-revm",
"reth-evm/op",
"reth-primitives-traits/op",
"reth-optimism-primitives?/op",
]
1 change: 1 addition & 0 deletions crates/storage/db-api/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,5 +89,6 @@ op = [
"dep:reth-optimism-primitives",
"reth-codecs/op",
"reth-primitives-traits/op",
"reth-optimism-primitives?/op",
]
bench = []
Loading