@super-protocol/sdk-js 3.11.25 → 3.11.26-beta.1

package/dist/cjs/crypto/Crypto.d.ts

@@ -2,7 +2,7 @@
 /// <reference types="node" />
 /// <reference types="node" />
 /// <reference types="node" />
-import { CryptoAlgorithm, Encryption, Hash, EncryptionKey } from '@super-protocol/dto-js';
+import { CryptoAlgorithm, Encryption, Hash, EncryptionKey, type Serialized } from '@super-protocol/dto-js';
 import fs from 'fs';
 import { Readable } from 'stream';
 import { BinaryToTextEncoding, KeyObject } from 'crypto';
@@ -17,7 +17,7 @@ declare class Crypto {
      * @param encoding - encoding of key and output data
      * @returns {Promise<Encryption>} - object what contains encrypted data, key and spec to decryption
      */
-    static encrypt(content: string, encryption: Encryption): Promise<Encryption>;
+    static encrypt<T = unknown>(content: Serialized<T>, encryption: Encryption<Serialized<T>>): Promise<Encryption<Serialized<T>>>;
     /**
      * Encrypts data stream
      * @param inputStream - path to file that will be encrypted
@@ -32,7 +32,7 @@ declare class Crypto {
      * @param encryption - object what contains encrypted data, key and spec to decryption
      * @returns {Promise<string>} - decrypted string
      */
-    static decrypt(encryption: Encryption): Promise<string>;
+    static decrypt<S = unknown, T = Serialized<S>>(encryption: Encryption<T>): T;
     /**
      * Decrypts data stream
      * @param inputStream - stream with data to decrypt

package/dist/cjs/crypto/Crypto.js

@@ -27,9 +27,9 @@ class Crypto {
             case dto_js_1.CryptoAlgorithm.ARIA:
                 return await ARIA_js_1.default.encrypt(content, encryption);
             case dto_js_1.CryptoAlgorithm.ECIES:
-                return await ECIES_js_1.default.encrypt(content, encryption);
+                return ECIES_js_1.default.encrypt(content, encryption);
             case dto_js_1.CryptoAlgorithm.RSAHybrid:
-                return await RSA_Hybrid_js_1.default.encrypt(content, encryption);
+                return RSA_Hybrid_js_1.default.encrypt(content, encryption);
             default:
                 throw Error(`${encryption.algo} algorithm not supported`);
         }
@@ -59,7 +59,7 @@ class Crypto {
      * @param encryption - object what contains encrypted data, key and spec to decryption
      * @returns {Promise<string>} - decrypted string
      */
-    static async decrypt(encryption) {
+    static decrypt(encryption) {
         switch (encryption.algo) {
             case dto_js_1.CryptoAlgorithm.AES:
                 return AES_js_1.default.decrypt(encryption);
@@ -137,4 +137,4 @@ class Crypto {
     }
 }
 exports.default = Crypto;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ3J5cHRvLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NyeXB0by9DcnlwdG8udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSxtREFTZ0M7QUFFaEMsNkRBQWtDO0FBQ2xDLCtEQUFvQztBQUNwQyxpRUFBc0M7QUFDdEMsMkVBQStDO0FBQy9DLCtFQUFvRDtBQUVwRCxvREFBaUU7QUFDakUsbURBQXVEO0FBR3ZELE1BQU0sTUFBTTtJQUNWOzs7Ozs7O09BT0c7SUFDSCxNQUFNLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxPQUFlLEVBQUUsVUFBc0I7UUFDMUQsUUFBUSxVQUFVLENBQUMsSUFBSSxFQUFFLENBQUM7WUFDeEIsS0FBSyx3QkFBZSxDQUFDLEdBQUc7Z0JBQ3RCLE9BQU8sTUFBTSxnQkFBRyxDQUFDLE9BQU8sQ0FBQyxPQUFPLEVBQUUsVUFBVSxDQUFDLENBQUM7WUFFaEQsS0FBSyx3QkFBZSxDQUFDLElBQUk7Z0JBQ3ZCLE9BQU8sTUFBTSxpQkFBSSxDQUFDLE9BQU8sQ0FBQyxPQUFPLEVBQUUsVUFBVSxDQUFDLENBQUM7WUFFakQsS0FBSyx3QkFBZSxDQUFDLEtBQUs7Z0JBQ3hCLE9BQU8sTUFBTSxrQkFBSyxDQUFDLE9BQU8sQ0FBQyxPQUFPLEVBQUUsVUFBVSxDQUFDLENBQUM7WUFFbEQsS0FBSyx3QkFBZSxDQUFDLFNBQVM7Z0JBQzVCLE9BQU8sTUFBTSx1QkFBUyxDQUFDLE9BQU8sQ0FBQyxPQUFPLEVBQUUsVUFBVSxDQUFDLENBQUM7WUFFdEQ7Z0JBQ0UsTUFBTSxLQUFLLENBQUMsR0FBRyxVQUFVLENBQUMsSUFBSSwwQkFBMEIsQ0FBQyxDQUFDO1FBQzlELENBQUM7SUFDSCxDQUFDO0lBRUQ7Ozs7Ozs7T0FPRztJQUNILE1BQU0sQ0FBQyxLQUFLLENBQUMsYUFBYSxDQUN4QixXQUEwQixFQUMxQixZQUE0QixFQUM1QixVQUFzQjtRQUV0QixRQUFRLFVBQVUsQ0FBQyxJQUFJLEVBQUUs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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ3J5cHRvLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NyeXB0by9DcnlwdG8udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSxtREFVZ0M7QUFFaEMsNkRBQWtDO0FBQ2xDLCtEQUFvQztBQUNwQyxpRUFBc0M7QUFDdEMsMkVBQStDO0FBQy9DLCtFQUFvRDtBQUVwRCxvREFBaUU7QUFDakUsbURBQXVEO0FBR3ZELE1BQU0sTUFBTTtJQUNWOzs7Ozs7O09BT0c7SUFDSCxNQUFNLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FDbEIsT0FBc0IsRUFDdEIsVUFBcUM7UUFFckMsUUFBUSxVQUFVLENBQUMsSUFBSSxFQUFFLENBQUM7WUFDeEIsS0FBSyx3QkFBZSxDQUFDLEdBQUc7Z0JBQ3RCLE9BQU8sTUFBTSxnQkFBRyxDQUFDLE9BQU8sQ0FBQyxPQUFPLEVBQUUsVUFBVSxDQUFDLENBQUM7WUFFaEQsS0FBSyx3QkFBZSxDQUFDLElBQUk7Z0JBQ3ZCLE9BQU8sTUFBTSxpQkFBSSxDQUFDLE9BQU8sQ0FBQyxPQUFPLEVBQUUsVUFBVSxDQUFDLENBQUM7WUFFakQsS0FBSyx3QkFBZSxDQUFDLEtBQUs7Z0JBQ3hCLE9BQU8sa0JBQUssQ0FBQyxPQUFPLENBQUMsT0FBTyxFQUFFLFVBQVUsQ0FBQyxDQUFDO1lBRTVDLEtBQUssd0JBQWUsQ0FBQyxTQUFTO2dCQUM1QixPQUFPLHVCQUFTLENBQUMsT0FBTyxDQUFDLE9BQU8sRUFBRSxVQUFVLENBQUMsQ0FBQztZQUVoRDtnQkFDRSxNQUFNLEtBQUssQ0FBQyxHQUFHLFVBQVUsQ0FBQyxJQUFJLDBCQUEwQixDQUFDLENBQUM7UUFDOUQsQ0FBQztJQUNILENBQUM7SUFFRDs7Ozs7OztPQU9HO0lBQ0gsTUFBTSxDQUFDLEtBQUssQ0FBQyxhQUFhLENBQ3hCLFdBQTBCLEVBQzFCLFlBQTRCLEVBQzVCLFVBQXNCO1FBRXRCLFFBQVEsVUFBVSxDQUFDLElBQUksRUFBRSxDQUFDO1lB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

package/dist/cjs/models/Order.d.ts

@@ -32,7 +32,6 @@ declare class Order {
      * Function for fetching hold deposits sum of the order and its suborders
      */
     calculateTotalOrderDeposit(): Promise<TokenAmount>;
-    calculateOrderOutputReserve(): Promise<TokenAmount>;
     /**
      * Function for fetching spent deposits sum of the order and its suborders
      */
@@ -45,6 +44,7 @@ declare class Order {
     getAwaitingPayment(): Promise<boolean>;
     getDeposit(): Promise<TokenAmount>;
     getStartDate(): Promise<number>;
+    getBillingStartDate(): Promise<number>;
     calculateOrderTime(): Promise<number>;
     setAwaitingPayment(value: boolean, transactionOptions?: TransactionOptions): Promise<void>;
     updateStatus(status: OrderStatus, transactionOptions?: TransactionOptions): Promise<void>;

package/dist/cjs/models/Order.js

@@ -164,12 +164,6 @@ class Order {
             .call()
             .then((price) => price.toString());
     }
-    calculateOrderOutputReserve() {
-        return Order.contract.methods
-            .calculateOrderOutputReserve(this.id)
-            .call()
-            .then((price) => price.toString());
-    }
     /**
      * Function for fetching spent deposits sum of the order and its suborders
      */
@@ -207,6 +201,9 @@ class Order {
     async getStartDate() {
         return Number(await Order.contract.methods.getStartDate(this.id).call());
     }
+    async getBillingStartDate() {
+        return Number(await Order.contract.methods.getBillingStartDate(this.id).call());
+    }
     async calculateOrderTime() {
         return Number(await Order.contract.methods.calculateOrderTime(this.id).call());
     }
@@ -391,12 +388,6 @@ __decorate([
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
 ], Order.prototype, "calculateTotalOrderDeposit", null);
-__decorate([
-    (0, helper_js_1.incrementMethodCall)(),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", []),
-    __metadata("design:returntype", Promise)
-], Order.prototype, "calculateOrderOutputReserve", null);
 __decorate([
     (0, helper_js_1.incrementMethodCall)(),
     __metadata("design:type", Function),
@@ -433,6 +424,12 @@ __decorate([
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
 ], Order.prototype, "getStartDate", null);
+__decorate([
+    (0, helper_js_1.incrementMethodCall)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], Order.prototype, "getBillingStartDate", null);
 __decorate([
     (0, helper_js_1.incrementMethodCall)(),
     __metadata("design:type", Function),
@@ -488,4 +485,4 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], Order.prototype, "createSubOrders", null);
 exports.default = Order;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Order.js","sourceRoot":"","sources":["../../../src/models/Order.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Order.js","sourceRoot":"","sources":["../../../src/models/Order.ts"],"names":[],"mappings":"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"}

package/dist/cjs/types/Order.d.ts

@@ -1,6 +1,6 @@
 import { BytesLike } from 'ethers/lib/utils.js';
 import { TokenAmount, BlockchainId } from './Web3.js';
-import { EncryptionKey, RuntimeInputInfo, Hash, SlotInfo } from '@super-protocol/dto-js';
+import { EncryptionKey, RuntimeInputInfo, Hash, SlotInfo, StorageAccessCredentials, Encryption, type Serialized } from '@super-protocol/dto-js';
 import { OrderUsage, OrderUsageRaw, Origins, SlotUsage } from '../types/index.js';
 export declare enum OrderStatus {
     New = "0",
@@ -14,10 +14,12 @@ export declare enum OrderStatus {
 }
 export type OrderArgs = {
     inputOffersIds: BlockchainId[];
-    outputOfferId: BlockchainId;
     inputOffersVersions: number[];
-    outputOfferVersion: number;
 };
+export type OrderArgsRaw = {
+    outputOfferId_DEPRECATED: BlockchainId;
+    outputOfferVersion_DEPRECATED: number;
+} & OrderArgs;
 export type OrderSlots = {
     slotId: BlockchainId;
     slotCount: number;
@@ -26,7 +28,7 @@ export type OrderSlots = {
 };
 export type OrderResultInfo = {
     publicKey: string;
-    encryptedInfo: string;
+    encryptedInfo: Serialized<Encryption<Serialized<OrderEncryptedInfo>>>;
 };
 export type OrderInfo = {
     offerId: BlockchainId;
@@ -42,16 +44,17 @@ export type OrderInfo = {
 };
 export type OrderInfoRaw = {
     offerId: BlockchainId;
-    resultInfo: string;
+    resultInfo: Serialized<OrderResultInfo>;
     status: OrderStatus;
     externalId: BytesLike;
     expectedPrice: TokenAmount;
     maxPriceSlippage: TokenAmount;
+    args: OrderArgsRaw;
     offerVersion: number;
     tokenAddress?: string;
 };
 export declare const orderInfoToRaw: (orderInfo: OrderInfo) => OrderInfoRaw;
-export declare const orderInfoFromRaw: (orderInfoBch: OrderInfoRaw, args: OrderArgs) => OrderInfo;
+export declare const orderInfoFromRaw: (orderInfoBch: OrderInfoRaw, args: OrderArgsRaw) => OrderInfo;
 export type ExtendedOrderInfo = OrderInfo & {
     blocking: boolean;
     deposit: TokenAmount;
@@ -71,7 +74,7 @@ export type AggregatedOrderInfoRaw = {
     consumer: string;
     deposit: TokenAmount;
     info: OrderInfoRaw;
-    args: OrderArgs;
+    args: OrderArgsRaw;
     result: OrderResult;
     selectedSlotInfo: SlotInfo;
     selectedSlotUsage: SlotUsage;
@@ -111,6 +114,7 @@ export type OrderEncryptedInfo = {
     publicKey: EncryptionKey;
     runtimeInputInfos: RuntimeInputInfo[];
     argsHash?: Hash;
+    storage?: StorageAccessCredentials;
 };
 export type PriceTypeFilter = {
     includeFixed: boolean;

package/dist/cjs/types/Order.js

@@ -1,8 +1,13 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.aggregatedOrderInfoFromRaw = exports.orderInfoFromRaw = exports.orderInfoToRaw = exports.OrderStatus = void 0;
 const utils_js_1 = require("ethers/lib/utils.js");
+const dto_js_1 = require("@super-protocol/dto-js");
 const helper_js_1 = require("../utils/helper.js");
+const logger_js_1 = __importDefault(require("../logger.js"));
 var OrderStatus;
 (function (OrderStatus) {
     OrderStatus["New"] = "0";
@@ -14,6 +19,7 @@ var OrderStatus;
     OrderStatus["Blocked"] = "6";
     OrderStatus["Suspended"] = "7";
 })(OrderStatus || (exports.OrderStatus = OrderStatus = {}));
+const logger = logger_js_1.default.child({ module: 'Order' });
 const orderInfoToRaw = (orderInfo) => {
     const resultInfo = JSON.stringify({
         publicKey: orderInfo.resultInfo.publicKey,
@@ -29,20 +35,22 @@ const orderInfoToRaw = (orderInfo) => {
         maxPriceSlippage: orderInfo.maxPriceSlippage ?? '0',
         offerVersion: orderInfo.offerVersion,
         tokenAddress: orderInfo.tokenAddress,
+        args: {
+            ...orderInfo.args,
+            outputOfferId_DEPRECATED: '0',
+            outputOfferVersion_DEPRECATED: 0,
+        },
     };
 };
 exports.orderInfoToRaw = orderInfoToRaw;
 const orderInfoFromRaw = (orderInfoBch, args) => {
-    let publicKey = '';
-    let encryptedInfo = '';
-    let encryptedArgs = '';
+    let parsedFields;
     try {
-        const parsedFields = JSON.parse(orderInfoBch.resultInfo);
-        publicKey = parsedFields.publicKey ?? publicKey;
-        encryptedInfo = parsedFields.encryptedInfo ?? encryptedInfo;
-        encryptedArgs = parsedFields.encryptedArgs ?? encryptedArgs;
+        parsedFields = (0, dto_js_1.deserialize)(orderInfoBch.resultInfo);
+    }
+    catch (e) {
+        logger.warn('Failed to parse orderInfoBch.resultInfo, using empty object as fallback:', e);
     }
-    catch (e) { }
     const parseExternalId = (externalId) => {
         try {
             return (0, utils_js_1.parseBytes32String)(externalId);
@@ -53,17 +61,17 @@ const orderInfoFromRaw = (orderInfoBch, args) => {
     };
     return {
         resultInfo: {
-            publicKey,
-            encryptedInfo,
+            publicKey: parsedFields?.publicKey ?? '',
+            encryptedInfo: parsedFields?.encryptedInfo ??
+                '',
         },
-        encryptedArgs,
+        encryptedArgs: '',
         offerId: orderInfoBch.offerId,
         status: orderInfoBch.status,
         externalId: parseExternalId(orderInfoBch.externalId),
         args: {
             ...args,
             inputOffersVersions: (args.inputOffersVersions ?? []).map(Number),
-            outputOfferVersion: Number(args.outputOfferVersion),
         },
         offerVersion: Number(orderInfoBch.offerVersion),
         tokenAddress: orderInfoBch.tokenAddress,
@@ -90,4 +98,4 @@ function aggregatedOrderInfoFromRaw(aggregatedInfo, coresDenominator) {
     };
 }
 exports.aggregatedOrderInfoFromRaw = aggregatedOrderInfoFromRaw;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiT3JkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdHlwZXMvT3JkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsa0RBQXlGO0FBSXpGLGtEQUFvRztBQUVwRyxJQUFZLFdBU1g7QUFURCxXQUFZLFdBQVc7SUFDckIsd0JBQVMsQ0FBQTtJQUNULCtCQUFnQixDQUFBO0lBQ2hCLDhCQUFlLENBQUE7SUFDZiw2QkFBYyxDQUFBO0lBQ2QseUJBQVUsQ0FBQTtJQUNWLDBCQUFXLENBQUE7SUFDWCw0QkFBYSxDQUFBO0lBQ2IsOEJBQWUsQ0FBQTtBQUNqQixDQUFDLEVBVFcsV0FBVywyQkFBWCxXQUFXLFFBU3RCO0FBNkNNLE1BQU0sY0FBYyxHQUFHLENBQUMsU0FBb0IsRUFBZ0IsRUFBRTtJQUNuRSxNQUFNLFVBQVUsR0FBRyxJQUFJLENBQUMsU0FBUyxDQUFDO1FBQ2hDLFNBQVMsRUFBRSxTQUFTLENBQUMsVUFBVSxDQUFDLFNBQVM7UUFDekMsYUFBYSxFQUFFLFNBQVMsQ0FBQyxVQUFVLENBQUMsYUFBYTtRQUNqRCxhQUFhLEVBQUUsU0FBUyxDQUFDLGFBQWE7S0FDdkMsQ0FBQyxDQUFDO0lBQ0gsT0FBTztRQUNMLE9BQU8sRUFBRSxTQUFTLENBQUMsT0FBTztRQUMxQixVQUFVLEVBQUUsVUFBVTtRQUN0QixNQUFNLEVBQUUsU0FBUyxDQUFDLE1BQU07UUFDeEIsVUFBVSxFQUFFLElBQUEsOEJBQW1CLEVBQUMsU0FBUyxDQUFDLFVBQVUsQ0FBQztRQUNyRCxhQUFhLEVBQUUsU0FBUyxDQUFDLGFBQWEsSUFBSSxHQUFHO1FBQzdDLGdCQUFnQixFQUFFLFNBQVMsQ0FBQyxnQkFBZ0IsSUFBSSxHQUFHO1FBQ25ELFlBQVksRUFBRSxTQUFTLENBQUMsWUFBWTtRQUNwQyxZQUFZLEVBQUUsU0FBUyxDQUFDLFlBQVk7S0FDckMsQ0FBQztBQUNKLENBQUMsQ0FBQztBQWhCVyxRQUFBLGNBQWMsa0JBZ0J6QjtBQUVL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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiT3JkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdHlwZXMvT3JkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsa0RBQXlGO0FBRXpGLG1EQVNnQztBQUVoQyxrREFBb0c7QUFDcEcsNkRBQXNDO0FBRXRDLElBQVksV0FTWDtBQVRELFdBQVksV0FBVztJQUNyQix3QkFBUyxDQUFBO0lBQ1QsK0JBQWdCLENBQUE7SUFDaEIsOEJBQWUsQ0FBQTtJQUNmLDZCQUFjLENBQUE7SUFDZCx5QkFBVSxDQUFBO0lBQ1YsMEJBQVcsQ0FBQTtJQUNYLDRCQUFhLENBQUE7SUFDYiw4QkFBZSxDQUFBO0FBQ2pCLENBQUMsRUFUVyxXQUFXLDJCQUFYLFdBQVcsUUFTdEI7QUFpREQsTUFBTSxNQUFNLEdBQUcsbUJBQVUsQ0FBQyxLQUFLLENBQUMsRUFBRSxNQUFNLEVBQUUsT0FBTyxFQUFFLENBQUMsQ0FBQztBQUU5QyxNQUFNLGNBQWMsR0FBRyxDQUFDLFNBQW9CLEVBQWdCLEVBQUU7SUFDbkUsTUFBTSxVQUFVLEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQztRQUNoQyxTQUFTLEVBQUUsU0FBUyxDQUFDLFVBQVUsQ0FBQyxTQUFTO1FBQ3pDLGFBQWEsRUFBRSxTQUFTLENBQUMsVUFBVSxDQUFDLGFBQWE7UUFDakQsYUFBYSxFQUFFLFNBQVMsQ0FBQyxhQUFhO0tBQ3ZDLENBQUMsQ0FBQztJQUNILE9BQU87UUFDTCxPQUFPLEVBQUUsU0FBUyxDQUFDLE9BQU87UUFDMUIsVUFBVSxFQUFFLFVBQVU7UUFDdEIsTUFBTSxFQUFFLFNBQVMsQ0FBQyxNQUFNO1FBQ3hCLFVBQVUsRUFBRSxJQUFBLDhCQUFtQixFQUFDLFNBQVMsQ0FBQyxVQUFVLENBQUM7UUFDckQsYUFBYSxFQUFFLFNBQVMsQ0FBQyxhQUFhLElBQUksR0FBRztRQUM3QyxnQkFBZ0IsRUFBRSxTQUFTLENBQUMsZ0JBQWdCLElBQUksR0FBRztRQUNuRCxZQUFZ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

package/dist/cjs/utils/order/versify.js

@@ -16,7 +16,6 @@ const versify = async (info, isTeeOffer) => {
             : await new Offer_js_1.default(params.offerId).getLastVersionNumber();
         return actualVersion || 0;
     };
-    args.outputOfferVersion;
     return {
         ...info,
         offerVersion: await getActualOfferVersion({
@@ -26,11 +25,6 @@ const versify = async (info, isTeeOffer) => {
         }),
         args: {
             ...args,
-            outputOfferVersion: await getActualOfferVersion({
-                isTeeOffer,
-                offerId: args.outputOfferId,
-                offerVersion: args.outputOfferVersion,
-            }),
             inputOffersVersions: await Promise.all(args.inputOffersVersions.map((offerVersion, index) => getActualOfferVersion({
                 isTeeOffer: false,
                 offerId: args.inputOffersIds[index],
@@ -40,4 +34,4 @@ const versify = async (info, isTeeOffer) => {
     };
 };
 exports.versify = versify;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVyc2lmeS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy91dGlscy9vcmRlci92ZXJzaWZ5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUNBLHFFQUEwQztBQUVuQyxNQUFNLE9BQU8sR0FBRyxLQUFLLEVBQUUsSUFBZSxFQUFFLFVBQW1CLEVBQXNCLEVBQUU7SUFDeEYsTUFBTSxFQUFFLE9BQU8sRUFBRSxZQUFZLEVBQUUsSUFBSSxFQUFFLEdBQUcsSUFBSSxDQUFDO0lBQzdDLE1BQU0scUJBQXFCLEdBQUcsS0FBSyxFQUFFLE1BSXBDLEVBQW1CLEVBQUU7UUFDcEIsSUFBSSxNQUFNLENBQUMsVUFBVSxJQUFJLE1BQU0sQ0FBQyxPQUFPLEtBQUssR0FBRyxFQUFFLENBQUM7WUFDaEQsT0FBTyxNQUFNLENBQUMsWUFBWSxDQUFDO1FBQzdCLENBQUM7UUFFRCxNQUFNLGFBQWEsR0FBRyxNQUFNLENBQUMsWUFBWTtZQUN2QyxDQUFDLENBQUMsTUFBTSxDQUFDLFlBQVk7WUFDckIsQ0FBQyxDQUFDLE1BQU0sSUFBSSxrQkFBSyxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQyxvQkFBb0IsRUFBRSxDQUFDO1FBRTNELE9BQU8sYUFBYSxJQUFJLENBQUMsQ0FBQztJQUM1QixDQUFDLENBQUM7SUFFRixJQUFJLENBQUMsa0JBQWtCLENBQUM7SUFFeEIsT0FBTztRQUNMLEdBQUcsSUFBSTtRQUNQLFlBQVksRUFBRSxNQUFNLHFCQUFxQixDQUFDO1lBQ3hDLFVBQVU7WUFDVixPQUFPO1lBQ1AsWUFBWTtTQUNiLENBQUM7UUFDRixJQUFJLEVBQUU7WUFDSixHQUFHLElBQUk7WUFDUCxrQkFBa0IsRUFBRSxNQUFNLHFCQUFxQixDQUFDO2dCQUM5QyxVQUFVO2dCQUNWLE9BQU8sRUFBRSxJQUFJLENBQUMsYUFBYTtnQkFDM0IsWUFBWSxFQUFFLElBQUksQ0FBQyxrQkFBa0I7YUFDdEMsQ0FBQztZQUNGLG1CQUFtQixFQUFFLE1BQU0sT0FBTyxDQUFDLEdBQUcsQ0FDcEMsSUFBSSxDQUFDLG1CQUFtQixDQUFDLEdBQUcsQ0FBQyxDQUFDLFlBQVksRUFBRSxLQUFLLEVBQUUsRUFBRSxDQUNuRCxxQkFBcUIsQ0FBQztnQkFDcEIsVUFBVSxFQUFFLEtBQUs7Z0JBQ2pCLE9BQU8sRUFBRSxJQUFJLENBQUMsY0FBYyxDQUFDLEtBQUssQ0FBQztnQkFDbkMsWUFBWTthQUNiLENBQUMsQ0FDSCxDQUNGO1NBQ0Y7S0FDRixDQUFDO0FBQ0osQ0FBQyxDQUFDO0FBN0NXLFFBQUEsT0FBTyxXQTZDbEIifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVyc2lmeS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy91dGlscy9vcmRlci92ZXJzaWZ5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUNBLHFFQUEwQztBQUVuQyxNQUFNLE9BQU8sR0FBRyxLQUFLLEVBQUUsSUFBZSxFQUFFLFVBQW1CLEVBQXNCLEVBQUU7SUFDeEYsTUFBTSxFQUFFLE9BQU8sRUFBRSxZQUFZLEVBQUUsSUFBSSxFQUFFLEdBQUcsSUFBSSxDQUFDO0lBQzdDLE1BQU0scUJBQXFCLEdBQUcsS0FBSyxFQUFFLE1BSXBDLEVBQW1CLEVBQUU7UUFDcEIsSUFBSSxNQUFNLENBQUMsVUFBVSxJQUFJLE1BQU0sQ0FBQyxPQUFPLEtBQUssR0FBRyxFQUFFLENBQUM7WUFDaEQsT0FBTyxNQUFNLENBQUMsWUFBWSxDQUFDO1FBQzdCLENBQUM7UUFFRCxNQUFNLGFBQWEsR0FBRyxNQUFNLENBQUMsWUFBWTtZQUN2QyxDQUFDLENBQUMsTUFBTSxDQUFDLFlBQVk7WUFDckIsQ0FBQyxDQUFDLE1BQU0sSUFBSSxrQkFBSyxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQyxvQkFBb0IsRUFBRSxDQUFDO1FBRTNELE9BQU8sYUFBYSxJQUFJLENBQUMsQ0FBQztJQUM1QixDQUFDLENBQUM7SUFFRixPQUFPO1FBQ0wsR0FBRyxJQUFJO1FBQ1AsWUFBWSxFQUFFLE1BQU0scUJBQXFCLENBQUM7WUFDeEMsVUFBVTtZQUNWLE9BQU87WUFDUCxZQUFZO1NBQ2IsQ0FBQztRQUNGLElBQUksRUFBRTtZQUNKLEdBQUcsSUFBSTtZQUNQLG1CQUFtQixFQUFFLE1BQU0sT0FBTyxDQUFDLEdBQUcsQ0FDcEMsSUFBSSxDQUFDLG1CQUFtQixDQUFDLEdBQUcsQ0FBQyxDQUFDLFlBQVksRUFBRSxLQUFLLEVBQUUsRUFBRSxDQUNuRCxxQkFBcUIsQ0FBQztnQkFDcEIsVUFBVSxFQUFFLEtBQUs7Z0JBQ2pCLE9BQU8sRUFBRSxJQUFJLENBQUMsY0FBYyxDQUFDLEtBQUssQ0FBQztnQkFDbkMsWUFBWTthQUNiLENBQUMsQ0FDSCxDQUNGO1NBQ0Y7S0FDRixDQUFDO0FBQ0osQ0FBQyxDQUFDO0FBdENXLFFBQUEsT0FBTyxXQXNDbEIifQ==

package/dist/mjs/RIGenerator.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { EncryptionKey, Hash, Encryption, RuntimeInputInfo } from '@super-protocol/dto-js';
+import { EncryptionKey, Hash, Encryption, RuntimeInputInfo, StorageAccessCredentials, type Serialized } from '@super-protocol/dto-js';
 import { OrderEncryptedInfo, OrderResultInfo } from './types/index.js';
 import TeeInputGeneratorBase from './TeeInputGeneratorBase.js';
 declare class RIGenerator extends TeeInputGeneratorBase {
@@ -10,7 +10,8 @@ declare class RIGenerator extends TeeInputGeneratorBase {
         pccsServiceApiUrl: string;
         runtimeInputInfos: RuntimeInputInfo[];
         argsHash?: Hash;
+        storage?: StorageAccessCredentials;
     }): Promise<OrderResultInfo>;
-    static getResultInfo(encryptedResultInfo: Encryption, privateKey: Buffer): Promise<OrderEncryptedInfo>;
+    static getResultInfo(encryptedResultInfo: Encryption<Serialized<OrderEncryptedInfo>>, privateKey: Buffer): OrderEncryptedInfo;
 }
 export default RIGenerator;

package/dist/mjs/RIGenerator.js

@@ -1,4 +1,4 @@
-import { Encoding, CryptoAlgorithm, HashAlgorithm, } from '@super-protocol/dto-js';
+import { Encoding, CryptoAlgorithm, HashAlgorithm, serialize, deserialize, } from '@super-protocol/dto-js';
 import { createECDH } from 'crypto';
 import Crypto from './crypto/index.js';
 import TeeInputGeneratorBase from './TeeInputGeneratorBase.js';
@@ -24,21 +24,22 @@ class RIGenerator extends TeeInputGeneratorBase {
         const orderInfoToEncrypt = {
             publicKey: resultEncryption,
             runtimeInputInfos: params.runtimeInputInfos,
+            storage: params.storage,
             ...(params.argsHash && { argsHash: params.argsHash }),
         };
-        const encryptedInfo = await this.encryptByTeeBlock(params.offerId, JSON.stringify(orderInfoToEncrypt), params.pccsServiceApiUrl);
+        const encryptedInfo = await this.encryptByTeeBlock(params.offerId, serialize(orderInfoToEncrypt), params.pccsServiceApiUrl);
         return {
             publicKey: JSON.stringify(publicKey),
-            encryptedInfo: JSON.stringify(encryptedInfo),
+            encryptedInfo: serialize(encryptedInfo),
         };
     }
-    static async getResultInfo(encryptedResultInfo, privateKey) {
-        const res = await Crypto.decrypt({
+    static getResultInfo(encryptedResultInfo, privateKey) {
+        const res = Crypto.decrypt({
             ...encryptedResultInfo,
             key: privateKey.toString(encryptedResultInfo.encoding),
         });
-        return JSON.parse(res);
+        return deserialize(res);
     }
 }
 export default RIGenerator;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUklHZW5lcmF0b3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvUklHZW5lcmF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUdMLFFBQVEsRUFDUixlQUFlLEVBRWYsYUFBYSxHQUVkLE1BQU0sd0JBQXdCLENBQUM7QUFDaEMsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLFFBQVEsQ0FBQztBQUVwQyxPQUFPLE1BQU0sTUFBTSxtQkFBbUIsQ0FBQztBQUN2QyxPQUFPLHFCQUFxQixNQUFNLDRCQUE0QixDQUFDO0FBRS9ELE1BQU0sV0FBWSxTQUFRLHFCQUFxQjtJQUM3QyxNQUFNLENBQUMsS0FBSyxDQUFDLG9CQUFvQixDQUFDLG1CQUFrQztRQUNsRSxNQUFNLGlCQUFpQixHQUFHLE1BQU0sTUFBTSxDQUFDLFVBQVUsQ0FDL0MsTUFBTSxDQUFDLElBQUksQ0FBQyxtQkFBbUIsQ0FBQyxHQUFJLEVBQUUsbUJBQW1CLENBQUMsUUFBUSxDQUFDLEVBQ25FLEVBQUUsUUFBUSxFQUFFLFFBQVEsQ0FBQyxNQUFNLEVBQUUsSUFBSSxFQUFFLGFBQWEsQ0FBQyxNQUFNLEVBQUUsQ0FDMUQsQ0FBQztRQUVGLE9BQU87WUFDTCxHQUFHLEVBQUUsaUJBQWlCLENBQUMsSUFBSTtZQUMzQixRQUFRLEVBQUUsaUJBQWlCLENBQUMsUUFBUTtZQUNwQyxJQUFJLEVBQUUsZUFBZSxDQUFDLEtBQUs7U0FDNUIsQ0FBQztJQUNKLENBQUM7SUFFRCxNQUFNLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxNQU1yQjtRQUNDLE1BQU0sZ0JBQWdCLEdBQUcsTUFBTSxDQUFDLFlBQVksQ0FBQyxNQUFNLENBQUMsb0JBQW9CLENBQUMsQ0FBQztRQUUxRSxNQUFNLGlCQUFpQixHQUFHLE1BQU0sSUFBSSxDQUFDLG9CQUFvQixDQUFDLGdCQUFnQixDQUFDLENBQUM7UUFFNUUsTUFBTSxJQUFJLEdBQUcsVUFBVSxDQUFDLFdBQVcsQ0FBQyxDQUFDO1FBQ3JDLElBQUksQ0FBQyxhQUFhLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxHQUFJLEVBQUUsaUJBQWlCLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQztRQUNwRixNQUFNLFNBQVMsR0FBRztZQUNoQixHQUFHLEVBQUUsSUFBSSxDQUFDLFlBQVksQ0FBQyxpQkFBaUIsQ0FBQyxRQUFRLENBQUM7WUFDbEQsUUFBUSxFQUFFLFFBQVEsQ0FBQyxNQUFNO1lBQ3pCLElBQUksRUFBRSxlQUFlLENBQUMsS0FBSztTQUNkLENBQUM7UUFFaEIsTUFBTSxrQkFBa0IsR0FBdUI7WUFDN0MsU0FBUyxFQUFFLGdCQUFnQjtZQUMzQixpQkFBaUIsRUFBRSxNQUFNLENBQUMsaUJBQWlCO1lBQzNDLEdBQUcsQ0FBQyxNQUFNLENBQUMsUUFBUSxJQUFJLEVBQUUsUUFBUSxFQUFFLE1BQU0sQ0FBQyxRQUFRLEVBQUUsQ0FBQztTQUN0RCxDQUFDO1FBRUYsTUFBTSxhQUFhLEdBQUcsTUFBTSxJQUFJLENBQUMsaUJBQWlCLENBQ2hELE1BQU0sQ0FBQyxPQUFPLEVBQ2QsSUFBSSxDQUFDLFNBQVMsQ0FBQyxrQkFBa0IsQ0FBQyxFQUNsQyxNQUFNLENBQUMsaUJBQWlCLENBQ3pCLENBQUM7UUFFRixPQUFPO1lBQ0wsU0FBUyxFQUFFLElBQUksQ0FBQyxTQUFTLENBQUMsU0FBUyxDQUFDO1lBQ3BDLGFBQWEsRUFBRSxJQUFJLENBQUMsU0FBUyxDQUFDLGFBQWEsQ0FBQztTQUM3QyxDQUFDO0lBQ0osQ0FBQztJQUVELE1BQU0sQ0FBQyxLQUFLLENBQUMsYUFBYSxDQUN4QixtQkFBK0IsRUFDL0IsVUFBa0I7UUFFbEIsTUFBTSxHQUFHLEdBQUcsTUFBTSxNQUFNLENBQUMsT0FBTyxDQUFDO1lBQy9CLEdBQUcsbUJBQW1CO1lBQ3RCLEdBQUcsRUFBRSxVQUFVLENBQUMsUUFBUSxDQUFDLG1CQUFtQixDQUFDLFFBQVEsQ0FBQztTQUN2RCxDQUFDLENBQUM7UUFFSCxPQUFPLElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDekIsQ0FBQztDQUNGO0FBRUQsZUFBZSxXQUFXLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUklHZW5lcmF0b3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvUklHZW5lcmF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUdMLFFBQVEsRUFDUixlQUFlLEVBRWYsYUFBYSxFQUdiLFNBQVMsRUFDVCxXQUFXLEdBRVosTUFBTSx3QkFBd0IsQ0FBQztBQUNoQyxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sUUFBUSxDQUFDO0FBRXBDLE9BQU8sTUFBTSxNQUFNLG1CQUFtQixDQUFDO0FBQ3ZDLE9BQU8scUJBQXFCLE1BQU0sNEJBQTRCLENBQUM7QUFFL0QsTUFBTSxXQUFZLFNBQVEscUJBQXFCO0lBQzdDLE1BQU0sQ0FBQyxLQUFLLENBQUMsb0JBQW9CLENBQUMsbUJBQWtDO1FBQ2xFLE1BQU0saUJBQWlCLEdBQUcsTUFBTSxNQUFNLENBQUMsVUFBVSxDQUMvQyxNQUFNLENBQUMsSUFBSSxDQUFDLG1CQUFtQixDQUFDLEdBQUksRUFBRSxtQkFBbUIsQ0FBQyxRQUFRLENBQUMsRUFDbkUsRUFBRSxRQUFRLEVBQUUsUUFBUSxDQUFDLE1BQU0sRUFBRSxJQUFJLEVBQUUsYUFBYSxDQUFDLE1BQU0sRUFBRSxDQUMxRCxDQUFDO1FBRUYsT0FBTztZQUNMLEdBQUcsRUFBRSxpQkFBaUIsQ0FBQyxJQUFJO1lBQzNCLFFBQVEsRUFBRSxpQkFBaUIsQ0FBQyxRQUFRO1lBQ3BDLElBQUksRUFBRSxlQUFlLENBQUMsS0FBSztTQUM1QixDQUFDO0lBQ0osQ0FBQztJQUVELE1BQU0sQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLE1BT3JCO1FBQ0MsTUFBTSxnQkFBZ0IsR0FBRyxNQUFNLENBQUMsWUFBWSxDQUFDLE1BQU0sQ0FBQyxvQkFBb0IsQ0FBQyxDQUFDO1FBRTFFLE1BQU0saUJBQWlCLEdBQUcsTUFBTSxJQUFJLENBQUMsb0JBQW9CLENBQUMsZ0JBQWdCLENBQUMsQ0FBQztRQUU1RSxNQUFNLElBQUksR0FBRyxVQUFVLENBQUMsV0FBVyxDQUFDLENBQUM7UUFDckMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLGlCQUFpQixDQUFDLEdBQUksRUFBRSxpQkFBaUIsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDO1FBQ3BGLE1BQU0sU0FBUyxHQUFHO1lBQ2hCLEdBQUcsRUFBRSxJQUFJLENBQUMsWUFBWSxDQUFDLGlCQUFpQixDQUFDLFFBQVEsQ0FBQztZQUNsRCxRQUFRLEVBQUUsUUFBUSxDQUFDLE1BQU07WUFDekIsSUFBSSxFQUFFLGVBQWUsQ0FBQyxLQUFLO1NBQ2QsQ0FBQztRQUVoQixNQUFNLGtCQUFrQixHQUF1QjtZQUM3QyxTQUFTLEVBQUUsZ0JBQWdCO1lBQzNCLGlCQUFpQixFQUFFLE1BQU0sQ0FBQyxpQkFBaUI7WUFDM0MsT0FBTyxFQUFFLE1BQU0sQ0FBQyxPQUFPO1lBQ3ZCLEdBQUcsQ0FBQyxNQUFNLENBQUMsUUFBUSxJQUFJLEVBQUUsUUFBUSxFQUFFLE1BQU0sQ0FBQyxRQUFRLEVBQUUsQ0FBQztTQUN0RCxDQUFDO1FBRUYsTUFBTSxhQUFhLEdBQUcsTUFBTSxJQUFJLENBQUMsaUJBQWlCLENBQ2hELE1BQU0sQ0FBQyxPQUFPLEVBQ2QsU0FBUyxDQUFDLGtCQUFrQixDQUFDLEVBQzdCLE1BQU0sQ0FBQyxpQkFBaUIsQ0FDekIsQ0FBQztRQUVGLE9BQU87WUFDTCxTQUFTLEVBQUUsSUFBSSxDQUFDLFNBQVMsQ0FBQyxTQUFTLENBQUM7WUFDcEMsYUFBYSxFQUFFLFNBQVMsQ0FBQyxhQUFhLENBQUM7U0FDeEMsQ0FBQztJQUNKLENBQUM7SUFFRCxNQUFNLENBQUMsYUFBYSxDQUNsQixtQkFBK0QsRUFDL0QsVUFBa0I7UUFFbEIsTUFBTSxHQUFHLEdBQUcsTUFBTSxDQUFDLE9BQU8sQ0FBQztZQUN6QixHQUFHLG1CQUFtQjtZQUN0QixHQUFHLEVBQUUsVUFBVSxDQUFDLFFBQVEsQ0FBQyxtQkFBbUIsQ0FBQyxRQUFRLENBQUM7U0FDdkQsQ0FBQyxDQUFDO1FBRUgsT0FBTyxXQUFXLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDMUIsQ0FBQztDQUNGO0FBRUQsZUFBZSxXQUFXLENBQUMifQ==

package/dist/mjs/TeeInputGeneratorBase.d.ts

@@ -1,9 +1,9 @@
-import { Encryption, RuntimeInputInfo } from '@super-protocol/dto-js';
+import { Encryption, RuntimeInputInfo, type Serialized } from '@super-protocol/dto-js';
 import { BlockchainId, VersionedOfferId } from './types/index.js';
 export default class TeeInputGeneratorBase {
     protected static generateRiiByOfferId(offerId: VersionedOfferId): Promise<RuntimeInputInfo | null>;
     static generateRiiByOfferIds(inputOffersIds: BlockchainId[]): Promise<RuntimeInputInfo[]>;
     static generateRiiByOfferIds(inputOffersIds: VersionedOfferId[]): Promise<RuntimeInputInfo[]>;
-    static encryptByTeeBlock(offerId: string, data: string, sgxApiUrl: string): Promise<Encryption>;
+    static encryptByTeeBlock<T = unknown>(offerId: string, data: Serialized<T>, sgxApiUrl: string): Promise<Encryption<Serialized<T>>>;
     protected static getVerifiedBlockEncryption(offerId: string, sgxApiUrl: string): Promise<Encryption>;
 }

package/dist/mjs/TeeInputGeneratorBase.js

@@ -83,4 +83,4 @@ export default class TeeInputGeneratorBase {
         };
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVGVlSW5wdXRHZW5lcmF0b3JCYXNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL1RlZUlucHV0R2VuZXJhdG9yQmFzZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsZUFBZSxFQUNmLFFBQVEsR0FJVCxNQUFNLHdCQUF3QixDQUFDO0FBQ2hDLE9BQU8sRUFBRSxLQUFLLEVBQUUsR0FBRyxFQUFFLFFBQVEsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ3pELE9BQU8sRUFBMkIsU0FBUyxFQUFvQixNQUFNLGtCQUFrQixDQUFDO0FBQ3hGLE9BQU8sTUFBTSxNQUFNLG1CQUFtQixDQUFDO0FBQ3ZDLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQzdELE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUUzQyxNQUFNLGtCQUFrQixHQUFHLENBQ3pCLEdBQTJDLEVBQ2xCLEVBQUU7SUFDM0IsSUFBSSxDQUFDLEdBQUcsSUFBSSxPQUFPLEdBQUcsS0FBSyxRQUFRO1FBQUUsT0FBTyxLQUFLLENBQUM7SUFDbEQsT0FBTyxDQUNMLElBQUksSUFBSSxHQUFHLElBQUksU0FBUyxJQUFJLEdBQUcsSUFBSSxPQUFPLEdBQUcsQ0FBQyxFQUFFLEtBQUssUUFBUSxJQUFJLE9BQU8sR0FBRyxDQUFDLE9BQU8sS0FBSyxRQUFRLENBQ2pHLENBQUM7QUFDSixDQUFDLENBQUM7QUFFRixNQUFNLENBQUMsT0FBTyxPQUFPLHFCQUFxQjtJQUM5QixNQUFNLENBQUMsS0FBSyxDQUFDLG9CQUFvQixDQUN6QyxPQUF5QjtRQUV6QixNQUFNLEtBQUssR0FBVSxJQUFJLEtBQUssQ0FBQyxPQUFPLENBQUMsRUFBRSxDQUFDLENBQUM7UUFDM0MsTUFBTSxTQUFTLEdBQWMsTUFBTSxLQUFLLENBQUMsT0FBTyxFQUFFLENBQUM7UUFDbkQsTUFBTSxRQUFRLEdBQUcsS0FBSyxFQUFFLFNBQW9C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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVGVlSW5wdXRHZW5lcmF0b3JCYXNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL1RlZUlucHV0R2VuZXJhdG9yQmFzZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsZUFBZSxFQUNmLFFBQVEsR0FLVCxNQUFNLHdCQUF3QixDQUFDO0FBQ2hDLE9BQU8sRUFBRSxLQUFLLEVBQUUsR0FBRyxFQUFFLFFBQVEsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ3pELE9BQU8sRUFBMkIsU0FBUyxFQUFvQixNQUFNLGtCQUFrQixDQUFDO0FBQ3hGLE9BQU8sTUFBTSxNQUFNLG1CQUFtQixDQUFDO0FBQ3ZDLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQzdELE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUUzQyxNQUFNLGtCQUFrQixHQUFHLENBQ3pCLEdBQTJDLEVBQ2xCLEVBQUU7SUFDM0IsSUFBSSxDQUFDLEdBQUcsSUFBSSxPQUFPLEdBQUcsS0FBSyxRQUFRO1FBQUUsT0FBTyxLQUFLLENBQUM7SUFDbEQsT0FBTyxDQUNMLElBQUksSUFBSSxHQUFHLElBQUksU0FBUyxJQUFJLEdBQUcsSUFBSSxPQUFPLEdBQUcsQ0FBQyxFQUFFLEtBQUssUUFBUSxJQUFJLE9BQU8sR0FBRyxDQUFDLE9BQU8sS0FBSyxRQUFRLENBQ2pHLENBQUM7QUFDSixDQUFDLENBQUM7QUFFRixNQUFNLENBQUMsT0FBTyxPQUFPLHFCQUFxQjtJQUM5QixNQUFNLENBQUMsS0FBSyxDQUFDLG9CQUFvQixDQUN6QyxPQUF5QjtRQUV6QixNQUFNLEtBQUssR0FBVSxJQUFJLEtBQUssQ0FBQyxPQUFPLENBQUMsRUFBRSxDQUFDLENBQUM7UUFDM0MsTUFBTSxTQUFTLEdBQWMsTUFBTSxLQUFLLENBQUMsT0FBTyxFQUFFLENBQUM7UUFDbkQsTUFBTSxRQUFRLEdBQUcsS0FBSyxFQUFFLFNBQW9C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