@aztec/p2p 0.0.1-commit.43c09e3f → 0.0.1-commit.4d3c002

package/dest/mem_pools/tx_pool_v2/tx_pool_v2_impl.js

@@ -1,12 +1,16 @@
+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, compareFee, compareTxHash } from './tx_metadata.js';
+import { buildTxMetaData, checkNullifierConflict } from './tx_metadata.js';
+import { TxPoolIndices } from './tx_pool_indices.js';
 /**
  * Implementation of TxPoolV2 logic.
  *
@@ -18,33 +22,35 @@ import { buildTxMetaData, checkNullifierConflict, compareFee, compareTxHash } fr
     // === Dependencies ===
     #l2BlockSource;
     #worldStateSynchronizer;
-    #pendingTxValidator;
+    #createTxValidator;
+    #checkAllowedSetupCalls;
     // === In-Memory Indices ===
-    /** Primary metadata store: txHash -> TxMetaData */ #metadata = new Map();
-    /** Nullifier to txHash index (pending txs only) */ #nullifierToTxHash = new Map();
-    /** Fee payer to txHashes index (pending txs only) */ #feePayerToTxHashes = new Map();
-    /**
-   * Pending txHashes grouped by priority fee.
-   * Outer map: priorityFee -> Set of txHashes at that fee level.
-   */ #pendingByPriority = new Map();
-    /** Protected transactions: txHash -> slotNumber. Includes txs we have and txs we expect to receive. */ #protectedTransactions = new Map();
+    #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.#checkAllowedSetupCalls = deps.checkAllowedSetupCalls;
         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
@@ -75,20 +81,32 @@ import { buildTxMetaData, checkNullifierConflict, compareFee, compareTxHash } fr
    * 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));
         // Step 3: Partition by mined status
-        const { mined, nonMined } = this.#partitionByMinedStatus(loaded);
+        const mined = [];
+        const nonMined = [];
+        for (const entry of loaded){
+            if (entry.meta.minedL2BlockId !== undefined) {
+                mined.push(entry.meta);
+            } else {
+                nonMined.push(entry);
+            }
+        }
         // Step 4: Validate non-mined transactions
-        const { valid, invalid } = await this.#validateNonMinedTxs(nonMined);
+        const { valid, invalid } = await this.#revalidateMetadata(nonMined.map((e)=>e.meta), 'on startup');
         // Step 5: Populate mined indices (these don't need conflict resolution)
-        this.#populateMinedIndices(mined);
+        for (const meta of mined){
+            this.#indices.addMined(meta);
+        }
         // Step 6: Rebuild pending pool by running pre-add rules for each tx
         // This resolves nullifier conflicts, fee payer balance issues, and pool size limits
         const { rejected } = await this.#rebuildPendingPool(valid);
-        // Step 7: Delete invalid and rejected txs from DB
+        // Step 7: Delete invalid and rejected txs from DB only (indices were never populated for these)
         const toDelete = [
             ...deserializationErrors,
             ...invalid,
@@ -102,104 +120,158 @@ import { buildTxMetaData, checkNullifierConflict, compareFee, compareTxHash } fr
                 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 newlyAdded = [];
+        const errors = new Map();
         const acceptedPending = new Set();
+        // Phase 1: Pre-compute all throwable I/O outside the transaction.
+        // If any pre-computation throws, the entire call fails before mutations happen.
+        const precomputed = new Map();
+        const validator = await this.#createTxValidator();
+        for (const tx of txs){
+            const txHash = tx.getTxHash();
+            const txHashStr = txHash.toString();
+            const meta = await buildTxMetaData(tx);
+            const minedBlockId = await this.#getMinedBlockId(txHash);
+            // Validate non-mined txs (mined and pre-protected txs bypass validation inside the transaction)
+            let isValid = true;
+            if (!minedBlockId) {
+                isValid = await this.#validateMeta(meta, validator);
+            }
+            precomputed.set(txHashStr, {
+                meta,
+                minedBlockId,
+                isValid
+            });
+        }
+        // Phase 2: Apply mutations inside the transaction using only pre-computed results,
+        // in-memory reads, and buffered DB writes. Nothing here can throw an unhandled exception.
         const poolAccess = this.#createPreAddPoolAccess();
+        const preAddContext = opts.feeComparisonOnly !== undefined ? {
+            feeComparisonOnly: opts.feeComparisonOnly,
+            priceBumpPercentage: this.#config.priceBumpPercentage
+        } : undefined;
         await this.#store.transactionAsync(async ()=>{
             for (const tx of txs){
                 const txHash = tx.getTxHash();
                 const txHashStr = txHash.toString();
                 // Skip duplicates
-                if (this.#isDuplicateTx(txHashStr)) {
+                if (this.#indices.has(txHashStr)) {
                     ignored.push(txHash);
                     continue;
                 }
-                // Check mined status first (applies to all paths)
-                const minedBlockId = await this.#getMinedBlockId(txHash);
-                const preProtectedSlot = this.#protectedTransactions.get(txHashStr);
+                const { meta, minedBlockId, isValid } = precomputed.get(txHashStr);
+                const preProtectedSlot = this.#indices.getProtectionSlot(txHashStr);
                 if (minedBlockId) {
                     // Already mined - add directly (protection already set if pre-protected)
-                    await this.#addNewMinedTx(tx, minedBlockId);
+                    await this.#addTx(tx, {
+                        mined: minedBlockId
+                    }, opts, meta);
                     accepted.push(txHash);
-                    newlyAdded.push(tx);
                 } else if (preProtectedSlot !== undefined) {
                     // Pre-protected and not mined - add as protected (bypass validation)
-                    await this.#addNewProtectedTx(tx, preProtectedSlot);
+                    await this.#addTx(tx, {
+                        protected: preProtectedSlot
+                    }, opts, meta);
                     accepted.push(txHash);
