@noir-lang/noir_js 0.28.0 → 0.29.0-c8b70ac.nightly

package/lib/index.d.ts

@@ -5,6 +5,7 @@ export { ecdsa_secp256r1_verify, ecdsa_secp256k1_verify, keccak256, blake2s256,
 export { InputMap } from '@noir-lang/noirc_abi';
 export { WitnessMap, ForeignCallHandler, ForeignCallInput, ForeignCallOutput } from '@noir-lang/acvm_js';
 export { Noir } from './program.js';
+export { ErrorWithPayload } from './witness_generation.js';
 /** @ignore */
 export { acvm, abi };
 export { CompiledCircuit, ProofData };

package/lib/program.cjs

@@ -74,9 +74,10 @@ class Noir {
      */
     async execute(inputs, foreignCallHandler) {
         await this.init();
-        const witness = await (0, witness_generation_js_1.generateWitness)(this.circuit, inputs, foreignCallHandler);
-        const { return_value: returnValue } = (0, noirc_abi_1.abiDecode)(this.circuit.abi, witness);
-        return { witness: (0, acvm_js_1.compressWitness)(witness), returnValue };
+        const witness_stack = await (0, witness_generation_js_1.generateWitness)(this.circuit, inputs, foreignCallHandler);
+        const main_witness = witness_stack[0].witness;
+        const { return_value: returnValue } = (0, noirc_abi_1.abiDecode)(this.circuit.abi, main_witness);
+        return { witness: (0, acvm_js_1.compressWitnessStack)(witness_stack), returnValue };
     }
     /**
      *

package/lib/program.mjs

@@ -1,6 +1,6 @@
 import { generateWitness } from "./witness_generation.mjs";
 import initAbi, { abiDecode } from '@noir-lang/noirc_abi';
-import initACVM, { compressWitness } from '@noir-lang/acvm_js';
+import initACVM, { compressWitnessStack } from '@noir-lang/acvm_js';
 export class Noir {
     circuit;
     backend;
@@ -48,9 +48,10 @@ export class Noir {
      */
     async execute(inputs, foreignCallHandler) {
         await this.init();
-        const witness = await generateWitness(this.circuit, inputs, foreignCallHandler);
-        const { return_value: returnValue } = abiDecode(this.circuit.abi, witness);
-        return { witness: compressWitness(witness), returnValue };
+        const witness_stack = await generateWitness(this.circuit, inputs, foreignCallHandler);
+        const main_witness = witness_stack[0].witness;
+        const { return_value: returnValue } = abiDecode(this.circuit.abi, main_witness);
+        return { witness: compressWitnessStack(witness_stack), returnValue };
     }
     /**
      *

package/lib/witness_generation.cjs

@@ -19,15 +19,30 @@ const defaultForeignCallHandler = async (name, args) => {
         // If a user needs to print values then they should provide a custom foreign call handler.
         return [];
     }
-    else if (name == 'assert_message') {
-        // By default we do not do anything for `assert_message` foreign calls due to a need for formatting,
-        // however we provide an empty response in order to not halt execution.
-        //
-        // If a user needs to use dynamic assertion messages then they should provide a custom foreign call handler.
-        return [];
-    }
     throw Error(`Unexpected oracle during execution: ${name}(${args.join(', ')})`);
 };
+function parseErrorPayload(abi, originalError) {
+    const payload = originalError.rawAssertionPayload;
+    if (!payload)
+        return originalError;
+    const enrichedError = originalError;
+    try {
+        // Decode the payload
+        const decodedPayload = (0, noirc_abi_1.abiDecodeError)(abi, payload);
+        if (typeof decodedPayload === 'string') {
+            // If it's a string, just add it to the error message
+            enrichedError.message = `Circuit execution failed: ${decodedPayload}`;
+        }
+        else {
+            // If not, attach the payload to the original error
+            enrichedError.decodedAssertionPayload = decodedPayload;
+        }
+    }
+    catch (_errorDecoding) {
+        // Ignore errors decoding the payload
+    }
+    return enrichedError;
+}
 // Generates the witnesses needed to feed into the chosen proving system
 async function generateWitness(compiledProgram, inputs, foreignCallHandler = defaultForeignCallHandler) {
     // Throws on ABI encoding error
@@ -35,10 +50,14 @@ async function generateWitness(compiledProgram, inputs, foreignCallHandler = def
     // Execute the circuit to generate the rest of the witnesses and serialize
     // them into a Uint8Array.
     try {
-        const solvedWitness = await (0, acvm_js_1.executeCircuitWithBlackBoxSolver)(await getSolver(), (0, base64_decode_js_1.base64Decode)(compiledProgram.bytecode), witnessMap, foreignCallHandler);
+        const solvedWitness = await (0, acvm_js_1.executeProgramWithBlackBoxSolver)(await getSolver(), (0, base64_decode_js_1.base64Decode)(compiledProgram.bytecode), witnessMap, foreignCallHandler);
         return solvedWitness;
     }
     catch (err) {
+        // Typescript types catched errors as unknown or any, so we need to narrow its type to check if it has raw assertion payload.
+        if (typeof err === 'object' && err !== null && 'rawAssertionPayload' in err) {
+            throw parseErrorPayload(compiledProgram.abi, err);
+        }
         throw new Error(`Circuit execution failed: ${err}`);
     }
 }

package/lib/witness_generation.d.ts

@@ -1,4 +1,7 @@
 import { InputMap } from '@noir-lang/noirc_abi';
-import { WitnessMap, ForeignCallHandler } from '@noir-lang/acvm_js';
+import { WitnessStack, ForeignCallHandler, ExecutionError } from '@noir-lang/acvm_js';
 import { CompiledCircuit } from '@noir-lang/types';
-export declare function generateWitness(compiledProgram: CompiledCircuit, inputs: InputMap, foreignCallHandler?: ForeignCallHandler): Promise<WitnessMap>;
+export type ErrorWithPayload = ExecutionError & {
+    decodedAssertionPayload?: any;
+};
+export declare function generateWitness(compiledProgram: CompiledCircuit, inputs: InputMap, foreignCallHandler?: ForeignCallHandler): Promise<WitnessStack>;

package/lib/witness_generation.mjs

@@ -1,6 +1,6 @@
-import { abiEncode } from '@noir-lang/noirc_abi';
+import { abiDecodeError, abiEncode } from '@noir-lang/noirc_abi';
 import { base64Decode } from "./base64_decode.mjs";
-import { createBlackBoxSolver, executeCircuitWithBlackBoxSolver, } from '@noir-lang/acvm_js';
+import { createBlackBoxSolver, executeProgramWithBlackBoxSolver, } from '@noir-lang/acvm_js';
 let solver;
 const getSolver = () => {
     if (!solver) {
@@ -16,15 +16,30 @@ const defaultForeignCallHandler = async (name, args) => {
         // If a user needs to print values then they should provide a custom foreign call handler.
         return [];
     }
-    else if (name == 'assert_message') {
-        // By default we do not do anything for `assert_message` foreign calls due to a need for formatting,
-        // however we provide an empty response in order to not halt execution.
-        //
-        // If a user needs to use dynamic assertion messages then they should provide a custom foreign call handler.
-        return [];
-    }
     throw Error(`Unexpected oracle during execution: ${name}(${args.join(', ')})`);
 };
+function parseErrorPayload(abi, originalError) {
+    const payload = originalError.rawAssertionPayload;
+    if (!payload)
+        return originalError;
+    const enrichedError = originalError;
+    try {
+        // Decode the payload
+        const decodedPayload = abiDecodeError(abi, payload);
+        if (typeof decodedPayload === 'string') {
+            // If it's a string, just add it to the error message
+            enrichedError.message = `Circuit execution failed: ${decodedPayload}`;
+        }
+        else {
+            // If not, attach the payload to the original error
+            enrichedError.decodedAssertionPayload = decodedPayload;
+        }
+    }
+    catch (_errorDecoding) {
+        // Ignore errors decoding the payload
+    }
+    return enrichedError;
+}
 // Generates the witnesses needed to feed into the chosen proving system
 export async function generateWitness(compiledProgram, inputs, foreignCallHandler = defaultForeignCallHandler) {
     // Throws on ABI encoding error
@@ -32,10 +47,14 @@ export async function generateWitness(compiledProgram, inputs, foreignCallHandle
     // Execute the circuit to generate the rest of the witnesses and serialize
     // them into a Uint8Array.
     try {
-        const solvedWitness = await executeCircuitWithBlackBoxSolver(await getSolver(), base64Decode(compiledProgram.bytecode), witnessMap, foreignCallHandler);
+        const solvedWitness = await executeProgramWithBlackBoxSolver(await getSolver(), base64Decode(compiledProgram.bytecode), witnessMap, foreignCallHandler);
         return solvedWitness;
     }
     catch (err) {
+        // Typescript types catched errors as unknown or any, so we need to narrow its type to check if it has raw assertion payload.
+        if (typeof err === 'object' && err !== null && 'rawAssertionPayload' in err) {
+            throw parseErrorPayload(compiledProgram.abi, err);
+        }
         throw new Error(`Circuit execution failed: ${err}`);
     }
 }

package/package.json

@@ -3,7 +3,7 @@
   "contributors": [
     "The Noir Team <team@noir-lang.org>"
   ],
-  "version": "0.28.0",
+  "version": "0.29.0-c8b70ac.nightly",
   "packageManager": "yarn@3.5.1",
   "license": "(MIT OR Apache-2.0)",
   "type": "module",
@@ -17,9 +17,9 @@
     "url": "https://github.com/noir-lang/noir/issues"
   },
   "dependencies": {
-    "@noir-lang/acvm_js": "0.44.0",
-    "@noir-lang/noirc_abi": "0.28.0",
-    "@noir-lang/types": "0.28.0"
+    "@noir-lang/acvm_js": "0.45.0-c8b70ac.nightly",
+    "@noir-lang/noirc_abi": "0.29.0-c8b70ac.nightly",
+    "@noir-lang/types": "0.29.0-c8b70ac.nightly"
   },
   "files": [
     "lib",