@aztec/bb.js 0.0.1-alpha.6 → 0.0.1-fake-ceab37513c

package/src/main.ts

@@ -1,324 +1,534 @@
-#!/usr/bin/env -S node --no-warnings
-import { Crs, BarretenbergApiAsync, newBarretenbergApiAsync, RawBuffer } from './index.js';
-import createDebug from 'debug';
+#!/usr/bin/env node
+import 'source-map-support/register.js';
+import { Crs, Barretenberg, RawBuffer } from './index.js';
+import { createDebugLogger, initLogger } from './log/index.js';
 import { readFileSync, writeFileSync } from 'fs';
 import { gunzipSync } from 'zlib';
-import { numToUInt32BE } from './serialize/serialize.js';
 import { Command } from 'commander';
+import { UltraHonkBackendOptions } from './barretenberg/backend.js';
 
-createDebug.log = console.error.bind(console);
-const debug = createDebug('bb.js');
+let debug: (msg: string) => void;
 
-// Maximum we support.
-const MAX_CIRCUIT_SIZE = 2 ** 19;
+const threads = +process.env.HARDWARE_CONCURRENCY! || undefined;
 
-function getBytecode(jsonPath: string) {
-  const json = readFileSync(jsonPath, 'utf-8');
-  const parsed = JSON.parse(json);
-  const buffer = Buffer.from(parsed.bytecode, 'base64');
-  const decompressed = gunzipSync(buffer);
-  return decompressed;
-}
+function getBytecode(bytecodePath: string): Uint8Array {
+  const extension = bytecodePath.substring(bytecodePath.lastIndexOf('.') + 1);
 
-function getWitness(witnessPath: string) {
-  const data = readFileSync(witnessPath);
-  return Buffer.concat([numToUInt32BE(data.length / 32), data]);
-}
+  if (extension == 'json') {
+    const encodedCircuit = JSON.parse(readFileSync(bytecodePath, 'utf8'));
+    const decompressed = gunzipSync(Buffer.from(encodedCircuit.bytecode, 'base64'));
+    return Uint8Array.from(decompressed);
+  }
 
-async function getCircuitSize(jsonPath: string, api: BarretenbergApiAsync) {
-  const bytecode = getBytecode(jsonPath);
-  const [exact, total, subgroup] = await api.acirGetCircuitSizes(new RawBuffer(bytecode));
-  return { exact, total, subgroup };
+  const encodedCircuit = readFileSync(bytecodePath);
+  const decompressed = gunzipSync(encodedCircuit);
+  return Uint8Array.from(decompressed);
 }
 
-async function init(jsonPath: string, sizeHint?: number) {
-  const api = await newBarretenbergApiAsync();
-
-  const subgroupSize = await (async () => {
-    if (sizeHint) {
-      // Round to subgroup size.
-      return Math.pow(2, Math.ceil(Math.log2(sizeHint)));
-    }
+// TODO(https://github.com/AztecProtocol/barretenberg/issues/1126): split this into separate Plonk and Honk functions as their gate count differs
+async function getGatesUltra(bytecodePath: string, recursive: boolean, honkRecursion: boolean, api: Barretenberg) {
+  const { total } = await computeCircuitSize(bytecodePath, recursive, honkRecursion, api);
+  return total;
+}
 
-    // First compute circuit size.
-    debug(`computing circuit size (use size hint to skip)...`);
-    const circuitSizes = await getCircuitSize(jsonPath, api);
-    debug(`circuit size: ${circuitSizes.total}`);
+function getWitness(witnessPath: string): Uint8Array {
+  const data = readFileSync(witnessPath);
+  const decompressed = gunzipSync(data);
+  return Uint8Array.from(decompressed);
+}
 
-    if (circuitSizes.subgroup > MAX_CIRCUIT_SIZE) {
-      throw new Error(`Circuit size of ${circuitSizes.subgroup} exceeds max supported of ${MAX_CIRCUIT_SIZE}`);
-    }
+async function computeCircuitSize(bytecodePath: string, recursive: boolean, honkRecursion: boolean, api: Barretenberg) {
+  debug(`Computing circuit size for ${bytecodePath}`);
+  const bytecode = getBytecode(bytecodePath);
+  const [total, subgroup] = await api.acirGetCircuitSizes(bytecode, recursive, honkRecursion);
+  return { total, subgroup };
+}
 
-    return circuitSizes.subgroup;
-  })();
+async function initUltraHonk(bytecodePath: string, crsPath: string) {
+  const api = await Barretenberg.new({
+    threads,
+  });
 
-  debug(`subgroup size: ${subgroupSize}`);
-  debug('loading crs...');
-  // Plus 1 needed! (Move +1 into Crs?)
-  const crs = await Crs.new(subgroupSize + 1);
+  // TODO(https://github.com/AztecProtocol/barretenberg/issues/1248): Get rid of this call to avoid building the circuit twice.
+  // TODO(https://github.com/AztecProtocol/barretenberg/issues/1126): use specific UltraHonk function
+  // recursive here is useless for UH, as it does not affect anything
+  const circuitSize = await getGatesUltra(bytecodePath, /*recursive=*/ false, /*honkRecursion=*/ true, api);
+  // TODO(https://github.com/AztecProtocol/barretenberg/issues/811): remove subgroupSizeOverride hack for goblin
+  const dyadicCircuitSize = Math.pow(2, Math.ceil(Math.log2(circuitSize)));
 
-  // Important to init slab allocator as first thing, to ensure maximum memory efficiency.
-  await api.commonInitSlabAllocator(subgroupSize);
+  debug(`Loading CRS for UltraHonk with circuit-size=${circuitSize} dyadic-circuit-size=${dyadicCircuitSize}`);
+  const crs = await Crs.new(dyadicCircuitSize + 1, crsPath);
 
   // Load CRS into wasm global CRS state.
-  // TODO: Make RawBuffer be default behaviour, and have a specific Vector type for when wanting length prefixed.
+  // TODO: Make RawBuffer be default behavior, and have a specific Vector type for when wanting length prefixed.
   await api.srsInitSrs(new RawBuffer(crs.getG1Data()), crs.numPoints, new RawBuffer(crs.getG2Data()));
-
-  const acirComposer = await api.acirNewAcirComposer(subgroupSize);
-  return { api, acirComposer, circuitSize: subgroupSize };
+  return { api, circuitSize, dyadicCircuitSize };
 }
 
-async function initLite() {
-  const api = await newBarretenbergApiAsync(1);
+async function initLite(crsPath: string) {
+  const api = await Barretenberg.new({ threads: 1 });
 
   // Plus 1 needed! (Move +1 into Crs?)
-  const crs = await Crs.new(1);
+  const crs = await Crs.new(1, crsPath);
 
   // Load CRS into wasm global CRS state.
   await api.srsInitSrs(new RawBuffer(crs.getG1Data()), crs.numPoints, new RawBuffer(crs.getG2Data()));
 
-  const acirComposer = await api.acirNewAcirComposer(0);
-  return { api, acirComposer };
+  return { api };
 }
 
-export async function proveAndVerify(jsonPath: string, witnessPath: string, isRecursive: boolean, sizeHint?: number) {
-  const { api, acirComposer } = await init(jsonPath, sizeHint);
+export async function proveAndVerifyUltraHonk(bytecodePath: string, witnessPath: string, crsPath: string) {
+  /* eslint-disable camelcase */
+  const { api } = await initUltraHonk(bytecodePath, crsPath);
   try {
-    debug(`creating proof...`);
-    const bytecode = getBytecode(jsonPath);
+    const bytecode = getBytecode(bytecodePath);
     const witness = getWitness(witnessPath);
-    const proof = await api.acirCreateProof(acirComposer, new RawBuffer(bytecode), new RawBuffer(witness), isRecursive);
 
-    debug(`verifying...`);
-    const verified = await api.acirVerifyProof(acirComposer, proof, isRecursive);
-    console.log(`verified: ${verified}`);
+    const verified = await api.acirProveAndVerifyUltraHonk(bytecode, witness);
     return verified;
   } finally {
     await api.destroy();
   }
+  /* eslint-enable camelcase */
 }
 
-export async function prove(
-  jsonPath: string,
-  witnessPath: string,
-  isRecursive: boolean,
-  outputPath: string,
-  sizeHint?: number,
-) {
-  const { api, acirComposer } = await init(jsonPath, sizeHint);
+export async function proveAndVerifyMegaHonk(bytecodePath: string, witnessPath: string, crsPath: string) {
+  /* eslint-disable camelcase */
+  const { api } = await initUltraHonk(bytecodePath, crsPath);
   try {
-    debug(`creating proof...`);
-    const bytecode = getBytecode(jsonPath);
+    const bytecode = getBytecode(bytecodePath);
     const witness = getWitness(witnessPath);
-    const proof = await api.acirCreateProof(acirComposer, new RawBuffer(bytecode), new RawBuffer(witness), isRecursive);
-    debug(`done.`);
 
-    writeFileSync(outputPath, proof);
-    console.log(`proof written to: ${outputPath}`);
+    const verified = await api.acirProveAndVerifyMegaHonk(bytecode, witness);
+    return verified;
   } finally {
     await api.destroy();
   }
+  /* eslint-enable camelcase */
 }
 
-export async function gateCount(jsonPath: string) {
-  const api = await newBarretenbergApiAsync(1);
+export async function gateCountUltra(bytecodePath: string, recursive: boolean, honkRecursion: boolean) {
+  const api = await Barretenberg.new({ threads: 1 });
   try {
-    const circuitSizes = await getCircuitSize(jsonPath, api);
-    console.log(`${circuitSizes.exact}`);
+    const numberOfGates = await getGatesUltra(bytecodePath, recursive, honkRecursion, api);
+    debug(`Number of gates: ${numberOfGates}`);
+    // Create an 8-byte buffer and write the number into it.
+    // Writing number directly to stdout will result in a variable sized
+    // input depending on the size.
+    const buffer = Buffer.alloc(8);
+    buffer.writeBigInt64LE(BigInt(numberOfGates));
+
+    process.stdout.write(Uint8Array.from(buffer));
   } finally {
     await api.destroy();
   }
 }
 
-export async function verify(jsonPath: string, proofPath: string, isRecursive: boolean, vkPath: string) {
-  const { api, acirComposer } = await initLite();
+export async function contractUltraHonk(bytecodePath: string, vkPath: string, crsPath: string, outputPath: string) {
+  const { api } = await initUltraHonk(bytecodePath, crsPath);
   try {
-    await api.acirLoadVerificationKey(acirComposer, new RawBuffer(readFileSync(vkPath)));
-    const verified = await api.acirVerifyProof(acirComposer, readFileSync(proofPath), isRecursive);
-    console.log(`verified: ${verified}`);
-    return verified;
+    debug(`Creating UltraHonk verifier contract bytecode=${bytecodePath} vk=${vkPath}`);
+    const bytecode = getBytecode(bytecodePath);
+    const vk = new RawBuffer(readFileSync(vkPath));
+    const contract = await api.acirHonkSolidityVerifier(bytecode, vk);
+
+    if (outputPath === '-') {
+      process.stdout.write(contract);
+      debug(`Solidity verifier contract written to stdout`);
+    } else {
+      writeFileSync(outputPath, contract);
+      debug(`Solidity verifier contract written to ${outputPath}`);
+    }
   } finally {
     await api.destroy();
   }
 }
 
-export async function contract(outputPath: string, vkPath: string) {
-  const { api, acirComposer } = await initLite();
+export async function proveUltraHonk(
+  bytecodePath: string,
+  witnessPath: string,
+  crsPath: string,
+  vkPath: string,
+  outputPath: string,
+  options?: UltraHonkBackendOptions,
+) {
+  const { api } = await initUltraHonk(bytecodePath, crsPath);
   try {
-    await api.acirLoadVerificationKey(acirComposer, new RawBuffer(readFileSync(vkPath)));
-    const contract = await api.acirGetSolidityVerifier(acirComposer);
+    debug(`Creating UltraHonk proof bytecode=${bytecodePath}`);
+    const bytecode = getBytecode(bytecodePath);
+    const witness = getWitness(witnessPath);
+
+    const acirProveUltraHonk = options?.keccak
+      ? api.acirProveUltraKeccakHonk.bind(api)
+      : options?.keccakZK
+        ? api.acirProveUltraKeccakZkHonk.bind(api)
+        : options?.starknet
+          ? api.acirProveUltraStarknetHonk.bind(api)
+          : options?.starknetZK
+            ? api.acirProveUltraStarknetZkHonk.bind(api)
+            : api.acirProveUltraZKHonk.bind(api);
+    const proof = await acirProveUltraHonk(bytecode, witness, new RawBuffer(readFileSync(vkPath)));
+
     if (outputPath === '-') {
-      console.log(contract);
+      process.stdout.write(proof);
+      debug(`Proof written to stdout`);
     } else {
-      writeFileSync(outputPath, contract);
-      console.log(`contract written to: ${outputPath}`);
+      writeFileSync(outputPath, proof);
+      debug(`Proof written to ${outputPath}`);
     }
   } finally {
     await api.destroy();
   }
 }
 
-export async function writeVk(jsonPath: string, outputPath: string, sizeHint?: number) {
-  const { api, acirComposer } = await init(jsonPath, sizeHint);
+export async function writeVkUltraHonk(
+  bytecodePath: string,
+  crsPath: string,
+  outputPath: string,
+  options?: UltraHonkBackendOptions,
+) {
+  const { api } = await initUltraHonk(bytecodePath, crsPath);
   try {
-    debug('initing proving key...');
-    const bytecode = getBytecode(jsonPath);
-    await api.acirInitProvingKey(acirComposer, new RawBuffer(bytecode));
+    const bytecode = getBytecode(bytecodePath);
+    debug(`Initializing UltraHonk verification key bytecode=${bytecodePath}`);
+
+    const acirWriteVkUltraHonk = options?.keccak
+      ? api.acirWriteVkUltraKeccakHonk.bind(api)
+      : options?.keccakZK
+        ? api.acirWriteVkUltraKeccakZkHonk.bind(api)
+        : options?.starknet
+          ? api.acirWriteVkUltraStarknetHonk.bind(api)
+          : options?.starknetZK
+            ? api.acirWriteVkUltraStarknetZkHonk.bind(api)
+            : api.acirWriteVkUltraHonk.bind(api);
+    const vk = await acirWriteVkUltraHonk(bytecode);
 
-    debug('initing verification key...');
-    const vk = await api.acirGetVerificationKey(acirComposer);
     if (outputPath === '-') {
       process.stdout.write(vk);
+      debug(`Verification key written to stdout`);
     } else {
       writeFileSync(outputPath, vk);
-      console.log(`vk written to: ${outputPath}`);
+      debug(`Verification key written to ${outputPath}`);
     }
   } finally {
     await api.destroy();
   }
 }
 
-export async function proofAsFields(proofPath: string, numInnerPublicInputs: number, outputPath: string) {
-  const { api, acirComposer } = await initLite();
-
+export async function verifyUltraHonk(
+  proofPath: string,
+  vkPath: string,
+  crsPath: string,
+  options?: UltraHonkBackendOptions,
+) {
+  const { api } = await initLite(crsPath);
   try {
-    debug('serializing proof byte array into field elements');
-    const proofAsFields = await api.acirSerializeProofIntoFields(
-      acirComposer,
-      readFileSync(proofPath),
-      numInnerPublicInputs,
+    const acirVerifyUltraHonk = options?.keccak
+      ? api.acirVerifyUltraKeccakHonk.bind(api)
+      : options?.keccakZK
+        ? api.acirVerifyUltraKeccakZkHonk.bind(api)
+        : options?.starknet
+          ? api.acirVerifyUltraStarknetHonk.bind(api)
+          : options?.starknetZK
+            ? api.acirVerifyUltraStarknetZkHonk.bind(api)
+            : api.acirVerifyUltraZKHonk.bind(api);
+    const verified = await acirVerifyUltraHonk(
+      Uint8Array.from(readFileSync(proofPath)),
+      new RawBuffer(readFileSync(vkPath)),
     );
 
-    writeFileSync(outputPath, JSON.stringify(proofAsFields.map(f => f.toString())));
-    debug('done.');
+    debug(`Verification ${verified ? 'successful' : 'failed'}`);
+    return verified;
   } finally {
     await api.destroy();
   }
 }
 
-export async function vkAsFields(vkPath: string, vkeyOutputPath: string) {
-  const { api, acirComposer } = await initLite();
-
+export async function proofAsFieldsUltraHonk(proofPath: string, outputPath: string, crsPath: string) {
+  const { api } = await initLite(crsPath);
   try {
-    debug('serializing vk byte array into field elements');
-    await api.acirLoadVerificationKey(acirComposer, new RawBuffer(readFileSync(vkPath)));
-    const [vkAsFields, vkHash] = await api.acirSerializeVerificationKeyIntoFields(acirComposer);
-    const output = [vkHash, ...vkAsFields].map(f => f.toString());
-    writeFileSync(vkeyOutputPath, JSON.stringify(output));
-    debug('done.');
+    debug(`Outputting UltraHonk proof as vector of fields proof=${proofPath}`);
+    const proofAsFields = await api.acirProofAsFieldsUltraHonk(Uint8Array.from(readFileSync(proofPath)));
+    const jsonProofAsFields = JSON.stringify(proofAsFields.map(f => f.toString()));
+
+    if (outputPath === '-') {
+      process.stdout.write(jsonProofAsFields);
+      debug(`Proof as fields written to stdout`);
+    } else {
+      writeFileSync(outputPath, jsonProofAsFields);
+      debug(`Proof as fields written to ${outputPath}`);
+    }
   } finally {
     await api.destroy();
   }
 }
 
-// nargo use bb.js: backend -> bb.js
-// backend prove --data-dir data --witness /foo/bar/witness.tr --json /foo/bar/main.json
-// backend verify ...
-// backend get_total_num_gates --data-dir data --json /foo/bar/main.json
-// backend get_sol_contract --data-dir data --json /foo/bar/main.json --output
-// backend get_features
-// OPTIONAL stateful backend:
-// backend start
-// backend stop
+export async function vkAsFieldsUltraHonk(vkPath: string, vkeyOutputPath: string, crsPath: string) {
+  const { api } = await initLite(crsPath);
 
-const program = new Command();
+  try {
+    debug(`Serializing vk byte array into field elements vk=${vkPath}`);
+    const vkAsFields = await api.acirVkAsFieldsUltraHonk(new RawBuffer(readFileSync(vkPath)));
+    const jsonVKAsFields = JSON.stringify(vkAsFields.map(f => f.toString()));
+
+    if (vkeyOutputPath === '-') {
+      process.stdout.write(jsonVKAsFields);
+      debug(`Verification key as fields written to stdout`);
+    } else {
+      writeFileSync(vkeyOutputPath, jsonVKAsFields);
+      debug(`Verification key as fields written to ${vkeyOutputPath}`);
+    }
+  } finally {
+    await api.destroy();
+  }
+}
+
+const program = new Command('bb');
 
 program.option('-v, --verbose', 'enable verbose logging', false);
+program.option('-c, --crs-path <path>', 'set crs path', './crs');
 
 function handleGlobalOptions() {
-  if (program.opts().verbose) {
-    createDebug.enable('bb.js*');
-  }
+  initLogger({ useStdErr: true, level: program.opts().verbose ? 'debug' : 'info' });
+  debug = createDebugLogger('bb');
+  return { crsPath: program.opts().crsPath };
 }
 
+const deprecatedCommandError = () => async () => {
+  console.error(
+    `Error: UltraPlonk is now deprecated (see https://github.com/AztecProtocol/barretenberg/issues/1377). Use UltraHonk!`,
+  );
+  process.exit(1);
+};
+
 program
   .command('prove_and_verify')
-  .description('Generate a proof and verify it. Process exits with success or failure code.')
-  .option('-j, --json-path <path>', 'Specify the JSON path', './target/main.json')
-  .option('-w, --witness-path <path>', 'Specify the witness path', './target/witness.tr')
-  .option('-r, --recursive', 'prove and verify using recursive prover and verifier', false)
-  .option('-s, --size-hint <gates>', 'provide a circuit size hint to skip calculation phase')
-  .action(async ({ jsonPath, witnessPath, recursive, sizeHint }) => {
-    handleGlobalOptions();
-    const result = await proveAndVerify(jsonPath, witnessPath, recursive, sizeHint);
+  .description('Generate a proof and verify it. Process exits with success or failure code. [DEPRECATED]')
+  .option('-b, --bytecode-path <path>', 'Specify the bytecode path', './target/program.json')
+  .option('-r, --recursive', 'Whether to use a SNARK friendly proof', false)
+  .option('-w, --witness-path <path>', 'Specify the witness path', './target/witness.gz')
+  .action(deprecatedCommandError());
+
+program
+  .command('prove_and_verify_ultra_honk')
+  .description('Generate an UltraHonk proof and verify it. Process exits with success or failure code.')
+  .option('-b, --bytecode-path <path>', 'Specify the bytecode path', './target/program.json')
+  .option('-w, --witness-path <path>', 'Specify the witness path', './target/witness.gz')
+  .action(async ({ bytecodePath, witnessPath }) => {
+    const { crsPath } = handleGlobalOptions();
+    const result = await proveAndVerifyUltraHonk(bytecodePath, witnessPath, crsPath);
+    process.exit(result ? 0 : 1);
+  });
+
+program
+  .command('prove_and_verify_mega_honk')
+  .description('Generate a MegaHonk proof and verify it. Process exits with success or failure code.')
+  .option('-b, --bytecode-path <path>', 'Specify the bytecode path', './target/program.json')
+  .option('-w, --witness-path <path>', 'Specify the witness path', './target/witness.gz')
+  .action(async ({ bytecodePath, witnessPath }) => {
+    const { crsPath } = handleGlobalOptions();
+    const result = await proveAndVerifyMegaHonk(bytecodePath, witnessPath, crsPath);
     process.exit(result ? 0 : 1);
   });
 
 program
   .command('prove')
-  .description('Generate a proof and write it to a file.')
-  .option('-j, --json-path <path>', 'Specify the JSON path', './target/main.json')
-  .option('-w, --witness-path <path>', 'Specify the witness path', './target/witness.tr')
-  .option('-r, --recursive', 'prove using recursive prover', false)
+  .description('Generate a proof and write it to a file. [DEPRECATED]')
+  .option('-b, --bytecode-path <path>', 'Specify the bytecode path', './target/program.json')
+  .option('-r, --recursive', 'Create a SNARK friendly proof', false)
+  .option('-w, --witness-path <path>', 'Specify the witness path', './target/witness.gz')
   .option('-o, --output-path <path>', 'Specify the proof output path', './proofs/proof')
-  .option('-s, --size-hint <gates>', 'provide a circuit size hint to skip calculation phase')
-  .action(async ({ jsonPath, witnessPath, recursive, outputPath, sizeHint }) => {
-    handleGlobalOptions();
-    await prove(jsonPath, witnessPath, recursive, outputPath, sizeHint);
-  });
+  .action(deprecatedCommandError());
 
 program
   .command('gates')
-  .description('Print gate count to standard output.')
-  .option('-j, --json-path <path>', 'Specify the JSON path', './target/main.json')
-  .action(async ({ jsonPath }) => {
+  .description('Print Ultra Builder gate count to standard output.')
+  .option('-b, --bytecode-path <path>', 'Specify the bytecode path', './target/program.json')
+  .option('-r, --recursive', 'Create a SNARK friendly proof', false)
+  .option('-hr, --honk-recursion', 'Specify whether to use UltraHonk recursion', false)
+  .action(async ({ bytecodePath, recursive, honkRecursion: honkRecursion }) => {
     handleGlobalOptions();
-    await gateCount(jsonPath);
+    await gateCountUltra(bytecodePath, recursive, honkRecursion);
   });
 
 program
   .command('verify')
-  .description('Verify a proof. Process exists with success or failure code.')
-  .option('-j, --json-path <path>', 'Specify the JSON path', './target/main.json')
+  .description('Verify a proof. Process exists with success or failure code. [DEPRECATED]')
   .requiredOption('-p, --proof-path <path>', 'Specify the path to the proof')
-  .option('-r, --recursive', 'prove using recursive prover', false)
   .requiredOption('-k, --vk <path>', 'path to a verification key. avoids recomputation.')
-  .action(async ({ jsonPath, proofPath, recursive, vk }) => {
-    handleGlobalOptions();
-    await verify(jsonPath, proofPath, recursive, vk);
-  });
+  .action(deprecatedCommandError());
 
 program
   .command('contract')
+  .description('Output solidity verification key contract. [DEPRECATED]')
+  .option('-b, --bytecode-path <path>', 'Specify the bytecode path', './target/program.json')
+  .option('-o, --output-path <path>', 'Specify the path to write the contract', './target/contract.sol')
+  .requiredOption('-k, --vk-path <path>', 'Path to a verification key. avoids recomputation.')
+  .action(deprecatedCommandError());
+
+program
+  .command('contract_ultra_honk')
   .description('Output solidity verification key contract.')
-  .option('-j, --json-path <path>', 'Specify the JSON path', './target/main.json')
-  .option('-o, --output-path <path>', 'Specify the path to write the contract', '-')
-  .requiredOption('-k, --vk <path>', 'path to a verification key. avoids recomputation.')
-  .action(async ({ outputPath, vk }) => {
-    handleGlobalOptions();
-    await contract(outputPath, vk);
+  .option('-b, --bytecode-path <path>', 'Specify the bytecode path', './target/program.json')
+  .option('-o, --output-path <path>', 'Specify the path to write the contract', './target/contract.sol')
+  .requiredOption('-k, --vk-path <path>', 'Path to a verification key.')
+  .action(async ({ bytecodePath, outputPath, vkPath }) => {
+    const { crsPath } = handleGlobalOptions();
+    await contractUltraHonk(bytecodePath, vkPath, crsPath, outputPath);
   });
 
 program
   .command('write_vk')
+  .description('Output verification key. [DEPRECATED]')
+  .option('-b, --bytecode-path <path>', 'Specify the bytecode path', './target/program.json')
+  .option('-r, --recursive', 'Create a SNARK friendly proof', false)
+  .option('-o, --output-path <path>', 'Specify the path to write the key')
+  .action(deprecatedCommandError());
+
+program
+  .command('write_pk')
+  .description('Output proving key. [DEPRECATED]')
+  .option('-b, --bytecode-path <path>', 'Specify the bytecode path', './target/program.json')
+  .option('-r, --recursive', 'Create a SNARK friendly proof', false)
+  .requiredOption('-o, --output-path <path>', 'Specify the path to write the key')
+  .action(deprecatedCommandError());
+
+program
+  .command('proof_as_fields')
+  .description('Return the proof as fields elements. [DEPRECATED]')
+  .requiredOption('-p, --proof-path <path>', 'Specify the proof path')
+  .requiredOption('-k, --vk-path <path>', 'Path to verification key.')
+  .requiredOption('-o, --output-path <path>', 'Specify the JSON path to write the proof fields')
+  .action(deprecatedCommandError());
+
+program
+  .command('vk_as_fields')
+  .description(
+    'Return the verification key represented as fields elements. Also return the verification key hash. [DEPRECATED]',
+  )
+  .requiredOption('-k, --vk-path <path>', 'Path to verification key.')
+  .requiredOption('-o, --output-path <path>', 'Specify the JSON path to write the verification key fields and key hash')
+  .action(deprecatedCommandError());
+
+program
+  .command('prove_ultra_honk')
+  .description('Generate a proof and write it to a file.')
+  .option('-b, --bytecode-path <path>', 'Specify the bytecode path', './target/program.json')
+  .option('-w, --witness-path <path>', 'Specify the witness path', './target/witness.gz')
+  .option('-k, --vk-path <path>', 'path to a verification key. avoids recomputation.')
+  .option('-o, --output-path <path>', 'Specify the proof output path', './proofs/proof')
+  .action(async ({ bytecodePath, witnessPath, vkPath, outputPath }) => {
+    const { crsPath } = handleGlobalOptions();
+    debug(`Creating UltraHonk proof bytecodePath=${bytecodePath}, witnessPath=${witnessPath}, vkPath=${vkPath}`);
+    await proveUltraHonk(bytecodePath, witnessPath, crsPath, vkPath, outputPath);
+  });
+
+program
+  .command('prove_ultra_keccak_honk')
+  .description('Generate a proof and write it to a file.')
+  .option('-b, --bytecode-path <path>', 'Specify the bytecode path', './target/program.json')
+  .option('-w, --witness-path <path>', 'Specify the witness path', './target/witness.gz')
+  .option('-k, --vk-path <path>', 'path to a verification key. avoids recomputation.')
+  .option('-o, --output-path <path>', 'Specify the proof output path', './proofs/proof')
+  .action(async ({ bytecodePath, witnessPath, vkPath, outputPath }) => {
+    const { crsPath } = handleGlobalOptions();
+    await proveUltraHonk(bytecodePath, witnessPath, crsPath, vkPath, outputPath, { keccak: true });
+  });
+
+program
+  .command('prove_ultra_starknet_honk')
+  .description('Generate a proof and write it to a file.')
+  .option('-b, --bytecode-path <path>', 'Specify the bytecode path', './target/program.json')
+  .option('-w, --witness-path <path>', 'Specify the witness path', './target/witness.gz')
+  .option('-k, --vk-path <path>', 'path to a verification key. avoids recomputation.')
+  .option('-o, --output-path <path>', 'Specify the proof output path', './proofs/proof')
+  .action(async ({ bytecodePath, witnessPath, vkPath, outputPath }) => {
+    const { crsPath } = handleGlobalOptions();
+    await proveUltraHonk(bytecodePath, witnessPath, crsPath, vkPath, outputPath, { starknet: true });
+  });
+
+program
+  .command('write_vk_ultra_honk')
   .description('Output verification key.')
-  .option('-j, --json-path <path>', 'Specify the JSON path', './target/main.json')
+  .option('-b, --bytecode-path <path>', 'Specify the bytecode path', './target/program.json')
   .requiredOption('-o, --output-path <path>', 'Specify the path to write the key')
-  .option('-s, --size-hint <gates>', 'provide a circuit size hint to skip calculation phase')
-  .action(async ({ jsonPath, outputPath, sizeHint }) => {
-    handleGlobalOptions();
-    await writeVk(jsonPath, outputPath, sizeHint);
+  .action(async ({ bytecodePath, outputPath }) => {
+    const { crsPath } = handleGlobalOptions();
+    debug(`Writing verification key to ${outputPath}`);
+    await writeVkUltraHonk(bytecodePath, crsPath, outputPath);
   });
 
 program
-  .command('proof_as_fields')
+  .command('write_vk_ultra_keccak_honk')
+  .description('Output verification key.')
+  .option('-b, --bytecode-path <path>', 'Specify the bytecode path', './target/program.json')
+  .requiredOption('-o, --output-path <path>', 'Specify the path to write the key')
+  .action(async ({ bytecodePath, outputPath }) => {
+    const { crsPath } = handleGlobalOptions();
+    await writeVkUltraHonk(bytecodePath, crsPath, outputPath, { keccak: true });
+  });
+
+program
+  .command('write_vk_ultra_starknet_honk')
+  .description('Output verification key.')
+  .option('-b, --bytecode-path <path>', 'Specify the bytecode path', './target/program.json')
+  .requiredOption('-o, --output-path <path>', 'Specify the path to write the key')
+  .action(async ({ bytecodePath, outputPath }) => {
+    const { crsPath } = handleGlobalOptions();
+    await writeVkUltraHonk(bytecodePath, crsPath, outputPath, { starknet: true });
+  });
+
+program
+  .command('verify_ultra_honk')
+  .description('Verify a proof. Process exists with success or failure code.')
+  .requiredOption('-p, --proof-path <path>', 'Specify the path to the proof')
+  .requiredOption('-k, --vk-path <path>', 'path to a verification key. avoids recomputation.')
+  .action(async ({ proofPath, vkPath }) => {
+    const { crsPath } = handleGlobalOptions();
+    const result = await verifyUltraHonk(proofPath, vkPath, crsPath);
+    process.exit(result ? 0 : 1);
+  });
+
+program
+  .command('verify_ultra_keccak_honk')
+  .description('Verify a proof. Process exists with success or failure code.')
+  .requiredOption('-p, --proof-path <path>', 'Specify the path to the proof')
+  .requiredOption('-k, --vk-path <path>', 'path to a verification key. avoids recomputation.')
+  .action(async ({ proofPath, vkPath }) => {
+    const { crsPath } = handleGlobalOptions();
+    const result = await verifyUltraHonk(proofPath, vkPath, crsPath, { keccak: true });
+    process.exit(result ? 0 : 1);
+  });
+
+program
+  .command('verify_ultra_starknet_honk')
+  .description('Verify a proof. Process exists with success or failure code.')
+  .requiredOption('-p, --proof-path <path>', 'Specify the path to the proof')
+  .requiredOption('-k, --vk <path>', 'path to a verification key. avoids recomputation.')
+  .action(async ({ proofPath, vk }) => {
+    const { crsPath } = handleGlobalOptions();
+    const result = await verifyUltraHonk(proofPath, vk, crsPath, { starknet: true });
+    process.exit(result ? 0 : 1);
+  });
+
+program
+  .command('proof_as_fields_honk')
   .description('Return the proof as fields elements')
   .requiredOption('-p, --proof-path <path>', 'Specify the proof path')
-  .requiredOption('-n, --num-public-inputs <number>', 'Specify the number of public inputs')
   .requiredOption('-o, --output-path <path>', 'Specify the JSON path to write the proof fields')
-  .action(async ({ proofPath, numPublicInputs, outputPath }) => {
-    handleGlobalOptions();
-    await proofAsFields(proofPath, numPublicInputs, outputPath);
+  .action(async ({ proofPath, outputPath }) => {
+    const { crsPath } = handleGlobalOptions();
+    await proofAsFieldsUltraHonk(proofPath, outputPath, crsPath);
   });
 
 program
-  .command('vk_as_fields')
-  .description('Return the verifiation key represented as fields elements. Also return the verification key hash.')
-  .requiredOption('-i, --input-path <path>', 'Specifies the vk path (output from write_vk)')
-  .requiredOption('-o, --output-path <path>', 'Specify the JSON path to write the verification key fields and key hash')
-  .action(async ({ inputPath, outputPath }) => {
-    handleGlobalOptions();
-    await vkAsFields(inputPath, outputPath);
+  .command('vk_as_fields_ultra_honk')
+  .description('Return the verification key represented as fields elements.')
+  .requiredOption('-k, --vk-path <path>', 'Path to verification key.')
+  .requiredOption('-o, --output-path <path>', 'Specify the JSON path to write the verification key fields.')
+  .action(async ({ vkPath, outputPath }) => {
+    const { crsPath } = handleGlobalOptions();
+    await vkAsFieldsUltraHonk(vkPath, outputPath, crsPath);
   });
 
 program.name('bb.js').parse(process.argv);