From 4e97f48182db093533133b63c7b07eba42f572fb Mon Sep 17 00:00:00 2001
From: Rez <rez@berachain.com>
Date: Sun, 15 Jun 2025 00:50:07 +1000
Subject: [PATCH] feat: make `EthereumEngineValidator` generic over `ChainSpec`
 (#16812)

---
 crates/ethereum/node/src/engine.rs | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/crates/ethereum/node/src/engine.rs b/crates/ethereum/node/src/engine.rs
index f6c26dbfb2..14e1f4eff2 100644
--- a/crates/ethereum/node/src/engine.rs
+++ b/crates/ethereum/node/src/engine.rs
@@ -5,7 +5,7 @@ pub use alloy_rpc_types_engine::{
     ExecutionPayloadEnvelopeV2, ExecutionPayloadEnvelopeV3, ExecutionPayloadEnvelopeV4,
     ExecutionPayloadV1, PayloadAttributes as EthPayloadAttributes,
 };
-use reth_chainspec::ChainSpec;
+use reth_chainspec::{EthChainSpec, EthereumHardforks};
 use reth_engine_primitives::{EngineValidator, PayloadValidator};
 use reth_ethereum_payload_builder::EthereumExecutionPayloadValidator;
 use reth_ethereum_primitives::Block;
@@ -19,11 +19,11 @@ use std::sync::Arc;
 
 /// Validator for the ethereum engine API.
 #[derive(Debug, Clone)]
-pub struct EthereumEngineValidator {
+pub struct EthereumEngineValidator<ChainSpec = reth_chainspec::ChainSpec> {
     inner: EthereumExecutionPayloadValidator<ChainSpec>,
 }
 
-impl EthereumEngineValidator {
+impl<ChainSpec> EthereumEngineValidator<ChainSpec> {
     /// Instantiates a new validator.
     pub const fn new(chain_spec: Arc<ChainSpec>) -> Self {
         Self { inner: EthereumExecutionPayloadValidator::new(chain_spec) }
@@ -36,7 +36,10 @@ impl EthereumEngineValidator {
     }
 }
 
-impl PayloadValidator for EthereumEngineValidator {
+impl<ChainSpec> PayloadValidator for EthereumEngineValidator<ChainSpec>
+where
+    ChainSpec: EthChainSpec + EthereumHardforks + 'static,
+{
     type Block = Block;
     type ExecutionData = ExecutionData;
 
@@ -49,8 +52,9 @@ impl PayloadValidator for EthereumEngineValidator {
     }
 }
 
-impl<Types> EngineValidator<Types> for EthereumEngineValidator
+impl<ChainSpec, Types> EngineValidator<Types> for EthereumEngineValidator<ChainSpec>
 where
+    ChainSpec: EthChainSpec + EthereumHardforks + 'static,
     Types: PayloadTypes<PayloadAttributes = EthPayloadAttributes, ExecutionData = ExecutionData>,
 {
     fn validate_version_specific_fields(