-                    newlyAdded.push(tx);
+                } else if (!isValid) {
+                    // Failed pre-computed validation
+                    rejected.push(txHash);
                 } else {
-                    // Regular pending tx - validate and run pre-add rules
-                    const result = await this.#tryAddRegularPendingTx(tx, poolAccess, acceptedPending, ignored);
+                    // Regular pending tx - run pre-add rules using pre-computed metadata
+                    const result = await this.#tryAddRegularPendingTx(tx, meta, opts, poolAccess, acceptedPending, ignored, errors, preAddContext);
                     if (result.status === 'accepted') {
                         acceptedPending.add(txHashStr);
-                        newlyAdded.push(tx);
-                    } else if (result.status === 'rejected') {
-                        rejected.push(txHash);
                     } else {
                         ignored.push(txHash);
                     }
                 }
             }
+            // Run post-add eviction rules for pending txs (inside transaction for atomicity)
+            if (acceptedPending.size > 0) {
+                const feePayers = Array.from(acceptedPending).map((txHash)=>this.#indices.getMetadata(txHash).feePayer);
+                const uniqueFeePayers = new Set(feePayers);
+                await this.#evictionManager.evictAfterNewTxs(Array.from(acceptedPending), [
+                    ...uniqueFeePayers
+                ]);
+            }
         });
         // Build final accepted list for pending txs (excludes intra-batch evictions)
         for (const txHashStr of acceptedPending){
             accepted.push(TxHash.fromString(txHashStr));
         }
-        // Run post-add eviction rules for pending txs
-        if (acceptedPending.size > 0) {
-            const feePayers = Array.from(acceptedPending).map((txHash)=>this.#metadata.get(txHash).feePayer);
-            const uniqueFeePayers = new Set(feePayers);
-            await this.#evictionManager.evictAfterNewTxs(Array.from(acceptedPending), [
-                ...uniqueFeePayers
-            ]);
+        // Record metrics
+        if (ignored.length > 0) {
+            this.#instrumentation.recordIgnored(ignored.length);
         }
-        // Emit events
-        if (newlyAdded.length > 0) {
-            this.#callbacks.onTxsAdded(newlyAdded, opts);
+        if (rejected.length > 0) {
+            this.#instrumentation.recordRejected(rejected.length);
         }
         return {
             accepted,
             ignored,
-            rejected
+            rejected,
+            ...errors.size > 0 ? {
+                errors
+            } : {}
         };
     }
-    /** Validates and adds a regular pending tx. Returns status. */ async #tryAddRegularPendingTx(tx, poolAccess, acceptedPending, ignored) {
-        const txHash = tx.getTxHash();
-        const txHashStr = txHash.toString();
-        // Validate transaction
-        const validationResult = await this.#pendingTxValidator.validateTx(tx);
-        if (validationResult.result !== 'valid') {
-            this.#log.info(`Rejecting tx ${txHashStr}: ${validationResult.reason?.join(', ')}`);
-            return {
-                status: 'rejected'
-            };
-        }
-        // Build metadata and run pre-add rules
-        const meta = await buildTxMetaData(tx);
-        const preAddResult = await this.#evictionManager.runPreAddRules(meta, poolAccess);
+    /** Adds a validated pending tx, running pre-add rules and evicting conflicts. */ async #tryAddRegularPendingTx(tx, precomputedMeta, opts, poolAccess, acceptedPending, ignored, errors, preAddContext) {
+        const txHashStr = tx.getTxHash().toString();
+        // Run pre-add rules
+        const preAddResult = await this.#evictionManager.runPreAddRules(precomputedMeta, 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 (tracking intra-batch evictions)
-        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)) {
-                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));
+                }
+            }
+        }
+        // Randomly drop the transaction for testing purposes (report as accepted so it propagates)
+        if (this.#config.dropTransactionsProbability > 0 && Math.random() < this.#config.dropTransactionsProbability) {
+            this.#log.debug(`Dropping tx ${txHashStr} (simulated drop for testing)`);
+            return {
+                status: 'accepted'
+            };
         }
         // Add the transaction
-        await this.#addNewPendingTx(tx);
+        await this.#addTx(tx, 'pending', opts, precomputedMeta);
         return {
             status: 'accepted'
         };
@@ -207,89 +279,125 @@ import { buildTxMetaData, checkNullifierConflict, compareFee, compareTxHash } fr
     async canAddPendingTx(tx) {
         const txHashStr = tx.getTxHash().toString();
         // Check if already in pool
-        if (this.#metadata.has(txHashStr)) {
+        if (this.#indices.has(txHashStr)) {
+            this.#log.verbose(`canAddPendingTx: tx ${txHashStr} already in pool`);
             return 'ignored';
         }
-        // Validate transaction
-        const validationResult = await this.#pendingTxValidator.validateTx(tx);
-        if (validationResult.result !== 'valid') {
-            return 'rejected';
-        }
-        // Build metadata and use pre-add rules
+        // Build metadata and check pre-add rules
         const meta = await buildTxMetaData(tx);
         const poolAccess = this.#createPreAddPoolAccess();
         const preAddResult = await this.#evictionManager.runPreAddRules(meta, poolAccess);
-        return preAddResult.shouldIgnore ? 'ignored' : 'accepted';
+        if (preAddResult.shouldIgnore) {
+            this.#log.verbose(`canAddPendingTx: tx ${txHashStr} ignored by pre-add rule`, {
+                reason: preAddResult.reason?.message ?? 'no reason provided'
+            });
+            return 'ignored';
+        }
+        return 'accepted';
     }
     async addProtectedTxs(txs, block, opts) {
         const slotNumber = block.globalVariables.slotNumber;
-        const newlyAdded = [];
+        // Precompute setup-call allow-list flags outside the store transaction
+        const allowedFlags = await Promise.all(txs.map((tx)=>this.#checkAllowedSetupCalls(tx)));
         await this.#store.transactionAsync(async ()=>{
-            for (const tx of txs){
+            for(let i = 0; i < txs.length; i++){
+                const tx = txs[i];
                 const txHash = tx.getTxHash();
                 const txHashStr = txHash.toString();
-                const isNew = !this.#metadata.has(txHashStr);
+                const isNew = !this.#indices.has(txHashStr);
                 const minedBlockId = await this.#getMinedBlockId(txHash);
                 if (isNew) {
-                    // New tx - add as mined or protected
+                    const meta = await buildTxMetaData(tx, allowedFlags[i]);
+                    // New tx - add as mined or protected (callback emitted by #addTx)
                     if (minedBlockId) {
-                        await this.#addNewMinedTx(tx, minedBlockId);
-                        this.#protectedTransactions.set(txHashStr, slotNumber);
+                        await this.#addTx(tx, {
+                            mined: minedBlockId
+                        }, opts, meta);
+                        this.#indices.setProtection(txHashStr, slotNumber);
                     } else {
-                        await this.#addNewProtectedTx(tx, slotNumber);
+                        await this.#addTx(tx, {
+                            protected: slotNumber
+                        }, opts, meta);
                     }
-                    newlyAdded.push(tx);
                 } else {
                     // Existing tx - update protection and mined status
-                    this.#updateProtection(txHashStr, slotNumber);
+                    this.#indices.updateProtection(txHashStr, slotNumber);
                     if (minedBlockId) {
-                        this.#markAsMined(this.#metadata.get(txHashStr), minedBlockId);
+                        const meta = this.#indices.getMetadata(txHashStr);
+                        this.#indices.markAsMined(meta, minedBlockId);
                     }
                 }
             }
         });
