@noir-lang/acvm_js 1.0.0-beta.3-1fa0dd9.nightly → 1.0.0-beta.4-17958e3.nightly

package/nodejs/acvm_js.d.ts

@@ -1,29 +1,5 @@
 /* tslint:disable */
 /* eslint-disable */
-/**
- * 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;
 /**
  * Returns the `BuildInfo` object containing information about how the installed package was built.
  * @returns {BuildInfo} - Information on how the installed package was built.
@@ -58,11 +34,29 @@ export function executeCircuitWithReturnWitness(program: Uint8Array, initial_wit
  */
 export function executeProgram(program: Uint8Array, initial_witness: WitnessMap, foreign_call_handler: ForeignCallHandler): Promise<WitnessStack>;
 /**
- * Sets the package's logging level.
+ * Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's return values.
  *
- * @param {LogLevel} level - The maximum level of logging to be emitted.
+ * @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 initLogLevel(filter: string): void;
+export function getReturnWitness(program: Uint8Array, witness_map: WitnessMap): WitnessMap;
+/**
+ * Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's public parameters.
+ *
+ * @param {Uint8Array} circuit - A serialized representation of an ACIR circuit
+ * @param {WitnessMap} witness_map - The completed witness map after executing the circuit.
+ * @returns {WitnessMap} A witness map containing the circuit's public parameters.
+ */
+export function getPublicParametersWitness(program: Uint8Array, solved_witness: WitnessMap): WitnessMap;
+/**
+ * Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's public inputs.
+ *
+ * @param {Uint8Array} circuit - A serialized representation of an ACIR circuit
+ * @param {WitnessMap} witness_map - The completed witness map after executing the circuit.
+ * @returns {WitnessMap} A witness map containing the circuit's public inputs.
+ */
+export function getPublicWitness(program: Uint8Array, solved_witness: WitnessMap): WitnessMap;
 /**
  * Performs a bitwise AND operation between `lhs` and `rhs`
  */
@@ -116,6 +110,12 @@ export function compressWitnessStack(witness_stack: WitnessStack): Uint8Array;
  * @returns {WitnessStack} The decompressed witness stack.
  */
 export function decompressWitnessStack(compressed_witness: Uint8Array): WitnessStack;
+/**
+ * Sets the package's logging level.
+ *
+ * @param {LogLevel} level - The maximum level of logging to be emitted.
+ */
+export function initLogLevel(filter: string): void;
 
 /**
 * @typedef {Object} BuildInfo - Information about how the installed package was built
@@ -139,23 +139,23 @@ export type RawAssertionPayload = {
 export type ExecutionError = Error & {
     callStack?: string[];
     rawAssertionPayload?: RawAssertionPayload;
+    acirFunctionId?: number;
     brilligFunctionId?: number;
 };
 
 
 
-// Map from witness index to hex string value of witness.
-export type WitnessMap = Map<number, string>;
+export type ForeignCallInput = string[]
+export type ForeignCallOutput = string | 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;
-}
+* A callback which performs an foreign call and returns the response.
+* @callback ForeignCallHandler
+* @param {string} name - The identifier for the type of foreign call being performed.
+* @param {string[][]} inputs - An array of hex encoded inputs to the foreign call.
+* @returns {Promise<string[]>} outputs - An array of hex encoded outputs containing the results of the foreign call.
+*/
+export type ForeignCallHandler = (name: string, inputs: ForeignCallInput[]) => Promise<ForeignCallOutput[]>;
 
 
 
@@ -168,16 +168,17 @@ export type WitnessStack = Array<StackItem>;
 
 
 
-export type ForeignCallInput = string[]
-export type ForeignCallOutput = string | string[]
+// Map from witness index to hex string value of witness.
+export type WitnessMap = Map<number, string>;
 
 /**
-* A callback which performs an foreign call and returns the response.
-* @callback ForeignCallHandler
-* @param {string} name - The identifier for the type of foreign call being performed.
-* @param {string[][]} inputs - An array of hex encoded inputs to the foreign call.
-* @returns {Promise<string[]>} outputs - An array of hex encoded outputs containing the results of the foreign call.
-*/
-export type ForeignCallHandler = (name: string, inputs: ForeignCallInput[]) => Promise<ForeignCallOutput[]>;
+ * 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;
+}
 
 

