@aztec/p2p 0.0.1-commit.6d63667d → 0.0.1-commit.7ac86ea28

package/dest/mem_pools/tx_pool_v2/tx_pool_v2_impl.js

@@ -1,10 +1,13 @@
+import { BlockNumber } from '@aztec/foundation/branded-types';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
 import { computeFeePayerBalanceStorageSlot } from '@aztec/protocol-contracts/fee-juice';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { DatabasePublicStateSource } from '@aztec/stdlib/trees';
 import { Tx, TxHash } from '@aztec/stdlib/tx';
 import { TxArchive } from './archive/index.js';
-import { EvictionManager, FeePayerBalanceEvictionRule, FeePayerBalancePreAddRule, InvalidTxsAfterMiningRule, InvalidTxsAfterReorgRule, LowPriorityEvictionRule, LowPriorityPreAddRule, NullifierConflictRule } from './eviction/index.js';
+import { DeletedPool } from './deleted_pool.js';
+import { EvictionManager, FeePayerBalanceEvictionRule, FeePayerBalancePreAddRule, InvalidTxsAfterMiningRule, InvalidTxsAfterReorgRule, LowPriorityEvictionRule, LowPriorityPreAddRule, NullifierConflictRule, TxPoolRejectionCode } from './eviction/index.js';
+import { TxPoolV2Instrumentation } from './instrumentation.js';
 import { DEFAULT_TX_POOL_V2_CONFIG } from './interfaces.js';
 import { buildTxMetaData, checkNullifierConflict } from './tx_metadata.js';
 import { TxPoolIndices } from './tx_pool_indices.js';
@@ -19,26 +22,33 @@ import { TxPoolIndices } from './tx_pool_indices.js';
     // === Dependencies ===
     #l2BlockSource;
     #worldStateSynchronizer;
-    #pendingTxValidator;
+    #createTxValidator;
     // === In-Memory Indices ===
     #indices = new TxPoolIndices();
     // === Config & Services ===
     #config;
     #archive;
+    #deletedPool;
     #evictionManager;
+    #dateProvider;
+    #instrumentation;
+    #evictedTxHashes = new Set();
     #log;
     #callbacks;
-    constructor(store, archiveStore, deps, callbacks, config = {}, log){
+    constructor(store, archiveStore, deps, callbacks, telemetry, config = {}, dateProvider, log){
         this.#store = store;
         this.#txsDB = store.openMap('txs');
         this.#l2BlockSource = deps.l2BlockSource;
         this.#worldStateSynchronizer = deps.worldStateSynchronizer;
-        this.#pendingTxValidator = deps.pendingTxValidator;
+        this.#createTxValidator = deps.createTxValidator;
         this.#config = {
             ...DEFAULT_TX_POOL_V2_CONFIG,
             ...config
         };
         this.#archive = new TxArchive(archiveStore, this.#config.archivedTxLimit, log);
+        this.#deletedPool = new DeletedPool(store, this.#txsDB, log);
+        this.#dateProvider = dateProvider;
+        this.#instrumentation = new TxPoolV2Instrumentation(telemetry, ()=>this.#indices.getTotalMetadataBytes());
         this.#log = log;
         this.#callbacks = callbacks;
         // Setup eviction manager with rules
@@ -69,7 +79,9 @@ import { TxPoolIndices } from './tx_pool_indices.js';
    * Note: Protected status is lost on restart. All non-mined txs are rebuilt as pending
    * by running pre-add rules to resolve nullifier conflicts, balance checks, and pool size limits.
    */ async hydrateFromDatabase() {
-        // Step 1: Load all transactions from DB
+        // Step 0: Hydrate deleted pool state
+        await this.#deletedPool.hydrateFromDatabase();
+        // Step 1: Load all transactions from DB (excluding soft-deleted)
         const { loaded, errors: deserializationErrors } = await this.#loadAllTxsFromDb();
         // Step 2: Check mined status for each tx
         await this.#markMinedStatusBatch(loaded.map((l)=>l.meta));
@@ -84,7 +96,7 @@ import { TxPoolIndices } from './tx_pool_indices.js';
             }
         }
         // Step 4: Validate non-mined transactions
-        const { valid, invalid } = await this.#validateTxBatch(nonMined, 'on startup');
+        const { valid, invalid } = await this.#revalidateMetadata(nonMined.map((e)=>e.meta), 'on startup');
         // Step 5: Populate mined indices (these don't need conflict resolution)
         for (const meta of mined){
             this.#indices.addMined(meta);
@@ -106,14 +118,20 @@ import { TxPoolIndices } from './tx_pool_indices.js';
                 await this.#txsDB.delete(txHashStr);
             }
         });