-        if (newlyAdded.length > 0) {
-            this.#callbacks.onTxsAdded(newlyAdded, opts);
-        }
     }
-    protectTxs(txHashes, block) {
+    async protectTxs(txHashes, block) {
         const slotNumber = block.globalVariables.slotNumber;
         const missing = [];
-        for (const txHash of txHashes){
-            const txHashStr = txHash.toString();
-            if (this.#metadata.has(txHashStr)) {
-                // Step 1a: Update protection for existing tx
-                this.#updateProtection(txHashStr, slotNumber);
-            } else {
-                // Step 1b: Pre-record protection for tx we don't have yet
-                this.#protectedTransactions.set(txHashStr, slotNumber);
-                missing.push(txHash);
+        let softDeletedHits = 0;
+        let missingPreviouslyEvicted = 0;
+        await this.#store.transactionAsync(async ()=>{
+            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 {
+                    // 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) {
         // Step 1: Build block ID
         const blockId = await this.#buildBlockId(block);
-        const newlyAdded = [];
         await this.#store.transactionAsync(async ()=>{
             for (const tx of txs){
                 const txHashStr = tx.getTxHash().toString();
-                const existingMeta = this.#metadata.get(txHashStr);
+                const existingMeta = this.#indices.getMetadata(txHashStr);
                 if (existingMeta) {
-                    // Step 2a: Mark existing tx as mined
-                    this.#markAsMined(existingMeta, blockId);
+                    // Mark existing tx as mined
+                    this.#indices.markAsMined(existingMeta, blockId);
                 } else {
-                    // Step 2b: Add new mined tx
-                    await this.#addNewMinedTx(tx, blockId);
-                    newlyAdded.push(tx);
+                    // Add new mined tx (callback emitted by #addTx)
+                    await this.#addTx(tx, {
+                        mined: blockId
+                    }, opts);
                 }
+                await this.#deletedPool.clearIfMinedHigher(txHashStr, blockId.number);
             }
         });
-        // Step 3: Emit events for newly added txs
-        if (newlyAdded.length > 0) {
-            this.#callbacks.onTxsAdded(newlyAdded, opts);
-        }
     }
     async handleMinedBlock(block) {
         // Step 1: Build block ID
@@ -301,102 +409,141 @@ import { buildTxMetaData, checkNullifierConflict, compareFee, compareTxHash } fr
         const feePayers = [];
         const found = [];
         for (const txHash of txHashes){
-            const meta = this.#metadata.get(txHash.toString());
+            const meta = this.#indices.getMetadata(txHash.toString());
             if (meta) {
                 feePayers.push(meta.feePayer);
                 found.push(meta);
             }
         }
-        // Step 4: Mark txs as mined (only those we have in the pool)
-        this.#markTxsAsMined(found, blockId);
-        // Step 5: Run eviction rules (remove pending txs with conflicting nullifiers/expired timestamps)
-        await this.#evictionManager.evictAfterNewBlock(block.header, nullifiers, feePayers);
-        this.#callbacks.onTxsRemoved(txHashes.map((h)=>h.toBigInt()));
+        await this.#store.transactionAsync(async ()=>{
+            // 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 post-event eviction rules (inside transaction for atomicity)
+            await this.#evictionManager.evictAfterNewBlock(block.header, nullifiers, feePayers);
+        });
+        if (found.length > 0) {
+            this.#callbacks.onTxsMined(found.map((m)=>m.txHash));
+        }
         this.#log.info(`Marked ${found.length} txs as mined in block ${blockId.number}`);
     }
     async prepareForSlot(slotNumber) {
-        // Step 1: Find expired protected txs
-        const expiredProtected = this.#findExpiredProtectedTxs(slotNumber);
-        // Step 2: Clear protection for all expired entries (including those without metadata)
-        this.#clearProtection(expiredProtected);
-        // Step 3: Filter to only txs that have metadata and are not mined
-        const txsToRestore = this.#filterRestorable(expiredProtected);
-        if (txsToRestore.length === 0) {
-            return;
-        }
-        this.#log.info(`Preparing for slot ${slotNumber}: unprotecting ${txsToRestore.length} txs`);
-        // Step 4: Validate for pending pool
-        const { valid, invalid } = await this.#validateForPending(txsToRestore);
-        // 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 7: Run eviction rules (enforce pool size limit)
-        if (added.length > 0) {
-            const feePayers = added.map((meta)=>meta.feePayer);
-            const uniqueFeePayers = new Set(feePayers);
-            await this.#evictionManager.evictAfterNewTxs(added.map((m)=>m.txHash), [
-                ...uniqueFeePayers
-            ]);
-        }
+        await this.#store.transactionAsync(async ()=>{
+            // 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)
+            this.#indices.clearProtection(expiredProtected);
+            // 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.#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 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);
+                const uniqueFeePayers = new Set(feePayers);
+                await this.#evictionManager.evictAfterNewTxs(added.map((m)=>m.txHash), [
+                    ...uniqueFeePayers
+                ]);
+            }
+        });
     }
