@aztec/p2p 0.0.1-commit.d3ec352c → 0.0.1-commit.d6f2b3f94

package/dest/mem_pools/tx_pool_v2/archive/tx_archive.js

@@ -0,0 +1,103 @@
+import { createLogger } from '@aztec/foundation/log';
+import { ChonkProof } from '@aztec/stdlib/proofs';
+import { Tx } from '@aztec/stdlib/tx';
+/**
+ * Manages archived transactions with FIFO eviction.
+ * Archived transactions have their proofs stripped to save space.
+ */ export class TxArchive {
+    #store;
+    #txs;
+    #indices;
+    #limit;
+    #log;
+    constructor(store, limit, log){
+        this.#store = store;
+        this.#txs = store.openMap('archivedTxs');
+        this.#indices = store.openMap('archivedTxIndices');
+        this.#limit = limit;
+        this.#log = log ?? createLogger('p2p:tx_pool_v2:archive');
+    }
+    /**
+   * Updates the maximum number of archived transactions.
+   */ updateLimit(limit) {
+        this.#limit = limit;
+    }
+    /**
+   * Gets the current archive limit.
+   */ getLimit() {
+        return this.#limit;
+    }
+    /**
+   * Checks if archiving is enabled.
+   */ isEnabled() {
+        return this.#limit > 0;
+    }
+    /**
+   * Archives transactions, stripping their proofs.
+   * Evicts oldest transactions if the limit is exceeded.
+   */ async archiveTxs(txs) {
+        if (!this.isEnabled() || txs.length === 0) {
+            return;
+        }
+        try {
+            await this.#store.transactionAsync(async ()=>{
+                // Get current head and tail indices
+                let headIdx = await this.getHeadIndex();
+                let tailIdx = await this.getTailIndex();
+                for (const tx of txs){
+                    // Evict oldest entries if at capacity
+                    while(headIdx - tailIdx >= this.#limit){
+                        const txHashToEvict = await this.#indices.getAsync(tailIdx);
+                        if (txHashToEvict) {
+                            await this.#txs.delete(txHashToEvict);
+                            await this.#indices.delete(tailIdx);
+                        }
+                        tailIdx++;
+                    }
+                    // Archive the transaction with stripped proof
+                    const archivedTx = this.stripProof(tx);
+                    const txHash = tx.getTxHash().toString();
+                    await this.#txs.set(txHash, archivedTx.toBuffer());
+                    await this.#indices.set(headIdx, txHash);
+                    headIdx++;
+                }
+                this.#log.debug(`Archived ${txs.length} txs, total: ${headIdx - tailIdx}`);
+            });
+        } catch (error) {
+            this.#log.error('Error archiving transactions', {
+                error
+            });
+        }
+    }
+    /**
+   * Retrieves an archived transaction by its hash.
+   */ async getTxByHash(txHash) {
+        const buffer = await this.#txs.getAsync(txHash.toString());
+        return buffer ? Tx.fromBuffer(buffer) : undefined;
+    }
+    /**
+   * Gets the current count of archived transactions.
+   */ async getCount() {
+        const head = await this.getHeadIndex();
+        const tail = await this.getTailIndex();
+        return head - tail;
+    }
+    /**
+   * Strips the proof from a transaction for archival.
+   */ stripProof(tx) {
+        return new Tx(tx.txHash, tx.data, ChonkProof.empty(), tx.contractClassLogFields, tx.publicFunctionCalldata);
+    }
+    async getHeadIndex() {
+        const entry = await this.#indices.entriesAsync({
+            limit: 1,
+            reverse: true
+        }).next();
+        return (entry.value?.[0] ?? -1) + 1;
+    }
+    async getTailIndex() {
+        const entry = await this.#indices.entriesAsync({
+            limit: 1
+        }).next();
+        return entry.value?.[0] ?? 0;
+    }
+}

package/dest/mem_pools/tx_pool_v2/deleted_pool.d.ts

