@aztec/p2p 0.86.0-starknet.1 → 0.87.0

package/dest/config.js

@@ -84,16 +84,6 @@ export const p2pConfigMappings = {
         description: 'If announceUdpAddress or announceTcpAddress are not provided, query for the IP address of the machine. Default is false.',
         ...booleanConfigHelper()
     },
-    keepProvenTxsInPoolFor: {
-        env: 'P2P_TX_POOL_KEEP_PROVEN_FOR',
-        description: 'How many blocks have to pass after a block is proven before its txs are deleted (zero to delete immediately once proven)',
-        ...numberConfigHelper(0)
-    },
-    keepAttestationsInPoolFor: {
-        env: 'P2P_ATTESTATION_POOL_KEEP_FOR',
-        description: 'How many slots to keep attestations for.',
-        ...numberConfigHelper(96)
-    },
     gossipsubInterval: {
         env: 'P2P_GOSSIPSUB_INTERVAL_MS',
         description: 'The interval of the gossipsub heartbeat to perform maintenance tasks.',
@@ -131,9 +121,14 @@ export const p2pConfigMappings = {
     },
     gossipsubMcacheGossip: {
         env: 'P2P_GOSSIPSUB_MCACHE_GOSSIP',
-        description: 'How many message cache windows to include when gossiping with other pears.',
+        description: 'How many message cache windows to include when gossiping with other peers.',
         ...numberConfigHelper(3)
     },
+    gossipsubSeenTTL: {
+        env: 'P2P_GOSSIPSUB_SEEN_TTL',
+        description: 'How long to keep message IDs in the seen cache.',
+        ...numberConfigHelper(20 * 60 * 1000)
+    },
     gossipsubTxTopicWeight: {
         env: 'P2P_GOSSIPSUB_TX_TOPIC_WEIGHT',
         description: 'The weight of the tx topic for the gossipsub protocol.',

package/dest/enr/generate-enr.d.ts

@@ -1,10 +1,17 @@
 import type { LogFn } from '@aztec/foundation/log';
+import { type ChainConfig } from '@aztec/stdlib/config';
+import type { ComponentsVersions } from '@aztec/stdlib/versioning';
 import { ENR, SignableENR } from '@chainsafe/enr';
 import type { PeerId } from '@libp2p/interface';
+import { type Multiaddr } from '@multiformats/multiaddr';
 export { ENR };
 export declare function createBootnodeENRandPeerId(privateKey: string, p2pIp: string, p2pBroadcastPort: number, l1ChainId: number): Promise<{
     enr: SignableENR;
     peerId: PeerId;
 }>;
+export declare function createNodeENR(peerId: PeerId, multiAddrUdp: Multiaddr | undefined, multiAddrTcp: Multiaddr | undefined, chainConfig: ChainConfig, packageVersion: string): {
+    enr: SignableENR;
+    versions: ComponentsVersions;
+};
 export declare function printENR(enr: string, log: LogFn): Promise<void>;
 //# sourceMappingURL=generate-enr.d.ts.map

package/dest/enr/generate-enr.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate-enr.d.ts","sourceRoot":"","sources":["../../src/enr/generate-enr.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAGnD,OAAO,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAOhD,OAAO,EAAE,GAAG,EAAE,CAAC;AAEf,wBAAsB,0BAA0B,CAC9C,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,MAAM,EACb,gBAAgB,EAAE,MAAM,EACxB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC;IAAE,GAAG,EAAE,WAAW,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAa/C;AAED,wBAAsB,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,iBAQrD"}
+{"version":3,"file":"generate-enr.d.ts","sourceRoot":"","sources":["../../src/enr/generate-enr.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,KAAK,WAAW,EAAoB,MAAM,sBAAsB,CAAC;AAC1E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAEnE,OAAO,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,KAAK,SAAS,EAAa,MAAM,yBAAyB,CAAC;AAMpE,OAAO,EAAE,GAAG,EAAE,CAAC;AAEf,wBAAsB,0BAA0B,CAC9C,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,MAAM,EACb,gBAAgB,EAAE,MAAM,EACxB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC;IAAE,GAAG,EAAE,WAAW,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAa/C;AAED,wBAAgB,aAAa,CAC3B,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,SAAS,GAAG,SAAS,EACnC,YAAY,EAAE,SAAS,GAAG,SAAS,EACnC,WAAW,EAAE,WAAW,EACxB,cAAc,EAAE,MAAM,GACrB;IAAE,GAAG,EAAE,WAAW,CAAC;IAAC,QAAQ,EAAE,kBAAkB,CAAA;CAAE,CAiBpD;AAED,wBAAsB,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,iBAYrD"}

package/dest/enr/generate-enr.js

@@ -1,9 +1,9 @@
 import { emptyChainConfig } from '@aztec/stdlib/config';
 import { ENR, SignableENR } from '@chainsafe/enr';
 import { multiaddr } from '@multiformats/multiaddr';
-import { AZTEC_ENR_KEY } from '../types/index.js';
+import { AZTEC_ENR_CLIENT_VERSION_KEY, AZTEC_ENR_KEY } from '../types/index.js';
 import { convertToMultiaddr, createLibP2PPeerIdFromPrivateKey } from '../util.js';
-import { setAztecEnrKey } from '../versioning.js';
+import { setAztecClientVersionEnrKey, setAztecEnrKey } from '../versioning.js';
 export { ENR };
 export async function createBootnodeENRandPeerId(privateKey, p2pIp, p2pBroadcastPort, l1ChainId) {
     const peerId = await createLibP2PPeerIdFromPrivateKey(privateKey);
@@ -20,6 +20,25 @@ export async function createBootnodeENRandPeerId(privateKey, p2pIp, p2pBroadcast
         peerId
     };
 }
+export function createNodeENR(peerId, multiAddrUdp, multiAddrTcp, chainConfig, packageVersion) {
+    // create ENR from PeerId
+    const enr = SignableENR.createFromPeerId(peerId);
+    // Add aztec identification to ENR
+    const versions = setAztecEnrKey(enr, chainConfig);
+    // Add aztec client version to ENR
+    setAztecClientVersionEnrKey(enr, packageVersion);
+    // set location multiaddr in ENR record
+    if (multiAddrUdp) {
+        enr.setLocationMultiaddr(multiAddrUdp);
+    }
+    if (multiAddrTcp) {
+        enr.setLocationMultiaddr(multiAddrTcp);
+    }
+    return {
+        enr,
+        versions
+    };
+}
 export async function printENR(enr, log) {
     const decoded = ENR.decodeTxt(enr);
     log(`PeerID: ${await decoded.peerId()}`);
@@ -28,4 +47,6 @@ export async function printENR(enr, log) {
     log(`TCP: ${decoded.tcp}`);
     const aztec = decoded.kvs.get(AZTEC_ENR_KEY);
     log(`Aztec version: ${aztec?.toString()}`);
+    const aztecClientVersion = decoded.kvs.get(AZTEC_ENR_CLIENT_VERSION_KEY);
+    log(`Aztec client version ${aztecClientVersion ? aztecClientVersion.toString() : 'N/A'}`);
 }

package/dest/mem_pools/attestation_pool/memory_attestation_pool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"memory_attestation_pool.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/attestation_pool/memory_attestation_pool.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAGnF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE7D,qBAAa,uBAAwB,YAAW,eAAe;;IAKE,OAAO,CAAC,GAAG;IAJ1E,OAAO,CAAC,OAAO,CAAwC;IAEvD,OAAO,CAAC,YAAY,CAAgG;gBAExG,SAAS,GAAE,eAAsC,EAAU,GAAG,yCAAuC;IAK1G,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC;IAI3B,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAQjE,iCAAiC,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAWhG,eAAe,CAAC,YAAY,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAqC1D,2BAA2B,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBpE,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAWtD,oCAAoC,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAerF,kBAAkB,CAAC,YAAY,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAiB3E"}
+{"version":3,"file":"memory_attestation_pool.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/attestation_pool/memory_attestation_pool.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAGnF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE7D,qBAAa,uBAAwB,YAAW,eAAe;;IAO3D,OAAO,CAAC,GAAG;IANb,OAAO,CAAC,OAAO,CAAwC;IAEvD,OAAO,CAAC,YAAY,CAAgG;gBAGlH,SAAS,GAAE,eAAsC,EACzC,GAAG,yCAAuC;IAM7C,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC;IAI3B,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAQjE,iCAAiC,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAWhG,eAAe,CAAC,YAAY,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAqC1D,2BAA2B,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBpE,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAWtD,oCAAoC,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAerF,kBAAkB,CAAC,YAAY,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAiB3E"}

package/dest/mem_pools/attestation_pool/mocks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mocks.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/attestation_pool/mocks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EACL,gBAAgB,EAIjB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C,OAAO,EAAE,KAAK,YAAY,EAA2C,MAAM,eAAe,CAAC;AAE3F;;;;GAIG;AACH,eAAO,MAAM,eAAe,QAAO,YAGlC,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,eAAe,WAClB,eAAe,SACjB,MAAM,YACH,EAAE,QACN,MAAM,EAAE,KACZ,gBASF,CAAC"}
+{"version":3,"file":"mocks.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/attestation_pool/mocks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EACL,gBAAgB,EAIjB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C,OAAO,EAAE,KAAK,YAAY,EAA2C,MAAM,eAAe,CAAC;AAE3F;;;;GAIG;AACH,eAAO,MAAM,eAAe,QAAO,YAGlC,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,eAAe,GAC1B,QAAQ,eAAe,EACvB,OAAM,MAAU,EAChB,UAAS,EAAgB,EACzB,MAAK,MAAM,EAAkD,KAC5D,gBASF,CAAC"}

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

@@ -28,6 +28,7 @@ export declare class AztecKVTxPool implements TxPool {
     markMinedAsPending(txHashes: TxHash[]): Promise<void>;
     getPendingTxHashes(): Promise<TxHash[]>;
     getMinedTxHashes(): Promise<[TxHash, number][]>;
+    getPendingTxCount(): Promise<number>;
     getTxStatus(txHash: TxHash): Promise<'pending' | 'mined' | undefined>;
     /**
      * Checks if a transaction exists in the pool and returns it.
@@ -66,6 +67,7 @@ export declare class AztecKVTxPool implements TxPool {
      */
     getAllTxHashes(): Promise<TxHash[]>;
     setMaxTxPoolSize(maxSizeBytes: number | undefined): Promise<void>;
+    markTxsAsNonEvictable(txHashes: TxHash[]): Promise<void>;
     /**
      * Creates a GasTxValidator instance.
      * @param db - DB for the validator to use
@@ -120,5 +122,6 @@ export declare class AztecKVTxPool implements TxPool {
     private evictInvalidTxsAfterReorg;
     private addPendingTxIndices;
     private removePendingTxIndices;
+    private increasePendingTxCount;
 }
 //# sourceMappingURL=aztec_kv_tx_pool.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"aztec_kv_tx_pool.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/tx_pool/aztec_kv_tx_pool.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAClE,OAAO,KAAK,EAAE,iBAAiB,EAA0D,MAAM,iBAAiB,CAAC;AAGjH,OAAO,KAAK,EAAE,wBAAwB,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAIxG,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAEnF,OAAO,EAAE,YAAY,EAAE,MAAM,oDAAoD,CAAC;AAClF,OAAO,EAAE,cAAc,EAAE,MAAM,oDAAoD,CAAC;AAGpF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAE3C;;GAEG;AACH,qBAAa,aAAc,YAAW,MAAM;;IA8C1C;;;;;;;OAOG;gBAED,KAAK,EAAE,iBAAiB,EACxB,OAAO,EAAE,iBAAiB,EAC1B,sBAAsB,EAAE,sBAAsB,EAC9C,SAAS,GAAE,eAAsC,EACjD,MAAM,GAAE;QACN,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,eAAe,CAAC,EAAE,MAAM,CAAC;KACrB,EACN,GAAG,SAA8B;IAsBtB,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC;IAOjC,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAsCnE,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAqC/C,kBAAkB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAKvC,gBAAgB,IAAI,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;IAK/C,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,OAAO,GAAG,SAAS,CAAC;IAalF;;;;OAIG;IACU,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC;IAU3D,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC,EAAE,GAAG,SAAS,CAAC,EAAE,CAAC;IAY7D,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAIpD;;;;OAIG;IACU,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC;IAUzE;;;;OAIG;IACU,MAAM,CAAC,GAAG,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAsC7C;;;;OAIG;IACI,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,QAAQ,UAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAsCrE;;;OAGG;IACU,SAAS,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC;IASvC;;;OAGG;IACU,cAAc,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAKzC,gBAAgB,CAAC,YAAY,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAKxE;;;;OAIG;IACH,SAAS,CAAC,oBAAoB,CAAC,EAAE,EAAE,wBAAwB,GAAG,cAAc;IAI5E;;;;OAIG;IACH,SAAS,CAAC,kBAAkB,CAAC,EAAE,EAAE,wBAAwB,GAAG,YAAY;IAIxE;;;;;OAKG;YACW,kBAAkB;IAoBhC;;;;OAIG;YACW,UAAU;IA4BxB;;;;;;OAMG;YACW,mBAAmB;IAsCjC;;;;;;;;;;OAUG;YACW,0BAA0B;IAwDxC;;;;;OAKG;YACW,yBAAyB;YAqCzB,mBAAmB;YAMnB,sBAAsB;CAMrC"}
+{"version":3,"file":"aztec_kv_tx_pool.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/tx_pool/aztec_kv_tx_pool.ts"],"names":[],"mappings":"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"}

package/dest/mem_pools/tx_pool/aztec_kv_tx_pool.js

@@ -22,7 +22,9 @@ import { getPendingTxPriority } from './priority.js';
     /** Index from tx hash to its tx size (in bytes), filtered by pending txs. */ #pendingTxHashToSize;
     /** Index from tx hash to its header hash, filtered by pending txs. */ #pendingTxHashToHeaderHash;
     /** The cumulative tx size in bytes that the pending txs in the pool take up. */ #pendingTxSize;
+    /** Count of total pending txs. */ #pendingTxCount;
     /** In-memory mapping of pending tx hashes to the hydrated pending tx in the pool. */ #pendingTxs;
+    /** In-memory set of txs that should not be evicted from the pool. */ #nonEvictableTxs;
     /** KV store for archived txs. */ #archive;
     /** Archived txs map for future lookup. */ #archivedTxs;
     /** Indexes of the archived txs by insertion order. */ #archivedTxIndices;
@@ -44,8 +46,10 @@ import { getPendingTxPriority } from './priority.js';
         this.#pendingTxHashToSize = store.openMap('pendingTxHashToSize');
         this.#pendingTxHashToHeaderHash = store.openMap('pendingTxHashToHeaderHash');
         this.#pendingTxSize = store.openSingleton('pendingTxSize');
+        this.#pendingTxCount = store.openSingleton('pendingTxCount');
         this.#maxTxPoolSize = config.maxTxPoolSize;
         this.#pendingTxs = new Map();
+        this.#nonEvictableTxs = new Set();
         this.#archivedTxs = archive.openMap('archivedTxs');
         this.#archivedTxIndices = archive.openMap('archivedTxIndices');
         this.#archivedTxLimit = config.archivedTxLimit ?? 0;
@@ -61,14 +65,14 @@ import { getPendingTxPriority } from './priority.js';
         }
         return true;
     }
-    markAsMined(txHashes, blockNumber) {
+    async markAsMined(txHashes, blockNumber) {
         if (txHashes.length === 0) {
             return Promise.resolve();
         }
         let deletedPending = 0;
         const minedNullifiers = new Set();
         const minedFeePayers = new Set();
-        return this.#store.transactionAsync(async ()=>{
+        await this.#store.transactionAsync(async ()=>{
             let pendingTxSize = await this.#pendingTxSize.getAsync() ?? 0;
             for (const hash of txHashes){
                 const key = hash.toString();
@@ -85,16 +89,21 @@ import { getPendingTxPriority } from './priority.js';
             }
             this.#metrics.recordAddedObjects(txHashes.length, 'mined');
             await this.#pendingTxSize.set(pendingTxSize);
+            await this.increasePendingTxCount(-deletedPending);
             const numTxsEvicted = await this.evictInvalidTxsAfterMining(txHashes, blockNumber, minedNullifiers, minedFeePayers);
             this.#metrics.recordRemovedObjects(deletedPending + numTxsEvicted, 'pending');
         });
+        // We update this after the transaction above. This ensures that the non-evictable transactions are not evicted
+        // until any that have been mined are marked as such.
+        // The non-evictable set is not considered when evicting transactions that are invalid after a block is mined.
+        this.#nonEvictableTxs.clear();
     }
-    markMinedAsPending(txHashes) {
+    async markMinedAsPending(txHashes) {
         if (txHashes.length === 0) {
             return Promise.resolve();
         }
         let markedAsPending = 0;
-        return this.#store.transactionAsync(async ()=>{
+        await this.#store.transactionAsync(async ()=>{
             let pendingTxSize = await this.#pendingTxSize.getAsync() ?? 0;
             for (const hash of txHashes){
                 const key = hash.toString();
@@ -108,13 +117,13 @@ import { getPendingTxPriority } from './priority.js';
                 }
             }
             await this.#pendingTxSize.set(pendingTxSize);
-        }).then(async ()=>{
-            const numInvalidTxsEvicted = await this.evictInvalidTxsAfterReorg(txHashes);
-            const { numLowPriorityTxsEvicted, numNewTxsEvicted } = await this.evictLowPriorityTxs(txHashes);
-            this.#metrics.recordAddedObjects(markedAsPending - numNewTxsEvicted, 'pending');
-            this.#metrics.recordRemovedObjects(numInvalidTxsEvicted + numLowPriorityTxsEvicted - numNewTxsEvicted, 'pending');
-            this.#metrics.recordRemovedObjects(markedAsPending, 'mined');
         });
