@aztec/noir-acvm_js 2.0.0-nightly.20250903 → 3.0.0-canary.a9708bd

package/nodejs/acvm_js.d.ts

@@ -6,59 +6,6 @@
  * @param {LogLevel} level - The maximum level of logging to be emitted.
  */
 export function initLogLevel(filter: string): void;
-/**
- * Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's return values.
- *
- * @param {Uint8Array} circuit - A serialized representation of an ACIR circuit
- * @param {WitnessMap} witness_map - The completed witness map after executing the circuit.
- * @returns {WitnessMap} A witness map containing the circuit's return values.
- */
-export function getReturnWitness(program: Uint8Array, witness_map: WitnessMap): WitnessMap;
-/**
- * Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's public parameters.
- *
- * @param {Uint8Array} circuit - A serialized representation of an ACIR circuit
- * @param {WitnessMap} witness_map - The completed witness map after executing the circuit.
- * @returns {WitnessMap} A witness map containing the circuit's public parameters.
- */
-export function getPublicParametersWitness(program: Uint8Array, solved_witness: WitnessMap): WitnessMap;
-/**
- * Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's public inputs.
- *
- * @param {Uint8Array} circuit - A serialized representation of an ACIR circuit
- * @param {WitnessMap} witness_map - The completed witness map after executing the circuit.
- * @returns {WitnessMap} A witness map containing the circuit's public inputs.
- */
-export function getPublicWitness(program: Uint8Array, solved_witness: WitnessMap): WitnessMap;
-/**
- * Performs a bitwise AND operation between `lhs` and `rhs`
- */
-export function and(lhs: string, rhs: string): string;
-/**
- * Performs a bitwise XOR operation between `lhs` and `rhs`
- */
-export function xor(lhs: string, rhs: string): string;
-/**
- * Sha256 compression function
- */
-export function sha256_compression(inputs: Uint32Array, state: Uint32Array): Uint32Array;
-/**
- * Calculates the Blake2s256 hash of the input bytes
- */
-export function blake2s256(inputs: Uint8Array): Uint8Array;
-/**
- * Verifies a ECDSA signature over the secp256k1 curve.
- */
-export function ecdsa_secp256k1_verify(hashed_msg: Uint8Array, public_key_x_bytes: Uint8Array, public_key_y_bytes: Uint8Array, signature: Uint8Array): boolean;
-/**
- * Verifies a ECDSA signature over the secp256r1 curve.
- */
-export function ecdsa_secp256r1_verify(hashed_msg: Uint8Array, public_key_x_bytes: Uint8Array, public_key_y_bytes: Uint8Array, signature: Uint8Array): boolean;
-/**
- * Returns the `BuildInfo` object containing information about how the installed package was built.
- * @returns {BuildInfo} - Information on how the installed package was built.
- */
-export function buildInfo(): BuildInfo;
 /**
  * Compresses a `WitnessMap` into the binary format outputted by Nargo.
  *
@@ -116,6 +63,82 @@ export function executeCircuitWithReturnWitness(program: Uint8Array, initial_wit
  * @returns {WitnessStack} The solved witness calculated by executing the program on the provided inputs.
  */
 export function executeProgram(program: Uint8Array, initial_witness: WitnessMap, foreign_call_handler: ForeignCallHandler): Promise<WitnessStack>;