package/nodejs/acvm_js.js

@@ -201,6 +201,14 @@ function debugString(val) {
     // TODO we could test for more things here, like `Set`s and `Map`s.
     return className;
 }
+/**
+ * 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;
+};
 
 function passArray8ToWasm0(arg, malloc) {
     const ptr = malloc(arg.length * 1, 1) >>> 0;
@@ -208,6 +216,51 @@ function passArray8ToWasm0(arg, malloc) {
     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, 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 takeFromExternrefTable0(idx) {
     const value = wasm.__wbindgen_export_2.get(idx);
@@ -274,75 +327,6 @@ module.exports.getPublicWitness = function(program, solved_witness) {
     return 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;
-};
-
-/**
- * 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;
-};
-
-/**
- * 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
@@ -527,16 +511,30 @@ module.exports.decompressWitnessStack = function(compressed_witness) {
     return takeFromExternrefTable0(ret[0]);
 };
 
+/**
+ * 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]);
+    }
+};
+
 function __wbg_adapter_30(arg0, arg1, arg2) {
-    wasm.closure249_externref_shim(arg0, arg1, arg2);
+    wasm.closure255_externref_shim(arg0, arg1, arg2);
 }
 
 function __wbg_adapter_89(arg0, arg1, arg2, arg3, arg4) {
-    wasm.closure810_externref_shim(arg0, arg1, arg2, arg3, arg4);
+    wasm.closure816_externref_shim(arg0, arg1, arg2, arg3, arg4);
 }
 
 function __wbg_adapter_110(arg0, arg1, arg2, arg3) {
-    wasm.closure814_externref_shim(arg0, arg1, arg2, arg3);
+    wasm.closure820_externref_shim(arg0, arg1, arg2, arg3);
 }
 
 module.exports.__wbg_call_672a4d21634d4a24 = function() { return handleError(function (arg0, arg1) {
@@ -554,12 +552,12 @@ module.exports.__wbg_call_833bed5770ea2041 = function() { return handleError(fun
     return ret;
 }, arguments) };
 
-module.exports.__wbg_constructor_003f4a4118e07291 = function(arg0) {
+module.exports.__wbg_constructor_6f67fe370a1d12e4 = function(arg0) {
     const ret = new Error(arg0);
     return ret;
 };
 
-module.exports.__wbg_constructor_c456dcccc52847dd = function(arg0) {
+module.exports.__wbg_constructor_e1ce7ec5d0c26936 = function(arg0) {
     const ret = new Error(arg0);
     return ret;
 };
@@ -675,11 +673,6 @@ module.exports.__wbg_new_23a2665fac83c611 = function(arg0, arg1) {
     }
 };
 
-module.exports.__wbg_new_3f4c5c451d69e970 = function() {
-    const ret = new Map();
-    return ret;
-};
-
 module.exports.__wbg_new_5e0be73521bc8c17 = function() {
     const ret = new Map();
     return ret;
@@ -695,11 +688,16 @@ module.exports.__wbg_new_8a6f238a6ece86ea = function() {
     return ret;
 };
 
-module.exports.__wbg_new_a324c5957dd8b845 = function() {
+module.exports.__wbg_new_afcb88b732711926 = function() {
     const ret = new Array();
     return ret;
 };
 
+module.exports.__wbg_new_c4d92c865672cdba = function() {
+    const ret = new Map();
+    return ret;
+};
+
 module.exports.__wbg_new_c68d7209be747379 = function(arg0, arg1) {
     const ret = new Error(getStringFromWasm0(arg0, arg1));
     return ret;
@@ -814,8 +812,8 @@ module.exports.__wbindgen_cb_drop = function(arg0) {
     return ret;
 };
 
-module.exports.__wbindgen_closure_wrapper725 = function(arg0, arg1, arg2) {
-    const ret = makeMutClosure(arg0, arg1, 250, __wbg_adapter_30);
+module.exports.__wbindgen_closure_wrapper739 = function(arg0, arg1, arg2) {
+    const ret = makeMutClosure(arg0, arg1, 256, __wbg_adapter_30);
     return ret;
 };
 

package/nodejs/acvm_js_bg.wasm.d.ts

@@ -1,14 +1,13 @@
 /* tslint:disable */
 /* eslint-disable */
 export const memory: WebAssembly.Memory;