-        this.#log.info(`Deleted ${toDelete.length} invalid/rejected transactions on startup`);
+        this.#log.info(`Deleted ${toDelete.length} invalid/rejected transactions on startup`, {
+            txHashes: toDelete
+        });
     }
     async addPendingTxs(txs, opts) {
         const accepted = [];
         const ignored = [];
         const rejected = [];
+        const errors = new Map();
         const acceptedPending = new Set();
         const poolAccess = this.#createPreAddPoolAccess();
+        const preAddContext = opts.feeComparisonOnly !== undefined ? {
+            feeComparisonOnly: opts.feeComparisonOnly
+        } : undefined;
         await this.#store.transactionAsync(async ()=>{
             for (const tx of txs){
                 const txHash = tx.getTxHash();
@@ -140,7 +158,7 @@ import { TxPoolIndices } from './tx_pool_indices.js';
                     accepted.push(txHash);
                 } else {
                     // Regular pending tx - validate and run pre-add rules
-                    const result = await this.#tryAddRegularPendingTx(tx, opts, poolAccess, acceptedPending, ignored);
+                    const result = await this.#tryAddRegularPendingTx(tx, opts, poolAccess, acceptedPending, ignored, errors, preAddContext);
                     if (result.status === 'accepted') {
                         acceptedPending.add(txHashStr);
                     } else if (result.status === 'rejected') {
@@ -155,6 +173,13 @@ import { TxPoolIndices } from './tx_pool_indices.js';
         for (const txHashStr of acceptedPending){
             accepted.push(TxHash.fromString(txHashStr));
         }
+        // Record metrics
+        if (ignored.length > 0) {
+            this.#instrumentation.recordIgnored(ignored.length);
+        }
+        if (rejected.length > 0) {
+            this.#instrumentation.recordRejected(rejected.length);
+        }
         // Run post-add eviction rules for pending txs
         if (acceptedPending.size > 0) {
             const feePayers = Array.from(acceptedPending).map((txHash)=>this.#indices.getMetadata(txHash).feePayer);
@@ -166,35 +191,59 @@ import { TxPoolIndices } from './tx_pool_indices.js';
         return {
             accepted,
             ignored,
-            rejected
+            rejected,
+            ...errors.size > 0 ? {
+                errors
+            } : {}
         };
     }
-    /** Validates and adds a regular pending tx. Returns status. */ async #tryAddRegularPendingTx(tx, opts, poolAccess, acceptedPending, ignored) {
+    /** Validates and adds a regular pending tx. Returns status. */ async #tryAddRegularPendingTx(tx, opts, poolAccess, acceptedPending, ignored, errors, preAddContext) {
         const txHash = tx.getTxHash();
         const txHashStr = txHash.toString();
-        // Validate transaction
-        if (!await this.#validateTx(tx)) {
+        // Build metadata and validate using metadata
+        const meta = await buildTxMetaData(tx);
+        if (!await this.#validateMeta(meta)) {
             return {
                 status: 'rejected'
             };
         }
-        // Build metadata and run pre-add rules
-        const meta = await buildTxMetaData(tx);
-        const preAddResult = await this.#evictionManager.runPreAddRules(meta, poolAccess);
+        // Run pre-add rules
+        const preAddResult = await this.#evictionManager.runPreAddRules(meta, poolAccess, preAddContext);
         if (preAddResult.shouldIgnore) {
-            this.#log.debug(`Ignoring tx ${txHashStr}: ${preAddResult.reason}`);
+            this.#log.debug(`Ignoring tx ${txHashStr}: ${preAddResult.reason?.message ?? 'unknown reason'}`);
+            if (preAddResult.reason && preAddResult.reason.code !== TxPoolRejectionCode.INTERNAL_ERROR) {
+                errors.set(txHashStr, preAddResult.reason);
+            }
             return {
                 status: 'ignored'
             };
         }
-        // Evict conflicts
-        for (const evictHashStr of preAddResult.txHashesToEvict){
-            await this.#deleteTx(evictHashStr);
-            this.#log.debug(`Evicted tx ${evictHashStr} due to higher-fee tx ${txHashStr}`);
-            if (acceptedPending.has(evictHashStr)) {
-                // Evicted tx was from this batch - mark as ignored in result
-                acceptedPending.delete(evictHashStr);
-                ignored.push(TxHash.fromString(evictHashStr));
+        // Evict conflicts, grouped by rule name for metrics
+        if (preAddResult.evictions && preAddResult.evictions.length > 0) {
+            const byReason = new Map();
+            for (const { txHash: evictHash, reason } of preAddResult.evictions){
+                const group = byReason.get(reason);
+                if (group) {
+                    group.push(evictHash);
+                } else {
+                    byReason.set(reason, [
+                        evictHash
+                    ]);
+                }
+            }
+            for (const [reason, hashes] of byReason){
+                await this.#evictTxs(hashes, reason);
+            }
+            for (const evictHashStr of preAddResult.txHashesToEvict){
+                this.#log.debug(`Evicted tx ${evictHashStr} due to higher-fee tx ${txHashStr}`, {
+                    evictedTxHash: evictHashStr,
+                    replacementTxHash: txHashStr
+                });
+                if (acceptedPending.has(evictHashStr)) {
+                    // Evicted tx was from this batch - mark as ignored in result
+                    acceptedPending.delete(evictHashStr);
+                    ignored.push(TxHash.fromString(evictHashStr));
+                }
             }
         }
         // Add the transaction
@@ -209,13 +258,13 @@ import { TxPoolIndices } from './tx_pool_indices.js';
         if (this.#indices.has(txHashStr)) {
             return 'ignored';
         }
-        // Validate transaction (no logging for dry-run check)
-        const validationResult = await this.#pendingTxValidator.validateTx(tx);
-        if (validationResult.result !== 'valid') {
+        // Build metadata and validate using metadata
+        const meta = await buildTxMetaData(tx);
+        const validationResult = await this.#validateMeta(meta, undefined, 'can add pending');
+        if (validationResult !== true) {
             return 'rejected';
         }
-        // Build metadata and use pre-add rules
-        const meta = await buildTxMetaData(tx);
+        // Use pre-add rules
         const poolAccess = this.#createPreAddPoolAccess();
         const preAddResult = await this.#evictionManager.runPreAddRules(meta, poolAccess);
         return preAddResult.shouldIgnore ? 'ignored' : 'accepted';
@@ -251,20 +300,51 @@ import { TxPoolIndices } from './tx_pool_indices.js';
             }
         });
     }
-    protectTxs(txHashes, block) {
+    async protectTxs(txHashes, block) {
         const slotNumber = block.globalVariables.slotNumber;
         const missing = [];
+        let softDeletedHits = 0;
+        let missingPreviouslyEvicted = 0;
         for (const txHash of txHashes){
             const txHashStr = txHash.toString();
             if (this.#indices.has(txHashStr)) {
                 // Update protection for existing tx
                 this.#indices.updateProtection(txHashStr, slotNumber);
+            } else if (this.#deletedPool.isSoftDeleted(txHashStr)) {
+                // Resurrect soft-deleted tx as protected
+                const buffer = await this.#txsDB.getAsync(txHashStr);
+                if (buffer) {
+                    const tx = Tx.fromBuffer(buffer);
+                    await this.#addTx(tx, {
+                        protected: slotNumber
+                    });
+                    softDeletedHits++;
+                } else {
+                    // Data missing despite soft-delete flag — treat as truly missing
+                    this.#indices.setProtection(txHashStr, slotNumber);
+                    missing.push(txHash);
+                }
             } else {
-                // Pre-record protection for tx we don't have yet
+                // Truly missing — pre-record protection for tx we don't have yet
                 this.#indices.setProtection(txHashStr, slotNumber);
                 missing.push(txHash);
+                if (this.#evictedTxHashes.has(txHashStr)) {
+                    missingPreviouslyEvicted++;
+                }
             }
         }
+        // Record metrics
+        if (softDeletedHits > 0) {
+            this.#instrumentation.recordSoftDeletedHits(softDeletedHits);
+        }
+        if (missing.length > 0) {
+            this.#log.debug(`protectTxs missing tx hashes: ${missing.map((h)=>h.toString()).join(', ')}`);
+            this.#instrumentation.recordMissingOnProtect(missing.length);
+        }
+        if (missingPreviouslyEvicted > 0) {
+            this.#instrumentation.recordMissingPreviouslyEvicted(missingPreviouslyEvicted);
+        }
+        this.#log.info(`Protected ${txHashes.length} txs, missing: ${missing.length}, soft-deleted hits: ${softDeletedHits}`);
         return missing;
     }
     async addMinedTxs(txs, block, opts) {
@@ -283,6 +363,7 @@ import { TxPoolIndices } from './tx_pool_indices.js';
                         mined: blockId
                     }, opts);
                 }
