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

package/dist/mjs/types/Order.js

@@ -1,4 +1,3 @@
-import { formatBytes32String, parseBytes32String } from 'ethers/lib/utils.js';
 export var OrderStatus;
 (function (OrderStatus) {
     OrderStatus["New"] = "0";
@@ -10,44 +9,4 @@ export var OrderStatus;
     OrderStatus["Blocked"] = "6";
     OrderStatus["Suspended"] = "7";
 })(OrderStatus || (OrderStatus = {}));
-export const orderInfoToRaw = (orderInfo) => {
-    const resultInfo = JSON.stringify({
-        publicKey: orderInfo.resultInfo.publicKey,
-        encryptedInfo: orderInfo.resultInfo.encryptedInfo,
-        encryptedArgs: orderInfo.encryptedArgs,
-    });
-    return {
-        offerId: orderInfo.offerId,
-        resultInfo: resultInfo,
-        encryptedRequirements_DEPRECATED: '',
-        encryptedArgs_DEPRECATED: '',
-        status: orderInfo.status,
-        externalId: formatBytes32String(orderInfo.externalId),
-        expectedPrice: orderInfo.expectedPrice ?? '0',
-        maxPriceSlippage: orderInfo.maxPriceSlippage ?? '0',
-    };
-};
-export const orderInfoFromRaw = (orderInfoBch, args) => {
-    let publicKey = '';
-    let encryptedInfo = '';
-    let encryptedArgs = orderInfoBch.encryptedArgs_DEPRECATED;
-    try {
-        const parsedFields = JSON.parse(orderInfoBch.resultInfo);
-        publicKey = parsedFields.publicKey ?? publicKey;
-        encryptedInfo = parsedFields.encryptedInfo ?? encryptedInfo;
-        encryptedArgs = parsedFields.encryptedArgs ?? encryptedArgs;
-    }
-    catch (e) { }
-    return {
-        resultInfo: {
-            publicKey,
-            encryptedInfo,
-        },
-        encryptedArgs,
-        offerId: orderInfoBch.offerId,
-        status: orderInfoBch.status,
-        externalId: parseBytes32String(orderInfoBch.externalId),
-        args,
-    };
-};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiT3JkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdHlwZXMvT3JkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLG1CQUFtQixFQUFFLGtCQUFrQixFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFJOUUsTUFBTSxDQUFOLElBQVksV0FTWDtBQVRELFdBQVksV0FBVztJQUNyQix3QkFBUyxDQUFBO0lBQ1QsK0JBQWdCLENBQUE7SUFDaEIsOEJBQWUsQ0FBQTtJQUNmLDZCQUFjLENBQUE7SUFDZCx5QkFBVSxDQUFBO0lBQ1YsMEJBQVcsQ0FBQTtJQUNYLDRCQUFhLENBQUE7SUFDYiw4QkFBZSxDQUFBO0FBQ2pCLENBQUMsRUFUVyxXQUFXLEtBQVgsV0FBVyxRQVN0QjtBQXVDRCxNQUFNLENBQUMsTUFBTSxjQUFjLEdBQUcsQ0FBQyxTQUFvQixFQUFnQixFQUFFO0lBQ25FLE1BQU0sVUFBVSxHQUFHLElBQUksQ0FBQyxTQUFTLENBQUM7UUFDaEMsU0FBUyxFQUFFLFNBQVMsQ0FBQyxVQUFVLENBQUMsU0FBUztRQUN6QyxhQUFhLEVBQUUsU0FBUyxDQUFDLFVBQVUsQ0FBQyxhQUFhO1FBQ2pELGFBQWEsRUFBRSxTQUFTLENBQUMsYUFBYTtLQUN2QyxDQUFDLENBQUM7SUFDSCxPQUFPO1FBQ0wsT0FBTyxFQUFFLFNBQVMsQ0FBQyxPQUFPO1FBQzFCLFVBQVUsRUFBRSxVQUFVO1FBQ3RCLGdDQUFnQyxFQUFFLEVBQUU7UUFDcEMsd0JBQXdCLEVBQUUsRUFBRTtRQUM1QixNQUFNLEVBQUUsU0FBUyxDQUFDLE1BQU07UUFDeEIsVUFBVSxFQUFFLG1CQUFtQixDQUFDLFNBQVMsQ0FBQyxVQUFVLENBQUM7UUFDckQsYUFBYSxFQUFFLFNBQVMsQ0FBQyxhQUFhLElBQUksR0FBRztRQUM3QyxnQkFBZ0IsRUFBRSxTQUFTLENBQUMsZ0JBQWdCLElBQUksR0FBRztLQUNwRCxDQUFDO0FBQ0osQ0FBQyxDQUFDO0FBRUYsTUFBTSxDQUFDLE1BQU0sZ0JBQWdCLEdBQUcsQ0FBQyxZQUEwQixFQUFFLElBQWUsRUFBYSxFQUFFO0lBQ3pGLElBQUksU0FBUyxHQUFHLEVBQUUsQ0FBQztJQUNuQixJQUFJLGFBQWEsR0FBRyxFQUFFLENBQUM7SUFDdkIsSUFBSSxhQUFhLEdBQUcsWUFBWSxDQUFDLHdCQUF3QixDQUFDO0lBQzFELElBQUksQ0FBQztRQUNILE1BQU0sWUFBWSxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsWUFBWSxDQUFDLFVBQVUsQ0FBQyxDQUFDO1FBQ3pELFNBQVMsR0FBRyxZQUFZLENBQUMsU0FBUyxJQUFJLFNBQVMsQ0FBQztRQUNoRCxhQUFhLEdBQUcsWUFBWSxDQUFDLGFBQWEsSUFBSSxhQUFhLENBQUM7UUFDNUQsYUFBYSxHQUFHLFlBQVksQ0FBQyxhQUFhLElBQUksYUFBYSxDQUFDO0lBQzlELENBQUM7SUFBQyxPQUFPLENBQUMsRUFBRSxDQUFDLENBQUEsQ0FBQztJQUVkLE9BQU87UUFDTCxVQUFVLEVBQUU7WUFDVixTQUFTO1lBQ1QsYUFBYTtTQUNkO1FBQ0QsYUFBYTtRQUNiLE9BQU8sRUFBRSxZQUFZLENBQUMsT0FBTztRQUM3QixNQUFNLEVBQUUsWUFBWSxDQUFDLE1BQU07UUFDM0IsVUFBVSxFQUFFLGtCQUFrQixDQUFDLFlBQVksQ0FBQyxVQUFVLENBQUM7UUFDdkQsSUFBSTtLQUNMLENBQUM7QUFDSixDQUFDLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiT3JkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdHlwZXMvT3JkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsTUFBTSxDQUFOLElBQVksV0FTWDtBQVRELFdBQVksV0FBVztJQUNyQix3QkFBUyxDQUFBO0lBQ1QsK0JBQWdCLENBQUE7SUFDaEIsOEJBQWUsQ0FBQTtJQUNmLDZCQUFjLENBQUE7SUFDZCx5QkFBVSxDQUFBO0lBQ1YsMEJBQVcsQ0FBQTtJQUNYLDRCQUFhLENBQUE7SUFDYiw4QkFBZSxDQUFBO0FBQ2pCLENBQUMsRUFUVyxXQUFXLEtBQVgsV0FBVyxRQVN0QiJ9

