@noir-lang/acvm_js 0.43.0 → 0.44.0

package/nodejs/acvm_js_bg.wasm.d.ts

@@ -1,6 +1,18 @@
 /* tslint:disable */
 /* eslint-disable */
 export const memory: WebAssembly.Memory;
+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;
+export function blake2s256(a: number, b: number, c: number): void;
+export function keccak256(a: number, b: number, c: number): void;
+export function ecdsa_secp256k1_verify(a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number): number;
+export function ecdsa_secp256r1_verify(a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number): number;
+export function buildInfo(): number;
+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 compressWitness(a: number, b: number): void;
 export function decompressWitness(a: number, b: number, c: number): void;
 export function compressWitnessStack(a: number, b: number): void;
@@ -8,29 +20,18 @@ export function decompressWitnessStack(a: number, b: number, c: number): void;
 export function __wbg_wasmblackboxfunctionsolver_free(a: number): void;
 export function createBlackBoxSolver(): number;
 export function executeCircuit(a: number, b: number, c: number, d: number): number;
+export function executeCircuitWithReturnWitness(a: number, b: number, c: number, d: number, e: number): number;
 export function executeCircuitWithBlackBoxSolver(a: number, b: number, c: number, d: number, e: number): number;
 export function executeProgram(a: number, b: number, c: number, d: number): number;
 export function executeProgramWithBlackBoxSolver(a: number, b: number, c: number, d: number, e: number): number;
-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 and(a: number, b: number): number;
-export function xor(a: number, b: number): number;
-export function sha256(a: number, b: number, c: number): void;
-export function blake2s256(a: number, b: number, c: number): void;
-export function keccak256(a: number, b: number, c: number): void;
-export function ecdsa_secp256k1_verify(a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number): number;
-export function ecdsa_secp256r1_verify(a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number): number;
-export function buildInfo(): number;
-export function initLogLevel(a: number, b: number, c: number): void;
 export function __wbg_trap_free(a: number): void;
 export function trap___wbg_wasmer_trap(): void;
 export function __wbindgen_malloc(a: number): number;
 export function __wbindgen_realloc(a: number, b: number, c: number): number;
 export const __wbindgen_export_2: WebAssembly.Table;
-export function _dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hfdf1d0fa4debaf70(a: number, b: number, c: number): void;
+export function _dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hc5258430255de068(a: number, b: number, c: number): void;
 export function __wbindgen_add_to_stack_pointer(a: number): number;
 export function __wbindgen_free(a: number, b: number): void;
 export function __wbindgen_exn_store(a: number): void;
-export function wasm_bindgen__convert__closures__invoke3_mut__h28a07b2d2a2056af(a: number, b: number, c: number, d: number, e: number): void;
-export function wasm_bindgen__convert__closures__invoke2_mut__h79f8a29187e94f15(a: number, b: number, c: number, d: number): void;
+export function wasm_bindgen__convert__closures__invoke3_mut__h1e7d8ac96c74bd35(a: number, b: number, c: number, d: number, e: number): void;
+export function wasm_bindgen__convert__closures__invoke2_mut__h188e918906ff9a40(a: number, b: number, c: number, d: number): void;

package/package.json

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

package/web/acvm_js.d.ts

@@ -1,63 +1,60 @@
 /* tslint:disable */
 /* eslint-disable */
 /**
-* Compresses a `WitnessMap` into the binary format outputted by Nargo.
-*
-* @param {WitnessMap} witness_map - A witness map.
-* @returns {Uint8Array} A compressed witness map
-*/
-export function compressWitness(witness_map: WitnessMap): Uint8Array;
-/**
-* Decompresses a compressed witness as outputted by Nargo into a `WitnessMap`.
-* This should be used to only fetch the witness map for the main function.
-*
-* @param {Uint8Array} compressed_witness - A compressed witness.
-* @returns {WitnessMap} The decompressed witness map.
+* Performs a bitwise AND operation between `lhs` and `rhs`
+* @param {string} lhs
+* @param {string} rhs
+* @returns {string}
 */
-export function decompressWitness(compressed_witness: Uint8Array): WitnessMap;
+export function and(lhs: string, rhs: string): string;
 /**
-* Compresses a `WitnessStack` into the binary format outputted by Nargo.
-*
-* @param {WitnessStack} witness_stack - A witness stack.
-* @returns {Uint8Array} A compressed witness stack
+* Performs a bitwise XOR operation between `lhs` and `rhs`
+* @param {string} lhs
+* @param {string} rhs
+* @returns {string}
 */
