@aztec/prover-node 0.85.0-nightly.20250424 → 0.86.0

package/dest/config.d.ts

@@ -15,9 +15,9 @@ type SpecificProverNodeConfig = {
     proverNodeMaxPendingJobs: number;
     proverNodePollingIntervalMs: number;
     proverNodeMaxParallelBlocksPerEpoch: number;
-    txGatheringTimeoutMs: number;
     txGatheringIntervalMs: number;
-    txGatheringMaxParallelRequests: number;
+    txGatheringBatchSize: number;
+    txGatheringMaxParallelRequestsPerNode: number;
 };
 export declare const proverNodeConfigMappings: ConfigMappingsType<ProverNodeConfig>;
 export declare function getProverNodeConfigFromEnv(): ProverNodeConfig;

package/dest/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAA0B,MAAM,wBAAwB,CAAC;AACrF,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACpE,OAAO,EAAE,KAAK,kBAAkB,EAAwD,MAAM,iBAAiB,CAAC;AAChH,OAAO,EAAE,KAAK,kBAAkB,EAA6C,MAAM,0BAA0B,CAAC;AAE9G,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,wBAAwB,CAAC;AAClF,OAAO,EAAE,KAAK,gBAAgB,EAA4B,MAAM,wBAAwB,CAAC;AACzF,OAAO,EAAE,KAAK,SAAS,EAAqB,MAAM,mBAAmB,CAAC;AACtE,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EAGxB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,sBAAsB,EAG5B,MAAM,6BAA6B,CAAC;AACrC,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,cAAc,EAGpB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,KAAK,gBAAgB,EAA4B,MAAM,2BAA2B,CAAC;AAE5F,OAAO,EAAE,KAAK,wBAAwB,EAAoC,MAAM,iCAAiC,CAAC;AAElH,MAAM,MAAM,gBAAgB,GAAG,cAAc,GAC3C,sBAAsB,GACtB,SAAS,GACT,gBAAgB,GAChB,eAAe,GACf,cAAc,GACd,eAAe,GACf,wBAAwB,GACxB,gBAAgB,GAChB,wBAAwB,GACxB,kBAAkB,CAAC;AAErB,KAAK,wBAAwB,GAAG;IAC9B,wBAAwB,EAAE,MAAM,CAAC;IACjC,2BAA2B,EAAE,MAAM,CAAC;IACpC,mCAAmC,EAAE,MAAM,CAAC;IAC5C,oBAAoB,EAAE,MAAM,CAAC;IAC7B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,8BAA8B,EAAE,MAAM,CAAC;CACxC,CAAC;AAmCF,eAAO,MAAM,wBAAwB,EAAE,kBAAkB,CAAC,gBAAgB,CAYzE,CAAC;AAEF,wBAAgB,0BAA0B,IAAI,gBAAgB,CAE7D;AAED,wBAAgB,gCAAgC,IAAI,kBAAkB,CAIrE;AAED,wBAAgB,+BAA+B,IAAI,iBAAiB,GAAG,QAAQ,GAAG,UAAU,CAK3F;AAED,wBAAgB,aAAa,CAAC,UAAU,EAAE,gBAAgB,GAAG,gBAAgB,GAAG,kBAAkB,CAMjG"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAA0B,MAAM,wBAAwB,CAAC;AACrF,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACpE,OAAO,EAAE,KAAK,kBAAkB,EAAwD,MAAM,iBAAiB,CAAC;AAChH,OAAO,EAAE,KAAK,kBAAkB,EAA6C,MAAM,0BAA0B,CAAC;AAE9G,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,wBAAwB,CAAC;AAClF,OAAO,EAAE,KAAK,gBAAgB,EAA4B,MAAM,wBAAwB,CAAC;AACzF,OAAO,EAAE,KAAK,SAAS,EAAqB,MAAM,mBAAmB,CAAC;AACtE,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EAGxB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,sBAAsB,EAG5B,MAAM,6BAA6B,CAAC;AACrC,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,cAAc,EAGpB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,KAAK,gBAAgB,EAA4B,MAAM,2BAA2B,CAAC;AAE5F,OAAO,EAAE,KAAK,wBAAwB,EAAoC,MAAM,iCAAiC,CAAC;AAElH,MAAM,MAAM,gBAAgB,GAAG,cAAc,GAC3C,sBAAsB,GACtB,SAAS,GACT,gBAAgB,GAChB,eAAe,GACf,cAAc,GACd,eAAe,GACf,wBAAwB,GACxB,gBAAgB,GAChB,wBAAwB,GACxB,kBAAkB,CAAC;AAErB,KAAK,wBAAwB,GAAG;IAC9B,wBAAwB,EAAE,MAAM,CAAC;IACjC,2BAA2B,EAAE,MAAM,CAAC;IACpC,mCAAmC,EAAE,MAAM,CAAC;IAC5C,qBAAqB,EAAE,MAAM,CAAC;IAC9B,oBAAoB,EAAE,MAAM,CAAC;IAC7B,qCAAqC,EAAE,MAAM,CAAC;CAC/C,CAAC;AAmCF,eAAO,MAAM,wBAAwB,EAAE,kBAAkB,CAAC,gBAAgB,CAYzE,CAAC;AAEF,wBAAgB,0BAA0B,IAAI,gBAAgB,CAE7D;AAED,wBAAgB,gCAAgC,IAAI,kBAAkB,CAIrE;AAED,wBAAgB,+BAA+B,IAAI,iBAAiB,GAAG,QAAQ,GAAG,UAAU,CAK3F;AAED,wBAAgB,aAAa,CAAC,UAAU,EAAE,gBAAgB,GAAG,gBAAgB,GAAG,kBAAkB,CAMjG"}

package/dest/config.js

@@ -26,19 +26,19 @@ const specificProverNodeConfigMappings = {
         description: 'The Maximum number of blocks to process in parallel while proving an epoch',
         ...numberConfigHelper(32)
     },
-    txGatheringTimeoutMs: {
-        env: 'PROVER_NODE_TX_GATHERING_TIMEOUT_MS',
-        description: 'The maximum amount of time to wait for tx data to be available',
-        ...numberConfigHelper(60_000)
-    },
     txGatheringIntervalMs: {
         env: 'PROVER_NODE_TX_GATHERING_INTERVAL_MS',
         description: 'How often to check that tx data is available',
         ...numberConfigHelper(1_000)
     },
-    txGatheringMaxParallelRequests: {
-        env: 'PROVER_NODE_TX_GATHERING_MAX_PARALLEL_REQUESTS',
-        description: 'How many txs to load up a time',
+    txGatheringBatchSize: {
+        env: 'PROVER_NODE_TX_GATHERING_BATCH_SIZE',
+        description: 'How many transactions to gather from a node in a single request',
+        ...numberConfigHelper(10)
+    },
+    txGatheringMaxParallelRequestsPerNode: {
+        env: 'PROVER_NODE_TX_GATHERING_MAX_PARALLEL_REQUESTS_PER_NODE',
+        description: 'How many tx requests to make in parallel to each node',
         ...numberConfigHelper(100)
     }
 };

package/dest/factory.d.ts

@@ -3,17 +3,18 @@ import { type BlobSinkClientInterface } from '@aztec/blob-sink/client';
 import { L1TxUtils } from '@aztec/ethereum';
 import { type Logger } from '@aztec/foundation/log';
 import type { DataStoreConfig } from '@aztec/kv-store/config';
