@aztec/bb-prover 0.0.1-commit.3fd054f6 → 0.0.1-commit.431c48d

package/dest/verifier/bb_verifier.js

@@ -1,22 +1,92 @@
-import { runInDirectory } from '@aztec/foundation/fs';
+function _ts_add_disposable_resource(env, value, async) {
+    if (value !== null && value !== void 0) {
+        if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
+        var dispose, inner;
+        if (async) {
+            if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");
+            dispose = value[Symbol.asyncDispose];
+        }
+        if (dispose === void 0) {
+            if (!Symbol.dispose) throw new TypeError("Symbol.dispose is not defined.");
+            dispose = value[Symbol.dispose];
+            if (async) inner = dispose;
+        }
+        if (typeof dispose !== "function") throw new TypeError("Object not disposable.");
+        if (inner) dispose = function() {
+            try {
+                inner.call(this);
+            } catch (e) {
+                return Promise.reject(e);
+            }
+        };
+        env.stack.push({
+            value: value,
+            dispose: dispose,
+            async: async
+        });
+    } else if (async) {
+        env.stack.push({
+            async: true
+        });
+    }
+    return value;
+}
+function _ts_dispose_resources(env) {
+    var _SuppressedError = typeof SuppressedError === "function" ? SuppressedError : function(error, suppressed, message) {
+        var e = new Error(message);
+        return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+    };
+    return (_ts_dispose_resources = function _ts_dispose_resources(env) {
+        function fail(e) {
+            env.error = env.hasError ? new _SuppressedError(e, env.error, "An error was suppressed during disposal.") : e;
+            env.hasError = true;
+        }
+        var r, s = 0;
+        function next() {
+            while(r = env.stack.pop()){
+                try {
+                    if (!r.async && s === 1) return s = 0, env.stack.push(r), Promise.resolve().then(next);
+                    if (r.dispose) {
+                        var result = r.dispose.call(r.value);
+                        if (r.async) return s |= 2, Promise.resolve(result).then(next, function(e) {
+                            fail(e);
+                            return next();
+                        });
+                    } else s |= 1;
+                } catch (e) {
+                    fail(e);
+                }
+            }
+            if (s === 1) return env.hasError ? Promise.reject(env.error) : Promise.resolve();
+            if (env.hasError) throw env.error;
+        }
+        return next();
+    })(env);
+}
 import { createLogger } from '@aztec/foundation/log';
 import { Timer } from '@aztec/foundation/timer';
 import { ProtocolCircuitVks } from '@aztec/noir-protocol-circuits-types/server/vks';
 import { mapProtocolArtifactNameToCircuitName } from '@aztec/noir-protocol-circuits-types/types';
 import { promises as fs } from 'fs';
-import * as path from 'path';
-import { BB_RESULT, PROOF_FILENAME, PUBLIC_INPUTS_FILENAME, VK_FILENAME, verifyChonkProof, verifyProof } from '../bb/execute.js';
+import { BBJsFactory } from '../bb/bb_js_backend.js';
 import { getUltraHonkFlavorForCircuit } from '../honk.js';
