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

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

@@ -0,0 +1,78 @@
+import { findIndexInSortedArray, insertIntoSortedArray } from '@aztec/foundation/array';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { createLogger } from '@aztec/foundation/log';
+import { MerkleTreeId } from '@aztec/stdlib/trees';
+import { EvictionEvent } from './eviction_strategy.js';
+/**
+ * Eviction rule that removes invalid transactions after a blockchain reorganization.
+ * Only triggers on CHAIN_PRUNED events.
+ *
+ * Eviction criteria includes:
+ * - Transactions that reference pruned block hashes (invalid by definition)
+ */ export class InvalidTxsAfterReorgRule {
+    worldState;
+    name;
+    log;
+    constructor(worldState){
+        this.worldState = worldState;
+        this.name = 'InvalidTxsAfterReorg';
+        this.log = createLogger('p2p:mempool:tx_pool:invalid_txs_after_reorg_rule');
+    }
+    async evict(context, txPool) {
+        if (context.event !== EvictionEvent.CHAIN_PRUNED) {
+            return {
+                reason: 'reorg_invalid_txs',
+                success: true,
+                txsEvicted: []
+            };
+        }
+        try {
+            const candidateTxs = (await txPool.getPendingTxInfos()).filter(({ isEvictable })=>isEvictable);
+            // Deduplicate block hashes to reduce redundant DB lookups (many txs may share the same blockHash).
+            const uniqueBlockHashes = [];
+            candidateTxs.forEach(({ blockHash })=>{
+                insertIntoSortedArray(uniqueBlockHashes, blockHash, Fr.cmp, false);
+            });
+            // Ensure world state is synced to this block before accessing the snapshot.
+            await this.worldState.syncImmediate(context.blockNumber);
+            const db = this.worldState.getSnapshot(context.blockNumber);
+            const blocksFromDb = await db.findLeafIndices(MerkleTreeId.ARCHIVE, uniqueBlockHashes);
+            // Identify txs whose blockHash is not found in the archive (pruned)
+            const txsToEvict = [];
+            for (const tx of candidateTxs){
+                const idx = findIndexInSortedArray(uniqueBlockHashes, tx.blockHash, Fr.cmp);
+                const blockPruned = idx === -1 || blocksFromDb[idx] === undefined;
+                if (blockPruned) {
+                    txsToEvict.push(tx.txHash);
+                }
+            }
+            if (txsToEvict.length > 0) {
+                this.log.verbose(`Evicting ${txsToEvict.length} txs from pool due to referencing pruned blocks`);
+                await txPool.deleteTxs(txsToEvict);
+            }
+            const keptCount = candidateTxs.length - txsToEvict.length;
+            if (keptCount > 0) {
+                this.log.verbose(`Kept ${keptCount} txs that did not reference pruned blocks`);
+            }
+            this.log.debug(`Evicted ${txsToEvict.length} invalid txs after reorg`);
+            return {
+                reason: 'reorg_invalid_txs',
+                success: true,
+                txsEvicted: txsToEvict
+            };
+        } catch (err) {
+            this.log.error('Failed to evict invalid transactions after reorg', {
+                err
+            });
+            return {
+                reason: 'reorg_invalid_txs',
+                success: false,
+                txsEvicted: [],
+                error: new Error('Failed to evict invalid txs after reorg', {
+                    cause: err
+                })
+            };
+        }
+    }
+    updateConfig(_config) {}
+}

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

