Merge branch 'master' into tf/noir-js-testing-ci

* master:
  chore: delete unnecessary nix files (#2840)
  chore!: `generateWitness` now returns a serialized witness file (#2842)

acvm-repo/.gitignore

@@ -4,4 +4,3 @@
 # Cargo.lock
 result
 outputs/
-.direnv

tooling/noir_js/src/witness_generation.ts

@@ -2,6 +2,7 @@ import { abiEncode } from '@noir-lang/noirc_abi';
 import { validateInputs } from './input_validation.js';
 import { base64Decode } from './base64_decode.js';
 import { WitnessMap, executeCircuit } from '@noir-lang/acvm_js';
+import { witnessMapToUint8Array } from './serialize.js';
 
 // Generates the witnesses needed to feed into the chosen proving system
 export async function generateWitness(compiledProgram, inputs): Promise<WitnessMap> {
@@ -12,12 +13,13 @@ export async function generateWitness(compiledProgram, inputs): Promise<WitnessM
   }
   const witnessMap = abiEncode(compiledProgram.abi, inputs, null);
 
-  // Execute the circuit to generate the rest of the witnesses
+  // Execute the circuit to generate the rest of the witnesses and serialize
+  // them into a Uint8Array.
   try {
     const solvedWitness = await executeCircuit(base64Decode(compiledProgram.bytecode), witnessMap, () => {
       throw Error('unexpected oracle during execution');
     });
-    return solvedWitness;
+    return witnessMapToUint8Array(solvedWitness);
   } catch (err) {
     throw new Error(`Circuit execution failed: ${err}`);
   }