Abstract txpool, decoupling it from reth

crates/op-rbuilder/src/main.rs

@@ -28,6 +28,7 @@ mod primitives;
 mod tester;
 mod tx_signer;
 use monitor_tx_pool::monitor_tx_pool;
+mod txpool_trait;
 
 fn main() {
     Cli::<OpChainSpecParser, args::OpRbuilderArgs>::parse()

crates/op-rbuilder/src/payload_builder_vanilla.rs

@@ -1,3 +1,4 @@
+use crate::txpool_trait::BuilderTransactionPool;
 use crate::{
     generator::{BlockCell, BlockPayloadJobGenerator, BuildArguments, PayloadBuilder},
     metrics::OpRBuilderMetrics,
@@ -772,30 +773,30 @@ impl<Txs> OpBuilder<'_, Txs> {
 pub trait OpPayloadTransactions<Transaction>: Clone + Send + Sync + Unpin + 'static {
     /// Returns an iterator that yields the transaction in the order they should get included in the
     /// new payload.
-    fn best_transactions<Pool: TransactionPool<Transaction = Transaction>>(
+    fn best_transactions<Pool: BuilderTransactionPool<Transaction = Transaction>>(
         &self,
         pool: Pool,
         attr: BestTransactionsAttributes,
     ) -> impl PayloadTransactions<Transaction = Transaction>;
 
     /// Removes invalid transactions from the tx pool
-    fn remove_invalid<Pool: TransactionPool<Transaction = Transaction>>(
+    fn remove_invalid<Pool: BuilderTransactionPool<Transaction = Transaction>>(
         &self,
         pool: Pool,
         hashes: Vec<TxHash>,
     );
 }
 
 impl<T: PoolTransaction> OpPayloadTransactions<T> for () {
-    fn best_transactions<Pool: TransactionPool<Transaction = T>>(
+    fn best_transactions<Pool: BuilderTransactionPool<Transaction = T>>(
         &self,
         pool: Pool,
         attr: BestTransactionsAttributes,
     ) -> impl PayloadTransactions<Transaction = T> {
         BestPayloadTransactions::new(pool.best_transactions_with_attributes(attr))
     }
 
-    fn remove_invalid<Pool: TransactionPool<Transaction = T>>(
+    fn remove_invalid<Pool: BuilderTransactionPool<Transaction = T>>(
         &self,
         pool: Pool,
         hashes: Vec<TxHash>,

crates/op-rbuilder/src/txpool_trait.rs

@@ -0,0 +1,46 @@
+use alloy_primitives::TxHash;
+use reth_transaction_pool::TransactionPool;
+use reth_transaction_pool::{
+    BestTransactions, BestTransactionsAttributes, EthPoolTransaction, ValidPoolTransaction,
+};
+use std::sync::Arc;
+
+pub trait BuilderTransactionPool: Send + Sync + Clone {
+    /// The transaction type of the pool
+    type Transaction: EthPoolTransaction;
+
+    /// Returns an iterator that yields transactions that are ready for block production with the
+    /// given base fee and optional blob fee attributes.
+    ///
+    /// Consumer: Block production
+    fn best_transactions_with_attributes(
+        &self,
+        best_transactions_attributes: BestTransactionsAttributes,
+    ) -> Box<dyn BestTransactions<Item = Arc<ValidPoolTransaction<Self::Transaction>>>>;
+
+    /// Removes all transactions corresponding to the given hashes.
+    ///
+    /// Consumer: Utility
+    fn remove_transactions(
+        &self,
+        hashes: Vec<TxHash>,
+    ) -> Vec<Arc<ValidPoolTransaction<Self::Transaction>>>;
+}
+
+impl<T: TransactionPool> BuilderTransactionPool for T {
+    type Transaction = T::Transaction;
+
+    fn best_transactions_with_attributes(
+        &self,
+        best_transactions_attributes: BestTransactionsAttributes,
+    ) -> Box<dyn BestTransactions<Item = Arc<ValidPoolTransaction<Self::Transaction>>>> {
+        TransactionPool::best_transactions_with_attributes(self, best_transactions_attributes)
+    }
+
+    fn remove_transactions(
+        &self,
+        hashes: Vec<TxHash>,
+    ) -> Vec<Arc<ValidPoolTransaction<Self::Transaction>>> {
+        TransactionPool::remove_transactions(self, hashes)
+    }
+}