@aztec/prover-node 1.2.0 → 2.0.0-nightly.20250813

package/package.json

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

package/src/config.ts

@@ -26,8 +26,6 @@ import {
 } from '@aztec/sequencer-client/config';
 import { type WorldStateConfig, worldStateConfigMappings } from '@aztec/world-state/config';
 
-import { type ProverCoordinationConfig, proverCoordinationConfigMappings } from './prover-coordination/config.js';
-
 export type ProverNodeConfig = ArchiverConfig &
   ProverClientUserConfig &
   P2PConfig &
@@ -35,7 +33,6 @@ export type ProverNodeConfig = ArchiverConfig &
   PublisherConfig &
   TxSenderConfig &
   DataStoreConfig &
-  ProverCoordinationConfig &
   SharedNodeConfig &
   SpecificProverNodeConfig &
   GenesisStateConfig;
@@ -45,6 +42,7 @@ export type SpecificProverNodeConfig = {
   proverNodePollingIntervalMs: number;
   proverNodeMaxParallelBlocksPerEpoch: number;
   proverNodeFailedEpochStore: string | undefined;
+  txGatheringTimeoutMs: number;
   txGatheringIntervalMs: number;
   txGatheringBatchSize: number;
   txGatheringMaxParallelRequestsPerNode: number;
@@ -86,6 +84,11 @@ const specificProverNodeConfigMappings: ConfigMappingsType<SpecificProverNodeCon
     description: 'How many tx requests to make in parallel to each node',
     ...numberConfigHelper(100),
   },