-import type { ProverCoordination, ProvingJobBroker } from '@aztec/stdlib/interfaces/server';
+import type { ProvingJobBroker } from '@aztec/stdlib/interfaces/server';
 import type { PublicDataTreeLeaf } from '@aztec/stdlib/trees';
 import { type TelemetryClient } from '@aztec/telemetry-client';
 import { type ProverNodeConfig } from './config.js';
+import type { TxSource } from './prover-coordination/combined-prover-coordination.js';
 import { ProverNodePublisher } from './prover-node-publisher.js';
 import { ProverNode } from './prover-node.js';
 /** Creates a new prover node given a config. */
 export declare function createProverNode(userConfig: ProverNodeConfig & DataStoreConfig, deps?: {
     telemetry?: TelemetryClient;
     log?: Logger;
-    aztecNodeTxProvider?: ProverCoordination;
+    aztecNodeTxProvider?: TxSource;
     archiver?: Archiver;
     publisher?: ProverNodePublisher;
     blobSinkClient?: BlobSinkClientInterface;

package/dest/factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAAkB,MAAM,iBAAiB,CAAC;AAChE,OAAO,EAAE,KAAK,uBAAuB,EAAwB,MAAM,yBAAyB,CAAC;AAE7F,OAAO,EAAE,SAAS,EAA+D,MAAM,iBAAiB,CAAC;AACzG,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAI9D,OAAO,KAAK,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAC5F,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAGnF,OAAO,EAAE,KAAK,gBAAgB,EAAiB,MAAM,aAAa,CAAC;AAGnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,UAAU,EAA0B,MAAM,kBAAkB,CAAC;AAEtE,gDAAgD;AAChD,wBAAsB,gBAAgB,CACpC,UAAU,EAAE,gBAAgB,GAAG,eAAe,EAC9C,IAAI,GAAE;IACJ,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,mBAAmB,CAAC,EAAE,kBAAkB,CAAC;IACzC,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,SAAS,CAAC,EAAE,mBAAmB,CAAC;IAChC,cAAc,CAAC,EAAE,uBAAuB,CAAC;IACzC,MAAM,CAAC,EAAE,gBAAgB,CAAC;IAC1B,SAAS,CAAC,EAAE,SAAS,CAAC;CAClB,EACN,OAAO,GAAE;IACP,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,CAAC;CACvC,uBAqEP"}
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAAkB,MAAM,iBAAiB,CAAC;AAChE,OAAO,EAAE,KAAK,uBAAuB,EAAwB,MAAM,yBAAyB,CAAC;AAE7F,OAAO,EAAE,SAAS,EAA+D,MAAM,iBAAiB,CAAC;AACzG,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAI9D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAGnF,OAAO,EAAE,KAAK,gBAAgB,EAAiB,MAAM,aAAa,CAAC;AAEnE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uDAAuD,CAAC;AAEtF,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,UAAU,EAA0B,MAAM,kBAAkB,CAAC;AAEtE,gDAAgD;AAChD,wBAAsB,gBAAgB,CACpC,UAAU,EAAE,gBAAgB,GAAG,eAAe,EAC9C,IAAI,GAAE;IACJ,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,mBAAmB,CAAC,EAAE,QAAQ,CAAC;IAC/B,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,SAAS,CAAC,EAAE,mBAAmB,CAAC;IAChC,cAAc,CAAC,EAAE,uBAAuB,CAAC;IACzC,MAAM,CAAC,EAAE,gBAAgB,CAAC;IAC1B,SAAS,CAAC,EAAE,SAAS,CAAC;CAClB,EACN,OAAO,GAAE;IACP,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,CAAC;CACvC,uBAmEP"}

package/dest/factory.js

@@ -45,7 +45,7 @@ import { ProverNode } from './prover-node.js';
     });
     const epochCache = await EpochCache.create(config.l1Contracts.rollupAddress, config);
     // If config.p2pEnabled is true, createProverCoordination will create a p2p client where txs are requested
