@aztec/bb-prover 0.69.0-devnet → 0.69.1-devnet

package/dest/wasm/bb_wasm_private_kernel_prover.js

@@ -0,0 +1,30 @@
+import { AztecClientBackend } from '@aztec/bb.js';
+import { ClientIvcProof } from '@aztec/circuits.js';
+import { createLogger } from '@aztec/foundation/log';
+import { Timer } from '@aztec/foundation/timer';
+import { serializeWitness } from '@noir-lang/noirc_abi';
+import { ungzip } from 'pako';
+import { BBPrivateKernelProver } from '../prover/bb_private_kernel_prover.js';
+export class BBWASMPrivateKernelProver extends BBPrivateKernelProver {
+    constructor(artifactProvider, threads = 1, log = createLogger('bb-prover:wasm')) {
+        super(artifactProvider, log);
+        this.artifactProvider = artifactProvider;
+        this.threads = threads;
+        this.log = log;
+    }
+    async createClientIvcProof(acirs, witnessStack) {
+        const timer = new Timer();
+        this.log.info(`Generating ClientIVC proof...`);
+        const backend = new AztecClientBackend(acirs.map(acir => ungzip(acir)), { threads: this.threads });
+        const [proof, vk] = await backend.prove(witnessStack.map(witnessMap => ungzip(serializeWitness(witnessMap))));
+        await backend.destroy();
+        this.log.info(`Generated ClientIVC proof`, {
+            eventName: 'client-ivc-proof-generation',
+            duration: timer.ms(),
+            proofSize: proof.length,
+            vkSize: vk.length,
+        });
+        return new ClientIvcProof(Buffer.from(proof), Buffer.from(vk));
+    }
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmJfd2FzbV9wcml2YXRlX2tlcm5lbF9wcm92ZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvd2FzbS9iYl93YXNtX3ByaXZhdGVfa2VybmVsX3Byb3Zlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFDbEQsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ3BELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUNyRCxPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFHaEQsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFFeEQsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUU5QixPQUFPLEVBQUUscUJBQXFCLEVBQUUsTUFBTSx1Q0FBdUMsQ0FBQztBQUU5RSxNQUFNLE9BQWdCLHlCQUEwQixTQUFRLHFCQUFxQjtJQUMzRSxZQUNxQixnQkFBa0MsRUFDN0MsVUFBa0IsQ0FBQyxFQUNSLE1BQU0sWUFBWSxDQUFDLGdCQUFnQixDQUFDO1FBRXZELEtBQUssQ0FBQyxnQkFBZ0IsRUFBRSxHQUFHLENBQUMsQ0FBQztRQUpWLHFCQUFnQixHQUFoQixnQkFBZ0IsQ0FBa0I7UUFDN0MsWUFBTyxHQUFQLE9BQU8sQ0FBWTtRQUNSLFFBQUcsR0FBSCxHQUFHLENBQWlDO0lBR3pELENBQUM7SUFFZSxLQUFLLENBQUMsb0JBQW9CLENBQUMsS0FBZSxFQUFFLFlBQTBCO1FBQ3BGLE1BQU0sS0FBSyxHQUFHLElBQUksS0FBSyxFQUFFLENBQUM7UUFDMUIsSUFBSSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsK0JBQStCLENBQUMsQ0FBQztRQUMvQyxNQUFNLE9BQU8sR0FBRyxJQUFJLGtCQUFrQixDQUNwQyxLQUFLLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDLEVBQy9CLEVBQUUsT0FBTyxFQUFFLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FDMUIsQ0FBQztRQUVGLE1BQU0sQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUFDLEdBQUcsTUFBTSxPQUFPLENBQUMsS0FBSyxDQUFDLFlBQVksQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLEVBQUUsQ0FBQyxNQUFNLENBQUMsZ0JBQWdCLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDOUcsTUFBTSxPQUFPLENBQUMsT0FBTyxFQUFFLENBQUM7UUFDeEIsSUFBSSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsMkJBQTJCLEVBQUU7WUFDekMsU0FBUyxFQUFFLDZCQUE2QjtZQUN4QyxRQUFRLEVBQUUsS0FBSyxDQUFDLEVBQUUsRUFBRTtZQUNwQixTQUFTLEVBQUUsS0FBSyxDQUFDLE1BQU07WUFDdkIsTUFBTSxFQUFFLEVBQUUsQ0FBQyxNQUFNO1NBQ2xCLENBQUMsQ0FBQztRQUNILE9BQU8sSUFBSSxjQUFjLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsRUFBRSxNQUFNLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUM7SUFDakUsQ0FBQztDQUNGIn0=

package/dest/wasm/bundle.d.ts

@@ -0,0 +1,5 @@
+import { BBWASMPrivateKernelProver } from './bb_wasm_private_kernel_prover.js';
+export declare class BBWASMBundlePrivateKernelProver extends BBWASMPrivateKernelProver {
+    constructor(threads?: number, log?: import("@aztec/foundation/log").Logger);
+}
+//# sourceMappingURL=bundle.d.ts.map

package/dest/wasm/bundle.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"bundle.d.ts","sourceRoot":"","sources":["../../src/wasm/bundle.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,yBAAyB,EAAE,MAAM,oCAAoC,CAAC;AAE/E,qBAAa,+BAAgC,SAAQ,yBAAyB;gBAChE,OAAO,SAAI,EAAE,GAAG,yCAAwC;CAGrE"}

package/dest/wasm/bundle.js

@@ -0,0 +1,9 @@
+import { createLogger } from '@aztec/foundation/log';
+import { BundleArtifactProvider } from '@aztec/noir-protocol-circuits-types/client/bundle';
+import { BBWASMPrivateKernelProver } from './bb_wasm_private_kernel_prover.js';
+export class BBWASMBundlePrivateKernelProver extends BBWASMPrivateKernelProver {
+    constructor(threads = 1, log = createLogger('bb-prover:wasm:bundle')) {
+        super(new BundleArtifactProvider(), threads, log);
+    }
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnVuZGxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3dhc20vYnVuZGxlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUNyRCxPQUFPLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSxtREFBbUQsQ0FBQztBQUUzRixPQUFPLEVBQUUseUJBQXlCLEVBQUUsTUFBTSxvQ0FBb0MsQ0FBQztBQUUvRSxNQUFNLE9BQU8sK0JBQWdDLFNBQVEseUJBQXlCO0lBQzVFLFlBQVksT0FBTyxHQUFHLENBQUMsRUFBRSxHQUFHLEdBQUcsWUFBWSxDQUFDLHVCQUF1QixDQUFDO1FBQ2xFLEtBQUssQ0FBQyxJQUFJLHNCQUFzQixFQUFFLEVBQUUsT0FBTyxFQUFFLEdBQUcsQ0FBQyxDQUFDO0lBQ3BELENBQUM7Q0FDRiJ9

package/dest/wasm/lazy.d.ts

@@ -0,0 +1,5 @@
+import { BBWASMPrivateKernelProver } from './bb_wasm_private_kernel_prover.js';
+export declare class BBWASMLazyPrivateKernelProver extends BBWASMPrivateKernelProver {
+    constructor(threads?: number, log?: import("@aztec/foundation/log").Logger);
+}
+//# sourceMappingURL=lazy.d.ts.map

package/dest/wasm/lazy.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"lazy.d.ts","sourceRoot":"","sources":["../../src/wasm/lazy.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,yBAAyB,EAAE,MAAM,oCAAoC,CAAC;AAE/E,qBAAa,6BAA8B,SAAQ,yBAAyB;gBAC9D,OAAO,SAAI,EAAE,GAAG,yCAAsC;CAGnE"}

package/dest/wasm/lazy.js

@@ -0,0 +1,9 @@
+import { createLogger } from '@aztec/foundation/log';
+import { LazyArtifactProvider } from '@aztec/noir-protocol-circuits-types/client/lazy';
+import { BBWASMPrivateKernelProver } from './bb_wasm_private_kernel_prover.js';
+export class BBWASMLazyPrivateKernelProver extends BBWASMPrivateKernelProver {
+    constructor(threads = 1, log = createLogger('bb-prover:wasm:lazy')) {
+        super(new LazyArtifactProvider(), threads, log);
+    }
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGF6eS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy93YXNtL2xhenkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3JELE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLGlEQUFpRCxDQUFDO0FBRXZGLE9BQU8sRUFBRSx5QkFBeUIsRUFBRSxNQUFNLG9DQUFvQyxDQUFDO0FBRS9FLE1BQU0sT0FBTyw2QkFBOEIsU0FBUSx5QkFBeUI7SUFDMUUsWUFBWSxPQUFPLEdBQUcsQ0FBQyxFQUFFLEdBQUcsR0FBRyxZQUFZLENBQUMscUJBQXFCLENBQUM7UUFDaEUsS0FBSyxDQUFDLElBQUksb0JBQW9CLEVBQUUsRUFBRSxPQUFPLEVBQUUsR0FBRyxDQUFDLENBQUM7SUFDbEQsQ0FBQztDQUNGIn0=

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@aztec/bb-prover",
-  "version": "0.69.0-devnet",
+  "version": "0.69.1-devnet",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
-    "./wasm": "./dest/wasm/index.js",
+    "./wasm/bundle": "./dest/wasm/bundle.js",
+    "./wasm/lazy": "./dest/wasm/lazy.js",
     "./prover": "./dest/prover/index.js",
     "./verifier": "./dest/verifier/index.js",
     "./test": "./dest/test/index.js",
@@ -66,14 +67,14 @@
     ]
   },
   "dependencies": {
-    "@aztec/bb.js": "0.69.0-devnet",
-    "@aztec/circuit-types": "0.69.0-devnet",
-    "@aztec/circuits.js": "0.69.0-devnet",
-    "@aztec/foundation": "0.69.0-devnet",
-    "@aztec/noir-protocol-circuits-types": "0.69.0-devnet",
-    "@aztec/simulator": "0.69.0-devnet",
-    "@aztec/telemetry-client": "0.69.0-devnet",
-    "@aztec/world-state": "0.69.0-devnet",
+    "@aztec/bb.js": "0.69.1-devnet",
+    "@aztec/circuit-types": "0.69.1-devnet",
+    "@aztec/circuits.js": "0.69.1-devnet",
+    "@aztec/foundation": "0.69.1-devnet",
+    "@aztec/noir-protocol-circuits-types": "0.69.1-devnet",
+    "@aztec/simulator": "0.69.1-devnet",
+    "@aztec/telemetry-client": "0.69.1-devnet",
+    "@aztec/world-state": "0.69.1-devnet",
     "@msgpack/msgpack": "^3.0.0-beta2",
     "@noir-lang/noirc_abi": "portal:../../noir/packages/noirc_abi",
     "@noir-lang/types": "portal:../../noir/packages/types",

package/src/bb/cli.ts

@@ -1,5 +1,8 @@
 import { type LogFn } from '@aztec/foundation/log';
-import { type ProtocolArtifact, ProtocolCircuitArtifacts } from '@aztec/noir-protocol-circuits-types';
+import { ClientCircuitArtifacts } from '@aztec/noir-protocol-circuits-types/client/bundle';
+import { ServerCircuitArtifacts } from '@aztec/noir-protocol-circuits-types/server';
+import { type ProtocolArtifact } from '@aztec/noir-protocol-circuits-types/types';
+import { type NoirCompiledCircuit } from '@aztec/types/noir';
 
 import { Command } from 'commander';
 import { promises as fs } from 'fs';
@@ -8,6 +11,11 @@ import { generateContractForCircuit, generateKeyForNoirCircuit } from './execute
 
 const { BB_WORKING_DIRECTORY, BB_BINARY_PATH } = process.env;
 
+export const ProtocolCircuitArtifacts: Record<ProtocolArtifact, NoirCompiledCircuit> = {
+  ...ClientCircuitArtifacts,
+  ...ServerCircuitArtifacts,
+};
+
 /**
  * Returns commander program that defines the CLI.
  * @param log - Console logger.

package/src/honk.ts

@@ -1,35 +1,30 @@
-import { type ProtocolArtifact } from '@aztec/noir-protocol-circuits-types';
+import { type ServerProtocolArtifact } from '@aztec/noir-protocol-circuits-types/server';
 
 export type UltraHonkFlavor = 'ultra_honk' | 'ultra_keccak_honk' | 'ultra_rollup_honk';
 
-const UltraKeccakHonkCircuits = ['RootRollupArtifact'] as const satisfies ProtocolArtifact[];
-const UltraHonkCircuits = [
-  // 'EmptyNestedArtifact',
-  // 'PrivateKernelEmptyArtifact',
-  'BaseParityArtifact',
-  'RootParityArtifact',
-] as const satisfies ProtocolArtifact[];
+const UltraKeccakHonkCircuits = ['RootRollupArtifact'] as const satisfies ServerProtocolArtifact[];
+const UltraHonkCircuits = ['BaseParityArtifact', 'RootParityArtifact'] as const satisfies ServerProtocolArtifact[];
 
-export type UltraKeccakHonkProtocolArtifact = (typeof UltraKeccakHonkCircuits)[number];
-export type UltraHonkProtocolArtifact = (typeof UltraHonkCircuits)[number];
-export type UltraRollupHonkProtocolArtifact = Exclude<
-  Exclude<ProtocolArtifact, UltraKeccakHonkProtocolArtifact>,
-  UltraHonkProtocolArtifact
+export type UltraKeccakHonkServerProtocolArtifact = (typeof UltraKeccakHonkCircuits)[number];
+export type UltraHonkServerProtocolArtifact = (typeof UltraHonkCircuits)[number];
+export type UltraRollupHonkServerProtocolArtifact = Exclude<
+  Exclude<ServerProtocolArtifact, UltraKeccakHonkServerProtocolArtifact>,
+  UltraHonkServerProtocolArtifact
 >;
 
-export function getUltraHonkFlavorForCircuit(artifact: UltraKeccakHonkProtocolArtifact): 'ultra_keccak_honk';
-export function getUltraHonkFlavorForCircuit(artifact: UltraHonkProtocolArtifact): 'ultra_honk';
-export function getUltraHonkFlavorForCircuit(artifact: UltraRollupHonkProtocolArtifact): 'ultra_rollup_honk';
-export function getUltraHonkFlavorForCircuit(artifact: ProtocolArtifact): UltraHonkFlavor;
-export function getUltraHonkFlavorForCircuit(artifact: ProtocolArtifact): UltraHonkFlavor {
+export function getUltraHonkFlavorForCircuit(artifact: UltraKeccakHonkServerProtocolArtifact): 'ultra_keccak_honk';
+export function getUltraHonkFlavorForCircuit(artifact: UltraHonkServerProtocolArtifact): 'ultra_honk';
+export function getUltraHonkFlavorForCircuit(artifact: UltraRollupHonkServerProtocolArtifact): 'ultra_rollup_honk';
+export function getUltraHonkFlavorForCircuit(artifact: ServerProtocolArtifact): UltraHonkFlavor;
+export function getUltraHonkFlavorForCircuit(artifact: ServerProtocolArtifact): UltraHonkFlavor {
   if (isUltraKeccakHonkCircuit(artifact)) {
     return 'ultra_keccak_honk';
-  } else if (UltraHonkCircuits.includes(artifact as UltraHonkProtocolArtifact)) {
+  } else if (UltraHonkCircuits.includes(artifact as UltraHonkServerProtocolArtifact)) {
     return 'ultra_honk';
   }
   return 'ultra_rollup_honk';
 }
 
-function isUltraKeccakHonkCircuit(artifact: ProtocolArtifact): artifact is UltraKeccakHonkProtocolArtifact {
-  return UltraKeccakHonkCircuits.includes(artifact as UltraKeccakHonkProtocolArtifact);
+function isUltraKeccakHonkCircuit(artifact: ServerProtocolArtifact): artifact is UltraKeccakHonkServerProtocolArtifact {
+  return UltraKeccakHonkCircuits.includes(artifact as UltraKeccakHonkServerProtocolArtifact);
 }

package/src/prover/bb_native_private_kernel_prover.ts

@@ -0,0 +1,110 @@
+import { type ClientIvcProof } from '@aztec/circuits.js';
+import { runInDirectory } from '@aztec/foundation/fs';
+import { type Logger, createLogger } from '@aztec/foundation/log';
+import { BundleArtifactProvider } from '@aztec/noir-protocol-circuits-types/client/bundle';
+
+import { encode } from '@msgpack/msgpack';
+import { serializeWitness } from '@noir-lang/noirc_abi';
+import { type WitnessMap } from '@noir-lang/types';
+import { promises as fs } from 'fs';
+import path from 'path';
+
+import { BB_RESULT, computeGateCountForCircuit, executeBbClientIvcProof } from '../bb/execute.js';
+import { type BBConfig } from '../config.js';
+import { BBPrivateKernelProver } from './bb_private_kernel_prover.js';
+import { readFromOutputDirectory } from './client_ivc_proof_utils.js';
+
+/**
+ * This proof creator implementation uses the native bb binary.
+ */
+export class BBNativePrivateKernelProver extends BBPrivateKernelProver {
+  private constructor(
+    private bbBinaryPath: string,
+    private bbWorkingDirectory: string,
+    private skipCleanup: boolean,
+    protected override log = createLogger('bb-prover:native'),
+  ) {
+    super(new BundleArtifactProvider(), log);
+  }
+
+  public static async new(config: BBConfig, log?: Logger) {
+    await fs.mkdir(config.bbWorkingDirectory, { recursive: true });
+    return new BBNativePrivateKernelProver(config.bbBinaryPath, config.bbWorkingDirectory, !!config.bbSkipCleanup, log);
+  }
+
+  private async _createClientIvcProof(
+    directory: string,
+    acirs: Buffer[],
+    witnessStack: WitnessMap[],
+  ): Promise<ClientIvcProof> {
+    // TODO(#7371): Longer term we won't use this hacked together msgpack format
+    // and instead properly create the bincode serialization from rust
+    await fs.writeFile(path.join(directory, 'acir.msgpack'), encode(acirs));
+    await fs.writeFile(
+      path.join(directory, 'witnesses.msgpack'),
+      encode(witnessStack.map(map => serializeWitness(map))),
+    );
+    const provingResult = await executeBbClientIvcProof(
+      this.bbBinaryPath,
+      directory,
+      path.join(directory, 'acir.msgpack'),
+      path.join(directory, 'witnesses.msgpack'),
+      this.log.info,
+    );
+
+    if (provingResult.status === BB_RESULT.FAILURE) {
+      this.log.error(`Failed to generate client ivc proof`);
+      throw new Error(provingResult.reason);
+    }
+
+    const proof = await readFromOutputDirectory(directory);
+
+    this.log.info(`Generated IVC proof`, {
+      duration: provingResult.durationMs,
+      eventName: 'circuit-proving',
+    });
+
+    return proof;
+  }
+
+  public override async createClientIvcProof(acirs: Buffer[], witnessStack: WitnessMap[]): Promise<ClientIvcProof> {
+    this.log.info(`Generating Client IVC proof`);
+    const operation = async (directory: string) => {
+      return await this._createClientIvcProof(directory, acirs, witnessStack);
+    };
+    return await this.runInDirectory(operation);
+  }
+
+  public override async computeGateCountForCircuit(bytecode: Buffer, circuitName: string): Promise<number> {
+    const logFunction = (message: string) => {
+      this.log.debug(`$bb gates ${circuitName} - ${message}`);
+    };
+
+    const result = await computeGateCountForCircuit(
+      this.bbBinaryPath,
+      this.bbWorkingDirectory,
+      circuitName,
+      bytecode,
+      'mega_honk',
+      logFunction,
+    );
+    if (result.status === BB_RESULT.FAILURE) {
+      throw new Error(result.reason);
+    }
+
+    return result.circuitSize as number;
+  }
+
+  private runInDirectory<T>(fn: (dir: string) => Promise<T>) {
+    const log = this.log;
+    return runInDirectory(
+      this.bbWorkingDirectory,
+      (dir: string) =>
+        fn(dir).catch(err => {
+          log.error(`Error running operation at ${dir}: ${err}`);
+          throw err;
+        }),
+      this.skipCleanup,
+    );
+  }
+}