@aztec/bb-prover 0.80.0 → 0.82.0

package/src/verifier/bb_verifier.ts

@@ -10,6 +10,7 @@ import type { VerificationKeyData } from '@aztec/stdlib/vks';
 
 import { promises as fs } from 'fs';
 import * as path from 'path';
+import { fileURLToPath } from 'url';
 
 import { BB_RESULT, PROOF_FILENAME, VK_FILENAME, verifyClientIvcProof, verifyProof } from '../bb/execute.js';
 import type { BBConfig } from '../config.js';
@@ -17,6 +18,12 @@ import { getUltraHonkFlavorForCircuit } from '../honk.js';
 import { writeToOutputDirectory } from '../prover/client_ivc_proof_utils.js';
 import { mapProtocolArtifactNameToCircuitName } from '../stats.js';
 
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+
+// Built by yarn generate
+export const PRIVATE_TAIL_CIVC_VK = path.join(__dirname, '../../artifacts/private-civc-vk');
+export const PUBLIC_TAIL_CIVC_VK = path.join(__dirname, '../../artifacts/public-civc-vk');
+
 export class BBCircuitVerifier implements ClientProtocolCircuitVerifier {
   private constructor(private config: BBConfig, private logger: Logger) {}
 
@@ -88,7 +95,7 @@ export class BBCircuitVerifier implements ClientProtocolCircuitVerifier {
         const result = await verifyClientIvcProof(
           this.config.bbBinaryPath,
           bbWorkingDirectory.concat('/proof'),
-          bbWorkingDirectory.concat('/vk'),
+          tx.data.forPublic ? PUBLIC_TAIL_CIVC_VK : PRIVATE_TAIL_CIVC_VK,
           logFunction,
         );
 
@@ -107,7 +114,7 @@ export class BBCircuitVerifier implements ClientProtocolCircuitVerifier {
       await runInDirectory(this.config.bbWorkingDirectory, operation, this.config.bbSkipCleanup, this.logger);
       return true;
     } catch (err) {
-      this.logger.warn(`Failed to verify ClientIVC proof for tx ${Tx.getHash(tx)}: ${String(err)}`);
+      this.logger.warn(`Failed to verify ClientIVC proof for tx ${await Tx.getHash(tx)}: ${String(err)}`);
       return false;
     }
   }

package/src/wasm/bb_wasm_private_kernel_prover.ts

@@ -3,8 +3,8 @@ import { createLogger } from '@aztec/foundation/log';
 import { Timer } from '@aztec/foundation/timer';
 import { serializeWitness } from '@aztec/noir-noirc_abi';
 import type { ArtifactProvider } from '@aztec/noir-protocol-circuits-types/types';
-import type { WitnessMap } from '@aztec/noir-types';
 import type { SimulationProvider } from '@aztec/simulator/client';
+import type { PrivateExecutionStep } from '@aztec/stdlib/kernel';
 import { ClientIvcProof } from '@aztec/stdlib/proofs';
 
 import { ungzip } from 'pako';
@@ -21,23 +21,24 @@ export abstract class BBWASMPrivateKernelProver extends BBPrivateKernelProver {
     super(artifactProvider, simulationProvider, log);
   }
 
-  public override async createClientIvcProof(acirs: Buffer[], witnessStack: WitnessMap[]): Promise<ClientIvcProof> {
+  public override async createClientIvcProof(executionSteps: PrivateExecutionStep[]): Promise<ClientIvcProof> {
     const timer = new Timer();
     this.log.info(`Generating ClientIVC proof...`);
     const backend = new AztecClientBackend(
-      acirs.map(acir => ungzip(acir)),
+      executionSteps.map(step => ungzip(step.bytecode)),
       { threads: this.threads, logger: this.log.verbose, wasmPath: process.env.BB_WASM_PATH },
     );
 
-    const [proof, vk] = await backend.prove(witnessStack.map(witnessMap => ungzip(serializeWitness(witnessMap))));
+    // TODO(https://github.com/AztecProtocol/barretenberg/issues/1297): the vk is not provided to the network anymore.
+    // Move this sanity check inside the wasm code and remove the vk from the return value.
+    const [proof, _vk] = await backend.prove(executionSteps.map(step => ungzip(serializeWitness(step.witness))));
     await backend.destroy();
     this.log.info(`Generated ClientIVC proof`, {
       eventName: 'client-ivc-proof-generation',
       duration: timer.ms(),
       proofSize: proof.length,
-      vkSize: vk.length,
     });
-    return new ClientIvcProof(Buffer.from(proof), Buffer.from(vk));
+    return new ClientIvcProof(Buffer.from(proof));
   }
 
   public override async computeGateCountForCircuit(_bytecode: Buffer, _circuitName: string): Promise<number> {