-    // If config.p2pEnabled is false, createProverCoordination request information from the AztecNode
+    // If config.proverCoordinationNodeUrls is not empty, createProverCoordination will create set of aztec node clients from which txs are requested
     const proverCoordination = await createProverCoordination(config, {
         aztecNodeTxProvider: deps.aztecNodeTxProvider,
         worldStateSynchronizer,
@@ -57,9 +57,7 @@ import { ProverNode } from './prover-node.js';
         maxPendingJobs: config.proverNodeMaxPendingJobs,
         pollingIntervalMs: config.proverNodePollingIntervalMs,
         maxParallelBlocksPerEpoch: config.proverNodeMaxParallelBlocksPerEpoch,
-        txGatheringMaxParallelRequests: config.txGatheringMaxParallelRequests,
-        txGatheringIntervalMs: config.txGatheringIntervalMs,
-        txGatheringTimeoutMs: config.txGatheringTimeoutMs
+        txGatheringIntervalMs: config.txGatheringIntervalMs
     };
     const epochMonitor = await EpochMonitor.create(archiver, proverNodeConfig, telemetry);
     return new ProverNode(prover, publisher, archiver, archiver, archiver, worldStateSynchronizer, proverCoordination, epochMonitor, proverNodeConfig, telemetry);

package/dest/prover-coordination/combined-prover-coordination.d.ts

@@ -0,0 +1,22 @@
+import type { P2P } from '@aztec/p2p';
+import type { P2PClient, ProverCoordination } from '@aztec/stdlib/interfaces/server';
+import { type Tx, TxHash } from '@aztec/stdlib/tx';
+export type CombinedCoordinationOptions = {
+    txGatheringBatchSize: number;
+    txGatheringMaxParallelRequestsPerNode: number;
+};
+export interface TxSource {
+    getTxsByHash(txHashes: TxHash[]): Promise<(Tx | undefined)[]>;
+}
+export declare class CombinedProverCoordination implements ProverCoordination {
+    #private;
+    readonly p2p: P2P | undefined;
+    readonly aztecNodes: TxSource[];
+    private readonly options;
+    private readonly log;
+    constructor(p2p: P2P | undefined, aztecNodes: TxSource[], options?: CombinedCoordinationOptions, log?: import("@aztec/foundation/log").Logger);
+    getP2PClient(): P2PClient | undefined;
+    getTxsByHash(txHashes: TxHash[]): Promise<Tx[]>;
+    gatherTxs(txHashes: TxHash[]): Promise<void>;
+}
+//# sourceMappingURL=combined-prover-coordination.d.ts.map

package/dest/prover-coordination/combined-prover-coordination.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"combined-prover-coordination.d.ts","sourceRoot":"","sources":["../../src/prover-coordination/combined-prover-coordination.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,KAAK,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACrF,OAAO,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAEnD,MAAM,MAAM,2BAA2B,GAAG;IAExC,oBAAoB,EAAE,MAAM,CAAC;IAC7B,qCAAqC,EAAE,MAAM,CAAC;CAC/C,CAAC;AASF,MAAM,WAAW,QAAQ;IACvB,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC,EAAE,GAAG,SAAS,CAAC,EAAE,CAAC,CAAC;CAC/D;AAsCD,qBAAa,0BAA2B,YAAW,kBAAkB;;aAEjD,GAAG,EAAE,GAAG,GAAG,SAAS;aACpB,UAAU,EAAE,QAAQ,EAAE;IACtC,OAAO,CAAC,QAAQ,CAAC,OAAO;IAIxB,OAAO,CAAC,QAAQ,CAAC,GAAG;gBANJ,GAAG,EAAE,GAAG,GAAG,SAAS,EACpB,UAAU,EAAE,QAAQ,EAAE,EACrB,OAAO,GAAE,2BAGzB,EACgB,GAAG,yCAA2D;IAG1E,YAAY,IAAI,SAAS,GAAG,SAAS;IAI/B,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC;IAY/C,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAyE1D"}

package/dest/prover-coordination/combined-prover-coordination.js

@@ -0,0 +1,136 @@
+import { asyncPool } from '@aztec/foundation/async-pool';
+import { createLogger } from '@aztec/foundation/log';
+import { TxHash } from '@aztec/stdlib/tx';
+// Wraps the p2p client into a coordination pool
+class P2PCoordinationPool {
+    p2p;
+    constructor(p2p){
+        this.p2p = p2p;
+    }
+    getTxsByHash(txHashes) {
+        return this.p2p.getTxsByHash(txHashes);
+    }
+    hasTxsInPool(txHashes) {
+        return this.p2p.hasTxsInPool(txHashes);
+    }
+    getTxsByHashFromPool(txHashes) {
+        return this.p2p.getTxsByHashFromPool(txHashes);
+    }
+    addTxs(txs) {
+        return this.p2p.addTxs(txs);
+    }
+}
+// Wraps an in memory tx pool into a coordination pool. Used for testing when no p2p/tx pool is available.
+class InMemoryCoordinationPool {
+    txs = new Map();
+    getTxsByHash(txHashes) {
+        return Promise.resolve(txHashes.map((hash)=>this.txs.get(hash.toString())));
+    }
+    hasTxsInPool(txHashes) {
+        return Promise.resolve(txHashes.map((hash)=>this.txs.has(hash.toString())));
+    }
+    getTxsByHashFromPool(txHashes) {
+        return this.getTxsByHash(txHashes);
+    }
+    async addTxs(txs) {
+        const hashes = await Promise.all(txs.map((tx)=>tx.getTxHash()));
+        txs.forEach((tx, index)=>this.txs.set(hashes[index].toString(), tx));
+    }
+}
+// Class to implement combined transaction retrieval from p2p and any available nodes
+export class CombinedProverCoordination {
+    p2p;
+    aztecNodes;
+    options;
+    log;
+    constructor(p2p, aztecNodes, options = {
+        txGatheringBatchSize: 10,
+        txGatheringMaxParallelRequestsPerNode: 10
+    }, log = createLogger('prover-node:combined-prover-coordination')){
+        this.p2p = p2p;
+        this.aztecNodes = aztecNodes;
+        this.options = options;
+        this.log = log;
+    }
+    getP2PClient() {
+        return this.p2p;
+    }
+    async getTxsByHash(txHashes) {
+        const pool = this.p2p ? new P2PCoordinationPool(this.p2p) : new InMemoryCoordinationPool();
+        await this.#gatherTxs(txHashes, pool);
+        const availability = await pool.hasTxsInPool(txHashes);
+        const notFound = txHashes.filter((_, index)=>!availability[index]);
+        if (notFound.length > 0) {
+            throw new Error(`Could not find txs: ${notFound.map((tx)=>tx.toString())}`);
+        }
+        const txs = await pool.getTxsByHashFromPool(txHashes);
+        return txs.filter((tx)=>tx !== undefined);
+    }
+    async gatherTxs(txHashes) {
+        const pool = this.p2p ? new P2PCoordinationPool(this.p2p) : new InMemoryCoordinationPool();
+        await this.#gatherTxs(txHashes, pool);
+    }
+    async #gatherTxs(txHashes, pool) {
+        const availability = await pool.hasTxsInPool(txHashes);
+        const notFound = txHashes.filter((_, index)=>!availability[index]);
+        const txsToFind = new Set(notFound.map((tx)=>tx.toString()));
+        if (txsToFind.size === 0) {
+            this.log.info(`Check for ${txHashes.length} txs found all in the pool}`);
+            return;
+        }
+        this.log.info(`Check for ${txHashes.length} txs found ${txsToFind.size} missing. Will gather from nodes and p2p`);
+        const originalToFind = txsToFind.size;
+        await this.#gatherTxsFromAllNodes(txsToFind, pool);
+        if (txsToFind.size === 0) {
+            this.log.info(`Found all ${originalToFind} txs directly from nodes`);
+            return;
+        }
+        const toFindFromP2P = txsToFind.size;
+        this.log.verbose(`Gathering ${toFindFromP2P} txs from p2p network`);
+        const foundFromP2P = await pool.getTxsByHash([
+            ...txsToFind
+        ].map((tx)=>TxHash.fromString(tx)));
+        const numFoundFromNodes = originalToFind - toFindFromP2P;
+        const numNotFound = toFindFromP2P - foundFromP2P.length;
+        if (numNotFound === 0) {
+            this.log.info(`Found all ${originalToFind} txs. ${numFoundFromNodes} from nodes, ${foundFromP2P.length} from p2p`);
+            return;
+        }
+        this.log.warn(`Failed to find ${numNotFound} txs from any source. Found ${foundFromP2P.length} from p2p and ${numFoundFromNodes} from nodes`);
+    }
+    async #gatherTxsFromAllNodes(txsToFind, pool) {
+        if (txsToFind.size === 0 || this.aztecNodes.length === 0) {
+            return;
+        }
+        await Promise.all(this.aztecNodes.map((aztecNode)=>this.#gatherTxsFromNode(txsToFind, aztecNode, pool)));
+    }
+    async #gatherTxsFromNode(txsToFind, aztecNode, pool) {
+        const totalTxsRequired = txsToFind.size;
+        // It's possible that the set is empty as we already found the txs
+        if (totalTxsRequired === 0) {
+            return;
+        }
+        let totalTxsGathered = 0;
+        const batches = [];
+        const allTxs = [
+            ...txsToFind
+        ];
+        while(allTxs.length){
+            const batch = allTxs.splice(0, this.options.txGatheringBatchSize);
+            batches.push(batch);
+        }
+        await asyncPool(this.options.txGatheringMaxParallelRequestsPerNode, batches, async (batch)=>{
+            try {
+                const txs = (await aztecNode.getTxsByHash(batch.map((b)=>TxHash.fromString(b)))).filter((tx)=>!!tx);
+                const hashes = await Promise.all(txs.map((tx)=>tx.getTxHash()));
+                await pool.addTxs(txs);
+                hashes.forEach((hash)=>txsToFind.delete(hash.toString()));
+                totalTxsGathered += txs.length;
+            } catch (err) {
+                this.log.error(`Error gathering txs from aztec node: ${err}`);
+                return;
+            }
+        });
+        this.log.verbose(`Gathered ${totalTxsGathered} of ${totalTxsRequired} txs from a node`);
+    }
+}

package/dest/prover-coordination/config.d.ts

@@ -1,6 +1,6 @@
 import { type ConfigMappingsType } from '@aztec/foundation/config';
 export type ProverCoordinationConfig = {
-    proverCoordinationNodeUrl: string | undefined;
+    proverCoordinationNodeUrls: string[];
 };
 export declare const proverCoordinationConfigMappings: ConfigMappingsType<ProverCoordinationConfig>;
 export declare function getTxProviderConfigFromEnv(): ProverCoordinationConfig;