+        const numInvalidTxsEvicted = await this.evictInvalidTxsAfterReorg(txHashes);
+        const { numLowPriorityTxsEvicted, numNewTxsEvicted } = await this.evictLowPriorityTxs(txHashes);
+        await this.increasePendingTxCount(markedAsPending);
+        this.#metrics.recordAddedObjects(markedAsPending - numNewTxsEvicted, 'pending');
+        this.#metrics.recordRemovedObjects(numInvalidTxsEvicted + numLowPriorityTxsEvicted - numNewTxsEvicted, 'pending');
+        this.#metrics.recordRemovedObjects(markedAsPending, 'mined');
     }
     async getPendingTxHashes() {
         const vals = await toArray(this.#pendingTxPriorityToHash.valuesAsync({
@@ -129,6 +138,9 @@ import { getPendingTxPriority } from './priority.js';
                 blockNumber
             ]);
     }
+    async getPendingTxCount() {
+        return await this.#pendingTxCount.getAsync() ?? 0;
+    }
     async getTxStatus(txHash) {
         const key = txHash.toString();
         const [isMined, isKnown] = await Promise.all([
@@ -193,26 +205,31 @@ import { getPendingTxPriority } from './priority.js';
                 txStats: await tx.getStats()
             })));
         await this.#store.transactionAsync(async ()=>{
