@aztec/p2p 0.0.1-commit.fce3e4f → 0.0.1-commit.fffb133c

package/dest/mem_pools/tx_pool/aztec_kv_tx_pool.js

@@ -1,39 +1,42 @@
-import { Fr } from '@aztec/foundation/fields';
+import { insertIntoSortedArray } from '@aztec/foundation/array';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { toArray } from '@aztec/foundation/iterable';
 import { createLogger } from '@aztec/foundation/log';
-import { ProtocolContractAddress } from '@aztec/protocol-contracts';
-import { GasFees } from '@aztec/stdlib/gas';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { ChonkProof } from '@aztec/stdlib/proofs';
-import { DatabasePublicStateSource } from '@aztec/stdlib/trees';
 import { Tx, TxHash } from '@aztec/stdlib/tx';
 import { getTelemetryClient } from '@aztec/telemetry-client';
 import assert from 'assert';
 import EventEmitter from 'node:events';
 import { ArchiveCache } from '../../msg_validators/tx_validator/archive_cache.js';
-import { GasTxValidator } from '../../msg_validators/tx_validator/gas_validator.js';
 import { PoolInstrumentation, PoolName } from '../instrumentation.js';
+import { EvictionManager } from './eviction/eviction_manager.js';
+import { FeePayerTxInfo } from './eviction/eviction_strategy.js';
+import { FeePayerBalanceEvictionRule } from './eviction/fee_payer_balance_eviction_rule.js';
+import { InvalidTxsAfterMiningRule } from './eviction/invalid_txs_after_mining_rule.js';
+import { InvalidTxsAfterReorgRule } from './eviction/invalid_txs_after_reorg_rule.js';
+import { LowPriorityEvictionRule } from './eviction/low_priority_eviction_rule.js';
+import { NullifierConflictPreAddRule } from './eviction/nullifier_conflict_pre_add_rule.js';
 import { getPendingTxPriority } from './priority.js';
 /**
  * KV implementation of the Transaction Pool.
  */ export class AztecKVTxPool extends EventEmitter {
     #store;
     /** Our tx pool, stored as a Map, with K: tx hash and V: the transaction. */ #txs;
-    /** The maximum cumulative tx size that the pending txs in the pool take up. */ #maxTxPoolSize = 0;
-    /** The tx evicion logic will kick after pool size is greater than maxTxPoolSize * txPoolOverflowFactor */ txPoolOverflowFactor = 1;
+    /** Holds the historical block for each tx */ #pendingTxHashToHistoricalBlockHeaderHash;
     /** Index from tx hash to the block number in which they were mined, filtered by mined txs. */ #minedTxHashToBlock;
     /** Index from tx priority (stored as hex) to its tx hash, filtered by pending txs. */ #pendingTxPriorityToHash;
-    /** Index from tx hash to its tx size (in bytes), filtered by pending txs. */ #pendingTxHashToSize;
-    /** Index from tx hash to its header hash, filtered by pending txs. */ #pendingTxHashToHeaderHash;
     /** Map from tx hash to the block number it was originally mined in (for soft-deleted txs). */ #deletedMinedTxHashes;
     /** MultiMap from block number to deleted mined tx hashes for efficient cleanup. */ #blockToDeletedMinedTxHash;
-    /** The cumulative tx size in bytes that the pending txs in the pool take up. */ #pendingTxSize;
-    /** In-memory mapping of pending tx hashes to the hydrated pending tx in the pool. */ #pendingTxs;
+    #historicalHeaderToTxHash;
+    #feePayerToBalanceEntry;
+    /** Index from nullifier to pending tx hash */ #pendingNullifierToTxHash;
     /** In-memory set of txs that should not be evicted from the pool. */ #nonEvictableTxs;
     /** KV store for archived txs. */ #archive;
     /** Archived txs map for future lookup. */ #archivedTxs;
     /** Indexes of the archived txs by insertion order. */ #archivedTxIndices;
     /** Number of txs to archive. */ #archivedTxLimit = 0;
-    /** The world state synchronizer used in the node. */ #worldStateSynchronizer;
+    #evictionManager;
     #log;
     #metrics;
     /**
@@ -43,25 +46,33 @@ import { getPendingTxPriority } from './priority.js';
    * @param telemetry - A telemetry client.
    * @param archivedTxLimit - The number of txs to archive.
    * @param log - A logger.
-   */ constructor(store, archive, worldStateSynchronizer, telemetry = getTelemetryClient(), config = {}, log = createLogger('p2p:tx_pool')){
+   */ constructor(store, archive, worldState, telemetry = getTelemetryClient(), config = {}, log = createLogger('p2p:tx_pool')){
         super();
         this.#log = log;
+        this.#evictionManager = new EvictionManager(this);
+        this.#evictionManager.registerRule(new InvalidTxsAfterMiningRule());
+        this.#evictionManager.registerRule(new InvalidTxsAfterReorgRule(worldState));
+        this.#evictionManager.registerRule(new FeePayerBalanceEvictionRule(worldState));
+        this.#evictionManager.registerRule(new LowPriorityEvictionRule({
+            //NOTE: 0 effectively disables low priority eviction
+            maxPoolSize: config.maxPendingTxCount ?? 0
+        }));
+        this.#evictionManager.registerPreAddRule(new NullifierConflictPreAddRule());
         this.updateConfig(config);
         this.#txs = store.openMap('txs');
         this.#minedTxHashToBlock = store.openMap('txHashToBlockMined');
         this.#pendingTxPriorityToHash = store.openMultiMap('pendingTxFeeToHash');