@@ -0,0 +1,26 @@
+import type { TxPoolOptions } from '../tx_pool.js';
+import { type EvictionContext, type EvictionResult, type EvictionRule, type TxPoolOperations } from './eviction_strategy.js';
+export interface LowPriorityEvictionConfig {
+    /** Maximum number of pending transactions before eviction kicks in */
+    maxPoolSize: number;
+}
+/**
+ * Eviction rule that removes low-priority transactions when the number of pending transactions exceeds configured limits.
+ * Only triggers on TXS_ADDED events and respects non-evictable transactions.
+ */
+export declare class LowPriorityEvictionRule implements EvictionRule {
+    private config;
+    readonly name = "LowPriorityEviction";
+    private log;
+    constructor(config: LowPriorityEvictionConfig);
+    evict(context: EvictionContext, txPool: TxPoolOperations): Promise<EvictionResult>;
+    /**
+     * Updates the configuration for this eviction rule
+     */
+    updateConfig(config: TxPoolOptions): void;
+    /**
+     * Gets the current configuration
+     */
+    getConfig(): LowPriorityEvictionConfig;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG93X3ByaW9yaXR5X2V2aWN0aW9uX3J1bGUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9tZW1fcG9vbHMvdHhfcG9vbC9ldmljdGlvbi9sb3dfcHJpb3JpdHlfZXZpY3Rpb25fcnVsZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFHQSxPQUFPLEtBQUssRUFBRSxhQUFhLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDbkQsT0FBTyxFQUNMLEtBQUssZUFBZSxFQUVwQixLQUFLLGNBQWMsRUFDbkIsS0FBSyxZQUFZLEVBQ2pCLEtBQUssZ0JBQWdCLEVBQ3RCLE1BQU0sd0JBQXdCLENBQUM7QUFFaEMsTUFBTSxXQUFXLHlCQUF5QjtJQUN4QyxzRUFBc0U7SUFDdEUsV0FBVyxFQUFFLE1BQU0sQ0FBQztDQUNyQjtBQUVEOzs7R0FHRztBQUNILHFCQUFhLHVCQUF3QixZQUFXLFlBQVk7SUFLOUMsT0FBTyxDQUFDLE1BQU07SUFKMUIsU0FBZ0IsSUFBSSx5QkFBeUI7SUFFN0MsT0FBTyxDQUFDLEdBQUcsQ0FBa0U7SUFFN0UsWUFBb0IsTUFBTSxFQUFFLHlCQUF5QixFQUFJO0lBRTVDLEtBQUssQ0FBQyxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sRUFBRSxnQkFBZ0IsR0FBRyxPQUFPLENBQUMsY0FBYyxDQUFDLENBNEQ5RjtJQUVEOztPQUVHO0lBQ0gsWUFBWSxDQUFDLE1BQU0sRUFBRSxhQUFhLEdBQUcsSUFBSSxDQUl4QztJQUVEOztPQUVHO0lBQ0gsU0FBUyxJQUFJLHlCQUF5QixDQUVyQztDQUNGIn0=

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

@@ -0,0 +1 @@
+{"version":3,"file":"low_priority_eviction_rule.d.ts","sourceRoot":"","sources":["../../../../src/mem_pools/tx_pool/eviction/low_priority_eviction_rule.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EACL,KAAK,eAAe,EAEpB,KAAK,cAAc,EACnB,KAAK,YAAY,EACjB,KAAK,gBAAgB,EACtB,MAAM,wBAAwB,CAAC;AAEhC,MAAM,WAAW,yBAAyB;IACxC,sEAAsE;IACtE,WAAW,EAAE,MAAM,CAAC;CACrB;AAED;;;GAGG;AACH,qBAAa,uBAAwB,YAAW,YAAY;IAK9C,OAAO,CAAC,MAAM;IAJ1B,SAAgB,IAAI,yBAAyB;IAE7C,OAAO,CAAC,GAAG,CAAkE;IAE7E,YAAoB,MAAM,EAAE,yBAAyB,EAAI;IAE5C,KAAK,CAAC,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,cAAc,CAAC,CA4D9F;IAED;;OAEG;IACH,YAAY,CAAC,MAAM,EAAE,aAAa,GAAG,IAAI,CAIxC;IAED;;OAEG;IACH,SAAS,IAAI,yBAAyB,CAErC;CACF"}

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

@@ -0,0 +1,84 @@
+import { createLogger } from '@aztec/foundation/log';
+import { EvictionEvent } from './eviction_strategy.js';
+/**
+ * Eviction rule that removes low-priority transactions when the number of pending transactions exceeds configured limits.
+ * Only triggers on TXS_ADDED events and respects non-evictable transactions.
+ */ export class LowPriorityEvictionRule {
+    config;
+    name;
+    log;
+    constructor(config){
+        this.config = config;
+        this.name = 'LowPriorityEviction';
+        this.log = createLogger('p2p:mempool:tx_pool:low_priority_eviction_rule');
+    }
+    async evict(context, txPool) {
+        if (context.event !== EvictionEvent.TXS_ADDED) {
+            return {
+                reason: 'low_priority',
+                success: true,
+                txsEvicted: []
+            };
+        }
+        if (this.config.maxPoolSize === 0) {
+            return {
+                reason: 'low_priority',
+                success: true,
+                txsEvicted: []
+            };
+        }
+        try {
+            const currentTxCount = await txPool.getPendingTxCount();
+            const maxCount = this.config.maxPoolSize;
+            if (currentTxCount <= maxCount) {
+                this.log.trace(`Not evicting low priority txs. Pending tx count below limit ${currentTxCount} <= ${maxCount}`);
+                return {
+                    reason: 'low_priority',
+                    success: true,
+                    txsEvicted: []
+                };
+            }
+            this.log.verbose(`Evicting low priority txs. Pending tx count above limit: ${currentTxCount} > ${maxCount}`);
+            const numberToEvict = currentTxCount - maxCount;
+            const txsToEvict = await txPool.getLowestPriorityEvictable(numberToEvict);
+            if (txsToEvict.length > 0) {
+                await txPool.deleteTxs(txsToEvict);
+            }
+            const numNewTxsEvicted = context.newTxs.filter((newTxHash)=>txsToEvict.some((evictedTx)=>evictedTx.equals(newTxHash))).length;
+            this.log.verbose(`Evicted ${txsToEvict.length} low priority txs, including ${numNewTxsEvicted} newly added txs`, {
+                txsEvicted: txsToEvict
+            });
+            return {
+                reason: 'low_priority',
+                success: true,
+                txsEvicted: txsToEvict
+            };
+        } catch (err) {
+            this.log.error('Failed to evict low priority transactions', {
+                err
+            });
+            return {
+                reason: 'low_priority',
+                success: false,
+                txsEvicted: [],
+                error: new Error('Failed to evict low priority txs', {
+                    cause: err
+                })
+            };
+        }
+    }
+    /**
+   * Updates the configuration for this eviction rule
+   */ updateConfig(config) {
+        if (config.maxPendingTxCount !== undefined) {
+            this.config.maxPoolSize = config.maxPendingTxCount;
+        }
+    }
+    /**
+   * Gets the current configuration
+   */ getConfig() {
+        return {
+            ...this.config
+        };
+    }
+}

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

@@ -0,0 +1,25 @@
+import { type Tx } from '@aztec/stdlib/tx';
+import type { PreAddEvictionResult, PreAddEvictionRule, PreAddPoolAccess } from './eviction_strategy.js';
+/**
+ * Pre-add eviction rule that checks for nullifier conflicts between incoming and existing transactions.
+ *
+ * When an incoming tx shares nullifiers with existing pending txs:
+ * - If the incoming tx has strictly higher priority fee, evict all conflicting txs
+ * - If any conflicting tx has equal or higher priority fee, reject the incoming tx
+ *
+ * This prevents nullifier spam attacks where an attacker floods the mempool with
+ * transactions spending the same nullifiers.
+ */
+export declare class NullifierConflictPreAddRule implements PreAddEvictionRule {
+    readonly name = "NullifierConflictPreAdd";
+    private log;
+    /**
+     * Check if the incoming transaction conflicts with existing transactions via nullifiers.
+     *
+     * @param tx - The incoming transaction
+     * @param poolAccess - Read-only access to pool state
+     * @returns Result with rejection status and txs to evict
+     */
+    check(tx: Tx, poolAccess: PreAddPoolAccess): Promise<PreAddEvictionResult>;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnVsbGlmaWVyX2NvbmZsaWN0X3ByZV9hZGRfcnVsZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL21lbV9wb29scy90eF9wb29sL2V2aWN0aW9uL251bGxpZmllcl9jb25mbGljdF9wcmVfYWRkX3J1bGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBR0EsT0FBTyxFQUFFLEtBQUssRUFBRSxFQUFVLE1BQU0sa0JBQWtCLENBQUM7QUFFbkQsT0FBTyxLQUFLLEVBQUUsb0JBQW9CLEVBQUUsa0JBQWtCLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUl6Rzs7Ozs7Ozs7O0dBU0c7QUFDSCxxQkFBYSwyQkFBNEIsWUFBVyxrQkFBa0I7SUFDcEUsU0FBZ0IsSUFBSSw2QkFBNkI7SUFFakQsT0FBTyxDQUFDLEdBQUcsQ0FBdUU7SUFFbEY7Ozs7OztPQU1HO0lBQ0csS0FBSyxDQUFDLEVBQUUsRUFBRSxFQUFFLEVBQUUsVUFBVSxFQUFFLGdCQUFnQixHQUFHLE9BQU8sQ0FBQyxvQkFBb0IsQ0FBQyxDQTBDL0U7Q0FDRiJ9

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

@@ -0,0 +1 @@
+{"version":3,"file":"nullifier_conflict_pre_add_rule.d.ts","sourceRoot":"","sources":["../../../../src/mem_pools/tx_pool/eviction/nullifier_conflict_pre_add_rule.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,EAAE,EAAU,MAAM,kBAAkB,CAAC;AAEnD,OAAO,KAAK,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAIzG;;;;;;;;;GASG;AACH,qBAAa,2BAA4B,YAAW,kBAAkB;IACpE,SAAgB,IAAI,6BAA6B;IAEjD,OAAO,CAAC,GAAG,CAAuE;IAElF;;;;;;OAMG;IACG,KAAK,CAAC,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,gBAAgB,GAAG,OAAO,CAAC,oBAAoB,CAAC,CA0C/E;CACF"}

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

@@ -0,0 +1,57 @@
+import { findIndexInSortedArray, insertIntoSortedArray } from '@aztec/foundation/array';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { createLogger } from '@aztec/foundation/log';
+const cmpTxHash = (a, b)=>Fr.cmp(a.hash, b.hash);
+/**
+ * Pre-add eviction rule that checks for nullifier conflicts between incoming and existing transactions.
+ *
+ * When an incoming tx shares nullifiers with existing pending txs:
+ * - If the incoming tx has strictly higher priority fee, evict all conflicting txs
+ * - If any conflicting tx has equal or higher priority fee, reject the incoming tx
+ *
+ * This prevents nullifier spam attacks where an attacker floods the mempool with
+ * transactions spending the same nullifiers.
+ */ export class NullifierConflictPreAddRule {
+    name = 'NullifierConflictPreAdd';
+    log = createLogger('p2p:mempool:tx_pool:nullifier_conflict_pre_add_rule');
+    /**
+   * Check if the incoming transaction conflicts with existing transactions via nullifiers.
+   *
+   * @param tx - The incoming transaction
+   * @param poolAccess - Read-only access to pool state
+   * @returns Result with rejection status and txs to evict
+   */ async check(tx, poolAccess) {
+        const txHash = tx.getTxHash();
+        const nullifiers = tx.data.getNonEmptyNullifiers();
+        const txHashesToEvict = [];
+        const incomingPriority = poolAccess.getTxPriority(tx);
+        for (const nullifier of nullifiers){
+            const conflictingHash = await poolAccess.getTxHashByNullifier(nullifier);
+            if (!conflictingHash || conflictingHash.equals(txHash) || findIndexInSortedArray(txHashesToEvict, conflictingHash, cmpTxHash) !== -1) {
+                continue;
+            }
+            // Get the conflicting tx's priority
+            const conflictingTx = await poolAccess.getPendingTxByHash(conflictingHash);
+            if (!conflictingTx) {
+                continue;
+            }
+            const conflictingPriority = poolAccess.getTxPriority(conflictingTx);
+            // If incoming tx has strictly higher priority, mark for eviction
+            // Otherwise, reject incoming tx (ties go to existing tx)
+            if (incomingPriority > conflictingPriority) {
+                insertIntoSortedArray(txHashesToEvict, conflictingHash, cmpTxHash);
+            } else {
+                this.log.debug(`Rejecting tx ${txHash.toString()}: nullifier conflict with ${conflictingHash.toString()} which has higher or equal fee`);
+                return {
+                    shouldReject: true,
+                    txHashesToEvict: [],
+                    reason: `nullifier conflict with ${conflictingHash.toString()}`
+                };
+            }
+        }
+        return {
+            shouldReject: false,
+            txHashesToEvict
+        };
+    }
+}

package/dest/mem_pools/tx_pool/index.d.ts

@@ -1,4 +1,3 @@
 export * from './tx_pool.js';
-export * from './memory_tx_pool.js';
 export * from './aztec_kv_tx_pool.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9tZW1fcG9vbHMvdHhfcG9vbC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLGNBQWMsQ0FBQztBQUM3QixjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMsdUJBQXVCLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9tZW1fcG9vbHMvdHhfcG9vbC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLGNBQWMsQ0FBQztBQUM3QixjQUFjLHVCQUF1QixDQUFDIn0=

package/dest/mem_pools/tx_pool/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/tx_pool/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,qBAAqB,CAAC;AACpC,cAAc,uBAAuB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/tx_pool/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,uBAAuB,CAAC"}

package/dest/mem_pools/tx_pool/index.js

@@ -1,3 +1,2 @@
 export * from './tx_pool.js';
-export * from './memory_tx_pool.js';
 export * from './aztec_kv_tx_pool.js';

package/dest/mem_pools/tx_pool/priority.d.ts

@@ -5,4 +5,8 @@ import type { Tx } from '@aztec/stdlib/tx';
  * We currently use the sum of the priority fees for the tx for this value, represented as hex.
  */
 export declare function getPendingTxPriority(tx: Tx): string;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpb3JpdHkuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9tZW1fcG9vbHMvdHhfcG9vbC9wcmlvcml0eS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUUzQzs7OztHQUlHO0FBQ0gsd0JBQWdCLG9CQUFvQixDQUFDLEVBQUUsRUFBRSxFQUFFLEdBQUcsTUFBTSxDQUluRCJ9
+/**
+ * Returns the priority of a tx.
+ */
+export declare function getTxPriorityFee(tx: Tx): bigint;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpb3JpdHkuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9tZW1fcG9vbHMvdHhfcG9vbC9wcmlvcml0eS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUUzQzs7OztHQUlHO0FBQ0gsd0JBQWdCLG9CQUFvQixDQUFDLEVBQUUsRUFBRSxFQUFFLEdBQUcsTUFBTSxDQUVuRDtBQUVEOztHQUVHO0FBQ0gsd0JBQWdCLGdCQUFnQixDQUFDLEVBQUUsRUFBRSxFQUFFLEdBQUcsTUFBTSxDQUkvQyJ9

package/dest/mem_pools/tx_pool/priority.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"priority.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/tx_pool/priority.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAE3C;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,EAAE,EAAE,EAAE,GAAG,MAAM,CAInD"}
+{"version":3,"file":"priority.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/tx_pool/priority.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAE3C;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,EAAE,EAAE,EAAE,GAAG,MAAM,CAEnD;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,EAAE,GAAG,MAAM,CAI/C"}

package/dest/mem_pools/tx_pool/priority.js

@@ -4,7 +4,12 @@ import { Buffer32 } from '@aztec/foundation/buffer';
  * Txs with a higher priority value are returned first when retrieving pending tx hashes.
  * We currently use the sum of the priority fees for the tx for this value, represented as hex.
  */ export function getPendingTxPriority(tx) {
+    return Buffer32.fromBigInt(getTxPriorityFee(tx)).toString();
+}
+/**
+ * Returns the priority of a tx.
+ */ export function getTxPriorityFee(tx) {
     const priorityFees = tx.getGasSettings().maxPriorityFeesPerGas;
     const totalFees = priorityFees.feePerDaGas + priorityFees.feePerL2Gas;
-    return Buffer32.fromBigInt(totalFees).toString();
+    return totalFees;
 }

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

@@ -1,8 +1,8 @@
+import type { BlockNumber } from '@aztec/foundation/branded-types';
 import type { TypedEventEmitter } from '@aztec/foundation/types';
 import type { BlockHeader, Tx, TxHash } from '@aztec/stdlib/tx';
 export type TxPoolOptions = {
-    maxTxPoolSize?: number;
-    txPoolOverflowFactor?: number;
+    maxPendingTxCount?: number;
     archivedTxLimit?: number;
 };
 export type TxPoolEvents = {
@@ -63,8 +63,9 @@ export interface TxPool extends TypedEventEmitter<TxPoolEvents> {
      * Moves mined txs back to the pending set in the case of a reorg.
      * Note: txs not known by this peer will be ignored.
      * @param txHashes - Hashes of the txs to flag as pending.
+     * @param latestBlock - The block number the chain was pruned to.
      */
-    markMinedAsPending(txHashes: TxHash[]): Promise<void>;
+    markMinedAsPending(txHashes: TxHash[], latestBlock: BlockNumber): Promise<void>;
     /**
      * Deletes transactions from the pool. Tx hashes that are not present are ignored.
      * @param txHashes - An array of tx hashes to be removed from the tx pool.
@@ -93,7 +94,7 @@ export interface TxPool extends TypedEventEmitter<TxPoolEvents> {
      * Gets the hashes of mined transactions currently in the tx pool.
      * @returns An array of mined transaction hashes found in the tx pool.
      */
-    getMinedTxHashes(): Promise<[tx: TxHash, blockNumber: number][]>;
+    getMinedTxHashes(): Promise<[tx: TxHash, blockNumber: BlockNumber][]>;
     /**
      * Returns whether the given tx hash is flagged as pending, mined, or deleted.
      * @param txHash - Hash of the tx to query.
@@ -112,11 +113,15 @@ export interface TxPool extends TypedEventEmitter<TxPoolEvents> {
      * @param txHashes - Hashes of the transactions to mark as non-evictible.
      */
     markTxsAsNonEvictable(txHashes: TxHash[]): Promise<void>;
+    /**
+     * Clears collection of non-evictable transactions in the pool
+     */
+    clearNonEvictableTxs(): Promise<void>;
     /**
      * 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.
      */
-    cleanupDeletedMinedTxs(blockNumber: number): Promise<number>;
+    cleanupDeletedMinedTxs(blockNumber: BlockNumber): Promise<number>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfcG9vbC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21lbV9wb29scy90eF9wb29sL3R4X3Bvb2wudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUNqRSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsRUFBRSxFQUFFLE1BQU0sRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRWhFLE1BQU0sTUFBTSxhQUFhLEdBQUc7SUFDMUIsYUFBYSxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ3ZCLG9CQUFvQixDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQzlCLGVBQWUsQ0FBQyxFQUFFLE1BQU0sQ0FBQztDQUMxQixDQUFDO0FBRUYsTUFBTSxNQUFNLFlBQVksR0FBRztJQUN6QixDQUFDLFdBQVcsQ0FBQyxFQUFFLENBQUMsSUFBSSxFQUFFO1FBQUUsR0FBRyxFQUFFLEVBQUUsRUFBRSxDQUFDO1FBQUMsTUFBTSxDQUFDLEVBQUUsTUFBTSxDQUFBO0tBQUUsS0FBSyxJQUFJLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO0NBQy9FLENBQUM7QUFFRjs7R0FFRztBQUNILE1BQU0sV0FBVyxNQUFPLFNBQVEsaUJBQWlCLENBQUMsWUFBWSxDQUFDO0lBQzdEOzs7O09BSUc7SUFDSCxNQUFNLENBQUMsR0FBRyxFQUFFLEVBQUUsRUFBRSxFQUFFLElBQUksQ0FBQyxFQUFFO1FBQUUsTUFBTSxDQUFDLEVBQUUsTUFBTSxDQUFBO0tBQUUsR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUM7SUFFL0Q7Ozs7T0FJRztJQUNILFdBQVcsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxFQUFFLEdBQUcsU0FBUyxDQUFDLENBQUM7SUFFckQ7Ozs7T0FJRztJQUNILFlBQVksQ0FBQyxRQUFRLEVBQUUsTUFBTSxFQUFFLEdBQUcsT0FBTyxDQUFDLENBQUMsRUFBRSxHQUFHLFNBQVMsQ0FBQyxFQUFFLENBQUMsQ0FBQztJQUU5RDs7OztPQUlHO0lBQ0gsTUFBTSxDQUFDLFFBQVEsRUFBRSxNQUFNLEVBQUUsR0FBRyxPQUFPLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FBQztJQUUvQzs7OztPQUlHO0lBQ0gsS0FBSyxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBRXhDOzs7O09BSUc7SUFDSCxtQkFBbUIsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxFQUFFLEdBQUcsU0FBUyxDQUFDLENBQUM7SUFFN0Q7Ozs7T0FJRztJQUNILFdBQVcsQ0FBQyxRQUFRLEVBQUUsTUFBTSxFQUFFLEVBQUUsV0FBVyxFQUFFLFdBQVcsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7SUFFekU7Ozs7T0FJRztJQUNILGtCQUFrQixDQUFDLFFBQVEsRUFBRSxNQUFNLEVBQUUsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7SUFFdEQ7OztPQUdHO0lBQ0gsU0FBUyxDQUFDLFFBQVEsRUFBRSxNQUFNLEVBQUUsRUFBRSxJQUFJLENBQUMsRUFBRTtRQUFFLFdBQVcsQ0FBQyxFQUFFLE9BQU8sQ0FBQTtLQUFFLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBRS9FOzs7T0FHRztJQUNILFNBQVMsSUFBSSxPQUFPLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQztJQUUzQjs7O09BR0c7SUFDSCxjQUFjLElBQUksT0FBTyxDQUFDLE1BQU0sRUFBRSxDQUFDLENBQUM7SUFFcEM7OztPQUdHO0lBQ0gsa0JBQWtCLElBQUksT0FBTyxDQUFDLE1BQU0sRUFBRSxDQUFDLENBQUM7SUFFeEMscURBQXFEO0lBQ3JELGlCQUFpQixJQUFJLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUVyQzs7O09BR0c7SUFDSCxnQkFBZ0IsSUFBSSxPQUFPLENBQUMsQ0FBQyxFQUFFLEVBQUUsTUFBTSxFQUFFLFdBQVcsRUFBRSxNQUFNLENBQUMsRUFBRSxDQUFDLENBQUM7SUFFakU7Ozs7T0FJRztJQUNILFdBQVcsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxTQUFTLEdBQUcsT0FBTyxHQUFHLFNBQVMsR0FBRyxTQUFTLENBQUMsQ0FBQztJQUVsRjs7O09BR0c7SUFDSCxZQUFZLENBQUMsTUFBTSxFQUFFLGFBQWEsR0FBRyxJQUFJLENBQUM7SUFFMUMseUNBQXlDO0lBQ3pDLE9BQU8sSUFBSSxPQUFPLENBQUMsT0FBTyxDQUFDLENBQUM7SUFFNUI7OztPQUdHO0lBQ0gscUJBQXFCLENBQUMsUUFBUSxFQUFFLE1BQU0sRUFBRSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUV6RDs7OztPQUlHO0lBQ0gsc0JBQXNCLENBQUMsV0FBVyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUM7Q0FDOUQifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfcG9vbC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21lbV9wb29scy90eF9wb29sL3R4X3Bvb2wudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDbkUsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUNqRSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsRUFBRSxFQUFFLE1BQU0sRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRWhFLE1BQU0sTUFBTSxhQUFhLEdBQUc7SUFDMUIsaUJBQWlCLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDM0IsZUFBZSxDQUFDLEVBQUUsTUFBTSxDQUFDO0NBQzFCLENBQUM7QUFFRixNQUFNLE1BQU0sWUFBWSxHQUFHO0lBQ3pCLENBQUMsV0FBVyxDQUFDLEVBQUUsQ0FBQyxJQUFJLEVBQUU7UUFBRSxHQUFHLEVBQUUsRUFBRSxFQUFFLENBQUM7UUFBQyxNQUFNLENBQUMsRUFBRSxNQUFNLENBQUE7S0FBRSxLQUFLLElBQUksR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7Q0FDL0UsQ0FBQztBQUVGOztHQUVHO0FBQ0gsTUFBTSxXQUFXLE1BQU8sU0FBUSxpQkFBaUIsQ0FBQyxZQUFZLENBQUM7SUFDN0Q7Ozs7T0FJRztJQUNILE1BQU0sQ0FBQyxHQUFHLEVBQUUsRUFBRSxFQUFFLEVBQUUsSUFBSSxDQUFDLEVBQUU7UUFBRSxNQUFNLENBQUMsRUFBRSxNQUFNLENBQUE7S0FBRSxHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUUvRDs7OztPQUlHO0lBQ0gsV0FBVyxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLEVBQUUsR0FBRyxTQUFTLENBQUMsQ0FBQztJQUVyRDs7OztPQUlHO0lBQ0gsWUFBWSxDQUFDLFFBQVEsRUFBRSxNQUFNLEVBQUUsR0FBRyxPQUFPLENBQUMsQ0FBQyxFQUFFLEdBQUcsU0FBUyxDQUFDLEVBQUUsQ0FBQyxDQUFDO0lBRTlEOzs7O09BSUc7SUFDSCxNQUFNLENBQUMsUUFBUSxFQUFFLE1BQU0sRUFBRSxHQUFHLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFDO0lBRS9DOzs7O09BSUc7SUFDSCxLQUFLLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBQUM7SUFFeEM7Ozs7T0FJRztJQUNILG1CQUFtQixDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLEVBQUUsR0FBRyxTQUFTLENBQUMsQ0FBQztJQUU3RDs7OztPQUlHO0lBQ0gsV0FBVyxDQUFDLFFBQVEsRUFBRSxNQUFNLEVBQUUsRUFBRSxXQUFXLEVBQUUsV0FBVyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUV6RTs7Ozs7T0FLRztJQUNILGtCQUFrQixDQUFDLFFBQVEsRUFBRSxNQUFNLEVBQUUsRUFBRSxXQUFXLEVBQUUsV0FBVyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUVoRjs7O09BR0c7SUFDSCxTQUFTLENBQUMsUUFBUSxFQUFFLE1BQU0sRUFBRSxFQUFFLElBQUksQ0FBQyxFQUFFO1FBQUUsV0FBVyxDQUFDLEVBQUUsT0FBTyxDQUFBO0tBQUUsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7SUFFL0U7OztPQUdHO0lBQ0gsU0FBUyxJQUFJLE9BQU8sQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDO0lBRTNCOzs7T0FHRztJQUNILGNBQWMsSUFBSSxPQUFPLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FBQztJQUVwQzs7O09BR0c7SUFDSCxrQkFBa0IsSUFBSSxPQUFPLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FBQztJQUV4QyxxREFBcUQ7SUFDckQsaUJBQWlCLElBQUksT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBRXJDOzs7T0FHRztJQUNILGdCQUFnQixJQUFJLE9BQU8sQ0FBQyxDQUFDLEVBQUUsRUFBRSxNQUFNLEVBQUUsV0FBVyxFQUFFLFdBQVcsQ0FBQyxFQUFFLENBQUMsQ0FBQztJQUV0RTs7OztPQUlHO0lBQ0gsV0FBVyxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLFNBQVMsR0FBRyxPQUFPLEdBQUcsU0FBUyxHQUFHLFNBQVMsQ0FBQyxDQUFDO0lBRWxGOzs7T0FHRztJQUNILFlBQVksQ0FBQyxNQUFNLEVBQUUsYUFBYSxHQUFHLElBQUksQ0FBQztJQUUxQyx5Q0FBeUM7SUFDekMsT0FBTyxJQUFJLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUU1Qjs7O09BR0c7SUFDSCxxQkFBcUIsQ0FBQyxRQUFRLEVBQUUsTUFBTSxFQUFFLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBRXpEOztPQUVHO0lBQ0gsb0JBQW9CLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBRXRDOzs7O09BSUc7SUFDSCxzQkFBc0IsQ0FBQyxXQUFXLEVBQUUsV0FBVyxHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQztDQUNuRSJ9

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

@@ -1 +1 @@
-{"version":3,"file":"tx_pool.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/tx_pool/tx_pool.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tx_pool.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/tx_pool/tx_pool.ts"],"names":[],"mappings":"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"}

package/dest/mem_pools/tx_pool/tx_pool_test_suite.d.ts

@@ -4,4 +4,4 @@ import type { TxPool } from './tx_pool.js';
  * @param getTxPool - Gets a fresh TxPool
  */
 export declare function describeTxPool(getTxPool: () => TxPool): void;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfcG9vbF90ZXN0X3N1aXRlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbWVtX3Bvb2xzL3R4X3Bvb2wvdHhfcG9vbF90ZXN0X3N1aXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUtBLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLGNBQWMsQ0FBQztBQUUzQzs7O0dBR0c7QUFDSCx3QkFBZ0IsY0FBYyxDQUFDLFNBQVMsRUFBRSxNQUFNLE1BQU0sUUE2U3JEIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfcG9vbF90ZXN0X3N1aXRlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbWVtX3Bvb2xzL3R4X3Bvb2wvdHhfcG9vbF90ZXN0X3N1aXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQU1BLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLGNBQWMsQ0FBQztBQUUzQzs7O0dBR0c7QUFDSCx3QkFBZ0IsY0FBYyxDQUFDLFNBQVMsRUFBRSxNQUFNLE1BQU0sUUFrVHJEIn0=

package/dest/mem_pools/tx_pool/tx_pool_test_suite.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tx_pool_test_suite.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/tx_pool/tx_pool_test_suite.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAE3C;;;GAGG;AACH,wBAAgB,cAAc,CAAC,SAAS,EAAE,MAAM,MAAM,QA6SrD"}
+{"version":3,"file":"tx_pool_test_suite.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/tx_pool/tx_pool_test_suite.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAE3C;;;GAGG;AACH,wBAAgB,cAAc,CAAC,SAAS,EAAE,MAAM,MAAM,QAkTrD"}

package/dest/mem_pools/tx_pool/tx_pool_test_suite.js

@@ -1,3 +1,4 @@
+import { BlockNumber } from '@aztec/foundation/branded-types';
 import { unfreeze } from '@aztec/foundation/types';
 import { GasFees } from '@aztec/stdlib/gas';
 import { mockTx } from '@aztec/stdlib/testing';
@@ -9,7 +10,7 @@ import { BlockHeader, GlobalVariables } from '@aztec/stdlib/tx';
     let pool;
     const minedBlockHeader = BlockHeader.empty({
         globalVariables: GlobalVariables.empty({
-            blockNumber: 1,
+            blockNumber: BlockNumber(1),
             timestamp: 0n
         })
     });
@@ -20,7 +21,7 @@ import { BlockHeader, GlobalVariables } from '@aztec/stdlib/tx';
         pool.removeAllListeners('txs-added');
     });
     it('adds txs to the pool as pending', async ()=>{
-        const tx1 = await mockTx();
+        const tx1 = await mockTx(1);
         await pool.addTxs([
             tx1
         ]);
@@ -33,9 +34,9 @@ import { BlockHeader, GlobalVariables } from '@aztec/stdlib/tx';
         await expect(pool.getPendingTxCount()).resolves.toEqual(1);
     });
     it('emits txs-added event with new txs', async ()=>{
-        const tx1 = await mockTx(); // existing and pending
-        const tx2 = await mockTx(); // mined but not known
-        const tx3 = await mockTx(); // brand new
+        const tx1 = await mockTx(1); // existing and pending
+        const tx2 = await mockTx(2); // mined but not known
+        const tx3 = await mockTx(3); // brand new
         await pool.addTxs([
             tx1
         ]);
@@ -53,12 +54,13 @@ import { BlockHeader, GlobalVariables } from '@aztec/stdlib/tx';
         ]);
         expect(txsFromEvent).toBeDefined();
         expect(txsFromEvent).toHaveLength(2);
-        expect(txsFromEvent).toEqual(expect.arrayContaining([
-            tx2,
-            tx3
+        const eventHashes = txsFromEvent.map((tx)=>tx.getTxHash());
+        expect(eventHashes).toEqual(expect.arrayContaining([
+            tx2.getTxHash(),
+            tx3.getTxHash()
         ]));
     });
-    it('permanently deletes pending txs and soft-deletes mined txs', async ()=>{
+    it('removes txs from the pool', async ()=>{
         const pendingTx = await mockTx(1);
         const minedTx = await mockTx(2);
         await pool.addTxs([
@@ -93,7 +95,8 @@ import { BlockHeader, GlobalVariables } from '@aztec/stdlib/tx';
         await pool.markAsMined([
             tx1.getTxHash()
         ], minedBlockHeader);
-        await expect(pool.getTxByHash(tx1.getTxHash())).resolves.toEqual(tx1);
+        const retrievedTx = await pool.getTxByHash(tx1.getTxHash());
+        expect(retrievedTx?.getTxHash()).toEqual(tx1.getTxHash());
         await expect(pool.getTxStatus(tx1.getTxHash())).resolves.toEqual('mined');
         await expect(pool.getMinedTxHashes()).resolves.toEqual([
             [
@@ -118,7 +121,7 @@ import { BlockHeader, GlobalVariables } from '@aztec/stdlib/tx';
         ], minedBlockHeader);
         await pool.markMinedAsPending([
             tx1.getTxHash()
-        ]);
+        ], BlockNumber(1));
         await expect(pool.getMinedTxHashes()).resolves.toEqual([]);
         const pending = await pool.getPendingTxHashes();
         expect(pending).toHaveLength(2);
@@ -155,7 +158,7 @@ import { BlockHeader, GlobalVariables } from '@aztec/stdlib/tx';
         await pool.markMinedAsPending([
             tx1.getTxHash(),
             someTxHashThatThisPeerDidNotSee
-        ]);
+        ], BlockNumber(1));
         await expect(pool.getMinedTxHashes()).resolves.toEqual([]);
         await expect(pool.getPendingTxHashes()).resolves.toEqual([
             tx1.getTxHash()
@@ -173,10 +176,11 @@ import { BlockHeader, GlobalVariables } from '@aztec/stdlib/tx';
         ]);
         const poolTxs = await pool.getAllTxs();
         expect(poolTxs).toHaveLength(3);
-        expect(poolTxs).toEqual(expect.arrayContaining([
-            tx1,
-            tx2,
-            tx3
+        const poolHashes = poolTxs.map((tx)=>tx.getTxHash());
+        expect(poolHashes).toEqual(expect.arrayContaining([
+            tx1.getTxHash(),
+            tx2.getTxHash(),
+            tx3.getTxHash()
         ]));
         await expect(pool.getPendingTxCount()).resolves.toEqual(3);
     });
@@ -213,13 +217,14 @@ import { BlockHeader, GlobalVariables } from '@aztec/stdlib/tx';
             tx3.getTxHash()
         ]);
         expect(requestedTxs).toHaveLength(2);
-        expect(requestedTxs).toEqual(expect.arrayContaining([
-            tx1,
-            tx3
+        const requestedHashes = requestedTxs.map((tx)=>tx.getTxHash());
+        expect(requestedHashes).toEqual(expect.arrayContaining([
+            tx1.getTxHash(),
+            tx3.getTxHash()
         ]));
     });
     it('returns a large number of transactions by their hash', async ()=>{
-        const numTxs = 1000;
+        const numTxs = 1_000;
         const txs = await Promise.all(Array.from({
             length: numTxs
         }, (_, i)=>mockTx(i)));
@@ -227,7 +232,8 @@ import { BlockHeader, GlobalVariables } from '@aztec/stdlib/tx';
         await pool.addTxs(txs);
         const requestedTxs = await pool.getTxsByHash(hashes);
         expect(requestedTxs).toHaveLength(numTxs);
-        expect(requestedTxs).toEqual(expect.arrayContaining(txs));
+        const requestedHashes = requestedTxs.map((tx)=>tx.getTxHash());
+        expect(requestedHashes).toEqual(expect.arrayContaining(hashes));
     });
     it('returns whether or not txs exist', async ()=>{
         const tx1 = await mockTx(1);
@@ -335,7 +341,7 @@ import { BlockHeader, GlobalVariables } from '@aztec/stdlib/tx';
                 txs[1].getTxHash()
             ]);
             // Clean up deleted mined txs from block 1 and earlier
-            const deletedCount = await pool.cleanupDeletedMinedTxs(1);
+            const deletedCount = await pool.cleanupDeletedMinedTxs(BlockNumber(1));
             // Verify old transactions are permanently deleted
             expect(deletedCount).toBe(2);
             await expect(pool.getTxByHash(txs[0].getTxHash())).resolves.toBeUndefined();
@@ -351,7 +357,7 @@ import { BlockHeader, GlobalVariables } from '@aztec/stdlib/tx';
             // Mark as mined in block 2
             const laterBlockHeader = BlockHeader.empty({
                 globalVariables: GlobalVariables.empty({
-                    blockNumber: 2,
+                    blockNumber: BlockNumber(2),
                     timestamp: 0n
                 })
             });
@@ -363,7 +369,7 @@ import { BlockHeader, GlobalVariables } from '@aztec/stdlib/tx';
                 txs[0].getTxHash()
             ]);
             // Try to clean up with block 1 (before the mined block)
-            const deletedCount = await pool.cleanupDeletedMinedTxs(1);
+            const deletedCount = await pool.cleanupDeletedMinedTxs(BlockNumber(1));
             // Verify no transactions were cleaned up
             expect(deletedCount).toBe(0);
             await expect(pool.getTxByHash(txs[0].getTxHash())).resolves.toBeDefined();

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

@@ -1,10 +1,10 @@
 import type { EpochCacheInterface } from '@aztec/epoch-cache';
 import { type Logger } from '@aztec/foundation/log';
-import { type BlockAttestation, type P2PValidator, PeerErrorSeverity } from '@aztec/stdlib/p2p';
-export declare class AttestationValidator implements P2PValidator<BlockAttestation> {
+import { type CheckpointAttestation, type P2PValidator, type ValidationResult } from '@aztec/stdlib/p2p';
+export declare class CheckpointAttestationValidator implements P2PValidator<CheckpointAttestation> {
     protected epochCache: EpochCacheInterface;
     protected logger: Logger;
     constructor(epochCache: EpochCacheInterface);
-    validate(message: BlockAttestation): Promise<PeerErrorSeverity | undefined>;
+    validate(message: CheckpointAttestation): Promise<ValidationResult>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXR0ZXN0YXRpb25fdmFsaWRhdG9yLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbXNnX3ZhbGlkYXRvcnMvYXR0ZXN0YXRpb25fdmFsaWRhdG9yL2F0dGVzdGF0aW9uX3ZhbGlkYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRTlELE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBZ0IsTUFBTSx1QkFBdUIsQ0FBQztBQUNsRSxPQUFPLEVBQUUsS0FBSyxnQkFBZ0IsRUFBRSxLQUFLLFlBQVksRUFBRSxpQkFBaUIsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBRWhHLHFCQUFhLG9CQUFxQixZQUFXLFlBQVksQ0FBQyxnQkFBZ0IsQ0FBQztJQUN6RSxTQUFTLENBQUMsVUFBVSxFQUFFLG1CQUFtQixDQUFDO0lBQzFDLFNBQVMsQ0FBQyxNQUFNLEVBQUUsTUFBTSxDQUFDO0lBRXpCLFlBQVksVUFBVSxFQUFFLG1CQUFtQixFQUcxQztJQUVLLFFBQVEsQ0FBQyxPQUFPLEVBQUUsZ0JBQWdCLEdBQUcsT0FBTyxDQUFDLGlCQUFpQixHQUFHLFNBQVMsQ0FBQyxDQXFEaEY7Q0FDRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXR0ZXN0YXRpb25fdmFsaWRhdG9yLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbXNnX3ZhbGlkYXRvcnMvYXR0ZXN0YXRpb25fdmFsaWRhdG9yL2F0dGVzdGF0aW9uX3ZhbGlkYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRTlELE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBZ0IsTUFBTSx1QkFBdUIsQ0FBQztBQUNsRSxPQUFPLEVBQ0wsS0FBSyxxQkFBcUIsRUFDMUIsS0FBSyxZQUFZLEVBRWpCLEtBQUssZ0JBQWdCLEVBQ3RCLE1BQU0sbUJBQW1CLENBQUM7QUFJM0IscUJBQWEsOEJBQStCLFlBQVcsWUFBWSxDQUFDLHFCQUFxQixDQUFDO0lBQ3hGLFNBQVMsQ0FBQyxVQUFVLEVBQUUsbUJBQW1CLENBQUM7SUFDMUMsU0FBUyxDQUFDLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFFekIsWUFBWSxVQUFVLEVBQUUsbUJBQW1CLEVBRzFDO0lBRUssUUFBUSxDQUFDLE9BQU8sRUFBRSxxQkFBcUIsR0FBRyxPQUFPLENBQUMsZ0JBQWdCLENBQUMsQ0E2RHhFO0NBQ0YifQ==

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

@@ -1 +1 @@
-{"version":3,"file":"attestation_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/attestation_validator/attestation_validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAE9D,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAClE,OAAO,EAAE,KAAK,gBAAgB,EAAE,KAAK,YAAY,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAEhG,qBAAa,oBAAqB,YAAW,YAAY,CAAC,gBAAgB,CAAC;IACzE,SAAS,CAAC,UAAU,EAAE,mBAAmB,CAAC;IAC1C,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IAEzB,YAAY,UAAU,EAAE,mBAAmB,EAG1C;IAEK,QAAQ,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC,CAqDhF;CACF"}
+{"version":3,"file":"attestation_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/attestation_validator/attestation_validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAE9D,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAClE,OAAO,EACL,KAAK,qBAAqB,EAC1B,KAAK,YAAY,EAEjB,KAAK,gBAAgB,EACtB,MAAM,mBAAmB,CAAC;AAI3B,qBAAa,8BAA+B,YAAW,YAAY,CAAC,qBAAqB,CAAC;IACxF,SAAS,CAAC,UAAU,EAAE,mBAAmB,CAAC;IAC1C,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IAEzB,YAAY,UAAU,EAAE,mBAAmB,EAG1C;IAEK,QAAQ,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CA6DxE;CACF"}