@aztec/bb-prover 0.40.0 → 0.41.0

package/dest/prover/bb_prover.js

@@ -1,6 +1,6 @@
 /* eslint-disable require-await */
 import { PublicKernelType, makePublicInputsAndProof, } from '@aztec/circuit-types';
-import { Fr, Proof, RecursiveProof, RollupTypes, RootParityInput, VerificationKeyAsFields, } from '@aztec/circuits.js';
+import { Fr, NESTED_RECURSIVE_PROOF_LENGTH, Proof, RECURSIVE_PROOF_LENGTH, RecursiveProof, RollupTypes, RootParityInput, VerificationKeyAsFields, } from '@aztec/circuits.js';
 import { randomBytes } from '@aztec/foundation/crypto';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { Timer } from '@aztec/foundation/timer';
@@ -9,7 +9,7 @@ import { NativeACVMSimulator } from '@aztec/simulator';
 import * as fs from 'fs/promises';
 import { BB_RESULT, PROOF_FIELDS_FILENAME, PROOF_FILENAME, VK_FIELDS_FILENAME, VK_FILENAME, generateKeyForNoirCircuit, generateProof, verifyProof, } from '../bb/execute.js';
 import { PublicKernelArtifactMapping } from '../mappings/mappings.js';
-import { circuitTypeToCircuitName, emitCircuitProvingStats, emitCircuitWitnessGenerationStats } from '../stats.js';
+import { mapProtocolArtifactNameToCircuitName } from '../stats.js';
 import { AGGREGATION_OBJECT_SIZE, CIRCUIT_PUBLIC_INPUTS_INDEX, CIRCUIT_RECURSIVE_INDEX, CIRCUIT_SIZE_INDEX, } from './verification_key_data.js';
 const logger = createDebugLogger('aztec:bb-prover');
 const CIRCUITS_WITHOUT_AGGREGATION = new Set(['BaseParityArtifact']);
