Fix external payload validation logic, resolve txs execution logic bug and add pre-exec validation

crates/op-rbuilder/src/builders/flashblocks/ctx.rs

@@ -9,6 +9,7 @@ use reth_basic_payload_builder::PayloadConfig;
 use reth_evm::EvmEnv;
 use reth_optimism_chainspec::OpChainSpec;
 use reth_optimism_evm::{OpEvmConfig, OpNextBlockEnvAttributes};
+use reth_optimism_forks::OpHardforks;
 use reth_optimism_payload_builder::{
     OpPayloadBuilderAttributes,
     config::{OpDAConfig, OpGasLimitConfig},
@@ -59,6 +60,16 @@ impl OpPayloadSyncerCtx {
         self.max_gas_per_txn
     }
 
+    /// Returns true if regolith is active for the payload.
+    pub(super) fn is_regolith_active(&self, timestamp: u64) -> bool {
+        self.chain_spec.is_regolith_active_at_timestamp(timestamp)
+    }
+
+    /// Returns true if canyon is active for the payload.
+    pub(super) fn is_canyon_active(&self, timestamp: u64) -> bool {
+        self.chain_spec.is_canyon_active_at_timestamp(timestamp)
+    }
+
     pub(super) fn into_op_payload_builder_ctx(
         self,
         payload_config: PayloadConfig<OpPayloadBuilderAttributes<OpTransactionSigned>>,

crates/op-rbuilder/src/builders/flashblocks/payload_handler.rs

@@ -8,18 +8,18 @@ use crate::{
 use alloy_evm::eth::receipt_builder::ReceiptBuilderCtx;
 use alloy_primitives::B64;
 use eyre::{WrapErr as _, bail};
-use op_alloy_consensus::OpTxEnvelope;
 use op_alloy_rpc_types_engine::OpFlashblockPayload;
 use reth::revm::{State, database::StateProviderDatabase};
 use reth_basic_payload_builder::PayloadConfig;
-use reth_evm::FromRecoveredTx;
 use reth_node_builder::Events;
 use reth_optimism_chainspec::OpChainSpec;
-use reth_optimism_evm::{OpEvmConfig, OpNextBlockEnvAttributes};
+use reth_optimism_consensus::OpBeaconConsensus;
+use reth_optimism_evm::OpNextBlockEnvAttributes;
 use reth_optimism_node::{OpEngineTypes, OpPayloadBuilderAttributes};
 use reth_optimism_payload_builder::OpBuiltPayload;
 use reth_optimism_primitives::{OpReceipt, OpTransactionSigned};
 use reth_payload_builder::EthPayloadBuilderAttributes;
+use reth_primitives_traits::SealedHeader;
 use std::sync::Arc;
 use tokio::sync::mpsc;
 use tracing::warn;
@@ -154,6 +154,11 @@ where
         .wrap_err("failed to get parent header")?
         .ok_or_else(|| eyre::eyre!("parent header not found"))?;
 
+    // For X Layer, validate header and parent relationship before execution
+    let chain_spec = client.chain_spec();
+    validate_pre_execution(&payload, &parent_header, parent_hash, chain_spec.clone())
+        .wrap_err("pre-execution validation failed")?;
+
     let state_provider = client
         .state_by_block_hash(parent_hash)
         .wrap_err("failed to get state for parent hash")?;
@@ -163,7 +168,6 @@ where
         .with_bundle_update()
         .build();
 
-    let chain_spec = client.chain_spec();
     let timestamp = payload.block().header().timestamp();
     let block_env_attributes = OpNextBlockEnvAttributes {
         timestamp,
@@ -222,15 +226,13 @@ where
     );
 
     execute_transactions(
+        &ctx,
         &mut info,
         &mut state,
         payload.block().body().transactions.clone(),
         payload.block().header().gas_used,
-        ctx.evm_config(),
+        timestamp,
         evm_env.clone(),
-        ctx.max_gas_per_txn(),
-        is_canyon_active(&chain_spec, timestamp),
-        is_regolith_active(&chain_spec, timestamp),
     )
     .wrap_err("failed to execute best transactions")?;
 
@@ -272,89 +274,55 @@ where
 
 #[allow(clippy::too_many_arguments)]
 fn execute_transactions(
+    ctx: &OpPayloadSyncerCtx,
     info: &mut ExecutionInfo<FlashblocksExecutionInfo>,
     state: &mut State<impl alloy_evm::Database>,
     txs: Vec<op_alloy_consensus::OpTxEnvelope>,
     gas_limit: u64,
-    evm_config: &reth_optimism_evm::OpEvmConfig,
+    timestamp: u64,
     evm_env: alloy_evm::EvmEnv<op_revm::OpSpecId>,
-    max_gas_per_txn: Option<u64>,
-    is_canyon_active: bool,
-    is_regolith_active: bool,
 ) -> eyre::Result<()> {
-    use alloy_evm::{Evm as _, EvmError as _};
-    use op_revm::{OpTransaction, transaction::deposit::DepositTransactionParts};
+    use alloy_evm::Evm as _;
     use reth_evm::ConfigureEvm as _;
-    use reth_primitives_traits::SignerRecoverable as _;
-    use revm::{
-        DatabaseCommit as _,
-        context::{TxEnv, result::ResultAndState},
-    };
+    use reth_primitives_traits::SignedTransaction;
+    use revm::{DatabaseCommit as _, context::result::ResultAndState};
 
-    let mut evm = evm_config.evm_with_env(&mut *state, evm_env);
+    let mut evm = ctx.evm_config().evm_with_env(&mut *state, evm_env);
 
     for tx in txs {
-        let sender = tx
-            .recover_signer()
-            .wrap_err("failed to recover tx signer")?;
-        let tx_env = TxEnv::from_recovered_tx(&tx, sender);
-        let executable_tx = match tx {
-            OpTxEnvelope::Deposit(ref tx) => {
-                let deposit = DepositTransactionParts {
-                    mint: Some(tx.mint),
-                    source_hash: tx.source_hash,
-                    is_system_transaction: tx.is_system_transaction,
-                };
-                OpTransaction {
-                    base: tx_env,
-                    enveloped_tx: None,
-                    deposit,
-                }
-            }
-            OpTxEnvelope::Legacy(_) => {
-                let mut tx = OpTransaction::new(tx_env);
-                tx.enveloped_tx = Some(vec![0x00].into());
-                tx
-            }
-            OpTxEnvelope::Eip2930(_) => {
-                let mut tx = OpTransaction::new(tx_env);
-                tx.enveloped_tx = Some(vec![0x00].into());
-                tx
-            }
-            OpTxEnvelope::Eip1559(_) => {
-                let mut tx = OpTransaction::new(tx_env);
-                tx.enveloped_tx = Some(vec![0x00].into());
-                tx
-            }
-            OpTxEnvelope::Eip7702(_) => {
-                let mut tx = OpTransaction::new(tx_env);
-                tx.enveloped_tx = Some(vec![0x00].into());
-                tx
-            }
-        };
+        // Convert to recovered transaction
+        let tx_recovered = tx
+            .try_clone_into_recovered()
+            .wrap_err("failed to recover tx")?;
+        let sender = tx_recovered.signer();
+
+        // Cache the depositor account prior to the state transition for the deposit nonce.
+        //
+        // Note that this *only* needs to be done post-regolith hardfork, as deposit nonces
+        // were not introduced in Bedrock. In addition, regular transactions don't have deposit
+        // nonces, so we don't need to touch the DB for those.
+        let depositor_nonce = (ctx.is_regolith_active(timestamp) && tx_recovered.is_deposit())
+            .then(|| {
+                evm.db_mut()
+                    .load_cache_account(sender)
+                    .map(|acc| acc.account_info().unwrap_or_default().nonce)
+            })
+            .transpose()
+            .wrap_err("failed to get depositor nonce")?;
 
-        let ResultAndState { result, state } = match evm.transact_raw(executable_tx) {
-            Ok(res) => res,
-            Err(err) => {
-                if let Some(err) = err.as_invalid_tx_err() {
-                    // TODO: what invalid txs are allowed in the block?
-                    // reverting txs should be allowed (?) but not straight up invalid ones
-                    tracing::error!(error = %err, "skipping invalid transaction in flashblock");
-                    continue;
-                }
-                return Err(err).wrap_err("failed to execute flashblock transaction");
-            }
-        };
+        let ResultAndState { result, state } = evm
+            .transact(&tx_recovered)
+            .wrap_err("failed to execute transaction")?;
 
-        if let Some(max_gas_per_txn) = max_gas_per_txn
-            && result.gas_used() > max_gas_per_txn
+        let tx_gas_used = result.gas_used();
+        if let Some(max_gas_per_txn) = ctx.max_gas_per_txn()
+            && tx_gas_used > max_gas_per_txn
         {
             return Err(eyre::eyre!(
                 "transaction exceeded max gas per txn limit in flashblock"
             ));
         }
 
-        let tx_gas_used = result.gas_used();
         info.cumulative_gas_used = info
             .cumulative_gas_used
             .checked_add(tx_gas_used)
@@ -365,29 +333,16 @@ fn execute_transactions(
             bail!("flashblock exceeded gas limit when executing transactions");
         }
 
-        let depositor_nonce = (is_regolith_active && tx.is_deposit())
-            .then(|| {
-                evm.db_mut()
-                    .load_cache_account(sender)
-                    .map(|acc| acc.account_info().unwrap_or_default().nonce)
-            })
-            .transpose()
-            .wrap_err("failed to get depositor nonce")?;
-
-        let ctx = ReceiptBuilderCtx {
+        let receipt_ctx = ReceiptBuilderCtx {
             tx: &tx,
             evm: &evm,
             result,
             state: &state,
             cumulative_gas_used: info.cumulative_gas_used,
         };
 
-        info.receipts.push(build_receipt(
-            evm_config,
-            ctx,
-            depositor_nonce,
-            is_canyon_active,
-        ));
+        info.receipts
+            .push(build_receipt(ctx, receipt_ctx, depositor_nonce, timestamp));
 
         evm.db_mut().commit(state);
 
@@ -400,26 +355,26 @@ fn execute_transactions(
 }
 
 fn build_receipt<E: alloy_evm::Evm>(
-    evm_config: &OpEvmConfig,
-    ctx: ReceiptBuilderCtx<'_, OpTransactionSigned, E>,
+    ctx: &OpPayloadSyncerCtx,
+    receipt_ctx: ReceiptBuilderCtx<'_, OpTransactionSigned, E>,
     deposit_nonce: Option<u64>,
-    is_canyon_active: bool,
+    timestamp: u64,
 ) -> OpReceipt {
     use alloy_consensus::Eip658Value;
     use alloy_op_evm::block::receipt_builder::OpReceiptBuilder as _;
     use op_alloy_consensus::OpDepositReceipt;
     use reth_evm::ConfigureEvm as _;
 
-    let receipt_builder = evm_config.block_executor_factory().receipt_builder();
-    match receipt_builder.build_receipt(ctx) {
+    let receipt_builder = ctx.evm_config().block_executor_factory().receipt_builder();
+    match receipt_builder.build_receipt(receipt_ctx) {
         Ok(receipt) => receipt,
-        Err(ctx) => {
+        Err(receipt_ctx) => {
             let receipt = alloy_consensus::Receipt {
                 // Success flag was added in `EIP-658: Embedding transaction status code
                 // in receipts`.
-                status: Eip658Value::Eip658(ctx.result.is_success()),
-                cumulative_gas_used: ctx.cumulative_gas_used,
-                logs: ctx.result.into_logs(),
+                status: Eip658Value::Eip658(receipt_ctx.result.is_success()),
+                cumulative_gas_used: receipt_ctx.cumulative_gas_used,
+                logs: receipt_ctx.result.into_logs(),
             };
 
             receipt_builder.build_deposit_receipt(OpDepositReceipt {
@@ -430,18 +385,36 @@ fn build_receipt<E: alloy_evm::Evm>(
                 // when set. The state transition process ensures
                 // this is only set for post-Canyon deposit
                 // transactions.
-                deposit_receipt_version: is_canyon_active.then_some(1),
+                deposit_receipt_version: ctx.is_canyon_active(timestamp).then_some(1),
             })
         }
     }
 }
 
-fn is_canyon_active(chain_spec: &OpChainSpec, timestamp: u64) -> bool {
-    use reth_optimism_chainspec::OpHardforks as _;
-    chain_spec.is_canyon_active_at_timestamp(timestamp)
-}
+/// Validates the payload header and its relationship with the parent before execution.
+/// This performs consensus rule validation including:
+/// - Header field validation (timestamp, gas limit, etc.)
+/// - Parent relationship validation (block number increment, timestamp progression)
+fn validate_pre_execution(
+    payload: &OpBuiltPayload,
+    parent_header: &reth_primitives_traits::Header,
+    parent_hash: alloy_primitives::B256,
+    chain_spec: Arc<OpChainSpec>,
+) -> eyre::Result<()> {
+    use reth::consensus::HeaderValidator;
 
-fn is_regolith_active(chain_spec: &OpChainSpec, timestamp: u64) -> bool {
-    use reth_optimism_chainspec::OpHardforks as _;
-    chain_spec.is_regolith_active_at_timestamp(timestamp)
+    let consensus = OpBeaconConsensus::new(chain_spec);
+    let parent_sealed = SealedHeader::new(parent_header.clone(), parent_hash);
+
+    // Validate incoming header
+    consensus
+        .validate_header(payload.block().sealed_header())
+        .wrap_err("header validation failed")?;
+
+    // Validate incoming header against parent
+    consensus
+        .validate_header_against_parent(payload.block().sealed_header(), &parent_sealed)
+        .wrap_err("header validation against parent failed")?;
+
+    Ok(())
 }