-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 buildInfo: () => any;
 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 initLogLevel: (a: number, b: number) => [number, number];
+export const getReturnWitness: (a: number, b: number, c: any) => [number, number, number];
+export const getPublicParametersWitness: (a: number, b: number, c: any) => [number, number, number];
+export const getPublicWitness: (a: number, b: number, c: any) => [number, number, number];
 export const and: (a: any, b: any) => any;
 export const xor: (a: any, b: any) => any;
 export const sha256_compression: (a: number, b: number, c: number, d: number) => [number, number];
@@ -19,6 +18,7 @@ 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 initLogLevel: (a: number, b: number) => [number, number];
 export const __wbindgen_exn_store: (a: number) => void;
 export const __externref_table_alloc: () => number;
 export const __wbindgen_export_2: WebAssembly.Table;
@@ -27,7 +27,7 @@ export const __wbindgen_malloc: (a: number, b: number) => number;
 export const __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number;
 export const __wbindgen_export_6: WebAssembly.Table;
 export const __externref_table_dealloc: (a: number) => void;
-export const closure249_externref_shim: (a: number, b: number, c: any) => void;
-export const closure810_externref_shim: (a: number, b: number, c: any, d: number, e: any) => void;
-export const closure814_externref_shim: (a: number, b: number, c: any, d: any) => void;
+export const closure255_externref_shim: (a: number, b: number, c: any) => void;
+export const closure816_externref_shim: (a: number, b: number, c: any, d: number, e: any) => void;
+export const closure820_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.3-1fa0dd9.nightly",
+  "version": "1.0.0-beta.4-17958e3.nightly",
   "publishConfig": {
     "access": "public"
   },
@@ -26,12 +26,12 @@
     "package.json"
   ],
   "sideEffects": false,
-  "packageManager": "yarn@3.5.1",
+  "packageManager": "yarn@4.5.2",
   "scripts": {
     "build": "bash ./build.sh",
     "test": "env TS_NODE_COMPILER_OPTIONS='{\"module\": \"commonjs\" }' mocha",
     "test:browser": "web-test-runner",
-    "lint": "NODE_NO_WARNINGS=1 eslint . --ext .ts --ignore-path ./.eslintignore  --max-warnings 0",
+    "lint": "NODE_NO_WARNINGS=1 eslint . --max-warnings 0",
     "publish": "echo 📡 publishing `$npm_package_name` && yarn npm publish",
     "nightly:version": "jq --arg new_version \"-$(git rev-parse --short HEAD)$1\" '.version = .version + $new_version' package.json > package-tmp.json && mv package-tmp.json package.json",
     "clean": "chmod u+w web nodejs || true && rm -rf web nodejs"
@@ -42,11 +42,11 @@
     "@web/test-runner": "^0.18.1",
     "@web/test-runner-playwright": "^0.11.0",
     "chai": "^4.4.1",
-    "eslint": "^8.57.0",
-    "eslint-plugin-prettier": "^5.1.3",
-    "mocha": "^10.2.0",
-    "prettier": "3.2.5",
-    "ts-node": "^10.9.1",
-    "typescript": "^5.4.2"
+    "eslint": "^9.24.0",
+    "eslint-plugin-prettier": "^5.2.6",
+    "mocha": "^11.1.0",
+    "prettier": "3.5.3",
+    "ts-node": "^10.9.2",
+    "typescript": "^5.8.3"
   }
 }

