@aztec/prover-client 0.69.1 → 0.71.0

package/src/bin/get-proof-inputs.ts

@@ -0,0 +1,60 @@
+/* eslint-disable no-console */
+import { AVM_HINTS_FILENAME, AVM_PUBLIC_INPUTS_FILENAME } from '@aztec/bb-prover';
+import { type ProofUri, ProvingJobInputs, ProvingRequestType } from '@aztec/circuit-types';
+import { jsonParseWithSchema, jsonStringify } from '@aztec/foundation/json-rpc';
+import { createLogger } from '@aztec/foundation/log';
+
+import { mkdirSync, writeFileSync } from 'fs';
+
+import { createProofStoreForUri } from '../proving_broker/index.js';
+
+const logger = createLogger('prover-client:get-proof-inputs');
+
+function printUsage() {
+  console.error('Usage: get-proof-inputs <proof-uri> [out-dir=.]');
+}
+
+async function main() {
+  if (process.argv[2] === '--help') {
+    printUsage();
+    return;
+  }
+
+  const uri = process.argv[2];
+  const outDir = process.argv[3] || '.';
+  if (!uri) {
+    printUsage();
+    throw new Error('Missing proof URI');
+  }
+
+  mkdirSync(outDir, { recursive: true });
+
+  const proofStore = createProofStoreForUri(uri);
+  logger.info(`Processing uri ${uri}`);
+  const input = await proofStore.getProofInput(uri as ProofUri);
+  logger.info(`Found inputs for ${ProvingRequestType[input.type]}`);
+  writeProofInputs(input, outDir);
+
+  console.log(jsonParseWithSchema(jsonStringify(input), ProvingJobInputs).inputs);
+}
+
+// This mimics the behavior of bb-prover/src/bb/execute.ts
+function writeProofInputs(input: ProvingJobInputs, outDir: string) {
+  switch (input.type) {
+    case ProvingRequestType.PUBLIC_VM: {
+      writeFileSync(`${outDir}/${AVM_PUBLIC_INPUTS_FILENAME}`, input.inputs.output.toBuffer());
+      logger.info(`Wrote AVM public inputs to ${AVM_PUBLIC_INPUTS_FILENAME}`);
+      writeFileSync(`${outDir}/${AVM_HINTS_FILENAME}`, input.inputs.avmHints.toBuffer());
+      logger.info(`Wrote AVM hints to ${AVM_HINTS_FILENAME}`);
+      break;
+    }
+    default: {
+      throw new Error(`Unimplemented proving request type: ${ProvingRequestType[input.type]}`);
+    }
+  }
+}
+
+main().catch(err => {
+  console.error(err);
+  process.exit(1);
+});

package/src/block_builder/light.ts

@@ -4,18 +4,13 @@ import {
   MerkleTreeId,
   type MerkleTreeWriteOperations,
   type ProcessedTx,
-  TxHash,
-  makeEmptyProcessedTx,
   toNumBlobFields,
 } from '@aztec/circuit-types';
 import { Fr, type GlobalVariables, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP } from '@aztec/circuits.js';
 import { SpongeBlob } from '@aztec/circuits.js/blobs';
 import { padArrayEnd } from '@aztec/foundation/collection';
 import { createLogger } from '@aztec/foundation/log';
