@aztec/bb-prover 0.87.2 → 0.87.3-nightly.20250528

package/dest/test/test_circuit_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_PROOF_LENGTH_IN_FIELDS, AVM_VERIFICATION_KEY_LENGTH_IN_FIELDS, NESTED_RECURSIVE_PROOF_LENGTH, NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH, RECURSIVE_PROOF_LENGTH, TUBE_PROOF_LENGTH } from '@aztec/constants';
+import { AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED, AVM_V2_VERIFICATION_KEY_LENGTH_IN_FIELDS_PADDED, NESTED_RECURSIVE_PROOF_LENGTH, NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH, RECURSIVE_PROOF_LENGTH, TUBE_PROOF_LENGTH } from '@aztec/constants';
 import { createLogger } from '@aztec/foundation/log';
 import { sleep } from '@aztec/foundation/sleep';
 import { Timer } from '@aztec/foundation/timer';
@@ -105,7 +105,7 @@ import { PROOF_DELAY_MS, WITGEN_DELAY_MS } from './delay_values.js';
         // We can't simulate the AVM because we don't have enough context to do so (e.g., DBs).
         // We just return an empty proof and VK data.
         this.logger.debug('Skipping AVM simulation in TestCircuitProver.');
-        return this.applyDelay(ProvingRequestType.PUBLIC_VM, ()=>makeProofAndVerificationKey(makeEmptyRecursiveProof(AVM_PROOF_LENGTH_IN_FIELDS), VerificationKeyData.makeFake(AVM_VERIFICATION_KEY_LENGTH_IN_FIELDS)));
+        return this.applyDelay(ProvingRequestType.PUBLIC_VM, ()=>makeProofAndVerificationKey(makeEmptyRecursiveProof(AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED), VerificationKeyData.makeFake(AVM_V2_VERIFICATION_KEY_LENGTH_IN_FIELDS_PADDED)));
     }
     async applyDelay(type, fn) {
         const timer = new Timer();

package/dest/verification_key/verification_key_data.d.ts

@@ -5,5 +5,11 @@ 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

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,CAWzF;AAGD,wBAAsB,gBAAgB,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAc5F"}
+{"version":3,"file":"verification_key_data.d.ts","sourceRoot":"","sources":["../../src/verification_key/verification_key_data.ts"],"names":[],"mappings":"AAIA,OAAO,EAA2B,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAQjF;;;;GAIG;AACH,wBAAsB,aAAa,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAWzF;AAED;;;;;GAKG;AACH,wBAAsB,gBAAgB,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAe5F"}

package/dest/verification_key/verification_key_data.js

@@ -1,5 +1,6 @@
-import { AVM_VERIFICATION_KEY_LENGTH_IN_FIELDS } from '@aztec/constants';
+import { AVM_V2_VERIFICATION_KEY_LENGTH_IN_FIELDS_PADDED } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/fields';
+import { BufferReader } from '@aztec/foundation/serialize';
 import { hashVK } from '@aztec/stdlib/hash';
 import { VerificationKeyAsFields, VerificationKeyData } from '@aztec/stdlib/vks';
 import { strict as assert } from 'assert';
@@ -24,21 +25,20 @@ import { VK_FIELDS_FILENAME, VK_FILENAME } from '../bb/execute.js';
     const vkAsFields = new VerificationKeyAsFields(fields, vkHash);
     return new VerificationKeyData(vkAsFields, rawBinary);
 }