+                await this.#deletedPool.clearIfMinedHigher(txHashStr, blockId.number);
             }
         });
     }
@@ -305,12 +386,15 @@ import { TxPoolIndices } from './tx_pool_indices.js';
         // Step 4: Mark txs as mined (only those we have in the pool)
         for (const meta of found){
             this.#indices.markAsMined(meta, blockId);
+            await this.#deletedPool.clearIfMinedHigher(meta.txHash, blockId.number);
         }
         // Step 5: Run eviction rules (remove pending txs with conflicting nullifiers/expired timestamps)
         await this.#evictionManager.evictAfterNewBlock(block.header, nullifiers, feePayers);
         this.#log.info(`Marked ${found.length} txs as mined in block ${blockId.number}`);
     }
     async prepareForSlot(slotNumber) {
+        // Step 0: Clean up slot-deleted txs from previous slots
+        await this.#deletedPool.cleanupSlotDeleted(slotNumber);
         // Step 1: Find expired protected txs
         const expiredProtected = this.#indices.findExpiredProtectedTxs(slotNumber);
         // Step 2: Clear protection for all expired entries (including those without metadata)
@@ -318,18 +402,17 @@ import { TxPoolIndices } from './tx_pool_indices.js';
         // Step 3: Filter to only txs that have metadata and are not mined
         const txsToRestore = this.#indices.filterRestorable(expiredProtected);
         if (txsToRestore.length === 0) {
+            this.#log.debug(`Preparing for slot ${slotNumber}, no txs to unprotect`);
             return;
         }
         this.#log.info(`Preparing for slot ${slotNumber}: unprotecting ${txsToRestore.length} txs`);
         // Step 4: Validate for pending pool
-        const { valid, invalid } = await this.#loadAndValidateTxs(txsToRestore, 'during prepareForSlot');
+        const { valid, invalid } = await this.#revalidateMetadata(txsToRestore, 'during prepareForSlot');
         // Step 5: Resolve nullifier conflicts and add winners to pending indices
         const { added, toEvict } = this.#applyNullifierConflictResolution(valid);
-        // Step 6: Delete invalid and evicted txs
-        await this.#deleteTxsBatch([
-            ...invalid,
-            ...toEvict
-        ]);
+        // Step 6: Delete invalid txs and evict conflict losers
+        await this.#deleteTxsBatch(invalid);
+        await this.#evictTxs(toEvict, 'NullifierConflict');
         // Step 7: Run eviction rules (enforce pool size limit)
         if (added.length > 0) {
             const feePayers = added.map((meta)=>meta.feePayer);
@@ -339,7 +422,7 @@ import { TxPoolIndices } from './tx_pool_indices.js';
             ]);
         }
     }
