@aztec/bb-prover 0.84.0 → 0.85.0

package/dest/avm_proving_tests/avm_proving_tester.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"avm_proving_tester.d.ts","sourceRoot":"","sources":["../../src/avm_proving_tests/avm_proving_tester.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,KAAK,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AACnG,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAC;AACnE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,iCAAiC,CAAC;AAEjF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAQxD,OAAO,EACL,KAAK,QAAQ,EACb,KAAK,SAAS,EAMf,MAAM,kBAAkB,CAAC;AAK1B,qBAAa,gBAAiB,SAAQ,wBAAwB;IAE1D,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,gBAAgB;gBADhB,kBAAkB,EAAE,MAAM,EAC1B,gBAAgB,EAAE,OAAO,EACjC,UAAU,EAAE,yBAAyB,EACrC,kBAAkB,EAAE,wBAAwB,EAC5C,OAAO,CAAC,EAAE,eAAe;WAMd,GAAG,CAAC,gBAAgB,GAAE,OAAe,EAAE,OAAO,CAAC,EAAE,eAAe;IAQvE,KAAK,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,OAAO,CAAC,QAAQ,CAAC;IAe5D,MAAM,CAAC,QAAQ,EAAE,SAAS,GAAG,OAAO,CAAC,QAAQ,CAAC;IAgBvC,cAAc,CACzB,MAAM,EAAE,YAAY,EACpB,UAAU,EAAE,gBAAgB,EAAE,EAC9B,QAAQ,EAAE,gBAAgB,EAAE,EAC5B,YAAY,EAAE,gBAAgB,GAAG,SAAS,EAC1C,YAAY,EAAE,OAAO,GAAG,SAAS,EACjC,QAAQ,eAAS;IAWN,sBAAsB,CAAC,OAAO,EAAE,gBAAgB,EAAE,YAAY,CAAC,EAAE,OAAO;CAWtF;AAED,qBAAa,kBAAmB,SAAQ,wBAAwB;IAE5D,OAAO,CAAC,kBAAkB;gBAAlB,kBAAkB,EAAE,MAAM,EAClC,kBAAkB,EAAE,wBAAwB,EAC5C,WAAW,EAAE,yBAAyB,EACtC,OAAO,CAAC,EAAE,eAAe;WAKd,GAAG,CAAC,OAAO,CAAC,EAAE,eAAe;IAQpC,OAAO,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,OAAO,CAAC,QAAQ,CAAC;IAU9D,QAAQ,CAAC,QAAQ,EAAE,SAAS,GAAG,OAAO,CAAC,QAAQ,CAAC;IAezC,gBAAgB,CAC3B,MAAM,EAAE,YAAY,EACpB,UAAU,EAAE,gBAAgB,EAAE,EAC9B,QAAQ,EAAE,gBAAgB,EAAE,EAC5B,YAAY,EAAE,gBAAgB,GAAG,SAAS,EAC1C,YAAY,EAAE,OAAO,GAAG,SAAS,EACjC,QAAQ,eAAS;CAYpB"}
+{"version":3,"file":"avm_proving_tester.d.ts","sourceRoot":"","sources":["../../src/avm_proving_tests/avm_proving_tester.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,KAAK,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AACnG,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAC;AACnE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,iCAAiC,CAAC;AAEjF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAQxD,OAAO,EACL,KAAK,QAAQ,EACb,KAAK,SAAS,EAMf,MAAM,kBAAkB,CAAC;AAK1B,qBAAa,gBAAiB,SAAQ,wBAAwB;IAE1D,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,gBAAgB;gBADhB,kBAAkB,EAAE,MAAM,EAC1B,gBAAgB,EAAE,OAAO,EACjC,UAAU,EAAE,yBAAyB,EACrC,kBAAkB,EAAE,wBAAwB,EAC5C,OAAO,CAAC,EAAE,eAAe;WAMd,GAAG,CAAC,gBAAgB,GAAE,OAAe,EAAE,OAAO,CAAC,EAAE,eAAe;IAQvE,KAAK,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,OAAO,CAAC,QAAQ,CAAC;IAe5D,MAAM,CAAC,QAAQ,EAAE,SAAS,GAAG,OAAO,CAAC,QAAQ,CAAC;IAgBvC,cAAc,CACzB,MAAM,EAAE,YAAY,EACpB,UAAU,EAAE,gBAAgB,EAAE,EAC9B,QAAQ,EAAE,gBAAgB,EAAE,EAC5B,YAAY,EAAE,gBAAgB,GAAG,SAAS,EAC1C,YAAY,EAAE,OAAO,GAAG,SAAS,EACjC,QAAQ,eAAS;IAWN,sBAAsB,CAAC,OAAO,EAAE,gBAAgB,EAAE,YAAY,CAAC,EAAE,OAAO;CAWtF;AAED,qBAAa,kBAAmB,SAAQ,wBAAwB;IAE5D,OAAO,CAAC,kBAAkB;gBAAlB,kBAAkB,EAAE,MAAM,EAClC,kBAAkB,EAAE,wBAAwB,EAC5C,WAAW,EAAE,yBAAyB,EACtC,OAAO,CAAC,EAAE,eAAe;WAKd,GAAG,CAAC,OAAO,CAAC,EAAE,eAAe;IAQpC,OAAO,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,OAAO,CAAC,QAAQ,CAAC;IAU9D,QAAQ,CAAC,QAAQ,EAAE,SAAS,GAAG,OAAO,CAAC,QAAQ,CAAC;IAczC,gBAAgB,CAC3B,MAAM,EAAE,YAAY,EACpB,UAAU,EAAE,gBAAgB,EAAE,EAC9B,QAAQ,EAAE,gBAAgB,EAAE,EAC5B,YAAY,EAAE,gBAAgB,GAAG,SAAS,EAC1C,YAAY,EAAE,OAAO,GAAG,SAAS,EACjC,QAAQ,eAAS;CAYpB"}

package/dest/avm_proving_tests/avm_proving_tester.js

@@ -89,8 +89,7 @@ export class AvmProvingTesterV2 extends PublicTxSimulationTester {
     async verifyV2(proofRes) {
         // TODO: Placeholder for now. They get ignored in C++.
         const inputs = await makeAvmCircuitInputs();
-        const rawVkPath = path.join(proofRes.vkPath, 'vk');
-        return await verifyAvmProofV2(BB_PATH, this.bbWorkingDirectory, proofRes.proofPath, inputs.publicInputs, rawVkPath, this.logger);
+        return await verifyAvmProofV2(BB_PATH, this.bbWorkingDirectory, proofRes.proofPath, inputs.publicInputs, proofRes.vkPath, this.logger);
     }
     async simProveVerifyV2(sender, setupCalls, appCalls, teardownCall, expectRevert, feePayer = sender) {
         const simRes = await this.simulateTx(sender, setupCalls, appCalls, teardownCall, feePayer);

package/dest/bb/execute.d.ts

@@ -12,7 +12,7 @@ export declare const PROOF_FIELDS_FILENAME = "proof_fields.json";
 export declare const AVM_INPUTS_FILENAME = "avm_inputs.bin";
 export declare const AVM_BYTECODE_FILENAME = "avm_bytecode.bin";
 export declare const AVM_PUBLIC_INPUTS_FILENAME = "avm_public_inputs.bin";
-export declare const AVM_HINTS_FILENAME = "avm_hints.bin";
+export declare const CLIENT_IVC_PROOF_FILE_NAME = "proof";
 export declare enum BB_RESULT {
     SUCCESS = 0,
     FAILURE = 1,
@@ -55,7 +55,7 @@ type BBExecResult = {
  * @returns The completed partial witness outputted from the circuit
  */
 export declare function executeBB(pathToBB: string, command: string, args: string[], logger: LogFn, timeout?: number, resultParser?: (code: number) => boolean): Promise<BBExecResult>;
-export declare function executeBbClientIvcProof(pathToBB: string, workingDirectory: string, bytecodeStackPath: string, witnessStackPath: string, log: LogFn): Promise<BBFailure | BBSuccess>;
+export declare function executeBbClientIvcProof(pathToBB: string, workingDirectory: string, bytecodeStackPath: string, witnessStackPath: string, log: LogFn, writeVk?: boolean): Promise<BBFailure | BBSuccess>;
 /**
  * Used for generating proofs of noir circuits.
  * It is assumed that the working directory is a temporary and/or random directory used solely for generating this proof.

package/dest/bb/execute.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../src/bb/execute.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../src/bb/execute.ts"],"names":[],"mappings":"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"}

package/dest/bb/execute.js

@@ -3,7 +3,6 @@ import { Timer } from '@aztec/foundation/timer';
 import * as proc from 'child_process';
 import { promises as fs } from 'fs';
 import { basename, dirname, join } from 'path';
-import { CLIENT_IVC_PROOF_FILE_NAME } from '../prover/client_ivc_proof_utils.js';
 export const VK_FILENAME = 'vk';
 export const VK_FIELDS_FILENAME = 'vk_fields.json';
 export const PUBLIC_INPUTS_FILENAME = 'public_inputs';
@@ -13,7 +12,7 @@ export const PROOF_FIELDS_FILENAME = 'proof_fields.json';
 export const AVM_INPUTS_FILENAME = 'avm_inputs.bin';
 export const AVM_BYTECODE_FILENAME = 'avm_bytecode.bin';
 export const AVM_PUBLIC_INPUTS_FILENAME = 'avm_public_inputs.bin';
-export const AVM_HINTS_FILENAME = 'avm_hints.bin';
+export const CLIENT_IVC_PROOF_FILE_NAME = 'proof';
 export var BB_RESULT = /*#__PURE__*/ function(BB_RESULT) {
     BB_RESULT[BB_RESULT["SUCCESS"] = 0] = "SUCCESS";
     BB_RESULT[BB_RESULT["FAILURE"] = 1] = "FAILURE";
@@ -87,7 +86,7 @@ export var BB_RESULT = /*#__PURE__*/ function(BB_RESULT) {
             signal: undefined
         }));
 }
-export async function executeBbClientIvcProof(pathToBB, workingDirectory, bytecodeStackPath, witnessStackPath, log) {
+export async function executeBbClientIvcProof(pathToBB, workingDirectory, bytecodeStackPath, witnessStackPath, log, writeVk = false) {
     // Check that the working directory exists
     try {
         await fs.access(workingDirectory);
@@ -121,9 +120,11 @@ export async function executeBbClientIvcProof(pathToBB, workingDirectory, byteco
             '--scheme',
             'client_ivc',
             '--input_type',
-            'runtime_stack',
-            '--write_vk'
+            'runtime_stack'
         ];
+        if (writeVk) {
+            args.push('--write_vk');
+        }
         const timer = new Timer();
         const logFunction = (message)=>{
             log(`bb - ${message}`);
@@ -391,7 +392,7 @@ function getArgs(flavor) {
                 durationMs: duration,
                 proofPath: join(outputPath, PROOF_FILENAME),
                 pkPath: undefined,
-                vkPath: outputPath
+                vkPath: join(outputPath, VK_FILENAME)
             };
         }
         // Not a great error message here but it is difficult to decipher what comes from bb
@@ -427,7 +428,6 @@ function getArgs(flavor) {
     }
     // Paths for the inputs
     const publicInputsPath = join(workingDirectory, AVM_PUBLIC_INPUTS_FILENAME);
-    const avmHintsPath = join(workingDirectory, AVM_HINTS_FILENAME);
     // The proof is written to e.g. /workingDirectory/proof
     const outputPath = workingDirectory;
     const filePresent = async (file)=>await fs.access(file, fs.constants.R_OK).then((_)=>true).catch((_)=>false);
@@ -452,8 +452,6 @@ function getArgs(flavor) {
         const args = [
             '--avm-public-inputs',
             publicInputsPath,
-            '--avm-hints',
-            avmHintsPath,
             '-o',
             outputPath
         ];

package/dest/index.d.ts

@@ -4,5 +4,6 @@ export * from './verifier/index.js';
 export * from './config.js';
 export * from './bb/execute.js';
 export * from './honk.js';
+export * from './verification_key/verification_key_data.js';
 export { type ClientProtocolCircuitVerifier } from '@aztec/stdlib/interfaces/server';
 //# sourceMappingURL=index.d.ts.map

package/dest/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC;AACpC,cAAc,aAAa,CAAC;AAC5B,cAAc,iBAAiB,CAAC;AAChC,cAAc,WAAW,CAAC;AAE1B,OAAO,EAAE,KAAK,6BAA6B,EAAE,MAAM,iCAAiC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC;AACpC,cAAc,aAAa,CAAC;AAC5B,cAAc,iBAAiB,CAAC;AAChC,cAAc,WAAW,CAAC;AAC1B,cAAc,6CAA6C,CAAC;AAE5D,OAAO,EAAE,KAAK,6BAA6B,EAAE,MAAM,iCAAiC,CAAC"}

package/dest/index.js

@@ -4,3 +4,4 @@ export * from './verifier/index.js';
 export * from './config.js';
 export * from './bb/execute.js';
 export * from './honk.js';
+export * from './verification_key/verification_key_data.js';

package/dest/prover/bb_native_private_kernel_prover.js

@@ -7,7 +7,7 @@ import { promises as fs } from 'fs';
 import path from 'path';
 import { BB_RESULT, computeGateCountForCircuit, executeBbClientIvcProof } from '../bb/execute.js';
 import { BBPrivateKernelProver } from './bb_private_kernel_prover.js';
-import { readFromOutputDirectory } from './client_ivc_proof_utils.js';
+import { readClientIVCProofFromOutputDirectory } from './proof_utils.js';
 /**
  * This proof creator implementation uses the native bb binary.
  */ export class BBNativePrivateKernelProver extends BBPrivateKernelProver {
@@ -46,7 +46,7 @@ import { readFromOutputDirectory } from './client_ivc_proof_utils.js';
             this.log.error(`Failed to generate client ivc proof`);
             throw new Error(provingResult.reason);
         }
-        const proof = await readFromOutputDirectory(directory);
+        const proof = await readClientIVCProofFromOutputDirectory(directory);
         this.log.info(`Generated IVC proof`, {
             duration: provingResult.durationMs,
             eventName: 'circuit-proving'

package/dest/prover/bb_prover.d.ts

@@ -113,7 +113,6 @@ export declare class BBNativeRollupProver implements ServerCircuitProver {
      * @returns The verification key data
      */
     private getVerificationKeyDataForCircuit;
-    private readProofAsFields;
     private readAvmProofAsFields;
     private runInDirectory;
 }

package/dest/prover/bb_prover.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bb_prover.d.ts","sourceRoot":"","sources":["../../src/prover/bb_prover.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"bb_prover.d.ts","sourceRoot":"","sources":["../../src/prover/bb_prover.ts"],"names":[],"mappings":"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"}

package/dest/prover/bb_prover.js

@@ -4,7 +4,7 @@
     else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-import { AGGREGATION_OBJECT_LENGTH, AVM_PROOF_LENGTH_IN_FIELDS, IPA_CLAIM_LENGTH, NESTED_RECURSIVE_PROOF_LENGTH, NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH, RECURSIVE_PROOF_LENGTH, TUBE_PROOF_LENGTH } from '@aztec/constants';
+import { AGGREGATION_OBJECT_LENGTH, AVM_PROOF_LENGTH_IN_FIELDS, NESTED_RECURSIVE_PROOF_LENGTH, NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH, RECURSIVE_PROOF_LENGTH, TUBE_PROOF_LENGTH } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/fields';
 import { runInDirectory } from '@aztec/foundation/fs';
 import { createLogger } from '@aztec/foundation/log';
@@ -17,17 +17,16 @@ import { ProvingError } from '@aztec/stdlib/errors';
 import { makeProofAndVerificationKey, makePublicInputsAndRecursiveProof } from '@aztec/stdlib/interfaces/server';
 import { Proof, RecursiveProof, makeRecursiveProofFromBinary } from '@aztec/stdlib/proofs';
 import { Attributes, getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
-import assert from 'assert';
 import crypto from 'crypto';
 import { promises as fs } from 'fs';
 import * as path from 'path';
-import { BB_RESULT, PROOF_FIELDS_FILENAME, PROOF_FILENAME, PUBLIC_INPUTS_FILENAME, VK_FILENAME, generateAvmProof, generateProof, generateTubeProof, verifyAvmProof, verifyProof } from '../bb/execute.js';
+import { BB_RESULT, PROOF_FILENAME, PUBLIC_INPUTS_FILENAME, VK_FILENAME, generateAvmProof, generateProof, generateTubeProof, verifyAvmProof, verifyProof } from '../bb/execute.js';
 import { 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 { PRIVATE_TAIL_CIVC_VK, PUBLIC_TAIL_CIVC_VK } from '../verifier/bb_verifier.js';
-import { writeToOutputDirectory } from './client_ivc_proof_utils.js';
+import { readProofAsFields, writeClientIVCProofToOutputDirectory } from './proof_utils.js';
 const logger = createLogger('bb-prover');
 // All `ServerCircuitArtifact` are recursive.
 const SERVER_CIRCUIT_RECURSIVE = true;
@@ -206,7 +205,7 @@ const SERVER_CIRCUIT_RECURSIVE = true;
         const operation = async (bbWorkingDirectory)=>{
             const { provingResult, circuitOutput: output } = await this.generateProofWithBB(input, circuitType, convertInput, convertOutput, bbWorkingDirectory);
             const vkData = this.getVerificationKeyDataForCircuit(circuitType);
-            const proof = await this.readProofAsFields(provingResult.proofPath, vkData, RECURSIVE_PROOF_LENGTH);
+            const proof = await readProofAsFields(provingResult.proofPath, vkData, RECURSIVE_PROOF_LENGTH, logger);
             const circuitName = mapProtocolArtifactNameToCircuitName(circuitType);
             this.instrumentation.recordDuration('provingDuration', circuitName, provingResult.durationMs);
             this.instrumentation.recordSize('proofSize', circuitName, proof.binaryProof.buffer.length);
@@ -231,10 +230,10 @@ const SERVER_CIRCUIT_RECURSIVE = true;
         return await this.runInDirectory(operation);
     }
     async generateAvmProofWithBB(input, workingDirectory) {
-        logger.info(`Proving avm-circuit for ${input.functionName}...`);
+        logger.info(`Proving avm-circuit for TX ${input.hints.tx.hash}...`);
         const provingResult = await generateAvmProof(this.config.bbBinaryPath, workingDirectory, input, logger);
         if (provingResult.status === BB_RESULT.FAILURE) {
-            logger.error(`Failed to generate AVM proof for ${input.functionName}: ${provingResult.reason}`);
+            logger.error(`Failed to generate AVM proof for TX ${input.hints.tx.hash}: ${provingResult.reason}`);
             throw new ProvingError(provingResult.reason, provingResult, provingResult.retry);
         }
         return provingResult;
@@ -243,7 +242,7 @@ const SERVER_CIRCUIT_RECURSIVE = true;
         logger.debug(`Proving tube...`);
         const hasher = crypto.createHash('sha256');
         hasher.update(input.toBuffer());
-        await writeToOutputDirectory(input.clientIVCData, bbWorkingDirectory);
+        await writeClientIVCProofToOutputDirectory(input.clientIVCData, bbWorkingDirectory);
         const provingResult = await generateTubeProof(this.config.bbBinaryPath, bbWorkingDirectory, input.usePublicTailVk ? PUBLIC_TAIL_CIVC_VK : PRIVATE_TAIL_CIVC_VK, logger.verbose);
         if (provingResult.status === BB_RESULT.FAILURE) {
             logger.error(`Failed to generate proof for tube circuit: ${provingResult.reason}`);
@@ -264,9 +263,9 @@ const SERVER_CIRCUIT_RECURSIVE = true;
             this.instrumentation.recordAvmSize('proofSize', appCircuitName, avmProof.binaryProof.buffer.length);
             this.instrumentation.recordAvmSize('circuitPublicInputCount', appCircuitName, verificationKey.numPublicInputs);
             this.instrumentation.recordAvmSize('circuitSize', appCircuitName, verificationKey.circuitSize);
-            logger.info(`Generated proof for ${circuitType}(${input.functionName}) in ${Math.ceil(provingResult.durationMs)} ms`, {
+            logger.info(`Generated proof for ${circuitType}(${input.hints.tx.hash}) in ${Math.ceil(provingResult.durationMs)} ms`, {
                 circuitName: circuitType,
-                appCircuitName: input.functionName,
+                appCircuitName: input.hints.tx.hash,
                 // does not include reading the proof from disk
                 duration: provingResult.durationMs,
                 proofSize: avmProof.binaryProof.buffer.length,
@@ -286,7 +285,7 @@ const SERVER_CIRCUIT_RECURSIVE = true;
             // Read the proof as fields
             // TODO(AD): this is the only remaining use of extractVkData.
             const tubeVK = await extractVkData(provingResult.vkPath);
-            const tubeProof = await this.readProofAsFields(provingResult.proofPath, tubeVK, TUBE_PROOF_LENGTH);
+            const tubeProof = await readProofAsFields(provingResult.proofPath, tubeVK, TUBE_PROOF_LENGTH, logger);
             this.instrumentation.recordDuration('provingDuration', 'tubeCircuit', provingResult.durationMs);
             this.instrumentation.recordSize('proofSize', 'tubeCircuit', tubeProof.binaryProof.buffer.length);
             this.instrumentation.recordSize('circuitPublicInputCount', 'tubeCircuit', tubeVK.numPublicInputs);
@@ -312,7 +311,7 @@ const SERVER_CIRCUIT_RECURSIVE = true;
             const { provingResult, circuitOutput: output } = await this.generateProofWithBB(input, circuitType, convertInput, convertOutput, bbWorkingDirectory);
             const vkData = this.getVerificationKeyDataForCircuit(circuitType);
             // Read the proof as fields
-            const proof = await this.readProofAsFields(provingResult.proofPath, vkData, proofLength);
+            const proof = await readProofAsFields(provingResult.proofPath, vkData, proofLength, logger);
             const circuitName = mapProtocolArtifactNameToCircuitName(circuitType);
             this.instrumentation.recordDuration('provingDuration', circuitName, provingResult.durationMs);
             this.instrumentation.recordSize('proofSize', circuitName, proof.binaryProof.buffer.length);
@@ -377,35 +376,6 @@ const SERVER_CIRCUIT_RECURSIVE = true;
         }
         return vk;
     }
-    async readProofAsFields(filePath, vkData, proofLength) {
-        const publicInputsFilename = path.join(filePath, PUBLIC_INPUTS_FILENAME);
-        const proofFilename = path.join(filePath, PROOF_FILENAME);
-        const proofFieldsFilename = path.join(filePath, PROOF_FIELDS_FILENAME);
-        const [binaryPublicInputs, binaryProof, proofString] = await Promise.all([
-            fs.readFile(publicInputsFilename),
-            fs.readFile(proofFilename),
-            fs.readFile(proofFieldsFilename, {
-                encoding: 'utf-8'
-            })
-        ]);
-        const json = JSON.parse(proofString);
-        let numPublicInputs = vkData.numPublicInputs - AGGREGATION_OBJECT_LENGTH;
-        assert(proofLength == NESTED_RECURSIVE_PROOF_LENGTH || proofLength == NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH, `Proof length must be one of the expected proof lengths, received ${proofLength}`);
-        if (proofLength == NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH) {
-            numPublicInputs -= IPA_CLAIM_LENGTH;
-        }
-        assert(json.length == proofLength, `Proof length mismatch: ${json.length} != ${proofLength}`);
-        const fieldsWithoutPublicInputs = json.map(Fr.fromHexString);
-        // Concat binary public inputs and binary proof
-        // This buffer will have the form: [binary public inputs, binary proof]
-        const binaryProofWithPublicInputs = Buffer.concat([
-            binaryPublicInputs,
-            binaryProof
-        ]);
-        logger.debug(`Circuit path: ${filePath}, complete proof length: ${json.length}, num public inputs: ${numPublicInputs}, circuit size: ${vkData.circuitSize}, is recursive: ${vkData.isRecursive}, raw length: ${binaryProofWithPublicInputs.length}`);
-        assert(binaryProofWithPublicInputs.length == numPublicInputs * 32 + proofLength * 32, `Proof length mismatch: ${binaryProofWithPublicInputs.length} != ${numPublicInputs * 32 + proofLength * 32}`);
-        return new RecursiveProof(fieldsWithoutPublicInputs, new Proof(binaryProofWithPublicInputs, numPublicInputs), true, proofLength);
-    }
     async readAvmProofAsFields(proofFilename, vkData) {
         const rawProof = await fs.readFile(proofFilename);
         const reader = BufferReader.asReader(rawProof);
@@ -433,6 +403,6 @@ _ts_decorate([
 ], BBNativeRollupProver.prototype, "getRootParityProof", null);
 _ts_decorate([
     trackSpan('BBNativeRollupProver.getAvmProof', (inputs)=>({
-            [Attributes.APP_CIRCUIT_NAME]: inputs.functionName
+            [Attributes.APP_CIRCUIT_NAME]: inputs.hints.tx.hash
         }))
 ], BBNativeRollupProver.prototype, "getAvmProof", null);

package/dest/prover/index.d.ts

@@ -1,4 +1,4 @@
 export * from './bb_prover.js';
 export * from './bb_native_private_kernel_prover.js';
-export * from './client_ivc_proof_utils.js';
+export * from './proof_utils.js';
 //# sourceMappingURL=index.d.ts.map

package/dest/prover/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/prover/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sCAAsC,CAAC;AACrD,cAAc,6BAA6B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/prover/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sCAAsC,CAAC;AACrD,cAAc,kBAAkB,CAAC"}

package/dest/prover/index.js

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

package/dest/prover/proof_utils.d.ts

@@ -0,0 +1,19 @@
+import type { Logger } from '@aztec/foundation/log';
+import { ClientIvcProof, RecursiveProof } from '@aztec/stdlib/proofs';
+import type { VerificationKeyData } from '@aztec/stdlib/vks';
+/**
+ * Create a ClientIvcProof proof file.
+ *
+ * @param directory the directory to read the proof from.
+ * @returns the encapsulated client ivc proof
+ */
+export declare function readClientIVCProofFromOutputDirectory(directory: string): Promise<ClientIvcProof>;
+/**
+ * Serialize a ClientIvcProof to a proof file.
+ *
+ * @param proof the ClientIvcProof from object
+ * @param directory the directory to write in
+ */
+export declare function writeClientIVCProofToOutputDirectory(clientIvcProof: ClientIvcProof, directory: string): Promise<void>;
+export declare function readProofAsFields<PROOF_LENGTH extends number>(filePath: string, vkData: VerificationKeyData, proofLength: PROOF_LENGTH, logger: Logger): Promise<RecursiveProof<PROOF_LENGTH>>;
+//# sourceMappingURL=proof_utils.d.ts.map

package/dest/prover/proof_utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"proof_utils.d.ts","sourceRoot":"","sources":["../../src/prover/proof_utils.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAS,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC7E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAa7D;;;;;GAKG;AACH,wBAAsB,qCAAqC,CAAC,SAAS,EAAE,MAAM,2BAG5E;AAED;;;;;GAKG;AACH,wBAAsB,oCAAoC,CAAC,cAAc,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,iBAG3G;AAED,wBAAsB,iBAAiB,CAAC,YAAY,SAAS,MAAM,EACjE,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,mBAAmB,EAC3B,WAAW,EAAE,YAAY,EACzB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,CA0CvC"}

package/dest/prover/proof_utils.js

@@ -0,0 +1,54 @@
+import { AGGREGATION_OBJECT_LENGTH, IPA_CLAIM_LENGTH, NESTED_RECURSIVE_PROOF_LENGTH, NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH } from '@aztec/constants';
+import { Fr } from '@aztec/foundation/fields';
+import { ClientIvcProof, Proof, RecursiveProof } from '@aztec/stdlib/proofs';
+import assert from 'assert';
+import { promises as fs } from 'fs';
+import * as path from 'path';
+import { CLIENT_IVC_PROOF_FILE_NAME, PROOF_FIELDS_FILENAME, PROOF_FILENAME, PUBLIC_INPUTS_FILENAME } from '../bb/execute.js';
+/**
+ * Create a ClientIvcProof proof file.
+ *
+ * @param directory the directory to read the proof from.
+ * @returns the encapsulated client ivc proof
+ */ export async function readClientIVCProofFromOutputDirectory(directory) {
+    const clientIvcProofBuffer = await fs.readFile(path.join(directory, CLIENT_IVC_PROOF_FILE_NAME));
+    return new ClientIvcProof(clientIvcProofBuffer);
+}
+/**
+ * Serialize a ClientIvcProof to a proof file.
+ *
+ * @param proof the ClientIvcProof from object
+ * @param directory the directory to write in
+ */ export async function writeClientIVCProofToOutputDirectory(clientIvcProof, directory) {
+    const { clientIvcProofBuffer } = clientIvcProof;
+    await fs.writeFile(path.join(directory, CLIENT_IVC_PROOF_FILE_NAME), clientIvcProofBuffer);
+}
+export async function readProofAsFields(filePath, vkData, proofLength, logger) {
+    const publicInputsFilename = path.join(filePath, PUBLIC_INPUTS_FILENAME);
+    const proofFilename = path.join(filePath, PROOF_FILENAME);
+    const proofFieldsFilename = path.join(filePath, PROOF_FIELDS_FILENAME);
+    const [binaryPublicInputs, binaryProof, proofString] = await Promise.all([
+        fs.readFile(publicInputsFilename),
+        fs.readFile(proofFilename),
+        fs.readFile(proofFieldsFilename, {
+            encoding: 'utf-8'
+        })
+    ]);
+    const json = JSON.parse(proofString);
+    let numPublicInputs = vkData.numPublicInputs - AGGREGATION_OBJECT_LENGTH;
+    assert(proofLength == NESTED_RECURSIVE_PROOF_LENGTH || proofLength == NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH, `Proof length must be one of the expected proof lengths, received ${proofLength}`);
+    if (proofLength == NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH) {
+        numPublicInputs -= IPA_CLAIM_LENGTH;
+    }
+    assert(json.length == proofLength, `Proof length mismatch: ${json.length} != ${proofLength}`);
+    const fieldsWithoutPublicInputs = json.map(Fr.fromHexString);
+    // Concat binary public inputs and binary proof
+    // This buffer will have the form: [binary public inputs, binary proof]
+    const binaryProofWithPublicInputs = Buffer.concat([
+        binaryPublicInputs,
+        binaryProof
+    ]);
+    logger.debug(`Circuit path: ${filePath}, complete proof length: ${json.length}, num public inputs: ${numPublicInputs}, circuit size: ${vkData.circuitSize}, is recursive: ${vkData.isRecursive}, raw length: ${binaryProofWithPublicInputs.length}`);
+    assert(binaryProofWithPublicInputs.length == numPublicInputs * 32 + proofLength * 32, `Proof length mismatch: ${binaryProofWithPublicInputs.length} != ${numPublicInputs * 32 + proofLength * 32}`);
+    return new RecursiveProof(fieldsWithoutPublicInputs, new Proof(binaryProofWithPublicInputs, numPublicInputs), true, proofLength);
+}

package/dest/verifier/bb_verifier.js

@@ -7,7 +7,7 @@ import * as path from 'path';
 import { fileURLToPath } from 'url';
 import { BB_RESULT, PROOF_FILENAME, VK_FILENAME, verifyClientIvcProof, verifyProof } from '../bb/execute.js';
 import { getUltraHonkFlavorForCircuit } from '../honk.js';
-import { writeToOutputDirectory } from '../prover/client_ivc_proof_utils.js';
+import { writeClientIVCProofToOutputDirectory } from '../prover/proof_utils.js';
 import { mapProtocolArtifactNameToCircuitName } from '../stats.js';
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 // Built by yarn generate
@@ -68,7 +68,7 @@ export class BBCircuitVerifier {
                 const logFunction = (message)=>{
                     this.logger.debug(`${circuit} BB out - ${message}`);
                 };
-                await writeToOutputDirectory(tx.clientIvcProof, bbWorkingDirectory);
+                await writeClientIVCProofToOutputDirectory(tx.clientIvcProof, bbWorkingDirectory);
                 const result = await verifyClientIvcProof(this.config.bbBinaryPath, bbWorkingDirectory.concat('/proof'), tx.data.forPublic ? PUBLIC_TAIL_CIVC_VK : PRIVATE_TAIL_CIVC_VK, logFunction);
                 if (result.status === BB_RESULT.FAILURE) {
                     const errorMessage = `Failed to verify ${circuit} proof!`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/bb-prover",
-  "version": "0.84.0",
+  "version": "0.85.0",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -68,16 +68,16 @@
     ]
   },
   "dependencies": {
-    "@aztec/bb.js": "0.84.0",
-    "@aztec/constants": "0.84.0",
-    "@aztec/foundation": "0.84.0",
-    "@aztec/noir-noirc_abi": "0.84.0",
-    "@aztec/noir-protocol-circuits-types": "0.84.0",
-    "@aztec/noir-types": "0.84.0",
-    "@aztec/simulator": "0.84.0",
-    "@aztec/stdlib": "0.84.0",
-    "@aztec/telemetry-client": "0.84.0",
-    "@aztec/world-state": "0.84.0",
+    "@aztec/bb.js": "0.85.0",
+    "@aztec/constants": "0.85.0",
+    "@aztec/foundation": "0.85.0",
+    "@aztec/noir-noirc_abi": "0.85.0",
+    "@aztec/noir-protocol-circuits-types": "0.85.0",
+    "@aztec/noir-types": "0.85.0",
+    "@aztec/simulator": "0.85.0",
+    "@aztec/stdlib": "0.85.0",
+    "@aztec/telemetry-client": "0.85.0",
+    "@aztec/world-state": "0.85.0",
     "@msgpack/msgpack": "^3.0.0-beta2",
     "commander": "^12.1.0",
     "pako": "^2.1.0",
@@ -85,13 +85,12 @@
     "tslib": "^2.4.0"
   },
   "devDependencies": {
-    "@aztec/ethereum": "0.84.0",
-    "@aztec/kv-store": "0.84.0",
-    "@aztec/noir-contracts.js": "0.84.0",
-    "@aztec/protocol-contracts": "0.84.0",
+    "@aztec/ethereum": "0.85.0",
+    "@aztec/kv-store": "0.85.0",
+    "@aztec/noir-contracts.js": "0.85.0",
+    "@aztec/protocol-contracts": "0.85.0",
     "@jest/globals": "^29.5.0",
     "@types/jest": "^29.5.0",
-    "@types/memdown": "^3.0.0",
     "@types/node": "^18.7.23",
     "@types/source-map-support": "^0.5.10",
     "jest": "^29.5.0",

package/src/avm_proving_tests/avm_proving_tester.ts

@@ -138,13 +138,12 @@ export class AvmProvingTesterV2 extends PublicTxSimulationTester {
     // TODO: Placeholder for now. They get ignored in C++.
     const inputs = await makeAvmCircuitInputs();
 
-    const rawVkPath = path.join(proofRes.vkPath!, 'vk');
     return await verifyAvmProofV2(
       BB_PATH,
       this.bbWorkingDirectory,
       proofRes.proofPath!,
       inputs.publicInputs,
-      rawVkPath,
+      proofRes.vkPath!,
       this.logger,
     );
   }

package/src/bb/execute.ts

@@ -8,7 +8,6 @@ import { promises as fs } from 'fs';
 import { basename, dirname, join } from 'path';
 
 import type { UltraHonkFlavor } from '../honk.js';
-import { CLIENT_IVC_PROOF_FILE_NAME } from '../prover/client_ivc_proof_utils.js';
 
 export const VK_FILENAME = 'vk';
 export const VK_FIELDS_FILENAME = 'vk_fields.json';
@@ -19,7 +18,7 @@ export const PROOF_FIELDS_FILENAME = 'proof_fields.json';
 export const AVM_INPUTS_FILENAME = 'avm_inputs.bin';
 export const AVM_BYTECODE_FILENAME = 'avm_bytecode.bin';
 export const AVM_PUBLIC_INPUTS_FILENAME = 'avm_public_inputs.bin';
-export const AVM_HINTS_FILENAME = 'avm_hints.bin';
+export const CLIENT_IVC_PROOF_FILE_NAME = 'proof';
 
 export enum BB_RESULT {
   SUCCESS,
@@ -123,6 +122,7 @@ export async function executeBbClientIvcProof(
   bytecodeStackPath: string,
   witnessStackPath: string,
   log: LogFn,
+  writeVk = false,
 ): Promise<BBFailure | BBSuccess> {
   // Check that the working directory exists
   try {
@@ -158,8 +158,10 @@ export async function executeBbClientIvcProof(
       'client_ivc',
       '--input_type',
       'runtime_stack',
-      '--write_vk',
     ];
+    if (writeVk) {
+      args.push('--write_vk');
+    }
 
     const timer = new Timer();
     const logFunction = (message: string) => {
@@ -423,7 +425,7 @@ export async function generateAvmProofV2(
         durationMs: duration,
         proofPath: join(outputPath, PROOF_FILENAME),
         pkPath: undefined,
-        vkPath: outputPath,
+        vkPath: join(outputPath, VK_FILENAME),
       };
     }
     // Not a great error message here but it is difficult to decipher what comes from bb
@@ -462,7 +464,6 @@ export async function generateAvmProof(
 
   // Paths for the inputs
   const publicInputsPath = join(workingDirectory, AVM_PUBLIC_INPUTS_FILENAME);
-  const avmHintsPath = join(workingDirectory, AVM_HINTS_FILENAME);
 
   // The proof is written to e.g. /workingDirectory/proof
   const outputPath = workingDirectory;
@@ -492,7 +493,7 @@ export async function generateAvmProof(
     //   return { status: BB_RESULT.FAILURE, reason: `Could not write avmHints at ${avmHintsPath}` };
     // }
 
-    const args = ['--avm-public-inputs', publicInputsPath, '--avm-hints', avmHintsPath, '-o', outputPath];
+    const args = ['--avm-public-inputs', publicInputsPath, '-o', outputPath];
     const loggingArg =
       logger.level === 'debug' || logger.level === 'trace' ? '-d' : logger.level === 'verbose' ? '-v' : '';
     if (loggingArg !== '') {

package/src/index.ts

@@ -4,5 +4,6 @@ export * from './verifier/index.js';
 export * from './config.js';
 export * from './bb/execute.js';
 export * from './honk.js';
+export * from './verification_key/verification_key_data.js';
 
 export { type ClientProtocolCircuitVerifier } from '@aztec/stdlib/interfaces/server';

package/src/prover/bb_native_private_kernel_prover.ts

@@ -13,7 +13,7 @@ import path from 'path';
 import { BB_RESULT, computeGateCountForCircuit, executeBbClientIvcProof } from '../bb/execute.js';
 import type { BBConfig } from '../config.js';
 import { BBPrivateKernelProver } from './bb_private_kernel_prover.js';
-import { readFromOutputDirectory } from './client_ivc_proof_utils.js';
+import { readClientIVCProofFromOutputDirectory } from './proof_utils.js';
 
 /**
  * This proof creator implementation uses the native bb binary.
@@ -73,7 +73,7 @@ export class BBNativePrivateKernelProver extends BBPrivateKernelProver {
       throw new Error(provingResult.reason);
     }
 
-    const proof = await readFromOutputDirectory(directory);
+    const proof = await readClientIVCProofFromOutputDirectory(directory);
 
     this.log.info(`Generated IVC proof`, {
       duration: provingResult.durationMs,

package/src/prover/bb_prover.ts

@@ -2,7 +2,6 @@
 import {
   AGGREGATION_OBJECT_LENGTH,
   AVM_PROOF_LENGTH_IN_FIELDS,
-  IPA_CLAIM_LENGTH,
   NESTED_RECURSIVE_PROOF_LENGTH,
   NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH,
   RECURSIVE_PROOF_LENGTH,
@@ -69,7 +68,6 @@ import type { CircuitProvingStats, CircuitWitnessGenerationStats } from '@aztec/
 import type { VerificationKeyData } from '@aztec/stdlib/vks';
 import { Attributes, type TelemetryClient, getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
 
-import assert from 'assert';
 import crypto from 'crypto';
 import { promises as fs } from 'fs';
 import * as path from 'path';
@@ -78,7 +76,6 @@ import {
   type BBFailure,
   type BBSuccess,
   BB_RESULT,
-  PROOF_FIELDS_FILENAME,
   PROOF_FILENAME,
   PUBLIC_INPUTS_FILENAME,
   VK_FILENAME,
@@ -94,7 +91,7 @@ import { ProverInstrumentation } from '../instrumentation.js';
 import { mapProtocolArtifactNameToCircuitName } from '../stats.js';
 import { extractAvmVkData, extractVkData } from '../verification_key/verification_key_data.js';
 import { PRIVATE_TAIL_CIVC_VK, PUBLIC_TAIL_CIVC_VK } from '../verifier/bb_verifier.js';
-import { writeToOutputDirectory } from './client_ivc_proof_utils.js';
+import { readProofAsFields, writeClientIVCProofToOutputDirectory } from './proof_utils.js';
 
 const logger = createLogger('bb-prover');
 
@@ -183,7 +180,7 @@ export class BBNativeRollupProver implements ServerCircuitProver {
    * @returns The proof.
    */
   @trackSpan('BBNativeRollupProver.getAvmProof', inputs => ({
-    [Attributes.APP_CIRCUIT_NAME]: inputs.functionName,
+    [Attributes.APP_CIRCUIT_NAME]: inputs.hints.tx.hash,
   }))
   public async getAvmProof(
     inputs: AvmCircuitInputs,
@@ -476,7 +473,7 @@ export class BBNativeRollupProver implements ServerCircuitProver {
         bbWorkingDirectory,
       );
       const vkData = this.getVerificationKeyDataForCircuit(circuitType);
-      const proof = await this.readProofAsFields(provingResult.proofPath!, vkData, RECURSIVE_PROOF_LENGTH);
+      const proof = await readProofAsFields(provingResult.proofPath!, vkData, RECURSIVE_PROOF_LENGTH, logger);
 
       const circuitName = mapProtocolArtifactNameToCircuitName(circuitType);
 
@@ -503,12 +500,12 @@ export class BBNativeRollupProver implements ServerCircuitProver {
   }
 
   private async generateAvmProofWithBB(input: AvmCircuitInputs, workingDirectory: string): Promise<BBSuccess> {
-    logger.info(`Proving avm-circuit for ${input.functionName}...`);
+    logger.info(`Proving avm-circuit for TX ${input.hints.tx.hash}...`);
 
     const provingResult = await generateAvmProof(this.config.bbBinaryPath, workingDirectory, input, logger);
 
     if (provingResult.status === BB_RESULT.FAILURE) {
-      logger.error(`Failed to generate AVM proof for ${input.functionName}: ${provingResult.reason}`);
+      logger.error(`Failed to generate AVM proof for TX ${input.hints.tx.hash}: ${provingResult.reason}`);
       throw new ProvingError(provingResult.reason, provingResult, provingResult.retry);
     }
 
@@ -521,7 +518,7 @@ export class BBNativeRollupProver implements ServerCircuitProver {
     const hasher = crypto.createHash('sha256');
     hasher.update(input.toBuffer());
 
-    await writeToOutputDirectory(input.clientIVCData, bbWorkingDirectory);
+    await writeClientIVCProofToOutputDirectory(input.clientIVCData, bbWorkingDirectory);
     const provingResult = await generateTubeProof(
       this.config.bbBinaryPath,
       bbWorkingDirectory,
@@ -556,10 +553,10 @@ export class BBNativeRollupProver implements ServerCircuitProver {
       this.instrumentation.recordAvmSize('circuitSize', appCircuitName, verificationKey.circuitSize);
 
       logger.info(
-        `Generated proof for ${circuitType}(${input.functionName}) in ${Math.ceil(provingResult.durationMs)} ms`,
+        `Generated proof for ${circuitType}(${input.hints.tx.hash}) in ${Math.ceil(provingResult.durationMs)} ms`,
         {
           circuitName: circuitType,
-          appCircuitName: input.functionName,
+          appCircuitName: input.hints.tx.hash,
           // does not include reading the proof from disk
           duration: provingResult.durationMs,
           proofSize: avmProof.binaryProof.buffer.length,
@@ -583,7 +580,7 @@ export class BBNativeRollupProver implements ServerCircuitProver {
       // Read the proof as fields
       // TODO(AD): this is the only remaining use of extractVkData.
       const tubeVK = await extractVkData(provingResult.vkPath!);
-      const tubeProof = await this.readProofAsFields(provingResult.proofPath!, tubeVK, TUBE_PROOF_LENGTH);
+      const tubeProof = await readProofAsFields(provingResult.proofPath!, tubeVK, TUBE_PROOF_LENGTH, logger);
 
       this.instrumentation.recordDuration('provingDuration', 'tubeCircuit', provingResult.durationMs);
       this.instrumentation.recordSize('proofSize', 'tubeCircuit', tubeProof.binaryProof.buffer.length);
@@ -636,7 +633,7 @@ export class BBNativeRollupProver implements ServerCircuitProver {
 
       const vkData = this.getVerificationKeyDataForCircuit(circuitType);
       // Read the proof as fields
-      const proof = await this.readProofAsFields(provingResult.proofPath!, vkData, proofLength);
+      const proof = await readProofAsFields(provingResult.proofPath!, vkData, proofLength, logger);
 
       const circuitName = mapProtocolArtifactNameToCircuitName(circuitType);
       this.instrumentation.recordDuration('provingDuration', circuitName, provingResult.durationMs);
@@ -728,54 +725,6 @@ export class BBNativeRollupProver implements ServerCircuitProver {
     return vk;
   }
 
-  private async readProofAsFields<PROOF_LENGTH extends number>(
-    filePath: string,
-    vkData: VerificationKeyData,
-    proofLength: PROOF_LENGTH,
-  ): Promise<RecursiveProof<PROOF_LENGTH>> {
-    const publicInputsFilename = path.join(filePath, PUBLIC_INPUTS_FILENAME);
-    const proofFilename = path.join(filePath, PROOF_FILENAME);
-    const proofFieldsFilename = path.join(filePath, PROOF_FIELDS_FILENAME);
-
-    const [binaryPublicInputs, binaryProof, proofString] = await Promise.all([
-      fs.readFile(publicInputsFilename),
-      fs.readFile(proofFilename),
-      fs.readFile(proofFieldsFilename, { encoding: 'utf-8' }),
-    ]);
-
-    const json = JSON.parse(proofString);
-
-    let numPublicInputs = vkData.numPublicInputs - AGGREGATION_OBJECT_LENGTH;
-    assert(
-      proofLength == NESTED_RECURSIVE_PROOF_LENGTH || proofLength == NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH,
-      `Proof length must be one of the expected proof lengths, received ${proofLength}`,
-    );
-    if (proofLength == NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH) {
-      numPublicInputs -= IPA_CLAIM_LENGTH;
-    }
-
-    assert(json.length == proofLength, `Proof length mismatch: ${json.length} != ${proofLength}`);
-
-    const fieldsWithoutPublicInputs = json.map(Fr.fromHexString);
-
-    // Concat binary public inputs and binary proof
-    // This buffer will have the form: [binary public inputs, binary proof]
-    const binaryProofWithPublicInputs = Buffer.concat([binaryPublicInputs, binaryProof]);
-    logger.debug(
-      `Circuit path: ${filePath}, complete proof length: ${json.length}, num public inputs: ${numPublicInputs}, circuit size: ${vkData.circuitSize}, is recursive: ${vkData.isRecursive}, raw length: ${binaryProofWithPublicInputs.length}`,
-    );
-    assert(
-      binaryProofWithPublicInputs.length == numPublicInputs * 32 + proofLength * 32,
-      `Proof length mismatch: ${binaryProofWithPublicInputs.length} != ${numPublicInputs * 32 + proofLength * 32}`,
-    );
-    return new RecursiveProof(
-      fieldsWithoutPublicInputs,
-      new Proof(binaryProofWithPublicInputs, numPublicInputs),
-      true,
-      proofLength,
-    );
-  }
-
   private async readAvmProofAsFields(
     proofFilename: string,
     vkData: VerificationKeyData,

package/src/prover/index.ts

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

package/src/prover/proof_utils.ts

@@ -0,0 +1,92 @@
+import {
+  AGGREGATION_OBJECT_LENGTH,
+  IPA_CLAIM_LENGTH,
+  NESTED_RECURSIVE_PROOF_LENGTH,
+  NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH,
+} from '@aztec/constants';
+import { Fr } from '@aztec/foundation/fields';
+import type { Logger } from '@aztec/foundation/log';
+import { ClientIvcProof, Proof, RecursiveProof } from '@aztec/stdlib/proofs';
+import type { VerificationKeyData } from '@aztec/stdlib/vks';
+
+import assert from 'assert';
+import { promises as fs } from 'fs';
+import * as path from 'path';
+
+import {
+  CLIENT_IVC_PROOF_FILE_NAME,
+  PROOF_FIELDS_FILENAME,
+  PROOF_FILENAME,
+  PUBLIC_INPUTS_FILENAME,
+} from '../bb/execute.js';
+
+/**
+ * Create a ClientIvcProof proof file.
+ *
+ * @param directory the directory to read the proof from.
+ * @returns the encapsulated client ivc proof
+ */
+export async function readClientIVCProofFromOutputDirectory(directory: string) {
+  const clientIvcProofBuffer = await fs.readFile(path.join(directory, CLIENT_IVC_PROOF_FILE_NAME));
+  return new ClientIvcProof(clientIvcProofBuffer);
+}
+
+/**
+ * Serialize a ClientIvcProof to a proof file.
+ *
+ * @param proof the ClientIvcProof from object
+ * @param directory the directory to write in
+ */
+export async function writeClientIVCProofToOutputDirectory(clientIvcProof: ClientIvcProof, directory: string) {
+  const { clientIvcProofBuffer } = clientIvcProof;
+  await fs.writeFile(path.join(directory, CLIENT_IVC_PROOF_FILE_NAME), clientIvcProofBuffer);
+}
+
+export async function readProofAsFields<PROOF_LENGTH extends number>(
+  filePath: string,
+  vkData: VerificationKeyData,
+  proofLength: PROOF_LENGTH,
+  logger: Logger,
+): Promise<RecursiveProof<PROOF_LENGTH>> {
+  const publicInputsFilename = path.join(filePath, PUBLIC_INPUTS_FILENAME);
+  const proofFilename = path.join(filePath, PROOF_FILENAME);
+  const proofFieldsFilename = path.join(filePath, PROOF_FIELDS_FILENAME);
+
+  const [binaryPublicInputs, binaryProof, proofString] = await Promise.all([
+    fs.readFile(publicInputsFilename),
+    fs.readFile(proofFilename),
+    fs.readFile(proofFieldsFilename, { encoding: 'utf-8' }),
+  ]);
+
+  const json = JSON.parse(proofString);
+
+  let numPublicInputs = vkData.numPublicInputs - AGGREGATION_OBJECT_LENGTH;
+  assert(
+    proofLength == NESTED_RECURSIVE_PROOF_LENGTH || proofLength == NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH,
+    `Proof length must be one of the expected proof lengths, received ${proofLength}`,
+  );
+  if (proofLength == NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH) {
+    numPublicInputs -= IPA_CLAIM_LENGTH;
+  }
+
+  assert(json.length == proofLength, `Proof length mismatch: ${json.length} != ${proofLength}`);
+
+  const fieldsWithoutPublicInputs = json.map(Fr.fromHexString);
+
+  // Concat binary public inputs and binary proof
+  // This buffer will have the form: [binary public inputs, binary proof]
+  const binaryProofWithPublicInputs = Buffer.concat([binaryPublicInputs, binaryProof]);
+  logger.debug(
+    `Circuit path: ${filePath}, complete proof length: ${json.length}, num public inputs: ${numPublicInputs}, circuit size: ${vkData.circuitSize}, is recursive: ${vkData.isRecursive}, raw length: ${binaryProofWithPublicInputs.length}`,
+  );
+  assert(
+    binaryProofWithPublicInputs.length == numPublicInputs * 32 + proofLength * 32,
+    `Proof length mismatch: ${binaryProofWithPublicInputs.length} != ${numPublicInputs * 32 + proofLength * 32}`,
+  );
+  return new RecursiveProof(
+    fieldsWithoutPublicInputs,
+    new Proof(binaryProofWithPublicInputs, numPublicInputs),
+    true,
+    proofLength,
+  );
+}

package/src/verifier/bb_verifier.ts

@@ -15,7 +15,7 @@ import { fileURLToPath } from 'url';
 import { BB_RESULT, PROOF_FILENAME, VK_FILENAME, verifyClientIvcProof, verifyProof } from '../bb/execute.js';
 import type { BBConfig } from '../config.js';
 import { getUltraHonkFlavorForCircuit } from '../honk.js';
-import { writeToOutputDirectory } from '../prover/client_ivc_proof_utils.js';
+import { writeClientIVCProofToOutputDirectory } from '../prover/proof_utils.js';
 import { mapProtocolArtifactNameToCircuitName } from '../stats.js';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
@@ -91,7 +91,7 @@ export class BBCircuitVerifier implements ClientProtocolCircuitVerifier {
           this.logger.debug(`${circuit} BB out - ${message}`);
         };
 
-        await writeToOutputDirectory(tx.clientIvcProof, bbWorkingDirectory);
+        await writeClientIVCProofToOutputDirectory(tx.clientIvcProof, bbWorkingDirectory);
         const result = await verifyClientIvcProof(
           this.config.bbBinaryPath,
           bbWorkingDirectory.concat('/proof'),

package/dest/prover/client_ivc_proof_utils.d.ts

@@ -1,17 +0,0 @@
-import { ClientIvcProof } from '@aztec/stdlib/proofs';
-export declare const CLIENT_IVC_PROOF_FILE_NAME = "proof";
-/**
- * Create a ClientIvcProof proof file.
- *
- * @param directory the directory to read the proof from.
- * @returns the encapsulated client ivc proof
- */
-export declare function readFromOutputDirectory(directory: string): Promise<ClientIvcProof>;
-/**
- * Serialize a ClientIvcProof to a proof file.
- *
- * @param proof the ClientIvcProof from object
- * @param directory the directory to write in
- */
-export declare function writeToOutputDirectory(clientIvcProof: ClientIvcProof, directory: string): Promise<void>;
-//# sourceMappingURL=client_ivc_proof_utils.d.ts.map

package/dest/prover/client_ivc_proof_utils.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"client_ivc_proof_utils.d.ts","sourceRoot":"","sources":["../../src/prover/client_ivc_proof_utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAKtD,eAAO,MAAM,0BAA0B,UAAU,CAAC;AAElD;;;;;GAKG;AACH,wBAAsB,uBAAuB,CAAC,SAAS,EAAE,MAAM,2BAG9D;AAED;;;;;GAKG;AACH,wBAAsB,sBAAsB,CAAC,cAAc,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,iBAG7F"}

package/dest/prover/client_ivc_proof_utils.js

@@ -1,22 +0,0 @@
-import { ClientIvcProof } from '@aztec/stdlib/proofs';
-import { promises as fs } from 'fs';
-import { join } from 'path';
-export const CLIENT_IVC_PROOF_FILE_NAME = 'proof';
-/**
- * Create a ClientIvcProof proof file.
- *
- * @param directory the directory to read the proof from.
- * @returns the encapsulated client ivc proof
- */ export async function readFromOutputDirectory(directory) {
-    const clientIvcProofBuffer = await fs.readFile(join(directory, CLIENT_IVC_PROOF_FILE_NAME));
-    return new ClientIvcProof(clientIvcProofBuffer);
-}
-/**
- * Serialize a ClientIvcProof to a proof file.
- *
- * @param proof the ClientIvcProof from object
- * @param directory the directory to write in
- */ export async function writeToOutputDirectory(clientIvcProof, directory) {
-    const { clientIvcProofBuffer } = clientIvcProof;
-    await fs.writeFile(join(directory, CLIENT_IVC_PROOF_FILE_NAME), clientIvcProofBuffer);
-}

package/src/prover/client_ivc_proof_utils.ts

@@ -1,28 +0,0 @@
-import { ClientIvcProof } from '@aztec/stdlib/proofs';
-
-import { promises as fs } from 'fs';
-import { join } from 'path';
-
-export const CLIENT_IVC_PROOF_FILE_NAME = 'proof';
-
-/**
- * Create a ClientIvcProof proof file.
- *
- * @param directory the directory to read the proof from.
- * @returns the encapsulated client ivc proof
- */
-export async function readFromOutputDirectory(directory: string) {
-  const clientIvcProofBuffer = await fs.readFile(join(directory, CLIENT_IVC_PROOF_FILE_NAME));
-  return new ClientIvcProof(clientIvcProofBuffer);
-}
-
-/**
- * Serialize a ClientIvcProof to a proof file.
- *
- * @param proof the ClientIvcProof from object
- * @param directory the directory to write in
- */
-export async function writeToOutputDirectory(clientIvcProof: ClientIvcProof, directory: string) {
-  const { clientIvcProofBuffer } = clientIvcProof;
-  await fs.writeFile(join(directory, CLIENT_IVC_PROOF_FILE_NAME), clientIvcProofBuffer);
-}