-export function compressWitnessStack(witness_stack: WitnessStack): Uint8Array;
+export function xor(lhs: string, rhs: string): string;
 /**
-* Decompresses a compressed witness stack as outputted by Nargo into a `WitnessStack`.
-*
-* @param {Uint8Array} compressed_witness - A compressed witness.
-* @returns {WitnessStack} The decompressed witness stack.
+* Calculates the SHA256 hash of the input bytes
+* @param {Uint8Array} inputs
+* @returns {Uint8Array}
 */
-export function decompressWitnessStack(compressed_witness: Uint8Array): WitnessStack;
+export function sha256(inputs: Uint8Array): Uint8Array;
 /**
-* @returns {Promise<WasmBlackBoxFunctionSolver>}
+* Calculates the Blake2s256 hash of the input bytes
+* @param {Uint8Array} inputs
+* @returns {Uint8Array}
 */
-export function createBlackBoxSolver(): Promise<WasmBlackBoxFunctionSolver>;
+export function blake2s256(inputs: Uint8Array): Uint8Array;
 /**
-* 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.
+* Calculates the Keccak256 hash of the input bytes
+* @param {Uint8Array} inputs
+* @returns {Uint8Array}
 */
-export function executeCircuit(program: Uint8Array, initial_witness: WitnessMap, foreign_call_handler: ForeignCallHandler): Promise<WitnessMap>;
+export function keccak256(inputs: Uint8Array): Uint8Array;
 /**
-* Executes an ACIR circuit to generate the solved witness from the initial witness.
-*
-* @param {&WasmBlackBoxFunctionSolver} solver - A black box solver.
-* @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.
+* Verifies a ECDSA signature over the secp256k1 curve.
+* @param {Uint8Array} hashed_msg
+* @param {Uint8Array} public_key_x_bytes
+* @param {Uint8Array} public_key_y_bytes
+* @param {Uint8Array} signature
+* @returns {boolean}
 */
-export function executeCircuitWithBlackBoxSolver(solver: WasmBlackBoxFunctionSolver, program: Uint8Array, initial_witness: WitnessMap, foreign_call_handler: ForeignCallHandler): Promise<WitnessMap>;
+export function ecdsa_secp256k1_verify(hashed_msg: Uint8Array, public_key_x_bytes: Uint8Array, public_key_y_bytes: Uint8Array, signature: Uint8Array): boolean;
 /**
+* Verifies a ECDSA signature over the secp256r1 curve.
+* @param {Uint8Array} hashed_msg
+* @param {Uint8Array} public_key_x_bytes
+* @param {Uint8Array} public_key_y_bytes
+* @param {Uint8Array} signature
+* @returns {boolean}
 */
-export function executeProgram(program: Uint8Array, initial_witness: WitnessMap, foreign_call_handler: ForeignCallHandler): Promise<WitnessStack>;
+export function ecdsa_secp256r1_verify(hashed_msg: Uint8Array, public_key_x_bytes: Uint8Array, public_key_y_bytes: Uint8Array, signature: Uint8Array): boolean;
 /**
+* Returns the `BuildInfo` object containing information about how the installed package was built.
+* @returns {BuildInfo} - Information on how the installed package was built.
 */
-export function executeProgramWithBlackBoxSolver(solver: WasmBlackBoxFunctionSolver, program: Uint8Array, initial_witness: WitnessMap, foreign_call_executor: ForeignCallHandler): Promise<WitnessStack>;
+export function buildInfo(): BuildInfo;
 /**
 * Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's return values.
 *
@@ -92,80 +89,80 @@ export function getPublicParametersWitness(program: Uint8Array, solved_witness:
 */
 export function getPublicWitness(program: Uint8Array, solved_witness: WitnessMap): WitnessMap;
 /**
-* Performs a bitwise AND operation between `lhs` and `rhs`
-* @param {string} lhs
-* @param {string} rhs
-* @returns {string}
+* Sets the package's logging level.
+*
+* @param {LogLevel} level - The maximum level of logging to be emitted.
 */
-export function and(lhs: string, rhs: string): string;
+export function initLogLevel(filter: string): void;
 /**
-* Performs a bitwise XOR operation between `lhs` and `rhs`
-* @param {string} lhs
-* @param {string} rhs
-* @returns {string}
+* Compresses a `WitnessMap` into the binary format outputted by Nargo.
+*
+* @param {WitnessMap} witness_map - A witness map.
+* @returns {Uint8Array} A compressed witness map
 */