-        this.#pendingTxHashToSize = store.openMap('pendingTxHashToSize');
-        this.#pendingTxHashToHeaderHash = store.openMap('pendingTxHashToHeaderHash');
-        this.#pendingTxSize = store.openSingleton('pendingTxSize');
         this.#deletedMinedTxHashes = store.openMap('deletedMinedTxHashes');
         this.#blockToDeletedMinedTxHash = store.openMultiMap('blockToDeletedMinedTxHash');
-        this.#pendingTxs = new Map();
+        this.#pendingTxHashToHistoricalBlockHeaderHash = store.openMap('txHistoricalBlock');
+        this.#historicalHeaderToTxHash = store.openMultiMap('historicalHeaderToPendingTxHash');
+        this.#feePayerToBalanceEntry = store.openMultiMap('feePayerToBalanceEntry');
+        this.#pendingNullifierToTxHash = store.openMap('pendingNullifierToTxHash');
         this.#nonEvictableTxs = new Set();
         this.#archivedTxs = archive.openMap('archivedTxs');
         this.#archivedTxIndices = archive.openMap('archivedTxIndices');
         this.#store = store;
         this.#archive = archive;
-        this.#worldStateSynchronizer = worldStateSynchronizer;
         this.#metrics = new PoolInstrumentation(telemetry, PoolName.TX_POOL, this.countTxs, ()=>store.estimateSize());
     }
     countTxs = async ()=>{
@@ -92,59 +103,68 @@ import { getPendingTxPriority } from './priority.js';
         if (txHashes.length === 0) {
             return Promise.resolve();
         }
-        const minedNullifiers = new Set();
-        const minedFeePayers = new Set();
-        await this.#store.transactionAsync(async ()=>{
-            let pendingTxSize = await this.#pendingTxSize.getAsync() ?? 0;
-            for (const hash of txHashes){
-                const key = hash.toString();
-                // If this tx was previously soft-deleted, remove it from the deleted sets
-                if (await this.#deletedMinedTxHashes.hasAsync(key)) {
-                    const originalBlock = await this.#deletedMinedTxHashes.getAsync(key);
-                    await this.#deletedMinedTxHashes.delete(key);
-                    // Remove from block-to-hash mapping
-                    if (originalBlock !== undefined) {
-                        await this.#blockToDeletedMinedTxHash.deleteValue(originalBlock, key);
+        const uniqueMinedNullifiers = [];
+        const uniqueMinedFeePayers = [];
+        try {
+            await this.#store.transactionAsync(async ()=>{
+                for (const hash of txHashes){
+                    const key = hash.toString();
+                    await this.#minedTxHashToBlock.set(key, blockHeader.globalVariables.blockNumber);
+                    const tx = await this.getTxByHash(hash);
+                    if (tx) {
+                        const nullifiers = tx.data.getNonEmptyNullifiers();
+                        nullifiers.forEach((nullifier)=>insertIntoSortedArray(uniqueMinedNullifiers, nullifier, Fr.cmp, false));
+                        insertIntoSortedArray(uniqueMinedFeePayers, tx.data.feePayer, (a, b)=>a.toField().cmp(b.toField()), false);
+                        await this.removePendingTxIndicesInDbTx(tx, key);
+                    }
+                    // If this tx was previously soft-deleted, remove it from the deleted sets
+                    if (await this.#deletedMinedTxHashes.hasAsync(key)) {
+                        const originalBlock = await this.#deletedMinedTxHashes.getAsync(key);
+                        await this.#deletedMinedTxHashes.delete(key);
+                        // Remove from block-to-hash mapping
+                        if (originalBlock !== undefined) {
+                            await this.#blockToDeletedMinedTxHash.deleteValue(originalBlock, key);
+                        }
                     }
                 }
-                await this.#minedTxHashToBlock.set(key, blockHeader.globalVariables.blockNumber);
-                const tx = await this.getPendingTxByHash(hash);
-                if (tx) {
-                    const nullifiers = tx.data.getNonEmptyNullifiers();
-                    nullifiers.forEach((nullifier)=>minedNullifiers.add(nullifier.toString()));
-                    minedFeePayers.add(tx.data.feePayer.toString());
-                    pendingTxSize -= tx.getSize();
-                    await this.removePendingTxIndices(tx, key);
-                }
-            }
-            await this.#pendingTxSize.set(pendingTxSize);
-            await this.evictInvalidTxsAfterMining(txHashes, blockHeader, minedNullifiers, minedFeePayers);
-        });
-        // We update this after the transaction above. This ensures that the non-evictable transactions are not evicted
-        // until any that have been mined are marked as such.
-        // The non-evictable set is not considered when evicting transactions that are invalid after a block is mined.
-        this.#nonEvictableTxs.clear();
+            });
+            await this.#evictionManager.evictAfterNewBlock(blockHeader, uniqueMinedNullifiers, uniqueMinedFeePayers);
+            this.#metrics.transactionsRemoved(txHashes.map((hash)=>hash.toBigInt()));
+        } catch (err) {
+            this.#log.warn('Unexpected error when marking txs as mined', {
+                err
+            });
+        }
     }
