@aztec/bb-prover 0.66.0 → 0.67.1-devnet

package/dest/wasm/index.js

@@ -0,0 +1,74 @@
+import { AztecClientBackend } from '@aztec/bb.js';
+import { ClientIvcProof, } from '@aztec/circuits.js';
+import { createLogger } from '@aztec/foundation/log';
+import { Timer } from '@aztec/foundation/timer';
+import { ClientCircuitArtifacts, ClientCircuitVks, convertPrivateKernelInitInputsToWitnessMap, convertPrivateKernelInitOutputsFromWitnessMap, convertPrivateKernelInnerInputsToWitnessMap, convertPrivateKernelInnerOutputsFromWitnessMap, convertPrivateKernelResetInputsToWitnessMap, convertPrivateKernelResetOutputsFromWitnessMap, convertPrivateKernelTailForPublicOutputsFromWitnessMap, convertPrivateKernelTailInputsToWitnessMap, convertPrivateKernelTailOutputsFromWitnessMap, convertPrivateKernelTailToPublicInputsToWitnessMap, getPrivateKernelResetArtifactName, } from '@aztec/noir-protocol-circuits-types/client';
+import { WASMSimulator } from '@aztec/simulator/client';
+import { serializeWitness } from '@noir-lang/noirc_abi';
+import { ungzip } from 'pako';
+export class BBWasmPrivateKernelProver {
+    constructor(threads = 1, log = createLogger('bb-prover:wasm')) {
+        this.threads = threads;
+        this.log = log;
+        this.simulator = new WASMSimulator();
+    }
+    async simulateProofInit(inputs) {
+        return await this.simulate(inputs, 'PrivateKernelInitArtifact', convertPrivateKernelInitInputsToWitnessMap, convertPrivateKernelInitOutputsFromWitnessMap);
+    }
+    async simulateProofInner(inputs) {
+        return await this.simulate(inputs, 'PrivateKernelInnerArtifact', convertPrivateKernelInnerInputsToWitnessMap, convertPrivateKernelInnerOutputsFromWitnessMap);
+    }
+    async simulateProofReset(inputs) {
+        const variantInputs = inputs.trimToSizes();
+        const artifactName = getPrivateKernelResetArtifactName(inputs.dimensions);
+        return await this.simulate(variantInputs, artifactName, variantInputs => convertPrivateKernelResetInputsToWitnessMap(variantInputs, artifactName), output => convertPrivateKernelResetOutputsFromWitnessMap(output, artifactName));
+    }
+    async simulateProofTail(inputs) {
+        if (!inputs.isForPublic()) {
+            return await this.simulate(inputs, 'PrivateKernelTailArtifact', convertPrivateKernelTailInputsToWitnessMap, convertPrivateKernelTailOutputsFromWitnessMap);
+        }
+        return await this.simulate(inputs, 'PrivateKernelTailToPublicArtifact', convertPrivateKernelTailToPublicInputsToWitnessMap, convertPrivateKernelTailForPublicOutputsFromWitnessMap);
+    }
+    async simulate(inputs, circuitType, convertInputs, convertOutputs) {
+        this.log.debug(`Generating witness for ${circuitType}`);
+        const compiledCircuit = ClientCircuitArtifacts[circuitType];
+        const witnessMap = convertInputs(inputs);
+        const timer = new Timer();
+        const outputWitness = await this.simulator.simulateCircuit(witnessMap, compiledCircuit);
+        const output = convertOutputs(outputWitness);
+        this.log.debug(`Generated witness for ${circuitType}`, {
+            eventName: 'circuit-witness-generation',
+            circuitName: circuitType,
+            duration: timer.ms(),
+            inputSize: inputs.toBuffer().length,
+            outputSize: output.toBuffer().length,
+        });
+        const verificationKey = ClientCircuitVks[circuitType].keyAsFields;
+        const bytecode = Buffer.from(compiledCircuit.bytecode, 'base64');
+        const kernelOutput = {
+            publicInputs: output,
+            verificationKey,
+            outputWitness,
+            bytecode,
+        };
+        return kernelOutput;
+    }
+    async createClientIvcProof(acirs, witnessStack) {
+        const timer = new Timer();
+        this.log.info(`Generating ClientIVC proof...`);
+        const backend = new AztecClientBackend(acirs.map(acir => ungzip(acir)), { threads: this.threads });
+        const [proof, vk] = await backend.prove(witnessStack.map(witnessMap => ungzip(serializeWitness(witnessMap))));
+        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));
+    }
+    computeGateCountForCircuit(_bytecode, _circuitName) {
+        return Promise.resolve(0);
+    }
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvd2FzbS9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFFbEQsT0FBTyxFQUNMLGNBQWMsR0FPZixNQUFNLG9CQUFvQixDQUFDO0FBQzVCLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUNyRCxPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDaEQsT0FBTyxFQUNMLHNCQUFzQixFQUN0QixnQkFBZ0IsRUFFaEIsMENBQTBDLEVBQzFDLDZDQUE2QyxFQUM3QywyQ0FBMkMsRUFDM0MsOENBQThDLEVBQzlDLDJDQUEyQyxFQUMzQyw4Q0FBOEMsRUFDOUMsc0RBQXNELEVBQ3RELDBDQUEwQyxFQUMxQyw2Q0FBNkMsRUFDN0Msa0RBQWtELEVBQ2xELGlDQUFpQyxHQUNsQyxNQUFNLDRDQUE0QyxDQUFDO0FBQ3BELE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUl4RCxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN4RCxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBRTlCLE1BQU0sT0FBTyx5QkFBeUI7SUFHcEMsWUFBb0IsVUFBa0IsQ0FBQyxFQUFVLE1BQU0sWUFBWSxDQUFDLGdCQUFnQixDQUFDO1FBQWpFLFlBQU8sR0FBUCxPQUFPLENBQVk7UUFBVSxRQUFHLEdBQUgsR0FBRyxDQUFpQztRQUY3RSxjQUFTLEdBQUcsSUFBSSxhQUFhLEVBQUUsQ0FBQztJQUVnRCxDQUFDO0lBRWxGLEtBQUssQ0FBQyxpQkFBaUIsQ0FDNUIsTUFBNkM7UUFFN0MsT0FBTyxNQUFNLElBQUksQ0FBQyxRQUFRLENBQ3hCLE1BQU0sRUFDTiwyQkFBMkIsRUFDM0IsMENBQTBDLEVBQzFDLDZDQUE2QyxDQUM5QyxDQUFDO0lBQ0osQ0FBQztJQUVNLEtBQUssQ0FBQyxrQkFBa0IsQ0FDN0IsTUFBOEM7UUFFOUMsT0FBTyxNQUFNLElBQUksQ0FBQyxRQUFRLENBQ3hCLE1BQU0sRUFDTiw0QkFBNEIsRUFDNUIsMkNBQTJDLEVBQzNDLDhDQUE4QyxDQUMvQyxDQUFDO0lBQ0osQ0FBQztJQUVNLEtBQUssQ0FBQyxrQkFBa0IsQ0FDN0IsTUFBOEM7UUFFOUMsTUFBTSxhQUFhLEdBQUcsTUFBTSxDQUFDLFdBQVcsRUFBRSxDQUFDO1FBQzNDLE1BQU0sWUFBWSxHQUFHLGlDQUFpQyxDQUFDLE1BQU0sQ0FBQyxVQUFVLENBQUMsQ0FBQztRQUMxRSxPQUFPLE1BQU0sSUFBSSxDQUFDLFFBQVEsQ0FDeEIsYUFBYSxFQUNiLFlBQVksRUFDWixhQUFhLENBQUMsRUFBRSxDQUFDLDJDQUEyQyxDQUFDLGFBQWEsRUFBRSxZQUFZLENBQUMsRUFDekYsTUFBTSxDQUFDLEVBQUUsQ0FBQyw4Q0FBOEMsQ0FBQyxNQUFNLEVBQUUsWUFBWSxDQUFDLENBQy9FLENBQUM7SUFDSixDQUFDO0lBRU0sS0FBSyxDQUFDLGlCQUFpQixDQUM1QixNQUE2QztRQUU3QyxJQUFJLENBQUMsTUFBTSxDQUFDLFdBQVcsRUFBRSxFQUFFLENBQUM7WUFDMUIsT0FBTyxNQUFNLElBQUksQ0FBQyxRQUFRLENBQ3hCLE1BQU0sRUFDTiwyQkFBMkIsRUFDM0IsMENBQTBDLEVBQzFDLDZDQUE2QyxDQUM5QyxDQUFDO1FBQ0osQ0FBQztRQUNELE9BQU8sTUFBTSxJQUFJLENBQUMsUUFBUSxDQUN4QixNQUFNLEVBQ04sbUNBQW1DLEVBQ25DLGtEQUFrRCxFQUNsRCxzREFBc0QsQ0FDdkQsQ0FBQztJQUNKLENBQUM7SUFFTyxLQUFLLENBQUMsUUFBUSxDQUlwQixNQUFTLEVBQ1QsV0FBbUMsRUFDbkMsYUFBd0MsRUFDeEMsY0FBMEM7UUFFMUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsMEJBQTBCLFdBQVcsRUFBRSxDQUFDLENBQUM7UUFDeEQsTUFBTSxlQUFlLEdBQXdCLHNCQUFzQixDQUFDLFdBQVcsQ0FBQyxDQUFDO1FBRWpGLE1BQU0sVUFBVSxHQUFHLGFBQWEsQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUN6QyxNQUFNLEtBQUssR0FBRyxJQUFJLEtBQUssRUFBRSxDQUFDO1FBQzFCLE1BQU0sYUFBYSxHQUFHLE1BQU0sSUFBSSxDQUFDLFNBQVMsQ0FBQyxlQUFlLENBQUMsVUFBVSxFQUFFLGVBQWUsQ0FBQyxDQUFDO1FBQ3hGLE1BQU0sTUFBTSxHQUFHLGNBQWMsQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUU3QyxJQUFJLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyx5QkFBeUIsV0FBVyxFQUFFLEVBQUU7WUFDckQsU0FBUyxFQUFFLDRCQUE0QjtZQUN2QyxXQUFXLEVBQUUsV0FBVztZQUN4QixRQUFRLEVBQUUsS0FBSyxDQUFDLEVBQUUsRUFBRTtZQUNwQixTQUFTLEVBQUUsTUFBTSxDQUFDLFFBQVEsRUFBRSxDQUFDLE1BQU07WUFDbkMsVUFBVSxFQUFFLE1BQU0sQ0FBQyxRQUFRLEVBQUUsQ0FBQyxNQUFNO1NBQ3JDLENBQUMsQ0FBQztRQUVILE1BQU0sZUFBZSxHQUFHLGdCQUFnQixDQUFDLFdBQVcsQ0FBQyxDQUFDLFdBQVcsQ0FBQztRQUNsRSxNQUFNLFFBQVEsR0FBRyxNQUFNLENBQUMsSUFBSSxDQUFDLGVBQWUsQ0FBQyxRQUFRLEVBQUUsUUFBUSxDQUFDLENBQUM7UUFFakUsTUFBTSxZQUFZLEdBQW1DO1lBQ25ELFlBQVksRUFBRSxNQUFNO1lBQ3BCLGVBQWU7WUFDZixhQUFhO1lBQ2IsUUFBUTtTQUNULENBQUM7UUFDRixPQUFPLFlBQVksQ0FBQztJQUN0QixDQUFDO0lBRUQsS0FBSyxDQUFDLG9CQUFvQixDQUFDLEtBQWUsRUFBRSxZQUEwQjtRQUNwRSxNQUFNLEtBQUssR0FBRyxJQUFJLEtBQUssRUFBRSxDQUFDO1FBQzFCLElBQUksQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLCtCQUErQixDQUFDLENBQUM7UUFDL0MsTUFBTSxPQUFPLEdBQUcsSUFBSSxrQkFBa0IsQ0FDcEMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQyxFQUMvQixFQUFFLE9BQU8sRUFBRSxJQUFJLENBQUMsT0FBTyxFQUFFLENBQzFCLENBQUM7UUFFRixNQUFNLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxHQUFHLE1BQU0sT0FBTyxDQUFDLEtBQUssQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxFQUFFLENBQUMsTUFBTSxDQUFDLGdCQUFnQixDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQzlHLE1BQU0sT0FBTyxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBQ3hCLElBQUksQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLDJCQUEyQixFQUFFO1lBQ3pDLFNBQVMsRUFBRSw2QkFBNkI7WUFDeEMsUUFBUSxFQUFFLEtBQUssQ0FBQyxFQUFFLEVBQUU7WUFDcEIsU0FBUyxFQUFFLEtBQUssQ0FBQyxNQUFNO1lBQ3ZCLE1BQU0sRUFBRSxFQUFFLENBQUMsTUFBTTtTQUNsQixDQUFDLENBQUM7UUFDSCxPQUFPLElBQUksY0FBYyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLEVBQUUsTUFBTSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDO0lBQ2pFLENBQUM7SUFFRCwwQkFBMEIsQ0FBQyxTQUFpQixFQUFFLFlBQW9CO1FBQ2hFLE9BQU8sT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUM1QixDQUFDO0NBQ0YifQ==