-    async handlePrunedBlocks(latestBlock) {
+    async handlePrunedBlocks(latestBlock, options) {
         // Step 1: Find transactions mined after the prune point
-        const txsToUnmine = this.#findTxsMinedAfter(latestBlock.number);
+        const txsToUnmine = this.#indices.findTxsMinedAfter(latestBlock.number);
         if (txsToUnmine.length === 0) {
             this.#log.debug(`No transactions to un-mine for prune to block ${latestBlock.number}`);
             return;
         }
         this.#log.info(`Handling prune to block ${latestBlock.number}: un-mining ${txsToUnmine.length} txs`);
-        // Step 2: Unmine - clear mined status from metadata
-        this.#unmineTxs(txsToUnmine);
-        // Step 3: Filter out protected txs (they'll be handled by prepareForSlot)
-        const unprotectedTxs = this.#filterUnprotected(txsToUnmine);
-        // Step 4: Validate for pending pool
-        const { valid, invalid } = await this.#validateForPending(unprotectedTxs);
-        // Step 5: 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)
-        // This handles cases like existing pending txs with invalid fee payer balances
-        await this.#evictionManager.evictAfterChainPrune(latestBlock.number);
+        await this.#store.transactionAsync(async ()=>{
+            // 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);
+            }
+            // 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 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 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) {
-        // Step 1: Delete failed txs
-        await this.#deleteTxsBatch(txHashes.map((h)=>h.toString()));
-        this.#log.info(`Deleted ${txHashes.length} failed txs`);
+        await this.#store.transactionAsync(async ()=>{
+            await this.#deleteTxsBatch(txHashes.map((h)=>h.toString()));
+        });
+        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.#findTxsMinedAtOrBefore(blockNumber);
-        if (txsToFinalize.length === 0) {
-            return;
-        }
-        // Step 2: Collect txs for archiving (before deletion)
-        const txsToArchive = [];
-        if (this.#archive.isEnabled()) {
-            for (const txHashStr of txsToFinalize){
-                const buffer = await this.#txsDB.getAsync(txHashStr);
-                if (buffer) {
-                    txsToArchive.push(Tx.fromBuffer(buffer));
+        // Step 1: Find mined txs at or before finalized block
+        const minedTxsToFinalize = this.#indices.findTxsMinedAtOrBefore(blockNumber);
+        await this.#store.transactionAsync(async ()=>{
+            // Step 2: Collect mined txs for archiving (before deletion)
+            const txsToArchive = [];
+            if (this.#archive.isEnabled()) {
+                for (const txHashStr of minedTxsToFinalize){
+                    const buffer = await this.#txsDB.getAsync(txHashStr);
+                    if (buffer) {
+                        txsToArchive.push(Tx.fromBuffer(buffer));
+                    }
                 }
             }
+            // 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);
+            }
+        });
+        if (minedTxsToFinalize.length > 0) {
+            this.#log.info(`Finalized ${minedTxsToFinalize.length} mined txs from blocks up to ${blockNumber}`, {
+                txHashes: minedTxsToFinalize
+            });
         }