-    async handlePrunedBlocks(latestBlock) {
+    async handlePrunedBlocks(latestBlock, options) {
         // Step 1: Find transactions mined after the prune point
         const txsToUnmine = this.#indices.findTxsMinedAfter(latestBlock.number);
         if (txsToUnmine.length === 0) {
@@ -347,54 +430,76 @@ import { TxPoolIndices } from './tx_pool_indices.js';
             return;
         }
         this.#log.info(`Handling prune to block ${latestBlock.number}: un-mining ${txsToUnmine.length} txs`);
-        // Step 2: Unmine - clear mined status from metadata
+        // Step 2: Mark ALL un-mined txs with their original mined block number
+        // This ensures they get soft-deleted if removed later, and only hard-deleted
+        // when their original mined block is finalized
+        await this.#deletedPool.markFromPrunedBlock(txsToUnmine.map((m)=>({
+                txHash: m.txHash,
+                minedAtBlock: BlockNumber(m.minedL2BlockId.number)
+            })));
+        // Step 3: Unmine - clear mined status from metadata
         for (const meta of txsToUnmine){
             this.#indices.markAsUnmined(meta);
         }
-        // Step 3: Filter out protected txs (they'll be handled by prepareForSlot)
+        // If deleteAllTxs is set (epoch prune), delete all un-mined txs and return early
+        if (options?.deleteAllTxs) {
+            const allTxHashes = txsToUnmine.map((m)=>m.txHash);
+            await this.#deleteTxsBatch(allTxHashes);
+            this.#log.info(`Handled prune to block ${latestBlock.number} with deleteAllTxs: deleted ${allTxHashes.length} txs`);
+            return;
+        }
+        // Step 4: Filter out protected txs (they'll be handled by prepareForSlot)
         const unprotectedTxs = this.#indices.filterUnprotected(txsToUnmine);
