@aztec/pxe 0.35.1 → 0.37.0
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/dest/contract_data_oracle/index.d.ts +0 -10
- package/dest/contract_data_oracle/index.d.ts.map +1 -1
- package/dest/contract_data_oracle/index.js +1 -14
- package/dest/database/kv_pxe_database.js +2 -2
- package/dest/kernel_oracle/index.d.ts +0 -1
- package/dest/kernel_oracle/index.d.ts.map +1 -1
- package/dest/kernel_oracle/index.js +2 -2
- package/dest/kernel_prover/kernel_prover.d.ts +0 -1
- package/dest/kernel_prover/kernel_prover.d.ts.map +1 -1
- package/dest/kernel_prover/kernel_prover.js +13 -16
- package/dest/kernel_prover/private_inputs_builders/build_private_kernel_inner_hints.d.ts +3 -0
- package/dest/kernel_prover/private_inputs_builders/build_private_kernel_inner_hints.d.ts.map +1 -0
- package/dest/kernel_prover/private_inputs_builders/build_private_kernel_inner_hints.js +6 -0
- package/dest/kernel_prover/private_inputs_builders/build_private_kernel_tail_hints.d.ts +4 -0
- package/dest/kernel_prover/private_inputs_builders/build_private_kernel_tail_hints.d.ts.map +1 -0
- package/dest/kernel_prover/private_inputs_builders/build_private_kernel_tail_hints.js +85 -0
- package/dest/kernel_prover/private_inputs_builders/build_private_kernel_tail_outputs.d.ts +4 -0
- package/dest/kernel_prover/private_inputs_builders/build_private_kernel_tail_outputs.d.ts.map +1 -0
- package/dest/kernel_prover/private_inputs_builders/build_private_kernel_tail_outputs.js +10 -0
- package/dest/kernel_prover/private_inputs_builders/index.d.ts +4 -0
- package/dest/kernel_prover/private_inputs_builders/index.d.ts.map +1 -0
- package/dest/kernel_prover/private_inputs_builders/index.js +4 -0
- package/dest/note_processor/note_processor.d.ts +2 -2
- package/dest/note_processor/note_processor.d.ts.map +1 -1
- package/dest/note_processor/note_processor.js +12 -14
- package/dest/pxe_service/create_pxe_service.js +4 -3
- package/dest/pxe_service/pxe_service.d.ts +6 -4
- package/dest/pxe_service/pxe_service.d.ts.map +1 -1
- package/dest/pxe_service/pxe_service.js +89 -31
- package/dest/pxe_service/test/pxe_test_suite.d.ts.map +1 -1
- package/dest/pxe_service/test/pxe_test_suite.js +11 -14
- package/dest/simulator_oracle/index.d.ts +5 -4
- package/dest/simulator_oracle/index.d.ts.map +1 -1
- package/dest/simulator_oracle/index.js +18 -9
- package/dest/synchronizer/synchronizer.d.ts.map +1 -1
- package/dest/synchronizer/synchronizer.js +9 -9
- package/package.json +20 -12
- package/src/contract_data_oracle/index.ts +0 -14
- package/src/database/kv_pxe_database.ts +1 -1
- package/src/kernel_oracle/index.ts +1 -1
- package/src/kernel_prover/kernel_prover.ts +26 -56
- package/src/kernel_prover/private_inputs_builders/build_private_kernel_inner_hints.ts +17 -0
- package/src/kernel_prover/private_inputs_builders/build_private_kernel_tail_hints.ts +194 -0
- package/src/kernel_prover/private_inputs_builders/build_private_kernel_tail_outputs.ts +30 -0
- package/src/kernel_prover/private_inputs_builders/index.ts +3 -0
- package/src/note_processor/note_processor.ts +12 -12
- package/src/pxe_service/create_pxe_service.ts +2 -2
- package/src/pxe_service/pxe_service.ts +118 -31
- package/src/pxe_service/test/pxe_test_suite.ts +9 -14
- package/src/simulator_oracle/index.ts +22 -11
- package/src/synchronizer/synchronizer.ts +18 -13
- package/dest/kernel_prover/hints_builder.d.ts +0 -40
- package/dest/kernel_prover/hints_builder.d.ts.map +0 -1
- package/dest/kernel_prover/hints_builder.js +0 -103
- package/src/kernel_prover/hints_builder.ts +0 -155
|
@@ -24,16 +24,6 @@ export declare class ContractDataOracle {
|
|
|
24
24
|
/** Returns a contract class for a given class id. Throws if not found. */
|
|
25
25
|
getContractClass(contractClassId: Fr): Promise<ContractClass>;
|
|
26
26
|
getContractArtifact(contractClassId: Fr): Promise<ContractArtifact>;
|
|
27
|
-
/**
|
|
28
|
-
* Retrieve the portal contract address associated with the given contract address.
|
|
29
|
-
* This function searches for the corresponding contract tree in the local cache and returns the portal contract address.
|
|
30
|
-
* If the contract tree is not found in the cache, it fetches the contract data from the database and creates a new ContractTree instance.
|
|
31
|
-
* Throws an error if the contract address is not found in the database.
|
|
32
|
-
*
|
|
33
|
-
* @param contractAddress - The AztecAddress of the contract whose portal contract address needs to be retrieved.
|
|
34
|
-
* @returns A Promise that resolves to the portal contract address.
|
|
35
|
-
*/
|
|
36
|
-
getPortalContractAddress(contractAddress: AztecAddress): Promise<import("@aztec/circuits.js").EthAddress>;
|
|
37
27
|
/**
|
|
38
28
|
* Retrieves the artifact of a specified function within a given contract.
|
|
39
29
|
* The function is identified by its selector, which is a unique code generated from the function's signature.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/contract_data_oracle/index.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,iBAAiB,EAAkB,MAAM,oBAAoB,CAAC;AAC1F,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EACrB,KAAK,qBAAqB,EAC1B,KAAK,gBAAgB,EAEtB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,KAAK,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAEnD,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAEnF,OAAO,EAAE,KAAK,wBAAwB,EAAE,MAAM,+CAA+C,CAAC;AAC9F,OAAO,EAAE,KAAK,wBAAwB,EAAE,MAAM,+CAA+C,CAAC;AAG9F;;;;;;GAMG;AACH,qBAAa,kBAAkB;IAMjB,OAAO,CAAC,EAAE;IALtB,2DAA2D;IAC3D,OAAO,CAAC,eAAe,CAAgD;IACvE,6CAA6C;IAC7C,OAAO,CAAC,iBAAiB,CAA4C;gBAEjD,EAAE,EAAE,wBAAwB,GAAG,wBAAwB;IAE3E,4EAA4E;IAC/D,mBAAmB,CAAC,eAAe,EAAE,YAAY,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAW1F,0EAA0E;IAC7D,gBAAgB,CAAC,eAAe,EAAE,EAAE,GAAG,OAAO,CAAC,aAAa,CAAC;IAK7D,mBAAmB,CAAC,eAAe,EAAE,EAAE,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAKhF;;;;;;;;OAQG;IACU,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/contract_data_oracle/index.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,iBAAiB,EAAkB,MAAM,oBAAoB,CAAC;AAC1F,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EACrB,KAAK,qBAAqB,EAC1B,KAAK,gBAAgB,EAEtB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,KAAK,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAEnD,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAEnF,OAAO,EAAE,KAAK,wBAAwB,EAAE,MAAM,+CAA+C,CAAC;AAC9F,OAAO,EAAE,KAAK,wBAAwB,EAAE,MAAM,+CAA+C,CAAC;AAG9F;;;;;;GAMG;AACH,qBAAa,kBAAkB;IAMjB,OAAO,CAAC,EAAE;IALtB,2DAA2D;IAC3D,OAAO,CAAC,eAAe,CAAgD;IACvE,6CAA6C;IAC7C,OAAO,CAAC,iBAAiB,CAA4C;gBAEjD,EAAE,EAAE,wBAAwB,GAAG,wBAAwB;IAE3E,4EAA4E;IAC/D,mBAAmB,CAAC,eAAe,EAAE,YAAY,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAW1F,0EAA0E;IAC7D,gBAAgB,CAAC,eAAe,EAAE,EAAE,GAAG,OAAO,CAAC,aAAa,CAAC;IAK7D,mBAAmB,CAAC,eAAe,EAAE,EAAE,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAKhF;;;;;;;;OAQG;IACU,mBAAmB,CAAC,eAAe,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB;IAK1F;;;;;;;;OAQG;IACU,yBAAyB,CACpC,eAAe,EAAE,YAAY,EAC7B,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;IAKxC;;;;;;;;;OASG;IACU,wBAAwB,CACnC,eAAe,EAAE,YAAY,EAC7B,QAAQ,EAAE,gBAAgB,GACzB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC;IAM7C;;;;;;;;;OASG;IACU,WAAW,CAAC,eAAe,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB;IAKlF;;;;;;;;OAQG;IACU,4BAA4B,CAAC,eAAe,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB;IAKnG;;;;;;;;OAQG;IACU,sBAAsB;IAKnC;;;;;;;;;OASG;YACW,iBAAiB;IAY/B;;;;;;;;;OASG;YACW,iBAAiB;CAIhC"}
|
|
@@ -37,19 +37,6 @@ export class ContractDataOracle {
|
|
|
37
37
|
const tree = await this.getTreeForClassId(contractClassId);
|
|
38
38
|
return tree.getArtifact();
|
|
39
39
|
}
|
|
40
|
-
/**
|
|
41
|
-
* Retrieve the portal contract address associated with the given contract address.
|
|
42
|
-
* This function searches for the corresponding contract tree in the local cache and returns the portal contract address.
|
|
43
|
-
* If the contract tree is not found in the cache, it fetches the contract data from the database and creates a new ContractTree instance.
|
|
44
|
-
* Throws an error if the contract address is not found in the database.
|
|
45
|
-
*
|
|
46
|
-
* @param contractAddress - The AztecAddress of the contract whose portal contract address needs to be retrieved.
|
|
47
|
-
* @returns A Promise that resolves to the portal contract address.
|
|
48
|
-
*/
|
|
49
|
-
async getPortalContractAddress(contractAddress) {
|
|
50
|
-
const instance = await this.getContractInstance(contractAddress);
|
|
51
|
-
return instance.portalContractAddress;
|
|
52
|
-
}
|
|
53
40
|
/**
|
|
54
41
|
* Retrieves the artifact of a specified function within a given contract.
|
|
55
42
|
* The function is identified by its selector, which is a unique code generated from the function's signature.
|
|
@@ -167,4 +154,4 @@ export class ContractDataOracle {
|
|
|
167
154
|
return this.getTreeForClassId(instance.contractClassId);
|
|
168
155
|
}
|
|
169
156
|
}
|
|
170
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
157
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29udHJhY3RfZGF0YV9vcmFjbGUvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFxQixpQkFBaUIsRUFBRSxjQUFjLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUMxRixPQUFPLEVBS0wsd0JBQXdCLEdBQ3pCLE1BQU0sdUJBQXVCLENBQUM7QUFFL0IsT0FBTyxFQUFFLDBCQUEwQixFQUFFLHFCQUFxQixFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFLckYsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFFbkU7Ozs7OztHQU1HO0FBQ0gsTUFBTSxPQUFPLGtCQUFrQjtJQU03QixZQUFvQixFQUF1RDtRQUF2RCxPQUFFLEdBQUYsRUFBRSxDQUFxRDtRQUwzRSwyREFBMkQ7UUFDbkQsb0JBQWUsR0FBc0MsSUFBSSxHQUFHLEVBQUUsQ0FBQztRQUN2RSw2Q0FBNkM7UUFDckMsc0JBQWlCLEdBQWtDLElBQUksR0FBRyxFQUFFLENBQUM7SUFFUyxDQUFDO0lBRS9FLDRFQUE0RTtJQUNyRSxLQUFLLENBQUMsbUJBQW1CLENBQUMsZUFBNkI7UUFDNUQsSUFBSSxDQUFDLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxHQUFHLENBQUMsZUFBZSxDQUFDLFFBQVEsRUFBRSxDQUFDLEVBQUUsQ0FBQztZQUM1RCxNQUFNLFFBQVEsR0FBRyxNQUFNLElBQUksQ0FBQyxFQUFFLENBQUMsbUJBQW1CLENBQUMsZUFBZSxDQUFDLENBQUM7WUFDcEUsSUFBSSxDQUFDLFFBQVEsRUFBRSxDQUFDO2dCQUNkLE1BQU0sSUFBSSxxQkFBcUIsQ0FBQyxlQUFlLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQztZQUM5RCxDQUFDO1lBQ0QsSUFBSSxDQUFDLGlCQUFpQixDQUFDLEdBQUcsQ0FBQyxlQUFlLENBQUMsUUFBUSxFQUFFLEVBQUUsUUFBUSxDQUFDLENB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
|
|
@@ -148,7 +148,7 @@ export class KVPxeDatabase {
|
|
|
148
148
|
removeDeferredNotesByContract(contractAddress) {
|
|
149
149
|
return __classPrivateFieldGet(this, _KVPxeDatabase_db, "f").transaction(() => {
|
|
150
150
|
const deferredNotes = [];
|
|
151
|
-
const indices = __classPrivateFieldGet(this, _KVPxeDatabase_deferredNotesByContract, "f").getValues(contractAddress.toString());
|
|
151
|
+
const indices = Array.from(__classPrivateFieldGet(this, _KVPxeDatabase_deferredNotesByContract, "f").getValues(contractAddress.toString()));
|
|
152
152
|
for (const index of indices) {
|
|
153
153
|
const deferredNoteBuffer = __classPrivateFieldGet(this, _KVPxeDatabase_deferredNotes, "f").at(index);
|
|
154
154
|
if (!deferredNoteBuffer) {
|
|
@@ -324,4 +324,4 @@ _KVPxeDatabase_synchronizedBlock = new WeakMap(), _KVPxeDatabase_addresses = new
|
|
|
324
324
|
const value = __classPrivateFieldGet(this, _KVPxeDatabase_addresses, "f").at(index);
|
|
325
325
|
return value ? CompleteAddress.fromBuffer(value) : undefined;
|
|
326
326
|
};
|
|
327
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"kv_pxe_database.js","sourceRoot":"","sources":["../../src/database/kv_pxe_database.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,YAAY,EAAmB,UAAU,EAAkB,MAAM,sBAAsB,CAAC;AACjG,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE3E,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC7D,OAAO,EAAE,EAAE,EAAc,MAAM,0BAA0B,CAAC;AAQ1D,OAAO,EAAE,0BAA0B,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AACxF,OAAO,EAAoC,4BAA4B,EAAE,MAAM,wBAAwB,CAAC;AAExG,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAGxC;;GAEG;AACH,MAAM,OAAO,aAAa;IAwBxB,YAAoB,EAAgB;;QAAhB,OAAE,GAAF,EAAE,CAAc;QAvBpC,mDAA2C;QAC3C,2CAA+B;QAC/B,8CAAwC;QACxC,+CAA2C;QAC3C,0CAAgC;QAChC,uCAAiC;QACjC,gDAA0C;QAC1C,mDAA6C;QAC7C,iDAAgD;QAChD,oDAAmD;QACnD,+CAA8C;QAC9C,8CAA6C;QAC7C,0DAAyD;QACzD,6DAA4D;QAC5D,wDAAuD;QACvD,uDAAsD;QACtD,+CAA0C;QAC1C,yDAAwD;QACxD,yDAAmD;QACnD,mDAA6C;QAC7C,mDAA6C;QAC7C,oCAAkB;QAGhB,uBAAA,IAAI,qBAAO,EAAE,MAAA,CAAC;QAEd,uBAAA,IAAI,4BAAc,EAAE,CAAC,SAAS,CAAC,WAAW,CAAC,MAAA,CAAC;QAC5C,uBAAA,IAAI,+BAAiB,EAAE,CAAC,OAAO,CAAC,eAAe,CAAC,MAAA,CAAC;QAEjD,uBAAA,IAAI,gCAAkB,EAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,MAAA,CAAC;QACnD,uBAAA,IAAI,2BAAa,EAAE,CAAC,SAAS,CAAC,UAAU,CAAC,MAAA,CAAC;QAE1C,uBAAA,IAAI,oCAAsB,EAAE,CAAC,OAAO,CAAC,oBAAoB,CAAC,MAAA,CAAC;QAC3D,uBAAA,IAAI,oCAAsB,EAAE,CAAC,OAAO,CAAC,qBAAqB,CAAC,MAAA,CAAC;QAE5D,uBAAA,IAAI,oCAAsB,EAAE,CAAC,aAAa,CAAC,QAAQ,CAAC,MAAA,CAAC;QACrD,uBAAA,IAAI,0CAA4B,EAAE,CAAC,OAAO,CAAC,6BAA6B,CAAC,MAAA,CAAC;QAE1E,uBAAA,IAAI,wBAAU,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,MAAA,CAAC;QAClC,uBAAA,IAAI,iCAAmB,EAAE,CAAC,OAAO,CAAC,iBAAiB,CAAC,MAAA,CAAC;QACrD,uBAAA,IAAI,oCAAsB,EAAE,CAAC,OAAO,CAAC,mBAAmB,CAAC,MAAA,CAAC;QAE1D,uBAAA,IAAI,kCAAoB,EAAE,CAAC,YAAY,CAAC,mBAAmB,CAAC,MAAA,CAAC;QAC7D,uBAAA,IAAI,qCAAuB,EAAE,CAAC,YAAY,CAAC,uBAAuB,CAAC,MAAA,CAAC;QACpE,uBAAA,IAAI,gCAAkB,EAAE,CAAC,YAAY,CAAC,kBAAkB,CAAC,MAAA,CAAC;QAC1D,uBAAA,IAAI,+BAAiB,EAAE,CAAC,YAAY,CAAC,gBAAgB,CAAC,MAAA,CAAC;QAEvD,uBAAA,IAAI,2CAA6B,EAAE,CAAC,YAAY,CAAC,6BAA6B,CAAC,MAAA,CAAC;QAChF,uBAAA,IAAI,8CAAgC,EAAE,CAAC,YAAY,CAAC,iCAAiC,CAAC,MAAA,CAAC;QACvF,uBAAA,IAAI,yCAA2B,EAAE,CAAC,YAAY,CAAC,4BAA4B,CAAC,MAAA,CAAC;QAC7E,uBAAA,IAAI,wCAA0B,EAAE,CAAC,YAAY,CAAC,0BAA0B,CAAC,MAAA,CAAC;QAE1E,uBAAA,IAAI,gCAAkB,EAAE,CAAC,SAAS,CAAC,gBAAgB,CAAC,MAAA,CAAC;QACrD,uBAAA,IAAI,0CAA4B,EAAE,CAAC,YAAY,CAAC,4BAA4B,CAAC,MAAA,CAAC;IAChF,CAAC;IAEM,KAAK,CAAC,WAAW,CACtB,OAAqB;QAErB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;QACzD,MAAM,QAAQ,GAAG,QAAQ,IAAI,CAAC,MAAM,IAAI,CAAC,mBAAmB,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC,CAAC;QACzF,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC3B,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,OAAO,EAAE,GAAG,QAAQ,EAAE,GAAG,QAAQ,EAAE,CAAC;IACtC,CAAC;IAEM,KAAK,CAAC,mBAAmB,CAAC,EAAM,EAAE,QAA0B;QACjE,MAAM,uBAAA,IAAI,wCAAmB,CAAC,GAAG,CAAC,EAAE,CAAC,QAAQ,EAAE,EAAE,wBAAwB,CAAC,QAAQ,CAAC,CAAC,CAAC;IACvF,CAAC;IAEM,mBAAmB,CAAC,EAAM;QAC/B,MAAM,QAAQ,GAAG,uBAAA,IAAI,wCAAmB,CAAC,GAAG,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC5D,4GAA4G;QAC5G,OAAO,OAAO,CAAC,OAAO,CAAC,QAAQ,IAAI,0BAA0B,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IACxF,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,QAAqC;QAC7D,MAAM,uBAAA,IAAI,wCAAmB,CAAC,GAAG,CAC/B,QAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE,EAC3B,IAAI,4BAA4B,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,CACtD,CAAC;IACJ,CAAC;IAED,mBAAmB,CAAC,OAAqB;QACvC,MAAM,QAAQ,GAAG,uBAAA,IAAI,wCAAmB,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;QACjE,OAAO,OAAO,CAAC,OAAO,CAAC,QAAQ,IAAI,4BAA4B,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC;IAC7G,CAAC;IAED,qBAAqB;QACnB,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,uBAAA,IAAI,wCAAmB,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC;IAClG,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,WAAe,EAAE,OAAa;QACjD,MAAM,uBAAA,IAAI,oCAAe,CAAC,GAAG,CAC3B,WAAW,CAAC,QAAQ,EAAE,EACtB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAC/B,CAAC;IACJ,CAAC;IAED,cAAc,CAAC,WAAe;QAC5B,MAAM,OAAO,GAAG,uBAAA,IAAI,oCAAe,CAAC,GAAG,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC;QAChE,OAAO,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9D,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,OAAa;QAC5B,MAAM,uBAAA,IAAI,+BAAU,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;IAC5D,CAAC;IAED,KAAK,CAAC,UAAU;QACd,MAAM,GAAG,GAAG,MAAM,uBAAA,IAAI,+BAAU,CAAC,GAAG,EAAE,CAAC;QACvC,OAAO,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;IACzC,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,IAAa;QACzB,MAAM,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IAC9B,CAAC;IAED,QAAQ,CAAC,KAAgB;QACvB,OAAO,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE;YAC9B,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;gBACxB,oDAAoD;gBACpD,iEAAiE;gBACjE,oEAAoE;gBACpE,gFAAgF;gBAChF,MAAM,SAAS,GAAG,UAAU,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;gBAC5D,KAAK,uBAAA,IAAI,4BAAO,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;gBAChD,KAAK,uBAAA,IAAI,wCAAmB,CAAC,GAAG,CAAC,GAAG,CAAC,eAAe,CAAC,QAAQ,EAAE,EAAE,SAAS,CAAC,CAAC;gBAC5E,KAAK,uBAAA,IAAI,sCAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,eAAe,CAAC,QAAQ,EAAE,EAAE,SAAS,CAAC,CAAC;gBAC1E,KAAK,uBAAA,IAAI,yCAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,QAAQ,EAAE,EAAE,SAAS,CAAC,CAAC;gBACzE,KAAK,uBAAA,IAAI,oCAAe,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,SAAS,CAAC,CAAC;gBAC/D,KAAK,uBAAA,IAAI,mCAAc,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,EAAE,EAAE,SAAS,CAAC,CAAC;YACnE,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,aAAgC;QACrD,MAAM,SAAS,GAAG,MAAM,uBAAA,IAAI,oCAAe,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;QAChG,KAAK,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,aAAa,CAAC,OAAO,EAAE,EAAE,CAAC;YACpD,MAAM,MAAM,GAAG,SAAS,GAAG,aAAa,CAAC,MAAM,GAAG,KAAK,CAAC;YACxD,MAAM,uBAAA,IAAI,8CAAyB,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,EAAE,MAAM,CAAC,CAAC;QACnF,CAAC;IACH,CAAC;IAED,0BAA0B,CAAC,eAA6B;QACtD,MAAM,OAAO,GAAG,uBAAA,IAAI,8CAAyB,CAAC,SAAS,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC,CAAC;QACpF,MAAM,KAAK,GAAsB,EAAE,CAAC;QACpC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC7B,MAAM,cAAc,GAAG,uBAAA,IAAI,oCAAe,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;YACtD,IAAI,CAAC,cAAc,EAAE,CAAC;gBACpB,SAAS;YACX,CAAC;YAED,MAAM,IAAI,GAAG,eAAe,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;YACxD,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACnB,CAAC;QAED,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IAED;;;;OAIG;IACH,6BAA6B,CAAC,eAA6B;QACzD,OAAO,uBAAA,IAAI,yBAAI,CAAC,WAAW,CAAC,GAAG,EAAE;YAC/B,MAAM,aAAa,GAAsB,EAAE,CAAC;YAC5C,MAAM,OAAO,GAAG,uBAAA,IAAI,8CAAyB,CAAC,SAAS,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC,CAAC;YAEpF,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;gBAC5B,MAAM,kBAAkB,GAAG,uBAAA,IAAI,oCAAe,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;gBACzD,IAAI,CAAC,kBAAkB,EAAE,CAAC;oBACxB,SAAS;gBACX,CAAC;qBAAM,CAAC;oBACN,aAAa,CAAC,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC,CAAC;gBACrE,CAAC;gBAED,KAAK,uBAAA,IAAI,8CAAyB,CAAC,WAAW,CAAC,eAAe,CAAC,QAAQ,EAAE,EAAE,KAAK,CAAC,CAAC;gBAClF,KAAK,uBAAA,IAAI,oCAAe,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;YAC9C,CAAC;YAED,OAAO,aAAa,CAAC;QACvB,CAAC,CAAC,CAAC;IACL,CAAC;IAuED,QAAQ,CAAC,MAAkB;QACzB,OAAO,OAAO,CAAC,OAAO,CAAC,uBAAA,IAAI,yDAAU,MAAd,IAAI,EAAW,MAAM,CAAC,CAAC,CAAC;IACjD,CAAC;IAED,oBAAoB,CAAC,UAAgB,EAAE,OAAkB;QACvD,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC5B,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAC7B,CAAC;QAED,OAAO,uBAAA,IAAI,yBAAI,CAAC,WAAW,CAAC,GAAG,EAAE;YAC/B,MAAM,cAAc,GAAc,EAAE,CAAC;YAErC,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;gBACnC,MAAM,SAAS,GAAG,uBAAA,IAAI,wCAAmB,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;gBACpE,IAAI,CAAC,SAAS,EAAE,CAAC;oBACf,SAAS;gBACX,CAAC;gBAED,MAAM,UAAU,GAAG,SAAS,CAAC,CAAC,CAAC,uBAAA,IAAI,4BAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;gBAEtE,IAAI,CAAC,UAAU,EAAE,CAAC;oBAChB,qDAAqD;oBACrD,SAAS;gBACX,CAAC;gBAED,MAAM,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;gBAC5C,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;oBACpC,uCAAuC;oBACvC,SAAS;gBACX,CAAC;gBAED,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAE1B,KAAK,uBAAA,IAAI,4BAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;gBACnC,KAAK,uBAAA,IAAI,mCAAc,CAAC,WAAW,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,SAAS,CAAC,CAAC;gBACnE,KAAK,uBAAA,IAAI,oCAAe,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,SAAS,CAAC,CAAC;gBACxE,KAAK,uBAAA,IAAI,sCAAiB,CAAC,WAAW,CAAC,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,EAAE,SAAS,CAAC,CAAC;gBACnF,KAAK,uBAAA,IAAI,yCAAoB,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,EAAE,SAAS,CAAC,CAAC;gBAElF,KAAK,uBAAA,IAAI,qCAAgB,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;gBAC1D,KAAK,uBAAA,IAAI,+CAA0B,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,EAAE,SAAS,CAAC,CAAC;gBACpF,KAAK,uBAAA,IAAI,kDAA6B,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,EAAE,SAAS,CAAC,CAAC;gBACnF,KAAK,uBAAA,IAAI,6CAAwB,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,SAAS,CAAC,CAAC;gBACzE,KAAK,uBAAA,IAAI,4CAAuB,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,EAAE,SAAS,CAAC,CAAC;gBAE3E,KAAK,uBAAA,IAAI,wCAAmB,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC5D,CAAC;YAED,OAAO,cAAc,CAAC;QACxB,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,MAAc;QAC5B,MAAM,uBAAA,IAAI,wCAAmB,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;IACvD,CAAC;IAED,cAAc;QACZ,MAAM,YAAY,GAAG,uBAAA,IAAI,wCAAmB,CAAC,GAAG,EAAE,CAAC;QACnD,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,OAAO,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,eAAe,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC;IACxF,CAAC;IAED,SAAS;QACP,MAAM,YAAY,GAAG,uBAAA,IAAI,wCAAmB,CAAC,GAAG,EAAE,CAAC;QACnD,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC;QACpC,CAAC;QAED,OAAO,MAAM,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;IACzC,CAAC;IAED,kBAAkB,CAAC,eAAgC;QACjD,OAAO,uBAAA,IAAI,yBAAI,CAAC,WAAW,CAAC,GAAG,EAAE;YAC/B,MAAM,aAAa,GAAG,eAAe,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;YACzD,MAAM,MAAM,GAAG,eAAe,CAAC,QAAQ,EAAE,CAAC;YAC1C,MAAM,QAAQ,GAAG,uBAAA,IAAI,mCAAc,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;YACvD,IAAI,OAAO,QAAQ,KAAK,WAAW,EAAE,CAAC;gBACpC,MAAM,KAAK,GAAG,uBAAA,IAAI,gCAAW,CAAC,MAAM,CAAC;gBACrC,KAAK,uBAAA,IAAI,gCAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBAClC,KAAK,uBAAA,IAAI,mCAAc,CAAC,GAAG,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;gBAElD,OAAO,IAAI,CAAC;YACd,CAAC;iBAAM,CAAC;gBACN,MAAM,cAAc,GAAG,uBAAA,IAAI,gCAAW,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;gBAEpD,IAAI,cAAc,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;oBACnC,OAAO,KAAK,CAAC;gBACf,CAAC;gBAED,MAAM,IAAI,KAAK,CACb,uCAAuC,aAAa,4EAA4E,CACjI,CAAC;YACJ,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAYD,kBAAkB,CAAC,OAAqB;QACtC,OAAO,OAAO,CAAC,OAAO,CAAC,uBAAA,IAAI,mEAAoB,MAAxB,IAAI,EAAqB,OAAO,CAAC,CAAC,CAAC;IAC5D,CAAC;IAED,oBAAoB;QAClB,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,uBAAA,IAAI,gCAAW,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9F,CAAC;IAED,iCAAiC,CAAC,SAAgB;QAChD,OAAO,uBAAA,IAAI,8CAAyB,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;IACjE,CAAC;IAED,iCAAiC,CAAC,SAAgB,EAAE,WAAmB;QACrE,OAAO,uBAAA,IAAI,8CAAyB,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,EAAE,EAAE,WAAW,CAAC,CAAC;IAC9E,CAAC;IAED,YAAY;QACV,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,uBAAA,IAAI,yDAAU,MAAd,IAAI,EAAW,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;QAChG,MAAM,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC,uBAAA,IAAI,oCAAe,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAClE,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,GAAG,GAAG,KAAK,CAAC,MAAM,GAAG,EAAE,CAAC,aAAa,EACrD,CAAC,CACF,CAAC;QACF,MAAM,aAAa,GAAG,uBAAA,IAAI,gCAAW,CAAC,MAAM,GAAG,eAAe,CAAC,aAAa,CAAC;QAC7E,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,MAAM,GAAG,EAAE,CAAC,aAAa,CAAC;QAE1E,OAAO,SAAS,GAAG,aAAa,GAAG,YAAY,GAAG,aAAa,CAAC;IAClE,CAAC;CACF;ipCA7MW,MAAkB;IAC1B,MAAM,SAAS,GAA0B,MAAM,CAAC,KAAK;QACnD,CAAC,CAAC,uBAAA,IAAI,mEAAoB,MAAxB,IAAI,EAAqB,MAAM,CAAC,KAAK,CAAC,EAAE,SAAS;QACnD,CAAC,CAAC,SAAS,CAAC;IAEd,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,UAAU,CAAC,MAAM,CAAC;IAEnD,MAAM,oBAAoB,GAAG,EAAE,CAAC;IAEhC,oBAAoB,CAAC,IAAI,CAAC;QACxB,GAAG,EAAE,SAAS;YACZ,CAAC,CAAC,uBAAA,IAAI,mCAAc,CAAC,SAAS,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;YACpD,CAAC,CAAC,MAAM,CAAC,MAAM;gBACf,CAAC,CAAC,uBAAA,IAAI,oCAAe,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;gBACzD,CAAC,CAAC,MAAM,CAAC,eAAe;oBACxB,CAAC,CAAC,uBAAA,IAAI,sCAAiB,CAAC,SAAS,CAAC,MAAM,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC;oBACpE,CAAC,CAAC,MAAM,CAAC,WAAW;wBACpB,CAAC,CAAC,uBAAA,IAAI,yCAAoB,CAAC,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC;wBACnE,CAAC,CAAC,uBAAA,IAAI,4BAAO,CAAC,IAAI,EAAE;QACtB,KAAK,EAAE,uBAAA,IAAI,4BAAO;KACnB,CAAC,CAAC;IAEH,IAAI,MAAM,CAAC,MAAM,IAAI,UAAU,CAAC,mBAAmB,EAAE,CAAC;QACpD,oBAAoB,CAAC,IAAI,CAAC;YACxB,GAAG,EAAE,SAAS;gBACZ,CAAC,CAAC,uBAAA,IAAI,4CAAuB,CAAC,SAAS,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;gBAC7D,CAAC,CAAC,MAAM,CAAC,MAAM;oBACf,CAAC,CAAC,uBAAA,IAAI,6CAAwB,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;oBAClE,CAAC,CAAC,MAAM,CAAC,eAAe;wBACxB,CAAC,CAAC,uBAAA,IAAI,+CAA0B,CAAC,SAAS,CAAC,MAAM,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC;wBAC7E,CAAC,CAAC,MAAM,CAAC,WAAW;4BACpB,CAAC,CAAC,uBAAA,IAAI,kDAA6B,CAAC,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC;4BAC5E,CAAC,CAAC,uBAAA,IAAI,qCAAgB,CAAC,IAAI,EAAE;YAC/B,KAAK,EAAE,uBAAA,IAAI,qCAAgB;SAC5B,CAAC,CAAC;IACL,CAAC;IAED,MAAM,MAAM,GAAc,EAAE,CAAC;IAC7B,KAAK,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,oBAAoB,EAAE,CAAC;QAClD,KAAK,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC;YACrB,MAAM,cAAc,GAAG,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACrC,IAAI,CAAC,cAAc,EAAE,CAAC;gBACpB,SAAS;YACX,CAAC;YAED,MAAM,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;YAChD,IAAI,MAAM,CAAC,eAAe,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC;gBACnF,SAAS;YACX,CAAC;YAED,IAAI,MAAM,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;gBACxD,SAAS;YACX,CAAC;YAED,IAAI,MAAM,CAAC,WAAW,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,WAAY,CAAC,EAAE,CAAC;gBACxE,SAAS;YACX,CAAC;YAED,IAAI,SAAS,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;gBACnD,SAAS;YACX,CAAC;YAED,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpB,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC,iFAqGmB,OAAqB;IACvC,MAAM,KAAK,GAAG,uBAAA,IAAI,mCAAc,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;IACzD,IAAI,OAAO,KAAK,KAAK,WAAW,EAAE,CAAC;QACjC,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,KAAK,GAAG,uBAAA,IAAI,gCAAW,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;IACxC,OAAO,KAAK,CAAC,CAAC,CAAC,eAAe,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AAC/D,CAAC"}
|
|
327
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"kv_pxe_database.js","sourceRoot":"","sources":["../../src/database/kv_pxe_database.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,6 @@ export declare class KernelOracle implements ProvingDataOracle {
|
|
|
15
15
|
salt: Fr;
|
|
16
16
|
contractClassId: Fr;
|
|
17
17
|
initializationHash: Fr;
|
|
18
|
-
portalContractAddress: import("@aztec/circuits.js").EthAddress;
|
|
19
18
|
publicKeysHash: Fr;
|
|
20
19
|
deployer: AztecAddress;
|
|
21
20
|
saltedInitializationHash: Fr;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/kernel_oracle/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACrE,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,EAAE,EACP,KAAK,gBAAgB,EACrB,iBAAiB,EACjB,KAAK,qBAAqB,EAC1B,KAAK,KAAK,EAGX,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AAC3E,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAInF;;GAEG;AACH,qBAAa,YAAa,YAAW,iBAAiB;IACxC,OAAO,CAAC,kBAAkB;IAAsB,OAAO,CAAC,QAAQ;IAAY,OAAO,CAAC,IAAI;gBAAhF,kBAAkB,EAAE,kBAAkB,EAAU,QAAQ,EAAE,QAAQ,EAAU,IAAI,EAAE,SAAS;IAElG,0BAA0B,CAAC,OAAO,EAAE,YAAY
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/kernel_oracle/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACrE,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,EAAE,EACP,KAAK,gBAAgB,EACrB,iBAAiB,EACjB,KAAK,qBAAqB,EAC1B,KAAK,KAAK,EAGX,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AAC3E,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAInF;;GAEG;AACH,qBAAa,YAAa,YAAW,iBAAiB;IACxC,OAAO,CAAC,kBAAkB;IAAsB,OAAO,CAAC,QAAQ;IAAY,OAAO,CAAC,IAAI;gBAAhF,kBAAkB,EAAE,kBAAkB,EAAU,QAAQ,EAAE,QAAQ,EAAU,IAAI,EAAE,SAAS;IAElG,0BAA0B,CAAC,OAAO,EAAE,YAAY;;;;;;;;;IAQhD,0BAA0B,CAAC,eAAe,EAAE,EAAE;IAK9C,4BAA4B,CAAC,eAAe,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB;IAItF,sBAAsB;IAI7B,wBAAwB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,OAAO,qBAAqB,CAAC,CAAC;IAS3G,6BAA6B,CAAC,SAAS,EAAE,EAAE;IAIrC,mBAAmB,IAAI,OAAO,CAAC,EAAE,CAAC;IAKjC,2BAA2B,CAAC,kBAAkB,EAAE,KAAK;CAG7D"}
|
|
@@ -39,7 +39,7 @@ export class KernelOracle {
|
|
|
39
39
|
return header.state.partial.noteHashTree.root;
|
|
40
40
|
}
|
|
41
41
|
getMasterNullifierSecretKey(nullifierPublicKey) {
|
|
42
|
-
return this.keyStore.
|
|
42
|
+
return this.keyStore.getMasterNullifierSecretKeyForPublicKey(nullifierPublicKey);
|
|
43
43
|
}
|
|
44
44
|
}
|
|
45
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
45
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMva2VybmVsX29yYWNsZS9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBSUwsaUJBQWlCLEVBR2pCLDhCQUE4QixFQUM5QiwrQkFBK0IsR0FDaEMsTUFBTSxvQkFBb0IsQ0FBQztBQU01Qiw2Q0FBNkM7QUFDN0Msc0lBQXNJO0FBQ3RJOztHQUVHO0FBQ0gsTUFBTSxPQUFPLFlBQVk7SUFDdkIsWUFBb0Isa0JBQXNDLEVBQVUsUUFBa0IsRUFBVSxJQUFlO1FBQTNGLHVCQUFrQixHQUFsQixrQkFBa0IsQ0FBb0I7UUFBVSxhQUFRLEdBQVIsUUFBUSxDQUFVO1FBQVUsU0FBSSxHQUFKLElBQUksQ0FBVztJQUFHLENBQUM7SUFFNUcsS0FBSyxDQUFDLDBCQUEwQixDQUFDLE9BQXFCO1FBQzNELE1BQU0sUUFBUSxHQUFHLE1BQU0sSUFBSSxDQUFDLGtCQUFrQixDQUFDLG1CQUFtQixDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQzVFLE9BQU87WUFDTCx3QkFBd0IsRUFBRSwrQkFBK0IsQ0FBQyxRQUFRLENBQUM7WUFDbkUsR0FBRyxRQUFRO1NBQ1osQ0FBQztJQUNKLENBQUM7SUFFTSxLQUFLLENBQUMsMEJBQTBCLENBQUMsZUFBbUI7UUFDekQsTUFBTSxhQUFhLEdBQUcsTUFBTSxJQUFJLENBQUMsa0JBQWtCLENBQUMsZ0JBQWdCLENBQUMsZUFBZSxDQUFDLENBQUM7UUFDdEYsT0FBTyw4QkFBOEIsQ0FBQyxhQUFhLENBQUMsQ0FBQztJQUN2RCxDQUFDO0lBRU0sS0FBSyxDQUFDLDRCQUE0QixDQUFDLGVBQTZCLEVBQUUsUUFBMEI7UUFDakcsT0FBTyxNQUFNLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyw0QkFBNEIsQ0FBQyxlQUFlLEVBQUUsUUFBUSxDQUFDLENBQUM7SUFDL0YsQ0FBQztJQUVNLEtBQUssQ0FBQyxzQkFBc0I7UUFDakMsT0FBTyxNQUFNLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxzQkFBc0IsRUFBRSxDQUFDO0lBQ2hFLENBQUM7SUFFRCxLQUFLLENBQUMsd0JBQXdCLENBQUMsU0FBaUI7UUFDOUMsTUFBTSxJQUFJLEdBQUcsTUFBTSxJQUFJLENBQUMsSUFBSSxDQUFDLHNCQUFzQixDQUFDLFFBQVEsRUFBRSxTQUFTLENBQUMsQ0FBQztRQUN6RSxPQUFPLElBQUksaUJBQWlCLENBQzFCLElBQUksQ0FBQyxRQUFRLEVBQ2IsU0FBUyxFQUNULElBQUksQ0FBQyxRQUFRLEVBQTZDLENBQzNELENBQUM7SUFDSixDQUFDO0lBRUQsNkJBQTZCLENBQUMsU0FBYTtRQUN6QyxPQUFPLElBQUksQ0FBQyxJQUFJLENBQUMsNkJBQTZCLENBQUMsUUFBUSxFQUFFLFNBQVMsQ0FBQyxDQUFDO0lBQ3RFLENBQUM7SUFFRCxLQUFLLENBQUMsbUJBQW1CO1FBQ3ZCLE1BQU0sTUFBTSxHQUFHLE1BQU0sSUFBSSxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUUsQ0FBQztRQUMzQyxPQUFPLE1BQU0sQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUM7SUFDaEQsQ0FBQztJQUVNLDJCQUEyQixDQUFDLGtCQUF5QjtRQUMxRCxPQUFPLElBQUksQ0FBQyxRQUFRLENBQUMsdUNBQXVDLENBQUMsa0JBQWtCLENBQUMsQ0FBQztJQUNuRixDQUFDO0NBQ0YifQ==
|
|
@@ -12,7 +12,6 @@ export declare class KernelProver {
|
|
|
12
12
|
private oracle;
|
|
13
13
|
private proofCreator;
|
|
14
14
|
private log;
|
|
15
|
-
private hintsBuilder;
|
|
16
15
|
constructor(oracle: ProvingDataOracle, proofCreator?: ProofCreator);
|
|
17
16
|
/**
|
|
18
17
|
* Generate a proof for a given transaction request and execution result.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kernel_prover.d.ts","sourceRoot":"","sources":["../../src/kernel_prover/kernel_prover.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"kernel_prover.d.ts","sourceRoot":"","sources":["../../src/kernel_prover/kernel_prover.ts"],"names":[],"mappings":"AAAA,OAAO,EAaL,KAAK,SAAS,EAIf,MAAM,oBAAoB,CAAC;AAM5B,OAAO,EAAE,KAAK,eAAe,EAAoC,MAAM,kBAAkB,CAAC;AAO1F,OAAO,EAAsB,KAAK,YAAY,EAAoB,KAAK,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACpH,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAElE;;;;;GAKG;AACH,qBAAa,YAAY;IAEX,OAAO,CAAC,MAAM;IAAqB,OAAO,CAAC,YAAY;IADnE,OAAO,CAAC,GAAG,CAA4C;gBACnC,MAAM,EAAE,iBAAiB,EAAU,YAAY,GAAE,YAAuC;IAE5G;;;;;;;;;OASG;IACG,KAAK,CAAC,SAAS,EAAE,SAAS,EAAE,eAAe,EAAE,eAAe,GAAG,OAAO,CAAC,gBAAgB,CAAC;YA2GhF,qBAAqB;CAoDpC"}
|
|
@@ -2,9 +2,10 @@ import { CallRequest, Fr, MAX_NOTE_HASH_READ_REQUESTS_PER_CALL, MAX_PRIVATE_CALL
|
|
|
2
2
|
import { makeTuple } from '@aztec/foundation/array';
|
|
3
3
|
import { padArrayEnd } from '@aztec/foundation/collection';
|
|
4
4
|
import { createDebugLogger } from '@aztec/foundation/log';
|
|
5
|
-
import { assertLength
|
|
5
|
+
import { assertLength } from '@aztec/foundation/serialize';
|
|
6
6
|
import { pushTestData } from '@aztec/foundation/testing';
|
|
7
|
-
import {
|
|
7
|
+
import { collectNullifiedNoteHashCounters } from '@aztec/simulator';
|
|
8
|
+
import { buildPrivateKernelInnerHints, buildPrivateKernelTailHints, buildPrivateKernelTailOutputs, } from './private_inputs_builders/index.js';
|
|
8
9
|
import { KernelProofCreator } from './proof_creator.js';
|
|
9
10
|
/**
|
|
10
11
|
* The KernelProver class is responsible for generating kernel proofs.
|
|
@@ -17,7 +18,6 @@ export class KernelProver {
|
|
|
17
18
|
this.oracle = oracle;
|
|
18
19
|
this.proofCreator = proofCreator;
|
|
19
20
|
this.log = createDebugLogger('aztec:kernel-prover');
|
|
20
|
-
this.hintsBuilder = new HintsBuilder(oracle);
|
|
21
21
|
}
|
|
22
22
|
/**
|
|
23
23
|
* Generate a proof for a given transaction request and execution result.
|
|
@@ -37,6 +37,8 @@ export class KernelProver {
|
|
|
37
37
|
publicInputs: PrivateKernelCircuitPublicInputs.empty(),
|
|
38
38
|
proof: makeEmptyProof(),
|
|
39
39
|
};
|
|
40
|
+
const noteHashNullifierCounterMap = new Map();
|
|
41
|
+
collectNullifiedNoteHashCounters(executionResult).forEach(({ noteHashCounter, nullifierCounter }) => noteHashNullifierCounterMap.set(noteHashCounter, nullifierCounter));
|
|
40
42
|
while (executionStack.length) {
|
|
41
43
|
const currentExecution = executionStack.pop();
|
|
42
44
|
executionStack.push(...currentExecution.nestedExecutions);
|
|
@@ -66,15 +68,16 @@ export class KernelProver {
|
|
|
66
68
|
.fill(0)
|
|
67
69
|
.map(() => NoteHashReadRequestMembershipWitness.empty(BigInt(0))));
|
|
68
70
|
const privateCallData = await this.createPrivateCallData(currentExecution, privateCallRequests, publicCallRequests, noteHashReadRequestMembershipWitnesses);
|
|
71
|
+
const hints = buildPrivateKernelInnerHints(currentExecution.callStackItem.publicInputs, noteHashNullifierCounterMap);
|
|
69
72
|
if (firstIteration) {
|
|
70
|
-
const proofInput = new PrivateKernelInitCircuitPrivateInputs(txRequest, privateCallData);
|
|
73
|
+
const proofInput = new PrivateKernelInitCircuitPrivateInputs(txRequest, privateCallData, hints);
|
|
71
74
|
pushTestData('private-kernel-inputs-init', proofInput);
|
|
72
75
|
output = await this.proofCreator.createProofInit(proofInput);
|
|
73
76
|
}
|
|
74
77
|
else {
|
|
75
78
|
const previousVkMembershipWitness = await this.oracle.getVkMembershipWitness(previousVerificationKey);
|
|
76
79
|
const previousKernelData = new PrivateKernelData(output.publicInputs, output.proof, previousVerificationKey, Number(previousVkMembershipWitness.leafIndex), assertLength(previousVkMembershipWitness.siblingPath, VK_TREE_HEIGHT));
|
|
77
|
-
const proofInput = new PrivateKernelInnerCircuitPrivateInputs(previousKernelData, privateCallData);
|
|
80
|
+
const proofInput = new PrivateKernelInnerCircuitPrivateInputs(previousKernelData, privateCallData, hints);
|
|
78
81
|
pushTestData('private-kernel-inputs-inner', proofInput);
|
|
79
82
|
output = await this.proofCreator.createProofInner(proofInput);
|
|
80
83
|
}
|
|
@@ -83,20 +86,15 @@ export class KernelProver {
|
|
|
83
86
|
}
|
|
84
87
|
const previousVkMembershipWitness = await this.oracle.getVkMembershipWitness(previousVerificationKey);
|
|
85
88
|
const previousKernelData = new PrivateKernelData(output.publicInputs, output.proof, previousVerificationKey, Number(previousVkMembershipWitness.leafIndex), assertLength(previousVkMembershipWitness.siblingPath, VK_TREE_HEIGHT));
|
|
86
|
-
const readNoteHashHints = this.hintsBuilder.getNoteHashReadRequestHints(output.publicInputs.validationRequests.noteHashReadRequests, output.publicInputs.end.newNoteHashes);
|
|
87
|
-
const nullifierReadRequestHints = await this.hintsBuilder.getNullifierReadRequestHints(output.publicInputs.validationRequests.nullifierReadRequests, output.publicInputs.end.newNullifiers);
|
|
88
|
-
const masterNullifierSecretKeys = await this.hintsBuilder.getMasterNullifierSecretKeys(output.publicInputs.validationRequests.nullifierKeyValidationRequests);
|
|
89
|
-
const [sortedNoteHashes, sortedNoteHashesIndexes] = this.hintsBuilder.sortSideEffects(output.publicInputs.end.newNoteHashes);
|
|
90
|
-
const [sortedNullifiers, sortedNullifiersIndexes] = this.hintsBuilder.sortSideEffects(output.publicInputs.end.newNullifiers);
|
|
91
|
-
const nullifierNoteHashHints = this.hintsBuilder.getNullifierHints(mapTuple(sortedNullifiers, n => n.noteHash), sortedNoteHashes);
|
|
92
89
|
this.log.debug(`Calling private kernel tail with hwm ${previousKernelData.publicInputs.minRevertibleSideEffectCounter}`);
|
|
93
|
-
const
|
|
90
|
+
const hints = await buildPrivateKernelTailHints(output.publicInputs, this.oracle);
|
|
91
|
+
const expectedOutputs = buildPrivateKernelTailOutputs(hints.sortedNewNoteHashes, hints.sortedNewNullifiers);
|
|
92
|
+
const privateInputs = new PrivateKernelTailCircuitPrivateInputs(previousKernelData, expectedOutputs, hints);
|
|
94
93
|
pushTestData('private-kernel-inputs-ordering', privateInputs);
|
|
95
94
|
return await this.proofCreator.createProofTail(privateInputs);
|
|
96
95
|
}
|
|
97
96
|
async createPrivateCallData({ callStackItem, vk }, privateCallRequests, publicCallRequests, noteHashReadRequestMembershipWitnesses) {
|
|
98
|
-
const { contractAddress, functionData
|
|
99
|
-
const { portalContractAddress } = publicInputs.callContext;
|
|
97
|
+
const { contractAddress, functionData } = callStackItem;
|
|
100
98
|
// Pad with empty items to reach max/const length expected by circuit.
|
|
101
99
|
const privateCallStack = padArrayEnd(privateCallRequests, CallRequest.empty(), MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL);
|
|
102
100
|
const publicCallStack = padArrayEnd(publicCallRequests, CallRequest.empty(), MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL);
|
|
@@ -120,9 +118,8 @@ export class KernelProver {
|
|
|
120
118
|
saltedInitializationHash,
|
|
121
119
|
functionLeafMembershipWitness,
|
|
122
120
|
noteHashReadRequestMembershipWitnesses: makeTuple(MAX_NOTE_HASH_READ_REQUESTS_PER_CALL, i => noteHashReadRequestMembershipWitnesses[i], 0),
|
|
123
|
-
portalContractAddress: portalContractAddress.toField(),
|
|
124
121
|
acirHash,
|
|
125
122
|
});
|
|
126
123
|
}
|
|
127
124
|
}
|
|
128
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
125
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoia2VybmVsX3Byb3Zlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9rZXJuZWxfcHJvdmVyL2tlcm5lbF9wcm92ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUNMLFdBQVcsRUFDWCxFQUFFLEVBQ0Ysb0NBQW9DLEVBQ3BDLHNDQUFzQyxFQUN0QyxxQ0FBcUMsRUFDckMsb0NBQW9DLEVBQ3BDLGVBQWUsRUFDZixnQ0FBZ0MsRUFDaEMsaUJBQWlCLEVBQ2pCLHFDQUFxQyxFQUNyQyxzQ0FBc0MsRUFDdEMscUNBQXFDLEVBRXJDLGNBQWMsRUFDZCxlQUFlLEVBQ2YsY0FBYyxHQUNmLE1BQU0sb0JBQW9CLENBQUM7QUFDNUIsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ3BELE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUMzRCxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUMxRCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDM0QsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ3pELE9BQU8sRUFBd0IsZ0NBQWdDLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUUxRixPQUFPLEVBQ0wsNEJBQTRCLEVBQzVCLDJCQUEyQixFQUMzQiw2QkFBNkIsR0FDOUIsTUFBTSxvQ0FBb0MsQ0FBQztBQUM1QyxPQUFPLEVBQUUsa0JBQWtCLEVBQThELE1BQU0sb0JBQW9CLENBQUM7QUFHcEg7Ozs7O0dBS0c7QUFDSCxNQUFNLE9BQU8sWUFBWTtJQUV2QixZQUFvQixNQUF5QixFQUFVLGVBQTZCLElBQUksa0JBQWtCLEVBQUU7UUFBeEYsV0FBTSxHQUFOLE1BQU0sQ0FBbUI7UUFBVSxpQkFBWSxHQUFaLFlBQVksQ0FBeUM7UUFEcEcsUUFBRyxHQUFHLGlCQUFpQixDQUFDLHFCQUFxQixDQUFDLENB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
|
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
import { type PrivateCircuitPublicInputs, PrivateKernelInnerHints } from '@aztec/circuits.js';
|
|
2
|
+
export declare function buildPrivateKernelInnerHints(publicInputs: PrivateCircuitPublicInputs, noteHashNullifierCounterMap: Map<number, number>): PrivateKernelInnerHints;
|
|
3
|
+
//# sourceMappingURL=build_private_kernel_inner_hints.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"build_private_kernel_inner_hints.d.ts","sourceRoot":"","sources":["../../../src/kernel_prover/private_inputs_builders/build_private_kernel_inner_hints.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,0BAA0B,EAC/B,uBAAuB,EACxB,MAAM,oBAAoB,CAAC;AAG5B,wBAAgB,4BAA4B,CAC1C,YAAY,EAAE,0BAA0B,EACxC,2BAA2B,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,2BAOjD"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import { PrivateKernelInnerHints, } from '@aztec/circuits.js';
|
|
2
|
+
export function buildPrivateKernelInnerHints(publicInputs, noteHashNullifierCounterMap) {
|
|
3
|
+
const nullifierCounters = publicInputs.newNoteHashes.map(n => noteHashNullifierCounterMap.get(n.counter) ?? 0);
|
|
4
|
+
return new PrivateKernelInnerHints(nullifierCounters);
|
|
5
|
+
}
|
|
6
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnVpbGRfcHJpdmF0ZV9rZXJuZWxfaW5uZXJfaGludHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMva2VybmVsX3Byb3Zlci9wcml2YXRlX2lucHV0c19idWlsZGVycy9idWlsZF9wcml2YXRlX2tlcm5lbF9pbm5lcl9oaW50cy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBR0wsdUJBQXVCLEdBQ3hCLE1BQU0sb0JBQW9CLENBQUM7QUFHNUIsTUFBTSxVQUFVLDRCQUE0QixDQUMxQyxZQUF3QyxFQUN4QywyQkFBZ0Q7SUFFaEQsTUFBTSxpQkFBaUIsR0FBRyxZQUFZLENBQUMsYUFBYSxDQUFDLEdBQUcsQ0FDdEQsQ0FBQyxDQUFDLEVBQUUsQ0FBQywyQkFBMkIsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FDQyxDQUFDO0lBRXhELE9BQU8sSUFBSSx1QkFBdUIsQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDO0FBQ3hELENBQUMifQ==
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import { type PrivateKernelCircuitPublicInputs, PrivateKernelTailHints } from '@aztec/circuits.js';
|
|
2
|
+
import { type ProvingDataOracle } from '../proving_data_oracle.js';
|
|
3
|
+
export declare function buildPrivateKernelTailHints(publicInputs: PrivateKernelCircuitPublicInputs, oracle: ProvingDataOracle): Promise<PrivateKernelTailHints>;
|
|
4
|
+
//# sourceMappingURL=build_private_kernel_tail_hints.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"build_private_kernel_tail_hints.d.ts","sourceRoot":"","sources":["../../../src/kernel_prover/private_inputs_builders/build_private_kernel_tail_hints.ts"],"names":[],"mappings":"AAAA,OAAO,EAeL,KAAK,gCAAgC,EACrC,sBAAsB,EAQvB,MAAM,oBAAoB,CAAC;AAI5B,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAuGnE,wBAAsB,2BAA2B,CAC/C,YAAY,EAAE,gCAAgC,EAC9C,MAAM,EAAE,iBAAiB,mCA4D1B"}
|
|
@@ -0,0 +1,85 @@
|
|
|
1
|
+
import { GrumpkinScalar, MAX_NEW_NOTE_HASHES_PER_TX, MAX_NEW_NULLIFIERS_PER_TX, MAX_NOTE_HASH_READ_REQUESTS_PER_TX, MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX, MembershipWitness, NULLIFIER_TREE_HEIGHT, PrivateKernelTailHints, buildNullifierReadRequestHints, buildTransientDataHints, countAccumulatedItems, sortByCounterGetSortedHints, } from '@aztec/circuits.js';
|
|
2
|
+
import { makeTuple } from '@aztec/foundation/array';
|
|
3
|
+
/** @deprecated Use sortByCounterGetSortedHints instead */
|
|
4
|
+
function sortSideEffects(sideEffects) {
|
|
5
|
+
const sorted = sideEffects
|
|
6
|
+
.map((sideEffect, index) => ({ sideEffect, index }))
|
|
7
|
+
.sort((a, b) => {
|
|
8
|
+
// Empty ones go to the right
|
|
9
|
+
if (a.sideEffect.isEmpty()) {
|
|
10
|
+
return 1;
|
|
11
|
+
}
|
|
12
|
+
return Number(a.sideEffect.counter.toBigInt() - b.sideEffect.counter.toBigInt());
|
|
13
|
+
});
|
|
14
|
+
const originalToSorted = sorted.map(() => 0);
|
|
15
|
+
sorted.forEach(({ index }, i) => {
|
|
16
|
+
originalToSorted[index] = i;
|
|
17
|
+
});
|
|
18
|
+
return [sorted.map(({ sideEffect }) => sideEffect), originalToSorted];
|
|
19
|
+
}
|
|
20
|
+
function isValidNoteHashReadRequest(readRequest, noteHash) {
|
|
21
|
+
return (noteHash.value.equals(readRequest.value) &&
|
|
22
|
+
noteHash.counter < readRequest.counter.toNumber() &&
|
|
23
|
+
(noteHash.nullifierCounter === 0 || noteHash.nullifierCounter > readRequest.counter.toNumber()));
|
|
24
|
+
}
|
|
25
|
+
/**
|
|
26
|
+
* Performs the matching between an array of read request and an array of note hashes. This produces
|
|
27
|
+
* hints for the private kernel tail circuit to efficiently match a read request with the corresponding
|
|
28
|
+
* note hash. Several read requests might be pointing to the same note hash. It is therefore valid
|
|
29
|
+
* to return more than one hint with the same index.
|
|
30
|
+
*
|
|
31
|
+
* @param noteHashReadRequests - The array of read requests.
|
|
32
|
+
* @param noteHashes - The array of note hashes.
|
|
33
|
+
* @returns An array of hints where each element is the index of the note hash in note hashes array
|
|
34
|
+
* corresponding to the read request. In other words we have readRequests[i] == noteHashes[hints[i]].
|
|
35
|
+
*/
|
|
36
|
+
function getNoteHashReadRequestHints(noteHashReadRequests, noteHashes) {
|
|
37
|
+
const hints = makeTuple(MAX_NOTE_HASH_READ_REQUESTS_PER_TX, () => 0);
|
|
38
|
+
const numReadRequests = countAccumulatedItems(noteHashReadRequests);
|
|
39
|
+
for (let i = 0; i < numReadRequests; i++) {
|
|
40
|
+
const readRequest = noteHashReadRequests[i];
|
|
41
|
+
const noteHashIndex = noteHashes.findIndex((n) => isValidNoteHashReadRequest(readRequest, n));
|
|
42
|
+
if (noteHashIndex === -1) {
|
|
43
|
+
throw new Error(`The read request at index ${i} ${readRequest} does not match to any note hash.`);
|
|
44
|
+
}
|
|
45
|
+
hints[i] = noteHashIndex;
|
|
46
|
+
}
|
|
47
|
+
return hints;
|
|
48
|
+
}
|
|
49
|
+
function getNullifierReadRequestHints(nullifierReadRequests, nullifiers, oracle) {
|
|
50
|
+
const getNullifierMembershipWitness = async (nullifier) => {
|
|
51
|
+
const res = await oracle.getNullifierMembershipWitness(nullifier);
|
|
52
|
+
if (!res) {
|
|
53
|
+
throw new Error(`Cannot find the leaf for nullifier ${nullifier.toBigInt()}.`);
|
|
54
|
+
}
|
|
55
|
+
const { index, siblingPath, leafPreimage } = res;
|
|
56
|
+
return {
|
|
57
|
+
membershipWitness: new MembershipWitness(NULLIFIER_TREE_HEIGHT, index, siblingPath.toTuple()),
|
|
58
|
+
leafPreimage,
|
|
59
|
+
};
|
|
60
|
+
};
|
|
61
|
+
return buildNullifierReadRequestHints({ getNullifierMembershipWitness }, nullifierReadRequests, nullifiers);
|
|
62
|
+
}
|
|
63
|
+
async function getMasterNullifierSecretKeys(nullifierKeyValidationRequests, oracle) {
|
|
64
|
+
const keys = makeTuple(MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX, GrumpkinScalar.zero);
|
|
65
|
+
for (let i = 0; i < nullifierKeyValidationRequests.length; ++i) {
|
|
66
|
+
const request = nullifierKeyValidationRequests[i];
|
|
67
|
+
if (request.isEmpty()) {
|
|
68
|
+
break;
|
|
69
|
+
}
|
|
70
|
+
keys[i] = await oracle.getMasterNullifierSecretKey(request.masterNullifierPublicKey);
|
|
71
|
+
}
|
|
72
|
+
return keys;
|
|
73
|
+
}
|
|
74
|
+
export async function buildPrivateKernelTailHints(publicInputs, oracle) {
|
|
75
|
+
const noteHashReadRequestHints = getNoteHashReadRequestHints(publicInputs.validationRequests.noteHashReadRequests, publicInputs.end.newNoteHashes);
|
|
76
|
+
const nullifierReadRequestHints = await getNullifierReadRequestHints(publicInputs.validationRequests.nullifierReadRequests, publicInputs.end.newNullifiers, oracle);
|
|
77
|
+
const masterNullifierSecretKeys = await getMasterNullifierSecretKeys(publicInputs.validationRequests.nullifierKeyValidationRequests, oracle);
|
|
78
|
+
const [sortedNoteHashes, sortedNoteHashesIndexes] = sortByCounterGetSortedHints(publicInputs.end.newNoteHashes, MAX_NEW_NOTE_HASHES_PER_TX);
|
|
79
|
+
const [sortedNullifiers, sortedNullifiersIndexes] = sortByCounterGetSortedHints(publicInputs.end.newNullifiers, MAX_NEW_NULLIFIERS_PER_TX);
|
|
80
|
+
const [sortedEncryptedLogHashes, sortedEncryptedLogHashesIndexes] = sortSideEffects(publicInputs.end.encryptedLogsHashes);
|
|
81
|
+
const [sortedUnencryptedLogHashes, sortedUnencryptedLogHashesIndexes] = sortSideEffects(publicInputs.end.unencryptedLogsHashes);
|
|
82
|
+
const [transientNullifierIndexesForNoteHashes, transientNoteHashIndexesForNullifiers] = buildTransientDataHints(sortedNoteHashes, sortedNullifiers, MAX_NEW_NOTE_HASHES_PER_TX, MAX_NEW_NULLIFIERS_PER_TX);
|
|
83
|
+
return new PrivateKernelTailHints(transientNullifierIndexesForNoteHashes, transientNoteHashIndexesForNullifiers, noteHashReadRequestHints, nullifierReadRequestHints, masterNullifierSecretKeys, sortedNoteHashes, sortedNoteHashesIndexes, sortedNullifiers, sortedNullifiersIndexes, sortedEncryptedLogHashes, sortedEncryptedLogHashesIndexes, sortedUnencryptedLogHashes, sortedUnencryptedLogHashesIndexes);
|
|
84
|
+
}
|
|
85
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnVpbGRfcHJpdmF0ZV9rZXJuZWxfdGFpbF9oaW50cy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9rZXJuZWxfcHJvdmVyL3ByaXZhdGVfaW5wdXRzX2J1aWxkZXJzL2J1aWxkX3ByaXZhdGVfa2VybmVsX3RhaWxfaGludHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUVMLGNBQWMsRUFFZCwwQkFBMEIsRUFDMUIseUJBQXlCLEVBQ3pCLGtDQUFrQyxFQUNsQyw0Q0FBNEMsRUFHNUMsaUJBQWlCLEVBQ2pCLHFCQUFxQixFQUtyQixzQkFBc0IsRUFJdEIsOEJBQThCLEVBQzlCLHVCQUF1QixFQUN2QixxQkFBcUIsRUFDckIsMkJBQTJCLEdBQzVCLE1BQU0sb0JBQW9CLENBQUM7QUFDNUIsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBS3BELDBEQUEwRDtBQUMxRCxTQUFTLGVBQWUsQ0FDdEIsV0FBd0I7SUFFeEIsTUFBTSxNQUFNLEdBQUcsV0FBVztTQUN2QixHQUFHLENBQUMsQ0FBQyxVQUFVLEVBQUUsS0FBSyxFQUFFLEVBQUUsQ0FBQyxDQUFDLEVBQUUsVUFBVSxFQUFFLEtBQUssRUFBRSxDQUFDLENBQUM7U0FDbkQsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxFQUFFO1FBQ2IsNkJBQTZCO1FBQzdCLElBQUksQ0FBQyxDQUFDLFVBQVUsQ0FBQyxPQUFPLEVBQUUsRUFBRSxDQUFDO1lBQzNCLE9BQU8sQ0FBQyxDQUFDO1FBQ1gsQ0FBQztRQUNELE9BQU8sTUFBTSxDQUFDLENBQUMsQ0FBQyxVQUFVLENBQUMsT0FBTyxDQUFDLFFBQVEsRUFBRSxHQUFHLENBQUMsQ0FBQyxVQUFVLENBQUMsT0FBTyxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7SUFDbkYsQ0FBQyxDQUFDLENBQUM7SUFFTCxNQUFNLGdCQUFnQixHQUFHLE1BQU0sQ0FBQyxHQUFHLENBQUMs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
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import { MAX_NEW_NOTE_HASHES_PER_TX, MAX_NEW_NULLIFIERS_PER_TX, NoteHashContext, Nullifier, PrivateKernelTailOutputs } from '@aztec/circuits.js';
|
|
2
|
+
import { type Tuple } from '@aztec/foundation/serialize';
|
|
3
|
+
export declare function buildPrivateKernelTailOutputs(prevNoteHashes: Tuple<NoteHashContext, typeof MAX_NEW_NOTE_HASHES_PER_TX>, prevNullifiers: Tuple<Nullifier, typeof MAX_NEW_NULLIFIERS_PER_TX>): PrivateKernelTailOutputs;
|
|
4
|
+
//# sourceMappingURL=build_private_kernel_tail_outputs.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"build_private_kernel_tail_outputs.d.ts","sourceRoot":"","sources":["../../../src/kernel_prover/private_inputs_builders/build_private_kernel_tail_outputs.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,0BAA0B,EAC1B,yBAAyB,EACzB,eAAe,EACf,SAAS,EACT,wBAAwB,EACzB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAEzD,wBAAgB,6BAA6B,CAC3C,cAAc,EAAE,KAAK,CAAC,eAAe,EAAE,OAAO,0BAA0B,CAAC,EACzE,cAAc,EAAE,KAAK,CAAC,SAAS,EAAE,OAAO,yBAAyB,CAAC,4BAiBnE"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { MAX_NEW_NOTE_HASHES_PER_TX, MAX_NEW_NULLIFIERS_PER_TX, NoteHashContext, Nullifier, PrivateKernelTailOutputs, } from '@aztec/circuits.js';
|
|
2
|
+
import { padArrayEnd } from '@aztec/foundation/collection';
|
|
3
|
+
export function buildPrivateKernelTailOutputs(prevNoteHashes, prevNullifiers) {
|
|
4
|
+
// Propagate note hashes that are not linked to a nullifier.
|
|
5
|
+
// Note that note hashes can't link to the first nullifier (counter == 0).
|
|
6
|
+
const noteHashes = padArrayEnd(prevNoteHashes.filter(n => !n.nullifierCounter), NoteHashContext.empty(), MAX_NEW_NOTE_HASHES_PER_TX);
|
|
7
|
+
const nullifiers = padArrayEnd(prevNullifiers.filter(n => n.noteHash.isZero()), Nullifier.empty(), MAX_NEW_NULLIFIERS_PER_TX);
|
|
8
|
+
return new PrivateKernelTailOutputs(noteHashes, nullifiers);
|
|
9
|
+
}
|
|
10
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnVpbGRfcHJpdmF0ZV9rZXJuZWxfdGFpbF9vdXRwdXRzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2tlcm5lbF9wcm92ZXIvcHJpdmF0ZV9pbnB1dHNfYnVpbGRlcnMvYnVpbGRfcHJpdmF0ZV9rZXJuZWxfdGFpbF9vdXRwdXRzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFDTCwwQkFBMEIsRUFDMUIseUJBQXlCLEVBQ3pCLGVBQWUsRUFDZixTQUFTLEVBQ1Qsd0JBQXdCLEdBQ3pCLE1BQU0sb0JBQW9CLENBQUM7QUFDNUIsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBRzNELE1BQU0sVUFBVSw2QkFBNkIsQ0FDM0MsY0FBeUUsRUFDekUsY0FBa0U7SUFFbEUsNERBQTREO0lBQzVELDBFQUEwRTtJQUMxRSxNQUFNLFVBQVUsR0FBRyxXQUFXLENBQzVCLGNBQWMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxnQkFBZ0IsQ0FBQyxFQUMvQyxlQUFlLENBQUMsS0FBSyxFQUFFLEVBQ3ZCLDBCQUEwQixDQUMzQixDQUFDO0lBRUYsTUFBTSxVQUFVLEdBQUcsV0FBVyxDQUM1QixjQUFjLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxFQUMvQyxTQUFTLENBQUMsS0FBSyxFQUFFLEVBQ2pCLHlCQUF5QixDQUMxQixDQUFDO0lBRUYsT0FBTyxJQUFJLHdCQUF3QixDQUFDLFVBQVUsRUFBRSxVQUFVLENBQUMsQ0FBQztBQUM5RCxDQUFDIn0=
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
export { buildPrivateKernelInnerHints } from './build_private_kernel_inner_hints.js';
|
|
2
|
+
export { buildPrivateKernelTailHints } from './build_private_kernel_tail_hints.js';
|
|
3
|
+
export { buildPrivateKernelTailOutputs } from './build_private_kernel_tail_outputs.js';
|
|
4
|
+
//# sourceMappingURL=index.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/kernel_prover/private_inputs_builders/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,4BAA4B,EAAE,MAAM,uCAAuC,CAAC;AACrF,OAAO,EAAE,2BAA2B,EAAE,MAAM,sCAAsC,CAAC;AACnF,OAAO,EAAE,6BAA6B,EAAE,MAAM,wCAAwC,CAAC"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
export { buildPrivateKernelInnerHints } from './build_private_kernel_inner_hints.js';
|
|
2
|
+
export { buildPrivateKernelTailHints } from './build_private_kernel_tail_hints.js';
|
|
3
|
+
export { buildPrivateKernelTailOutputs } from './build_private_kernel_tail_outputs.js';
|
|
4
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMva2VybmVsX3Byb3Zlci9wcml2YXRlX2lucHV0c19idWlsZGVycy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsNEJBQTRCLEVBQUUsTUFBTSx1Q0FBdUMsQ0FBQztBQUNyRixPQUFPLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSxzQ0FBc0MsQ0FBQztBQUNuRixPQUFPLEVBQUUsNkJBQTZCLEVBQUUsTUFBTSx3Q0FBd0MsQ0FBQyJ9
|
|
@@ -13,7 +13,7 @@ export declare class NoteProcessor {
|
|
|
13
13
|
/**
|
|
14
14
|
* The public counterpart to the private key to be used in note decryption.
|
|
15
15
|
*/
|
|
16
|
-
readonly
|
|
16
|
+
readonly masterIncomingViewingPublicKey: PublicKey;
|
|
17
17
|
private keyStore;
|
|
18
18
|
private db;
|
|
19
19
|
private node;
|
|
@@ -28,7 +28,7 @@ export declare class NoteProcessor {
|
|
|
28
28
|
/**
|
|
29
29
|
* The public counterpart to the private key to be used in note decryption.
|
|
30
30
|
*/
|
|
31
|
-
|
|
31
|
+
masterIncomingViewingPublicKey: PublicKey, keyStore: KeyStore, db: PxeDatabase, node: AztecNode, startingBlock?: number, simulator?: import("@aztec/simulator").AcirSimulator, log?: import("@aztec/foundation/log").Logger);
|
|
32
32
|
/**
|
|
33
33
|
* Check if the NoteProcessor is synchronized with the remote block number.
|
|
34
34
|
* The function queries the remote block number from the AztecNode and compares it with the syncedToBlock value in the NoteProcessor.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"note_processor.d.ts","sourceRoot":"","sources":["../../src/note_processor/note_processor.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,SAAS,EACd,KAAK,sBAAsB,EAC3B,KAAK,QAAQ,EAEb,KAAK,OAAO,EAEb,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AACrE,OAAO,EAAoD,KAAK,SAAS,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"note_processor.d.ts","sourceRoot":"","sources":["../../src/note_processor/note_processor.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,SAAS,EACd,KAAK,sBAAsB,EAC3B,KAAK,QAAQ,EAEb,KAAK,OAAO,EAEb,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AACrE,OAAO,EAAoD,KAAK,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAGtG,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAGhD,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAkBvD;;;GAGG;AACH,qBAAa,aAAa;IAQtB;;OAEG;aACa,8BAA8B,EAAE,SAAS;IACzD,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,GAAG;IAhBb,mEAAmE;IACnE,SAAgB,KAAK,EAAE,KAAK,CAAe;IAE3C,4CAA4C;IAC5C,SAAgB,KAAK,EAAE,kBAAkB,CAAwE;;IAG/G;;OAEG;IACa,8BAA8B,EAAE,SAAS,EACjD,QAAQ,EAAE,QAAQ,EAClB,EAAE,EAAE,WAAW,EACf,IAAI,EAAE,SAAS,EACf,aAAa,GAAE,MAA6B,EAC5C,SAAS,2CAAuC,EAChD,GAAG,yCAA4C;IAGzD;;;;;;OAMG;IACU,cAAc;IAK3B;;OAEG;IACH,IAAW,MAAM;;MAEhB;IAED,OAAO,CAAC,gBAAgB;IAIxB;;;;;;;OAOG;IACU,OAAO,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,oBAAoB,EAAE,sBAAsB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAmGxG;;;;;;;;OAQG;YACW,qBAAqB;IA0BnC;;;;OAIG;YACW,oBAAoB;IAalC;;;;;;;;OAQG;IACU,mBAAmB,CAAC,gBAAgB,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;CA4B1F"}
|