feat: add ExecutionData AT (#14179)

crates/engine/primitives/Cargo.toml

@@ -31,6 +31,7 @@ tokio = { workspace = true, features = ["sync"] }
 futures.workspace = true
 
 # misc
+auto_impl.workspace = true
 serde.workspace = true
 thiserror.workspace = true
 

crates/engine/primitives/src/lib.rs

@@ -15,10 +15,10 @@ use alloy_primitives::B256;
 use reth_payload_primitives::{BuiltPayload, PayloadAttributes};
 mod error;
 
-use core::fmt;
+use core::fmt::{self, Debug};
 
 use alloy_consensus::BlockHeader;
-use alloy_rpc_types_engine::{ExecutionPayload, ExecutionPayloadSidecar, PayloadError};
+use alloy_rpc_types_engine::{ExecutionPayloadSidecar, PayloadError};
 pub use error::*;
 
 mod forkchoice;
@@ -42,37 +42,25 @@ use reth_primitives::{NodePrimitives, SealedBlock};
 use reth_primitives_traits::Block;
 use serde::{de::DeserializeOwned, Deserialize, Serialize};
 
-/// Struct aggregating [`ExecutionPayload`] and [`ExecutionPayloadSidecar`] and encapsulating
-/// complete payload supplied for execution.
+/// Struct aggregating [`alloy_rpc_types_engine::ExecutionPayload`] and [`ExecutionPayloadSidecar`]
+/// and encapsulating complete payload supplied for execution.
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct ExecutionData {
     /// Execution payload.
-    pub payload: ExecutionPayload,
+    pub payload: alloy_rpc_types_engine::ExecutionPayload,
     /// Additional fork-specific fields.
     pub sidecar: ExecutionPayloadSidecar,
 }
 
 impl ExecutionData {
     /// Creates new instance of [`ExecutionData`].
-    pub const fn new(payload: ExecutionPayload, sidecar: ExecutionPayloadSidecar) -> Self {
+    pub const fn new(
+        payload: alloy_rpc_types_engine::ExecutionPayload,
+        sidecar: ExecutionPayloadSidecar,
+    ) -> Self {
         Self { payload, sidecar }
     }
 
-    /// Returns the parent hash of the block.
-    pub fn parent_hash(&self) -> B256 {
-        self.payload.parent_hash()
-    }
-
-    /// Returns the hash of the block.
-    pub fn block_hash(&self) -> B256 {
-        self.payload.block_hash()
-    }
-
-    /// Returns the number of the block.
-    pub fn block_number(&self) -> u64 {
-        self.payload.block_number()
-    }
-
     /// Tries to create a new unsealed block from the given payload and payload sidecar.
     ///
     /// Performs additional validation of `extra_data` and `base_fee_per_gas` fields.
@@ -89,6 +77,34 @@ impl ExecutionData {
     }
 }
 
+/// An execution payload.
+pub trait ExecutionPayload:
+    Serialize + DeserializeOwned + Debug + Clone + Send + Sync + 'static
+{
+    /// Returns the parent hash of the block.
+    fn parent_hash(&self) -> B256;
+
+    /// Returns the hash of the block.
+    fn block_hash(&self) -> B256;
+
+    /// Returns the number of the block.
+    fn block_number(&self) -> u64;
+}
+
+impl ExecutionPayload for ExecutionData {
+    fn parent_hash(&self) -> B256 {
+        self.payload.parent_hash()
+    }
+
+    fn block_hash(&self) -> B256 {
+        self.payload.block_hash()
+    }
+
+    fn block_number(&self) -> u64 {
+        self.payload.block_number()
+    }
+}
+
 /// This type defines the versioned types of the engine API.
 ///
 /// This includes the execution payload types and payload attributes that are used to trigger a
@@ -135,20 +151,26 @@ pub trait EngineTypes:
         + Send
         + Sync
         + 'static;
+    /// Execution data.
+    type ExecutionData: ExecutionPayload;
 
     /// Converts a [`BuiltPayload`] into an [`ExecutionPayload`] and [`ExecutionPayloadSidecar`].
     fn block_to_payload(
         block: SealedBlock<
             <<Self::BuiltPayload as BuiltPayload>::Primitives as NodePrimitives>::Block,
         >,
-    ) -> ExecutionData;
+    ) -> Self::ExecutionData;
 }
 
 /// Type that validates an [`ExecutionPayload`].
+#[auto_impl::auto_impl(&, Arc)]
 pub trait PayloadValidator: fmt::Debug + Send + Sync + Unpin + 'static {
     /// The block type used by the engine.
     type Block: Block;
 
+    /// The execution payload type used by the engine.
+    type ExecutionData;
+
     /// Ensures that the given payload does not violate any consensus rules that concern the block's
     /// layout.
     ///
@@ -159,12 +181,14 @@ pub trait PayloadValidator: fmt::Debug + Send + Sync + Unpin + 'static {
     /// engine-API specification.
     fn ensure_well_formed_payload(
         &self,
-        payload: ExecutionData,
+        payload: Self::ExecutionData,
     ) -> Result<SealedBlock<Self::Block>, PayloadError>;
 }
 
 /// Type that validates the payloads processed by the engine.
-pub trait EngineValidator<Types: EngineTypes>: PayloadValidator {
+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,

crates/engine/primitives/src/message.rs

@@ -1,6 +1,6 @@
 use crate::{
     error::BeaconForkChoiceUpdateError, BeaconOnNewPayloadError, EngineApiMessageVersion,
-    EngineTypes, ExecutionData, ForkchoiceStatus,
+    EngineTypes, ExecutionPayload, ForkchoiceStatus,
 };
 use alloy_rpc_types_engine::{
     ForkChoiceUpdateResult, ForkchoiceState, ForkchoiceUpdateError, ForkchoiceUpdated, PayloadId,
@@ -145,7 +145,7 @@ pub enum BeaconEngineMessage<Engine: EngineTypes> {
     /// Message with new payload.
     NewPayload {
         /// The execution payload received by Engine API.
-        payload: ExecutionData,
+        payload: Engine::ExecutionData,
         /// The sender for returning payload status result.
         tx: oneshot::Sender<Result<PayloadStatus, BeaconOnNewPayloadError>>,
     },
@@ -217,7 +217,7 @@ where
     /// See also <https://github.com/ethereum/execution-apis/blob/3d627c95a4d3510a8187dd02e0250ecb4331d27e/src/engine/shanghai.md#engine_newpayloadv2>
     pub async fn new_payload(
         &self,
-        payload: ExecutionData,
+        payload: Engine::ExecutionData,
     ) -> Result<PayloadStatus, BeaconOnNewPayloadError> {
         let (tx, rx) = oneshot::channel();
         let _ = self.to_engine.send(BeaconEngineMessage::NewPayload { payload, tx });