-        // Step 4: Validate for pending pool
-        const { valid, invalid } = await this.#loadAndValidateTxs(unprotectedTxs, 'during handlePrunedBlocks');
-        // Step 5: Resolve nullifier conflicts and add winners to pending indices
+        // Step 5: Validate for pending pool
+        const { valid, invalid } = await this.#revalidateMetadata(unprotectedTxs, 'during handlePrunedBlocks');
+        // Step 6: Resolve nullifier conflicts and add winners to pending indices
         const { toEvict } = this.#applyNullifierConflictResolution(valid);
-        // Step 6: Delete invalid and evicted txs
-        await this.#deleteTxsBatch([
-            ...invalid,
-            ...toEvict
-        ]);
-        // Step 7: Run eviction rules for ALL pending txs (not just restored ones)
+        // Step 7: Delete invalid txs and evict conflict losers
+        await this.#deleteTxsBatch(invalid);
+        await this.#evictTxs(toEvict, 'NullifierConflict');
+        this.#log.info(`Handled prune to block ${latestBlock.number}: ${valid.length} txs restored to pending, ${invalid.length} invalid, ${toEvict.length} evicted due to nullifier conflicts`, {
+            txHashesRestored: valid.map((m)=>m.txHash),
+            txHashesInvalid: invalid,
+            txHashesEvicted: toEvict
+        });
+        // Step 8: Run eviction rules for ALL pending txs (not just restored ones)
         // This handles cases like existing pending txs with invalid fee payer balances
         await this.#evictionManager.evictAfterChainPrune(latestBlock.number);
     }
     async handleFailedExecution(txHashes) {
         // Delete failed txs
         await this.#deleteTxsBatch(txHashes.map((h)=>h.toString()));
-        this.#log.info(`Deleted ${txHashes.length} failed txs`);
+        this.#log.info(`Deleted ${txHashes.length} failed txs`, {
+            txHashes: txHashes.map((h)=>h.toString())
+        });
     }
     async handleFinalizedBlock(block) {
         const blockNumber = block.globalVariables.blockNumber;
-        // Step 1: Find txs mined at or before finalized block
-        const txsToFinalize = this.#indices.findTxsMinedAtOrBefore(blockNumber);
-        if (txsToFinalize.length === 0) {
-            return;
-        }
-        // Step 2: Collect txs for archiving (before deletion)
+        // Step 1: Find mined txs at or before finalized block
+        const minedTxsToFinalize = this.#indices.findTxsMinedAtOrBefore(blockNumber);
+        // Step 2: Collect mined txs for archiving (before deletion)
         const txsToArchive = [];
         if (this.#archive.isEnabled()) {
-            for (const txHashStr of txsToFinalize){
+            for (const txHashStr of minedTxsToFinalize){
                 const buffer = await this.#txsDB.getAsync(txHashStr);
                 if (buffer) {
                     txsToArchive.push(Tx.fromBuffer(buffer));
                 }
             }
         }
-        // Step 3: Delete from active pool
-        await this.#deleteTxsBatch(txsToFinalize);
-        // Step 4: Archive
+        // Step 3: Delete mined txs from active pool
+        await this.#deleteTxsBatch(minedTxsToFinalize);
+        // Step 4: Finalize soft-deleted txs
+        await this.#deletedPool.finalizeBlock(blockNumber);
+        // Step 5: Archive mined txs
         if (txsToArchive.length > 0) {
             await this.#archive.archiveTxs(txsToArchive);
         }
-        this.#log.info(`Finalized ${txsToFinalize.length} txs from blocks up to ${blockNumber}`);
+        if (minedTxsToFinalize.length > 0) {
+            this.#log.info(`Finalized ${minedTxsToFinalize.length} mined txs from blocks up to ${blockNumber}`, {
+                txHashes: minedTxsToFinalize
+            });
+        }
     }
     // === Query Methods ===
     async getTxByHash(txHash) {
@@ -410,20 +515,34 @@ import { TxPoolIndices } from './tx_pool_indices.js';
         return results;
     }
     hasTxs(txHashes) {
-        return txHashes.map((h)=>this.#indices.has(h.toString()));
+        return txHashes.map((h)=>{
+            const hashStr = h.toString();
+            return this.#indices.has(hashStr) || this.#deletedPool.isSoftDeleted(hashStr);
+        });
     }
     getTxStatus(txHash) {
-        const meta = this.#indices.getMetadata(txHash.toString());
-        if (!meta) {
-            return undefined;
+        const txHashStr = txHash.toString();
+        const meta = this.#indices.getMetadata(txHashStr);
+        if (meta) {
+            return this.#indices.getTxState(meta);
         }
-        return this.#indices.getTxState(meta);
+        // Check if soft-deleted
+        if (this.#deletedPool.isSoftDeleted(txHashStr)) {
+            return 'deleted';
+        }
+        return undefined;
     }
     getPendingTxHashes() {
         return [
             ...this.#indices.iteratePendingByPriority('desc')
         ].map((hash)=>TxHash.fromString(hash));
     }
+    getEligiblePendingTxHashes() {
+        const maxReceivedAt = this.#dateProvider.now() - this.#config.minTxPoolAgeMs;
+        return [
+            ...this.#indices.iterateEligiblePendingByPriority('desc', maxReceivedAt)
+        ].map((hash)=>TxHash.fromString(hash));
+    }
     getPendingTxCount() {
         return this.#indices.getPendingTxCount();
     }
@@ -463,6 +582,9 @@ import { TxPoolIndices } from './tx_pool_indices.js';
             this.#config.archivedTxLimit = config.archivedTxLimit;
             this.#archive.updateLimit(config.archivedTxLimit);
         }
+        if (config.minTxPoolAgeMs !== undefined) {
+            this.#config.minTxPoolAgeMs = config.minTxPoolAgeMs;
+        }
         // Update eviction rules with new config
         this.#evictionManager.updateConfig(config);
     }