+  txGatheringTimeoutMs: {
+    env: 'PROVER_NODE_TX_GATHERING_TIMEOUT_MS',
+    description: 'How long to wait for tx data to be available before giving up',
+    ...numberConfigHelper(120_000),
+  },
 };
 
 export const proverNodeConfigMappings: ConfigMappingsType<ProverNodeConfig> = {
@@ -96,7 +99,6 @@ export const proverNodeConfigMappings: ConfigMappingsType<ProverNodeConfig> = {
   ...worldStateConfigMappings,
   ...getPublisherConfigMappings('PROVER'),
   ...getTxSenderConfigMappings('PROVER'),
-  ...proverCoordinationConfigMappings,
   ...specificProverNodeConfigMappings,
   ...genesisStateConfigMappings,
   ...sharedNodeConfigMappings,

package/src/factory.ts

@@ -1,51 +1,62 @@
 import { type Archiver, createArchiver } from '@aztec/archiver';
+import { BBCircuitVerifier, QueuedIVCVerifier, TestCircuitVerifier } from '@aztec/bb-prover';
 import { type BlobSinkClientInterface, createBlobSinkClient } from '@aztec/blob-sink/client';
 import { EpochCache } from '@aztec/epoch-cache';
 import { L1TxUtils, RollupContract, createEthereumChain, createExtendedL1Client } from '@aztec/ethereum';
 import { pick } from '@aztec/foundation/collection';
 import { type Logger, createLogger } from '@aztec/foundation/log';
+import { DateProvider } from '@aztec/foundation/timer';
 import type { DataStoreConfig } from '@aztec/kv-store/config';
 import { trySnapshotSync } from '@aztec/node-lib/actions';
+import { NodeRpcTxSource, createP2PClient } from '@aztec/p2p';
 import { createProverClient } from '@aztec/prover-client';
 import { createAndStartProvingBroker } from '@aztec/prover-client/broker';
-import type { ProvingJobBroker } from '@aztec/stdlib/interfaces/server';
+import type { AztecNode, ProvingJobBroker } from '@aztec/stdlib/interfaces/server';
+import { P2PClientType } from '@aztec/stdlib/p2p';
 import type { PublicDataTreeLeaf } from '@aztec/stdlib/trees';
+import { getPackageVersion } from '@aztec/stdlib/update-checker';
 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 } from './prover-node.js';
 
+export type ProverNodeDeps = {
+  telemetry?: TelemetryClient;
+  log?: Logger;
+  aztecNodeTxProvider?: Pick<AztecNode, 'getTxsByHash'>;
+  archiver?: Archiver;
+  publisher?: ProverNodePublisher;
+  blobSinkClient?: BlobSinkClientInterface;
+  broker?: ProvingJobBroker;
+  l1TxUtils?: L1TxUtils;
+  dateProvider?: DateProvider;
+};
+
 /** Creates a new prover node given a config. */
 export async function createProverNode(
   userConfig: ProverNodeConfig & DataStoreConfig,
-  deps: {
-    telemetry?: TelemetryClient;
-    log?: Logger;
-    aztecNodeTxProvider?: TxSource;
-    archiver?: Archiver;
-    publisher?: ProverNodePublisher;
-    blobSinkClient?: BlobSinkClientInterface;
-    broker?: ProvingJobBroker;
-    l1TxUtils?: L1TxUtils;
-  } = {},
+  deps: ProverNodeDeps = {},
   options: {
     prefilledPublicData?: PublicDataTreeLeaf[];
   } = {},
 ) {
   const config = resolveConfig(userConfig);
   const telemetry = deps.telemetry ?? getTelemetryClient();
+  const dateProvider = deps.dateProvider ?? new DateProvider();
   const blobSinkClient =
     deps.blobSinkClient ?? createBlobSinkClient(config, { logger: createLogger('prover-node:blob-sink:client') });
   const log = deps.log ?? createLogger('prover-node');
 
   await trySnapshotSync(config, log);
 
-  const archiver = deps.archiver ?? (await createArchiver(config, blobSinkClient, { blockUntilSync: true }, telemetry));
+  const epochCache = await EpochCache.create(config.l1Contracts.rollupAddress, config);
+
+  const archiver =
+    deps.archiver ??
+    (await createArchiver(config, { blobSinkClient, epochCache, telemetry, dateProvider }, { blockUntilSync: true }));
   log.verbose(`Created archiver and synced to block ${await archiver.getBlockNumber()}`);
 
   const worldStateConfig = { ...config, worldStateProvenBlocksOnly: false };
@@ -66,20 +77,32 @@ export async function createProverNode(
 
   const rollupContract = new RollupContract(l1Client, config.l1Contracts.rollupAddress.toString());
 
-  const l1TxUtils = deps.l1TxUtils ?? new L1TxUtils(l1Client, log, config);
+  const l1TxUtils = deps.l1TxUtils ?? new L1TxUtils(l1Client, log, deps.dateProvider, config);
   const publisher = deps.publisher ?? new ProverNodePublisher(config, { telemetry, rollupContract, l1TxUtils });
 
-  const epochCache = await EpochCache.create(config.l1Contracts.rollupAddress, config);
+  const proofVerifier = new QueuedIVCVerifier(
+    config,
+    config.realProofs ? await BBCircuitVerifier.new(config) : new TestCircuitVerifier(),
+  );
 
-  // If config.p2pEnabled is true, createProverCoordination will create a p2p client where txs are requested
-  // 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,
+  const p2pClient = await createP2PClient(
+    P2PClientType.Prover,
+    config,
     archiver,
+    proofVerifier,
+    worldStateSynchronizer,
     epochCache,
+    getPackageVersion() ?? '',
+    dateProvider,
     telemetry,
-  });
+    {
+      txCollectionNodeSources: deps.aztecNodeTxProvider
+        ? [new NodeRpcTxSource(deps.aztecNodeTxProvider, 'TestNode')]
+        : [],
+    },
+  );
+
+  await p2pClient.start();
 
   const proverNodeConfig = {
     ...pick(
@@ -110,7 +133,7 @@ export async function createProverNode(
     archiver,
     archiver,
     worldStateSynchronizer,
-    proverCoordination,
+    p2pClient,
     epochMonitor,
     proverNodeConfig,
     telemetry,

package/src/job/epoch-proving-job-data.ts

@@ -1,15 +1,16 @@
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
-import { L2Block } from '@aztec/stdlib/block';
+import { CommitteeAttestation, L2Block } from '@aztec/stdlib/block';
 import { BlockHeader, Tx } from '@aztec/stdlib/tx';
 
 /** All data from an epoch used in proving. */
 export type EpochProvingJobData = {
   epochNumber: bigint;
   blocks: L2Block[];
-  txs: Tx[];
+  txs: Map<string, Tx>;
   l1ToL2Messages: Record<number, Fr[]>;
   previousBlockHeader: BlockHeader;
+  attestations: CommitteeAttestation[];
 };
 
 export function validateEpochProvingJobData(data: EpochProvingJobData) {
@@ -30,12 +31,13 @@ export function validateEpochProvingJobData(data: EpochProvingJobData) {
 
 export function serializeEpochProvingJobData(data: EpochProvingJobData): Buffer {
   const blocks = data.blocks.map(block => block.toBuffer());
-  const txs = data.txs.map(tx => tx.toBuffer());
+  const txs = Array.from(data.txs.values()).map(tx => tx.toBuffer());
   const l1ToL2Messages = Object.entries(data.l1ToL2Messages).map(([blockNumber, messages]) => [
     Number(blockNumber),
     messages.length,
     ...messages,
   ]);
+  const attestations = data.attestations.map(attestation => attestation.toBuffer());
 
   return serializeToBuffer(
     Number(data.epochNumber),
@@ -46,6 +48,8 @@ export function serializeEpochProvingJobData(data: EpochProvingJobData): Buffer
     ...txs,
     l1ToL2Messages.length,
     ...l1ToL2Messages,
+    attestations.length,
+    ...attestations,
   );
 }
 
@@ -54,7 +58,7 @@ export function deserializeEpochProvingJobData(buf: Buffer): EpochProvingJobData
   const epochNumber = BigInt(reader.readNumber());
   const previousBlockHeader = reader.readObject(BlockHeader);
   const blocks = reader.readVector(L2Block);
-  const txs = reader.readVector(Tx);
+  const txArray = reader.readVector(Tx);
 
   const l1ToL2MessageBlockCount = reader.readNumber();
   const l1ToL2Messages: Record<number, Fr[]> = {};
@@ -64,5 +68,9 @@ export function deserializeEpochProvingJobData(buf: Buffer): EpochProvingJobData
     l1ToL2Messages[blockNumber] = messages;
   }
 
-  return { epochNumber, previousBlockHeader, blocks, txs, l1ToL2Messages };
+  const attestations = reader.readVector(CommitteeAttestation);
+
+  const txs = new Map<string, Tx>(txArray.map(tx => [tx.getTxHash().toString(), tx]));
+
+  return { epochNumber, previousBlockHeader, blocks, txs, l1ToL2Messages, attestations };
 }

package/src/job/epoch-proving-job.ts

@@ -84,6 +84,10 @@ export class EpochProvingJob implements Traceable {
     return this.data.txs;
   }
 
+  private get attestations() {
+    return this.data.attestations;
+  }
+
   /**
    * Proves the given epoch and submits the proof to L1.
    */
@@ -96,6 +100,7 @@ export class EpochProvingJob implements Traceable {
       await this.scheduleEpochCheck();
     }
 
+    const attestations = this.attestations.map(attestation => attestation.toViem());
     const epochNumber = Number(this.epochNumber);
     const epochSizeBlocks = this.blocks.length;
     const epochSizeTxs = this.blocks.reduce((total, current) => total + current.body.txEffects.length, 0);
@@ -120,13 +125,13 @@ export class EpochProvingJob implements Traceable {
 
       const finalBlobBatchingChallenges = await BatchedBlob.precomputeBatchedBlobChallenges(allBlobs);
       this.prover.startNewEpoch(epochNumber, fromBlock, epochSizeBlocks, finalBlobBatchingChallenges);
-      await this.prover.startTubeCircuits(this.txs);
+      await this.prover.startTubeCircuits(Array.from(this.txs.values()));
 
       await asyncPool(this.config.parallelBlockLimit ?? 32, this.blocks, async block => {
         this.checkState();
 
         const globalVariables = block.header.globalVariables;
-        const txs = await this.getTxs(block);
+        const txs = this.getTxs(block);
         const l1ToL2Messages = this.getL1ToL2Messages(block);
         const previousHeader = this.getBlockHeader(block.number - 1)!;
 
@@ -168,6 +173,7 @@ export class EpochProvingJob implements Traceable {
       this.log.info(`Finalised proof for epoch ${epochNumber}`, { epochNumber, uuid: this.uuid, duration: timer.ms() });
 
       this.progressState('publishing-proof');
+
       const success = await this.publisher.submitEpochProof({
         fromBlock,
         toBlock,
@@ -175,6 +181,7 @@ export class EpochProvingJob implements Traceable {
         publicInputs,
         proof,
         batchedBlobInputs,
+        attestations,
       });
       if (!success) {
         throw new Error('Failed to submit epoch proof to L1');
@@ -299,12 +306,8 @@ export class EpochProvingJob implements Traceable {
     );
   }
 
-  private async getTxs(block: L2Block): Promise<Tx[]> {
-    const txHashes = block.body.txEffects.map(tx => tx.txHash.toBigInt());
-    const txsAndHashes = await Promise.all(this.txs.map(async tx => ({ tx, hash: await tx.getTxHash() })));
-    return txsAndHashes
-      .filter(txAndHash => txHashes.includes(txAndHash.hash.toBigInt()))
-      .map(txAndHash => txAndHash.tx);
+  private getTxs(block: L2Block): Tx[] {
+    return block.body.txEffects.map(txEffect => this.txs.get(txEffect.txHash.toString())!);
   }
 
   private getL1ToL2Messages(block: L2Block) {

package/src/prover-node-publisher.ts

@@ -1,6 +1,11 @@
 import { type BatchedBlob, FinalBlobAccumulatorPublicInputs } from '@aztec/blob-lib';
 import { AZTEC_MAX_EPOCH_DURATION } from '@aztec/constants';
-import type { L1TxUtils, RollupContract } from '@aztec/ethereum';
+import {
+  type L1TxUtils,
+  type RollupContract,
+  RollupContract as RollupContractClass,
+  type ViemCommitteeAttestation,
+} from '@aztec/ethereum';
 import { makeTuple } from '@aztec/foundation/array';
 import { areArraysEqual } from '@aztec/foundation/collection';
 import { EthAddress } from '@aztec/foundation/eth-address';
@@ -21,9 +26,6 @@ import { type Hex, type TransactionReceipt, encodeFunctionData } from 'viem';
 
 import { ProverNodePublisherMetrics } from './metrics.js';
 
-/**
- * Stats for a sent transaction.
- */
 /** Arguments to the submitEpochProof method of the rollup contract */
 export type L1SubmitEpochProofArgs = {
   epochSize: number;
@@ -97,6 +99,7 @@ export class ProverNodePublisher {
     publicInputs: RootRollupPublicInputs;
     proof: Proof;
     batchedBlobInputs: BatchedBlob;
+    attestations: ViemCommitteeAttestation[];
   }): Promise<boolean> {
     const { epochNumber, fromBlock, toBlock } = args;
     const ctx = { epochNumber, fromBlock, toBlock };
@@ -136,11 +139,11 @@ export class ProverNodePublisher {
       }
 
       this.metrics.recordFailedTx();
-      this.log.error(`Rollup.submitEpochProof tx status failed: ${txReceipt.transactionHash}`, ctx);
+      this.log.error(`Rollup.submitEpochProof tx status failed ${txReceipt.transactionHash}`, undefined, ctx);
       await this.sleepOrInterrupted();
     }
 
-    this.log.verbose('L2 block data syncing interrupted while processing blocks.', ctx);
+    this.log.verbose('L2 block data syncing interrupted', ctx);
     return false;
   }
 
@@ -150,6 +153,7 @@ export class ProverNodePublisher {
     publicInputs: RootRollupPublicInputs;
     proof: Proof;
     batchedBlobInputs: BatchedBlob;
+    attestations: ViemCommitteeAttestation[];
   }) {
     const { fromBlock, toBlock, publicInputs, batchedBlobInputs } = args;
 
@@ -207,6 +211,7 @@ export class ProverNodePublisher {
     publicInputs: RootRollupPublicInputs;
     proof: Proof;
     batchedBlobInputs: BatchedBlob;
+    attestations: ViemCommitteeAttestation[];
   }): Promise<TransactionReceipt | undefined> {
     const txArgs = [this.getSubmitEpochProofArgs(args)] as const;
 
@@ -246,6 +251,7 @@ export class ProverNodePublisher {
     toBlock: number;
     publicInputs: RootRollupPublicInputs;
     batchedBlobInputs: BatchedBlob;
+    attestations: ViemCommitteeAttestation[];
   }) {
     // Returns arguments for EpochProofLib.sol -> getEpochProofPublicInputs()
     return [
@@ -271,6 +277,7 @@ export class ProverNodePublisher {
     publicInputs: RootRollupPublicInputs;
     proof: Proof;
     batchedBlobInputs: BatchedBlob;
+    attestations: ViemCommitteeAttestation[];
   }) {
     // Returns arguments for EpochProofLib.sol -> submitEpochRootProof()
     const proofHex: Hex = `0x${args.proof.withoutPublicInputs().toString('hex')}`;
@@ -280,6 +287,7 @@ export class ProverNodePublisher {
       end: argsArray[1],
       args: argsArray[2],
       fees: argsArray[3],
+      attestations: RollupContractClass.packAttestations(args.attestations),
       blobInputs: argsArray[4],
       proof: proofHex,
     };

package/src/prover-node.ts

@@ -5,9 +5,9 @@ import { memoize } from '@aztec/foundation/decorators';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import type { Fr } from '@aztec/foundation/fields';
 import { createLogger } from '@aztec/foundation/log';
-import { RunningPromise } from '@aztec/foundation/running-promise';
 import { DateProvider } from '@aztec/foundation/timer';
 import type { DataStoreConfig } from '@aztec/kv-store/config';
+import type { P2PClient } from '@aztec/p2p';
 import { PublicProcessorFactory } from '@aztec/simulator/server';
 import type { L2Block, L2BlockSource } from '@aztec/stdlib/block';
 import type { ChainConfig } from '@aztec/stdlib/config';
@@ -16,7 +16,6 @@ import { getProofSubmissionDeadlineTimestamp } from '@aztec/stdlib/epoch-helpers
 import {
   type EpochProverManager,
   EpochProvingJobTerminalState,
-  type ProverCoordination,
   type ProverNodeApi,
   type Service,
   type WorldStateSyncStatus,
@@ -24,7 +23,8 @@ import {
   tryStop,
 } from '@aztec/stdlib/interfaces/server';
 import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
-import type { TxHash } from '@aztec/stdlib/tx';
+import type { P2PClientType } from '@aztec/stdlib/p2p';
+import type { Tx } from '@aztec/stdlib/tx';
 import {
   Attributes,
   L1Metrics,
@@ -61,9 +61,6 @@ export class ProverNode implements EpochMonitorHandler, ProverNodeApi, Traceable
   private rewardsMetrics: ProverNodeRewardsMetrics;
   private l1Metrics: L1Metrics;
 
-  private txFetcher: RunningPromise;
-  private lastBlockNumber: number | undefined;
-
   public readonly tracer: Tracer;
 
   constructor(
@@ -73,7 +70,7 @@ export class ProverNode implements EpochMonitorHandler, ProverNodeApi, Traceable
     protected readonly l1ToL2MessageSource: L1ToL2MessageSource,
     protected readonly contractDataSource: ContractDataSource,
     protected readonly worldState: WorldStateSynchronizer,
-    protected readonly coordination: ProverCoordination & Partial<Service>,
+    protected readonly p2pClient: Pick<P2PClient<P2PClientType.Prover>, 'getTxProvider'> & Partial<Service>,
     protected readonly epochsMonitor: EpochMonitor,
     config: Partial<ProverNodeOptions> = {},
     protected readonly telemetryClient: TelemetryClient = getTelemetryClient(),
@@ -91,6 +88,7 @@ export class ProverNode implements EpochMonitorHandler, ProverNodeApi, Traceable
       txGatheringIntervalMs: 1_000,
       txGatheringBatchSize: 10,
       txGatheringMaxParallelRequestsPerNode: 100,
+      txGatheringTimeoutMs: 120_000,
       proverNodeFailedEpochStore: undefined,
       ...compact(config),
     };
@@ -107,8 +105,6 @@ export class ProverNode implements EpochMonitorHandler, ProverNodeApi, Traceable
       EthAddress.fromField(this.prover.getProverId()),
       this.publisher.getRollupContract(),
     );
-
-    this.txFetcher = new RunningPromise(() => this.checkForTxs(), this.log, this.config.txGatheringIntervalMs);
   }
 
   public getProverId() {
@@ -116,7 +112,7 @@ export class ProverNode implements EpochMonitorHandler, ProverNodeApi, Traceable
   }
 
   public getP2P() {
-    return this.coordination.getP2PClient();
+    return this.p2pClient;
   }
 
   /**
@@ -153,7 +149,6 @@ export class ProverNode implements EpochMonitorHandler, ProverNodeApi, Traceable
    * starts proving jobs for them.
    */
   async start() {
-    this.txFetcher.start();
     this.epochsMonitor.start(this);
     this.l1Metrics.start();
     await this.rewardsMetrics.start();
@@ -165,14 +160,13 @@ export class ProverNode implements EpochMonitorHandler, ProverNodeApi, Traceable
    */
   async stop() {
     this.log.info('Stopping ProverNode');
-    await this.txFetcher.stop();
     await this.epochsMonitor.stop();
     await this.prover.stop();
+    await tryStop(this.p2pClient);
     await tryStop(this.l2BlockSource);
     this.publisher.interrupt();
     await Promise.all(Array.from(this.jobs.values()).map(job => job.stop()));
     await this.worldState.stop();
-    await tryStop(this.coordination);
     this.l1Metrics.stop();
     this.rewardsMetrics.stop();
     await this.telemetryClient.stop();
@@ -307,30 +301,17 @@ export class ProverNode implements EpochMonitorHandler, ProverNodeApi, Traceable
     return this.l2BlockSource.getL1Constants();
   }
 
-  /** Monitors for new blocks and requests their txs from the p2p layer to ensure they are available for proving. */
-  @trackSpan('ProverNode.checkForTxs')
-  private async checkForTxs() {
-    const blockNumber = await this.l2BlockSource.getBlockNumber();
-    if (this.lastBlockNumber === undefined || blockNumber > this.lastBlockNumber) {
-      const block = await this.l2BlockSource.getBlock(blockNumber);
-      if (!block) {
-        return;
-      }
-      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.gatherTxs(txHashes); // This stores the txs in the tx pool, no need to persist them here
-      this.lastBlockNumber = blockNumber;
-    }
-  }
-
   @trackSpan('ProverNode.gatherEpochData', epochNumber => ({ [Attributes.EPOCH_NUMBER]: Number(epochNumber) }))
   private async gatherEpochData(epochNumber: bigint): Promise<EpochProvingJobData> {
     const blocks = await this.gatherBlocks(epochNumber);
-    const txs = await this.gatherTxs(epochNumber, blocks);
+    const txArray = await this.gatherTxs(epochNumber, blocks);
+    const txs = new Map<string, Tx>(txArray.map(tx => [tx.getTxHash().toString(), tx]));
     const l1ToL2Messages = await this.gatherMessages(epochNumber, blocks);
     const previousBlockHeader = await this.gatherPreviousBlockHeader(epochNumber, blocks[0]);
+    const [lastBlock] = await this.l2BlockSource.getPublishedBlocks(blocks.at(-1)!.number, 1);
+    const attestations = lastBlock?.attestations ?? [];
 
-    return { blocks, txs, l1ToL2Messages, epochNumber, previousBlockHeader };
+    return { blocks, txs, l1ToL2Messages, epochNumber, previousBlockHeader, attestations };
   }
 
   private async gatherBlocks(epochNumber: bigint) {
@@ -342,20 +323,18 @@ export class ProverNode implements EpochMonitorHandler, ProverNodeApi, Traceable
   }
 
   private async gatherTxs(epochNumber: bigint, blocks: L2Block[]) {
-    const txsToFind: TxHash[] = blocks.flatMap(block => block.body.txEffects.map(tx => tx.txHash));
-    const txs = await this.coordination.getTxsByHash(txsToFind);
+    const deadline = new Date(this.dateProvider.now() + this.config.txGatheringTimeoutMs);
+    const txProvider = this.p2pClient.getTxProvider();
+    const txsByBlock = await Promise.all(blocks.map(block => txProvider.getTxsForBlock(block, { deadline })));
+    const txs = txsByBlock.map(({ txs }) => txs).flat();
+    const missingTxs = txsByBlock.map(({ missingTxs }) => missingTxs).flat();
 
-    if (txs.length === txsToFind.length) {
+    if (missingTxs.length === 0) {
       this.log.verbose(`Gathered all ${txs.length} txs for epoch ${epochNumber}`, { epochNumber });
       return txs;
     }
 
-    const txHashesFound = await Promise.all(txs.map(tx => tx.getTxHash()));
-    const missingTxHashes = txsToFind
-      .filter(txHashToFind => !txHashesFound.some(txHashFound => txHashToFind.equals(txHashFound)))
-      .join(', ');
-
-    throw new Error(`Txs not found for epoch ${epochNumber}: ${missingTxHashes}`);
+    throw new Error(`Txs not found for epoch ${epochNumber}: ${missingTxs.map(hash => hash.toString()).join(', ')}`);
   }
 
   private async gatherMessages(epochNumber: bigint, blocks: L2Block[]) {

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

@@ -1,22 +0,0 @@
-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

@@ -1 +0,0 @@
-{"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;AAuCD,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;CA4E1D"}