fix: EthTransactionValidatorBuilder accepts custom local_transactions_config

Author: yiweichi

crates/ethereum/node/src/node.rs

@@ -405,7 +405,7 @@ where
         let blob_store =
             reth_node_builder::components::create_blob_store_with_cache(ctx, blob_cache_size)?;
 
-        let validator = TransactionValidationTaskExecutor::eth_builder(ctx.provider().clone())
+        let validator = TransactionValidationTaskExecutor::eth_builder(ctx.provider().clone(), Some(pool_config.local_transactions_config.clone()))
             .with_head_timestamp(ctx.head().timestamp)
             .with_max_tx_input_bytes(ctx.config().txpool.max_tx_input_bytes)
             .kzg_settings(ctx.kzg_settings()?)

crates/optimism/node/src/node.rs

@@ -800,7 +800,7 @@ where
             .await;
 
         let blob_store = reth_node_builder::components::create_blob_store(ctx)?;
-        let validator = TransactionValidationTaskExecutor::eth_builder(ctx.provider().clone())
+        let validator = TransactionValidationTaskExecutor::eth_builder(ctx.provider().clone(), None)
             .no_eip4844()
             .with_head_timestamp(ctx.head().timestamp)
             .with_max_tx_input_bytes(ctx.config().txpool.max_tx_input_bytes)

crates/optimism/txpool/src/transaction.rs