+/**
+ * Performs a bitwise AND operation between `lhs` and `rhs`
+ */
+export function and(lhs: string, rhs: string): string;
+/**
+ * Performs a bitwise XOR operation between `lhs` and `rhs`
+ */
+export function xor(lhs: string, rhs: string): string;
+/**
+ * Sha256 compression function
+ */
+export function sha256_compression(inputs: Uint32Array, state: Uint32Array): Uint32Array;
+/**
+ * Calculates the Blake2s256 hash of the input bytes
+ */
+export function blake2s256(inputs: Uint8Array): Uint8Array;
+/**
+ * Verifies a ECDSA signature over the secp256k1 curve.
+ */
+export function ecdsa_secp256k1_verify(hashed_msg: Uint8Array, public_key_x_bytes: Uint8Array, public_key_y_bytes: Uint8Array, signature: Uint8Array): boolean;
+/**
+ * Verifies a ECDSA signature over the secp256r1 curve.
+ */
+export function ecdsa_secp256r1_verify(hashed_msg: Uint8Array, public_key_x_bytes: Uint8Array, public_key_y_bytes: Uint8Array, signature: Uint8Array): boolean;
+/**
+ * Returns the `BuildInfo` object containing information about how the installed package was built.
+ * @returns {BuildInfo} - Information on how the installed package was built.
+ */
+export function buildInfo(): BuildInfo;
+/**
+ * Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's return values.
+ *
+ * @param {Uint8Array} circuit - A serialized representation of an ACIR circuit
+ * @param {WitnessMap} witness_map - The completed witness map after executing the circuit.
+ * @returns {WitnessMap} A witness map containing the circuit's return values.
+ */
+export function getReturnWitness(program: Uint8Array, witness_map: WitnessMap): WitnessMap;
+/**
+ * Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's public parameters.
+ *
+ * @param {Uint8Array} circuit - A serialized representation of an ACIR circuit
+ * @param {WitnessMap} witness_map - The completed witness map after executing the circuit.
+ * @returns {WitnessMap} A witness map containing the circuit's public parameters.
+ */
+export function getPublicParametersWitness(program: Uint8Array, solved_witness: WitnessMap): WitnessMap;
+/**
+ * Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's public inputs.
+ *
+ * @param {Uint8Array} circuit - A serialized representation of an ACIR circuit
+ * @param {WitnessMap} witness_map - The completed witness map after executing the circuit.
+ * @returns {WitnessMap} A witness map containing the circuit's public inputs.
+ */
+export function getPublicWitness(program: Uint8Array, solved_witness: WitnessMap): WitnessMap;
+
+export type StackItem = {
+    index: number;
+    witness: WitnessMap;
+}
+
+export type WitnessStack = Array<StackItem>;
+
+
+
+/**
+* @typedef {Object} BuildInfo - Information about how the installed package was built
+* @property {string} gitHash - The hash of the git commit from which the package was built. 
+* @property {string} version - The version of the package at the built git commit.
+* @property {boolean} dirty - Whether the package contained uncommitted changes when built.
+ */
+export type BuildInfo = {
+  gitHash: string;
+  version: string;
+  dirty: string;
+}
+
+
 
 export type RawAssertionPayload = {
     selector: string;
@@ -146,29 +169,6 @@ export type SolvedAndReturnWitness = {
 
 
 
-export type StackItem = {
-    index: number;
-    witness: WitnessMap;
-}
-
-export type WitnessStack = Array<StackItem>;
-
-
-
-/**
-* @typedef {Object} BuildInfo - Information about how the installed package was built
-* @property {string} gitHash - The hash of the git commit from which the package was built. 
-* @property {string} version - The version of the package at the built git commit.
-* @property {boolean} dirty - Whether the package contained uncommitted changes when built.
- */
-export type BuildInfo = {
-  gitHash: string;
-  version: string;
-  dirty: string;
-}
-
-
-
 export type ForeignCallInput = string[]
 export type ForeignCallOutput = string | string[]
 

package/nodejs/acvm_js.js

@@ -221,6 +221,26 @@ module.exports.initLogLevel = function(filter) {
     }
 };
 
+function getArrayU8FromWasm0(ptr, len) {
+    ptr = ptr >>> 0;
+    return getUint8ArrayMemory0().subarray(ptr / 1, ptr / 1 + len);
+}
+/**
+ * Compresses a `WitnessMap` into the binary format outputted by Nargo.
+ *
+ * @param {WitnessMap} witness_map - A witness map.
+ * @returns {Uint8Array} A compressed witness map
+ */
+module.exports.compressWitness = function(witness_map) {
+    const ret = wasm.compressWitness(witness_map);
+    if (ret[3]) {
+        throw takeFromExternrefTable0(ret[2]);
+    }
+    var v1 = getArrayU8FromWasm0(ret[0], ret[1]).slice();
+    wasm.__wbindgen_free(ret[0], ret[1] * 1, 1);
+    return v1;
+};
+
 function passArray8ToWasm0(arg, malloc) {
     const ptr = malloc(arg.length * 1, 1) >>> 0;
     getUint8ArrayMemory0().set(arg, ptr / 1);
@@ -228,19 +248,16 @@ function passArray8ToWasm0(arg, malloc) {
     return ptr;
 }
 /**
- * Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's return values.
+ * Decompresses a compressed witness as outputted by Nargo into a `WitnessMap`.
+ * This should be used to only fetch the witness map for the main function.
  *
- * @param {Uint8Array} circuit - A serialized representation of an ACIR circuit
- * @param {WitnessMap} witness_map - The completed witness map after executing the circuit.
- * @returns {WitnessMap} A witness map containing the circuit's return values.
- * @param {Uint8Array} program
- * @param {WitnessMap} witness_map
- * @returns {WitnessMap}
+ * @param {Uint8Array} compressed_witness - A compressed witness.
+ * @returns {WitnessMap} The decompressed witness map.
  */
-module.exports.getReturnWitness = function(program, witness_map) {
-    const ptr0 = passArray8ToWasm0(program, wasm.__wbindgen_malloc);
+module.exports.decompressWitness = function(compressed_witness) {
+    const ptr0 = passArray8ToWasm0(compressed_witness, wasm.__wbindgen_malloc);
     const len0 = WASM_VECTOR_LEN;
-    const ret = wasm.getReturnWitness(ptr0, len0, witness_map);
+    const ret = wasm.decompressWitness(ptr0, len0);
     if (ret[2]) {
         throw takeFromExternrefTable0(ret[1]);
     }
@@ -248,19 +265,31 @@ module.exports.getReturnWitness = function(program, witness_map) {
 };
 
 /**
- * Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's public parameters.
+ * Compresses a `WitnessStack` into the binary format outputted by Nargo.
  *
- * @param {Uint8Array} circuit - A serialized representation of an ACIR circuit
- * @param {WitnessMap} witness_map - The completed witness map after executing the circuit.
- * @returns {WitnessMap} A witness map containing the circuit's public parameters.
- * @param {Uint8Array} program
- * @param {WitnessMap} solved_witness
- * @returns {WitnessMap}
+ * @param {WitnessStack} witness_stack - A witness stack.
+ * @returns {Uint8Array} A compressed witness stack
  */
-module.exports.getPublicParametersWitness = function(program, solved_witness) {
-    const ptr0 = passArray8ToWasm0(program, wasm.__wbindgen_malloc);
+module.exports.compressWitnessStack = function(witness_stack) {
+    const ret = wasm.compressWitnessStack(witness_stack);
+    if (ret[3]) {
+        throw takeFromExternrefTable0(ret[2]);
+    }
+    var v1 = getArrayU8FromWasm0(ret[0], ret[1]).slice();
+    wasm.__wbindgen_free(ret[0], ret[1] * 1, 1);
+    return v1;
+};
+
+/**
+ * Decompresses a compressed witness stack as outputted by Nargo into a `WitnessStack`.
+ *
+ * @param {Uint8Array} compressed_witness - A compressed witness.
+ * @returns {WitnessStack} The decompressed witness stack.
+ */
+module.exports.decompressWitnessStack = function(compressed_witness) {
+    const ptr0 = passArray8ToWasm0(compressed_witness, wasm.__wbindgen_malloc);
     const len0 = WASM_VECTOR_LEN;
-    const ret = wasm.getPublicParametersWitness(ptr0, len0, solved_witness);
+    const ret = wasm.decompressWitnessStack(ptr0, len0);
     if (ret[2]) {
         throw takeFromExternrefTable0(ret[1]);
     }
@@ -268,23 +297,49 @@ module.exports.getPublicParametersWitness = function(program, solved_witness) {
 };
 
 /**
- * Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's public inputs.
+ * Executes an ACIR circuit to generate the solved witness from the initial witness.
  *
  * @param {Uint8Array} circuit - A serialized representation of an ACIR circuit
- * @param {WitnessMap} witness_map - The completed witness map after executing the circuit.
- * @returns {WitnessMap} A witness map containing the circuit's public inputs.
- * @param {Uint8Array} program
- * @param {WitnessMap} solved_witness
- * @returns {WitnessMap}
+ * @param {WitnessMap} initial_witness - The initial witness map defining all of the inputs to `circuit`..
+ * @param {ForeignCallHandler} foreign_call_handler - A callback to process any foreign calls from the circuit.
+ * @returns {WitnessMap} The solved witness calculated by executing the circuit on the provided inputs.
  */
-module.exports.getPublicWitness = function(program, solved_witness) {
+module.exports.executeCircuit = function(program, initial_witness, foreign_call_handler) {
     const ptr0 = passArray8ToWasm0(program, wasm.__wbindgen_malloc);
     const len0 = WASM_VECTOR_LEN;
-    const ret = wasm.getPublicWitness(ptr0, len0, solved_witness);
-    if (ret[2]) {
-        throw takeFromExternrefTable0(ret[1]);
-    }
-    return takeFromExternrefTable0(ret[0]);
+    const ret = wasm.executeCircuit(ptr0, len0, initial_witness, foreign_call_handler);
+    return ret;
+};
+
+/**
+ * Executes an ACIR circuit to generate the solved witness from the initial witness.
+ * This method also extracts the public return values from the solved witness into its own return witness.
+ *
+ * @param {Uint8Array} circuit - A serialized representation of an ACIR circuit
+ * @param {WitnessMap} initial_witness - The initial witness map defining all of the inputs to `circuit`..
+ * @param {ForeignCallHandler} foreign_call_handler - A callback to process any foreign calls from the circuit.
+ * @returns {SolvedAndReturnWitness} The solved witness calculated by executing the circuit on the provided inputs, as well as the return witness indices as specified by the circuit.
+ */
+module.exports.executeCircuitWithReturnWitness = function(program, initial_witness, foreign_call_handler) {
+    const ptr0 = passArray8ToWasm0(program, wasm.__wbindgen_malloc);
+    const len0 = WASM_VECTOR_LEN;
+    const ret = wasm.executeCircuitWithReturnWitness(ptr0, len0, initial_witness, foreign_call_handler);
+    return ret;
+};
+
+/**
+ * Executes an ACIR circuit to generate the solved witness from the initial witness.
+ *
+ * @param {Uint8Array} program - A serialized representation of an ACIR program
+ * @param {WitnessMap} initial_witness - The initial witness map defining all of the inputs to `program`.
+ * @param {ForeignCallHandler} foreign_call_handler - A callback to process any foreign calls from the program.
+ * @returns {WitnessStack} The solved witness calculated by executing the program on the provided inputs.
+ */
+module.exports.executeProgram = function(program, initial_witness, foreign_call_handler) {
+    const ptr0 = passArray8ToWasm0(program, wasm.__wbindgen_malloc);
+    const len0 = WASM_VECTOR_LEN;
+    const ret = wasm.executeProgram(ptr0, len0, initial_witness, foreign_call_handler);
+    return ret;
 };
 
 /**
@@ -346,10 +401,6 @@ module.exports.sha256_compression = function(inputs, state) {
     return v3;
 };
 
-function getArrayU8FromWasm0(ptr, len) {
-    ptr = ptr >>> 0;
-    return getUint8ArrayMemory0().subarray(ptr / 1, ptr / 1 + len);
-}
 /**
  * Calculates the Blake2s256 hash of the input bytes
  * @param {Uint8Array} inputs
@@ -416,32 +467,19 @@ module.exports.buildInfo = function() {
 };
 
 /**
- * Compresses a `WitnessMap` into the binary format outputted by Nargo.
- *
- * @param {WitnessMap} witness_map - A witness map.
- * @returns {Uint8Array} A compressed witness map
- */
-module.exports.compressWitness = function(witness_map) {
-    const ret = wasm.compressWitness(witness_map);
-    if (ret[3]) {
-        throw takeFromExternrefTable0(ret[2]);
-    }
-    var v1 = getArrayU8FromWasm0(ret[0], ret[1]).slice();
-    wasm.__wbindgen_free(ret[0], ret[1] * 1, 1);
-    return v1;
-};
-
-/**
- * Decompresses a compressed witness as outputted by Nargo into a `WitnessMap`.
- * This should be used to only fetch the witness map for the main function.
+ * Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's return values.
  *
- * @param {Uint8Array} compressed_witness - A compressed witness.
- * @returns {WitnessMap} The decompressed witness map.
+ * @param {Uint8Array} circuit - A serialized representation of an ACIR circuit
+ * @param {WitnessMap} witness_map - The completed witness map after executing the circuit.
+ * @returns {WitnessMap} A witness map containing the circuit's return values.
+ * @param {Uint8Array} program
+ * @param {WitnessMap} witness_map
+ * @returns {WitnessMap}
  */
-module.exports.decompressWitness = function(compressed_witness) {
-    const ptr0 = passArray8ToWasm0(compressed_witness, wasm.__wbindgen_malloc);
+module.exports.getReturnWitness = function(program, witness_map) {
+    const ptr0 = passArray8ToWasm0(program, wasm.__wbindgen_malloc);
     const len0 = WASM_VECTOR_LEN;
-    const ret = wasm.decompressWitness(ptr0, len0);
+    const ret = wasm.getReturnWitness(ptr0, len0, witness_map);
     if (ret[2]) {
         throw takeFromExternrefTable0(ret[1]);
     }
@@ -449,31 +487,19 @@ module.exports.decompressWitness = function(compressed_witness) {
 };
 
 /**
- * Compresses a `WitnessStack` into the binary format outputted by Nargo.
- *
- * @param {WitnessStack} witness_stack - A witness stack.
- * @returns {Uint8Array} A compressed witness stack
- */
-module.exports.compressWitnessStack = function(witness_stack) {
-    const ret = wasm.compressWitnessStack(witness_stack);
-    if (ret[3]) {
-        throw takeFromExternrefTable0(ret[2]);
-    }
-    var v1 = getArrayU8FromWasm0(ret[0], ret[1]).slice();
-    wasm.__wbindgen_free(ret[0], ret[1] * 1, 1);
-    return v1;
-};
-
-/**
- * Decompresses a compressed witness stack as outputted by Nargo into a `WitnessStack`.
+ * Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's public parameters.
  *
- * @param {Uint8Array} compressed_witness - A compressed witness.
- * @returns {WitnessStack} The decompressed witness stack.
+ * @param {Uint8Array} circuit - A serialized representation of an ACIR circuit
+ * @param {WitnessMap} witness_map - The completed witness map after executing the circuit.
+ * @returns {WitnessMap} A witness map containing the circuit's public parameters.
+ * @param {Uint8Array} program
+ * @param {WitnessMap} solved_witness
+ * @returns {WitnessMap}
  */
-module.exports.decompressWitnessStack = function(compressed_witness) {
-    const ptr0 = passArray8ToWasm0(compressed_witness, wasm.__wbindgen_malloc);
+module.exports.getPublicParametersWitness = function(program, solved_witness) {
+    const ptr0 = passArray8ToWasm0(program, wasm.__wbindgen_malloc);
     const len0 = WASM_VECTOR_LEN;
-    const ret = wasm.decompressWitnessStack(ptr0, len0);
+    const ret = wasm.getPublicParametersWitness(ptr0, len0, solved_witness);
     if (ret[2]) {
         throw takeFromExternrefTable0(ret[1]);
     }
@@ -481,61 +507,35 @@ module.exports.decompressWitnessStack = function(compressed_witness) {
 };
 
 /**
- * Executes an ACIR circuit to generate the solved witness from the initial witness.
- *
- * @param {Uint8Array} circuit - A serialized representation of an ACIR circuit
- * @param {WitnessMap} initial_witness - The initial witness map defining all of the inputs to `circuit`..
- * @param {ForeignCallHandler} foreign_call_handler - A callback to process any foreign calls from the circuit.
- * @returns {WitnessMap} The solved witness calculated by executing the circuit on the provided inputs.
- */
-module.exports.executeCircuit = function(program, initial_witness, foreign_call_handler) {
-    const ptr0 = passArray8ToWasm0(program, wasm.__wbindgen_malloc);
-    const len0 = WASM_VECTOR_LEN;
-    const ret = wasm.executeCircuit(ptr0, len0, initial_witness, foreign_call_handler);
-    return ret;
-};
-
-/**
- * Executes an ACIR circuit to generate the solved witness from the initial witness.
- * This method also extracts the public return values from the solved witness into its own return witness.
+ * Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's public inputs.
  *
  * @param {Uint8Array} circuit - A serialized representation of an ACIR circuit
- * @param {WitnessMap} initial_witness - The initial witness map defining all of the inputs to `circuit`..
- * @param {ForeignCallHandler} foreign_call_handler - A callback to process any foreign calls from the circuit.
- * @returns {SolvedAndReturnWitness} The solved witness calculated by executing the circuit on the provided inputs, as well as the return witness indices as specified by the circuit.
- */
-module.exports.executeCircuitWithReturnWitness = function(program, initial_witness, foreign_call_handler) {
-    const ptr0 = passArray8ToWasm0(program, wasm.__wbindgen_malloc);
-    const len0 = WASM_VECTOR_LEN;
-    const ret = wasm.executeCircuitWithReturnWitness(ptr0, len0, initial_witness, foreign_call_handler);
-    return ret;
-};
-
-/**
- * Executes an ACIR circuit to generate the solved witness from the initial witness.
- *
- * @param {Uint8Array} program - A serialized representation of an ACIR program
- * @param {WitnessMap} initial_witness - The initial witness map defining all of the inputs to `program`.
- * @param {ForeignCallHandler} foreign_call_handler - A callback to process any foreign calls from the program.
- * @returns {WitnessStack} The solved witness calculated by executing the program on the provided inputs.
+ * @param {WitnessMap} witness_map - The completed witness map after executing the circuit.
+ * @returns {WitnessMap} A witness map containing the circuit's public inputs.
+ * @param {Uint8Array} program
+ * @param {WitnessMap} solved_witness
+ * @returns {WitnessMap}
  */
-module.exports.executeProgram = function(program, initial_witness, foreign_call_handler) {
+module.exports.getPublicWitness = function(program, solved_witness) {
     const ptr0 = passArray8ToWasm0(program, wasm.__wbindgen_malloc);
     const len0 = WASM_VECTOR_LEN;
-    const ret = wasm.executeProgram(ptr0, len0, initial_witness, foreign_call_handler);
-    return ret;
+    const ret = wasm.getPublicWitness(ptr0, len0, solved_witness);
+    if (ret[2]) {
+        throw takeFromExternrefTable0(ret[1]);
+    }
+    return takeFromExternrefTable0(ret[0]);
 };
 
 function __wbg_adapter_30(arg0, arg1, arg2) {
-    wasm.closure645_externref_shim(arg0, arg1, arg2);
+    wasm.closure571_externref_shim(arg0, arg1, arg2);
 }
 
 function __wbg_adapter_89(arg0, arg1, arg2, arg3, arg4) {
-    wasm.closure1243_externref_shim(arg0, arg1, arg2, arg3, arg4);
+    wasm.closure1165_externref_shim(arg0, arg1, arg2, arg3, arg4);
 }
 
 function __wbg_adapter_110(arg0, arg1, arg2, arg3) {
-    wasm.closure1247_externref_shim(arg0, arg1, arg2, arg3);
+    wasm.closure1169_externref_shim(arg0, arg1, arg2, arg3);
 }
 
 module.exports.__wbg_call_672a4d21634d4a24 = function() { return handleError(function (arg0, arg1) {
@@ -813,8 +813,8 @@ module.exports.__wbindgen_cb_drop = function(arg0) {
     return ret;
 };
 
-module.exports.__wbindgen_closure_wrapper2151 = function(arg0, arg1, arg2) {
-    const ret = makeMutClosure(arg0, arg1, 646, __wbg_adapter_30);
+module.exports.__wbindgen_closure_wrapper1986 = function(arg0, arg1, arg2) {
+    const ret = makeMutClosure(arg0, arg1, 572, __wbg_adapter_30);
     return ret;
 };
 

package/nodejs/acvm_js_bg.wasm.d.ts

@@ -2,16 +2,6 @@
 /* eslint-disable */
 export const memory: WebAssembly.Memory;
 export const initLogLevel: (a: number, b: number) => [number, number];
-export const getReturnWitness: (a: number, b: number, c: any) => [number, number, number];
-export const getPublicParametersWitness: (a: number, b: number, c: any) => [number, number, number];
-export const getPublicWitness: (a: number, b: number, c: any) => [number, number, number];
-export const and: (a: any, b: any) => any;
-export const xor: (a: any, b: any) => any;
-export const sha256_compression: (a: number, b: number, c: number, d: number) => [number, number];
-export const blake2s256: (a: number, b: number) => [number, number];
-export const ecdsa_secp256k1_verify: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number) => number;
-export const ecdsa_secp256r1_verify: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number) => number;
-export const buildInfo: () => any;
 export const compressWitness: (a: any) => [number, number, number, number];
 export const decompressWitness: (a: number, b: number) => [number, number, number];
 export const compressWitnessStack: (a: any) => [number, number, number, number];
@@ -19,6 +9,16 @@ export const decompressWitnessStack: (a: number, b: number) => [number, number,
 export const executeCircuit: (a: number, b: number, c: any, d: any) => any;
 export const executeCircuitWithReturnWitness: (a: number, b: number, c: any, d: any) => any;
 export const executeProgram: (a: number, b: number, c: any, d: any) => any;
+export const and: (a: any, b: any) => any;
+export const xor: (a: any, b: any) => any;
+export const sha256_compression: (a: number, b: number, c: number, d: number) => [number, number];
+export const blake2s256: (a: number, b: number) => [number, number];
+export const ecdsa_secp256k1_verify: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number) => number;
+export const ecdsa_secp256r1_verify: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number) => number;
+export const buildInfo: () => any;
+export const getReturnWitness: (a: number, b: number, c: any) => [number, number, number];
+export const getPublicParametersWitness: (a: number, b: number, c: any) => [number, number, number];
+export const getPublicWitness: (a: number, b: number, c: any) => [number, number, number];
 export const __wbindgen_exn_store: (a: number) => void;
 export const __externref_table_alloc: () => number;
 export const __wbindgen_export_2: WebAssembly.Table;
@@ -27,7 +27,7 @@ export const __wbindgen_malloc: (a: number, b: number) => number;
 export const __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number;
 export const __wbindgen_export_6: WebAssembly.Table;
 export const __externref_table_dealloc: (a: number) => void;
-export const closure645_externref_shim: (a: number, b: number, c: any) => void;
-export const closure1243_externref_shim: (a: number, b: number, c: any, d: number, e: any) => void;
-export const closure1247_externref_shim: (a: number, b: number, c: any, d: any) => void;
+export const closure571_externref_shim: (a: number, b: number, c: any) => void;
+export const closure1165_externref_shim: (a: number, b: number, c: any, d: number, e: any) => void;
+export const closure1169_externref_shim: (a: number, b: number, c: any, d: any) => void;
 export const __wbindgen_start: () => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/noir-acvm_js",
-  "version": "2.0.0-nightly.20250903",
+  "version": "3.0.0-canary.a9708bd",
   "publishConfig": {
     "access": "public"
   },

package/web/acvm_js.d.ts

@@ -6,59 +6,6 @@
  * @param {LogLevel} level - The maximum level of logging to be emitted.
  */
 export function initLogLevel(filter: string): void;
-/**
- * Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's return values.
- *
- * @param {Uint8Array} circuit - A serialized representation of an ACIR circuit
- * @param {WitnessMap} witness_map - The completed witness map after executing the circuit.
- * @returns {WitnessMap} A witness map containing the circuit's return values.
- */
-export function getReturnWitness(program: Uint8Array, witness_map: WitnessMap): WitnessMap;
-/**
- * Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's public parameters.
- *
- * @param {Uint8Array} circuit - A serialized representation of an ACIR circuit
- * @param {WitnessMap} witness_map - The completed witness map after executing the circuit.
- * @returns {WitnessMap} A witness map containing the circuit's public parameters.
- */
-export function getPublicParametersWitness(program: Uint8Array, solved_witness: WitnessMap): WitnessMap;
-/**
- * Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's public inputs.
- *
- * @param {Uint8Array} circuit - A serialized representation of an ACIR circuit
- * @param {WitnessMap} witness_map - The completed witness map after executing the circuit.
- * @returns {WitnessMap} A witness map containing the circuit's public inputs.
- */
-export function getPublicWitness(program: Uint8Array, solved_witness: WitnessMap): WitnessMap;
-/**
- * Performs a bitwise AND operation between `lhs` and `rhs`
- */
-export function and(lhs: string, rhs: string): string;
-/**
- * Performs a bitwise XOR operation between `lhs` and `rhs`
- */
-export function xor(lhs: string, rhs: string): string;
-/**
- * Sha256 compression function
- */
-export function sha256_compression(inputs: Uint32Array, state: Uint32Array): Uint32Array;
-/**
- * Calculates the Blake2s256 hash of the input bytes
- */
-export function blake2s256(inputs: Uint8Array): Uint8Array;
-/**
- * Verifies a ECDSA signature over the secp256k1 curve.
- */
-export function ecdsa_secp256k1_verify(hashed_msg: Uint8Array, public_key_x_bytes: Uint8Array, public_key_y_bytes: Uint8Array, signature: Uint8Array): boolean;
-/**
- * Verifies a ECDSA signature over the secp256r1 curve.
- */
-export function ecdsa_secp256r1_verify(hashed_msg: Uint8Array, public_key_x_bytes: Uint8Array, public_key_y_bytes: Uint8Array, signature: Uint8Array): boolean;
-/**
- * Returns the `BuildInfo` object containing information about how the installed package was built.
- * @returns {BuildInfo} - Information on how the installed package was built.
- */
-export function buildInfo(): BuildInfo;
 /**
  * Compresses a `WitnessMap` into the binary format outputted by Nargo.
  *
@@ -116,6 +63,82 @@ export function executeCircuitWithReturnWitness(program: Uint8Array, initial_wit
  * @returns {WitnessStack} The solved witness calculated by executing the program on the provided inputs.
  */
 export function executeProgram(program: Uint8Array, initial_witness: WitnessMap, foreign_call_handler: ForeignCallHandler): Promise<WitnessStack>;
+/**
+ * Performs a bitwise AND operation between `lhs` and `rhs`
+ */
+export function and(lhs: string, rhs: string): string;
+/**
+ * Performs a bitwise XOR operation between `lhs` and `rhs`
+ */
+export function xor(lhs: string, rhs: string): string;
+/**
+ * Sha256 compression function
+ */
+export function sha256_compression(inputs: Uint32Array, state: Uint32Array): Uint32Array;
+/**
+ * Calculates the Blake2s256 hash of the input bytes
+ */
+export function blake2s256(inputs: Uint8Array): Uint8Array;
+/**
+ * Verifies a ECDSA signature over the secp256k1 curve.
+ */
+export function ecdsa_secp256k1_verify(hashed_msg: Uint8Array, public_key_x_bytes: Uint8Array, public_key_y_bytes: Uint8Array, signature: Uint8Array): boolean;
+/**
+ * Verifies a ECDSA signature over the secp256r1 curve.
+ */
+export function ecdsa_secp256r1_verify(hashed_msg: Uint8Array, public_key_x_bytes: Uint8Array, public_key_y_bytes: Uint8Array, signature: Uint8Array): boolean;
+/**
+ * Returns the `BuildInfo` object containing information about how the installed package was built.
+ * @returns {BuildInfo} - Information on how the installed package was built.
+ */
+export function buildInfo(): BuildInfo;
+/**
+ * Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's return values.
+ *
+ * @param {Uint8Array} circuit - A serialized representation of an ACIR circuit
+ * @param {WitnessMap} witness_map - The completed witness map after executing the circuit.
+ * @returns {WitnessMap} A witness map containing the circuit's return values.
+ */
+export function getReturnWitness(program: Uint8Array, witness_map: WitnessMap): WitnessMap;
+/**
+ * Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's public parameters.
+ *
+ * @param {Uint8Array} circuit - A serialized representation of an ACIR circuit
+ * @param {WitnessMap} witness_map - The completed witness map after executing the circuit.
+ * @returns {WitnessMap} A witness map containing the circuit's public parameters.
+ */
+export function getPublicParametersWitness(program: Uint8Array, solved_witness: WitnessMap): WitnessMap;
+/**
+ * Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's public inputs.
+ *
+ * @param {Uint8Array} circuit - A serialized representation of an ACIR circuit
+ * @param {WitnessMap} witness_map - The completed witness map after executing the circuit.
+ * @returns {WitnessMap} A witness map containing the circuit's public inputs.
+ */
+export function getPublicWitness(program: Uint8Array, solved_witness: WitnessMap): WitnessMap;
+
+export type StackItem = {
+    index: number;
+    witness: WitnessMap;
+}
+
+export type WitnessStack = Array<StackItem>;
+
+
+
+/**
+* @typedef {Object} BuildInfo - Information about how the installed package was built
+* @property {string} gitHash - The hash of the git commit from which the package was built. 
+* @property {string} version - The version of the package at the built git commit.
+* @property {boolean} dirty - Whether the package contained uncommitted changes when built.
+ */
+export type BuildInfo = {
+  gitHash: string;
+  version: string;
+  dirty: string;
+}
+
+
 
 export type RawAssertionPayload = {
     selector: string;
@@ -146,29 +169,6 @@ export type SolvedAndReturnWitness = {
 
 
 
-export type StackItem = {
-    index: number;
-    witness: WitnessMap;
-}
-
-export type WitnessStack = Array<StackItem>;
-
-
-
-/**
-* @typedef {Object} BuildInfo - Information about how the installed package was built
-* @property {string} gitHash - The hash of the git commit from which the package was built. 
-* @property {string} version - The version of the package at the built git commit.
-* @property {boolean} dirty - Whether the package contained uncommitted changes when built.
- */
-export type BuildInfo = {
-  gitHash: string;
-  version: string;
-  dirty: string;
-}
-
-
-
 export type ForeignCallInput = string[]
 export type ForeignCallOutput = string | string[]
 
@@ -188,16 +188,6 @@ export type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembl
 export interface InitOutput {
   readonly memory: WebAssembly.Memory;
   readonly initLogLevel: (a: number, b: number) => [number, number];
-  readonly getReturnWitness: (a: number, b: number, c: any) => [number, number, number];
-  readonly getPublicParametersWitness: (a: number, b: number, c: any) => [number, number, number];
-  readonly getPublicWitness: (a: number, b: number, c: any) => [number, number, number];
-  readonly and: (a: any, b: any) => any;
-  readonly xor: (a: any, b: any) => any;
-  readonly sha256_compression: (a: number, b: number, c: number, d: number) => [number, number];
-  readonly blake2s256: (a: number, b: number) => [number, number];
-  readonly ecdsa_secp256k1_verify: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number) => number;
-  readonly ecdsa_secp256r1_verify: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number) => number;
-  readonly buildInfo: () => any;
   readonly compressWitness: (a: any) => [number, number, number, number];
   readonly decompressWitness: (a: number, b: number) => [number, number, number];
   readonly compressWitnessStack: (a: any) => [number, number, number, number];
@@ -205,6 +195,16 @@ export interface InitOutput {
   readonly executeCircuit: (a: number, b: number, c: any, d: any) => any;
   readonly executeCircuitWithReturnWitness: (a: number, b: number, c: any, d: any) => any;
   readonly executeProgram: (a: number, b: number, c: any, d: any) => any;
+  readonly and: (a: any, b: any) => any;
+  readonly xor: (a: any, b: any) => any;
+  readonly sha256_compression: (a: number, b: number, c: number, d: number) => [number, number];
+  readonly blake2s256: (a: number, b: number) => [number, number];
+  readonly ecdsa_secp256k1_verify: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number) => number;
+  readonly ecdsa_secp256r1_verify: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number) => number;
+  readonly buildInfo: () => any;
+  readonly getReturnWitness: (a: number, b: number, c: any) => [number, number, number];
+  readonly getPublicParametersWitness: (a: number, b: number, c: any) => [number, number, number];
+  readonly getPublicWitness: (a: number, b: number, c: any) => [number, number, number];
   readonly __wbindgen_exn_store: (a: number) => void;
   readonly __externref_table_alloc: () => number;
   readonly __wbindgen_export_2: WebAssembly.Table;
@@ -213,9 +213,9 @@ export interface InitOutput {
   readonly __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number;
   readonly __wbindgen_export_6: WebAssembly.Table;
   readonly __externref_table_dealloc: (a: number) => void;
-  readonly closure645_externref_shim: (a: number, b: number, c: any) => void;
-  readonly closure1243_externref_shim: (a: number, b: number, c: any, d: number, e: any) => void;
-  readonly closure1247_externref_shim: (a: number, b: number, c: any, d: any) => void;
+  readonly closure571_externref_shim: (a: number, b: number, c: any) => void;
+  readonly closure1165_externref_shim: (a: number, b: number, c: any, d: number, e: any) => void;
+  readonly closure1169_externref_shim: (a: number, b: number, c: any, d: any) => void;
   readonly __wbindgen_start: () => void;
 }
 

package/web/acvm_js.js

@@ -217,6 +217,26 @@ export function initLogLevel(filter) {
     }
 }
 
+function getArrayU8FromWasm0(ptr, len) {
+    ptr = ptr >>> 0;
+    return getUint8ArrayMemory0().subarray(ptr / 1, ptr / 1 + len);
+}
+/**
+ * Compresses a `WitnessMap` into the binary format outputted by Nargo.
+ *
+ * @param {WitnessMap} witness_map - A witness map.
+ * @returns {Uint8Array} A compressed witness map
+ */
+export function compressWitness(witness_map) {
+    const ret = wasm.compressWitness(witness_map);
+    if (ret[3]) {
+        throw takeFromExternrefTable0(ret[2]);
+    }
+    var v1 = getArrayU8FromWasm0(ret[0], ret[1]).slice();
+    wasm.__wbindgen_free(ret[0], ret[1] * 1, 1);
+    return v1;
+}
+
 function passArray8ToWasm0(arg, malloc) {
     const ptr = malloc(arg.length * 1, 1) >>> 0;
     getUint8ArrayMemory0().set(arg, ptr / 1);
@@ -224,19 +244,16 @@ function passArray8ToWasm0(arg, malloc) {
     return ptr;
 }
 /**
- * Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's return values.
+ * Decompresses a compressed witness as outputted by Nargo into a `WitnessMap`.
+ * This should be used to only fetch the witness map for the main function.
  *
- * @param {Uint8Array} circuit - A serialized representation of an ACIR circuit
- * @param {WitnessMap} witness_map - The completed witness map after executing the circuit.
- * @returns {WitnessMap} A witness map containing the circuit's return values.
- * @param {Uint8Array} program
- * @param {WitnessMap} witness_map
- * @returns {WitnessMap}
+ * @param {Uint8Array} compressed_witness - A compressed witness.
+ * @returns {WitnessMap} The decompressed witness map.
  */
-export function getReturnWitness(program, witness_map) {
-    const ptr0 = passArray8ToWasm0(program, wasm.__wbindgen_malloc);
+export function decompressWitness(compressed_witness) {
+    const ptr0 = passArray8ToWasm0(compressed_witness, wasm.__wbindgen_malloc);
     const len0 = WASM_VECTOR_LEN;
-    const ret = wasm.getReturnWitness(ptr0, len0, witness_map);
+    const ret = wasm.decompressWitness(ptr0, len0);
     if (ret[2]) {
         throw takeFromExternrefTable0(ret[1]);
     }
@@ -244,19 +261,31 @@ export function getReturnWitness(program, witness_map) {
 }
 
 /**
- * Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's public parameters.
+ * Compresses a `WitnessStack` into the binary format outputted by Nargo.
  *
- * @param {Uint8Array} circuit - A serialized representation of an ACIR circuit
- * @param {WitnessMap} witness_map - The completed witness map after executing the circuit.
- * @returns {WitnessMap} A witness map containing the circuit's public parameters.
- * @param {Uint8Array} program
- * @param {WitnessMap} solved_witness
- * @returns {WitnessMap}
+ * @param {WitnessStack} witness_stack - A witness stack.
+ * @returns {Uint8Array} A compressed witness stack
  */
-export function getPublicParametersWitness(program, solved_witness) {
-    const ptr0 = passArray8ToWasm0(program, wasm.__wbindgen_malloc);
+export function compressWitnessStack(witness_stack) {
+    const ret = wasm.compressWitnessStack(witness_stack);
+    if (ret[3]) {
+        throw takeFromExternrefTable0(ret[2]);
+    }
+    var v1 = getArrayU8FromWasm0(ret[0], ret[1]).slice();
+    wasm.__wbindgen_free(ret[0], ret[1] * 1, 1);
+    return v1;
+}
+
+/**
+ * Decompresses a compressed witness stack as outputted by Nargo into a `WitnessStack`.
+ *
+ * @param {Uint8Array} compressed_witness - A compressed witness.
+ * @returns {WitnessStack} The decompressed witness stack.
+ */
+export function decompressWitnessStack(compressed_witness) {
+    const ptr0 = passArray8ToWasm0(compressed_witness, wasm.__wbindgen_malloc);
     const len0 = WASM_VECTOR_LEN;
-    const ret = wasm.getPublicParametersWitness(ptr0, len0, solved_witness);
+    const ret = wasm.decompressWitnessStack(ptr0, len0);
     if (ret[2]) {
         throw takeFromExternrefTable0(ret[1]);
     }
@@ -264,23 +293,49 @@ export function getPublicParametersWitness(program, solved_witness) {
 }
 
 /**
- * Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's public inputs.
+ * Executes an ACIR circuit to generate the solved witness from the initial witness.
  *
  * @param {Uint8Array} circuit - A serialized representation of an ACIR circuit
- * @param {WitnessMap} witness_map - The completed witness map after executing the circuit.
- * @returns {WitnessMap} A witness map containing the circuit's public inputs.
- * @param {Uint8Array} program
- * @param {WitnessMap} solved_witness
- * @returns {WitnessMap}
+ * @param {WitnessMap} initial_witness - The initial witness map defining all of the inputs to `circuit`..
+ * @param {ForeignCallHandler} foreign_call_handler - A callback to process any foreign calls from the circuit.
+ * @returns {WitnessMap} The solved witness calculated by executing the circuit on the provided inputs.
  */
-export function getPublicWitness(program, solved_witness) {
+export function executeCircuit(program, initial_witness, foreign_call_handler) {
     const ptr0 = passArray8ToWasm0(program, wasm.__wbindgen_malloc);
     const len0 = WASM_VECTOR_LEN;
-    const ret = wasm.getPublicWitness(ptr0, len0, solved_witness);
-    if (ret[2]) {
-        throw takeFromExternrefTable0(ret[1]);
-    }
-    return takeFromExternrefTable0(ret[0]);
+    const ret = wasm.executeCircuit(ptr0, len0, initial_witness, foreign_call_handler);
+    return ret;
+}
+
+/**
+ * Executes an ACIR circuit to generate the solved witness from the initial witness.
+ * This method also extracts the public return values from the solved witness into its own return witness.
+ *
+ * @param {Uint8Array} circuit - A serialized representation of an ACIR circuit
+ * @param {WitnessMap} initial_witness - The initial witness map defining all of the inputs to `circuit`..
+ * @param {ForeignCallHandler} foreign_call_handler - A callback to process any foreign calls from the circuit.
+ * @returns {SolvedAndReturnWitness} The solved witness calculated by executing the circuit on the provided inputs, as well as the return witness indices as specified by the circuit.
+ */
+export function executeCircuitWithReturnWitness(program, initial_witness, foreign_call_handler) {
+    const ptr0 = passArray8ToWasm0(program, wasm.__wbindgen_malloc);
+    const len0 = WASM_VECTOR_LEN;
+    const ret = wasm.executeCircuitWithReturnWitness(ptr0, len0, initial_witness, foreign_call_handler);
+    return ret;
+}
+
+/**
+ * Executes an ACIR circuit to generate the solved witness from the initial witness.
+ *
+ * @param {Uint8Array} program - A serialized representation of an ACIR program
+ * @param {WitnessMap} initial_witness - The initial witness map defining all of the inputs to `program`.
+ * @param {ForeignCallHandler} foreign_call_handler - A callback to process any foreign calls from the program.
+ * @returns {WitnessStack} The solved witness calculated by executing the program on the provided inputs.
+ */
+export function executeProgram(program, initial_witness, foreign_call_handler) {
+    const ptr0 = passArray8ToWasm0(program, wasm.__wbindgen_malloc);
+    const len0 = WASM_VECTOR_LEN;
+    const ret = wasm.executeProgram(ptr0, len0, initial_witness, foreign_call_handler);
+    return ret;
 }
 
 /**
@@ -342,10 +397,6 @@ export function sha256_compression(inputs, state) {
     return v3;
 }
 
-function getArrayU8FromWasm0(ptr, len) {
-    ptr = ptr >>> 0;
-    return getUint8ArrayMemory0().subarray(ptr / 1, ptr / 1 + len);
-}
 /**
  * Calculates the Blake2s256 hash of the input bytes
  * @param {Uint8Array} inputs
@@ -412,32 +463,19 @@ export function buildInfo() {
 }
 
 /**
- * Compresses a `WitnessMap` into the binary format outputted by Nargo.
- *
- * @param {WitnessMap} witness_map - A witness map.
- * @returns {Uint8Array} A compressed witness map
- */
-export function compressWitness(witness_map) {
-    const ret = wasm.compressWitness(witness_map);
-    if (ret[3]) {
-        throw takeFromExternrefTable0(ret[2]);
-    }
-    var v1 = getArrayU8FromWasm0(ret[0], ret[1]).slice();
-    wasm.__wbindgen_free(ret[0], ret[1] * 1, 1);
-    return v1;
-}
-
-/**
- * Decompresses a compressed witness as outputted by Nargo into a `WitnessMap`.
- * This should be used to only fetch the witness map for the main function.
+ * Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's return values.
  *
- * @param {Uint8Array} compressed_witness - A compressed witness.
- * @returns {WitnessMap} The decompressed witness map.
+ * @param {Uint8Array} circuit - A serialized representation of an ACIR circuit
+ * @param {WitnessMap} witness_map - The completed witness map after executing the circuit.
+ * @returns {WitnessMap} A witness map containing the circuit's return values.
+ * @param {Uint8Array} program
+ * @param {WitnessMap} witness_map
+ * @returns {WitnessMap}
  */
-export function decompressWitness(compressed_witness) {
-    const ptr0 = passArray8ToWasm0(compressed_witness, wasm.__wbindgen_malloc);
+export function getReturnWitness(program, witness_map) {
+    const ptr0 = passArray8ToWasm0(program, wasm.__wbindgen_malloc);
     const len0 = WASM_VECTOR_LEN;
-    const ret = wasm.decompressWitness(ptr0, len0);
+    const ret = wasm.getReturnWitness(ptr0, len0, witness_map);
     if (ret[2]) {
         throw takeFromExternrefTable0(ret[1]);
     }
@@ -445,31 +483,19 @@ export function decompressWitness(compressed_witness) {
 }
 
 /**
- * Compresses a `WitnessStack` into the binary format outputted by Nargo.
- *
- * @param {WitnessStack} witness_stack - A witness stack.
- * @returns {Uint8Array} A compressed witness stack
- */
-export function compressWitnessStack(witness_stack) {
-    const ret = wasm.compressWitnessStack(witness_stack);
-    if (ret[3]) {
-        throw takeFromExternrefTable0(ret[2]);
-    }
-    var v1 = getArrayU8FromWasm0(ret[0], ret[1]).slice();
-    wasm.__wbindgen_free(ret[0], ret[1] * 1, 1);
-    return v1;
-}
-
-/**
- * Decompresses a compressed witness stack as outputted by Nargo into a `WitnessStack`.
+ * Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's public parameters.
  *
- * @param {Uint8Array} compressed_witness - A compressed witness.
- * @returns {WitnessStack} The decompressed witness stack.
+ * @param {Uint8Array} circuit - A serialized representation of an ACIR circuit
+ * @param {WitnessMap} witness_map - The completed witness map after executing the circuit.
+ * @returns {WitnessMap} A witness map containing the circuit's public parameters.
+ * @param {Uint8Array} program
+ * @param {WitnessMap} solved_witness
+ * @returns {WitnessMap}
  */
-export function decompressWitnessStack(compressed_witness) {
-    const ptr0 = passArray8ToWasm0(compressed_witness, wasm.__wbindgen_malloc);
+export function getPublicParametersWitness(program, solved_witness) {
+    const ptr0 = passArray8ToWasm0(program, wasm.__wbindgen_malloc);
     const len0 = WASM_VECTOR_LEN;
-    const ret = wasm.decompressWitnessStack(ptr0, len0);
+    const ret = wasm.getPublicParametersWitness(ptr0, len0, solved_witness);
     if (ret[2]) {
         throw takeFromExternrefTable0(ret[1]);
     }
@@ -477,61 +503,35 @@ export function decompressWitnessStack(compressed_witness) {
 }
 
 /**
- * Executes an ACIR circuit to generate the solved witness from the initial witness.
- *
- * @param {Uint8Array} circuit - A serialized representation of an ACIR circuit
- * @param {WitnessMap} initial_witness - The initial witness map defining all of the inputs to `circuit`..
- * @param {ForeignCallHandler} foreign_call_handler - A callback to process any foreign calls from the circuit.
- * @returns {WitnessMap} The solved witness calculated by executing the circuit on the provided inputs.
- */
-export function executeCircuit(program, initial_witness, foreign_call_handler) {
-    const ptr0 = passArray8ToWasm0(program, wasm.__wbindgen_malloc);
-    const len0 = WASM_VECTOR_LEN;
-    const ret = wasm.executeCircuit(ptr0, len0, initial_witness, foreign_call_handler);
-    return ret;
-}
-
-/**
- * Executes an ACIR circuit to generate the solved witness from the initial witness.
- * This method also extracts the public return values from the solved witness into its own return witness.
+ * Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's public inputs.
  *
  * @param {Uint8Array} circuit - A serialized representation of an ACIR circuit
- * @param {WitnessMap} initial_witness - The initial witness map defining all of the inputs to `circuit`..
- * @param {ForeignCallHandler} foreign_call_handler - A callback to process any foreign calls from the circuit.
- * @returns {SolvedAndReturnWitness} The solved witness calculated by executing the circuit on the provided inputs, as well as the return witness indices as specified by the circuit.
- */
-export function executeCircuitWithReturnWitness(program, initial_witness, foreign_call_handler) {
-    const ptr0 = passArray8ToWasm0(program, wasm.__wbindgen_malloc);
-    const len0 = WASM_VECTOR_LEN;
-    const ret = wasm.executeCircuitWithReturnWitness(ptr0, len0, initial_witness, foreign_call_handler);
-    return ret;
-}
-
-/**
- * Executes an ACIR circuit to generate the solved witness from the initial witness.
- *
- * @param {Uint8Array} program - A serialized representation of an ACIR program
- * @param {WitnessMap} initial_witness - The initial witness map defining all of the inputs to `program`.
- * @param {ForeignCallHandler} foreign_call_handler - A callback to process any foreign calls from the program.
- * @returns {WitnessStack} The solved witness calculated by executing the program on the provided inputs.
+ * @param {WitnessMap} witness_map - The completed witness map after executing the circuit.
+ * @returns {WitnessMap} A witness map containing the circuit's public inputs.
+ * @param {Uint8Array} program
+ * @param {WitnessMap} solved_witness
+ * @returns {WitnessMap}
  */
-export function executeProgram(program, initial_witness, foreign_call_handler) {
+export function getPublicWitness(program, solved_witness) {
     const ptr0 = passArray8ToWasm0(program, wasm.__wbindgen_malloc);
     const len0 = WASM_VECTOR_LEN;
-    const ret = wasm.executeProgram(ptr0, len0, initial_witness, foreign_call_handler);
-    return ret;
+    const ret = wasm.getPublicWitness(ptr0, len0, solved_witness);
+    if (ret[2]) {
+        throw takeFromExternrefTable0(ret[1]);
+    }
+    return takeFromExternrefTable0(ret[0]);
 }
 
 function __wbg_adapter_30(arg0, arg1, arg2) {
-    wasm.closure645_externref_shim(arg0, arg1, arg2);
+    wasm.closure571_externref_shim(arg0, arg1, arg2);
 }
 
 function __wbg_adapter_89(arg0, arg1, arg2, arg3, arg4) {
-    wasm.closure1243_externref_shim(arg0, arg1, arg2, arg3, arg4);
+    wasm.closure1165_externref_shim(arg0, arg1, arg2, arg3, arg4);
 }
 
 function __wbg_adapter_110(arg0, arg1, arg2, arg3) {
-    wasm.closure1247_externref_shim(arg0, arg1, arg2, arg3);
+    wasm.closure1169_externref_shim(arg0, arg1, arg2, arg3);
 }
 
 async function __wbg_load(module, imports) {
@@ -797,8 +797,8 @@ function __wbg_get_imports() {
         const ret = false;
         return ret;
     };
-    imports.wbg.__wbindgen_closure_wrapper2151 = function(arg0, arg1, arg2) {
-        const ret = makeMutClosure(arg0, arg1, 646, __wbg_adapter_30);
+    imports.wbg.__wbindgen_closure_wrapper1986 = function(arg0, arg1, arg2) {
+        const ret = makeMutClosure(arg0, arg1, 572, __wbg_adapter_30);
         return ret;
     };
     imports.wbg.__wbindgen_debug_string = function(arg0, arg1) {

package/web/acvm_js_bg.wasm.d.ts

@@ -2,16 +2,6 @@
 /* eslint-disable */
 export const memory: WebAssembly.Memory;
 export const initLogLevel: (a: number, b: number) => [number, number];
-export const getReturnWitness: (a: number, b: number, c: any) => [number, number, number];
-export const getPublicParametersWitness: (a: number, b: number, c: any) => [number, number, number];
-export const getPublicWitness: (a: number, b: number, c: any) => [number, number, number];
-export const and: (a: any, b: any) => any;
-export const xor: (a: any, b: any) => any;
-export const sha256_compression: (a: number, b: number, c: number, d: number) => [number, number];
-export const blake2s256: (a: number, b: number) => [number, number];
-export const ecdsa_secp256k1_verify: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number) => number;
-export const ecdsa_secp256r1_verify: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number) => number;
-export const buildInfo: () => any;
 export const compressWitness: (a: any) => [number, number, number, number];
 export const decompressWitness: (a: number, b: number) => [number, number, number];
 export const compressWitnessStack: (a: any) => [number, number, number, number];
@@ -19,6 +9,16 @@ export const decompressWitnessStack: (a: number, b: number) => [number, number,
 export const executeCircuit: (a: number, b: number, c: any, d: any) => any;
 export const executeCircuitWithReturnWitness: (a: number, b: number, c: any, d: any) => any;
 export const executeProgram: (a: number, b: number, c: any, d: any) => any;
+export const and: (a: any, b: any) => any;
+export const xor: (a: any, b: any) => any;
+export const sha256_compression: (a: number, b: number, c: number, d: number) => [number, number];
+export const blake2s256: (a: number, b: number) => [number, number];
+export const ecdsa_secp256k1_verify: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number) => number;
+export const ecdsa_secp256r1_verify: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number) => number;
+export const buildInfo: () => any;
+export const getReturnWitness: (a: number, b: number, c: any) => [number, number, number];
+export const getPublicParametersWitness: (a: number, b: number, c: any) => [number, number, number];
+export const getPublicWitness: (a: number, b: number, c: any) => [number, number, number];
 export const __wbindgen_exn_store: (a: number) => void;
 export const __externref_table_alloc: () => number;
 export const __wbindgen_export_2: WebAssembly.Table;
@@ -27,7 +27,7 @@ export const __wbindgen_malloc: (a: number, b: number) => number;
 export const __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number;
 export const __wbindgen_export_6: WebAssembly.Table;
 export const __externref_table_dealloc: (a: number) => void;
-export const closure645_externref_shim: (a: number, b: number, c: any) => void;
-export const closure1243_externref_shim: (a: number, b: number, c: any, d: number, e: any) => void;
-export const closure1247_externref_shim: (a: number, b: number, c: any, d: any) => void;
+export const closure571_externref_shim: (a: number, b: number, c: any) => void;
+export const closure1165_externref_shim: (a: number, b: number, c: any, d: number, e: any) => void;
+export const closure1169_externref_shim: (a: number, b: number, c: any, d: any) => void;
 export const __wbindgen_start: () => void;