package/dist/mjs/utils/helpers/index.d.ts

@@ -1,2 +1 @@
 export * from './tryWithInterval.js';
-export * from './orderHelpers.js';

package/dist/mjs/utils/helpers/index.js

@@ -1,3 +1,2 @@
 export * from './tryWithInterval.js';
-export * from './orderHelpers.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvdXRpbHMvaGVscGVycy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLHNCQUFzQixDQUFDO0FBQ3JDLGNBQWMsbUJBQW1CLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvdXRpbHMvaGVscGVycy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLHNCQUFzQixDQUFDIn0=

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@super-protocol/sdk-js",
-  "version": "2.1.6-beta.4",
+  "version": "2.1.7-beta.0",
   "main": "dist/cjs/index.js",
   "module": "dist/mjs/index.js",
   "exports": {
@@ -38,7 +38,7 @@
   },
   "devDependencies": {
     "@super-protocol/eslint-config-typescript": "2.0.0",
-    "@types/elliptic": "^6.4.18",
+    "@types/elliptic": "^6.4.14",
     "@types/jest": "^27.0.3",
     "@types/lodash": "^4.14.176",
     "@types/lru-cache": "^7.10.10",
@@ -47,6 +47,7 @@
     "@types/node-gzip": "^1.1.0",
     "@types/ua-parser-js": "^0.7.39",
     "@types/uuid": "^9.0.7",
+    "elliptic": "^6.5.4",
     "jest": "^29.7.0",
     "net": "^1.0.2",
     "ts-jest": "^29.1.2",
@@ -58,13 +59,12 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.470.0",
     "@fidm/x509": "^1.2.1",
-    "@super-protocol/dto-js": "^0.0.35",
+    "@super-protocol/dto-js": "^0.0.30",
     "@super-protocol/tee-lib": "^0.1.2",
     "@super-protocol/uplink-nodejs": "1.2.19",
     "asn1js": "^3.0.5",
     "axios": "^1.5.1",
     "bottleneck": "^2.19.5",
-    "elliptic": "^6.5.5",
     "ethers": "^5.5.3",
     "js-encoding-utils": "^0.7.3",
     "lodash": "^4.17.21",

package/dist/cjs/utils/helpers/orderHelpers.d.ts

@@ -1,12 +0,0 @@
-import { Encryption, EncryptionKey } from '@super-protocol/dto-js';
-export declare function getDerivedPrivateKey(publicKeyEncryption: Encryption): Promise<Encryption>;
-export declare function getEncryptionKeysForOrder(params: {
-    offerId: string;
-    encryptionPrivateKey: EncryptionKey;
-    pccsServiceApiUrl: string;
-    hashes?: string[];
-    linkage?: string;
-}): Promise<{
-    publicKey: string;
-    encryptedInfo: string;
-}>;

package/dist/cjs/utils/helpers/orderHelpers.js

@@ -1,42 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getEncryptionKeysForOrder = exports.getDerivedPrivateKey = void 0;
-const dto_js_1 = require("@super-protocol/dto-js");
-const crypto_1 = require("crypto");
-const TIIGenerator_js_1 = __importDefault(require("../../TIIGenerator.js"));
-const index_js_1 = __importDefault(require("../../crypto/index.js"));
-async function getDerivedPrivateKey(publicKeyEncryption) {
-    const derivedPrivateKey = await index_js_1.default.createHash(Buffer.from(publicKeyEncryption.key, publicKeyEncryption.encoding), { encoding: dto_js_1.Encoding.base64, algo: dto_js_1.HashAlgorithm.SHA256 });
-    return {
-        key: derivedPrivateKey.hash,
-        encoding: derivedPrivateKey.encoding,
-        algo: dto_js_1.CryptoAlgorithm.ECIES,
-    };
-}
-exports.getDerivedPrivateKey = getDerivedPrivateKey;
-async function getEncryptionKeysForOrder(params) {
-    const resultEncryption = index_js_1.default.getPublicKey(params.encryptionPrivateKey);
-    const derivedPrivateKey = await getDerivedPrivateKey(resultEncryption);
-    const ecdh = (0, crypto_1.createECDH)('secp256k1');
-    ecdh.setPrivateKey(Buffer.from(derivedPrivateKey.key, derivedPrivateKey.encoding));
-    const publicKey = {
-        key: ecdh.getPublicKey(derivedPrivateKey.encoding),
-        encoding: dto_js_1.Encoding.base64,
-        algo: dto_js_1.CryptoAlgorithm.ECIES,
-    };
-    const orderInfoToEncrypt = {
-        publicKey: resultEncryption,
-        hashes: params.hashes || [],
-        linkage: params.linkage || '',
-    };
-    const encryptedInfo = await TIIGenerator_js_1.default.encryptByTeeBlock(params.offerId, JSON.stringify(orderInfoToEncrypt), params.pccsServiceApiUrl);
-    return {
-        publicKey: JSON.stringify(publicKey),
-        encryptedInfo: JSON.stringify(encryptedInfo),
-    };
-}
-exports.getEncryptionKeysForOrder = getEncryptionKeysForOrder;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3JkZXJIZWxwZXJzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL3V0aWxzL2hlbHBlcnMvb3JkZXJIZWxwZXJzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLG1EQU1nQztBQUNoQyxtQ0FBb0M7QUFDcEMsNEVBQWlEO0FBQ2pELHFFQUEyQztBQUdwQyxLQUFLLFVBQVUsb0JBQW9CLENBQUMsbUJBQStCO0lBQ3hFLE1BQU0saUJBQWlCLEdBQUcsTUFBTSxrQkFBTSxDQUFDLFVBQVUsQ0FDL0MsTUFBTSxDQUFDLElBQUksQ0FBQyxtQkFBbUIsQ0FBQyxHQUFJLEVBQUUsbUJBQW1CLENBQUMsUUFBUSxDQUFDLEVBQ25FLEVBQUUsUUFBUSxFQUFFLGlCQUFRLENBQUMsTUFBTSxFQUFFLElBQUksRUFBRSxzQkFBYSxDQUFDLE1BQU0sRUFBRSxDQUMxRCxDQUFDO0lBRUYsT0FBTztRQUNMLEdBQUcsRUFBRSxpQkFBaUIsQ0FBQyxJQUFJO1FBQzNCLFFBQVEsRUFBRSxpQkFBaUIsQ0FBQyxRQUFRO1FBQ3BDLElBQUksRUFBRSx3QkFBZSxDQUFDLEtBQUs7S0FDNUIsQ0FBQztBQUNKLENBQUM7QUFYRCxvREFXQztBQUVNLEtBQUssVUFBVSx5QkFBeUIsQ0FBQyxNQU0vQztJQUNDLE1BQU0sZ0JBQWdCLEdBQUcsa0JBQU0sQ0FBQyxZQUFZLENBQUMsTUFBTSxDQUFDLG9CQUFvQixDQUFDLENBQUM7SUFFMUUsTUFBTSxpQkFBaUIsR0FBRyxNQUFNLG9CQUFvQixDQUFDLGdCQUFnQixDQUFDLENBQUM7SUFFdkUsTUFBTSxJQUFJLEdBQUcsSUFBQSxtQkFBVSxFQUFDLFdBQVcsQ0FBQyxDQUFDO0lBQ3JDLElBQUksQ0FBQyxhQUFhLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxHQUFJLEVBQUUsaUJBQWlCLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQztJQUNwRixNQUFNLFNBQVMsR0FBRztRQUNoQixHQUFHLEVBQUUsSUFBSSxDQUFDLFlBQVksQ0FBQyxpQkFBaUIsQ0FBQyxRQUFRLENBQUM7UUFDbEQsUUFBUSxFQUFFLGlCQUFRLENBQUMsTUFBTTtRQUN6QixJQUFJLEVBQUUsd0JBQWUsQ0FBQyxLQUFLO0tBQ2QsQ0FBQztJQUVoQixNQUFNLGtCQUFrQixHQUF1QjtRQUM3QyxTQUFTLEVBQUUsZ0JBQWdCO1FBQzNCLE1BQU0sRUFBRSxNQUFNLENBQUMsTUFBTSxJQUFJLEVBQUU7UUFDM0IsT0FBTyxFQUFFLE1BQU0sQ0FBQyxPQUFPLElBQUksRUFBRTtLQUM5QixDQUFDO0lBRUYsTUFBTSxhQUFhLEdBQUcsTUFBTSx5QkFBWSxDQUFDLGlCQUFpQixDQUN4RCxNQUFNLENBQUMsT0FBTyxFQUNkLElBQUksQ0FBQyxTQUFTLENBQUMsa0JBQWtCLENBQUMsRUFDbEMsTUFBTSxDQUFDLGlCQUFpQixDQUN6QixDQUFDO0lBRUYsT0FBTztRQUNMLFNBQVMsRUFBRSxJQUFJLENBQUMsU0FBUyxDQUFDLFNBQVMsQ0FBQztRQUNwQyxhQUFhLEVBQUUsSUFBSSxDQUFDLFNBQVMsQ0FBQyxhQUFhLENBQUM7S0FDN0MsQ0FBQztBQUNKLENBQUM7QUFuQ0QsOERBbUNDIn0=

package/dist/mjs/utils/helpers/orderHelpers.d.ts

@@ -1,12 +0,0 @@
-import { Encryption, EncryptionKey } from '@super-protocol/dto-js';
-export declare function getDerivedPrivateKey(publicKeyEncryption: Encryption): Promise<Encryption>;
-export declare function getEncryptionKeysForOrder(params: {
-    offerId: string;
-    encryptionPrivateKey: EncryptionKey;
-    pccsServiceApiUrl: string;
-    hashes?: string[];
-    linkage?: string;
-}): Promise<{
-    publicKey: string;
-    encryptedInfo: string;
-}>;

package/dist/mjs/utils/helpers/orderHelpers.js

@@ -1,34 +0,0 @@
-import { CryptoAlgorithm, Encoding, HashAlgorithm, } from '@super-protocol/dto-js';
-import { createECDH } from 'crypto';
-import TIIGenerator from '../../TIIGenerator.js';
-import Crypto from '../../crypto/index.js';
-export async function getDerivedPrivateKey(publicKeyEncryption) {
-    const derivedPrivateKey = await Crypto.createHash(Buffer.from(publicKeyEncryption.key, publicKeyEncryption.encoding), { encoding: Encoding.base64, algo: HashAlgorithm.SHA256 });
-    return {
-        key: derivedPrivateKey.hash,
-        encoding: derivedPrivateKey.encoding,
-        algo: CryptoAlgorithm.ECIES,
-    };
-}
-export async function getEncryptionKeysForOrder(params) {
-    const resultEncryption = Crypto.getPublicKey(params.encryptionPrivateKey);
-    const derivedPrivateKey = await getDerivedPrivateKey(resultEncryption);
-    const ecdh = createECDH('secp256k1');
-    ecdh.setPrivateKey(Buffer.from(derivedPrivateKey.key, derivedPrivateKey.encoding));
-    const publicKey = {
-        key: ecdh.getPublicKey(derivedPrivateKey.encoding),
-        encoding: Encoding.base64,
-        algo: CryptoAlgorithm.ECIES,
-    };
-    const orderInfoToEncrypt = {
-        publicKey: resultEncryption,
-        hashes: params.hashes || [],
-        linkage: params.linkage || '',
-    };
-    const encryptedInfo = await TIIGenerator.encryptByTeeBlock(params.offerId, JSON.stringify(orderInfoToEncrypt), params.pccsServiceApiUrl);
-    return {
-        publicKey: JSON.stringify(publicKey),
-        encryptedInfo: JSON.stringify(encryptedInfo),
-    };
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3JkZXJIZWxwZXJzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL3V0aWxzL2hlbHBlcnMvb3JkZXJIZWxwZXJzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFDTCxlQUFlLEVBQ2YsUUFBUSxFQUdSLGFBQWEsR0FDZCxNQUFNLHdCQUF3QixDQUFDO0FBQ2hDLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxRQUFRLENBQUM7QUFDcEMsT0FBTyxZQUFZLE1BQU0sdUJBQXVCLENBQUM7QUFDakQsT0FBTyxNQUFNLE1BQU0sdUJBQXVCLENBQUM7QUFHM0MsTUFBTSxDQUFDLEtBQUssVUFBVSxvQkFBb0IsQ0FBQyxtQkFBK0I7SUFDeEUsTUFBTSxpQkFBaUIsR0FBRyxNQUFNLE1BQU0sQ0FBQyxVQUFVLENBQy9DLE1BQU0sQ0FBQyxJQUFJLENBQUMsbUJBQW1CLENBQUMsR0FBSSxFQUFFLG1CQUFtQixDQUFDLFFBQVEsQ0FBQyxFQUNuRSxFQUFFLFFBQVEsRUFBRSxRQUFRLENBQUMsTUFBTSxFQUFFLElBQUksRUFBRSxhQUFhLENBQUMsTUFBTSxFQUFFLENBQzFELENBQUM7SUFFRixPQUFPO1FBQ0wsR0FBRyxFQUFFLGlCQUFpQixDQUFDLElBQUk7UUFDM0IsUUFBUSxFQUFFLGlCQUFpQixDQUFDLFFBQVE7UUFDcEMsSUFBSSxFQUFFLGVBQWUsQ0FBQyxLQUFLO0tBQzVCLENBQUM7QUFDSixDQUFDO0FBRUQsTUFBTSxDQUFDLEtBQUssVUFBVSx5QkFBeUIsQ0FBQyxNQU0vQztJQUNDLE1BQU0sZ0JBQWdCLEdBQUcsTUFBTSxDQUFDLFlBQVksQ0FBQyxNQUFNLENBQUMsb0JBQW9CLENBQUMsQ0FBQztJQUUxRSxNQUFNLGlCQUFpQixHQUFHLE1BQU0sb0JBQW9CLENBQUMsZ0JBQWdCLENBQUMsQ0FBQztJQUV2RSxNQUFNLElBQUksR0FBRyxVQUFVLENBQUMsV0FBVyxDQUFDLENBQUM7SUFDckMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLGlCQUFpQixDQUFDLEdBQUksRUFBRSxpQkFBaUIsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDO0lBQ3BGLE1BQU0sU0FBUyxHQUFHO1FBQ2hCLEdBQUcsRUFBRSxJQUFJLENBQUMsWUFBWSxDQUFDLGlCQUFpQixDQUFDLFFBQVEsQ0FBQztRQUNsRCxRQUFRLEVBQUUsUUFBUSxDQUFDLE1BQU07UUFDekIsSUFBSSxFQUFFLGVBQWUsQ0FBQyxLQUFLO0tBQ2QsQ0FBQztJQUVoQixNQUFNLGtCQUFrQixHQUF1QjtRQUM3QyxTQUFTLEVBQUUsZ0JBQWdCO1FBQzNCLE1BQU0sRUFBRSxNQUFNLENBQUMsTUFBTSxJQUFJLEVBQUU7UUFDM0IsT0FBTyxFQUFFLE1BQU0sQ0FBQyxPQUFPLElBQUksRUFBRTtLQUM5QixDQUFDO0lBRUYsTUFBTSxhQUFhLEdBQUcsTUFBTSxZQUFZLENBQUMsaUJBQWlCLENBQ3hELE1BQU0sQ0FBQyxPQUFPLEVBQ2QsSUFBSSxDQUFDLFNBQVMsQ0FBQyxrQkFBa0IsQ0FBQyxFQUNsQyxNQUFNLENBQUMsaUJBQWlCLENBQ3pCLENBQUM7SUFFRixPQUFPO1FBQ0wsU0FBUyxFQUFFLElBQUksQ0FBQyxTQUFTLENBQUMsU0FBUyxDQUFDO1FBQ3BDLGFBQWEsRUFBRSxJQUFJLENBQUMsU0FBUyxDQUFDLGFBQWEsQ0FBQztLQUM3QyxDQUFDO0FBQ0osQ0FBQyJ9