@@ -477,7 +599,10 @@ import { TxPoolIndices } from './tx_pool_indices.js';
     }
     // === Metrics ===
     countTxs() {
-        return this.#indices.countTxs();
+        return {
+            ...this.#indices.countTxs(),
+            softDeleted: this.#deletedPool.getSoftDeletedCount()
+        };
     }
     // ============================================================================
     // PRIVATE HELPERS - Transaction Management
@@ -488,7 +613,9 @@ import { TxPoolIndices } from './tx_pool_indices.js';
    */ async #addTx(tx, state, opts = {}) {
         const txHashStr = tx.getTxHash().toString();
         const meta = await buildTxMetaData(tx);
+        meta.receivedAt = this.#dateProvider.now();
         await this.#txsDB.set(txHashStr, tx.toBuffer());
+        await this.#deletedPool.clearSoftDeleted(txHashStr);
         this.#callbacks.onTxsAdded([
             tx
         ], opts);
@@ -501,64 +628,74 @@ import { TxPoolIndices } from './tx_pool_indices.js';
             this.#indices.addMined(meta);
         }
         const stateStr = typeof state === 'string' ? state : Object.keys(state)[0];
-        this.#log.verbose(`Added ${stateStr} tx ${txHashStr}`, {
+        this.#log.debug(`Added tx ${txHashStr} as ${stateStr}`, {
             eventName: 'tx-added-to-pool',
-            state: stateStr
+            txHash: txHashStr,
+            state: stateStr,
+            source: opts.source
         });
         return meta;
     }
     /**
    * Deletes a transaction from both indices and DB.
    * Emits onTxsRemoved callback immediately after DB delete.
+   */ /**
+   * Deletes a transaction from the pool.
+   * Delegates to DeletedPool which decides soft vs hard delete based on whether
+   * the tx is from a pruned block.
    */ async #deleteTx(txHashStr) {
         this.#indices.remove(txHashStr);
-        await this.#txsDB.delete(txHashStr);
         this.#callbacks.onTxsRemoved([
             txHashStr
         ]);
+        await this.#deletedPool.deleteTx(txHashStr);
     }
     /** Deletes a batch of transactions, emitting callbacks individually for each. */ async #deleteTxsBatch(txHashes) {
         for (const txHashStr of txHashes){
             await this.#deleteTx(txHashStr);
         }
     }
+    /** Evicts transactions: records eviction metric with reason, caches hashes, then deletes. */ async #evictTxs(txHashes, reason) {
+        if (txHashes.length === 0) {
+            return;
+        }
+        this.#instrumentation.recordEvictions(txHashes.length, reason);
+        for (const txHashStr of txHashes){
+            this.#log.debug(`Evicting tx ${txHashStr}`, {
+                txHash: txHashStr,
+                reason
+            });
+            this.#addToEvictedCache(txHashStr);
+        }
+        await this.#deleteTxsBatch(txHashes);
+    }
+    /** Adds a tx hash to the bounded evicted cache, evicting the oldest entry if at capacity. */ #addToEvictedCache(txHashStr) {
+        if (this.#evictedTxHashes.size >= this.#config.evictedTxCacheSize) {
+            // FIFO eviction: remove the first (oldest) entry
+            const oldest = this.#evictedTxHashes.values().next().value;
+            this.#evictedTxHashes.delete(oldest);
+        }
+        this.#evictedTxHashes.add(txHashStr);
+    }
     // ============================================================================
     // PRIVATE HELPERS - Validation & Conflict Resolution
     // ============================================================================
