@aztec/bb.js 0.76.4 → 0.77.0-testnet-ignition.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +10 -2
- package/dest/browser/barretenberg/backend.d.ts +5 -1
- package/dest/browser/barretenberg/backend.d.ts.map +1 -1
- package/dest/browser/barretenberg/index.d.ts +3 -1
- package/dest/browser/barretenberg/index.d.ts.map +1 -1
- package/dest/browser/barretenberg-threads.js +1 -1
- package/dest/browser/barretenberg.js +1 -1
- package/dest/browser/barretenberg_api/index.d.ts +1 -0
- package/dest/browser/barretenberg_api/index.d.ts.map +1 -1
- package/dest/browser/barretenberg_wasm/barretenberg_wasm_base/index.d.ts.map +1 -1
- package/dest/browser/barretenberg_wasm/barretenberg_wasm_main/index.d.ts.map +1 -1
- package/dest/browser/barretenberg_wasm/fetch_code/browser/index.d.ts.map +1 -1
- package/dest/browser/barretenberg_wasm/index.d.ts +2 -2
- package/dest/browser/barretenberg_wasm/index.d.ts.map +1 -1
- package/dest/browser/crs/net_crs.d.ts.map +1 -1
- package/dest/browser/crs/node/index.d.ts +6 -4
- package/dest/browser/crs/node/index.d.ts.map +1 -1
- package/dest/browser/index.js +98 -38
- package/dest/browser/retry/index.d.ts +26 -0
- package/dest/browser/retry/index.d.ts.map +1 -0
- package/dest/node/barretenberg/__snapshots__/pedersen.test.js.snap +156 -0
- package/dest/node/barretenberg/__snapshots__/poseidon.test.js.snap +40 -0
- package/dest/node/barretenberg/backend.d.ts +5 -1
- package/dest/node/barretenberg/backend.d.ts.map +1 -1
- package/dest/node/barretenberg/backend.js +21 -4
- package/dest/node/barretenberg/index.d.ts +3 -1
- package/dest/node/barretenberg/index.d.ts.map +1 -1
- package/dest/node/barretenberg/index.js +11 -12
- package/dest/node/barretenberg_api/index.d.ts +1 -0
- package/dest/node/barretenberg_api/index.d.ts.map +1 -1
- package/dest/node/barretenberg_api/index.js +25 -1
- package/dest/node/barretenberg_wasm/barretenberg-threads.wasm.gz +0 -0
- package/dest/node/barretenberg_wasm/barretenberg_wasm_base/index.d.ts.map +1 -1
- package/dest/node/barretenberg_wasm/barretenberg_wasm_base/index.js +5 -6
- package/dest/node/barretenberg_wasm/barretenberg_wasm_main/index.d.ts.map +1 -1
- package/dest/node/barretenberg_wasm/barretenberg_wasm_main/index.js +6 -7
- package/dest/node/barretenberg_wasm/fetch_code/browser/index.d.ts.map +1 -1
- package/dest/node/barretenberg_wasm/fetch_code/browser/index.js +5 -2
- package/dest/node/barretenberg_wasm/fetch_code/node/index.js +2 -2
- package/dest/node/barretenberg_wasm/index.d.ts +2 -2
- package/dest/node/barretenberg_wasm/index.d.ts.map +1 -1
- package/dest/node/barretenberg_wasm/index.js +11 -9
- package/dest/node/barretenberg_wasm/index.test.js +3 -3
- package/dest/node/crs/net_crs.d.ts.map +1 -1
- package/dest/node/crs/net_crs.js +6 -5
- package/dest/node/crs/node/index.d.ts +6 -4
- package/dest/node/crs/node/index.d.ts.map +1 -1
- package/dest/node/crs/node/index.js +16 -13
- package/dest/node/examples/simple.test.js +2 -2
- package/dest/node/main.d.ts.map +1 -1
- package/dest/node/main.js +55 -65
- package/dest/node/retry/index.d.ts +26 -0
- package/dest/node/retry/index.d.ts.map +1 -0
- package/dest/node/retry/index.js +50 -0
- package/dest/node-cjs/barretenberg/backend.d.ts +5 -1
- package/dest/node-cjs/barretenberg/backend.d.ts.map +1 -1
- package/dest/node-cjs/barretenberg/backend.js +23 -5
- package/dest/node-cjs/barretenberg/index.d.ts +3 -1
- package/dest/node-cjs/barretenberg/index.d.ts.map +1 -1
- package/dest/node-cjs/barretenberg/index.js +11 -12
- package/dest/node-cjs/barretenberg_api/index.d.ts +1 -0
- package/dest/node-cjs/barretenberg_api/index.d.ts.map +1 -1
- package/dest/node-cjs/barretenberg_api/index.js +25 -1
- package/dest/node-cjs/barretenberg_wasm/barretenberg-threads.wasm.gz +0 -0
- package/dest/node-cjs/barretenberg_wasm/barretenberg_wasm_base/index.d.ts.map +1 -1
- package/dest/node-cjs/barretenberg_wasm/barretenberg_wasm_base/index.js +5 -6
- package/dest/node-cjs/barretenberg_wasm/barretenberg_wasm_main/index.d.ts.map +1 -1
- package/dest/node-cjs/barretenberg_wasm/barretenberg_wasm_main/index.js +6 -7
- package/dest/node-cjs/barretenberg_wasm/fetch_code/browser/index.d.ts.map +1 -1
- package/dest/node-cjs/barretenberg_wasm/fetch_code/browser/index.js +5 -2
- package/dest/node-cjs/barretenberg_wasm/fetch_code/node/index.js +2 -2
- package/dest/node-cjs/barretenberg_wasm/index.d.ts +2 -2
- package/dest/node-cjs/barretenberg_wasm/index.d.ts.map +1 -1
- package/dest/node-cjs/barretenberg_wasm/index.js +11 -9
- package/dest/node-cjs/barretenberg_wasm/index.test.js +3 -3
- package/dest/node-cjs/crs/net_crs.d.ts.map +1 -1
- package/dest/node-cjs/crs/net_crs.js +6 -5
- package/dest/node-cjs/crs/node/index.d.ts +6 -4
- package/dest/node-cjs/crs/node/index.d.ts.map +1 -1
- package/dest/node-cjs/crs/node/index.js +16 -13
- package/dest/node-cjs/examples/simple.test.js +2 -2
- package/dest/node-cjs/main.d.ts.map +1 -1
- package/dest/node-cjs/main.js +55 -65
- package/dest/node-cjs/retry/index.d.ts +26 -0
- package/dest/node-cjs/retry/index.d.ts.map +1 -0
- package/dest/node-cjs/retry/index.js +56 -0
- package/package.json +3 -3
- package/src/barretenberg/backend.ts +22 -3
- package/src/barretenberg/index.ts +19 -12
- package/src/barretenberg_api/index.ts +35 -0
- package/src/barretenberg_wasm/barretenberg_wasm_base/index.ts +4 -6
- package/src/barretenberg_wasm/barretenberg_wasm_main/index.ts +5 -7
- package/src/barretenberg_wasm/fetch_code/browser/index.ts +4 -1
- package/src/barretenberg_wasm/fetch_code/node/index.ts +1 -1
- package/src/barretenberg_wasm/index.test.ts +2 -2
- package/src/barretenberg_wasm/index.ts +21 -10
- package/src/crs/net_crs.ts +18 -9
- package/src/crs/node/index.ts +31 -15
- package/src/examples/simple.test.ts +1 -1
- package/src/main.ts +59 -70
- package/src/retry/index.ts +50 -0
|
@@ -1,5 +1,8 @@
|
|
|
1
1
|
import { BackendOptions, Barretenberg, CircuitOptions } from './index.js';
|
|
2
2
|
import { ProofData, ProofDataForRecursion } from '../proof/index.js';
|
|
3
|
+
export declare class AztecClientBackendError extends Error {
|
|
4
|
+
constructor(message: string);
|
|
5
|
+
}
|
|
3
6
|
export declare class UltraPlonkBackend {
|
|
4
7
|
protected backendOptions: BackendOptions;
|
|
5
8
|
protected circuitOptions: CircuitOptions;
|
|
@@ -61,7 +64,7 @@ export declare class UltraHonkBackend {
|
|
|
61
64
|
generateProof(compressedWitness: Uint8Array, options?: UltraHonkBackendOptions): Promise<ProofData>;
|
|
62
65
|
generateProofForRecursiveAggregation(compressedWitness: Uint8Array, options?: UltraHonkBackendOptions): Promise<ProofDataForRecursion>;
|
|
63
66
|
verifyProof(proofData: ProofData, options?: UltraHonkBackendOptions): Promise<boolean>;
|
|
64
|
-
getVerificationKey(): Promise<Uint8Array>;
|
|
67
|
+
getVerificationKey(options?: UltraHonkBackendOptions): Promise<Uint8Array>;
|
|
65
68
|
/** @description Returns a solidity verifier */
|
|
66
69
|
getSolidityVerifier(vk?: Uint8Array): Promise<string>;
|
|
67
70
|
generateRecursiveProofArtifacts(_proof: Uint8Array, _numOfPublicInputs: number): Promise<{
|
|
@@ -81,6 +84,7 @@ export declare class AztecClientBackend {
|
|
|
81
84
|
prove(witnessMsgpack: Uint8Array[]): Promise<[Uint8Array, Uint8Array]>;
|
|
82
85
|
verify(proof: Uint8Array, vk: Uint8Array): Promise<boolean>;
|
|
83
86
|
proveAndVerify(witnessMsgpack: Uint8Array[]): Promise<boolean>;
|
|
87
|
+
gates(): Promise<number[]>;
|
|
84
88
|
destroy(): Promise<void>;
|
|
85
89
|
}
|
|
86
90
|
//# sourceMappingURL=backend.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"backend.d.ts","sourceRoot":"","sources":["../../../src/barretenberg/backend.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAG1E,OAAO,EAGL,SAAS,EACT,qBAAqB,EAGtB,MAAM,mBAAmB,CAAC;AAE3B,qBAAa,iBAAiB;IAc1B,SAAS,CAAC,cAAc,EAAE,cAAc;IACxC,SAAS,CAAC,cAAc,EAAE,cAAc;IAT1C,SAAS,CAAC,GAAG,EAAG,YAAY,CAAC;IAE7B,SAAS,CAAC,YAAY,EAAE,GAAG,CAAC;IAE5B,SAAS,CAAC,wBAAwB,EAAE,UAAU,CAAC;gBAG7C,YAAY,EAAE,MAAM,EACV,cAAc,GAAE,cAA+B,EAC/C,cAAc,GAAE,cAAqC;IAKjE,cAAc;IACR,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAmBlC,qCAAqC;IAC/B,aAAa,CAAC,iBAAiB,EAAE,UAAU,GAAG,OAAO,CAAC,SAAS,CAAC;IAsBtE;;;;;;;;;;;;;;;OAeG;IACG,+BAA+B,CACnC,SAAS,EAAE,SAAS,EACpB,iBAAiB,SAAI,GACpB,OAAO,CAAC;QACT,aAAa,EAAE,MAAM,EAAE,CAAC;QACxB,UAAU,EAAE,MAAM,EAAE,CAAC;QACrB,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;IAsBF,oCAAoC;IAC9B,WAAW,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC;IAOzD,gDAAgD;IAC1C,kBAAkB,IAAI,OAAO,CAAC,UAAU,CAAC;IAM/C,+CAA+C;IACzC,mBAAmB,IAAI,OAAO,CAAC,MAAM,CAAC;IAMtC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAM/B;AAQD;;GAEG;AACH,MAAM,MAAM,uBAAuB,GAAG;IACpC;;;OAGG;IACH,MAAM,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,qBAAa,gBAAgB;IAWzB,SAAS,CAAC,cAAc,EAAE,cAAc;IACxC,SAAS,CAAC,cAAc,EAAE,cAAc;IAN1C,SAAS,CAAC,GAAG,EAAG,YAAY,CAAC;IAC7B,SAAS,CAAC,wBAAwB,EAAE,UAAU,CAAC;gBAG7C,YAAY,EAAE,MAAM,EACV,cAAc,GAAE,cAA+B,EAC/C,cAAc,GAAE,cAAqC;IAIjE,cAAc;IACR,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAY5B,aAAa,CAAC,iBAAiB,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE,uBAAuB,GAAG,OAAO,CAAC,SAAS,CAAC;IAqCnG,oCAAoC,CACxC,iBAAiB,EAAE,UAAU,EAC7B,OAAO,CAAC,EAAE,uBAAuB,GAChC,OAAO,CAAC,qBAAqB,CAAC;IAoD3B,WAAW,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,uBAAuB,GAAG,OAAO,CAAC,OAAO,CAAC;IAgBtF,kBAAkB,
|
|
1
|
+
{"version":3,"file":"backend.d.ts","sourceRoot":"","sources":["../../../src/barretenberg/backend.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.AztecClientBackend = exports.UltraHonkBackend = exports.UltraPlonkBackend = void 0;
|
|
3
|
+
exports.AztecClientBackend = exports.UltraHonkBackend = exports.UltraPlonkBackend = exports.AztecClientBackendError = void 0;
|
|
4
4
|
const index_js_1 = require("./index.js");
|
|
5
5
|
const raw_buffer_js_1 = require("../types/raw_buffer.js");
|
|
6
6
|
const fflate_1 = require("fflate");
|
|
7
7
|
const index_js_2 = require("../proof/index.js");
|
|
8
|
+
class AztecClientBackendError extends Error {
|
|
9
|
+
constructor(message) {
|
|
10
|
+
super(message);
|
|
11
|
+
}
|
|
12
|
+
}
|
|
13
|
+
exports.AztecClientBackendError = AztecClientBackendError;
|
|
8
14
|
class UltraPlonkBackend {
|
|
9
15
|
constructor(acirBytecode, backendOptions = { threads: 1 }, circuitOptions = { recursive: false }) {
|
|
10
16
|
this.backendOptions = backendOptions;
|
|
@@ -183,9 +189,11 @@ class UltraHonkBackend {
|
|
|
183
189
|
const vkBuf = await writeVkUltraHonk(this.acirUncompressedBytecode, this.circuitOptions.recursive);
|
|
184
190
|
return await verifyUltraHonk(proof, new raw_buffer_js_1.RawBuffer(vkBuf));
|
|
185
191
|
}
|
|
186
|
-
async getVerificationKey() {
|
|
192
|
+
async getVerificationKey(options) {
|
|
187
193
|
await this.instantiate();
|
|
188
|
-
return
|
|
194
|
+
return options?.keccak
|
|
195
|
+
? await this.api.acirWriteVkUltraKeccakHonk(this.acirUncompressedBytecode, this.circuitOptions.recursive)
|
|
196
|
+
: await this.api.acirWriteVkUltraHonk(this.acirUncompressedBytecode, this.circuitOptions.recursive);
|
|
189
197
|
}
|
|
190
198
|
/** @description Returns a solidity verifier */
|
|
191
199
|
async getSolidityVerifier(vk) {
|
|
@@ -244,7 +252,12 @@ class AztecClientBackend {
|
|
|
244
252
|
}
|
|
245
253
|
async prove(witnessMsgpack) {
|
|
246
254
|
await this.instantiate();
|
|
247
|
-
|
|
255
|
+
const proofAndVk = await this.api.acirProveAztecClient(this.acirMsgpack, witnessMsgpack);
|
|
256
|
+
const [proof, vk] = proofAndVk;
|
|
257
|
+
if (!await this.verify(proof, vk)) {
|
|
258
|
+
throw new AztecClientBackendError("Failed to verify the private (ClientIVC) transaction proof!");
|
|
259
|
+
}
|
|
260
|
+
return proofAndVk;
|
|
248
261
|
}
|
|
249
262
|
async verify(proof, vk) {
|
|
250
263
|
await this.instantiate();
|
|
@@ -254,6 +267,11 @@ class AztecClientBackend {
|
|
|
254
267
|
await this.instantiate();
|
|
255
268
|
return this.api.acirProveAndVerifyAztecClient(this.acirMsgpack, witnessMsgpack);
|
|
256
269
|
}
|
|
270
|
+
async gates() {
|
|
271
|
+
// call function on API
|
|
272
|
+
await this.instantiate();
|
|
273
|
+
return this.api.acirGatesAztecClient(this.acirMsgpack);
|
|
274
|
+
}
|
|
257
275
|
async destroy() {
|
|
258
276
|
if (!this.api) {
|
|
259
277
|
return;
|
|
@@ -283,4 +301,4 @@ function base64Decode(input) {
|
|
|
283
301
|
throw new Error('No implementation found for base64 decoding.');
|
|
284
302
|
}
|
|
285
303
|
}
|
|
286
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"backend.js","sourceRoot":"","sources":["../../../src/barretenberg/backend.ts"],"names":[],"mappings":"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"}
|
|
304
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"backend.js","sourceRoot":"","sources":["../../../src/barretenberg/backend.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,6 +13,8 @@ export type BackendOptions = {
|
|
|
13
13
|
crsPath?: string;
|
|
14
14
|
/** @description Path to download WASM files */
|
|
15
15
|
wasmPath?: string;
|
|
16
|
+
/** @description Logging function */
|
|
17
|
+
logger?: (msg: string) => void;
|
|
16
18
|
};
|
|
17
19
|
export type CircuitOptions = {
|
|
18
20
|
/** @description Whether to produce SNARK friendly proofs */
|
|
@@ -42,7 +44,7 @@ export declare class Barretenberg extends BarretenbergApi {
|
|
|
42
44
|
export declare class BarretenbergSync extends BarretenbergApiSync {
|
|
43
45
|
private constructor();
|
|
44
46
|
private static new;
|
|
45
|
-
static initSingleton(wasmPath?: string): Promise<BarretenbergSync>;
|
|
47
|
+
static initSingleton(wasmPath?: string, logger?: (msg: string) => void): Promise<BarretenbergSync>;
|
|
46
48
|
static getSingleton(): BarretenbergSync;
|
|
47
49
|
getWasm(): import("../barretenberg_wasm/index.js").BarretenbergWasm;
|
|
48
50
|
}
|
|
@@ -1 +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;AASpF,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;
|
|
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;AASpF,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAEvF,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;IAG3B,OAAO,CAAC,MAAM;IAFlC,OAAO,CAAC,OAAO,CAAiB;IAEhC,OAAO;IAKP;;;;;OAKG;WACU,GAAG,CAAC,OAAO,GAAE,cAAmB;IAcvC,aAAa;IAIb,qBAAqB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAOzD,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAWjC,WAAW,CAAC,QAAQ,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE,aAAa,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAM5F,OAAO;CAId;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"}
|
|
@@ -17,7 +17,6 @@ var backend_js_1 = require("./backend.js");
|
|
|
17
17
|
Object.defineProperty(exports, "UltraPlonkBackend", { enumerable: true, get: function () { return backend_js_1.UltraPlonkBackend; } });
|
|
18
18
|
Object.defineProperty(exports, "UltraHonkBackend", { enumerable: true, get: function () { return backend_js_1.UltraHonkBackend; } });
|
|
19
19
|
Object.defineProperty(exports, "AztecClientBackend", { enumerable: true, get: function () { return backend_js_1.AztecClientBackend; } });
|
|
20
|
-
const debug = (0, debug_1.default)('bb.js:wasm');
|
|
21
20
|
/**
|
|
22
21
|
* The main class library consumers interact with.
|
|
23
22
|
* It extends the generated api, and provides a static constructor "new" to compose components.
|
|
@@ -37,23 +36,23 @@ class Barretenberg extends index_js_1.BarretenbergApi {
|
|
|
37
36
|
static async new(options = {}) {
|
|
38
37
|
const worker = (0, index_js_2.createMainWorker)();
|
|
39
38
|
const wasm = (0, index_js_4.getRemoteBarretenbergWasm)(worker);
|
|
40
|
-
const { module, threads } = await (0, index_js_5.fetchModuleAndThreads)(options.threads, options.wasmPath);
|
|
41
|
-
await wasm.init(module, threads, (0, comlink_1.proxy)(
|
|
39
|
+
const { module, threads } = await (0, index_js_5.fetchModuleAndThreads)(options.threads, options.wasmPath, options.logger);
|
|
40
|
+
await wasm.init(module, threads, (0, comlink_1.proxy)(options.logger ?? (0, debug_1.default)('bb.js:bb_wasm_async')), options.memory?.initial, options.memory?.maximum);
|
|
42
41
|
return new Barretenberg(worker, wasm, options);
|
|
43
42
|
}
|
|
44
43
|
async getNumThreads() {
|
|
45
44
|
return await this.wasm.getNumThreads();
|
|
46
45
|
}
|
|
47
46
|
async initSRSForCircuitSize(circuitSize) {
|
|
48
|
-
const crs = await index_js_6.Crs.new(circuitSize + 1, this.options.crsPath);
|
|
47
|
+
const crs = await index_js_6.Crs.new(circuitSize + 1, this.options.crsPath, this.options.logger);
|
|
49
48
|
// TODO(https://github.com/AztecProtocol/barretenberg/issues/1129): Do slab allocator initialization?
|
|
50
49
|
// await this.commonInitSlabAllocator(circuitSize);
|
|
51
50
|
await this.srsInitSrs(new raw_buffer_js_1.RawBuffer(crs.getG1Data()), crs.numPoints, new raw_buffer_js_1.RawBuffer(crs.getG2Data()));
|
|
52
51
|
}
|
|
53
52
|
async initSRSClientIVC() {
|
|
54
53
|
// crsPath can be undefined
|
|
55
|
-
const crs = await index_js_6.Crs.new(2 ** 20 + 1, this.options.crsPath);
|
|
56
|
-
const grumpkinCrs = await index_js_6.GrumpkinCrs.new(2 ** 16 + 1, this.options.crsPath);
|
|
54
|
+
const crs = await index_js_6.Crs.new(2 ** 20 + 1, this.options.crsPath, this.options.logger);
|
|
55
|
+
const grumpkinCrs = await index_js_6.GrumpkinCrs.new(2 ** 16 + 1, this.options.crsPath, this.options.logger);
|
|
57
56
|
// Load CRS into wasm global CRS state.
|
|
58
57
|
// TODO: Make RawBuffer be default behavior, and have a specific Vector type for when wanting length prefixed.
|
|
59
58
|
await this.srsInitSrs(new raw_buffer_js_1.RawBuffer(crs.getG1Data()), crs.numPoints, new raw_buffer_js_1.RawBuffer(crs.getG2Data()));
|
|
@@ -76,15 +75,15 @@ class BarretenbergSync extends index_js_1.BarretenbergApiSync {
|
|
|
76
75
|
constructor(wasm) {
|
|
77
76
|
super(wasm);
|
|
78
77
|
}
|
|
79
|
-
static async new(wasmPath) {
|
|
78
|
+
static async new(wasmPath, logger = (0, debug_1.default)('bb.js:bb_wasm_sync')) {
|
|
80
79
|
const wasm = new index_js_3.BarretenbergWasmMain();
|
|
81
|
-
const { module, threads } = await (0, index_js_5.fetchModuleAndThreads)(1, wasmPath);
|
|
82
|
-
await wasm.init(module, threads);
|
|
80
|
+
const { module, threads } = await (0, index_js_5.fetchModuleAndThreads)(1, wasmPath, logger);
|
|
81
|
+
await wasm.init(module, threads, logger);
|
|
83
82
|
return new BarretenbergSync(wasm);
|
|
84
83
|
}
|
|
85
|
-
static async initSingleton(wasmPath) {
|
|
84
|
+
static async initSingleton(wasmPath, logger = (0, debug_1.default)('bb.js:bb_wasm_sync')) {
|
|
86
85
|
if (!barrentenbergSyncSingletonPromise) {
|
|
87
|
-
barrentenbergSyncSingletonPromise = BarretenbergSync.new(wasmPath);
|
|
86
|
+
barrentenbergSyncSingletonPromise = BarretenbergSync.new(wasmPath, logger);
|
|
88
87
|
}
|
|
89
88
|
barretenbergSyncSingleton = await barrentenbergSyncSingletonPromise;
|
|
90
89
|
return barretenbergSyncSingleton;
|
|
@@ -100,4 +99,4 @@ class BarretenbergSync extends index_js_1.BarretenbergApiSync {
|
|
|
100
99
|
}
|
|
101
100
|
}
|
|
102
101
|
exports.BarretenbergSync = BarretenbergSync;
|
|
103
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
102
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvYmFycmV0ZW5iZXJnL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7QUFBQSxxQ0FBZ0M7QUFDaEMsMkRBQW9GO0FBQ3BGLGdHQUFxRztBQUNyRyxtRkFBd0g7QUFDeEgsb0VBQWtGO0FBQ2xGLDREQUE4RjtBQUM5RiwwREFBZ0M7QUFDaEMsOENBQW1EO0FBQ25ELDBEQUFtRDtBQUVuRCw2Q0FBcUQ7QUFBNUMsbUhBQUEsb0JBQW9CLE9BQUE7QUFDN0IsMkNBQXVGO0FBQTlFLCtHQUFBLGlCQUFpQixPQUFBO0FBQUUsOEdBQUEsZ0JBQWdCLE9BQUE7QUFBRSxnSEFBQSxrQkFBa0IsT0FBQTtBQXdCaEU7OztHQUdHO0FBQ0gsTUFBYSxZQUFhLFNBQVEsMEJBQWU7SUFHL0MsWUFBNEIsTUFBVyxFQUFFLElBQTRCLEVBQUUsT0FBdUI7UUFDNUYsS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDO1FBRGMsV0FBTSxHQUFOLE1BQU0sQ0FBSztRQUVyQyxJQUFJLENBQUMsT0FBTyxHQUFHLE9BQU8sQ0FBQztJQUN6QixDQUFDO0lBRUQ7Ozs7O09BS0c7SUFDSCxNQUFNLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxVQUEwQixFQUFFO1FBQzNDLE1BQU0sTUFBTSxHQUFHLElBQUEsMkJBQWdCLEdBQUUsQ0FBQztRQUNsQyxNQUFNLElBQUksR0FBRyxJQUFBLG9DQUF5QixFQUE2QixNQUFNLENBQUMsQ0FBQztRQUMzRSxNQUFNLEVBQUUsTUFBTSxFQUFFLE9BQU8sRUFBRSxHQUFHLE1BQU0sSUFBQSxnQ0FBcUIsRUFBQyxPQUFPLENBQUMsT0FBTyxFQUFFLE9BQU8sQ0FBQyxRQUFRLEVBQUUsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQzNHLE1BQU0sSUFBSSxDQUFDLElBQUksQ0FDYixNQUFNLEVBQ04sT0FBTyxFQUNQLElBQUEsZUFBSyxFQUFDLE9BQU8sQ0FB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
|
|
@@ -31,6 +31,7 @@ export declare class BarretenbergApi {
|
|
|
31
31
|
testThreads(threads: number, iterations: number): Promise<number>;
|
|
32
32
|
commonInitSlabAllocator(circuitSize: number): Promise<void>;
|
|
33
33
|
acirGetCircuitSizes(constraintSystemBuf: Uint8Array, recursive: boolean, honkRecursion: boolean): Promise<[number, number]>;
|
|
34
|
+
acirGatesAztecClient(acirVec: Uint8Array[]): Promise<number[]>;
|
|
34
35
|
acirNewAcirComposer(sizeHint: number): Promise<Ptr>;
|
|
35
36
|
acirDeleteAcirComposer(acirComposerPtr: Ptr): Promise<void>;
|
|
36
37
|
acirInitProvingKey(acirComposerPtr: Ptr, constraintSystemBuf: Uint8Array, recursive: boolean): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/barretenberg_api/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAE,MAAM,sDAAsD,CAAC;AAC5F,OAAO,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAUzF,OAAO,EAAE,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/barretenberg_api/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAE,MAAM,sDAAsD,CAAC;AAC5F,OAAO,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAUzF,OAAO,EAAE,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAsB5E,qBAAa,eAAe;IACd,SAAS,CAAC,IAAI,EAAE,sBAAsB,GAAG,oBAAoB;gBAAnD,IAAI,EAAE,sBAAsB,GAAG,oBAAoB;IAEnE,cAAc,CAAC,YAAY,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;IAYpE,YAAY,CAAC,YAAY,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,CAAC;IAYhE,cAAc,CAAC,YAAY,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,CAAC;IAYlE,kBAAkB,CAAC,WAAW,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,CAAC;IAY3E,aAAa,CAAC,YAAY,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC;IAY9C,uBAAuB,CAAC,YAAY,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC;IAYxD,eAAe,CAAC,YAAY,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC;IAYhD,oBAAoB,CAAC,YAAY,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC;IAYvD,OAAO,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,QAAQ,CAAC;IAY5C,cAAc,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,EAAE,CAAC;IAY7C,uBAAuB,CAAC,UAAU,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC;IAYvD,sBAAsB,CAAC,eAAe,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IAY9D,yBAAyB,CAAC,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,EAAE,GAAG,OAAO,CAAC,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAY7F,sBAAsB,CAAC,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;IAY5G,sCAAsC,CAAC,UAAU,EAAE,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC;IAY1E,8CAA8C,CAAC,eAAe,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAYvG,uCAAuC,IAAI,OAAO,CAAC,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IAY1E,uCAAuC,CAC3C,OAAO,EAAE,UAAU,EACnB,UAAU,EAAE,EAAE,EACd,wBAAwB,EAAE,SAAS,EACnC,gBAAgB,EAAE,SAAS,EAAE,EAC7B,iBAAiB,EAAE,SAAS,EAAE,GAC7B,OAAO,CAAC,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;IAcnB,gCAAgC,CACpC,OAAO,EAAE,UAAU,EACnB,gBAAgB,EAAE,SAAS,EAAE,EAC7B,WAAW,EAAE,SAAS,EAAE,EACxB,WAAW,EAAE,EAAE,EAAE,GAChB,OAAO,CAAC,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;IAYnC,mBAAmB,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE,EAAE,UAAU,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAY5G,mBAAmB,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE,EAAE,UAAU,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAY5G,UAAU,CAAC,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAY3F,kBAAkB,CAAC,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAY3E,kCAAkC,IAAI,OAAO,CAAC,OAAO,CAAC;IAYtD,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAYjE,uBAAuB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAY3D,mBAAmB,CACvB,mBAAmB,EAAE,UAAU,EAC/B,SAAS,EAAE,OAAO,EAClB,aAAa,EAAE,OAAO,GACrB,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAYtB,oBAAoB,CAExB,OAAO,EAAE,UAAU,EAAE,GACpB,OAAO,CAAC,MAAM,EAAE,CAAC;IAYd,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAYnD,sBAAsB,CAAC,eAAe,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAY3D,kBAAkB,CAAC,eAAe,EAAE,GAAG,EAAE,mBAAmB,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAY5G,eAAe,CACnB,eAAe,EAAE,GAAG,EACpB,mBAAmB,EAAE,UAAU,EAC/B,SAAS,EAAE,OAAO,EAClB,UAAU,EAAE,UAAU,GACrB,OAAO,CAAC,UAAU,CAAC;IAYhB,2BAA2B,CAC/B,mBAAmB,EAAE,UAAU,EAC/B,SAAS,EAAE,OAAO,EAClB,UAAU,EAAE,UAAU,GACrB,OAAO,CAAC,OAAO,CAAC;IAYb,0BAA0B,CAC9B,mBAAmB,EAAE,UAAU,EAC/B,SAAS,EAAE,OAAO,EAClB,UAAU,EAAE,UAAU,GACrB,OAAO,CAAC,OAAO,CAAC;IAYb,6BAA6B,CACjC,mBAAmB,EAAE,UAAU,EAC/B,SAAS,EAAE,OAAO,EAClB,UAAU,EAAE,UAAU,GACrB,OAAO,CAAC,OAAO,CAAC;IAYb,uBAAuB,CAAC,eAAe,EAAE,GAAG,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAY/E,uBAAuB,CAAC,eAAe,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAY5D,sBAAsB,CAAC,eAAe,EAAE,GAAG,GAAG,OAAO,CAAC,UAAU,CAAC;IAYjE,iBAAiB,CAAC,eAAe,EAAE,GAAG,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC;IAYrG,eAAe,CAAC,eAAe,EAAE,GAAG,EAAE,QAAQ,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;IAY7E,uBAAuB,CAAC,eAAe,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC;IAY9D,4BAA4B,CAChC,eAAe,EAAE,GAAG,EACpB,QAAQ,EAAE,UAAU,EACpB,oBAAoB,EAAE,MAAM,GAC3B,OAAO,CAAC,EAAE,EAAE,CAAC;IAYV,sCAAsC,CAAC,eAAe,EAAE,GAAG,GAAG,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;IAYjF,6BAA6B,CAAC,OAAO,EAAE,UAAU,EAAE,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAYhG,oBAAoB,CAAC,OAAO,EAAE,UAAU,EAAE,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IAYxG,qBAAqB,CAAC,QAAQ,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;IAYhF,kBAAkB,CAAC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;IAYxG,wBAAwB,CAAC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;IAY9G,mBAAmB,CAAC,QAAQ,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;IAY9E,yBAAyB,CAAC,QAAQ,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;IAYpF,oBAAoB,CAAC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC;IAYlF,0BAA0B,CAAC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC;IAYxF,wBAAwB,CAAC,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC;IAYjF,0BAA0B,CAAC,QAAQ,EAAE,UAAU,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC;IAY/D,uBAAuB,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC;IAYzD,sBAAsB,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC;CAW/D;AACD,qBAAa,mBAAmB;IAClB,SAAS,CAAC,IAAI,EAAE,gBAAgB;gBAAtB,IAAI,EAAE,gBAAgB;IAE5C,cAAc,CAAC,YAAY,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,MAAM,GAAG,KAAK;IAY3D,YAAY,CAAC,YAAY,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,GAAG,EAAE;IAYvD,cAAc,CAAC,YAAY,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,GAAG,EAAE;IAYzD,kBAAkB,CAAC,WAAW,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,GAAG,EAAE;IAYlE,aAAa,CAAC,YAAY,EAAE,EAAE,EAAE,GAAG,EAAE;IAYrC,uBAAuB,CAAC,YAAY,EAAE,EAAE,EAAE,GAAG,EAAE;IAY/C,eAAe,CAAC,YAAY,EAAE,EAAE,EAAE,GAAG,EAAE;IAYvC,oBAAoB,CAAC,YAAY,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE;IAY9C,OAAO,CAAC,IAAI,EAAE,UAAU,GAAG,QAAQ;IAYnC,cAAc,CAAC,IAAI,EAAE,UAAU,GAAG,EAAE;IAYpC,uBAAuB,CAAC,UAAU,EAAE,EAAE,GAAG,KAAK;IAY9C,sBAAsB,CAAC,eAAe,EAAE,KAAK,GAAG,KAAK;IAYrD,yBAAyB,CAAC,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,EAAE,GAAG,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAYpF,sBAAsB,CAAC,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,GAAG,OAAO;IAYnG,sCAAsC,CAAC,UAAU,EAAE,EAAE,GAAG,SAAS;IAYjE,8CAA8C,CAAC,eAAe,EAAE,SAAS,EAAE,GAAG,CAAC,KAAK,EAAE,OAAO,CAAC;IAY9F,uCAAuC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC;IAYjE,uCAAuC,CACrC,OAAO,EAAE,UAAU,EACnB,UAAU,EAAE,EAAE,EACd,wBAAwB,EAAE,SAAS,EACnC,gBAAgB,EAAE,SAAS,EAAE,EAC7B,iBAAiB,EAAE,SAAS,EAAE,GAC7B,CAAC,EAAE,EAAE,OAAO,CAAC;IAchB,gCAAgC,CAC9B,OAAO,EAAE,UAAU,EACnB,gBAAgB,EAAE,SAAS,EAAE,EAC7B,WAAW,EAAE,SAAS,EAAE,EACxB,WAAW,EAAE,EAAE,EAAE,GAChB,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,CAAC;IAYhC,mBAAmB,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE,EAAE,UAAU,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,GAAG,UAAU;IAYnG,mBAAmB,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE,EAAE,UAAU,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,GAAG,UAAU;IAYnG,UAAU,CAAC,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,GAAG,IAAI;IAYlF,kBAAkB,CAAC,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI;IAYlE,kCAAkC,IAAI,OAAO;IAY7C,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM;IAYxD,uBAAuB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAYlD,mBAAmB,CACjB,mBAAmB,EAAE,UAAU,EAC/B,SAAS,EAAE,OAAO,EAClB,aAAa,EAAE,OAAO,GACrB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;IAY3B,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,GAAG;IAY1C,sBAAsB,CAAC,eAAe,EAAE,GAAG,GAAG,IAAI;IAYlD,kBAAkB,CAAC,eAAe,EAAE,GAAG,EAAE,mBAAmB,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,GAAG,IAAI;IAYnG,eAAe,CACb,eAAe,EAAE,GAAG,EACpB,mBAAmB,EAAE,UAAU,EAC/B,SAAS,EAAE,OAAO,EAClB,UAAU,EAAE,UAAU,GACrB,UAAU;IAYb,2BAA2B,CAAC,mBAAmB,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,GAAG,OAAO;IAYjH,0BAA0B,CAAC,mBAAmB,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,GAAG,OAAO;IAYhH,6BAA6B,CAAC,mBAAmB,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,GAAG,OAAO;IAYnH,uBAAuB,CAAC,eAAe,EAAE,GAAG,EAAE,KAAK,EAAE,UAAU,GAAG,IAAI;IAYtE,uBAAuB,CAAC,eAAe,EAAE,GAAG,GAAG,IAAI;IAYnD,sBAAsB,CAAC,eAAe,EAAE,GAAG,GAAG,UAAU;IAYxD,iBAAiB,CAAC,eAAe,EAAE,GAAG,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,GAAG,UAAU;IAY5F,eAAe,CAAC,eAAe,EAAE,GAAG,EAAE,QAAQ,EAAE,UAAU,GAAG,OAAO;IAYpE,uBAAuB,CAAC,eAAe,EAAE,GAAG,GAAG,MAAM;IAYrD,4BAA4B,CAAC,eAAe,EAAE,GAAG,EAAE,QAAQ,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,GAAG,EAAE,EAAE;IAY5G,sCAAsC,CAAC,eAAe,EAAE,GAAG,GAAG,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC;IAYxE,kBAAkB,CAAC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,GAAG,UAAU;IAY/F,mBAAmB,CAAC,QAAQ,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO;IAYrE,oBAAoB,CAAC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,GAAG,UAAU;IAYzE,0BAA0B,CAAC,QAAQ,EAAE,UAAU,GAAG,EAAE,EAAE;IAYtD,uBAAuB,CAAC,KAAK,EAAE,UAAU,GAAG,EAAE,EAAE;IAYhD,sBAAsB,CAAC,KAAK,EAAE,UAAU,GAAG,EAAE,EAAE;CAWhD"}
|