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: rm redundant conversion fn (#14129)

Browse Source
This commit is contained in:
Matthias Seitz
2025-01-31 19:13:23 +01:00
committed by GitHub
parent 62edaf14d4
commit 214f3b3b8e
3 changed files with 15 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
crates/ethereum/engine-primitives/src/payload.rs
View File

@ -6,14 +6,12 @@ use alloy_primitives::{Address, B256, U256};
use alloy_rlp::Encodable;
use alloy_rpc_types_engine::{
ExecutionPayloadEnvelopeV2, ExecutionPayloadEnvelopeV3, ExecutionPayloadEnvelopeV4,
ExecutionPayloadV1, PayloadAttributes, PayloadId,
ExecutionPayloadFieldV2, ExecutionPayloadV1, PayloadAttributes, PayloadId,
};
use core::convert::Infallible;
use reth_payload_primitives::{BuiltPayload, PayloadBuilderAttributes};
use reth_primitives::{EthPrimitives, SealedBlock};
use reth_rpc_types_compat::engine::payload::{
block_to_payload_v1, block_to_payload_v3, convert_block_to_payload_field_v2,
};
use reth_rpc_types_compat::engine::payload::{block_to_payload_v1, block_to_payload_v3};
/// Contains the built payload.
///
@ -131,7 +129,10 @@ impl From<EthBuiltPayload> for ExecutionPayloadEnvelopeV2 {
Self {
block_value: fees,
execution_payload: convert_block_to_payload_field_v2(Arc::unwrap_or_clone(block)),
execution_payload: ExecutionPayloadFieldV2::from_block_unchecked(
block.hash(),
&Arc::unwrap_or_clone(block).into_block(),
),
}
}
}

13
crates/optimism/payload/src/payload.rs
View File

@ -6,7 +6,9 @@ use alloy_eips::{
};
use alloy_primitives::{keccak256, Address, Bytes, B256, B64, U256};
use alloy_rlp::Encodable;
use alloy_rpc_types_engine::{ExecutionPayloadEnvelopeV2, ExecutionPayloadV1, PayloadId};
use alloy_rpc_types_engine::{
ExecutionPayloadEnvelopeV2, ExecutionPayloadFieldV2, ExecutionPayloadV1, PayloadId,
};
use op_alloy_consensus::{encode_holocene_extra_data, EIP1559ParamError};
/// Re-export for use in downstream arguments.
pub use op_alloy_rpc_types_engine::OpPayloadAttributes;
@ -18,9 +20,7 @@ use reth_optimism_primitives::{OpBlock, OpPrimitives, OpTransactionSigned};
use reth_payload_builder::EthPayloadBuilderAttributes;
use reth_payload_primitives::{BuiltPayload, PayloadBuilderAttributes};
use reth_primitives::{transaction::WithEncoded, SealedBlock};
use reth_rpc_types_compat::engine::payload::{
block_to_payload_v1, block_to_payload_v3, convert_block_to_payload_field_v2,
};
use reth_rpc_types_compat::engine::payload::{block_to_payload_v1, block_to_payload_v3};
use std::sync::Arc;
/// Optimism Payload Builder Attributes
@ -239,7 +239,10 @@ impl From<OpBuiltPayload> for ExecutionPayloadEnvelopeV2 {
Self {
block_value: fees,
execution_payload: convert_block_to_payload_field_v2(Arc::unwrap_or_clone(block)),
execution_payload: ExecutionPayloadFieldV2::from_block_unchecked(
block.hash(),
&Arc::unwrap_or_clone(block).into_block(),
),
}
}
}

15
crates/rpc/rpc-types-compat/src/engine/payload.rs
View File

@ -4,8 +4,7 @@
use alloy_eips::{eip2718::Encodable2718, eip4895::Withdrawals};
use alloy_primitives::U256;
use alloy_rpc_types_engine::{
payload::{ExecutionPayloadBodyV1, ExecutionPayloadFieldV2},
ExecutionPayloadV1, ExecutionPayloadV2, ExecutionPayloadV3,
payload::ExecutionPayloadBodyV1, ExecutionPayloadV1, ExecutionPayloadV2, ExecutionPayloadV3,
};
use reth_primitives::{Block, SealedBlock};
use reth_primitives_traits::{BlockBody as _, SignedTransaction};
@ -55,18 +54,6 @@ pub fn block_to_payload_v3<T: SignedTransaction>(
}
}
/// Converts [`SealedBlock`] to [`ExecutionPayloadFieldV2`]
pub fn convert_block_to_payload_field_v2<T: SignedTransaction>(
value: SealedBlock<Block<T>>,
) -> ExecutionPayloadFieldV2 {
// if there are withdrawals, return V2
if value.body().withdrawals.is_some() {
ExecutionPayloadFieldV2::V2(block_to_payload_v2(value))
} else {
ExecutionPayloadFieldV2::V1(block_to_payload_v1(value))
}
}
/// Converts a [`reth_primitives_traits::Block`] to [`ExecutionPayloadBodyV1`]
pub fn convert_to_payload_body_v1(
value: impl reth_primitives_traits::Block,