@super-protocol/sdk-js 3.4.0-beta.2 → 3.4.0-beta.21
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/certificates/crl.d.ts +6 -0
- package/dist/cjs/certificates/crl.js +66 -0
- package/dist/cjs/certificates/helper.d.ts +23 -0
- package/dist/cjs/certificates/helper.js +176 -0
- package/dist/cjs/certificates/index.d.ts +2 -0
- package/dist/cjs/certificates/index.js +19 -0
- package/dist/cjs/certificates/ocsp.d.ts +9 -0
- package/dist/cjs/certificates/ocsp.js +124 -0
- package/dist/cjs/certificates/types.d.ts +4 -0
- package/dist/cjs/certificates/types.js +3 -0
- package/dist/cjs/connectors/BaseConnector.d.ts +1 -0
- package/dist/cjs/connectors/BaseConnector.js +1 -1
- package/dist/cjs/connectors/BlockchainConnector.js +2 -2
- package/dist/cjs/constants.d.ts +9 -0
- package/dist/cjs/constants.js +11 -2
- package/dist/cjs/contracts/abi.d.ts +8 -8
- package/dist/cjs/contracts/abi.js +9 -9
- package/dist/cjs/crypto/types.d.ts +0 -4
- package/dist/cjs/crypto/utils.d.ts +2 -3
- package/dist/cjs/crypto/utils.js +46 -26
- package/dist/cjs/crypto/utils.spec.d.ts +1 -0
- package/dist/cjs/crypto/utils.spec.js +176 -0
- package/dist/cjs/index.d.ts +2 -0
- package/dist/cjs/index.js +5 -2
- package/dist/cjs/models/Offer.js +12 -8
- package/dist/cjs/models/Order.d.ts +1 -1
- package/dist/cjs/models/Order.js +4 -2
- package/dist/cjs/providers/storage/fs-storage-provider.js +3 -4
- package/dist/cjs/staticModels/OfferResources.js +3 -3
- package/dist/cjs/staticModels/OffersStorageRequests.js +3 -3
- package/dist/cjs/staticModels/Orders.d.ts +3 -3
- package/dist/cjs/staticModels/Orders.js +9 -3
- package/dist/cjs/staticModels/SecretRequests.js +2 -2
- package/dist/cjs/store.d.ts +2 -0
- package/dist/cjs/store.js +3 -1
- package/dist/cjs/tee/OrderReportService.d.ts +0 -3
- package/dist/cjs/tee/OrderReportService.js +12 -28
- package/dist/cjs/tee/QuoteValidator.js +2 -2
- package/dist/cjs/tee/TeeCertificateService.d.ts +1 -5
- package/dist/cjs/tee/TeeCertificateService.js +20 -36
- package/dist/cjs/tee/TeeSignatureVerifier.d.ts +2 -2
- package/dist/cjs/tee/TeeSignatureVerifier.js +3 -3
- package/dist/cjs/types/Order.js +7 -3
- package/dist/cjs/utils/TxManager.d.ts +3 -1
- package/dist/cjs/utils/TxManager.js +41 -4
- package/dist/cjs/utils/helper.d.ts +1 -1
- package/dist/cjs/utils/helper.js +8 -9
- package/dist/cjs/utils/order/index.d.ts +1 -0
- package/dist/cjs/utils/order/index.js +2 -1
- package/dist/cjs/utils/order/types.d.ts +2 -3
- package/dist/cjs/utils/order/validate-order.js +18 -9
- package/dist/cjs/utils/order/versify.d.ts +2 -0
- package/dist/cjs/utils/order/versify.js +43 -0
- package/dist/mjs/certificates/crl.d.ts +6 -0
- package/dist/mjs/certificates/crl.js +39 -0
- package/dist/mjs/certificates/helper.d.ts +23 -0
- package/dist/mjs/certificates/helper.js +146 -0
- package/dist/mjs/certificates/index.d.ts +2 -0
- package/dist/mjs/certificates/index.js +3 -0
- package/dist/mjs/certificates/ocsp.d.ts +9 -0
- package/dist/mjs/certificates/ocsp.js +94 -0
- package/dist/mjs/certificates/types.d.ts +4 -0
- package/dist/mjs/certificates/types.js +2 -0
- package/dist/mjs/connectors/BaseConnector.d.ts +1 -0
- package/dist/mjs/connectors/BaseConnector.js +1 -1
- package/dist/mjs/connectors/BlockchainConnector.js +2 -2
- package/dist/mjs/constants.d.ts +9 -0
- package/dist/mjs/constants.js +10 -1
- package/dist/mjs/contracts/abi.d.ts +8 -8
- package/dist/mjs/contracts/abi.js +9 -9
- package/dist/mjs/crypto/types.d.ts +0 -4
- package/dist/mjs/crypto/utils.d.ts +2 -3
- package/dist/mjs/crypto/utils.js +46 -26
- package/dist/mjs/crypto/utils.spec.d.ts +1 -0
- package/dist/mjs/crypto/utils.spec.js +174 -0
- package/dist/mjs/index.d.ts +2 -0
- package/dist/mjs/index.js +3 -1
- package/dist/mjs/models/Offer.js +12 -8
- package/dist/mjs/models/Order.d.ts +1 -1
- package/dist/mjs/models/Order.js +4 -2
- package/dist/mjs/providers/storage/fs-storage-provider.js +3 -4
- package/dist/mjs/staticModels/OfferResources.js +3 -3
- package/dist/mjs/staticModels/OffersStorageRequests.js +3 -3
- package/dist/mjs/staticModels/Orders.d.ts +3 -3
- package/dist/mjs/staticModels/Orders.js +10 -4
- package/dist/mjs/staticModels/SecretRequests.js +2 -2
- package/dist/mjs/store.d.ts +2 -0
- package/dist/mjs/store.js +4 -2
- package/dist/mjs/tee/OrderReportService.d.ts +0 -3
- package/dist/mjs/tee/OrderReportService.js +13 -29
- package/dist/mjs/tee/QuoteValidator.js +2 -2
- package/dist/mjs/tee/TeeCertificateService.d.ts +1 -5
- package/dist/mjs/tee/TeeCertificateService.js +20 -36
- package/dist/mjs/tee/TeeSignatureVerifier.d.ts +2 -2
- package/dist/mjs/tee/TeeSignatureVerifier.js +3 -3
- package/dist/mjs/types/Order.js +7 -3
- package/dist/mjs/utils/TxManager.d.ts +3 -1
- package/dist/mjs/utils/TxManager.js +42 -5
- package/dist/mjs/utils/helper.d.ts +1 -1
- package/dist/mjs/utils/helper.js +9 -10
- package/dist/mjs/utils/order/index.d.ts +1 -0
- package/dist/mjs/utils/order/index.js +2 -1
- package/dist/mjs/utils/order/types.d.ts +2 -3
- package/dist/mjs/utils/order/validate-order.js +18 -9
- package/dist/mjs/utils/order/versify.d.ts +2 -0
- package/dist/mjs/utils/order/versify.js +36 -0
- package/package.json +4 -4
package/dist/cjs/models/Order.js
CHANGED
|
@@ -22,6 +22,7 @@ const TxManager_js_1 = __importDefault(require("../utils/TxManager.js"));
|
|
|
22
22
|
const index_js_3 = require("../utils/helpers/index.js");
|
|
23
23
|
const constants_js_1 = require("../constants.js");
|
|
24
24
|
const OrderReportService_js_1 = require("../tee/OrderReportService.js");
|
|
25
|
+
const versify_js_1 = require("../utils/order/versify.js");
|
|
25
26
|
class Order {
|
|
26
27
|
static contract;
|
|
27
28
|
logger;
|
|
@@ -235,8 +236,9 @@ class Order {
|
|
|
235
236
|
(0, helper_js_1.checkIfActionAccountInitialized)(transactionOptions);
|
|
236
237
|
await TxManager_js_1.default.execute(Order.contract.methods.completeOrder(this.id, status, encryptedResult), transactionOptions);
|
|
237
238
|
}
|
|
238
|
-
async createSubOrder(
|
|
239
|
+
async createSubOrder(inputSubOrderInfo, slots, blockParentOrder, deposit, transactionOptions, checkTxBeforeSend = false) {
|
|
239
240
|
(0, helper_js_1.checkIfActionAccountInitialized)(transactionOptions);
|
|
241
|
+
const subOrderInfo = await (0, versify_js_1.versify)(inputSubOrderInfo, false);
|
|
240
242
|
if (subOrderInfo.tokenAddress === undefined) {
|
|
241
243
|
subOrderInfo.tokenAddress = index_js_2.BlockchainConnector.getInstance().getTokenAddress();
|
|
242
244
|
}
|
|
@@ -456,4 +458,4 @@ __decorate([
|
|
|
456
458
|
__metadata("design:returntype", Promise)
|
|
457
459
|
], Order.prototype, "createSubOrders", null);
|
|
458
460
|
exports.default = Order;
|
|
459
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Order.js","sourceRoot":"","sources":["../../../src/models/Order.ts"],"names":[],"mappings":"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"}
|
|
461
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Order.js","sourceRoot":"","sources":["../../../src/models/Order.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,7 +29,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
29
29
|
exports.FSStorageProvider = void 0;
|
|
30
30
|
const fs_1 = __importDefault(require("fs"));
|
|
31
31
|
const path = __importStar(require("path"));
|
|
32
|
-
const promises_1 = require("fs/promises");
|
|
33
32
|
const index_js_1 = require("../../errors/index.js");
|
|
34
33
|
class FSStorageProvider {
|
|
35
34
|
bucket;
|
|
@@ -101,11 +100,11 @@ class FSStorageProvider {
|
|
|
101
100
|
}
|
|
102
101
|
async ensureDirectoryExists(directory, createIfNotExists = true) {
|
|
103
102
|
try {
|
|
104
|
-
await
|
|
103
|
+
await fs_1.default.promises.access(directory, fs_1.default.promises.constants.F_OK);
|
|
105
104
|
}
|
|
106
105
|
catch (error) {
|
|
107
106
|
if (createIfNotExists) {
|
|
108
|
-
await
|
|
107
|
+
await fs_1.default.promises.mkdir(directory, { recursive: true });
|
|
109
108
|
}
|
|
110
109
|
else {
|
|
111
110
|
throw new index_js_1.NotFoundError(`Directory does not exist: ${directory}`);
|
|
@@ -140,4 +139,4 @@ class FSStorageProvider {
|
|
|
140
139
|
}
|
|
141
140
|
}
|
|
142
141
|
exports.FSStorageProvider = FSStorageProvider;
|
|
143
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
142
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZnMtc3RvcmFnZS1wcm92aWRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9wcm92aWRlcnMvc3RvcmFnZS9mcy1zdG9yYWdlLXByb3ZpZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQ0EsNENBQW9CO0FBQ3BCLDJDQUE2QjtBQUk3QixvREFBc0Q7QUFFdEQsTUFBYSxpQkFBaUI7SUFDWCxNQUFNLENBQVM7SUFDZixNQUFNLENBQVM7SUFFaEMsWUFBWSxXQUEwQjtRQUNwQyxJQUFJLENBQUMsTUFBTSxHQUFHLFdBQVcsQ0FBQyxNQUFNLENBQUM7UUFDakMsSUFBSSxDQUFDLE1BQU0sR0FBRyxXQUFXLENBQUMsTUFBTSxDQUFDO0lBQ25DLENBQUM7SUFFTyxXQUFXLENBQUMsVUFBa0I7UUFDcEMsT0FBTyxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsSUFBSSxDQUFDLE1BQU0sRUFBRSxVQUFVLENBQUMsQ0FBQztJQUN6RCxDQUFDO0lBRU8saUJBQWlCLENBQ3ZCLFdBQTRCLEVBQzVCLFlBQTZCLEVBQzdCLGFBQXFCLEVBQ3JCLGdCQUEyRDtRQUUzRCxJQUFJLFlBQVksR0FBRyxDQUFDLENBQUM7UUFFckIsT0FBTyxJQUFJLE9BQU8sQ0FBTyxDQUFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsRUFBRTtZQUMzQyxZQUFZLENBQUMsRUFBRSxDQUFDLE9BQU8sRUFBRSxPQUFPLENBQUMsQ0FBQyxFQUFFLENBQUMsT0FBTyxFQUFFLE1BQU0sQ0FBQyxDQUFDO1lBQ3RELFdBQVc7aUJBQ1IsSUFBSSxDQUFDLE1BQU0sRUFBRSxDQUFDLEtBQUssRUFBRSxFQUFFO2dCQUN0QixNQUFNLFdBQVcsR0FBRyxZQUFZLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFDO2dCQUM5QyxJQUFJLENBQUMsV0FBVyxFQUFFLENBQUM7b0JBQ2pCLFdBQVcs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
|
|
@@ -94,7 +94,7 @@ class OfferResources {
|
|
|
94
94
|
const logger = this.logger.child({ method: 'onOfferResourceCreated' });
|
|
95
95
|
const onData = (event) => {
|
|
96
96
|
const parsedEvent = (0, helper_js_1.cleanWeb3Data)(event.returnValues);
|
|
97
|
-
callback(parsedEvent.offerId, parsedEvent.offerVersion, parsedEvent.teeOfferKeeperId, parsedEvent.teeOfferIssuerId, parsedEvent.transactionHash, {
|
|
97
|
+
callback(parsedEvent.offerId, Number(parsedEvent.offerVersion), parsedEvent.teeOfferKeeperId, parsedEvent.teeOfferIssuerId, parsedEvent.transactionHash, {
|
|
98
98
|
index: Number(event.blockNumber),
|
|
99
99
|
hash: event.blockHash,
|
|
100
100
|
});
|
|
@@ -113,7 +113,7 @@ class OfferResources {
|
|
|
113
113
|
const logger = this.logger.child({ method: 'onOrderResourceCreated' });
|
|
114
114
|
const onData = (event) => {
|
|
115
115
|
const parsedEvent = (0, helper_js_1.cleanWeb3Data)(event.returnValues);
|
|
116
|
-
callback(parsedEvent.requestOfferId, parsedEvent.requestOfferVersion, parsedEvent.orderId, parsedEvent.transactionHash, {
|
|
116
|
+
callback(parsedEvent.requestOfferId, Number(parsedEvent.requestOfferVersion), parsedEvent.orderId, parsedEvent.transactionHash, {
|
|
117
117
|
index: Number(event.blockNumber),
|
|
118
118
|
hash: event.blockHash,
|
|
119
119
|
});
|
|
@@ -129,4 +129,4 @@ class OfferResources {
|
|
|
129
129
|
}
|
|
130
130
|
}
|
|
131
131
|
exports.default = OfferResources;
|
|
132
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
132
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiT2ZmZXJSZXNvdXJjZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc3RhdGljTW9kZWxzL09mZmVyUmVzb3VyY2VzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBQUEscURBQXVGO0FBUXZGLGtEQUk0QjtBQUM1Qix5RUFBOEM7QUFFOUMsNkRBQXNDO0FBS3RDLGtEQUFvRDtBQUVwRCxNQUFNLGNBQWM7SUFDVixNQUFNLENBQVUsTUFBTSxHQUFHLG1CQUFVLENBQUMsS0FBSyxDQUFDLEVBQUUsU0FBUyxFQUFFLGdCQUFnQixFQUFFLENBQUMsQ0FBQztJQUU1RSxNQUFNLENBQUMsYUFBYSxDQUFDLGdCQUE4QjtRQUN4RCxNQUFNLFFBQVEsR0FBRyw4QkFBbUIsQ0FBQyxXQUFXLEVBQUUsQ0FBQyxXQUFXLEVBQUUsQ0FBQztRQUVqRSxPQUFPLFFBQVEsQ0FBQyxPQUFPO2FBQ3BCLDJCQUEyQixDQUFDLGdCQUFnQixDQUFDO2FBQzdDLElBQUksRUFBRTthQUNOLElBQUksQ0FBQyxDQUFDLFNBQTJCLEVBQUUsRUFBRSxDQUNwQyxTQUFVLENBQUMsR0FBRyxDQUFDLENBQUMsUUFBUSxFQUFFLEVBQUUsQ0FBQyxJQUFBLHVDQUEyQixFQUFDLFFBQXlCLENBQUMsQ0FBQyxDQUNyRixDQUFDO0lBQ04sQ0FBQztJQUVNLE1BQU0sQ0FBQyxhQUFhLENBQUMsZ0JBQThCO1FBQ3hELE1BQU0sUUFBUSxHQUFHLDhCQUFtQixDQUFDLFdBQVcsRUFBRSxDQUFDLFdBQVcsRUFBRSxDQUFDO1FBRWpFLE9BQU8sUUFBUSxDQUFDLE9BQU87YUFDcEIsMkJBQTJCLENBQUMsZ0JBQWdCLENBQUM7YUFDN0MsSUFBSSxFQUFFO2FBQ04sSUFBSSxDQUFDLENBQUMsU0FBMkIsRUFBRSxFQUFFLENBQ3BDLFNBQVUsQ0FBQyxHQUFHLENBQUMsQ0FBQyxRQUFRLEVBQUUsRUFBRSxDQUFDLElBQUEsdUNBQTJCLEVBQUMsUUFBeUIsQ0FBQyxDQUFD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
|
|
@@ -54,7 +54,7 @@ class OffersStorageRequests {
|
|
|
54
54
|
const logger = this.logger.child({ method: 'onOfferStorageRequestCreated' });
|
|
55
55
|
const onData = (event) => {
|
|
56
56
|
const parsedEvent = (0, helper_js_1.cleanWeb3Data)(event.returnValues);
|
|
57
|
-
callback(parsedEvent.offerId, parsedEvent.offerVersion, parsedEvent.teeOfferIssuerId, {
|
|
57
|
+
callback(parsedEvent.offerId, Number(parsedEvent.offerVersion), parsedEvent.teeOfferIssuerId, {
|
|
58
58
|
index: Number(event.blockNumber),
|
|
59
59
|
hash: event.blockHash,
|
|
60
60
|
});
|
|
@@ -73,7 +73,7 @@ class OffersStorageRequests {
|
|
|
73
73
|
const logger = this.logger.child({ method: 'onOfferStorageRequestCanceled' });
|
|
74
74
|
const onData = (event) => {
|
|
75
75
|
const parsedEvent = (0, helper_js_1.cleanWeb3Data)(event.returnValues);
|
|
76
|
-
callback(parsedEvent.offerId, parsedEvent.offerVersion, {
|
|
76
|
+
callback(parsedEvent.offerId, Number(parsedEvent.offerVersion), {
|
|
77
77
|
index: Number(event.blockNumber),
|
|
78
78
|
hash: event.blockHash,
|
|
79
79
|
});
|
|
@@ -89,4 +89,4 @@ class OffersStorageRequests {
|
|
|
89
89
|
}
|
|
90
90
|
}
|
|
91
91
|
exports.default = OffersStorageRequests;
|
|
92
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
92
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiT2ZmZXJzU3RvcmFnZVJlcXVlc3RzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3N0YXRpY01vZGVscy9PZmZlcnNTdG9yYWdlUmVxdWVzdHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSxxREFBdUY7QUFPdkYsa0RBSTRCO0FBQzVCLHlFQUE4QztBQUU5Qyw2REFBc0M7QUFNdEMsTUFBTSxxQkFBcUI7SUFDakIsTUFBTSxDQUFVLE1BQU0sR0FBRyxtQkFBVSxDQUFDLEtBQUssQ0FBQyxFQUFFLFNBQVMsRUFBRSx1QkFBdUIsRUFBRSxDQUFDLENBQUM7SUFFbkYsTUFBTSxDQUFDLEtBQUssQ0FBQyxrQkFBa0I7UUFDcEMsTUFBTSxRQUFRLEdBQUcsOEJBQW1CLENBQUMsV0FBVyxFQUFFLENBQUMsV0FBVyxFQUFFLENBQUM7UUFFakUsT0FBTyxNQUFNLENBQUMsTUFBTSxRQUFRLENBQUMsT0FBTyxDQUFDLHNDQUFzQyxFQUFFLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQztJQUN4RixDQUFDO0lBRU0sTUFBTSxDQUFDLGFBQWEsQ0FBQyxnQkFBOEI7UUFDeEQsTUFBTSxRQUFRLEdBQUcsOEJBQW1CLENBQUMsV0FBVyxFQUFFLENBQUMsV0FBVyxFQUFFLENBQUM7UUFFakUsT0FBTyxRQUFRLENBQUMsT0FBTzthQUNwQixrQ0FBa0MsQ0FBQyxnQkFBZ0IsQ0FBQzthQUNwRCxJQUFJLEVBQUU7YUFDTixJQUFJLENBQUMsQ0FBQyxrQkFBb0MsRUFBRSxFQUFFLENBQzdDLGtCQUFtQixDQUFDLEdBQUcsQ0FBQyxDQUFDLGNBQWMsRUFBRSxFQUFFLENBQ3pDLElBQUEsNkNBQWlDLEVBQUMsY0FBcUMsQ0FBQyxDQUN6RSxDQUNGLENBQUM7SUFDTixDQUFDO0lBRU0sTUFBTSxDQUFDLEtBQUssQ0FBQyxpQkFBaUIsQ0FDbkMsT0FBcUIsRUFDckIsZUFBdUIsQ0FBQztRQUV4QixNQUFNLFFBQVEsR0FBRyw4QkFBbUIs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
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { BlockchainId, BlockInfo, OptionInfo, OrderCreatedEvent, OrderInfo, OrderSlots, OrderStatus, OrderUsage, SlotInfo, SlotUsage, TokenAmount, TransactionOptions } from '../types/index.js';
|
|
2
2
|
import StaticModel from './StaticModel.js';
|
|
3
3
|
import { TransactionReceipt } from 'web3-types';
|
|
4
4
|
declare class Orders implements StaticModel {
|
|
@@ -15,12 +15,12 @@ declare class Orders implements StaticModel {
|
|
|
15
15
|
* Function for fetching orders count
|
|
16
16
|
*/
|
|
17
17
|
static getCount(): Promise<number>;
|
|
18
|
-
static createOrder(
|
|
18
|
+
static createOrder(inputOrderInfo: OrderInfo, slots: OrderSlots, deposit?: TokenAmount, suspended?: boolean, transactionOptions?: TransactionOptions, checkTxBeforeSend?: boolean): Promise<TransactionReceipt>;
|
|
19
19
|
static getByExternalId(filter: {
|
|
20
20
|
externalId: string;
|
|
21
21
|
consumer?: string;
|
|
22
22
|
}, fromBlock?: number | string, toBlock?: number | string): Promise<OrderCreatedEvent | null>;
|
|
23
|
-
static createWorkflow(
|
|
23
|
+
static createWorkflow(inputParentOrderInfo: OrderInfo, parentOrderSlot: OrderSlots, inputSubOrdersInfo: OrderInfo[], subOrdersSlots: OrderSlots[], workflowDeposit: TokenAmount, transactionOptions?: TransactionOptions, checkTxBeforeSend?: boolean): Promise<TransactionReceipt>;
|
|
24
24
|
static cancelWorkflow(perentOrderId: BlockchainId, transactionOptions?: TransactionOptions): Promise<TransactionReceipt>;
|
|
25
25
|
/**
|
|
26
26
|
* Function for refilling order deposit
|
|
@@ -20,6 +20,8 @@ const Superpro_js_1 = __importDefault(require("./Superpro.js"));
|
|
|
20
20
|
const TxManager_js_1 = __importDefault(require("../utils/TxManager.js"));
|
|
21
21
|
const index_js_2 = require("../connectors/index.js");
|
|
22
22
|
const StaticModel_js_1 = __importDefault(require("./StaticModel.js"));
|
|
23
|
+
const versify_js_1 = require("../utils/order/versify.js");
|
|
24
|
+
const Offer_js_1 = __importDefault(require("../models/Offer.js"));
|
|
23
25
|
class Orders {
|
|
24
26
|
static logger = logger_js_1.default.child({ className: 'Orders' });
|
|
25
27
|
static orders;
|
|
@@ -51,9 +53,11 @@ class Orders {
|
|
|
51
53
|
const contract = index_js_2.BlockchainConnector.getInstance().getContract();
|
|
52
54
|
return Number(await contract.methods.getOrdersCount().call());
|
|
53
55
|
}
|
|
54
|
-
static async createOrder(
|
|
56
|
+
static async createOrder(inputOrderInfo, slots, deposit, suspended = false, transactionOptions, checkTxBeforeSend = false) {
|
|
55
57
|
const contract = index_js_2.BlockchainConnector.getInstance().getContract();
|
|
56
58
|
(0, helper_js_1.checkIfActionAccountInitialized)(transactionOptions);
|
|
59
|
+
const offerType = await new Offer_js_1.default(inputOrderInfo.offerId).getOfferType();
|
|
60
|
+
const orderInfo = await (0, versify_js_1.versify)(inputOrderInfo, offerType === index_js_1.OfferType.TeeOffer);
|
|
57
61
|
if (orderInfo.tokenAddress === undefined)
|
|
58
62
|
orderInfo.tokenAddress = Orders.getTokenAddress();
|
|
59
63
|
deposit = deposit ?? '0';
|
|
@@ -70,9 +74,11 @@ class Orders {
|
|
|
70
74
|
return null;
|
|
71
75
|
return founded;
|
|
72
76
|
}
|
|
73
|
-
static async createWorkflow(
|
|
77
|
+
static async createWorkflow(inputParentOrderInfo, parentOrderSlot, inputSubOrdersInfo, subOrdersSlots, workflowDeposit, transactionOptions, checkTxBeforeSend = false) {
|
|
74
78
|
const contract = index_js_2.BlockchainConnector.getInstance().getContract();
|
|
75
79
|
(0, helper_js_1.checkIfActionAccountInitialized)(transactionOptions);
|
|
80
|
+
const parentOrderInfo = await (0, versify_js_1.versify)(inputParentOrderInfo, true);
|
|
81
|
+
const subOrdersInfo = await Promise.all(inputSubOrdersInfo.map((item) => (0, versify_js_1.versify)(item, false)));
|
|
76
82
|
const tokenAddress = Orders.getTokenAddress();
|
|
77
83
|
if (parentOrderInfo.tokenAddress === undefined)
|
|
78
84
|
parentOrderInfo.tokenAddress = tokenAddress;
|
|
@@ -491,4 +497,4 @@ __decorate([
|
|
|
491
497
|
__metadata("design:returntype", Promise)
|
|
492
498
|
], Orders, "createWorkflow", null);
|
|
493
499
|
exports.default = Orders;
|
|
494
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Orders.js","sourceRoot":"","sources":["../../../src/staticModels/Orders.ts"],"names":[],"mappings":"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"}
|
|
500
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Orders.js","sourceRoot":"","sources":["../../../src/staticModels/Orders.ts"],"names":[],"mappings":"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"}
|
|
@@ -60,7 +60,7 @@ class SecretRequests {
|
|
|
60
60
|
const logger = this.logger.child({ method: 'onSecretRequestCreated' });
|
|
61
61
|
const onData = (event) => {
|
|
62
62
|
const parsedEvent = (0, helper_js_1.cleanWeb3Data)(event.returnValues);
|
|
63
|
-
callback(parsedEvent.secretRequestorId, parsedEvent.secretKeeperId, parsedEvent.offerId, parsedEvent.offerVersion, {
|
|
63
|
+
callback(parsedEvent.secretRequestorId, parsedEvent.secretKeeperId, parsedEvent.offerId, Number(parsedEvent.offerVersion), {
|
|
64
64
|
index: Number(event.blockNumber),
|
|
65
65
|
hash: event.blockHash,
|
|
66
66
|
});
|
|
@@ -76,4 +76,4 @@ class SecretRequests {
|
|
|
76
76
|
}
|
|
77
77
|
}
|
|
78
78
|
exports.default = SecretRequests;
|
|
79
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
79
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2VjcmV0UmVxdWVzdHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc3RhdGljTW9kZWxzL1NlY3JldFJlcXVlc3RzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBQUEscURBQXVGO0FBRXZGLGtEQUk0QjtBQUM1Qix5RUFBOEM7QUFFOUMsNkRBQXNDO0FBS3RDLGtEQUFvRDtBQUVwRCxNQUFNLGNBQWM7SUFDVixNQUFNLENBQVUsTUFBTSxHQUFHLG1CQUFVLENBQUMsS0FBSyxDQUFDLEVBQUUsU0FBUyxFQUFFLGdCQUFnQixFQUFFLENBQUMsQ0FBQztJQUU1RSxNQUFNLENBQUMsS0FBSyxDQUFDLGtCQUFrQixDQUFDLGdCQUE4QjtRQUNuRSxNQUFNLFFBQVEsR0FBRyw4QkFBbUIsQ0FBQyxXQUFXLEVBQUUsQ0FBQyxXQUFXLEVBQUUsQ0FBQztRQUVqRSxPQUFPLE1BQU0sQ0FBQyxNQUFNLFFBQVEsQ0FBQyxPQUFPLENBQUMsZ0NBQWdDLENBQUMsZ0JBQWdCLENBQUMsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDO0lBQ2xHLENBQUM7SUFFTSxNQUFNLENBQUMsYUFBYSxDQUFDLGdCQUE4QjtRQUN4RCxNQUFNLFFBQVEsR0FBRyw4QkFBbUIsQ0FBQyxXQUFXLEVBQUUsQ0FBQyxXQUFXLEVBQUUsQ0FBQztRQUVqRSxPQUFPLFFBQVEsQ0FBQyxPQUFPO2FBQ3BCLDJCQUEyQixDQUFDLGdCQUFnQixDQUFDO2FBQzdDLElBQUksRUFBRTthQUNOLElBQUksQ0FBQyxDQUFDLFFBQTBCLEVBQUUsRUFBRSxDQUNuQyxRQUFTLENBQUMsR0FBRyxDQUFDLENBQUMsT0FBTyxFQUFFLEVBQUUsQ0FBQyxJQUFBLHVDQUEyQixFQUFDLE9BQXdCLENBQUMsQ0FBQyxDQUNsRixDQUFDO0lBQ04sQ0FBQztJQUVNLE1BQU0sQ0FBQyxnQkFBZ0IsQ0FBQyxtQkFBaUM7UUFDOUQsTUFBTSxRQUFRLEdBQUcsOEJBQW1CLENBQUMsV0FBVyxF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
|
package/dist/cjs/store.d.ts
CHANGED
package/dist/cjs/store.js
CHANGED
|
@@ -12,7 +12,9 @@ const store = {
|
|
|
12
12
|
txConcurrency: constants_js_1.txConcurrency,
|
|
13
13
|
txIntervalMs: constants_js_1.txIntervalMs,
|
|
14
14
|
chainId: constants_js_1.POLYGON_MAIN_CHAIN_ID,
|
|
15
|
+
maxFeePerGasMultiplier: constants_js_1.defaultMaxFeePerGasMultiplier,
|
|
16
|
+
maxPriorityFeePerGasMultiplier: constants_js_1.defaultMaxPriorityFeePerGasMultiplier,
|
|
15
17
|
keys: {},
|
|
16
18
|
};
|
|
17
19
|
exports.default = store;
|
|
18
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
20
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RvcmUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc3RvcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFDQSxpREFTd0I7QUFrQnhCLE1BQU0sS0FBSyxHQUFVO0lBQ25CLE9BQU8sRUFBRSxTQUFTO0lBQ2xCLFNBQVMsRUFBRSxTQUFTO0lBQ3BCLGFBQWEsRUFBRSxTQUFTO0lBQ3hCLFFBQVEsRUFBRSw4QkFBZTtJQUN6QixrQkFBa0IsRUFBRSx3Q0FBeUI7SUFDN0Msa0JBQWtCLEVBQUUsd0NBQXlCO0lBQzdDLFFBQVEsRUFBRSxTQUFTO0lBQ25CLGFBQWEsRUFBRSw0QkFBYTtJQUM1QixZQUFZLEVBQUUsMkJBQVk7SUFDMUIsT0FBTyxFQUFFLG9DQUFxQjtJQUM5QixzQkFBc0IsRUFBRSw0Q0FBNkI7SUFDckQsOEJBQThCLEVBQUUsb0RBQXFDO0lBQ3JFLElBQUksRUFBRSxFQUFFO0NBQ1QsQ0FBQztBQUVGLGtCQUFlLEtBQUssQ0FBQyJ9
|
|
@@ -1,12 +1,9 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import { OrderReport } from '@super-protocol/dto-js';
|
|
3
3
|
export declare class OrderReportService {
|
|
4
|
-
private static readonly teeCertificateService;
|
|
5
4
|
static encode(orderReport: OrderReport): Promise<Buffer>;
|
|
6
5
|
static decode(encodedOrderReport: Buffer): Promise<OrderReport>;
|
|
7
|
-
static removeRootCertificateFromChain(certsDer: Buffer[]): Buffer[];
|
|
8
6
|
static validateOrderReport(orderReport: OrderReport): Promise<void>;
|
|
9
|
-
private static certsToDerArray;
|
|
10
7
|
private static hashToBinary;
|
|
11
8
|
private static binaryHashToHash;
|
|
12
9
|
}
|
|
@@ -4,23 +4,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.OrderReportService = void 0;
|
|
7
|
-
const node_forge_1 = __importDefault(require("node-forge"));
|
|
8
7
|
const util_1 = require("util");
|
|
9
8
|
const zlib_1 = __importDefault(require("zlib"));
|
|
10
9
|
const dto_js_1 = require("@super-protocol/dto-js");
|
|
11
10
|
const OrderReport_js_1 = require("../proto/OrderReport.js");
|
|
12
|
-
const TeeCertificateService_js_1 = require("./TeeCertificateService.js");
|
|
13
11
|
const constants_js_1 = require("../constants.js");
|
|
14
12
|
const calculateObjectHash_js_1 = require("../utils/helpers/calculateObjectHash.js");
|
|
13
|
+
const helper_js_1 = require("../certificates/helper.js");
|
|
14
|
+
const TeeCertificateService_js_1 = require("./TeeCertificateService.js");
|
|
15
15
|
const gzipPromise = (0, util_1.promisify)(zlib_1.default.gzip);
|
|
16
16
|
const unzipPromise = (0, util_1.promisify)(zlib_1.default.unzip);
|
|
17
|
-
const rootCertDer = Buffer.from(node_forge_1.default.pki.pemToDer(constants_js_1.SUPERPROTOCOL_CA).bytes(), 'binary');
|
|
18
17
|
class OrderReportService {
|
|
19
|
-
static teeCertificateService = new TeeCertificateService_js_1.TeeCertificateService();
|
|
20
18
|
static async encode(orderReport) {
|
|
21
|
-
const
|
|
19
|
+
const { certs } = helper_js_1.CertificatesHelper.extractCAFromChain(orderReport.certificate);
|
|
20
|
+
const certsDer = helper_js_1.CertificatesHelper.pemChainToDer(certs);
|
|
22
21
|
const orderReportProto = {
|
|
23
|
-
certificates:
|
|
22
|
+
certificates: certsDer,
|
|
24
23
|
workloadInfo: {
|
|
25
24
|
runtimeInfo: orderReport.workloadInfo.runtimeInfo.map((ri) => ({
|
|
26
25
|
type: ri.type,
|
|
@@ -39,14 +38,7 @@ class OrderReportService {
|
|
|
39
38
|
static async decode(encodedOrderReport) {
|
|
40
39
|
const decompressed = await unzipPromise(encodedOrderReport);
|
|
41
40
|
const orderReportProto = OrderReport_js_1.OrderReportProto.decode(decompressed);
|
|
42
|
-
const certsPem = orderReportProto.certificates
|
|
43
|
-
contentDomain: null,
|
|
44
|
-
dekInfo: null,
|
|
45
|
-
headers: [],
|
|
46
|
-
procType: null,
|
|
47
|
-
type: 'CERTIFICATE',
|
|
48
|
-
body: Buffer.from(derCert).toString('binary'),
|
|
49
|
-
}));
|
|
41
|
+
const certsPem = helper_js_1.CertificatesHelper.derChainToPem(orderReportProto.certificates);
|
|
50
42
|
if (!orderReportProto.workloadInfo) {
|
|
51
43
|
throw new Error(`Wrong order report! Missing workloadInfo`);
|
|
52
44
|
}
|
|
@@ -65,34 +57,26 @@ class OrderReportService {
|
|
|
65
57
|
return result;
|
|
66
58
|
});
|
|
67
59
|
return {
|
|
68
|
-
certificate: certsPem
|
|
60
|
+
certificate: certsPem,
|
|
69
61
|
workloadInfo: {
|
|
70
62
|
runtimeInfo,
|
|
71
63
|
created: orderReportProto.workloadInfo.created,
|
|
72
64
|
},
|
|
73
65
|
};
|
|
74
66
|
}
|
|
75
|
-
static removeRootCertificateFromChain(certsDer) {
|
|
76
|
-
return certsDer.filter((certDer) => !certDer.equals(rootCertDer));
|
|
77
|
-
}
|
|
78
67
|
static async validateOrderReport(orderReport) {
|
|
79
|
-
|
|
80
|
-
|
|
68
|
+
const teeCertificateService = new TeeCertificateService_js_1.TeeCertificateService();
|
|
69
|
+
await teeCertificateService.validateTeeReportCertChain(orderReport.certificate);
|
|
70
|
+
const workloadInfoHashFromCert = helper_js_1.CertificatesHelper.getExtensionValue(orderReport.certificate, constants_js_1.OID_CUSTOM_EXTENSION_ORDER_REPORT_WORKLOAD_INFO_HASH);
|
|
81
71
|
if (!workloadInfoHashFromCert) {
|
|
82
72
|
throw new Error(`WorkloadInfoHash is missing in certificate!`);
|
|
83
73
|
}
|
|
84
74
|
const workloadInfoHash = await (0, calculateObjectHash_js_1.calculateObjectHash)(orderReport.workloadInfo);
|
|
85
|
-
const isHashMatch = Buffer.compare(
|
|
75
|
+
const isHashMatch = Buffer.compare(workloadInfoHashFromCert, Buffer.from(workloadInfoHash.hash, workloadInfoHash.encoding)) === 0;
|
|
86
76
|
if (!isHashMatch) {
|
|
87
77
|
throw new Error(`WorkloadInfoHash in the certificate doesn't match the WorkloadInfoHash in the orderReport`);
|
|
88
78
|
}
|
|
89
79
|
}
|
|
90
|
-
static certsToDerArray(certificate) {
|
|
91
|
-
const certs = this.teeCertificateService.splitPemCerts(certificate);
|
|
92
|
-
return certs.map((pemCert) => {
|
|
93
|
-
return Buffer.from(node_forge_1.default.pki.pemToDer(pemCert).bytes(), 'binary');
|
|
94
|
-
});
|
|
95
|
-
}
|
|
96
80
|
static hashToBinary(hash) {
|
|
97
81
|
if (!hash) {
|
|
98
82
|
return;
|
|
@@ -114,4 +98,4 @@ class OrderReportService {
|
|
|
114
98
|
}
|
|
115
99
|
}
|
|
116
100
|
exports.OrderReportService = OrderReportService;
|
|
117
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
101
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiT3JkZXJSZXBvcnRTZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3RlZS9PcmRlclJlcG9ydFNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsK0JBQWlDO0FBQ2pDLGdEQUF3QjtBQUN4QixtREFPZ0M7QUFHaEMsNERBQTJEO0FBQzNELGtEQUF1RjtBQUN2RixvRkFBOEU7QUFDOUUseURBQStEO0FBQy9ELHlFQUFtRTtBQUVuRSxNQUFNLFdBQVcsR0FBRyxJQUFBLGdCQUFTLEVBQUMsY0FBSSxDQUFDLElBQUksQ0FBQyxDQUFDO0FBQ3pDLE1BQU0sWUFBWSxHQUFHLElBQUEsZ0JBQVMsRUFBQyxjQUFJLENBQUMsS0FBSyxDQUFDLENBQUM7QUFFM0MsTUFBYSxrQkFBa0I7SUFDN0IsTUFBTSxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsV0FBd0I7UUFDMUMsTUFBTSxFQUFFLEtBQUssRUFBRSxHQUFHLDhCQUFrQixDQUFDLGtCQUFrQixDQUFDLFdBQVcsQ0FBQyxXQUFXLENBQUMsQ0FBQztRQUNqRixNQUFNLFFBQVEsR0FBRyw4QkFBa0IsQ0FBQyxhQUFhLENBQUMsS0FBSyxDQUFDLENBQUM7UUFFekQsTUFBTSxnQkFBZ0IsR0FBcUI7WUFDekMsWUFBWSxFQUFFLFFBQVE7WUFDdEIsWUFBWSxFQUFFO2dCQUNaLFdBQVcsRUFBRSxXQUFXLENBQUMsWUFBWSxDQUFDLFdBQVcsQ0FBQyxHQUFHLENBQUMsQ0FBQyxFQUFFLEVBQUUsRUFBRSxDQUFDLENBQUM7b0JBQzdELElBQUksRUFBRSxFQUFFLENBQUMsSUFBSTtvQkFDYixJQUFJLEVBQUUsRUFBRSxDQUFDLElBQUk7b0JBQ2IsSUFBSSxFQUFFLElBQUksQ0FBQyxZQUFZLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQztvQkFDaEMsZ0JBQWdCLEVBQUUsSUFBSSxDQUFDLFlBQVksQ0FBQyxFQUFFLENBQUMsZ0JBQWdCLENBQUM7b0JBQ3hE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
|