package/package.json

@@ -1,12 +1,14 @@
 {
   "name": "@aztec/bb-prover",
-  "version": "0.66.0",
+  "version": "0.67.1-devnet",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
+    "./wasm": "./dest/wasm/index.js",
     "./prover": "./dest/prover/index.js",
     "./verifier": "./dest/verifier/index.js",
-    "./test": "./dest/test/index.js"
+    "./test": "./dest/test/index.js",
+    "./config": "./dest/config.js"
   },
   "bin": {
     "bb-cli": "./dest/bb/index.js"
@@ -62,20 +64,26 @@
           "summaryThreshold": 9999
         }
       ]
+    ],
+    "testTimeout": 30000,
+    "setupFiles": [
+      "../../foundation/src/jest/setup.mjs"
     ]
   },
   "dependencies": {
-    "@aztec/circuit-types": "0.66.0",
-    "@aztec/circuits.js": "0.66.0",
-    "@aztec/foundation": "0.66.0",
-    "@aztec/noir-protocol-circuits-types": "0.66.0",
-    "@aztec/simulator": "0.66.0",
-    "@aztec/telemetry-client": "0.66.0",
-    "@aztec/world-state": "0.66.0",
+    "@aztec/bb.js": "0.67.1-devnet",
+    "@aztec/circuit-types": "0.67.1-devnet",
+    "@aztec/circuits.js": "0.67.1-devnet",
+    "@aztec/foundation": "0.67.1-devnet",
+    "@aztec/noir-protocol-circuits-types": "0.67.1-devnet",
+    "@aztec/simulator": "0.67.1-devnet",
+    "@aztec/telemetry-client": "0.67.1-devnet",
+    "@aztec/world-state": "0.67.1-devnet",
     "@msgpack/msgpack": "^3.0.0-beta2",
     "@noir-lang/noirc_abi": "portal:../../noir/packages/noirc_abi",
     "@noir-lang/types": "portal:../../noir/packages/types",
     "commander": "^12.1.0",
+    "pako": "^2.1.0",
     "source-map-support": "^0.5.21",
     "tslib": "^2.4.0"
   },

