@noir-lang/acvm_js 0.47.0 → 0.48.0

package/nodejs/acvm_js.d.ts

@@ -1,33 +1,11 @@
 /* tslint:disable */
 /* eslint-disable */
 /**
-* 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: Uint8Array, initial_witness: WitnessMap, foreign_call_handler: ForeignCallHandler): Promise<WitnessMap>;
-/**
-* 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: Uint8Array, initial_witness: WitnessMap, foreign_call_handler: ForeignCallHandler): Promise<SolvedAndReturnWitness>;
-/**
-* Executes an ACIR circuit to generate the solved witness from the initial witness.
+* Sets the package's logging level.
 *
-* @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 {LogLevel} level - The maximum level of logging to be emitted.
 */
-export function executeProgram(program: Uint8Array, initial_witness: WitnessMap, foreign_call_handler: ForeignCallHandler): Promise<WitnessStack>;
+export function initLogLevel(filter: string): void;
 /**
 * Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's return values.
 *
@@ -62,11 +40,33 @@ export function getPublicParametersWitness(program: Uint8Array, solved_witness:
 */
 export function getPublicWitness(program: Uint8Array, solved_witness: WitnessMap): WitnessMap;
 /**
-* Sets the package's logging level.
+* Executes an ACIR circuit to generate the solved witness from the initial witness.
 *
-* @param {LogLevel} level - The maximum level of logging to be emitted.
+* @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 initLogLevel(filter: string): void;
+export function executeCircuit(program: Uint8Array, initial_witness: WitnessMap, foreign_call_handler: ForeignCallHandler): Promise<WitnessMap>;
+/**
+* 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: Uint8Array, initial_witness: WitnessMap, foreign_call_handler: ForeignCallHandler): Promise<SolvedAndReturnWitness>;
+/**
+* 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: Uint8Array, initial_witness: WitnessMap, foreign_call_handler: ForeignCallHandler): Promise<WitnessStack>;
 /**
 * Performs a bitwise AND operation between `lhs` and `rhs`
 * @param {string} lhs
@@ -163,21 +163,6 @@ 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 StackItem = {
     index: number;
     witness: WitnessMap;
@@ -187,6 +172,20 @@ 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[]
 
@@ -201,16 +200,17 @@ export type ForeignCallHandler = (name: string, inputs: ForeignCallInput[]) => P
 
 
 
+// Map from witness index to hex string value of witness.
+export type WitnessMap = Map<number, string>;
+
 /**
-* @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.
+ * 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 BuildInfo = {
-  gitHash: string;
-  version: string;
-  dirty: string;
+export type SolvedAndReturnWitness = {
+    solvedWitness: WitnessMap;
+    returnWitness: WitnessMap;
 }
 
 

package/nodejs/acvm_js.js

@@ -23,6 +23,28 @@ function takeObject(idx) {
     return ret;
 }
 
+function isLikeNone(x) {
+    return x === undefined || x === null;
+}
+
+let cachedFloat64Memory0 = null;
+
+function getFloat64Memory0() {
+    if (cachedFloat64Memory0 === null || cachedFloat64Memory0.byteLength === 0) {
+        cachedFloat64Memory0 = new Float64Array(wasm.memory.buffer);
+    }
+    return cachedFloat64Memory0;
+}
+
+let cachedInt32Memory0 = null;
+
+function getInt32Memory0() {
+    if (cachedInt32Memory0 === null || cachedInt32Memory0.byteLength === 0) {
+        cachedInt32Memory0 = new Int32Array(wasm.memory.buffer);
+    }
+    return cachedInt32Memory0;
+}
+
 let cachedTextDecoder = new TextDecoder('utf-8', { ignoreBOM: true, fatal: true });
 
 cachedTextDecoder.decode();
@@ -105,28 +127,6 @@ function passStringToWasm0(arg, malloc, realloc) {
     return ptr;
 }
 
-function isLikeNone(x) {
-    return x === undefined || x === null;
-}
-
-let cachedInt32Memory0 = null;
-
-function getInt32Memory0() {
-    if (cachedInt32Memory0 === null || cachedInt32Memory0.byteLength === 0) {
-        cachedInt32Memory0 = new Int32Array(wasm.memory.buffer);
-    }
-    return cachedInt32Memory0;
-}
-
-let cachedFloat64Memory0 = null;
-
-function getFloat64Memory0() {
-    if (cachedFloat64Memory0 === null || cachedFloat64Memory0.byteLength === 0) {
-        cachedFloat64Memory0 = new Float64Array(wasm.memory.buffer);
-    }
-    return cachedFloat64Memory0;
-}
-
 function debugString(val) {
     // primitive types
     const type = typeof val;
@@ -220,58 +220,33 @@ function __wbg_adapter_22(arg0, arg1, arg2) {
     wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h36bac5ff3ea3c380(arg0, arg1, addHeapObject(arg2));
 }
 
+/**
+* Sets the package's logging level.
+*
+* @param {LogLevel} level - The maximum level of logging to be emitted.
+*/
+module.exports.initLogLevel = function(filter) {
+    try {
+        const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
+        const ptr0 = passStringToWasm0(filter, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        const len0 = WASM_VECTOR_LEN;
+        wasm.initLogLevel(retptr, ptr0, len0);
+        var r0 = getInt32Memory0()[retptr / 4 + 0];
+        var r1 = getInt32Memory0()[retptr / 4 + 1];
+        if (r1) {
+            throw takeObject(r0);
+        }
+    } finally {
+        wasm.__wbindgen_add_to_stack_pointer(16);
+    }
+};
+
 function passArray8ToWasm0(arg, malloc) {
     const ptr = malloc(arg.length * 1) >>> 0;
     getUint8Memory0().set(arg, ptr / 1);
     WASM_VECTOR_LEN = arg.length;
     return ptr;
 }
-/**
-* 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, addHeapObject(initial_witness), addHeapObject(foreign_call_handler));
-    return takeObject(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, addHeapObject(initial_witness), addHeapObject(foreign_call_handler));
-    return takeObject(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, addHeapObject(initial_witness), addHeapObject(foreign_call_handler));
-    return takeObject(ret);
-};
-
 /**
 * Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's return values.
 *
@@ -357,24 +332,49 @@ module.exports.getPublicWitness = function(program, solved_witness) {
 };
 
 /**
-* Sets the package's logging level.
+* Executes an ACIR circuit to generate the solved witness from the initial witness.
 *
-* @param {LogLevel} level - The maximum level of logging to be emitted.
+* @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.initLogLevel = function(filter) {
-    try {
-        const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-        const ptr0 = passStringToWasm0(filter, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-        const len0 = WASM_VECTOR_LEN;
-        wasm.initLogLevel(retptr, ptr0, len0);
-        var r0 = getInt32Memory0()[retptr / 4 + 0];
-        var r1 = getInt32Memory0()[retptr / 4 + 1];
-        if (r1) {
-            throw takeObject(r0);
-        }
-    } finally {
-        wasm.__wbindgen_add_to_stack_pointer(16);
-    }
+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, addHeapObject(initial_witness), addHeapObject(foreign_call_handler));
+    return takeObject(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, addHeapObject(initial_witness), addHeapObject(foreign_call_handler));
+    return takeObject(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, addHeapObject(initial_witness), addHeapObject(foreign_call_handler));
+    return takeObject(ret);
 };
 
 /**
@@ -631,12 +631,29 @@ function __wbg_adapter_93(arg0, arg1, arg2, arg3) {
     wasm.wasm_bindgen__convert__closures__invoke2_mut__h4efdd1050cfb3ea7(arg0, arg1, addHeapObject(arg2), addHeapObject(arg3));
 }
 
+module.exports.__wbindgen_cb_drop = function(arg0) {
+    const obj = takeObject(arg0).original;
+    if (obj.cnt-- == 1) {
+        obj.a = 0;
+        return true;
+    }
+    const ret = false;
+    return ret;
+};
+
 module.exports.__wbindgen_object_drop_ref = function(arg0) {
     takeObject(arg0);
 };
 
-module.exports.__wbindgen_string_new = function(arg0, arg1) {
-    const ret = getStringFromWasm0(arg0, arg1);
+module.exports.__wbindgen_number_get = function(arg0, arg1) {
+    const obj = getObject(arg1);
+    const ret = typeof(obj) === 'number' ? obj : undefined;
+    getFloat64Memory0()[arg0 / 8 + 1] = isLikeNone(ret) ? 0 : ret;
+    getInt32Memory0()[arg0 / 4 + 0] = !isLikeNone(ret);
+};
+
+module.exports.__wbg_constructor_a4e1fbe49b64399a = function(arg0) {
+    const ret = new Error(takeObject(arg0));
     return addHeapObject(ret);
 };
 
@@ -645,13 +662,18 @@ module.exports.__wbindgen_is_array = function(arg0) {
     return ret;
 };
 
-module.exports.__wbg_constructor_971e67e66cc5bd6a = function(arg0) {
-    const ret = new Error(takeObject(arg0));
+module.exports.__wbindgen_is_string = function(arg0) {
+    const ret = typeof(getObject(arg0)) === 'string';
+    return ret;
+};
+
+module.exports.__wbindgen_string_new = function(arg0, arg1) {
+    const ret = getStringFromWasm0(arg0, arg1);
     return addHeapObject(ret);
 };
 
-module.exports.__wbg_new_193bac1dd2be232d = function() {
-    const ret = new Map();
+module.exports.__wbg_new_99fb929611321a93 = function() {
+    const ret = new Array();
     return addHeapObject(ret);
 };
 
@@ -660,6 +682,11 @@ module.exports.__wbindgen_number_new = function(arg0) {
     return addHeapObject(ret);
 };
 
+module.exports.__wbg_new_237eb36a3bda602b = function() {
+    const ret = new Map();
+    return addHeapObject(ret);
+};
+
 module.exports.__wbindgen_string_get = function(arg0, arg1) {
     const obj = getObject(arg1);
     const ret = typeof(obj) === 'string' ? obj : undefined;
@@ -669,33 +696,6 @@ module.exports.__wbindgen_string_get = function(arg0, arg1) {
     getInt32Memory0()[arg0 / 4 + 0] = ptr1;
 };
 
-module.exports.__wbindgen_number_get = function(arg0, arg1) {
-    const obj = getObject(arg1);
-    const ret = typeof(obj) === 'number' ? obj : undefined;
-    getFloat64Memory0()[arg0 / 8 + 1] = isLikeNone(ret) ? 0 : ret;
-    getInt32Memory0()[arg0 / 4 + 0] = !isLikeNone(ret);
-};
-
-module.exports.__wbindgen_is_string = function(arg0) {
-    const ret = typeof(getObject(arg0)) === 'string';
-    return ret;
-};
-
-module.exports.__wbindgen_cb_drop = function(arg0) {
-    const obj = takeObject(arg0).original;
-    if (obj.cnt-- == 1) {
-        obj.a = 0;
-        return true;
-    }
-    const ret = false;
-    return ret;
-};
-
-module.exports.__wbg_new_f139361aad331bd0 = function() {
-    const ret = new Array();
-    return addHeapObject(ret);
-};
-
 module.exports.__wbg_new_abda76e883ba8a5f = function() {
     const ret = new Error();
     return addHeapObject(ret);
@@ -914,8 +914,8 @@ module.exports.__wbindgen_throw = function(arg0, arg1) {
     throw new Error(getStringFromWasm0(arg0, arg1));
 };
 
-module.exports.__wbindgen_closure_wrapper739 = function(arg0, arg1, arg2) {
-    const ret = makeMutClosure(arg0, arg1, 237, __wbg_adapter_22);
+module.exports.__wbindgen_closure_wrapper759 = function(arg0, arg1, arg2) {
+    const ret = makeMutClosure(arg0, arg1, 256, __wbg_adapter_22);
     return addHeapObject(ret);
 };
 

package/nodejs/acvm_js_bg.wasm.d.ts

@@ -1,13 +1,13 @@
 /* tslint:disable */
 /* eslint-disable */
 export const memory: WebAssembly.Memory;
-export function executeCircuit(a: number, b: number, c: number, d: number): number;
-export function executeCircuitWithReturnWitness(a: number, b: number, c: number, d: number): number;
-export function executeProgram(a: number, b: number, c: number, d: number): number;
+export function initLogLevel(a: number, b: number, c: number): void;
 export function getReturnWitness(a: number, b: number, c: number, d: number): void;
 export function getPublicParametersWitness(a: number, b: number, c: number, d: number): void;
 export function getPublicWitness(a: number, b: number, c: number, d: number): void;
-export function initLogLevel(a: number, b: number, c: number): void;
+export function executeCircuit(a: number, b: number, c: number, d: number): number;
+export function executeCircuitWithReturnWitness(a: number, b: number, c: number, d: number): number;
+export function executeProgram(a: number, b: number, c: number, d: number): number;
 export function and(a: number, b: number): number;
 export function xor(a: number, b: number): number;
 export function sha256(a: number, b: number, c: number): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@noir-lang/acvm_js",
-  "version": "0.47.0",
+  "version": "0.48.0",
   "publishConfig": {
     "access": "public"
   },

package/web/acvm_js.d.ts

@@ -1,33 +1,11 @@
 /* tslint:disable */
 /* eslint-disable */
 /**
-* 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: Uint8Array, initial_witness: WitnessMap, foreign_call_handler: ForeignCallHandler): Promise<WitnessMap>;
-/**
-* 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: Uint8Array, initial_witness: WitnessMap, foreign_call_handler: ForeignCallHandler): Promise<SolvedAndReturnWitness>;
-/**
-* Executes an ACIR circuit to generate the solved witness from the initial witness.
+* Sets the package's logging level.
 *
-* @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 {LogLevel} level - The maximum level of logging to be emitted.
 */
-export function executeProgram(program: Uint8Array, initial_witness: WitnessMap, foreign_call_handler: ForeignCallHandler): Promise<WitnessStack>;
+export function initLogLevel(filter: string): void;
 /**
 * Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's return values.
 *
@@ -62,11 +40,33 @@ export function getPublicParametersWitness(program: Uint8Array, solved_witness:
 */
 export function getPublicWitness(program: Uint8Array, solved_witness: WitnessMap): WitnessMap;
 /**
-* Sets the package's logging level.
+* Executes an ACIR circuit to generate the solved witness from the initial witness.
 *
-* @param {LogLevel} level - The maximum level of logging to be emitted.
+* @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 initLogLevel(filter: string): void;
+export function executeCircuit(program: Uint8Array, initial_witness: WitnessMap, foreign_call_handler: ForeignCallHandler): Promise<WitnessMap>;
+/**
+* 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: Uint8Array, initial_witness: WitnessMap, foreign_call_handler: ForeignCallHandler): Promise<SolvedAndReturnWitness>;
+/**
+* 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: Uint8Array, initial_witness: WitnessMap, foreign_call_handler: ForeignCallHandler): Promise<WitnessStack>;
 /**
 * Performs a bitwise AND operation between `lhs` and `rhs`
 * @param {string} lhs
@@ -163,21 +163,6 @@ 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 StackItem = {
     index: number;
     witness: WitnessMap;
@@ -187,6 +172,20 @@ 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[]
 
@@ -201,16 +200,17 @@ export type ForeignCallHandler = (name: string, inputs: ForeignCallInput[]) => P
 
 
 
+// Map from witness index to hex string value of witness.
+export type WitnessMap = Map<number, string>;
+
 /**
-* @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.
+ * 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 BuildInfo = {
-  gitHash: string;
-  version: string;
-  dirty: string;
+export type SolvedAndReturnWitness = {
+    solvedWitness: WitnessMap;
+    returnWitness: WitnessMap;
 }
 
 
@@ -219,13 +219,13 @@ export type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembl
 
 export interface InitOutput {
   readonly memory: WebAssembly.Memory;
-  readonly executeCircuit: (a: number, b: number, c: number, d: number) => number;
-  readonly executeCircuitWithReturnWitness: (a: number, b: number, c: number, d: number) => number;
-  readonly executeProgram: (a: number, b: number, c: number, d: number) => number;
+  readonly initLogLevel: (a: number, b: number, c: number) => void;
   readonly getReturnWitness: (a: number, b: number, c: number, d: number) => void;
   readonly getPublicParametersWitness: (a: number, b: number, c: number, d: number) => void;
   readonly getPublicWitness: (a: number, b: number, c: number, d: number) => void;
-  readonly initLogLevel: (a: number, b: number, c: number) => void;
+  readonly executeCircuit: (a: number, b: number, c: number, d: number) => number;
+  readonly executeCircuitWithReturnWitness: (a: number, b: number, c: number, d: number) => number;
+  readonly executeProgram: (a: number, b: number, c: number, d: number) => number;
   readonly and: (a: number, b: number) => number;
   readonly xor: (a: number, b: number) => number;
   readonly sha256: (a: number, b: number, c: number) => void;

package/web/acvm_js.js

@@ -20,6 +20,28 @@ function takeObject(idx) {
     return ret;
 }
 
+function isLikeNone(x) {
+    return x === undefined || x === null;
+}
+
+let cachedFloat64Memory0 = null;
+
+function getFloat64Memory0() {
+    if (cachedFloat64Memory0 === null || cachedFloat64Memory0.byteLength === 0) {
+        cachedFloat64Memory0 = new Float64Array(wasm.memory.buffer);
+    }
+    return cachedFloat64Memory0;
+}
+
+let cachedInt32Memory0 = null;
+
+function getInt32Memory0() {
+    if (cachedInt32Memory0 === null || cachedInt32Memory0.byteLength === 0) {
+        cachedInt32Memory0 = new Int32Array(wasm.memory.buffer);
+    }
+    return cachedInt32Memory0;
+}
+
 const cachedTextDecoder = (typeof TextDecoder !== 'undefined' ? new TextDecoder('utf-8', { ignoreBOM: true, fatal: true }) : { decode: () => { throw Error('TextDecoder not available') } } );
 
 if (typeof TextDecoder !== 'undefined') { cachedTextDecoder.decode(); };
@@ -102,28 +124,6 @@ function passStringToWasm0(arg, malloc, realloc) {
     return ptr;
 }
 
-function isLikeNone(x) {
-    return x === undefined || x === null;
-}
-
-let cachedInt32Memory0 = null;
-
-function getInt32Memory0() {
-    if (cachedInt32Memory0 === null || cachedInt32Memory0.byteLength === 0) {
-        cachedInt32Memory0 = new Int32Array(wasm.memory.buffer);
-    }
-    return cachedInt32Memory0;
-}
-
-let cachedFloat64Memory0 = null;
-
-function getFloat64Memory0() {
-    if (cachedFloat64Memory0 === null || cachedFloat64Memory0.byteLength === 0) {
-        cachedFloat64Memory0 = new Float64Array(wasm.memory.buffer);
-    }
-    return cachedFloat64Memory0;
-}
-
 function debugString(val) {
     // primitive types
     const type = typeof val;
@@ -217,58 +217,33 @@ function __wbg_adapter_22(arg0, arg1, arg2) {
     wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h36bac5ff3ea3c380(arg0, arg1, addHeapObject(arg2));
 }
 
-function passArray8ToWasm0(arg, malloc) {
-    const ptr = malloc(arg.length * 1) >>> 0;
-    getUint8Memory0().set(arg, ptr / 1);
-    WASM_VECTOR_LEN = arg.length;
-    return ptr;
-}
-/**
-* 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, addHeapObject(initial_witness), addHeapObject(foreign_call_handler));
-    return takeObject(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.
+* Sets the package's logging level.
 *
-* @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.
+* @param {LogLevel} level - The maximum level of logging to be emitted.
 */
-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, addHeapObject(initial_witness), addHeapObject(foreign_call_handler));
-    return takeObject(ret);
+export function initLogLevel(filter) {
+    try {
+        const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
+        const ptr0 = passStringToWasm0(filter, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        const len0 = WASM_VECTOR_LEN;
+        wasm.initLogLevel(retptr, ptr0, len0);
+        var r0 = getInt32Memory0()[retptr / 4 + 0];
+        var r1 = getInt32Memory0()[retptr / 4 + 1];
+        if (r1) {
+            throw takeObject(r0);
+        }
+    } finally {
+        wasm.__wbindgen_add_to_stack_pointer(16);
+    }
 }
 
-/**
-* 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, addHeapObject(initial_witness), addHeapObject(foreign_call_handler));
-    return takeObject(ret);
+function passArray8ToWasm0(arg, malloc) {
+    const ptr = malloc(arg.length * 1) >>> 0;
+    getUint8Memory0().set(arg, ptr / 1);
+    WASM_VECTOR_LEN = arg.length;
+    return ptr;
 }
-
 /**
 * Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's return values.
 *
@@ -354,24 +329,49 @@ export function getPublicWitness(program, solved_witness) {
 }
 
 /**
-* Sets the package's logging level.
+* Executes an ACIR circuit to generate the solved witness from the initial witness.
 *
-* @param {LogLevel} level - The maximum level of logging to be emitted.
+* @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 initLogLevel(filter) {
-    try {
-        const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-        const ptr0 = passStringToWasm0(filter, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-        const len0 = WASM_VECTOR_LEN;
-        wasm.initLogLevel(retptr, ptr0, len0);
-        var r0 = getInt32Memory0()[retptr / 4 + 0];
-        var r1 = getInt32Memory0()[retptr / 4 + 1];
-        if (r1) {
-            throw takeObject(r0);
-        }
-    } finally {
-        wasm.__wbindgen_add_to_stack_pointer(16);
-    }
+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, addHeapObject(initial_witness), addHeapObject(foreign_call_handler));
+    return takeObject(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, addHeapObject(initial_witness), addHeapObject(foreign_call_handler));
+    return takeObject(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, addHeapObject(initial_witness), addHeapObject(foreign_call_handler));
+    return takeObject(ret);
 }
 
 /**
@@ -662,29 +662,52 @@ async function __wbg_load(module, imports) {
 function __wbg_get_imports() {
     const imports = {};
     imports.wbg = {};
+    imports.wbg.__wbindgen_cb_drop = function(arg0) {
+        const obj = takeObject(arg0).original;
+        if (obj.cnt-- == 1) {
+            obj.a = 0;
+            return true;
+        }
+        const ret = false;
+        return ret;
+    };
     imports.wbg.__wbindgen_object_drop_ref = function(arg0) {
         takeObject(arg0);
     };
-    imports.wbg.__wbindgen_string_new = function(arg0, arg1) {
-        const ret = getStringFromWasm0(arg0, arg1);
+    imports.wbg.__wbindgen_number_get = function(arg0, arg1) {
+        const obj = getObject(arg1);
+        const ret = typeof(obj) === 'number' ? obj : undefined;
+        getFloat64Memory0()[arg0 / 8 + 1] = isLikeNone(ret) ? 0 : ret;
+        getInt32Memory0()[arg0 / 4 + 0] = !isLikeNone(ret);
+    };
+    imports.wbg.__wbg_constructor_a4e1fbe49b64399a = function(arg0) {
+        const ret = new Error(takeObject(arg0));
         return addHeapObject(ret);
     };
     imports.wbg.__wbindgen_is_array = function(arg0) {
         const ret = Array.isArray(getObject(arg0));
         return ret;
     };
-    imports.wbg.__wbg_constructor_971e67e66cc5bd6a = function(arg0) {
-        const ret = new Error(takeObject(arg0));
+    imports.wbg.__wbindgen_is_string = function(arg0) {
+        const ret = typeof(getObject(arg0)) === 'string';
+        return ret;
+    };
+    imports.wbg.__wbindgen_string_new = function(arg0, arg1) {
+        const ret = getStringFromWasm0(arg0, arg1);
         return addHeapObject(ret);
     };
-    imports.wbg.__wbg_new_193bac1dd2be232d = function() {
-        const ret = new Map();
+    imports.wbg.__wbg_new_99fb929611321a93 = function() {
+        const ret = new Array();
         return addHeapObject(ret);
     };
     imports.wbg.__wbindgen_number_new = function(arg0) {
         const ret = arg0;
         return addHeapObject(ret);
     };
+    imports.wbg.__wbg_new_237eb36a3bda602b = function() {
+        const ret = new Map();
+        return addHeapObject(ret);
+    };
     imports.wbg.__wbindgen_string_get = function(arg0, arg1) {
         const obj = getObject(arg1);
         const ret = typeof(obj) === 'string' ? obj : undefined;
@@ -693,29 +716,6 @@ function __wbg_get_imports() {
         getInt32Memory0()[arg0 / 4 + 1] = len1;
         getInt32Memory0()[arg0 / 4 + 0] = ptr1;
     };
-    imports.wbg.__wbindgen_number_get = function(arg0, arg1) {
-        const obj = getObject(arg1);
-        const ret = typeof(obj) === 'number' ? obj : undefined;
-        getFloat64Memory0()[arg0 / 8 + 1] = isLikeNone(ret) ? 0 : ret;
-        getInt32Memory0()[arg0 / 4 + 0] = !isLikeNone(ret);
-    };
-    imports.wbg.__wbindgen_is_string = function(arg0) {
-        const ret = typeof(getObject(arg0)) === 'string';
-        return ret;
-    };
-    imports.wbg.__wbindgen_cb_drop = function(arg0) {
-        const obj = takeObject(arg0).original;
-        if (obj.cnt-- == 1) {
-            obj.a = 0;
-            return true;
-        }
-        const ret = false;
-        return ret;
-    };
-    imports.wbg.__wbg_new_f139361aad331bd0 = function() {
-        const ret = new Array();
-        return addHeapObject(ret);
-    };
     imports.wbg.__wbg_new_abda76e883ba8a5f = function() {
         const ret = new Error();
         return addHeapObject(ret);
@@ -899,8 +899,8 @@ function __wbg_get_imports() {
     imports.wbg.__wbindgen_throw = function(arg0, arg1) {
         throw new Error(getStringFromWasm0(arg0, arg1));
     };
-    imports.wbg.__wbindgen_closure_wrapper739 = function(arg0, arg1, arg2) {
-        const ret = makeMutClosure(arg0, arg1, 237, __wbg_adapter_22);
+    imports.wbg.__wbindgen_closure_wrapper759 = function(arg0, arg1, arg2) {
+        const ret = makeMutClosure(arg0, arg1, 256, __wbg_adapter_22);
         return addHeapObject(ret);
     };
 

package/web/acvm_js_bg.wasm.d.ts

@@ -1,13 +1,13 @@
 /* tslint:disable */
 /* eslint-disable */
 export const memory: WebAssembly.Memory;
-export function executeCircuit(a: number, b: number, c: number, d: number): number;
-export function executeCircuitWithReturnWitness(a: number, b: number, c: number, d: number): number;
-export function executeProgram(a: number, b: number, c: number, d: number): number;
+export function initLogLevel(a: number, b: number, c: number): void;
 export function getReturnWitness(a: number, b: number, c: number, d: number): void;
 export function getPublicParametersWitness(a: number, b: number, c: number, d: number): void;
 export function getPublicWitness(a: number, b: number, c: number, d: number): void;
-export function initLogLevel(a: number, b: number, c: number): void;
+export function executeCircuit(a: number, b: number, c: number, d: number): number;
+export function executeCircuitWithReturnWitness(a: number, b: number, c: number, d: number): number;
+export function executeProgram(a: number, b: number, c: number, d: number): number;
 export function and(a: number, b: number): number;
 export function xor(a: number, b: number): number;
 export function sha256(a: number, b: number, c: number): void;