-import { writeChonkProofToPath } from '../prover/proof_utils.js';
 export class BBCircuitVerifier {
     config;
     logger;
+    bbJsFactory;
     constructor(config, logger){
         this.config = config;
         this.logger = logger;
+        // BB_NUM_IVC_VERIFIERS bounds the number of long-lived bb processes the pool keeps alive.
+        // If 0, fall back to spawning a fresh bb per verification.
+        this.bbJsFactory = new BBJsFactory(config.bbBinaryPath, {
+            poolSize: config.numConcurrentIVCVerifiers > 0 ? config.numConcurrentIVCVerifiers : undefined,
+            logger,
+            debugDir: config.bbDebugOutputDir
+        });
     }
     stop() {
-        return Promise.resolve();
+        return this.bbJsFactory.destroy();
     }
     static async new(config, logger = createLogger('bb-prover:verifier')) {
         if (!config.bbWorkingDirectory) {
@@ -34,64 +104,76 @@ export class BBCircuitVerifier {
         }
         return vk;
     }
-    async verifyProofForCircuit(circuit, proof) {
-        const operation = async (bbWorkingDirectory)=>{
-            const publicInputsFileName = path.join(bbWorkingDirectory, PUBLIC_INPUTS_FILENAME);
-            const proofFileName = path.join(bbWorkingDirectory, PROOF_FILENAME);
-            const verificationKeyPath = path.join(bbWorkingDirectory, VK_FILENAME);
+    /** Verify an UltraHonk proof via bb.js API (no temp files). */ async verifyProofForCircuit(circuit, proof) {
+        const env = {
+            stack: [],
+            error: void 0,
+            hasError: false
+        };
+        try {
             const verificationKey = this.getVerificationKeyData(circuit);
+            const flavor = getUltraHonkFlavorForCircuit(circuit);
             this.logger.debug(`${circuit} Verifying with key: ${verificationKey.keyAsFields.hash.toString()}`);
-            // TODO(https://github.com/AztecProtocol/aztec-packages/issues/13189): Put this proof parsing logic in the proof class.
-            await fs.writeFile(publicInputsFileName, proof.buffer.slice(0, proof.numPublicInputs * 32));
-            await fs.writeFile(proofFileName, proof.buffer.slice(proof.numPublicInputs * 32));
-            await fs.writeFile(verificationKeyPath, verificationKey.keyAsBytes);
-            const result = await verifyProof(this.config.bbBinaryPath, proofFileName, verificationKeyPath, getUltraHonkFlavorForCircuit(circuit), this.logger);
-            if (result.status === BB_RESULT.FAILURE) {
-                const errorMessage = `Failed to verify ${circuit} proof!`;
-                throw new Error(errorMessage);
+            // Split proof buffer into public input fields and proof fields (32-byte each)
+            const publicInputFields = splitBufferToFieldArrays(proof.buffer.subarray(0, proof.numPublicInputs * 32));
+            const proofFields = splitBufferToFieldArrays(proof.buffer.subarray(proof.numPublicInputs * 32));
+            const instance = _ts_add_disposable_resource(env, await this.bbJsFactory.getInstance(), true);
+            const { verified, durationMs } = await instance.verifyProof(proofFields, verificationKey.keyAsBytes, publicInputFields, flavor);
+            if (!verified) {
+                throw new Error(`Failed to verify ${circuit} proof!`);
             }
             this.logger.debug(`${circuit} verification successful`, {
                 circuitName: mapProtocolArtifactNameToCircuitName(circuit),
-                duration: result.durationMs,
+                duration: durationMs,
                 eventName: 'circuit-verification',
                 proofType: 'ultra-honk'
             });
-        };
-        await runInDirectory(this.config.bbWorkingDirectory, operation, this.config.bbSkipCleanup, this.logger);
+        } catch (e) {
+            env.error = e;
+            env.hasError = true;
+        } finally{
+            const result = _ts_dispose_resources(env);
+            if (result) await result;
+        }
     }
-    async verifyProof(tx) {
+    /** Verify a Chonk (IVC) proof from a transaction via bb.js API. */ async verifyProof(tx) {
         const proofType = 'Chonk';
         try {
-            const totalTimer = new Timer();
-            let verificationDuration = 0;
-            const circuit = tx.data.forPublic ? 'HidingKernelToPublic' : 'HidingKernelToRollup';
-            // Block below is almost copy-pasted from verifyProofForCircuit
-            const operation = async (bbWorkingDirectory)=>{
-                const proofPath = path.join(bbWorkingDirectory, PROOF_FILENAME);
-                await writeChonkProofToPath(tx.chonkProof.attachPublicInputs(tx.data.publicInputs().toFields()), proofPath);
-                const verificationKeyPath = path.join(bbWorkingDirectory, VK_FILENAME);
+            const env = {
+                stack: [],
+                error: void 0,
+                hasError: false
+            };
+            try {
+                const totalTimer = new Timer();
+                const circuit = tx.data.forPublic ? 'HidingKernelToPublic' : 'HidingKernelToRollup';
                 const verificationKey = this.getVerificationKeyData(circuit);
-                await fs.writeFile(verificationKeyPath, verificationKey.keyAsBytes);
-                const timer = new Timer();
-                const result = await verifyChonkProof(this.config.bbBinaryPath, proofPath, verificationKeyPath, this.logger, this.config.bbIVCConcurrency);
-                verificationDuration = timer.ms();
-                if (result.status === BB_RESULT.FAILURE) {
-                    const errorMessage = `Failed to verify ${proofType} proof for ${circuit}!`;
-                    throw new Error(errorMessage);
+                // Reconstruct the full proof with public inputs prepended, then convert Fr[] to Uint8Array[]
+                const proofWithPubInputs = tx.chonkProof.attachPublicInputs(tx.data.publicInputs().toFields());
+                const fieldsAsBuffers = proofWithPubInputs.fieldsWithPublicInputs.map((f)=>new Uint8Array(f.toBuffer()));
+                const instance = _ts_add_disposable_resource(env, await this.bbJsFactory.getInstance(), true);
+                const { verified, durationMs } = await instance.verifyChonkProof(fieldsAsBuffers, verificationKey.keyAsBytes);
+                if (!verified) {
+                    throw new Error(`Failed to verify ${proofType} proof for ${circuit}!`);
                 }
                 this.logger.debug(`${proofType} verification successful`, {
                     circuitName: mapProtocolArtifactNameToCircuitName(circuit),
-                    duration: result.durationMs,
+                    duration: durationMs,
                     eventName: 'circuit-verification',
                     proofType: 'chonk'
                 });
-            };
-            await runInDirectory(this.config.bbWorkingDirectory, operation, this.config.bbSkipCleanup, this.logger);
-            return {
-                valid: true,
-                durationMs: verificationDuration,
-                totalDurationMs: totalTimer.ms()
-            };
+                return {
+                    valid: true,
+                    durationMs,
+                    totalDurationMs: totalTimer.ms()
+                };
+            } catch (e) {
+                env.error = e;
+                env.hasError = true;
+            } finally{
+                const result = _ts_dispose_resources(env);
+                if (result) await result;
+            }
         } catch (err) {
             this.logger.warn(`Failed to verify ${proofType} proof for tx ${tx.getTxHash().toString()}: ${String(err)}`);
             return {
@@ -102,3 +184,10 @@ export class BBCircuitVerifier {
         }
     }
 }
+/** Split a buffer into 32-byte Uint8Array field elements. */ function splitBufferToFieldArrays(buffer) {
+    const fields = [];
+    for(let i = 0; i < buffer.length; i += 32){
+        fields.push(new Uint8Array(buffer.subarray(i, i + 32)));
+    }
+    return fields;
+}

package/dest/verifier/queued_chonk_verifier.d.ts

@@ -1,6 +1,18 @@
 import type { ClientProtocolCircuitVerifier, IVCProofVerificationResult } from '@aztec/stdlib/interfaces/server';
 import type { Tx } from '@aztec/stdlib/tx';
 import { type TelemetryClient } from '@aztec/telemetry-client';
+/** Records verification timing and failure metrics for an IVC (chonk) proof verifier. */
+export declare class IVCVerifierMetrics {
+    private ivcVerificationHistogram;
+    private ivcTotalVerificationHistogram;
+    private ivcFailureCount;
+    private localHistogramOk;
+    private localHistogramFails;
+    private aggDurationMetrics;
+    constructor(client: TelemetryClient, name?: string);
+    recordIVCVerification(result: IVCProofVerificationResult): void;
+    private aggregate;
+}
 export declare class QueuedIVCVerifier implements ClientProtocolCircuitVerifier {
     private verifier;
     private telemetry;
@@ -11,4 +23,4 @@ export declare class QueuedIVCVerifier implements ClientProtocolCircuitVerifier
     verifyProof(tx: Tx): Promise<IVCProofVerificationResult>;
     stop(): Promise<void>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicXVldWVkX2Nob25rX3ZlcmlmaWVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdmVyaWZpZXIvcXVldWVkX2Nob25rX3ZlcmlmaWVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sS0FBSyxFQUFFLDZCQUE2QixFQUFFLDBCQUEwQixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDakgsT0FBTyxLQUFLLEVBQUUsRUFBRSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDM0MsT0FBTyxFQU1MLEtBQUssZUFBZSxFQUlyQixNQUFNLHlCQUF5QixDQUFDO0FBbUVqQyxxQkFBYSxpQkFBa0IsWUFBVyw2QkFBNkI7SUFLbkUsT0FBTyxDQUFDLFFBQVE7SUFFaEIsT0FBTyxDQUFDLFNBQVM7SUFDakIsT0FBTyxDQUFDLE1BQU07SUFQaEIsT0FBTyxDQUFDLEtBQUssQ0FBYztJQUMzQixPQUFPLENBQUMsT0FBTyxDQUFxQjtJQUVwQyxZQUNVLFFBQVEsRUFBRSw2QkFBNkIsRUFDL0MsV0FBVyxFQUFFLE1BQU0sRUFDWCxTQUFTLEdBQUUsZUFBc0MsRUFDakQsTUFBTSx5Q0FBa0QsRUFNakU7SUFFWSxXQUFXLENBQUMsRUFBRSxFQUFFLEVBQUUsR0FBRyxPQUFPLENBQUMsMEJBQTBCLENBQUMsQ0FJcEU7SUFFSyxJQUFJLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxDQUcxQjtDQUNGIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicXVldWVkX2Nob25rX3ZlcmlmaWVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdmVyaWZpZXIvcXVldWVkX2Nob25rX3ZlcmlmaWVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sS0FBSyxFQUFFLDZCQUE2QixFQUFFLDBCQUEwQixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDakgsT0FBTyxLQUFLLEVBQUUsRUFBRSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDM0MsT0FBTyxFQU1MLEtBQUssZUFBZSxFQUlyQixNQUFNLHlCQUF5QixDQUFDO0FBSWpDLHlGQUF5RjtBQUN6RixxQkFBYSxrQkFBa0I7SUFDN0IsT0FBTyxDQUFDLHdCQUF3QixDQUFZO0lBQzVDLE9BQU8sQ0FBQyw2QkFBNkIsQ0FBWTtJQUNqRCxPQUFPLENBQUMsZUFBZSxDQUFnQjtJQUN2QyxPQUFPLENBQUMsZ0JBQWdCLENBR3JCO0lBQ0gsT0FBTyxDQUFDLG1CQUFtQixDQUd4QjtJQUVILE9BQU8sQ0FBQyxrQkFBa0IsQ0FBaUU7SUFFM0YsWUFBWSxNQUFNLEVBQUUsZUFBZSxFQUFFLElBQUksU0FBc0IsRUFrQjlEO0lBRUQscUJBQXFCLENBQUMsTUFBTSxFQUFFLDBCQUEwQixRQVN2RDtJQUVELE9BQU8sQ0FBQyxTQUFTLENBY2Y7Q0FDSDtBQUVELHFCQUFhLGlCQUFrQixZQUFXLDZCQUE2QjtJQUtuRSxPQUFPLENBQUMsUUFBUTtJQUVoQixPQUFPLENBQUMsU0FBUztJQUNqQixPQUFPLENBQUMsTUFBTTtJQVBoQixPQUFPLENBQUMsS0FBSyxDQUFjO0lBQzNCLE9BQU8sQ0FBQyxPQUFPLENBQXFCO0lBRXBDLFlBQ1UsUUFBUSxFQUFFLDZCQUE2QixFQUMvQyxXQUFXLEVBQUUsTUFBTSxFQUNYLFNBQVMsR0FBRSxlQUFzQyxFQUNqRCxNQUFNLHlDQUFrRCxFQU1qRTtJQUVZLFdBQVcsQ0FBQyxFQUFFLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQywwQkFBMEIsQ0FBQyxDQUlwRTtJQUVLLElBQUksSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLENBRzFCO0NBQ0YifQ==

package/dest/verifier/queued_chonk_verifier.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"queued_chonk_verifier.d.ts","sourceRoot":"","sources":["../../src/verifier/queued_chonk_verifier.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,6BAA6B,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AACjH,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAML,KAAK,eAAe,EAIrB,MAAM,yBAAyB,CAAC;AAmEjC,qBAAa,iBAAkB,YAAW,6BAA6B;IAKnE,OAAO,CAAC,QAAQ;IAEhB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,MAAM;IAPhB,OAAO,CAAC,KAAK,CAAc;IAC3B,OAAO,CAAC,OAAO,CAAqB;IAEpC,YACU,QAAQ,EAAE,6BAA6B,EAC/C,WAAW,EAAE,MAAM,EACX,SAAS,GAAE,eAAsC,EACjD,MAAM,yCAAkD,EAMjE;IAEY,WAAW,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAIpE;IAEK,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAG1B;CACF"}
+{"version":3,"file":"queued_chonk_verifier.d.ts","sourceRoot":"","sources":["../../src/verifier/queued_chonk_verifier.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,6BAA6B,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AACjH,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAML,KAAK,eAAe,EAIrB,MAAM,yBAAyB,CAAC;AAIjC,yFAAyF;AACzF,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,wBAAwB,CAAY;IAC5C,OAAO,CAAC,6BAA6B,CAAY;IACjD,OAAO,CAAC,eAAe,CAAgB;IACvC,OAAO,CAAC,gBAAgB,CAGrB;IACH,OAAO,CAAC,mBAAmB,CAGxB;IAEH,OAAO,CAAC,kBAAkB,CAAiE;IAE3F,YAAY,MAAM,EAAE,eAAe,EAAE,IAAI,SAAsB,EAkB9D;IAED,qBAAqB,CAAC,MAAM,EAAE,0BAA0B,QASvD;IAED,OAAO,CAAC,SAAS,CAcf;CACH;AAED,qBAAa,iBAAkB,YAAW,6BAA6B;IAKnE,OAAO,CAAC,QAAQ;IAEhB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,MAAM;IAPhB,OAAO,CAAC,KAAK,CAAc;IAC3B,OAAO,CAAC,OAAO,CAAqB;IAEpC,YACU,QAAQ,EAAE,6BAA6B,EAC/C,WAAW,EAAE,MAAM,EACX,SAAS,GAAE,eAAsC,EACjD,MAAM,yCAAkD,EAMjE;IAEY,WAAW,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAIpE;IAEK,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAG1B;CACF"}

package/dest/verifier/queued_chonk_verifier.js

@@ -2,7 +2,7 @@ import { createLogger } from '@aztec/foundation/log';
 import { SerialQueue } from '@aztec/foundation/queue';
 import { Attributes, Metrics, createUpDownCounterWithDefault, getTelemetryClient } from '@aztec/telemetry-client';
 import { createHistogram } from 'node:perf_hooks';
-class IVCVerifierMetrics {
+/** Records verification timing and failure metrics for an IVC (chonk) proof verifier. */ export class IVCVerifierMetrics {
     ivcVerificationHistogram;
     ivcTotalVerificationHistogram;
     ivcFailureCount;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/bb-prover",
-  "version": "0.0.1-commit.3fd054f6",
+  "version": "0.0.1-commit.431c48d",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -9,7 +9,8 @@
     "./client": "./dest/prover/client/bb_private_kernel_prover.js",
     "./verifier": "./dest/verifier/index.js",
     "./test": "./dest/test/index.js",
-    "./config": "./dest/config.js"
+    "./config": "./dest/config.js",
+    "./debug": "./dest/bb/bb_js_debug.js"
   },
   "bin": {
     "bb-cli": "./dest/bb/index.js"
@@ -69,16 +70,16 @@
     ]
   },
   "dependencies": {
-    "@aztec/bb.js": "0.0.1-commit.3fd054f6",
-    "@aztec/constants": "0.0.1-commit.3fd054f6",
-    "@aztec/foundation": "0.0.1-commit.3fd054f6",
-    "@aztec/noir-noirc_abi": "0.0.1-commit.3fd054f6",
-    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.3fd054f6",
-    "@aztec/noir-types": "0.0.1-commit.3fd054f6",
-    "@aztec/simulator": "0.0.1-commit.3fd054f6",
-    "@aztec/stdlib": "0.0.1-commit.3fd054f6",
-    "@aztec/telemetry-client": "0.0.1-commit.3fd054f6",
-    "@aztec/world-state": "0.0.1-commit.3fd054f6",
+    "@aztec/bb.js": "0.0.1-commit.431c48d",
+    "@aztec/constants": "0.0.1-commit.431c48d",
+    "@aztec/foundation": "0.0.1-commit.431c48d",
+    "@aztec/noir-noirc_abi": "0.0.1-commit.431c48d",
+    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.431c48d",
+    "@aztec/noir-types": "0.0.1-commit.431c48d",
+    "@aztec/simulator": "0.0.1-commit.431c48d",
+    "@aztec/stdlib": "0.0.1-commit.431c48d",
+    "@aztec/telemetry-client": "0.0.1-commit.431c48d",
+    "@aztec/world-state": "0.0.1-commit.431c48d",
     "commander": "^12.1.0",
     "msgpackr": "^1.11.2",
     "pako": "^2.1.0",
@@ -86,11 +87,11 @@
     "tslib": "^2.4.0"
   },
   "devDependencies": {
-    "@aztec/ethereum": "0.0.1-commit.3fd054f6",
-    "@aztec/kv-store": "0.0.1-commit.3fd054f6",
-    "@aztec/noir-contracts.js": "0.0.1-commit.3fd054f6",
-    "@aztec/noir-test-contracts.js": "0.0.1-commit.3fd054f6",
-    "@aztec/protocol-contracts": "0.0.1-commit.3fd054f6",
+    "@aztec/ethereum": "0.0.1-commit.431c48d",
+    "@aztec/kv-store": "0.0.1-commit.431c48d",
+    "@aztec/noir-contracts.js": "0.0.1-commit.431c48d",
+    "@aztec/noir-test-contracts.js": "0.0.1-commit.431c48d",
+    "@aztec/protocol-contracts": "0.0.1-commit.431c48d",
     "@jest/globals": "^30.0.0",
     "@types/jest": "^30.0.0",
     "@types/node": "^22.15.17",

package/src/avm_proving_tests/avm_proving_tester.ts

@@ -1,4 +1,4 @@
-import type { LogFn, LogLevel, Logger } from '@aztec/foundation/log';
+import type { AvmStat } from '@aztec/bb.js';
 import { Timer } from '@aztec/foundation/timer';
 import {
   PublicTxSimulationTester,
@@ -15,77 +15,12 @@ import type { MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server'
 import type { GlobalVariables } from '@aztec/stdlib/tx';
 import { NativeWorldStateService } from '@aztec/world-state';
 
-import fs from 'node:fs/promises';
-import { tmpdir } from 'node:os';
 import path from 'path';
 
-import { type BBResult, type BBSuccess, BB_RESULT, generateAvmProof, verifyAvmProof } from '../bb/execute.js';
+import { BBJsFactory } from '../bb/bb_js_backend.js';
 
 const BB_PATH = path.resolve('../../barretenberg/cpp/build/bin/bb-avm');
 
-// An InterceptingLogger that records all log messages and forwards them to a wrapped logger.
-class InterceptingLogger implements Logger {
-  public readonly logs: string[] = [];
-  public level: LogLevel;
-  public module: string;
-
-  private logger: Logger;
-
-  constructor(logger: Logger) {
-    this.logger = logger;
-    this.level = logger.level;
-    this.module = logger.module;
-  }
-
-  isLevelEnabled(level: LogLevel): boolean {
-    return this.logger.isLevelEnabled(level);
-  }
-
-  createChild(_childModule: string): Logger {
-    throw new Error('Not implemented');
-  }
-
-  getBindings() {
-    return this.logger.getBindings();
-  }
-
-  private intercept(level: LogLevel, msg: string, ...args: any[]) {
-    this.logs.push(...msg.split('\n'));
-    // Forward to the wrapped logger
-    (this.logger[level] as LogFn)(msg, ...args);
-  }
-
-  // Log methods for each level
-  silent(msg: string, ...args: any[]) {
-    this.intercept('silent', msg, ...args);
-  }
-  fatal(msg: string, ...args: any[]) {
-    this.intercept('fatal', msg, ...args);
-  }
-  warn(msg: string, ...args: any[]) {
-    this.intercept('warn', msg, ...args);
-  }
-  info(msg: string, ...args: any[]) {
-    this.intercept('info', msg, ...args);
-  }
-  verbose(msg: string, ...args: any[]) {
-    this.intercept('verbose', msg, ...args);
-  }
-  debug(msg: string, ...args: any[]) {
-    this.intercept('debug', msg, ...args);
-  }
-  trace(msg: string, ...args: any[]) {
-    this.intercept('trace', msg, ...args);
-  }
-
-  // Error log function can be string or Error
-  error(err: Error | string, ...args: any[]) {
-    const msg = typeof err === 'string' ? err : err.message;
-    this.logs.push(msg);
-    this.logger.error(msg, err, ...args);
-  }
-}
-
 // Config with collectHints enabled for proving tests
 const provingConfig: PublicSimulatorConfig = PublicSimulatorConfig.from({
   skipFeeEnforcement: false,
@@ -97,7 +32,7 @@ const provingConfig: PublicSimulatorConfig = PublicSimulatorConfig.from({
 });
 
 export class AvmProvingTester extends PublicTxSimulationTester {
-  private bbWorkingDirectory: string = '';
+  private readonly bbJsFactory = new BBJsFactory(BB_PATH);
 
   constructor(
     private checkCircuitOnly: boolean,
@@ -121,53 +56,57 @@ export class AvmProvingTester extends PublicTxSimulationTester {
     return new AvmProvingTester(checkCircuitOnly, contractDataSource, merkleTrees, globals, metrics);
   }
 
-  async prove(avmCircuitInputs: AvmCircuitInputs, txLabel: string = 'unlabeledTx'): Promise<BBResult> {
-    // We use a new working directory for each proof.
-    this.bbWorkingDirectory = await fs.mkdtemp(path.join(tmpdir(), 'bb-'));
+  /**
+   * Generate an AVM proof (or run check-circuit if configured). Records per-stage timings in the test metrics.
+   * Returns the in-memory proof fields on success; throws via jest expect() on failure.
+   */
+  async prove(avmCircuitInputs: AvmCircuitInputs, txLabel: string = 'unlabeledTx'): Promise<Uint8Array[]> {
+    const inputsBuffer = avmCircuitInputs.serializeWithMessagePack();
 
-    const interceptingLogger = new InterceptingLogger(this.logger);
+    if (this.checkCircuitOnly) {
+      await using instance = await this.bbJsFactory.getInstance();
+      const { passed, stats } = await instance.checkAvmCircuit(inputsBuffer);
+      this.recordProverMetrics(stats, txLabel);
+      expect(passed).toBe(true);
+      return [];
+    }
 
-    // Then we prove.
-    const proofRes = await generateAvmProof(
-      BB_PATH,
-      this.bbWorkingDirectory,
-      avmCircuitInputs,
-      interceptingLogger,
-      this.checkCircuitOnly,
-    );
-    if (proofRes.status === BB_RESULT.FAILURE) {
-      this.logger.error(`Proof generation failed: ${proofRes.reason}`);
+    await using instance = await this.bbJsFactory.getInstance();
+    const { proof, stats } = await instance.generateAvmProof(inputsBuffer);
+    this.recordProverMetrics(stats, txLabel);
+    return proof;
+  }
+
+  async verify(proof: Uint8Array[], publicInputs: AvmCircuitPublicInputs): Promise<void> {
+    if (this.checkCircuitOnly) {
+      // Check-circuit did not generate a proof; nothing to verify.
+      return;
     }
-    expect(proofRes.status).toEqual(BB_RESULT.SUCCESS);
+    const piBuffer = publicInputs.serializeWithMessagePack();
+    await using instance = await this.bbJsFactory.getInstance();
+    const { verified } = await instance.verifyAvmProof(proof, piBuffer);
+    expect(verified).toBe(true);
+  }
 
-    // Parse the logs into a structured format.
-    const logs = interceptingLogger.logs;
-    // const traceSizes: { name: string; size: number }[] = [];
-    // logs.forEach(log => {
-    //   const match = log.match(/\b(\w+): (\d+) \(~2/);
-    //   if (match) {
-    //     traceSizes.push({
-    //       name: match[1],
-    //       size: parseInt(match[2]),
-    //     });
-    //   }
-    // });
-    const times: { [key: string]: number } = {};
-    logs.forEach(log => {
-      const match = log.match(/\b([\w/]+)_ms: (\d+)/);
-      if (match) {
-        times[match[1]] = parseInt(match[2]);
-      }
-    });
+  public async proveVerify(avmCircuitInputs: AvmCircuitInputs, txLabel: string = 'unlabeledTx') {
+    const proof = await this.prove(avmCircuitInputs, txLabel);
+    await this.verify(proof, avmCircuitInputs.publicInputs);
+  }
 
-    // Throw if logs did not contain any times.
+  private recordProverMetrics(stats: AvmStat[], txLabel: string) {
+    // Build a lookup keyed on the stage name with the `_ms` suffix stripped, matching the legacy
+    // stdout-scraped shape. bb::avm2::Stats::time() stores keys with `_ms` appended.
+    const times: { [key: string]: number } = {};
+    for (const { name, valueMs } of stats) {
+      const key = name.endsWith('_ms') ? name.slice(0, -'_ms'.length) : name;
+      times[key] = valueMs;
+    }
     if (Object.keys(times).length === 0) {
-      throw new Error('AVM stdout did not contain any proving times in the stats!');
+      throw new Error('AVM response did not contain any proving-stage timings!');
     }
-
     // Hack to make labels match.
     const txLabelWithCount = `${txLabel}/${this.txCount - 1}`;
-    // I need to cast because TS doesnt realize metrics is protected not private.
+    // Cast because TS doesn't realize `metrics` is protected, not private on the parent class.
     (this as any).metrics?.recordProverMetrics(txLabelWithCount, {
       proverSimulationStepMs: times['simulation/all'],
       proverProvingStepMs: times['proving/all'],
@@ -180,26 +119,6 @@ export class AvmProvingTester extends PublicTxSimulationTester {
       provingLogDerivativeInverseCommitmentsMs: times['prove/log_derivative_inverse_commitments_round'],
       provingWireCommitmentsMs: times['prove/wire_commitments_round'],
     });
-
-    return proofRes as BBSuccess;
-  }
-
-  async verify(proofRes: BBSuccess, publicInputs: AvmCircuitPublicInputs): Promise<BBResult> {
-    if (this.checkCircuitOnly) {
-      // Skip verification if we are only checking the circuit.
-      // Check-circuit does not generate a proof to verify.
-      return proofRes;
-    }
-
-    return await verifyAvmProof(BB_PATH, this.bbWorkingDirectory, proofRes.proofPath!, publicInputs, this.logger);
-  }
-
-  public async proveVerify(avmCircuitInputs: AvmCircuitInputs, txLabel: string = 'unlabeledTx') {
-    const provingRes = await this.prove(avmCircuitInputs, txLabel);
-    expect(provingRes.status).toEqual(BB_RESULT.SUCCESS);
-
-    const verificationRes = await this.verify(provingRes as BBSuccess, avmCircuitInputs.publicInputs);
-    expect(verificationRes.status).toBe(BB_RESULT.SUCCESS);
   }
 
   public async simProveVerify(
@@ -273,7 +192,7 @@ export class AvmProvingTester extends PublicTxSimulationTester {
     gasLimits?: Gas,
   ) {
     await this.simProveVerify(
-      /*sender=*/ AztecAddress.fromNumber(42),
+      /*sender=*/ AztecAddress.fromNumberUnsafe(42),
       /*setupCalls=*/ [],
       [appCall],
       undefined,