-    async markMinedAsPending(txHashes) {
+    async markMinedAsPending(txHashes, latestBlock) {
         if (txHashes.length === 0) {
             return Promise.resolve();
         }
-        await this.#store.transactionAsync(async ()=>{
-            let pendingTxSize = await this.#pendingTxSize.getAsync() ?? 0;
-            for (const hash of txHashes){
-                const key = hash.toString();
-                await this.#minedTxHashToBlock.delete(key);
-                // Rehydrate the tx in the in-memory pending txs mapping
-                const tx = await this.getPendingTxByHash(hash);
-                if (tx) {
-                    await this.addPendingTxIndices(tx, key);
-                    pendingTxSize += tx.getSize();
+        try {
+            await this.#store.transactionAsync(async ()=>{
+                for (const hash of txHashes){
+                    const key = hash.toString();
+                    await this.#minedTxHashToBlock.delete(key);
+                    // Clear soft-delete metadata if this tx was previously soft-deleted,
+                    // so cleanupDeletedMinedTxs won't later hard-delete it while it's pending
+                    const deletedBlock = await this.#deletedMinedTxHashes.getAsync(key);
+                    if (deletedBlock !== undefined) {
+                        await this.#deletedMinedTxHashes.delete(key);
+                        await this.#blockToDeletedMinedTxHash.deleteValue(deletedBlock, key);
+                    }
+                    // Rehydrate the tx in the in-memory pending txs mapping
+                    const tx = await this.getTxByHash(hash);
+                    if (tx) {
+                        await this.addPendingTxIndicesInDbTx(tx, key);
+                    }
                 }
-            }
-            await this.#pendingTxSize.set(pendingTxSize);
-        });
-        await this.evictInvalidTxsAfterReorg(txHashes);
-        await this.evictLowPriorityTxs(txHashes);
+            });
+            await this.#evictionManager.evictAfterChainPrune(latestBlock);
+        } catch (err) {
+            this.#log.warn('Unexpected error when marking mined txs as pending', {
+                err
+            });
+        }
     }
     async getPendingTxHashes() {
         const vals = await toArray(this.#pendingTxPriorityToHash.valuesAsync({
@@ -152,36 +172,6 @@ import { getPendingTxPriority } from './priority.js';
         }));
         return vals.map(TxHash.fromString);
     }
