@aztec/bb.js 0.0.1-alpha.4 → 0.0.1-alpha.6

package/src/barretenberg_api/index.ts

@@ -12,47 +12,52 @@ export class BarretenbergApi {
   }
 
   async pedersenInit(): Promise<void> {
-    const result = await this.binder.callWasmExport('pedersen_init', [], []);
+    const result = await this.binder.callWasmExport('pedersen___init', [], []);
     return;
   }
 
   async pedersenCompressFields(left: Fr, right: Fr): Promise<Fr> {
-    const result = await this.binder.callWasmExport('pedersen_compress_fields', [left, right], [Fr]);
+    const result = await this.binder.callWasmExport('pedersen___compress_fields', [left, right], [Fr]);
     return result[0];
   }
 
   async pedersenPlookupCompressFields(left: Fr, right: Fr): Promise<Fr> {
-    const result = await this.binder.callWasmExport('pedersen_plookup_compress_fields', [left, right], [Fr]);
+    const result = await this.binder.callWasmExport('pedersen___plookup_compress_fields', [left, right], [Fr]);
     return result[0];
   }
 
   async pedersenCompress(inputsBuffer: Fr[]): Promise<Fr> {
-    const result = await this.binder.callWasmExport('pedersen_compress', [inputsBuffer], [Fr]);
+    const result = await this.binder.callWasmExport('pedersen___compress', [inputsBuffer], [Fr]);
     return result[0];
   }
 
   async pedersenPlookupCompress(inputsBuffer: Fr[]): Promise<Fr> {
-    const result = await this.binder.callWasmExport('pedersen_plookup_compress', [inputsBuffer], [Fr]);
+    const result = await this.binder.callWasmExport('pedersen___plookup_compress', [inputsBuffer], [Fr]);
     return result[0];
   }
 
   async pedersenCompressWithHashIndex(inputsBuffer: Fr[], hashIndex: number): Promise<Fr> {
-    const result = await this.binder.callWasmExport('pedersen_compress_with_hash_index', [inputsBuffer, hashIndex], [Fr]);
+    const result = await this.binder.callWasmExport('pedersen___compress_with_hash_index', [inputsBuffer, hashIndex], [Fr]);
     return result[0];
   }
 
   async pedersenCommit(inputsBuffer: Fr[]): Promise<Fr> {
-    const result = await this.binder.callWasmExport('pedersen_commit', [inputsBuffer], [Fr]);
+    const result = await this.binder.callWasmExport('pedersen___commit', [inputsBuffer], [Fr]);
     return result[0];
   }
 
   async pedersenPlookupCommit(inputsBuffer: Fr[]): Promise<Fr> {
-    const result = await this.binder.callWasmExport('pedersen_plookup_commit', [inputsBuffer], [Fr]);
+    const result = await this.binder.callWasmExport('pedersen___plookup_commit', [inputsBuffer], [Fr]);
+    return result[0];
+  }
+
+  async pedersenPlookupCommitWithHashIndex(inputsBuffer: Fr[], hashIndex: number): Promise<Fr> {
+    const result = await this.binder.callWasmExport('pedersen___plookup_commit_with_hash_index', [inputsBuffer, hashIndex], [Fr]);
     return result[0];
   }
 
   async pedersenBufferToField(data: Uint8Array): Promise<Fr> {
-    const result = await this.binder.callWasmExport('pedersen_buffer_to_field', [data], [Fr]);
+    const result = await this.binder.callWasmExport('pedersen___buffer_to_field', [data], [Fr]);
     return result[0];
   }
 
@@ -171,8 +176,8 @@ export class BarretenbergApi {
     return result as any;
   }
 
