@noir-lang/acvm_js 0.42.0 → 0.43.0

package/nodejs/acvm_js_bg.wasm.d.ts

@@ -1,24 +1,28 @@
 /* tslint:disable */
 /* eslint-disable */
 export const memory: WebAssembly.Memory;
-export function ecdsa_secp256r1_verify(a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number): number;
-export function ecdsa_secp256k1_verify(a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number): number;
-export function keccak256(a: number, b: number, c: number): void;
-export function blake2s256(a: number, b: number, c: number): void;
-export function sha256(a: number, b: number, c: number): void;
-export function xor(a: number, b: number): number;
-export function and(a: number, b: number): number;
-export function executeCircuitWithBlackBoxSolver(a: number, b: number, c: number, d: number, e: number): number;
-export function executeCircuit(a: number, b: number, c: number, d: number): number;
-export function createBlackBoxSolver(): number;
+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;
+export function decompressWitnessStack(a: number, b: number, c: number): void;
 export function __wbg_wasmblackboxfunctionsolver_free(a: number): void;
-export function getPublicWitness(a: number, b: number, c: number, d: number): void;
-export function getPublicParametersWitness(a: number, b: number, c: number, d: number): void;
+export function createBlackBoxSolver(): number;
+export function executeCircuit(a: number, b: number, c: number, d: 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 initLogLevel(a: number, b: number, c: number): void;
-export function decompressWitness(a: number, b: number, c: number): void;
-export function compressWitness(a: number, b: 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;
@@ -28,4 +32,5 @@ export function _dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen
 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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@noir-lang/acvm_js",
-  "version": "0.42.0",
+  "version": "0.43.0",
   "publishConfig": {
     "access": "public"
   },
@@ -34,9 +34,7 @@
     "lint": "NODE_NO_WARNINGS=1 eslint . --ext .ts --ignore-path ./.eslintignore  --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",
-    "build:nix": "nix build -L .#acvm_js",
-    "install:from:nix": "yarn clean && yarn build:nix && cp -rL ./result/acvm_js/nodejs ./ && cp -rL ./result/acvm_js/web ./"
+    "clean": "chmod u+w web nodejs || true && rm -rf web nodejs"
   },
   "devDependencies": {
     "@esm-bundle/chai": "^4.3.4-fix.0",

package/web/acvm_js.d.ts

@@ -1,89 +1,74 @@
 /* tslint:disable */
 /* eslint-disable */
 /**
-* 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 ecdsa_secp256r1_verify(hashed_msg: Uint8Array, public_key_x_bytes: Uint8Array, public_key_y_bytes: Uint8Array, signature: Uint8Array): boolean;
-/**
-* 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 ecdsa_secp256k1_verify(hashed_msg: Uint8Array, public_key_x_bytes: Uint8Array, public_key_y_bytes: Uint8Array, signature: Uint8Array): boolean;
-/**
-* Calculates the Keccak256 hash of the input bytes
-* @param {Uint8Array} inputs
-* @returns {Uint8Array}
+* 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 keccak256(inputs: Uint8Array): Uint8Array;
+export function compressWitness(witness_map: WitnessMap): Uint8Array;
 /**
-* Calculates the Blake2s256 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 blake2s256(inputs: Uint8Array): Uint8Array;
+export function decompressWitness(compressed_witness: Uint8Array): WitnessMap;
 /**
-* Calculates the SHA256 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 sha256(inputs: Uint8Array): Uint8Array;
+export function compressWitnessStack(witness_stack: WitnessStack): Uint8Array;
 /**
-* Performs a bitwise XOR operation between `lhs` and `rhs`
-* @param {string} lhs
-* @param {string} rhs
-* @returns {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.
 */
-export function xor(lhs: string, rhs: string): string;
+export function decompressWitnessStack(compressed_witness: Uint8Array): WitnessStack;
 /**
-* Performs a bitwise AND operation between `lhs` and `rhs`
-* @param {string} lhs
-* @param {string} rhs
-* @returns {string}
+* @returns {Promise<WasmBlackBoxFunctionSolver>}
 */
-export function and(lhs: string, rhs: string): string;
+export function createBlackBoxSolver(): Promise<WasmBlackBoxFunctionSolver>;
 /**
 * 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.
 */
-export function executeCircuitWithBlackBoxSolver(solver: WasmBlackBoxFunctionSolver, program: Uint8Array, initial_witness: WitnessMap, foreign_call_handler: ForeignCallHandler): Promise<WitnessMap>;
+export function executeCircuit(program: Uint8Array, initial_witness: WitnessMap, foreign_call_handler: ForeignCallHandler): Promise<WitnessMap>;
 /**
 * Executes an ACIR circuit to generate the solved witness from the initial witness.
 *
+* @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 executeCircuit(program: Uint8Array, initial_witness: WitnessMap, foreign_call_handler: ForeignCallHandler): Promise<WitnessMap>;
+export function executeCircuitWithBlackBoxSolver(solver: WasmBlackBoxFunctionSolver, program: Uint8Array, initial_witness: WitnessMap, foreign_call_handler: ForeignCallHandler): Promise<WitnessMap>;
 /**
-* @returns {Promise<WasmBlackBoxFunctionSolver>}
 */
-export function createBlackBoxSolver(): Promise<WasmBlackBoxFunctionSolver>;
+export function executeProgram(program: Uint8Array, initial_witness: WitnessMap, foreign_call_handler: ForeignCallHandler): Promise<WitnessStack>;
 /**
-* Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's public inputs.
+*/
+export function executeProgramWithBlackBoxSolver(solver: WasmBlackBoxFunctionSolver, program: Uint8Array, initial_witness: WitnessMap, foreign_call_executor: ForeignCallHandler): Promise<WitnessStack>;
+/**
+* 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 public inputs.
+* @returns {WitnessMap} A witness map containing the circuit's return values.
 * @param {Uint8Array} program
-* @param {WitnessMap} solved_witness
+* @param {WitnessMap} witness_map
 * @returns {WitnessMap}
 */
-export function getPublicWitness(program: Uint8Array, solved_witness: WitnessMap): WitnessMap;
+export function getReturnWitness(program: Uint8Array, witness_map: WitnessMap): WitnessMap;
 /**
 * Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's public parameters.
 *
@@ -96,41 +81,91 @@ export function getPublicWitness(program: Uint8Array, solved_witness: WitnessMap
 */
 export function getPublicParametersWitness(program: Uint8Array, solved_witness: WitnessMap): WitnessMap;
 /**
-* Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's return values.
+* 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 return values.
+* @returns {WitnessMap} A witness map containing the circuit's public inputs.
 * @param {Uint8Array} program
-* @param {WitnessMap} witness_map
+* @param {WitnessMap} solved_witness
 * @returns {WitnessMap}
 */
-export function getReturnWitness(program: Uint8Array, witness_map: WitnessMap): WitnessMap;
+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.
+* Performs a bitwise AND operation between `lhs` and `rhs`
+* @param {string} lhs
+* @param {string} rhs
+* @returns {string}
 */
-export function initLogLevel(filter: string): void;
+export function and(lhs: string, rhs: string): string;
 /**
-* Decompresses a compressed witness as outputted by Nargo into a `WitnessMap`.
-*
-* @param {Uint8Array} compressed_witness - A compressed witness.
-* @returns {WitnessMap} The decompressed witness map.
+* Performs a bitwise XOR operation between `lhs` and `rhs`
+* @param {string} lhs
+* @param {string} rhs
+* @returns {string}
 */
-export function decompressWitness(compressed_witness: Uint8Array): WitnessMap;
+export function xor(lhs: string, rhs: string): string;
 /**
-* Compresses a `WitnessMap` into the binary format outputted by Nargo.
-*
-* @param {Uint8Array} compressed_witness - A witness map.
-* @returns {WitnessMap} A compressed witness map
+* Calculates the SHA256 hash of the input bytes
+* @param {Uint8Array} inputs
+* @returns {Uint8Array}
 */
-export function compressWitness(witness_map: WitnessMap): Uint8Array;
+export function sha256(inputs: Uint8Array): Uint8Array;
+/**
+* Calculates the Blake2s256 hash of the input bytes
+* @param {Uint8Array} inputs
+* @returns {Uint8Array}
+*/
+export function blake2s256(inputs: Uint8Array): Uint8Array;
+/**
+* Calculates the Keccak256 hash of the input bytes
+* @param {Uint8Array} inputs
+* @returns {Uint8Array}
+*/
+export function keccak256(inputs: Uint8Array): Uint8Array;
+/**
+* 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 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 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 buildInfo(): BuildInfo;
+/**
+* Sets the package's logging level.
+*
+* @param {LogLevel} level - The maximum level of logging to be emitted.
+*/
+export function initLogLevel(filter: string): void;
+
+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 ExecutionError = Error & {
     callStack?: string[];
@@ -143,17 +178,12 @@ export type WitnessMap = Map<number, string>;
 
 
 
-export type ForeignCallInput = string[]
-export type ForeignCallOutput = string | string[]
+export type StackItem = {
+    index: number;
+    witness: 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 type WitnessStack = Array<StackItem>;
 
 
 
@@ -180,24 +210,28 @@ export type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembl
 
 export interface InitOutput {
   readonly memory: WebAssembly.Memory;
-  readonly ecdsa_secp256r1_verify: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number) => number;
-  readonly ecdsa_secp256k1_verify: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number) => number;
-  readonly keccak256: (a: number, b: number, c: number) => void;
-  readonly blake2s256: (a: number, b: number, c: number) => void;
-  readonly sha256: (a: number, b: number, c: number) => void;
-  readonly xor: (a: number, b: number) => number;
-  readonly and: (a: number, b: number) => number;
-  readonly executeCircuitWithBlackBoxSolver: (a: number, b: number, c: number, d: number, e: number) => number;
-  readonly executeCircuit: (a: number, b: number, c: number, d: number) => number;
-  readonly createBlackBoxSolver: () => number;
+  readonly compressWitness: (a: number, b: number) => void;
+  readonly decompressWitness: (a: number, b: number, c: number) => void;
+  readonly compressWitnessStack: (a: number, b: number) => void;
+  readonly decompressWitnessStack: (a: number, b: number, c: number) => void;
   readonly __wbg_wasmblackboxfunctionsolver_free: (a: number) => void;
-  readonly getPublicWitness: (a: number, b: number, c: number, d: number) => void;
-  readonly getPublicParametersWitness: (a: number, b: number, c: number, d: number) => void;
+  readonly createBlackBoxSolver: () => number;
+  readonly executeCircuit: (a: number, b: number, c: number, d: 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 initLogLevel: (a: number, b: number, c: number) => void;
-  readonly decompressWitness: (a: number, b: number, c: number) => void;
-  readonly compressWitness: (a: number, b: 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;
@@ -207,6 +241,7 @@ export interface InitOutput {
   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;
 }