@super-protocol/sdk-js 3.16.4 → 3.17.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/dist/cjs/RIGenerator.d.ts +3 -2
- package/dist/cjs/RIGenerator.js +7 -6
- package/dist/cjs/TIIGenerator.d.ts +2 -2
- package/dist/cjs/TIIGenerator.js +32 -4
- package/dist/cjs/TeeInputGeneratorBase.d.ts +3 -3
- package/dist/cjs/TeeInputGeneratorBase.js +5 -5
- package/dist/cjs/certificates/serializer.d.ts +5 -3
- package/dist/cjs/certificates/serializer.js +26 -11
- package/dist/cjs/certificates/types.d.ts +1 -1
- package/dist/cjs/connectors/BaseConnector.d.ts +3 -3
- package/dist/cjs/connectors/BaseConnector.js +1 -1
- package/dist/cjs/connectors/BlockchainConnector.js +3 -3
- package/dist/cjs/connectors/BlockchainEventsListener.d.ts +2 -2
- package/dist/cjs/connectors/BlockchainEventsListener.js +3 -2
- package/dist/cjs/constants.d.ts +1 -3
- package/dist/cjs/constants.js +3 -7
- package/dist/cjs/contracts/abi.d.ts +1067 -1137
- package/dist/cjs/contracts/abi.js +1408 -1500
- package/dist/cjs/crypto/Crypto.d.ts +10 -13
- package/dist/cjs/crypto/Crypto.js +14 -17
- package/dist/cjs/crypto/nodejs/AES.d.ts +1 -1
- package/dist/cjs/crypto/nodejs/AES.js +2 -2
- package/dist/cjs/crypto/nodejs/ARIA.d.ts +1 -1
- package/dist/cjs/crypto/nodejs/ARIA.js +2 -2
- package/dist/cjs/errors/index.d.ts +1 -0
- package/dist/cjs/errors/index.js +4 -2
- package/dist/cjs/errors/insufficient-funds.error.d.ts +19 -0
- package/dist/cjs/errors/insufficient-funds.error.js +57 -0
- package/dist/cjs/index.d.ts +3 -6
- package/dist/cjs/index.js +6 -9
- package/dist/cjs/models/Offer.d.ts +16 -1
- package/dist/cjs/models/Offer.js +59 -9
- package/dist/cjs/models/Order.d.ts +1 -1
- package/dist/cjs/models/Order.js +11 -15
- package/dist/cjs/models/Provider.d.ts +0 -1
- package/dist/cjs/models/Provider.js +1 -7
- package/dist/cjs/models/TCB.d.ts +1 -28
- package/dist/cjs/models/TCB.js +1 -61
- package/dist/cjs/models/TeeOffer.d.ts +3 -18
- package/dist/cjs/models/TeeOffer.js +20 -106
- package/dist/cjs/providers/storage/S3StorageProvider.js +5 -5
- package/dist/cjs/providers/storage/StorageKeyValueAdapter.d.ts +1 -1
- package/dist/cjs/providers/storage/StorageKeyValueAdapter.js +7 -7
- package/dist/cjs/providers/storage/fs-storage-provider.js +35 -15
- package/dist/cjs/providers/storage/parseStorageCredentials.d.ts +1 -2
- package/dist/cjs/staticModels/Consensus.d.ts +5 -16
- package/dist/cjs/staticModels/Consensus.js +17 -86
- package/dist/cjs/staticModels/Offers.d.ts +4 -1
- package/dist/cjs/staticModels/Offers.js +9 -8
- package/dist/cjs/staticModels/OffersCommon.d.ts +3 -1
- package/dist/cjs/staticModels/OffersCommon.js +6 -2
- package/dist/cjs/staticModels/Orders.js +12 -11
- package/dist/cjs/staticModels/ProviderRewards.js +2 -2
- package/dist/cjs/staticModels/StaticModel.js +5 -5
- package/dist/cjs/staticModels/SuperproToken.d.ts +7 -7
- package/dist/cjs/staticModels/SuperproToken.js +3 -3
- package/dist/cjs/staticModels/TeeOffers.d.ts +1 -7
- package/dist/cjs/staticModels/TeeOffers.js +11 -20
- package/dist/cjs/store.d.ts +0 -1
- package/dist/cjs/store.js +1 -2
- package/dist/cjs/tee/TeeBlockVerifier.d.ts +1 -2
- package/dist/cjs/tee/TeeBlockVerifier.js +17 -24
- package/dist/cjs/tee/TeeCertificateService.d.ts +1 -1
- package/dist/cjs/tee/TeeCertificateService.js +6 -10
- package/dist/cjs/tee/statuses.d.ts +0 -7
- package/dist/cjs/tee/statuses.js +2 -10
- package/dist/cjs/types/Consensus.d.ts +10 -31
- package/dist/cjs/types/Consensus.js +2 -10
- package/dist/cjs/types/Offer.d.ts +5 -0
- package/dist/cjs/types/Order.d.ts +26 -21
- package/dist/cjs/types/Order.js +24 -17
- package/dist/cjs/types/index.d.ts +0 -1
- package/dist/cjs/types/index.js +1 -2
- package/dist/cjs/utils/CryptoKeysTransformer.js +5 -5
- package/dist/cjs/utils/TxManager.js +21 -5
- package/dist/cjs/utils/helper.d.ts +2 -8
- package/dist/cjs/utils/helper.js +6 -75
- package/dist/cjs/utils/helpers/OrderArgsHelper.d.ts +2 -2
- package/dist/cjs/utils/helpers/OrderArgsHelper.js +5 -5
- package/dist/cjs/utils/helpers/index.d.ts +1 -0
- package/dist/cjs/utils/helpers/index.js +2 -1
- package/dist/cjs/utils/helpers/streamToBuffer.d.ts +4 -0
- package/dist/cjs/utils/helpers/streamToBuffer.js +13 -0
- package/dist/cjs/utils/order/versify.js +1 -7
- package/dist/cjs/utils/rent-calculator/rent-calculator.js +2 -3
- package/dist/cjs/utils/rent-calculator/types.d.ts +0 -1
- package/dist/cjs/utils/tcb.d.ts +2 -0
- package/dist/cjs/utils/tcb.js +13 -0
- package/dist/cjs/utils/types.d.ts +0 -5
- package/dist/mjs/RIGenerator.d.ts +3 -2
- package/dist/mjs/RIGenerator.js +8 -7
- package/dist/mjs/TIIGenerator.d.ts +2 -2
- package/dist/mjs/TIIGenerator.js +32 -4
- package/dist/mjs/TeeInputGeneratorBase.d.ts +3 -3
- package/dist/mjs/TeeInputGeneratorBase.js +5 -5
- package/dist/mjs/certificates/serializer.d.ts +5 -3
- package/dist/mjs/certificates/serializer.js +26 -11
- package/dist/mjs/certificates/types.d.ts +1 -1
- package/dist/mjs/connectors/BaseConnector.d.ts +3 -3
- package/dist/mjs/connectors/BaseConnector.js +1 -1
- package/dist/mjs/connectors/BlockchainConnector.js +3 -3
- package/dist/mjs/connectors/BlockchainEventsListener.d.ts +2 -2
- package/dist/mjs/connectors/BlockchainEventsListener.js +3 -2
- package/dist/mjs/constants.d.ts +1 -3
- package/dist/mjs/constants.js +2 -6
- package/dist/mjs/contracts/abi.d.ts +1067 -1137
- package/dist/mjs/contracts/abi.js +1406 -1498
- package/dist/mjs/crypto/Crypto.d.ts +10 -13
- package/dist/mjs/crypto/Crypto.js +14 -17
- package/dist/mjs/crypto/nodejs/AES.d.ts +1 -1
- package/dist/mjs/crypto/nodejs/AES.js +2 -2
- package/dist/mjs/crypto/nodejs/ARIA.d.ts +1 -1
- package/dist/mjs/crypto/nodejs/ARIA.js +2 -2
- package/dist/mjs/errors/index.d.ts +1 -0
- package/dist/mjs/errors/index.js +2 -1
- package/dist/mjs/errors/insufficient-funds.error.d.ts +19 -0
- package/dist/mjs/errors/insufficient-funds.error.js +53 -0
- package/dist/mjs/index.d.ts +3 -6
- package/dist/mjs/index.js +4 -7
- package/dist/mjs/models/Offer.d.ts +16 -1
- package/dist/mjs/models/Offer.js +53 -3
- package/dist/mjs/models/Order.d.ts +1 -1
- package/dist/mjs/models/Order.js +11 -15
- package/dist/mjs/models/Provider.d.ts +0 -1
- package/dist/mjs/models/Provider.js +1 -7
- package/dist/mjs/models/TCB.d.ts +1 -28
- package/dist/mjs/models/TCB.js +2 -62
- package/dist/mjs/models/TeeOffer.d.ts +3 -18
- package/dist/mjs/models/TeeOffer.js +13 -99
- package/dist/mjs/providers/storage/S3StorageProvider.js +5 -5
- package/dist/mjs/providers/storage/StorageKeyValueAdapter.d.ts +1 -1
- package/dist/mjs/providers/storage/StorageKeyValueAdapter.js +7 -7
- package/dist/mjs/providers/storage/fs-storage-provider.js +35 -15
- package/dist/mjs/providers/storage/parseStorageCredentials.d.ts +1 -2
- package/dist/mjs/staticModels/Consensus.d.ts +5 -16
- package/dist/mjs/staticModels/Consensus.js +18 -87
- package/dist/mjs/staticModels/Offers.d.ts +4 -1
- package/dist/mjs/staticModels/Offers.js +9 -8
- package/dist/mjs/staticModels/OffersCommon.d.ts +3 -1
- package/dist/mjs/staticModels/OffersCommon.js +6 -2
- package/dist/mjs/staticModels/Orders.js +12 -11
- package/dist/mjs/staticModels/ProviderRewards.js +3 -3
- package/dist/mjs/staticModels/StaticModel.js +5 -5
- package/dist/mjs/staticModels/SuperproToken.d.ts +7 -7
- package/dist/mjs/staticModels/SuperproToken.js +3 -3
- package/dist/mjs/staticModels/TeeOffers.d.ts +1 -7
- package/dist/mjs/staticModels/TeeOffers.js +12 -21
- package/dist/mjs/store.d.ts +0 -1
- package/dist/mjs/store.js +2 -3
- package/dist/mjs/tee/TeeBlockVerifier.d.ts +1 -2
- package/dist/mjs/tee/TeeBlockVerifier.js +17 -24
- package/dist/mjs/tee/TeeCertificateService.d.ts +1 -1
- package/dist/mjs/tee/TeeCertificateService.js +7 -11
- package/dist/mjs/tee/statuses.d.ts +0 -7
- package/dist/mjs/tee/statuses.js +1 -9
- package/dist/mjs/types/Consensus.d.ts +10 -31
- package/dist/mjs/types/Consensus.js +1 -9
- package/dist/mjs/types/Offer.d.ts +5 -0
- package/dist/mjs/types/Order.d.ts +26 -21
- package/dist/mjs/types/Order.js +21 -17
- package/dist/mjs/types/index.d.ts +0 -1
- package/dist/mjs/types/index.js +1 -2
- package/dist/mjs/utils/CryptoKeysTransformer.js +5 -5
- package/dist/mjs/utils/TxManager.js +21 -5
- package/dist/mjs/utils/helper.d.ts +2 -8
- package/dist/mjs/utils/helper.js +5 -68
- package/dist/mjs/utils/helpers/OrderArgsHelper.d.ts +2 -2
- package/dist/mjs/utils/helpers/OrderArgsHelper.js +5 -5
- package/dist/mjs/utils/helpers/index.d.ts +1 -0
- package/dist/mjs/utils/helpers/index.js +2 -1
- package/dist/mjs/utils/helpers/streamToBuffer.d.ts +4 -0
- package/dist/mjs/utils/helpers/streamToBuffer.js +9 -0
- package/dist/mjs/utils/order/versify.js +1 -7
- package/dist/mjs/utils/rent-calculator/rent-calculator.js +2 -3
- package/dist/mjs/utils/rent-calculator/types.d.ts +0 -1
- package/dist/mjs/utils/tcb.d.ts +2 -0
- package/dist/mjs/utils/tcb.js +9 -0
- package/dist/mjs/utils/types.d.ts +0 -5
- package/package.json +8 -9
- package/dist/cjs/contracts/Campaign.d.ts +0 -1198
- package/dist/cjs/contracts/Campaign.js +0 -1554
- package/dist/cjs/contracts/adminCertificateHelperAbi.d.ts +0 -316
- package/dist/cjs/contracts/adminCertificateHelperAbi.js +0 -410
- package/dist/cjs/proto/TeeDeviceInfo.d.ts +0 -292
- package/dist/cjs/proto/TeeDeviceInfo.js +0 -491
- package/dist/cjs/staticModels/AdminCertificateHelper.d.ts +0 -24
- package/dist/cjs/staticModels/AdminCertificateHelper.js +0 -99
- package/dist/cjs/staticModels/Campaign.d.ts +0 -62
- package/dist/cjs/staticModels/Campaign.js +0 -318
- package/dist/cjs/tee/QuoteValidator.d.ts +0 -46
- package/dist/cjs/tee/QuoteValidator.js +0 -456
- package/dist/cjs/tee/TcbSerializer.d.ts +0 -20
- package/dist/cjs/tee/TcbSerializer.js +0 -27
- package/dist/cjs/types/Campaign.d.ts +0 -55
- package/dist/cjs/types/Campaign.js +0 -17
- package/dist/cjs/utils/admin-service.d.ts +0 -13
- package/dist/cjs/utils/admin-service.js +0 -73
- package/dist/mjs/contracts/Campaign.d.ts +0 -1198
- package/dist/mjs/contracts/Campaign.js +0 -1551
- package/dist/mjs/contracts/adminCertificateHelperAbi.d.ts +0 -316
- package/dist/mjs/contracts/adminCertificateHelperAbi.js +0 -407
- package/dist/mjs/proto/TeeDeviceInfo.d.ts +0 -292
- package/dist/mjs/proto/TeeDeviceInfo.js +0 -485
- package/dist/mjs/staticModels/AdminCertificateHelper.d.ts +0 -24
- package/dist/mjs/staticModels/AdminCertificateHelper.js +0 -92
- package/dist/mjs/staticModels/Campaign.d.ts +0 -62
- package/dist/mjs/staticModels/Campaign.js +0 -313
- package/dist/mjs/tee/QuoteValidator.d.ts +0 -46
- package/dist/mjs/tee/QuoteValidator.js +0 -449
- package/dist/mjs/tee/TcbSerializer.d.ts +0 -20
- package/dist/mjs/tee/TcbSerializer.js +0 -23
- package/dist/mjs/types/Campaign.d.ts +0 -55
- package/dist/mjs/types/Campaign.js +0 -14
- package/dist/mjs/utils/admin-service.d.ts +0 -13
- package/dist/mjs/utils/admin-service.js +0 -66
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { TeeOfferInfo, TransactionOptions, OfferType, Origins, BlockchainId, TokenAmount, OfferVersionInfo, OfferVersion, TeeOfferSubtype, TeeOfferAggregatedInfo } from '../types/index.js';
|
|
2
|
-
import {
|
|
3
|
-
import { GetTcbRequest } from '@super-protocol/dto-js';
|
|
2
|
+
import { TeeOfferOption, TeeOfferSlot, OptionInfo, SlotUsage, SlotInfo } from '../types/index.js';
|
|
4
3
|
declare class TeeOffer {
|
|
5
4
|
private static contract;
|
|
6
5
|
id: BlockchainId;
|
|
@@ -69,15 +68,6 @@ declare class TeeOffer {
|
|
|
69
68
|
* @param transactionOptions - object what contains alternative action account or gas limit (optional)
|
|
70
69
|
*/
|
|
71
70
|
deleteOption(optionId: BlockchainId, transactionOptions?: TransactionOptions): Promise<void>;
|
|
72
|
-
private initializeTcb;
|
|
73
|
-
private initializeTcbAndAssignBlocks;
|
|
74
|
-
/**
|
|
75
|
-
* Function initialize TCB and returns list of anothers' TCB for their checking
|
|
76
|
-
* @param deviceId - id of TEE offer
|
|
77
|
-
* @param transactionOptions - object what contains alternative action account or gas limit (optional)
|
|
78
|
-
* @returns tcbId and lists of anothers' TCB for their checking
|
|
79
|
-
*/
|
|
80
|
-
getListsForVerification(deviceId: string, transactionOptions?: TransactionOptions): Promise<GetTcbRequest>;
|
|
81
71
|
/**
|
|
82
72
|
* Returns the offer version info.
|
|
83
73
|
*/
|
|
@@ -142,11 +132,7 @@ declare class TeeOffer {
|
|
|
142
132
|
* @returns Promise<BlockchainId> Promise that resolves to the actual TCB ID
|
|
143
133
|
*/
|
|
144
134
|
getActualTcbId(): Promise<BlockchainId>;
|
|
145
|
-
|
|
146
|
-
* Function return last initialized TCB of TEE offer
|
|
147
|
-
*/
|
|
148
|
-
getInitializedTcbId(): Promise<BlockchainId>;
|
|
149
|
-
isTcbCreationAvailable(deviceId: string): Promise<boolean>;
|
|
135
|
+
isTcbCreationAvailable(pubKey: string): Promise<boolean>;
|
|
150
136
|
/**
|
|
151
137
|
* Function for fetching TEE offer provider authority account from blockchain
|
|
152
138
|
*/
|
|
@@ -159,7 +145,6 @@ declare class TeeOffer {
|
|
|
159
145
|
* Fetch offer subtype from blockchain (TEE only)
|
|
160
146
|
*/
|
|
161
147
|
getSubtype(): Promise<TeeOfferSubtype>;
|
|
162
|
-
isTeeOfferVerifying(): Promise<boolean>;
|
|
163
148
|
/**
|
|
164
149
|
* Function for fetching violationRate for this TEE offer
|
|
165
150
|
*/
|
|
@@ -185,7 +170,7 @@ declare class TeeOffer {
|
|
|
185
170
|
* @param newHardwareInfo - new offer hardware info
|
|
186
171
|
* @param transactionOptions - object what contains alternative action account or gas limit (optional)
|
|
187
172
|
*/
|
|
188
|
-
|
|
173
|
+
setTeeOfferHardwareOptionInfo(optionInfo: OptionInfo, transactionOptions?: TransactionOptions): Promise<void>;
|
|
189
174
|
/**
|
|
190
175
|
* Updates description in offer info
|
|
191
176
|
* @param description - new description
|
|
@@ -16,14 +16,12 @@ const helper_js_1 = require("../utils/helper.js");
|
|
|
16
16
|
const index_js_1 = require("../types/index.js");
|
|
17
17
|
const index_js_2 = require("../connectors/index.js");
|
|
18
18
|
const TxManager_js_1 = __importDefault(require("../utils/TxManager.js"));
|
|
19
|
-
const
|
|
19
|
+
const ethers_1 = require("ethers");
|
|
20
20
|
const TeeOffers_js_1 = __importDefault(require("../staticModels/TeeOffers.js"));
|
|
21
|
-
const index_js_3 = require("../models/index.js");
|
|
22
21
|
const dto_js_1 = require("@super-protocol/dto-js");
|
|
23
|
-
const
|
|
24
|
-
const
|
|
25
|
-
const
|
|
26
|
-
const index_js_5 = require("../errors/index.js");
|
|
22
|
+
const index_js_3 = require("../utils/schema-utils/index.js");
|
|
23
|
+
const utils_js_1 = require("../errors/utils.js");
|
|
24
|
+
const index_js_4 = require("../errors/index.js");
|
|
27
25
|
const StaticModel_js_1 = __importDefault(require("../staticModels/StaticModel.js"));
|
|
28
26
|
class TeeOffer {
|
|
29
27
|
static contract;
|
|
@@ -155,7 +153,7 @@ class TeeOffer {
|
|
|
155
153
|
async addOption(info, usage, externalId = 'default', transactionOptions) {
|
|
156
154
|
const contract = index_js_2.BlockchainConnector.getInstance().getContract();
|
|
157
155
|
(0, helper_js_1.checkIfActionAccountInitialized)(transactionOptions);
|
|
158
|
-
const formattedExternalId = (0,
|
|
156
|
+
const formattedExternalId = (0, ethers_1.encodeBytes32String)(externalId);
|
|
159
157
|
const newTeeOptionId = await StaticModel_js_1.default.createEntity({
|
|
160
158
|
txExecutorCallback: async () => {
|
|
161
159
|
await TxManager_js_1.default.execute(contract.methods.addOption(this.id, formattedExternalId, (0, helper_js_1.convertOptionInfoToRaw)(info), usage), transactionOptions);
|
|
@@ -186,54 +184,6 @@ class TeeOffer {
|
|
|
186
184
|
(0, helper_js_1.checkIfActionAccountInitialized)(transactionOptions);
|
|
187
185
|
await TxManager_js_1.default.execute(TeeOffer.contract.methods.deleteOption(this.id, optionId), transactionOptions);
|
|
188
186
|
}
|
|
189
|
-
async initializeTcb(deviceId, transactionOptions) {
|
|
190
|
-
(0, helper_js_1.checkIfActionAccountInitialized)();
|
|
191
|
-
await TxManager_js_1.default.execute(TeeOffer.contract.methods.initializeTcb(this.id, deviceId), transactionOptions);
|
|
192
|
-
}
|
|
193
|
-
async initializeTcbAndAssignBlocks(deviceId, transactionOptions) {
|
|
194
|
-
await this.initializeTcb(deviceId, transactionOptions);
|
|
195
|
-
const tcbId = await this.getInitializedTcbId();
|
|
196
|
-
const tcb = new index_js_3.TCB(tcbId);
|
|
197
|
-
await tcb.assignLastBlocksToCheck(transactionOptions);
|
|
198
|
-
await tcb.assignSuspiciousBlocksToCheck(transactionOptions);
|
|
199
|
-
return tcb;
|
|
200
|
-
}
|
|
201
|
-
/**
|
|
202
|
-
* Function initialize TCB and returns list of anothers' TCB for their checking
|
|
203
|
-
* @param deviceId - id of TEE offer
|
|
204
|
-
* @param transactionOptions - object what contains alternative action account or gas limit (optional)
|
|
205
|
-
* @returns tcbId and lists of anothers' TCB for their checking
|
|
206
|
-
*/
|
|
207
|
-
async getListsForVerification(deviceId, transactionOptions) {
|
|
208
|
-
(0, helper_js_1.checkIfActionAccountInitialized)();
|
|
209
|
-
deviceId = (0, helper_js_1.packDeviceId)(deviceId);
|
|
210
|
-
const tcb = await this.initializeTcbAndAssignBlocks(deviceId, transactionOptions);
|
|
211
|
-
const { checkingTcbIds } = await tcb.getPublicData();
|
|
212
|
-
const tcbsPublicData = await Consensus_js_1.default.getTcbsPublicData(checkingTcbIds);
|
|
213
|
-
const tcbsUtilityData = await Consensus_js_1.default.getTcbsUtilityData(checkingTcbIds);
|
|
214
|
-
const teeOfferIds = [];
|
|
215
|
-
for (const tcbId of checkingTcbIds) {
|
|
216
|
-
teeOfferIds.push(tcbsUtilityData[tcbId].teeOfferId);
|
|
217
|
-
}
|
|
218
|
-
const benchmarks = await Consensus_js_1.default.getBenchmarksByTcbIds(checkingTcbIds, teeOfferIds);
|
|
219
|
-
const tcbsForVerification = [];
|
|
220
|
-
for (const checkingTcbId of checkingTcbIds) {
|
|
221
|
-
const { checkingTcbMarks, ...otherPublicData } = tcbsPublicData[checkingTcbId];
|
|
222
|
-
const { quote, pubKey } = tcbsUtilityData[checkingTcbId];
|
|
223
|
-
tcbsForVerification.push({
|
|
224
|
-
...otherPublicData,
|
|
225
|
-
benchmark: benchmarks[checkingTcbId],
|
|
226
|
-
checkingTcbId,
|
|
227
|
-
checkingTcbMarks: checkingTcbMarks.map((mark) => mark),
|
|
228
|
-
pubKey,
|
|
229
|
-
quote,
|
|
230
|
-
});
|
|
231
|
-
}
|
|
232
|
-
return {
|
|
233
|
-
tcbId: tcb.tcbId.toString(),
|
|
234
|
-
tcbsForVerification,
|
|
235
|
-
};
|
|
236
|
-
}
|
|
237
187
|
/**
|
|
238
188
|
* Returns the offer version info.
|
|
239
189
|
*/
|
|
@@ -249,10 +199,10 @@ class TeeOffer {
|
|
|
249
199
|
metadata: JSON.parse(cleanedTeeOfferVersion.info.metadata),
|
|
250
200
|
}),
|
|
251
201
|
...(cleanedTeeOfferVersion.info.signatureKeyHash && {
|
|
252
|
-
signatureKeyHash: (0,
|
|
202
|
+
signatureKeyHash: (0, index_js_3.deserializeBySchema)(cleanedTeeOfferVersion.info.signatureKeyHash, dto_js_1.HashSchema),
|
|
253
203
|
}),
|
|
254
204
|
...(cleanedTeeOfferVersion.info.hash && {
|
|
255
|
-
hash: (0,
|
|
205
|
+
hash: (0, index_js_3.deserializeBySchema)(cleanedTeeOfferVersion.info.hash, dto_js_1.HashSchema),
|
|
256
206
|
}),
|
|
257
207
|
},
|
|
258
208
|
};
|
|
@@ -309,7 +259,7 @@ class TeeOffer {
|
|
|
309
259
|
async addSlot(info, usage, externalId = 'default', transactionOptions) {
|
|
310
260
|
(0, helper_js_1.checkIfActionAccountInitialized)(transactionOptions);
|
|
311
261
|
info = (0, helper_js_1.packSlotInfo)(info, await TeeOffers_js_1.default.getDenominator());
|
|
312
|
-
const formattedExternalId = (0,
|
|
262
|
+
const formattedExternalId = (0, ethers_1.encodeBytes32String)(externalId);
|
|
313
263
|
const newTeeSlotId = await StaticModel_js_1.default.createEntity({
|
|
314
264
|
txExecutorCallback: async () => {
|
|
315
265
|
await TxManager_js_1.default.execute(TeeOffer.contract.methods.addTeeOfferSlot(this.id, formattedExternalId, info, usage), transactionOptions);
|
|
@@ -350,9 +300,9 @@ class TeeOffer {
|
|
|
350
300
|
async setNewVersion(newVersion, versionInfo, transactionOptions) {
|
|
351
301
|
(0, helper_js_1.checkIfActionAccountInitialized)(transactionOptions);
|
|
352
302
|
const transactionCall = TeeOffer.contract.methods.setOfferNewVersion(this.id, newVersion, {
|
|
353
|
-
hash: versionInfo.hash ? (0,
|
|
303
|
+
hash: versionInfo.hash ? (0, index_js_3.serializeBySchema)(versionInfo.hash, dto_js_1.HashSchema) : '',
|
|
354
304
|
signatureKeyHash: versionInfo.signatureKeyHash
|
|
355
|
-
? (0,
|
|
305
|
+
? (0, index_js_3.serializeBySchema)(versionInfo.signatureKeyHash, dto_js_1.HashSchema)
|
|
356
306
|
: '',
|
|
357
307
|
metadata: versionInfo.metadata ? JSON.stringify(versionInfo.metadata) : '',
|
|
358
308
|
});
|
|
@@ -375,17 +325,9 @@ class TeeOffer {
|
|
|
375
325
|
getActualTcbId() {
|
|
376
326
|
return TeeOffer.contract.methods.getActualTcbId(this.id).call();
|
|
377
327
|
}
|
|
378
|
-
|
|
379
|
-
|
|
380
|
-
|
|
381
|
-
getInitializedTcbId() {
|
|
382
|
-
return TeeOffer.contract.methods.getInitializedTcbId(this.id).call();
|
|
383
|
-
}
|
|
384
|
-
async isTcbCreationAvailable(deviceId) {
|
|
385
|
-
const { offerNotBlocked, newEpochStarted, halfEpochPassed, benchmarkVerified } = (0, helper_js_1.cleanWeb3Data)(await TeeOffer.contract.methods
|
|
386
|
-
.isTcbCreationAvailable(this.id, (0, helper_js_1.packDeviceId)(deviceId))
|
|
387
|
-
.call());
|
|
388
|
-
return offerNotBlocked && newEpochStarted && halfEpochPassed && benchmarkVerified;
|
|
328
|
+
async isTcbCreationAvailable(pubKey) {
|
|
329
|
+
const { offerNotBlocked, newEpochStarted, halfEpochPassed } = (0, helper_js_1.cleanWeb3Data)(await TeeOffer.contract.methods.isTcbCreationAvailable(this.id, pubKey).call());
|
|
330
|
+
return offerNotBlocked && newEpochStarted && halfEpochPassed;
|
|
389
331
|
}
|
|
390
332
|
/**
|
|
391
333
|
* Function for fetching TEE offer provider authority account from blockchain
|
|
@@ -410,9 +352,6 @@ class TeeOffer {
|
|
|
410
352
|
this.type = await TeeOffer.contract.methods.getTeeOfferSubtype(this.id).call();
|
|
411
353
|
return this.type.toString();
|
|
412
354
|
}
|
|
413
|
-
isTeeOfferVerifying() {
|
|
414
|
-
return TeeOffer.contract.methods.isTeeOfferVerified(this.id).call();
|
|
415
|
-
}
|
|
416
355
|
/**
|
|
417
356
|
* Function for fetching violationRate for this TEE offer
|
|
418
357
|
*/
|
|
@@ -451,8 +390,8 @@ class TeeOffer {
|
|
|
451
390
|
*/
|
|
452
391
|
async setInfo(newInfo, transactionOptions) {
|
|
453
392
|
(0, helper_js_1.checkIfActionAccountInitialized)(transactionOptions);
|
|
454
|
-
const { hardwareInfo, subType, ...offerInfo } = newInfo;
|
|
455
|
-
await this.
|
|
393
|
+
const { hardwareInfo: { optionInfo }, subType, ...offerInfo } = newInfo;
|
|
394
|
+
await this.setTeeOfferHardwareOptionInfo(optionInfo, transactionOptions);
|
|
456
395
|
await TxManager_js_1.default.execute(TeeOffer.contract.methods.setTeeOfferInfo(this.id, {
|
|
457
396
|
...offerInfo,
|
|
458
397
|
subtype: subType,
|
|
@@ -465,10 +404,9 @@ class TeeOffer {
|
|
|
465
404
|
* @param newHardwareInfo - new offer hardware info
|
|
466
405
|
* @param transactionOptions - object what contains alternative action account or gas limit (optional)
|
|
467
406
|
*/
|
|
468
|
-
async
|
|
407
|
+
async setTeeOfferHardwareOptionInfo(optionInfo, transactionOptions) {
|
|
469
408
|
(0, helper_js_1.checkIfActionAccountInitialized)(transactionOptions);
|
|
470
|
-
|
|
471
|
-
await TxManager_js_1.default.execute(TeeOffer.contract.methods.setTeeOfferHardwareInfo(this.id, newHardwareInfo.slotInfo, (0, helper_js_1.convertOptionInfoToRaw)(newHardwareInfo.optionInfo)), transactionOptions);
|
|
409
|
+
await TxManager_js_1.default.execute(TeeOffer.contract.methods.setTeeOfferHardwareOptionInfo(this.id, (0, helper_js_1.convertOptionInfoToRaw)(optionInfo)), transactionOptions);
|
|
472
410
|
}
|
|
473
411
|
/**
|
|
474
412
|
* Updates description in offer info
|
|
@@ -524,9 +462,9 @@ class TeeOffer {
|
|
|
524
462
|
return await promise;
|
|
525
463
|
}
|
|
526
464
|
catch (err) {
|
|
527
|
-
const message = (0,
|
|
465
|
+
const message = (0, utils_js_1.getBcErrorMessage)(err);
|
|
528
466
|
if (message.includes('Offer not found')) {
|
|
529
|
-
throw new
|
|
467
|
+
throw new index_js_4.NotFoundError(`Offer ${this.id} not found`);
|
|
530
468
|
}
|
|
531
469
|
throw err;
|
|
532
470
|
}
|
|
@@ -580,24 +518,6 @@ __decorate([
|
|
|
580
518
|
__metadata("design:paramtypes", [String, Object]),
|
|
581
519
|
__metadata("design:returntype", Promise)
|
|
582
520
|
], TeeOffer.prototype, "deleteOption", null);
|
|
583
|
-
__decorate([
|
|
584
|
-
(0, helper_js_1.incrementMethodCall)(),
|
|
585
|
-
__metadata("design:type", Function),
|
|
586
|
-
__metadata("design:paramtypes", [String, Object]),
|
|
587
|
-
__metadata("design:returntype", Promise)
|
|
588
|
-
], TeeOffer.prototype, "initializeTcb", null);
|
|
589
|
-
__decorate([
|
|
590
|
-
(0, helper_js_1.incrementMethodCall)(),
|
|
591
|
-
__metadata("design:type", Function),
|
|
592
|
-
__metadata("design:paramtypes", [String, Object]),
|
|
593
|
-
__metadata("design:returntype", Promise)
|
|
594
|
-
], TeeOffer.prototype, "initializeTcbAndAssignBlocks", null);
|
|
595
|
-
__decorate([
|
|
596
|
-
(0, helper_js_1.incrementMethodCall)(),
|
|
597
|
-
__metadata("design:type", Function),
|
|
598
|
-
__metadata("design:paramtypes", [String, Object]),
|
|
599
|
-
__metadata("design:returntype", Promise)
|
|
600
|
-
], TeeOffer.prototype, "getListsForVerification", null);
|
|
601
521
|
__decorate([
|
|
602
522
|
(0, helper_js_1.incrementMethodCall)(),
|
|
603
523
|
__metadata("design:type", Function),
|
|
@@ -658,12 +578,6 @@ __decorate([
|
|
|
658
578
|
__metadata("design:paramtypes", []),
|
|
659
579
|
__metadata("design:returntype", Promise)
|
|
660
580
|
], TeeOffer.prototype, "getSubtype", null);
|
|
661
|
-
__decorate([
|
|
662
|
-
(0, helper_js_1.incrementMethodCall)(),
|
|
663
|
-
__metadata("design:type", Function),
|
|
664
|
-
__metadata("design:paramtypes", []),
|
|
665
|
-
__metadata("design:returntype", Promise)
|
|
666
|
-
], TeeOffer.prototype, "isTeeOfferVerifying", null);
|
|
667
581
|
__decorate([
|
|
668
582
|
(0, helper_js_1.incrementMethodCall)(),
|
|
669
583
|
__metadata("design:type", Function),
|
|
@@ -677,4 +591,4 @@ __decorate([
|
|
|
677
591
|
__metadata("design:returntype", Promise)
|
|
678
592
|
], TeeOffer.prototype, "setSubtype", null);
|
|
679
593
|
exports.default = TeeOffer;
|
|
680
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"TeeOffer.js","sourceRoot":"","sources":["../../../src/models/TeeOffer.ts"],"names":[],"mappings":"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"}
|
|
594
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"TeeOffer.js","sourceRoot":"","sources":["../../../src/models/TeeOffer.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,7 @@ exports.S3StorageProvider = void 0;
|
|
|
7
7
|
const client_s3_1 = require("@aws-sdk/client-s3");
|
|
8
8
|
const stream_1 = require("stream");
|
|
9
9
|
const getStreamChunks_js_1 = require("../../utils/helpers/getStreamChunks.js");
|
|
10
|
+
const streamToBuffer_js_1 = require("../../utils/helpers/streamToBuffer.js");
|
|
10
11
|
const path_1 = __importDefault(require("path"));
|
|
11
12
|
const helper_js_1 = require("../../utils/helper.js");
|
|
12
13
|
class S3StorageProvider {
|
|
@@ -47,17 +48,16 @@ class S3StorageProvider {
|
|
|
47
48
|
// For performance & cost optimization
|
|
48
49
|
// https://docs.storj.io/dcs/api-reference/s3-compatible-gateway/multipart-upload/multipart-part-size
|
|
49
50
|
const key = this.applyPrefix(remotePath);
|
|
50
|
-
const body = (0, helper_js_1.isNodeJS)()
|
|
51
|
-
? inputStream
|
|
52
|
-
: new Uint8Array(await inputStream.arrayBuffer());
|
|
53
51
|
if (contentLength >= this.multipartChunkSizeInBytes) {
|
|
54
52
|
return this.multipartUpload(inputStream, key, contentLength, progressListener);
|
|
55
53
|
}
|
|
54
|
+
const body = (0, helper_js_1.isNodeJS)()
|
|
55
|
+
? await (0, streamToBuffer_js_1.streamToBuffer)(inputStream)
|
|
56
|
+
: new Uint8Array(await inputStream.arrayBuffer());
|
|
56
57
|
const putObjectCommand = new client_s3_1.PutObjectCommand({
|
|
57
58
|
Body: body,
|
|
58
59
|
Bucket: this.bucket,
|
|
59
60
|
Key: key,
|
|
60
|
-
ContentLength: contentLength,
|
|
61
61
|
});
|
|
62
62
|
progressListener?.(contentLength, 0);
|
|
63
63
|
await this.s3Client.send(putObjectCommand);
|
|
@@ -207,4 +207,4 @@ class S3StorageProvider {
|
|
|
207
207
|
}
|
|
208
208
|
}
|
|
209
209
|
exports.S3StorageProvider = S3StorageProvider;
|
|
210
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
210
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"S3StorageProvider.js","sourceRoot":"","sources":["../../../../src/providers/storage/S3StorageProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@ export default class StorageKeyValueAdapter<V extends object> implements IStorag
|
|
|
12
12
|
private readonly logger?;
|
|
13
13
|
constructor(storageAccess: StorageAccess, config?: StorageKeyValueAdapterConfig);
|
|
14
14
|
protected decrypt(encryption: Encryption, key: string): Promise<V | null>;
|
|
15
|
-
protected encrypt(data: V | null, key: string):
|
|
15
|
+
protected encrypt(data: V | null, key: string): Encryption;
|
|
16
16
|
private downloadFromStorage;
|
|
17
17
|
private streamToString;
|
|
18
18
|
private storageUpload;
|
|
@@ -67,7 +67,7 @@ class StorageKeyValueAdapter {
|
|
|
67
67
|
const encryptedValue = this.hasEncryption && privateKey ? await this.encrypt(value, privateKey) : value;
|
|
68
68
|
const buffer = Buffer.from(JSON.stringify(encryptedValue));
|
|
69
69
|
await this.storageProvider.uploadFile(stream_1.Readable.from(buffer), key, buffer.byteLength);
|
|
70
|
-
this.logger?.
|
|
70
|
+
this.logger?.trace({ data: key }, 'Success uploading to storage');
|
|
71
71
|
}
|
|
72
72
|
catch (err) {
|
|
73
73
|
this.logger?.error({ err }, 'Error uploading to storage');
|
|
@@ -77,10 +77,10 @@ class StorageKeyValueAdapter {
|
|
|
77
77
|
async storageDelete(key) {
|
|
78
78
|
try {
|
|
79
79
|
await this.storageProvider.deleteObject(key);
|
|
80
|
-
this.logger?.
|
|
80
|
+
this.logger?.trace({ data: key }, 'Success deleting from storage');
|
|
81
81
|
}
|
|
82
82
|
catch (err) {
|
|
83
|
-
this.logger?.
|
|
83
|
+
this.logger?.trace({ err }, 'Error deleting from storage');
|
|
84
84
|
throw err;
|
|
85
85
|
}
|
|
86
86
|
}
|
|
@@ -90,7 +90,7 @@ class StorageKeyValueAdapter {
|
|
|
90
90
|
}
|
|
91
91
|
try {
|
|
92
92
|
const downloaded = await this.downloadFromStorage(key);
|
|
93
|
-
this.logger?.
|
|
93
|
+
this.logger?.trace({ key }, 'Success download data from storage');
|
|
94
94
|
if (!downloaded) {
|
|
95
95
|
return null;
|
|
96
96
|
}
|
|
@@ -98,7 +98,7 @@ class StorageKeyValueAdapter {
|
|
|
98
98
|
return this.hasEncryption && privateKey ? await this.decrypt(value, privateKey) : value;
|
|
99
99
|
}
|
|
100
100
|
catch (err) {
|
|
101
|
-
this.logger?.
|
|
101
|
+
this.logger?.trace({
|
|
102
102
|
err,
|
|
103
103
|
key,
|
|
104
104
|
}, 'Error download data from storage');
|
|
@@ -115,7 +115,7 @@ class StorageKeyValueAdapter {
|
|
|
115
115
|
return listObjects.filter((obj) => !obj.isFolder);
|
|
116
116
|
}
|
|
117
117
|
catch (err) {
|
|
118
|
-
this.logger?.
|
|
118
|
+
this.logger?.trace({
|
|
119
119
|
err,
|
|
120
120
|
key,
|
|
121
121
|
}, 'Error list objects from storage');
|
|
@@ -136,4 +136,4 @@ class StorageKeyValueAdapter {
|
|
|
136
136
|
}
|
|
137
137
|
}
|
|
138
138
|
exports.default = StorageKeyValueAdapter;
|
|
139
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
139
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU3RvcmFnZUtleVZhbHVlQWRhcHRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9wcm92aWRlcnMvc3RvcmFnZS9TdG9yYWdlS2V5VmFsdWVBZGFwdGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBQUEsbUNBQWtDO0FBQ2xDLG1EQUF1RjtBQUd2RixvRkFBeUQ7QUFFekQsZ0VBQWlEO0FBQ2pELHVFQUE0QztBQVE1QyxNQUFxQixzQkFBc0I7SUFHeEIsYUFBYSxDQUFVO0lBQ3ZCLGVBQWUsQ0FBbUI7SUFDbEMsTUFBTSxDQUFpQjtJQUV4QyxZQUFZLGFBQTRCLEVBQUUsTUFBcUM7UUFDN0UsSUFBSSxDQUFDLGFBQWEsRUFBRSxXQUFXLEVBQUUsQ0FBQztZQUNoQyxNQUFNLElBQUksS0FBSyxDQUFDLHNCQUFzQixDQUFDLENBQUM7UUFDMUMsQ0FBQztRQUNELE1BQU0sRUFBRSxRQUFRLEdBQUcsSUFBSSxFQUFFLGFBQWEsR0FBRyxJQUFJLEVBQUUsR0FBRyxNQUFNLElBQUksRUFBRSxDQUFDO1FBQy9ELElBQUksQ0FBQyxhQUFhLEdBQUcsYUFBYSxDQUFDO1FBQ25DLElBQUksQ0FBQyxNQUFNLEdBQUcsUUFBUSxDQUFDLENBQUMsQ0FBQyxtQkFBTSxDQUFDLEtBQUssQ0FBQyxFQUFFLEtBQUssRUFBRSxzQkFBc0IsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUM7UUFDckYsSUFBSSxDQUFDLGVBQWUsR0FBRyxJQUFBLCtCQUFrQixFQUFDLGFBQWEsQ0FBQyxDQUFDO0lBQzNELENBQUM7SUFFUyxLQUFLLENBQUMsT0FBTyxDQUFDLFVBQXNCLEVBQUUsR0FBVztRQUN6RCxJQUFJLENBQUMsVUFBVSxFQUFFLENBQUM7WUFDaEIsT0FBTyxJQUFJLENBQUM7UUFDZCxDQUFDO1FBQ0QsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDO1lBQ1QsTUFBTSxJQUFJLEtBQUssQ0FBQyxz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
|
|
@@ -42,24 +42,44 @@ class FSStorageProvider {
|
|
|
42
42
|
}
|
|
43
43
|
writeWithProgress(inputStream, outputStream, contentLength, progressListener) {
|
|
44
44
|
let bytesWritten = 0;
|
|
45
|
+
let failed = false;
|
|
45
46
|
return new Promise((resolve, reject) => {
|
|
46
|
-
outputStream.
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
progressListener(contentLength, bytesWritten);
|
|
56
|
-
}
|
|
47
|
+
outputStream.once('finish', resolve).once('error', (err) => {
|
|
48
|
+
failed = true;
|
|
49
|
+
if (!inputStream.destroyed)
|
|
50
|
+
inputStream.destroy(err);
|
|
51
|
+
reject(err);
|
|
52
|
+
});
|
|
53
|
+
outputStream.on('drain', () => {
|
|
54
|
+
if (!inputStream.destroyed && inputStream.isPaused && inputStream.isPaused()) {
|
|
55
|
+
inputStream.resume();
|
|
57
56
|
}
|
|
58
|
-
})
|
|
59
|
-
|
|
57
|
+
});
|
|
58
|
+
inputStream.on('data', (chunk) => {
|
|
59
|
+
if (failed || outputStream.destroyed || outputStream.writableEnded)
|
|
60
|
+
return;
|
|
61
|
+
let canContinue = true;
|
|
62
|
+
try {
|
|
63
|
+
canContinue = outputStream.write(chunk);
|
|
64
|
+
}
|
|
65
|
+
catch (err) {
|
|
66
|
+
failed = true;
|
|
67
|
+
if (!inputStream.destroyed)
|
|
68
|
+
inputStream.destroy(err);
|
|
69
|
+
return;
|
|
70
|
+
}
|
|
71
|
+
bytesWritten += chunk.length;
|
|
72
|
+
if (progressListener) {
|
|
73
|
+
progressListener(contentLength, bytesWritten);
|
|
74
|
+
}
|
|
75
|
+
if (!canContinue && !inputStream.destroyed)
|
|
76
|
+
inputStream.pause();
|
|
77
|
+
});
|
|
78
|
+
inputStream
|
|
79
|
+
.once('end', () => {
|
|
60
80
|
outputStream.end();
|
|
61
81
|
})
|
|
62
|
-
.
|
|
82
|
+
.once('error', (err) => outputStream.destroy(err));
|
|
63
83
|
});
|
|
64
84
|
}
|
|
65
85
|
async uploadFile(inputStream, remotePath, contentLength, progressListener) {
|
|
@@ -139,4 +159,4 @@ class FSStorageProvider {
|
|
|
139
159
|
}
|
|
140
160
|
}
|
|
141
161
|
exports.FSStorageProvider = FSStorageProvider;
|
|
142
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
162
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZnMtc3RvcmFnZS1wcm92aWRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9wcm92aWRlcnMvc3RvcmFnZS9mcy1zdG9yYWdlLXByb3ZpZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQ0EsNENBQW9CO0FBQ3BCLDJDQUE2QjtBQUk3QixvREFBc0Q7QUFFdEQsTUFBYSxpQkFBaUI7SUFDWCxNQUFNLENBQVM7SUFDZixNQUFNLENBQVM7SUFFaEMsWUFBWSxXQUEwQjtRQUNwQyxJQUFJLENBQUMsTUFBTSxHQUFHLFdBQVcsQ0FBQyxNQUFNLENBQUM7UUFDakMsSUFBSSxDQUFDLE1BQU0sR0FBRyxXQUFXLENBQUMsTUFBTSxDQUFDO0lBQ25DLENBQUM7SUFFTyxXQUFXLENBQUMsVUFBa0I7UUFDcEMsT0FBTyxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsSUFBSSxDQUFDLE1BQU0sRUFBRSxVQUFVLENBQUMsQ0FBQztJQUN6RCxDQUFDO0lBRU8saUJBQWlCLENBQ3ZCLFdBQTRCLEVBQzVCLFlBQTZCLEVBQzdCLGFBQXFCLEVBQ3JCLGdCQUEyRDtRQUUzRCxJQUFJLFlBQVksR0FBRyxDQUFDLENBQUM7UUFDckIsSUFBSSxNQUFNLEdBQUcsS0FBSyxDQUFDO1FBRW5CLE9BQU8sSUFBSSxPQUFPLENBQU8sQ0FBQyxPQUFPLEVBQUUsTUFBTSxFQUFFLEVBQUU7WUFDM0MsWUFBWSxDQUFDLElBQUksQ0FBQyxRQUFRLEVBQUUsT0FBTyxDQUFDLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDLEdBQVUsRUFBRSxFQUFFO2dCQUNoRSxNQUFNLEdBQUcsSUFBSSxDQUFDO2dCQUNkLElBQUksQ0FBQyxXQUFXLENBQUMsU0FBUztvQkFBRSxXQUFXLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDO2dCQUNyRCxNQUFNLENBQUMsR0FBRyxD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
|