-export function xor(lhs: string, rhs: string): string;
+export function compressWitness(witness_map: WitnessMap): Uint8Array;
 /**
-* Calculates the SHA256 hash of the input bytes
-* @param {Uint8Array} inputs
-* @returns {Uint8Array}
+* Decompresses a compressed witness as outputted by Nargo into a `WitnessMap`.
+* This should be used to only fetch the witness map for the main function.
+*
+* @param {Uint8Array} compressed_witness - A compressed witness.
+* @returns {WitnessMap} The decompressed witness map.
 */
-export function sha256(inputs: Uint8Array): Uint8Array;
+export function decompressWitness(compressed_witness: Uint8Array): WitnessMap;
 /**
-* Calculates the Blake2s256 hash of the input bytes
-* @param {Uint8Array} inputs
-* @returns {Uint8Array}
+* Compresses a `WitnessStack` into the binary format outputted by Nargo.
+*
+* @param {WitnessStack} witness_stack - A witness stack.
+* @returns {Uint8Array} A compressed witness stack
 */
-export function blake2s256(inputs: Uint8Array): Uint8Array;
+export function compressWitnessStack(witness_stack: WitnessStack): Uint8Array;
 /**
-* Calculates the Keccak256 hash of the input bytes
-* @param {Uint8Array} inputs
-* @returns {Uint8Array}
+* Decompresses a compressed witness stack as outputted by Nargo into a `WitnessStack`.
+*
+* @param {Uint8Array} compressed_witness - A compressed witness.
+* @returns {WitnessStack} The decompressed witness stack.
 */
-export function keccak256(inputs: Uint8Array): Uint8Array;
+export function decompressWitnessStack(compressed_witness: Uint8Array): WitnessStack;
 /**
-* Verifies a ECDSA signature over the secp256k1 curve.
-* @param {Uint8Array} hashed_msg
-* @param {Uint8Array} public_key_x_bytes
-* @param {Uint8Array} public_key_y_bytes
-* @param {Uint8Array} signature
-* @returns {boolean}
+* @returns {Promise<WasmBlackBoxFunctionSolver>}
 */