package/web/acvm_js.d.ts

@@ -1,29 +1,5 @@
 /* tslint:disable */
 /* eslint-disable */
-/**
- * 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;
 /**
  * Returns the `BuildInfo` object containing information about how the installed package was built.
  * @returns {BuildInfo} - Information on how the installed package was built.
@@ -58,11 +34,29 @@ export function executeCircuitWithReturnWitness(program: Uint8Array, initial_wit
  */
 export function executeProgram(program: Uint8Array, initial_witness: WitnessMap, foreign_call_handler: ForeignCallHandler): Promise<WitnessStack>;
 /**
- * Sets the package's logging level.
+ * Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's return values.
  *
- * @param {LogLevel} level - The maximum level of logging to be emitted.
+ * @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 initLogLevel(filter: string): void;
+export function getReturnWitness(program: Uint8Array, witness_map: WitnessMap): WitnessMap;
+/**
+ * Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's public parameters.
+ *
+ * @param {Uint8Array} circuit - A serialized representation of an ACIR circuit
+ * @param {WitnessMap} witness_map - The completed witness map after executing the circuit.
+ * @returns {WitnessMap} A witness map containing the circuit's public parameters.
+ */
+export function getPublicParametersWitness(program: Uint8Array, solved_witness: WitnessMap): WitnessMap;
+/**
+ * Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's public inputs.
+ *
+ * @param {Uint8Array} circuit - A serialized representation of an ACIR circuit
+ * @param {WitnessMap} witness_map - The completed witness map after executing the circuit.
+ * @returns {WitnessMap} A witness map containing the circuit's public inputs.
+ */
+export function getPublicWitness(program: Uint8Array, solved_witness: WitnessMap): WitnessMap;
 /**
  * Performs a bitwise AND operation between `lhs` and `rhs`
  */
@@ -116,6 +110,12 @@ export function compressWitnessStack(witness_stack: WitnessStack): Uint8Array;
  * @returns {WitnessStack} The decompressed witness stack.
  */
 export function decompressWitnessStack(compressed_witness: Uint8Array): WitnessStack;
+/**
+ * Sets the package's logging level.
+ *
+ * @param {LogLevel} level - The maximum level of logging to be emitted.
+ */
+export function initLogLevel(filter: string): void;
 
 /**
 * @typedef {Object} BuildInfo - Information about how the installed package was built
@@ -139,23 +139,23 @@ export type RawAssertionPayload = {
 export type ExecutionError = Error & {
     callStack?: string[];
     rawAssertionPayload?: RawAssertionPayload;
+    acirFunctionId?: number;
     brilligFunctionId?: number;
 };
 
 
 
-// Map from witness index to hex string value of witness.
-export type WitnessMap = Map<number, string>;
+export type ForeignCallInput = string[]
+export type ForeignCallOutput = string | 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;
-}
+* A callback which performs an foreign call and returns the response.
+* @callback ForeignCallHandler
+* @param {string} name - The identifier for the type of foreign call being performed.
+* @param {string[][]} inputs - An array of hex encoded inputs to the foreign call.
+* @returns {Promise<string[]>} outputs - An array of hex encoded outputs containing the results of the foreign call.
+*/
+export type ForeignCallHandler = (name: string, inputs: ForeignCallInput[]) => Promise<ForeignCallOutput[]>;
 
 
 
@@ -168,17 +168,18 @@ export type WitnessStack = Array<StackItem>;
 
 
 
