@noir-lang/noir_js 0.29.0 → 0.30.0-2e543b4.nightly

package/lib/index.d.ts

@@ -1,10 +1,11 @@
 import * as acvm from '@noir-lang/acvm_js';
 import * as abi from '@noir-lang/noirc_abi';
-import { CompiledCircuit, ProofData } from '@noir-lang/types';
+import { CompiledCircuit } from '@noir-lang/types';
 export { ecdsa_secp256r1_verify, ecdsa_secp256k1_verify, keccak256, blake2s256, sha256, xor, and, } from '@noir-lang/acvm_js';
 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 };
+export { CompiledCircuit };

package/lib/program.cjs

@@ -29,10 +29,8 @@ const noirc_abi_1 = __importStar(require("@noir-lang/noirc_abi"));
 const acvm_js_1 = __importStar(require("@noir-lang/acvm_js"));
 class Noir {
     circuit;
-    backend;
-    constructor(circuit, backend) {
+    constructor(circuit) {
         this.circuit = circuit;
-        this.backend = backend;
     }
     /** @ignore */
     async init() {
@@ -43,26 +41,6 @@ class Noir {
             await Promise.all([(0, noirc_abi_1.default)(), (0, acvm_js_1.default)()]);
         }
     }
-    /**
-     *
-     * @description
-     * Destroys the underlying backend instance.
-     *
-     * @example
-     * ```typescript
-     * await noir.destroy();
-     * ```
-     *
-     */
-    async destroy() {
-        await this.backend?.destroy();
-    }
-    getBackend() {
-        if (this.backend === undefined)
-            throw new Error('Operation requires a backend but none was provided');
-        return this.backend;
-    }
-    // Initial inputs to your program
     /**
      * @description
      * Allows to execute a circuit to get its witness and return value.
@@ -79,35 +57,5 @@ class Noir {
         const { return_value: returnValue } = (0, noirc_abi_1.abiDecode)(this.circuit.abi, main_witness);
         return { witness: (0, acvm_js_1.compressWitnessStack)(witness_stack), returnValue };
     }
-    /**
-     *
-     * @description
-     * Generates a witness and a proof given an object as input.
-     *
-     * @example
-     * ```typescript
-     * async generateProof(input)
-     * ```
-     *
-     */
-    async generateProof(inputs, foreignCallHandler) {
-        const { witness } = await this.execute(inputs, foreignCallHandler);
-        return this.getBackend().generateProof(witness);
-    }
-    /**
-     *
-     * @description
-     * Instantiates the verification key and verifies a proof.
-     *
-     *
-     * @example
-     * ```typescript
-     * async verifyProof(proof)
-     * ```
-     *
-     */
-    async verifyProof(proofData) {
-        return this.getBackend().verifyProof(proofData);
-    }
 }
 exports.Noir = Noir;

package/lib/program.d.ts

@@ -1,25 +1,11 @@
-import { Backend, CompiledCircuit, ProofData } from '@noir-lang/types';
+import { CompiledCircuit } from '@noir-lang/types';
 import { InputMap, InputValue } from '@noir-lang/noirc_abi';
 import { ForeignCallHandler } from '@noir-lang/acvm_js';
 export declare class Noir {
     private circuit;
-    private backend?;
-    constructor(circuit: CompiledCircuit, backend?: Backend | undefined);
+    constructor(circuit: CompiledCircuit);
     /** @ignore */
     init(): Promise<void>;
-    /**
-     *
-     * @description
-     * Destroys the underlying backend instance.
-     *
-     * @example
-     * ```typescript
-     * await noir.destroy();
-     * ```
-     *
-     */
-    destroy(): Promise<void>;
-    private getBackend;
     /**
      * @description
      * Allows to execute a circuit to get its witness and return value.
@@ -33,29 +19,4 @@ export declare class Noir {
         witness: Uint8Array;
         returnValue: InputValue;
     }>;
-    /**
-     *
-     * @description
-     * Generates a witness and a proof given an object as input.
-     *
-     * @example
-     * ```typescript
-     * async generateProof(input)
-     * ```
-     *
-     */
-    generateProof(inputs: InputMap, foreignCallHandler?: ForeignCallHandler): Promise<ProofData>;
-    /**
-     *
-     * @description
-     * Instantiates the verification key and verifies a proof.
-     *
-     *
-     * @example
-     * ```typescript
-     * async verifyProof(proof)
-     * ```
-     *
-     */
-    verifyProof(proofData: ProofData): Promise<boolean>;
 }

package/lib/program.mjs

@@ -3,10 +3,8 @@ import initAbi, { abiDecode } from '@noir-lang/noirc_abi';
 import initACVM, { compressWitnessStack } from '@noir-lang/acvm_js';
 export class Noir {
     circuit;
-    backend;
-    constructor(circuit, backend) {
+    constructor(circuit) {
         this.circuit = circuit;
-        this.backend = backend;
     }
     /** @ignore */
     async init() {
@@ -17,26 +15,6 @@ export class Noir {
             await Promise.all([initAbi(), initACVM()]);
         }
     }
-    /**
-     *
-     * @description
-     * Destroys the underlying backend instance.
-     *
-     * @example
-     * ```typescript
-     * await noir.destroy();
-     * ```
-     *
-     */
-    async destroy() {
-        await this.backend?.destroy();
-    }
-    getBackend() {
-        if (this.backend === undefined)
-            throw new Error('Operation requires a backend but none was provided');
-        return this.backend;
-    }
-    // Initial inputs to your program
     /**
      * @description
      * Allows to execute a circuit to get its witness and return value.
@@ -53,34 +31,4 @@ export class Noir {
         const { return_value: returnValue } = abiDecode(this.circuit.abi, main_witness);
         return { witness: compressWitnessStack(witness_stack), returnValue };
     }
-    /**
-     *
-     * @description
-     * Generates a witness and a proof given an object as input.
-     *
-     * @example
-     * ```typescript
-     * async generateProof(input)
-     * ```
-     *
-     */
-    async generateProof(inputs, foreignCallHandler) {
-        const { witness } = await this.execute(inputs, foreignCallHandler);
-        return this.getBackend().generateProof(witness);
-    }
-    /**
-     *
-     * @description
-     * Instantiates the verification key and verifies a proof.
-     *
-     *
-     * @example
-     * ```typescript
-     * async verifyProof(proof)
-     * ```
-     *
-     */
-    async verifyProof(proofData) {
-        return this.getBackend().verifyProof(proofData);
-    }
 }

package/lib/witness_generation.cjs

@@ -4,13 +4,6 @@ exports.generateWitness = void 0;
 const noirc_abi_1 = require("@noir-lang/noirc_abi");
 const base64_decode_js_1 = require("./base64_decode.cjs");
 const acvm_js_1 = require("@noir-lang/acvm_js");
-let solver;
-const getSolver = () => {
-    if (!solver) {
-        solver = (0, acvm_js_1.createBlackBoxSolver)();
-    }
-    return solver;
-};
 const defaultForeignCallHandler = async (name, args) => {
     if (name == 'print') {
         // By default we do not print anything for `print` foreign calls due to a need for formatting,
@@ -19,15 +12,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 +43,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.executeProgramWithBlackBoxSolver)(await getSolver(), (0, base64_decode_js_1.base64Decode)(compiledProgram.bytecode), witnessMap, foreignCallHandler);
+        const solvedWitness = await (0, acvm_js_1.executeProgram)((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 { WitnessStack, ForeignCallHandler } from '@noir-lang/acvm_js';
+import { WitnessStack, ForeignCallHandler, ExecutionError } from '@noir-lang/acvm_js';
 import { CompiledCircuit } from '@noir-lang/types';
+export type ErrorWithPayload = ExecutionError & {
+    decodedAssertionPayload?: any;
+};
 export declare function generateWitness(compiledProgram: CompiledCircuit, inputs: InputMap, foreignCallHandler?: ForeignCallHandler): Promise<WitnessStack>;

package/lib/witness_generation.mjs

@@ -1,13 +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, executeProgramWithBlackBoxSolver, } from '@noir-lang/acvm_js';
-let solver;
-const getSolver = () => {
-    if (!solver) {
-        solver = createBlackBoxSolver();
-    }
-    return solver;
-};
+import { executeProgram } from '@noir-lang/acvm_js';
 const defaultForeignCallHandler = async (name, args) => {
     if (name == 'print') {
         // By default we do not print anything for `print` foreign calls due to a need for formatting,
@@ -16,15 +9,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 +40,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 executeProgramWithBlackBoxSolver(await getSolver(), base64Decode(compiledProgram.bytecode), witnessMap, foreignCallHandler);
+        const solvedWitness = await executeProgram(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.29.0",
+  "version": "0.30.0-2e543b4.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.45.0",
-    "@noir-lang/noirc_abi": "0.29.0",
-    "@noir-lang/types": "0.29.0"
+    "@noir-lang/acvm_js": "0.46.0-2e543b4.nightly",
+    "@noir-lang/noirc_abi": "0.30.0-2e543b4.nightly",
+    "@noir-lang/types": "0.30.0-2e543b4.nightly"
   },
   "files": [
     "lib",