-import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types';
-import { protocolContractTreeRoot } from '@aztec/protocol-contracts';
-import { type TelemetryClient } from '@aztec/telemetry-client';
-import { NoopTelemetryClient } from '@aztec/telemetry-client/noop';
+import { type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client';
 
 import {
   buildBaseRollupHints,
@@ -27,7 +22,6 @@ import {
  * Builds a block and its header from a set of processed tx without running any circuits.
  */
 export class LightweightBlockBuilder implements BlockBuilder {
-  private numTxs?: number;
   private spongeBlobState?: SpongeBlob;
   private globalVariables?: GlobalVariables;
   private l1ToL2Messages?: Fr[];
@@ -36,14 +30,13 @@ export class LightweightBlockBuilder implements BlockBuilder {
 
   private readonly logger = createLogger('prover-client:block_builder');
 
-  constructor(private db: MerkleTreeWriteOperations, private telemetry: TelemetryClient) {}
+  constructor(private db: MerkleTreeWriteOperations, private telemetry: TelemetryClient = getTelemetryClient()) {}
 
   async startNewBlock(globalVariables: GlobalVariables, l1ToL2Messages: Fr[]): Promise<void> {
     this.logger.debug('Starting new block', { globalVariables: globalVariables.toInspect(), l1ToL2Messages });
     this.globalVariables = globalVariables;
     this.l1ToL2Messages = padArrayEnd(l1ToL2Messages, Fr.ZERO, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP);
     this.txs = [];
-    this.numTxs = 0;
     this.spongeBlobState = undefined;
 
     // Update L1 to L2 tree
@@ -51,31 +44,15 @@ export class LightweightBlockBuilder implements BlockBuilder {
   }
 
   async addTxs(txs: ProcessedTx[]): Promise<void> {
-    this.numTxs = Math.max(2, txs.length);
     this.spongeBlobState = SpongeBlob.init(toNumBlobFields(txs));
     for (const tx of txs) {
-      this.logger.debug(tx.hash.equals(TxHash.zero()) ? 'Adding padding tx to block' : 'Adding new tx to block', {
-        txHash: tx.hash.toString(),
-      });
+      this.logger.debug('Adding new tx to block', { txHash: tx.hash.toString() });
       this.txs.push(tx);
       await buildBaseRollupHints(tx, this.globalVariables!, this.db, this.spongeBlobState!);
     }
   }
 
-  async setBlockCompleted(): Promise<L2Block> {
-    const paddingTxCount = this.numTxs! - this.txs.length;
-    for (let i = 0; i < paddingTxCount; i++) {
-      await this.addTxs([
-        makeEmptyProcessedTx(
-          this.db.getInitialHeader(),
-          this.globalVariables!.chainId,
-          this.globalVariables!.version,
-          getVKTreeRoot(),
-          protocolContractTreeRoot,
-        ),
-      ]);
-    }
-
+  setBlockCompleted(): Promise<L2Block> {
     return this.buildBlock();
   }
 
@@ -102,16 +79,15 @@ export class LightweightBlockBuilder implements BlockBuilder {
 }
 
 export class LightweightBlockBuilderFactory {
-  constructor(private telemetry?: TelemetryClient) {}
+  constructor(private telemetry: TelemetryClient = getTelemetryClient()) {}
 
   create(db: MerkleTreeWriteOperations): BlockBuilder {
-    return new LightweightBlockBuilder(db, this.telemetry ?? new NoopTelemetryClient());
+    return new LightweightBlockBuilder(db, this.telemetry);
   }
 }
 
 /**
  * Creates a block builder under the hood with the given txs and messages and creates a block.
- * Automatically adds padding txs to get to a minimum of 2 txs in the block.
  * @param db - A db fork to use for block building.
  */
 export async function buildBlock(
@@ -119,7 +95,7 @@ export async function buildBlock(
   globalVariables: GlobalVariables,
   l1ToL2Messages: Fr[],
   db: MerkleTreeWriteOperations,
-  telemetry: TelemetryClient = new NoopTelemetryClient(),
+  telemetry: TelemetryClient = getTelemetryClient(),
 ) {
   const builder = new LightweightBlockBuilder(db, telemetry);
   await builder.startNewBlock(globalVariables, l1ToL2Messages);

package/src/config.ts

@@ -1,13 +1,13 @@
 import { type ACVMConfig, type BBConfig } from '@aztec/bb-prover';
+import { type ProverConfig, proverConfigMappings } from '@aztec/circuit-types';
+import { type ConfigMappingsType, booleanConfigHelper, getConfigFromMappings } from '@aztec/foundation/config';
+
 import {
   type ProverAgentConfig,
   type ProverBrokerConfig,
-  type ProverConfig,
   proverAgentConfigMappings,
   proverBrokerConfigMappings,
-  proverConfigMappings,
-} from '@aztec/circuit-types';
-import { type ConfigMappingsType, booleanConfigHelper, getConfigFromMappings } from '@aztec/foundation/config';
+} from './proving_broker/config.js';
 
 /**
  * The prover configuration.

package/src/mocks/fixtures.ts

@@ -13,7 +13,7 @@ import { padArrayEnd } from '@aztec/foundation/collection';
 import { randomBytes } from '@aztec/foundation/crypto';
 import { type Logger } from '@aztec/foundation/log';
 import { fileURLToPath } from '@aztec/foundation/url';
-import { NativeACVMSimulator, type SimulationProvider, WASMSimulatorWithBlobs } from '@aztec/simulator';
+import { NativeACVMSimulator, type SimulationProvider, WASMSimulatorWithBlobs } from '@aztec/simulator/server';
 
 import { promises as fs } from 'fs';
 import path from 'path';

package/src/mocks/test_context.ts

@@ -18,7 +18,7 @@ import { times } from '@aztec/foundation/collection';
 import { Fr } from '@aztec/foundation/fields';
 import { type Logger } from '@aztec/foundation/log';
 import { TestDateProvider } from '@aztec/foundation/timer';
-import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types';
+import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vks';
 import { protocolContractTreeRoot } from '@aztec/protocol-contracts';
 import {
   PublicProcessor,
@@ -26,8 +26,8 @@ import {
   type SimulationProvider,
   WASMSimulatorWithBlobs,
   type WorldStateDB,
-} from '@aztec/simulator';
-import { NoopTelemetryClient } from '@aztec/telemetry-client/noop';
+} from '@aztec/simulator/server';
+import { getTelemetryClient } from '@aztec/telemetry-client';
 import { type MerkleTreeAdminDatabase } from '@aztec/world-state';
 import { NativeWorldStateService } from '@aztec/world-state/native';
 
@@ -69,14 +69,13 @@ export class TestContext {
     logger: Logger,
     proverCount = 4,
     createProver: (bbConfig: BBProverConfig) => Promise<ServerCircuitProver> = _ =>
-      Promise.resolve(new TestCircuitProver(new NoopTelemetryClient(), new WASMSimulatorWithBlobs())),
+      Promise.resolve(new TestCircuitProver(new WASMSimulatorWithBlobs())),
     blockNumber = 1,
   ) {
     const directoriesToCleanup: string[] = [];
     const globalVariables = makeGlobals(blockNumber);
 
     const worldStateDB = mock<WorldStateDB>();
-    const telemetry = new NoopTelemetryClient();
 
     // Separated dbs for public processor and prover - see public_processor for context
     const ws = await NativeWorldStateService.tmp();
@@ -84,7 +83,7 @@ export class TestContext {
 
     worldStateDB.getMerkleInterface.mockReturnValue(publicDb);
 
-    const publicTxSimulator = new PublicTxSimulator(publicDb, worldStateDB, telemetry, globalVariables, true);
+    const publicTxSimulator = new PublicTxSimulator(publicDb, worldStateDB, globalVariables, true);
     const processor = new PublicProcessor(
       publicDb,
       globalVariables,
@@ -92,7 +91,6 @@ export class TestContext {
       worldStateDB,
       publicTxSimulator,
       new TestDateProvider(),
-      telemetry,
     );
 
     let localProver: ServerCircuitProver;
@@ -102,7 +100,7 @@ export class TestContext {
       acvmBinaryPath: config?.expectedAcvmPath,
     });
     if (!config) {
-      localProver = new TestCircuitProver(new NoopTelemetryClient(), simulationProvider);
+      localProver = new TestCircuitProver(simulationProvider);
     } else {
       const bbConfig: BBProverConfig = {
         acvmBinaryPath: config.expectedAcvmPath,
@@ -118,9 +116,9 @@ export class TestContext {
       directoriesToCleanup.push(config.directoryToCleanup);
     }
 
-    const queue = new MemoryProvingQueue(telemetry);
-    const orchestrator = new TestProvingOrchestrator(ws, queue, telemetry, Fr.ZERO);
-    const agent = new ProverAgent(localProver, proverCount, undefined, telemetry);
+    const queue = new MemoryProvingQueue(getTelemetryClient());
+    const orchestrator = new TestProvingOrchestrator(ws, queue, Fr.ZERO);
+    const agent = new ProverAgent(localProver, proverCount, undefined);
 
     queue.start();
     agent.start(queue);