feat(perp): optimize OpTxpool 2718 bytes encoding (#16336)

Author: kiflomte

crates/optimism/node/src/node.rs

@@ -41,8 +41,6 @@ use reth_optimism_rpc::{
     OpEthApi, OpEthApiError, SequencerClient,
 };
 use reth_optimism_txpool::{
-    conditional::MaybeConditionalTransaction,
-    interop::MaybeInteropTransaction,
     supervisor::{SupervisorClient, DEFAULT_SUPERVISOR_URL},
     OpPooledTx,
 };
@@ -536,9 +534,7 @@ impl<T> OpPoolBuilder<T> {
 impl<Node, T> PoolBuilder<Node> for OpPoolBuilder<T>
 where
     Node: FullNodeTypes<Types: NodeTypes<ChainSpec: OpHardforks>>,
-    T: EthPoolTransaction<Consensus = TxTy<Node::Types>>
-        + MaybeConditionalTransaction
-        + MaybeInteropTransaction,
+    T: EthPoolTransaction<Consensus = TxTy<Node::Types>> + OpPooledTx,
 {
     type Pool = OpTransactionPool<Node::Provider, DiskFileBlobStore, T>;
 

crates/optimism/txpool/src/transaction.rs

@@ -5,7 +5,11 @@ use crate::{
 use alloy_consensus::{
     transaction::Recovered, BlobTransactionSidecar, BlobTransactionValidationError, Typed2718,
 };
-use alloy_eips::{eip2718::WithEncoded, eip2930::AccessList, eip7702::SignedAuthorization};
+use alloy_eips::{
+    eip2718::{Encodable2718, WithEncoded},
+    eip2930::AccessList,
+    eip7702::SignedAuthorization,
+};
 use alloy_primitives::{Address, Bytes, TxHash, TxKind, B256, U256};
 use alloy_rpc_types_eth::erc4337::TransactionConditional;
 use c_kzg::KzgSettings;
@@ -15,9 +19,12 @@ use reth_primitives_traits::{InMemorySize, SignedTransaction};
 use reth_transaction_pool::{
     EthBlobTransactionSidecar, EthPoolTransaction, EthPooledTransaction, PoolTransaction,
 };
-use std::sync::{
-    atomic::{AtomicU64, Ordering},
-    Arc, OnceLock,
+use std::{
+    borrow::Cow,
+    sync::{
+        atomic::{AtomicU64, Ordering},
+        Arc, OnceLock,
+    },
 };
 
 /// Marker for no-interop transactions
@@ -287,13 +294,19 @@ where
 pub trait OpPooledTx:
     MaybeConditionalTransaction + MaybeInteropTransaction + PoolTransaction + DataAvailabilitySized
 {
+    /// Returns the EIP-2718 encoded bytes of the transaction.
+    fn encoded_2718(&self) -> Cow<'_, Bytes>;
 }
-impl<T> OpPooledTx for T where
-    T: MaybeConditionalTransaction
-        + MaybeInteropTransaction
-        + PoolTransaction
-        + DataAvailabilitySized
+
+impl<Cons, Pooled> OpPooledTx for OpPooledTransaction<Cons, Pooled>
+where
+    Cons: SignedTransaction + From<Pooled>,
+    Pooled: SignedTransaction + TryFrom<Cons>,
+    <Pooled as TryFrom<Cons>>::Error: core::error::Error,
 {
+    fn encoded_2718(&self) -> Cow<'_, Bytes> {
+        Cow::Borrowed(self.encoded_2718())
+    }
 }
 
 #[cfg(test)]

crates/optimism/txpool/src/validator.rs

@@ -1,6 +1,5 @@
-use crate::{interop::MaybeInteropTransaction, supervisor::SupervisorClient, InvalidCrossTx};
+use crate::{supervisor::SupervisorClient, InvalidCrossTx, OpPooledTx};
 use alloy_consensus::{BlockHeader, Transaction};
-use alloy_eips::Encodable2718;
 use op_revm::L1BlockInfo;
 use parking_lot::RwLock;
 use reth_chainspec::ChainSpecProvider;
@@ -92,7 +91,7 @@ impl<Client, Tx> OpTransactionValidator<Client, Tx> {
 impl<Client, Tx> OpTransactionValidator<Client, Tx>
 where
     Client: ChainSpecProvider<ChainSpec: OpHardforks> + StateProviderFactory + BlockReaderIdExt,
-    Tx: EthPoolTransaction + MaybeInteropTransaction,
+    Tx: EthPoolTransaction + OpPooledTx,
 {
     /// Create a new [`OpTransactionValidator`].
     pub fn new(inner: EthTransactionValidator<Client, Tx>) -> Self {
@@ -268,9 +267,7 @@ where
         {
             let mut l1_block_info = self.block_info.l1_block_info.read().clone();
 
-            let mut encoded = Vec::with_capacity(valid_tx.transaction().encoded_length());
-            let tx = valid_tx.transaction().clone_into_consensus();
-            tx.encode_2718(&mut encoded);
+            let encoded = valid_tx.transaction().encoded_2718();
 
             let cost_addition = match l1_block_info.l1_tx_data_fee(
                 self.chain_spec(),
@@ -328,7 +325,7 @@ where
 impl<Client, Tx> TransactionValidator for OpTransactionValidator<Client, Tx>
 where
     Client: ChainSpecProvider<ChainSpec: OpHardforks> + StateProviderFactory + BlockReaderIdExt,
-    Tx: EthPoolTransaction + MaybeInteropTransaction,
+    Tx: EthPoolTransaction + OpPooledTx,
 {
     type Transaction = Tx;
 

examples/custom-node/src/pool.rs

@@ -9,10 +9,8 @@ use reth_node_builder::{
 };
 use reth_op::{
     node::txpool::{
-        conditional::MaybeConditionalTransaction,
-        interop::MaybeInteropTransaction,
         supervisor::{SupervisorClient, DEFAULT_SUPERVISOR_URL},
-        OpPooledTransaction, OpTransactionPool, OpTransactionValidator,
+        OpPooledTransaction, OpPooledTx, OpTransactionPool, OpTransactionValidator,
     },
     pool::{
         blobstore::DiskFileBlobStore, CoinbaseTipOrdering, EthPoolTransaction,
@@ -84,8 +82,7 @@ where
     <Node::Types as NodeTypes>::Primitives:
         NodePrimitives<SignedTx = Extended<OpTxEnvelope, CustomTransactionEnvelope>>,
     T: EthPoolTransaction<Consensus = Extended<OpTxEnvelope, CustomTransactionEnvelope>>
-        + MaybeConditionalTransaction
-        + MaybeInteropTransaction,
+        + OpPooledTx,
 {
     type Pool = OpTransactionPool<Node::Provider, DiskFileBlobStore, T>;