@aztec/bb.js 0.86.0 → 0.87.0

package/src/barretenberg_api/index.ts

@@ -183,18 +183,6 @@ export class BarretenbergApi {
     return;
   }
 
-  async examplesSimpleCreateAndVerifyProof(): Promise<boolean> {
-    const inArgs = [].map(serializeBufferable);
-    const outTypes: OutputType[] = [BoolDeserializer()];
-    const result = await this.wasm.callWasmExport(
-      'examples_simple_create_and_verify_proof',
-      inArgs,
-      outTypes.map(t => t.SIZE_IN_BYTES),
-    );
-    const out = result.map((r, i) => outTypes[i].fromBuffer(r));
-    return out[0];
-  }
-
   async testThreads(threads: number, iterations: number): Promise<number> {
     const inArgs = [threads, iterations].map(serializeBufferable);
     const outTypes: OutputType[] = [NumberDeserializer()];
@@ -235,58 +223,6 @@ export class BarretenbergApi {
     return out as any;
   }
 
-  async acirNewAcirComposer(sizeHint: number): Promise<Ptr> {
-    const inArgs = [sizeHint].map(serializeBufferable);
-    const outTypes: OutputType[] = [Ptr];
-    const result = await this.wasm.callWasmExport(
-      'acir_new_acir_composer',
-      inArgs,
-      outTypes.map(t => t.SIZE_IN_BYTES),
-    );
-    const out = result.map((r, i) => outTypes[i].fromBuffer(r));
-    return out[0];
-  }
-
-  async acirDeleteAcirComposer(acirComposerPtr: Ptr): Promise<void> {
-    const inArgs = [acirComposerPtr].map(serializeBufferable);
-    const outTypes: OutputType[] = [];
-    const result = await this.wasm.callWasmExport(
-      'acir_delete_acir_composer',
-      inArgs,
-      outTypes.map(t => t.SIZE_IN_BYTES),
-    );
-    const out = result.map((r, i) => outTypes[i].fromBuffer(r));
-    return;
-  }
-
-  async acirInitProvingKey(acirComposerPtr: Ptr, constraintSystemBuf: Uint8Array, recursive: boolean): Promise<void> {
-    const inArgs = [acirComposerPtr, constraintSystemBuf, recursive].map(serializeBufferable);
-    const outTypes: OutputType[] = [];
-    const result = await this.wasm.callWasmExport(
-      'acir_init_proving_key',
-      inArgs,
-      outTypes.map(t => t.SIZE_IN_BYTES),
-    );
-    const out = result.map((r, i) => outTypes[i].fromBuffer(r));
-    return;
-  }
-
-  async acirCreateProof(
-    acirComposerPtr: Ptr,
-    constraintSystemBuf: Uint8Array,
-    recursive: boolean,
-    witnessBuf: Uint8Array,
-  ): Promise<Uint8Array> {
-    const inArgs = [acirComposerPtr, constraintSystemBuf, recursive, witnessBuf].map(serializeBufferable);
-    const outTypes: OutputType[] = [BufferDeserializer()];
-    const result = await this.wasm.callWasmExport(
-      'acir_create_proof',
-      inArgs,
-      outTypes.map(t => t.SIZE_IN_BYTES),
-    );
-    const out = result.map((r, i) => outTypes[i].fromBuffer(r));
-    return out[0];
-  }
 
   async acirProveAndVerifyUltraHonk(constraintSystemBuf: Uint8Array, witnessBuf: Uint8Array): Promise<boolean> {
     const inArgs = [constraintSystemBuf, witnessBuf].map(serializeBufferable);
@@ -472,6 +408,18 @@ export class BarretenbergApi {
     return out[0];
   }
 
+  async acirProveUltraKeccakZKHonk(acirVec: Uint8Array, witnessVec: Uint8Array): Promise<Uint8Array> {
+    const inArgs = [acirVec, witnessVec].map(serializeBufferable);
+    const outTypes: OutputType[] = [BufferDeserializer()];
+    const result = await this.wasm.callWasmExport(
+      'acir_prove_ultra_keccak_zk_honk',
+      inArgs,
+      outTypes.map(t => t.SIZE_IN_BYTES),
+    );
+    const out = result.map((r, i) => outTypes[i].fromBuffer(r));
+    return out[0];
+  }
+
   async acirProveUltraStarknetHonk(acirVec: Uint8Array, witnessVec: Uint8Array): Promise<Uint8Array> {
     const inArgs = [acirVec, witnessVec].map(serializeBufferable);
     const outTypes: OutputType[] = [BufferDeserializer()];
@@ -508,6 +456,18 @@ export class BarretenbergApi {
     return out[0];
   }
 
+  async acirVerifyUltraKeccakZKHonk(proofBuf: Uint8Array, vkBuf: Uint8Array): Promise<boolean> {
+    const inArgs = [proofBuf, vkBuf].map(serializeBufferable);
+    const outTypes: OutputType[] = [BoolDeserializer()];
+    const result = await this.wasm.callWasmExport(
+      'acir_verify_ultra_keccak_zk_honk',
+      inArgs,
+      outTypes.map(t => t.SIZE_IN_BYTES),
+    );
+    const out = result.map((r, i) => outTypes[i].fromBuffer(r));
+    return out[0];
+  }
+
   async acirVerifyUltraStarknetHonk(proofBuf: Uint8Array, vkBuf: Uint8Array): Promise<boolean> {
     const inArgs = [proofBuf, vkBuf].map(serializeBufferable);
     const outTypes: OutputType[] = [BoolDeserializer()];
@@ -544,6 +504,18 @@ export class BarretenbergApi {
     return out[0];
   }
 
+  async acirWriteVkUltraKeccakZKHonk(acirVec: Uint8Array): Promise<Uint8Array> {
+    const inArgs = [acirVec].map(serializeBufferable);
+    const outTypes: OutputType[] = [BufferDeserializer()];
+    const result = await this.wasm.callWasmExport(
+      'acir_write_vk_ultra_keccak_zk_honk',
+      inArgs,
+      outTypes.map(t => t.SIZE_IN_BYTES),
+    );
+    const out = result.map((r, i) => outTypes[i].fromBuffer(r));
+    return out[0];
+  }
+
   async acirWriteVkUltraStarknetHonk(acirVec: Uint8Array): Promise<Uint8Array> {
     const inArgs = [acirVec].map(serializeBufferable);
     const outTypes: OutputType[] = [BufferDeserializer()];
@@ -775,18 +747,6 @@ export class BarretenbergApiSync {
     return;
   }
 
-  examplesSimpleCreateAndVerifyProof(): boolean {
-    const inArgs = [].map(serializeBufferable);
-    const outTypes: OutputType[] = [BoolDeserializer()];
-    const result = this.wasm.callWasmExport(
-      'examples_simple_create_and_verify_proof',
-      inArgs,
-      outTypes.map(t => t.SIZE_IN_BYTES),
-    );
-    const out = result.map((r, i) => outTypes[i].fromBuffer(r));
-    return out[0];
-  }
-
   testThreads(threads: number, iterations: number): number {
     const inArgs = [threads, iterations].map(serializeBufferable);
     const outTypes: OutputType[] = [NumberDeserializer()];
@@ -823,58 +783,6 @@ export class BarretenbergApiSync {
     return out as any;
   }
 
-  acirNewAcirComposer(sizeHint: number): Ptr {
-    const inArgs = [sizeHint].map(serializeBufferable);
-    const outTypes: OutputType[] = [Ptr];
-    const result = this.wasm.callWasmExport(
-      'acir_new_acir_composer',
-      inArgs,
-      outTypes.map(t => t.SIZE_IN_BYTES),
-    );
-    const out = result.map((r, i) => outTypes[i].fromBuffer(r));
-    return out[0];
-  }
-
-  acirDeleteAcirComposer(acirComposerPtr: Ptr): void {
-    const inArgs = [acirComposerPtr].map(serializeBufferable);
-    const outTypes: OutputType[] = [];
-    const result = this.wasm.callWasmExport(
-      'acir_delete_acir_composer',
-      inArgs,
-      outTypes.map(t => t.SIZE_IN_BYTES),
-    );
-    const out = result.map((r, i) => outTypes[i].fromBuffer(r));
-    return;
-  }
-
-  acirInitProvingKey(acirComposerPtr: Ptr, constraintSystemBuf: Uint8Array, recursive: boolean): void {
-    const inArgs = [acirComposerPtr, constraintSystemBuf, recursive].map(serializeBufferable);
-    const outTypes: OutputType[] = [];
-    const result = this.wasm.callWasmExport(
-      'acir_init_proving_key',
-      inArgs,
-      outTypes.map(t => t.SIZE_IN_BYTES),
-    );
-    const out = result.map((r, i) => outTypes[i].fromBuffer(r));
-    return;
-  }
-
-  acirCreateProof(
-    acirComposerPtr: Ptr,
-    constraintSystemBuf: Uint8Array,
-    recursive: boolean,
-    witnessBuf: Uint8Array,
-  ): Uint8Array {
-    const inArgs = [acirComposerPtr, constraintSystemBuf, recursive, witnessBuf].map(serializeBufferable);
-    const outTypes: OutputType[] = [BufferDeserializer()];
-    const result = this.wasm.callWasmExport(
-      'acir_create_proof',
-      inArgs,
-      outTypes.map(t => t.SIZE_IN_BYTES),
-    );
-    const out = result.map((r, i) => outTypes[i].fromBuffer(r));
-    return out[0];
-  }
 
   acirProveAndVerifyUltraHonk(constraintSystemBuf: Uint8Array, witnessBuf: Uint8Array): boolean {
     const inArgs = [constraintSystemBuf, witnessBuf].map(serializeBufferable);
@@ -1056,6 +964,30 @@ export class BarretenbergApiSync {
     return out[0];
   }
 
+  acirProveUltraKeccakZKHonk(acirVec: Uint8Array, witnessVec: Uint8Array): Uint8Array {
+    const inArgs = [acirVec, witnessVec].map(serializeBufferable);
+    const outTypes: OutputType[] = [BufferDeserializer()];
+    const result = this.wasm.callWasmExport(
+      'acir_prove_ultra_keccak_zk_honk',
+      inArgs,
+      outTypes.map(t => t.SIZE_IN_BYTES),
+    );
+    const out = result.map((r, i) => outTypes[i].fromBuffer(r));
+    return out[0];
+  }
+
+  acirProveUltraKeccakZkHonk(acirVec: Uint8Array, witnessVec: Uint8Array): Uint8Array {
+    const inArgs = [acirVec, witnessVec].map(serializeBufferable);
+    const outTypes: OutputType[] = [BufferDeserializer()];
+    const result = this.wasm.callWasmExport(
+      'acir_prove_ultra_keccak_zk_honk',
+      inArgs,
+      outTypes.map(t => t.SIZE_IN_BYTES),
+    );
+    const out = result.map((r, i) => outTypes[i].fromBuffer(r));
+    return out[0];
+  }
+
   acirVerifyUltraHonk(proofBuf: Uint8Array, vkBuf: Uint8Array): boolean {
     const inArgs = [proofBuf, vkBuf].map(serializeBufferable);
     const outTypes: OutputType[] = [BoolDeserializer()];
@@ -1068,11 +1000,11 @@ export class BarretenbergApiSync {
     return out[0];
   }
 
-  acirVerifyUltraKeccakHonk(proofBuf: Uint8Array, vkBuf: Uint8Array): boolean {
+  acirVerifyUltraKeccakZKHonk(proofBuf: Uint8Array, vkBuf: Uint8Array): boolean {
     const inArgs = [proofBuf, vkBuf].map(serializeBufferable);
     const outTypes: OutputType[] = [BoolDeserializer()];
     const result = this.wasm.callWasmExport(
-      'acir_verify_ultra_keccak_honk',
+      'acir_verify_ultra_keccak_zk_honk',
       inArgs,
       outTypes.map(t => t.SIZE_IN_BYTES),
     );
@@ -1104,6 +1036,18 @@ export class BarretenbergApiSync {
     return out[0];
   }
 
+  acirWriteVkUltraKeccakZKHonk(acirVec: Uint8Array): Uint8Array {
+    const inArgs = [acirVec].map(serializeBufferable);
+    const outTypes: OutputType[] = [BufferDeserializer()];
+    const result = this.wasm.callWasmExport(
+      'acir_write_vk_ultra_keccak_zk_honk',
+      inArgs,
+      outTypes.map(t => t.SIZE_IN_BYTES),
+    );
+    const out = result.map((r, i) => outTypes[i].fromBuffer(r));
+    return out[0];
+  }
+
   acirProofAsFieldsUltraHonk(proofBuf: Uint8Array): Fr[] {
     const inArgs = [proofBuf].map(serializeBufferable);
     const outTypes: OutputType[] = [VectorDeserializer(Fr)];

package/src/bindgen/mappings.ts

@@ -13,7 +13,7 @@ const typeMap: { [key: string]: string } = {
   'fq::vec_in_buf': 'Fq[]',
   'fq::vec_out_buf': 'Fq[]',
   'const uint8_t *': 'Uint8Array',
-  'uint8_vec_vec_in_buf': 'Uint8Array[]',
+  uint8_vec_vec_in_buf: 'Uint8Array[]',
   'uint8_t **': 'Uint8Array',
   in_str_buf: 'string',
   out_str_buf: 'string',

package/src/bindgen/typescript.ts

@@ -46,8 +46,8 @@ export class BarretenbergApi {
         outArgs.length === 0
           ? 'void'
           : outArgs.length === 1
-          ? `${mapType(outArgs[0].type)}`
-          : `[${outArgs.map(a => mapType(a.type)).join(', ')}]`;
+            ? `${mapType(outArgs[0].type)}`
+            : `[${outArgs.map(a => mapType(a.type)).join(', ')}]`;
 
       output += `
   async ${toCamelCase(functionName)}(${parameters}): Promise<${returnType}> {
@@ -93,8 +93,8 @@ export class BarretenbergApiSync {
         outArgs.length === 0
           ? 'void'
           : outArgs.length === 1
-          ? `${mapType(outArgs[0].type)}`
-          : `[${outArgs.map(a => mapType(a.type)).join(', ')}]`;
+            ? `${mapType(outArgs[0].type)}`
+            : `[${outArgs.map(a => mapType(a.type)).join(', ')}]`;
 
       output += `
   ${toCamelCase(functionName)}(${parameters}): ${returnType} {

package/src/crs/net_crs.ts

@@ -78,7 +78,7 @@ export class NetCrs {
     const g1End = this.numPoints * 64 - 1;
     return await retry(
       () =>
-        fetch('https://aztec-ignition.s3.amazonaws.com/MAIN%20IGNITION/flat/g1.dat', {
+        fetch('https://crs.aztec.network/g1.dat', {
           headers: {
             Range: `bytes=0-${g1End}`,
           },
@@ -94,7 +94,7 @@ export class NetCrs {
   private async fetchG2Data(): Promise<Response> {
     return await retry(
       () =>
-        fetch('https://aztec-ignition.s3.amazonaws.com/MAIN%20IGNITION/flat/g2.dat', {
+        fetch('https://crs.aztec.network/g2.dat', {
           cache: 'force-cache',
         }),
       makeBackoff([5, 5, 5]),
@@ -152,12 +152,11 @@ export class NetGrumpkinCrs {
       return new Response(new Uint8Array([]));
     }
 
-    const g1Start = 28;
-    const g1End = g1Start + (this.numPoints * 64 - 1);
+    const g1End = this.numPoints * 64 - 1;
 
-    return await fetch('https://aztec-ignition.s3.amazonaws.com/TEST%20GRUMPKIN/monomial/transcript00.dat', {
+    return await fetch('https://crs.aztec.network/grumpkin_g1.dat', {
       headers: {
-        Range: `bytes=${g1Start}-${g1End}`,
+        Range: `bytes=0-${g1End}`,
       },
       cache: 'force-cache',
     });

package/src/crs/node/index.ts

@@ -98,7 +98,7 @@ export class GrumpkinCrs {
   async init(): Promise<void> {
     mkdirSync(this.path, { recursive: true });
 
-    const g1FileSize = await stat(this.path + '/grumpkin_g1.dat')
+    const g1FileSize = await stat(this.path + '/grumpkin_g1.flat.dat')
       .then(stats => stats.size)
       .catch(() => 0);
 
@@ -111,7 +111,7 @@ export class GrumpkinCrs {
     const crs = new NetGrumpkinCrs(this.numPoints);
     const stream = await crs.streamG1Data();
 
-    await finished(Readable.fromWeb(stream as any).pipe(createWriteStream(this.path + '/grumpkin_g1.dat')));
+    await finished(Readable.fromWeb(stream as any).pipe(createWriteStream(this.path + '/grumpkin_g1.flat.dat')));
     writeFileSync(this.path + '/grumpkin_size', String(crs.numPoints));
   }
 
@@ -120,6 +120,6 @@ export class GrumpkinCrs {
    * @returns The points data.
    */
   getG1Data(): Uint8Array {
-    return readFileSync(this.path + '/grumpkin_g1.dat');
+    return readFileSync(this.path + '/grumpkin_g1.flat.dat');
   }
 }

package/src/index.html

@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html>
   <head>
     <title>My App</title>

package/src/index.ts

@@ -4,7 +4,6 @@ export {
   Barretenberg,
   BarretenbergSync,
   BarretenbergVerifier,
-  UltraPlonkBackend,
   UltraHonkBackend,
   AztecClientBackend,
 } from './barretenberg/index.js';