@aztec/bb-prover 0.0.1-fake-ceab37513c → 0.0.2-commit.217f559981

package/dest/test/test_verifier.d.ts

@@ -1,7 +1,9 @@
 import type { ClientProtocolCircuitVerifier, IVCProofVerificationResult } from '@aztec/stdlib/interfaces/server';
 import type { Tx } from '@aztec/stdlib/tx';
 export declare class TestCircuitVerifier implements ClientProtocolCircuitVerifier {
+    private verificationDelayMs?;
+    constructor(verificationDelayMs?: number | undefined);
     verifyProof(_tx: Tx): Promise<IVCProofVerificationResult>;
     stop(): Promise<void>;
 }
-//# sourceMappingURL=test_verifier.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdF92ZXJpZmllci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Rlc3QvdGVzdF92ZXJpZmllci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSw2QkFBNkIsRUFBRSwwQkFBMEIsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ2pILE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRTNDLHFCQUFhLG1CQUFvQixZQUFXLDZCQUE2QjtJQUMzRCxPQUFPLENBQUMsbUJBQW1CLENBQUM7SUFBeEMsWUFBb0IsbUJBQW1CLENBQUMsb0JBQVEsRUFBSTtJQUNwRCxXQUFXLENBQUMsR0FBRyxFQUFFLEVBQUUsR0FBRyxPQUFPLENBQUMsMEJBQTBCLENBQUMsQ0FTeEQ7SUFFTSxJQUFJLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxDQUUzQjtDQUNGIn0=

package/dest/test/test_verifier.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"test_verifier.d.ts","sourceRoot":"","sources":["../../src/test/test_verifier.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,6BAA6B,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AACjH,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAE3C,qBAAa,mBAAoB,YAAW,6BAA6B;IACvE,WAAW,CAAC,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC,0BAA0B,CAAC;IAIlD,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAG7B"}
+{"version":3,"file":"test_verifier.d.ts","sourceRoot":"","sources":["../../src/test/test_verifier.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,6BAA6B,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AACjH,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAE3C,qBAAa,mBAAoB,YAAW,6BAA6B;IAC3D,OAAO,CAAC,mBAAmB,CAAC;IAAxC,YAAoB,mBAAmB,CAAC,oBAAQ,EAAI;IACpD,WAAW,CAAC,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC,0BAA0B,CAAC,CASxD;IAEM,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAE3B;CACF"}

package/dest/test/test_verifier.js

@@ -1,5 +1,20 @@
 export class TestCircuitVerifier {
+    verificationDelayMs;
+    constructor(verificationDelayMs){
+        this.verificationDelayMs = verificationDelayMs;
+    }
     verifyProof(_tx) {
+        if (this.verificationDelayMs !== undefined && this.verificationDelayMs > 0) {
+            return new Promise((resolve)=>{
+                setTimeout(()=>{
+                    resolve({
+                        valid: true,
+                        durationMs: this.verificationDelayMs,
+                        totalDurationMs: this.verificationDelayMs
+                    });
+                }, this.verificationDelayMs);
+            });
+        }
         return Promise.resolve({
             valid: true,
             durationMs: 0,

package/dest/verification_key/verification_key_data.d.ts

@@ -5,11 +5,4 @@ import { VerificationKeyData } from '@aztec/stdlib/vks';
  * @returns The verification key data
  */
 export declare function extractVkData(vkDirectoryPath: string): Promise<VerificationKeyData>;
-/**
- * Reads the verification key data stored in a binary file at the specified directory location and parses into a VerificationKeyData.
- * We do not assume any JSON file available but only the binary version, contrary to the above extractVkData() method.
- * @param vkDirectoryPath - The directory containing the verification key binary data file.
- * @returns The verification key data
- */
-export declare function extractAvmVkData(vkDirectoryPath: string): Promise<VerificationKeyData>;
-//# sourceMappingURL=verification_key_data.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVyaWZpY2F0aW9uX2tleV9kYXRhLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdmVyaWZpY2F0aW9uX2tleS92ZXJpZmljYXRpb25fa2V5X2RhdGEudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUEyQixtQkFBbUIsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBT2pGOzs7O0dBSUc7QUFDSCx3QkFBc0IsYUFBYSxDQUFDLGVBQWUsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLG1CQUFtQixDQUFDLENBVXpGIn0=

package/dest/verification_key/verification_key_data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"verification_key_data.d.ts","sourceRoot":"","sources":["../../src/verification_key/verification_key_data.ts"],"names":[],"mappings":"AAGA,OAAO,EAA2B,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAQjF;;;;GAIG;AACH,wBAAsB,aAAa,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAUzF;AAED;;;;;GAKG;AACH,wBAAsB,gBAAgB,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAe5F"}
+{"version":3,"file":"verification_key_data.d.ts","sourceRoot":"","sources":["../../src/verification_key/verification_key_data.ts"],"names":[],"mappings":"AAEA,OAAO,EAA2B,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAOjF;;;;GAIG;AACH,wBAAsB,aAAa,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAUzF"}

package/dest/verification_key/verification_key_data.js

@@ -1,8 +1,6 @@
-import { AVM_V2_VERIFICATION_KEY_LENGTH_IN_FIELDS_PADDED } from '@aztec/constants';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader } from '@aztec/foundation/serialize';
 import { VerificationKeyAsFields, VerificationKeyData } from '@aztec/stdlib/vks';
-import { strict as assert } from 'assert';
 import { promises as fs } from 'fs';
 import * as path from 'path';
 import { VK_FILENAME } from '../bb/execute.js';
@@ -19,20 +17,3 @@ import { VK_FILENAME } from '../bb/execute.js';
     const vkAsFields = await VerificationKeyAsFields.fromKey(fields);
     return new VerificationKeyData(vkAsFields, rawBinary);
 }
-/**
- * Reads the verification key data stored in a binary file at the specified directory location and parses into a VerificationKeyData.
- * We do not assume any JSON file available but only the binary version, contrary to the above extractVkData() method.
- * @param vkDirectoryPath - The directory containing the verification key binary data file.
- * @returns The verification key data
- */ export async function extractAvmVkData(vkDirectoryPath) {
-    const rawBinary = await fs.readFile(path.join(vkDirectoryPath, VK_FILENAME));
-    const numFields = rawBinary.length / Fr.SIZE_IN_BYTES;
-    assert(numFields <= AVM_V2_VERIFICATION_KEY_LENGTH_IN_FIELDS_PADDED, 'Invalid AVM verification key length');
-    const reader = BufferReader.asReader(rawBinary);
-    const fieldsArray = reader.readArray(numFields, Fr);
-    const fieldsArrayPadded = fieldsArray.concat(Array(AVM_V2_VERIFICATION_KEY_LENGTH_IN_FIELDS_PADDED - fieldsArray.length).fill(new Fr(0)));
-    const vkAsFields = await VerificationKeyAsFields.fromKey(fieldsArrayPadded);
-    // TODO(#16644): We should have a different type for AVM verification keys since we don't have circuit size or num public inputs in AVM VKs.
-    const vk = new VerificationKeyData(vkAsFields, rawBinary);
-    return vk;
-}

package/dest/verifier/bb_verifier.d.ts

@@ -1,20 +1,18 @@
 import { type Logger } from '@aztec/foundation/log';
-import type { ServerProtocolArtifact } from '@aztec/noir-protocol-circuits-types/types';
+import { type ProtocolArtifact, 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 { Tx } from '@aztec/stdlib/tx';
 import type { VerificationKeyData } from '@aztec/stdlib/vks';
 import type { BBConfig } from '../config.js';
-export declare const PRIVATE_TAIL_CIVC_VK: string;
-export declare const PUBLIC_TAIL_CIVC_VK: string;
 export declare class BBCircuitVerifier implements ClientProtocolCircuitVerifier {
     private config;
     private logger;
     private constructor();
     stop(): Promise<void>;
     static new(config: BBConfig, logger?: Logger): Promise<BBCircuitVerifier>;
-    getVerificationKeyData(circuitType: ServerProtocolArtifact): VerificationKeyData;
+    getVerificationKeyData(circuit: ProtocolArtifact): VerificationKeyData;
     verifyProofForCircuit(circuit: ServerProtocolArtifact, proof: Proof): Promise<void>;
     verifyProof(tx: Tx): Promise<IVCProofVerificationResult>;
 }
-//# sourceMappingURL=bb_verifier.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmJfdmVyaWZpZXIuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZmllci9iYl92ZXJpZmllci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0sdUJBQXVCLENBQUM7QUFHbEUsT0FBTyxFQUVMLEtBQUssZ0JBQWdCLEVBQ3JCLEtBQUssc0JBQXNCLEVBRTVCLE1BQU0sMkNBQTJDLENBQUM7QUFDbkQsT0FBTyxLQUFLLEVBQUUsNkJBQTZCLEVBQUUsMEJBQTBCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUNqSCxPQUFPLEtBQUssRUFBRSxLQUFLLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUVsRCxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDdEMsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQWE3RCxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFJN0MscUJBQWEsaUJBQWtCLFlBQVcsNkJBQTZCO0lBRW5FLE9BQU8sQ0FBQyxNQUFNO0lBQ2QsT0FBTyxDQUFDLE1BQU07SUFGaEIsT0FBTyxlQUdIO0lBRUcsSUFBSSxJQUFJLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FFM0I7SUFFRCxPQUFvQixHQUFHLENBQUMsTUFBTSxFQUFFLFFBQVEsRUFBRSxNQUFNLFNBQXFDLDhCQU1wRjtJQUVNLHNCQUFzQixDQUFDLE9BQU8sRUFBRSxnQkFBZ0IsR0FBRyxtQkFBbUIsQ0FNNUU7SUFFWSxxQkFBcUIsQ0FBQyxPQUFPLEVBQUUsc0JBQXNCLEVBQUUsS0FBSyxFQUFFLEtBQUssaUJBbUMvRTtJQUVZLFdBQVcsQ0FBQyxFQUFFLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQywwQkFBMEIsQ0FBQyxDQTZDcEU7Q0FDRiJ9

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,EAEL,KAAK,gBAAgB,EACrB,KAAK,sBAAsB,EAE5B,MAAM,2CAA2C,CAAC;AACnD,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;AAa7D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAI7C,qBAAa,iBAAkB,YAAW,6BAA6B;IAEnE,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,MAAM;IAFhB,OAAO,eAGH;IAEG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAE3B;IAED,OAAoB,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,SAAqC,8BAMpF;IAEM,sBAAsB,CAAC,OAAO,EAAE,gBAAgB,GAAG,mBAAmB,CAM5E;IAEY,qBAAqB,CAAC,OAAO,EAAE,sBAAsB,EAAE,KAAK,EAAE,KAAK,iBAmC/E;IAEY,WAAW,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,0BAA0B,CAAC,CA6CpE;CACF"}

package/dest/verifier/bb_verifier.js

@@ -1,18 +1,13 @@
 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 { 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 { fileURLToPath } from 'url';
-import { BB_RESULT, PROOF_FILENAME, PUBLIC_INPUTS_FILENAME, VK_FILENAME, verifyClientIvcProof, verifyProof } from '../bb/execute.js';
+import { BB_RESULT, PROOF_FILENAME, PUBLIC_INPUTS_FILENAME, VK_FILENAME, verifyChonkProof, verifyProof } from '../bb/execute.js';
 import { getUltraHonkFlavorForCircuit } from '../honk.js';
-import { writeClientIVCProofToOutputDirectory } from '../prover/proof_utils.js';
-import { mapProtocolArtifactNameToCircuitName } from '../stats.js';
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
-// Built by yarn generate
-export const PRIVATE_TAIL_CIVC_VK = path.join(__dirname, '../../artifacts/private-civc-vk');
-export const PUBLIC_TAIL_CIVC_VK = path.join(__dirname, '../../artifacts/public-civc-vk');
+import { writeChonkProofToPath } from '../prover/proof_utils.js';
 export class BBCircuitVerifier {
     config;
     logger;
@@ -24,15 +19,18 @@ export class BBCircuitVerifier {
         return Promise.resolve();
     }
     static async new(config, logger = createLogger('bb-prover:verifier')) {
+        if (!config.bbWorkingDirectory) {
+            throw new Error(`Barretenberg working directory (BB_WORKING_DIRECTORY) is not set`);
+        }
         await fs.mkdir(config.bbWorkingDirectory, {
             recursive: true
         });
         return new BBCircuitVerifier(config, logger);
     }
-    getVerificationKeyData(circuitType) {
-        const vk = ServerCircuitVks[circuitType];
+    getVerificationKeyData(circuit) {
+        const vk = ProtocolCircuitVks[circuit];
         if (vk === undefined) {
-            throw new Error('Could not find VK for server artifact ' + circuitType);
+            throw new Error(`Could not find VK for artifact ${circuit}`);
         }
         return vk;
     }
@@ -62,33 +60,30 @@ export class BBCircuitVerifier {
         await runInDirectory(this.config.bbWorkingDirectory, operation, this.config.bbSkipCleanup, this.logger);
     }
     async verifyProof(tx) {
+        const proofType = 'Chonk';
         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';
+            const circuit = tx.data.forPublic ? 'HidingKernelToPublic' : 'HidingKernelToRollup';
             // Block below is almost copy-pasted from verifyProofForCircuit
             const operation = async (bbWorkingDirectory)=>{
-                const logFunction = (message)=>{
-                    this.logger.debug(`${circuit} BB out - ${message}`);
-                };
-                await writeClientIVCProofToOutputDirectory(tx.clientIvcProof, 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 verificationKey = this.getVerificationKeyData(circuit);
+                await fs.writeFile(verificationKeyPath, verificationKey.keyAsBytes);
                 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);
+                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 ${circuit} proof for ${expectedCircuit}!`;
+                    const errorMessage = `Failed to verify ${proofType} proof for ${circuit}!`;
                     throw new Error(errorMessage);
                 }
-                this.logger.debug(`${circuit} verification successful`, {
-                    circuitName: mapProtocolArtifactNameToCircuitName(expectedCircuit),
+                this.logger.debug(`${proofType} verification successful`, {
+                    circuitName: mapProtocolArtifactNameToCircuitName(circuit),
                     duration: result.durationMs,
                     eventName: 'circuit-verification',
-                    proofType: 'client-ivc'
+                    proofType: 'chonk'
                 });
             };
             await runInDirectory(this.config.bbWorkingDirectory, operation, this.config.bbSkipCleanup, this.logger);
@@ -98,7 +93,7 @@ export class BBCircuitVerifier {
                 totalDurationMs: totalTimer.ms()
             };
         } catch (err) {
-            this.logger.warn(`Failed to verify ClientIVC proof for tx ${tx.getTxHash().toString()}: ${String(err)}`);
+            this.logger.warn(`Failed to verify ${proofType} proof for tx ${tx.getTxHash().toString()}: ${String(err)}`);
             return {
                 valid: false,
                 durationMs: 0,

package/dest/verifier/index.d.ts

@@ -1,3 +1,3 @@
 export * from './bb_verifier.js';
-export * from './queued_ivc_verifier.js';
-//# sourceMappingURL=index.d.ts.map
+export * from './queued_chonk_verifier.js';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZmllci9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLGtCQUFrQixDQUFDO0FBQ2pDLGNBQWMsNEJBQTRCLENBQUMifQ==

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/verifier/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,0BAA0B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/verifier/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,4BAA4B,CAAC"}

package/dest/verifier/index.js

@@ -1,2 +1,2 @@
 export * from './bb_verifier.js';
-export * from './queued_ivc_verifier.js';
+export * from './queued_chonk_verifier.js';

package/dest/verifier/queued_chonk_verifier.d.ts

@@ -0,0 +1,15 @@
+import type { ClientProtocolCircuitVerifier, IVCProofVerificationResult } from '@aztec/stdlib/interfaces/server';
+import type { Tx } from '@aztec/stdlib/tx';
+import { type TelemetryClient } from '@aztec/telemetry-client';
+import type { BBConfig } from '../config.js';
+export declare class QueuedIVCVerifier implements ClientProtocolCircuitVerifier {
+    private verifier;
+    private telemetry;
+    private logger;
+    private queue;
+    private metrics;
+    constructor(config: BBConfig, verifier: ClientProtocolCircuitVerifier, telemetry?: TelemetryClient, logger?: import("@aztec/foundation/log").Logger);
+    verifyProof(tx: Tx): Promise<IVCProofVerificationResult>;
+    stop(): Promise<void>;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicXVldWVkX2Nob25rX3ZlcmlmaWVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdmVyaWZpZXIvcXVldWVkX2Nob25rX3ZlcmlmaWVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sS0FBSyxFQUFFLDZCQUE2QixFQUFFLDBCQUEwQixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDakgsT0FBTyxLQUFLLEVBQUUsRUFBRSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDM0MsT0FBTyxFQU1MLEtBQUssZUFBZSxFQUlyQixNQUFNLHlCQUF5QixDQUFDO0FBSWpDLE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLGNBQWMsQ0FBQztBQWlFN0MscUJBQWEsaUJBQWtCLFlBQVcsNkJBQTZCO0lBTW5FLE9BQU8sQ0FBQyxRQUFRO0lBQ2hCLE9BQU8sQ0FBQyxTQUFTO0lBQ2pCLE9BQU8sQ0FBQyxNQUFNO0lBUGhCLE9BQU8sQ0FBQyxLQUFLLENBQWM7SUFDM0IsT0FBTyxDQUFDLE9BQU8sQ0FBcUI7SUFFcEMsWUFDRSxNQUFNLEVBQUUsUUFBUSxFQUNSLFFBQVEsRUFBRSw2QkFBNkIsRUFDdkMsU0FBUyxHQUFFLGVBQXNDLEVBQ2pELE1BQU0seUNBQWtELEVBTWpFO0lBRVksV0FBVyxDQUFDLEVBQUUsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLDBCQUEwQixDQUFDLENBSXBFO0lBRUQsSUFBSSxJQUFJLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FFcEI7Q0FDRiJ9

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

@@ -0,0 +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;AAIjC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAiE7C,qBAAa,iBAAkB,YAAW,6BAA6B;IAMnE,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,MAAM;IAPhB,OAAO,CAAC,KAAK,CAAc;IAC3B,OAAO,CAAC,OAAO,CAAqB;IAEpC,YACE,MAAM,EAAE,QAAQ,EACR,QAAQ,EAAE,6BAA6B,EACvC,SAAS,GAAE,eAAsC,EACjD,MAAM,yCAAkD,EAMjE;IAEY,WAAW,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAIpE;IAED,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAEpB;CACF"}

package/dest/verifier/{queued_ivc_verifier.js → queued_chonk_verifier.js}

@@ -1,6 +1,6 @@
 import { createLogger } from '@aztec/foundation/log';
 import { SerialQueue } from '@aztec/foundation/queue';
-import { Attributes, Metrics, ValueType, getTelemetryClient } from '@aztec/telemetry-client';
+import { Attributes, Metrics, createUpDownCounterWithDefault, getTelemetryClient } from '@aztec/telemetry-client';
 import { createHistogram } from 'node:perf_hooks';
 class IVCVerifierMetrics {
     ivcVerificationHistogram;
@@ -17,46 +17,15 @@ class IVCVerifierMetrics {
     aggDurationMetrics;
     constructor(client, name = 'QueuedIVCVerifier'){
         const meter = client.getMeter(name);
-        this.ivcVerificationHistogram = meter.createHistogram(Metrics.IVC_VERIFIER_TIME, {
-            unit: 'ms',
-            description: 'Duration to verify client IVC proofs',
-            valueType: ValueType.INT
-        });
-        this.ivcTotalVerificationHistogram = meter.createHistogram(Metrics.IVC_VERIFIER_TOTAL_TIME, {
-            unit: 'ms',
-            description: 'Total duration to verify client IVC proofs, including serde',
-            valueType: ValueType.INT
-        });
-        this.ivcFailureCount = meter.createUpDownCounter(Metrics.IVC_VERIFIER_FAILURE_COUNT, {
-            description: 'Count of failed IVC proof verifications',
-            valueType: ValueType.INT
-        });
+        this.ivcVerificationHistogram = meter.createHistogram(Metrics.IVC_VERIFIER_TIME);
+        this.ivcTotalVerificationHistogram = meter.createHistogram(Metrics.IVC_VERIFIER_TOTAL_TIME);
+        this.ivcFailureCount = createUpDownCounterWithDefault(meter, Metrics.IVC_VERIFIER_FAILURE_COUNT);
         this.aggDurationMetrics = {
-            avg: meter.createObservableGauge(Metrics.IVC_VERIFIER_AGG_DURATION_AVG, {
-                valueType: ValueType.DOUBLE,
-                description: 'AVG ivc verification',
-                unit: 'ms'
-            }),
-            max: meter.createObservableGauge(Metrics.IVC_VERIFIER_AGG_DURATION_MAX, {
-                valueType: ValueType.DOUBLE,
-                description: 'MAX ivc verification',
-                unit: 'ms'
-            }),
-            min: meter.createObservableGauge(Metrics.IVC_VERIFIER_AGG_DURATION_MIN, {
-                valueType: ValueType.DOUBLE,
-                description: 'MIN ivc verification',
-                unit: 'ms'
-            }),
-            p50: meter.createObservableGauge(Metrics.IVC_VERIFIER_AGG_DURATION_P50, {
-                valueType: ValueType.DOUBLE,
-                description: 'P50 ivc verification',
-                unit: 'ms'
-            }),
-            p90: meter.createObservableGauge(Metrics.IVC_VERIFIER_AGG_DURATION_P90, {
-                valueType: ValueType.DOUBLE,
-                description: 'P90 ivc verification',
-                unit: 'ms'
-            })
+            avg: meter.createObservableGauge(Metrics.IVC_VERIFIER_AGG_DURATION_AVG),
+            max: meter.createObservableGauge(Metrics.IVC_VERIFIER_AGG_DURATION_MAX),
+            min: meter.createObservableGauge(Metrics.IVC_VERIFIER_AGG_DURATION_MIN),
+            p50: meter.createObservableGauge(Metrics.IVC_VERIFIER_AGG_DURATION_P50),
+            p90: meter.createObservableGauge(Metrics.IVC_VERIFIER_AGG_DURATION_P90)
         };
         meter.addBatchObservableCallback(this.aggregate, Object.values(this.aggDurationMetrics));
     }
@@ -112,7 +81,7 @@ export class QueuedIVCVerifier {
     logger;
     queue;
     metrics;
-    constructor(config, verifier, telemetry = getTelemetryClient(), logger = createLogger('bb-prover:queued_ivc_verifier')){
+    constructor(config, verifier, telemetry = getTelemetryClient(), logger = createLogger('bb-prover:queued_chonk_verifier')){
         this.verifier = verifier;
         this.telemetry = telemetry;
         this.logger = logger;

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@aztec/bb-prover",
-  "version": "0.0.1-fake-ceab37513c",
+  "version": "0.0.2-commit.217f559981",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
-    "./client/wasm/bundle": "./dest/prover/client/wasm/bundle.js",
-    "./client/wasm/lazy": "./dest/prover/client/wasm/lazy.js",
-    "./client/native": "./dest/prover/client/native/bb_native_private_kernel_prover.js",
+    "./client/bundle": "./dest/prover/client/bundle.js",
+    "./client/lazy": "./dest/prover/client/lazy.js",
+    "./client": "./dest/prover/client/bb_private_kernel_prover.js",
     "./verifier": "./dest/verifier/index.js",
     "./test": "./dest/test/index.js",
     "./config": "./dest/config.js"
@@ -25,10 +25,9 @@
     "../package.common.json"
   ],
   "scripts": {
-    "build": "yarn clean && tsc -b",
-    "build:dev": "tsc -b --watch",
+    "build": "yarn clean && ../scripts/tsc.sh",
+    "build:dev": "../scripts/tsc.sh --watch",
     "clean": "rm -rf ./dest .tsbuildinfo",
-    "generate": "scripts/copy_ivc_hiding_circuit_vks.sh",
     "bb": "node --no-warnings ./dest/bb/index.js",
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
   },
@@ -70,36 +69,37 @@
     ]
   },
   "dependencies": {
-    "@aztec/bb.js": "0.0.1-fake-ceab37513c",
-    "@aztec/constants": "0.0.1-fake-ceab37513c",
-    "@aztec/foundation": "0.0.1-fake-ceab37513c",
-    "@aztec/noir-noirc_abi": "0.0.1-fake-ceab37513c",
-    "@aztec/noir-protocol-circuits-types": "0.0.1-fake-ceab37513c",
-    "@aztec/noir-types": "0.0.1-fake-ceab37513c",
-    "@aztec/simulator": "0.0.1-fake-ceab37513c",
-    "@aztec/stdlib": "0.0.1-fake-ceab37513c",
-    "@aztec/telemetry-client": "0.0.1-fake-ceab37513c",
-    "@aztec/world-state": "0.0.1-fake-ceab37513c",
+    "@aztec/bb.js": "0.0.2-commit.217f559981",
+    "@aztec/constants": "0.0.2-commit.217f559981",
+    "@aztec/foundation": "0.0.2-commit.217f559981",
+    "@aztec/noir-noirc_abi": "0.0.2-commit.217f559981",
+    "@aztec/noir-protocol-circuits-types": "0.0.2-commit.217f559981",
+    "@aztec/noir-types": "0.0.2-commit.217f559981",
+    "@aztec/simulator": "0.0.2-commit.217f559981",
+    "@aztec/stdlib": "0.0.2-commit.217f559981",
+    "@aztec/telemetry-client": "0.0.2-commit.217f559981",
+    "@aztec/world-state": "0.0.2-commit.217f559981",
     "commander": "^12.1.0",
     "pako": "^2.1.0",
     "source-map-support": "^0.5.21",
     "tslib": "^2.4.0"
   },
   "devDependencies": {
-    "@aztec/ethereum": "0.0.1-fake-ceab37513c",
-    "@aztec/kv-store": "0.0.1-fake-ceab37513c",
-    "@aztec/noir-contracts.js": "0.0.1-fake-ceab37513c",
-    "@aztec/noir-test-contracts.js": "0.0.1-fake-ceab37513c",
-    "@aztec/protocol-contracts": "0.0.1-fake-ceab37513c",
+    "@aztec/ethereum": "0.0.2-commit.217f559981",
+    "@aztec/kv-store": "0.0.2-commit.217f559981",
+    "@aztec/noir-contracts.js": "0.0.2-commit.217f559981",
+    "@aztec/noir-test-contracts.js": "0.0.2-commit.217f559981",
+    "@aztec/protocol-contracts": "0.0.2-commit.217f559981",
     "@jest/globals": "^30.0.0",
     "@types/jest": "^30.0.0",
     "@types/node": "^22.15.17",
     "@types/source-map-support": "^0.5.10",
+    "@typescript/native-preview": "7.0.0-dev.20260113.1",
     "jest": "^30.0.0",
     "jest-mock-extended": "^4.0.0",
     "ts-node": "^10.9.1",
     "typescript": "^5.3.3",
-    "viem": "npm:@spalladino/viem@2.38.2-eip7594.0"
+    "viem": "npm:@aztec/viem@2.38.2"
   },
   "files": [
     "dest",

package/src/avm_proving_tests/avm_proving_tester.ts

@@ -8,7 +8,7 @@ import {
   type TestPrivateInsertions,
 } from '@aztec/simulator/public/fixtures';
 import type { PublicTxResult } from '@aztec/simulator/server';
-import { type AvmCircuitInputs, AvmCircuitPublicInputs } from '@aztec/stdlib/avm';
+import { AvmCircuitInputs, AvmCircuitPublicInputs, PublicSimulatorConfig } from '@aztec/stdlib/avm';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server';
 import type { GlobalVariables } from '@aztec/stdlib/tx';
@@ -18,16 +18,9 @@ import fs from 'node:fs/promises';
 import { tmpdir } from 'node:os';
 import path from 'path';
 
-import {
-  type BBResult,
-  type BBSuccess,
-  BB_RESULT,
-  VK_FILENAME,
-  generateAvmProof,
-  verifyAvmProof,
-} from '../bb/execute.js';
+import { type BBResult, type BBSuccess, BB_RESULT, generateAvmProof, verifyAvmProof } from '../bb/execute.js';
 
-const BB_PATH = path.resolve('../../barretenberg/cpp/build/bin/bb');
+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 {
@@ -51,6 +44,10 @@ class InterceptingLogger implements 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
@@ -88,34 +85,45 @@ class InterceptingLogger implements Logger {
   }
 }
 
+// Config with collectHints enabled for proving tests
+const provingConfig: PublicSimulatorConfig = PublicSimulatorConfig.from({
+  skipFeeEnforcement: false,
+  collectCallMetadata: true, // For results.
+  collectDebugLogs: false,
+  collectHints: true, // Required for proving!
+  collectPublicInputs: true, // Required for proving!
+  collectStatistics: false,
+});
+
 export class AvmProvingTester extends PublicTxSimulationTester {
+  private bbWorkingDirectory: string = '';
+
   constructor(
-    private bbWorkingDirectory: string,
     private checkCircuitOnly: boolean,
     contractDataSource: SimpleContractDataSource,
     merkleTrees: MerkleTreeWriteOperations,
     globals?: GlobalVariables,
     metrics?: TestExecutorMetrics,
   ) {
-    super(merkleTrees, contractDataSource, globals, metrics);
+    // simulator factory is undefined because for proving, we use the default C++ simulator
+    super(merkleTrees, contractDataSource, globals, metrics, /*simulatorFactory=*/ undefined, provingConfig);
   }
 
-  static async new(checkCircuitOnly: boolean = false, globals?: GlobalVariables, metrics?: TestExecutorMetrics) {
-    const bbWorkingDirectory = await fs.mkdtemp(path.join(tmpdir(), 'bb-'));
-
+  static async new(
+    worldStateService: NativeWorldStateService, // make sure to close this later
+    checkCircuitOnly: boolean = false,
+    globals?: GlobalVariables,
+    metrics?: TestExecutorMetrics,
+  ) {
     const contractDataSource = new SimpleContractDataSource();
-    const merkleTrees = await (await NativeWorldStateService.tmp()).fork();
-    return new AvmProvingTester(
-      bbWorkingDirectory,
-      checkCircuitOnly,
-      contractDataSource,
-      merkleTrees,
-      globals,
-      metrics,
-    );
+    const merkleTrees = await worldStateService.fork();
+    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-'));
+
     const interceptingLogger = new InterceptingLogger(this.logger);
 
     // Then we prove.
@@ -151,6 +159,11 @@ export class AvmProvingTester extends PublicTxSimulationTester {
       }
     });
 
+    // Throw if logs did not contain any times.
+    if (Object.keys(times).length === 0) {
+      throw new Error('AVM stdout did not contain any proving times in the stats!');
+    }
+
     // Hack to make labels match.
     const txLabelWithCount = `${txLabel}/${this.txCount - 1}`;
     // I need to cast because TS doesnt realize metrics is protected not private.
@@ -177,14 +190,7 @@ export class AvmProvingTester extends PublicTxSimulationTester {
       return proofRes;
     }
 
-    return await verifyAvmProof(
-      BB_PATH,
-      this.bbWorkingDirectory,
-      proofRes.proofPath!,
-      publicInputs,
-      path.join(proofRes.vkDirectoryPath!, VK_FILENAME),
-      this.logger,
-    );
+    return await verifyAvmProof(BB_PATH, this.bbWorkingDirectory, proofRes.proofPath!, publicInputs, this.logger);
   }
 
   public async proveVerify(avmCircuitInputs: AvmCircuitInputs, txLabel: string = 'unlabeledTx') {
@@ -204,7 +210,9 @@ export class AvmProvingTester extends PublicTxSimulationTester {
     feePayer = sender,
     privateInsertions?: TestPrivateInsertions,
     txLabel: string = 'unlabeledTx',
+    disableRevertCheck: boolean = false,
   ): Promise<PublicTxResult> {
+    const simTimer = new Timer();
     const simRes = await this.simulateTx(
       sender,
       setupCalls,
@@ -214,11 +222,16 @@ export class AvmProvingTester extends PublicTxSimulationTester {
       privateInsertions,
       txLabel,
     );
-    expect(simRes.revertCode.isOK()).toBe(expectRevert ? false : true);
+    const simDuration = simTimer.ms();
+    this.logger.info(`Simulation took ${simDuration} ms for tx ${txLabel}`);
+
+    if (!disableRevertCheck) {
+      expect(simRes.revertCode.isOK()).toBe(expectRevert ? false : true);
+    }
 
     const opString = this.checkCircuitOnly ? 'Check circuit' : 'Proving and verification';
 
-    const avmCircuitInputs = simRes.avmProvingRequest.inputs;
+    const avmCircuitInputs = new AvmCircuitInputs(simRes.hints!, simRes.publicInputs!);
     const timer = new Timer();
     await this.proveVerify(avmCircuitInputs, txLabel);
     this.logger.info(`${opString} took ${timer.ms()} ms for tx ${txLabel}`);
@@ -240,10 +253,11 @@ export class AvmProvingTester extends PublicTxSimulationTester {
       setupCalls ?? [],
       appCalls ?? [],
       teardownCall,
-      /*expectRevert=*/ false,
+      undefined,
       feePayer,
       privateInsertions,
       txLabel,
+      true,
     );
   }