-            let pendingCount = 0;
+            let addedCount = 0;
             let pendingTxSize = await this.#pendingTxSize.getAsync() ?? 0;
             await Promise.all(txs.map(async (tx, i)=>{
                 const { txHash, txStats } = hashesAndStats[i];
+                const key = txHash.toString();
+                if (await this.#txs.hasAsync(key)) {
+                    this.#log.debug(`Tx ${txHash.toString()} already exists in the pool`);
+                    return;
+                }
                 this.#log.verbose(`Adding tx ${txHash.toString()} to pool`, {
                     eventName: 'tx-added-to-pool',
                     ...txStats
                 });
-                const key = txHash.toString();
                 await this.#txs.set(key, tx.toBuffer());
                 if (!await this.#minedTxHashToBlock.hasAsync(key)) {
-                    pendingCount++;
+                    addedCount++;
                     pendingTxSize += tx.getSize();
                     await this.addPendingTxIndices(tx, key);
                     this.#metrics.recordSize(tx);
                 }
             }));
+            await this.increasePendingTxCount(addedCount);
             await this.#pendingTxSize.set(pendingTxSize);
             const { numLowPriorityTxsEvicted, numNewTxsEvicted } = await this.evictLowPriorityTxs(hashesAndStats.map(({ txHash })=>txHash));