-  async acirNewAcirComposer(): Promise<Ptr> {
-    const result = await this.binder.callWasmExport('acir_new_acir_composer', [], [Ptr]);
+  async acirNewAcirComposer(sizeHint: number): Promise<Ptr> {
+    const result = await this.binder.callWasmExport('acir_new_acir_composer', [sizeHint], [Ptr]);
     return result[0];
   }
 
@@ -186,8 +191,8 @@ export class BarretenbergApi {
     return;
   }
 
-  async acirInitProvingKey(acirComposerPtr: Ptr, constraintSystemBuf: Uint8Array, sizeHint: number): Promise<void> {
-    const result = await this.binder.callWasmExport('acir_init_proving_key', [acirComposerPtr, constraintSystemBuf, sizeHint], []);
+  async acirInitProvingKey(acirComposerPtr: Ptr, constraintSystemBuf: Uint8Array): Promise<void> {
+    const result = await this.binder.callWasmExport('acir_init_proving_key', [acirComposerPtr, constraintSystemBuf], []);
     return;
   }
 
@@ -240,47 +245,52 @@ export class BarretenbergApiSync {
   }
 
   pedersenInit(): void {
-    const result = this.binder.callWasmExport('pedersen_init', [], []);
+    const result = this.binder.callWasmExport('pedersen___init', [], []);
     return;
   }
 
   pedersenCompressFields(left: Fr, right: Fr): Fr {
-    const result = this.binder.callWasmExport('pedersen_compress_fields', [left, right], [Fr]);
+    const result = this.binder.callWasmExport('pedersen___compress_fields', [left, right], [Fr]);
     return result[0];
   }
 
   pedersenPlookupCompressFields(left: Fr, right: Fr): Fr {
-    const result = this.binder.callWasmExport('pedersen_plookup_compress_fields', [left, right], [Fr]);
+    const result = this.binder.callWasmExport('pedersen___plookup_compress_fields', [left, right], [Fr]);
     return result[0];
   }
 
   pedersenCompress(inputsBuffer: Fr[]): Fr {
-    const result = this.binder.callWasmExport('pedersen_compress', [inputsBuffer], [Fr]);
+    const result = this.binder.callWasmExport('pedersen___compress', [inputsBuffer], [Fr]);
     return result[0];
   }
 
   pedersenPlookupCompress(inputsBuffer: Fr[]): Fr {
-    const result = this.binder.callWasmExport('pedersen_plookup_compress', [inputsBuffer], [Fr]);
+    const result = this.binder.callWasmExport('pedersen___plookup_compress', [inputsBuffer], [Fr]);
     return result[0];
   }
 
   pedersenCompressWithHashIndex(inputsBuffer: Fr[], hashIndex: number): Fr {
-    const result = this.binder.callWasmExport('pedersen_compress_with_hash_index', [inputsBuffer, hashIndex], [Fr]);
+    const result = this.binder.callWasmExport('pedersen___compress_with_hash_index', [inputsBuffer, hashIndex], [Fr]);
     return result[0];
   }
 
   pedersenCommit(inputsBuffer: Fr[]): Fr {
-    const result = this.binder.callWasmExport('pedersen_commit', [inputsBuffer], [Fr]);
+    const result = this.binder.callWasmExport('pedersen___commit', [inputsBuffer], [Fr]);
     return result[0];
   }
 
   pedersenPlookupCommit(inputsBuffer: Fr[]): Fr {
-    const result = this.binder.callWasmExport('pedersen_plookup_commit', [inputsBuffer], [Fr]);
+    const result = this.binder.callWasmExport('pedersen___plookup_commit', [inputsBuffer], [Fr]);
+    return result[0];
+  }
+
+  pedersenPlookupCommitWithHashIndex(inputsBuffer: Fr[], hashIndex: number): Fr {
+    const result = this.binder.callWasmExport('pedersen___plookup_commit_with_hash_index', [inputsBuffer, hashIndex], [Fr]);
     return result[0];
   }
 
   pedersenBufferToField(data: Uint8Array): Fr {
-    const result = this.binder.callWasmExport('pedersen_buffer_to_field', [data], [Fr]);
+    const result = this.binder.callWasmExport('pedersen___buffer_to_field', [data], [Fr]);
     return result[0];
   }
 
@@ -399,8 +409,8 @@ export class BarretenbergApiSync {
     return result as any;
   }
 
-  acirNewAcirComposer(): Ptr {
-    const result = this.binder.callWasmExport('acir_new_acir_composer', [], [Ptr]);
+  acirNewAcirComposer(sizeHint: number): Ptr {
+    const result = this.binder.callWasmExport('acir_new_acir_composer', [sizeHint], [Ptr]);
     return result[0];
   }
 
@@ -414,8 +424,8 @@ export class BarretenbergApiSync {
     return;
   }
 
-  acirInitProvingKey(acirComposerPtr: Ptr, constraintSystemBuf: Uint8Array, sizeHint: number): void {
-    const result = this.binder.callWasmExport('acir_init_proving_key', [acirComposerPtr, constraintSystemBuf, sizeHint], []);
+  acirInitProvingKey(acirComposerPtr: Ptr, constraintSystemBuf: Uint8Array): void {
+    const result = this.binder.callWasmExport('acir_init_proving_key', [acirComposerPtr, constraintSystemBuf], []);
     return;
   }
 

package/src/main.ts

@@ -64,7 +64,7 @@ async function init(jsonPath: string, sizeHint?: number) {
   // TODO: Make RawBuffer be default behaviour, 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();
+  const acirComposer = await api.acirNewAcirComposer(subgroupSize);
   return { api, acirComposer, circuitSize: subgroupSize };
 }
 
@@ -77,24 +77,15 @@ async function initLite() {
   // 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();
+  const acirComposer = await api.acirNewAcirComposer(0);
   return { api, acirComposer };
 }
 
 export async function proveAndVerify(jsonPath: string, witnessPath: string, isRecursive: boolean, sizeHint?: number) {
   const { api, acirComposer } = await init(jsonPath, sizeHint);
   try {
-    // debug('initing proving key...');
-    const bytecode = getBytecode(jsonPath);
-    // await api.acirInitProvingKey(acirComposer, new RawBuffer(bytecode), circuitSize);
-
-    // const circuitSize = await api.acirGetExactCircuitSize(acirComposer);
-    // debug(`circuit size: ${circuitSize}`);
-
-    // debug('initing verification key...');
-    // await api.acirInitVerificationKey(acirComposer);
-
     debug(`creating proof...`);
+    const bytecode = getBytecode(jsonPath);
     const witness = getWitness(witnessPath);
     const proof = await api.acirCreateProof(acirComposer, new RawBuffer(bytecode), new RawBuffer(witness), isRecursive);
 
@@ -116,14 +107,8 @@ export async function prove(
 ) {
   const { api, acirComposer } = await init(jsonPath, sizeHint);
   try {
-    // debug('initing proving key...');
-    const bytecode = getBytecode(jsonPath);
-    // await api.acirInitProvingKey(acirComposer, new RawBuffer(bytecode), circuitSize);
-
-    // const circuitSize = await api.acirGetExactCircuitSize(acirComposer);
-    // debug(`circuit size: ${circuitSize}`);
-
     debug(`creating proof...`);
+    const bytecode = getBytecode(jsonPath);
     const witness = getWitness(witnessPath);
     const proof = await api.acirCreateProof(acirComposer, new RawBuffer(bytecode), new RawBuffer(witness), isRecursive);
     debug(`done.`);
@@ -174,11 +159,11 @@ export async function contract(outputPath: string, vkPath: string) {
 }
 
 export async function writeVk(jsonPath: string, outputPath: string, sizeHint?: number) {
-  const { api, acirComposer, circuitSize } = await init(jsonPath, sizeHint);
+  const { api, acirComposer } = await init(jsonPath, sizeHint);
   try {
     debug('initing proving key...');
     const bytecode = getBytecode(jsonPath);
-    await api.acirInitProvingKey(acirComposer, new RawBuffer(bytecode), circuitSize);
+    await api.acirInitProvingKey(acirComposer, new RawBuffer(bytecode));
 
     debug('initing verification key...');
     const vk = await api.acirGetVerificationKey(acirComposer);