@@ -0,0 +1,87 @@
+import { BlockNumber } from '@aztec/foundation/branded-types';
+import type { Logger } from '@aztec/foundation/log';
+import type { AztecAsyncKVStore, AztecAsyncMap } from '@aztec/kv-store';
+/**
+ * Manages all transaction deletions in the pool.
+ *
+ * When a chain prune (reorg) happens, transactions from pruned blocks are tracked here.
+ * This class is responsible for ALL deletion decisions:
+ *
+ * - Transactions from pruned blocks are "soft deleted" - removed from indices but kept
+ *   in the database for later re-execution
+ * - Transactions NOT from pruned blocks are "hard deleted" - completely removed from DB
+ *
+ * When a block is finalized, soft-deleted transactions that were originally mined at or
+ * before that block number are permanently (hard) deleted.
+ */
+export declare class DeletedPool {
+    #private;
+    constructor(store: AztecAsyncKVStore, txsDB: AztecAsyncMap<string, Buffer>, log: Logger);
+    /**
+     * Loads state from the database on startup.
+     */
+    hydrateFromDatabase(): Promise<void>;
+    /**
+     * Marks transactions as being from a pruned block.
+     * Called during handlePrunedBlocks for ALL transactions that were un-mined.
+     *
+     * If a tx was previously tracked (e.g., mined at block 4, pruned, re-mined at block 5,
+     * pruned again), updates to the higher block number. This ensures the tx is kept until
+     * its most recent mined block is finalized.
+     *
+     * @param txs - Array of {txHash, minedAtBlock} pairs, where minedAtBlock is the block
+     *              number in which the tx was mined before being un-mined
+     */
+    markFromPrunedBlock(txs: {
+        txHash: string;
+        minedAtBlock: BlockNumber;
+    }[]): Promise<void>;
+    /**
+     * Deletes a transaction. This is the single entry point for ALL deletions.
+     *
+     * - If the tx is from a pruned block: soft-delete (keep in DB, mark as deleted)
+     * - If the tx is NOT from a pruned block: hard-delete (remove from DB)
+     *
+     * @returns 'soft' if soft-deleted, 'hard' if hard-deleted
+     */
+    deleteTx(txHash: string): Promise<'soft' | 'hard'>;
+    /**
+     * Clears tracking for a transaction if it re-mines at a block number >= the tracked minedAtBlock.
+     *
+     * When a tx re-mines at a higher (or equal) block, the old high-water mark is no longer needed:
+     * any future prune would re-add the tx with an even higher block number. Clearing keeps
+     * DeletedPool consistent — only txs that are actually un-mined should be tracked here.
+     *
+     * When a tx re-mines at a lower block, we must preserve the existing entry to retain
+     * the high-water mark for re-execution purposes.
+     */
+    clearIfMinedHigher(txHash: string, minedAtBlock: BlockNumber): Promise<void>;
+    /**
+     * Checks if a transaction is from a pruned block.
+     */
+    isFromPrunedBlock(txHash: string): boolean;
+    /**
+     * Checks if a transaction is soft-deleted.
+     */
+    isSoftDeleted(txHash: string): boolean;
+    /**
+     * Gets the block number in which a transaction was originally mined.
+     */
+    getMinedAtBlock(txHash: string): BlockNumber | undefined;
+    /**
+     * Finalizes transactions when a block is finalized.
+     * Hard-deletes transactions that were originally mined at or before the finalized block.
+     *
+     * @returns The hashes of transactions that were hard-deleted
+     */
+    finalizeBlock(finalizedBlockNumber: BlockNumber): Promise<string[]>;
+    /**
+     * Gets the count of transactions from pruned blocks.
+     */
+    getCount(): number;
+    /**
+     * Gets all transaction hashes from pruned blocks.
+     */
+    getPrunedTxHashes(): string[];
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVsZXRlZF9wb29sLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbWVtX3Bvb2xzL3R4X3Bvb2xfdjIvZGVsZXRlZF9wb29sLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUM5RCxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUNwRCxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBRSxhQUFhLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQWlDeEU7Ozs7Ozs7Ozs7OztHQVlHO0FBQ0gscUJBQWEsV0FBVzs7SUFZdEIsWUFBWSxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsS0FBSyxFQUFFLGFBQWEsQ0FBQyxNQUFNLEVBQUUsTUFBTSxDQUFDLEVBQUUsR0FBRyxFQUFFLE1BQU0sRUFJdEY7SUFFRDs7T0FFRztJQUNHLG1CQUFtQixJQUFJLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FnQnpDO0lBRUQ7Ozs7Ozs7Ozs7T0FVRztJQUNHLG1CQUFtQixDQUFDLEdBQUcsRUFBRTtRQUFFLE1BQU0sRUFBRSxNQUFNLENBQUM7UUFBQyxZQUFZLEVBQUUsV0FBVyxDQUFBO0tBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0F1QjdGO0lBRUQ7Ozs7Ozs7T0FPRztJQUNHLFFBQVEsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxNQUFNLEdBQUcsTUFBTSxDQUFDLENBZ0J2RDtJQUVEOzs7Ozs7Ozs7T0FTRztJQUNHLGtCQUFrQixDQUFDLE1BQU0sRUFBRSxNQUFNLEVBQUUsWUFBWSxFQUFFLFdBQVcsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBU2pGO0lBRUQ7O09BRUc7SUFDSCxpQkFBaUIsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FFekM7SUFFRDs7T0FFRztJQUNILGFBQWEsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FFckM7SUFFRDs7T0FFRztJQUNILGVBQWUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLFdBQVcsR0FBRyxTQUFTLENBRXZEO0lBRUQ7Ozs7O09BS0c7SUFDRyxhQUFhLENBQUMsb0JBQW9CLEVBQUUsV0FBVyxHQUFHLE9BQU8sQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQXFCeEU7SUFFRDs7T0FFRztJQUNILFFBQVEsSUFBSSxNQUFNLENBRWpCO0lBRUQ7O09BRUc7SUFDSCxpQkFBaUIsSUFBSSxNQUFNLEVBQUUsQ0FFNUI7Q0FDRiJ9

package/dest/mem_pools/tx_pool_v2/deleted_pool.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"deleted_pool.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/tx_pool_v2/deleted_pool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,KAAK,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAiCxE;;;;;;;;;;;;GAYG;AACH,qBAAa,WAAW;;IAYtB,YAAY,KAAK,EAAE,iBAAiB,EAAE,KAAK,EAAE,aAAa,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,GAAG,EAAE,MAAM,EAItF;IAED;;OAEG;IACG,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC,CAgBzC;IAED;;;;;;;;;;OAUG;IACG,mBAAmB,CAAC,GAAG,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,YAAY,EAAE,WAAW,CAAA;KAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAuB7F;IAED;;;;;;;OAOG;IACG,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC,CAgBvD;IAED;;;;;;;;;OASG;IACG,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CASjF;IAED;;OAEG;IACH,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAEzC;IAED;;OAEG;IACH,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAErC;IAED;;OAEG;IACH,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS,CAEvD;IAED;;;;;OAKG;IACG,aAAa,CAAC,oBAAoB,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAqBxE;IAED;;OAEG;IACH,QAAQ,IAAI,MAAM,CAEjB;IAED;;OAEG;IACH,iBAAiB,IAAI,MAAM,EAAE,CAE5B;CACF"}