-        // Step 3: Delete from active pool
-        await this.#deleteTxsBatch(txsToFinalize);
-        // Step 4: Archive
-        if (txsToArchive.length > 0) {
-            await this.#archive.archiveTxs(txsToArchive);
-        }
-        this.#log.info(`Finalized ${txsToFinalize.length} txs from blocks up to ${blockNumber}`);
     }
     // === Query Methods ===
     async getTxByHash(txHash) {
@@ -412,42 +559,46 @@ import { buildTxMetaData, checkNullifierConflict, compareFee, compareTxHash } fr
         return results;
     }
     hasTxs(txHashes) {
-        return txHashes.map((h)=>this.#metadata.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.#metadata.get(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.#getTxState(meta);
+        // Check if soft-deleted
+        if (this.#deletedPool.isSoftDeleted(txHashStr)) {
+            return 'deleted';
+        }
+        return undefined;
     }
     getPendingTxHashes() {
         return [
-            ...this.#iteratePendingByPriority('desc')
+            ...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() {
-        let count = 0;
-        for (const hashes of this.#pendingByPriority.values()){
-            count += hashes.size;
-        }
-        return count;
+        return this.#indices.getPendingTxCount();
     }
     getMinedTxHashes() {
-        const result = [];
-        for (const [txHash, meta] of this.#metadata){
-            if (meta.minedL2BlockId !== undefined) {
-                result.push([
-                    TxHash.fromString(txHash),
-                    meta.minedL2BlockId
-                ]);
-            }
-        }
-        return result;
+        return this.#indices.getMinedTxs().map(([hash, blockId])=>[
+                TxHash.fromString(hash),
+                blockId
+            ]);
     }
     getMinedTxCount() {
         let count = 0;
-        for (const meta of this.#metadata.values()){
+        for (const [, meta] of this.#indices.iterateMetadata()){
             if (meta.minedL2BlockId !== undefined) {
                 count++;
             }
@@ -455,26 +606,16 @@ import { buildTxMetaData, checkNullifierConflict, compareFee, compareTxHash } fr
         return count;
     }
     isEmpty() {
-        return this.#metadata.size === 0;
+        return this.#indices.isEmpty();
     }
     getTxCount() {
-        return this.#metadata.size;
+        return this.#indices.getTxCount();
     }
     getArchivedTxByHash(txHash) {
         return this.#archive.getTxByHash(txHash);
     }
     getLowestPriorityPending(limit) {
-        if (limit <= 0) {
-            return [];
-        }
-        const result = [];
-        for (const hash of this.#iteratePendingByPriority('asc')){
-            result.push(TxHash.fromString(hash));
-            if (result.length >= limit) {
-                break;
-            }
-        }
-        return result;
+        return this.#indices.getLowestPriorityPending(limit).map((h)=>TxHash.fromString(h));
     }
     // === Configuration ===
     updateConfig(config) {
@@ -485,138 +626,122 @@ import { buildTxMetaData, checkNullifierConflict, compareFee, compareTxHash } fr
             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);
     }
     // === Pool Read Access ===
     getPoolReadAccess() {
         return {
-            getMetadata: (txHash)=>this.#metadata.get(txHash),
-            getTxHashByNullifier: (nullifier)=>this.#nullifierToTxHash.get(nullifier),
-            getTxHashesByFeePayer: (feePayer)=>this.#feePayerToTxHashes.get(feePayer),
-            getPendingTxCount: ()=>this.getPendingTxCount()
+            getMetadata: (txHash)=>this.#indices.getMetadata(txHash),
+            getTxHashByNullifier: (nullifier)=>this.#indices.getTxHashByNullifier(nullifier),
+            getTxHashesByFeePayer: (feePayer)=>this.#indices.getTxHashesByFeePayer(feePayer),
+            getPendingTxCount: ()=>this.#indices.getPendingTxCount()
         };
     }
     // === Metrics ===
     countTxs() {
-        let pending = 0;
-        let protected_ = 0;
-        let mined = 0;
-        for (const meta of this.#metadata.values()){
-            const state = this.#getTxState(meta);
-            if (state === 'pending') {
-                pending++;
-            } else if (state === 'protected') {
-                protected_++;
-            } else if (state === 'mined') {
-                mined++;
-            }
-        }
         return {
-            pending,
-            protected: protected_,
-            mined
+            ...this.#indices.countTxs(),
+            softDeleted: this.#deletedPool.getSoftDeletedCount()
         };
     }
     // ============================================================================
-    // PRIVATE QUERY IMPLEMENTATIONS
+    // PRIVATE HELPERS - Transaction Management
     // ============================================================================
     /**
-   * Derives the transaction state from its metadata and protection status.
-   * A transaction is:
-   * - 'mined' if it has a minedL2BlockId
-   * - 'protected' if it's in the protectedTransactions map (but not mined)
-   * - 'pending' otherwise
-   */ #getTxState(meta) {
-        if (meta.minedL2BlockId !== undefined) {
-            return 'mined';
-        } else if (this.#protectedTransactions.has(meta.txHash)) {
-            return 'protected';
+   * Adds a new transaction to the pool with the specified state.
+   * Emits onTxsAdded callback immediately after DB write.
+   */ async #addTx(tx, state, opts = {}, precomputedMeta) {
+        const txHashStr = tx.getTxHash().toString();
+        const meta = precomputedMeta ?? 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);
+        if (state === 'pending') {
+            this.#indices.addPending(meta);
+        } else if ('protected' in state) {
+            this.#indices.addProtected(meta, state.protected);
         } else {
-            return 'pending';
+            meta.minedL2BlockId = state.mined;
+            this.#indices.addMined(meta);
         }
+        const stateStr = typeof state === 'string' ? state : Object.keys(state)[0];
+        this.#log.debug(`Added tx ${txHashStr} as ${stateStr}`, {
+            eventName: 'tx-added-to-pool',
+            txHash: txHashStr,
+            state: stateStr,
+            source: opts.source
+        });
+        return meta;
     }
     /**
-   * Iterates pending transaction hashes in priority order.
-   * @param order - 'desc' for highest priority first, 'asc' for lowest priority first
-   */ *#iteratePendingByPriority(order) {
-        // Use shared comparators, negating for descending order
-        const feeCompareFn = order === 'desc' ? (a, b)=>compareFee(b, a) : (a, b)=>compareFee(a, b);
-        const hashCompareFn = order === 'desc' ? (a, b)=>compareTxHash(b, a) : (a, b)=>compareTxHash(a, b);
-        const sortedFees = [
-            ...this.#pendingByPriority.keys()
-        ].sort(feeCompareFn);
-        for (const fee of sortedFees){
-            const hashesAtFee = this.#pendingByPriority.get(fee);
-            const sortedHashes = [
-                ...hashesAtFee
-            ].sort(hashCompareFn);
-            for (const hash of sortedHashes){
-                yield hash;
-            }
-        }
+   * 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);
+        this.#callbacks.onTxsRemoved([
+            txHashStr
+        ]);
+        await this.#deletedPool.deleteTx(txHashStr);
     }
-    // ============================================================================
-    // HELPER FUNCTIONS - Pipeline Step Functions
-    // ============================================================================
-    // --- Finding & Filtering Steps ---
-    /** Finds all transactions mined in blocks after the given block number */ #findTxsMinedAfter(blockNumber) {
-        const result = [];
-        for (const meta of this.#metadata.values()){
-            if (meta.minedL2BlockId !== undefined && meta.minedL2BlockId.number > blockNumber) {
-                result.push(meta);
-            }
+    /** Deletes a batch of transactions, emitting callbacks individually for each. */ async #deleteTxsBatch(txHashes) {
+        for (const txHashStr of txHashes){
+            await this.#deleteTx(txHashStr);
         }
-        return result;
     }
-    /** Finds tx hashes mined at or before the given block number */ #findTxsMinedAtOrBefore(blockNumber) {
-        const result = [];
-        for (const [txHashStr, meta] of this.#metadata){
-            if (meta.minedL2BlockId !== undefined && meta.minedL2BlockId.number <= blockNumber) {
-                result.push(txHashStr);
-            }
+    /** Evicts transactions: records eviction metric with reason, caches hashes, then deletes. */ async #evictTxs(txHashes, reason) {
+        if (txHashes.length === 0) {
+            return;
         }
-        return result;
-    }
-    /** Finds protected tx hashes from slots earlier than the given slot number */ #findExpiredProtectedTxs(slotNumber) {
-        const result = [];
-        for (const [txHashStr, protectedSlot] of this.#protectedTransactions){
-            if (protectedSlot < slotNumber) {
-                result.push(txHashStr);
-            }
+        this.#instrumentation.recordEvictions(txHashes.length, reason);
+        for (const txHashStr of txHashes){
+            this.#log.debug(`Evicting tx ${txHashStr}`, {
+                txHash: txHashStr,
+                reason
+            });
+            this.#addToEvictedCache(txHashStr);
         }
-        return result;
+        await this.#deleteTxsBatch(txHashes);
     }
