@aztec/bb-prover 1.2.1 → 2.0.0-nightly.20250814

package/dest/avm_proving_tests/avm_proving_tester.d.ts

@@ -1,4 +1,4 @@
-import { PublicTxSimulationTester, SimpleContractDataSource, type TestEnqueuedCall, type TestPrivateInsertions } from '@aztec/simulator/public/fixtures';
+import { PublicTxSimulationTester, SimpleContractDataSource, type TestEnqueuedCall, type TestExecutorMetrics, type TestPrivateInsertions } from '@aztec/simulator/public/fixtures';
 import { type AvmCircuitInputs, AvmCircuitPublicInputs } from '@aztec/stdlib/avm';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server';
@@ -7,12 +7,12 @@ import { type BBResult, type BBSuccess } from '../bb/execute.js';
 export declare class AvmProvingTester extends PublicTxSimulationTester {
     private bbWorkingDirectory;
     private checkCircuitOnly;
-    constructor(bbWorkingDirectory: string, checkCircuitOnly: boolean, contractDataSource: SimpleContractDataSource, merkleTrees: MerkleTreeWriteOperations, globals?: GlobalVariables);
-    static new(checkCircuitOnly?: boolean, globals?: GlobalVariables): Promise<AvmProvingTester>;
-    prove(avmCircuitInputs: AvmCircuitInputs): Promise<BBResult>;
+    constructor(bbWorkingDirectory: string, checkCircuitOnly: boolean, contractDataSource: SimpleContractDataSource, merkleTrees: MerkleTreeWriteOperations, globals?: GlobalVariables, metrics?: TestExecutorMetrics);
+    static new(checkCircuitOnly?: boolean, globals?: GlobalVariables, metrics?: TestExecutorMetrics): Promise<AvmProvingTester>;
+    prove(avmCircuitInputs: AvmCircuitInputs, txLabel?: string): Promise<BBResult>;
     verify(proofRes: BBSuccess, publicInputs: AvmCircuitPublicInputs): Promise<BBResult>;
-    proveVerify(avmCircuitInputs: AvmCircuitInputs): Promise<void>;
-    simProveVerify(sender: AztecAddress, setupCalls: TestEnqueuedCall[], appCalls: TestEnqueuedCall[], teardownCall: TestEnqueuedCall | undefined, expectRevert: boolean | undefined, feePayer?: AztecAddress, privateInsertions?: TestPrivateInsertions): Promise<void>;
-    simProveVerifyAppLogic(appCall: TestEnqueuedCall, expectRevert?: boolean): Promise<void>;
+    proveVerify(avmCircuitInputs: AvmCircuitInputs, txLabel?: string): Promise<void>;
+    simProveVerify(sender: AztecAddress, setupCalls: TestEnqueuedCall[], appCalls: TestEnqueuedCall[], teardownCall: TestEnqueuedCall | undefined, expectRevert: boolean | undefined, feePayer?: AztecAddress, privateInsertions?: TestPrivateInsertions, txLabel?: string): Promise<void>;
+    simProveVerifyAppLogic(appCall: TestEnqueuedCall, expectRevert?: boolean, txLabel?: string): Promise<void>;
 }
 //# sourceMappingURL=avm_proving_tester.d.ts.map

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,EACL,wBAAwB,EACxB,wBAAwB,EACxB,KAAK,gBAAgB,EACrB,KAAK,qBAAqB,EAC3B,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,KAAK,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAClF,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,iCAAiC,CAAC;AACjF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAOxD,OAAO,EACL,KAAK,QAAQ,EACb,KAAK,SAAS,EAKf,MAAM,kBAAkB,CAAC;AAI1B,qBAAa,gBAAiB,SAAQ,wBAAwB;IAE1D,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,gBAAgB;gBADhB,kBAAkB,EAAE,MAAM,EAC1B,gBAAgB,EAAE,OAAO,EACjC,kBAAkB,EAAE,wBAAwB,EAC5C,WAAW,EAAE,yBAAyB,EACtC,OAAO,CAAC,EAAE,eAAe;WAKd,GAAG,CAAC,gBAAgB,GAAE,OAAe,EAAE,OAAO,CAAC,EAAE,eAAe;IAQvE,KAAK,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,OAAO,CAAC,QAAQ,CAAC;IAgB5D,MAAM,CAAC,QAAQ,EAAE,SAAS,EAAE,YAAY,EAAE,sBAAsB,GAAG,OAAO,CAAC,QAAQ,CAAC;IAiB7E,WAAW,CAAC,gBAAgB,EAAE,gBAAgB;IAQ9C,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,EACjB,iBAAiB,CAAC,EAAE,qBAAqB;IAS9B,sBAAsB,CAAC,OAAO,EAAE,gBAAgB,EAAE,YAAY,CAAC,EAAE,OAAO;CAStF"}
+{"version":3,"file":"avm_proving_tester.d.ts","sourceRoot":"","sources":["../../src/avm_proving_tests/avm_proving_tester.ts"],"names":[],"mappings":"AACA,OAAO,EACL,wBAAwB,EACxB,wBAAwB,EACxB,KAAK,gBAAgB,EACrB,KAAK,mBAAmB,EACxB,KAAK,qBAAqB,EAC3B,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,KAAK,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAClF,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,iCAAiC,CAAC;AACjF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAOxD,OAAO,EACL,KAAK,QAAQ,EACb,KAAK,SAAS,EAKf,MAAM,kBAAkB,CAAC;AA+D1B,qBAAa,gBAAiB,SAAQ,wBAAwB;IAE1D,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,gBAAgB;gBADhB,kBAAkB,EAAE,MAAM,EAC1B,gBAAgB,EAAE,OAAO,EACjC,kBAAkB,EAAE,wBAAwB,EAC5C,WAAW,EAAE,yBAAyB,EACtC,OAAO,CAAC,EAAE,eAAe,EACzB,OAAO,CAAC,EAAE,mBAAmB;WAKlB,GAAG,CAAC,gBAAgB,GAAE,OAAe,EAAE,OAAO,CAAC,EAAE,eAAe,EAAE,OAAO,CAAC,EAAE,mBAAmB;IAetG,KAAK,CAAC,gBAAgB,EAAE,gBAAgB,EAAE,OAAO,GAAE,MAAsB,GAAG,OAAO,CAAC,QAAQ,CAAC;IAuD7F,MAAM,CAAC,QAAQ,EAAE,SAAS,EAAE,YAAY,EAAE,sBAAsB,GAAG,OAAO,CAAC,QAAQ,CAAC;IAiB7E,WAAW,CAAC,gBAAgB,EAAE,gBAAgB,EAAE,OAAO,GAAE,MAAsB;IAQ/E,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,EACjB,iBAAiB,CAAC,EAAE,qBAAqB,EACzC,OAAO,GAAE,MAAsB;IAiBpB,sBAAsB,CACjC,OAAO,EAAE,gBAAgB,EACzB,YAAY,CAAC,EAAE,OAAO,EACtB,OAAO,GAAE,MAAsB;CAalC"}