@@ -36,8 +36,7 @@ export class BBNativeRollupProver {
      * @returns The public inputs of the parity circuit.
      */
     async getBaseParityProof(inputs) {
-        const witnessMap = convertBaseParityInputsToWitnessMap(inputs);
-        const [circuitOutput, proof] = await this.createRecursiveProof(witnessMap, 'BaseParityArtifact', convertBaseParityOutputsFromWitnessMap);
+        const [circuitOutput, proof] = await this.createRecursiveProof(inputs, 'BaseParityArtifact', RECURSIVE_PROOF_LENGTH, convertBaseParityInputsToWitnessMap, convertBaseParityOutputsFromWitnessMap);
         const verificationKey = await this.getVerificationKeyDataForCircuit('BaseParityArtifact');
         const vk = new VerificationKeyAsFields(verificationKey.keyAsFields, verificationKey.hash);
         return new RootParityInput(proof, vk, circuitOutput);
@@ -48,8 +47,7 @@ export class BBNativeRollupProver {
      * @returns The public inputs of the parity circuit.
      */
     async getRootParityProof(inputs) {
-        const witnessMap = convertRootParityInputsToWitnessMap(inputs);
-        const [circuitOutput, proof] = await this.createRecursiveProof(witnessMap, 'RootParityArtifact', convertRootParityOutputsFromWitnessMap);
+        const [circuitOutput, proof] = await this.createRecursiveProof(inputs, 'RootParityArtifact', NESTED_RECURSIVE_PROOF_LENGTH, convertRootParityInputsToWitnessMap, convertRootParityOutputsFromWitnessMap);
         const verificationKey = await this.getVerificationKeyDataForCircuit('RootParityArtifact');
         const vk = new VerificationKeyAsFields(verificationKey.keyAsFields, verificationKey.hash);
         return new RootParityInput(proof, vk, circuitOutput);
@@ -64,9 +62,7 @@ export class BBNativeRollupProver {
         if (kernelOps === undefined) {
             throw new Error(`Unable to prove kernel type ${PublicKernelType[kernelRequest.type]}`);
         }
-        const witnessMap = kernelOps.convertInputs(kernelRequest.inputs);
-        const [outputWitness, proof] = await this.createProof(witnessMap, kernelOps.artifact);
-        const result = kernelOps.convertOutputs(outputWitness);
+        const [result, proof] = await this.createProof(kernelRequest.inputs, kernelOps.artifact, kernelOps.convertInputs, kernelOps.convertOutputs);
         return makePublicInputsAndProof(result, proof);
     }
     /**
@@ -75,9 +71,7 @@ export class BBNativeRollupProver {
      * @returns The requested circuit's public inputs and proof
      */
     async getPublicTailProof(kernelRequest) {
-        const witnessMap = convertPublicTailInputsToWitnessMap(kernelRequest.inputs);
-        const [outputWitness, proof] = await this.createProof(witnessMap, 'PublicKernelTailArtifact');
-        const result = convertPublicTailOutputFromWitnessMap(outputWitness);
+        const [result, proof] = await this.createProof(kernelRequest.inputs, 'PublicKernelTailArtifact', convertPublicTailInputsToWitnessMap, convertPublicTailOutputFromWitnessMap);
         return makePublicInputsAndProof(result, proof);
     }
     /**
@@ -86,9 +80,7 @@ export class BBNativeRollupProver {
      * @returns The public inputs as outputs of the simulation.
      */
     async getBaseRollupProof(input) {
-        const witnessMap = convertBaseRollupInputsToWitnessMap(input);
-        const [outputWitness, proof] = await this.createProof(witnessMap, 'BaseRollupArtifact');
-        const result = convertBaseRollupOutputsFromWitnessMap(outputWitness);
+        const [result, proof] = await this.createProof(input, 'BaseRollupArtifact', convertBaseRollupInputsToWitnessMap, convertBaseRollupOutputsFromWitnessMap);
         return makePublicInputsAndProof(result, proof);
     }
     /**
@@ -99,9 +91,7 @@ export class BBNativeRollupProver {
     async getMergeRollupProof(input) {
         // verify both inputs
         await Promise.all(input.previousRollupData.map(prev => this.verifyPreviousRollupProof(prev)));
-        const witnessMap = convertMergeRollupInputsToWitnessMap(input);
-        const [outputWitness, proof] = await this.createProof(witnessMap, 'MergeRollupArtifact');
-        const result = convertMergeRollupOutputsFromWitnessMap(outputWitness);
+        const [result, proof] = await this.createProof(input, 'MergeRollupArtifact', convertMergeRollupInputsToWitnessMap, convertMergeRollupOutputsFromWitnessMap);
         return makePublicInputsAndProof(result, proof);
     }
     /**
@@ -112,14 +102,12 @@ export class BBNativeRollupProver {
     async getRootRollupProof(input) {
         // verify the inputs
         await Promise.all(input.previousRollupData.map(prev => this.verifyPreviousRollupProof(prev)));
-        const witnessMap = convertRootRollupInputsToWitnessMap(input);
-        const [outputWitness, proof] = await this.createProof(witnessMap, 'RootRollupArtifact');
+        const [result, proof] = await this.createProof(input, 'RootRollupArtifact', convertRootRollupInputsToWitnessMap, convertRootRollupOutputsFromWitnessMap);
         await this.verifyProof('RootRollupArtifact', proof);
-        const result = convertRootRollupOutputsFromWitnessMap(outputWitness);
         return makePublicInputsAndProof(result, proof);
     }
     // TODO(@PhilWindle): Delete when no longer required
-    async createProof(witnessMap, circuitType) {
+    async createProof(input, circuitType, convertInput, convertOutput) {
         // Create random directory to be used for temp files
         const bbWorkingDirectory = `${this.config.bbWorkingDirectory}/${randomBytes(8).toString('hex')}`;
         await fs.mkdir(bbWorkingDirectory, { recursive: true });
@@ -131,9 +119,16 @@ export class BBNativeRollupProver {
         const simulator = new NativeACVMSimulator(this.config.acvmWorkingDirectory, this.config.acvmBinaryPath, outputWitnessFile);
         const artifact = ServerCircuitArtifacts[circuitType];
         logger.debug(`Generating witness data for ${circuitType}`);
+        const witnessMap = convertInput(input);
         const timer = new Timer();
         const outputWitness = await simulator.simulateCircuit(witnessMap, artifact);
-        emitCircuitWitnessGenerationStats(circuitTypeToCircuitName(circuitType), timer.ms(), witnessMap.size * Fr.SIZE_IN_BYTES, outputWitness.size * Fr.SIZE_IN_BYTES, logger);
+        logger.debug(`Generated witness`, {
+            circuitName: mapProtocolArtifactNameToCircuitName(circuitType),
+            duration: timer.ms(),
+            inputSize: witnessMap.size * Fr.SIZE_IN_BYTES,
+            outputSize: outputWitness.size * Fr.SIZE_IN_BYTES,
+            eventName: 'circuit-witness-generation',
+        });
         // Now prove the circuit from the generated witness
         logger.debug(`Proving ${circuitType}...`);
         const provingResult = await generateProof(this.config.bbBinaryPath, bbWorkingDirectory, circuitType, Buffer.from(artifact.bytecode, 'base64'), outputWitnessFile, logger.debug);
@@ -142,23 +137,35 @@ export class BBNativeRollupProver {
             throw new Error(provingResult.reason);
         }
         // Ensure our vk cache is up to date
-        await this.updateVerificationKeyAfterProof(provingResult.vkPath, circuitType);
+        const vkData = await this.updateVerificationKeyAfterProof(provingResult.vkPath, circuitType);
         // Read the proof and then cleanup up our temporary directory
-        const proof = await fs.readFile(`${provingResult.proofPath}/${PROOF_FILENAME}`);
-        // does not include reading the proof from disk above because duration comes from the bb wrapper
-        emitCircuitProvingStats(circuitTypeToCircuitName(circuitType), provingResult.duration, witnessMap.size * Fr.SIZE_IN_BYTES, outputWitness.size * Fr.SIZE_IN_BYTES, proof.length, logger);
+        const rawProof = await fs.readFile(`${provingResult.proofPath}/${PROOF_FILENAME}`);
         await fs.rm(bbWorkingDirectory, { recursive: true, force: true });
-        logger.info(`Generated proof for ${circuitType} in ${provingResult.duration} ms, size: ${proof.length} fields`);
-        return [outputWitness, new Proof(proof)];
+        const output = convertOutput(outputWitness);
+        const proof = new Proof(rawProof);
+        logger.info(`Generated proof for ${circuitType} in ${provingResult.duration} ms, size: ${proof.buffer.length} fields`, {
+            circuitName: mapProtocolArtifactNameToCircuitName(circuitType),
+            // does not include reading the proof from disk
+            duration: provingResult.duration,
+            proofSize: proof.buffer.length,
+            eventName: 'circuit-proving',
+            inputSize: input.toBuffer().length,
+            outputSize: output.toBuffer().length,
+            circuitSize: vkData.circuitSize,
+            numPublicInputs: vkData.numPublicInputs,
+        });
+        return [output, proof];
     }
     /**
      * Executes a circuit and returns it's outputs and corresponding proof with embedded aggregation object
      * @param witnessMap - The input witness
      * @param circuitType - The type of circuit to be executed
+     * @param proofLength - The length of the proof to be generated. This is a dummy parameter to aid in type checking
+     * @param convertInput - Function for mapping the input object to a witness map.
      * @param convertOutput - Function for parsing the output witness to it's corresponding object
      * @returns The circuits output object and it's proof
      */
-    async createRecursiveProof(witnessMap, circuitType, convertOutput) {
+    async createRecursiveProof(input, circuitType, proofLength, convertInput, convertOutput) {
         // Create random directory to be used for temp files
         const bbWorkingDirectory = `${this.config.bbWorkingDirectory}/${randomBytes(8).toString('hex')}`;
         await fs.mkdir(bbWorkingDirectory, { recursive: true });
@@ -172,9 +179,18 @@ export class BBNativeRollupProver {
             const artifact = ServerCircuitArtifacts[circuitType];
             logger.debug(`Generating witness data for ${circuitType}`);
             const timer = new Timer();
+            const witnessMap = convertInput(input);
             const outputWitness = await simulator.simulateCircuit(witnessMap, artifact);
-            emitCircuitWitnessGenerationStats(circuitTypeToCircuitName(circuitType), timer.ms(), witnessMap.size * Fr.SIZE_IN_BYTES, outputWitness.size * Fr.SIZE_IN_BYTES, logger);
-            const outputType = convertOutput(outputWitness);
+            const output = convertOutput(outputWitness);
+            const inputSize = input.toBuffer().length;
+            const outputSize = output.toBuffer().length;
+            logger.debug(`Generated witness`, {
+                circuitName: mapProtocolArtifactNameToCircuitName(circuitType),
+                duration: timer.ms(),
+                inputSize,
+                outputSize,
+                eventName: 'circuit-witness-generation',
+            });
             // Now prove the circuit from the generated witness
             logger.debug(`Proving ${circuitType}...`);
             const provingResult = await generateProof(this.config.bbBinaryPath, bbWorkingDirectory, circuitType, Buffer.from(artifact.bytecode, 'base64'), outputWitnessFile, logger.debug);
@@ -183,12 +199,20 @@ export class BBNativeRollupProver {
                 throw new Error(provingResult.reason);
             }
             // Ensure our vk cache is up to date
-            await this.updateVerificationKeyAfterProof(provingResult.vkPath, circuitType);
+            const vkData = await this.updateVerificationKeyAfterProof(provingResult.vkPath, circuitType);
             // Read the proof and then cleanup up our temporary directory
-            const proof = await this.readProofAsFields(provingResult.proofPath, circuitType);
-            logger.info(`Generated proof for ${circuitType} in ${provingResult.duration} ms, size: ${proof.proof.length} fields`);
-            emitCircuitProvingStats(circuitTypeToCircuitName(circuitType), provingResult.duration, witnessMap.size * Fr.SIZE_IN_BYTES, outputWitness.size * Fr.SIZE_IN_BYTES, proof.binaryProof.buffer.length, logger);
-            return [outputType, proof];
+            const proof = await this.readProofAsFields(provingResult.proofPath, circuitType, proofLength);
+            logger.info(`Generated proof for ${circuitType} in ${provingResult.duration} ms, size: ${proof.proof.length} fields`, {
+                circuitName: mapProtocolArtifactNameToCircuitName(circuitType),
+                circuitSize: vkData.circuitSize,
+                duration: provingResult.duration,
+                inputSize,
+                outputSize,
+                proofSize: proof.binaryProof.buffer.length,
+                eventName: 'circuit-proving',
+                numPublicInputs: vkData.numPublicInputs,
+            });
+            return [output, proof];
         }
         finally {
             await fs.rm(bbWorkingDirectory, { recursive: true, force: true });
@@ -290,7 +314,7 @@ export class BBNativeRollupProver {
             promise = this.convertVk(filePath);
             this.verificationKeys.set(circuitType, promise);
         }
-        await promise;
+        return promise;
     }
     /**
      * Parses and returns the proof data stored at the specified directory
@@ -298,7 +322,7 @@ export class BBNativeRollupProver {
      * @param circuitType - The type of circuit proven
      * @returns The proof
      */
-    async readProofAsFields(filePath, circuitType) {
+    async readProofAsFields(filePath, circuitType, proofLength) {
         const [binaryProof, proofString] = await Promise.all([
             fs.readFile(`${filePath}/${PROOF_FILENAME}`),
             fs.readFile(`${filePath}/${PROOF_FIELDS_FILENAME}`, { encoding: 'utf-8' }),
@@ -315,7 +339,10 @@ export class BBNativeRollupProver {
         const fieldsWithoutPublicInputs = fields.slice(numPublicInputs);
         logger.debug(`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(fieldsWithoutPublicInputs, new Proof(binaryProof));
+        if (proof.proof.length !== proofLength) {
+            throw new Error("Proof length doesn't match expected length");
+        }
         return proof;
     }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"bb_prover.js","sourceRoot":"","sources":["../../src/prover/bb_prover.ts"],"names":[],"mappings":"AAAA,kCAAkC;AAClC,OAAO,EAIL,gBAAgB,EAEhB,wBAAwB,GACzB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAIL,EAAE,EAMF,KAAK,EAGL,cAAc,EACd,WAAW,EACX,eAAe,EAKf,uBAAuB,GACxB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAE1D,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAChD,OAAO,EACL,sBAAsB,EAEtB,mCAAmC,EACnC,sCAAsC,EACtC,mCAAmC,EACnC,sCAAsC,EACtC,oCAAoC,EACpC,uCAAuC,EACvC,mCAAmC,EACnC,qCAAqC,EACrC,mCAAmC,EACnC,sCAAsC,EACtC,mCAAmC,EACnC,sCAAsC,GACvC,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAGvD,OAAO,KAAK,EAAE,MAAM,aAAa,CAAC;AAElC,OAAO,EACL,SAAS,EACT,qBAAqB,EACrB,cAAc,EACd,kBAAkB,EAClB,WAAW,EACX,yBAAyB,EACzB,aAAa,EACb,WAAW,GACZ,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,wBAAwB,EAAE,uBAAuB,EAAE,iCAAiC,EAAE,MAAM,aAAa,CAAC;AACnH,OAAO,EACL,uBAAuB,EACvB,2BAA2B,EAC3B,uBAAuB,EACvB,kBAAkB,GAEnB,MAAM,4BAA4B,CAAC;AAEpC,MAAM,MAAM,GAAG,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;AAEpD,MAAM,4BAA4B,GAAgC,IAAI,GAAG,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC;AAWlG;;GAEG;AACH,MAAM,OAAO,oBAAoB;IAK/B,YAAoB,MAAsB;QAAtB,WAAM,GAAN,MAAM,CAAgB;QAJlC,qBAAgB,GAA8D,IAAI,GAAG,EAG1F,CAAC;IACyC,CAAC;IAE9C,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,MAAsB;QACrC,MAAM,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,cAAc,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAC1D,MAAM,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,oBAAoB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACjE,MAAM,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACxD,MAAM,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,kBAAkB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC/D,MAAM,CAAC,IAAI,CAAC,sBAAsB,MAAM,CAAC,YAAY,0BAA0B,MAAM,CAAC,kBAAkB,EAAE,CAAC,CAAC;QAC5G,MAAM,CAAC,IAAI,CAAC,wBAAwB,MAAM,CAAC,cAAc,0BAA0B,MAAM,CAAC,oBAAoB,EAAE,CAAC,CAAC;QAElH,OAAO,IAAI,oBAAoB,CAAC,MAAM,CAAC,CAAC;IAC1C,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,kBAAkB,CAAC,MAAwB;QACtD,MAAM,UAAU,GAAG,mCAAmC,CAAC,MAAM,CAAC,CAAC;QAE/D,MAAM,CAAC,aAAa,EAAE,KAAK,CAAC,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAC5D,UAAU,EACV,oBAAoB,EACpB,sCAAsC,CACvC,CAAC;QAEF,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,gCAAgC,CAAC,oBAAoB,CAAC,CAAC;QAE1F,MAAM,EAAE,GAAG,IAAI,uBAAuB,CAAC,eAAe,CAAC,WAAW,EAAE,eAAe,CAAC,IAAI,CAAC,CAAC;QAE1F,OAAO,IAAI,eAAe,CAAC,KAAK,EAAE,EAAE,EAAE,aAAa,CAAC,CAAC;IACvD,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,kBAAkB,CAC7B,MAAwB;QAExB,MAAM,UAAU,GAAG,mCAAmC,CAAC,MAAM,CAAC,CAAC;QAE/D,MAAM,CAAC,aAAa,EAAE,KAAK,CAAC,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAG5D,UAAU,EAAE,oBAAoB,EAAE,sCAAsC,CAAC,CAAC;QAE5E,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,gCAAgC,CAAC,oBAAoB,CAAC,CAAC;QAE1F,MAAM,EAAE,GAAG,IAAI,uBAAuB,CAAC,eAAe,CAAC,WAAW,EAAE,eAAe,CAAC,IAAI,CAAC,CAAC;QAE1F,OAAO,IAAI,eAAe,CAAC,KAAK,EAAE,EAAE,EAAE,aAAa,CAAC,CAAC;IACvD,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,oBAAoB,CAC/B,aAAyC;QAEzC,MAAM,SAAS,GAAG,2BAA2B,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAClE,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;YAC5B,MAAM,IAAI,KAAK,CAAC,+BAA+B,gBAAgB,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACzF,CAAC;QACD,MAAM,UAAU,GAAG,SAAS,CAAC,aAAa,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QAEjE,MAAM,CAAC,aAAa,EAAE,KAAK,CAAC,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC;QAEtF,MAAM,MAAM,GAAG,SAAS,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC;QACvD,OAAO,wBAAwB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACjD,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,kBAAkB,CAC7B,aAAsC;QAEtC,MAAM,UAAU,GAAG,mCAAmC,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QAE7E,MAAM,CAAC,aAAa,EAAE,KAAK,CAAC,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,0BAA0B,CAAC,CAAC;QAE9F,MAAM,MAAM,GAAG,qCAAqC,CAAC,aAAa,CAAC,CAAC;QACpE,OAAO,wBAAwB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACjD,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,kBAAkB,CAC7B,KAAuB;QAEvB,MAAM,UAAU,GAAG,mCAAmC,CAAC,KAAK,CAAC,CAAC;QAE9D,MAAM,CAAC,aAAa,EAAE,KAAK,CAAC,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,oBAAoB,CAAC,CAAC;QAExF,MAAM,MAAM,GAAG,sCAAsC,CAAC,aAAa,CAAC,CAAC;QAErE,OAAO,wBAAwB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACjD,CAAC;IACD;;;;OAIG;IACI,KAAK,CAAC,mBAAmB,CAC9B,KAAwB;QAExB,qBAAqB;QACrB,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAE9F,MAAM,UAAU,GAAG,oCAAoC,CAAC,KAAK,CAAC,CAAC;QAE/D,MAAM,CAAC,aAAa,EAAE,KAAK,CAAC,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,qBAAqB,CAAC,CAAC;QAEzF,MAAM,MAAM,GAAG,uCAAuC,CAAC,aAAa,CAAC,CAAC;QAEtE,OAAO,wBAAwB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACjD,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,kBAAkB,CAAC,KAAuB;QACrD,oBAAoB;QACpB,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAE9F,MAAM,UAAU,GAAG,mCAAmC,CAAC,KAAK,CAAC,CAAC;QAE9D,MAAM,CAAC,aAAa,EAAE,KAAK,CAAC,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,oBAAoB,CAAC,CAAC;QAExF,MAAM,IAAI,CAAC,WAAW,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAC;QAEpD,MAAM,MAAM,GAAG,sCAAsC,CAAC,aAAa,CAAC,CAAC;QACrE,OAAO,wBAAwB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACjD,CAAC;IAED,oDAAoD;IAC7C,KAAK,CAAC,WAAW,CAAC,UAAsB,EAAE,WAAmC;QAClF,oDAAoD;QACpD,MAAM,kBAAkB,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,kBAAkB,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QACjG,MAAM,EAAE,CAAC,KAAK,CAAC,kBAAkB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAExD,MAAM,EAAE,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;QAEpC,+CAA+C;QAC/C,MAAM,iBAAiB,GAAG,GAAG,kBAAkB,qBAAqB,CAAC;QAErE,8CAA8C;QAC9C,gJAAgJ;QAChJ,MAAM,SAAS,GAAG,IAAI,mBAAmB,CACvC,IAAI,CAAC,MAAM,CAAC,oBAAoB,EAChC,IAAI,CAAC,MAAM,CAAC,cAAc,EAC1B,iBAAiB,CAClB,CAAC;QAEF,MAAM,QAAQ,GAAG,sBAAsB,CAAC,WAAW,CAAC,CAAC;QAErD,MAAM,CAAC,KAAK,CAAC,+BAA+B,WAAW,EAAE,CAAC,CAAC;QAE3D,MAAM,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC;QAC1B,MAAM,aAAa,GAAG,MAAM,SAAS,CAAC,eAAe,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QAC5E,iCAAiC,CAC/B,wBAAwB,CAAC,WAAW,CAAC,EACrC,KAAK,CAAC,EAAE,EAAE,EACV,UAAU,CAAC,IAAI,GAAG,EAAE,CAAC,aAAa,EAClC,aAAa,CAAC,IAAI,GAAG,EAAE,CAAC,aAAa,EACrC,MAAM,CACP,CAAC;QAEF,mDAAmD;QACnD,MAAM,CAAC,KAAK,CAAC,WAAW,WAAW,KAAK,CAAC,CAAC;QAE1C,MAAM,aAAa,GAAG,MAAM,aAAa,CACvC,IAAI,CAAC,MAAM,CAAC,YAAY,EACxB,kBAAkB,EAClB,WAAW,EACX,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,EACxC,iBAAiB,EACjB,MAAM,CAAC,KAAK,CACb,CAAC;QAEF,IAAI,aAAa,CAAC,MAAM,KAAK,SAAS,CAAC,OAAO,EAAE,CAAC;YAC/C,MAAM,CAAC,KAAK,CAAC,gCAAgC,WAAW,KAAK,aAAa,CAAC,MAAM,EAAE,CAAC,CAAC;YACrF,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QACxC,CAAC;QAED,oCAAoC;QACpC,MAAM,IAAI,CAAC,+BAA+B,CAAC,aAAa,CAAC,MAAO,EAAE,WAAW,CAAC,CAAC;QAE/E,6DAA6D;QAC7D,MAAM,KAAK,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,GAAG,aAAa,CAAC,SAAU,IAAI,cAAc,EAAE,CAAC,CAAC;QAEjF,gGAAgG;QAChG,uBAAuB,CACrB,wBAAwB,CAAC,WAAW,CAAC,EACrC,aAAa,CAAC,QAAQ,EACtB,UAAU,CAAC,IAAI,GAAG,EAAE,CAAC,aAAa,EAClC,aAAa,CAAC,IAAI,GAAG,EAAE,CAAC,aAAa,EACrC,KAAK,CAAC,MAAM,EACZ,MAAM,CACP,CAAC;QAEF,MAAM,EAAE,CAAC,EAAE,CAAC,kBAAkB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAElE,MAAM,CAAC,IAAI,CAAC,uBAAuB,WAAW,OAAO,aAAa,CAAC,QAAQ,cAAc,KAAK,CAAC,MAAM,SAAS,CAAC,CAAC;QAEhH,OAAO,CAAC,aAAa,EAAE,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;IAC3C,CAAC;IAED;;;;;;OAMG;IACI,KAAK,CAAC,oBAAoB,CAC/B,UAAsB,EACtB,WAAmC,EACnC,aAA+D;QAE/D,oDAAoD;QACpD,MAAM,kBAAkB,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,kBAAkB,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QACjG,MAAM,EAAE,CAAC,KAAK,CAAC,kBAAkB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAExD,MAAM,EAAE,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;QAEpC,IAAI,CAAC;YACH,+CAA+C;YAC/C,MAAM,iBAAiB,GAAG,GAAG,kBAAkB,qBAAqB,CAAC;YAErE,8CAA8C;YAC9C,gJAAgJ;YAChJ,MAAM,SAAS,GAAG,IAAI,mBAAmB,CACvC,IAAI,CAAC,MAAM,CAAC,oBAAoB,EAChC,IAAI,CAAC,MAAM,CAAC,cAAc,EAC1B,iBAAiB,CAClB,CAAC;YAEF,MAAM,QAAQ,GAAG,sBAAsB,CAAC,WAAW,CAAC,CAAC;YAErD,MAAM,CAAC,KAAK,CAAC,+BAA+B,WAAW,EAAE,CAAC,CAAC;YAE3D,MAAM,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC;YAC1B,MAAM,aAAa,GAAG,MAAM,SAAS,CAAC,eAAe,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;YAE5E,iCAAiC,CAC/B,wBAAwB,CAAC,WAAW,CAAC,EACrC,KAAK,CAAC,EAAE,EAAE,EACV,UAAU,CAAC,IAAI,GAAG,EAAE,CAAC,aAAa,EAClC,aAAa,CAAC,IAAI,GAAG,EAAE,CAAC,aAAa,EACrC,MAAM,CACP,CAAC;YAEF,MAAM,UAAU,GAAG,aAAa,CAAC,aAAa,CAAC,CAAC;YAEhD,mDAAmD;YACnD,MAAM,CAAC,KAAK,CAAC,WAAW,WAAW,KAAK,CAAC,CAAC;YAE1C,MAAM,aAAa,GAAG,MAAM,aAAa,CACvC,IAAI,CAAC,MAAM,CAAC,YAAY,EACxB,kBAAkB,EAClB,WAAW,EACX,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,EACxC,iBAAiB,EACjB,MAAM,CAAC,KAAK,CACb,CAAC;YAEF,IAAI,aAAa,CAAC,MAAM,KAAK,SAAS,CAAC,OAAO,EAAE,CAAC;gBAC/C,MAAM,CAAC,KAAK,CAAC,gCAAgC,WAAW,KAAK,aAAa,CAAC,MAAM,EAAE,CAAC,CAAC;gBACrF,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;YACxC,CAAC;YAED,oCAAoC;YACpC,MAAM,IAAI,CAAC,+BAA+B,CAAC,aAAa,CAAC,MAAO,EAAE,WAAW,CAAC,CAAC;YAE/E,6DAA6D;YAC7D,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAe,aAAa,CAAC,SAAU,EAAE,WAAW,CAAC,CAAC;YAEhG,MAAM,CAAC,IAAI,CACT,uBAAuB,WAAW,OAAO,aAAa,CAAC,QAAQ,cAAc,KAAK,CAAC,KAAK,CAAC,MAAM,SAAS,CACzG,CAAC;YAEF,uBAAuB,CACrB,wBAAwB,CAAC,WAAW,CAAC,EACrC,aAAa,CAAC,QAAQ,EACtB,UAAU,CAAC,IAAI,GAAG,EAAE,CAAC,aAAa,EAClC,aAAa,CAAC,IAAI,GAAG,EAAE,CAAC,aAAa,EACrC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,EAC/B,MAAM,CACP,CAAC;YAEF,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QAC7B,CAAC;gBAAS,CAAC;YACT,MAAM,EAAE,CAAC,EAAE,CAAC,kBAAkB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACpE,CAAC;IACH,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,WAAW,CAAC,WAAmC,EAAE,KAAY;QACxE,oDAAoD;QACpD,MAAM,kBAAkB,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,kBAAkB,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QACjG,MAAM,EAAE,CAAC,KAAK,CAAC,kBAAkB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAExD,MAAM,aAAa,GAAG,GAAG,kBAAkB,QAAQ,CAAC;QACpD,MAAM,mBAAmB,GAAG,GAAG,kBAAkB,KAAK,CAAC;QACvD,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,gCAAgC,CAAC,WAAW,CAAC,CAAC;QAEjF,MAAM,CAAC,KAAK,CAAC,uBAAuB,eAAe,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QAEvE,MAAM,EAAE,CAAC,SAAS,CAAC,aAAa,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;QAChD,MAAM,EAAE,CAAC,SAAS,CAAC,mBAAmB,EAAE,eAAe,CAAC,UAAU,CAAC,CAAC;QAEpE,MAAM,WAAW,GAAG,CAAC,OAAe,EAAE,EAAE;YACtC,MAAM,CAAC,KAAK,CAAC,GAAG,WAAW,aAAa,OAAO,EAAE,CAAC,CAAC;QACrD,CAAC,CAAC;QAEF,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,aAAa,EAAE,mBAAoB,EAAE,WAAW,CAAC,CAAC;QAE7G,MAAM,EAAE,CAAC,EAAE,CAAC,kBAAkB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAElE,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS,CAAC,OAAO,EAAE,CAAC;YACxC,MAAM,YAAY,GAAG,oBAAoB,WAAW,SAAS,CAAC;YAC9D,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;QAChC,CAAC;QAED,MAAM,CAAC,IAAI,CAAC,yBAAyB,WAAW,aAAa,MAAM,CAAC,QAAQ,KAAK,CAAC,CAAC;IACrF,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,4BAA4B,CAAC,WAAmC;QAC3E,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,gCAAgC,CAAC,WAAW,CAAC,CAAC;QACxE,OAAO,IAAI,uBAAuB,CAAC,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;IACtE,CAAC;IAEO,KAAK,CAAC,yBAAyB,CAAC,kBAAsC;QAC5E,MAAM,KAAK,GAAG,kBAAkB,CAAC,KAAK,CAAC;QACvC,MAAM,WAAW,GACf,kBAAkB,CAAC,6BAA6B,CAAC,UAAU,KAAK,WAAW,CAAC,IAAI;YAC9E,CAAC,CAAC,oBAAoB;YACtB,CAAC,CAAC,qBAAqB,CAAC;QAC5B,MAAM,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;IAC7C,CAAC;IAED;;;;OAIG;IACK,KAAK,CAAC,gCAAgC,CAAC,WAAmC;QAChF,IAAI,OAAO,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QACrD,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,GAAG,yBAAyB,CACjC,IAAI,CAAC,MAAM,CAAC,YAAY,EACxB,IAAI,CAAC,MAAM,CAAC,kBAAkB,EAC9B,WAAW,EACX,sBAAsB,CAAC,WAAW,CAAC,EACnC,IAAI,EACJ,MAAM,CAAC,KAAK,CACb,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;gBACd,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS,CAAC,OAAO,EAAE,CAAC;oBACxC,MAAM,IAAI,KAAK,CAAC,2CAA2C,WAAW,KAAK,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;gBAC9F,CAAC;gBACD,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,MAAO,CAAC,CAAC;YACxC,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QAClD,CAAC;QACD,OAAO,MAAM,OAAO,CAAC;IACvB,CAAC;IAED;;;;OAIG;IACK,KAAK,CAAC,SAAS,CAAC,QAAgB;QACtC,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAC/C,EAAE,CAAC,QAAQ,CAAC,GAAG,QAAQ,IAAI,kBAAkB,EAAE,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;YACvE,EAAE,CAAC,QAAQ,CAAC,GAAG,QAAQ,IAAI,WAAW,EAAE,CAAC;SAC1C,CAAC,CAAC;QACH,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACzC,MAAM,MAAM,GAAG,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC;QAC7C,gEAAgE;QAChE,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QACzB,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACjC,MAAM,EAAE,GAAwB;YAC9B,IAAI,EAAE,MAAM;YACZ,WAAW,EAAE,QAA+D;YAC5E,UAAU,EAAE,SAAS;YACrB,eAAe,EAAE,MAAM,CAAC,QAAQ,CAAC,2BAA2B,CAAC,CAAC;YAC9D,WAAW,EAAE,MAAM,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC;YACjD,WAAW,EAAE,QAAQ,CAAC,uBAAuB,CAAC,IAAI,EAAE,CAAC,GAAG;SACzD,CAAC;QACF,OAAO,EAAE,CAAC;IACZ,CAAC;IAED;;;;OAIG;IACK,KAAK,CAAC,+BAA+B,CAAC,QAAgB,EAAE,WAAmC;QACjG,IAAI,OAAO,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QACrD,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;YACnC,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QAClD,CAAC;QACD,MAAM,OAAO,CAAC;IAChB,CAAC;IAED;;;;;OAKG;IACK,KAAK,CAAC,iBAAiB,CAC7B,QAAgB,EAChB,WAAmC;QAEnC,MAAM,CAAC,WAAW,EAAE,WAAW,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACnD,EAAE,CAAC,QAAQ,CAAC,GAAG,QAAQ,IAAI,cAAc,EAAE,CAAC;YAC5C,EAAE,CAAC,QAAQ,CAAC,GAAG,QAAQ,IAAI,qBAAqB,EAAE,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;SAC3E,CAAC,CAAC;QACH,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QACrC,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC;QACvC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAC5D,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,KAAK,CAAC,gCAAgC,WAAW,EAAE,CAAC,CAAC;QACjE,CAAC;QACD,MAAM,eAAe,GAAG,4BAA4B,CAAC,GAAG,CAAC,WAAW,CAAC;YACnE,CAAC,CAAC,MAAM,CAAC,eAAe;YACxB,CAAC,CAAC,MAAM,CAAC,eAAe,GAAG,uBAAuB,CAAC;QACrD,MAAM,yBAAyB,GAAG,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;QAChE,MAAM,CAAC,KAAK,CACV,iBAAiB,WAAW,4BAA4B,MAAM,CAAC,MAAM,4BAA4B,yBAAyB,CAAC,MAAM,wBAAwB,eAAe,mBAAmB,MAAM,CAAC,WAAW,mBAAmB,MAAM,CAAC,WAAW,iBAAiB,WAAW,CAAC,MAAM,EAAE,CACxR,CAAC;QACF,MAAM,KAAK,GAAG,IAAI,cAAc,CAAe,yBAAyB,EAAE,IAAI,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC;QAClG,OAAO,KAAK,CAAC;IACf,CAAC;CACF"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"bb_prover.js","sourceRoot":"","sources":["../../src/prover/bb_prover.ts"],"names":[],"mappings":"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"}

package/dest/stats.d.ts

@@ -1,9 +1,6 @@
 import { type PublicKernelRequest } from '@aztec/circuit-types';
 import type { CircuitName } from '@aztec/circuit-types/stats';
-import { type Logger } from '@aztec/foundation/log';
-import { type ServerProtocolArtifact } from '@aztec/noir-protocol-circuits-types';
-export declare function emitCircuitWitnessGenerationStats(circuitName: CircuitName, duration: number, inputSize: number, outputSize: number, logger: Logger): void;
-export declare function emitCircuitProvingStats(circuitName: CircuitName, duration: number, inputSize: number, outputSize: number, proofSize: number, logger: Logger): void;
+import { type ClientProtocolArtifact, type ServerProtocolArtifact } from '@aztec/noir-protocol-circuits-types';
 export declare function mapPublicKernelToCircuitName(kernelType: PublicKernelRequest['type']): CircuitName;
-export declare function circuitTypeToCircuitName(circuitType: ServerProtocolArtifact): CircuitName;
+export declare function mapProtocolArtifactNameToCircuitName(artifact: ServerProtocolArtifact | ClientProtocolArtifact): CircuitName;
 //# sourceMappingURL=stats.d.ts.map

package/dest/stats.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stats.d.ts","sourceRoot":"","sources":["../src/stats.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,mBAAmB,EAAoB,MAAM,sBAAsB,CAAC;AAClF,OAAO,KAAK,EAAE,WAAW,EAAsD,MAAM,4BAA4B,CAAC;AAClH,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,KAAK,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAElF,wBAAgB,iCAAiC,CAC/C,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,QAWf;AAED,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,QAYf;AAED,wBAAgB,4BAA4B,CAAC,UAAU,EAAE,mBAAmB,CAAC,MAAM,CAAC,GAAG,WAAW,CAajG;AAED,wBAAgB,wBAAwB,CAAC,WAAW,EAAE,sBAAsB,GAAG,WAAW,CAuBzF"}
+{"version":3,"file":"stats.d.ts","sourceRoot":"","sources":["../src/stats.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,mBAAmB,EAAoB,MAAM,sBAAsB,CAAC;AAClF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,KAAK,sBAAsB,EAAE,KAAK,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAE/G,wBAAgB,4BAA4B,CAAC,UAAU,EAAE,mBAAmB,CAAC,MAAM,CAAC,GAAG,WAAW,CAajG;AAED,wBAAgB,oCAAoC,CAClD,QAAQ,EAAE,sBAAsB,GAAG,sBAAsB,GACxD,WAAW,CAuCb"}

package/dest/stats.js

@@ -1,25 +1,4 @@
 import { PublicKernelType } from '@aztec/circuit-types';
-export function emitCircuitWitnessGenerationStats(circuitName, duration, inputSize, outputSize, logger) {
-    const stats = {
-        eventName: 'circuit-witness-generation',
-        circuitName,
-        inputSize,
-        outputSize,
-        duration,
-    };
-    logger.debug('Circuit witness generation stats', stats);
-}
-export function emitCircuitProvingStats(circuitName, duration, inputSize, outputSize, proofSize, logger) {
-    const stats = {
-        eventName: 'circuit-proving',
-        circuitName,
-        duration,
-        inputSize,
-        outputSize,
-        proofSize,
-    };
-    logger.debug('Circuit proving stats', stats);
-}
 export function mapPublicKernelToCircuitName(kernelType) {
     switch (kernelType) {
         case PublicKernelType.SETUP:
@@ -34,8 +13,8 @@ export function mapPublicKernelToCircuitName(kernelType) {
             throw new Error(`Unknown kernel type: ${kernelType}`);
     }
 }
-export function circuitTypeToCircuitName(circuitType) {
-    switch (circuitType) {
+export function mapProtocolArtifactNameToCircuitName(artifact) {
+    switch (artifact) {
         case 'BaseParityArtifact':
             return 'base-parity';
         case 'RootParityArtifact':
@@ -54,8 +33,24 @@ export function circuitTypeToCircuitName(circuitType) {
             return 'public-kernel-teardown';
         case 'PublicKernelTailArtifact':
             return 'public-kernel-tail';
+        case 'PrivateKernelInitArtifact':
+            return 'private-kernel-init';
+        case 'PrivateKernelInnerArtifact':
+            return 'private-kernel-inner';
+        case 'PrivateKernelTailArtifact':
+            return 'private-kernel-tail';
+        case 'PrivateKernelTailToPublicArtifact':
+            return 'private-kernel-tail-to-public';
+        case 'PrivateKernelResetFullArtifact':
+            return 'private-kernel-reset-full';
+        case 'PrivateKernelResetBigArtifact':
+            return 'private-kernel-reset-big';
+        case 'PrivateKernelResetMediumArtifact':
+            return 'private-kernel-reset-medium';
+        case 'PrivateKernelResetSmallArtifact':
+            return 'private-kernel-reset-small';
         default:
-            throw new Error(`Unknown circuit type: ${circuitType}`);
+            throw new Error(`Unknown circuit type: ${artifact}`);
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhdHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvc3RhdHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUE0QixnQkFBZ0IsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBS2xGLE1BQU0sVUFBVSxpQ0FBaUMsQ0FDL0MsV0FBd0IsRUFDeEIsUUFBZ0IsRUFDaEIsU0FBaUIsRUFDakIsVUFBa0IsRUFDbEIsTUFBYztJQUVkLE1BQU0sS0FBSyxHQUFrQztRQUMzQyxTQUFTLEVBQUUsNEJBQTRCO1FBQ3ZDLFdBQVc7UUFDWCxTQUFTO1FBQ1QsVUFBVTtRQUNWLFFBQVE7S0FDVCxDQUFDO0lBRUYsTUFBTSxDQUFDLEtBQUssQ0FBQyxrQ0FBa0MsRUFBRSxLQUFLLENBQUMsQ0FBQztBQUMxRCxDQUFDO0FBRUQsTUFBTSxVQUFVLHVCQUF1QixDQUNyQyxXQUF3QixFQUN4QixRQUFnQixFQUNoQixTQUFpQixFQUNqQixVQUFrQixFQUNsQixTQUFpQixFQUNqQixNQUFjO0lBRWQsTUFBTSxLQUFLLEdBQXdCO1FBQ2pDLFNBQVMsRUFBRSxpQkFBaUI7UUFDNUIsV0FBVztRQUNYLFFBQVE7UUFDUixTQUFTO1FBQ1QsVUFBVTtRQUNWLFNBQVM7S0FDVixDQUFDO0lBRUYsTUFBTSxDQUFDLEtBQUssQ0FBQyx1QkFBdUIsRUFBRSxLQUFLLENBQUMsQ0FBQztBQUMvQyxDQUFDO0FBRUQsTUFBTSxVQUFVLDRCQUE0QixDQUFDLFVBQXVDO0lBQ2xGLFFBQVEsVUFBVSxFQUFFLENBQUM7UUFDbkIsS0FBSyxnQkFBZ0IsQ0FBQyxLQUFLO1lBQ3pCLE9BQU8scUJBQXFCLENBQUM7UUFDL0IsS0FBSyxnQkFBZ0IsQ0FBQyxTQUFTO1lBQzdCLE9BQU8seUJBQXlCLENBQUM7UUFDbkMsS0FBSyxnQkFBZ0IsQ0FBQyxRQUFRO1lBQzVCLE9BQU8sd0JBQXdCLENBQUM7UUFDbEMsS0FBSyxnQkFBZ0IsQ0FBQyxJQUFJO1lBQ3hCLE9BQU8sb0JBQW9CLENBQUM7UUFDOUI7WUFDRSxNQUFNLElBQUksS0FBSyxDQUFDLHdCQUF3QixVQUFVLEVBQUUsQ0FBQyxDQUFDO0lBQzFELENBQUM7QUFDSCxDQUFDO0FBRUQsTUFBTSxVQUFVLHdCQUF3QixDQUFDLFdBQW1DO0lBQzFFLFFBQVEsV0FBVyxFQUFFLENBQUM7UUFDcEIsS0FBSyxvQkFBb0I7WUFDdkIsT0FBTyxhQUFhLENBQUM7UUFDdkIsS0FBSyxvQkFBb0I7WUFDdkIsT0FBTyxhQUFhLENBQUM7UUFDdkIsS0FBSyxvQkFBb0I7WUFDdkIsT0FBTyxhQUFhLENBQUM7UUFDdkIsS0FBSyxxQkFBcUI7WUFDeEIsT0FBTyxjQUFjLENBQUM7UUFDeEIsS0FBSyxvQkFBb0I7WUFDdkIsT0FBTyxhQUFhLENBQUM7UUFDdkIsS0FBSywyQkFBMkI7WUFDOUIsT0FBTyxxQkFBcUIsQ0FBQztRQUMvQixLQUFLLDhCQUE4QjtZQUNqQyxPQUFPLHlCQUF5QixDQUFDO1FBQ25DLEtBQUssOEJBQThCO1lBQ2pDLE9BQU8sd0JBQXdCLENBQUM7UUFDbEMsS0FBSywwQkFBMEI7WUFDN0IsT0FBTyxvQkFBb0IsQ0FBQztRQUM5QjtZQUNFLE1BQU0sSUFBSSxLQUFLLENBQUMseUJBQXlCLFdBQVcsRUFBRSxDQUFDLENBQUM7SUFDNUQsQ0FBQztBQUNILENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhdHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvc3RhdHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUE0QixnQkFBZ0IsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBSWxGLE1BQU0sVUFBVSw0QkFBNEIsQ0FBQyxVQUF1QztJQUNsRixRQUFRLFVBQVUsRUFBRSxDQUFDO1FBQ25CLEtBQUssZ0JBQWdCLENBQUMsS0FBSztZQUN6QixPQUFPLHFCQUFxQixDQUFDO1FBQy9CLEtBQUssZ0JBQWdCLENBQUMsU0FBUztZQUM3QixPQUFPLHlCQUF5QixDQUFDO1FBQ25DLEtBQUssZ0JBQWdCLENBQUMsUUFBUTtZQUM1QixPQUFPLHdCQUF3QixDQUFDO1FBQ2xDLEtBQUssZ0JBQWdCLENBQUMsSUFBSTtZQUN4QixPQUFPLG9CQUFvQixDQUFDO1FBQzlCO1lBQ0UsTUFBTSxJQUFJLEtBQUssQ0FBQyx3QkFBd0IsVUFBVSxFQUFFLENBQUMsQ0FBQztJQUMxRCxDQUFDO0FBQ0gsQ0FBQztBQUVELE1BQU0sVUFBVSxvQ0FBb0MsQ0FDbEQsUUFBeUQ7SUFFekQsUUFBUSxRQUFRLEVBQUUsQ0FBQztRQUNqQixLQUFLLG9CQUFvQjtZQUN2QixPQUFPLGFBQWEsQ0FBQztRQUN2QixLQUFLLG9CQUFvQjtZQUN2QixPQUFPLGFBQWEsQ0FBQztRQUN2QixLQUFLLG9CQUFvQjtZQUN2QixPQUFPLGFBQWEsQ0FBQztRQUN2QixLQUFLLHFCQUFxQjtZQUN4QixPQUFPLGNBQWMsQ0FBQztRQUN4QixLQUFLLG9CQUFvQjtZQUN2QixPQUFPLGFBQWEsQ0FBQztRQUN2QixLQUFLLDJCQUEyQjtZQUM5QixPQUFPLHFCQUFxQixDQUFDO1FBQy9CLEtBQUssOEJBQThCO1lBQ2pDLE9BQU8seUJBQXlCLENBQUM7UUFDbkMsS0FBSyw4QkFBOEI7WUFDakMsT0FBTyx3QkFBd0IsQ0FBQztRQUNsQyxLQUFLLDBCQUEwQjtZQUM3QixPQUFPLG9CQUFvQixDQUFDO1FBQzlCLEtBQUssMkJBQTJCO1lBQzlCLE9BQU8scUJBQXFCLENBQUM7UUFDL0IsS0FBSyw0QkFBNEI7WUFDL0IsT0FBTyxzQkFBc0IsQ0FBQztRQUNoQyxLQUFLLDJCQUEyQjtZQUM5QixPQUFPLHFCQUFxQixDQUFDO1FBQy9CLEtBQUssbUNBQW1DO1lBQ3RDLE9BQU8sK0JBQStCLENBQUM7UUFDekMsS0FBSyxnQ0FBZ0M7WUFDbkMsT0FBTywyQkFBMkIsQ0FBQztRQUNyQyxLQUFLLCtCQUErQjtZQUNsQyxPQUFPLDBCQUEwQixDQUFDO1FBQ3BDLEtBQUssa0NBQWtDO1lBQ3JDLE9BQU8sNkJBQTZCLENBQUM7UUFDdkMsS0FBSyxpQ0FBaUM7WUFDcEMsT0FBTyw0QkFBNEIsQ0FBQztRQUN0QztZQUNFLE1BQU0sSUFBSSxLQUFLLENBQUMseUJBQXlCLFFBQVEsRUFBRSxDQUFDLENBQUM7SUFDekQsQ0FBQztBQUNILENBQUMifQ==

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/bb-prover",
-  "version": "0.40.0",
+  "version": "0.41.0",
   "type": "module",
   "exports": {
     ".": "./dest/index.js"
@@ -51,11 +51,11 @@
     ]
   },
   "dependencies": {
-    "@aztec/circuit-types": "0.40.0",
-    "@aztec/circuits.js": "0.40.0",
-    "@aztec/foundation": "0.40.0",
-    "@aztec/noir-protocol-circuits-types": "0.40.0",
-    "@aztec/simulator": "0.40.0",
+    "@aztec/circuit-types": "0.41.0",
+    "@aztec/circuits.js": "0.41.0",
+    "@aztec/foundation": "0.41.0",
+    "@aztec/noir-protocol-circuits-types": "0.41.0",
+    "@aztec/simulator": "0.41.0",
     "@noir-lang/noirc_abi": "portal:../../noir/packages/noirc_abi",
     "@noir-lang/types": "portal:../../noir/packages/types",
     "commander": "^9.0.0",

package/src/bb/execute.ts

@@ -32,6 +32,12 @@ export type BBFailure = {
 
 export type BBResult = BBSuccess | BBFailure;
 
+type BBExecResult = {
+  status: BB_RESULT;
+  exitCode: number;
+  signal: string | undefined;
+};
+
 /**
  * Invokes the Barretenberg binary with the provided command and args
  * @param pathToBB - The path to the BB binary
@@ -47,26 +53,20 @@ export function executeBB(
   args: string[],
   logger: LogFn,
   resultParser = (code: number) => code === 0,
-) {
-  return new Promise<BB_RESULT.SUCCESS | BB_RESULT.FAILURE>((resolve, reject) => {
+): Promise<BBExecResult> {
+  return new Promise<BBExecResult>(resolve => {
     // spawn the bb process
-    const bb = proc.spawn(pathToBB, [command, ...args]);
-    bb.stdout.on('data', data => {
-      const message = data.toString('utf-8').replace(/\n$/, '');
-      logger(message);
+    const bb = proc.spawn(pathToBB, [command, ...args], {
+      stdio: 'pipe',
     });
-    bb.stderr.on('data', data => {
-      const message = data.toString('utf-8').replace(/\n$/, '');
-      logger(message);
-    });
-    bb.on('close', (code: number) => {
-      if (resultParser(code)) {
-        resolve(BB_RESULT.SUCCESS);
+    bb.on('close', (exitCode: number, signal?: string) => {
+      if (resultParser(exitCode)) {
+        resolve({ status: BB_RESULT.SUCCESS, exitCode, signal });
       } else {
-        reject();
+        resolve({ status: BB_RESULT.FAILURE, exitCode, signal });
       }
     });
-  }).catch(_ => BB_RESULT.FAILURE);
+  }).catch(_ => ({ status: BB_RESULT.FAILURE, exitCode: -1, signal: undefined }));
 }
 
 const bytecodeHashFilename = 'bytecode_hash';
@@ -154,14 +154,14 @@ export async function generateKeyForNoirCircuit(
     const timer = new Timer();
     let result = await executeBB(pathToBB, `write_${key}`, args, log);
     // If we succeeded and the type of key if verification, have bb write the 'fields' version too
-    if (result == BB_RESULT.SUCCESS && key === 'vk') {
+    if (result.status == BB_RESULT.SUCCESS && key === 'vk') {
       const asFieldsArgs = ['-k', `${outputPath}/${VK_FILENAME}`, '-o', `${outputPath}/${VK_FIELDS_FILENAME}`, '-v'];
       result = await executeBB(pathToBB, `vk_as_fields`, asFieldsArgs, log);
     }
     const duration = timer.ms();
     // Cleanup the bytecode file
     await fs.rm(bytecodePath, { force: true });
-    if (result == BB_RESULT.SUCCESS) {
+    if (result.status == BB_RESULT.SUCCESS) {
       // Store the bytecode hash so we don't need to regenerate at a later time
       await fs.writeFile(bytecodeHashPath, bytecodeHash);
       return {
@@ -173,7 +173,10 @@ export async function generateKeyForNoirCircuit(
       };
     }
     // Not a great error message here but it is difficult to decipher what comes from bb
-    return { status: BB_RESULT.FAILURE, reason: `Failed to generate key` };
+    return {
+      status: BB_RESULT.FAILURE,
+      reason: `Failed to generate key. Exit code: ${result.exitCode}. Signal ${result.signal}.`,
+    };
   } catch (error) {
     return { status: BB_RESULT.FAILURE, reason: `${error}` };
   }
@@ -231,7 +234,7 @@ export async function generateProof(
     const duration = timer.ms();
     // cleanup the bytecode
     await fs.rm(bytecodePath, { force: true });
-    if (result == BB_RESULT.SUCCESS) {
+    if (result.status == BB_RESULT.SUCCESS) {
       return {
         status: BB_RESULT.SUCCESS,
         duration,
@@ -241,7 +244,10 @@ export async function generateProof(
       };
     }
     // Not a great error message here but it is difficult to decipher what comes from bb
-    return { status: BB_RESULT.FAILURE, reason: `Failed to generate proof` };
+    return {
+      status: BB_RESULT.FAILURE,
+      reason: `Failed to generate proof. Exit code ${result.exitCode}. Signal ${result.signal}.`,
+    };
   } catch (error) {
     return { status: BB_RESULT.FAILURE, reason: `${error}` };
   }
@@ -274,11 +280,14 @@ export async function verifyProof(
     const timer = new Timer();
     const result = await executeBB(pathToBB, 'verify', args, log);
     const duration = timer.ms();
-    if (result == BB_RESULT.SUCCESS) {
+    if (result.status == BB_RESULT.SUCCESS) {
       return { status: BB_RESULT.SUCCESS, duration };
     }
     // Not a great error message here but it is difficult to decipher what comes from bb
-    return { status: BB_RESULT.FAILURE, reason: `Failed to verify proof` };
+    return {
+      status: BB_RESULT.FAILURE,
+      reason: `Failed to verify proof. Exit code ${result.exitCode}. Signal ${result.signal}.`,
+    };
   } catch (error) {
     return { status: BB_RESULT.FAILURE, reason: `${error}` };
   }
@@ -311,11 +320,14 @@ export async function writeVkAsFields(
     const timer = new Timer();
     const result = await executeBB(pathToBB, 'vk_as_fields', args, log);
     const duration = timer.ms();
-    if (result == BB_RESULT.SUCCESS) {
+    if (result.status == BB_RESULT.SUCCESS) {
       return { status: BB_RESULT.SUCCESS, duration, vkPath: verificationKeyPath };
     }
     // Not a great error message here but it is difficult to decipher what comes from bb
-    return { status: BB_RESULT.FAILURE, reason: `Failed to create vk as fields` };
+    return {
+      status: BB_RESULT.FAILURE,
+      reason: `Failed to create vk as fields. Exit code ${result.exitCode}. Signal ${result.signal}.`,
+    };
   } catch (error) {
     return { status: BB_RESULT.FAILURE, reason: `${error}` };
   }
@@ -348,11 +360,14 @@ export async function writeProofAsFields(
     const timer = new Timer();
     const result = await executeBB(pathToBB, 'proof_as_fields', args, log);
     const duration = timer.ms();
-    if (result == BB_RESULT.SUCCESS) {
+    if (result.status == BB_RESULT.SUCCESS) {
       return { status: BB_RESULT.SUCCESS, duration, proofPath: proofPath };
     }
     // Not a great error message here but it is difficult to decipher what comes from bb
-    return { status: BB_RESULT.FAILURE, reason: `Failed to create proof as fields` };
+    return {
+      status: BB_RESULT.FAILURE,
+      reason: `Failed to create proof as fields. Exit code ${result.exitCode}. Signal ${result.signal}.`,
+    };
   } catch (error) {
     return { status: BB_RESULT.FAILURE, reason: `${error}` };
   }