Merge branch 'main' into matt/relax-pool-validate-fns

crates/optimism/node/Cargo.toml

@@ -16,6 +16,7 @@ reth-chainspec.workspace = true
 reth-db.workspace = true
 reth-engine-local.workspace = true
 reth-primitives.workspace = true
+reth-primitives-traits.workspace = true
 reth-payload-builder.workspace = true
 reth-payload-util.workspace = true
 reth-payload-validator.workspace = true

crates/optimism/node/src/txpool.rs

@@ -3,8 +3,7 @@ use alloy_consensus::{BlockHeader, Transaction};
 use alloy_eips::eip2718::Encodable2718;
 use parking_lot::RwLock;
 use reth_chainspec::ChainSpec;
-use reth_node_api::BlockBody;
-use reth_node_core::primitives::BlockHeader;
+use reth_node_api::{Block, BlockBody};
 use reth_optimism_evm::RethL1BlockInfo;
 use reth_primitives::{GotExpected, InvalidTransactionError, SealedBlock, TransactionSigned};
 use reth_provider::{BlockReaderIdExt, StateProviderFactory};
@@ -225,7 +224,7 @@ where
 
     fn on_new_head_block<H, B>(&self, new_tip_block: &SealedBlock<H, B>)
     where
-        H: BlockHeader,
+        H: reth_primitives_traits::BlockHeader,
         B: BlockBody,
     {
         self.inner.on_new_head_block(new_tip_block);

crates/transaction-pool/src/validate/mod.rs

@@ -243,7 +243,11 @@ where
         }
     }
 
-    fn on_new_head_block(&self, new_tip_block: &SealedBlock) {
+    fn on_new_head_block<H, Body>(&self, new_tip_block: &SealedBlock<H, Body>)
+    where
+        H: BlockHeader,
+        Body: BlockBody,
+    {
         match self {
             Self::Left(v) => v.on_new_head_block(new_tip_block),
             Self::Right(v) => v.on_new_head_block(new_tip_block),

crates/transaction-pool/src/validate/task.rs

@@ -9,6 +9,7 @@ use crate::{
 use futures_util::{lock::Mutex, StreamExt};
 use reth_chainspec::ChainSpec;
 use reth_primitives::SealedBlock;
+use reth_primitives_traits::{BlockBody, BlockHeader};
 use reth_tasks::TaskSpawner;
 use std::{future::Future, pin::Pin, sync::Arc};
 use tokio::{
@@ -205,7 +206,11 @@ where
         }
     }
 
-    fn on_new_head_block(&self, new_tip_block: &SealedBlock) {
+    fn on_new_head_block<H, B>(&self, new_tip_block: &SealedBlock<H, B>)
+    where
+        H: BlockHeader,
+        B: BlockBody,
+    {
         self.validator.on_new_head_block(new_tip_block)
     }
 }