From 9a732f6b7813f9ecb5f28b379d3062c287a78e70 Mon Sep 17 00:00:00 2001
From: Steven <112043913+stevencartavia@users.noreply.github.com>
Date: Mon, 7 Oct 2024 10:30:57 -0600
Subject: [PATCH] Introduce Eth PayloadTypes Impl (#11519)

Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
---
 crates/ethereum/engine-primitives/src/lib.rs | 33 +++++++++++++++-----
 crates/node/types/src/lib.rs                 |  1 +
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/crates/ethereum/engine-primitives/src/lib.rs b/crates/ethereum/engine-primitives/src/lib.rs
index 69d73a021..034a8c6bf 100644
--- a/crates/ethereum/engine-primitives/src/lib.rs
+++ b/crates/ethereum/engine-primitives/src/lib.rs
@@ -26,21 +26,40 @@ use reth_payload_primitives::{
 /// The types used in the default mainnet ethereum beacon consensus engine.
 #[derive(Debug, Default, Clone, serde::Deserialize, serde::Serialize)]
 #[non_exhaustive]
-pub struct EthEngineTypes;
-
-impl PayloadTypes for EthEngineTypes {
-    type BuiltPayload = EthBuiltPayload;
-    type PayloadAttributes = EthPayloadAttributes;
-    type PayloadBuilderAttributes = EthPayloadBuilderAttributes;
+pub struct EthEngineTypes<T: PayloadTypes = EthPayloadTypes> {
+    _marker: std::marker::PhantomData<T>,
 }
 
-impl EngineTypes for EthEngineTypes {
+impl<T: PayloadTypes> PayloadTypes for EthEngineTypes<T> {
+    type BuiltPayload = T::BuiltPayload;
+    type PayloadAttributes = T::PayloadAttributes;
+    type PayloadBuilderAttributes = T::PayloadBuilderAttributes;
+}
+
+impl<T: PayloadTypes> EngineTypes for EthEngineTypes<T>
+where
+    T::BuiltPayload: TryInto<ExecutionPayloadV1>
+        + TryInto<ExecutionPayloadEnvelopeV2>
+        + TryInto<ExecutionPayloadEnvelopeV3>
+        + TryInto<ExecutionPayloadEnvelopeV4>,
+{
     type ExecutionPayloadV1 = ExecutionPayloadV1;
     type ExecutionPayloadV2 = ExecutionPayloadEnvelopeV2;
     type ExecutionPayloadV3 = ExecutionPayloadEnvelopeV3;
     type ExecutionPayloadV4 = ExecutionPayloadEnvelopeV4;
 }
 
+/// A default payload type for [`EthEngineTypes`]
+#[derive(Debug, Default, Clone, serde::Deserialize, serde::Serialize)]
+#[non_exhaustive]
+pub struct EthPayloadTypes;
+
+impl PayloadTypes for EthPayloadTypes {
+    type BuiltPayload = EthBuiltPayload;
+    type PayloadAttributes = EthPayloadAttributes;
+    type PayloadBuilderAttributes = EthPayloadBuilderAttributes;
+}
+
 /// Validator for the ethereum engine API.
 #[derive(Debug, Clone)]
 pub struct EthereumEngineValidator {
diff --git a/crates/node/types/src/lib.rs b/crates/node/types/src/lib.rs
index 2c72e02d3..0f6d5a1a3 100644
--- a/crates/node/types/src/lib.rs
+++ b/crates/node/types/src/lib.rs
@@ -40,6 +40,7 @@ pub trait NodeTypes: Send + Sync + Unpin + 'static {
 pub trait NodeTypesWithEngine: NodeTypes {
     /// The node's engine types, defining the interaction with the consensus engine.
     type Engine: EngineTypes;
+    // type Engine: EngineTypes;
 }
 
 /// A helper trait that is downstream of the [`NodeTypesWithEngine`] trait and adds database to the