@noir-lang/acvm_js 1.0.0-beta.15-b34828f.nightly → 1.0.0-beta.15-1fce7ca.nightly

package/nodejs/acvm_js.d.ts

@@ -1,5 +1,64 @@
 /* tslint:disable */
 /* eslint-disable */
+/**
+ * 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;
+/**
+ * Sets the package's logging level.
+ *
+ * @param {LogLevel} level - The maximum level of logging to be emitted.
+ */
+export function initLogLevel(filter: string): void;
+/**
+ * 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;
 /**
  * Compresses a `WitnessMap` into the binary format outputted by Nargo.
  *
@@ -57,79 +116,14 @@ 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>;
-/**
- * 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;
-/**
- * Sets the package's logging level.
- *
- * @param {LogLevel} level - The maximum level of logging to be emitted.
- */
-export function initLogLevel(filter: string): void;
-/**
- * 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;
-/**
- * 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;
 
-// Map from witness index to hex string value of witness.
-export type WitnessMap = Map<number, string>;
-
-/**
- * An execution result containing two witnesses.
- * 1. The full solved witness of the execution.
- * 2. The return witness which contains the given public return values within the full witness.
- */
-export type SolvedAndReturnWitness = {
-    solvedWitness: WitnessMap;
-    returnWitness: WitnessMap;
+export type StackItem = {
+    index: number;
+    witness: WitnessMap;
 }
 
+export type WitnessStack = Array<StackItem>;
+
 
 
 /**
@@ -160,6 +154,21 @@ export type ExecutionError = Error & {
 
 
 
+// Map from witness index to hex string value of witness.
+export type WitnessMap = Map<number, string>;
+
+/**
+ * An execution result containing two witnesses.
+ * 1. The full solved witness of the execution.
+ * 2. The return witness which contains the given public return values within the full witness.
+ */
+export type SolvedAndReturnWitness = {
+    solvedWitness: WitnessMap;
+    returnWitness: WitnessMap;
+}
+
+
+
 export type ForeignCallInput = string[]
 export type ForeignCallOutput = string | string[]
 
@@ -173,12 +182,3 @@ export type ForeignCallOutput = string | string[]
 export type ForeignCallHandler = (name: string, inputs: ForeignCallInput[]) => Promise<ForeignCallOutput[]>;
 
 
-
-export type StackItem = {
-    index: number;
-    witness: WitnessMap;
-}
-
-export type WitnessStack = Array<StackItem>;
-
-

package/nodejs/acvm_js.js

@@ -201,157 +201,6 @@ function debugString(val) {
     // TODO we could test for more things here, like `Set`s and `Map`s.
     return className;
 }
-
-function takeFromExternrefTable0(idx) {
-    const value = wasm.__wbindgen_export_2.get(idx);
-    wasm.__externref_table_dealloc(idx);
-    return value;
-}
-
-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);
-    WASM_VECTOR_LEN = arg.length;
-    return ptr;
-}
-/**
- * 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} compressed_witness - A compressed witness.
- * @returns {WitnessMap} The decompressed witness map.
- */
-module.exports.decompressWitness = function(compressed_witness) {
-    const ptr0 = passArray8ToWasm0(compressed_witness, wasm.__wbindgen_malloc);
-    const len0 = WASM_VECTOR_LEN;
-    const ret = wasm.decompressWitness(ptr0, len0);
-    if (ret[2]) {
-        throw takeFromExternrefTable0(ret[1]);
-    }
-    return takeFromExternrefTable0(ret[0]);
-};
-
-/**
- * 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`.
- *
- * @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.decompressWitnessStack(ptr0, len0);
-    if (ret[2]) {
-        throw takeFromExternrefTable0(ret[1]);
-    }
-    return takeFromExternrefTable0(ret[0]);
-};
-
-/**
- * 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.
- *
- * @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;
-};
-
-/**
- * Returns the `BuildInfo` object containing information about how the installed package was built.
- * @returns {BuildInfo} - Information on how the installed package was built.
- */
-module.exports.buildInfo = function() {
-    const ret = wasm.buildInfo();
-    return ret;
-};
-
-/**
- * Sets the package's logging level.
- *
- * @param {LogLevel} level - The maximum level of logging to be emitted.
- */
-module.exports.initLogLevel = function(filter) {
-    const ptr0 = passStringToWasm0(filter, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-    const len0 = WASM_VECTOR_LEN;
-    const ret = wasm.initLogLevel(ptr0, len0);
-    if (ret[1]) {
-        throw takeFromExternrefTable0(ret[0]);
-    }
-};
-
 /**
  * Performs a bitwise AND operation between `lhs` and `rhs`
  * @param {string} lhs
@@ -411,6 +260,17 @@ module.exports.sha256_compression = function(inputs, state) {
     return v3;
 };
 
+function passArray8ToWasm0(arg, malloc) {
+    const ptr = malloc(arg.length * 1, 1) >>> 0;
+    getUint8ArrayMemory0().set(arg, ptr / 1);
+    WASM_VECTOR_LEN = arg.length;
+    return ptr;
+}
+
+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
@@ -467,6 +327,34 @@ module.exports.ecdsa_secp256r1_verify = function(hashed_msg, public_key_x_bytes,
     return ret !== 0;
 };
 
+function takeFromExternrefTable0(idx) {
+    const value = wasm.__wbindgen_export_2.get(idx);
+    wasm.__externref_table_dealloc(idx);
+    return value;
+}
+/**
+ * Sets the package's logging level.
+ *
+ * @param {LogLevel} level - The maximum level of logging to be emitted.
+ */
+module.exports.initLogLevel = function(filter) {
+    const ptr0 = passStringToWasm0(filter, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+    const len0 = WASM_VECTOR_LEN;
+    const ret = wasm.initLogLevel(ptr0, len0);
+    if (ret[1]) {
+        throw takeFromExternrefTable0(ret[0]);
+    }
+};
+
+/**
+ * Returns the `BuildInfo` object containing information about how the installed package was built.
+ * @returns {BuildInfo} - Information on how the installed package was built.
+ */
+module.exports.buildInfo = function() {
+    const ret = wasm.buildInfo();
+    return ret;
+};
+
 /**
  * Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's return values.
  *
@@ -527,16 +415,127 @@ module.exports.getPublicWitness = function(program, solved_witness) {
     return takeFromExternrefTable0(ret[0]);
 };
 
+/**
+ * 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.
+ *
+ * @param {Uint8Array} compressed_witness - A compressed witness.
+ * @returns {WitnessMap} The decompressed witness map.
+ */
+module.exports.decompressWitness = function(compressed_witness) {
+    const ptr0 = passArray8ToWasm0(compressed_witness, wasm.__wbindgen_malloc);
+    const len0 = WASM_VECTOR_LEN;
+    const ret = wasm.decompressWitness(ptr0, len0);
+    if (ret[2]) {
+        throw takeFromExternrefTable0(ret[1]);
+    }
+    return takeFromExternrefTable0(ret[0]);
+};
+
+/**
+ * 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`.
+ *
+ * @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.decompressWitnessStack(ptr0, len0);
+    if (ret[2]) {
+        throw takeFromExternrefTable0(ret[1]);
+    }
+    return takeFromExternrefTable0(ret[0]);
+};
+
+/**
+ * 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.
+ *
+ * @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;
+};
+
 function __wbg_adapter_30(arg0, arg1, arg2) {
-    wasm.closure588_externref_shim(arg0, arg1, arg2);
+    wasm.closure583_externref_shim(arg0, arg1, arg2);
 }
 
 function __wbg_adapter_89(arg0, arg1, arg2, arg3, arg4) {
-    wasm.closure1183_externref_shim(arg0, arg1, arg2, arg3, arg4);
+    wasm.closure1178_externref_shim(arg0, arg1, arg2, arg3, arg4);
 }
 
 function __wbg_adapter_110(arg0, arg1, arg2, arg3) {
-    wasm.closure1187_externref_shim(arg0, arg1, arg2, arg3);
+    wasm.closure1182_externref_shim(arg0, arg1, arg2, arg3);
 }
 
 module.exports.__wbg_call_672a4d21634d4a24 = function() { return handleError(function (arg0, arg1) {
@@ -815,7 +814,7 @@ module.exports.__wbindgen_cb_drop = function(arg0) {
 };
 
 module.exports.__wbindgen_closure_wrapper1982 = function(arg0, arg1, arg2) {
-    const ret = makeMutClosure(arg0, arg1, 589, __wbg_adapter_30);
+    const ret = makeMutClosure(arg0, arg1, 584, __wbg_adapter_30);
     return ret;
 };
 

package/nodejs/acvm_js_bg.wasm.d.ts

@@ -1,24 +1,24 @@
 /* tslint:disable */
 /* eslint-disable */
 export const memory: WebAssembly.Memory;
-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];
-export const decompressWitnessStack: (a: number, b: number) => [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 buildInfo: () => any;
-export const initLogLevel: (a: number, b: 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 initLogLevel: (a: number, b: number) => [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 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];
+export const decompressWitnessStack: (a: number, b: number) => [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 __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 closure588_externref_shim: (a: number, b: number, c: any) => void;
-export const closure1183_externref_shim: (a: number, b: number, c: any, d: number, e: any) => void;
-export const closure1187_externref_shim: (a: number, b: number, c: any, d: any) => void;
+export const closure583_externref_shim: (a: number, b: number, c: any) => void;
+export const closure1178_externref_shim: (a: number, b: number, c: any, d: number, e: any) => void;
+export const closure1182_externref_shim: (a: number, b: number, c: any, d: any) => void;
 export const __wbindgen_start: () => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@noir-lang/acvm_js",
-  "version": "1.0.0-beta.15-b34828f.nightly",
+  "version": "1.0.0-beta.15-1fce7ca.nightly",
   "publishConfig": {
     "access": "public"
   },

package/web/acvm_js.d.ts

@@ -1,5 +1,64 @@
 /* tslint:disable */
 /* eslint-disable */
+/**
+ * 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;
+/**
+ * Sets the package's logging level.
+ *
+ * @param {LogLevel} level - The maximum level of logging to be emitted.
+ */
+export function initLogLevel(filter: string): void;
+/**
+ * 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;
 /**
  * Compresses a `WitnessMap` into the binary format outputted by Nargo.
  *
@@ -57,79 +116,14 @@ 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>;
-/**
- * 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;
-/**
- * Sets the package's logging level.
- *
- * @param {LogLevel} level - The maximum level of logging to be emitted.
- */
-export function initLogLevel(filter: string): void;
-/**
- * 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;
-/**
- * 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;
-
-// Map from witness index to hex string value of witness.
-export type WitnessMap = Map<number, string>;
 
-/**
- * An execution result containing two witnesses.
- * 1. The full solved witness of the execution.
- * 2. The return witness which contains the given public return values within the full witness.
- */
-export type SolvedAndReturnWitness = {
-    solvedWitness: WitnessMap;
-    returnWitness: WitnessMap;
+export type StackItem = {
+    index: number;
+    witness: WitnessMap;
 }
 
+export type WitnessStack = Array<StackItem>;
+
 
 
 /**
@@ -160,6 +154,21 @@ export type ExecutionError = Error & {
 
 
 
+// Map from witness index to hex string value of witness.
+export type WitnessMap = Map<number, string>;
+
+/**
+ * An execution result containing two witnesses.
+ * 1. The full solved witness of the execution.
+ * 2. The return witness which contains the given public return values within the full witness.
+ */
+export type SolvedAndReturnWitness = {
+    solvedWitness: WitnessMap;
+    returnWitness: WitnessMap;
+}
+
+
+
 export type ForeignCallInput = string[]
 export type ForeignCallOutput = string | string[]
 
@@ -174,37 +183,28 @@ export type ForeignCallHandler = (name: string, inputs: ForeignCallInput[]) => P
 
 
 
-export type StackItem = {
-    index: number;
-    witness: WitnessMap;
-}
-
-export type WitnessStack = Array<StackItem>;
-
-
-
 export type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembly.Module;
 
 export interface InitOutput {
   readonly memory: WebAssembly.Memory;
-  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];
-  readonly decompressWitnessStack: (a: number, b: number) => [number, number, number];
-  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 buildInfo: () => any;
-  readonly initLogLevel: (a: number, b: 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 initLogLevel: (a: number, b: number) => [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 compressWitness: (a: any) => [number, number, number, number];
+  readonly decompressWitness: (a: number, b: number) => [number, number, number];
+  readonly compressWitnessStack: (a: any) => [number, number, number, number];
+  readonly decompressWitnessStack: (a: number, b: number) => [number, number, number];
+  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 __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 closure588_externref_shim: (a: number, b: number, c: any) => void;
-  readonly closure1183_externref_shim: (a: number, b: number, c: any, d: number, e: any) => void;
-  readonly closure1187_externref_shim: (a: number, b: number, c: any, d: any) => void;
+  readonly closure583_externref_shim: (a: number, b: number, c: any) => void;
+  readonly closure1178_externref_shim: (a: number, b: number, c: any, d: number, e: any) => void;
+  readonly closure1182_externref_shim: (a: number, b: number, c: any, d: any) => void;
   readonly __wbindgen_start: () => void;
 }
 

package/web/acvm_js.js

@@ -197,157 +197,6 @@ function debugString(val) {
     // TODO we could test for more things here, like `Set`s and `Map`s.
     return className;
 }
-
-function takeFromExternrefTable0(idx) {
-    const value = wasm.__wbindgen_export_2.get(idx);
-    wasm.__externref_table_dealloc(idx);
-    return value;
-}
-
-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);
-    WASM_VECTOR_LEN = arg.length;
-    return ptr;
-}
-/**
- * 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} compressed_witness - A compressed witness.
- * @returns {WitnessMap} The decompressed witness map.
- */
-export function decompressWitness(compressed_witness) {
-    const ptr0 = passArray8ToWasm0(compressed_witness, wasm.__wbindgen_malloc);
-    const len0 = WASM_VECTOR_LEN;
-    const ret = wasm.decompressWitness(ptr0, len0);
-    if (ret[2]) {
-        throw takeFromExternrefTable0(ret[1]);
-    }
-    return takeFromExternrefTable0(ret[0]);
-}
-
-/**
- * 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`.
- *
- * @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.decompressWitnessStack(ptr0, len0);
-    if (ret[2]) {
-        throw takeFromExternrefTable0(ret[1]);
-    }
-    return takeFromExternrefTable0(ret[0]);
-}
-
-/**
- * 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.
- *
- * @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;
-}
-
-/**
- * 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() {
-    const ret = wasm.buildInfo();
-    return ret;
-}
-
-/**
- * Sets the package's logging level.
- *
- * @param {LogLevel} level - The maximum level of logging to be emitted.
- */
-export function initLogLevel(filter) {
-    const ptr0 = passStringToWasm0(filter, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-    const len0 = WASM_VECTOR_LEN;
-    const ret = wasm.initLogLevel(ptr0, len0);
-    if (ret[1]) {
-        throw takeFromExternrefTable0(ret[0]);
-    }
-}
-
 /**
  * Performs a bitwise AND operation between `lhs` and `rhs`
  * @param {string} lhs
@@ -407,6 +256,17 @@ export function sha256_compression(inputs, state) {
     return v3;
 }
 
+function passArray8ToWasm0(arg, malloc) {
+    const ptr = malloc(arg.length * 1, 1) >>> 0;
+    getUint8ArrayMemory0().set(arg, ptr / 1);
+    WASM_VECTOR_LEN = arg.length;
+    return ptr;
+}
+
+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
@@ -463,6 +323,34 @@ export function ecdsa_secp256r1_verify(hashed_msg, public_key_x_bytes, public_ke
     return ret !== 0;
 }
 
+function takeFromExternrefTable0(idx) {
+    const value = wasm.__wbindgen_export_2.get(idx);
+    wasm.__externref_table_dealloc(idx);
+    return value;
+}
+/**
+ * Sets the package's logging level.
+ *
+ * @param {LogLevel} level - The maximum level of logging to be emitted.
+ */
+export function initLogLevel(filter) {
+    const ptr0 = passStringToWasm0(filter, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+    const len0 = WASM_VECTOR_LEN;
+    const ret = wasm.initLogLevel(ptr0, len0);
+    if (ret[1]) {
+        throw takeFromExternrefTable0(ret[0]);
+    }
+}
+
+/**
+ * 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() {
+    const ret = wasm.buildInfo();
+    return ret;
+}
+
 /**
  * Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's return values.
  *
@@ -523,16 +411,127 @@ export function getPublicWitness(program, solved_witness) {
     return takeFromExternrefTable0(ret[0]);
 }
 
+/**
+ * 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.
+ *
+ * @param {Uint8Array} compressed_witness - A compressed witness.
+ * @returns {WitnessMap} The decompressed witness map.
+ */
+export function decompressWitness(compressed_witness) {
+    const ptr0 = passArray8ToWasm0(compressed_witness, wasm.__wbindgen_malloc);
+    const len0 = WASM_VECTOR_LEN;
+    const ret = wasm.decompressWitness(ptr0, len0);
+    if (ret[2]) {
+        throw takeFromExternrefTable0(ret[1]);
+    }
+    return takeFromExternrefTable0(ret[0]);
+}
+
+/**
+ * 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`.
+ *
+ * @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.decompressWitnessStack(ptr0, len0);
+    if (ret[2]) {
+        throw takeFromExternrefTable0(ret[1]);
+    }
+    return takeFromExternrefTable0(ret[0]);
+}
+
+/**
+ * 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.
+ *
+ * @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;
+}
+
 function __wbg_adapter_30(arg0, arg1, arg2) {
-    wasm.closure588_externref_shim(arg0, arg1, arg2);
+    wasm.closure583_externref_shim(arg0, arg1, arg2);
 }
 
 function __wbg_adapter_89(arg0, arg1, arg2, arg3, arg4) {
-    wasm.closure1183_externref_shim(arg0, arg1, arg2, arg3, arg4);
+    wasm.closure1178_externref_shim(arg0, arg1, arg2, arg3, arg4);
 }
 
 function __wbg_adapter_110(arg0, arg1, arg2, arg3) {
-    wasm.closure1187_externref_shim(arg0, arg1, arg2, arg3);
+    wasm.closure1182_externref_shim(arg0, arg1, arg2, arg3);
 }
 
 async function __wbg_load(module, imports) {
@@ -799,7 +798,7 @@ function __wbg_get_imports() {
         return ret;
     };
     imports.wbg.__wbindgen_closure_wrapper1982 = function(arg0, arg1, arg2) {
-        const ret = makeMutClosure(arg0, arg1, 589, __wbg_adapter_30);
+        const ret = makeMutClosure(arg0, arg1, 584, __wbg_adapter_30);
         return ret;
     };
     imports.wbg.__wbindgen_debug_string = function(arg0, arg1) {

package/web/acvm_js_bg.wasm.d.ts

@@ -1,24 +1,24 @@
 /* tslint:disable */
 /* eslint-disable */
 export const memory: WebAssembly.Memory;
-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];
-export const decompressWitnessStack: (a: number, b: number) => [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 buildInfo: () => any;
-export const initLogLevel: (a: number, b: 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 initLogLevel: (a: number, b: number) => [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 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];
+export const decompressWitnessStack: (a: number, b: number) => [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 __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 closure588_externref_shim: (a: number, b: number, c: any) => void;
-export const closure1183_externref_shim: (a: number, b: number, c: any, d: number, e: any) => void;
-export const closure1187_externref_shim: (a: number, b: number, c: any, d: any) => void;
+export const closure583_externref_shim: (a: number, b: number, c: any) => void;
+export const closure1178_externref_shim: (a: number, b: number, c: any, d: number, e: any) => void;
+export const closure1182_externref_shim: (a: number, b: number, c: any, d: any) => void;
 export const __wbindgen_start: () => void;