Skip to content
Merged
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
6 changes: 6 additions & 0 deletions .changelog/rich-pigs-shake.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
reth-payload-primitives: patch
reth-engine-local: patch
---

Removed the `op` feature and `op-alloy-rpc-types-engine` dependency from `reth-payload-primitives`, along with the `ExecutionPayload` impl for `OpExecutionData`. Updated `reth-engine-local` to drop the corresponding feature flag dependency.
1 change: 0 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion crates/engine/local/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,4 @@ workspace = true
[features]
op = [
"dep:op-alloy-rpc-types-engine",
"reth-payload-primitives/op",
]
5 changes: 0 additions & 5 deletions crates/payload/primitives/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ alloy-eips.workspace = true
alloy-primitives.workspace = true
alloy-rlp.workspace = true
alloy-rpc-types-engine = { workspace = true, features = ["serde"] }
op-alloy-rpc-types-engine = { workspace = true, optional = true, features = ["serde"] }

# misc
auto_impl.workspace = true
Expand All @@ -49,7 +48,6 @@ std = [
"alloy-eips/std",
"alloy-primitives/std",
"alloy-rpc-types-engine/std",
"op-alloy-rpc-types-engine?/std",
"serde/std",
"thiserror/std",
"reth-primitives-traits/std",
Expand All @@ -59,6 +57,3 @@ std = [
"serde_json/std",
"sha2/std",
]
op = [
"dep:op-alloy-rpc-types-engine",
]
40 changes: 0 additions & 40 deletions crates/payload/primitives/src/payload.rs
Original file line number Diff line number Diff line change
Expand Up @@ -169,46 +169,6 @@ where
Self::PayloadAttributes(attributes)
}
}

#[cfg(feature = "op")]
impl ExecutionPayload for op_alloy_rpc_types_engine::OpExecutionData {
fn parent_hash(&self) -> B256 {
self.parent_hash()
}

fn block_hash(&self) -> B256 {
self.block_hash()
}

fn block_number(&self) -> u64 {
self.block_number()
}

fn withdrawals(&self) -> Option<&Vec<Withdrawal>> {
self.payload.as_v2().map(|p| &p.withdrawals)
}

fn block_access_list(&self) -> Option<&Bytes> {
None
}

fn parent_beacon_block_root(&self) -> Option<B256> {
self.sidecar.parent_beacon_block_root()
}

fn timestamp(&self) -> u64 {
self.payload.as_v1().timestamp
}

fn gas_used(&self) -> u64 {
self.payload.as_v1().gas_used
}

fn transaction_count(&self) -> usize {
self.payload.as_v1().transactions.len()
}
}

/// Extended functionality for Ethereum execution payloads
impl<Attributes> PayloadOrAttributes<'_, ExecutionData, Attributes>
where
Expand Down
Loading