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

package/dest/mem_pools/tx_pool/aztec_kv_tx_pool.js

@@ -2,6 +2,7 @@ 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 { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { ChonkProof } from '@aztec/stdlib/proofs';
 import { Tx, TxHash } from '@aztec/stdlib/tx';
 import { getTelemetryClient } from '@aztec/telemetry-client';
@@ -10,10 +11,12 @@ import EventEmitter from 'node:events';
 import { ArchiveCache } from '../../msg_validators/tx_validator/archive_cache.js';
 import { PoolInstrumentation, PoolName } from '../instrumentation.js';
 import { EvictionManager } from './eviction/eviction_manager.js';
-import { InsufficientFeePayerBalanceRule } from './eviction/insufficient_fee_payer_balance_rule.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.
@@ -26,7 +29,8 @@ import { getPendingTxPriority } from './priority.js';
     /** 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;
     #historicalHeaderToTxHash;
-    #feePayerToTxHash;
+    #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;
@@ -48,11 +52,12 @@ import { getPendingTxPriority } from './priority.js';
         this.#evictionManager = new EvictionManager(this);
         this.#evictionManager.registerRule(new InvalidTxsAfterMiningRule());
         this.#evictionManager.registerRule(new InvalidTxsAfterReorgRule(worldState));
-        this.#evictionManager.registerRule(new InsufficientFeePayerBalanceRule(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');
@@ -61,7 +66,8 @@ import { getPendingTxPriority } from './priority.js';
         this.#blockToDeletedMinedTxHash = store.openMultiMap('blockToDeletedMinedTxHash');
         this.#pendingTxHashToHistoricalBlockHeaderHash = store.openMap('txHistoricalBlock');
         this.#historicalHeaderToTxHash = store.openMultiMap('historicalHeaderToPendingTxHash');
-        this.#feePayerToTxHash = store.openMultiMap('feePayerToPendingTxHash');
+        this.#feePayerToBalanceEntry = store.openMultiMap('feePayerToBalanceEntry');
+        this.#pendingNullifierToTxHash = store.openMap('pendingNullifierToTxHash');
         this.#nonEvictableTxs = new Set();
         this.#archivedTxs = archive.openMap('archivedTxs');
         this.#archivedTxIndices = archive.openMap('archivedTxIndices');
@@ -104,7 +110,7 @@ import { getPendingTxPriority } from './priority.js';
                 for (const hash of txHashes){
                     const key = hash.toString();
                     await this.#minedTxHashToBlock.set(key, blockHeader.globalVariables.blockNumber);
-                    const tx = await this.getPendingTxByHash(hash);
+                    const tx = await this.getTxByHash(hash);
                     if (tx) {
                         const nullifiers = tx.data.getNonEmptyNullifiers();
                         nullifiers.forEach((nullifier)=>insertIntoSortedArray(uniqueMinedNullifiers, nullifier, Fr.cmp, false));
@@ -139,8 +145,15 @@ import { getPendingTxPriority } from './priority.js';
                 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.getPendingTxByHash(hash);
+                    const tx = await this.getTxByHash(hash);
                     if (tx) {
                         await this.addPendingTxIndicesInDbTx(tx, key);
                     }
@@ -190,6 +203,8 @@ 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 count of added transactions
    */ async addTxs(txs, opts = {}) {
@@ -197,38 +212,59 @@ import { getPendingTxPriority } from './priority.js';
             return Promise.resolve(0);
         }
         const addedTxs = [];
+        const uniqueFeePayers = [];
+        const replacedTxHashes = [];
         const hashesAndStats = txs.map((tx)=>({
                 txHash: tx.getTxHash(),
                 txStats: tx.getStats()
             }));
         try {
             await this.#store.transactionAsync(async ()=>{
-                await Promise.all(txs.map(async (tx, i)=>{
+                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 ${txHash.toString()} already exists in the pool`);
-                        return;
+                        this.#log.debug(`Tx ${key} already exists in the pool`);
+                        continue;
                     }
-                    this.#log.verbose(`Adding tx ${txHash.toString()} to pool`, {
+                    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.#evictionManager.evictAfterNewTxs(addedTxs.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', {
@@ -259,7 +295,7 @@ import { getPendingTxPriority } from './priority.js';
                 const minedBlockNumber = await this.#minedTxHashToBlock.getAsync(key);
                 const txIsPending = minedBlockNumber === undefined;
                 if (txIsPending) {
-                    await this.deletePendingTx(tx, key);
+                    await this.deletePendingTxInDbTx(tx, key);
                 } else {
                     await this.deleteMinedTx(key, minedBlockNumber, opts?.permanently ?? false);
                     const shouldArchiveTx = this.#archivedTxLimit && !opts?.permanently;
@@ -287,10 +323,11 @@ import { getPendingTxPriority } from './priority.js';
         await this.#deletedMinedTxHashes.set(txHash, minedBlockNumber);
         await this.#blockToDeletedMinedTxHash.set(minedBlockNumber, txHash);
     }
-    async deletePendingTx(tx, 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.removePendingTxIndices(tx, txHash);
+        await this.removePendingTxIndicesInDbTx(tx, txHash);
         await this.#txs.delete(txHash);
         await this.#pendingTxHashToHistoricalBlockHeaderHash.delete(txHash);
     }
@@ -317,7 +354,7 @@ import { getPendingTxPriority } from './priority.js';
         let historicalBlockHash = await this.#pendingTxHashToHistoricalBlockHeaderHash.getAsync(txHash.toString());
         // Not all tx might have this index created.
         if (!historicalBlockHash) {
-            const tx = await this.getPendingTxByHash(txHash);
+            const tx = await this.getTxByHash(txHash);
             if (!tx) {
                 this.#log.warn(`PendingTxInfo:tx ${txHash} not found`);
                 return undefined;
@@ -343,14 +380,20 @@ import { getPendingTxPriority } from './priority.js';
         }
         return result;
     }
-    async getPendingTxsWithFeePayer(feePayers) {
-        const result = [];
-        for (const feePayer of feePayers){
-            const chunk = await toArray(this.#feePayerToTxHash.getValuesAsync(feePayer.toString()));
-            const infos = await Promise.all(chunk.map((txHash)=>this.getPendingTxInfo(TxHash.fromString(txHash))));
-            result.push(...infos.filter((info)=>info !== undefined));
+    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;
         }
-        return result;
     }
     async getMinedTxHashes() {
         const vals = await toArray(this.#minedTxHashToBlock.entriesAsync());
@@ -447,21 +490,6 @@ 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) {
-        if (typeof txHash === 'string') {
-            txHash = TxHash.fromString(txHash);
-        }
-        const tx = await this.getTxByHash(txHash);
-        if (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.
@@ -515,23 +543,23 @@ import { getPendingTxPriority } from './priority.js';
     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.#feePayerToTxHash.set(tx.data.feePayer.toString(), txHash);
-    }
-    async addPendingTxIndices(tx, txHash) {
-        return await this.#store.transactionAsync(async ()=>{
-            await this.addPendingTxIndicesInDbTx(tx, 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);
+        }
     }
     // 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.#feePayerToTxHash.deleteValue(tx.data.feePayer.toString(), txHash);
-    }
-    async removePendingTxIndices(tx, txHash) {
-        return await this.#store.transactionAsync(async ()=>{
-            await this.removePendingTxIndicesInDbTx(tx, 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());
+        }
     }
     /**
    * Returns up to `limit` lowest-priority evictable pending tx hashes without hydrating transactions.
@@ -552,4 +580,17 @@ import { getPendingTxPriority } from './priority.js';
         }
         return txsToEvict;
     }
+    /**
+   * 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
+        };
+    }
 }

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

@@ -1,18 +1,32 @@
+import type { BlockNumber } from '@aztec/foundation/branded-types';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { BlockHeader, TxHash } from '@aztec/stdlib/tx';
+import { BlockHeader, Tx, TxHash } from '@aztec/stdlib/tx';
 import type { TxPoolOptions } from '../tx_pool.js';
-import { type EvictionRule, type TxPoolOperations } from './eviction_strategy.js';
+import { type EvictionRule, type PreAddEvictionResult, type PreAddEvictionRule, type PreAddPoolAccess, type TxPoolOperations } from './eviction_strategy.js';
 export declare class EvictionManager {
     private txPool;
     private log;
     private rules;
+    /** Pre-add eviction rules (run inside addTxs transaction) */
+    private preAddRules;
     constructor(txPool: TxPoolOperations, log?: import("@aztec/foundation/log").Logger);
-    evictAfterNewTxs(newTxs: TxHash[]): Promise<void>;
+    evictAfterNewTxs(newTxs: TxHash[], feePayers: AztecAddress[]): Promise<void>;
     evictAfterNewBlock(block: BlockHeader, newNullifiers: Fr[], minedFeePayers: AztecAddress[]): Promise<void>;
-    evictAfterChainPrune(blockNumber: number): Promise<void>;
+    evictAfterChainPrune(blockNumber: BlockNumber): Promise<void>;
+    /**
+     * Runs pre-add eviction rules to determine if an incoming tx should be added
+     * and which existing txs should be evicted.
+     * Called from inside the addTxs database transaction for atomicity.
+     *
+     * @param tx - The incoming transaction
+     * @param poolAccess - Read-only access to pool state
+     * @returns Combined result from all pre-add rules
+     */
+    runPreAddRules(tx: Tx, poolAccess: PreAddPoolAccess): Promise<PreAddEvictionResult>;
     registerRule(rule: EvictionRule): void;
+    registerPreAddRule(rule: PreAddEvictionRule): void;
     updateConfig(config: TxPoolOptions): void;
     private runEvictionRules;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXZpY3Rpb25fbWFuYWdlci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL21lbV9wb29scy90eF9wb29sL2V2aWN0aW9uL2V2aWN0aW9uX21hbmFnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRXBELE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ2hFLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFdkQsT0FBTyxLQUFLLEVBQUUsYUFBYSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQ25ELE9BQU8sRUFBdUMsS0FBSyxZQUFZLEVBQUUsS0FBSyxnQkFBZ0IsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRXZILHFCQUFhLGVBQWU7SUFJeEIsT0FBTyxDQUFDLE1BQU07SUFDZCxPQUFPLENBQUMsR0FBRztJQUpiLE9BQU8sQ0FBQyxLQUFLLENBQXNCO0lBRW5DLFlBQ1UsTUFBTSxFQUFFLGdCQUFnQixFQUN4QixHQUFHLHlDQUF1RCxFQUNoRTtJQUVTLGdCQUFnQixDQUFDLE1BQU0sRUFBRSxNQUFNLEVBQUUsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBTTdEO0lBRVksa0JBQWtCLENBQzdCLEtBQUssRUFBRSxXQUFXLEVBQ2xCLGFBQWEsRUFBRSxFQUFFLEVBQUUsRUFDbkIsY0FBYyxFQUFFLFlBQVksRUFBRSxHQUM3QixPQUFPLENBQUMsSUFBSSxDQUFDLENBU2Y7SUFFWSxvQkFBb0IsQ0FBQyxXQUFXLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FNcEU7SUFFTSxZQUFZLENBQUMsSUFBSSxFQUFFLFlBQVksUUFFckM7SUFFTSxZQUFZLENBQUMsTUFBTSxFQUFFLGFBQWEsR0FBRyxJQUFJLENBSS9DO1lBRWEsZ0JBQWdCO0NBYS9CIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXZpY3Rpb25fbWFuYWdlci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL21lbV9wb29scy90eF9wb29sL2V2aWN0aW9uL2V2aWN0aW9uX21hbmFnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDbkUsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRXBELE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ2hFLE9BQU8sRUFBRSxXQUFXLEVBQUUsRUFBRSxFQUFFLE1BQU0sRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRTNELE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUNuRCxPQUFPLEVBR0wsS0FBSyxZQUFZLEVBQ2pCLEtBQUssb0JBQW9CLEVBQ3pCLEtBQUssa0JBQWtCLEVBQ3ZCLEtBQUssZ0JBQWdCLEVBQ3JCLEtBQUssZ0JBQWdCLEVBQ3RCLE1BQU0sd0JBQXdCLENBQUM7QUFFaEMscUJBQWEsZUFBZTtJQU94QixPQUFPLENBQUMsTUFBTTtJQUNkLE9BQU8sQ0FBQyxHQUFHO0lBUGIsT0FBTyxDQUFDLEtBQUssQ0FBc0I7SUFFbkMsNkRBQTZEO0lBQzdELE9BQU8sQ0FBQyxXQUFXLENBQTRCO0lBRS9DLFlBQ1UsTUFBTSxFQUFFLGdCQUFnQixFQUN4QixHQUFHLHlDQUF1RCxFQUNoRTtJQUVTLGdCQUFnQixDQUFDLE1BQU0sRUFBRSxNQUFNLEVBQUUsRUFBRSxTQUFTLEVBQUUsWUFBWSxFQUFFLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQU94RjtJQUVZLGtCQUFrQixDQUM3QixLQUFLLEVBQUUsV0FBVyxFQUNsQixhQUFhLEVBQUUsRUFBRSxFQUFFLEVBQ25CLGNBQWMsRUFBRSxZQUFZLEVBQUUsR0FDN0IsT0FBTyxDQUFDLElBQUksQ0FBQyxDQVNmO0lBRVksb0JBQW9CLENBQUMsV0FBVyxFQUFFLFdBQVcsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBTXpFO0lBRUQ7Ozs7Ozs7O09BUUc7SUFDVSxjQUFjLENBQUMsRUFBRSxFQUFFLEVBQUUsRUFBRSxVQUFVLEVBQUUsZ0JBQWdCLEdBQUcsT0FBTyxDQUFDLG9CQUFvQixDQUFDLENBNkIvRjtJQUVNLFlBQVksQ0FBQyxJQUFJLEVBQUUsWUFBWSxRQUVyQztJQUVNLGtCQUFrQixDQUFDLElBQUksRUFBRSxrQkFBa0IsUUFFakQ7SUFFTSxZQUFZLENBQUMsTUFBTSxFQUFFLGFBQWEsR0FBRyxJQUFJLENBTy9DO1lBRWEsZ0JBQWdCO0NBYS9CIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"eviction_manager.d.ts","sourceRoot":"","sources":["../../../../src/mem_pools/tx_pool/eviction/eviction_manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEpD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAAuC,KAAK,YAAY,EAAE,KAAK,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAEvH,qBAAa,eAAe;IAIxB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,GAAG;IAJb,OAAO,CAAC,KAAK,CAAsB;IAEnC,YACU,MAAM,EAAE,gBAAgB,EACxB,GAAG,yCAAuD,EAChE;IAES,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAM7D;IAEY,kBAAkB,CAC7B,KAAK,EAAE,WAAW,EAClB,aAAa,EAAE,EAAE,EAAE,EACnB,cAAc,EAAE,YAAY,EAAE,GAC7B,OAAO,CAAC,IAAI,CAAC,CASf;IAEY,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAMpE;IAEM,YAAY,CAAC,IAAI,EAAE,YAAY,QAErC;IAEM,YAAY,CAAC,MAAM,EAAE,aAAa,GAAG,IAAI,CAI/C;YAEa,gBAAgB;CAa/B"}
+{"version":3,"file":"eviction_manager.d.ts","sourceRoot":"","sources":["../../../../src/mem_pools/tx_pool/eviction/eviction_manager.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEpD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAGL,KAAK,YAAY,EACjB,KAAK,oBAAoB,EACzB,KAAK,kBAAkB,EACvB,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EACtB,MAAM,wBAAwB,CAAC;AAEhC,qBAAa,eAAe;IAOxB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,GAAG;IAPb,OAAO,CAAC,KAAK,CAAsB;IAEnC,6DAA6D;IAC7D,OAAO,CAAC,WAAW,CAA4B;IAE/C,YACU,MAAM,EAAE,gBAAgB,EACxB,GAAG,yCAAuD,EAChE;IAES,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAOxF;IAEY,kBAAkB,CAC7B,KAAK,EAAE,WAAW,EAClB,aAAa,EAAE,EAAE,EAAE,EACnB,cAAc,EAAE,YAAY,EAAE,GAC7B,OAAO,CAAC,IAAI,CAAC,CASf;IAEY,oBAAoB,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAMzE;IAED;;;;;;;;OAQG;IACU,cAAc,CAAC,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,gBAAgB,GAAG,OAAO,CAAC,oBAAoB,CAAC,CA6B/F;IAEM,YAAY,CAAC,IAAI,EAAE,YAAY,QAErC;IAEM,kBAAkB,CAAC,IAAI,EAAE,kBAAkB,QAEjD;IAEM,YAAY,CAAC,MAAM,EAAE,aAAa,GAAG,IAAI,CAO/C;YAEa,gBAAgB;CAa/B"}

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

@@ -1,18 +1,23 @@
+import { findIndexInSortedArray, insertIntoSortedArray } from '@aztec/foundation/array';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { createLogger } from '@aztec/foundation/log';
 import { EvictionEvent } from './eviction_strategy.js';
 export class EvictionManager {
     txPool;
     log;
     rules;
+    /** Pre-add eviction rules (run inside addTxs transaction) */ preAddRules;
     constructor(txPool, log = createLogger('p2p:mempool:tx_pool:eviction_manager')){
         this.txPool = txPool;
         this.log = log;
         this.rules = [];
+        this.preAddRules = [];
     }
-    async evictAfterNewTxs(newTxs) {
+    async evictAfterNewTxs(newTxs, feePayers) {
         const ctx = {
             event: EvictionEvent.TXS_ADDED,
-            newTxs
+            newTxs,
+            feePayers
         };
         await this.runEvictionRules(ctx);
     }
@@ -21,7 +26,7 @@ export class EvictionManager {
             event: EvictionEvent.BLOCK_MINED,
             block,
             newNullifiers,
-            minedFeePayers
+            feePayers: minedFeePayers
         };
         await this.runEvictionRules(ctx);
     }
@@ -32,13 +37,64 @@ export class EvictionManager {
         };
         await this.runEvictionRules(ctx);
     }
+    /**
+   * Runs pre-add eviction rules to determine if an incoming tx should be added
+   * and which existing txs should be evicted.
+   * Called from inside the addTxs database transaction for atomicity.
+   *
+   * @param tx - The incoming transaction
+   * @param poolAccess - Read-only access to pool state
+   * @returns Combined result from all pre-add rules
+   */ async runPreAddRules(tx, poolAccess) {
+        const allTxHashesToEvict = [];
+        const cmpTxHash = (a, b)=>Fr.cmp(a.hash, b.hash);
+        for (const rule of this.preAddRules){
+            try {
+                const result = await rule.check(tx, poolAccess);
+                if (result.shouldReject) {
+                    return {
+                        shouldReject: true,
+                        txHashesToEvict: [],
+                        reason: result.reason
+                    };
+                }
+                for (const txHashToEvict of result.txHashesToEvict){
+                    // Only add if not already present (dedup)
+                    if (findIndexInSortedArray(allTxHashesToEvict, txHashToEvict, cmpTxHash) === -1) {
+                        insertIntoSortedArray(allTxHashesToEvict, txHashToEvict, cmpTxHash);
+                    }
+                }
+            } catch (err) {
+                this.log.warn(`Pre-add eviction rule ${rule.name} unexpected error: ${String(err)}`, {
+                    err,
+                    preAddRule: rule.name
+                });
+                // On error, reject the tx to be safe
+                return {
+                    shouldReject: true,
+                    txHashesToEvict: [],
+                    reason: `rule error: ${String(err)}`
+                };
+            }
+        }
+        return {
+            shouldReject: false,
+            txHashesToEvict: allTxHashesToEvict
+        };
+    }
     registerRule(rule) {
         this.rules.push(rule);
     }
+    registerPreAddRule(rule) {
+        this.preAddRules.push(rule);
+    }
     updateConfig(config) {
         for (const rule of this.rules){
             rule.updateConfig(config);
         }
+        for (const rule of this.preAddRules){
+            rule.updateConfig?.(config);
+        }
     }
     async runEvictionRules(ctx) {
         for (const rule of this.rules){

package/dest/mem_pools/tx_pool/eviction/eviction_strategy.d.ts

@@ -1,6 +1,7 @@
+import type { BlockNumber } from '@aztec/foundation/branded-types';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
-import type { BlockHeader, Tx, TxHash } from '@aztec/stdlib/tx';
+import { type BlockHeader, type Tx, TxHash } from '@aztec/stdlib/tx';
 import type { TxPoolOptions } from '../tx_pool.js';
 export declare const EvictionEvent: {
     readonly TXS_ADDED: "txs_added";
@@ -11,14 +12,15 @@ type EvictionEvent = (typeof EvictionEvent)[keyof typeof EvictionEvent];
 export type EvictionContext = {
     event: typeof EvictionEvent.TXS_ADDED;
     newTxs: TxHash[];
+    feePayers: AztecAddress[];
 } | {
     event: typeof EvictionEvent.CHAIN_PRUNED;
-    blockNumber: number;
+    blockNumber: BlockNumber;
 } | {
     event: typeof EvictionEvent.BLOCK_MINED;
     block: BlockHeader;
     newNullifiers: Fr[];
-    minedFeePayers: AztecAddress[];
+    feePayers: AztecAddress[];
 };
 /**
  * Result of an eviction operation
@@ -52,7 +54,8 @@ export interface TxPoolOperations {
     getTxByHash(txHash: TxHash): Promise<Tx | undefined>;
     getPendingTxInfos(): Promise<PendingTxInfo[]>;
     getPendingTxsReferencingBlocks(blockHashes: Fr[]): Promise<TxBlockReference[]>;
-    getPendingTxsWithFeePayer(feePayer: AztecAddress[]): Promise<PendingTxInfo[]>;
+    getPendingFeePayers(): Promise<AztecAddress[]>;
+    getFeePayerTxInfos(feePayer: AztecAddress): AsyncIterable<FeePayerTxInfo>;
     /** Cheap count of current pending transactions. */
     getPendingTxCount(): Promise<number>;
     /**
@@ -79,5 +82,76 @@ export interface EvictionRule {
      */
     updateConfig(config: TxPoolOptions): void;
 }
+/**
+ * Balance-related information about a transaction for a fee payer.
+ */
+export declare class FeePayerTxInfo {
+    txHash: TxHash;
+    priority: bigint;
+    feeLimit: bigint;
+    claimAmount: bigint;
+    isEvictable: boolean;
+    constructor(fields: {
+        txHash: TxHash;
+        priority: bigint;
+        feeLimit: bigint;
+        claimAmount: bigint;
+        isEvictable: boolean;
+    });
+    static encode(tx: Tx, txHash: string | TxHash): Promise<Buffer>;
+    static decode(value: Buffer, isEvictable?: boolean): FeePayerTxInfo;
+}
+/**
+ * Read-only access to pool state for pre-add eviction checks.
+ * Passed to pre-add rules during the addTxs transaction.
+ */
+export interface PreAddPoolAccess {
+    /**
+     * Get the pending tx hash that uses a specific nullifier, if any.
+     * Returns undefined if no pending tx uses this nullifier.
+     */
+    getTxHashByNullifier(nullifier: Fr): Promise<TxHash | undefined>;
+    /**
+     * Get a pending transaction by its hash.
+     */
+    getPendingTxByHash(hash: TxHash): Promise<Tx | undefined>;
+    /**
+     * Get the priority string for a transaction (for fee comparison).
+     */
+    getTxPriority(tx: Tx): string;
+}
+/**
+ * Result of a pre-add eviction check for a single transaction.
+ */
+export interface PreAddEvictionResult {
+    /** Whether the incoming tx should be rejected */
+    readonly shouldReject: boolean;
+    /** Sorted array of existing tx hashes that should be evicted if this tx is added */
+    readonly txHashesToEvict: TxHash[];
+    /** Optional reason for rejection */
+    readonly reason?: string;
+}
+/**
+ * Strategy interface for pre-add eviction rules.
+ * These run inside the addTxs transaction before a tx is added,
+ * deciding whether to evict existing txs or reject the incoming tx.
+ */
+export interface PreAddEvictionRule {
+    readonly name: string;
+    /**
+     * Check if incoming tx should be added and which existing txs to evict.
+     * Called inside the addTxs database transaction for atomicity.
+     *
+     * @param tx - The incoming transaction to check
+     * @param poolAccess - Read-only access to current pool state
+     * @returns Result indicating whether to reject and what to evict
+     */
+    check(tx: Tx, poolAccess: PreAddPoolAccess): Promise<PreAddEvictionResult>;
+    /**
+     * Updates the configuration for this rule.
+     * Rules should ignore config options that don't apply to them.
+     */
+    updateConfig?(config: TxPoolOptions): void;
+}
 export {};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXZpY3Rpb25fc3RyYXRlZ3kuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9tZW1fcG9vbHMvdHhfcG9vbC9ldmljdGlvbi9ldmljdGlvbl9zdHJhdGVneS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLEVBQUUsRUFBRSxNQUFNLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUVoRSxPQUFPLEtBQUssRUFBRSxhQUFhLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFFbkQsZUFBTyxNQUFNLGFBQWE7Ozs7Q0FJaEIsQ0FBQztBQUVYLEtBQUssYUFBYSxHQUFHLENBQUMsT0FBTyxhQUFhLENBQUMsQ0FBQyxNQUFNLE9BQU8sYUFBYSxDQUFDLENBQUM7QUFFeEUsTUFBTSxNQUFNLGVBQWUsR0FDdkI7SUFDRSxLQUFLLEVBQUUsT0FBTyxhQUFhLENBQUMsU0FBUyxDQUFDO0lBQ3RDLE1BQU0sRUFBRSxNQUFNLEVBQUUsQ0FBQztDQUNsQixHQUNEO0lBQ0UsS0FBSyxFQUFFLE9BQU8sYUFBYSxDQUFDLFlBQVksQ0FBQztJQUN6QyxXQUFXLEVBQUUsTUFBTSxDQUFDO0NBQ3JCLEdBQ0Q7SUFDRSxLQUFLLEVBQUUsT0FBTyxhQUFhLENBQUMsV0FBVyxDQUFDO0lBQ3hDLEtBQUssRUFBRSxXQUFXLENBQUM7SUFDbkIsYUFBYSxFQUFFLEVBQUUsRUFBRSxDQUFDO0lBQ3BCLGNBQWMsRUFBRSxZQUFZLEVBQUUsQ0FBQztDQUNoQyxDQUFDO0FBRU47O0dBRUc7QUFDSCxNQUFNLFdBQVcsY0FBYztJQUM3QixRQUFRLENBQUMsVUFBVSxFQUFFLE1BQU0sRUFBRSxDQUFDO0lBQzlCLFFBQVEsQ0FBQyxNQUFNLEVBQUUsTUFBTSxDQUFDO0lBQ3hCLFFBQVEsQ0FBQyxPQUFPLEVBQUUsT0FBTyxDQUFDO0lBQzFCLFFBQVEsQ0FBQyxLQUFLLENBQUMsRUFBRSxLQUFLLENBQUM7Q0FDeEI7QUFFRDs7R0FFRztBQUNILE1BQU0sV0FBVyxhQUFhO0lBQzVCLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFDZixTQUFTLEVBQUUsRUFBRSxDQUFDO0lBQ2QsV0FBVyxFQUFFLE9BQU8sQ0FBQztDQUN0QjtBQUVEOztHQUVHO0FBQ0gsTUFBTSxXQUFXLGdCQUFnQjtJQUMvQixNQUFNLEVBQUUsTUFBTSxDQUFDO0lBQ2YsU0FBUyxFQUFFLEVBQUUsQ0FBQztJQUNkLFdBQVcsRUFBRSxPQUFPLENBQUM7Q0FDdEI7QUFFRDs7R0FFRztBQUNILE1BQU0sV0FBVyxnQkFBZ0I7SUFDL0IsV0FBVyxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLEVBQUUsR0FBRyxTQUFTLENBQUMsQ0FBQztJQUNyRCxpQkFBaUIsSUFBSSxPQUFPLENBQUMsYUFBYSxFQUFFLENBQUMsQ0FBQztJQUM5Qyw4QkFBOEIsQ0FBQyxXQUFXLEVBQUUsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLGdCQUFnQixFQUFFLENBQUMsQ0FBQztJQUMvRSx5QkFBeUIsQ0FBQyxRQUFRLEVBQUUsWUFBWSxFQUFFLEdBQUcsT0FBTyxDQUFDLGFBQWEsRUFBRSxDQUFDLENBQUM7SUFDOUUsbURBQW1EO0lBQ25ELGlCQUFpQixJQUFJLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUNyQzs7O09BR0c7SUFDSCwwQkFBMEIsQ0FBQyxLQUFLLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQUFDO0lBQzdELFNBQVMsQ0FBQyxRQUFRLEVBQUUsTUFBTSxFQUFFLEVBQUUsSUFBSSxDQUFDLEVBQUU7UUFBRSxXQUFXLENBQUMsRUFBRSxPQUFPLENBQUE7S0FBRSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztDQUNoRjtBQUVEOztHQUVHO0FBQ0gsTUFBTSxXQUFXLFlBQVk7SUFDM0IsUUFBUSxDQUFDLElBQUksRUFBRSxNQUFNLENBQUM7SUFFdEI7O09BRUc7SUFDSCxLQUFLLENBQUMsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLEVBQUUsZ0JBQWdCLEdBQUcsT0FBTyxDQUFDLGNBQWMsQ0FBQyxDQUFDO0lBRW5GOzs7T0FHRztJQUNILFlBQVksQ0FBQyxNQUFNLEVBQUUsYUFBYSxHQUFHLElBQUksQ0FBQztDQUMzQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXZpY3Rpb25fc3RyYXRlZ3kuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9tZW1fcG9vbHMvdHhfcG9vbC9ldmljdGlvbi9ldmljdGlvbl9zdHJhdGVneS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUVuRSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFFcEQsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDaEUsT0FBTyxFQUFFLEtBQUssV0FBVyxFQUFFLEtBQUssRUFBRSxFQUFFLE1BQU0sRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBSXJFLE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUVuRCxlQUFPLE1BQU0sYUFBYTs7OztDQUloQixDQUFDO0FBRVgsS0FBSyxhQUFhLEdBQUcsQ0FBQyxPQUFPLGFBQWEsQ0FBQyxDQUFDLE1BQU0sT0FBTyxhQUFhLENBQUMsQ0FBQztBQUV4RSxNQUFNLE1BQU0sZUFBZSxHQUN2QjtJQUNFLEtBQUssRUFBRSxPQUFPLGFBQWEsQ0FBQyxTQUFTLENBQUM7SUFDdEMsTUFBTSxFQUFFLE1BQU0sRUFBRSxDQUFDO0lBQ2pCLFNBQVMsRUFBRSxZQUFZLEVBQUUsQ0FBQztDQUMzQixHQUNEO0lBQ0UsS0FBSyxFQUFFLE9BQU8sYUFBYSxDQUFDLFlBQVksQ0FBQztJQUN6QyxXQUFXLEVBQUUsV0FBVyxDQUFDO0NBQzFCLEdBQ0Q7SUFDRSxLQUFLLEVBQUUsT0FBTyxhQUFhLENBQUMsV0FBVyxDQUFDO0lBQ3hDLEtBQUssRUFBRSxXQUFXLENBQUM7SUFDbkIsYUFBYSxFQUFFLEVBQUUsRUFBRSxDQUFDO0lBQ3BCLFNBQVMsRUFBRSxZQUFZLEVBQUUsQ0FBQztDQUMzQixDQUFDO0FBRU47O0dBRUc7QUFDSCxNQUFN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

package/dest/mem_pools/tx_pool/eviction/eviction_strategy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"eviction_strategy.d.ts","sourceRoot":"","sources":["../../../../src/mem_pools/tx_pool/eviction/eviction_strategy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAEhE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAEnD,eAAO,MAAM,aAAa;;;;CAIhB,CAAC;AAEX,KAAK,aAAa,GAAG,CAAC,OAAO,aAAa,CAAC,CAAC,MAAM,OAAO,aAAa,CAAC,CAAC;AAExE,MAAM,MAAM,eAAe,GACvB;IACE,KAAK,EAAE,OAAO,aAAa,CAAC,SAAS,CAAC;IACtC,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB,GACD;IACE,KAAK,EAAE,OAAO,aAAa,CAAC,YAAY,CAAC;IACzC,WAAW,EAAE,MAAM,CAAC;CACrB,GACD;IACE,KAAK,EAAE,OAAO,aAAa,CAAC,WAAW,CAAC;IACxC,KAAK,EAAE,WAAW,CAAC;IACnB,aAAa,EAAE,EAAE,EAAE,CAAC;IACpB,cAAc,EAAE,YAAY,EAAE,CAAC;CAChC,CAAC;AAEN;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC;CACxB;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,EAAE,CAAC;IACd,WAAW,EAAE,OAAO,CAAC;CACtB;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,EAAE,CAAC;IACd,WAAW,EAAE,OAAO,CAAC;CACtB;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC,CAAC;IACrD,iBAAiB,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC;IAC9C,8BAA8B,CAAC,WAAW,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;IAC/E,yBAAyB,CAAC,QAAQ,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC;IAC9E,mDAAmD;IACnD,iBAAiB,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IACrC;;;OAGG;IACH,0BAA0B,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAC7D,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,IAAI,CAAC,EAAE;QAAE,WAAW,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAChF;AAED;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAEtB;;OAEG;IACH,KAAK,CAAC,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IAEnF;;;OAGG;IACH,YAAY,CAAC,MAAM,EAAE,aAAa,GAAG,IAAI,CAAC;CAC3C"}
+{"version":3,"file":"eviction_strategy.d.ts","sourceRoot":"","sources":["../../../../src/mem_pools/tx_pool/eviction/eviction_strategy.ts"],"names":[],"mappings":"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"}

package/dest/mem_pools/tx_pool/eviction/eviction_strategy.js

@@ -1,5 +1,52 @@
+import { Buffer32 } from '@aztec/foundation/buffer';
+import { ProtocolContractAddress } from '@aztec/protocol-contracts';
+import { TxHash } from '@aztec/stdlib/tx';
+import { getFeePayerBalanceDelta } from '../../../msg_validators/tx_validator/fee_payer_balance.js';
+import { getTxPriorityFee } from '../priority.js';
 export const EvictionEvent = {
     TXS_ADDED: 'txs_added',
     BLOCK_MINED: 'block_mined',
     CHAIN_PRUNED: 'chain_pruned'
 };
+/**
+ * Balance-related information about a transaction for a fee payer.
+ */ export class FeePayerTxInfo {
+    txHash;
+    priority;
+    feeLimit;
+    claimAmount;
+    isEvictable;
+    constructor(fields){
+        this.txHash = fields.txHash;
+        this.priority = fields.priority;
+        this.feeLimit = fields.feeLimit;
+        this.claimAmount = fields.claimAmount;
+        this.isEvictable = fields.isEvictable;
+    }
+    static async encode(tx, txHash) {
+        const { feeLimit, claimAmount } = await getFeePayerBalanceDelta(tx, ProtocolContractAddress.FeeJuice);
+        const priority = Buffer32.fromBigInt(getTxPriorityFee(tx)).toBuffer();
+        const hashBuffer = (typeof txHash === 'string' ? TxHash.fromString(txHash) : txHash).toBuffer();
+        const feeLimitBuffer = Buffer32.fromBigInt(feeLimit).toBuffer();
+        const claimAmountBuffer = Buffer32.fromBigInt(claimAmount).toBuffer();
+        return Buffer.concat([
+            priority,
+            hashBuffer,
+            feeLimitBuffer,
+            claimAmountBuffer
+        ]);
+    }
+    static decode(value, isEvictable = true) {
+        const priority = Buffer32.fromBuffer(value.subarray(0, Buffer32.SIZE)).toBigInt();
+        const hashOffset = Buffer32.SIZE;
+        const feeLimitOffset = hashOffset + TxHash.SIZE;
+        const claimOffset = feeLimitOffset + Buffer32.SIZE;
+        return new FeePayerTxInfo({
+            txHash: TxHash.fromBuffer(value.subarray(hashOffset, feeLimitOffset)),
+            priority,
+            feeLimit: Buffer32.fromBuffer(value.subarray(feeLimitOffset, claimOffset)).toBigInt(),
+            claimAmount: Buffer32.fromBuffer(value.subarray(claimOffset, claimOffset + Buffer32.SIZE)).toBigInt(),
+            isEvictable
+        });
+    }
+}