package/dest/prover-coordination/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/prover-coordination/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,kBAAkB,EAAyB,MAAM,0BAA0B,CAAC;AAE1F,MAAM,MAAM,wBAAwB,GAAG;IACrC,yBAAyB,EAAE,MAAM,GAAG,SAAS,CAAC;CAC/C,CAAC;AAEF,eAAO,MAAM,gCAAgC,EAAE,kBAAkB,CAAC,wBAAwB,CAMzF,CAAC;AAEF,wBAAgB,0BAA0B,IAAI,wBAAwB,CAErE"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/prover-coordination/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,kBAAkB,EAAyB,MAAM,0BAA0B,CAAC;AAE1F,MAAM,MAAM,wBAAwB,GAAG;IACrC,0BAA0B,EAAE,MAAM,EAAE,CAAC;CACtC,CAAC;AAEF,eAAO,MAAM,gCAAgC,EAAE,kBAAkB,CAAC,wBAAwB,CAMzF,CAAC;AAEF,wBAAgB,0BAA0B,IAAI,wBAAwB,CAErE"}

package/dest/prover-coordination/config.js

@@ -1,9 +1,9 @@
 import { getConfigFromMappings } from '@aztec/foundation/config';
 export const proverCoordinationConfigMappings = {
-    proverCoordinationNodeUrl: {
-        env: 'PROVER_COORDINATION_NODE_URL',
-        description: 'The URL of the tx provider node',
-        parseEnv: (val)=>val
+    proverCoordinationNodeUrls: {
+        env: 'PROVER_COORDINATION_NODE_URLS',
+        description: 'The URLs of the tx provider nodes',
+        parseEnv: (val)=>val.split(',').map((url)=>url.trim().replace(/\/$/, ''))
     }
 };
 export function getTxProviderConfigFromEnv() {

package/dest/prover-coordination/factory.d.ts

@@ -4,12 +4,13 @@ import type { DataStoreConfig } from '@aztec/kv-store/config';
 import type { ProverCoordination, WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
 import { type TelemetryClient } from '@aztec/telemetry-client';
 import type { ProverNodeConfig } from '../config.js';
+import { type TxSource } from './combined-prover-coordination.js';
 type ProverCoordinationDeps = {
-    aztecNodeTxProvider?: ProverCoordination;
-    worldStateSynchronizer?: WorldStateSynchronizer;
-    archiver?: Archiver | ArchiveSource;
+    aztecNodeTxProvider?: TxSource;
+    worldStateSynchronizer: WorldStateSynchronizer;
+    archiver: Archiver | ArchiveSource;
     telemetry?: TelemetryClient;
-    epochCache?: EpochCache;
+    epochCache: EpochCache;
 };
 /**
  * Creates a prover coordination service.

package/dest/prover-coordination/factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../src/prover-coordination/factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAE/D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAK9D,OAAO,KAAK,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAGlG,OAAO,EAAE,KAAK,eAAe,EAAmB,MAAM,yBAAyB,CAAC;AAEhF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAGrD,KAAK,sBAAsB,GAAG;IAC5B,mBAAmB,CAAC,EAAE,kBAAkB,CAAC;IACzC,sBAAsB,CAAC,EAAE,sBAAsB,CAAC;IAChD,QAAQ,CAAC,EAAE,QAAQ,GAAG,aAAa,CAAC;IACpC,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB,CAAC;AAEF;;;;;GAKG;AACH,wBAAsB,wBAAwB,CAC5C,MAAM,EAAE,gBAAgB,GAAG,eAAe,EAC1C,IAAI,EAAE,sBAAsB,GAC3B,OAAO,CAAC,kBAAkB,CAAC,CAqC7B"}
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../src/prover-coordination/factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAE/D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAK9D,OAAO,KAAK,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAGlG,OAAO,EAAE,KAAK,eAAe,EAAmB,MAAM,yBAAyB,CAAC;AAEhF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAGL,KAAK,QAAQ,EACd,MAAM,mCAAmC,CAAC;AAG3C,KAAK,sBAAsB,GAAG;IAC5B,mBAAmB,CAAC,EAAE,QAAQ,CAAC;IAC/B,sBAAsB,EAAE,sBAAsB,CAAC;IAC/C,QAAQ,EAAE,QAAQ,GAAG,aAAa,CAAC;IACnC,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,UAAU,EAAE,UAAU,CAAC;CACxB,CAAC;AAEF;;;;;GAKG;AACH,wBAAsB,wBAAwB,CAC5C,MAAM,EAAE,gBAAgB,GAAG,eAAe,EAC1C,IAAI,EAAE,sBAAsB,GAC3B,OAAO,CAAC,kBAAkB,CAAC,CA2C7B"}

package/dest/prover-coordination/factory.js

@@ -7,6 +7,7 @@ import { createAztecNodeClient } from '@aztec/stdlib/interfaces/client';
 import { P2PClientType } from '@aztec/stdlib/p2p';
 import { getComponentsVersionsFromConfig } from '@aztec/stdlib/versioning';
 import { makeTracedFetch } from '@aztec/telemetry-client';
+import { CombinedProverCoordination } from './combined-prover-coordination.js';
 /**
  * Creates a prover coordination service.
  * If p2p is enabled, prover coordination is done via p2p.
@@ -14,29 +15,34 @@ import { makeTracedFetch } from '@aztec/telemetry-client';
  * If an aztec node is provided, it is returned directly.
  */ export async function createProverCoordination(config, deps) {
     const log = createLogger('prover-node:prover-coordination');
+    const coordinationConfig = {
+        txGatheringBatchSize: config.txGatheringBatchSize ?? 10,
+        txGatheringMaxParallelRequestsPerNode: config.txGatheringMaxParallelRequestsPerNode ?? 10
+    };
     if (deps.aztecNodeTxProvider) {
         log.info('Using prover coordination via aztec node');
-        return deps.aztecNodeTxProvider;
+        return new CombinedProverCoordination(undefined, [
+            deps.aztecNodeTxProvider
+        ], coordinationConfig);
     }
     if (config.p2pEnabled) {
         log.info('Using prover coordination via p2p');
         if (!deps.archiver || !deps.worldStateSynchronizer || !deps.telemetry || !deps.epochCache) {
             throw new Error('Missing dependencies for p2p prover coordination');
         }
-        const proofVerifier = config.realProofs ? await BBCircuitVerifier.new(config) : new TestCircuitVerifier();
-        const p2pClient = await createP2PClient(P2PClientType.Prover, config, deps.archiver, proofVerifier, deps.worldStateSynchronizer, deps.epochCache, deps.telemetry);
-        await p2pClient.start();
-        return p2pClient;
     }
-    if (config.proverCoordinationNodeUrl) {
-        log.info('Using prover coordination via node url');
+    let nodes = [];
+    if (config.proverCoordinationNodeUrls.length > 0) {
+        log.info('Using prover coordination via node urls');
         const versions = getComponentsVersionsFromConfig(config, protocolContractTreeRoot, getVKTreeRoot());
-        return createAztecNodeClient(config.proverCoordinationNodeUrl, versions, makeTracedFetch([
-            1,
-            2,
-            3
-        ], false));
-    } else {
-        throw new Error(`Aztec Node URL for Tx Provider is not set.`);
+        nodes = config.proverCoordinationNodeUrls.map((url)=>createAztecNodeClient(url, versions, makeTracedFetch([
+                1,
+                2,
+                3
+            ], false)));
     }
+    const proofVerifier = config.realProofs ? await BBCircuitVerifier.new(config) : new TestCircuitVerifier();
+    const p2pClient = await createP2PClient(P2PClientType.Prover, config, deps.archiver, proofVerifier, deps.worldStateSynchronizer, deps.epochCache, deps.telemetry);
+    await p2pClient.start();
+    return new CombinedProverCoordination(p2pClient, nodes, coordinationConfig);
 }

package/dest/prover-node.d.ts

@@ -1,11 +1,9 @@
 import type { Maybe } from '@aztec/foundation/types';
-import type { P2P } from '@aztec/p2p';
 import { PublicProcessorFactory } from '@aztec/simulator/server';
 import type { L2Block, L2BlockSource } from '@aztec/stdlib/block';
 import type { ContractDataSource } from '@aztec/stdlib/contract';
 import { type EpochProverManager, type ProverCoordination, type ProverNodeApi, type Service, type WorldStateSyncStatus, type WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
 import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
-import type { P2PClientType } from '@aztec/stdlib/p2p';
 import type { Tx } from '@aztec/stdlib/tx';
 import { type TelemetryClient, type Traceable, type Tracer } from '@aztec/telemetry-client';
 import { EpochProvingJob, type EpochProvingJobState } from './job/epoch-proving-job.js';
@@ -15,9 +13,7 @@ export type ProverNodeOptions = {
     pollingIntervalMs: number;
     maxPendingJobs: number;
     maxParallelBlocksPerEpoch: number;
-    txGatheringTimeoutMs: number;
     txGatheringIntervalMs: number;
-    txGatheringMaxParallelRequests: number;
 };
 /**
  * An Aztec Prover Node is a standalone process that monitors the unfinalised chain on L1 for unproven blocks,
@@ -32,7 +28,7 @@ export declare class ProverNode implements EpochMonitorHandler, ProverNodeApi, T
     protected readonly l1ToL2MessageSource: L1ToL2MessageSource;
     protected readonly contractDataSource: ContractDataSource;
     protected readonly worldState: WorldStateSynchronizer;
-    protected readonly coordination: ProverCoordination & Maybe<Service>;
+    protected readonly coordination: ProverCoordination;
     protected readonly epochsMonitor: EpochMonitor;
     protected readonly telemetryClient: TelemetryClient;
     private log;
@@ -45,9 +41,9 @@ export declare class ProverNode implements EpochMonitorHandler, ProverNodeApi, T
     private txFetcher;
     private lastBlockNumber;
     readonly tracer: Tracer;
-    constructor(prover: EpochProverManager, publisher: ProverNodePublisher, l2BlockSource: L2BlockSource & Maybe<Service>, l1ToL2MessageSource: L1ToL2MessageSource, contractDataSource: ContractDataSource, worldState: WorldStateSynchronizer, coordination: ProverCoordination & Maybe<Service>, epochsMonitor: EpochMonitor, options?: Partial<ProverNodeOptions>, telemetryClient?: TelemetryClient);
+    constructor(prover: EpochProverManager, publisher: ProverNodePublisher, l2BlockSource: L2BlockSource & Maybe<Service>, l1ToL2MessageSource: L1ToL2MessageSource, contractDataSource: ContractDataSource, worldState: WorldStateSynchronizer, coordination: ProverCoordination, epochsMonitor: EpochMonitor, options?: Partial<ProverNodeOptions>, telemetryClient?: TelemetryClient);
     getProverId(): import("@aztec/foundation/schemas").Fr;
-    getP2P(): P2P<P2PClientType.Prover> | undefined;
+    getP2P(): import("@aztec/stdlib/interfaces/server").P2PClient | undefined;
     /**
      * Handles an epoch being completed by starting a proof for it if there are no active jobs for it.
      * @param epochNumber - The epoch number that was just completed.

package/dest/prover-node.d.ts.map

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

package/dest/prover-node.js

@@ -61,9 +61,7 @@ import { ProverNodeJobMetrics, ProverNodeRewardsMetrics } from './metrics.js';
             pollingIntervalMs: 1_000,
             maxPendingJobs: 100,
             maxParallelBlocksPerEpoch: 32,
-            txGatheringTimeoutMs: 60_000,
             txGatheringIntervalMs: 1_000,
-            txGatheringMaxParallelRequests: 100,
             ...compact(options)
         };
         const meter = telemetryClient.getMeter('ProverNode');
@@ -76,11 +74,7 @@ import { ProverNodeJobMetrics, ProverNodeRewardsMetrics } from './metrics.js';
         return this.prover.getProverId();
     }
     getP2P() {
-        const asP2PClient = this.coordination;
-        if (typeof asP2PClient.isP2PClient === 'function' && asP2PClient.isP2PClient()) {
-            return asP2PClient;
-        }
-        return undefined;
+        return this.coordination.getP2PClient();
     }
     /**
    * Handles an epoch being completed by starting a proof for it if there are no active jobs for it.
@@ -223,7 +217,7 @@ import { ProverNodeJobMetrics, ProverNodeRewardsMetrics } from './metrics.js';
             }
             const txHashes = block.body.txEffects.map((tx)=>tx.txHash);
             this.log.verbose(`Fetching ${txHashes.length} tx hashes for block number ${blockNumber} from coordination`);
-            await this.coordination.getTxsByHash(txHashes); // This stores the txs in the tx pool, no need to persist them here
+            await this.coordination.gatherTxs(txHashes); // This stores the txs in the tx pool, no need to persist them here
             this.lastBlockNumber = blockNumber;
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/prover-node",
-  "version": "0.85.0-nightly.20250424",
+  "version": "0.86.0",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -51,25 +51,25 @@
     ]
   },
   "dependencies": {
-    "@aztec/archiver": "0.85.0-nightly.20250424",
-    "@aztec/bb-prover": "0.85.0-nightly.20250424",
-    "@aztec/blob-sink": "0.85.0-nightly.20250424",
-    "@aztec/constants": "0.85.0-nightly.20250424",
-    "@aztec/epoch-cache": "0.85.0-nightly.20250424",
-    "@aztec/ethereum": "0.85.0-nightly.20250424",
-    "@aztec/foundation": "0.85.0-nightly.20250424",
-    "@aztec/kv-store": "0.85.0-nightly.20250424",
-    "@aztec/l1-artifacts": "0.85.0-nightly.20250424",
-    "@aztec/node-lib": "0.85.0-nightly.20250424",
-    "@aztec/noir-protocol-circuits-types": "0.85.0-nightly.20250424",
-    "@aztec/p2p": "0.85.0-nightly.20250424",
-    "@aztec/protocol-contracts": "0.85.0-nightly.20250424",
-    "@aztec/prover-client": "0.85.0-nightly.20250424",
-    "@aztec/sequencer-client": "0.85.0-nightly.20250424",
-    "@aztec/simulator": "0.85.0-nightly.20250424",
-    "@aztec/stdlib": "0.85.0-nightly.20250424",
-    "@aztec/telemetry-client": "0.85.0-nightly.20250424",
-    "@aztec/world-state": "0.85.0-nightly.20250424",
+    "@aztec/archiver": "0.86.0",
+    "@aztec/bb-prover": "0.86.0",
+    "@aztec/blob-sink": "0.86.0",
+    "@aztec/constants": "0.86.0",
+    "@aztec/epoch-cache": "0.86.0",
+    "@aztec/ethereum": "0.86.0",
+    "@aztec/foundation": "0.86.0",
+    "@aztec/kv-store": "0.86.0",
+    "@aztec/l1-artifacts": "0.86.0",
+    "@aztec/node-lib": "0.86.0",
+    "@aztec/noir-protocol-circuits-types": "0.86.0",
+    "@aztec/p2p": "0.86.0",
+    "@aztec/protocol-contracts": "0.86.0",
+    "@aztec/prover-client": "0.86.0",
+    "@aztec/sequencer-client": "0.86.0",
+    "@aztec/simulator": "0.86.0",
+    "@aztec/stdlib": "0.86.0",
+    "@aztec/telemetry-client": "0.86.0",
+    "@aztec/world-state": "0.86.0",
     "source-map-support": "^0.5.21",
     "tslib": "^2.4.0",
     "viem": "2.23.7"

package/src/config.ts

@@ -44,9 +44,9 @@ type SpecificProverNodeConfig = {
   proverNodeMaxPendingJobs: number;
   proverNodePollingIntervalMs: number;
   proverNodeMaxParallelBlocksPerEpoch: number;
-  txGatheringTimeoutMs: number;
   txGatheringIntervalMs: number;
-  txGatheringMaxParallelRequests: number;
+  txGatheringBatchSize: number;
+  txGatheringMaxParallelRequestsPerNode: number;
 };
 
 const specificProverNodeConfigMappings: ConfigMappingsType<SpecificProverNodeConfig> = {
@@ -65,19 +65,19 @@ const specificProverNodeConfigMappings: ConfigMappingsType<SpecificProverNodeCon
     description: 'The Maximum number of blocks to process in parallel while proving an epoch',
     ...numberConfigHelper(32),
   },
-  txGatheringTimeoutMs: {
-    env: 'PROVER_NODE_TX_GATHERING_TIMEOUT_MS',
-    description: 'The maximum amount of time to wait for tx data to be available',
-    ...numberConfigHelper(60_000),
-  },
   txGatheringIntervalMs: {
     env: 'PROVER_NODE_TX_GATHERING_INTERVAL_MS',
     description: 'How often to check that tx data is available',
     ...numberConfigHelper(1_000),
   },
-  txGatheringMaxParallelRequests: {
-    env: 'PROVER_NODE_TX_GATHERING_MAX_PARALLEL_REQUESTS',
-    description: 'How many txs to load up a time',
+  txGatheringBatchSize: {
+    env: 'PROVER_NODE_TX_GATHERING_BATCH_SIZE',
+    description: 'How many transactions to gather from a node in a single request',
+    ...numberConfigHelper(10),
+  },
+  txGatheringMaxParallelRequestsPerNode: {
+    env: 'PROVER_NODE_TX_GATHERING_MAX_PARALLEL_REQUESTS_PER_NODE',
+    description: 'How many tx requests to make in parallel to each node',
     ...numberConfigHelper(100),
   },
 };

package/src/factory.ts

@@ -7,13 +7,14 @@ import type { DataStoreConfig } from '@aztec/kv-store/config';
 import { trySnapshotSync } from '@aztec/node-lib/actions';
 import { createProverClient } from '@aztec/prover-client';
 import { createAndStartProvingBroker } from '@aztec/prover-client/broker';
-import type { ProverCoordination, ProvingJobBroker } from '@aztec/stdlib/interfaces/server';
+import type { ProvingJobBroker } from '@aztec/stdlib/interfaces/server';
 import type { PublicDataTreeLeaf } from '@aztec/stdlib/trees';
 import { type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client';
 import { createWorldStateSynchronizer } from '@aztec/world-state';
 
 import { type ProverNodeConfig, resolveConfig } from './config.js';
 import { EpochMonitor } from './monitors/epoch-monitor.js';
+import type { TxSource } from './prover-coordination/combined-prover-coordination.js';
 import { createProverCoordination } from './prover-coordination/factory.js';
 import { ProverNodePublisher } from './prover-node-publisher.js';
 import { ProverNode, type ProverNodeOptions } from './prover-node.js';
@@ -24,7 +25,7 @@ export async function createProverNode(
   deps: {
     telemetry?: TelemetryClient;
     log?: Logger;
-    aztecNodeTxProvider?: ProverCoordination;
+    aztecNodeTxProvider?: TxSource;
     archiver?: Archiver;
     publisher?: ProverNodePublisher;
     blobSinkClient?: BlobSinkClientInterface;
@@ -70,7 +71,7 @@ export async function createProverNode(
   const epochCache = await EpochCache.create(config.l1Contracts.rollupAddress, config);
 
   // If config.p2pEnabled is true, createProverCoordination will create a p2p client where txs are requested
-  // If config.p2pEnabled is false, createProverCoordination request information from the AztecNode
+  // If config.proverCoordinationNodeUrls is not empty, createProverCoordination will create set of aztec node clients from which txs are requested
   const proverCoordination = await createProverCoordination(config, {
     aztecNodeTxProvider: deps.aztecNodeTxProvider,
     worldStateSynchronizer,
@@ -83,9 +84,7 @@ export async function createProverNode(
     maxPendingJobs: config.proverNodeMaxPendingJobs,
     pollingIntervalMs: config.proverNodePollingIntervalMs,
     maxParallelBlocksPerEpoch: config.proverNodeMaxParallelBlocksPerEpoch,
-    txGatheringMaxParallelRequests: config.txGatheringMaxParallelRequests,
     txGatheringIntervalMs: config.txGatheringIntervalMs,
-    txGatheringTimeoutMs: config.txGatheringTimeoutMs,
   };
 
   const epochMonitor = await EpochMonitor.create(archiver, proverNodeConfig, telemetry);

package/src/prover-coordination/combined-prover-coordination.ts

@@ -0,0 +1,160 @@
+import { asyncPool } from '@aztec/foundation/async-pool';
+import { createLogger } from '@aztec/foundation/log';
+import type { P2P } from '@aztec/p2p';
+import type { P2PClient, ProverCoordination } from '@aztec/stdlib/interfaces/server';
+import { type Tx, TxHash } from '@aztec/stdlib/tx';
+
+export type CombinedCoordinationOptions = {
+  // These options apply to http tx gathering only
+  txGatheringBatchSize: number;
+  txGatheringMaxParallelRequestsPerNode: number;
+};
+
+interface CoordinationPool {
+  getTxsByHash(txHashes: TxHash[]): Promise<(Tx | undefined)[]>;
+  hasTxsInPool(txHashes: TxHash[]): Promise<boolean[]>;
+  getTxsByHashFromPool(txHashes: TxHash[]): Promise<(Tx | undefined)[]>;
+  addTxs(txs: Tx[]): Promise<void>;
+}
+
+export interface TxSource {
+  getTxsByHash(txHashes: TxHash[]): Promise<(Tx | undefined)[]>;
+}
+
+// Wraps the p2p client into a coordination pool
+class P2PCoordinationPool implements CoordinationPool {
+  constructor(private readonly p2p: P2P) {}
+  getTxsByHash(txHashes: TxHash[]): Promise<(Tx | undefined)[]> {
+    return this.p2p.getTxsByHash(txHashes);
+  }
+  hasTxsInPool(txHashes: TxHash[]): Promise<boolean[]> {
+    return this.p2p.hasTxsInPool(txHashes);
+  }
+  getTxsByHashFromPool(txHashes: TxHash[]): Promise<(Tx | undefined)[]> {
+    return this.p2p.getTxsByHashFromPool(txHashes);
+  }
+  addTxs(txs: Tx[]): Promise<void> {
+    return this.p2p.addTxs(txs);
+  }
+}
+
+// Wraps an in memory tx pool into a coordination pool. Used for testing when no p2p/tx pool is available.
+class InMemoryCoordinationPool implements CoordinationPool {
+  private txs: Map<string, Tx> = new Map();
+  getTxsByHash(txHashes: TxHash[]): Promise<(Tx | undefined)[]> {
+    return Promise.resolve(txHashes.map(hash => this.txs.get(hash.toString())));
+  }
+  hasTxsInPool(txHashes: TxHash[]): Promise<boolean[]> {
+    return Promise.resolve(txHashes.map(hash => this.txs.has(hash.toString())));
+  }
+  getTxsByHashFromPool(txHashes: TxHash[]): Promise<(Tx | undefined)[]> {
+    return this.getTxsByHash(txHashes);
+  }
+  async addTxs(txs: Tx[]): Promise<void> {
+    const hashes = await Promise.all(txs.map(tx => tx.getTxHash()));
+    txs.forEach((tx, index) => this.txs.set(hashes[index].toString(), tx));
+  }
+}
+
+// Class to implement combined transaction retrieval from p2p and any available nodes
+export class CombinedProverCoordination implements ProverCoordination {
+  constructor(
+    public readonly p2p: P2P | undefined,
+    public readonly aztecNodes: TxSource[],
+    private readonly options: CombinedCoordinationOptions = {
+      txGatheringBatchSize: 10,
+      txGatheringMaxParallelRequestsPerNode: 10,
+    },
+    private readonly log = createLogger('prover-node:combined-prover-coordination'),
+  ) {}
+
+  public getP2PClient(): P2PClient | undefined {
+    return this.p2p;
+  }
+
+  public async getTxsByHash(txHashes: TxHash[]): Promise<Tx[]> {
+    const pool = this.p2p ? new P2PCoordinationPool(this.p2p) : new InMemoryCoordinationPool();
+    await this.#gatherTxs(txHashes, pool);
+    const availability = await pool.hasTxsInPool(txHashes);
+    const notFound = txHashes.filter((_, index) => !availability[index]);
+    if (notFound.length > 0) {
+      throw new Error(`Could not find txs: ${notFound.map(tx => tx.toString())}`);
+    }
+    const txs = await pool.getTxsByHashFromPool(txHashes);
+    return txs.filter(tx => tx !== undefined) as Tx[];
+  }
+
+  public async gatherTxs(txHashes: TxHash[]): Promise<void> {
+    const pool = this.p2p ? new P2PCoordinationPool(this.p2p) : new InMemoryCoordinationPool();
+    await this.#gatherTxs(txHashes, pool);
+  }
+
+  async #gatherTxs(txHashes: TxHash[], pool: CoordinationPool): Promise<void> {
+    const availability = await pool.hasTxsInPool(txHashes);
+    const notFound = txHashes.filter((_, index) => !availability[index]);
+    const txsToFind = new Set(notFound.map(tx => tx.toString()));
+    if (txsToFind.size === 0) {
+      this.log.info(`Check for ${txHashes.length} txs found all in the pool}`);
+      return;
+    }
+    this.log.info(`Check for ${txHashes.length} txs found ${txsToFind.size} missing. Will gather from nodes and p2p`);
+    const originalToFind = txsToFind.size;
+    await this.#gatherTxsFromAllNodes(txsToFind, pool);
+    if (txsToFind.size === 0) {
+      this.log.info(`Found all ${originalToFind} txs directly from nodes`);
+      return;
+    }
+    const toFindFromP2P = txsToFind.size;
+    this.log.verbose(`Gathering ${toFindFromP2P} txs from p2p network`);
+    const foundFromP2P = await pool.getTxsByHash([...txsToFind].map(tx => TxHash.fromString(tx)));
+    const numFoundFromNodes = originalToFind - toFindFromP2P;
+    const numNotFound = toFindFromP2P - foundFromP2P.length;
+    if (numNotFound === 0) {
+      this.log.info(
+        `Found all ${originalToFind} txs. ${numFoundFromNodes} from nodes, ${foundFromP2P.length} from p2p`,
+      );
+      return;
+    }
+    this.log.warn(
+      `Failed to find ${numNotFound} txs from any source. Found ${foundFromP2P.length} from p2p and ${numFoundFromNodes} from nodes`,
+    );
+  }
+
+  async #gatherTxsFromAllNodes(txsToFind: Set<string>, pool: CoordinationPool) {
+    if (txsToFind.size === 0 || this.aztecNodes.length === 0) {
+      return;
+    }
+    await Promise.all(this.aztecNodes.map(aztecNode => this.#gatherTxsFromNode(txsToFind, aztecNode, pool)));
+  }
+
+  async #gatherTxsFromNode(txsToFind: Set<string>, aztecNode: TxSource, pool: CoordinationPool) {
+    const totalTxsRequired = txsToFind.size;
+
+    // It's possible that the set is empty as we already found the txs
+    if (totalTxsRequired === 0) {
+      return;
+    }
+    let totalTxsGathered = 0;
+
+    const batches: string[][] = [];
+    const allTxs: string[] = [...txsToFind];
+    while (allTxs.length) {
+      const batch = allTxs.splice(0, this.options.txGatheringBatchSize);
+      batches.push(batch);
+    }
+
+    await asyncPool(this.options.txGatheringMaxParallelRequestsPerNode, batches, async batch => {
+      try {
+        const txs = (await aztecNode.getTxsByHash(batch.map(b => TxHash.fromString(b)))).filter((tx): tx is Tx => !!tx);
+        const hashes = await Promise.all(txs.map(tx => tx.getTxHash()));
+        await pool.addTxs(txs);
+        hashes.forEach(hash => txsToFind.delete(hash.toString()));
+        totalTxsGathered += txs.length;
+      } catch (err) {
+        this.log.error(`Error gathering txs from aztec node: ${err}`);
+        return;
+      }
+    });
+    this.log.verbose(`Gathered ${totalTxsGathered} of ${totalTxsRequired} txs from a node`);
+  }
+}

package/src/prover-coordination/config.ts

@@ -1,14 +1,14 @@
 import { type ConfigMappingsType, getConfigFromMappings } from '@aztec/foundation/config';
 
 export type ProverCoordinationConfig = {
-  proverCoordinationNodeUrl: string | undefined;
+  proverCoordinationNodeUrls: string[];
 };
 
 export const proverCoordinationConfigMappings: ConfigMappingsType<ProverCoordinationConfig> = {
-  proverCoordinationNodeUrl: {
-    env: 'PROVER_COORDINATION_NODE_URL',
-    description: 'The URL of the tx provider node',
-    parseEnv: (val: string) => val,
+  proverCoordinationNodeUrls: {
+    env: 'PROVER_COORDINATION_NODE_URLS',
+    description: 'The URLs of the tx provider nodes',
+    parseEnv: (val: string) => val.split(',').map(url => url.trim().replace(/\/$/, '')),
   },
 };
 

package/src/prover-coordination/factory.ts

@@ -6,21 +6,26 @@ import type { DataStoreConfig } from '@aztec/kv-store/config';
 import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
 import { createP2PClient } from '@aztec/p2p';
 import { protocolContractTreeRoot } from '@aztec/protocol-contracts';
-import { createAztecNodeClient } from '@aztec/stdlib/interfaces/client';
+import { type AztecNode, createAztecNodeClient } from '@aztec/stdlib/interfaces/client';
 import type { ProverCoordination, WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
 import { P2PClientType } from '@aztec/stdlib/p2p';
 import { getComponentsVersionsFromConfig } from '@aztec/stdlib/versioning';
 import { type TelemetryClient, makeTracedFetch } from '@aztec/telemetry-client';
 
 import type { ProverNodeConfig } from '../config.js';
+import {
+  type CombinedCoordinationOptions,
+  CombinedProverCoordination,
+  type TxSource,
+} from './combined-prover-coordination.js';
 
 // We return a reference to the P2P client so that the prover node can stop the service when it shuts down.
 type ProverCoordinationDeps = {
-  aztecNodeTxProvider?: ProverCoordination;
-  worldStateSynchronizer?: WorldStateSynchronizer;
-  archiver?: Archiver | ArchiveSource;
+  aztecNodeTxProvider?: TxSource;
+  worldStateSynchronizer: WorldStateSynchronizer;
+  archiver: Archiver | ArchiveSource;
   telemetry?: TelemetryClient;
-  epochCache?: EpochCache;
+  epochCache: EpochCache;
 };
 
 /**
@@ -35,9 +40,14 @@ export async function createProverCoordination(
 ): Promise<ProverCoordination> {
   const log = createLogger('prover-node:prover-coordination');
 
+  const coordinationConfig: CombinedCoordinationOptions = {
+    txGatheringBatchSize: config.txGatheringBatchSize ?? 10,
+    txGatheringMaxParallelRequestsPerNode: config.txGatheringMaxParallelRequestsPerNode ?? 10,
+  };
+
   if (deps.aztecNodeTxProvider) {
     log.info('Using prover coordination via aztec node');
-    return deps.aztecNodeTxProvider;
+    return new CombinedProverCoordination(undefined, [deps.aztecNodeTxProvider!], coordinationConfig);
   }
 
   if (config.p2pEnabled) {
@@ -46,27 +56,28 @@ export async function createProverCoordination(
     if (!deps.archiver || !deps.worldStateSynchronizer || !deps.telemetry || !deps.epochCache) {
       throw new Error('Missing dependencies for p2p prover coordination');
     }
-
-    const proofVerifier = config.realProofs ? await BBCircuitVerifier.new(config) : new TestCircuitVerifier();
-    const p2pClient = await createP2PClient(
-      P2PClientType.Prover,
-      config,
-      deps.archiver,
-      proofVerifier,
-      deps.worldStateSynchronizer,
-      deps.epochCache,
-      deps.telemetry,
-    );
-    await p2pClient.start();
-
-    return p2pClient;
   }
 
-  if (config.proverCoordinationNodeUrl) {
-    log.info('Using prover coordination via node url');
+  let nodes: AztecNode[] = [];
+  if (config.proverCoordinationNodeUrls.length > 0) {
+    log.info('Using prover coordination via node urls');
     const versions = getComponentsVersionsFromConfig(config, protocolContractTreeRoot, getVKTreeRoot());
-    return createAztecNodeClient(config.proverCoordinationNodeUrl, versions, makeTracedFetch([1, 2, 3], false));
-  } else {
-    throw new Error(`Aztec Node URL for Tx Provider is not set.`);
+    nodes = config.proverCoordinationNodeUrls.map(url =>
+      createAztecNodeClient(url, versions, makeTracedFetch([1, 2, 3], false)),
+    );
   }
+
+  const proofVerifier = config.realProofs ? await BBCircuitVerifier.new(config) : new TestCircuitVerifier();
+  const p2pClient = await createP2PClient(
+    P2PClientType.Prover,
+    config,
+    deps.archiver,
+    proofVerifier,
+    deps.worldStateSynchronizer,
+    deps.epochCache,
+    deps.telemetry,
+  );
+  await p2pClient.start();
+
+  return new CombinedProverCoordination(p2pClient, nodes, coordinationConfig);
 }

package/src/prover-node.ts

@@ -6,7 +6,6 @@ import { createLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';
 import { DateProvider } from '@aztec/foundation/timer';
 import type { Maybe } from '@aztec/foundation/types';
-import type { P2P } from '@aztec/p2p';
 import { PublicProcessorFactory } from '@aztec/simulator/server';
 import type { L2Block, L2BlockSource } from '@aztec/stdlib/block';
 import type { ContractDataSource } from '@aztec/stdlib/contract';
@@ -22,7 +21,6 @@ import {
   tryStop,
 } from '@aztec/stdlib/interfaces/server';
 import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
-import type { P2PClientType } from '@aztec/stdlib/p2p';
 import type { Tx, TxHash } from '@aztec/stdlib/tx';
 import {
   Attributes,
@@ -43,9 +41,7 @@ export type ProverNodeOptions = {
   pollingIntervalMs: number;
   maxPendingJobs: number;
   maxParallelBlocksPerEpoch: number;
-  txGatheringTimeoutMs: number;
   txGatheringIntervalMs: number;
-  txGatheringMaxParallelRequests: number;
 };
 
 /**
@@ -76,7 +72,7 @@ export class ProverNode implements EpochMonitorHandler, ProverNodeApi, Traceable
     protected readonly l1ToL2MessageSource: L1ToL2MessageSource,
     protected readonly contractDataSource: ContractDataSource,
     protected readonly worldState: WorldStateSynchronizer,
-    protected readonly coordination: ProverCoordination & Maybe<Service>,
+    protected readonly coordination: ProverCoordination,
     protected readonly epochsMonitor: EpochMonitor,
     options: Partial<ProverNodeOptions> = {},
     protected readonly telemetryClient: TelemetryClient = getTelemetryClient(),
@@ -91,9 +87,7 @@ export class ProverNode implements EpochMonitorHandler, ProverNodeApi, Traceable
       pollingIntervalMs: 1_000,
       maxPendingJobs: 100,
       maxParallelBlocksPerEpoch: 32,
-      txGatheringTimeoutMs: 60_000,
       txGatheringIntervalMs: 1_000,
-      txGatheringMaxParallelRequests: 100,
       ...compact(options),
     };
 
@@ -116,11 +110,7 @@ export class ProverNode implements EpochMonitorHandler, ProverNodeApi, Traceable
   }
 
   public getP2P() {
-    const asP2PClient = this.coordination as P2P<P2PClientType.Prover>;
-    if (typeof asP2PClient.isP2PClient === 'function' && asP2PClient.isP2PClient()) {
-      return asP2PClient;
-    }
-    return undefined;
+    return this.coordination.getP2PClient();
   }
 
   /**
@@ -299,7 +289,7 @@ export class ProverNode implements EpochMonitorHandler, ProverNodeApi, Traceable
       }
       const txHashes = block.body.txEffects.map(tx => tx.txHash);
       this.log.verbose(`Fetching ${txHashes.length} tx hashes for block number ${blockNumber} from coordination`);
-      await this.coordination.getTxsByHash(txHashes); // This stores the txs in the tx pool, no need to persist them here
+      await this.coordination.gatherTxs(txHashes); // This stores the txs in the tx pool, no need to persist them here
       this.lastBlockNumber = blockNumber;
     }
   }