-            this.#metrics.recordAddedObjects(pendingCount - numNewTxsEvicted, 'pending');
+            this.#metrics.recordAddedObjects(addedCount - numNewTxsEvicted, 'pending');
             this.#metrics.recordRemovedObjects(numLowPriorityTxsEvicted - numNewTxsEvicted, 'pending');
         });
     }
@@ -246,6 +263,7 @@ import { getPendingTxPriority } from './priority.js';
                 }
             }
             await this.#pendingTxSize.set(pendingTxSize);
+            await this.increasePendingTxCount(-pendingDeleted);
             this.#metrics.recordRemovedObjects(pendingDeleted, 'pending');
             this.#metrics.recordRemovedObjects(minedDeleted, 'mined');
         });
@@ -273,6 +291,10 @@ import { getPendingTxPriority } from './priority.js';
         this.#maxTxPoolSize = maxSizeBytes;
         return Promise.resolve();
     }
+    markTxsAsNonEvictable(txHashes) {
+        txHashes.forEach((txHash)=>this.#nonEvictableTxs.add(txHash.toString()));
+        return Promise.resolve();
+    }
     /**
    * Creates a GasTxValidator instance.
    * @param db - DB for the validator to use
@@ -361,6 +383,9 @@ import { getPendingTxPriority } from './priority.js';
         let pendingTxsSize = await this.#pendingTxSize.getAsync() ?? 0;
         if (pendingTxsSize > this.#maxTxPoolSize) {
             for await (const txHash of this.#pendingTxPriorityToHash.valuesAsync()){
+                if (this.#nonEvictableTxs.has(txHash.toString())) {
+                    continue;
+                }
                 this.#log.verbose(`Evicting tx ${txHash} from pool due to low priority to satisfy max tx size limit`);
                 txsToEvict.push(TxHash.fromString(txHash));
                 const txSize = await this.#pendingTxHashToSize.getAsync(txHash.toString()) ?? (await this.getPendingTxByHash(txHash))?.getSize();
@@ -479,4 +504,9 @@ import { getPendingTxPriority } from './priority.js';
         await this.#pendingTxHashToHeaderHash.delete(txHash);
         this.#pendingTxs.delete(txHash);
     }
+    async increasePendingTxCount(count) {
+        const pendingTxCount = await this.#pendingTxCount.getAsync() ?? 0;
+        this.#log.debug(`Increasing pending tx count: current ${pendingTxCount} + count ${count} = ${pendingTxCount + count}`);
+        await this.#pendingTxCount.set(pendingTxCount + count);
+    }
 }

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

@@ -23,6 +23,7 @@ export declare class InMemoryTxPool implements TxPool {
     markMinedAsPending(txHashes: TxHash[]): Promise<void>;
     getPendingTxHashes(): Promise<TxHash[]>;
     getMinedTxHashes(): Promise<[TxHash, number][]>;
+    getPendingTxCount(): Promise<number>;
     getTxStatus(txHash: TxHash): Promise<'pending' | 'mined' | undefined>;
     /**
      * Checks if a transaction exists in the pool and returns it.
@@ -56,5 +57,6 @@ export declare class InMemoryTxPool implements TxPool {
      */
     getAllTxHashes(): Promise<TxHash[]>;
     setMaxTxPoolSize(_maxSizeBytes: number | undefined): Promise<void>;
+    markTxsAsNonEvictable(_: TxHash[]): Promise<void>;
 }
 //# sourceMappingURL=memory_tx_pool.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"memory_tx_pool.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/tx_pool/memory_tx_pool.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAInF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAE3C;;GAEG;AACH,qBAAa,cAAe,YAAW,MAAM;IAcoB,OAAO,CAAC,GAAG;IAb1E;;OAEG;IACH,OAAO,CAAC,GAAG,CAAkB;IAC7B,OAAO,CAAC,QAAQ,CAAsB;IACtC,OAAO,CAAC,UAAU,CAAc;IAEhC,OAAO,CAAC,OAAO,CAA0B;IAEzC;;;OAGG;gBACS,SAAS,GAAE,eAAsC,EAAU,GAAG,yCAA8B;IAOjG,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC;IAI3B,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAWnE,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IA0B/C,kBAAkB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAQ7C,gBAAgB,IAAI,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;IAM/C,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,OAAO,GAAG,SAAS,CAAC;IAW5E;;;;OAIG;IACI,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC;IAK3D,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC,EAAE,GAAG,SAAS,CAAC,EAAE,CAAC;IAG7D,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAIvC,mBAAmB,IAAI,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC;IAIrD;;;;OAIG;IACU,MAAM,CAAC,GAAG,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAsB7C;;;;OAIG;IACI,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBnD;;;OAGG;IACI,SAAS,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC;IAIjC;;;OAGG;IACI,cAAc,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAI1C,gBAAgB,CAAC,aAAa,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;CAGnE"}