-    /** Filters out transactions that are currently protected */ #filterUnprotected(txs) {
-        return txs.filter((meta)=>!this.#protectedTransactions.has(meta.txHash));
+    /** 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);
     }
-    /** Filters to transactions that have metadata and are not mined */ #filterRestorable(txHashes) {
-        const result = [];
-        for (const txHashStr of txHashes){
-            const meta = this.#metadata.get(txHashStr);
-            if (meta && meta.minedL2BlockId === undefined) {
-                result.push(meta);
-            }
+    // ============================================================================
+    // PRIVATE HELPERS - Validation & Conflict Resolution
+    // ============================================================================
+    /** 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 ${meta.txHash}${contextStr} failed validation: ${result.reason?.join(', ')}`);
+            return false;
         }
-        return result;
+        return true;
     }
-    // --- Validation & Conflict Resolution Steps ---
-    /** Validates transactions for pending pool, returning valid and invalid groups */ async #validateForPending(txs) {
+    /** Validates metadata directly */ async #revalidateMetadata(metas, context) {
         const valid = [];
         const invalid = [];
-        for (const meta of txs){
-            const buffer = await this.#txsDB.getAsync(meta.txHash);
-            if (!buffer) {
-                this.#log.warn(`Tx ${meta.txHash} not found in DB during validation`);
-                invalid.push(meta.txHash);
-                continue;
-            }
-            const tx = Tx.fromBuffer(buffer);
-            const result = await this.#pendingTxValidator.validateTx(tx);
-            if (result.result === 'valid') {
+        const validator = await this.#createTxValidator();
+        for (const meta of metas){
+            if (await this.#validateMeta(meta, validator, context)) {
                 valid.push(meta);
             } else {
-                this.#log.info(`Tx ${meta.txHash} failed validation: ${result.reason?.join(', ')}`);
                 invalid.push(meta.txHash);
             }
         }
@@ -633,7 +758,7 @@ import { buildTxMetaData, checkNullifierConflict, compareFee, compareTxHash } fr
         const added = [];
         const toEvict = [];
         for (const meta of txs){
-            const conflict = checkNullifierConflict(meta, (nullifier)=>this.#nullifierToTxHash.get(nullifier), (txHash)=>this.#metadata.get(txHash));
+            const conflict = checkNullifierConflict(meta, (nullifier)=>this.#indices.getTxHashByNullifier(nullifier), (txHash)=>this.#indices.getMetadata(txHash));
             if (conflict.shouldIgnore) {
                 // Lower priority than existing - don't add, mark for deletion
                 toEvict.push(meta.txHash);
@@ -642,13 +767,13 @@ import { buildTxMetaData, checkNullifierConflict, compareFee, compareTxHash } fr
                 toEvict.push(...conflict.txHashesToEvict);
                 // Remove evicted from indices immediately for subsequent checks
                 for (const evictHash of conflict.txHashesToEvict){
-                    const evictMeta = this.#metadata.get(evictHash);
+                    const evictMeta = this.#indices.getMetadata(evictHash);
                     if (evictMeta) {
-                        this.#removeFromPendingIndices(evictMeta);
+                        this.#indices.removeFromPendingIndices(evictMeta);
                     }
                 }
                 // Add to pending indices immediately so subsequent txs in the batch see this tx
-                this.#addToPendingIndices(meta);
+                this.#indices.addToPendingIndices(meta);
                 added.push(meta);
             }
         }
@@ -657,32 +782,10 @@ import { buildTxMetaData, checkNullifierConflict, compareFee, compareTxHash } fr
             toEvict
         };
     }
-    // --- State Transition Steps ---
-    /** Clears the mined status from transactions, returning them for further processing */ #unmineTxs(txs) {
-        for (const meta of txs){
-            meta.minedL2BlockId = undefined;
-        }
-        return txs;
-    }
-    /** Removes protection from tx hashes and clears them from the protected map */ #clearProtection(txHashes) {
-        for (const txHashStr of txHashes){
-            this.#protectedTransactions.delete(txHashStr);
-        }
-    }
-    // --- Batch Operation Steps ---
-    /** Deletes a batch of transactions permanently */ async #deleteTxsBatch(txHashes) {
-        if (txHashes.length === 0) {
-            return;
-        }
-        await this.#store.transactionAsync(async ()=>{
-            for (const txHashStr of txHashes){
-                await this.#deleteTx(txHashStr);
-            }
-        });
-        this.#callbacks.onTxsRemoved(txHashes);
-    }
-    // --- Block & Tx Info Steps ---
-    /** Builds a block ID from a block header */ async #buildBlockId(block) {
+    // ============================================================================
+    // PRIVATE HELPERS - Block & Hydration
+    // ============================================================================
+    async #buildBlockId(block) {
         return {
             number: block.globalVariables.blockNumber,
             hash: (await block.hash()).toString()
@@ -698,43 +801,18 @@ import { buildTxMetaData, checkNullifierConflict, compareFee, compareTxHash } fr
             hash: txEffect.l2BlockHash.toString()
         };
     }
-    /** Marks a batch of transactions as mined */ #markTxsAsMined(metas, blockId) {
-        for (const meta of metas){
-            this.#markAsMined(meta, blockId);
-        }
-    }
-    // --- Add Transaction Steps ---
-    /** Persists a transaction to the database */ async #persistTx(txHashStr, tx) {
-        await this.#txsDB.set(txHashStr, tx.toBuffer());
-    }
-    /** Adds a new transaction as protected, returning its metadata */ async #addNewProtectedTx(tx, slotNumber) {
-        const txHashStr = tx.getTxHash().toString();
-        const meta = await buildTxMetaData(tx);
-        this.#protectedTransactions.set(txHashStr, slotNumber);
-        await this.#persistTx(txHashStr, tx);
-        this.#metadata.set(txHashStr, meta);
-        // Don't add to pending indices since it's protected
-        this.#log.verbose(`Added protected tx ${txHashStr} for slot ${slotNumber}`);
-        return meta;
-    }
-    /** Adds a new transaction as mined, returning its metadata */ async #addNewMinedTx(tx, blockId) {
-        const txHashStr = tx.getTxHash().toString();
-        const meta = await buildTxMetaData(tx);
-        meta.minedL2BlockId = blockId;
-        await this.#persistTx(txHashStr, tx);
-        this.#metadata.set(txHashStr, meta);
-        // Don't add to pending indices since it's mined
-        this.#log.verbose(`Added mined tx ${txHashStr} from block ${blockId.number}`);
-        return meta;
-    }
-    // --- Hydration Steps ---
     /** Loads all transactions from the database, returning loaded txs and deserialization errors */ async #loadAllTxsFromDb() {
         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);