-    /** Validates a single transaction, returning true if valid */ async #validateTx(tx, context) {
-        const result = await this.#pendingTxValidator.validateTx(tx);
+    /** Validates transaction metadata, returning true if valid */ async #validateMeta(meta, validator, context) {
+        const txValidator = validator ?? await this.#createTxValidator();
+        const result = await txValidator.validateTx(meta);
         if (result.result !== 'valid') {
             const contextStr = context ? ` ${context}` : '';
-            this.#log.info(`Tx ${tx.getTxHash()}${contextStr} failed validation: ${result.reason?.join(', ')}`);
+            this.#log.info(`Tx ${meta.txHash}${contextStr} failed validation: ${result.reason?.join(', ')}`);
             return false;
         }
         return true;
     }
-    /** Loads transactions from DB, returning loaded txs and missing hashes */ async #loadTxsFromDb(metas) {
-        const loaded = [];
-        const missing = [];
-        for (const meta of metas){
-            const buffer = await this.#txsDB.getAsync(meta.txHash);
-            if (!buffer) {
-                this.#log.warn(`Tx ${meta.txHash} not found in DB`);
-                missing.push(meta.txHash);
-                continue;
-            }
-            loaded.push({
-                tx: Tx.fromBuffer(buffer),
-                meta
-            });
-        }
-        return {
-            loaded,
-            missing
-        };
-    }
-    /** Validates a batch of transactions, returning valid and invalid groups */ async #validateTxBatch(txs, context) {
+    /** Validates metadata directly */ async #revalidateMetadata(metas, context) {
         const valid = [];
         const invalid = [];