-// TODO: This was adapted from the above function. A refactor might be needed.
-export async function extractAvmVkData(vkDirectoryPath) {
-    const [rawFields, rawBinary] = await Promise.all([
-        fs.readFile(path.join(vkDirectoryPath, VK_FIELDS_FILENAME), {
-            encoding: 'utf-8'
-        }),
-        fs.readFile(path.join(vkDirectoryPath, VK_FILENAME))
-    ]);
-    const fieldsJson = JSON.parse(rawFields);
-    const fields = fieldsJson.map(Fr.fromHexString);
-    // The first item is the hash, this is not part of the actual VK
-    // TODO: is the above actually the case?
-    const vkHash = fields[0];
-    assert(fields.length === AVM_VERIFICATION_KEY_LENGTH_IN_FIELDS, 'Invalid AVM verification key length');
-    const vkAsFields = new VerificationKeyAsFields(fields, vkHash);
+/**
+ * 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)));
+    // Currently, we do not need the vk hash for the AVM as we are not adding in the vk tree.
+    const vkAsFields = new VerificationKeyAsFields(fieldsArrayPadded, new Fr(0));
     const vk = new VerificationKeyData(vkAsFields, rawBinary);
     return vk;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/bb-prover",
-  "version": "0.87.2",
+  "version": "0.87.3-nightly.20250528",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -66,30 +66,32 @@
     ]
   },
   "dependencies": {
-    "@aztec/bb.js": "0.87.2",
-    "@aztec/constants": "0.87.2",
-    "@aztec/foundation": "0.87.2",
-    "@aztec/noir-noirc_abi": "0.87.2",
-    "@aztec/noir-protocol-circuits-types": "0.87.2",
-    "@aztec/noir-types": "0.87.2",
-    "@aztec/simulator": "0.87.2",
-    "@aztec/stdlib": "0.87.2",
-    "@aztec/telemetry-client": "0.87.2",
-    "@aztec/world-state": "0.87.2",
+    "@aztec/bb.js": "0.87.3-nightly.20250528",
+    "@aztec/constants": "0.87.3-nightly.20250528",
+    "@aztec/foundation": "0.87.3-nightly.20250528",
+    "@aztec/noir-noirc_abi": "0.87.3-nightly.20250528",
+    "@aztec/noir-protocol-circuits-types": "0.87.3-nightly.20250528",
+    "@aztec/noir-types": "0.87.3-nightly.20250528",
+    "@aztec/simulator": "0.87.3-nightly.20250528",
+    "@aztec/stdlib": "0.87.3-nightly.20250528",
+    "@aztec/telemetry-client": "0.87.3-nightly.20250528",
+    "@aztec/world-state": "0.87.3-nightly.20250528",
     "commander": "^12.1.0",
     "pako": "^2.1.0",
+    "pidusage": "^4.0.1",
     "source-map-support": "^0.5.21",
     "tslib": "^2.4.0"
   },
   "devDependencies": {
-    "@aztec/ethereum": "0.87.2",
-    "@aztec/kv-store": "0.87.2",
-    "@aztec/noir-contracts.js": "0.87.2",
-    "@aztec/noir-test-contracts.js": "0.87.2",
-    "@aztec/protocol-contracts": "0.87.2",
+    "@aztec/ethereum": "0.87.3-nightly.20250528",
+    "@aztec/kv-store": "0.87.3-nightly.20250528",
+    "@aztec/noir-contracts.js": "0.87.3-nightly.20250528",
+    "@aztec/noir-test-contracts.js": "0.87.3-nightly.20250528",
+    "@aztec/protocol-contracts": "0.87.3-nightly.20250528",
     "@jest/globals": "^29.5.0",
     "@types/jest": "^29.5.0",
     "@types/node": "^22.15.17",
+    "@types/pidusage": "^2.0.5",
     "@types/source-map-support": "^0.5.10",
     "jest": "^29.5.0",
     "jest-mock-extended": "^3.0.3",

package/src/avm_proving_tests/avm_proving_tester.ts

@@ -7,7 +7,6 @@ import { type AvmCircuitInputs, AvmCircuitPublicInputs } 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';
-import { VerificationKeyData } from '@aztec/stdlib/vks';
 import { NativeWorldStateService } from '@aztec/world-state';
 
 import fs from 'node:fs/promises';
@@ -18,12 +17,10 @@ import {
   type BBResult,
   type BBSuccess,
   BB_RESULT,
+  VK_FILENAME,
   generateAvmProof,
-  generateAvmProofV2,
   verifyAvmProof,
-  verifyAvmProofV2,
 } from '../bb/execute.js';
-import { extractAvmVkData } from '../verification_key/verification_key_data.js';
 
 const BB_PATH = path.resolve('../../barretenberg/cpp/build/bin/bb');
 
@@ -31,20 +28,19 @@ export class AvmProvingTester extends PublicTxSimulationTester {
   constructor(
     private bbWorkingDirectory: string,
     private checkCircuitOnly: boolean,
-    merkleTree: MerkleTreeWriteOperations,
     contractDataSource: SimpleContractDataSource,
+    merkleTrees: MerkleTreeWriteOperations,
     globals?: GlobalVariables,
   ) {
-    super(merkleTree, contractDataSource, globals);
+    super(merkleTrees, contractDataSource, globals);
   }
 
-  // overriding parent class' create is a pain, so we use a different nam
   static async new(checkCircuitOnly: boolean = false, globals?: GlobalVariables) {
     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, merkleTrees, contractDataSource, globals);
+    return new AvmProvingTester(bbWorkingDirectory, checkCircuitOnly, contractDataSource, merkleTrees, globals);
   }
 
   async prove(avmCircuitInputs: AvmCircuitInputs): Promise<BBResult> {
@@ -59,95 +55,36 @@ export class AvmProvingTester extends PublicTxSimulationTester {
     if (proofRes.status === BB_RESULT.FAILURE) {
       this.logger.error(`Proof generation failed: ${proofRes.reason}`);
     }
-    return proofRes;
+    expect(proofRes.status).toEqual(BB_RESULT.SUCCESS);
+    return proofRes as BBSuccess;
   }
 
-  async verify(proofRes: BBSuccess): Promise<BBResult> {
+  async verify(proofRes: BBSuccess, publicInputs: AvmCircuitPublicInputs): Promise<BBResult> {
     if (this.checkCircuitOnly) {
-      // Skip verification if we're only checking the circuit.
-      // Check-circuit doesn't generate a proof to verify.
+      // Skip verification if we are only checking the circuit.
+      // Check-circuit does not generate a proof to verify.
       return proofRes;
     }
-    // Then we test VK extraction and serialization.
-    const succeededRes = proofRes as BBSuccess;
-    const vkData = await extractAvmVkData(succeededRes.vkPath!);
-    VerificationKeyData.fromBuffer(vkData.toBuffer());
-
-    // Then we verify.
-    const rawVkPath = path.join(succeededRes.vkPath!, 'vk');
-    return await verifyAvmProof(BB_PATH, succeededRes.proofPath!, rawVkPath, this.logger);
-  }
-
-  public async simProveVerify(
-    sender: AztecAddress,
-    setupCalls: TestEnqueuedCall[],
-    appCalls: TestEnqueuedCall[],
-    teardownCall: TestEnqueuedCall | undefined,
-    expectRevert: boolean | undefined,
-    feePayer = sender,
-  ) {
-    const simRes = await this.simulateTx(sender, setupCalls, appCalls, teardownCall, feePayer);
-    expect(simRes.revertCode.isOK()).toBe(expectRevert ? false : true);
-    const avmCircuitInputs = simRes.avmProvingRequest.inputs;
-    const provingRes = await this.prove(avmCircuitInputs);
-    expect(provingRes.status).toEqual(BB_RESULT.SUCCESS);
-    const verificationRes = await this.verify(provingRes as BBSuccess);
-    expect(verificationRes.status).toBe(BB_RESULT.SUCCESS);
-  }
-
-  public async simProveVerifyAppLogic(appCall: TestEnqueuedCall, expectRevert?: boolean) {
-    const simRes = await this.simulateTx(/*sender=*/ AztecAddress.fromNumber(42), /*setupCalls=*/ [], [appCall]);
-    expect(simRes.revertCode.isOK()).toBe(expectRevert ? false : true);
-
-    const avmCircuitInputs = simRes.avmProvingRequest.inputs;
-    const provingRes = await this.prove(avmCircuitInputs);
-    expect(provingRes.status).toEqual(BB_RESULT.SUCCESS);
-
-    const verificationRes = await this.verify(provingRes as BBSuccess);
-    expect(verificationRes.status).toBe(BB_RESULT.SUCCESS);
-  }
-}
-
-export class AvmProvingTesterV2 extends PublicTxSimulationTester {
-  constructor(
-    private bbWorkingDirectory: string,
-    contractDataSource: SimpleContractDataSource,
-    merkleTrees: MerkleTreeWriteOperations,
-    globals?: GlobalVariables,
-  ) {
-    super(merkleTrees, contractDataSource, globals);
-  }
-
-  static async new(globals?: GlobalVariables) {
-    const bbWorkingDirectory = await fs.mkdtemp(path.join(tmpdir(), 'bb-'));
-
-    const contractDataSource = new SimpleContractDataSource();
-    const merkleTrees = await (await NativeWorldStateService.tmp()).fork();
-    return new AvmProvingTesterV2(bbWorkingDirectory, contractDataSource, merkleTrees, globals);
-  }
-
-  async proveV2(avmCircuitInputs: AvmCircuitInputs): Promise<BBResult> {
-    // Then we prove.
-    const proofRes = await generateAvmProofV2(BB_PATH, this.bbWorkingDirectory, avmCircuitInputs, this.logger);
-    if (proofRes.status === BB_RESULT.FAILURE) {
-      this.logger.error(`Proof generation failed: ${proofRes.reason}`);
-    }
-    expect(proofRes.status).toEqual(BB_RESULT.SUCCESS);
-    return proofRes as BBSuccess;
-  }
 
-  async verifyV2(proofRes: BBSuccess, publicInputs: AvmCircuitPublicInputs): Promise<BBResult> {
-    return await verifyAvmProofV2(
+    return await verifyAvmProof(
       BB_PATH,
       this.bbWorkingDirectory,
       proofRes.proofPath!,
       publicInputs,
-      proofRes.vkPath!,
+      path.join(proofRes.vkDirectoryPath!, VK_FILENAME),
       this.logger,
     );
   }
 
-  public async simProveVerifyV2(
+  public async proveVerify(avmCircuitInputs: AvmCircuitInputs) {
+    const provingRes = await this.prove(avmCircuitInputs);
+    expect(provingRes.status).toEqual(BB_RESULT.SUCCESS);
+
+    const verificationRes = await this.verify(provingRes as BBSuccess, avmCircuitInputs.publicInputs);
+    expect(verificationRes.status).toBe(BB_RESULT.SUCCESS);
+  }
+
+  public async simProveVerify(
     sender: AztecAddress,
     setupCalls: TestEnqueuedCall[],
     appCalls: TestEnqueuedCall[],
@@ -159,10 +96,16 @@ export class AvmProvingTesterV2 extends PublicTxSimulationTester {
     expect(simRes.revertCode.isOK()).toBe(expectRevert ? false : true);
 
     const avmCircuitInputs = simRes.avmProvingRequest.inputs;
-    const provingRes = await this.proveV2(avmCircuitInputs);
-    expect(provingRes.status).toEqual(BB_RESULT.SUCCESS);
+    await this.proveVerify(avmCircuitInputs);
+  }
 
-    const verificationRes = await this.verifyV2(provingRes as BBSuccess, avmCircuitInputs.publicInputs);
-    expect(verificationRes.status).toBe(BB_RESULT.SUCCESS);
+  public async simProveVerifyAppLogic(appCall: TestEnqueuedCall, expectRevert?: boolean) {
+    await this.simProveVerify(
+      /*sender=*/ AztecAddress.fromNumber(42),
+      /*setupCalls=*/ [],
+      [appCall],
+      undefined,
+      expectRevert,
+    );
   }
 }

package/src/bb/execute.ts

@@ -6,6 +6,7 @@ import type { AvmCircuitInputs, AvmCircuitPublicInputs } from '@aztec/stdlib/avm
 import * as proc from 'child_process';
 import { promises as fs } from 'fs';
 import { basename, dirname, join } from 'path';
+import pidusage from 'pidusage';
 
 import type { UltraHonkFlavor } from '../honk.js';
 
@@ -32,7 +33,7 @@ export type BBSuccess = {
   /** Full path of the public key. */
   pkPath?: string;
   /** Base directory for the VKs (raw, fields). */
-  vkPath?: string;
+  vkDirectoryPath?: string;
   /** Full path of the proof. */
   proofPath?: string;
   /** Full path of the contract. */
@@ -49,8 +50,6 @@ export type BBFailure = {
 
 export type BBResult = BBSuccess | BBFailure;
 
-export type VerificationFunction = typeof verifyProof | typeof verifyAvmProof;
-
 type BBExecResult = {
   status: BB_RESULT;
   exitCode: number;
@@ -97,11 +96,23 @@ export function executeBB(
 
     bb.stdout.on('data', data => {
       const message = data.toString('utf-8').replace(/\n$/, '');
-      logger(message);
+      pidusage(bb.pid!, (err, stats) => {
+        if (err) {
+          logger(message);
+        } else {
+          logger(`${message} (mem: ${(stats.memory / 1024 / 1024).toFixed(2)}MiB)`);
+        }
+      });
     });
     bb.stderr.on('data', data => {
       const message = data.toString('utf-8').replace(/\n$/, '');
-      logger(message);
+      pidusage(bb.pid!, (err, stats) => {
+        if (err) {
+          logger(message);
+        } else {
+          logger(`${message} (mem: ${(stats.memory / 1024 / 1024).toFixed(2)}MiB)`);
+        }
+      });
     });
     bb.on('close', (exitCode: number, signal?: string) => {
       if (timeoutId) {
@@ -162,7 +173,7 @@ export async function executeBbClientIvcProof(
         durationMs,
         proofPath: `${outputPath}`,
         pkPath: undefined,
-        vkPath: `${outputPath}`,
+        vkDirectoryPath: `${outputPath}`,
       };
     }
     // Not a great error message here but it is difficult to decipher what comes from bb
@@ -266,7 +277,7 @@ export async function generateProof(
         durationMs: duration,
         proofPath: `${outputPath}`,
         pkPath: undefined,
-        vkPath: `${outputPath}`,
+        vkDirectoryPath: `${outputPath}`,
       };
     }
     // Not a great error message here but it is difficult to decipher what comes from bb
@@ -334,7 +345,7 @@ export async function generateTubeProof(
         durationMs,
         proofPath: outputPath,
         pkPath: undefined,
-        vkPath: outputPath,
+        vkDirectoryPath: outputPath,
       };
     }
     // Not a great error message here but it is difficult to decipher what comes from bb
@@ -354,14 +365,16 @@ export async function generateTubeProof(
  * @param pathToBB - The full path to the bb binary
  * @param workingDirectory - A working directory for use by bb
  * @param input - The inputs for the public function to be proven
- * @param log - A logging function
+ * @param logger - A logging function
+ * @param checkCircuitOnly - A boolean to toggle a "check-circuit only" operation instead of proving.
  * @returns An object containing a result indication, the location of the proof and the duration taken
  */
-export async function generateAvmProofV2(
+export async function generateAvmProof(
   pathToBB: string,
   workingDirectory: string,
   input: AvmCircuitInputs,
   logger: Logger,
+  checkCircuitOnly: boolean = false,
 ): Promise<BBFailure | BBSuccess> {
   // Check that the working directory exists
   try {
@@ -401,99 +414,12 @@ export async function generateAvmProofV2(
       args.push(loggingArg);
     }
     const timer = new Timer();
-    const logFunction = (message: string) => {
-      logger.verbose(`AvmCircuit (prove) BB out - ${message}`);
-    };
-    const result = await executeBB(pathToBB, 'avm2_prove', args, logFunction);
-    const duration = timer.ms();
-
-    if (result.status == BB_RESULT.SUCCESS) {
-      return {
-        status: BB_RESULT.SUCCESS,
-        durationMs: duration,
-        proofPath: join(outputPath, PROOF_FILENAME),
-        pkPath: undefined,
-        vkPath: join(outputPath, VK_FILENAME),
-      };
-    }
-    // Not a great error message here but it is difficult to decipher what comes from bb
-    return {
-      status: BB_RESULT.FAILURE,
-      reason: `Failed to generate proof. Exit code ${result.exitCode}. Signal ${result.signal}.`,
-      retry: !!result.signal,
-    };
-  } catch (error) {
-    return { status: BB_RESULT.FAILURE, reason: `${error}` };
-  }
-}
-
-/**
- * Used for generating AVM proofs (or doing check-circuit).
- * It is assumed that the working directory is a temporary and/or random directory used solely for generating this proof.
- * @param pathToBB - The full path to the bb binary
- * @param workingDirectory - A working directory for use by bb
- * @param bytecode - The AVM bytecode for the public function to be proven (expected to be decompressed)
- * @param log - A logging function
- * @returns An object containing a result indication, the location of the proof and the duration taken
- */
-export async function generateAvmProof(
-  pathToBB: string,
-  workingDirectory: string,
-  _input: AvmCircuitInputs,
-  logger: Logger,
-  checkCircuitOnly: boolean = false,
-): Promise<BBFailure | BBSuccess> {
-  // Check that the working directory exists
-  try {
-    await fs.access(workingDirectory);
-  } catch {
-    return { status: BB_RESULT.FAILURE, reason: `Working directory ${workingDirectory} does not exist` };
-  }
 
-  // Paths for the inputs
-  const publicInputsPath = join(workingDirectory, AVM_PUBLIC_INPUTS_FILENAME);
-
-  // The proof is written to e.g. /workingDirectory/proof
-  const outputPath = workingDirectory;
-
-  const filePresent = async (file: string) =>
-    await fs
-      .access(file, fs.constants.R_OK)
-      .then(_ => true)
-      .catch(_ => false);
-
-  const binaryPresent = await filePresent(pathToBB);
-  if (!binaryPresent) {
-    return { status: BB_RESULT.FAILURE, reason: `Failed to find bb binary at ${pathToBB}` };
-  }
-
-  try {
-    // Write the inputs to the working directory.
-
-    // WARNING: Not writing the inputs since VM1 is disabled!
-    // await fs.writeFile(publicInputsPath, input.publicInputs.toBuffer());
-    // if (!(await filePresent(publicInputsPath))) {
-    //   return { status: BB_RESULT.FAILURE, reason: `Could not write publicInputs at ${publicInputsPath}` };
-    // }
-
-    // await fs.writeFile(avmHintsPath, input.avmHints.toBuffer());
-    // if (!(await filePresent(avmHintsPath))) {
-    //   return { status: BB_RESULT.FAILURE, reason: `Could not write avmHints at ${avmHintsPath}` };
-    // }
-
-    const args = ['--avm-public-inputs', publicInputsPath, '-o', outputPath];
-    const loggingArg =
-      logger.level === 'debug' || logger.level === 'trace' ? '-d' : logger.level === 'verbose' ? '-v' : '';
-    if (loggingArg !== '') {
-      args.push(loggingArg);
-    }
-
-    const timer = new Timer();
-    const cmd = checkCircuitOnly ? 'check_circuit' : 'prove';
+    const cmd = checkCircuitOnly ? 'avm_check_circuit' : 'avm_prove';
     const logFunction = (message: string) => {
       logger.verbose(`AvmCircuit (${cmd}) BB out - ${message}`);
     };
-    const result = await executeBB(pathToBB, `avm_${cmd}`, args, logFunction);
+    const result = await executeBB(pathToBB, cmd, args, logFunction);
     const duration = timer.ms();
 
     if (result.status == BB_RESULT.SUCCESS) {
@@ -502,7 +428,7 @@ export async function generateAvmProof(
         durationMs: duration,
         proofPath: join(outputPath, PROOF_FILENAME),
         pkPath: undefined,
-        vkPath: outputPath,
+        vkDirectoryPath: outputPath,
       };
     }
     // Not a great error message here but it is difficult to decipher what comes from bb
@@ -541,24 +467,7 @@ export async function verifyProof(
   );
 }
 
-/**
- * Used for verifying proofs of the AVM
- * @param pathToBB - The full path to the bb binary
- * @param proofFullPath - The full path to the proof to be verified
- * @param verificationKeyPath - The full path to the circuit verification key
- * @param log - A logging function
- * @returns An object containing a result indication and duration taken
- */
 export async function verifyAvmProof(
-  pathToBB: string,
-  proofFullPath: string,
-  verificationKeyPath: string,
-  logger: Logger,
-): Promise<BBFailure | BBSuccess> {
-  return await verifyProofInternal(pathToBB, proofFullPath, verificationKeyPath, 'avm_verify', logger);
-}
-
-export async function verifyAvmProofV2(
   pathToBB: string,
   workingDirectory: string,
   proofFullPath: string,
@@ -580,7 +489,7 @@ export async function verifyAvmProofV2(
     return { status: BB_RESULT.FAILURE, reason: `Could not write avm inputs to ${avmInputsPath}` };
   }
 
-  return await verifyProofInternal(pathToBB, proofFullPath, verificationKeyPath, 'avm2_verify', logger, [
+  return await verifyProofInternal(pathToBB, proofFullPath, verificationKeyPath, 'avm_verify', logger, [
     '--avm-public-inputs',
     avmInputsPath,
   ]);
@@ -641,7 +550,7 @@ async function verifyProofInternal(
   pathToBB: string,
   proofFullPath: string,
   verificationKeyPath: string,
-  command: 'verify' | 'avm_verify' | 'avm2_verify',
+  command: 'verify' | 'avm_verify',
   logger: Logger,
   extraArgs: string[] = [],
 ): Promise<BBFailure | BBSuccess> {
@@ -657,24 +566,27 @@ async function verifyProofInternal(
     logger.verbose(`bb-prover (verify) BB out - ${message}`);
   };
 
-  // take proofFullPath and remove the suffix past the / to get the directory
-  const proofDir = proofFullPath.substring(0, proofFullPath.lastIndexOf('/'));
-  const publicInputsFullPath = join(proofDir, '/public_inputs');
-
-  logger.debug(`public inputs path: ${publicInputsFullPath}`);
   try {
     let args;
-    // Specify the public inputs path in the case of UH verification.
+
     if (command == 'verify') {
+      // Specify the public inputs path in the case of UH verification.
+      // Take proofFullPath and remove the suffix past the / to get the directory.
+      const proofDir = proofFullPath.substring(0, proofFullPath.lastIndexOf('/'));
+      const publicInputsFullPath = join(proofDir, '/public_inputs');
+      logger.debug(`public inputs path: ${publicInputsFullPath}`);
+
       args = ['-p', proofFullPath, '-k', verificationKeyPath, '-i', publicInputsFullPath, ...extraArgs];
     } else {
       args = ['-p', proofFullPath, '-k', verificationKeyPath, ...extraArgs];
     }
+
     const loggingArg =
       logger.level === 'debug' || logger.level === 'trace' ? '-d' : logger.level === 'verbose' ? '-v' : '';
     if (loggingArg !== '') {
       args.push(loggingArg);
     }
+
     const timer = new Timer();
     const result = await executeBB(pathToBB, command, args, logFunction);
     const duration = timer.ms();