Review changes

Author: PhilWindle

yarn-project/p2p/src/mem_pools/tx_pool/eviction/archive_filter.ts

@@ -13,11 +13,7 @@ import {
   type PreAddEvictionResult,
   type PreAddEvictionRule,
   type PreAddPoolAccess,
-  type PrePendingFilter,
-  type PrePendingFilterContext,
-  type PrePendingFilterResult,
   type TxPoolOperations,
-  type TxValidationFields,
 } from './eviction_strategy.js';
 
 export class EvictionManager {
@@ -26,9 +22,6 @@ export class EvictionManager {
   /** Pre-add eviction rules (run inside addTxs transaction) */
   private preAddRules: PreAddEvictionRule[] = [];
 
-  /** Pre-pending filters (run before restoring txs to pending after reorg/unprotect) */
-  private prePendingFilters: PrePendingFilter[] = [];
-
   constructor(
     private txPool: TxPoolOperations,
     private log = createLogger('p2p:mempool:tx_pool:eviction_manager'),
@@ -114,68 +107,6 @@ export class EvictionManager {
     this.preAddRules.push(rule);
   }
 
-  public registerPrePendingFilter(filter: PrePendingFilter) {
-    this.prePendingFilters.push(filter);
-  }
-
-  /**
-   * Filters transactions before they are restored to pending state.
-   * Used during reorgs (un-mining) and slot transitions (unprotecting) to avoid
-   * adding transactions to pending indices only to immediately remove them.
-   *
-   * @param txs - Transaction metadata to validate
-   * @param ctx - Context about why we're filtering
-   * @returns Result with valid and invalid tx hashes
-   */
-  public async filterValidForPending(
-    txs: TxValidationFields[],
-    ctx: PrePendingFilterContext,
-  ): Promise<PrePendingFilterResult> {
-    if (txs.length === 0) {
-      return { valid: [], invalid: [] };
-    }
-
-    // Collect all invalid tx hashes from all filters
-    const allInvalid = new Set<string>();
-
-    for (const filter of this.prePendingFilters) {
-      try {
-        const invalidFromFilter = await filter.filterInvalid(txs, ctx);
-        for (const txHash of invalidFromFilter) {
-          allInvalid.add(txHash);
-        }
-      } catch (err) {
-        this.log.warn(`Pre-pending filter ${filter.name} unexpected error: ${String(err)}`, {
-          err,
-          filterName: filter.name,
-          event: ctx.event,
-        });
-        // On error, don't filter out any txs - let them go to pending and be evicted later if needed
-      }
-    }
-
-    // Partition into valid and invalid
-    const valid: string[] = [];
-    const invalid: string[] = [];
-    for (const tx of txs) {
-      if (allInvalid.has(tx.txHash)) {
-        invalid.push(tx.txHash);
-      } else {
-        valid.push(tx.txHash);
-      }
-    }
-
-    if (invalid.length > 0) {
-      this.log.verbose(`Pre-pending filter: ${invalid.length} invalid, ${valid.length} valid`, {
-        event: ctx.event,
-        invalidCount: invalid.length,
-        validCount: valid.length,
-      });
-    }
-
-    return { valid, invalid };
-  }
-
   public updateConfig(config: TxPoolOptions): void {
     for (const rule of this.rules) {
       rule.updateConfig(config);

yarn-project/p2p/src/mem_pools/tx_pool/eviction/eviction_manager.ts

@@ -148,62 +148,6 @@ export class FeePayerTxInfo {
   }
 }
 
-/**
- * Metadata about a transaction for pre-pending validation.
- * Contains the essential fields needed to validate without loading the full Tx.
- */
-export interface TxValidationFields {
-  /** Transaction hash as string */
-  txHash: string;
-  /** Hash of the anchor block header */
-  anchorBlockHeaderHash: string;
-  /** Fee payer address as string */
-  feePayer: string;
-  /** Maximum fee the tx is willing to pay */
-  feeLimit: bigint;
-}
-
-/**
- * Context for pre-pending filter operations.
- */
-export type PrePendingFilterContext =
-  | {
-      event: 'CHAIN_PRUNED';
-      /** The latest valid block number after the prune */
-      blockNumber: BlockNumber;
-    }
-  | {
-      event: 'UNPROTECT';
-    };
-
-/**
- * Result of a pre-pending filter operation.
- */
-export interface PrePendingFilterResult {
-  /** Transaction hashes that are valid and can be added to pending */
-  valid: string[];
-  /** Transaction hashes that are invalid and should be deleted */
-  invalid: string[];
-}
-
-/**
- * Strategy interface for filtering transactions before they enter the pending pool.
- * Used during reorgs (un-mining) and slot transitions (unprotecting) to avoid
- * adding transactions to pending indices only to immediately remove them.
- */
-export interface PrePendingFilter {
-  readonly name: string;
-
-  /**
-   * Filters transactions, returning which are invalid and should not be added to pending.
-   *
-   * @param txs - Transaction metadata to validate
-   * @param ctx - Context about why we're filtering (reorg vs unprotect)
-   * @returns Set of tx hashes that are INVALID (should not be added to pending)
-   */
-  filterInvalid(txs: TxValidationFields[], ctx: PrePendingFilterContext): Promise<Set<string>>;
-}
-
 /**
  * Read-only access to pool state for pre-add eviction checks.
  * Passed to pre-add rules during the addTxs transaction.