+{"version":3,"file":"memory_tx_pool.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/tx_pool/memory_tx_pool.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAInF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAE3C;;GAEG;AACH,qBAAa,cAAe,YAAW,MAAM;IAgBzC,OAAO,CAAC,GAAG;IAfb;;OAEG;IACH,OAAO,CAAC,GAAG,CAAkB;IAC7B,OAAO,CAAC,QAAQ,CAAsB;IACtC,OAAO,CAAC,UAAU,CAAc;IAEhC,OAAO,CAAC,OAAO,CAA0B;IAEzC;;;OAGG;gBAED,SAAS,GAAE,eAAsC,EACzC,GAAG,yCAA8B;IAQpC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC;IAI3B,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAWnE,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IA0B/C,kBAAkB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAQ7C,gBAAgB,IAAI,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;IAM/C,iBAAiB,IAAI,OAAO,CAAC,MAAM,CAAC;IAIpC,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,OAAO,GAAG,SAAS,CAAC;IAW5E;;;;OAIG;IACI,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC;IAK3D,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC,EAAE,GAAG,SAAS,CAAC,EAAE,CAAC;IAG7D,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAIvC,mBAAmB,IAAI,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC;IAIrD;;;;OAIG;IACU,MAAM,CAAC,GAAG,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAsB7C;;;;OAIG;IACI,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBnD;;;OAGG;IACI,SAAS,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC;IAIjC;;;OAGG;IACI,cAAc,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAI1C,gBAAgB,CAAC,aAAa,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAIlE,qBAAqB,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAGlD"}

package/dest/mem_pools/tx_pool/memory_tx_pool.js

@@ -68,6 +68,9 @@ import { getPendingTxPriority } from './priority.js';
                 blockNumber
             ]));
     }
