Skip to content
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.

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

chore: Remove feature = optimism from reth-optimism-payload-builder #6954

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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 bin/reth/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ optimism = [
"reth-network-api/optimism",
"reth-blockchain-tree/optimism",
"reth-payload-builder/optimism",
"reth-optimism-payload-builder/optimism",
"reth-optimism-payload-builder",
"dep:reth-node-optimism",
"reth-node-core/optimism",
]
Expand Down
2 changes: 1 addition & 1 deletion crates/node-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ optimism = [
"reth-consensus-common/optimism",
"reth-blockchain-tree/optimism",
"reth-beacon-consensus/optimism",
"reth-optimism-payload-builder/optimism",
"reth-optimism-payload-builder",
]

jemalloc = ["dep:jemalloc-ctl"]
Expand Down
4 changes: 2 additions & 2 deletions crates/node-optimism/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ workspace = true
reth-primitives.workspace = true
reth-payload-builder.workspace = true
reth-basic-payload-builder.workspace = true
reth-optimism-payload-builder.workspace = true
reth-optimism-payload-builder = { workspace = true, optional = true }
reth-rpc-types.workspace = true
reth-rpc.workspace = true
reth-rpc-types-compat.workspace = true
Expand Down Expand Up @@ -44,5 +44,5 @@ optimism = [
"reth-provider/optimism",
"reth-rpc-types-compat/optimism",
"reth-rpc/optimism",
"reth-optimism-payload-builder/optimism",
"reth-optimism-payload-builder",
]
22 changes: 5 additions & 17 deletions crates/payload/optimism/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ workspace = true

[dependencies]
# reth
reth-primitives.workspace = true
reth-revm.workspace = true
reth-transaction-pool.workspace = true
reth-provider.workspace = true
reth-payload-builder.workspace = true
reth-primitives ={workspace = true, features = ["optimism"]}
reth-revm = {workspace = true, features = ["optimism"]}
reth-transaction-pool = {workspace = true, features = ["optimism"]}
reth-provider = {workspace = true, features = ["optimism"]}
reth-payload-builder={workspace = true, features = ["optimism"] }
reth-basic-payload-builder.workspace = true

# ethereum
Expand All @@ -26,15 +26,3 @@ revm.workspace = true
# misc
tracing.workspace = true
thiserror.workspace = true


[features]
# This is a workaround for reth-cli crate to allow this as mandatory dependency without breaking the build even if unused.
# This makes managing features and testing workspace easier because clippy always builds all members if --workspace is provided
optimism = [
"reth-primitives/optimism",
"reth-revm/optimism",
"reth-transaction-pool/optimism",
"reth-provider/optimism",
"reth-payload-builder/optimism",
]
3 changes: 0 additions & 3 deletions crates/payload/optimism/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,12 @@
html_favicon_url = "https://avatars0.githubusercontent.com/u/97369466?s=256",
issue_tracker_base_url = "https://github.com/paradigmxyz/reth/issues/"
)]
#![cfg_attr(all(not(test), feature = "optimism"), warn(unused_crate_dependencies))]
#![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]

#[cfg(feature = "optimism")]
pub use builder::*;

pub mod error;

#[cfg(feature = "optimism")]
mod builder {
use crate::error::OptimismPayloadBuilderError;
use reth_basic_payload_builder::*;
Expand Down
Loading