-export function ecdsa_secp256k1_verify(hashed_msg: Uint8Array, public_key_x_bytes: Uint8Array, public_key_y_bytes: Uint8Array, signature: Uint8Array): boolean;
+export function createBlackBoxSolver(): Promise<WasmBlackBoxFunctionSolver>;
 /**
-* Verifies a ECDSA signature over the secp256r1 curve.
-* @param {Uint8Array} hashed_msg
-* @param {Uint8Array} public_key_x_bytes
-* @param {Uint8Array} public_key_y_bytes
-* @param {Uint8Array} signature
-* @returns {boolean}
+* 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 ecdsa_secp256r1_verify(hashed_msg: Uint8Array, public_key_x_bytes: Uint8Array, public_key_y_bytes: Uint8Array, signature: Uint8Array): boolean;
+export function executeCircuit(program: Uint8Array, initial_witness: WitnessMap, foreign_call_handler: ForeignCallHandler): Promise<WitnessMap>;
 /**
-* Returns the `BuildInfo` object containing information about how the installed package was built.
-* @returns {BuildInfo} - Information on how the installed package was built.
+* 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 {&WasmBlackBoxFunctionSolver} solver - A black box solver.
+* @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 buildInfo(): BuildInfo;
+export function executeCircuitWithReturnWitness(solver: WasmBlackBoxFunctionSolver, program: Uint8Array, initial_witness: WitnessMap, foreign_call_handler: ForeignCallHandler): Promise<SolvedAndReturnWitness>;
 /**
-* 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 {&WasmBlackBoxFunctionSolver} solver - A black box solver.
+* @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 type ForeignCallInput = string[]
-export type ForeignCallOutput = string | string[]
-
+export function executeCircuitWithBlackBoxSolver(solver: WasmBlackBoxFunctionSolver, program: Uint8Array, initial_witness: WitnessMap, foreign_call_handler: ForeignCallHandler): Promise<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[]>;
-
-
+export function executeProgram(program: Uint8Array, initial_witness: WitnessMap, foreign_call_handler: ForeignCallHandler): Promise<WitnessStack>;
+/**
+*/
+export function executeProgramWithBlackBoxSolver(solver: WasmBlackBoxFunctionSolver, program: Uint8Array, initial_witness: WitnessMap, foreign_call_executor: ForeignCallHandler): Promise<WitnessStack>;
 
 export type ExecutionError = Error & {
     callStack?: string[];
@@ -176,15 +173,16 @@ export type ExecutionError = Error & {
 // Map from witness index to hex string value of witness.
 export type WitnessMap = Map<number, string>;
 
-
-
-export type StackItem = {
-    index: number;
-    witness: WitnessMap;
+/**
+ * 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 WitnessStack = Array<StackItem>;
-
 
 
 /**
@@ -200,6 +198,29 @@ export type BuildInfo = {
 }
 
 
+
+export type ForeignCallInput = string[]
+export type ForeignCallOutput = string | 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[]>;
+
+
+
+export type StackItem = {
+    index: number;
+    witness: WitnessMap;
+}
+
+export type WitnessStack = Array<StackItem>;
+
+
 /**
 */
 export class WasmBlackBoxFunctionSolver {
@@ -210,6 +231,18 @@ export type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembl
 
 export interface InitOutput {
   readonly memory: WebAssembly.Memory;
+  readonly and: (a: number, b: number) => number;
+  readonly xor: (a: number, b: number) => number;
+  readonly sha256: (a: number, b: number, c: number) => void;
+  readonly blake2s256: (a: number, b: number, c: number) => void;
+  readonly keccak256: (a: number, b: number, c: number) => void;
+  readonly ecdsa_secp256k1_verify: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number) => number;
+  readonly ecdsa_secp256r1_verify: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number) => number;
+  readonly buildInfo: () => number;
+  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 compressWitness: (a: number, b: number) => void;
   readonly decompressWitness: (a: number, b: number, c: number) => void;
   readonly compressWitnessStack: (a: number, b: number) => void;
@@ -217,32 +250,21 @@ export interface InitOutput {
   readonly __wbg_wasmblackboxfunctionsolver_free: (a: number) => void;
   readonly createBlackBoxSolver: () => number;
   readonly executeCircuit: (a: number, b: number, c: number, d: number) => number;
+  readonly executeCircuitWithReturnWitness: (a: number, b: number, c: number, d: number, e: number) => number;
   readonly executeCircuitWithBlackBoxSolver: (a: number, b: number, c: number, d: number, e: number) => number;
   readonly executeProgram: (a: number, b: number, c: number, d: number) => number;
   readonly executeProgramWithBlackBoxSolver: (a: number, b: number, c: number, d: number, e: number) => number;
-  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 and: (a: number, b: number) => number;
-  readonly xor: (a: number, b: number) => number;
-  readonly sha256: (a: number, b: number, c: number) => void;
-  readonly blake2s256: (a: number, b: number, c: number) => void;
-  readonly keccak256: (a: number, b: number, c: number) => void;
-  readonly ecdsa_secp256k1_verify: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number) => number;
-  readonly ecdsa_secp256r1_verify: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number) => number;
-  readonly buildInfo: () => number;
-  readonly initLogLevel: (a: number, b: number, c: number) => void;
   readonly __wbg_trap_free: (a: number) => void;
   readonly trap___wbg_wasmer_trap: () => void;
   readonly __wbindgen_malloc: (a: number) => number;
   readonly __wbindgen_realloc: (a: number, b: number, c: number) => number;
   readonly __wbindgen_export_2: WebAssembly.Table;
-  readonly _dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hfdf1d0fa4debaf70: (a: number, b: number, c: number) => void;
+  readonly _dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hc5258430255de068: (a: number, b: number, c: number) => void;
   readonly __wbindgen_add_to_stack_pointer: (a: number) => number;
   readonly __wbindgen_free: (a: number, b: number) => void;
   readonly __wbindgen_exn_store: (a: number) => void;
-  readonly wasm_bindgen__convert__closures__invoke3_mut__h28a07b2d2a2056af: (a: number, b: number, c: number, d: number, e: number) => void;
-  readonly wasm_bindgen__convert__closures__invoke2_mut__h79f8a29187e94f15: (a: number, b: number, c: number, d: number) => void;
+  readonly wasm_bindgen__convert__closures__invoke3_mut__h1e7d8ac96c74bd35: (a: number, b: number, c: number, d: number, e: number) => void;
+  readonly wasm_bindgen__convert__closures__invoke2_mut__h188e918906ff9a40: (a: number, b: number, c: number, d: number) => void;
 }
 
 export type SyncInitInput = BufferSource | WebAssembly.Module;