+    getPendingTxCount() {
+        return Promise.resolve(this.pendingTxs.size);
+    }
     getTxStatus(txHash) {
         const key = txHash.toBigInt();
         if (this.pendingTxs.has(key)) {
@@ -150,4 +153,7 @@ import { getPendingTxPriority } from './priority.js';
     setMaxTxPoolSize(_maxSizeBytes) {
         return Promise.resolve();
     }
+    markTxsAsNonEvictable(_) {
+        return Promise.resolve();
+    }
 }

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

@@ -63,6 +63,8 @@ export interface TxPool {
      * @returns An array of pending transaction hashes found in the tx pool.
      */
     getPendingTxHashes(): Promise<TxHash[]>;
+    /** Returns the number of pending txs in the pool. */
+    getPendingTxCount(): Promise<number>;
     /**
      * Gets the hashes of mined transactions currently in the tx pool.
      * @returns An array of mined transaction hashes found in the tx pool.
@@ -81,5 +83,10 @@ export interface TxPool {
     setMaxTxPoolSize(maxSizeBytes: number | undefined): Promise<void>;
     /** Returns whether the pool is empty. */
     isEmpty(): Promise<boolean>;
+    /**
+     * Marks transactions as non-evictible in the pool.
+     * @param txHashes - Hashes of the transactions to mark as non-evictible.
+     */
+    markTxsAsNonEvictable(txHashes: TxHash[]): Promise<void>;
 }
 //# sourceMappingURL=tx_pool.d.ts.map

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,EAAE,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAEnD;;GAEG;AACH,MAAM,WAAW,MAAM;IACrB;;;OAGG;IACH,MAAM,CAAC,GAAG,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjC;;;;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;;;OAGG;IACH,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEpE;;;;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;;;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,gBAAgB,CAAC,YAAY,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAElE,yCAAyC;IACzC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;CAC7B"}
+{"version":3,"file":"tx_pool.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/tx_pool/tx_pool.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAEnD;;GAEG;AACH,MAAM,WAAW,MAAM;IACrB;;;OAGG;IACH,MAAM,CAAC,GAAG,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjC;;;;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;;;OAGG;IACH,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEpE;;;;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,gBAAgB,CAAC,YAAY,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAElE,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"}

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,QAiKrD"}
+{"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,QAuKrD"}

package/dest/mem_pools/tx_pool/tx_pool_test_suite.js

@@ -20,6 +20,7 @@ import { mockTx } from '@aztec/stdlib/testing';
         await expect(pool.getPendingTxHashes()).resolves.toEqual([
             await tx1.getTxHash()
         ]);
+        await expect(pool.getPendingTxCount()).resolves.toEqual(1);
     });
     it('Removes txs from the pool', async ()=>{
         const tx1 = await mockTx();
@@ -31,6 +32,7 @@ import { mockTx } from '@aztec/stdlib/testing';
         ]);
         await expect(pool.getTxByHash(await tx1.getTxHash())).resolves.toBeFalsy();
         await expect(pool.getTxStatus(await tx1.getTxHash())).resolves.toBeUndefined();
+        await expect(pool.getPendingTxCount()).resolves.toEqual(0);
     });
     it('Marks txs as mined', async ()=>{
         const tx1 = await mockTx(1);
@@ -53,6 +55,7 @@ import { mockTx } from '@aztec/stdlib/testing';
         await expect(pool.getPendingTxHashes()).resolves.toEqual([
             await tx2.getTxHash()
         ]);
+        await expect(pool.getPendingTxCount()).resolves.toEqual(1);
     });
     it('Marks txs as pending after being mined', async ()=>{
         const tx1 = await mockTx(1);
@@ -74,6 +77,7 @@ import { mockTx } from '@aztec/stdlib/testing';
             await tx1.getTxHash(),
             await tx2.getTxHash()
         ]));
+        await expect(pool.getPendingTxCount()).resolves.toEqual(2);
     });
     it('Only marks txs as pending if they are known', async ()=>{
         const tx1 = await mockTx(1);
@@ -107,6 +111,7 @@ import { mockTx } from '@aztec/stdlib/testing';
         await expect(pool.getPendingTxHashes()).resolves.toEqual([
             await tx1.getTxHash()
         ]); // tx2 is not in the pool
+        await expect(pool.getPendingTxCount()).resolves.toEqual(1);
     });
     it('Returns all transactions in the pool', async ()=>{
         const tx1 = await mockTx(1);
@@ -124,6 +129,7 @@ import { mockTx } from '@aztec/stdlib/testing';
             tx2,
             tx3
         ]));
+        await expect(pool.getPendingTxCount()).resolves.toEqual(3);
     });
     it('Returns all txHashes in the pool', async ()=>{
         const tx1 = await mockTx(1);
@@ -135,12 +141,14 @@ import { mockTx } from '@aztec/stdlib/testing';
             tx3
         ]);
         const poolTxHashes = await pool.getAllTxHashes();
+        const expectedHashes = await Promise.all([
+            tx1,
+            tx2,
+            tx3
+        ].map((tx)=>tx.getTxHash()));
         expect(poolTxHashes).toHaveLength(3);
