jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: improve deps for payload prims (#12374)

Browse Source
This commit is contained in:
Matthias Seitz
2024-11-07 17:56:35 +01:00
committed by GitHub
parent e911fe9ff0
commit d0baf926bf
7 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
crates/payload/primitives/Cargo.toml
View File

@ -22,8 +22,8 @@ reth-chain-state.workspace = true
# alloy
alloy-eips.workspace = true
alloy-primitives.workspace = true
alloy-rpc-types = { workspace = true, features = ["engine"] }
op-alloy-rpc-types-engine.workspace = true
alloy-rpc-types-engine = { workspace = true, features = ["serde"] }
op-alloy-rpc-types-engine = { workspace = true, optional = true }
# async
async-trait.workspace = true
@ -35,3 +35,6 @@ pin-project.workspace = true
serde.workspace = true
thiserror.workspace = true
tracing.workspace = true
[features]
op = ["dep:op-alloy-rpc-types-engine"]

5
crates/payload/primitives/src/payload.rs
View File

@ -1,6 +1,7 @@
use crate::{MessageValidationKind, PayloadAttributes};
use alloy_eips::eip4895::Withdrawal;
use alloy_primitives::B256;
use alloy_rpc_types::engine::ExecutionPayload;
use alloy_rpc_types_engine::ExecutionPayload;
/// Either an [`ExecutionPayload`] or a types that implements the [`PayloadAttributes`] trait.
///
@ -39,7 +40,7 @@ where
Attributes: PayloadAttributes,
{
/// Return the withdrawals for the payload or attributes.
pub fn withdrawals(&self) -> Option<&Vec<alloy_rpc_types::Withdrawal>> {
pub fn withdrawals(&self) -> Option<&Vec<Withdrawal>> {
match self {
Self::ExecutionPayload { payload, .. } => payload.withdrawals(),
Self::PayloadAttributes(attributes) => attributes.withdrawals(),

11
crates/payload/primitives/src/traits.rs
View File

@ -1,11 +1,7 @@
use crate::{PayloadEvents, PayloadKind, PayloadTypes};
use alloy_eips::eip7685::Requests;
use alloy_eips::{eip4895::Withdrawal, eip7685::Requests};
use alloy_primitives::{Address, B256, U256};
use alloy_rpc_types::{
engine::{PayloadAttributes as EthPayloadAttributes, PayloadId},
Withdrawal,
};
use op_alloy_rpc_types_engine::OpPayloadAttributes;
use alloy_rpc_types_engine::{PayloadAttributes as EthPayloadAttributes, PayloadId};
use reth_chain_state::ExecutedBlock;
use reth_primitives::{SealedBlock, Withdrawals};
use tokio::sync::oneshot;
@ -146,7 +142,8 @@ impl PayloadAttributes for EthPayloadAttributes {
}
}
impl PayloadAttributes for OpPayloadAttributes {
#[cfg(feature = "op")]
impl PayloadAttributes for op_alloy_rpc_types_engine::OpPayloadAttributes {
fn timestamp(&self) -> u64 {
self.payload_attributes.timestamp
}