fix: call validate_execution_requests from validate_version_specific_fields for ethereum engine validator (#14932)

Author: fgimenez

Cargo.lock

@@ -26,7 +26,6 @@ reth-trie-common.workspace = true
 alloy-primitives.workspace = true
 alloy-consensus.workspace = true
 alloy-rpc-types-engine.workspace = true
-alloy-eips.workspace = true
 
 # async
 tokio = { workspace = true, features = ["sync"] }
@@ -50,5 +49,4 @@ std = [
     "futures/std",
     "serde/std",
     "thiserror/std",
-    "alloy-eips/std",
 ]

crates/engine/primitives/Cargo.toml

@@ -12,12 +12,11 @@
 extern crate alloc;
 
 use alloy_consensus::BlockHeader;
-use alloy_eips::eip7685::Requests;
 use reth_errors::ConsensusError;
 use reth_payload_primitives::{
-    validate_execution_requests, BuiltPayload, EngineApiMessageVersion,
-    EngineObjectValidationError, InvalidPayloadAttributesError, NewPayloadError, PayloadAttributes,
-    PayloadOrAttributes, PayloadTypes,
+    BuiltPayload, EngineApiMessageVersion, EngineObjectValidationError,
+    InvalidPayloadAttributesError, NewPayloadError, PayloadAttributes, PayloadOrAttributes,
+    PayloadTypes,
 };
 use reth_primitives::{NodePrimitives, RecoveredBlock, SealedBlock};
 use reth_primitives_traits::Block;
@@ -136,14 +135,6 @@ pub trait PayloadValidator: Send + Sync + Unpin + 'static {
 pub trait EngineValidator<Types: EngineTypes>:
     PayloadValidator<ExecutionData = Types::ExecutionData>
 {
-    /// Validates the execution requests according to [EIP-7685](https://eips.ethereum.org/EIPS/eip-7685).
-    fn validate_execution_requests(
-        &self,
-        requests: &Requests,
-    ) -> Result<(), EngineObjectValidationError> {
-        validate_execution_requests(requests)
-    }
-
     /// Validates the presence or exclusion of fork-specific fields based on the payload attributes
     /// and the message version.
     fn validate_version_specific_fields(

crates/engine/primitives/src/lib.rs

@@ -9,8 +9,8 @@ use reth_chainspec::ChainSpec;
 use reth_engine_primitives::{EngineTypes, EngineValidator, PayloadValidator};
 use reth_ethereum_payload_builder::EthereumExecutionPayloadValidator;
 use reth_payload_primitives::{
-    validate_version_specific_fields, EngineApiMessageVersion, EngineObjectValidationError,
-    NewPayloadError, PayloadOrAttributes,
+    validate_execution_requests, validate_version_specific_fields, EngineApiMessageVersion,
+    EngineObjectValidationError, NewPayloadError, PayloadOrAttributes,
 };
 use reth_primitives::{Block, RecoveredBlock};
 use std::sync::Arc;
@@ -56,6 +56,11 @@ where
         version: EngineApiMessageVersion,
         payload_or_attrs: PayloadOrAttributes<'_, Self::ExecutionData, EthPayloadAttributes>,
     ) -> Result<(), EngineObjectValidationError> {
+        payload_or_attrs
+            .execution_requests()
+            .map(|requests| validate_execution_requests(requests))
+            .transpose()?;
+
         validate_version_specific_fields(self.chain_spec(), version, payload_or_attrs)
     }
 

crates/ethereum/node/src/engine.rs

@@ -150,19 +150,6 @@ where
     Types: EngineTypes<PayloadAttributes = OpPayloadAttributes, ExecutionData = OpExecutionData>,
     P: StateProviderFactory + Unpin + 'static,
 {
-    fn validate_execution_requests(
-        &self,
-        requests: &alloy_eips::eip7685::Requests,
-    ) -> Result<(), EngineObjectValidationError> {
-        // according to op spec, execution requests must be empty
-        if !requests.is_empty() {
-            return Err(EngineObjectValidationError::InvalidParams(
-                "NonEmptyExecutionRequests".to_string().into(),
-            ))
-        }
-        Ok(())
-    }
-
     fn validate_version_specific_fields(
         &self,
         version: EngineApiMessageVersion,

crates/optimism/node/src/engine.rs

@@ -1,6 +1,6 @@
 use crate::{MessageValidationKind, PayloadAttributes};
 use alloc::vec::Vec;
-use alloy_eips::eip4895::Withdrawal;
+use alloy_eips::{eip4895::Withdrawal, eip7685::Requests};
 use alloy_primitives::B256;
 use alloy_rpc_types_engine::ExecutionData;
 use core::fmt::Debug;
@@ -164,3 +164,25 @@ impl ExecutionPayload for op_alloy_rpc_types_engine::OpExecutionData {
         self.payload.as_v1().gas_used
     }
 }
+
+/// Special implementation for Ethereum types that provides additional helper methods
+impl<'a, Attributes> PayloadOrAttributes<'a, ExecutionData, Attributes>
+where
+    Attributes: PayloadAttributes,
+{
+    /// Return the execution requests from the payload, if available.
+    ///
+    /// This will return `Some(requests)` only if:
+    /// - The payload is an `ExecutionData` (not `PayloadAttributes`)
+    /// - The payload has Prague payload fields
+    /// - The Prague fields contain requests (not a hash)
+    ///
+    /// Returns `None` in all other cases.
+    pub fn execution_requests(&self) -> Option<&Requests> {
+        if let Self::ExecutionPayload(payload) = self {
+            payload.sidecar.requests()
+        } else {
+            None
+        }
+    }
+}