feat(optimism): Replace OpTransactionSigned bound on the Block associated to OpEngineValidator with a generic (#16486)

Author: RomanHodulak

crates/optimism/node/src/engine.rs

@@ -21,10 +21,10 @@ use reth_optimism_consensus::isthmus;
 use reth_optimism_forks::{OpHardfork, OpHardforks};
 use reth_optimism_payload_builder::{OpExecutionPayloadValidator, OpPayloadTypes};
 use reth_optimism_primitives::{OpBlock, ADDRESS_L2_TO_L1_MESSAGE_PASSER};
-use reth_primitives_traits::{RecoveredBlock, SealedBlock};
+use reth_primitives_traits::{RecoveredBlock, SealedBlock, SignedTransaction};
 use reth_provider::StateProviderFactory;
 use reth_trie_common::{HashedPostState, KeyHasher};
-use std::sync::Arc;
+use std::{marker::PhantomData, sync::Arc};
 
 /// The types used in the optimism beacon consensus engine.
 #[derive(Debug, Default, Clone, serde::Deserialize, serde::Serialize)]
@@ -71,20 +71,22 @@ where
 
 /// Validator for Optimism engine API.
 #[derive(Debug, Clone)]
-pub struct OpEngineValidator<P> {
+pub struct OpEngineValidator<P, Tx> {
     inner: OpExecutionPayloadValidator<OpChainSpec>,
     provider: P,
     hashed_addr_l2tol1_msg_passer: B256,
+    phantom: PhantomData<Tx>,
 }
 
-impl<P> OpEngineValidator<P> {
+impl<P, Tx> OpEngineValidator<P, Tx> {
     /// Instantiates a new validator.
     pub fn new<KH: KeyHasher>(chain_spec: Arc<OpChainSpec>, provider: P) -> Self {
         let hashed_addr_l2tol1_msg_passer = KH::hash_key(ADDRESS_L2_TO_L1_MESSAGE_PASSER);
         Self {
             inner: OpExecutionPayloadValidator::new(chain_spec),
             provider,
             hashed_addr_l2tol1_msg_passer,
+            phantom: PhantomData,
         }
     }
 
@@ -95,11 +97,12 @@ impl<P> OpEngineValidator<P> {
     }
 }
 
-impl<P> PayloadValidator for OpEngineValidator<P>
+impl<P, Tx> PayloadValidator for OpEngineValidator<P, Tx>
 where
     P: StateProviderFactory + Unpin + 'static,
+    Tx: SignedTransaction + Unpin + 'static,
 {
-    type Block = OpBlock;
+    type Block = alloy_consensus::Block<Tx>;
     type ExecutionData = OpExecutionData;
 
     fn ensure_well_formed_payload(
@@ -142,13 +145,15 @@ where
     }
 }
 
-impl<Types, P> EngineValidator<Types> for OpEngineValidator<P>
+impl<Types, P, Tx> EngineValidator<Types> for OpEngineValidator<P, Tx>
 where
     Types: PayloadTypes<
         PayloadAttributes = OpPayloadAttributes,
         ExecutionData = <Self as PayloadValidator>::ExecutionData,
+        BuiltPayload: BuiltPayload<Primitives: NodePrimitives<SignedTx = Tx>>,
     >,
     P: StateProviderFactory + Unpin + 'static,
+    Tx: SignedTransaction + Unpin + 'static + Send + Sync,
 {
     fn validate_version_specific_fields(
         &self,
@@ -311,7 +316,7 @@ mod test {
             OpEngineValidator::new::<KeccakKeyHasher>(get_chainspec(), NoopProvider::default());
         let attributes = get_attributes(None, 1732633199);
 
-        let result = <engine::OpEngineValidator<_> as EngineValidator<
+        let result = <engine::OpEngineValidator<_, _> as EngineValidator<
             OpEngineTypes,
         >>::ensure_well_formed_attributes(
             &validator, EngineApiMessageVersion::V3, &attributes
@@ -325,7 +330,7 @@ mod test {
             OpEngineValidator::new::<KeccakKeyHasher>(get_chainspec(), NoopProvider::default());
         let attributes = get_attributes(None, 1732633200);
 
-        let result = <engine::OpEngineValidator<_> as EngineValidator<
+        let result = <engine::OpEngineValidator<_, _> as EngineValidator<
             OpEngineTypes,
         >>::ensure_well_formed_attributes(
             &validator, EngineApiMessageVersion::V3, &attributes
@@ -339,7 +344,7 @@ mod test {
             OpEngineValidator::new::<KeccakKeyHasher>(get_chainspec(), NoopProvider::default());
         let attributes = get_attributes(Some(b64!("0000000000000008")), 1732633200);
 
-        let result = <engine::OpEngineValidator<_> as EngineValidator<
+        let result = <engine::OpEngineValidator<_, _> as EngineValidator<
             OpEngineTypes,
         >>::ensure_well_formed_attributes(
             &validator, EngineApiMessageVersion::V3, &attributes
@@ -353,7 +358,7 @@ mod test {
             OpEngineValidator::new::<KeccakKeyHasher>(get_chainspec(), NoopProvider::default());
         let attributes = get_attributes(Some(b64!("0000000800000008")), 1732633200);
 
-        let result = <engine::OpEngineValidator<_> as EngineValidator<
+        let result = <engine::OpEngineValidator<_, _> as EngineValidator<
             OpEngineTypes,
         >>::ensure_well_formed_attributes(
             &validator, EngineApiMessageVersion::V3, &attributes
@@ -367,7 +372,7 @@ mod test {
             OpEngineValidator::new::<KeccakKeyHasher>(get_chainspec(), NoopProvider::default());
         let attributes = get_attributes(Some(b64!("0000000000000000")), 1732633200);
 
-        let result = <engine::OpEngineValidator<_> as EngineValidator<
+        let result = <engine::OpEngineValidator<_, _> as EngineValidator<
             OpEngineTypes,
         >>::ensure_well_formed_attributes(
             &validator, EngineApiMessageVersion::V3, &attributes

crates/optimism/node/src/node.rs

@@ -406,7 +406,10 @@ where
     >,
     OpEthApiBuilder<NetworkT>: EthApiBuilder<N>,
 {
-    type Validator = OpEngineValidator<N::Provider>;
+    type Validator = OpEngineValidator<
+        N::Provider,
+        <<N::Types as NodeTypes>::Primitives as NodePrimitives>::SignedTx,
+    >;
 
     async fn engine_validator(&self, ctx: &AddOnsContext<'_, N>) -> eyre::Result<Self::Validator> {
         OpEngineValidatorBuilder::default().build(ctx).await
@@ -951,7 +954,10 @@ where
     Types: NodeTypes<ChainSpec = OpChainSpec, Primitives = OpPrimitives, Payload = OpEngineTypes>,
     Node: FullNodeComponents<Types = Types>,
 {
-    type Validator = OpEngineValidator<Node::Provider>;
+    type Validator = OpEngineValidator<
+        Node::Provider,
+        <<Node::Types as NodeTypes>::Primitives as NodePrimitives>::SignedTx,
+    >;
 
     async fn build(self, ctx: &AddOnsContext<'_, Node>) -> eyre::Result<Self::Validator> {
         Ok(OpEngineValidator::new::<KeyHasherTy<Types>>(