@aztec/bb.js 3.0.0-canary.a9708bd → 3.0.0-devnet.2-patch.1

package/dest/browser/barretenberg/backend.js

@@ -1,9 +1,6 @@
-import { Barretenberg } from './index.js';
-import { RawBuffer } from '../types/raw_buffer.js';
-import { uint8ArrayToHex, hexToUint8Array, } from '../proof/index.js';
-import { fromClientIVCProof, toClientIVCProof } from '../cbind/generated/api_types.js';
+import { uint8ArrayToHex, hexToUint8Array } from '../proof/index.js';
+import { fromChonkProof, toChonkProof } from '../cbind/generated/api_types.js';
 import { ungzip } from 'pako';
-import { Buffer } from 'buffer';
 import { Decoder, Encoder } from 'msgpackr';
 export class AztecClientBackendError extends Error {
     constructor(message) {
@@ -11,30 +8,80 @@ export class AztecClientBackendError extends Error {
     }
 }
 function getProofSettingsFromOptions(options) {
+    // Check for conflicting options - verifierTarget should not be combined with legacy options
+    if (options?.verifierTarget) {
+        const legacyOptions = [options.keccak, options.keccakZK, options.starknet, options.starknetZK].filter(Boolean);
+        if (legacyOptions.length > 0) {
+            throw new Error('Cannot use verifierTarget with legacy options (keccak, keccakZK, starknet, starknetZK). ' +
+                'Use verifierTarget alone.');
+        }
+        switch (options.verifierTarget) {
+            case 'evm':
+                return { ipaAccumulation: false, oracleHashType: 'keccak', disableZk: false, optimizedSolidityVerifier: false };
+            case 'evm-no-zk':
+                return { ipaAccumulation: false, oracleHashType: 'keccak', disableZk: true, optimizedSolidityVerifier: false };
+            case 'noir-recursive':
+                return {
+                    ipaAccumulation: false,
+                    oracleHashType: 'poseidon2',
+                    disableZk: false,
+                    optimizedSolidityVerifier: false,
+                };
+            case 'noir-recursive-no-zk':
+                return {
+                    ipaAccumulation: false,
+                    oracleHashType: 'poseidon2',
+                    disableZk: true,
+                    optimizedSolidityVerifier: false,
+                };
+            case 'noir-rollup':
+                return {
+                    ipaAccumulation: true,
+                    oracleHashType: 'poseidon2',
+                    disableZk: false,
+                    optimizedSolidityVerifier: false,
+                };
+            case 'noir-rollup-no-zk':
+                return {
+                    ipaAccumulation: true,
+                    oracleHashType: 'poseidon2',
+                    disableZk: true,
+                    optimizedSolidityVerifier: false,
+                };
+            case 'starknet':
+                return {
+                    ipaAccumulation: false,
+                    oracleHashType: 'starknet',
+                    disableZk: false,
+                    optimizedSolidityVerifier: false,
+                };
+            case 'starknet-no-zk':
+                return {
+                    ipaAccumulation: false,
+                    oracleHashType: 'starknet',
+                    disableZk: true,
+                    optimizedSolidityVerifier: false,
+                };
+        }
+    }
+    // Legacy options support (deprecated)
     return {
         ipaAccumulation: false,
-        oracleHashType: options?.keccak || options?.keccakZK ? 'keccak' : (options?.starknet || options?.starknetZK ? 'starknet' : 'poseidon2'),
-        // TODO no current way to target non-zk poseidon2 hash
+        oracleHashType: options?.keccak || options?.keccakZK
+            ? 'keccak'
+            : options?.starknet || options?.starknetZK
+                ? 'starknet'
+                : 'poseidon2',
         disableZk: options?.keccak || options?.starknet ? true : false,
         optimizedSolidityVerifier: false,
     };
 }
 export class UltraHonkVerifierBackend {
-    constructor(backendOptions = { threads: 1 }, circuitOptions = { recursive: false }) {
-        this.backendOptions = backendOptions;
-        this.circuitOptions = circuitOptions;
-    }
-    /** @ignore */
-    async instantiate() {
-        if (!this.api) {
-            const api = await Barretenberg.new(this.backendOptions);
-            const honkRecursion = true;
-            await api.initSRSForCircuitSize(0);
-            this.api = api;
-        }
+    api;
+    constructor(api) {
+        this.api = api;
     }
     async verifyProof(proofData, options) {
-        await this.instantiate();
         const proofFrs = [];
         for (let i = 0; i < proofData.proof.length; i += 32) {
             proofFrs.push(proofData.proof.slice(i, i + 32));
@@ -47,39 +94,28 @@ export class UltraHonkVerifierBackend {
         });
         return verified;
     }
-    destroy() {
-        if (!this.api) {
-            return Promise.resolve();
-        }
-        return this.api.destroy();
-    }
 }
 export class UltraHonkBackend {
-    constructor(acirBytecode, backendOptions = { threads: 1 }, circuitOptions = { recursive: false }) {
-        this.backendOptions = backendOptions;
-        this.circuitOptions = circuitOptions;
+    api;
+    // These type assertions are used so that we don't
+    // have to initialize `api` in the constructor.
+    // These are initialized asynchronously in the `init` function,
+    // constructors cannot be asynchronous which is why we do this.
+    acirUncompressedBytecode;
+    constructor(acirBytecode, api) {
+        this.api = api;
         this.acirUncompressedBytecode = acirToUint8Array(acirBytecode);
     }
-    /** @ignore */
-    async instantiate() {
-        if (!this.api) {
-            const api = await Barretenberg.new(this.backendOptions);
-            const honkRecursion = true;
-            await api.acirInitSRS(this.acirUncompressedBytecode, this.circuitOptions.recursive, honkRecursion);
-            this.api = api;
-        }
-    }
     async generateProof(compressedWitness, options) {
-        await this.instantiate();
         const witness = ungzip(compressedWitness);
         const { proof, publicInputs } = await this.api.circuitProve({
             witness,
             circuit: {
                 name: 'circuit',
-                bytecode: Buffer.from(this.acirUncompressedBytecode),
-                verificationKey: Buffer.from([]), // Empty VK - lower performance.
+                bytecode: this.acirUncompressedBytecode,
+                verificationKey: new Uint8Array(0), // Empty VK - lower performance.
             },
-            settings: getProofSettingsFromOptions(options)
+            settings: getProofSettingsFromOptions(options),
         });
         console.log(`Generated proof for circuit with ${publicInputs.length} public inputs and ${proof.length} fields.`);
         // We return ProofData as a flat buffer and an array of strings to match the current ProofData class.
@@ -90,7 +126,6 @@ export class UltraHonkBackend {
         return { proof: flatProof, publicInputs: publicInputs.map(uint8ArrayToHex) };
     }
     async verifyProof(proofData, options) {
-        await this.instantiate();
         const proofFrs = [];
         for (let i = 0; i < proofData.proof.length; i += 32) {
             proofFrs.push(proofData.proof.slice(i, i + 32));
@@ -112,21 +147,22 @@ export class UltraHonkBackend {
         return verified;
     }
     async getVerificationKey(options) {
-        await this.instantiate();
         const vkResult = await this.api.circuitComputeVk({
             circuit: {
                 name: 'circuit',
-                bytecode: Buffer.from(this.acirUncompressedBytecode),
+                bytecode: this.acirUncompressedBytecode,
             },
             settings: getProofSettingsFromOptions(options),
         });
         return vkResult.bytes;
     }
     /** @description Returns a solidity verifier */
-    async getSolidityVerifier(vk) {
-        await this.instantiate();
-        const vkBuf = vk ?? (await this.api.acirWriteVkUltraKeccakHonk(this.acirUncompressedBytecode));
-        return await this.api.acirHonkSolidityVerifier(this.acirUncompressedBytecode, new RawBuffer(vkBuf));
+    async getSolidityVerifier(vk, options) {
+        const result = await this.api.circuitWriteSolidityVerifier({
+            verificationKey: vk,
+            settings: getProofSettingsFromOptions(options),
+        });
+        return result.solidityCode;
     }
     // TODO(https://github.com/noir-lang/noir/issues/5661): Update this to handle Honk recursive aggregation in the browser once it is ready in the backend itself
     async generateRecursiveProofArtifacts(
@@ -134,7 +170,6 @@ export class UltraHonkBackend {
     _proof, 
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     _numOfPublicInputs) {
-        await this.instantiate();
         // TODO(https://github.com/noir-lang/noir/issues/5661): This needs to be updated to handle recursive aggregation.
         // There is still a proofAsFields method but we could consider getting rid of it as the proof itself
         // is a list of field elements.
@@ -147,7 +182,7 @@ export class UltraHonkBackend {
         const vkResult = await this.api.circuitComputeVk({
             circuit: {
                 name: 'circuit',
-                bytecode: Buffer.from(this.acirUncompressedBytecode),
+                bytecode: this.acirUncompressedBytecode,
             },
             settings: getProofSettingsFromOptions({}),
         });
@@ -164,28 +199,20 @@ export class UltraHonkBackend {
             // We use an empty string for the vk hash here as it is unneeded as part of the recursive artifacts
             // The user can be expected to hash the vk inside their circuit to check whether the vk is the circuit
             // they expect
-            vkHash: uint8ArrayToHex(vkResult.hash)
+            vkHash: uint8ArrayToHex(vkResult.hash),
         };
     }
-    async destroy() {
-        if (!this.api) {
-            return;
-        }
-        await this.api.destroy();
-    }
 }
 export class AztecClientBackend {
-    constructor(acirBuf, options = { threads: 1 }) {
+    acirBuf;
+    api;
+    // These type assertions are used so that we don't
+    // have to initialize `api` in the constructor.
+    // These are initialized asynchronously in the `init` function,
+    // constructors cannot be asynchronous which is why we do this.
+    constructor(acirBuf, api) {
         this.acirBuf = acirBuf;
-        this.options = options;
-    }
-    /** @ignore */
-    async instantiate() {
-        if (!this.api) {
-            const api = await Barretenberg.new(this.options);
-            await api.initSRSClientIVC();
-            this.api = api;
-        }
+        this.api = api;
     }
     async prove(witnessBuf, vksBuf = []) {
         if (vksBuf.length !== 0 && this.acirBuf.length !== witnessBuf.length) {
@@ -195,92 +222,85 @@ export class AztecClientBackend {
             // NOTE: we allow 0 as an explicit 'I have no VKs'. This is a deprecated feature.
             throw new AztecClientBackendError('Witness and VKs must have the same stack depth!');
         }
-        await this.instantiate();
         // Queue IVC start with the number of circuits
-        this.api.clientIvcStart({ numCircuits: this.acirBuf.length });
+        this.api.chonkStart({ numCircuits: this.acirBuf.length });
         // Queue load and accumulate for each circuit
         for (let i = 0; i < this.acirBuf.length; i++) {
             const bytecode = this.acirBuf[i];
-            const witness = witnessBuf[i] || Buffer.from([]);
-            const vk = vksBuf[i] || Buffer.from([]);
+            const witness = witnessBuf[i] || new Uint8Array(0);
+            const vk = vksBuf[i] || new Uint8Array(0);
             const functionName = `unknown_wasm_${i}`;
             // Load the circuit
-            this.api.clientIvcLoad({
+            this.api.chonkLoad({
                 circuit: {
                     name: functionName,
-                    bytecode: Buffer.from(bytecode),
-                    verificationKey: Buffer.from(vk),
-                }
+                    bytecode: bytecode,
+                    verificationKey: vk,
+                },
             });
             // Accumulate with witness
-            this.api.clientIvcAccumulate({
-                witness: Buffer.from(witness),
+            this.api.chonkAccumulate({
+                witness,
             });
         }
         // Generate the proof (and wait for all previous steps to finish)
-        const proveResult = await this.api.clientIvcProve({});
+        const proveResult = await this.api.chonkProve({});
         // The API currently expects a msgpack-encoded API.
-        const proof = new Encoder({ useRecords: false }).encode(fromClientIVCProof(proveResult.proof));
+        const proof = new Encoder({ useRecords: false }).encode(fromChonkProof(proveResult.proof));
         // Generate the VK
-        const vkResult = await this.api.clientIvcComputeIvcVk({ circuit: {
+        const vkResult = await this.api.chonkComputeIvcVk({
+            circuit: {
                 name: 'hiding',
                 bytecode: this.acirBuf[this.acirBuf.length - 1],
-            } });
+            },
+        });
+        const proofFields = [
+            proveResult.proof.megaProof,
+            proveResult.proof.goblinProof.mergeProof,
+            proveResult.proof.goblinProof.eccvmProof,
+            proveResult.proof.goblinProof.ipaProof,
+            proveResult.proof.goblinProof.translatorProof,
+        ].flat();
         // Note: Verification may not work correctly until we properly serialize the proof
         if (!(await this.verify(proof, vkResult.bytes))) {
-            throw new AztecClientBackendError('Failed to verify the private (ClientIVC) transaction proof!');
+            throw new AztecClientBackendError('Failed to verify the private (Chonk) transaction proof!');
         }
-        return [proof, vkResult.bytes];
+        return [proofFields, proof, vkResult.bytes];
     }
     async verify(proof, vk) {
-        await this.instantiate();
-        const result = await this.api.clientIvcVerify({
-            proof: toClientIVCProof(new Decoder({ useRecords: false }).decode(proof)),
-            vk: Buffer.from(vk),
+        const result = await this.api.chonkVerify({
+            proof: toChonkProof(new Decoder({ useRecords: false }).decode(proof)),
+            vk,
         });
         return result.valid;
     }
     async gates() {
-        await this.instantiate();
         const circuitSizes = [];
         for (const buf of this.acirBuf) {
-            const gates = await this.api.clientIvcStats({
+            const gates = await this.api.chonkStats({
                 circuit: {
                     name: 'circuit',
                     bytecode: buf,
                 },
-                includeGatesPerOpcode: false
+                includeGatesPerOpcode: false,
             });
             circuitSizes.push(gates.circuitSize);
         }
         return circuitSizes;
     }
-    async destroy() {
-        if (!this.api) {
-            return;
-        }
-        await this.api.destroy();
-    }
 }
 // Converts bytecode from a base64 string to a Uint8Array
 function acirToUint8Array(base64EncodedBytecode) {
     const compressedByteCode = base64Decode(base64EncodedBytecode);
     return ungzip(compressedByteCode);
 }
-// Since this is a simple function, we can use feature detection to
-// see if we are in the nodeJs environment or the browser environment.
+// Base64 decode using atob (works in both browser and Node.js 18+)
 function base64Decode(input) {
-    if (typeof Buffer !== 'undefined') {
-        // Node.js environment
-        const b = Buffer.from(input, 'base64');
-        return new Uint8Array(b.buffer, b.byteOffset, b.byteLength);
-    }
-    else if (typeof atob === 'function') {
-        // Browser environment
+    if (typeof atob === 'function') {
         return Uint8Array.from(atob(input), c => c.charCodeAt(0));
     }
     else {
-        throw new Error('No implementation found for base64 decoding.');
+        throw new Error('atob is not available. Node.js 18+ or browser required.');
     }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"backend.js","sourceRoot":"","sources":["../../../src/barretenberg/backend.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"backend.js","sourceRoot":"","sources":["../../../src/barretenberg/backend.ts"],"names":[],"mappings":"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"}

package/dest/browser/barretenberg/index.d.ts

@@ -1,22 +1,9 @@
-import { BarretenbergApi, BarretenbergApiSync } from '../barretenberg_api/index.js';
-import { BarretenbergWasmMain, BarretenbergWasmMainWorker } from '../barretenberg_wasm/barretenberg_wasm_main/index.js';
-import { CircuitComputeVk, CircuitProve, CircuitVerify, ClientIvcAccumulate, ClientIvcComputeIvcVk, ClientIvcStats, ClientIvcLoad, ClientIvcProve, ClientIvcStart, ClientIvcVerify, VkAsFields } from '../cbind/generated/api_types.js';
-export { UltraHonkBackend, UltraHonkVerifierBackend, AztecClientBackend } from './backend.js';
-export type BackendOptions = {
-    /** @description Number of threads to run the backend worker on */
-    threads?: number;
-    /** @description Initial and Maximum memory to be alloted to the backend worker */
-    memory?: {
-        initial?: number;
-        maximum?: number;
-    };
-    /** @description Path to download CRS files */
-    crsPath?: string;
-    /** @description Path to download WASM files */
-    wasmPath?: string;
-    /** @description Logging function */
-    logger?: (msg: string) => void;
-};
+import { AsyncApi } from '../cbind/generated/async.js';
+import { SyncApi } from '../cbind/generated/sync.js';
+import { IMsgpackBackendSync, IMsgpackBackendAsync } from '../bb_backends/interface.js';
+import { BackendOptions } from '../bb_backends/index.js';
+export { UltraHonkBackend, UltraHonkVerifierBackend, AztecClientBackend, type UltraHonkBackendOptions, type VerifierTarget, } from './backend.js';
+export * from '../bb_backends/index.js';
 export type CircuitOptions = {
     /** @description Whether to produce SNARK friendly proofs */
     recursive: boolean;
@@ -25,42 +12,54 @@ export type CircuitOptions = {
  * The main class library consumers interact with.
  * It extends the generated api, and provides a static constructor "new" to compose components.
  */
-export declare class Barretenberg extends BarretenbergApi {
-    private worker;
+export declare class Barretenberg extends AsyncApi {
     private options;
-    private bbApi;
-    private constructor();
+    constructor(backend: IMsgpackBackendAsync, options: BackendOptions);
     /**
      * Constructs an instance of Barretenberg.
-     * Launches it within a worker. This is necessary as it blocks waiting on child threads to complete,
-     * and blocking the main thread in the browser is not allowed.
-     * It threads > 1 (defaults to hardware availability), child threads will be created on their own workers.
+     *
+     * If options.backend is set: uses that specific backend (throws if unavailable)
+     * If options.backend is unset: tries backends in order with fallback:
+     *   1. NativeUnixSocket (if bb binary available)
+     *   2. WasmWorker (in browser) or Wasm (in Node.js)
      */
     static new(options?: BackendOptions): Promise<Barretenberg>;
-    getNumThreads(): Promise<number>;
-    initSRSForCircuitSize(circuitSize: number): Promise<void>;
-    initSRSClientIVC(srsSize?: number): Promise<void>;
+    initSRSChonk(srsSize?: number): Promise<void>;
     getDefaultSrsSize(): number;
-    acirInitSRS(bytecode: Uint8Array, recursive: boolean, honkRecursion: boolean): Promise<void>;
+    acirGetCircuitSizes(bytecode: Uint8Array, recursive: boolean, honkRecursion: boolean): Promise<[number, number]>;
     destroy(): Promise<void>;
-    getWasm(): BarretenbergWasmMainWorker;
-    clientIvcStart(command: ClientIvcStart): Promise<import("../cbind/generated/api_types.js").ClientIvcStartResponse>;
-    clientIvcLoad(command: ClientIvcLoad): Promise<import("../cbind/generated/api_types.js").ClientIvcLoadResponse>;
-    clientIvcAccumulate(command: ClientIvcAccumulate): Promise<import("../cbind/generated/api_types.js").ClientIvcAccumulateResponse>;
-    clientIvcProve(command: ClientIvcProve): Promise<import("../cbind/generated/api_types.js").ClientIvcProveResponse>;
-    clientIvcVerify(command: ClientIvcVerify): Promise<import("../cbind/generated/api_types.js").ClientIvcVerifyResponse>;
-    clientIvcComputeIvcVk(command: ClientIvcComputeIvcVk): Promise<import("../cbind/generated/api_types.js").ClientIvcComputeIvcVkResponse>;
-    clientIvcStats(command: ClientIvcStats): Promise<import("../cbind/generated/api_types.js").ClientIvcStatsResponse>;
-    circuitProve(command: CircuitProve): Promise<import("../cbind/generated/api_types.js").CircuitProveResponse>;
-    circuitComputeVk(command: CircuitComputeVk): Promise<import("../cbind/generated/api_types.js").CircuitComputeVkResponse>;
-    circuitVerify(command: CircuitVerify): Promise<import("../cbind/generated/api_types.js").CircuitVerifyResponse>;
-    vkAsFields(command: VkAsFields): Promise<import("../cbind/generated/api_types.js").VkAsFieldsResponse>;
+    /**
+     * Initialize the singleton instance of Barretenberg.
+     * @param options Backend configuration options
+     */
+    static initSingleton(options?: BackendOptions): Promise<Barretenberg>;
+    static destroySingleton(): Promise<void>;
+    /**
+     * Get the singleton instance of Barretenberg.
+     * Must call initSingleton() first.
+     */
+    static getSingleton(): Barretenberg;
 }
-export declare class BarretenbergSync extends BarretenbergApiSync {
-    private constructor();
-    private static new;
-    static initSingleton(wasmPath?: string, logger?: (msg: string) => void): Promise<BarretenbergSync>;
+export declare class BarretenbergSync extends SyncApi {
+    constructor(backend: IMsgpackBackendSync);
+    /**
+     * Create a new BarretenbergSync instance.
+     *
+     * If options.backend is set: uses that specific backend (throws if unavailable)
+     * If options.backend is unset: tries backends in order with fallback:
+     *   1. NativeSharedMem (if bb binary + NAPI module available)
+     *   2. Wasm
+     *
+     * Supported backends: Wasm, NativeSharedMem
+     * Not supported: WasmWorker (no workers in sync), NativeUnixSocket (async only)
+     */
+    static new(options?: BackendOptions): Promise<BarretenbergSync>;
+    /**
+     * Initialize the singleton instance.
+     * @param options Backend configuration options
+     */
+    static initSingleton(options?: BackendOptions): Promise<BarretenbergSync>;
+    static destroySingleton(): void;
     static getSingleton(): BarretenbergSync;
-    getWasm(): BarretenbergWasmMain;
 }
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9iYXJyZXRlbmJlcmcvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ3ZELE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQztBQUNyRCxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUN4RixPQUFPLEVBQUUsY0FBYyxFQUFlLE1BQU0seUJBQXlCLENBQUM7QUFHdEUsT0FBTyxFQUNMLGdCQUFnQixFQUNoQix3QkFBd0IsRUFDeEIsa0JBQWtCLEVBQ2xCLEtBQUssdUJBQXVCLEVBQzVCLEtBQUssY0FBYyxHQUNwQixNQUFNLGNBQWMsQ0FBQztBQUN0QixjQUFjLHlCQUF5QixDQUFDO0FBRXhDLE1BQU0sTUFBTSxjQUFjLEdBQUc7SUFDM0IsNERBQTREO0lBQzVELFNBQVMsRUFBRSxPQUFPLENBQUM7Q0FDcEIsQ0FBQztBQUVGOzs7R0FHRztBQUNILHFCQUFhLFlBQWEsU0FBUSxRQUFRO0lBQ3hDLE9BQU8sQ0FBQyxPQUFPLENBQWlCO0lBRWhDLFlBQVksT0FBTyxFQUFFLG9CQUFvQixFQUFFLE9BQU8sRUFBRSxjQUFjLEVBR2pFO0lBRUQ7Ozs7Ozs7T0FPRztJQUNILE9BQWEsR0FBRyxDQUFDLE9BQU8sR0FBRSxjQUFtQix5QkEyQjVDO0lBRUssWUFBWSxDQUFDLE9BQU8sU0FBMkIsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBU3BFO0lBRUQsaUJBQWlCLElBQUksTUFBTSxDQU8xQjtJQUVLLG1CQUFtQixDQUN2QixRQUFRLEVBQUUsVUFBVSxFQUNwQixTQUFTLEVBQUUsT0FBTyxFQUNsQixhQUFhLEVBQUUsT0FBTyxHQUNyQixPQUFPLENBQUMsQ0FBQyxNQUFNLEVBQUUsTUFBTSxDQUFDLENBQUMsQ0FZM0I7SUFFSyxPQUFPLGtCQUVaO0lBRUQ7OztPQUdHO0lBQ0gsT0FBYSxhQUFhLENBQUMsT0FBTyxHQUFFLGNBQW1CLHlCQWF0RDtJQUVELE9BQWEsZ0JBQWdCLGtCQU01QjtJQUVEOzs7T0FHRztJQUNILE1BQU0sQ0FBQyxZQUFZLGlCQUtsQjtDQUNGO0FBUUQscUJBQWEsZ0JBQWlCLFNBQVEsT0FBTztJQUMzQyxZQUFZLE9BQU8sRUFBRSxtQkFBbUIsRUFFdkM7SUFFRDs7Ozs7Ozs7OztPQVVHO0lBQ0gsT0FBYSxHQUFHLENBQUMsT0FBTyxHQUFFLGNBQW1CLDZCQWU1QztJQUVEOzs7T0FHRztJQUNILE9BQWEsYUFBYSxDQUFDLE9BQU8sR0FBRSxjQUFtQiw2QkFPdEQ7SUFFRCxNQUFNLENBQUMsZ0JBQWdCLFNBTXRCO0lBRUQsTUFBTSxDQUFDLFlBQVkscUJBS2xCO0NBQ0YifQ==

package/dest/browser/barretenberg/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/barretenberg/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAEpF,OAAO,EAAE,oBAAoB,EAAE,0BAA0B,EAAE,MAAM,sDAAsD,CAAC;AAOxH,OAAO,EAAa,gBAAgB,EAAE,YAAY,EAAE,aAAa,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,cAAc,EAAE,aAAa,EAAE,cAAc,EAAE,cAAc,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAEnP,OAAO,EAAE,gBAAgB,EAAE,wBAAwB,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAE9F,MAAM,MAAM,cAAc,GAAG;IAC3B,kEAAkE;IAClE,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,kFAAkF;IAClF,MAAM,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAEhD,8CAA8C;IAC9C,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,+CAA+C;IAC/C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,oCAAoC;IACpC,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,4DAA4D;IAC5D,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF;;;GAGG;AACH,qBAAa,YAAa,SAAQ,eAAe;IAK7C,OAAO,CAAC,MAAM;IAJhB,OAAO,CAAC,OAAO,CAAiB;IAChC,OAAO,CAAC,KAAK,CAAY;IAEzB,OAAO;IAUP;;;;;OAKG;WACU,GAAG,CAAC,OAAO,GAAE,cAAmB;IAcvC,aAAa;IAIb,qBAAqB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQzD,gBAAgB,CAAC,OAAO,SAA2B,GAAG,OAAO,CAAC,IAAI,CAAC;IAWzE,iBAAiB,IAAI,MAAM;IASrB,WAAW,CAAC,QAAQ,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE,aAAa,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAM5F,OAAO;IAKb,OAAO;IAKD,cAAc,CAAC,OAAO,EAAE,cAAc;IAItC,aAAa,CAAC,OAAO,EAAE,aAAa;IAIpC,mBAAmB,CAAC,OAAO,EAAE,mBAAmB;IAIhD,cAAc,CAAC,OAAO,EAAE,cAAc;IAItC,eAAe,CAAC,OAAO,EAAE,eAAe;IAIxC,qBAAqB,CAAC,OAAO,EAAE,qBAAqB;IAIpD,cAAc,CAAC,OAAO,EAAE,cAAc;IAKtC,YAAY,CAAC,OAAO,EAAE,YAAY;IAIlC,gBAAgB,CAAC,OAAO,EAAE,gBAAgB;IAI1C,aAAa,CAAC,OAAO,EAAE,aAAa;IAIpC,UAAU,CAAC,OAAO,EAAE,UAAU;CAIrC;AAKD,qBAAa,gBAAiB,SAAQ,mBAAmB;IACvD,OAAO;mBAIc,GAAG;WAOX,aAAa,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,MAAM,GAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAwC;IAS/G,MAAM,CAAC,YAAY;IAOnB,OAAO;CAGR"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/barretenberg/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAC;AACrD,OAAO,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACxF,OAAO,EAAE,cAAc,EAAe,MAAM,yBAAyB,CAAC;AAGtE,OAAO,EACL,gBAAgB,EAChB,wBAAwB,EACxB,kBAAkB,EAClB,KAAK,uBAAuB,EAC5B,KAAK,cAAc,GACpB,MAAM,cAAc,CAAC;AACtB,cAAc,yBAAyB,CAAC;AAExC,MAAM,MAAM,cAAc,GAAG;IAC3B,4DAA4D;IAC5D,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF;;;GAGG;AACH,qBAAa,YAAa,SAAQ,QAAQ;IACxC,OAAO,CAAC,OAAO,CAAiB;IAEhC,YAAY,OAAO,EAAE,oBAAoB,EAAE,OAAO,EAAE,cAAc,EAGjE;IAED;;;;;;;OAOG;IACH,OAAa,GAAG,CAAC,OAAO,GAAE,cAAmB,yBA2B5C;IAEK,YAAY,CAAC,OAAO,SAA2B,GAAG,OAAO,CAAC,IAAI,CAAC,CASpE;IAED,iBAAiB,IAAI,MAAM,CAO1B;IAEK,mBAAmB,CACvB,QAAQ,EAAE,UAAU,EACpB,SAAS,EAAE,OAAO,EAClB,aAAa,EAAE,OAAO,GACrB,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAY3B;IAEK,OAAO,kBAEZ;IAED;;;OAGG;IACH,OAAa,aAAa,CAAC,OAAO,GAAE,cAAmB,yBAatD;IAED,OAAa,gBAAgB,kBAM5B;IAED;;;OAGG;IACH,MAAM,CAAC,YAAY,iBAKlB;CACF;AAQD,qBAAa,gBAAiB,SAAQ,OAAO;IAC3C,YAAY,OAAO,EAAE,mBAAmB,EAEvC;IAED;;;;;;;;;;OAUG;IACH,OAAa,GAAG,CAAC,OAAO,GAAE,cAAmB,6BAe5C;IAED;;;OAGG;IACH,OAAa,aAAa,CAAC,OAAO,GAAE,cAAmB,6BAOtD;IAED,MAAM,CAAC,gBAAgB,SAMtB;IAED,MAAM,CAAC,YAAY,qBAKlB;CACF"}