-    async getMinedTxHashes() {
-        const vals = await toArray(this.#minedTxHashToBlock.entriesAsync());
-        return vals.map(([txHash, blockNumber])=>[
-                TxHash.fromString(txHash),
-                blockNumber
-            ]);
-    }
-    async getPendingTxCount() {
-        return await this.#pendingTxHashToHeaderHash.sizeAsync() ?? 0;
-    }
-    async getMinedTxCount() {
-        return await this.#minedTxHashToBlock.sizeAsync() ?? 0;
-    }
-    async getTxStatus(txHash) {
-        const key = txHash.toString();
-        const [isMined, isKnown, isDeleted] = await Promise.all([
-            this.#minedTxHashToBlock.hasAsync(key),
-            this.#txs.hasAsync(key),
-            this.#deletedMinedTxHashes.hasAsync(key)
-        ]);
-        if (isDeleted) {
-            return 'deleted';
-        } else if (isMined) {
-            return 'mined';
-        } else if (isKnown) {
-            return 'pending';
-        } else {
-            return undefined;
-        }
-    }
     /**
    * Checks if a transaction exists in the pool and returns it.
    * @param txHash - The generated tx hash.
@@ -213,39 +203,70 @@ import { getPendingTxPriority } from './priority.js';
     }
     /**
    * Adds a list of transactions to the pool. Duplicates are ignored.
+   * Handles nullifier deduplication: if an incoming tx has a nullifier conflict with
+   * existing pending txs, it will either replace them (if higher fee) or be rejected.
    * @param txs - An array of txs to be added to the pool.
-   * @returns Empty promise.
+   * @returns count of added transactions
    */ async addTxs(txs, opts = {}) {
+        if (txs.length === 0) {
+            return Promise.resolve(0);
+        }
         const addedTxs = [];
+        const uniqueFeePayers = [];
+        const replacedTxHashes = [];
         const hashesAndStats = txs.map((tx)=>({
                 txHash: tx.getTxHash(),
                 txStats: tx.getStats()
             }));
-        await this.#store.transactionAsync(async ()=>{
-            let pendingTxSize = await this.#pendingTxSize.getAsync() ?? 0;
-            await Promise.all(txs.map(async (tx, i)=>{
-                const { txHash, txStats } = hashesAndStats[i];
-                const key = txHash.toString();
-                if (await this.#txs.hasAsync(key)) {
-                    this.#log.debug(`Tx ${txHash.toString()} already exists in the pool`);
-                    return;
-                }
-                this.#log.verbose(`Adding tx ${txHash.toString()} to pool`, {
-                    eventName: 'tx-added-to-pool',
-                    ...txStats
-                });
-                await this.#txs.set(key, tx.toBuffer());
-                addedTxs.push(tx);
-                if (!await this.#minedTxHashToBlock.hasAsync(key)) {
-                    pendingTxSize += tx.getSize();
-                    await this.addPendingTxIndices(tx, key);
-                    this.#metrics.recordSize(tx);
+        try {
+            await this.#store.transactionAsync(async ()=>{
+                for(let i = 0; i < txs.length; i++){
+                    const tx = txs[i];
+                    const { txHash, txStats } = hashesAndStats[i];
+                    const key = txHash.toString();
+                    if (await this.#txs.hasAsync(key)) {
+                        this.#log.debug(`Tx ${key} already exists in the pool`);
+                        continue;
+                    }
+                    const poolAccess = this.getPreAddPoolAccess();
+                    const { shouldReject, txHashesToEvict } = await this.#evictionManager.runPreAddRules(tx, poolAccess);
+                    if (shouldReject) {
+                        continue;
+                    }
+                    for (const txHashToEvict of txHashesToEvict){
+                        const txToDelete = await this.getTxByHash(txHashToEvict);
+                        if (txToDelete) {
+                            const evictedKey = txHashToEvict.toString();
+                            await this.deletePendingTxInDbTx(txToDelete, evictedKey);
+                            replacedTxHashes.push(txHashToEvict);
+                            this.#log.verbose(`Evicted tx ${evictedKey} due to higher-fee tx ${key}`);
+                        }
+                    }
+                    this.#log.verbose(`Adding tx ${key} to pool`, {
+                        eventName: 'tx-added-to-pool',
+                        ...txStats
+                    });
+                    await this.#txs.set(key, tx.toBuffer());
+                    addedTxs.push(tx);
+                    insertIntoSortedArray(uniqueFeePayers, tx.data.feePayer, (a, b)=>a.toField().cmp(b.toField()), false);
+                    await this.#pendingTxHashToHistoricalBlockHeaderHash.set(key, (await tx.data.constants.anchorBlockHeader.hash()).toString());
+                    if (!await this.#minedTxHashToBlock.hasAsync(key)) {
+                        await this.addPendingTxIndicesInDbTx(tx, key);
+                        this.#metrics.recordSize(tx);
+                    }
                 }
-            }));
-            await this.#pendingTxSize.set(pendingTxSize);
-            await this.evictLowPriorityTxs(hashesAndStats.map(({ txHash })=>txHash));
-        });
+            });
+            await this.#evictionManager.evictAfterNewTxs(addedTxs.map(({ txHash })=>txHash), uniqueFeePayers);
+        } catch (err) {
+            this.#log.warn('Unexpected error when adding txs', {
+                err
+            });
+        }
+        if (replacedTxHashes.length > 0) {
+            this.#metrics.transactionsRemoved(replacedTxHashes.map((hash)=>hash.toBigInt()));
+        }
         if (addedTxs.length > 0) {
+            this.#metrics.transactionsAdded(addedTxs);
             this.emit('txs-added', {
                 ...opts,
                 txs: addedTxs
@@ -258,51 +279,58 @@ import { getPendingTxPriority } from './priority.js';
    * Mined transactions are soft-deleted with a timestamp, pending transactions are permanently deleted.
    * @param txHashes - An array of tx hashes to be deleted from the tx pool.
    * @returns Empty promise.
-   */ deleteTxs(txHashes, opts = {}) {
+   */ deleteTxs(txHashes, opts) {
         if (txHashes.length === 0) {
             return Promise.resolve();
         }
         const deletedTxs = [];
         const poolDbTx = this.#store.transactionAsync(async ()=>{
-            let pendingTxSize = await this.#pendingTxSize.getAsync() ?? 0;
             for (const hash of txHashes){
                 const key = hash.toString();
                 const tx = await this.getTxByHash(hash);
-                if (tx) {
-                    const minedBlockNumber = await this.#minedTxHashToBlock.getAsync(key);
-                    if (minedBlockNumber !== undefined) {
-                        await this.#minedTxHashToBlock.delete(key);
-                        if (opts.permanently) {
-                            // Permanently delete mined transactions if specified
-                            this.#log.trace(`Deleting mined tx ${key} from pool`);
-                            await this.#txs.delete(key);
-                        } else {
-                            // Soft-delete mined transactions: remove from mined set but keep in storage
-                            this.#log.trace(`Soft-deleting mined tx ${key} from pool`);
-                            await this.#deletedMinedTxHashes.set(key, minedBlockNumber);
-                            await this.#blockToDeletedMinedTxHash.set(minedBlockNumber, key);
-                        }
-                    } else {
-                        // Permanently delete pending transactions
-                        this.#log.trace(`Deleting pending tx ${key} from pool`);
-                        pendingTxSize -= tx.getSize();
-                        await this.removePendingTxIndices(tx, key);
-                        await this.#txs.delete(key);
-                    }
-                    if (!opts.eviction && this.#archivedTxLimit) {
+                if (!tx) {
+                    this.#log.trace(`Skipping deletion of missing tx ${key} from pool`);
+                    continue;
+                }
+                const minedBlockNumber = await this.#minedTxHashToBlock.getAsync(key);
+                const txIsPending = minedBlockNumber === undefined;
+                if (txIsPending) {
+                    await this.deletePendingTxInDbTx(tx, key);
+                } else {
+                    await this.deleteMinedTx(key, minedBlockNumber, opts?.permanently ?? false);
+                    const shouldArchiveTx = this.#archivedTxLimit && !opts?.permanently;
+                    if (shouldArchiveTx) {
                         deletedTxs.push(tx);
                     }
-                } else {
-                    this.#log.trace(`Skipping deletion of missing tx ${key} from pool`);
                 }
             }
-            await this.#pendingTxSize.set(pendingTxSize);
         });
+        this.#metrics.transactionsRemoved(txHashes.map((hash)=>hash.toBigInt()));
         this.#log.debug(`Deleted ${txHashes.length} txs from pool`, {
             txHashes
         });
         return this.#archivedTxLimit ? poolDbTx.then(()=>this.archiveTxs(deletedTxs)) : poolDbTx;
     }
+    async deleteMinedTx(txHash, minedBlockNumber, permanently) {
+        await this.#minedTxHashToBlock.delete(txHash);
+        if (permanently) {
+            this.#log.trace(`Deleting mined tx ${txHash} from pool`);
+            await this.#txs.delete(txHash);
+            return;
+        }
+        // Soft-delete mined transactions: remove from mined set but keep in storage
+        this.#log.trace(`Soft-deleting mined tx ${txHash} from pool`);
+        await this.#deletedMinedTxHashes.set(txHash, minedBlockNumber);
+        await this.#blockToDeletedMinedTxHash.set(minedBlockNumber, txHash);
+    }
+    // Assumes being called within a DB transaction
+    async deletePendingTxInDbTx(tx, txHash) {
+        // We always permanently delete pending transactions
+        this.#log.trace(`Deleting pending tx ${txHash} from pool`);
+        await this.removePendingTxIndicesInDbTx(tx, txHash);
+        await this.#txs.delete(txHash);
+        await this.#pendingTxHashToHistoricalBlockHeaderHash.delete(txHash);
+    }
     /**
    * Gets all the transactions stored in the pool.
    * @returns Array of tx objects in the order they were added to the pool.
@@ -317,45 +345,116 @@ import { getPendingTxPriority } from './priority.js';
         const vals = await toArray(this.#txs.keysAsync());
         return vals.map((x)=>TxHash.fromString(x));
     }
-    updateConfig({ maxTxPoolSize, txPoolOverflowFactor, archivedTxLimit }) {
-        if (typeof maxTxPoolSize === 'number') {
-            assert(maxTxPoolSize >= 0, 'maxTxPoolSize must be greater or equal to 0');
-            this.#maxTxPoolSize = maxTxPoolSize;
-            if (maxTxPoolSize === 0) {
-                this.#log.info(`Disabling maximum tx mempool size. Tx eviction stopped`);
-            } else {
-                this.#log.info(`Setting maximum tx mempool size`, {
-                    maxTxPoolSize
-                });
+    async getPendingTxInfos() {
+        const vals = await toArray(this.#pendingTxPriorityToHash.valuesAsync());
+        const results = await Promise.all(vals.map((val)=>this.getPendingTxInfo(TxHash.fromString(val))));
+        return results.filter((info)=>info !== undefined);
+    }
+    async getPendingTxInfo(txHash) {
+        let historicalBlockHash = await this.#pendingTxHashToHistoricalBlockHeaderHash.getAsync(txHash.toString());
+        // Not all tx might have this index created.
+        if (!historicalBlockHash) {
+            const tx = await this.getTxByHash(txHash);
+            if (!tx) {
+                this.#log.warn(`PendingTxInfo:tx ${txHash} not found`);
+                return undefined;
             }
+            historicalBlockHash = (await tx.data.constants.anchorBlockHeader.hash()).toString();
+            await this.#pendingTxHashToHistoricalBlockHeaderHash.set(txHash.toString(), historicalBlockHash);
         }
-        if (typeof txPoolOverflowFactor === 'number') {
-            assert(txPoolOverflowFactor >= 1, 'txPoolOveflowFactor must be greater or equal to 1');
-            this.txPoolOverflowFactor = txPoolOverflowFactor;
-            this.#log.info(`Allowing tx pool size to grow above limit`, {
-                maxTxPoolSize,
-                txPoolOverflowFactor
-            });
+        return {
+            txHash,
+            blockHash: Fr.fromString(historicalBlockHash),
+            isEvictable: !this.#nonEvictableTxs.has(txHash.toString())
+        };
+    }
+    async getPendingTxsReferencingBlocks(blockHashes) {
+        const result = [];
+        for (const blockHash of blockHashes){
+            const chunk = await toArray(this.#historicalHeaderToTxHash.getValuesAsync(blockHash.toString()));
+            result.push(...chunk.map((txHash)=>({
+                    txHash: TxHash.fromString(txHash),
+                    blockHash,
+                    isEvictable: !this.#nonEvictableTxs.has(txHash)
+                })));
         }
-        if (typeof archivedTxLimit === 'number') {
-            assert(archivedTxLimit >= 0, 'archivedTxLimit must be greater or equal to 0');
-            this.#archivedTxLimit = archivedTxLimit;
+        return result;
+    }
+    async getPendingFeePayers() {
+        const feePayers = [];
+        for await (const feePayer of this.#feePayerToBalanceEntry.keysAsync()){
+            const address = AztecAddress.fromString(feePayer);
+            insertIntoSortedArray(feePayers, address, (a, b)=>a.toField().cmp(b.toField()), false);
+        }
+        return feePayers;
+    }
+    async *getFeePayerTxInfos(feePayer) {
+        for await (const value of this.#feePayerToBalanceEntry.getValuesAsync(feePayer.toString())){
+            const info = FeePayerTxInfo.decode(value);
+            info.isEvictable = !this.#nonEvictableTxs.has(info.txHash.toString());
+            yield info;
+        }
+    }
+    async getMinedTxHashes() {
+        const vals = await toArray(this.#minedTxHashToBlock.entriesAsync());
+        return vals.map(([txHash, blockNumber])=>[
+                TxHash.fromString(txHash),
+                blockNumber
+            ]);
+    }
+    async getPendingTxCount() {
+        return await this.#pendingTxPriorityToHash.sizeAsync() ?? 0;
+    }
+    async getMinedTxCount() {
+        return await this.#minedTxHashToBlock.sizeAsync() ?? 0;
+    }
+    async getTxStatus(txHash) {
+        const key = txHash.toString();
+        const [isMined, isKnown, isDeleted] = await Promise.all([
+            this.#minedTxHashToBlock.hasAsync(key),
+            this.#txs.hasAsync(key),
+            this.#deletedMinedTxHashes.hasAsync(key)
+        ]);
+        if (isDeleted) {
+            return 'deleted';
+        } else if (isMined) {
+            return 'mined';
+        } else if (isKnown) {
+            return 'pending';
+        } else {
+            return undefined;
+        }
+    }
+    updateConfig(cfg) {
+        if (typeof cfg.archivedTxLimit === 'number') {
+            assert(cfg.archivedTxLimit >= 0, 'archivedTxLimit must be greater or equal to 0');
+            this.#archivedTxLimit = cfg.archivedTxLimit;
+        }
+        if (this.#evictionManager) {
+            this.#evictionManager.updateConfig(cfg);
         }
-    // deletedMinedCleanupThresholdMs is no longer used in block-based cleanup
     }
     markTxsAsNonEvictable(txHashes) {
         txHashes.forEach((txHash)=>this.#nonEvictableTxs.add(txHash.toString()));
         return Promise.resolve();
     }
+    clearNonEvictableTxs() {
+        // Clear the non-evictable set after completing the DB updates above.
+        // This ensures pinned (non-evictable) txs are protected while we mark mined txs,
+        // but they won't remain pinned indefinitely across blocks. Note that eviction rules
+        // (including post-mining invalidation) respect the non-evictable flag while it is set.
+        this.#nonEvictableTxs.clear();
+        return Promise.resolve();
+    }
     /**
    * Permanently deletes deleted mined transactions from blocks up to and including the specified block number.
    * @param blockNumber - Block number threshold. Deleted mined txs from this block or earlier will be permanently deleted.
    * @returns The number of transactions permanently deleted.
    */ async cleanupDeletedMinedTxs(blockNumber) {
         let deletedCount = 0;
-        const txHashesToDelete = [];
-        const blocksToDelete = [];
         await this.#store.transactionAsync(async ()=>{
+            const txHashesToDelete = [];
+            const blocksToDelete = [];
             // Iterate through all entries and check block numbers
             for await (const [block, txHash] of this.#blockToDeletedMinedTxHash.entriesAsync()){
                 if (block <= blockNumber) {
@@ -369,6 +468,7 @@ import { getPendingTxPriority } from './priority.js';
                     deletedCount++;
                 }
             }
+            this.#metrics.transactionsRemoved(txHashesToDelete);
             // Clean up block-to-hash mapping - delete all values for each block
             for (const block of blocksToDelete){
                 const txHashesForBlock = await toArray(this.#blockToDeletedMinedTxHash.getValuesAsync(block));
@@ -383,13 +483,6 @@ import { getPendingTxPriority } from './priority.js';
         return deletedCount;
     }
     /**
-   * Creates a GasTxValidator instance.
-   * @param db - DB for the validator to use
-   * @returns A GasTxValidator instance
-   */ createGasTxValidator(db) {
-        return new GasTxValidator(new DatabasePublicStateSource(db), ProtocolContractAddress.FeeJuice, GasFees.empty());
-    }
-    /**
    * Creates an ArchiveCache instance.
    * @param db - DB for the cache to use
    * @returns An ArchiveCache instance
@@ -397,36 +490,17 @@ import { getPendingTxPriority } from './priority.js';
         return new ArchiveCache(db);
     }
     /**
-   * Checks if a cached transaction exists in the in-memory pending tx pool and returns it.
-   * Otherwise, it checks the tx pool, updates the pending tx pool, and returns the tx.
-   * @param txHash - The generated tx hash.
-   * @returns The transaction, if found, 'undefined' otherwise.
-   */ async getPendingTxByHash(txHash) {
-        let key;
-        if (typeof txHash === 'string') {
-            key = txHash;
-            txHash = TxHash.fromString(txHash);
-        } else {
-            key = txHash.toString();
-        }
-        if (this.#pendingTxs.has(key)) {
-            return this.#pendingTxs.get(key);
-        }
-        const tx = await this.getTxByHash(txHash);
-        if (tx) {
-            this.#pendingTxs.set(key, tx);
-            return tx;
-        }
-        return undefined;
-    }
-    /**
    * Archives a list of txs for future reference. The number of archived txs is limited by the specified archivedTxLimit.
+   * Note: Pending txs should not be archived, only finalized txs
    * @param txs - The list of transactions to archive.
    * @returns Empty promise.
    */ async archiveTxs(txs) {
         if (txs.length === 0) {
             return;
         }
+        if (this.#archivedTxLimit === 0) {
+            return;
+        }
         try {
             const txHashes = await Promise.all(txs.map((tx)=>tx.getTxHash()));
             await this.#archive.transactionAsync(async ()=>{
@@ -465,153 +539,58 @@ import { getPendingTxPriority } from './priority.js';
             });
         }
     }
-    /**
-   * Evicts pending txs with the lowest priority fees from the pool to accomodate the max tx count and cumulative max tx size
-   * after new txs are added.
-   *
-   * @param newTxHashes - The tx hashes of the new txs added to the pool.
-   * @returns The total number of txs evicted from the pool and the number of new txs that were evicted.
-   */ async evictLowPriorityTxs(newTxHashes) {
-        if (this.#maxTxPoolSize === undefined || this.#maxTxPoolSize === 0) {
-            return {
-                numLowPriorityTxsEvicted: 0,
-                numNewTxsEvicted: 0
-            };
-        }
-        let numNewTxsEvicted = 0;
-        const txsToEvict = [];
-        let pendingTxsSize = await this.#pendingTxSize.getAsync() ?? 0;
-        if (pendingTxsSize > this.#maxTxPoolSize * this.txPoolOverflowFactor) {
-            for await (const txHash of this.#pendingTxPriorityToHash.valuesAsync()){
-                if (this.#nonEvictableTxs.has(txHash.toString())) {
-                    continue;
-                }
-                const txSize = await this.#pendingTxHashToSize.getAsync(txHash.toString()) ?? (await this.getPendingTxByHash(txHash))?.getSize();
-                this.#log.verbose(`Evicting tx ${txHash} from pool due to low priority to satisfy max tx size limit`, {
-                    txHash,
-                    txSize
-                });
-                txsToEvict.push(TxHash.fromString(txHash));
-                if (txSize) {
-                    pendingTxsSize -= txSize;
-                    if (pendingTxsSize <= this.#maxTxPoolSize) {
-                        break;
-                    }
-                }
-            }
-            numNewTxsEvicted += newTxHashes.filter((txHash)=>txsToEvict.includes(txHash)).length;
-        }
-        if (txsToEvict.length > 0) {
-            await this.deleteTxs(txsToEvict, {
-                eviction: true
-            });
+    // Assumes being called within a DB transaction
+    async addPendingTxIndicesInDbTx(tx, txHash) {
+        await this.#pendingTxPriorityToHash.set(getPendingTxPriority(tx), txHash);
+        await this.#historicalHeaderToTxHash.set((await tx.data.constants.anchorBlockHeader.hash()).toString(), txHash);
+        await this.#feePayerToBalanceEntry.set(tx.data.feePayer.toString(), await FeePayerTxInfo.encode(tx, txHash));
+        // Add nullifier entries for conflict detection
+        const nullifiers = tx.data.getNonEmptyNullifiers();
+        for (const nullifier of nullifiers){
+            await this.#pendingNullifierToTxHash.set(nullifier.toString(), txHash);
         }
-        return {
-            numLowPriorityTxsEvicted: txsToEvict.length,
-            numNewTxsEvicted
-        };
     }
-    /**
-   * Evicts invalid pending txs from the pool after a txs from a block are mined.
-   * Eviction criteria includes:
-   *   - txs with nullifiers that are already included in the mined block
-   *   - txs with an insufficient fee payer balance
-   *   - txs with an expiration timestamp lower than that of the mined block
-   *
-   * @param minedTxHashes - The tx hashes of the txs mined in the block.
-   * @param blockHeader - The header of the mined block.
-   * @returns The total number of txs evicted from the pool.
-   */ async evictInvalidTxsAfterMining(minedTxHashes, blockHeader, minedNullifiers, minedFeePayers) {
-        if (minedTxHashes.length === 0) {
-            return 0;
-        }
-        const { blockNumber, timestamp } = blockHeader.globalVariables;
-        // Wait for world state to be synced to at least the mined block number
-        await this.#worldStateSynchronizer.syncImmediate(blockNumber);
-        const db = this.#worldStateSynchronizer.getCommitted();
-        const gasTxValidator = this.createGasTxValidator(db);
-        const txsToEvict = [];
-        for await (const txHash of this.#pendingTxPriorityToHash.valuesAsync()){
-            const tx = await this.getPendingTxByHash(txHash);
-            if (!tx) {
-                continue;
-            }
-            // Evict pending txs that share nullifiers with mined txs
-            const txNullifiers = tx.data.getNonEmptyNullifiers();
-            if (txNullifiers.some((nullifier)=>minedNullifiers.has(nullifier.toString()))) {
-                this.#log.verbose(`Evicting tx ${txHash} from pool due to a duplicate nullifier with a mined tx`);
-                txsToEvict.push(TxHash.fromString(txHash));
-                continue;
-            }
-            // Evict pending txs with an insufficient fee payer balance
-            if (minedFeePayers.has(tx.data.feePayer.toString()) && (await gasTxValidator.validateTxFee(tx)).result === 'invalid') {
-                this.#log.verbose(`Evicting tx ${txHash} from pool due to an insufficient fee payer balance`);
-                txsToEvict.push(TxHash.fromString(txHash));
-                continue;
-            }
-            // Evict pending txs with an expiration timestamp less than or equal to the mined block timestamp
-            const includeByTimestamp = tx.data.includeByTimestamp;
-            if (includeByTimestamp <= timestamp) {
-                this.#log.verbose(`Evicting tx ${txHash} from pool due to the tx being expired (includeByTimestamp: ${includeByTimestamp}, mined block timestamp: ${timestamp})`);
-                txsToEvict.push(TxHash.fromString(txHash));
-                continue;
-            }
-        }
-        if (txsToEvict.length > 0) {
-            await this.deleteTxs(txsToEvict, {
-                eviction: true
-            });
+    // Assumes being called within a DB transaction
+    async removePendingTxIndicesInDbTx(tx, txHash) {
+        await this.#pendingTxPriorityToHash.deleteValue(getPendingTxPriority(tx), txHash);
+        await this.#historicalHeaderToTxHash.deleteValue((await tx.data.constants.anchorBlockHeader.hash()).toString(), txHash);
+        await this.#feePayerToBalanceEntry.deleteValue(tx.data.feePayer.toString(), await FeePayerTxInfo.encode(tx, txHash));
+        // Remove nullifier entries
+        const nullifiers = tx.data.getNonEmptyNullifiers();
+        for (const nullifier of nullifiers){
+            await this.#pendingNullifierToTxHash.delete(nullifier.toString());
         }
-        return txsToEvict.length;
     }
     /**
-   * Evicts pending txs that no longer have valid archive roots or fee payer balances from the pool after a reorg.
-   *
-   * @param txHashes - The tx hashes of the txs that were moved from mined to pending.
-   * @returns The total number of txs evicted from the pool.
-   */ async evictInvalidTxsAfterReorg(txHashes) {
-        if (txHashes.length === 0) {
-            return 0;
-        }
-        await this.#worldStateSynchronizer.syncImmediate();
-        const db = this.#worldStateSynchronizer.getCommitted();
-        const archiveCache = this.createArchiveCache(db);
-        const gasTxValidator = this.createGasTxValidator(db);
+   * Returns up to `limit` lowest-priority evictable pending tx hashes without hydrating transactions.
+   * Iterates the priority index in ascending order and skips non-evictable txs.
+   */ async getLowestPriorityEvictable(limit) {
         const txsToEvict = [];
-        for await (const [txHash, headerHash] of this.#pendingTxHashToHeaderHash.entriesAsync()){
-            const tx = await this.getPendingTxByHash(txHash);
-            if (!tx) {
-                continue;
-            }
-            const [index] = await archiveCache.getArchiveIndices([
-                Fr.fromString(headerHash)
-            ]);
-            if (index === undefined) {
-                this.#log.verbose(`Evicting tx ${txHash} from pool due to an invalid archive root`);
-                txsToEvict.push(TxHash.fromString(txHash));
+        if (limit <= 0) {
+            return txsToEvict;
+        }
+        for await (const txHashStr of this.#pendingTxPriorityToHash.valuesAsync()){
+            if (this.#nonEvictableTxs.has(txHashStr)) {
                 continue;
             }
-            if ((await gasTxValidator.validateTxFee(tx)).result === 'invalid') {
-                this.#log.verbose(`Evicting tx ${txHash} from pool due to an insufficient fee payer balance`);
-                txsToEvict.push(TxHash.fromString(txHash));
+            txsToEvict.push(TxHash.fromString(txHashStr));
+            if (txsToEvict.length >= limit) {
+                break;
             }
         }
-        if (txsToEvict.length > 0) {
-            await this.deleteTxs(txsToEvict, {
-                eviction: true
-            });
-        }
-        return txsToEvict.length;
+        return txsToEvict;
     }
-    async addPendingTxIndices(tx, txHash) {
-        await this.#pendingTxPriorityToHash.set(getPendingTxPriority(tx), txHash);
-        await this.#pendingTxHashToSize.set(txHash, tx.getSize());
-        await this.#pendingTxHashToHeaderHash.set(txHash, (await tx.data.constants.anchorBlockHeader.hash()).toString());
-    }
-    async removePendingTxIndices(tx, txHash) {
-        await this.#pendingTxPriorityToHash.deleteValue(getPendingTxPriority(tx), txHash);
-        await this.#pendingTxHashToSize.delete(txHash);
-        await this.#pendingTxHashToHeaderHash.delete(txHash);
-        this.#pendingTxs.delete(txHash);
+    /**
+   * Creates a PreAddPoolAccess object for use by pre-add eviction rules.
+   * Provides read-only access to pool state during addTxs transaction.
+   */ getPreAddPoolAccess() {
+        return {
+            getTxHashByNullifier: async (nullifier)=>{
+                const hashStr = await this.#pendingNullifierToTxHash.getAsync(nullifier.toString());
+                return hashStr ? TxHash.fromString(hashStr) : undefined;
+            },
+            getPendingTxByHash: this.getTxByHash.bind(this),
+            getTxPriority: getPendingTxPriority
+        };
     }
 }