package/dest/mem_pools/tx_pool_v2/deleted_pool.js

@@ -0,0 +1,180 @@
+import { BlockNumber } from '@aztec/foundation/branded-types';
+/**
+ * Serializes DeletedTxState to a Buffer.
+ * Format: 4 bytes for blockNumber (uint32) + 1 byte for softDeleted (0 or 1)
+ */ function serializeState(state) {
+    const buffer = Buffer.alloc(5);
+    buffer.writeUInt32BE(Number(state.minedAtBlock), 0);
+    buffer.writeUInt8(state.softDeleted ? 1 : 0, 4);
+    return buffer;
+}
+/**
+ * Deserializes a Buffer to DeletedTxState.
+ */ function deserializeState(buffer) {
+    return {
+        minedAtBlock: BlockNumber(buffer.readUInt32BE(0)),
+        softDeleted: buffer.readUInt8(4) === 1
+    };
+}
+/**
+ * Manages all transaction deletions in the pool.
+ *
+ * When a chain prune (reorg) happens, transactions from pruned blocks are tracked here.
+ * This class is responsible for ALL deletion decisions:
+ *
+ * - Transactions from pruned blocks are "soft deleted" - removed from indices but kept
+ *   in the database for later re-execution
+ * - Transactions NOT from pruned blocks are "hard deleted" - completely removed from DB
+ *
+ * When a block is finalized, soft-deleted transactions that were originally mined at or
+ * before that block number are permanently (hard) deleted.
+ */ export class DeletedPool {
+    /** Persisted map: txHash -> DeletedTxState (serialized) */ #deletedTxsDB;
+    /** Reference to the main txs database for hard deletion */ #txsDB;
+    /** In-memory state for transactions from pruned blocks */ #state = new Map();
+    #log;
+    constructor(store, txsDB, log){
+        this.#deletedTxsDB = store.openMap('deleted_txs');
+        this.#txsDB = txsDB;
+        this.#log = log;
+    }
+    /**
+   * Loads state from the database on startup.
+   */ async hydrateFromDatabase() {
+        let prunedCount = 0;
+        let softDeletedCount = 0;
+        for await (const [txHash, buffer] of this.#deletedTxsDB.entriesAsync()){
+            const state = deserializeState(buffer);
+            this.#state.set(txHash, state);
+            prunedCount++;
+            if (state.softDeleted) {
+                softDeletedCount++;
+            }
+        }
+        if (prunedCount > 0 || softDeletedCount > 0) {
+            this.#log.info(`Loaded ${prunedCount} txs from pruned blocks, ${softDeletedCount} soft-deleted`);
+        }
+    }
+    /**
+   * Marks transactions as being from a pruned block.
+   * Called during handlePrunedBlocks for ALL transactions that were un-mined.
+   *
+   * If a tx was previously tracked (e.g., mined at block 4, pruned, re-mined at block 5,
+   * pruned again), updates to the higher block number. This ensures the tx is kept until
+   * its most recent mined block is finalized.
+   *
+   * @param txs - Array of {txHash, minedAtBlock} pairs, where minedAtBlock is the block
+   *              number in which the tx was mined before being un-mined
+   */ async markFromPrunedBlock(txs) {
+        if (txs.length === 0) {
+            return;
+        }
+        let count = 0;
+        for (const { txHash, minedAtBlock } of txs){
+            const existing = this.#state.get(txHash);
+            // Update if not tracked, or if this is a higher mined block (tx was re-mined then pruned again)
+            if (existing === undefined || minedAtBlock > existing.minedAtBlock) {
+                const state = {
+                    minedAtBlock,
+                    softDeleted: existing?.softDeleted ?? false
+                };
+                this.#state.set(txHash, state);
+                await this.#deletedTxsDB.set(txHash, serializeState(state));
+                count++;
+            }
+        }
+        if (count > 0) {
+            this.#log.debug(`Marked ${count} transactions from pruned blocks`);
+        }
+    }
+    /**
+   * Deletes a transaction. This is the single entry point for ALL deletions.
+   *
+   * - If the tx is from a pruned block: soft-delete (keep in DB, mark as deleted)
+   * - If the tx is NOT from a pruned block: hard-delete (remove from DB)
+   *
+   * @returns 'soft' if soft-deleted, 'hard' if hard-deleted
+   */ async deleteTx(txHash) {
+        const existing = this.#state.get(txHash);
+        if (existing !== undefined) {
+            // Soft delete - keep in DB
+            const state = {
+                minedAtBlock: existing.minedAtBlock,
+                softDeleted: true
+            };
+            this.#state.set(txHash, state);
+            await this.#deletedTxsDB.set(txHash, serializeState(state));
+            return 'soft';
+        } else {
+            // Hard delete - remove from DB
+            await this.#txsDB.delete(txHash);
+            return 'hard';
+        }
+    }
+    /**
+   * Clears tracking for a transaction if it re-mines at a block number >= the tracked minedAtBlock.
+   *
+   * When a tx re-mines at a higher (or equal) block, the old high-water mark is no longer needed:
+   * any future prune would re-add the tx with an even higher block number. Clearing keeps
+   * DeletedPool consistent — only txs that are actually un-mined should be tracked here.
+   *
+   * When a tx re-mines at a lower block, we must preserve the existing entry to retain
+   * the high-water mark for re-execution purposes.
+   */ async clearIfMinedHigher(txHash, minedAtBlock) {
+        const existing = this.#state.get(txHash);
+        if (existing !== undefined && minedAtBlock >= existing.minedAtBlock) {
+            this.#state.delete(txHash);
+            await this.#deletedTxsDB.delete(txHash);
+            this.#log.debug(`Cleared tracking for tx ${txHash}: re-mined at block ${minedAtBlock} (was ${existing.minedAtBlock})`);
+        }
+    }
+    /**
+   * Checks if a transaction is from a pruned block.
+   */ isFromPrunedBlock(txHash) {
+        return this.#state.has(txHash);
+    }
+    /**
+   * Checks if a transaction is soft-deleted.
+   */ isSoftDeleted(txHash) {
+        return this.#state.get(txHash)?.softDeleted ?? false;
+    }
+    /**
+   * Gets the block number in which a transaction was originally mined.
+   */ getMinedAtBlock(txHash) {
+        return this.#state.get(txHash)?.minedAtBlock;
+    }
+    /**
+   * Finalizes transactions when a block is finalized.
+   * Hard-deletes transactions that were originally mined at or before the finalized block.
+   *
+   * @returns The hashes of transactions that were hard-deleted
+   */ async finalizeBlock(finalizedBlockNumber) {
+        const toHardDelete = [];
+        for (const [txHash, state] of this.#state){
+            if (state.softDeleted && state.minedAtBlock <= finalizedBlockNumber) {
+                toHardDelete.push(txHash);
+            }
+        }
+        if (toHardDelete.length === 0) {
+            return [];
+        }
+        // Hard-delete from all stores
+        for (const txHash of toHardDelete){
+            this.#state.delete(txHash);
+            await this.#deletedTxsDB.delete(txHash);
+            await this.#txsDB.delete(txHash);
+        }
+        this.#log.debug(`Finalized ${toHardDelete.length} txs from pruned blocks at block ${finalizedBlockNumber}`);
+        return toHardDelete;
+    }
+    /**
+   * Gets the count of transactions from pruned blocks.
+   */ getCount() {
+        return this.#state.size;
+    }
+    /**
+   * Gets all transaction hashes from pruned blocks.
+   */ getPrunedTxHashes() {
+        return Array.from(this.#state.keys());
+    }
+}

package/dest/mem_pools/tx_pool_v2/eviction/eviction_manager.d.ts

@@ -0,0 +1,47 @@
+import type { BlockNumber } from '@aztec/foundation/branded-types';
+import type { Logger } from '@aztec/foundation/log';
+import type { BlockHeader } from '@aztec/stdlib/tx';
+import type { TxMetaData } from '../tx_metadata.js';
+import { type EvictionConfig, type EvictionRule, type PoolOperations, type PreAddPoolAccess, type PreAddResult, type PreAddRule } from './interfaces.js';
+/**
+ * Manages eviction rules for the transaction pool.
+ * Coordinates pre-add rules (run during addPendingTxs) and post-event rules (run after events).
+ */
+export declare class EvictionManager {
+    private pool;
+    private log;
+    private preAddRules;
+    private postEventRules;
+    constructor(pool: PoolOperations, log: Logger);
+    /**
+     * Registers a pre-add rule that runs during transaction addition.
+     */
+    registerPreAddRule(rule: PreAddRule): void;
+    /**
+     * Registers a post-event eviction rule that runs after events.
+     */
+    registerRule(rule: EvictionRule): void;
+    /**
+     * Runs all pre-add rules for an incoming transaction.
+     * Returns combined result of all rules.
+     */
+    runPreAddRules(incomingMeta: TxMetaData, poolAccess: PreAddPoolAccess): Promise<PreAddResult>;
+    /**
+     * Runs post-event eviction after new transactions are added.
+     */
+    evictAfterNewTxs(newTxHashes: string[], feePayers: string[]): Promise<void>;
+    /**
+     * Runs post-event eviction after a block is mined.
+     */
+    evictAfterNewBlock(block: BlockHeader, newNullifiers: string[], feePayers: string[]): Promise<void>;
+    /**
+     * Runs post-event eviction after a chain prune (reorg).
+     */
+    evictAfterChainPrune(blockNumber: BlockNumber): Promise<void>;
+    /**
+     * Updates configuration for all rules.
+     */
+    updateConfig(config: EvictionConfig): void;
+    private runPostEventRules;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXZpY3Rpb25fbWFuYWdlci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL21lbV9wb29scy90eF9wb29sX3YyL2V2aWN0aW9uL2V2aWN0aW9uX21hbmFnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDbkUsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDcEQsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFcEQsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDcEQsT0FBTyxFQUNMLEtBQUssY0FBYyxFQUduQixLQUFLLFlBQVksRUFDakIsS0FBSyxjQUFjLEVBQ25CLEtBQUssZ0JBQWdCLEVBQ3JCLEtBQUssWUFBWSxFQUNqQixLQUFLLFVBQVUsRUFDaEIsTUFBTSxpQkFBaUIsQ0FBQztBQUV6Qjs7O0dBR0c7QUFDSCxxQkFBYSxlQUFlO0lBS3hCLE9BQU8sQ0FBQyxJQUFJO0lBQ1osT0FBTyxDQUFDLEdBQUc7SUFMYixPQUFPLENBQUMsV0FBVyxDQUFvQjtJQUN2QyxPQUFPLENBQUMsY0FBYyxDQUFzQjtJQUU1QyxZQUNVLElBQUksRUFBRSxjQUFjLEVBQ3BCLEdBQUcsRUFBRSxNQUFNLEVBQ2pCO0lBRUo7O09BRUc7SUFDSCxrQkFBa0IsQ0FBQyxJQUFJLEVBQUUsVUFBVSxHQUFHLElBQUksQ0FHekM7SUFFRDs7T0FFRztJQUNILFlBQVksQ0FBQyxJQUFJLEVBQUUsWUFBWSxHQUFHLElBQUksQ0FHckM7SUFFRDs7O09BR0c7SUFDRyxjQUFjLENBQUMsWUFBWSxFQUFFLFVBQVUsRUFBRSxVQUFVLEVBQUUsZ0JBQWdCLEdBQUcsT0FBTyxDQUFDLFlBQVksQ0FBQyxDQWdDbEc7SUFFRDs7T0FFRztJQUNHLGdCQUFnQixDQUFDLFdBQVcsRUFBRSxNQUFNLEVBQUUsRUFBRSxTQUFTLEVBQUUsTUFBTSxFQUFFLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQVFoRjtJQUVEOztPQUVHO0lBQ0csa0JBQWtCLENBQUMsS0FBSyxFQUFFLFdBQVcsRUFBRSxhQUFhLEVBQUUsTUFBTSxFQUFFLEVBQUUsU0FBUyxFQUFFLE1BQU0sRUFBRSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FTeEc7SUFFRDs7T0FFRztJQUNHLG9CQUFvQixDQUFDLFdBQVcsRUFBRSxXQUFXLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQU9sRTtJQUVEOztPQUVHO0lBQ0gsWUFBWSxDQUFDLE1BQU0sRUFBRSxjQUFjLEdBQUcsSUFBSSxDQU96QztZQUVhLGlCQUFpQjtDQVloQyJ9

package/dest/mem_pools/tx_pool_v2/eviction/eviction_manager.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"eviction_manager.d.ts","sourceRoot":"","sources":["../../../../src/mem_pools/tx_pool_v2/eviction/eviction_manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EACL,KAAK,cAAc,EAGnB,KAAK,YAAY,EACjB,KAAK,cAAc,EACnB,KAAK,gBAAgB,EACrB,KAAK,YAAY,EACjB,KAAK,UAAU,EAChB,MAAM,iBAAiB,CAAC;AAEzB;;;GAGG;AACH,qBAAa,eAAe;IAKxB,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,GAAG;IALb,OAAO,CAAC,WAAW,CAAoB;IACvC,OAAO,CAAC,cAAc,CAAsB;IAE5C,YACU,IAAI,EAAE,cAAc,EACpB,GAAG,EAAE,MAAM,EACjB;IAEJ;;OAEG;IACH,kBAAkB,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI,CAGzC;IAED;;OAEG;IACH,YAAY,CAAC,IAAI,EAAE,YAAY,GAAG,IAAI,CAGrC;IAED;;;OAGG;IACG,cAAc,CAAC,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,gBAAgB,GAAG,OAAO,CAAC,YAAY,CAAC,CAgClG;IAED;;OAEG;IACG,gBAAgB,CAAC,WAAW,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAQhF;IAED;;OAEG;IACG,kBAAkB,CAAC,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CASxG;IAED;;OAEG;IACG,oBAAoB,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAOlE;IAED;;OAEG;IACH,YAAY,CAAC,MAAM,EAAE,cAAc,GAAG,IAAI,CAOzC;YAEa,iBAAiB;CAYhC"}

package/dest/mem_pools/tx_pool_v2/eviction/eviction_manager.js

@@ -0,0 +1,119 @@
+import { EvictionEvent } from './interfaces.js';
+/**
+ * Manages eviction rules for the transaction pool.
+ * Coordinates pre-add rules (run during addPendingTxs) and post-event rules (run after events).
+ */ export class EvictionManager {
+    pool;
+    log;
+    preAddRules;
+    postEventRules;
+    constructor(pool, log){
+        this.pool = pool;
+        this.log = log;
+        this.preAddRules = [];
+        this.postEventRules = [];
+    }
+    /**
+   * Registers a pre-add rule that runs during transaction addition.
+   */ registerPreAddRule(rule) {
+        this.preAddRules.push(rule);
+        this.log.debug(`Registered pre-add rule: ${rule.name}`);
+    }
+    /**
+   * Registers a post-event eviction rule that runs after events.
+   */ registerRule(rule) {
+        this.postEventRules.push(rule);
+        this.log.debug(`Registered eviction rule: ${rule.name}`);
+    }
+    /**
+   * Runs all pre-add rules for an incoming transaction.
+   * Returns combined result of all rules.
+   */ async runPreAddRules(incomingMeta, poolAccess) {
+        const allTxHashesToEvict = [];
+        for (const rule of this.preAddRules){
+            try {
+                const result = await rule.check(incomingMeta, poolAccess);
+                if (result.shouldIgnore) {
+                    return result;
+                }
+                // Collect txs to evict from all rules
+                for (const txHash of result.txHashesToEvict){
+                    if (!allTxHashesToEvict.includes(txHash)) {
+                        allTxHashesToEvict.push(txHash);
+                    }
+                }
+            } catch (err) {
+                this.log.error(`Error running pre-add rule ${rule.name}`, {
+                    err,
+                    txHash: incomingMeta.txHash
+                });
+                // On error, ignore the transaction to be safe
+                return {
+                    shouldIgnore: true,
+                    txHashesToEvict: [],
+                    reason: `pre-add rule ${rule.name} error: ${err}`
+                };
+            }
+        }
+        return {
+            shouldIgnore: false,
+            txHashesToEvict: allTxHashesToEvict
+        };
+    }
+    /**
+   * Runs post-event eviction after new transactions are added.
+   */ async evictAfterNewTxs(newTxHashes, feePayers) {
+        const context = {
+            event: EvictionEvent.TXS_ADDED,
+            newTxHashes,
+            feePayers
+        };
+        await this.runPostEventRules(context);
+    }
+    /**
+   * Runs post-event eviction after a block is mined.
+   */ async evictAfterNewBlock(block, newNullifiers, feePayers) {
+        const context = {
+            event: EvictionEvent.BLOCK_MINED,
+            block,
+            newNullifiers,
+            feePayers
+        };
+        await this.runPostEventRules(context);
+    }
+    /**
+   * Runs post-event eviction after a chain prune (reorg).
+   */ async evictAfterChainPrune(blockNumber) {
+        const context = {
+            event: EvictionEvent.CHAIN_PRUNED,
+            blockNumber
+        };
+        await this.runPostEventRules(context);
+    }
+    /**
+   * Updates configuration for all rules.
+   */ updateConfig(config) {
+        for (const rule of this.preAddRules){
+            rule.updateConfig?.(config);
+        }
+        for (const rule of this.postEventRules){
+            rule.updateConfig?.(config);
+        }
+    }
+    async runPostEventRules(context) {
+        for (const rule of this.postEventRules){
+            try {
+                const result = await rule.evict(context, this.pool);
+                if (!result.success) {
+                    this.log.warn(`Eviction rule ${rule.name} failed`, {
+                        error: result.error
+                    });
+                }
+            } catch (err) {
+                this.log.error(`Error running eviction rule ${rule.name}`, {
+                    err
+                });
+            }
+        }
+    }
+}

package/dest/mem_pools/tx_pool_v2/eviction/fee_payer_balance_eviction_rule.d.ts

@@ -0,0 +1,17 @@
+import type { WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
+import type { EvictionContext, EvictionResult, EvictionRule, PoolOperations } from './interfaces.js';
+/**
+ * Eviction rule that removes transactions when fee payers have insufficient balance.
+ * Triggers on TXS_ADDED, BLOCK_MINED, and CHAIN_PRUNED events.
+ */
+export declare class FeePayerBalanceEvictionRule implements EvictionRule {
+    private worldState;
+    readonly name = "FeePayerBalanceEviction";
+    readonly reason = "fee_payer_balance";
+    private log;
+    constructor(worldState: WorldStateSynchronizer);
+    evict(context: EvictionContext, pool: PoolOperations): Promise<EvictionResult>;
+    private evictForFeePayers;
+    private getEvictionsForFeePayer;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmVlX3BheWVyX2JhbGFuY2VfZXZpY3Rpb25fcnVsZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL21lbV9wb29scy90eF9wb29sX3YyL2V2aWN0aW9uL2ZlZV9wYXllcl9iYWxhbmNlX2V2aWN0aW9uX3J1bGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBSUEsT0FBTyxLQUFLLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUk5RSxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsY0FBYyxFQUFFLFlBQVksRUFBRSxjQUFjLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUdyRzs7O0dBR0c7QUFDSCxxQkFBYSwyQkFBNEIsWUFBVyxZQUFZO0lBTWxELE9BQU8sQ0FBQyxVQUFVO0lBTDlCLFNBQWdCLElBQUksNkJBQTZCO0lBQ2pELFNBQWdCLE1BQU0sdUJBQXVCO0lBRTdDLE9BQU8sQ0FBQyxHQUFHLENBQWtFO0lBRTdFLFlBQW9CLFVBQVUsRUFBRSxzQkFBc0IsRUFBSTtJQUVwRCxLQUFLLENBQUMsT0FBTyxFQUFFLGVBQWUsRUFBRSxJQUFJLEVBQUUsY0FBYyxHQUFHLE9BQU8sQ0FBQyxjQUFjLENBQUMsQ0FnQ25GO1lBRWEsaUJBQWlCO1lBc0JqQix1QkFBdUI7Q0FzQ3RDIn0=

package/dest/mem_pools/tx_pool_v2/eviction/fee_payer_balance_eviction_rule.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"fee_payer_balance_eviction_rule.d.ts","sourceRoot":"","sources":["../../../../src/mem_pools/tx_pool_v2/eviction/fee_payer_balance_eviction_rule.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAI9E,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAGrG;;;GAGG;AACH,qBAAa,2BAA4B,YAAW,YAAY;IAMlD,OAAO,CAAC,UAAU;IAL9B,SAAgB,IAAI,6BAA6B;IACjD,SAAgB,MAAM,uBAAuB;IAE7C,OAAO,CAAC,GAAG,CAAkE;IAE7E,YAAoB,UAAU,EAAE,sBAAsB,EAAI;IAEpD,KAAK,CAAC,OAAO,EAAE,eAAe,EAAE,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC,CAgCnF;YAEa,iBAAiB;YAsBjB,uBAAuB;CAsCtC"}

package/dest/mem_pools/tx_pool_v2/eviction/fee_payer_balance_eviction_rule.js

@@ -0,0 +1,90 @@
+import { createLogger } from '@aztec/foundation/log';
+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 { comparePriority } from '../tx_metadata.js';
+import { EvictionEvent } from './interfaces.js';
+/**
+ * Eviction rule that removes transactions when fee payers have insufficient balance.
+ * Triggers on TXS_ADDED, BLOCK_MINED, and CHAIN_PRUNED events.
+ */ export class FeePayerBalanceEvictionRule {
+    worldState;
+    name;
+    reason;
+    log;
+    constructor(worldState){
+        this.worldState = worldState;
+        this.name = 'FeePayerBalanceEviction';
+        this.reason = 'fee_payer_balance';
+        this.log = createLogger('p2p:tx_pool_v2:fee_payer_balance_eviction_rule');
+    }
+    async evict(context, pool) {
+        try {
+            if (context.event === EvictionEvent.TXS_ADDED) {
+                return await this.evictForFeePayers(context.feePayers, this.worldState.getCommitted(), pool);
+            }
+            if (context.event === EvictionEvent.BLOCK_MINED) {
+                const blockNumber = context.block.getBlockNumber();
+                await this.worldState.syncImmediate(blockNumber);
+                return await this.evictForFeePayers(context.feePayers, this.worldState.getSnapshot(blockNumber), pool);
+            }
+            if (context.event === EvictionEvent.CHAIN_PRUNED) {
+                await this.worldState.syncImmediate(context.blockNumber);
+                const feePayers = pool.getPendingFeePayers();
+                return await this.evictForFeePayers(feePayers, this.worldState.getSnapshot(context.blockNumber), pool);
+            }
+            return {
+                reason: this.reason,
+                success: true,
+                txsEvicted: []
+            };
+        } catch (err) {
+            this.log.error('Failed to evict txs due to fee payer balance', {
+                err
+            });
+            return {
+                reason: this.reason,
+                success: false,
+                txsEvicted: [],
+                error: new Error('Failed to evict txs due to fee payer balance', {
+                    cause: err
+                })
+            };
+        }
+    }
+    async evictForFeePayers(feePayers, db, pool) {
+        const publicStateSource = new DatabasePublicStateSource(db);
+        const txsToEvict = (await Promise.all(feePayers.map((feePayer)=>this.getEvictionsForFeePayer(feePayer, publicStateSource, pool)))).flat();
+        if (txsToEvict.length > 0) {
+            await pool.deleteTxs(txsToEvict);
+        }
+        return {
+            reason: this.reason,
+            success: true,
+            txsEvicted: txsToEvict
+        };
+    }
+    async getEvictionsForFeePayer(feePayerStr, publicStateSource, pool) {
+        const feePayer = AztecAddress.fromString(feePayerStr);
+        const initialBalance = (await publicStateSource.storageRead(ProtocolContractAddress.FeeJuice, await computeFeePayerBalanceStorageSlot(feePayer))).toBigInt();
+        const txs = pool.getFeePayerPendingTxs(feePayerStr);
+        if (txs.length === 0) {
+            return [];
+        }
+        const txsToEvict = [];
+        let balance = initialBalance;
+        // Sort by priority descending (highest first), with hash as tiebreaker
+        txs.sort((a, b)=>comparePriority(b, a));
+        for (const tx of txs){
+            const available = balance + tx.claimAmount;
+            if (available >= tx.feeLimit) {
+                balance = available - tx.feeLimit;
+                continue;
+            }
+            // This tx cannot be covered - mark for eviction
+            txsToEvict.push(tx.txHash);
+        }
+        return txsToEvict;
+    }
+}