-        for (const { tx, meta } of txs){
-            if (await this.#validateTx(tx, context)) {
+        const validator = await this.#createTxValidator();
+        for (const meta of metas){
+            if (await this.#validateMeta(meta, validator, context)) {
                 valid.push(meta);
             } else {
                 invalid.push(meta.txHash);
@@ -569,17 +706,6 @@ import { TxPoolIndices } from './tx_pool_indices.js';
             invalid
         };
     }
-    /** Loads transactions from DB and validates them */ async #loadAndValidateTxs(metas, context) {
-        const { loaded, missing } = await this.#loadTxsFromDb(metas);
-        const { valid, invalid } = await this.#validateTxBatch(loaded, context);
-        return {
-            valid,
-            invalid: [
-                ...missing,
-                ...invalid
-            ]
-        };
-    }
     /**
    * Resolves nullifier conflicts between incoming txs and existing pending txs.
    * Modifies the pending indices during iteration to maintain consistent state
@@ -635,6 +761,10 @@ import { TxPoolIndices } from './tx_pool_indices.js';
         const loaded = [];
         const errors = [];
         for await (const [txHashStr, buffer] of this.#txsDB.entriesAsync()){
+            // Skip soft-deleted transactions - they stay in DB but not in indices
+            if (this.#deletedPool.isSoftDeleted(txHashStr)) {
+                continue;
+            }
             try {
                 const tx = Tx.fromBuffer(buffer);
                 const meta = await buildTxMetaData(tx);
@@ -685,7 +815,7 @@ import { TxPoolIndices } from './tx_pool_indices.js';
             if (preAddResult.shouldIgnore) {
                 // Transaction rejected - mark for deletion from DB
                 rejected.push(meta.txHash);
-                this.#log.debug(`Rejected tx ${meta.txHash} during rebuild: ${preAddResult.reason}`);
+                this.#log.debug(`Rejected tx ${meta.txHash} during rebuild: ${preAddResult.reason?.message ?? 'unknown reason'}`);
                 continue;
             }
             // Evict any conflicting txs identified by pre-add rules
@@ -721,7 +851,7 @@ import { TxPoolIndices } from './tx_pool_indices.js';
             getFeePayerPendingTxs: (feePayer)=>this.#indices.getFeePayerPendingTxs(feePayer),
             getPendingTxCount: ()=>this.#indices.getPendingTxCount(),
             getLowestPriorityPending: (limit)=>this.#indices.getLowestPriorityPending(limit),
-            deleteTxs: (txHashes)=>this.#deleteTxsBatch(txHashes)
+            deleteTxs: (txHashes, reason)=>this.#evictTxs(txHashes, reason ?? 'unknown')
         };
     }
     #createPreAddPoolAccess() {

package/dest/msg_validators/attestation_validator/fisherman_attestation_validator.d.ts

@@ -1,7 +1,7 @@
 import type { EpochCacheInterface } from '@aztec/epoch-cache';
 import { type CheckpointAttestation, type ValidationResult } from '@aztec/stdlib/p2p';
 import { type TelemetryClient } from '@aztec/telemetry-client';
-import type { AttestationPool } from '../../mem_pools/attestation_pool/attestation_pool.js';
+import type { AttestationPoolApi } from '../../mem_pools/attestation_pool/attestation_pool.js';
 import { CheckpointAttestationValidator } from './attestation_validator.js';
 /**
  * FishermanAttestationValidator extends the base AttestationValidator to add
@@ -14,7 +14,7 @@ import { CheckpointAttestationValidator } from './attestation_validator.js';
 export declare class FishermanAttestationValidator extends CheckpointAttestationValidator {
     private attestationPool;
     private invalidAttestationCounter;
-    constructor(epochCache: EpochCacheInterface, attestationPool: AttestationPool, telemetryClient: TelemetryClient);
+    constructor(epochCache: EpochCacheInterface, attestationPool: AttestationPoolApi, telemetryClient: TelemetryClient);
     validate(message: CheckpointAttestation): Promise<ValidationResult>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmlzaGVybWFuX2F0dGVzdGF0aW9uX3ZhbGlkYXRvci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21zZ192YWxpZGF0b3JzL2F0dGVzdGF0aW9uX3ZhbGlkYXRvci9maXNoZXJtYW5fYXR0ZXN0YXRpb25fdmFsaWRhdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDOUQsT0FBTyxFQUFFLEtBQUsscUJBQXFCLEVBQXFCLEtBQUssZ0JBQWdCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUN6RyxPQUFPLEVBQXVCLEtBQUssZUFBZSxFQUFrQyxNQUFNLHlCQUF5QixDQUFDO0FBRXBILE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHNEQUFzRCxDQUFDO0FBQzVGLE9BQU8sRUFBRSw4QkFBOEIsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBRTVFOzs7Ozs7O0dBT0c7QUFDSCxxQkFBYSw2QkFBOEIsU0FBUSw4QkFBOEI7SUFLN0UsT0FBTyxDQUFDLGVBQWU7SUFKekIsT0FBTyxDQUFDLHlCQUF5QixDQUFDO0lBRWxDLFlBQ0UsVUFBVSxFQUFFLG1CQUFtQixFQUN2QixlQUFlLEVBQUUsZUFBZSxFQUN4QyxlQUFlLEVBQUUsZUFBZSxFQWFqQztJQUVjLFFBQVEsQ0FBQyxPQUFPLEVBQUUscUJBQXFCLEdBQUcsT0FBTyxDQUFDLGdCQUFnQixDQUFDLENBd0RqRjtDQUNGIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmlzaGVybWFuX2F0dGVzdGF0aW9uX3ZhbGlkYXRvci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21zZ192YWxpZGF0b3JzL2F0dGVzdGF0aW9uX3ZhbGlkYXRvci9maXNoZXJtYW5fYXR0ZXN0YXRpb25fdmFsaWRhdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDOUQsT0FBTyxFQUFFLEtBQUsscUJBQXFCLEVBQXFCLEtBQUssZ0JBQWdCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUN6RyxPQUFPLEVBQXVCLEtBQUssZUFBZSxFQUFrQyxNQUFNLHlCQUF5QixDQUFDO0FBRXBILE9BQU8sS0FBSyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sc0RBQXNELENBQUM7QUFDL0YsT0FBTyxFQUFFLDhCQUE4QixFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFFNUU7Ozs7Ozs7R0FPRztBQUNILHFCQUFhLDZCQUE4QixTQUFRLDhCQUE4QjtJQUs3RSxPQUFPLENBQUMsZUFBZTtJQUp6QixPQUFPLENBQUMseUJBQXlCLENBQUM7SUFFbEMsWUFDRSxVQUFVLEVBQUUsbUJBQW1CLEVBQ3ZCLGVBQWUsRUFBRSxrQkFBa0IsRUFDM0MsZUFBZSxFQUFFLGVBQWUsRUFhakM7SUFFYyxRQUFRLENBQUMsT0FBTyxFQUFFLHFCQUFxQixHQUFHLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxDQXdEakY7Q0FDRiJ9