@@ -325,7 +325,7 @@ mod tests {
     #[tokio::test]
     async fn validate_optimism_transaction() {
         let client = MockEthProvider::default().with_chain_spec(OP_MAINNET.clone());
-        let validator = EthTransactionValidatorBuilder::new(client)
+        let validator = EthTransactionValidatorBuilder::new(client, None)
             .no_shanghai()
             .no_cancun()
             .build(InMemoryBlobStore::default());

crates/scroll/node/src/builder/pool.rs

@@ -61,7 +61,7 @@ where
         let data_dir = ctx.config().datadir();
         let blob_store = DiskFileBlobStore::open(data_dir.blobstore(), Default::default())?;
 
-        let validator = TransactionValidationTaskExecutor::eth_builder(ctx.provider().clone())
+        let validator = TransactionValidationTaskExecutor::eth_builder(ctx.provider().clone(), Some(pool_config_overrides.clone().apply(ctx.pool_config()).local_transactions_config))
             .no_eip4844()
             .with_head_timestamp(ctx.head().timestamp)
             .kzg_settings(ctx.kzg_settings()?)

crates/scroll/txpool/src/transaction.rs

@@ -226,7 +226,7 @@ mod tests {
     #[test]
     fn validate_scroll_transaction() {
         let client = MockEthProvider::default().with_chain_spec(SCROLL_MAINNET.clone());
-        let validator = EthTransactionValidatorBuilder::new(client)
+        let validator = EthTransactionValidatorBuilder::new(client, None)
             .no_shanghai()
             .no_cancun()
             .build(InMemoryBlobStore::default());

crates/transaction-pool/src/maintain.rs

@@ -776,7 +776,7 @@ mod tests {
         let sender = hex!("1f9090aaE28b8a3dCeaDf281B0F12828e676c326").into();
         provider.add_account(sender, ExtendedAccount::new(42, U256::MAX));
         let blob_store = InMemoryBlobStore::default();
-        let validator = EthTransactionValidatorBuilder::new(provider).build(blob_store.clone());
+        let validator = EthTransactionValidatorBuilder::new(provider, None).build(blob_store.clone());
 
         let txpool = Pool::new(
             validator.clone(),

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

@@ -785,14 +785,14 @@ impl<Client> EthTransactionValidatorBuilder<Client> {
     ///  - EIP-1559
     ///  - EIP-4844
     ///  - EIP-7702
-    pub fn new(client: Client) -> Self {
+    pub fn new(client: Client, local_transactions_config: Option<LocalTransactionConfig>) -> Self {
         Self {
             block_gas_limit: ETHEREUM_BLOCK_GAS_LIMIT_30M.into(),
             client,
             minimum_priority_fee: None,
             additional_tasks: 1,
             kzg_settings: EnvKzgSettings::Default,
-            local_transactions_config: Default::default(),
+            local_transactions_config: local_transactions_config.unwrap_or_default(),
             max_tx_input_bytes: DEFAULT_MAX_TX_INPUT_BYTES,
             tx_fee_cap: Some(1e18 as u128),
             // by default all transaction types are allowed
@@ -1201,7 +1201,7 @@ mod tests {
             ExtendedAccount::new(transaction.nonce(), U256::MAX),
         );
         let blob_store = InMemoryBlobStore::default();
-        let validator = EthTransactionValidatorBuilder::new(provider).build(blob_store.clone());
+        let validator = EthTransactionValidatorBuilder::new(provider, None).build(blob_store.clone());
 
         let outcome = validator.validate_one(TransactionOrigin::External, transaction.clone());
 
@@ -1228,7 +1228,7 @@ mod tests {
         );
 
         let blob_store = InMemoryBlobStore::default();
-        let validator = EthTransactionValidatorBuilder::new(provider)
+        let validator = EthTransactionValidatorBuilder::new(provider, None)
             .set_block_gas_limit(1_000_000) // tx gas limit is 1_015_288
             .build(blob_store.clone());
 
@@ -1261,7 +1261,7 @@ mod tests {
         );
 
         let blob_store = InMemoryBlobStore::default();
-        let validator = EthTransactionValidatorBuilder::new(provider)
+        let validator = EthTransactionValidatorBuilder::new(provider, None)
             .set_tx_fee_cap(100) // 100 wei cap
             .build(blob_store.clone());
 
@@ -1298,7 +1298,7 @@ mod tests {
         );
 
         let blob_store = InMemoryBlobStore::default();
-        let validator = EthTransactionValidatorBuilder::new(provider)
+        let validator = EthTransactionValidatorBuilder::new(provider, None)
             .set_tx_fee_cap(0) // no cap
             .build(blob_store);
 
@@ -1316,7 +1316,7 @@ mod tests {
         );
 
         let blob_store = InMemoryBlobStore::default();
-        let validator = EthTransactionValidatorBuilder::new(provider)
+        let validator = EthTransactionValidatorBuilder::new(provider, None)
             .set_tx_fee_cap(2e18 as u128) // 2 ETH cap
             .build(blob_store);
 

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

@@ -1,10 +1,7 @@
 //! A validation service for transactions.
 
 use crate::{
-    blobstore::BlobStore,
-    validate::{EthTransactionValidatorBuilder, TransactionValidatorError},
-    EthTransactionValidator, PoolTransaction, TransactionOrigin, TransactionValidationOutcome,
-    TransactionValidator,
+    blobstore::BlobStore, validate::{EthTransactionValidatorBuilder, TransactionValidatorError}, EthTransactionValidator, LocalTransactionConfig, PoolTransaction, TransactionOrigin, TransactionValidationOutcome, TransactionValidator
 };
 use futures_util::{lock::Mutex, StreamExt};
 use reth_primitives_traits::{Block, SealedBlock};
@@ -90,8 +87,8 @@ pub struct TransactionValidationTaskExecutor<V> {
 
 impl TransactionValidationTaskExecutor<()> {
     /// Convenience method to create a [`EthTransactionValidatorBuilder`]
-    pub fn eth_builder<Client>(client: Client) -> EthTransactionValidatorBuilder<Client> {
-        EthTransactionValidatorBuilder::new(client)
+    pub fn eth_builder<Client>(client: Client, local_transactions_config: Option<LocalTransactionConfig>) -> EthTransactionValidatorBuilder<Client> {
+        EthTransactionValidatorBuilder::new(client, local_transactions_config)
     }
 }
 
@@ -138,7 +135,7 @@ impl<Client, Tx> TransactionValidationTaskExecutor<EthTransactionValidator<Clien
     where
         T: TaskSpawner,
     {
-        EthTransactionValidatorBuilder::new(client)
+        EthTransactionValidatorBuilder::new(client, None)
             .with_additional_tasks(num_additional_tasks)
             .build_with_tasks::<Tx, T, S>(tasks, blob_store)
     }

examples/custom-node-components/src/main.rs

@@ -58,7 +58,7 @@ where
     async fn build_pool(self, ctx: &BuilderContext<Node>) -> eyre::Result<Self::Pool> {
         let data_dir = ctx.config().datadir();
         let blob_store = InMemoryBlobStore::default();
-        let validator = TransactionValidationTaskExecutor::eth_builder(ctx.provider().clone())
+        let validator = TransactionValidationTaskExecutor::eth_builder(ctx.provider().clone(), None)
             .with_head_timestamp(ctx.head().timestamp)
             .kzg_settings(ctx.kzg_settings()?)
             .with_additional_tasks(ctx.config().txpool.additional_validation_tasks)