@aztec/p2p 4.0.0-nightly.20250907 → 4.0.0-nightly.20260107

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 = {
@@ -41,6 +41,12 @@ export interface TxPool extends TypedEventEmitter<TxPoolEvents> {
      * @returns True or False for each tx hash
      */
     hasTxs(txHashes: TxHash[]): Promise<boolean[]>;
+    /**
+     * Checks if a transaction exists in the pool
+     * @param txHash - The hash of the transaction to check for
+     * @returns True if the transaction exists, false otherwise
+     */
+    hasTx(txHash: TxHash): Promise<boolean>;
     /**
      * Checks if an archived transaction exists in the pool and returns it.
      * @param txHash - The hash of the transaction, used as an ID.
@@ -57,13 +63,16 @@ 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.
      */
-    deleteTxs(txHashes: TxHash[]): Promise<void>;
+    deleteTxs(txHashes: TxHash[], opts?: {
+        permanently?: boolean;
+    }): Promise<void>;
     /**
      * Gets all transactions currently in the tx pool.
      * @returns An array of transaction objects found in the tx pool.
@@ -85,13 +94,13 @@ 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 or mined.
+     * Returns whether the given tx hash is flagged as pending, mined, or deleted.
      * @param txHash - Hash of the tx to query.
-     * @returns Pending or mined depending on its status, or undefined if not found.
+     * @returns Pending, mined, or deleted depending on its status, or undefined if not found.
      */
-    getTxStatus(txHash: TxHash): Promise<'pending' | 'mined' | undefined>;
+    getTxStatus(txHash: TxHash): Promise<'pending' | 'mined' | 'deleted' | undefined>;
     /**
      * Configure the maximum size of the tx pool
      * @param maxSizeBytes - The maximum size in bytes of the mempool. Set to undefined to disable it
@@ -104,5 +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: BlockNumber): Promise<number>;
 }
-//# sourceMappingURL=tx_pool.d.ts.map
+//# 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":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,KAAK,EAAE,WAAW,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAEhE,MAAM,MAAM,aAAa,GAAG;IAC1B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,CAAC,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE;QAAE,GAAG,EAAE,EAAE,EAAE,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/E,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,MAAO,SAAQ,iBAAiB,CAAC,YAAY,CAAC;IAC7D;;;;OAIG;IACH,MAAM,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAE/D;;;;OAIG;IACH,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC,CAAC;IAErD;;;;OAIG;IACH,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC,EAAE,GAAG,SAAS,CAAC,EAAE,CAAC,CAAC;IAE9D;;;;OAIG;IACH,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;IAE/C;;;;OAIG;IACH,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC,CAAC;IAE7D;;;;OAIG;IACH,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzE;;;;OAIG;IACH,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEtD;;;OAGG;IACH,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE7C;;;OAGG;IACH,SAAS,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;IAE3B;;;OAGG;IACH,cAAc,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAEpC;;;OAGG;IACH,kBAAkB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAExC,qDAAqD;IACrD,iBAAiB,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAErC;;;OAGG;IACH,gBAAgB,IAAI,OAAO,CAAC,CAAC,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;IAEjE;;;;OAIG;IACH,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,OAAO,GAAG,SAAS,CAAC,CAAC;IAEtE;;;OAGG;IACH,YAAY,CAAC,MAAM,EAAE,aAAa,GAAG,IAAI,CAAC;IAE1C,yCAAyC;IACzC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAE5B;;;OAGG;IACH,qBAAqB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1D"}
+{"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=tx_pool_test_suite.d.ts.map
+//# 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,QAkMrD"}
+{"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,21 +54,35 @@ 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('removes txs from the pool', async ()=>{
-        const tx1 = await mockTx();
+        const pendingTx = await mockTx(1);
+        const minedTx = await mockTx(2);
         await pool.addTxs([
-            tx1
+            pendingTx,
+            minedTx
         ]);
+        await pool.markAsMined([
+            minedTx.getTxHash()
+        ], minedBlockHeader);
+        // Delete a pending tx - should be permanently deleted
         await pool.deleteTxs([
-            tx1.getTxHash()
+            pendingTx.getTxHash()
+        ]);
+        await expect(pool.getTxByHash(pendingTx.getTxHash())).resolves.toBeUndefined();
+        await expect(pool.getTxStatus(pendingTx.getTxHash())).resolves.toBeUndefined();
+        // Delete a mined tx - should be soft-deleted (still in storage)
+        await pool.deleteTxs([
+            minedTx.getTxHash()
         ]);
-        await expect(pool.getTxByHash(tx1.getTxHash())).resolves.toBeFalsy();
-        await expect(pool.getTxStatus(tx1.getTxHash())).resolves.toBeUndefined();
+        await expect(pool.getTxByHash(minedTx.getTxHash())).resolves.toBeDefined();
+        await expect(pool.getTxStatus(minedTx.getTxHash())).resolves.toEqual('deleted');
+        await expect(pool.getMinedTxHashes()).resolves.toEqual([]);
         await expect(pool.getPendingTxCount()).resolves.toEqual(0);
     });
     it('marks txs as mined', async ()=>{
@@ -80,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([
             [
@@ -105,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);
@@ -142,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()
@@ -160,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);
     });
@@ -200,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)));
@@ -214,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);
@@ -267,4 +286,115 @@ import { BlockHeader, GlobalVariables } from '@aztec/stdlib/tx';
             tx2
         ].map((tx)=>tx.getTxHash()));
     });
+    describe('soft-delete', ()=>{
+        it('soft-deletes mined txs and keeps them in storage', async ()=>{
+            const txs = await Promise.all([
+                mockTx(1),
+                mockTx(2),
+                mockTx(3)
+            ]);
+            await pool.addTxs(txs);
+            // Mark first tx as mined
+            await pool.markAsMined([
+                txs[0].getTxHash()
+            ], minedBlockHeader);
+            // Verify initial state
+            await expect(pool.getPendingTxCount()).resolves.toBe(2);
+            await expect(pool.getTxByHash(txs[0].getTxHash())).resolves.toBeDefined();
+            await expect(pool.getTxByHash(txs[1].getTxHash())).resolves.toBeDefined();
+            // Delete mined tx - should be soft-deleted
+            await pool.deleteTxs([
+                txs[0].getTxHash()
+            ]);
+            // Delete pending tx - should be permanently deleted
+            await pool.deleteTxs([
+                txs[1].getTxHash()
+            ]);
+            // Verify mined tx still exists in storage but has 'deleted' status
+            await expect(pool.getTxByHash(txs[0].getTxHash())).resolves.toBeDefined();
+            await expect(pool.getTxStatus(txs[0].getTxHash())).resolves.toEqual('deleted');
+            // Verify pending tx is permanently deleted
+            await expect(pool.getTxByHash(txs[1].getTxHash())).resolves.toBeUndefined();
+            await expect(pool.getTxStatus(txs[1].getTxHash())).resolves.toBeUndefined();
+            // Verify remaining pending count
+            await expect(pool.getPendingTxCount()).resolves.toBe(1);
+            // Verify pending hashes don't include deleted txs
+            const pendingHashes = await pool.getPendingTxHashes();
+            expect(pendingHashes).toHaveLength(1);
+            expect(pendingHashes.map((h)=>h.toString())).toContain(txs[2].getTxHash().toString());
+        });
+        it('cleans up old deleted mined transactions', async ()=>{
+            const txs = await Promise.all([
+                mockTx(1),
+                mockTx(2),
+                mockTx(3)
+            ]);
+            await pool.addTxs(txs);
+            // Mark first two as mined in block 1
+            await pool.markAsMined([
+                txs[0].getTxHash(),
+                txs[1].getTxHash()
+            ], minedBlockHeader);
+            // Soft-delete mined transactions
+            await pool.deleteTxs([
+                txs[0].getTxHash(),
+                txs[1].getTxHash()
+            ]);
+            // Clean up deleted mined txs from block 1 and earlier
+            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();
+            await expect(pool.getTxByHash(txs[1].getTxHash())).resolves.toBeUndefined();
+            await expect(pool.getTxByHash(txs[2].getTxHash())).resolves.toBeDefined();
+        });
+        it('does not clean up recent deleted mined transactions', async ()=>{
+            const txs = await Promise.all([
+                mockTx(1),
+                mockTx(2)
+            ]);
+            await pool.addTxs(txs);
+            // Mark as mined in block 2
+            const laterBlockHeader = BlockHeader.empty({
+                globalVariables: GlobalVariables.empty({
+                    blockNumber: BlockNumber(2),
+                    timestamp: 0n
+                })
+            });
+            await pool.markAsMined([
+                txs[0].getTxHash()
+            ], laterBlockHeader);
+            // Soft-delete a mined transaction
+            await pool.deleteTxs([
+                txs[0].getTxHash()
+            ]);
+            // Try to clean up with block 1 (before the mined block)
+            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();
+        });
+        it('restores deleted mined tx when it is mined again', async ()=>{
+            const tx = await mockTx(1);
+            await pool.addTxs([
+                tx
+            ]);
+            // Mark as mined
+            await pool.markAsMined([
+                tx.getTxHash()
+            ], minedBlockHeader);
+            // Soft-delete it
+            await pool.deleteTxs([
+                tx.getTxHash()
+            ]);
+            await expect(pool.getTxStatus(tx.getTxHash())).resolves.toEqual('deleted');
+            // Mark as mined again (e.g., after a reorg)
+            await pool.markAsMined([
+                tx.getTxHash()
+            ], minedBlockHeader);
+            // Should be back to mined status
+            await expect(pool.getTxStatus(tx.getTxHash())).resolves.toEqual('mined');
+            await expect(pool.getTxByHash(tx.getTxHash())).resolves.toBeDefined();
+        });
+    });
 }

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

@@ -1,8 +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> {
-    private epochCache;
+    protected epochCache: EpochCacheInterface;
+    protected logger: Logger;
     constructor(epochCache: EpochCacheInterface);
     validate(message: BlockAttestation): Promise<PeerErrorSeverity | undefined>;
 }
-//# sourceMappingURL=attestation_validator.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXR0ZXN0YXRpb25fdmFsaWRhdG9yLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbXNnX3ZhbGlkYXRvcnMvYXR0ZXN0YXRpb25fdmFsaWRhdG9yL2F0dGVzdGF0aW9uX3ZhbGlkYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRTlELE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBZ0IsTUFBTSx1QkFBdUIsQ0FBQztBQUNsRSxPQUFPLEVBQUUsS0FBSyxnQkFBZ0IsRUFBRSxLQUFLLFlBQVksRUFBRSxpQkFBaUIsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBRWhHLHFCQUFhLG9CQUFxQixZQUFXLFlBQVksQ0FBQyxnQkFBZ0IsQ0FBQztJQUN6RSxTQUFTLENBQUMsVUFBVSxFQUFFLG1CQUFtQixDQUFDO0lBQzFDLFNBQVMsQ0FBQyxNQUFNLEVBQUUsTUFBTSxDQUFDO0lBRXpCLFlBQVksVUFBVSxFQUFFLG1CQUFtQixFQUcxQztJQUVLLFFBQVEsQ0FBQyxPQUFPLEVBQUUsZ0JBQWdCLEdBQUcsT0FBTyxDQUFDLGlCQUFpQixHQUFHLFNBQVMsQ0FBQyxDQXFEaEY7Q0FDRiJ9

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,gBAAgB,EAAE,KAAK,YAAY,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAEhG,qBAAa,oBAAqB,YAAW,YAAY,CAAC,gBAAgB,CAAC;IACzE,OAAO,CAAC,UAAU,CAAsB;gBAE5B,UAAU,EAAE,mBAAmB;IAIrC,QAAQ,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC;CAsBlF"}
+{"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"}

package/dest/msg_validators/attestation_validator/attestation_validator.js

@@ -1,25 +1,52 @@
-import { NoCommitteeError } from '@aztec/ethereum';
+import { NoCommitteeError } from '@aztec/ethereum/contracts';
+import { createLogger } from '@aztec/foundation/log';
 import { PeerErrorSeverity } from '@aztec/stdlib/p2p';
 export class AttestationValidator {
     epochCache;
+    logger;
     constructor(epochCache){
         this.epochCache = epochCache;
+        this.logger = createLogger('p2p:attestation-validator');
     }
     async validate(message) {
+        const slotNumber = message.payload.header.slotNumber;
         try {
-            const { currentSlot, nextSlot } = await this.epochCache.getProposerAttesterAddressInCurrentOrNextSlot();
-            const slotNumberBigInt = message.payload.header.slotNumber.toBigInt();
-            if (slotNumberBigInt !== currentSlot && slotNumberBigInt !== nextSlot) {
+            const { currentProposer, nextProposer, currentSlot, nextSlot } = await this.epochCache.getProposerAttesterAddressInCurrentOrNextSlot();
+            if (slotNumber !== currentSlot && slotNumber !== nextSlot) {
+                this.logger.warn(`Attestation slot ${slotNumber} is not current (${currentSlot}) or next (${nextSlot}) slot`);
                 return PeerErrorSeverity.HighToleranceError;
             }
+            // Verify the signature is valid
             const attester = message.getSender();
-            if (!await this.epochCache.isInCommittee(slotNumberBigInt, attester)) {
+            if (attester === undefined) {
+                this.logger.warn(`Invalid signature in attestation for slot ${slotNumber}`);
+                return PeerErrorSeverity.LowToleranceError;
+            }
+            // Verify the attester is in the committee for this slot
+            if (!await this.epochCache.isInCommittee(slotNumber, attester)) {
+                this.logger.warn(`Attester ${attester.toString()} is not in committee for slot ${slotNumber}`);
+                return PeerErrorSeverity.HighToleranceError;
+            }
+            // Verify the proposer signature matches the expected proposer for this slot
+            const proposer = message.getProposer();
+            const expectedProposer = slotNumber === currentSlot ? currentProposer : nextProposer;
+            if (!expectedProposer) {
+                this.logger.warn(`No proposer defined for slot ${slotNumber}`);
+                return PeerErrorSeverity.HighToleranceError;
+            }
+            if (!proposer) {
+                this.logger.warn(`Invalid proposer signature in attestation for slot ${slotNumber}`);
+                return PeerErrorSeverity.LowToleranceError;
+            }
+            if (!proposer.equals(expectedProposer)) {
+                this.logger.warn(`Proposer signature mismatch in attestation. ` + `Expected ${expectedProposer?.toString() ?? 'none'} but got ${proposer.toString()} for slot ${slotNumber}`);
                 return PeerErrorSeverity.HighToleranceError;
             }
             return undefined;
         } catch (e) {
             // People shouldn't be sending us attestations if the committee doesn't exist
             if (e instanceof NoCommitteeError) {
+                this.logger.warn(`No committee exists for attestation for slot ${slotNumber}`);
                 return PeerErrorSeverity.LowToleranceError;
             }
             throw e;

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

@@ -0,0 +1,20 @@
+import type { EpochCacheInterface } from '@aztec/epoch-cache';
+import { type BlockAttestation, PeerErrorSeverity } from '@aztec/stdlib/p2p';
+import { type TelemetryClient } from '@aztec/telemetry-client';
+import type { AttestationPool } from '../../mem_pools/attestation_pool/attestation_pool.js';
+import { AttestationValidator } from './attestation_validator.js';
+/**
+ * FishermanAttestationValidator extends the base AttestationValidator to add
+ * additional validation for fisherman nodes: verifying that attestations sign
+ * the same payload as the original proposal.
+ * Invalid attestations are rejected (not propagated), but peer penalization is
+ * handled by LibP2PService based on the fishermanMode config to ensure a better
+ * view of the network.
+ */
+export declare class FishermanAttestationValidator extends AttestationValidator {
+    private attestationPool;
+    private invalidAttestationCounter;
+    constructor(epochCache: EpochCacheInterface, attestationPool: AttestationPool, telemetryClient: TelemetryClient);
+    validate(message: BlockAttestation): Promise<PeerErrorSeverity | undefined>;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmlzaGVybWFuX2F0dGVzdGF0aW9uX3ZhbGlkYXRvci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21zZ192YWxpZGF0b3JzL2F0dGVzdGF0aW9uX3ZhbGlkYXRvci9maXNoZXJtYW5fYXR0ZXN0YXRpb25fdmFsaWRhdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDOUQsT0FBTyxFQUFFLEtBQUssZ0JBQWdCLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUM3RSxPQUFPLEVBQXVCLEtBQUssZUFBZSxFQUFhLE1BQU0seUJBQXlCLENBQUM7QUFFL0YsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sc0RBQXNELENBQUM7QUFDNUYsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFFbEU7Ozs7Ozs7R0FPRztBQUNILHFCQUFhLDZCQUE4QixTQUFRLG9CQUFvQjtJQUtuRSxPQUFPLENBQUMsZUFBZTtJQUp6QixPQUFPLENBQUMseUJBQXlCLENBQUM7SUFFbEMsWUFDRSxVQUFVLEVBQUUsbUJBQW1CLEVBQ3ZCLGVBQWUsRUFBRSxlQUFlLEVBQ3hDLGVBQWUsRUFBRSxlQUFlLEVBVWpDO0lBRWMsUUFBUSxDQUFDLE9BQU8sRUFBRSxnQkFBZ0IsR0FBRyxPQUFPLENBQUMsaUJBQWlCLEdBQUcsU0FBUyxDQUFDLENBd0R6RjtDQUNGIn0=

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

@@ -0,0 +1 @@
+{"version":3,"file":"fisherman_attestation_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/attestation_validator/fisherman_attestation_validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,KAAK,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAC7E,OAAO,EAAuB,KAAK,eAAe,EAAa,MAAM,yBAAyB,CAAC;AAE/F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sDAAsD,CAAC;AAC5F,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAElE;;;;;;;GAOG;AACH,qBAAa,6BAA8B,SAAQ,oBAAoB;IAKnE,OAAO,CAAC,eAAe;IAJzB,OAAO,CAAC,yBAAyB,CAAC;IAElC,YACE,UAAU,EAAE,mBAAmB,EACvB,eAAe,EAAE,eAAe,EACxC,eAAe,EAAE,eAAe,EAUjC;IAEc,QAAQ,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC,CAwDzF;CACF"}

package/dest/msg_validators/attestation_validator/fisherman_attestation_validator.js

@@ -0,0 +1,67 @@
+import { PeerErrorSeverity } from '@aztec/stdlib/p2p';
+import { Attributes, Metrics, ValueType } from '@aztec/telemetry-client';
+import { AttestationValidator } from './attestation_validator.js';
+/**
+ * FishermanAttestationValidator extends the base AttestationValidator to add
+ * additional validation for fisherman nodes: verifying that attestations sign
+ * the same payload as the original proposal.
+ * Invalid attestations are rejected (not propagated), but peer penalization is
+ * handled by LibP2PService based on the fishermanMode config to ensure a better
+ * view of the network.
+ */ export class FishermanAttestationValidator extends AttestationValidator {
+    attestationPool;
+    invalidAttestationCounter;
+    constructor(epochCache, attestationPool, telemetryClient){
+        super(epochCache), this.attestationPool = attestationPool;
+        this.logger = this.logger.createChild('[FISHERMAN]');
+        const meter = telemetryClient.getMeter('FishermanAttestationValidator');
+        this.invalidAttestationCounter = meter.createUpDownCounter(Metrics.VALIDATOR_INVALID_ATTESTATION_RECEIVED_COUNT, {
+            description: 'The number of invalid attestations received',
+            valueType: ValueType.INT
+        });
+    }
+    async validate(message) {
+        // First run the standard validation
+        const baseValidationResult = await super.validate(message);
+        if (baseValidationResult !== undefined) {
+            // Track base validation failures (invalid signature, wrong committee, etc.)
+            this.invalidAttestationCounter.add(1, {
+                [Attributes.ERROR_TYPE]: 'base_validation_failed'
+            });
+            return baseValidationResult;
+        }
+        // fisherman validation: verify attestation payload matches proposal payload
+        const slotNumberBigInt = message.payload.header.slotNumber;
+        const attester = message.getSender();
+        const proposer = message.getProposer();
+        if (!attester || !proposer) {
+            return undefined;
+        }
+        const proposalId = message.archive.toString();
+        const proposal = await this.attestationPool.getBlockProposal(proposalId);
+        if (proposal) {
+            // Compare the attestation payload with the proposal payload
+            if (!message.payload.equals(proposal.payload)) {
+                this.logger.error(`Attestation payload mismatch for slot ${slotNumberBigInt}! ` + `Attester ${attester.toString()} signed different data than the proposal.`, {
+                    slot: slotNumberBigInt.toString(),
+                    attester: attester.toString(),
+                    proposer: proposer.toString(),
+                    proposalArchive: proposal.archive.toString(),
+                    attestationArchive: message.archive.toString(),
+                    proposalHeader: proposal.payload.header.hash().toString(),
+                    attestationHeader: message.payload.header.hash().toString()
+                });
+                // Track invalid attestation metric
+                this.invalidAttestationCounter.add(1, {
+                    [Attributes.ERROR_TYPE]: 'payload_mismatch'
+                });
+                // Return error to reject the message, but LibP2PService won't penalize in fisherman mode
+                return PeerErrorSeverity.LowToleranceError;
+            }
+        } else {
+            // We might receive attestations before proposals in some cases
+            this.logger.debug(`Received attestation for slot ${slotNumberBigInt} but proposal not found yet. ` + `Proposal ID: ${proposalId}`);
+        }
+        return undefined;
+    }
+}

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

@@ -1,2 +1,3 @@
 export * from './attestation_validator.js';
-//# sourceMappingURL=index.d.ts.map
+export * from './fisherman_attestation_validator.js';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9tc2dfdmFsaWRhdG9ycy9hdHRlc3RhdGlvbl92YWxpZGF0b3IvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyw0QkFBNEIsQ0FBQztBQUMzQyxjQUFjLHNDQUFzQyxDQUFDIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/attestation_validator/index.ts"],"names":[],"mappings":"AAAA,cAAc,4BAA4B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/attestation_validator/index.ts"],"names":[],"mappings":"AAAA,cAAc,4BAA4B,CAAC;AAC3C,cAAc,sCAAsC,CAAC"}

package/dest/msg_validators/attestation_validator/index.js

@@ -1 +1,2 @@
 export * from './attestation_validator.js';
+export * from './fisherman_attestation_validator.js';

package/dest/msg_validators/block_proposal_validator/block_proposal_validator.d.ts

@@ -3,7 +3,10 @@ import { type BlockProposal, type P2PValidator, PeerErrorSeverity } from '@aztec
 export declare class BlockProposalValidator implements P2PValidator<BlockProposal> {
     private epochCache;
     private logger;
-    constructor(epochCache: EpochCacheInterface);
+    private txsPermitted;
+    constructor(epochCache: EpochCacheInterface, opts: {
+        txsPermitted: boolean;
+    });
     validate(block: BlockProposal): Promise<PeerErrorSeverity | undefined>;
 }
-//# sourceMappingURL=block_proposal_validator.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfcHJvcG9zYWxfdmFsaWRhdG9yLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbXNnX3ZhbGlkYXRvcnMvYmxvY2tfcHJvcG9zYWxfdmFsaWRhdG9yL2Jsb2NrX3Byb3Bvc2FsX3ZhbGlkYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRzlELE9BQU8sRUFBRSxLQUFLLGFBQWEsRUFBRSxLQUFLLFlBQVksRUFBRSxpQkFBaUIsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBRTdGLHFCQUFhLHNCQUF1QixZQUFXLFlBQVksQ0FBQyxhQUFhLENBQUM7SUFDeEUsT0FBTyxDQUFDLFVBQVUsQ0FBc0I7SUFDeEMsT0FBTyxDQUFDLE1BQU0sQ0FBUztJQUN2QixPQUFPLENBQUMsWUFBWSxDQUFVO0lBRTlCLFlBQVksVUFBVSxFQUFFLG1CQUFtQixFQUFFLElBQUksRUFBRTtRQUFFLFlBQVksRUFBRSxPQUFPLENBQUE7S0FBRSxFQUkzRTtJQUVLLFFBQVEsQ0FBQyxLQUFLLEVBQUUsYUFBYSxHQUFHLE9BQU8sQ0FBQyxpQkFBaUIsR0FBRyxTQUFTLENBQUMsQ0ErRTNFO0NBQ0YifQ==

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

@@ -1 +1 @@
-{"version":3,"file":"block_proposal_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/block_proposal_validator/block_proposal_validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAG9D,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,YAAY,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAE7F,qBAAa,sBAAuB,YAAW,YAAY,CAAC,aAAa,CAAC;IACxE,OAAO,CAAC,UAAU,CAAsB;IACxC,OAAO,CAAC,MAAM,CAAS;gBAEX,UAAU,EAAE,mBAAmB;IAKrC,QAAQ,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC;CAyC7E"}
+{"version":3,"file":"block_proposal_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/block_proposal_validator/block_proposal_validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAG9D,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,YAAY,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAE7F,qBAAa,sBAAuB,YAAW,YAAY,CAAC,aAAa,CAAC;IACxE,OAAO,CAAC,UAAU,CAAsB;IACxC,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,YAAY,CAAU;IAE9B,YAAY,UAAU,EAAE,mBAAmB,EAAE,IAAI,EAAE;QAAE,YAAY,EAAE,OAAO,CAAA;KAAE,EAI3E;IAEK,QAAQ,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC,CA+E3E;CACF"}