@aztec/bb-prover 0.76.4 → 0.77.0-testnet-ignition.21

package/src/verifier/bb_verifier.ts

@@ -1,16 +1,18 @@
-import { type ClientProtocolCircuitVerifier, Tx } from '@aztec/circuit-types';
-import { type CircuitVerificationStats } from '@aztec/circuit-types/stats';
-import { type Proof, type VerificationKeyData } from '@aztec/circuits.js';
 import { runInDirectory } from '@aztec/foundation/fs';
 import { type Logger, createLogger } from '@aztec/foundation/log';
-import { type ClientProtocolArtifact, type ServerProtocolArtifact } from '@aztec/noir-protocol-circuits-types/types';
-import { ServerCircuitVks } from '@aztec/noir-protocol-circuits-types/vks';
+import { ServerCircuitVks } from '@aztec/noir-protocol-circuits-types/server/vks';
+import type { ClientProtocolArtifact, ServerProtocolArtifact } from '@aztec/noir-protocol-circuits-types/types';
+import type { ClientProtocolCircuitVerifier } from '@aztec/stdlib/interfaces/server';
+import type { Proof } from '@aztec/stdlib/proofs';
+import type { CircuitVerificationStats } from '@aztec/stdlib/stats';
+import { Tx } from '@aztec/stdlib/tx';
+import type { VerificationKeyData } from '@aztec/stdlib/vks';
 
 import { promises as fs } from 'fs';
 import * as path from 'path';
 
 import { BB_RESULT, PROOF_FILENAME, VK_FILENAME, verifyClientIvcProof, verifyProof } from '../bb/execute.js';
-import { type BBConfig } from '../config.js';
+import type { BBConfig } from '../config.js';
 import { getUltraHonkFlavorForCircuit } from '../honk.js';
 import { writeToOutputDirectory } from '../prover/client_ivc_proof_utils.js';
 import { mapProtocolArtifactNameToCircuitName } from '../stats.js';
@@ -62,7 +64,7 @@ export class BBCircuitVerifier implements ClientProtocolCircuitVerifier {
         proofType: 'ultra-honk',
       } satisfies CircuitVerificationStats);
     };
-    await runInDirectory(this.config.bbWorkingDirectory, operation, this.config.bbSkipCleanup);
+    await runInDirectory(this.config.bbWorkingDirectory, operation, this.config.bbSkipCleanup, this.logger);
   }
 
   public async verifyProof(tx: Tx): Promise<boolean> {
@@ -83,7 +85,12 @@ export class BBCircuitVerifier implements ClientProtocolCircuitVerifier {
         };
 
         await writeToOutputDirectory(tx.clientIvcProof, bbWorkingDirectory);
-        const result = await verifyClientIvcProof(this.config.bbBinaryPath, bbWorkingDirectory, logFunction);
+        const result = await verifyClientIvcProof(
+          this.config.bbBinaryPath,
+          bbWorkingDirectory.concat('/proof'),
+          bbWorkingDirectory.concat('/vk'),
+          logFunction,
+        );
 
         if (result.status === BB_RESULT.FAILURE) {
           const errorMessage = `Failed to verify ${circuit} proof!`;
@@ -97,7 +104,7 @@ export class BBCircuitVerifier implements ClientProtocolCircuitVerifier {
           proofType: 'client-ivc',
         } satisfies CircuitVerificationStats);
       };
-      await runInDirectory(this.config.bbWorkingDirectory, operation, this.config.bbSkipCleanup);
+      await runInDirectory(this.config.bbWorkingDirectory, operation, this.config.bbSkipCleanup, this.logger);
       return true;
     } catch (err) {
       this.logger.warn(`Failed to verify ClientIVC proof for tx ${Tx.getHash(tx)}: ${String(err)}`);

package/src/wasm/bb_wasm_private_kernel_prover.ts

@@ -1,12 +1,12 @@
 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 { type ArtifactProvider } from '@aztec/noir-protocol-circuits-types/types';
-import { type SimulationProvider } from '@aztec/simulator/client';
+import type { ArtifactProvider } from '@aztec/noir-protocol-circuits-types/types';
+import type { SimulationProvider } from '@aztec/simulator/client';
+import { ClientIvcProof } from '@aztec/stdlib/proofs';
 
 import { serializeWitness } from '@noir-lang/noirc_abi';
-import { type WitnessMap } from '@noir-lang/types';
+import type { WitnessMap } from '@noir-lang/types';
 import { ungzip } from 'pako';
 
 import { BBPrivateKernelProver } from '../prover/bb_private_kernel_prover.js';
@@ -26,7 +26,7 @@ export abstract class BBWASMPrivateKernelProver extends BBPrivateKernelProver {
     this.log.info(`Generating ClientIVC proof...`);
     const backend = new AztecClientBackend(
       acirs.map(acir => ungzip(acir)),
-      { threads: this.threads },
+      { threads: this.threads, logger: this.log.verbose, wasmPath: process.env.BB_WASM_PATH },
     );
 
     const [proof, vk] = await backend.prove(witnessStack.map(witnessMap => ungzip(serializeWitness(witnessMap))));
@@ -39,4 +39,17 @@ export abstract class BBWASMPrivateKernelProver extends BBPrivateKernelProver {
     });
     return new ClientIvcProof(Buffer.from(proof), Buffer.from(vk));
   }
+
+  public override async computeGateCountForCircuit(_bytecode: Buffer, _circuitName: string): Promise<number> {
+    const backend = new AztecClientBackend([ungzip(_bytecode)], {
+      threads: this.threads,
+      logger: this.log.verbose,
+      wasmPath: process.env.BB_WASM_PATH,
+    });
+
+    const gateCount = await backend.gates();
+    await backend.destroy();
+
+    return gateCount[0];
+  }
 }

package/src/wasm/bundle.ts

@@ -1,6 +1,6 @@
 import { createLogger } from '@aztec/foundation/log';
 import { BundleArtifactProvider } from '@aztec/noir-protocol-circuits-types/client/bundle';
-import { type SimulationProvider } from '@aztec/simulator/client';
+import type { SimulationProvider } from '@aztec/simulator/client';
 
 import { BBWASMPrivateKernelProver } from './bb_wasm_private_kernel_prover.js';
 

package/src/wasm/lazy.ts

@@ -1,6 +1,6 @@
 import { createLogger } from '@aztec/foundation/log';
 import { LazyArtifactProvider } from '@aztec/noir-protocol-circuits-types/client/lazy';
-import { type SimulationProvider } from '@aztec/simulator/client';
+import type { SimulationProvider } from '@aztec/simulator/client';
 
 import { BBWASMPrivateKernelProver } from './bb_wasm_private_kernel_prover.js';