@aztec/p2p 0.0.1-commit.96bb3f7 → 0.0.1-commit.993d52e

package/dest/services/tx_collection/tx_collection.js

@@ -1,10 +1,13 @@
 import { compactArray } from '@aztec/foundation/collection';
 import { createLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/promise';
+import { sleep } from '@aztec/foundation/sleep';
 import { DateProvider } from '@aztec/foundation/timer';
+import { TxHash } from '@aztec/stdlib/tx';
 import { getTelemetryClient } from '@aztec/telemetry-client';
 import { FastTxCollection } from './fast_tx_collection.js';
-import { SlowTxCollection } from './slow_tx_collection.js';
+import { FileStoreTxCollection } from './file_store_tx_collection.js';
+import { SlowTxCollection, getProofDeadlineForSlot } from './slow_tx_collection.js';
 import { TxCollectionSink } from './tx_collection_sink.js';
 /**
  * Coordinates tx collection from remote RPC nodes and reqresp.
@@ -17,7 +20,7 @@ import { TxCollectionSink } from './tx_collection_sink.js';
  * via events and notifies the slow and fast collection loops to stop collecting that tx, so that we don't
  * collect the same tx multiple times.
  */ export class TxCollection {
-    reqResp;
+    p2pService;
     nodes;
     constants;
     txPool;
@@ -26,21 +29,37 @@ import { TxCollectionSink } from './tx_collection_sink.js';
     log;
     /** Slow collection background loops */ slowCollection;
     /** Fast collection methods */ fastCollection;
+    /** File store collection for slow (mined block) path */ fileStoreSlowCollection;
+    /** File store collection for fast (proposal/proving) path */ fileStoreFastCollection;
     /** Loop for periodically reconciling found transactions from the tx pool in case we missed some */ reconcileFoundTxsLoop;
     /** Handles txs found by the slow and fast collection loops */ txCollectionSink;
     /** Handler for the txs-added event from the tx pool */ handleTxsAddedToPool;
     /** Handler for the txs-added event from the tx collection sink */ handleTxsFound;
-    constructor(reqResp, nodes, constants, txPool, config, dateProvider = new DateProvider(), telemetryClient = getTelemetryClient(), log = createLogger('p2p:tx_collection_service')){
-        this.reqResp = reqResp;
+    /** Whether the service has been started. */ started;
+    /** Whether file store sources are configured. */ hasFileStoreSources;
+    constructor(p2pService, nodes, constants, txPool, config, fileStoreSources = [], dateProvider = new DateProvider(), telemetryClient = getTelemetryClient(), log = createLogger('p2p:tx_collection_service')){
+        this.p2pService = p2pService;
         this.nodes = nodes;
         this.constants = constants;
         this.txPool = txPool;
         this.config = config;
         this.dateProvider = dateProvider;
         this.log = log;
+        this.started = false;
         this.txCollectionSink = new TxCollectionSink(this.txPool, telemetryClient, this.log);
-        this.fastCollection = new FastTxCollection(this.reqResp, this.nodes, this.txCollectionSink, this.config, this.dateProvider, this.log);
-        this.slowCollection = new SlowTxCollection(this.reqResp, this.nodes, this.txCollectionSink, this.fastCollection, constants, this.config, this.dateProvider, this.log);
+        this.fastCollection = new FastTxCollection(this.p2pService, this.nodes, this.txCollectionSink, this.config, this.dateProvider, this.log);
+        this.slowCollection = new SlowTxCollection(this.p2pService.reqResp, this.nodes, this.txCollectionSink, this.fastCollection, constants, this.config, this.dateProvider, this.log);
+        this.hasFileStoreSources = fileStoreSources.length > 0;
+        this.fileStoreSlowCollection = new FileStoreTxCollection(fileStoreSources, this.txCollectionSink, {
+            workerCount: config.txCollectionFileStoreSlowWorkerCount,
+            backoffBaseMs: config.txCollectionFileStoreSlowBackoffBaseMs,
+            backoffMaxMs: config.txCollectionFileStoreSlowBackoffMaxMs
+        }, this.dateProvider, this.log);
+        this.fileStoreFastCollection = new FileStoreTxCollection(fileStoreSources, this.txCollectionSink, {
+            workerCount: config.txCollectionFileStoreFastWorkerCount,
+            backoffBaseMs: config.txCollectionFileStoreFastBackoffBaseMs,
+            backoffMaxMs: config.txCollectionFileStoreFastBackoffMaxMs
+        }, this.dateProvider, this.log);
         this.reconcileFoundTxsLoop = new RunningPromise(()=>this.reconcileFoundTxsWithPool(), this.log, this.config.txCollectionReconcileIntervalMs);
         this.handleTxsFound = (args)=>{
             this.foundTxs(args.txs);
@@ -55,15 +74,21 @@ import { TxCollectionSink } from './tx_collection_sink.js';
         this.txPool.on('txs-added', this.handleTxsAddedToPool);
     }
     /** Starts all collection loops. */ start() {
+        this.started = true;
         this.slowCollection.start();
+        this.fileStoreSlowCollection.start();
+        this.fileStoreFastCollection.start();
         this.reconcileFoundTxsLoop.start();
         // TODO(palla/txs): Collect mined unproven tx hashes for txs we dont have in the pool and populate missingTxs on startup
         return Promise.resolve();
     }
     /** Stops all activity. */ async stop() {
+        this.started = false;
         await Promise.all([
             this.slowCollection.stop(),
             this.fastCollection.stop(),
+            this.fileStoreSlowCollection.stop(),
+            this.fileStoreFastCollection.stop(),
             this.reconcileFoundTxsLoop.stop()
         ]);
         this.txPool.removeListener('txs-added', this.handleTxsAddedToPool);
@@ -79,7 +104,25 @@ import { TxCollectionSink } from './tx_collection_sink.js';
         return this.constants;
     }
     /** Starts collecting the given tx hashes for the given L2Block in the slow loop */ startCollecting(block, txHashes) {
-        return this.slowCollection.startCollecting(block, txHashes);
+        this.slowCollection.startCollecting(block, txHashes);
+        // Delay file store collection to give P2P methods time to find txs first
+        if (this.hasFileStoreSources) {
+            const context = {
+                type: 'mined',
+                block
+            };
+            const deadline = getProofDeadlineForSlot(block.header.getSlot(), this.constants);
+            sleep(this.config.txCollectionFileStoreSlowDelayMs).then(()=>{
+                if (this.started) {
+                    // Only queue txs that are still missing after the delay
+                    const stillMissing = new Set(this.slowCollection.getMissingTxHashes().map((h)=>h.toString()));
+                    const remaining = txHashes.filter((h)=>stillMissing.has(h.toString()));
+                    if (remaining.length > 0) {
+                        this.fileStoreSlowCollection.startCollecting(remaining, context, deadline);
+                    }
+                }
+            }).catch((err)=>this.log.error('Error in file store slow delay', err));
+        }
     }
     /** Collects the set of txs for the given block proposal as fast as possible */ collectFastForProposal(blockProposal, blockNumber, txHashes, opts) {
         return this.collectFastFor({
@@ -95,11 +138,36 @@ import { TxCollectionSink } from './tx_collection_sink.js';
         }, txHashes, opts);
     }
     /** Collects the set of txs for the given proposal or block as fast as possible */ collectFastFor(input, txHashes, opts) {
+        const hashes = txHashes.map((h)=>typeof h === 'string' ? TxHash.fromString(h) : h);
+        // Delay file store collection to give P2P methods time to find txs first
+        if (this.hasFileStoreSources) {
+            const context = this.getAddContextForInput(input);
+            sleep(this.config.txCollectionFileStoreFastDelayMs).then(()=>{
+                if (this.started) {
+                    this.fileStoreFastCollection.startCollecting(hashes, context, opts.deadline);
+                }
+            }).catch((err)=>this.log.error('Error in file store fast delay', err));
+        }
         return this.fastCollection.collectFastFor(input, txHashes, opts);
     }
+    /** Returns the TxAddContext for the given fast collection request input */ getAddContextForInput(input) {
+        if (input.type === 'proposal') {
+            return {
+                type: 'proposal',
+                blockHeader: input.blockProposal.blockHeader
+            };
+        } else {
+            return {
+                type: 'mined',
+                block: input.block
+            };
+        }
+    }
     /** Mark the given txs as found. Stops collecting them. */ foundTxs(txs) {
         this.slowCollection.foundTxs(txs);
         this.fastCollection.foundTxs(txs);
+        this.fileStoreSlowCollection.foundTxs(txs);
+        this.fileStoreFastCollection.foundTxs(txs);
     }
     /**
    * Stop collecting all txs for blocks less than or requal to the block number specified.
@@ -107,6 +175,8 @@ import { TxCollectionSink } from './tx_collection_sink.js';
    */ stopCollectingForBlocksUpTo(blockNumber) {
         this.slowCollection.stopCollectingForBlocksUpTo(blockNumber);
         this.fastCollection.stopCollectingForBlocksUpTo(blockNumber);
+        this.fileStoreSlowCollection.clearPending();
+        this.fileStoreFastCollection.clearPending();
     }
     /**
    * Stop collecting all txs for blocks greater than the block number specified.
@@ -114,6 +184,8 @@ import { TxCollectionSink } from './tx_collection_sink.js';
    */ stopCollectingForBlocksAfter(blockNumber) {
         this.slowCollection.stopCollectingForBlocksAfter(blockNumber);
         this.fastCollection.stopCollectingForBlocksAfter(blockNumber);
+        this.fileStoreSlowCollection.clearPending();
+        this.fileStoreFastCollection.clearPending();
     }
     /** Every now and then, check if the pool has received one of the txs we are looking for, just to catch any race conditions */ async reconcileFoundTxsWithPool() {
         const missingTxHashes = this.slowCollection.getMissingTxHashes();

package/dest/services/tx_collection/tx_collection_sink.d.ts

@@ -1,10 +1,20 @@
 import type { Logger } from '@aztec/foundation/log';
 import type { TypedEventEmitter } from '@aztec/foundation/types';
-import { Tx, type TxHash } from '@aztec/stdlib/tx';
+import type { L2Block } from '@aztec/stdlib/block';
+import type { BlockHeader, Tx } from '@aztec/stdlib/tx';
 import type { TelemetryClient } from '@aztec/telemetry-client';
-import type { TxPool, TxPoolEvents } from '../../mem_pools/tx_pool/tx_pool.js';
+import type { TxPoolV2, TxPoolV2Events } from '../../mem_pools/index.js';
 import type { CollectionMethod } from './tx_collection.js';
-declare const TxCollectionSink_base: new () => TypedEventEmitter<TxPoolEvents>;
+import type { TxSourceCollectionResult } from './tx_source.js';
+/** Context determining how collected txs should be added to the pool. */
+export type TxAddContext = {
+    type: 'proposal';
+    blockHeader: BlockHeader;
+} | {
+    type: 'mined';
+    block: L2Block;
+};
+declare const TxCollectionSink_base: new () => TypedEventEmitter<TxPoolV2Events>;
 /**
  * Executes collection requests from the fast and slow collection loops, and handles collected txs
  * by adding them to the tx pool and emitting events, as well as handling logging and metrics.
@@ -13,13 +23,13 @@ export declare class TxCollectionSink extends TxCollectionSink_base {
     private readonly txPool;
     private readonly log;
     private readonly instrumentation;
-    constructor(txPool: TxPool, telemetryClient: TelemetryClient, log: Logger);
-    collect(collectValidTxsFn: (txHashes: TxHash[]) => Promise<(Tx | undefined)[]>, requested: TxHash[], info: Record<string, any> & {
+    constructor(txPool: TxPoolV2, telemetryClient: TelemetryClient, log: Logger);
+    collect(collectValidTxsFn: () => Promise<TxSourceCollectionResult>, requested: string[], info: Record<string, any> & {
         description: string;
         method: CollectionMethod;
-    }): Promise<{
+    }, context: TxAddContext): Promise<{
         txs: Tx[];
-        requested: TxHash[];
+        requested: string[];
         duration: number;
     } | {
         txs: Tx[];
@@ -27,4 +37,4 @@ export declare class TxCollectionSink extends TxCollectionSink_base {
     private foundTxs;
 }
 export {};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfY29sbGVjdGlvbl9zaW5rLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc2VydmljZXMvdHhfY29sbGVjdGlvbi90eF9jb2xsZWN0aW9uX3NpbmsudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFcEQsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUNqRSxPQUFPLEVBQUUsRUFBRSxFQUFFLEtBQUssTUFBTSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDbkQsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFJL0QsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLFlBQVksRUFBRSxNQUFNLG9DQUFvQyxDQUFDO0FBRS9FLE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sb0JBQW9CLENBQUM7O0FBRTNEOzs7R0FHRztBQUNILHFCQUFhLGdCQUFpQixTQUFRLHFCQUEyRDtJQUk3RixPQUFPLENBQUMsUUFBUSxDQUFDLE1BQU07SUFFdkIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxHQUFHO0lBTHRCLE9BQU8sQ0FBQyxRQUFRLENBQUMsZUFBZSxDQUE4QjtJQUU5RCxZQUNtQixNQUFNLEVBQUUsTUFBTSxFQUMvQixlQUFlLEVBQUUsZUFBZSxFQUNmLEdBQUcsRUFBRSxNQUFNLEVBSTdCO0lBRVksT0FBTyxDQUNsQixpQkFBaUIsRUFBRSxDQUFDLFFBQVEsRUFBRSxNQUFNLEVBQUUsS0FBSyxPQUFPLENBQUMsQ0FBQyxFQUFFLEdBQUcsU0FBUyxDQUFDLEVBQUUsQ0FBQyxFQUN0RSxTQUFTLEVBQUUsTUFBTSxFQUFFLEVBQ25CLElBQUksRUFBRSxNQUFNLENBQUMsTUFBTSxFQUFFLEdBQUcsQ0FBQyxHQUFHO1FBQUUsV0FBVyxFQUFFLE1BQU0sQ0FBQztRQUFDLE1BQU0sRUFBRSxnQkFBZ0IsQ0FBQTtLQUFFOzs7Ozs7T0F1RTlFO1lBRWEsUUFBUTtDQXdCdkIifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfY29sbGVjdGlvbl9zaW5rLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc2VydmljZXMvdHhfY29sbGVjdGlvbi90eF9jb2xsZWN0aW9uX3NpbmsudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFcEQsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUNqRSxPQUFPLEtBQUssRUFBRSxPQUFPLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNuRCxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsRUFBRSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDeEQsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFJL0QsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLGNBQWMsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBRXpFLE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDM0QsT0FBTyxLQUFLLEVBQUUsd0JBQXdCLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUUvRCx5RUFBeUU7QUFDekUsTUFBTSxNQUFNLFlBQVksR0FBRztJQUFFLElBQUksRUFBRSxVQUFVLENBQUM7SUFBQyxXQUFXLEVBQUUsV0FBVyxDQUFBO0NBQUUsR0FBRztJQUFFLElBQUksRUFBRSxPQUFPLENBQUM7SUFBQyxLQUFLLEVBQUUsT0FBTyxDQUFBO0NBQUUsQ0FBQzs7QUFFOUc7OztHQUdHO0FBQ0gscUJBQWEsZ0JBQWlCLFNBQVEscUJBQTZEO0lBSS9GLE9BQU8sQ0FBQyxRQUFRLENBQUMsTUFBTTtJQUV2QixPQUFPLENBQUMsUUFBUSxDQUFDLEdBQUc7SUFMdEIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxlQUFlLENBQThCO0lBRTlELFlBQ21CLE1BQU0sRUFBRSxRQUFRLEVBQ2pDLGVBQWUsRUFBRSxlQUFlLEVBQ2YsR0FBRyxFQUFFLE1BQU0sRUFJN0I7SUFFWSxPQUFPLENBQ2xCLGlCQUFpQixFQUFFLE1BQU0sT0FBTyxDQUFDLHdCQUF3QixDQUFDLEVBQzFELFNBQVMsRUFBRSxNQUFNLEVBQUUsRUFDbkIsSUFBSSxFQUFFLE1BQU0sQ0FBQyxNQUFNLEVBQUUsR0FBRyxDQUFDLEdBQUc7UUFBRSxXQUFXLEVBQUUsTUFBTSxDQUFDO1FBQUMsTUFBTSxFQUFFLGdCQUFnQixDQUFBO0tBQUUsRUFDN0UsT0FBTyxFQUFFLFlBQVk7Ozs7OztPQXdEdEI7WUFFYSxRQUFRO0NBNkJ2QiJ9

package/dest/services/tx_collection/tx_collection_sink.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tx_collection_sink.d.ts","sourceRoot":"","sources":["../../../src/services/tx_collection/tx_collection_sink.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EAAE,EAAE,EAAE,KAAK,MAAM,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAI/D,OAAO,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAE/E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;;AAE3D;;;GAGG;AACH,qBAAa,gBAAiB,SAAQ,qBAA2D;IAI7F,OAAO,CAAC,QAAQ,CAAC,MAAM;IAEvB,OAAO,CAAC,QAAQ,CAAC,GAAG;IALtB,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA8B;IAE9D,YACmB,MAAM,EAAE,MAAM,EAC/B,eAAe,EAAE,eAAe,EACf,GAAG,EAAE,MAAM,EAI7B;IAEY,OAAO,CAClB,iBAAiB,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC,CAAC,EAAE,GAAG,SAAS,CAAC,EAAE,CAAC,EACtE,SAAS,EAAE,MAAM,EAAE,EACnB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,gBAAgB,CAAA;KAAE;;;;;;OAuE9E;YAEa,QAAQ;CAwBvB"}
+{"version":3,"file":"tx_collection_sink.d.ts","sourceRoot":"","sources":["../../../src/services/tx_collection/tx_collection_sink.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,EAAE,WAAW,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAI/D,OAAO,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAEzE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAE/D,yEAAyE;AACzE,MAAM,MAAM,YAAY,GAAG;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,WAAW,EAAE,WAAW,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,CAAC;;AAE9G;;;GAGG;AACH,qBAAa,gBAAiB,SAAQ,qBAA6D;IAI/F,OAAO,CAAC,QAAQ,CAAC,MAAM;IAEvB,OAAO,CAAC,QAAQ,CAAC,GAAG;IALtB,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA8B;IAE9D,YACmB,MAAM,EAAE,QAAQ,EACjC,eAAe,EAAE,eAAe,EACf,GAAG,EAAE,MAAM,EAI7B;IAEY,OAAO,CAClB,iBAAiB,EAAE,MAAM,OAAO,CAAC,wBAAwB,CAAC,EAC1D,SAAS,EAAE,MAAM,EAAE,EACnB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,gBAAgB,CAAA;KAAE,EAC7E,OAAO,EAAE,YAAY;;;;;;OAwDtB;YAEa,QAAQ;CA6BvB"}

package/dest/services/tx_collection/tx_collection_sink.js

@@ -12,46 +12,37 @@ import { TxCollectionInstrumentation } from './instrumentation.js';
         super(), this.txPool = txPool, this.log = log;
         this.instrumentation = new TxCollectionInstrumentation(telemetryClient, 'TxCollection');
     }
-    async collect(collectValidTxsFn, requested, info) {
+    async collect(collectValidTxsFn, requested, info, context) {
         this.log.trace(`Requesting ${requested.length} txs via ${info.description}`, {
             ...info,
-            requestedTxs: requested.map((t)=>t.toString())
+            requestedTxs: requested
         });
         // Execute collection function and measure the time taken, catching any errors.
-        const [duration, txs] = await elapsed(async ()=>{
+        const [duration, { validTxs, invalidTxHashes }] = await elapsed(async ()=>{
             try {
-                const response = await collectValidTxsFn(requested);
-                return response.filter((tx)=>tx !== undefined);
+                return await collectValidTxsFn();
             } catch (err) {
                 this.log.error(`Error collecting txs via ${info.description}`, err, {
                     ...info,
-                    requestedTxs: requested.map((hash)=>hash.toString())
+                    requestedTxs: requested
                 });
-                return [];
+                return {
+                    validTxs: [],
+                    invalidTxHashes: []
+                };
             }
         });
-        if (txs.length === 0) {
+        if (validTxs.length === 0 && invalidTxHashes.length === 0) {
             this.log.trace(`No txs found via ${info.description}`, {
                 ...info,
-                requestedTxs: requested.map((t)=>t.toString())
+                requestedTxs: requested
             });
             return {
-                txs,
+                txs: validTxs,
                 requested,
                 duration
             };
         }
-        // Validate tx hashes for all collected txs from external sources
-        const validTxs = [];
-        const invalidTxHashes = [];
-        await Promise.all(txs.map(async (tx)=>{
-            const isValid = await tx.validateTxHash();
-            if (isValid) {
-                validTxs.push(tx);
-            } else {
-                invalidTxHashes.push(tx.getTxHash().toString());
-            }
-        }));
         if (invalidTxHashes.length > 0) {
             this.log.warn(`Rejecting ${invalidTxHashes.length} txs with invalid hashes from ${info.description}`, {
                 ...info,
@@ -61,7 +52,7 @@ import { TxCollectionInstrumentation } from './instrumentation.js';
         if (validTxs.length === 0) {
             this.log.trace(`No valid txs found via ${info.description} after validation`, {
                 ...info,
-                requestedTxs: requested.map((t)=>t.toString()),
+                requestedTxs: requested,
                 invalidTxHashes
             });
             return {
@@ -74,26 +65,32 @@ import { TxCollectionInstrumentation } from './instrumentation.js';
             ...info,
             duration,
             txs: validTxs.map((t)=>t.getTxHash().toString()),
-            requestedTxs: requested.map((t)=>t.toString()),
+            requestedTxs: requested,
             rejectedCount: invalidTxHashes.length
         });
         return await this.foundTxs(validTxs, {
             ...info,
             duration
-        });
+        }, context);
     }
-    async foundTxs(txs, info) {
+    async foundTxs(txs, info, context) {
         // Report metrics for the collection
         this.instrumentation.increaseTxsFor(info.method, txs.length, info.duration);
         // Mark txs as found in the slow missing txs set and all fast requests
         this.emit('txs-added', {
             txs
         });
-        // Add the txs to the tx pool (should not fail, but we catch it just in case)
+        // Add the txs to the tx pool using the appropriate method based on context
         try {
-            await this.txPool.addTxs(txs, {
-                source: `tx-collection`
-            });
+            if (context.type === 'mined') {
+                await this.txPool.addMinedTxs(txs, context.block.header, {
+                    source: 'tx-collection'
+                });
+            } else {
+                await this.txPool.addProtectedTxs(txs, context.blockHeader, {
+                    source: 'tx-collection'
+                });
+            }
         } catch (err) {
             this.log.error(`Error adding txs to the pool via ${info.description}`, err, {
                 ...info,

package/dest/services/tx_collection/tx_source.d.ts

@@ -2,9 +2,13 @@ import type { ChainConfig } from '@aztec/stdlib/config';
 import { type AztecNode } from '@aztec/stdlib/interfaces/client';
 import type { Tx, TxHash } from '@aztec/stdlib/tx';
 import { type ComponentsVersions } from '@aztec/stdlib/versioning';
+export type TxSourceCollectionResult = {
+    validTxs: Tx[];
+    invalidTxHashes: string[];
+};
 export interface TxSource {
     getInfo(): string;
-    getTxsByHash(txHashes: TxHash[]): Promise<(Tx | undefined)[]>;
+    getTxsByHash(txHashes: TxHash[]): Promise<TxSourceCollectionResult>;
 }
 export declare class NodeRpcTxSource implements TxSource {
     private readonly client;
@@ -12,7 +16,8 @@ export declare class NodeRpcTxSource implements TxSource {
     constructor(client: Pick<AztecNode, 'getTxsByHash'>, info: string);
     static fromUrl(nodeUrl: string, versions: ComponentsVersions): NodeRpcTxSource;
     getInfo(): string;
-    getTxsByHash(txHashes: TxHash[]): Promise<(Tx | undefined)[]>;
+    getTxsByHash(txHashes: TxHash[]): Promise<TxSourceCollectionResult>;
+    private verifyTxs;
 }
 export declare function createNodeRpcTxSources(urls: string[], chainConfig: ChainConfig): NodeRpcTxSource[];
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfc291cmNlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc2VydmljZXMvdHhfY29sbGVjdGlvbi90eF9zb3VyY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDeEQsT0FBTyxFQUFFLEtBQUssU0FBUyxFQUF5QixNQUFNLGlDQUFpQyxDQUFDO0FBQ3hGLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUNuRCxPQUFPLEVBQUUsS0FBSyxrQkFBa0IsRUFBbUMsTUFBTSwwQkFBMEIsQ0FBQztBQUdwRyxNQUFNLFdBQVcsUUFBUTtJQUN2QixPQUFPLElBQUksTUFBTSxDQUFDO0lBQ2xCLFlBQVksQ0FBQyxRQUFRLEVBQUUsTUFBTSxFQUFFLEdBQUcsT0FBTyxDQUFDLENBQUMsRUFBRSxHQUFHLFNBQVMsQ0FBQyxFQUFFLENBQUMsQ0FBQztDQUMvRDtBQUVELHFCQUFhLGVBQWdCLFlBQVcsUUFBUTtJQUU1QyxPQUFPLENBQUMsUUFBUSxDQUFDLE1BQU07SUFDdkIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxJQUFJO0lBRnZCLFlBQ21CLE1BQU0sRUFBRSxJQUFJLENBQUMsU0FBUyxFQUFFLGNBQWMsQ0FBQyxFQUN2QyxJQUFJLEVBQUUsTUFBTSxFQUMzQjtJQUVKLE9BQWMsT0FBTyxDQUFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsUUFBUSxFQUFFLGtCQUFrQixHQUFHLGVBQWUsQ0FHcEY7SUFFTSxPQUFPLFdBRWI7SUFFTSxZQUFZLENBQUMsUUFBUSxFQUFFLE1BQU0sRUFBRSxHQUFHLE9BQU8sQ0FBQyxDQUFDLEVBQUUsR0FBRyxTQUFTLENBQUMsRUFBRSxDQUFDLENBRW5FO0NBQ0Y7QUFFRCx3QkFBZ0Isc0JBQXNCLENBQUMsSUFBSSxFQUFFLE1BQU0sRUFBRSxFQUFFLFdBQVcsRUFBRSxXQUFXLHFCQUc5RSJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfc291cmNlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc2VydmljZXMvdHhfY29sbGVjdGlvbi90eF9zb3VyY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDeEQsT0FBTyxFQUFFLEtBQUssU0FBUyxFQUF5QixNQUFNLGlDQUFpQyxDQUFDO0FBQ3hGLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUNuRCxPQUFPLEVBQUUsS0FBSyxrQkFBa0IsRUFBbUMsTUFBTSwwQkFBMEIsQ0FBQztBQUdwRyxNQUFNLE1BQU0sd0JBQXdCLEdBQUc7SUFBRSxRQUFRLEVBQUUsRUFBRSxFQUFFLENBQUM7SUFBQyxlQUFlLEVBQUUsTUFBTSxFQUFFLENBQUE7Q0FBRSxDQUFDO0FBRXJGLE1BQU0sV0FBVyxRQUFRO0lBQ3ZCLE9BQU8sSUFBSSxNQUFNLENBQUM7SUFDbEIsWUFBWSxDQUFDLFFBQVEsRUFBRSxNQUFNLEVBQUUsR0FBRyxPQUFPLENBQUMsd0JBQXdCLENBQUMsQ0FBQztDQUNyRTtBQUVELHFCQUFhLGVBQWdCLFlBQVcsUUFBUTtJQUU1QyxPQUFPLENBQUMsUUFBUSxDQUFDLE1BQU07SUFDdkIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxJQUFJO0lBRnZCLFlBQ21CLE1BQU0sRUFBRSxJQUFJLENBQUMsU0FBUyxFQUFFLGNBQWMsQ0FBQyxFQUN2QyxJQUFJLEVBQUUsTUFBTSxFQUMzQjtJQUVKLE9BQWMsT0FBTyxDQUFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsUUFBUSxFQUFFLGtCQUFrQixHQUFHLGVBQWUsQ0FHcEY7SUFFTSxPQUFPLFdBRWI7SUFFWSxZQUFZLENBQUMsUUFBUSxFQUFFLE1BQU0sRUFBRSxHQUFHLE9BQU8sQ0FBQyx3QkFBd0IsQ0FBQyxDQUUvRTtZQUVhLFNBQVM7Q0FnQnhCO0FBRUQsd0JBQWdCLHNCQUFzQixDQUFDLElBQUksRUFBRSxNQUFNLEVBQUUsRUFBRSxXQUFXLEVBQUUsV0FBVyxxQkFHOUUifQ==

package/dest/services/tx_collection/tx_source.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tx_source.d.ts","sourceRoot":"","sources":["../../../src/services/tx_collection/tx_source.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,KAAK,SAAS,EAAyB,MAAM,iCAAiC,CAAC;AACxF,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,KAAK,kBAAkB,EAAmC,MAAM,0BAA0B,CAAC;AAGpG,MAAM,WAAW,QAAQ;IACvB,OAAO,IAAI,MAAM,CAAC;IAClB,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC,EAAE,GAAG,SAAS,CAAC,EAAE,CAAC,CAAC;CAC/D;AAED,qBAAa,eAAgB,YAAW,QAAQ;IAE5C,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,IAAI;IAFvB,YACmB,MAAM,EAAE,IAAI,CAAC,SAAS,EAAE,cAAc,CAAC,EACvC,IAAI,EAAE,MAAM,EAC3B;IAEJ,OAAc,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,kBAAkB,GAAG,eAAe,CAGpF;IAEM,OAAO,WAEb;IAEM,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC,EAAE,GAAG,SAAS,CAAC,EAAE,CAAC,CAEnE;CACF;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,WAAW,qBAG9E"}
+{"version":3,"file":"tx_source.d.ts","sourceRoot":"","sources":["../../../src/services/tx_collection/tx_source.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,KAAK,SAAS,EAAyB,MAAM,iCAAiC,CAAC;AACxF,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,KAAK,kBAAkB,EAAmC,MAAM,0BAA0B,CAAC;AAGpG,MAAM,MAAM,wBAAwB,GAAG;IAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;IAAC,eAAe,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AAErF,MAAM,WAAW,QAAQ;IACvB,OAAO,IAAI,MAAM,CAAC;IAClB,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC;CACrE;AAED,qBAAa,eAAgB,YAAW,QAAQ;IAE5C,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,IAAI;IAFvB,YACmB,MAAM,EAAE,IAAI,CAAC,SAAS,EAAE,cAAc,CAAC,EACvC,IAAI,EAAE,MAAM,EAC3B;IAEJ,OAAc,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,kBAAkB,GAAG,eAAe,CAGpF;IAEM,OAAO,WAEb;IAEY,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAE/E;YAEa,SAAS;CAgBxB;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,WAAW,qBAG9E"}

package/dest/services/tx_collection/tx_source.js

@@ -21,8 +21,25 @@ export class NodeRpcTxSource {
     getInfo() {
         return this.info;
     }
-    getTxsByHash(txHashes) {
-        return this.client.getTxsByHash(txHashes);
+    async getTxsByHash(txHashes) {
+        return this.verifyTxs(await this.client.getTxsByHash(txHashes));
+    }
+    async verifyTxs(txs) {
+        // Validate tx hashes for all collected txs from external sources
+        const validTxs = [];
+        const invalidTxHashes = [];
+        await Promise.all(txs.map(async (tx)=>{
+            const isValid = await tx.validateTxHash();
+            if (isValid) {
+                validTxs.push(tx);
+            } else {
+                invalidTxHashes.push(tx.getTxHash().toString());
+            }
+        }));
+        return {
+            validTxs: validTxs,
+            invalidTxHashes: invalidTxHashes
+        };
     }
 }
 export function createNodeRpcTxSources(urls, chainConfig) {

package/dest/services/tx_file_store/config.d.ts

@@ -0,0 +1,16 @@
+import { type ConfigMappingsType } from '@aztec/foundation/config';
+/**
+ * Configuration for the TxFileStore service.
+ */
+export type TxFileStoreConfig = {
+    /** URL for uploading txs to file storage (s3://, gs://, file://) */
+    txFileStoreUrl?: string;
+    /** Max concurrent uploads */
+    txFileStoreUploadConcurrency: number;
+    /** Max queue size to prevent unbounded memory growth */
+    txFileStoreMaxQueueSize: number;
+    /** Enable tx file store upload */
+    txFileStoreEnabled: boolean;
+};
+export declare const txFileStoreConfigMappings: ConfigMappingsType<TxFileStoreConfig>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc2VydmljZXMvdHhfZmlsZV9zdG9yZS9jb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEtBQUssa0JBQWtCLEVBQTJDLE1BQU0sMEJBQTBCLENBQUM7QUFFNUc7O0dBRUc7QUFDSCxNQUFNLE1BQU0saUJBQWlCLEdBQUc7SUFDOUIsb0VBQW9FO0lBQ3BFLGNBQWMsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUN4Qiw2QkFBNkI7SUFDN0IsNEJBQTRCLEVBQUUsTUFBTSxDQUFDO0lBQ3JDLHdEQUF3RDtJQUN4RCx1QkFBdUIsRUFBRSxNQUFNLENBQUM7SUFDaEMsa0NBQWtDO0lBQ2xDLGtCQUFrQixFQUFFLE9BQU8sQ0FBQztDQUM3QixDQUFDO0FBRUYsZUFBTyxNQUFNLHlCQUF5QixFQUFFLGtCQUFrQixDQUFDLGlCQUFpQixDQW9CM0UsQ0FBQyJ9

package/dest/services/tx_file_store/config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/services/tx_file_store/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,kBAAkB,EAA2C,MAAM,0BAA0B,CAAC;AAE5G;;GAEG;AACH,MAAM,MAAM,iBAAiB,GAAG;IAC9B,oEAAoE;IACpE,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,6BAA6B;IAC7B,4BAA4B,EAAE,MAAM,CAAC;IACrC,wDAAwD;IACxD,uBAAuB,EAAE,MAAM,CAAC;IAChC,kCAAkC;IAClC,kBAAkB,EAAE,OAAO,CAAC;CAC7B,CAAC;AAEF,eAAO,MAAM,yBAAyB,EAAE,kBAAkB,CAAC,iBAAiB,CAoB3E,CAAC"}

package/dest/services/tx_file_store/config.js

@@ -0,0 +1,22 @@
+import { booleanConfigHelper, numberConfigHelper } from '@aztec/foundation/config';
+export const txFileStoreConfigMappings = {
+    txFileStoreUrl: {
+        env: 'TX_FILE_STORE_URL',
+        description: 'URL for uploading txs to file storage (s3://, gs://, file://)'
+    },
+    txFileStoreUploadConcurrency: {
+        env: 'TX_FILE_STORE_UPLOAD_CONCURRENCY',
+        description: 'Maximum number of concurrent tx uploads',
+        ...numberConfigHelper(10)
+    },
+    txFileStoreMaxQueueSize: {
+        env: 'TX_FILE_STORE_MAX_QUEUE_SIZE',
+        description: 'Maximum queue size for pending uploads (oldest dropped when exceeded)',
+        ...numberConfigHelper(1000)
+    },
+    txFileStoreEnabled: {
+        env: 'TX_FILE_STORE_ENABLED',
+        description: 'Enable uploading transactions to file storage',
+        ...booleanConfigHelper(false)
+    }
+};

package/dest/services/tx_file_store/index.d.ts

@@ -0,0 +1,4 @@
+export { TxFileStore } from './tx_file_store.js';
+export { TxFileStoreInstrumentation } from './instrumentation.js';
+export { type TxFileStoreConfig, txFileStoreConfigMappings } from './config.js';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zZXJ2aWNlcy90eF9maWxlX3N0b3JlL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNqRCxPQUFPLEVBQUUsMEJBQTBCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUNsRSxPQUFPLEVBQUUsS0FBSyxpQkFBaUIsRUFBRSx5QkFBeUIsRUFBRSxNQUFNLGFBQWEsQ0FBQyJ9

package/dest/services/tx_file_store/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/services/tx_file_store/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,0BAA0B,EAAE,MAAM,sBAAsB,CAAC;AAClE,OAAO,EAAE,KAAK,iBAAiB,EAAE,yBAAyB,EAAE,MAAM,aAAa,CAAC"}

package/dest/services/tx_file_store/index.js

@@ -0,0 +1,3 @@
+export { TxFileStore } from './tx_file_store.js';
+export { TxFileStoreInstrumentation } from './instrumentation.js';
+export { txFileStoreConfigMappings } from './config.js';

package/dest/services/tx_file_store/instrumentation.d.ts

@@ -0,0 +1,15 @@
+import { type TelemetryClient } from '@aztec/telemetry-client';
+/** Instrumentation for the TxFileStore service. */
+export declare class TxFileStoreInstrumentation {
+    private uploadsSuccess;
+    private uploadsFailed;
+    private uploadsSkipped;
+    private uploadDuration;
+    private queueSize;
+    constructor(client: TelemetryClient, name: string);
+    recordUploadSuccess(durationMs: number): void;
+    recordUploadFailed(): void;
+    recordUploadSkipped(): void;
+    recordQueueSize(size: number): void;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5zdHJ1bWVudGF0aW9uLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc2VydmljZXMvdHhfZmlsZV9zdG9yZS9pbnN0cnVtZW50YXRpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUF1QyxLQUFLLGVBQWUsRUFBc0IsTUFBTSx5QkFBeUIsQ0FBQztBQUV4SCxtREFBbUQ7QUFDbkQscUJBQWEsMEJBQTBCO0lBQ3JDLE9BQU8sQ0FBQyxjQUFjLENBQWdCO0lBQ3RDLE9BQU8sQ0FBQyxhQUFhLENBQWdCO0lBQ3JDLE9BQU8sQ0FBQyxjQUFjLENBQWdCO0lBQ3RDLE9BQU8sQ0FBQyxjQUFjLENBQVk7SUFDbEMsT0FBTyxDQUFDLFNBQVMsQ0FBUTtJQUV6QixZQUFZLE1BQU0sRUFBRSxlQUFlLEVBQUUsSUFBSSxFQUFFLE1BQU0sRUFPaEQ7SUFFRCxtQkFBbUIsQ0FBQyxVQUFVLEVBQUUsTUFBTSxRQUdyQztJQUVELGtCQUFrQixTQUVqQjtJQUVELG1CQUFtQixTQUVsQjtJQUVELGVBQWUsQ0FBQyxJQUFJLEVBQUUsTUFBTSxRQUUzQjtDQUNGIn0=

package/dest/services/tx_file_store/instrumentation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"instrumentation.d.ts","sourceRoot":"","sources":["../../../src/services/tx_file_store/instrumentation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuC,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAExH,mDAAmD;AACnD,qBAAa,0BAA0B;IACrC,OAAO,CAAC,cAAc,CAAgB;IACtC,OAAO,CAAC,aAAa,CAAgB;IACrC,OAAO,CAAC,cAAc,CAAgB;IACtC,OAAO,CAAC,cAAc,CAAY;IAClC,OAAO,CAAC,SAAS,CAAQ;IAEzB,YAAY,MAAM,EAAE,eAAe,EAAE,IAAI,EAAE,MAAM,EAOhD;IAED,mBAAmB,CAAC,UAAU,EAAE,MAAM,QAGrC;IAED,kBAAkB,SAEjB;IAED,mBAAmB,SAElB;IAED,eAAe,CAAC,IAAI,EAAE,MAAM,QAE3B;CACF"}

package/dest/services/tx_file_store/instrumentation.js

@@ -0,0 +1,29 @@
+import { Metrics } from '@aztec/telemetry-client';
+/** Instrumentation for the TxFileStore service. */ export class TxFileStoreInstrumentation {
+    uploadsSuccess;
+    uploadsFailed;
+    uploadsSkipped;
+    uploadDuration;
+    queueSize;
+    constructor(client, name){
+        const meter = client.getMeter(name);
+        this.uploadsSuccess = meter.createUpDownCounter(Metrics.TX_FILE_STORE_UPLOADS_SUCCESS);
+        this.uploadsFailed = meter.createUpDownCounter(Metrics.TX_FILE_STORE_UPLOADS_FAILED);
+        this.uploadsSkipped = meter.createUpDownCounter(Metrics.TX_FILE_STORE_UPLOADS_SKIPPED);
+        this.uploadDuration = meter.createHistogram(Metrics.TX_FILE_STORE_UPLOAD_DURATION);
+        this.queueSize = meter.createGauge(Metrics.TX_FILE_STORE_QUEUE_SIZE);
+    }
+    recordUploadSuccess(durationMs) {
+        this.uploadsSuccess.add(1);
+        this.uploadDuration.record(durationMs);
+    }
+    recordUploadFailed() {
+        this.uploadsFailed.add(1);
+    }
+    recordUploadSkipped() {
+        this.uploadsSkipped.add(1);
+    }
+    recordQueueSize(size) {
+        this.queueSize.record(size);
+    }
+}

package/dest/services/tx_file_store/tx_file_store.d.ts

@@ -0,0 +1,48 @@
+import { type Logger } from '@aztec/foundation/log';
+import { type FileStore } from '@aztec/stdlib/file-store';
+import { type TelemetryClient } from '@aztec/telemetry-client';
+import type { TxPoolV2 } from '../../mem_pools/index.js';
+import type { TxFileStoreConfig } from './config.js';
+/**
+ * Uploads validated transactions to a file store as a fallback retrieval mechanism.
+ * Listens to TxPool txs-added events and uploads txs asynchronously with bounded concurrency.
+ */
+export declare class TxFileStore {
+    private readonly fileStore;
+    private readonly txPool;
+    private readonly config;
+    private readonly instrumentation;
+    private readonly log;
+    private readonly basePath;
+    private uploadQueue;
+    private activeUploads;
+    private readonly queueProcessor;
+    private readonly handleTxsAdded;
+    /** Recently uploaded tx hashes for deduplication. */
+    private recentUploads;
+    private recentUploadsOrder;
+    private readonly maxRecentUploads;
+    private constructor();
+    /**
+     * Creates and initializes the file store.
+     * @param txPool - The transaction pool to listen to.
+     * @param config - The file store configuration.
+     * @param log - Optional logger.
+     * @param telemetry - Optional telemetry client.
+     * @param fileStoreOverride - Optional FileStore for testing (bypasses createFileStore).
+     * @returns The file store instance, or undefined if not configured/enabled.
+     */
+    static create(txPool: TxPoolV2, config: TxFileStoreConfig, basePath: string, log?: Logger, telemetry?: TelemetryClient, fileStoreOverride?: FileStore): Promise<TxFileStore | undefined>;
+    /** Starts listening to TxPool events and uploading txs. */
+    start(): void;
+    /** Stops listening and waits for pending uploads to complete. */
+    stop(): Promise<void>;
+    private enqueueTxs;
+    private processQueueBatch;
+    private uploadTx;
+    /** Waits for all queued and in-flight uploads to complete. For testing. */
+    flush(): Promise<void>;
+    /** Returns the number of pending uploads (queued + in-flight). */
+    getPendingUploadCount(): number;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfZmlsZV9zdG9yZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3NlcnZpY2VzL3R4X2ZpbGVfc3RvcmUvdHhfZmlsZV9zdG9yZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0sdUJBQXVCLENBQUM7QUFJbEUsT0FBTyxFQUFFLEtBQUssU0FBUyxFQUFtQixNQUFNLDBCQUEwQixDQUFDO0FBRTNFLE9BQU8sRUFBRSxLQUFLLGVBQWUsRUFBc0IsTUFBTSx5QkFBeUIsQ0FBQztBQUVuRixPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUN6RCxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUdyRDs7O0dBR0c7QUFDSCxxQkFBYSxXQUFXO0lBWXBCLE9BQU8sQ0FBQyxRQUFRLENBQUMsU0FBUztJQUMxQixPQUFPLENBQUMsUUFBUSxDQUFDLE1BQU07SUFDdkIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxNQUFNO0lBQ3ZCLE9BQU8sQ0FBQyxRQUFRLENBQUMsZUFBZTtJQUNoQyxPQUFPLENBQUMsUUFBUSxDQUFDLEdBQUc7SUFDcEIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxRQUFRO0lBaEIzQixPQUFPLENBQUMsV0FBVyxDQUFZO0lBQy9CLE9BQU8sQ0FBQyxhQUFhLENBQUs7SUFDMUIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxjQUFjLENBQWlCO0lBQ2hELE9BQU8sQ0FBQyxRQUFRLENBQUMsY0FBYyxDQUFpRDtJQUVoRixxREFBcUQ7SUFDckQsT0FBTyxDQUFDLGFBQWEsQ0FBMEI7SUFDL0MsT0FBTyxDQUFDLGtCQUFrQixDQUFnQjtJQUMxQyxPQUFPLENBQUMsUUFBUSxDQUFDLGdCQUFnQixDQUFRO0lBRXpDLE9BQU8sZUFZTjtJQUVEOzs7Ozs7OztPQVFHO0lBQ0gsT0FBYSxNQUFNLENBQ2pCLE1BQU0sRUFBRSxRQUFRLEVBQ2hCLE1BQU0sRUFBRSxpQkFBaUIsRUFDekIsUUFBUSxFQUFFLE1BQU0sRUFDaEIsR0FBRyxHQUFFLE1BQTBDLEVBQy9DLFNBQVMsR0FBRSxlQUFzQyxFQUNqRCxpQkFBaUIsQ0FBQyxFQUFFLFNBQVMsR0FDNUIsT0FBTyxDQUFDLFdBQVcsR0FBRyxTQUFTLENBQUMsQ0FvQmxDO0lBRUQsMkRBQTJEO0lBQ3BELEtBQUssSUFBSSxJQUFJLENBT25CO0lBRUQsaUVBQWlFO0lBQ3BELElBQUksSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLENBSWpDO0lBRUQsT0FBTyxDQUFDLFVBQVU7WUFnQkosaUJBQWlCO1lBWWpCLFFBQVE7SUF1Q3RCLDJFQUEyRTtJQUM5RCxLQUFLLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxDQUlsQztJQUVELGtFQUFrRTtJQUMzRCxxQkFBcUIsSUFBSSxNQUFNLENBRXJDO0NBQ0YifQ==

package/dest/services/tx_file_store/tx_file_store.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tx_file_store.d.ts","sourceRoot":"","sources":["../../../src/services/tx_file_store/tx_file_store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAIlE,OAAO,EAAE,KAAK,SAAS,EAAmB,MAAM,0BAA0B,CAAC;AAE3E,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAEnF,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAGrD;;;GAGG;AACH,qBAAa,WAAW;IAYpB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAhB3B,OAAO,CAAC,WAAW,CAAY;IAC/B,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;IAChD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiD;IAEhF,qDAAqD;IACrD,OAAO,CAAC,aAAa,CAA0B;IAC/C,OAAO,CAAC,kBAAkB,CAAgB;IAC1C,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAQ;IAEzC,OAAO,eAYN;IAED;;;;;;;;OAQG;IACH,OAAa,MAAM,CACjB,MAAM,EAAE,QAAQ,EAChB,MAAM,EAAE,iBAAiB,EACzB,QAAQ,EAAE,MAAM,EAChB,GAAG,GAAE,MAA0C,EAC/C,SAAS,GAAE,eAAsC,EACjD,iBAAiB,CAAC,EAAE,SAAS,GAC5B,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,CAoBlC;IAED,2DAA2D;IACpD,KAAK,IAAI,IAAI,CAOnB;IAED,iEAAiE;IACpD,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAIjC;IAED,OAAO,CAAC,UAAU;YAgBJ,iBAAiB;YAYjB,QAAQ;IAuCtB,2EAA2E;IAC9D,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAIlC;IAED,kEAAkE;IAC3D,qBAAqB,IAAI,MAAM,CAErC;CACF"}