package/src/bb/cli.ts

@@ -2,7 +2,7 @@ import { type LogFn } from '@aztec/foundation/log';
 import { type ProtocolArtifact, ProtocolCircuitArtifacts } from '@aztec/noir-protocol-circuits-types';
 
 import { Command } from 'commander';
-import * as fs from 'fs/promises';
+import { promises as fs } from 'fs';
 
 import { generateContractForCircuit, generateKeyForNoirCircuit } from './execute.js';
 

package/src/bb/execute.ts

@@ -1,11 +1,11 @@
 import { type AvmCircuitInputs } from '@aztec/circuits.js';
 import { sha256 } from '@aztec/foundation/crypto';
-import { type DebugLogger, type LogFn } from '@aztec/foundation/log';
+import { type LogFn, type Logger } from '@aztec/foundation/log';
 import { Timer } from '@aztec/foundation/timer';
 import { type NoirCompiledCircuit } from '@aztec/types/noir';
 
 import * as proc from 'child_process';
-import * as fs from 'fs/promises';
+import { promises as fs } from 'fs';
 import { basename, dirname, join } from 'path';
 
 import { type UltraHonkFlavor } from '../honk.js';
@@ -201,7 +201,6 @@ export async function executeBbClientIvcProof(
   bytecodeStackPath: string,
   witnessStackPath: string,
   log: LogFn,
-  noAutoVerify = false,
 ): Promise<BBFailure | BBSuccess> {
   // Check that the working directory exists
   try {
@@ -238,9 +237,7 @@ export async function executeBbClientIvcProof(
       '--input_type',
       'runtime_stack',
     ];
-    if (noAutoVerify) {
-      args.push('--no_auto_verify');
-    }
+
     const timer = new Timer();
     const logFunction = (message: string) => {
       log(`bb - ${message}`);
@@ -508,7 +505,7 @@ export async function generateAvmProof(
   pathToBB: string,
   workingDirectory: string,
   input: AvmCircuitInputs,
-  logger: DebugLogger,
+  logger: Logger,
 ): Promise<BBFailure | BBSuccess> {
   // Check that the working directory exists
   try {

package/src/instrumentation.ts

@@ -8,7 +8,6 @@ import {
   type TelemetryClient,
   type Tracer,
   ValueType,
-  millisecondBuckets,
 } from '@aztec/telemetry-client';
 
 /**
@@ -36,27 +35,18 @@ export class ProverInstrumentation {
       description: 'Records how long it takes to simulate a circuit',
       unit: 'ms',
       valueType: ValueType.INT,
-      advice: {
-        explicitBucketBoundaries: millisecondBuckets(1), // 10ms -> ~327s
-      },
     });
 
     this.witGenDuration = meter.createHistogram(Metrics.CIRCUIT_WITNESS_GEN_DURATION, {
       description: 'Records how long it takes to generate the partial witness for a circuit',
       unit: 'ms',
       valueType: ValueType.INT,
-      advice: {
-        explicitBucketBoundaries: millisecondBuckets(1),
-      },
     });
 
     this.provingDuration = meter.createHistogram(Metrics.CIRCUIT_PROVING_DURATION, {
       unit: 'ms',
       description: 'Records how long it takes to prove a circuit',
       valueType: ValueType.INT,
-      advice: {
-        explicitBucketBoundaries: millisecondBuckets(2), // 100ms -> 54 minutes
-      },
     });
 
     this.witGenInputSize = meter.createGauge(Metrics.CIRCUIT_WITNESS_GEN_INPUT_SIZE, {

package/src/prover/bb_private_kernel_prover.ts

@@ -1,26 +1,18 @@
+import { type PrivateKernelProver, type PrivateKernelSimulateOutput } from '@aztec/circuit-types';
+import { type CircuitWitnessGenerationStats } from '@aztec/circuit-types/stats';
 import {
-  type AppCircuitSimulateOutput,
-  type PrivateKernelProver,
-  type PrivateKernelSimulateOutput,
-} from '@aztec/circuit-types';
-import { type CircuitSimulationStats, type CircuitWitnessGenerationStats } from '@aztec/circuit-types/stats';
-import {
-  AGGREGATION_OBJECT_LENGTH,
-  ClientIvcProof,
-  Fr,
+  type ClientIvcProof,
   type PrivateKernelCircuitPublicInputs,
   type PrivateKernelInitCircuitPrivateInputs,
   type PrivateKernelInnerCircuitPrivateInputs,
   type PrivateKernelResetCircuitPrivateInputs,
   type PrivateKernelTailCircuitPrivateInputs,
   type PrivateKernelTailCircuitPublicInputs,
-  Proof,
-  RecursiveProof,
-  type VerificationKeyAsFields,
+  type Proof,
   type VerificationKeyData,
 } from '@aztec/circuits.js';
 import { runInDirectory } from '@aztec/foundation/fs';
-import { type DebugLogger, createDebugLogger } from '@aztec/foundation/log';
+import { type Logger, createLogger } from '@aztec/foundation/log';
 import { Timer } from '@aztec/foundation/timer';
 import {
   ClientCircuitArtifacts,
@@ -45,22 +37,15 @@ import { type NoirCompiledCircuit } from '@aztec/types/noir';
 import { encode } from '@msgpack/msgpack';
 import { serializeWitness } from '@noir-lang/noirc_abi';
 import { type WitnessMap } from '@noir-lang/types';
-import * as fs from 'fs/promises';
+import { promises as fs } from 'fs';
 import path from 'path';
 
-import {
-  BB_RESULT,
-  PROOF_FIELDS_FILENAME,
-  PROOF_FILENAME,
-  computeGateCountForCircuit,
-  computeVerificationKey,
-  executeBbClientIvcProof,
-  verifyProof,
-} from '../bb/execute.js';
+import { BB_RESULT, computeGateCountForCircuit, executeBbClientIvcProof, verifyProof } from '../bb/execute.js';
 import { type BBConfig } from '../config.js';
 import { type UltraHonkFlavor, getUltraHonkFlavorForCircuit } from '../honk.js';
 import { mapProtocolArtifactNameToCircuitName } from '../stats.js';
 import { extractVkData } from '../verification_key/verification_key_data.js';
+import { readFromOutputDirectory } from './client_ivc_proof_utils.js';
 
 /**
  * This proof creator implementation uses the native bb binary.
@@ -79,10 +64,10 @@ export class BBNativePrivateKernelProver implements PrivateKernelProver {
     private bbBinaryPath: string,
     private bbWorkingDirectory: string,
     private skipCleanup: boolean,
-    private log = createDebugLogger('aztec:bb-native-prover'),
+    private log = createLogger('bb-prover:native'),
   ) {}
 
-  public static async new(config: BBConfig, log?: DebugLogger) {
+  public static async new(config: BBConfig, log?: Logger) {
     await fs.mkdir(config.bbWorkingDirectory, { recursive: true });
     return new BBNativePrivateKernelProver(config.bbBinaryPath, config.bbWorkingDirectory, !!config.bbSkipCleanup, log);
   }
@@ -112,7 +97,7 @@ export class BBNativePrivateKernelProver implements PrivateKernelProver {
       throw new Error(provingResult.reason);
     }
 
-    const proof = await ClientIvcProof.readFromOutputDirectory(directory);
+    const proof = await readFromOutputDirectory(directory);
 
     this.log.info(`Generated IVC proof`, {
       duration: provingResult.durationMs,
@@ -184,22 +169,6 @@ export class BBNativePrivateKernelProver implements PrivateKernelProver {
     );
   }
 
-  public async computeAppCircuitVerificationKey(
-    bytecode: Buffer,
-    appCircuitName?: string,
-  ): Promise<AppCircuitSimulateOutput> {
-    const operation = async (directory: string) => {
-      this.log.debug(`Proving app circuit`);
-      // App circuits are always recursive; the #[recursive] attribute used to be applied automatically
-      // by the `private` comptime macro in noir-projects/aztec-nr/aztec/src/macros/functions/mod.nr
-      // Yet, inside `computeVerificationKey` the `mega_honk` flavor is used, which doesn't use the recursive flag.
-      const recursive = true;
-      return await this.computeVerificationKey(directory, bytecode, recursive, 'App', appCircuitName);
-    };
-
-    return await this.runInDirectory(operation);
-  }
-
   /**
    * Verifies a proof, will generate the verification key if one is not cached internally
    * @param circuitType - The type of circuit whose proof is to be verified
@@ -313,99 +282,6 @@ export class BBNativePrivateKernelProver implements PrivateKernelProver {
     return kernelOutput;
   }
 
-  private async computeVerificationKey(
-    directory: string,
-    bytecode: Buffer,
-    recursive: boolean,
-    circuitType: ClientProtocolArtifact | 'App',
-    appCircuitName?: string,
-  ): Promise<{
-    verificationKey: VerificationKeyAsFields;
-  }> {
-    const dbgCircuitName = appCircuitName ? `(${appCircuitName})` : '';
-    this.log.info(`Computing VK of ${circuitType}${dbgCircuitName} circuit...`);
-
-    const timer = new Timer();
-
-    const vkResult = await computeVerificationKey(
-      this.bbBinaryPath,
-      directory,
-      circuitType,
-      bytecode,
-      recursive,
-      circuitType === 'App' ? 'mega_honk' : getUltraHonkFlavorForCircuit(circuitType),
-      this.log.debug,
-    );
-
-    if (vkResult.status === BB_RESULT.FAILURE) {
-      this.log.error(`Failed to generate verification key for ${circuitType}${dbgCircuitName}: ${vkResult.reason}`);
-      throw new Error(vkResult.reason);
-    }
-
-    this.log.info(`Generated ${circuitType}${dbgCircuitName} VK in ${Math.ceil(timer.ms())} ms`);
-
-    if (circuitType === 'App') {
-      const vkData = await extractVkData(directory);
-
-      this.log.debug(`Computed verification key`, {
-        circuitName: 'app-circuit',
-        duration: vkResult.durationMs,
-        eventName: 'circuit-simulation',
-        inputSize: bytecode.length,
-        outputSize: vkData.keyAsBytes.length,
-        circuitSize: vkData.circuitSize,
-        numPublicInputs: vkData.numPublicInputs,
-      } as CircuitSimulationStats);
-
-      return { verificationKey: vkData.keyAsFields };
-    }
-
-    const vkData = await this.updateVerificationKeyAfterSimulation(directory, circuitType);
-
-    this.log.debug(`Computed verification key`, {
-      circuitName: mapProtocolArtifactNameToCircuitName(circuitType),
-      duration: vkResult.durationMs,
-      eventName: 'circuit-simulation',
-      inputSize: bytecode.length,
-      outputSize: vkData.keyAsBytes.length,
-      circuitSize: vkData.circuitSize,
-      numPublicInputs: vkData.numPublicInputs,
-    } as CircuitSimulationStats);
-
-    return { verificationKey: vkData.keyAsFields };
-  }
-
-  /**
-   * Parses and returns the proof data stored at the specified directory
-   * @param filePath - The directory containing the proof data
-   * @param circuitType - The type of circuit proven
-   * @returns The proof
-   */
-  private async readProofAsFields<PROOF_LENGTH extends number>(
-    filePath: string,
-    circuitType: ClientProtocolArtifact | 'App',
-    vkData: VerificationKeyData,
-  ): Promise<RecursiveProof<PROOF_LENGTH>> {
-    const [binaryProof, proofString] = await Promise.all([
-      fs.readFile(`${filePath}/${PROOF_FILENAME}`),
-      fs.readFile(`${filePath}/${PROOF_FIELDS_FILENAME}`, { encoding: 'utf-8' }),
-    ]);
-    const json = JSON.parse(proofString);
-    const fields = json.map(Fr.fromString);
-    const numPublicInputs = vkData.numPublicInputs - AGGREGATION_OBJECT_LENGTH;
-    const fieldsWithoutPublicInputs = fields.slice(numPublicInputs);
-    this.log.info(
-      `Circuit type: ${circuitType}, complete proof length: ${fields.length}, without public inputs: ${fieldsWithoutPublicInputs.length}, num public inputs: ${numPublicInputs}, circuit size: ${vkData.circuitSize}, is recursive: ${vkData.isRecursive}, raw length: ${binaryProof.length}`,
-    );
-    const proof = new RecursiveProof<PROOF_LENGTH>(
-      fieldsWithoutPublicInputs,
-      new Proof(binaryProof, vkData.numPublicInputs),
-      true,
-      fieldsWithoutPublicInputs.length,
-    );
-    return proof;
-  }
-
   private runInDirectory<T>(fn: (dir: string) => Promise<T>) {
     const log = this.log;
     return runInDirectory(

package/src/prover/bb_prover.ts

@@ -42,7 +42,7 @@ import {
   makeRecursiveProofFromBinary,
 } from '@aztec/circuits.js';
 import { runInDirectory } from '@aztec/foundation/fs';
-import { createDebugLogger } from '@aztec/foundation/log';
+import { createLogger } from '@aztec/foundation/log';
 import { BufferReader } from '@aztec/foundation/serialize';
 import { Timer } from '@aztec/foundation/timer';
 import {
@@ -76,7 +76,7 @@ import { Attributes, type TelemetryClient, trackSpan } from '@aztec/telemetry-cl
 import { abiEncode } from '@noir-lang/noirc_abi';
 import { type Abi, type WitnessMap } from '@noir-lang/types';
 import crypto from 'crypto';
-import * as fs from 'fs/promises';
+import { promises as fs } from 'fs';
 import * as path from 'path';
 
 import {
@@ -99,8 +99,9 @@ import { type UltraHonkFlavor, getUltraHonkFlavorForCircuit } from '../honk.js';
 import { ProverInstrumentation } from '../instrumentation.js';
 import { mapProtocolArtifactNameToCircuitName } from '../stats.js';
 import { extractAvmVkData, extractVkData } from '../verification_key/verification_key_data.js';
+import { writeToOutputDirectory } from './client_ivc_proof_utils.js';
 
-const logger = createDebugLogger('aztec:bb-prover');
+const logger = createLogger('bb-prover');
 
 // All `ServerCircuitArtifact` are recursive.
 const SERVER_CIRCUIT_RECURSIVE = true;
@@ -551,7 +552,7 @@ export class BBNativeRollupProver implements ServerCircuitProver {
     const hasher = crypto.createHash('sha256');
     hasher.update(input.toBuffer());
 
-    await input.clientIVCData.writeToOutputDirectory(bbWorkingDirectory);
+    await writeToOutputDirectory(input.clientIVCData, bbWorkingDirectory);
     const provingResult = await generateTubeProof(this.config.bbBinaryPath, bbWorkingDirectory, logger.verbose);
 
     if (provingResult.status === BB_RESULT.FAILURE) {
@@ -795,8 +796,8 @@ export class BBNativeRollupProver implements ServerCircuitProver {
       const json = JSON.parse(proofString);
       const fields = json
         .slice(0, 3)
-        .map(Fr.fromString)
-        .concat(json.slice(3 + numPublicInputs).map(Fr.fromString));
+        .map(Fr.fromHexString)
+        .concat(json.slice(3 + numPublicInputs).map(Fr.fromHexString));
       return new RecursiveProof(
         fields,
         new Proof(proof.binaryProof.buffer, vk.numPublicInputs),
@@ -877,8 +878,8 @@ export class BBNativeRollupProver implements ServerCircuitProver {
 
     const fieldsWithoutPublicInputs = json
       .slice(0, 3)
-      .map(Fr.fromString)
-      .concat(json.slice(3 + numPublicInputs).map(Fr.fromString));
+      .map(Fr.fromHexString)
+      .concat(json.slice(3 + numPublicInputs).map(Fr.fromHexString));
     logger.debug(
       `Circuit path: ${filePath}, complete proof length: ${json.length}, num public inputs: ${numPublicInputs}, circuit size: ${vkData.circuitSize}, is recursive: ${vkData.isRecursive}, raw length: ${binaryProof.length}`,
     );

package/src/prover/client_ivc_proof_utils.ts

@@ -0,0 +1,39 @@
+import { ClientIvcProof } from '@aztec/circuits.js';
+
+import { promises as fs } from 'fs';
+import { join } from 'path';
+
+/**
+ * TODO(#7371): eventually remove client_ivc_prove_output_all_msgpack and properly handle these accumulators and VKs
+ * Create a ClientIvcProof from the result of client_ivc_prove_output_all or client_ivc_prove_output_all_msgpack
+ * @param directory the directory of results
+ * @returns the encapsulated client ivc proof
+ */
+export async function readFromOutputDirectory(directory: string) {
+  const [clientIvcVkBuffer, clientIvcProofBuffer] = await Promise.all(
+    ['client_ivc_vk', 'client_ivc_proof'].map(fileName => fs.readFile(join(directory, fileName))),
+  );
+  return new ClientIvcProof(clientIvcProofBuffer, clientIvcVkBuffer);
+}
+
+/**
+ * TODO(#7371): eventually remove client_ivc_prove_output_all_msgpack and properly handle these accumulators and VKs
+ * Serialize a ClientIvcProof to the files expected by prove_tube
+ *
+ * Example usage:
+ *  await runInDirectory(bbWorkingDirectory, async (dir: string) => {
+ *    await privateTx.clientIvcProof!.writeToOutputDirectory(bbWorkingDirectory);
+ *    const result = await generateTubeProof(bbPath, dir, logger.info)
+ *    expect(result.status).toBe(BB_RESULT.SUCCESS)
+ *  });
+ * @param proof the ClientIvcProof from readFromOutputDirectory
+ * @param directory the directory of results
+ */
+export async function writeToOutputDirectory(clientIvcProof: ClientIvcProof, directory: string) {
+  const { clientIvcProofBuffer, clientIvcVkBuffer } = clientIvcProof;
+  const fileData = [
+    ['client_ivc_proof', clientIvcProofBuffer],
+    ['client_ivc_vk', clientIvcVkBuffer],
+  ] as const;
+  await Promise.all(fileData.map(([fileName, buffer]) => fs.writeFile(join(directory, fileName), buffer)));
+}

package/src/prover/index.ts

@@ -1,2 +1,3 @@
 export * from './bb_prover.js';
 export * from './bb_private_kernel_prover.js';
+export * from './client_ivc_proof_utils.js';

package/src/test/test_avm.ts

@@ -0,0 +1,85 @@
+import {
+  AztecAddress,
+  BlockHeader,
+  ContractStorageRead,
+  ContractStorageUpdateRequest,
+  Gas,
+  GlobalVariables,
+  L2ToL1Message,
+  LogHash,
+  MAX_ENQUEUED_CALLS_PER_CALL,
+  MAX_L1_TO_L2_MSG_READ_REQUESTS_PER_CALL,
+  MAX_L2_TO_L1_MSGS_PER_CALL,
+  MAX_NOTE_HASHES_PER_CALL,
+  MAX_NOTE_HASH_READ_REQUESTS_PER_CALL,
+  MAX_NULLIFIERS_PER_CALL,
+  MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL,
+  MAX_NULLIFIER_READ_REQUESTS_PER_CALL,
+  MAX_PUBLIC_DATA_READS_PER_CALL,
+  MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL,
+  MAX_UNENCRYPTED_LOGS_PER_CALL,
+  NoteHash,
+  Nullifier,
+  PublicCircuitPublicInputs,
+  PublicInnerCallRequest,
+  ReadRequest,
+  RevertCode,
+  TreeLeafReadRequest,
+} from '@aztec/circuits.js';
+import { computeVarArgsHash } from '@aztec/circuits.js/hash';
+import { padArrayEnd } from '@aztec/foundation/collection';
+import { type PublicFunctionCallResult } from '@aztec/simulator';
+
+// TODO: pub somewhere more usable - copied from abstract phase manager
+export function getPublicInputs(result: PublicFunctionCallResult): PublicCircuitPublicInputs {
+  return PublicCircuitPublicInputs.from({
+    callContext: result.executionRequest.callContext,
+    proverAddress: AztecAddress.ZERO,
+    argsHash: computeVarArgsHash(result.executionRequest.args),
+    noteHashes: padArrayEnd(result.noteHashes, NoteHash.empty(), MAX_NOTE_HASHES_PER_CALL),
+    nullifiers: padArrayEnd(result.nullifiers, Nullifier.empty(), MAX_NULLIFIERS_PER_CALL),
+    l2ToL1Msgs: padArrayEnd(result.l2ToL1Messages, L2ToL1Message.empty(), MAX_L2_TO_L1_MSGS_PER_CALL),
+    startSideEffectCounter: result.startSideEffectCounter,
+    endSideEffectCounter: result.endSideEffectCounter,
+    returnsHash: computeVarArgsHash(result.returnValues),
+    noteHashReadRequests: padArrayEnd(
+      result.noteHashReadRequests,
+      TreeLeafReadRequest.empty(),
+      MAX_NOTE_HASH_READ_REQUESTS_PER_CALL,
+    ),
+    nullifierReadRequests: padArrayEnd(
+      result.nullifierReadRequests,
+      ReadRequest.empty(),
+      MAX_NULLIFIER_READ_REQUESTS_PER_CALL,
+    ),
+    nullifierNonExistentReadRequests: padArrayEnd(
+      result.nullifierNonExistentReadRequests,
+      ReadRequest.empty(),
+      MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL,
+    ),
+    l1ToL2MsgReadRequests: padArrayEnd(
+      result.l1ToL2MsgReadRequests,
+      TreeLeafReadRequest.empty(),
+      MAX_L1_TO_L2_MSG_READ_REQUESTS_PER_CALL,
+    ),
+    contractStorageReads: padArrayEnd(
+      result.contractStorageReads,
+      ContractStorageRead.empty(),
+      MAX_PUBLIC_DATA_READS_PER_CALL,
+    ),
+    contractStorageUpdateRequests: padArrayEnd(
+      result.contractStorageUpdateRequests,
+      ContractStorageUpdateRequest.empty(),
+      MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL,
+    ),
+    publicCallRequests: padArrayEnd([], PublicInnerCallRequest.empty(), MAX_ENQUEUED_CALLS_PER_CALL),
+    unencryptedLogsHashes: padArrayEnd(result.unencryptedLogsHashes, LogHash.empty(), MAX_UNENCRYPTED_LOGS_PER_CALL),
+    historicalHeader: BlockHeader.empty(),
+    globalVariables: GlobalVariables.empty(),
+    startGasLeft: Gas.from(result.startGasLeft),
+    endGasLeft: Gas.from(result.endGasLeft),
+    transactionFee: result.transactionFee,
+    // TODO(@just-mitch): need better mapping from simulator to revert code.
+    revertCode: result.reverted ? RevertCode.APP_LOGIC_REVERTED : RevertCode.OK,
+  });
+}