@super-protocol/sdk-js 2.1.7-beta.0 → 2.1.7-beta.1

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.
@@ -1,7 +1,7 @@
1
1
  /// <reference types="node" />
2
2
  /// <reference types="node" />
3
3
  /// <reference types="node" />
4
- import { Encryption, Hash } from '@super-protocol/dto-js';
4
+ import { Encryption, Hash, EncryptionKey } from '@super-protocol/dto-js';
5
5
  import fs from 'fs';
6
6
  import { Readable } from 'stream';
7
7
  declare class Crypto {
@@ -50,5 +50,6 @@ declare class Crypto {
50
50
  * @returns Hash structure with hash itself hash algorithm and encoding
51
51
  */
52
52
  static createHash(inputStream: Readable, hashInfo: Omit<Hash, 'hash'>): Promise<Hash>;
53
+ static getPublicKey(privateKey: EncryptionKey): EncryptionKey;
53
54
  }
54
55
  export default Crypto;
@@ -64,7 +64,7 @@ class Crypto {
64
64
  case dto_js_1.CryptoAlgorithm.ARIA:
65
65
  return ARIA_js_1.default.decrypt(encryption);
66
66
  case dto_js_1.CryptoAlgorithm.ECIES:
67
- return await ECIES_js_1.default.decrypt(encryption);
67
+ return ECIES_js_1.default.decrypt(encryption);
68
68
  case dto_js_1.CryptoAlgorithm.RSAHybrid:
69
69
  return RSA_Hybrid_js_1.default.decrypt(encryption);
70
70
  default:
@@ -95,6 +95,14 @@ class Crypto {
95
95
  ? NativeCrypto_js_1.default.createHashFromBuffer(param1, algo, encoding)
96
96
  : await NativeCrypto_js_1.default.createHashFromStream(param1, algo, encoding);
97
97
  }
98
+ static getPublicKey(privateKey) {
99
+ switch (privateKey.algo) {
100
+ case dto_js_1.CryptoAlgorithm.ECIES:
101
+ return ECIES_js_1.default.getPublicKeyEncryption(privateKey);
102
+ default:
103
+ throw Error(`${privateKey.algo} algorithm not supported`);
104
+ }
105
+ }
98
106
  }
99
107
  exports.default = Crypto;
100
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ3J5cHRvLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NyeXB0by9DcnlwdG8udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSxtREFRZ0M7QUFFaEMsNkRBQWtDO0FBQ2xDLCtEQUFvQztBQUNwQyxpRUFBc0M7QUFDdEMsMkVBQStDO0FBQy9DLCtFQUFvRDtBQUdwRCxNQUFNLE1BQU07SUFDVjs7Ozs7OztPQU9HO0lBQ0gsTUFBTSxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsT0FBZSxFQUFFLFVBQXNCO1FBQzFELFFBQVEsVUFBVSxDQUFDLElBQUksRUFBRSxDQUFDO1lBQ3hCLEtBQUssd0JBQWUsQ0FBQyxHQUFHO2dCQUN0QixPQUFPLE1BQU0sZ0JBQUcsQ0FBQyxPQUFPLENBQUMsT0FBTyxFQUFFLFVBQVUsQ0FBQyxDQUFDO1lBRWhELEtBQUssd0JBQWUsQ0FBQyxJQUFJO2dCQUN2QixPQUFPLE1BQU0saUJBQUksQ0FBQyxPQUFPLENBQUMsT0FBTyxFQUFFLFVBQVUsQ0FBQyxDQUFDO1lBRWpELEtBQUssd0JBQWUsQ0FBQyxLQUFLO2dCQUN4QixPQUFPLE1BQU0sa0JBQUssQ0FBQyxPQUFPLENBQUMsT0FBTyxFQUFFLFVBQVUsQ0FBQyxDQUFDO1lBRWxELEtBQUssd0JBQWUsQ0FBQyxTQUFTO2dCQUM1QixPQUFPLE1BQU0sdUJBQVMsQ0FBQyxPQUFPLENBQUMsT0FBTyxFQUFFLFVBQVUsQ0FBQyxDQUFDO1lBRXREO2dCQUNFLE1BQU0sS0FBSyxDQUFDLEdBQUcsVUFBVSxDQUFDLElBQUksMEJBQTBCLENBQUMsQ0FBQztRQUM5RCxDQUFDO0lBQ0gsQ0FBQztJQUVEOzs7Ozs7O09BT0c7SUFDSSxNQUFNLENBQUMsS0FBSyxDQUFDLGFBQWEsQ0FDL0IsV0FBMEIsRUFDMUIsWUFBNEIsRUFDNUIsVUFBc0I7UUFFdEIsUUFBUSxVQUFVLENBQUMsSUFBSSxFQUFFLENBQUM7WUFDeEIsS0FBSyx3QkFBZSxDQUFD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
108
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ3J5cHRvLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NyeXB0by9DcnlwdG8udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSxtREFTZ0M7QUFFaEMsNkRBQWtDO0FBQ2xDLCtEQUFvQztBQUNwQyxpRUFBc0M7QUFDdEMsMkVBQStDO0FBQy9DLCtFQUFvRDtBQUdwRCxNQUFNLE1BQU07SUFDVjs7Ozs7OztPQU9HO0lBQ0gsTUFBTSxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsT0FBZSxFQUFFLFVBQXNCO1FBQzFELFFBQVEsVUFBVSxDQUFDLElBQUksRUFBRSxDQUFDO1lBQ3hCLEtBQUssd0JBQWUsQ0FBQyxHQUFHO2dCQUN0QixPQUFPLE1BQU0sZ0JBQUcsQ0FBQyxPQUFPLENBQUMsT0FBTyxFQUFFLFVBQVUsQ0FBQyxDQUFDO1lBRWhELEtBQUssd0JBQWUsQ0FBQyxJQUFJO2dCQUN2QixPQUFPLE1BQU0saUJBQUksQ0FBQyxPQUFPLENBQUMsT0FBTyxFQUFFLFVBQVUsQ0FBQyxDQUFDO1lBRWpELEtBQUssd0JBQWUsQ0FBQyxLQUFLO2dCQUN4QixPQUFPLE1BQU0sa0JBQUssQ0FBQyxPQUFPLENBQUMsT0FBTyxFQUFFLFVBQVUsQ0FBQyxDQUFDO1lBRWxELEtBQUssd0JBQWUsQ0FBQyxTQUFTO2dCQUM1QixPQUFPLE1BQU0sdUJBQVMsQ0FBQyxPQUFPLENBQUMsT0FBTyxFQUFFLFVBQVUsQ0FBQyxDQUFDO1lBRXREO2dCQUNFLE1BQU0sS0FBSyxDQUFDLEdBQUcsVUFBVSxDQUFDLElBQUksMEJBQTBCLENBQUMsQ0FBQztRQUM5RCxDQUFDO0lBQ0gsQ0FBQztJQUVEOzs7Ozs7O09BT0c7SUFDSSxNQUFNLENBQUMsS0FBSyxDQUFDLGFBQWEsQ0FDL0IsV0FBMEIsRUFDMUIsWUFBNEIsRUFDNUIsVUFBc0I7UUFFdEIsUUFBUSxVQUFVLENBQUMsSUFBSSxFQUFFLENBQUM7WUFDeEIsS0FBSyx3QkFBZSxDQUFD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
@@ -1,6 +1,8 @@
1
- import { ECIESEncryption, Encryption } from '@super-protocol/dto-js';
1
+ import { ECIESEncryption, Encryption, EncryptionKey } from '@super-protocol/dto-js';
2
2
  declare class ECIES {
3
- static encrypt(content: string, encryption: Encryption): Promise<ECIESEncryption>;
4
- static decrypt(encryption: ECIESEncryption): Promise<string>;
3
+ static encrypt(content: string, encryption: Encryption): ECIESEncryption;
4
+ static decrypt(encryption: ECIESEncryption): string;
5
+ static getPublicFromPrivate(privateKey: Pick<EncryptionKey, 'key' | 'encoding'>): string;
6
+ static getPublicKeyEncryption: (encryption: EncryptionKey) => EncryptionKey;
5
7
  }
6
8
  export default ECIES;
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
6
6
  const dto_js_1 = require("@super-protocol/dto-js");
7
7
  const crypto_1 = __importDefault(require("crypto"));
8
8
  class ECIES {
9
- static async encrypt(content, encryption) {
9
+ static encrypt(content, encryption) {
10
10
  if (!encryption.key)
11
11
  throw Error('Encryption key is not provided');
12
12
  const ecdh = crypto_1.default.createECDH('secp256k1');
@@ -14,7 +14,7 @@ class ECIES {
14
14
  const epk = ecdh.getPublicKey();
15
15
  const pk = ecdh.computeSecret(Buffer.from(encryption.key, encryption.encoding));
16
16
  const hash = crypto_1.default.createHash('sha512').update(pk).digest();
17
- const cipherKey = hash.slice(0, 32), macKey = hash.slice(32);
17
+ const cipherKey = hash.subarray(0, 32), macKey = hash.subarray(32);
18
18
  const iv = crypto_1.default.randomBytes(16);
19
19
  const cipher = crypto_1.default.createCipheriv('aes-256-cbc', cipherKey, iv);
20
20
  let ct = cipher.update(content);
@@ -30,7 +30,7 @@ class ECIES {
30
30
  ciphertext: ct.toString(encryption.encoding),
31
31
  };
32
32
  }
33
- static async decrypt(encryption) {
33
+ static decrypt(encryption) {
34
34
  if (!encryption.key)
35
35
  throw Error('Decryption key is not provided');
36
36
  const iv = Buffer.from(encryption.iv, encryption.encoding), epk = Buffer.from(encryption.ephemPublicKey, encryption.encoding), ct = Buffer.from(encryption.ciphertext, encryption.encoding), mac = Buffer.from(encryption.mac, encryption.encoding);
@@ -38,7 +38,7 @@ class ECIES {
38
38
  ecdh.setPrivateKey(Buffer.from(encryption.key, encryption.encoding));
39
39
  const pk = ecdh.computeSecret(epk);
40
40
  const hash = crypto_1.default.createHash('sha512').update(pk).digest();
41
- const cipherKey = hash.slice(0, 32), macKey = hash.slice(32);
41
+ const cipherKey = hash.subarray(0, 32), macKey = hash.subarray(32);
42
42
  const m = crypto_1.default
43
43
  .createHmac('sha256', macKey)
44
44
  .update(Buffer.concat([iv, epk, ct]))
@@ -51,6 +51,27 @@ class ECIES {
51
51
  const result = Buffer.concat([pt, decipher.final()]);
52
52
  return result.toString('binary');
53
53
  }
54
+ static getPublicFromPrivate(privateKey) {
55
+ const ecdh = crypto_1.default.createECDH('secp256k1');
56
+ ecdh.setPrivateKey(Buffer.from(privateKey.key, privateKey.encoding));
57
+ return ecdh.getPublicKey(privateKey.encoding);
58
+ }
59
+ static getPublicKeyEncryption = (encryption) => {
60
+ if (encryption.algo !== dto_js_1.CryptoAlgorithm.ECIES) {
61
+ throw Error('Only ECIES result encryption is supported');
62
+ }
63
+ if (encryption.encoding !== dto_js_1.Encoding.base64) {
64
+ throw new Error('Only base64 result encryption is supported');
65
+ }
66
+ if (!encryption.key) {
67
+ throw new Error('Encryption private key is not provided');
68
+ }
69
+ return {
70
+ algo: encryption.algo,
71
+ encoding: encryption.encoding,
72
+ key: this.getPublicFromPrivate(encryption),
73
+ };
74
+ };
54
75
  }
55
76
  exports.default = ECIES;
56
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRUNJRVMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvY3J5cHRvL25vZGVqcy9FQ0lFUy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLG1EQUFzRjtBQUN0RixvREFBNEI7QUFFNUIsTUFBTSxLQUFLO0lBQ0YsTUFBTSxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsT0FBZSxFQUFFLFVBQXNCO1FBQ2pFLElBQUksQ0FBQyxVQUFVLENBQUMsR0FBRztZQUFFLE1BQU0sS0FBSyxDQUFDLGdDQUFnQyxDQUFDLENBQUM7UUFFbkUsTUFBTSxJQUFJLEdBQUcsZ0JBQU0sQ0FBQyxVQUFVLENBQUMsV0FBVyxDQUFDLENBQUM7UUFFNUMsSUFBSSxDQUFDLFlBQVksRUFBRSxDQUFDO1FBQ3BCLE1BQU0sR0FBRyxHQUFHLElBQUksQ0FBQyxZQUFZLEVBQUUsQ0FBQztRQUVoQyxNQUFNLEVBQUUsR0FBRyxJQUFJLENBQUMsYUFBYSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLEdBQUcsRUFBRSxVQUFVLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQztRQUVoRixNQUFNLElBQUksR0FBRyxnQkFBTSxDQUFDLFVBQVUsQ0FBQyxRQUFRLENBQUMsQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLENBQUMsTUFBTSxFQUFFLENBQUM7UUFFN0QsTUFBTSxTQUFTLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLEVBQ2pDLE1BQU0sR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQyxDQUFDO1FBQzFCLE1BQU0sRUFBRSxHQUFHLGdCQUFNLENBQUMsV0FBVyxDQUFDLEVBQUUsQ0FBQyxDQUFDO1FBRWxDLE1BQU0sTUFBTSxHQUFHLGdCQUFNLENBQUMsY0FBYyxDQUFDLGFBQWEsRUFBRSxTQUFTLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFDbkUsSUFBSSxFQUFFLEdBQUcsTUFB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
77
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRUNJRVMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvY3J5cHRvL25vZGVqcy9FQ0lFUy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLG1EQU1nQztBQUNoQyxvREFBNEI7QUFFNUIsTUFBTSxLQUFLO0lBQ0YsTUFBTSxDQUFDLE9BQU8sQ0FBQyxPQUFlLEVBQUUsVUFBc0I7UUFDM0QsSUFBSSxDQUFDLFVBQVUsQ0FBQyxHQUFHO1lBQUUsTUFBTSxLQUFLLENBQUMsZ0NBQWdDLENBQUMsQ0FBQztRQUVuRSxNQUFNLElBQUksR0FBRyxnQkFBTSxDQUFDLFVBQVUsQ0FBQyxXQUFXLENBQUMsQ0FBQztRQUU1QyxJQUFJLENBQUMsWUFBWSxFQUFFLENBQUM7UUFDcEIsTUFBTSxHQUFHLEdBQUcsSUFBSSxDQUFDLFlBQVksRUFBRSxDQUFDO1FBRWhDLE1BQU0sRUFBRSxHQUFHLElBQUksQ0FBQyxhQUFhLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsR0FBRyxFQUFFLFVBQVUsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDO1FBRWhGLE1BQU0sSUFBSSxHQUFHLGdCQUFNLENBQUMsVUFBVSxDQUFDLFFBQVEsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQztRQUU3RCxNQUFNLFNBQVMsR0FBRyxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsRUFDcEMsTUFBTSxHQUFHLElBQUksQ0FBQyxRQUFRLENBQUMsRUFBRSxDQUFDLENBQUM7UUFDN0IsTUFBTSxFQUFFLEdBQUcsZ0JBQU0sQ0FBQyxXQUFXLENBQUMsRUFBRSxDQUFDLENBQUM7UUFFbEMsTUFBTSxNQUFNLEdBQUcsZ0JBQU0sQ0FBQyxjQUFjLENBQUMsYUFBYSxFQUFFLFNBQVMsRUFBRSxFQUFFLENBQUMsQ0FBQztRQUNuRSxJQUFJLEVBQUUsR0FBRyxNQUFNLENBQUMsTUFB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
@@ -15,7 +15,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
15
15
  const index_js_1 = require("../types/index.js");
16
16
  const logger_js_1 = __importDefault(require("../logger.js"));
17
17
  const helper_js_1 = require("../utils/helper.js");
18
- const utils_js_1 = require("ethers/lib/utils.js");
19
18
  const index_js_2 = require("../connectors/index.js");
20
19
  const TeeOffers_js_1 = __importDefault(require("../staticModels/TeeOffers.js"));
21
20
  const TxManager_js_1 = __importDefault(require("../utils/TxManager.js"));
@@ -80,12 +79,9 @@ class Order {
80
79
  }
81
80
  const orderInfoParams = await Order.contract.methods.getOrder(this.id).call();
82
81
  const orderArgs = await Order.contract.methods.getOrderArgs(this.id).call();
83
- const orderInfo = {
84
- ...(0, helper_js_1.cleanWeb3Data)(orderInfoParams[1]),
85
- args: (0, helper_js_1.cleanWeb3Data)(orderArgs),
86
- status: orderInfoParams[1].status.toString(),
87
- };
88
- return (this.orderInfo = orderInfo);
82
+ const cleanedOrderInfo = (0, helper_js_1.cleanWeb3Data)(orderInfoParams[1]);
83
+ const finalOrderInfo = (0, index_js_1.orderInfoFromRaw)(cleanedOrderInfo, (0, helper_js_1.cleanWeb3Data)(orderArgs));
84
+ return (this.orderInfo = finalOrderInfo);
89
85
  }
90
86
  async checkIfOrderExistsWithInterval() {
91
87
  const offerExists = await (0, index_js_3.tryWithInterval)({
@@ -308,27 +304,16 @@ class Order {
308
304
  async createSubOrder(subOrderInfo, slots, blockParentOrder, deposit, transactionOptions, checkTxBeforeSend = false) {
309
305
  (0, helper_js_1.checkIfActionAccountInitialized)(transactionOptions);
310
306
  deposit = deposit ?? '0';
311
- const preparedInfo = {
312
- ...subOrderInfo,
313
- externalId: (0, utils_js_1.formatBytes32String)(subOrderInfo.externalId),
314
- };
307
+ const args = subOrderInfo.args;
308
+ const preparedInfo = (0, index_js_1.orderInfoToRaw)(subOrderInfo);
315
309
  const params = {
316
310
  blockParentOrder,
317
311
  deposit,
318
312
  };
319
- const { args, ...restPreparedInfo } = preparedInfo;
320
313
  if (checkTxBeforeSend) {
321
- await TxManager_js_1.default.dryRun(Order.contract.methods.createSubOrder(this.id, {
322
- ...restPreparedInfo,
323
- expectedPrice: restPreparedInfo.expectedPrice ?? '0',
324
- maxPriceSlippage: restPreparedInfo.maxPriceSlippage ?? '0',
325
- }, slots, args, params), transactionOptions);
314
+ await TxManager_js_1.default.dryRun(Order.contract.methods.createSubOrder(this.id, preparedInfo, slots, args, params), transactionOptions);
326
315
  }
327
- await TxManager_js_1.default.execute(Order.contract.methods.createSubOrder(this.id, {
328
- ...restPreparedInfo,
329
- expectedPrice: restPreparedInfo.expectedPrice ?? '0',
330
- maxPriceSlippage: restPreparedInfo.maxPriceSlippage ?? '0',
331
- }, slots, args, params), transactionOptions);
316
+ await TxManager_js_1.default.execute(Order.contract.methods.createSubOrder(this.id, preparedInfo, slots, args, params), transactionOptions);
332
317
  }
333
318
  /**
334
319
  * Function for creating pack of sub orders (wokflow) for current order
@@ -343,17 +328,14 @@ class Order {
343
328
  }
344
329
  const promises = [];
345
330
  for (let orderInfoIndex = 0; orderInfoIndex < subOrdersInfo.length; orderInfoIndex++) {
346
- const preparedInfo = {
347
- ...subOrdersInfo[orderInfoIndex],
348
- externalId: (0, utils_js_1.formatBytes32String)(subOrdersInfo[orderInfoIndex].externalId),
349
- expectedPrice: subOrdersInfo[orderInfoIndex].expectedPrice ?? '0',
350
- maxPriceSlippage: subOrdersInfo[orderInfoIndex].maxPriceSlippage ?? '0',
351
- };
331
+ const { blocking, deposit, ...orderInfo } = subOrdersInfo[orderInfoIndex];
332
+ const args = orderInfo.args;
333
+ const preparedInfo = (0, index_js_1.orderInfoToRaw)(orderInfo);
352
334
  const params = {
353
- blockParentOrder: subOrdersInfo[orderInfoIndex].blocking,
354
- deposit: subOrdersInfo[orderInfoIndex].deposit,
335
+ blockParentOrder: blocking,
336
+ deposit,
355
337
  };
356
- const transactionCall = Order.contract.methods.createSubOrder(this.id, preparedInfo, subOrdersSlots[orderInfoIndex], preparedInfo.args, params);
338
+ const transactionCall = Order.contract.methods.createSubOrder(this.id, preparedInfo, subOrdersSlots[orderInfoIndex], args, params);
357
339
  promises.push(TxManager_js_1.default.execute(transactionCall, transactionOptions));
358
340
  }
359
341
  return (await Promise.all(promises)).map((tx) => tx.transactionHash);
@@ -540,4 +522,4 @@ __decorate([
540
522
  __metadata("design:returntype", Promise)
541
523
  ], Order.prototype, "createSubOrders", null);
542
524
  exports.default = Order;
543
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Order.js","sourceRoot":"","sources":["../../../src/models/Order.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,gDAgB2B;AAG3B,6DAAsC;AAEtC,kDAO4B;AAC5B,kDAA0D;AAC1D,qDAAuF;AACvF,gFAAqD;AACrD,yEAA8C;AAC9C,wDAA4D;AAC5D,kDAAiG;AAEjG,MAAM,KAAK;IACD,MAAM,CAAC,QAAQ,CAAuB;IACtC,MAAM,CAAoB;IAE3B,aAAa,CAAc;IAC3B,SAAS,CAAa;IACtB,WAAW,CAAe;IAC1B,SAAS,CAAkB;IAC3B,WAAW,CAAgB;IAC3B,QAAQ,CAAU;IAClB,OAAO,CAAW;IAClB,SAAS,CAAU;IACnB,EAAE,CAAe;IAExB,YAAY,OAAqB;QAC/B,IAAI,CAAC,EAAE,GAAG,OAAO,CAAC;QAClB,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;YACpB,KAAK,CAAC,QAAQ,GAAG,8BAAmB,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE,CAAC;QACnE,CAAC;QAED,IAAI,CAAC,MAAM,GAAG,mBAAU,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;IAC3E,CAAC;IAED;;OAEG;IACI,OAAO;QACZ,OAAO,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC7D,CAAC;IAED;;OAEG;IACI,iBAAiB;QACtB,OAAO,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAClE,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,sBAAsB;QACjC,MAAM,cAAc,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAC,OAAO;aAChD,sBAAsB,CAAC,IAAI,CAAC,EAAE,CAAC;aAC/B,IAAI,EAAE;aACN,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAA,yBAAa,EAAC,QAAQ,CAA4B,CAAC,CAAC;QAE1E,OAAO,cAAc,CAAC,MAAM,CAAC;IAC/B,CAAC;IAED;;OAEG;IACI,qBAAqB;QAC1B,OAAO,KAAK,CAAC,QAAQ,CAAC,OAAO;aAC1B,0BAA0B,CAAC,IAAI,CAAC,EAAE,CAAC;aACnC,IAAI,EAAE;aACN,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;IACvC,CAAC;IAED;;OAEG;IAEU,AAAN,KAAK,CAAC,YAAY;QACvB,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,8BAA8B,EAAE,CAAC,EAAE,CAAC;YACnD,MAAM,KAAK,CAAC,SAAS,IAAI,CAAC,EAAE,iBAAiB,CAAC,CAAC;QACjD,CAAC;QACD,MAAM,eAAe,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAC9E,MAAM,SAAS,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAE5E,MAAM,SAAS,GAAc;YAC3B,GAAI,IAAA,yBAAa,EAAC,eAAe,CAAC,CAAC,CAAC,CAAe;YACnD,IAAI,EAAE,IAAA,yBAAa,EAAC,SAAS,CAAc;YAC3C,MAAM,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAiB;SAC5D,CAAC;QAEF,OAAO,CAAC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC,CAAC;IACtC,CAAC;IAEO,KAAK,CAAC,8BAA8B;QAC1C,MAAM,WAAW,GAAG,MAAM,IAAA,0BAAe,EAAC;YACxC,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE;YAC7B,WAAW,EAAE,CAAC,MAAM,EAAE,EAAE;gBACtB,IAAI,CAAC,MAAM;oBAAE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,IAAI,CAAC,EAAE,YAAY,MAAM,EAAE,CAAC,CAAC;gBAErE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC;YAChC,CAAC;YACD,aAAa,EAAE,6CAA8B;YAC7C,QAAQ,EAAE,6CAA8B;SACzC,CAAC,CAAC;QAEH,OAAO,WAAW,CAAC;IACrB,CAAC;IAGY,AAAN,KAAK,CAAC,WAAW;QACtB,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QACvE,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QAE5B,OAAO,IAAI,CAAC,QAAS,CAAC;IACxB,CAAC;IAED;;OAEG;IAEU,AAAN,KAAK,CAAC,cAAc;QACzB,MAAM,YAAY,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAE3E,OAAO,CAAC,IAAI,CAAC,WAAW,GAAG,IAAA,yBAAa,EAAC,YAAY,CAAC,CAAC,CAAC,CAAgB,CAAC,CAAC;IAC5E,CAAC;IAED;;OAEG;IAEU,AAAN,KAAK,CAAC,YAAY;QACvB,IAAI,CAAC,SAAS,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAC,OAAO;aAC1C,iBAAiB,CAAC,IAAI,CAAC,EAAE,CAAC;aAC1B,IAAI,EAAE;aACN,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;QAEjD,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAED;;OAEG;IAEU,AAAN,KAAK,CAAC,cAAc;QACzB,IAAI,CAAC,WAAW,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAC,OAAO;aAC5C,mBAAmB,CAAC,IAAI,CAAC,EAAE,CAAC;aAC5B,IAAI,EAAE;aACN,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;QAE/B,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAED;;OAEG;IAEI,sBAAsB;QAC3B,OAAO,KAAK,CAAC,QAAQ,CAAC,OAAO;aAC1B,sBAAsB,CAAC,IAAI,CAAC,EAAE,CAAC;aAC/B,IAAI,EAAE;aACN,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;IACvC,CAAC;IAED;;OAEG;IAEU,AAAN,KAAK,CAAC,gBAAgB;QAC3B,MAAM,gBAAgB,GAAG,MAAM,sBAAS,CAAC,cAAc,EAAE,CAAC;QAE1D,MAAM,qBAAqB,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAC,OAAO;aACvD,6BAA6B,CAAC,IAAI,CAAC,EAAE,CAAC;aACtC,IAAI,EAAE;aACN,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAA,yBAAa,EAAC,QAAQ,CAAa,CAAC,CAAC;QAE3D,MAAM,sBAAsB,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAC,OAAO;aACxD,8BAA8B,CAAC,IAAI,CAAC,EAAE,CAAC;aACvC,IAAI,EAAE;aACN,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,IAAA,yBAAa,EAAC,SAAS,CAAc,CAAC,CAAC;QAE9D,IAAI,CAAC,aAAa,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAC,OAAO;aAC9C,qBAAqB,CAAC,IAAI,CAAC,EAAE,CAAC;aAC9B,IAAI,EAAE;aACN,IAAI,CAAC,CAAC,aAAa,EAAE,EAAE,CACtB,IAAA,6BAAiB,EACf,IAAA,yBAAa,EAAC,aAAa,CAAkB,EAC7C,IAAA,0BAAc,EAAC,qBAAqB,EAAE,gBAAgB,CAAC,EACvD,IAAA,uBAAW,EAAC,sBAAsB,CAAC,CACpC,CACF,CAAC;QAEJ,IAAI,CAAC,aAAa,CAAC,YAAY,GAAG,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;QAC9F,IAAI,CAAC,aAAa,CAAC,WAAW,GAAG,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAC5E,IAAA,uBAAW,EAAC,KAAK,CAAC,CACnB,CAAC;QAEF,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IAED;;OAEG;IAEI,0BAA0B;QAC/B,OAAO,KAAK,CAAC,QAAQ,CAAC,OAAO;aAC1B,0BAA0B,CAAC,IAAI,CAAC,EAAE,CAAC;aACnC,IAAI,EAAE;aACN,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;IACvC,CAAC;IAED;;OAEG;IAEI,2BAA2B;QAChC,OAAO,KAAK,CAAC,QAAQ,CAAC,OAAO;aAC1B,2BAA2B,CAAC,IAAI,CAAC,EAAE,CAAC;aACpC,IAAI,EAAE;aACN,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;IACvC,CAAC;IAED;;OAEG;IAEI,0BAA0B;QAC/B,OAAO,KAAK,CAAC,QAAQ,CAAC,OAAO;aAC1B,0BAA0B,CAAC,IAAI,CAAC,EAAE,CAAC;aACnC,IAAI,EAAE;aACN,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;IACvC,CAAC;IAED;;OAEG;IAEI,4BAA4B;QACjC,OAAO,KAAK,CAAC,QAAQ,CAAC,OAAO;aAC1B,4BAA4B,CAAC,IAAI,CAAC,EAAE,CAAC;aACrC,IAAI,EAAE;aACN,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;IACvC,CAAC;IAED;;OAEG;IAEU,AAAN,KAAK,CAAC,UAAU;QACrB,MAAM,OAAO,GAAY,MAAM,KAAK,CAAC,QAAQ,CAAC,OAAO;aAClD,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC;aACxB,IAAI,EAAE;aACN,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAA,yBAAa,EAAC,OAAO,CAAY,CAAC,CAAC;QAExD,0DAA0D;QAC1D,OAAO,CAAC,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC;QACzD,OAAO,CAAC,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG,IAAI,CAAC;QAE3D,OAAO,CAAC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,CAAC;IAClC,CAAC;IAED;;OAEG;IAEI,kBAAkB;QACvB,OAAO,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACnE,CAAC;IAED;;OAEG;IAEI,UAAU;QACf,OAAO,KAAK,CAAC,QAAQ,CAAC,OAAO;aAC1B,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC;aACxB,IAAI,EAAE;aACN,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;IACvC,CAAC;IAED;;OAEG;IAEU,AAAN,KAAK,CAAC,YAAY;QACvB,OAAO,MAAM,CAAC,MAAM,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IAC3E,CAAC;IAED;;OAEG;IAEU,AAAN,KAAK,CAAC,kBAAkB;QAC7B,OAAO,MAAM,CAAC,MAAM,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IACjF,CAAC;IAED;;OAEG;IAEU,AAAN,KAAK,CAAC,kBAAkB,CAC7B,KAAc,EACd,kBAAuC;QAEvC,IAAA,2CAA+B,EAAC,kBAAkB,CAAC,CAAC;QAEpD,MAAM,sBAAS,CAAC,OAAO,CACrB,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE,EAAE,KAAK,CAAC,EACzD,kBAAkB,CACnB,CAAC;IACJ,CAAC;IAED;;OAEG;IAEU,AAAN,KAAK,CAAC,sBAAsB,CACjC,KAAkB,EAClB,kBAAuC;QAEvC,IAAA,2CAA+B,EAAC,kBAAkB,CAAC,CAAC;QAEpD,MAAM,sBAAS,CAAC,OAAO,CACrB,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,sBAAsB,CAAC,IAAI,CAAC,EAAE,EAAE,KAAK,CAAC,EAC7D,kBAAkB,CACnB,CAAC;IACJ,CAAC;IAED;;OAEG;IAEU,AAAN,KAAK,CAAC,YAAY,CACvB,MAAmB,EACnB,kBAAuC;QAEvC,IAAA,2CAA+B,EAAC,kBAAkB,CAAC,CAAC;QAEpD,IAAI,MAAM,KAAK,sBAAW,CAAC,UAAU,EAAE,CAAC;YACtC,MAAM,sBAAS,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,kBAAkB,CAAC,CAAC;QAC5F,CAAC;QAED,IAAI,IAAI,CAAC,SAAS;YAAE,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,MAAM,CAAC;IACrD,CAAC;IAED;;OAEG;IAEU,AAAN,KAAK,CAAC,WAAW,CAAC,kBAAuC;QAC9D,IAAA,2CAA+B,EAAC,kBAAkB,CAAC,CAAC;QAEpD,MAAM,sBAAS,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,kBAAkB,CAAC,CAAC;IAC3F,CAAC;IAED;;OAEG;IAEU,AAAN,KAAK,CAAC,KAAK,CAAC,kBAAuC;QACxD,IAAA,2CAA+B,EAAC,kBAAkB,CAAC,CAAC;QAEpD,MAAM,sBAAS,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,kBAAkB,CAAC,CAAC;IAC1F,CAAC;IAED;;OAEG;IAEU,AAAN,KAAK,CAAC,iBAAiB,CAC5B,eAAe,GAAG,EAAE,EACpB,kBAAuC;QAEvC,IAAA,2CAA+B,EAAC,kBAAkB,CAAC,CAAC;QAEpD,MAAM,sBAAS,CAAC,OAAO,CACrB,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,EAAE,eAAe,CAAC,EAClE,kBAAkB,CACnB,CAAC;IACJ,CAAC;IAED;;OAEG;IAEU,AAAN,KAAK,CAAC,QAAQ,CACnB,MAAmB,EACnB,eAAe,GAAG,EAAE,EACpB,kBAAuC;QAEvC,IAAA,2CAA+B,EAAC,kBAAkB,CAAC,CAAC;QAEpD,MAAM,sBAAS,CAAC,OAAO,CACrB,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,eAAe,CAAC,EACtE,kBAAkB,CACnB,CAAC;IACJ,CAAC;IAED;;OAEG;IAEU,AAAN,KAAK,CAAC,YAAY,CAAC,kBAAuC;QAC/D,IAAA,2CAA+B,EAAC,kBAAkB,CAAC,CAAC;QAEpD,MAAM,sBAAS,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,kBAAkB,CAAC,CAAC;IAC5F,CAAC;IAED;;;;;;OAMG;IAEU,AAAN,KAAK,CAAC,cAAc,CACzB,YAAuB,EACvB,KAAiB,EACjB,gBAAyB,EACzB,OAAqB,EACrB,kBAAuC,EACvC,iBAAiB,GAAG,KAAK;QAEzB,IAAA,2CAA+B,EAAC,kBAAkB,CAAC,CAAC;QACpD,OAAO,GAAG,OAAO,IAAI,GAAG,CAAC;QACzB,MAAM,YAAY,GAAc;YAC9B,GAAG,YAAY;YACf,UAAU,EAAE,IAAA,8BAAmB,EAAC,YAAY,CAAC,UAAU,CAAC;SACzD,CAAC;QACF,MAAM,MAAM,GAAmB;YAC7B,gBAAgB;YAChB,OAAO;SACR,CAAC;QAEF,MAAM,EAAE,IAAI,EAAE,GAAG,gBAAgB,EAAE,GAAG,YAAY,CAAC;QAEnD,IAAI,iBAAiB,EAAE,CAAC;YACtB,MAAM,sBAAS,CAAC,MAAM,CACpB,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,cAAc,CACnC,IAAI,CAAC,EAAE,EACP;gBACE,GAAG,gBAAgB;gBACnB,aAAa,EAAE,gBAAgB,CAAC,aAAa,IAAI,GAAG;gBACpD,gBAAgB,EAAE,gBAAgB,CAAC,gBAAgB,IAAI,GAAG;aAC3D,EACD,KAAK,EACL,IAAI,EACJ,MAAM,CACP,EACD,kBAAkB,CACnB,CAAC;QACJ,CAAC;QAED,MAAM,sBAAS,CAAC,OAAO,CACrB,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,cAAc,CACnC,IAAI,CAAC,EAAE,EACP;YACE,GAAG,gBAAgB;YACnB,aAAa,EAAE,gBAAgB,CAAC,aAAa,IAAI,GAAG;YACpD,gBAAgB,EAAE,gBAAgB,CAAC,gBAAgB,IAAI,GAAG;SAC3D,EACD,KAAK,EACL,IAAI,EACJ,MAAM,CACP,EACD,kBAAkB,CACnB,CAAC;IACJ,CAAC;IAED;;;;;OAKG;IAEU,AAAN,KAAK,CAAC,eAAe,CAC1B,aAAkC,EAClC,cAA4B,EAC5B,kBAAsC;QAEtC,IAAA,2CAA+B,EAAC,kBAAkB,CAAC,CAAC;QACpD,IAAI,aAAa,CAAC,MAAM,KAAK,cAAc,CAAC,MAAM,EAAE,CAAC;YACnD,MAAM,KAAK,CACT,kFAAkF,CACnF,CAAC;QACJ,CAAC;QAED,MAAM,QAAQ,GAAkC,EAAE,CAAC;QACnD,KAAK,IAAI,cAAc,GAAG,CAAC,EAAE,cAAc,GAAG,aAAa,CAAC,MAAM,EAAE,cAAc,EAAE,EAAE,CAAC;YACrF,MAAM,YAAY,GAAG;gBACnB,GAAG,aAAa,CAAC,cAAc,CAAC;gBAChC,UAAU,EAAE,IAAA,8BAAmB,EAAC,aAAa,CAAC,cAAc,CAAC,CAAC,UAAU,CAAC;gBACzE,aAAa,EAAE,aAAa,CAAC,cAAc,CAAC,CAAC,aAAa,IAAI,GAAG;gBACjE,gBAAgB,EAAE,aAAa,CAAC,cAAc,CAAC,CAAC,gBAAgB,IAAI,GAAG;aACxE,CAAC;YACF,MAAM,MAAM,GAAmB;gBAC7B,gBAAgB,EAAE,aAAa,CAAC,cAAc,CAAC,CAAC,QAAQ;gBACxD,OAAO,EAAE,aAAa,CAAC,cAAc,CAAC,CAAC,OAAO;aAC/C,CAAC;YAEF,MAAM,eAAe,GAAG,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,cAAc,CAC3D,IAAI,CAAC,EAAE,EACP,YAAY,EACZ,cAAc,CAAC,cAAc,CAAC,EAC9B,YAAY,CAAC,IAAI,EACjB,MAAM,CACP,CAAC;YAEF,QAAQ,CAAC,IAAI,CAAC,sBAAS,CAAC,OAAO,CAAC,eAAe,EAAE,kBAAkB,CAAC,CAAC,CAAC;QACxE,CAAC;QAED,OAAO,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,eAAyB,CAAC,CAAC;IACjF,CAAC;IAED;;;;OAIG;IACI,eAAe,CAAC,QAAsC;QAC3D,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,sBAAsB,EAAE,CAAC,CAAC;QAErE,4EAA4E;QAC5E,MAAM,WAAW,GAAG,mCAAwB,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE,CAAC;QACzE,MAAM,YAAY,GAAG,WAAW,CAAC,MAAM,CAAC,kBAAkB,EAAE,CAAC;QAC7D,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAe,EAAQ,EAAE;YAChD,IAAI,KAAK,CAAC,YAAY,CAAC,OAAO,IAAI,IAAI,CAAC,EAAE,EAAE,CAAC;gBAC1C,OAAO;YACT,CAAC;YACD,MAAM,SAAS,GAAgB,KAAK,CAAC,YAAY,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC;YACrE,IAAI,IAAI,CAAC,SAAS;gBAAE,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,SAAS,CAAC;YACtD,QAAQ,CAAC,SAAS,CAAC,CAAC;QACtB,CAAC,CAAC,CAAC;QACH,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAY,EAAE,EAAE;YACxC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrB,CAAC,CAAC,CAAC;QAEH,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC;IAC1C,CAAC;CACF;AA/cc;IADZ,IAAA,+BAAmB,GAAE;;;;yCAerB;AAkBY;IADZ,IAAA,+BAAmB,GAAE;;;;wCAMrB;AAMY;IADZ,IAAA,+BAAmB,GAAE;;;;2CAKrB;AAMY;IADZ,IAAA,+BAAmB,GAAE;;;;yCAQrB;AAMY;IADZ,IAAA,+BAAmB,GAAE;;;;2CAQrB;AAMM;IADN,IAAA,+BAAmB,GAAE;;;;mDAMrB;AAMY;IADZ,IAAA,+BAAmB,GAAE;;;;6CA+BrB;AAMM;IADN,IAAA,+BAAmB,GAAE;;;;uDAMrB;AAMM;IADN,IAAA,+BAAmB,GAAE;;;;wDAMrB;AAMM;IADN,IAAA,+BAAmB,GAAE;;;;uDAMrB;AAMM;IADN,IAAA,+BAAmB,GAAE;;;;yDAMrB;AAMY;IADZ,IAAA,+BAAmB,GAAE;;;;uCAYrB;AAMM;IADN,IAAA,+BAAmB,GAAE;;;;+CAGrB;AAMM;IADN,IAAA,+BAAmB,GAAE;;;;uCAMrB;AAMY;IADZ,IAAA,+BAAmB,GAAE;;;;yCAGrB;AAMY;IADZ,IAAA,+BAAmB,GAAE;;;;+CAGrB;AAMY;IADZ,IAAA,+BAAmB,GAAE;;;;+CAWrB;AAMY;IADZ,IAAA,+BAAmB,GAAE;;;;mDAWrB;AAMY;IADZ,IAAA,+BAAmB,GAAE;;;;yCAYrB;AAMY;IADZ,IAAA,+BAAmB,GAAE;;;;wCAKrB;AAMY;IADZ,IAAA,+BAAmB,GAAE;;;;kCAKrB;AAMY;IADZ,IAAA,+BAAmB,GAAE;;;;8CAWrB;AAMY;IADZ,IAAA,+BAAmB,GAAE;;;;qCAYrB;AAMY;IADZ,IAAA,+BAAmB,GAAE;;;;yCAKrB;AAUY;IADZ,IAAA,+BAAmB,GAAE;;;;2CAqDrB;AASY;IADZ,IAAA,+BAAmB,GAAE;;;;4CAsCrB;AA+BH,kBAAe,KAAK,CAAC"}
525
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Order.js","sourceRoot":"","sources":["../../../src/models/Order.ts"],"names":[],"mappings":"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"}