package/dest/avm_proving_tests/avm_proving_tester.js

@@ -6,25 +6,111 @@ import { tmpdir } from 'node:os';
 import path from 'path';
 import { BB_RESULT, VK_FILENAME, generateAvmProof, verifyAvmProof } from '../bb/execute.js';
 const BB_PATH = path.resolve('../../barretenberg/cpp/build/bin/bb');
+// An InterceptingLogger that records all log messages and forwards them to a wrapped logger.
+class InterceptingLogger {
+    logs = [];
+    level;
+    module;
+    logger;
+    constructor(logger){
+        this.logger = logger;
+        this.level = logger.level;
+        this.module = logger.module;
+    }
+    isLevelEnabled(level) {
+        return this.logger.isLevelEnabled(level);
+    }
+    createChild(_childModule) {
+        throw new Error('Not implemented');
+    }
+    intercept(level, msg, ...args) {
+        this.logs.push(...msg.split('\n'));
+        // Forward to the wrapped logger
+        this.logger[level](msg, ...args);
+    }
+    // Log methods for each level
+    silent(msg, ...args) {
+        this.intercept('silent', msg, ...args);
+    }
+    fatal(msg, ...args) {
+        this.intercept('fatal', msg, ...args);
+    }
+    warn(msg, ...args) {
+        this.intercept('warn', msg, ...args);
+    }
+    info(msg, ...args) {
+        this.intercept('info', msg, ...args);
+    }
+    verbose(msg, ...args) {
+        this.intercept('verbose', msg, ...args);
+    }
+    debug(msg, ...args) {
+        this.intercept('debug', msg, ...args);
+    }
+    trace(msg, ...args) {
+        this.intercept('trace', msg, ...args);
+    }
+    // Error log function can be string or Error
+    error(err, ...args) {
+        const msg = typeof err === 'string' ? err : err.message;
+        this.logs.push(msg);
+        this.logger.error(msg, err, ...args);
+    }
+}
 export class AvmProvingTester extends PublicTxSimulationTester {
     bbWorkingDirectory;
     checkCircuitOnly;
-    constructor(bbWorkingDirectory, checkCircuitOnly, contractDataSource, merkleTrees, globals){
-        super(merkleTrees, contractDataSource, globals), this.bbWorkingDirectory = bbWorkingDirectory, this.checkCircuitOnly = checkCircuitOnly;
+    constructor(bbWorkingDirectory, checkCircuitOnly, contractDataSource, merkleTrees, globals, metrics){
+        super(merkleTrees, contractDataSource, globals, metrics), this.bbWorkingDirectory = bbWorkingDirectory, this.checkCircuitOnly = checkCircuitOnly;
     }
-    static async new(checkCircuitOnly = false, globals) {
+    static async new(checkCircuitOnly = false, globals, metrics) {
         const bbWorkingDirectory = await fs.mkdtemp(path.join(tmpdir(), 'bb-'));
         const contractDataSource = new SimpleContractDataSource();
         const merkleTrees = await (await NativeWorldStateService.tmp()).fork();
-        return new AvmProvingTester(bbWorkingDirectory, checkCircuitOnly, contractDataSource, merkleTrees, globals);
+        return new AvmProvingTester(bbWorkingDirectory, checkCircuitOnly, contractDataSource, merkleTrees, globals, metrics);
     }
-    async prove(avmCircuitInputs) {
+    async prove(avmCircuitInputs, txLabel = 'unlabeledTx') {
+        const interceptingLogger = new InterceptingLogger(this.logger);
         // Then we prove.
-        const proofRes = await generateAvmProof(BB_PATH, this.bbWorkingDirectory, avmCircuitInputs, this.logger, this.checkCircuitOnly);
+        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}`);
         }
         expect(proofRes.status).toEqual(BB_RESULT.SUCCESS);
+        // 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 = {};
+        logs.forEach((log)=>{
+            const match = log.match(/\b([\w/]+)_ms: (\d+)/);
+            if (match) {
+                times[match[1]] = parseInt(match[2]);
+            }
+        });
+        // Hack to make labels match.
+        const txLabelWithCount = `${txLabel}/${this.txCount - 1}`;
+        // I need to cast because TS doesnt realize metrics is protected not private.
+        this.metrics?.recordProverMetrics(txLabelWithCount, {
+            proverSimulationStepMs: times['simulation/all'],
+            proverProvingStepMs: times['proving/all'],
+            proverTraceGenerationStepMs: times['tracegen/all'],
+            traceGenerationInteractionsMs: times['tracegen/interactions'],
+            traceGenerationTracesMs: times['tracegen/traces'],
+            provingSumcheckMs: times['prove/sumcheck'],
+            provingPcsMs: times['prove/pcs_rounds'],
+            provingLogDerivativeInverseMs: times['prove/log_derivative_inverse_round'],
+            provingLogDerivativeInverseCommitmentsMs: times['prove/log_derivative_inverse_commitments_round'],
+            provingWireCommitmentsMs: times['prove/wire_commitments_round']
+        });
         return proofRes;
     }
     async verify(proofRes, publicInputs) {
@@ -35,21 +121,21 @@ export class AvmProvingTester extends PublicTxSimulationTester {
         }
         return await verifyAvmProof(BB_PATH, this.bbWorkingDirectory, proofRes.proofPath, publicInputs, path.join(proofRes.vkDirectoryPath, VK_FILENAME), this.logger);
     }
-    async proveVerify(avmCircuitInputs) {
-        const provingRes = await this.prove(avmCircuitInputs);
+    async proveVerify(avmCircuitInputs, txLabel = 'unlabeledTx') {
+        const provingRes = await this.prove(avmCircuitInputs, txLabel);
         expect(provingRes.status).toEqual(BB_RESULT.SUCCESS);
         const verificationRes = await this.verify(provingRes, avmCircuitInputs.publicInputs);
         expect(verificationRes.status).toBe(BB_RESULT.SUCCESS);
     }
-    async simProveVerify(sender, setupCalls, appCalls, teardownCall, expectRevert, feePayer = sender, privateInsertions) {
-        const simRes = await this.simulateTx(sender, setupCalls, appCalls, teardownCall, feePayer, privateInsertions);
+    async simProveVerify(sender, setupCalls, appCalls, teardownCall, expectRevert, feePayer = sender, privateInsertions, txLabel = 'unlabeledTx') {
+        const simRes = await this.simulateTx(sender, setupCalls, appCalls, teardownCall, feePayer, privateInsertions, txLabel);
         expect(simRes.revertCode.isOK()).toBe(expectRevert ? false : true);
         const avmCircuitInputs = simRes.avmProvingRequest.inputs;
-        await this.proveVerify(avmCircuitInputs);
+        await this.proveVerify(avmCircuitInputs, txLabel);
     }
-    async simProveVerifyAppLogic(appCall, expectRevert) {
+    async simProveVerifyAppLogic(appCall, expectRevert, txLabel = 'unlabeledTx') {
         await this.simProveVerify(/*sender=*/ AztecAddress.fromNumber(42), /*setupCalls=*/ [], [
             appCall
-        ], undefined, expectRevert);
+        ], undefined, expectRevert, /*feePayer=*/ undefined, /*privateInsertions=*/ undefined, txLabel);
     }
 }

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

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

package/dest/prover/proof_utils.js

@@ -1,4 +1,4 @@
-import { IPA_CLAIM_SIZE, NESTED_RECURSIVE_PROOF_LENGTH, NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH, PAIRING_POINTS_SIZE } from '@aztec/constants';
+import { IPA_CLAIM_SIZE, NESTED_RECURSIVE_PROOF_LENGTH, NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH, PAIRING_POINTS_SIZE, ULTRA_KECCAK_PROOF_LENGTH } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/fields';
 import { ClientIvcProof, Proof, RecursiveProof } from '@aztec/stdlib/proofs';
 import assert from 'assert';
@@ -36,7 +36,7 @@ export async function readProofAsFields(filePath, vkData, proofLength, logger) {
     ]);
     const json = JSON.parse(proofString);
     let numPublicInputs = vkData.numPublicInputs - PAIRING_POINTS_SIZE;
-    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}`);
+    assert(proofLength == NESTED_RECURSIVE_PROOF_LENGTH || proofLength == NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH || proofLength == ULTRA_KECCAK_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_SIZE;
     }

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

@@ -1 +1 @@
-{"version":3,"file":"bb_prover.d.ts","sourceRoot":"","sources":["../../../src/prover/server/bb_prover.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,oCAAoC,EACpC,6BAA6B,EAC7B,yCAAyC,EAEzC,sBAAsB,EACtB,iBAAiB,EAClB,MAAM,kBAAkB,CAAC;AAK1B,OAAO,EACL,KAAK,sBAAsB,EAwB5B,MAAM,4CAA4C,CAAC;AAIpD,OAAO,KAAK,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAElF,OAAO,EACL,KAAK,uBAAuB,EAC5B,KAAK,6BAA6B,EAClC,KAAK,mBAAmB,EAGzB,MAAM,iCAAiC,CAAC;AACzC,OAAO,KAAK,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACnG,OAAO,EAAE,KAAK,EAAgD,MAAM,sBAAsB,CAAC;AAC3F,OAAO,EACL,KAAK,6BAA6B,EAClC,KAAK,sBAAsB,EAC3B,KAAK,iCAAiC,EACtC,KAAK,qBAAqB,EAC1B,KAAK,0BAA0B,EAC/B,KAAK,iBAAiB,EACtB,4BAA4B,EAC5B,KAAK,uBAAuB,EAC5B,sBAAsB,EACtB,KAAK,gBAAgB,EACrB,KAAK,sBAAsB,EAC3B,KAAK,6BAA6B,EAClC,KAAK,UAAU,EAEhB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAC7D,OAAO,EAAc,KAAK,eAAe,EAAiC,MAAM,yBAAyB,CAAC;AAmB1G,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC5D,OAAO,EAAE,KAAK,eAAe,EAAgC,MAAM,eAAe,CAAC;AAYnF,MAAM,WAAW,cAAe,SAAQ,QAAQ,EAAE,UAAU;IAE1D,aAAa,CAAC,EAAE,sBAAsB,EAAE,CAAC;CAC1C;AAED;;GAEG;AACH,qBAAa,oBAAqB,YAAW,mBAAmB;IAI5D,OAAO,CAAC,MAAM;IAHhB,OAAO,CAAC,eAAe,CAAwB;gBAGrC,MAAM,EAAE,cAAc,EAC9B,SAAS,EAAE,eAAe;IAK5B,IAAI,MAAM,6CAET;WAEY,GAAG,CAAC,MAAM,EAAE,cAAc,EAAE,SAAS,GAAE,eAAsC;IAW1F;;;;OAIG;IAEU,kBAAkB,CAC7B,MAAM,EAAE,gBAAgB,GACvB,OAAO,CAAC,6BAA6B,CAAC,kBAAkB,EAAE,OAAO,sBAAsB,CAAC,CAAC;IAe5F;;;;OAIG;IAEU,kBAAkB,CAC7B,MAAM,EAAE,gBAAgB,GACvB,OAAO,CAAC,6BAA6B,CAAC,kBAAkB,EAAE,OAAO,6BAA6B,CAAC,CAAC;IAenG;;;;OAIG;IAIU,WAAW,CACtB,MAAM,EAAE,gBAAgB,EACxB,0BAA0B,GAAE,OAAe,GAC1C,OAAO,CAAC,uBAAuB,CAAC,OAAO,oCAAoC,CAAC,CAAC;IAShF;;;;OAIG;IACU,yBAAyB,CACpC,MAAM,EAAE,uBAAuB,GAC9B,OAAO,CACR,6BAA6B,CAAC,6BAA6B,EAAE,OAAO,yCAAyC,CAAC,CAC/G;IAkBD;;;;OAIG;IACU,wBAAwB,CACnC,MAAM,EAAE,sBAAsB,GAC7B,OAAO,CACR,6BAA6B,CAAC,6BAA6B,EAAE,OAAO,yCAAyC,CAAC,CAC/G;IAkBD;;;;OAIG;IACU,mBAAmB,CAC9B,KAAK,EAAE,iBAAiB,GACvB,OAAO,CACR,6BAA6B,CAAC,6BAA6B,EAAE,OAAO,yCAAyC,CAAC,CAC/G;IAgBD;;;;OAIG;IACU,uBAAuB,CAClC,KAAK,EAAE,qBAAqB,GAC3B,OAAO,CACR,6BAA6B,CAAC,iCAAiC,EAAE,OAAO,yCAAyC,CAAC,CACnH;IAgBY,+BAA+B,CAC1C,KAAK,EAAE,6BAA6B,GACnC,OAAO,CACR,6BAA6B,CAAC,iCAAiC,EAAE,OAAO,yCAAyC,CAAC,CACnH;IAgBD;;;;OAIG;IACU,4BAA4B,CACvC,KAAK,EAAE,0BAA0B,GAChC,OAAO,CACR,6BAA6B,CAAC,iCAAiC,EAAE,OAAO,yCAAyC,CAAC,CACnH;IAgBY,8BAA8B,CACzC,KAAK,EAAE,4BAA4B,GAClC,OAAO,CACR,6BAA6B,CAAC,iCAAiC,EAAE,OAAO,yCAAyC,CAAC,CACnH;IAgBD;;;;OAIG;IACU,wBAAwB,CACnC,KAAK,EAAE,sBAAsB,GAC5B,OAAO,CACR,6BAA6B,CAAC,iCAAiC,EAAE,OAAO,yCAAyC,CAAC,CACnH;IAgBD;;;;OAIG;IACU,kBAAkB,CAC7B,KAAK,EAAE,gBAAgB,GACtB,OAAO,CAAC,6BAA6B,CAAC,sBAAsB,CAAC,CAAC;YAkBnD,mBAAmB;YAoEnB,WAAW;YAyCX,sBAAsB;YAatB,uBAAuB;YAsBvB,cAAc;IAsCf,YAAY,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,uBAAuB,CAAC,OAAO,iBAAiB,CAAC,CAAC;IA6BxG;;;;;;;;OAQG;YACW,oBAAoB;IAqDlC;;;;OAIG;IACU,WAAW,CAAC,WAAW,EAAE,sBAAsB,EAAE,KAAK,EAAE,KAAK;IAK7D,cAAc,CACzB,KAAK,EAAE,KAAK,EACZ,eAAe,EAAE,mBAAmB,EACpC,YAAY,EAAE,sBAAsB;IAOzB,aAAa,CAAC,MAAM,EAAE,eAAe,EAAE,eAAe,EAAE,mBAAmB,EAAE,KAAK,EAAE,KAAK;YAMxF,qBAAqB;IA2BnC;;;;OAIG;IACH,OAAO,CAAC,gCAAgC;YAQ1B,oBAAoB;IAwBlC,OAAO,CAAC,cAAc;CAYvB"}
+{"version":3,"file":"bb_prover.d.ts","sourceRoot":"","sources":["../../../src/prover/server/bb_prover.ts"],"names":[],"mappings":"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"}

package/dest/prover/server/bb_prover.js

@@ -4,7 +4,7 @@ function _ts_decorate(decorators, target, key, desc) {
     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 { AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED, NESTED_RECURSIVE_PROOF_LENGTH, NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH, PAIRING_POINTS_SIZE, RECURSIVE_PROOF_LENGTH, TUBE_PROOF_LENGTH } from '@aztec/constants';
+import { AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED, NESTED_RECURSIVE_PROOF_LENGTH, NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH, PAIRING_POINTS_SIZE, RECURSIVE_PROOF_LENGTH, TUBE_PROOF_LENGTH, ULTRA_KECCAK_PROOF_LENGTH } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/fields';
 import { runInDirectory } from '@aztec/foundation/fs';
 import { createLogger } from '@aztec/foundation/log';
@@ -212,7 +212,8 @@ 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 readProofAsFields(provingResult.proofPath, vkData, RECURSIVE_PROOF_LENGTH, logger);
+            const PROOF_LENGTH = circuitType == 'RootRollupArtifact' ? ULTRA_KECCAK_PROOF_LENGTH : RECURSIVE_PROOF_LENGTH;
+            const proof = await readProofAsFields(provingResult.proofPath, vkData, PROOF_LENGTH, logger);
             const circuitName = mapProtocolArtifactNameToCircuitName(circuitType);
             this.instrumentation.recordDuration('provingDuration', circuitName, provingResult.durationMs);
             this.instrumentation.recordSize('proofSize', circuitName, proof.binaryProof.buffer.length);

package/dest/stats.js

@@ -23,17 +23,17 @@ export function mapProtocolArtifactNameToCircuitName(artifact) {
         case 'RootRollupArtifact':
             return 'root-rollup';
         case 'PrivateKernelInitArtifact':
-            return 'private-kernel-init';
+            return 'ClientIVC';
         case 'PrivateKernelInnerArtifact':
-            return 'private-kernel-inner';
+            return 'ClientIVC';
         case 'PrivateKernelTailArtifact':
-            return 'private-kernel-tail';
+            return 'ClientIVC';
         case 'PrivateKernelTailToPublicArtifact':
-            return 'private-kernel-tail-to-public';
+            return 'ClientIVC';
         default:
             {
                 if (artifact.startsWith('PrivateKernelReset')) {
-                    return 'private-kernel-reset';
+                    return 'ClientIVC';
                 }
                 throw new Error(`Unknown circuit type: ${artifact}`);
             }

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

@@ -1 +1 @@
-{"version":3,"file":"bb_verifier.d.ts","sourceRoot":"","sources":["../../src/verifier/bb_verifier.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAGlE,OAAO,KAAK,EAA0B,sBAAsB,EAAE,MAAM,2CAA2C,CAAC;AAChH,OAAO,KAAK,EAAE,6BAA6B,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AACjH,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAElD,OAAO,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AACtC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAc7D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAQ7C,eAAO,MAAM,oBAAoB,QAA0D,CAAC;AAC5F,eAAO,MAAM,mBAAmB,QAAyD,CAAC;AAE1F,qBAAa,iBAAkB,YAAW,6BAA6B;IAEnE,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,MAAM;IAFhB,OAAO;IAKA,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;WAIR,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,SAAqC;IAK9E,sBAAsB,CAAC,WAAW,EAAE,sBAAsB,GAAG,mBAAmB;IAQ1E,qBAAqB,CAAC,OAAO,EAAE,sBAAsB,EAAE,KAAK,EAAE,KAAK;IAqCnE,WAAW,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,0BAA0B,CAAC;CAiDtE"}
+{"version":3,"file":"bb_verifier.d.ts","sourceRoot":"","sources":["../../src/verifier/bb_verifier.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAGlE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,2CAA2C,CAAC;AACxF,OAAO,KAAK,EAAE,6BAA6B,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AACjH,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAElD,OAAO,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AACtC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAc7D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAQ7C,eAAO,MAAM,oBAAoB,QAA0D,CAAC;AAC5F,eAAO,MAAM,mBAAmB,QAAyD,CAAC;AAE1F,qBAAa,iBAAkB,YAAW,6BAA6B;IAEnE,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,MAAM;IAFhB,OAAO;IAKA,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;WAIR,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,SAAqC;IAK9E,sBAAsB,CAAC,WAAW,EAAE,sBAAsB,GAAG,mBAAmB;IAQ1E,qBAAqB,CAAC,OAAO,EAAE,sBAAsB,EAAE,KAAK,EAAE,KAAK;IAqCnE,WAAW,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,0BAA0B,CAAC;CAwCtE"}

package/dest/verifier/bb_verifier.js

@@ -2,7 +2,6 @@ import { runInDirectory } from '@aztec/foundation/fs';
 import { createLogger } from '@aztec/foundation/log';
 import { Timer } from '@aztec/foundation/timer';
 import { ServerCircuitVks } from '@aztec/noir-protocol-circuits-types/server/vks';
-import { Tx } from '@aztec/stdlib/tx';
 import { promises as fs } from 'fs';
 import * as path from 'path';
 import { fileURLToPath } from 'url';
@@ -66,27 +65,21 @@ export class BBCircuitVerifier {
         try {
             const totalTimer = new Timer();
             let verificationDuration = 0;
-            // TODO(#7370) The verification keys should be supplied separately and based on the expectedCircuit
-            // rather than read from the tx object itself. We also need the vks for the translator and ecc, which
-            // are not being saved along the other vks yet. Reuse the 'verifyProofForCircuit' method above once
-            // we have all the verification keys available.
-            const expectedCircuit = tx.data.forPublic ? 'PrivateKernelTailToPublicArtifact' : 'PrivateKernelTailArtifact';
-            const circuit = 'ClientIVC';
             // Block below is almost copy-pasted from verifyProofForCircuit
             const operation = async (bbWorkingDirectory)=>{
                 const logFunction = (message)=>{
-                    this.logger.debug(`${circuit} BB out - ${message}`);
+                    this.logger.debug(`ClientIVC BB out - ${message}`);
                 };
                 await writeClientIVCProofToOutputDirectory(tx.clientIvcProof, bbWorkingDirectory);
                 const timer = new Timer();
                 const result = await verifyClientIvcProof(this.config.bbBinaryPath, bbWorkingDirectory.concat('/proof'), tx.data.forPublic ? PUBLIC_TAIL_CIVC_VK : PRIVATE_TAIL_CIVC_VK, logFunction, this.config.bbIVCConcurrency);
                 verificationDuration = timer.ms();
                 if (result.status === BB_RESULT.FAILURE) {
-                    const errorMessage = `Failed to verify ${circuit} proof for ${expectedCircuit}!`;
+                    const errorMessage = `Failed to verify ClientIVC proof!`;
                     throw new Error(errorMessage);
                 }
-                this.logger.debug(`${circuit} verification successful`, {
-                    circuitName: mapProtocolArtifactNameToCircuitName(expectedCircuit),
+                this.logger.debug(`ClientIVC verification successful`, {
+                    circuitName: 'ClientIVC',
                     duration: result.durationMs,
                     eventName: 'circuit-verification',
                     proofType: 'client-ivc'
@@ -99,7 +92,7 @@ export class BBCircuitVerifier {
                 totalDurationMs: totalTimer.ms()
             };
         } catch (err) {
-            this.logger.warn(`Failed to verify ClientIVC proof for tx ${await Tx.getHash(tx)}: ${String(err)}`);
+            this.logger.warn(`Failed to verify ClientIVC proof for tx ${tx.getTxHash().toString()}: ${String(err)}`);
             return {
                 valid: false,
                 durationMs: 0,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/bb-prover",
-  "version": "1.2.1",
+  "version": "2.0.0-nightly.20250814",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -70,27 +70,27 @@
     ]
   },
   "dependencies": {
-    "@aztec/bb.js": "1.2.1",
-    "@aztec/constants": "1.2.1",
-    "@aztec/foundation": "1.2.1",
-    "@aztec/noir-noirc_abi": "1.2.1",
-    "@aztec/noir-protocol-circuits-types": "1.2.1",
-    "@aztec/noir-types": "1.2.1",
-    "@aztec/simulator": "1.2.1",
-    "@aztec/stdlib": "1.2.1",
-    "@aztec/telemetry-client": "1.2.1",
-    "@aztec/world-state": "1.2.1",
+    "@aztec/bb.js": "2.0.0-nightly.20250814",
+    "@aztec/constants": "2.0.0-nightly.20250814",
+    "@aztec/foundation": "2.0.0-nightly.20250814",
+    "@aztec/noir-noirc_abi": "2.0.0-nightly.20250814",
+    "@aztec/noir-protocol-circuits-types": "2.0.0-nightly.20250814",
+    "@aztec/noir-types": "2.0.0-nightly.20250814",
+    "@aztec/simulator": "2.0.0-nightly.20250814",
+    "@aztec/stdlib": "2.0.0-nightly.20250814",
+    "@aztec/telemetry-client": "2.0.0-nightly.20250814",
+    "@aztec/world-state": "2.0.0-nightly.20250814",
     "commander": "^12.1.0",
     "pako": "^2.1.0",
     "source-map-support": "^0.5.21",
     "tslib": "^2.4.0"
   },
   "devDependencies": {
-    "@aztec/ethereum": "1.2.1",
-    "@aztec/kv-store": "1.2.1",
-    "@aztec/noir-contracts.js": "1.2.1",
-    "@aztec/noir-test-contracts.js": "1.2.1",
-    "@aztec/protocol-contracts": "1.2.1",
+    "@aztec/ethereum": "2.0.0-nightly.20250814",
+    "@aztec/kv-store": "2.0.0-nightly.20250814",
+    "@aztec/noir-contracts.js": "2.0.0-nightly.20250814",
+    "@aztec/noir-test-contracts.js": "2.0.0-nightly.20250814",
+    "@aztec/protocol-contracts": "2.0.0-nightly.20250814",
     "@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,7 +1,9 @@
+import type { LogFn, LogLevel, Logger } from '@aztec/foundation/log';
 import {
   PublicTxSimulationTester,
   SimpleContractDataSource,
   type TestEnqueuedCall,
+  type TestExecutorMetrics,
   type TestPrivateInsertions,
 } from '@aztec/simulator/public/fixtures';
 import { type AvmCircuitInputs, AvmCircuitPublicInputs } from '@aztec/stdlib/avm';
@@ -25,6 +27,65 @@ import {
 
 const BB_PATH = path.resolve('../../barretenberg/cpp/build/bin/bb');
 
+// 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');
+  }
+
+  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);
+  }
+}
+
 export class AvmProvingTester extends PublicTxSimulationTester {
   constructor(
     private bbWorkingDirectory: string,
@@ -32,31 +93,78 @@ export class AvmProvingTester extends PublicTxSimulationTester {
     contractDataSource: SimpleContractDataSource,
     merkleTrees: MerkleTreeWriteOperations,
     globals?: GlobalVariables,
+    metrics?: TestExecutorMetrics,
   ) {
-    super(merkleTrees, contractDataSource, globals);
+    super(merkleTrees, contractDataSource, globals, metrics);
   }
 
-  static async new(checkCircuitOnly: boolean = false, globals?: GlobalVariables) {
+  static async new(checkCircuitOnly: boolean = false, globals?: GlobalVariables, metrics?: TestExecutorMetrics) {
     const bbWorkingDirectory = await fs.mkdtemp(path.join(tmpdir(), 'bb-'));
 
     const contractDataSource = new SimpleContractDataSource();
     const merkleTrees = await (await NativeWorldStateService.tmp()).fork();
-    return new AvmProvingTester(bbWorkingDirectory, checkCircuitOnly, contractDataSource, merkleTrees, globals);
+    return new AvmProvingTester(
+      bbWorkingDirectory,
+      checkCircuitOnly,
+      contractDataSource,
+      merkleTrees,
+      globals,
+      metrics,
+    );
   }
 
-  async prove(avmCircuitInputs: AvmCircuitInputs): Promise<BBResult> {
+  async prove(avmCircuitInputs: AvmCircuitInputs, txLabel: string = 'unlabeledTx'): Promise<BBResult> {
+    const interceptingLogger = new InterceptingLogger(this.logger);
+
     // Then we prove.
     const proofRes = await generateAvmProof(
       BB_PATH,
       this.bbWorkingDirectory,
       avmCircuitInputs,
-      this.logger,
+      interceptingLogger,
       this.checkCircuitOnly,
     );
     if (proofRes.status === BB_RESULT.FAILURE) {
       this.logger.error(`Proof generation failed: ${proofRes.reason}`);
     }
     expect(proofRes.status).toEqual(BB_RESULT.SUCCESS);
+
+    // 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]);
+      }
+    });
+
+    // Hack to make labels match.
+    const txLabelWithCount = `${txLabel}/${this.txCount - 1}`;
+    // I need to cast because TS doesnt realize metrics is protected not private.
+    (this as any).metrics?.recordProverMetrics(txLabelWithCount, {
+      proverSimulationStepMs: times['simulation/all'],
+      proverProvingStepMs: times['proving/all'],
+      proverTraceGenerationStepMs: times['tracegen/all'],
+      traceGenerationInteractionsMs: times['tracegen/interactions'],
+      traceGenerationTracesMs: times['tracegen/traces'],
+      provingSumcheckMs: times['prove/sumcheck'],
+      provingPcsMs: times['prove/pcs_rounds'],
+      provingLogDerivativeInverseMs: times['prove/log_derivative_inverse_round'],
+      provingLogDerivativeInverseCommitmentsMs: times['prove/log_derivative_inverse_commitments_round'],
+      provingWireCommitmentsMs: times['prove/wire_commitments_round'],
+    });
+
     return proofRes as BBSuccess;
   }
 
@@ -77,8 +185,8 @@ export class AvmProvingTester extends PublicTxSimulationTester {
     );
   }
 
-  public async proveVerify(avmCircuitInputs: AvmCircuitInputs) {
-    const provingRes = await this.prove(avmCircuitInputs);
+  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);
@@ -93,21 +201,37 @@ export class AvmProvingTester extends PublicTxSimulationTester {
     expectRevert: boolean | undefined,
     feePayer = sender,
     privateInsertions?: TestPrivateInsertions,
+    txLabel: string = 'unlabeledTx',
   ) {
-    const simRes = await this.simulateTx(sender, setupCalls, appCalls, teardownCall, feePayer, privateInsertions);
+    const simRes = await this.simulateTx(
+      sender,
+      setupCalls,
+      appCalls,
+      teardownCall,
+      feePayer,
+      privateInsertions,
+      txLabel,
+    );
     expect(simRes.revertCode.isOK()).toBe(expectRevert ? false : true);
 
     const avmCircuitInputs = simRes.avmProvingRequest.inputs;
-    await this.proveVerify(avmCircuitInputs);
+    await this.proveVerify(avmCircuitInputs, txLabel);
   }
 
-  public async simProveVerifyAppLogic(appCall: TestEnqueuedCall, expectRevert?: boolean) {
+  public async simProveVerifyAppLogic(
+    appCall: TestEnqueuedCall,
+    expectRevert?: boolean,
+    txLabel: string = 'unlabeledTx',
+  ) {
     await this.simProveVerify(
       /*sender=*/ AztecAddress.fromNumber(42),
       /*setupCalls=*/ [],
       [appCall],
       undefined,
       expectRevert,
+      /*feePayer=*/ undefined,
+      /*privateInsertions=*/ undefined,
+      txLabel,
     );
   }
 }

package/src/prover/proof_utils.ts

@@ -3,6 +3,7 @@ import {
   NESTED_RECURSIVE_PROOF_LENGTH,
   NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH,
   PAIRING_POINTS_SIZE,
+  ULTRA_KECCAK_PROOF_LENGTH,
 } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/fields';
 import type { Logger } from '@aztec/foundation/log';
@@ -62,7 +63,9 @@ export async function readProofAsFields<PROOF_LENGTH extends number>(
 
   let numPublicInputs = vkData.numPublicInputs - PAIRING_POINTS_SIZE;
   assert(
-    proofLength == NESTED_RECURSIVE_PROOF_LENGTH || proofLength == NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH,
+    proofLength == NESTED_RECURSIVE_PROOF_LENGTH ||
+      proofLength == NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH ||
+      proofLength == ULTRA_KECCAK_PROOF_LENGTH,
     `Proof length must be one of the expected proof lengths, received ${proofLength}`,
   );
   if (proofLength == NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH) {

package/src/prover/server/bb_prover.ts

@@ -5,6 +5,7 @@ import {
   PAIRING_POINTS_SIZE,
   RECURSIVE_PROOF_LENGTH,
   TUBE_PROOF_LENGTH,
+  ULTRA_KECCAK_PROOF_LENGTH,
 } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/fields';
 import { runInDirectory } from '@aztec/foundation/fs';
@@ -501,7 +502,9 @@ export class BBNativeRollupProver implements ServerCircuitProver {
         bbWorkingDirectory,
       );
       const vkData = this.getVerificationKeyDataForCircuit(circuitType);
-      const proof = await readProofAsFields(provingResult.proofPath!, vkData, RECURSIVE_PROOF_LENGTH, logger);
+
+      const PROOF_LENGTH = circuitType == 'RootRollupArtifact' ? ULTRA_KECCAK_PROOF_LENGTH : RECURSIVE_PROOF_LENGTH;
+      const proof = await readProofAsFields(provingResult.proofPath!, vkData, PROOF_LENGTH, logger);
 
       const circuitName = mapProtocolArtifactNameToCircuitName(circuitType);
 

package/src/stats.ts

@@ -26,16 +26,16 @@ export function mapProtocolArtifactNameToCircuitName(artifact: ProtocolArtifact)
     case 'RootRollupArtifact':
       return 'root-rollup';
     case 'PrivateKernelInitArtifact':
-      return 'private-kernel-init';
+      return 'ClientIVC';
     case 'PrivateKernelInnerArtifact':
-      return 'private-kernel-inner';
+      return 'ClientIVC';
     case 'PrivateKernelTailArtifact':
-      return 'private-kernel-tail';
+      return 'ClientIVC';
     case 'PrivateKernelTailToPublicArtifact':
-      return 'private-kernel-tail-to-public';
+      return 'ClientIVC';
     default: {
       if (artifact.startsWith('PrivateKernelReset')) {
-        return 'private-kernel-reset';
+        return 'ClientIVC';
       }
       throw new Error(`Unknown circuit type: ${artifact}`);
     }

package/src/verifier/bb_verifier.ts

@@ -2,7 +2,7 @@ import { runInDirectory } from '@aztec/foundation/fs';
 import { type Logger, createLogger } from '@aztec/foundation/log';
 import { Timer } from '@aztec/foundation/timer';
 import { ServerCircuitVks } from '@aztec/noir-protocol-circuits-types/server/vks';
-import type { ClientProtocolArtifact, ServerProtocolArtifact } from '@aztec/noir-protocol-circuits-types/types';
+import type { ServerProtocolArtifact } from '@aztec/noir-protocol-circuits-types/types';
 import type { ClientProtocolCircuitVerifier, IVCProofVerificationResult } from '@aztec/stdlib/interfaces/server';
 import type { Proof } from '@aztec/stdlib/proofs';
 import type { CircuitVerificationStats } from '@aztec/stdlib/stats';
@@ -96,19 +96,10 @@ export class BBCircuitVerifier implements ClientProtocolCircuitVerifier {
     try {
       const totalTimer = new Timer();
       let verificationDuration = 0;
-      // TODO(#7370) The verification keys should be supplied separately and based on the expectedCircuit
-      // rather than read from the tx object itself. We also need the vks for the translator and ecc, which
-      // are not being saved along the other vks yet. Reuse the 'verifyProofForCircuit' method above once
-      // we have all the verification keys available.
-      const expectedCircuit: ClientProtocolArtifact = tx.data.forPublic
-        ? 'PrivateKernelTailToPublicArtifact'
-        : 'PrivateKernelTailArtifact';
-      const circuit = 'ClientIVC';
-
       // Block below is almost copy-pasted from verifyProofForCircuit
       const operation = async (bbWorkingDirectory: string) => {
         const logFunction = (message: string) => {
-          this.logger.debug(`${circuit} BB out - ${message}`);
+          this.logger.debug(`ClientIVC BB out - ${message}`);
         };
 
         await writeClientIVCProofToOutputDirectory(tx.clientIvcProof, bbWorkingDirectory);
@@ -123,12 +114,12 @@ export class BBCircuitVerifier implements ClientProtocolCircuitVerifier {
         verificationDuration = timer.ms();
 
         if (result.status === BB_RESULT.FAILURE) {
-          const errorMessage = `Failed to verify ${circuit} proof for ${expectedCircuit}!`;
+          const errorMessage = `Failed to verify ClientIVC proof!`;
           throw new Error(errorMessage);
         }
 
-        this.logger.debug(`${circuit} verification successful`, {
-          circuitName: mapProtocolArtifactNameToCircuitName(expectedCircuit),
+        this.logger.debug(`ClientIVC verification successful`, {
+          circuitName: 'ClientIVC',
           duration: result.durationMs,
           eventName: 'circuit-verification',
           proofType: 'client-ivc',
@@ -137,7 +128,7 @@ export class BBCircuitVerifier implements ClientProtocolCircuitVerifier {
       await runInDirectory(this.config.bbWorkingDirectory, operation, this.config.bbSkipCleanup, this.logger);
       return { valid: true, durationMs: verificationDuration, totalDurationMs: totalTimer.ms() };
     } catch (err) {
-      this.logger.warn(`Failed to verify ClientIVC proof for tx ${await Tx.getHash(tx)}: ${String(err)}`);
+      this.logger.warn(`Failed to verify ClientIVC proof for tx ${tx.getTxHash().toString()}: ${String(err)}`);
       return { valid: false, durationMs: 0, totalDurationMs: 0 };
     }
   }