+                const allowedSetupCalls = await this.#checkAllowedSetupCalls(tx);
+                const meta = await buildTxMetaData(tx, allowedSetupCalls);
                 loaded.push({
                     tx,
                     meta
@@ -768,43 +846,6 @@ import { buildTxMetaData, checkNullifierConflict, compareFee, compareTxHash } fr
             }
         }
     }
-    /** Partitions transactions by mined status */ #partitionByMinedStatus(txs) {
-        const mined = [];
-        const nonMined = [];
-        for (const entry of txs){
-            if (entry.meta.minedL2BlockId !== undefined) {
-                mined.push(entry.meta);
-            } else {
-                nonMined.push(entry);
-            }
-        }
-        return {
-            mined,
-            nonMined
-        };
-    }
-    /** Validates non-mined transactions, returning valid metadata and invalid hashes */ async #validateNonMinedTxs(txs) {
-        const valid = [];
-        const invalid = [];
-        for (const { tx, meta } of txs){
-            const result = await this.#pendingTxValidator.validateTx(tx);
-            if (result.result === 'valid') {
-                valid.push(meta);
-            } else {
-                this.#log.info(`Removing invalid tx ${meta.txHash} on startup: ${result.reason?.join(', ')}`);
-                invalid.push(meta.txHash);
-            }
-        }
-        return {
-            valid,
-            invalid
-        };
-    }
-    /** Populates metadata index for mined transactions */ #populateMinedIndices(metas) {
-        for (const meta of metas){
-            this.#metadata.set(meta.txHash, meta);
-        }
-    }
     /**
    * Rebuilds the pending pool by processing each tx through pre-add rules.
    * Starts with an empty pending pool and adds txs one by one, resolving conflicts.
@@ -819,22 +860,22 @@ import { buildTxMetaData, checkNullifierConflict, compareFee, compareTxHash } fr
             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
             for (const evictHashStr of preAddResult.txHashesToEvict){
-                const evictMeta = this.#metadata.get(evictHashStr);
+                const evictMeta = this.#indices.getMetadata(evictHashStr);
                 if (evictMeta) {
-                    this.#removeFromPendingIndices(evictMeta);
-                    this.#metadata.delete(evictHashStr);
+                    this.#indices.removeFromPendingIndices(evictMeta);
+                    this.#indices.remove(evictHashStr);
                     rejected.push(evictHashStr);
                     accepted.delete(evictHashStr);
                     this.#log.debug(`Evicted tx ${evictHashStr} during rebuild due to conflict with ${meta.txHash}`);
                 }
             }
-            // Add to metadata and pending indices
-            this.#addToIndices(meta);
+            // Add to indices
+            this.#indices.addPending(meta);
             accepted.add(meta.txHash);
         }
         this.#log.info(`Rebuilt pending pool: ${accepted.size} accepted, ${rejected.length} rejected`);
@@ -845,197 +886,38 @@ import { buildTxMetaData, checkNullifierConflict, compareFee, compareTxHash } fr
             rejected
         };
     }
-    // --- Add Pending Tx Steps ---
-    /** Checks if a tx is a duplicate (already in pool) */ #isDuplicateTx(txHashStr) {
-        return this.#metadata.has(txHashStr);
-    }
-    /** Adds a new pending tx to the pool, returning its metadata */ async #addNewPendingTx(tx) {
-        const txHashStr = tx.getTxHash().toString();
-        const meta = await buildTxMetaData(tx);
-        await this.#persistTx(txHashStr, tx);
-        this.#addToIndices(meta);
-        this.#log.verbose(`Added tx ${txHashStr} to pool`, {
-            eventName: 'tx-added-to-pool',
-            state: this.#getTxState(meta)
-        });
-        return meta;
-    }
-    // ============================================================================
-    // HELPER FUNCTIONS - Index Management
-    // ============================================================================
-    #addToIndices(meta) {
-        this.#metadata.set(meta.txHash, meta);
-        if (this.#getTxState(meta) === 'pending') {
-            this.#addToPendingIndices(meta);
-        }
-    // Protected and mined txs don't go into pending indices
-    }
-    #addToPendingIndices(meta) {
-        // Add to nullifier index
-        for (const nullifier of meta.nullifiers){
-            this.#nullifierToTxHash.set(nullifier, meta.txHash);
-        }
-        // Add to fee payer index
-        let feePayerSet = this.#feePayerToTxHashes.get(meta.feePayer);
-        if (!feePayerSet) {
-            feePayerSet = new Set();
-            this.#feePayerToTxHashes.set(meta.feePayer, feePayerSet);
-        }
-        feePayerSet.add(meta.txHash);
-        // Add to priority bucket
-        let prioritySet = this.#pendingByPriority.get(meta.priorityFee);
-        if (!prioritySet) {
-            prioritySet = new Set();
-            this.#pendingByPriority.set(meta.priorityFee, prioritySet);
-        }
-        prioritySet.add(meta.txHash);
-    }
-    #removeFromPendingIndices(meta) {
-        // Remove from nullifier index
-        for (const nullifier of meta.nullifiers){
-            this.#nullifierToTxHash.delete(nullifier);
-        }
-        // Remove from fee payer index
-        const feePayerSet = this.#feePayerToTxHashes.get(meta.feePayer);
-        if (feePayerSet) {
-            feePayerSet.delete(meta.txHash);
-            if (feePayerSet.size === 0) {
-                this.#feePayerToTxHashes.delete(meta.feePayer);
-            }
-        }
-        // Remove from priority map
-        const hashSet = this.#pendingByPriority.get(meta.priorityFee);
-        if (hashSet) {
-            hashSet.delete(meta.txHash);
-            if (hashSet.size === 0) {
-                this.#pendingByPriority.delete(meta.priorityFee);
-            }
-        }
-    }
-    #updateProtection(txHashStr, slotNumber) {
-        const currentSlot = this.#protectedTransactions.get(txHashStr);
-        // Only update if not already protected at an equal or later slot
-        if (currentSlot !== undefined && currentSlot >= slotNumber) {
-            return;
-        }
-        // Remove from pending indices if transitioning from pending to protected
-        if (currentSlot === undefined) {
-            const meta = this.#metadata.get(txHashStr);
-            if (meta) {
-                this.#removeFromPendingIndices(meta);
-            }
-        }
-        this.#protectedTransactions.set(txHashStr, slotNumber);
-    }
-    #markAsMined(meta, blockId) {
-        meta.minedL2BlockId = blockId;
-        // Safe to call unconditionally - removeFromPendingIndices is idempotent
-        this.#removeFromPendingIndices(meta);
-    }
-    async #deleteTx(txHashStr) {
-        const meta = this.#metadata.get(txHashStr);
-        if (!meta) {
-            return;
-        }
-        // Remove from all indices
-        this.#metadata.delete(txHashStr);
-        this.#protectedTransactions.delete(txHashStr);
-        this.#removeFromPendingIndices(meta);
-        // Remove from persistence
-        await this.#txsDB.delete(txHashStr);
-    }
     // ============================================================================