-export type ForeignCallInput = string[]
-export type ForeignCallOutput = string | string[]
+// Map from witness index to hex string value of witness.
+export type WitnessMap = Map<number, string>;
 
 /**
-* A callback which performs an foreign call and returns the response.
-* @callback ForeignCallHandler
-* @param {string} name - The identifier for the type of foreign call being performed.
-* @param {string[][]} inputs - An array of hex encoded inputs to the foreign call.
-* @returns {Promise<string[]>} outputs - An array of hex encoded outputs containing the results of the foreign call.
-*/
-export type ForeignCallHandler = (name: string, inputs: ForeignCallInput[]) => Promise<ForeignCallOutput[]>;
+ * 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;
+}
 
 
 
@@ -186,14 +187,13 @@ export type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembl
 
 export interface InitOutput {
   readonly memory: WebAssembly.Memory;
-  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 buildInfo: () => any;
   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 initLogLevel: (a: number, b: number) => [number, number];
+  readonly getReturnWitness: (a: number, b: number, c: any) => [number, number, number];
+  readonly getPublicParametersWitness: (a: number, b: number, c: any) => [number, number, number];
+  readonly getPublicWitness: (a: number, b: number, c: any) => [number, number, number];
   readonly and: (a: any, b: any) => any;
   readonly xor: (a: any, b: any) => any;
   readonly sha256_compression: (a: number, b: number, c: number, d: number) => [number, number];
@@ -204,6 +204,7 @@ export interface InitOutput {
   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 initLogLevel: (a: number, b: number) => [number, number];
   readonly __wbindgen_exn_store: (a: number) => void;
   readonly __externref_table_alloc: () => number;
   readonly __wbindgen_export_2: WebAssembly.Table;
@@ -212,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 closure249_externref_shim: (a: number, b: number, c: any) => void;
-  readonly closure810_externref_shim: (a: number, b: number, c: any, d: number, e: any) => void;
-  readonly closure814_externref_shim: (a: number, b: number, c: any, d: any) => void;
+  readonly closure255_externref_shim: (a: number, b: number, c: any) => void;
+  readonly closure816_externref_shim: (a: number, b: number, c: any, d: number, e: any) => void;
+  readonly closure820_externref_shim: (a: number, b: number, c: any, d: any) => void;
   readonly __wbindgen_start: () => void;
 }
 

package/web/acvm_js.js

@@ -197,6 +197,14 @@ function debugString(val) {
     // TODO we could test for more things here, like `Set`s and `Map`s.
     return className;
 }
+/**
+ * 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;
+}
 
 function passArray8ToWasm0(arg, malloc) {
     const ptr = malloc(arg.length * 1, 1) >>> 0;
@@ -204,6 +212,51 @@ function passArray8ToWasm0(arg, malloc) {
     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, 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 takeFromExternrefTable0(idx) {
     const value = wasm.__wbindgen_export_2.get(idx);
@@ -270,75 +323,6 @@ export function getPublicWitness(program, solved_witness) {
     return 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;
-}
-
-/**
- * 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;
-}
-
-/**
- * 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
@@ -523,16 +507,30 @@ export function decompressWitnessStack(compressed_witness) {
     return takeFromExternrefTable0(ret[0]);
 }
 
+/**
+ * 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]);
+    }
+}
+
 function __wbg_adapter_30(arg0, arg1, arg2) {
-    wasm.closure249_externref_shim(arg0, arg1, arg2);
+    wasm.closure255_externref_shim(arg0, arg1, arg2);
 }
 
 function __wbg_adapter_89(arg0, arg1, arg2, arg3, arg4) {
-    wasm.closure810_externref_shim(arg0, arg1, arg2, arg3, arg4);
+    wasm.closure816_externref_shim(arg0, arg1, arg2, arg3, arg4);
 }
 
 function __wbg_adapter_110(arg0, arg1, arg2, arg3) {
-    wasm.closure814_externref_shim(arg0, arg1, arg2, arg3);
+    wasm.closure820_externref_shim(arg0, arg1, arg2, arg3);
 }
 
 async function __wbg_load(module, imports) {
@@ -581,11 +579,11 @@ function __wbg_get_imports() {
         const ret = arg0.call(arg1, arg2, arg3);
         return ret;
     }, arguments) };
-    imports.wbg.__wbg_constructor_003f4a4118e07291 = function(arg0) {
+    imports.wbg.__wbg_constructor_6f67fe370a1d12e4 = function(arg0) {
         const ret = new Error(arg0);
         return ret;
     };
-    imports.wbg.__wbg_constructor_c456dcccc52847dd = function(arg0) {
+    imports.wbg.__wbg_constructor_e1ce7ec5d0c26936 = function(arg0) {
         const ret = new Error(arg0);
         return ret;
     };
@@ -686,10 +684,6 @@ function __wbg_get_imports() {
             state0.a = state0.b = 0;
         }
     };
-    imports.wbg.__wbg_new_3f4c5c451d69e970 = function() {
-        const ret = new Map();
-        return ret;
-    };
     imports.wbg.__wbg_new_5e0be73521bc8c17 = function() {
         const ret = new Map();
         return ret;
@@ -702,10 +696,14 @@ function __wbg_get_imports() {
         const ret = new Error();
         return ret;
     };
-    imports.wbg.__wbg_new_a324c5957dd8b845 = function() {
+    imports.wbg.__wbg_new_afcb88b732711926 = function() {
         const ret = new Array();
         return ret;
     };
+    imports.wbg.__wbg_new_c4d92c865672cdba = function() {
+        const ret = new Map();
+        return ret;
+    };
     imports.wbg.__wbg_new_c68d7209be747379 = function(arg0, arg1) {
         const ret = new Error(getStringFromWasm0(arg0, arg1));
         return ret;
@@ -798,8 +796,8 @@ function __wbg_get_imports() {
         const ret = false;
         return ret;
     };
-    imports.wbg.__wbindgen_closure_wrapper725 = function(arg0, arg1, arg2) {
-        const ret = makeMutClosure(arg0, arg1, 250, __wbg_adapter_30);
+    imports.wbg.__wbindgen_closure_wrapper739 = function(arg0, arg1, arg2) {
+        const ret = makeMutClosure(arg0, arg1, 256, __wbg_adapter_30);
         return ret;
     };
     imports.wbg.__wbindgen_debug_string = function(arg0, arg1) {

package/web/acvm_js_bg.wasm.d.ts

@@ -1,14 +1,13 @@
 /* tslint:disable */
 /* eslint-disable */
 export const memory: WebAssembly.Memory;
-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 buildInfo: () => any;
 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 initLogLevel: (a: number, b: number) => [number, number];
+export const getReturnWitness: (a: number, b: number, c: any) => [number, number, number];
+export const getPublicParametersWitness: (a: number, b: number, c: any) => [number, number, number];
+export const getPublicWitness: (a: number, b: number, c: any) => [number, number, number];
 export const and: (a: any, b: any) => any;
 export const xor: (a: any, b: any) => any;
 export const sha256_compression: (a: number, b: number, c: number, d: number) => [number, number];
@@ -19,6 +18,7 @@ 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 initLogLevel: (a: number, b: number) => [number, number];
 export const __wbindgen_exn_store: (a: number) => void;
 export const __externref_table_alloc: () => number;
 export const __wbindgen_export_2: WebAssembly.Table;
@@ -27,7 +27,7 @@ export const __wbindgen_malloc: (a: number, b: number) => number;
 export const __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number;
 export const __wbindgen_export_6: WebAssembly.Table;
 export const __externref_table_dealloc: (a: number) => void;
-export const closure249_externref_shim: (a: number, b: number, c: any) => void;
-export const closure810_externref_shim: (a: number, b: number, c: any, d: number, e: any) => void;
-export const closure814_externref_shim: (a: number, b: number, c: any, d: any) => void;
+export const closure255_externref_shim: (a: number, b: number, c: any) => void;
+export const closure816_externref_shim: (a: number, b: number, c: any, d: number, e: any) => void;
+export const closure820_externref_shim: (a: number, b: number, c: any, d: any) => void;
 export const __wbindgen_start: () => void;