Merge branch 'reth-1.2.0' into f-reth-1.2.0-op

Author: ferranbt

crates/rbuilder/benches/benchmarks/mev_boost.rs

@@ -1,5 +1,6 @@
+use alloy_consensus::{Block, Header};
 use alloy_eips::eip4844::BlobTransactionSidecar;
-use alloy_primitives::{BlockHash, U256};
+use alloy_primitives::U256;
 use criterion::{criterion_group, Criterion};
 use primitive_types::H384;
 use rbuilder::mev_boost::{
@@ -8,7 +9,7 @@ use rbuilder::mev_boost::{
 };
 use reth::primitives::SealedBlock;
 use reth_chainspec::SEPOLIA;
-use reth_primitives::{kzg::Blob, SealedHeader};
+use reth_primitives::kzg::Blob;
 use std::{fs, path::PathBuf, sync::Arc};
 
 fn mev_boost_serialize_submit_block(data: DenebSubmitBlockRequest) {
@@ -98,13 +99,15 @@ fn bench_mevboost_sign(c: &mut Criterion) {
 
     // Create a sealed block that is after the Cancun hard fork in Sepolia
     // this is, a timestamp higher than 1706655072
-    let mut sealed_block_deneb: SealedBlock<alloy_consensus::Header, reth_primitives::BlockBody> =
-        SealedBlock::default();
-    let mut header = sealed_block_deneb.header().clone();
-    header.timestamp = 2706655072;
-    header.blob_gas_used = Some(64);
-    header.excess_blob_gas = Some(64);
-    sealed_block_deneb.header = SealedHeader::new(header.clone(), BlockHash::default());
+    let sealed_block_deneb = SealedBlock::new_unhashed(Block::new(
+        Header {
+            timestamp: 2706655072,
+            blob_gas_used: Some(64),
+            excess_blob_gas: Some(64),
+            ..Default::default()
+        },
+        Default::default(),
+    ));
 
     group.bench_function("Deneb", |b| {
         b.iter(|| {

crates/rbuilder/src/building/mod.rs

@@ -55,7 +55,7 @@ use revm::{
     db::states::bundle_state::BundleRetention,
     primitives::{BlobExcessGasAndPrice, BlockEnv, SpecId},
 };
-use revm_primitives::InvalidTransaction;
+use revm_primitives::{InvalidTransaction, B256};
 use serde::Deserialize;
 use std::{
     hash::Hash,
@@ -601,13 +601,13 @@ impl<Tracer: SimulationTracer> PartialBlock<Tracer> {
         Ok(())
     }
 
-    /// Mostly based on reth's (v1.1.1) default_ethereum_payload_builder.
-    #[allow(clippy::too_many_arguments)]
-    pub fn finalize(
-        self,
+    /// returns (requests,withdrawals_root)
+    pub fn process_requests(
+        &self,
         state: &mut BlockState,
         ctx: &BlockBuildingContext,
-    ) -> Result<FinalizeResult, FinalizeError> {
+    ) -> Result<(Option<Requests>, Option<B256>), FinalizeError> {
+        let mut db = state.new_db_ref();
         let requests = if ctx
             .chain_spec
             .is_prague_active_at_timestamp(ctx.attributes.timestamp())
@@ -616,8 +616,6 @@ impl<Tracer: SimulationTracer> PartialBlock<Tracer> {
                 EthEvmConfig::new(ctx.chain_spec.clone()),
                 ctx.chain_spec.clone(),
             );
-            let mut db = state.new_db_ref();
-
             let deposit_requests =
                 parse_deposits_from_receipts(&ctx.chain_spec, self.receipts.iter())
                     .map_err(|err| FinalizeError::Other(err.into()))?;
@@ -644,7 +642,6 @@ impl<Tracer: SimulationTracer> PartialBlock<Tracer> {
         };
 
         let withdrawals_root = {
-            let mut db = state.new_db_ref();
             let withdrawals_root = commit_withdrawals(
                 db.as_mut(),
                 &ctx.chain_spec,
@@ -657,7 +654,17 @@ impl<Tracer: SimulationTracer> PartialBlock<Tracer> {
             db.as_mut().merge_transitions(BundleRetention::Reverts);
             withdrawals_root
         };
+        Ok((requests, withdrawals_root))
+    }
 
+    /// Mostly based on reth's (v1.2) default_ethereum_payload_builder.
+    #[allow(clippy::too_many_arguments)]
+    pub fn finalize(
+        self,
+        state: &mut BlockState,
+        ctx: &BlockBuildingContext,
+    ) -> Result<FinalizeResult, FinalizeError> {
+        let (requests, withdrawals_root) = self.process_requests(state, ctx)?;
         let (cached_reads, bundle) = state.clone_bundle_and_cache();
         let block_number = ctx.evm_env.block_env.number.to::<u64>();
 

crates/rbuilder/src/live_builder/order_input/txpool_fetcher.rs

@@ -3,7 +3,7 @@ use crate::{
     primitives::{MempoolTx, Order, TransactionSignedEcRecoveredWithBlobs},
     telemetry::{add_txfetcher_time_to_query, mark_command_received},
 };
-use alloy_primitives::{hex, Bytes, FixedBytes};
+use alloy_primitives::FixedBytes;
 use alloy_provider::{IpcConnect, Provider, ProviderBuilder};
 use futures::StreamExt;
 use std::{pin::pin, time::Instant};
@@ -95,23 +95,11 @@ async fn get_tx_with_blobs(
     tx_hash: FixedBytes<32>,
     provider: &impl alloy_provider::Provider,
 ) -> eyre::Result<Option<TransactionSignedEcRecoveredWithBlobs>> {
-    // TODO: Use https://github.com/alloy-rs/alloy/pull/1168 when it gets cut
-    // in a release
-    let raw_tx: Option<String> = provider
-        .client()
-        .request("eth_getRawTransactionByHash", vec![tx_hash])
-        .await?;
-
-    let raw_tx = if let Some(raw_tx) = raw_tx {
-        raw_tx
-    } else {
+    let Some(response) = provider.get_raw_transaction_by_hash(tx_hash).await? else {
         return Ok(None);
     };
-
-    let raw_tx = hex::decode(raw_tx)?;
-    let raw_tx = Bytes::from(raw_tx);
     Ok(Some(
-        TransactionSignedEcRecoveredWithBlobs::decode_enveloped_with_real_blobs(raw_tx)?,
+        TransactionSignedEcRecoveredWithBlobs::decode_enveloped_with_real_blobs(response)?,
     ))
 }