-    // HELPER FUNCTIONS - Adapters
+    // PRIVATE HELPERS - Pool Access Adapters
     // ============================================================================
-    /** Gets all pending transactions for a given fee payer. */ #getFeePayerPendingTxs(feePayer) {
-        const txHashes = this.#feePayerToTxHashes.get(feePayer);
-        if (!txHashes) {
-            return [];
-        }
-        const result = [];
-        for (const txHashStr of txHashes){
-            const meta = this.#metadata.get(txHashStr);
-            if (meta && this.#getTxState(meta) === 'pending') {
-                result.push(meta);
-            }
-        }
-        return result;
-    }
-    /**
-   * Creates a PoolOperations adapter for use with the eviction manager.
-   */ #createPoolOperations() {
+    #createPoolOperations() {
         return {
-            getPendingTxs: ()=>{
-                const result = [];
-                for (const hashSet of this.#pendingByPriority.values()){
-                    for (const txHashStr of hashSet){
-                        const meta = this.#metadata.get(txHashStr);
-                        if (meta) {
-                            result.push(meta);
-                        }
-                    }
-                }
-                return result;
-            },
-            getPendingFeePayers: ()=>{
-                return Array.from(this.#feePayerToTxHashes.keys());
-            },
-            getFeePayerPendingTxs: (feePayer)=>{
-                return this.#getFeePayerPendingTxs(feePayer);
-            },
-            getPendingTxCount: ()=>{
-                return this.getPendingTxCount();
-            },
-            getLowestPriorityPending: (limit)=>{
-                return this.getLowestPriorityPending(limit).map((h)=>h.toString());
-            },
-            deleteTxs: async (txHashes)=>{
-                await this.#store.transactionAsync(async ()=>{
-                    for (const txHashStr of txHashes){
-                        await this.#deleteTx(txHashStr);
-                    }
-                });
-                this.#callbacks.onTxsRemoved(txHashes);
-            }
+            getPendingTxs: ()=>this.#indices.getPendingTxs(),
+            getPendingFeePayers: ()=>this.#indices.getPendingFeePayers(),
+            getFeePayerPendingTxs: (feePayer)=>this.#indices.getFeePayerPendingTxs(feePayer),
+            getPendingTxCount: ()=>this.#indices.getPendingTxCount(),
+            getLowestPriorityPending: (limit)=>this.#indices.getLowestPriorityPending(limit),
+            deleteTxs: (txHashes, reason)=>this.#evictTxs(txHashes, reason ?? 'unknown')
         };
     }
-    /**
-   * Creates a PreAddPoolAccess adapter for use with pre-add eviction rules.
-   * All methods work with strings and TxMetaData for efficiency.
-   */ #createPreAddPoolAccess() {
+    #createPreAddPoolAccess() {
         return {
             getMetadata: (txHashStr)=>{
-                const meta = this.#metadata.get(txHashStr);
-                if (!meta || this.#getTxState(meta) !== 'pending') {
+                const meta = this.#indices.getMetadata(txHashStr);
+                if (!meta || this.#indices.getTxState(meta) !== 'pending') {
                     return undefined;
                 }
                 return meta;
             },
-            getTxHashByNullifier: (nullifier)=>{
-                return this.#nullifierToTxHash.get(nullifier);
-            },
+            getTxHashByNullifier: (nullifier)=>this.#indices.getTxHashByNullifier(nullifier),
             getFeePayerBalance: async (feePayer)=>{
                 const db = this.#worldStateSynchronizer.getCommitted();
                 const publicStateSource = new DatabasePublicStateSource(db);
                 const balance = await publicStateSource.storageRead(ProtocolContractAddress.FeeJuice, await computeFeePayerBalanceStorageSlot(AztecAddress.fromString(feePayer)));
                 return balance.toBigInt();
             },
-            getFeePayerPendingTxs: (feePayer)=>{
-                return this.#getFeePayerPendingTxs(feePayer);
-            },
-            getPendingTxCount: ()=>{
-                return this.getPendingTxCount();
-            },
-            getLowestPriorityPendingTx: ()=>{
-                // Iterate in ascending order to find the lowest priority
-                for (const txHashStr of this.#iteratePendingByPriority('asc')){
-                    const meta = this.#metadata.get(txHashStr);
-                    if (meta) {
-                        return meta;
-                    }
-                }
-                return undefined;
-            }
+            getFeePayerPendingTxs: (feePayer)=>this.#indices.getFeePayerPendingTxs(feePayer),
+            getPendingTxCount: ()=>this.#indices.getPendingTxCount(),
+            getLowestPriorityPendingTx: ()=>this.#indices.getLowestPriorityPendingTx()
         };
     }
 }