@aztec/noir-acvm_js 4.0.0-nightly.20260125 → 4.0.0-nightly.20260127

package/nodejs/acvm_js.d.ts

@@ -58,36 +58,6 @@ export function ecdsa_secp256k1_verify(hashed_msg: Uint8Array, public_key_x_byte
  * 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;
-/**
- * Sets the package's logging level.
- *
- * @param {LogLevel} level - The maximum level of logging to be emitted.
- */
-export function initLogLevel(filter: string): void;
 /**
  * Executes an ACIR circuit to generate the solved witness from the initial witness.
  *
@@ -116,6 +86,36 @@ 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>;
+/**
+ * Sets the package's logging level.
+ *
+ * @param {LogLevel} level - The maximum level of logging to be emitted.
+ */
+export function initLogLevel(filter: string): void;
+/**
+ * Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's return values.
+ *
+ * @param {Uint8Array} circuit - A serialized representation of an ACIR circuit
+ * @param {WitnessMap} witness_map - The completed witness map after executing the circuit.
+ * @returns {WitnessMap} A witness map containing the circuit's return values.
+ */
+export function getReturnWitness(program: Uint8Array, witness_map: WitnessMap): WitnessMap;
+/**
+ * Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's public parameters.
+ *
+ * @param {Uint8Array} circuit - A serialized representation of an ACIR circuit
+ * @param {WitnessMap} witness_map - The completed witness map after executing the circuit.
+ * @returns {WitnessMap} A witness map containing the circuit's public parameters.
+ */
+export function getPublicParametersWitness(program: Uint8Array, solved_witness: WitnessMap): WitnessMap;
+/**
+ * Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's public inputs.
+ *
+ * @param {Uint8Array} circuit - A serialized representation of an ACIR circuit
+ * @param {WitnessMap} witness_map - The completed witness map after executing the circuit.
+ * @returns {WitnessMap} A witness map containing the circuit's public inputs.
+ */
+export function getPublicWitness(program: Uint8Array, solved_witness: WitnessMap): WitnessMap;
 
 export type StackItem = {
     index: number;
@@ -140,6 +140,20 @@ export type BuildInfo = {
 
 
 
+export type RawAssertionPayload = {
+    selector: string;
+    data: string[];
+};
+
+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>;
 
@@ -155,20 +169,6 @@ export type SolvedAndReturnWitness = {
 
 
 
-export type RawAssertionPayload = {
-    selector: string;
-    data: string[];
-};
-
-export type ExecutionError = Error & {
-    callStack?: string[];
-    rawAssertionPayload?: RawAssertionPayload;
-    acirFunctionId?: number;
-    brilligFunctionId?: number;
-};
-
-
-
 export type ForeignCallInput = string[]
 export type ForeignCallOutput = string | string[]
 

package/nodejs/acvm_js.js

@@ -407,63 +407,49 @@ module.exports.ecdsa_secp256r1_verify = function(hashed_msg, public_key_x_bytes,
 };
 
 /**
- * Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's return values.
+ * Executes an ACIR circuit to generate the solved witness from the initial witness.
  *
  * @param {Uint8Array} circuit - A serialized representation of an ACIR circuit
- * @param {WitnessMap} witness_map - The completed witness map after executing the circuit.
- * @returns {WitnessMap} A witness map containing the circuit's return values.
- * @param {Uint8Array} program
- * @param {WitnessMap} witness_map
- * @returns {WitnessMap}
+ * @param {WitnessMap} initial_witness - The initial witness map defining all of the inputs to `circuit`..
+ * @param {ForeignCallHandler} foreign_call_handler - A callback to process any foreign calls from the circuit.
+ * @returns {WitnessMap} The solved witness calculated by executing the circuit on the provided inputs.
  */
-module.exports.getReturnWitness = function(program, witness_map) {
+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.getReturnWitness(ptr0, len0, witness_map);
-    if (ret[2]) {
-        throw takeFromExternrefTable0(ret[1]);
-    }
-    return takeFromExternrefTable0(ret[0]);
+    const ret = wasm.executeCircuit(ptr0, len0, initial_witness, foreign_call_handler);
+    return ret;
 };
 
 /**
- * Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's public parameters.
+ * 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} witness_map - The completed witness map after executing the circuit.
- * @returns {WitnessMap} A witness map containing the circuit's public parameters.
- * @param {Uint8Array} program
- * @param {WitnessMap} solved_witness
- * @returns {WitnessMap}
+ * @param {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.getPublicParametersWitness = function(program, solved_witness) {
+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.getPublicParametersWitness(ptr0, len0, solved_witness);
-    if (ret[2]) {
-        throw takeFromExternrefTable0(ret[1]);
-    }
-    return takeFromExternrefTable0(ret[0]);
+    const ret = wasm.executeCircuitWithReturnWitness(ptr0, len0, initial_witness, foreign_call_handler);
+    return ret;
 };
 
 /**
- * Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's public inputs.
+ * Executes an ACIR circuit to generate the solved witness from the initial witness.
  *
- * @param {Uint8Array} circuit - A serialized representation of an ACIR circuit
- * @param {WitnessMap} witness_map - The completed witness map after executing the circuit.
- * @returns {WitnessMap} A witness map containing the circuit's public inputs.
- * @param {Uint8Array} program
- * @param {WitnessMap} solved_witness
- * @returns {WitnessMap}
+ * @param {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.getPublicWitness = function(program, solved_witness) {
+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.getPublicWitness(ptr0, len0, solved_witness);
-    if (ret[2]) {
-        throw takeFromExternrefTable0(ret[1]);
-    }
-    return takeFromExternrefTable0(ret[0]);
+    const ret = wasm.executeProgram(ptr0, len0, initial_witness, foreign_call_handler);
+    return ret;
 };
 
 /**
@@ -481,49 +467,63 @@ module.exports.initLogLevel = function(filter) {
 };
 
 /**
- * Executes an ACIR circuit to generate the solved witness from the initial witness.
+ * 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} 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.
+ * @param {WitnessMap} witness_map - The completed witness map after executing the circuit.
+ * @returns {WitnessMap} A witness map containing the circuit's return values.
+ * @param {Uint8Array} program
+ * @param {WitnessMap} witness_map
+ * @returns {WitnessMap}
  */
-module.exports.executeCircuit = function(program, initial_witness, foreign_call_handler) {
+module.exports.getReturnWitness = function(program, witness_map) {
     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;
+    const ret = wasm.getReturnWitness(ptr0, len0, witness_map);
+    if (ret[2]) {
+        throw takeFromExternrefTable0(ret[1]);
+    }
+    return takeFromExternrefTable0(ret[0]);
 };
 
 /**
- * Executes an ACIR circuit to generate the solved witness from the initial witness.
- * This method also extracts the public return values from the solved witness into its own return witness.
+ * Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's public parameters.
  *
  * @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 {WitnessMap} witness_map - The completed witness map after executing the circuit.
+ * @returns {WitnessMap} A witness map containing the circuit's public parameters.
+ * @param {Uint8Array} program
+ * @param {WitnessMap} solved_witness
+ * @returns {WitnessMap}
  */
-module.exports.executeCircuitWithReturnWitness = function(program, initial_witness, foreign_call_handler) {
+module.exports.getPublicParametersWitness = function(program, solved_witness) {
     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;
+    const ret = wasm.getPublicParametersWitness(ptr0, len0, solved_witness);
+    if (ret[2]) {
+        throw takeFromExternrefTable0(ret[1]);
+    }
+    return takeFromExternrefTable0(ret[0]);
 };
 
 /**
- * Executes an ACIR circuit to generate the solved witness from the initial witness.
+ * Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's public inputs.
  *
- * @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 {Uint8Array} circuit - A serialized representation of an ACIR circuit
+ * @param {WitnessMap} witness_map - The completed witness map after executing the circuit.
+ * @returns {WitnessMap} A witness map containing the circuit's public inputs.
+ * @param {Uint8Array} program
+ * @param {WitnessMap} solved_witness
+ * @returns {WitnessMap}
  */
-module.exports.executeProgram = function(program, initial_witness, foreign_call_handler) {
+module.exports.getPublicWitness = function(program, solved_witness) {
     const ptr0 = passArray8ToWasm0(program, wasm.__wbindgen_malloc);
     const len0 = WASM_VECTOR_LEN;
-    const ret = wasm.executeProgram(ptr0, len0, initial_witness, foreign_call_handler);
-    return ret;
+    const ret = wasm.getPublicWitness(ptr0, len0, solved_witness);
+    if (ret[2]) {
+        throw takeFromExternrefTable0(ret[1]);
+    }
+    return takeFromExternrefTable0(ret[0]);
 };
 
 function __wbg_adapter_30(arg0, arg1, arg2) {
@@ -813,7 +813,7 @@ module.exports.__wbindgen_cb_drop = function(arg0) {
     return ret;
 };
 
-module.exports.__wbindgen_closure_wrapper1446 = function(arg0, arg1, arg2) {
+module.exports.__wbindgen_closure_wrapper1445 = function(arg0, arg1, arg2) {
     const ret = makeMutClosure(arg0, arg1, 449, __wbg_adapter_30);
     return ret;
 };

package/nodejs/acvm_js_bg.wasm.d.ts

@@ -12,13 +12,13 @@ export const sha256_compression: (a: number, b: number, c: number, d: 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 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 initLogLevel: (a: number, b: number) => [number, number];
 export const executeCircuit: (a: number, b: number, c: any, d: any) => any;
 export const executeCircuitWithReturnWitness: (a: number, b: number, c: any, d: any) => any;
 export const executeProgram: (a: number, b: number, c: any, d: any) => any;
+export const 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 __wbindgen_exn_store: (a: number) => void;
 export const __externref_table_alloc: () => number;
 export const __wbindgen_export_2: WebAssembly.Table;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/noir-acvm_js",
-  "version": "4.0.0-nightly.20260125",
+  "version": "4.0.0-nightly.20260127",
   "publishConfig": {
     "access": "public"
   },

package/web/acvm_js.d.ts

@@ -58,36 +58,6 @@ export function ecdsa_secp256k1_verify(hashed_msg: Uint8Array, public_key_x_byte
  * 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;
-/**
- * Sets the package's logging level.
- *
- * @param {LogLevel} level - The maximum level of logging to be emitted.
- */
-export function initLogLevel(filter: string): void;
 /**
  * Executes an ACIR circuit to generate the solved witness from the initial witness.
  *
@@ -116,6 +86,36 @@ 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>;
+/**
+ * Sets the package's logging level.
+ *
+ * @param {LogLevel} level - The maximum level of logging to be emitted.
+ */
+export function initLogLevel(filter: string): void;
+/**
+ * Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's return values.
+ *
+ * @param {Uint8Array} circuit - A serialized representation of an ACIR circuit
+ * @param {WitnessMap} witness_map - The completed witness map after executing the circuit.
+ * @returns {WitnessMap} A witness map containing the circuit's return values.
+ */
+export function getReturnWitness(program: Uint8Array, witness_map: WitnessMap): WitnessMap;
+/**
+ * Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's public parameters.
+ *
+ * @param {Uint8Array} circuit - A serialized representation of an ACIR circuit
+ * @param {WitnessMap} witness_map - The completed witness map after executing the circuit.
+ * @returns {WitnessMap} A witness map containing the circuit's public parameters.
+ */
+export function getPublicParametersWitness(program: Uint8Array, solved_witness: WitnessMap): WitnessMap;
+/**
+ * Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's public inputs.
+ *
+ * @param {Uint8Array} circuit - A serialized representation of an ACIR circuit
+ * @param {WitnessMap} witness_map - The completed witness map after executing the circuit.
+ * @returns {WitnessMap} A witness map containing the circuit's public inputs.
+ */
+export function getPublicWitness(program: Uint8Array, solved_witness: WitnessMap): WitnessMap;
 
 export type StackItem = {
     index: number;
@@ -140,6 +140,20 @@ export type BuildInfo = {
 
 
 
+export type RawAssertionPayload = {
+    selector: string;
+    data: string[];
+};
+
+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>;
 
@@ -155,20 +169,6 @@ export type SolvedAndReturnWitness = {
 
 
 
-export type RawAssertionPayload = {
-    selector: string;
-    data: string[];
-};
-
-export type ExecutionError = Error & {
-    callStack?: string[];
-    rawAssertionPayload?: RawAssertionPayload;
-    acirFunctionId?: number;
-    brilligFunctionId?: number;
-};
-
-
-
 export type ForeignCallInput = string[]
 export type ForeignCallOutput = string | string[]
 
@@ -198,13 +198,13 @@ export interface InitOutput {
   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 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 initLogLevel: (a: number, b: 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 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 __wbindgen_exn_store: (a: number) => void;
   readonly __externref_table_alloc: () => number;
   readonly __wbindgen_export_2: WebAssembly.Table;

package/web/acvm_js.js

@@ -403,63 +403,49 @@ export function ecdsa_secp256r1_verify(hashed_msg, public_key_x_bytes, public_ke
 }
 
 /**
- * Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's return values.
+ * Executes an ACIR circuit to generate the solved witness from the initial witness.
  *
  * @param {Uint8Array} circuit - A serialized representation of an ACIR circuit
- * @param {WitnessMap} witness_map - The completed witness map after executing the circuit.
- * @returns {WitnessMap} A witness map containing the circuit's return values.
- * @param {Uint8Array} program
- * @param {WitnessMap} witness_map
- * @returns {WitnessMap}
+ * @param {WitnessMap} initial_witness - The initial witness map defining all of the inputs to `circuit`..
+ * @param {ForeignCallHandler} foreign_call_handler - A callback to process any foreign calls from the circuit.
+ * @returns {WitnessMap} The solved witness calculated by executing the circuit on the provided inputs.
  */
-export function getReturnWitness(program, witness_map) {
+export function executeCircuit(program, initial_witness, foreign_call_handler) {
     const ptr0 = passArray8ToWasm0(program, wasm.__wbindgen_malloc);
     const len0 = WASM_VECTOR_LEN;
-    const ret = wasm.getReturnWitness(ptr0, len0, witness_map);
-    if (ret[2]) {
-        throw takeFromExternrefTable0(ret[1]);
-    }
-    return takeFromExternrefTable0(ret[0]);
+    const ret = wasm.executeCircuit(ptr0, len0, initial_witness, foreign_call_handler);
+    return ret;
 }
 
 /**
- * Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's public parameters.
+ * 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} witness_map - The completed witness map after executing the circuit.
- * @returns {WitnessMap} A witness map containing the circuit's public parameters.
- * @param {Uint8Array} program
- * @param {WitnessMap} solved_witness
- * @returns {WitnessMap}
+ * @param {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 getPublicParametersWitness(program, solved_witness) {
+export function executeCircuitWithReturnWitness(program, initial_witness, foreign_call_handler) {
     const ptr0 = passArray8ToWasm0(program, wasm.__wbindgen_malloc);
     const len0 = WASM_VECTOR_LEN;
-    const ret = wasm.getPublicParametersWitness(ptr0, len0, solved_witness);
-    if (ret[2]) {
-        throw takeFromExternrefTable0(ret[1]);
-    }
-    return takeFromExternrefTable0(ret[0]);
+    const ret = wasm.executeCircuitWithReturnWitness(ptr0, len0, initial_witness, foreign_call_handler);
+    return ret;
 }
 
 /**
- * Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's public inputs.
+ * Executes an ACIR circuit to generate the solved witness from the initial witness.
  *
- * @param {Uint8Array} circuit - A serialized representation of an ACIR circuit
- * @param {WitnessMap} witness_map - The completed witness map after executing the circuit.
- * @returns {WitnessMap} A witness map containing the circuit's public inputs.
- * @param {Uint8Array} program
- * @param {WitnessMap} solved_witness
- * @returns {WitnessMap}
+ * @param {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 getPublicWitness(program, solved_witness) {
+export function executeProgram(program, initial_witness, foreign_call_handler) {
     const ptr0 = passArray8ToWasm0(program, wasm.__wbindgen_malloc);
     const len0 = WASM_VECTOR_LEN;
-    const ret = wasm.getPublicWitness(ptr0, len0, solved_witness);
-    if (ret[2]) {
-        throw takeFromExternrefTable0(ret[1]);
-    }
-    return takeFromExternrefTable0(ret[0]);
+    const ret = wasm.executeProgram(ptr0, len0, initial_witness, foreign_call_handler);
+    return ret;
 }
 
 /**
@@ -477,49 +463,63 @@ export function initLogLevel(filter) {
 }
 
 /**
- * Executes an ACIR circuit to generate the solved witness from the initial witness.
+ * 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} 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.
+ * @param {WitnessMap} witness_map - The completed witness map after executing the circuit.
+ * @returns {WitnessMap} A witness map containing the circuit's return values.
+ * @param {Uint8Array} program
+ * @param {WitnessMap} witness_map
+ * @returns {WitnessMap}
  */
-export function executeCircuit(program, initial_witness, foreign_call_handler) {
+export function getReturnWitness(program, witness_map) {
     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;
+    const ret = wasm.getReturnWitness(ptr0, len0, witness_map);
+    if (ret[2]) {
+        throw takeFromExternrefTable0(ret[1]);
+    }
+    return takeFromExternrefTable0(ret[0]);
 }
 
 /**
- * Executes an ACIR circuit to generate the solved witness from the initial witness.
- * This method also extracts the public return values from the solved witness into its own return witness.
+ * Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's public parameters.
  *
  * @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 {WitnessMap} witness_map - The completed witness map after executing the circuit.
+ * @returns {WitnessMap} A witness map containing the circuit's public parameters.
+ * @param {Uint8Array} program
+ * @param {WitnessMap} solved_witness
+ * @returns {WitnessMap}
  */
-export function executeCircuitWithReturnWitness(program, initial_witness, foreign_call_handler) {
+export function getPublicParametersWitness(program, solved_witness) {
     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;
+    const ret = wasm.getPublicParametersWitness(ptr0, len0, solved_witness);
+    if (ret[2]) {
+        throw takeFromExternrefTable0(ret[1]);
+    }
+    return takeFromExternrefTable0(ret[0]);
 }
 
 /**
- * Executes an ACIR circuit to generate the solved witness from the initial witness.
+ * Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's public inputs.
  *
- * @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 {Uint8Array} circuit - A serialized representation of an ACIR circuit
+ * @param {WitnessMap} witness_map - The completed witness map after executing the circuit.
+ * @returns {WitnessMap} A witness map containing the circuit's public inputs.
+ * @param {Uint8Array} program
+ * @param {WitnessMap} solved_witness
+ * @returns {WitnessMap}
  */
-export function executeProgram(program, initial_witness, foreign_call_handler) {
+export function getPublicWitness(program, solved_witness) {
     const ptr0 = passArray8ToWasm0(program, wasm.__wbindgen_malloc);
     const len0 = WASM_VECTOR_LEN;
-    const ret = wasm.executeProgram(ptr0, len0, initial_witness, foreign_call_handler);
-    return ret;
+    const ret = wasm.getPublicWitness(ptr0, len0, solved_witness);
+    if (ret[2]) {
+        throw takeFromExternrefTable0(ret[1]);
+    }
+    return takeFromExternrefTable0(ret[0]);
 }
 
 function __wbg_adapter_30(arg0, arg1, arg2) {
@@ -797,7 +797,7 @@ function __wbg_get_imports() {
         const ret = false;
         return ret;
     };
-    imports.wbg.__wbindgen_closure_wrapper1446 = function(arg0, arg1, arg2) {
+    imports.wbg.__wbindgen_closure_wrapper1445 = function(arg0, arg1, arg2) {
         const ret = makeMutClosure(arg0, arg1, 449, __wbg_adapter_30);
         return ret;
     };

package/web/acvm_js_bg.wasm.d.ts

@@ -12,13 +12,13 @@ export const sha256_compression: (a: number, b: number, c: number, d: 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 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 initLogLevel: (a: number, b: number) => [number, number];
 export const executeCircuit: (a: number, b: number, c: any, d: any) => any;
 export const executeCircuitWithReturnWitness: (a: number, b: number, c: any, d: any) => any;
 export const executeProgram: (a: number, b: number, c: any, d: any) => any;
+export const 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 __wbindgen_exn_store: (a: number) => void;
 export const __externref_table_alloc: () => number;
 export const __wbindgen_export_2: WebAssembly.Table;