@aztec/prover-node 0.65.2 → 0.67.0

package/src/prover-coordination/factory.ts

@@ -1,7 +1,7 @@
 import { type ArchiveSource, type Archiver } from '@aztec/archiver';
 import { BBCircuitVerifier, TestCircuitVerifier } from '@aztec/bb-prover';
 import { type ProverCoordination, type WorldStateSynchronizer, createAztecNodeClient } from '@aztec/circuit-types';
-import { createDebugLogger } from '@aztec/foundation/log';
+import { createLogger } from '@aztec/foundation/log';
 import { type DataStoreConfig } from '@aztec/kv-store/config';
 import { createP2PClient } from '@aztec/p2p';
 import { type TelemetryClient } from '@aztec/telemetry-client';
@@ -26,7 +26,7 @@ export async function createProverCoordination(
   config: ProverNodeConfig & DataStoreConfig,
   deps: ProverCoordinationDeps,
 ): Promise<ProverCoordination> {
-  const log = createDebugLogger('aztec:createProverCoordination');
+  const log = createLogger('prover-node:prover-coordination');
 
   if (deps.aztecNodeTxProvider) {
     log.info('Using prover coordination via aztec node');

package/src/prover-node.ts

@@ -6,7 +6,6 @@ import {
   type L1ToL2MessageSource,
   type L2Block,
   type L2BlockSource,
-  type MerkleTreeWriteOperations,
   type ProverCache,
   type ProverCoordination,
   type ProverNodeApi,
@@ -17,8 +16,9 @@ import {
 import { type ContractDataSource } from '@aztec/circuits.js';
 import { compact } from '@aztec/foundation/collection';
 import { sha256 } from '@aztec/foundation/crypto';
-import { createDebugLogger } from '@aztec/foundation/log';
+import { createLogger } from '@aztec/foundation/log';
 import { type Maybe } from '@aztec/foundation/types';
+import { type P2P } from '@aztec/p2p';
 import { type L1Publisher } from '@aztec/sequencer-client';
 import { PublicProcessorFactory } from '@aztec/simulator';
 import { type TelemetryClient } from '@aztec/telemetry-client';
@@ -35,6 +35,7 @@ import { type QuoteSigner } from './quote-signer.js';
 export type ProverNodeOptions = {
   pollingIntervalMs: number;
   maxPendingJobs: number;
+  maxParallelBlocksPerEpoch: number;
 };
 
 /**
@@ -44,7 +45,7 @@ export type ProverNodeOptions = {
  * proof for the epoch, and submits it to L1.
  */
 export class ProverNode implements ClaimsMonitorHandler, EpochMonitorHandler, ProverNodeApi {
-  private log = createDebugLogger('aztec:prover-node');
+  private log = createLogger('prover-node');
 
   private latestEpochWeAreProving: bigint | undefined;
   private jobs: Map<string, EpochProvingJob> = new Map();
@@ -71,12 +72,21 @@ export class ProverNode implements ClaimsMonitorHandler, EpochMonitorHandler, Pr
     this.options = {
       pollingIntervalMs: 1_000,
       maxPendingJobs: 100,
+      maxParallelBlocksPerEpoch: 32,
       ...compact(options),
     };
 
     this.metrics = new ProverNodeMetrics(telemetryClient, 'ProverNode');
   }
 
+  public getP2P() {
+    const asP2PClient = this.coordination as P2P;
+    if (typeof asP2PClient.isP2PClient === 'function' && asP2PClient.isP2PClient()) {
+      return asP2PClient;
+    }
+    return undefined;
+  }
+
   async handleClaim(proofClaim: EpochProofClaim): Promise<void> {
     if (proofClaim.epochToProve === this.latestEpochWeAreProving) {
       this.log.verbose(`Already proving claim for epoch ${proofClaim.epochToProve}`);
@@ -127,9 +137,14 @@ export class ProverNode implements ClaimsMonitorHandler, EpochMonitorHandler, Pr
     try {
       // Construct a quote for the epoch
       const blocks = await this.l2BlockSource.getBlocksForEpoch(epochNumber);
+      if (blocks.length === 0) {
+        this.log.info(`No blocks found for epoch ${epochNumber}`);
+        return;
+      }
+
       const partialQuote = await this.quoteProvider.getQuote(Number(epochNumber), blocks);
       if (!partialQuote) {
-        this.log.verbose(`No quote produced for epoch ${epochNumber}`);
+        this.log.info(`No quote produced for epoch ${epochNumber}`);
         return;
       }
 
@@ -246,10 +261,6 @@ export class ProverNode implements ClaimsMonitorHandler, EpochMonitorHandler, Pr
     // Fast forward world state to right before the target block and get a fork
     this.log.verbose(`Creating proving job for epoch ${epochNumber} for block range ${fromBlock} to ${toBlock}`);
     await this.worldState.syncImmediate(fromBlock - 1);
-    // NB: separated the dbs as both a block builder and public processor need to track and update tree state
-    // see public_processor.ts for context
-    const publicDb = await this.worldState.fork(fromBlock - 1);
-    const proverDb = await this.worldState.fork(fromBlock - 1);
 
     // Create a processor using the forked world state
     const publicProcessorFactory = new PublicProcessorFactory(this.contractDataSource, this.telemetryClient);
@@ -258,22 +269,12 @@ export class ProverNode implements ClaimsMonitorHandler, EpochMonitorHandler, Pr
     const proverCache = await this.proverCacheManager.openCache(epochNumber, epochHash);
 
     const cleanUp = async () => {
-      await publicDb.close();
-      await proverDb.close();
       await proverCache.close();
       await this.proverCacheManager.removeStaleCaches(epochNumber);
       this.jobs.delete(job.getId());
     };
 
-    const job = this.doCreateEpochProvingJob(
-      epochNumber,
-      blocks,
-      publicDb,
-      proverDb,
-      proverCache,
-      publicProcessorFactory,
-      cleanUp,
-    );
+    const job = this.doCreateEpochProvingJob(epochNumber, blocks, proverCache, publicProcessorFactory, cleanUp);
     this.jobs.set(job.getId(), job);
     return job;
   }
@@ -282,23 +283,22 @@ export class ProverNode implements ClaimsMonitorHandler, EpochMonitorHandler, Pr
   protected doCreateEpochProvingJob(
     epochNumber: bigint,
     blocks: L2Block[],
-    publicDb: MerkleTreeWriteOperations,
-    proverDb: MerkleTreeWriteOperations,
     proverCache: ProverCache,
     publicProcessorFactory: PublicProcessorFactory,
     cleanUp: () => Promise<void>,
   ) {
     return new EpochProvingJob(
-      publicDb,
+      this.worldState,
       epochNumber,
       blocks,
-      this.prover.createEpochProver(proverDb, proverCache),
+      this.prover.createEpochProver(proverCache),
       publicProcessorFactory,
       this.publisher,
       this.l2BlockSource,
       this.l1ToL2MessageSource,
       this.coordination,
       this.metrics,
+      { parallelBlockLimit: this.options.maxParallelBlocksPerEpoch },
       cleanUp,
     );
   }