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: phase out block_to_payload_v3 (#14140)

Browse Source 
Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
This commit is contained in:
Steven
2025-02-01 01:41:28 -06:00
committed by GitHub
parent bf20c786e5
commit 9e6e2c4695
5 changed files with 36 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,12 +6,12 @@ use alloy_primitives::{Address, B256, U256};
use alloy_rlp::Encodable;
use alloy_rpc_types_engine::{
ExecutionPayloadEnvelopeV2, ExecutionPayloadEnvelopeV3, ExecutionPayloadEnvelopeV4,
ExecutionPayloadFieldV2, ExecutionPayloadV1, PayloadAttributes, PayloadId,
ExecutionPayloadFieldV2, ExecutionPayloadV1, ExecutionPayloadV3, 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};
use reth_rpc_types_compat::engine::payload::block_to_payload_v1;
/// Contains the built payload.
///
@ -142,7 +142,10 @@ impl From<EthBuiltPayload> for ExecutionPayloadEnvelopeV3 {
let EthBuiltPayload { block, fees, sidecars, .. } = value;
Self {
execution_payload: block_to_payload_v3(Arc::unwrap_or_clone(block)),
execution_payload: ExecutionPayloadV3::from_block_unchecked(
block.hash(),
&Arc::unwrap_or_clone(block).into_block(),
),
block_value: fees,
// From the engine API spec:
//

13
crates/ethereum/node/tests/e2e/rpc.rs
View File

@ -6,12 +6,11 @@ use alloy_rpc_types_beacon::relay::{
BidTrace, BuilderBlockValidationRequestV3, BuilderBlockValidationRequestV4,
SignedBidSubmissionV3, SignedBidSubmissionV4,
};
use alloy_rpc_types_engine::BlobsBundleV1;
use alloy_rpc_types_engine::{BlobsBundleV1, ExecutionPayloadV3};
use alloy_rpc_types_eth::TransactionRequest;
use rand::{rngs::StdRng, Rng, SeedableRng};
use reth_chainspec::{ChainSpecBuilder, MAINNET};
use reth_e2e_test_utils::setup_engine;
use reth_node_core::rpc::compat::engine::payload::block_to_payload_v3;
use reth_node_ethereum::EthereumNode;
use reth_payload_primitives::BuiltPayload;
use std::sync::Arc;
@ -161,7 +160,10 @@ async fn test_flashbots_validate_v3() -> eyre::Result<()> {
gas_limit: payload.block().gas_limit,
..Default::default()
},
execution_payload: block_to_payload_v3(payload.block().clone()),
execution_payload: ExecutionPayloadV3::from_block_unchecked(
payload.block().hash(),
&payload.block().clone().into_block(),
),
blobs_bundle: BlobsBundleV1::new([]),
signature: Default::default(),
},
@ -234,7 +236,10 @@ async fn test_flashbots_validate_v4() -> eyre::Result<()> {
gas_limit: payload.block().gas_limit,
..Default::default()
},
execution_payload: block_to_payload_v3(payload.block().clone()),
execution_payload: ExecutionPayloadV3::from_block_unchecked(
payload.block().hash(),
&payload.block().clone().into_block(),
),
blobs_bundle: BlobsBundleV1::new([]),
execution_requests: payload.requests().unwrap().try_into().unwrap(),
signature: Default::default(),