chore: standardize ACIR serialization format in JS

noir-lang · Oct 11, 2023 · 52bf717 · 52bf717
1 parent 35f7a9d
commit 52bf717
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 23 deletions.
diff --git a/tooling/noir_js/src/index.ts b/tooling/noir_js/src/index.ts
@@ -3,6 +3,6 @@ import * as abi from '@noir-lang/noirc_abi';
 
 export { acvm, abi };
 
-export { acirToUint8Array, witnessMapToUint8Array } from './serialize.js';
+export { WitnessMap } from '@noir-lang/acvm_js';
 
 export { Noir } from './program.js';
diff --git a/tooling/noir_js/src/program.ts b/tooling/noir_js/src/program.ts
@@ -2,8 +2,7 @@
 import { Backend, CompiledCircuit, ProofData } from '@noir-lang/types';
 import { generateWitness } from './witness_generation.js';
 import initAbi, { abiDecode, InputMap, InputValue } from '@noir-lang/noirc_abi';
-import initACVM from '@noir-lang/acvm_js';
-import { witnessMapToUint8Array } from './serialize.js';
+import initACVM, { compressWitness } from '@noir-lang/acvm_js';
 
 export class Noir {
   constructor(
@@ -30,7 +29,7 @@ export class Noir {
     await this.init();
     const witness = await generateWitness(this.circuit, inputs);
     const { return_value: returnValue } = abiDecode(this.circuit.abi, witness);
-    return { witness: witnessMapToUint8Array(witness), returnValue };
+    return { witness: compressWitness(witness), returnValue };
   }
 
   // Initial inputs to your program

diff --git a/tooling/noir_js/src/serialize.ts b/tooling/noir_js/src/serialize.ts
diff --git a/tooling/noir_js_backend_barretenberg/src/index.ts b/tooling/noir_js_backend_barretenberg/src/index.ts
@@ -1,4 +1,5 @@
 /* eslint-disable  @typescript-eslint/no-explicit-any */
+import { decompressSync as gunzip } from 'fflate';
 import { acirToUint8Array } from './serialize.js';
 import { Backend, CompiledCircuit, ProofData } from '@noir-lang/types';
 
@@ -65,12 +66,12 @@ export class BarretenbergBackend implements Backend {
     return this.generateProof(witness, makeEasyToVerifyInCircuit);
   }
 
-  async generateProof(decompressedWitness: Uint8Array, makeEasyToVerifyInCircuit: boolean): Promise<ProofData> {
+  async generateProof(compressedWitness: Uint8Array, makeEasyToVerifyInCircuit: boolean): Promise<ProofData> {
     await this.instantiate();
     const proofWithPublicInputs = await this.api.acirCreateProof(
       this.acirComposer,
       this.acirUncompressedBytecode,
-      decompressedWitness,
+      gunzip(compressedWitness),
       makeEasyToVerifyInCircuit,
     );