-        expect(poolTxHashes).toEqual(expect.arrayContaining([
-            await tx1.getTxHash(),
-            await tx2.getTxHash(),
-            await tx3.getTxHash()
-        ]));
+        expect(poolTxHashes).toEqual(expect.arrayContaining(expectedHashes));
+        await expect(pool.getPendingTxCount()).resolves.toEqual(3);
     });
     it('Returns txs by their hash', async ()=>{
         const tx1 = await mockTx(1);

package/dest/msg_validators/tx_validator/block_header_validator.js

@@ -11,7 +11,7 @@ export class BlockHeaderTxValidator {
             await tx.data.constants.historicalHeader.hash()
         ]);
         if (index === undefined) {
-            this.#log.warn(`Rejecting tx ${await Tx.getHash(tx)} for referencing an unknown block header`);
+            this.#log.verbose(`Rejecting tx ${await Tx.getHash(tx)} for referencing an unknown block header`);
             return {
                 result: 'invalid',
                 reason: [

package/dest/msg_validators/tx_validator/data_validator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"data_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/tx_validator/data_validator.ts"],"names":[],"mappings":"AAGA,OAAO,EAQL,EAAE,EACF,KAAK,kBAAkB,EACvB,KAAK,WAAW,EACjB,MAAM,kBAAkB,CAAC;AAE1B,qBAAa,eAAgB,YAAW,WAAW,CAAC,EAAE,CAAC;;IAG/C,UAAU,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,kBAAkB,CAAC;CAmFtD"}
+{"version":3,"file":"data_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/tx_validator/data_validator.ts"],"names":[],"mappings":"AAGA,OAAO,EAQL,EAAE,EACF,KAAK,kBAAkB,EACvB,KAAK,WAAW,EACjB,MAAM,kBAAkB,CAAC;AAE1B,qBAAa,eAAgB,YAAW,WAAW,CAAC,EAAE,CAAC;;IAG/C,UAAU,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,kBAAkB,CAAC;CAyFtD"}

package/dest/msg_validators/tx_validator/data_validator.js

@@ -12,7 +12,7 @@ export class DataTxValidator {
     async #hasCorrectCalldata(tx) {
         if (tx.publicFunctionCalldata.length !== tx.numberOfPublicCalls()) {
             const reason = TX_ERROR_CALLDATA_COUNT_MISMATCH;
-            this.#log.warn(`Rejecting tx ${await Tx.getHash(tx)}. Reason: ${reason}. Expected ${tx.numberOfPublicCalls()}. Got ${tx.publicFunctionCalldata.length}.`);
+            this.#log.verbose(`Rejecting tx ${await Tx.getHash(tx)}. Reason: ${reason}. Expected ${tx.numberOfPublicCalls()}. Got ${tx.publicFunctionCalldata.length}.`);
             return {
                 result: 'invalid',
                 reason: [
@@ -22,7 +22,7 @@ export class DataTxValidator {
         }
         if (tx.getTotalPublicCalldataCount() > MAX_FR_CALLDATA_TO_ALL_ENQUEUED_CALLS) {
             const reason = TX_ERROR_CALLDATA_COUNT_TOO_LARGE;
-            this.#log.warn(`Rejecting tx ${await Tx.getHash(tx)}. Reason: ${reason}. Expected no greater than ${MAX_FR_CALLDATA_TO_ALL_ENQUEUED_CALLS} fields. Got ${tx.getTotalPublicCalldataCount()}.`);
+            this.#log.verbose(`Rejecting tx ${await Tx.getHash(tx)}. Reason: ${reason}. Expected no greater than ${MAX_FR_CALLDATA_TO_ALL_ENQUEUED_CALLS} fields. Got ${tx.getTotalPublicCalldataCount()}.`);
             return {
                 result: 'invalid',
                 reason: [
@@ -36,7 +36,7 @@ export class DataTxValidator {
             const hash = await computeCalldataHash(calldata);
             if (!hash.equals(request.calldataHash)) {
                 const reason = TX_ERROR_INCORRECT_CALLDATA;
-                this.#log.warn(`Rejecting tx ${await Tx.getHash(tx)}. Reason: ${reason}. Call request index: ${i}.`);
+                this.#log.verbose(`Rejecting tx ${await Tx.getHash(tx)}. Reason: ${reason}. Call request index: ${i}.`);
                 return {
                     result: 'invalid',
                     reason: [
@@ -51,9 +51,8 @@ export class DataTxValidator {
     }
     async #hasCorrectContractClassLogs(tx) {
         const contractClassLogsHashes = tx.data.getNonEmptyContractClassLogsHashes();
-        const hashedContractClasslogs = await Promise.all(tx.contractClassLogs.map((l)=>l.hash()));
-        if (contractClassLogsHashes.length !== hashedContractClasslogs.length) {
-            this.#log.warn(`Rejecting tx ${await Tx.getHash(tx)} because of mismatched number of contract class logs. Expected ${contractClassLogsHashes.length}. Got ${hashedContractClasslogs.length}.`);
+        if (contractClassLogsHashes.length !== tx.contractClassLogs.length) {
+            this.#log.verbose(`Rejecting tx ${await Tx.getHash(tx)} because of mismatched number of contract class logs. Expected ${contractClassLogsHashes.length}. Got ${tx.contractClassLogs.length}.`);
             return {
                 result: 'invalid',
                 reason: [
@@ -61,12 +60,13 @@ export class DataTxValidator {
                 ]
             };
         }
+        const expectedHashes = await Promise.all(tx.contractClassLogs.map((l)=>l.hash()));
         for (const [i, logHash] of contractClassLogsHashes.entries()){
-            const hashedLog = hashedContractClasslogs[i];
-            if (!logHash.value.equals(hashedLog)) {
-                if (hashedContractClasslogs.some((l)=>logHash.value.equals(l))) {
-                    const matchingLogIndex = hashedContractClasslogs.findIndex((l)=>logHash.value.equals(l));
-                    this.#log.warn(`Rejecting tx ${await Tx.getHash(tx)} because of mismatched contract class logs indices. Expected ${i} from the kernel's log hashes. Got ${matchingLogIndex} in the tx.`);
+            const hash = expectedHashes[i];
+            if (!logHash.value.equals(hash)) {
+                if (expectedHashes.some((h)=>logHash.value.equals(h))) {
+                    const matchingLogIndex = expectedHashes.findIndex((l)=>logHash.value.equals(l));
+                    this.#log.verbose(`Rejecting tx ${await Tx.getHash(tx)} because of mismatched contract class logs indices. Expected ${i} from the kernel's log hashes. Got ${matchingLogIndex} in the tx.`);
                     return {
                         result: 'invalid',
                         reason: [
@@ -74,7 +74,7 @@ export class DataTxValidator {
                         ]
                     };
                 } else {
-                    this.#log.warn(`Rejecting tx ${await Tx.getHash(tx)} because of mismatched contract class logs. Expected hash ${logHash.value} from the kernels. Got ${hashedLog} in the tx.`);
+                    this.#log.verbose(`Rejecting tx ${await Tx.getHash(tx)} because of mismatched contract class logs. Expected hash ${logHash.value} from the kernels. Got ${hash} in the tx.`);
                     return {
                         result: 'invalid',
                         reason: [
@@ -83,8 +83,9 @@ export class DataTxValidator {
                     };
                 }
             }
-            if (logHash.logHash.length !== tx.contractClassLogs[i].getEmittedLength()) {
-                this.#log.warn(`Rejecting tx ${await Tx.getHash(tx)} because of mismatched contract class logs length. Expected ${logHash.logHash.length} from the kernel's log hashes. Got ${tx.contractClassLogs[i].getEmittedLength()} in the tx.`);
+            const expectedMinLength = 1 + tx.contractClassLogs[i].fields.findLastIndex((f)=>!f.isZero());
+            if (logHash.logHash.length < expectedMinLength) {
+                this.#log.verbose(`Rejecting tx ${await Tx.getHash(tx)} because of incorrect contract class log length. Expected the length to be at least ${expectedMinLength}. Got ${logHash.logHash.length}.`);
                 return {
                     result: 'invalid',
                     reason: [

package/dest/msg_validators/tx_validator/double_spend_validator.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { type AnyTx, type TxValidationResult, type TxValidator } from '@aztec/stdlib/tx';
 export interface NullifierSource {
     nullifiersExist: (nullifiers: Buffer[]) => Promise<boolean[]>;

package/dest/msg_validators/tx_validator/double_spend_validator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"double_spend_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/tx_validator/double_spend_validator.ts"],"names":[],"mappings":";;AACA,OAAO,EACL,KAAK,KAAK,EAIV,KAAK,kBAAkB,EACvB,KAAK,WAAW,EACjB,MAAM,kBAAkB,CAAC;AAE1B,MAAM,WAAW,eAAe;IAC9B,eAAe,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;CAC/D;AAED,qBAAa,sBAAsB,CAAC,CAAC,SAAS,KAAK,CAAE,YAAW,WAAW,CAAC,CAAC,CAAC;;gBAIhE,eAAe,EAAE,eAAe;IAItC,UAAU,CAAC,EAAE,EAAE,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC;CAiBrD"}
+{"version":3,"file":"double_spend_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/tx_validator/double_spend_validator.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,KAAK,EAIV,KAAK,kBAAkB,EACvB,KAAK,WAAW,EACjB,MAAM,kBAAkB,CAAC;AAE1B,MAAM,WAAW,eAAe;IAC9B,eAAe,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;CAC/D;AAED,qBAAa,sBAAsB,CAAC,CAAC,SAAS,KAAK,CAAE,YAAW,WAAW,CAAC,CAAC,CAAC;;gBAIhE,eAAe,EAAE,eAAe;IAItC,UAAU,CAAC,EAAE,EAAE,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC;CAiBrD"}

package/dest/msg_validators/tx_validator/double_spend_validator.js

@@ -11,7 +11,7 @@ export class DoubleSpendTxValidator {
         // Ditch this tx if it has repeated nullifiers
         const uniqueNullifiers = new Set(nullifiers);
         if (uniqueNullifiers.size !== nullifiers.length) {
-            this.#log.warn(`Rejecting tx ${await Tx.getHash(tx)} for emitting duplicate nullifiers`);
+            this.#log.verbose(`Rejecting tx ${await Tx.getHash(tx)} for emitting duplicate nullifiers`);
             return {
                 result: 'invalid',
                 reason: [
@@ -20,7 +20,7 @@ export class DoubleSpendTxValidator {
             };
         }
         if ((await this.#nullifierSource.nullifiersExist(nullifiers.map((n)=>n.toBuffer()))).some(Boolean)) {
-            this.#log.warn(`Rejecting tx ${await Tx.getHash(tx)} for repeating a nullifier`);
+            this.#log.verbose(`Rejecting tx ${await Tx.getHash(tx)} for repeating a nullifier`);
             return {
                 result: 'invalid',
                 reason: [

package/dest/msg_validators/tx_validator/factory.d.ts

@@ -0,0 +1,14 @@
+import { Fr } from '@aztec/foundation/fields';
+import type { ContractDataSource } from '@aztec/stdlib/contract';
+import type { GasFees } from '@aztec/stdlib/gas';
+import type { AllowedElement, ClientProtocolCircuitVerifier, WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
+import { PeerErrorSeverity } from '@aztec/stdlib/p2p';
+import type { Tx, TxValidationResult } from '@aztec/stdlib/tx';
+export interface MessageValidator {
+    validator: {
+        validateTx(tx: Tx): Promise<TxValidationResult>;
+    };
+    severity: PeerErrorSeverity;
+}
+export declare function createTxMessageValidators(blockNumber: number, worldStateSynchronizer: WorldStateSynchronizer, gasFees: GasFees, l1ChainId: number, rollupVersion: number, protocolContractTreeRoot: Fr, contractDataSource: ContractDataSource, proofVerifier: ClientProtocolCircuitVerifier, allowedInSetup?: AllowedElement[]): Record<string, MessageValidator>[];
+//# sourceMappingURL=factory.d.ts.map

package/dest/msg_validators/tx_validator/factory.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/tx_validator/factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAG9C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,KAAK,EACV,cAAc,EACd,6BAA6B,EAC7B,sBAAsB,EACvB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAEtD,OAAO,KAAK,EAAE,EAAE,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAW/D,MAAM,WAAW,gBAAgB;IAC/B,SAAS,EAAE;QACT,UAAU,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;KACjD,CAAC;IACF,QAAQ,EAAE,iBAAiB,CAAC;CAC7B;AAED,wBAAgB,yBAAyB,CACvC,WAAW,EAAE,MAAM,EACnB,sBAAsB,EAAE,sBAAsB,EAC9C,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,EACrB,wBAAwB,EAAE,EAAE,EAC5B,kBAAkB,EAAE,kBAAkB,EACtC,aAAa,EAAE,6BAA6B,EAC5C,cAAc,GAAE,cAAc,EAAO,GACpC,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,EAAE,CAqDpC"}