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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -15,10 +15,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
15
15
  const utils_js_1 = require("ethers/lib/utils.js");
16
16
  const logger_js_1 = __importDefault(require("../logger.js"));
17
17
  const helper_js_1 = require("../utils/helper.js");
18
+ const index_js_1 = require("../types/index.js");
18
19
  const Superpro_js_1 = __importDefault(require("./Superpro.js"));
19
20
  const TxManager_js_1 = __importDefault(require("../utils/TxManager.js"));
20
- const index_js_1 = require("../connectors/index.js");
21
- const index_js_2 = require("../models/index.js");
21
+ const index_js_2 = require("../connectors/index.js");
22
+ const index_js_3 = require("../models/index.js");
22
23
  const StaticModel_js_1 = __importDefault(require("./StaticModel.js"));
23
24
  class Orders {
24
25
  static logger = logger_js_1.default.child({ className: 'Orders' });
@@ -31,7 +32,7 @@ class Orders {
31
32
  * @returns list of orders ids
32
33
  */
33
34
  static async getAll() {
34
- const contract = index_js_1.BlockchainConnector.getInstance().getContract();
35
+ const contract = index_js_2.BlockchainConnector.getInstance().getContract();
35
36
  this.orders = this.orders ?? [];
36
37
  const ordersSet = new Set(this.orders);
37
38
  const ordersCount = Number(await contract.methods.getOrdersCount().call());
@@ -45,7 +46,7 @@ class Orders {
45
46
  * Function for fetching orders count
46
47
  */
47
48
  static async getCount() {
48
- const contract = index_js_1.BlockchainConnector.getInstance().getContract();
49
+ const contract = index_js_2.BlockchainConnector.getInstance().getContract();
49
50
  return Number(await contract.methods.getOrdersCount().call());
50
51
  }
51
52
  /**
@@ -56,26 +57,15 @@ class Orders {
56
57
  * @returns {Promise<void>} - Does not return id of created order!
57
58
  */
58
59
  static async createOrder(orderInfo, slots, deposit, suspended = false, transactionOptions, checkTxBeforeSend = false) {
59
- const contract = index_js_1.BlockchainConnector.getInstance().getContract();
60
+ const contract = index_js_2.BlockchainConnector.getInstance().getContract();
60
61
  (0, helper_js_1.checkIfActionAccountInitialized)(transactionOptions);
61
62
  deposit = deposit ?? '0';
62
- const orderInfoArguments = {
63
- ...orderInfo,
64
- externalId: (0, utils_js_1.formatBytes32String)(orderInfo.externalId),
65
- };
66
- const { args, ...restOrderInfoArguments } = orderInfoArguments;
63
+ const args = orderInfo.args;
64
+ const orderInfoArguments = (0, index_js_1.orderInfoToRaw)(orderInfo);
67
65
  if (checkTxBeforeSend) {
68
- await TxManager_js_1.default.dryRun(contract.methods.createOrder({
69
- ...restOrderInfoArguments,
70
- expectedPrice: restOrderInfoArguments.expectedPrice ?? '0',
71
- maxPriceSlippage: restOrderInfoArguments.maxPriceSlippage ?? '0',
72
- }, slots, args, deposit, suspended), transactionOptions);
66
+ await TxManager_js_1.default.dryRun(contract.methods.createOrder(orderInfoArguments, slots, args, deposit, suspended), transactionOptions);
73
67
  }
74
- await TxManager_js_1.default.execute(contract.methods.createOrder({
75
- ...restOrderInfoArguments,
76
- expectedPrice: restOrderInfoArguments.expectedPrice ?? '0',
77
- maxPriceSlippage: restOrderInfoArguments.maxPriceSlippage ?? '0',
78
- }, slots, args, deposit, suspended), transactionOptions);
68
+ await TxManager_js_1.default.execute(contract.methods.createOrder(orderInfoArguments, slots, args, deposit, suspended), transactionOptions);
79
69
  }
80
70
  static async getByExternalId(filter, fromBlock, toBlock) {
81
71
  const founded = await StaticModel_js_1.default.findItemsById('OrderCreated', filter, fromBlock, toBlock);
@@ -92,34 +82,17 @@ class Orders {
92
82
  * @returns {Promise<void>} - Does not return id of created order!
93
83
  */
94
84
  static async createWorkflow(parentOrderInfo, parentOrderSlot, subOrdersInfo, subOrdersSlots, workflowDeposit, transactionOptions, checkTxBeforeSend = false) {
95
- const contract = index_js_1.BlockchainConnector.getInstance().getContract();
85
+ const contract = index_js_2.BlockchainConnector.getInstance().getContract();
96
86
  (0, helper_js_1.checkIfActionAccountInitialized)(transactionOptions);
97
87
  workflowDeposit = workflowDeposit ?? '0';
98
- const parentOrderInfoArgs = {
99
- ...parentOrderInfo,
100
- externalId: (0, utils_js_1.formatBytes32String)(parentOrderInfo.externalId),
101
- };
102
- const subOrdersInfoArgs = subOrdersInfo.map((o) => ({
103
- ...o,
104
- externalId: (0, utils_js_1.formatBytes32String)(o.externalId),
105
- expectedPrice: o.expectedPrice ?? '0',
106
- maxPriceSlippage: o.maxPriceSlippage ?? '0',
107
- }));
88
+ const parentArgs = parentOrderInfo.args;
89
+ const parentOrderInfoArgs = (0, index_js_1.orderInfoToRaw)(parentOrderInfo);
108
90
  const subOrdersArgs = subOrdersInfo.map((i) => i.args);
91
+ const subOrdersInfoArgs = subOrdersInfo.map((o) => (0, index_js_1.orderInfoToRaw)(o));
109
92
  if (checkTxBeforeSend) {
110
- const { args, ...restParentOrderInfoArgs } = parentOrderInfoArgs;
111
- await TxManager_js_1.default.dryRun(contract.methods.createWorkflow({
112
- ...restParentOrderInfoArgs,
113
- expectedPrice: restParentOrderInfoArgs.expectedPrice ?? '0',
114
- maxPriceSlippage: restParentOrderInfoArgs.maxPriceSlippage ?? '0',
115
- }, parentOrderSlot, args, workflowDeposit, subOrdersInfoArgs, subOrdersSlots, subOrdersArgs), transactionOptions);
93
+ await TxManager_js_1.default.dryRun(contract.methods.createWorkflow(parentOrderInfoArgs, parentOrderSlot, parentArgs, workflowDeposit, subOrdersInfoArgs, subOrdersSlots, subOrdersArgs), transactionOptions);
116
94
  }
117
- const { args, ...restParentOrderInfoArgs } = parentOrderInfoArgs;
118
- await TxManager_js_1.default.execute(contract.methods.createWorkflow({
119
- ...restParentOrderInfoArgs,
120
- expectedPrice: restParentOrderInfoArgs.expectedPrice ?? '0',
121
- maxPriceSlippage: restParentOrderInfoArgs.maxPriceSlippage ?? '0',
122
- }, parentOrderSlot, args, workflowDeposit, subOrdersInfoArgs, subOrdersSlots, subOrdersArgs), transactionOptions);
95
+ await TxManager_js_1.default.execute(contract.methods.createWorkflow(parentOrderInfoArgs, parentOrderSlot, parentArgs, workflowDeposit, subOrdersInfoArgs, subOrdersSlots, subOrdersArgs), transactionOptions);
123
96
  }
124
97
  /**
125
98
  * Function for cancel workflow
@@ -127,7 +100,7 @@ class Orders {
127
100
  * @returns {Promise<void>} - Does not return id of created order!
128
101
  */
129
102
  static async cancelWorkflow(perentOrderId, transactionOptions) {
130
- const contract = index_js_1.BlockchainConnector.getInstance().getContract();
103
+ const contract = index_js_2.BlockchainConnector.getInstance().getContract();
131
104
  (0, helper_js_1.checkIfActionAccountInitialized)(transactionOptions);
132
105
  await TxManager_js_1.default.execute(contract.methods.cancelWorkflow(perentOrderId), transactionOptions);
133
106
  }
@@ -138,12 +111,12 @@ class Orders {
138
111
  * @param transactionOptions - object what contains alternative action account or gas limit (optional)
139
112
  */
140
113
  static async refillOrderDeposit(orderId, amount, transactionOptions) {
141
- const contract = index_js_1.BlockchainConnector.getInstance().getContract();
114
+ const contract = index_js_2.BlockchainConnector.getInstance().getContract();
142
115
  (0, helper_js_1.checkIfActionAccountInitialized)(transactionOptions);
143
116
  await TxManager_js_1.default.execute(contract.methods.refillOrder(orderId, amount), transactionOptions);
144
117
  }
145
118
  static async unlockProfitByOrderList(orderIds, transactionOptions) {
146
- const contract = index_js_1.BlockchainConnector.getInstance().getContract();
119
+ const contract = index_js_2.BlockchainConnector.getInstance().getContract();
147
120
  (0, helper_js_1.checkIfActionAccountInitialized)(transactionOptions);
148
121
  let executedCount;
149
122
  try {
@@ -157,7 +130,7 @@ class Orders {
157
130
  }
158
131
  else {
159
132
  for (const orderId of orderIds) {
160
- await new index_js_2.Order(orderId).unlockProfit();
133
+ await new index_js_3.Order(orderId).unlockProfit();
161
134
  }
162
135
  }
163
136
  }
@@ -167,7 +140,7 @@ class Orders {
167
140
  * @returns unsubscribe - unsubscribe function from event
168
141
  */
169
142
  static onCreated(callback) {
170
- const contract = index_js_1.BlockchainEventsListener.getInstance().getContract();
143
+ const contract = index_js_2.BlockchainEventsListener.getInstance().getContract();
171
144
  const logger = this.logger.child({ method: 'onOrderCreated' });
172
145
  const subscription = contract.events.OrderCreated();
173
146
  subscription.on('data', (event) => {
@@ -189,7 +162,7 @@ class Orders {
189
162
  * @returns unsubscribe - unsubscribe function from event
190
163
  */
191
164
  static onStarted(callback, orderId) {
192
- const contract = index_js_1.BlockchainEventsListener.getInstance().getContract();
165
+ const contract = index_js_2.BlockchainEventsListener.getInstance().getContract();
193
166
  const logger = this.logger.child({ method: 'onOrderStarted' });
194
167
  const subscription = contract.events.OrderStarted();
195
168
  subscription.on('data', (event) => {
@@ -214,7 +187,7 @@ class Orders {
214
187
  * @returns unsubscribe - unsubscribe function from event
215
188
  */
216
189
  static onStatusUpdated(callback, orderId) {
217
- const contract = index_js_1.BlockchainEventsListener.getInstance().getContract();
190
+ const contract = index_js_2.BlockchainEventsListener.getInstance().getContract();
218
191
  const logger = this.logger.child({ method: 'onOrdersStatusUpdated' });
219
192
  const subscription = contract.events.OrderStatusUpdated();
220
193
  subscription.on('data', (event) => {
@@ -240,7 +213,7 @@ class Orders {
240
213
  * @returns unsubscribe - unsubscribe function from event
241
214
  */
242
215
  static onDepositRefilled(callback, consumer, orderId) {
243
- const contract = index_js_1.BlockchainEventsListener.getInstance().getContract();
216
+ const contract = index_js_2.BlockchainEventsListener.getInstance().getContract();
244
217
  const logger = this.logger.child({ method: 'onOrderDepositRefilled' });
245
218
  const subscription = contract.events.OrderDepositRefilled();
246
219
  subscription.on('data', (event) => {
@@ -268,7 +241,7 @@ class Orders {
268
241
  * @returns unsubscribe - unsubscribe function from event
269
242
  */
270
243
  static onChangedWithdrawn(callback, orderId) {
271
- const contract = index_js_1.BlockchainEventsListener.getInstance().getContract();
244
+ const contract = index_js_2.BlockchainEventsListener.getInstance().getContract();
272
245
  const logger = this.logger.child({ method: 'onOrderChangeWithdrawn' });
273
246
  const subscription = contract.events.OrderChangeWithdrawn();
274
247
  subscription.on('data', (event) => {
@@ -294,7 +267,7 @@ class Orders {
294
267
  * @returns unsubscribe - unsubscribe function from event
295
268
  */
296
269
  static onProfitWithdrawn(callback, orderId, tokenReceiver) {
297
- const contract = index_js_1.BlockchainEventsListener.getInstance().getContract();
270
+ const contract = index_js_2.BlockchainEventsListener.getInstance().getContract();
298
271
  const logger = this.logger.child({ method: 'onOrderProfitWithdrawn' });
299
272
  const subscription = contract.events.OrderProfitWithdrawn();
300
273
  subscription.on('data', (event) => {
@@ -323,7 +296,7 @@ class Orders {
323
296
  * @returns unsubscribe - unsubscribe function from event
324
297
  */
325
298
  static onAwaitingPaymentChanged(callback, consumer, orderId) {
326
- const contract = index_js_1.BlockchainEventsListener.getInstance().getContract();
299
+ const contract = index_js_2.BlockchainEventsListener.getInstance().getContract();
327
300
  const logger = this.logger.child({ method: 'onOrderAwaitingPaymentChanged' });
328
301
  const subscription = contract.events.OrderAwaitingPaymentChanged();
329
302
  subscription.on('data', (event) => {
@@ -352,7 +325,7 @@ class Orders {
352
325
  * @returns unsubscribe - unsubscribe function from event
353
326
  */
354
327
  static onEncryptedResultUpdated(callback, consumer, orderId) {
355
- const contract = index_js_1.BlockchainEventsListener.getInstance().getContract();
328
+ const contract = index_js_2.BlockchainEventsListener.getInstance().getContract();
356
329
  const logger = this.logger.child({ method: 'onOrderEncryptedResultUpdated' });
357
330
  const subscription = contract.events.OrderEncryptedResultUpdated();
358
331
  subscription.on('data', (event) => {
@@ -381,7 +354,7 @@ class Orders {
381
354
  * @returns unsubscribe - unsubscribe function from event
382
355
  */
383
356
  static onOptionsDepositSpentChanged(callback, consumer, orderId) {
384
- const contract = index_js_1.BlockchainEventsListener.getInstance().getContract();
357
+ const contract = index_js_2.BlockchainEventsListener.getInstance().getContract();
385
358
  const logger = this.logger.child({ method: 'onOrderOptionsDepositSpentChanged' });
386
359
  const subscription = contract.events.OrderOptionsDepositSpentChanged();
387
360
  subscription.on('data', (event) => {
@@ -410,7 +383,7 @@ class Orders {
410
383
  * @returns unsubscribe - unsubscribe function from event
411
384
  */
412
385
  static onOProfitUnlocked(callback, tokenReceiver, orderId) {
413
- const contract = index_js_1.BlockchainEventsListener.getInstance().getContract();
386
+ const contract = index_js_2.BlockchainEventsListener.getInstance().getContract();
414
387
  const logger = this.logger.child({ method: 'onOrderProfitUnlocked' });
415
388
  const subscription = contract.events.OrderProfitUnlocked();
416
389
  subscription.on('data', (event) => {
@@ -501,4 +474,4 @@ __decorate([
501
474
  __metadata("design:returntype", Promise)
502
475
  ], Orders, "createWorkflow", null);
503
476
  exports.default = Orders;
504
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Orders.js","sourceRoot":"","sources":["../../../src/staticModels/Orders.ts"],"names":[],"mappings":"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"}
477
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Orders.js","sourceRoot":"","sources":["../../../src/staticModels/Orders.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,5 @@
1
1
  import { TokenAmount, BlockchainId } from './Web3.js';
2
+ import { EncryptionKey } from '@super-protocol/dto-js';
2
3
  export declare enum OrderStatus {
3
4
  New = "0",
4
5
  Processing = "1",
@@ -21,8 +22,10 @@ export type OrderSlots = {
21
22
  };
22
23
  export type OrderInfo = {
23
24
  offerId: BlockchainId;
24
- resultPublicKey: string;
25
- encryptedRequirements: string;
25
+ resultInfo: {
26
+ publicKey: string;
27
+ encryptedInfo: string;
28
+ };
26
29
  encryptedArgs: string;
27
30
  status: OrderStatus;
28
31
  externalId: string;
@@ -30,6 +33,18 @@ export type OrderInfo = {
30
33
  maxPriceSlippage?: TokenAmount;
31
34
  args: OrderArgs;
32
35
  };
36
+ export type OrderInfoRaw = {
37
+ offerId: BlockchainId;
38
+ resultInfo: string;
39
+ encryptedRequirements_DEPRECATED: string;
40
+ encryptedArgs_DEPRECATED: string;
41
+ status: OrderStatus;
42
+ externalId: string;
43
+ expectedPrice: TokenAmount;
44
+ maxPriceSlippage: TokenAmount;
45
+ };
46
+ export declare const orderInfoToRaw: (orderInfo: OrderInfo) => OrderInfoRaw;
47
+ export declare const orderInfoFromRaw: (orderInfoBch: OrderInfoRaw, args: OrderArgs) => OrderInfo;
33
48
  export type ExtendedOrderInfo = OrderInfo & {
34
49
  blocking: boolean;
35
50
  deposit: TokenAmount;
@@ -42,3 +57,8 @@ export type SubOrderParams = {
42
57
  blockParentOrder: boolean;
43
58
  deposit: TokenAmount;
44
59
  };
60
+ export type OrderEncryptedInfo = {
61
+ publicKey: EncryptionKey;
62
+ hashes: string[];
63
+ linkage: string;
64
+ };
@@ -1,6 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.OrderStatus = void 0;
3
+ exports.orderInfoFromRaw = exports.orderInfoToRaw = exports.OrderStatus = void 0;
4
+ const utils_js_1 = require("ethers/lib/utils.js");
4
5
  var OrderStatus;
5
6
  (function (OrderStatus) {
6
7
  OrderStatus["New"] = "0";
@@ -12,4 +13,46 @@ var OrderStatus;
12
13
  OrderStatus["Blocked"] = "6";
13
14
  OrderStatus["Suspended"] = "7";
14
15
  })(OrderStatus || (exports.OrderStatus = OrderStatus = {}));
15
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiT3JkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdHlwZXMvT3JkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBRUEsSUFBWSxXQVNYO0FBVEQsV0FBWSxXQUFXO0lBQ3JCLHdCQUFTLENBQUE7SUFDVCwrQkFBZ0IsQ0FBQTtJQUNoQiw4QkFBZSxDQUFBO0lBQ2YsNkJBQWMsQ0FBQTtJQUNkLHlCQUFVLENBQUE7SUFDViwwQkFBVyxDQUFBO0lBQ1gsNEJBQWEsQ0FBQTtJQUNiLDhCQUFlLENBQUE7QUFDakIsQ0FBQyxFQVRXLFdBQVcsMkJBQVgsV0FBVyxRQVN0QiJ9
16
+ const orderInfoToRaw = (orderInfo) => {
17
+ const resultInfo = JSON.stringify({
18
+ publicKey: orderInfo.resultInfo.publicKey,
19
+ encryptedInfo: orderInfo.resultInfo.encryptedInfo,
20
+ encryptedArgs: orderInfo.encryptedArgs,
21
+ });
22
+ return {
23
+ offerId: orderInfo.offerId,
24
+ resultInfo: resultInfo,
25
+ encryptedRequirements_DEPRECATED: '',
26
+ encryptedArgs_DEPRECATED: '',
27
+ status: orderInfo.status,
28
+ externalId: (0, utils_js_1.formatBytes32String)(orderInfo.externalId),
29
+ expectedPrice: orderInfo.expectedPrice ?? '0',
30
+ maxPriceSlippage: orderInfo.maxPriceSlippage ?? '0',
31
+ };
32
+ };
33
+ exports.orderInfoToRaw = orderInfoToRaw;
34
+ const orderInfoFromRaw = (orderInfoBch, args) => {
35
+ let publicKey = '';
36
+ let encryptedInfo = '';
37
+ let encryptedArgs = orderInfoBch.encryptedArgs_DEPRECATED;
38
+ try {
39
+ const parsedFields = JSON.parse(orderInfoBch.resultInfo);
40
+ publicKey = parsedFields.publicKey ?? publicKey;
41
+ encryptedInfo = parsedFields.encryptedInfo ?? encryptedInfo;
42
+ encryptedArgs = parsedFields.encryptedArgs ?? encryptedArgs;
43
+ }
44
+ catch (e) { }
45
+ return {
46
+ resultInfo: {
47
+ publicKey,
48
+ encryptedInfo,
49
+ },
50
+ encryptedArgs,
51
+ offerId: orderInfoBch.offerId,
52
+ status: orderInfoBch.status,
53
+ externalId: (0, utils_js_1.parseBytes32String)(orderInfoBch.externalId),
54
+ args,
55
+ };
56
+ };
57
+ exports.orderInfoFromRaw = orderInfoFromRaw;
58
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiT3JkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdHlwZXMvT3JkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsa0RBQThFO0FBSTlFLElBQVksV0FTWDtBQVRELFdBQVksV0FBVztJQUNyQix3QkFBUyxDQUFBO0lBQ1QsK0JBQWdCLENBQUE7SUFDaEIsOEJBQWUsQ0FBQTtJQUNmLDZCQUFjLENBQUE7SUFDZCx5QkFBVSxDQUFBO0lBQ1YsMEJBQVcsQ0FBQTtJQUNYLDRCQUFhLENBQUE7SUFDYiw4QkFBZSxDQUFBO0FBQ2pCLENBQUMsRUFUVyxXQUFXLDJCQUFYLFdBQVcsUUFTdEI7QUF1Q00sTUFBTSxjQUFjLEdBQUcsQ0FBQyxTQUFvQixFQUFnQixFQUFFO0lBQ25FLE1BQU0sVUFBVSxHQUFHLElBQUksQ0FBQyxTQUFTLENBQUM7UUFDaEMsU0FBUyxFQUFFLFNBQVMsQ0FBQyxVQUFVLENBQUMsU0FBUztRQUN6QyxhQUFhLEVBQUUsU0FBUyxDQUFDLFVBQVUsQ0FBQyxhQUFhO1FBQ2pELGFBQWEsRUFBRSxTQUFTLENBQUMsYUFBYTtLQUN2QyxDQUFDLENBQUM7SUFDSCxPQUFPO1FBQ0wsT0FBTyxFQUFFLFNBQVMsQ0FBQyxPQUFPO1FBQzFCLFVBQVUsRUFBRSxVQUFVO1FBQ3RCLGdDQUFnQyxFQUFFLEVBQUU7UUFDcEMsd0JBQXdCLEVBQUUsRUFBRTtRQUM1QixNQUFNLEVBQUUsU0FBUyxDQUFDLE1BQU07UUFDeEIsVUFBVSxFQUFFLElBQUEsOEJBQW1CLEVBQUMsU0FBUyxDQUFDLFVBQVUsQ0FBQztRQUNyRCxhQUFhLEVBQUUsU0FBUyxDQUFDLGFBQWEsSUFBSSxHQUFHO1FBQzdDLGdCQUFnQixFQUFFLFNBQVMsQ0FBQyxnQkFBZ0IsSUFBSSxHQUFHO0tBQ3BELENBQUM7QUFDSixDQUFDLENBQUM7QUFoQlcsUUFBQSxjQUFjLGtCQWdCekI7QUFFSyxNQUFNLGdCQUFnQixHQUFHLENBQUMsWUFBMEIsRUFBRSxJQUFlLEVBQWEsRUFBRTtJQUN6RixJQUFJLFNBQVMsR0FBRyxFQUFFLENBQUM7SUFDbkIsSUFBSSxhQUFhLEdBQUcsRUFBRSxDQUFDO0lBQ3ZCLElBQUksYUFBYSxHQUFHLFlBQVksQ0FBQyx3QkFBd0IsQ0FBQztJQUMxRCxJQUFJLENBQUM7UUFDSCxNQUFNLFlBQVksR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLFlBQVksQ0FBQyxVQUFVLENBQUMsQ0FBQztRQUN6RCxTQUFTLEdBQUcsWUFBWSxDQUFDLFNBQVMsSUFBSSxTQUFTLENBQUM7UUFDaEQsYUFBYSxHQUFHLFlBQVksQ0FBQyxhQUFhLElBQUksYUFBYSxDQUFDO1FBQzVELGFBQWEsR0FBRyxZQUFZLENBQUMsYUFBYSxJQUFJLGFBQWEsQ0FBQztJQUM5RCxDQUFDO0lBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQUFBLENBQUM7SUFFZCxPQUFPO1FBQ0wsVUFBVSxFQUFFO1lBQ1YsU0FBUztZQUNULGFBQWE7U0FDZDtRQUNELGFBQWE7UUFDYixPQUFPLEVBQUUsWUFBWSxDQUFDLE9BQU87UUFDN0IsTUFBTSxFQUFFLFlBQVksQ0FBQyxNQUFNO1FBQzNCLFVBQVUsRUFBRSxJQUFBLDZCQUFrQixFQUFDLFlBQVksQ0FBQyxVQUFVLENBQUM7UUFDdkQsSUFBSTtLQUNMLENBQUM7QUFDSixDQUFDLENBQUM7QUF0QlcsUUFBQSxnQkFBZ0Isb0JBc0IzQiJ9
@@ -1 +1,2 @@
1
1
  export * from './tryWithInterval.js';
2
+ export * from './orderHelpers.js';
@@ -15,4 +15,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
15
15
  };
16
16
  Object.defineProperty(exports, "__esModule", { value: true });
17
17
  __exportStar(require("./tryWithInterval.js"), exports);
18
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvdXRpbHMvaGVscGVycy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsdURBQXFDIn0=
18
+ __exportStar(require("./orderHelpers.js"), exports);
19
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvdXRpbHMvaGVscGVycy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsdURBQXFDO0FBQ3JDLG9EQUFrQyJ9
@@ -0,0 +1,12 @@
1
+ import { EncryptionKey } from '@super-protocol/dto-js';
2
+ export declare function getDerivedPrivateKey(publicKeyEncryption: EncryptionKey): Promise<EncryptionKey>;
3
+ export declare function getEncryptionKeysForOrder(params: {
4
+ offerId: string;
5
+ encryptionPrivateKey: EncryptionKey;
6
+ pccsServiceApiUrl: string;
7
+ hashes?: string[];
8
+ linkage?: string;
9
+ }): Promise<{
10
+ publicKey: string;
11
+ encryptedInfo: string;
12
+ }>;
@@ -0,0 +1,42 @@
1
+ "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
5
+ Object.defineProperty(exports, "__esModule", { value: true });
6
+ exports.getEncryptionKeysForOrder = exports.getDerivedPrivateKey = void 0;
7
+ const dto_js_1 = require("@super-protocol/dto-js");
8
+ const crypto_1 = require("crypto");
9
+ const TIIGenerator_js_1 = __importDefault(require("../../TIIGenerator.js"));
10
+ const index_js_1 = __importDefault(require("../../crypto/index.js"));
11
+ async function getDerivedPrivateKey(publicKeyEncryption) {
12
+ const derivedPrivateKey = await index_js_1.default.createHash(Buffer.from(publicKeyEncryption.key, publicKeyEncryption.encoding), { encoding: dto_js_1.Encoding.base64, algo: dto_js_1.HashAlgorithm.SHA256 });
13
+ return {
14
+ key: derivedPrivateKey.hash,
15
+ encoding: derivedPrivateKey.encoding,
16
+ algo: dto_js_1.CryptoAlgorithm.ECIES,
17
+ };
18
+ }
19
+ exports.getDerivedPrivateKey = getDerivedPrivateKey;
20
+ async function getEncryptionKeysForOrder(params) {
21
+ const resultEncryption = index_js_1.default.getPublicKey(params.encryptionPrivateKey);
22
+ const derivedPrivateKey = await getDerivedPrivateKey(resultEncryption);
23
+ const ecdh = (0, crypto_1.createECDH)('secp256k1');
24
+ ecdh.setPrivateKey(Buffer.from(derivedPrivateKey.key, derivedPrivateKey.encoding));
25
+ const publicKey = {
26
+ key: ecdh.getPublicKey(derivedPrivateKey.encoding),
27
+ encoding: dto_js_1.Encoding.base64,
28
+ algo: dto_js_1.CryptoAlgorithm.ECIES,
29
+ };
30
+ const orderInfoToEncrypt = {
31
+ publicKey: resultEncryption,
32
+ hashes: params.hashes || [],
33
+ linkage: params.linkage || '',
34
+ };
35
+ const encryptedInfo = await TIIGenerator_js_1.default.encryptByTeeBlock(params.offerId, JSON.stringify(orderInfoToEncrypt), params.pccsServiceApiUrl);
36
+ return {
37
+ publicKey: JSON.stringify(publicKey),
38
+ encryptedInfo: JSON.stringify(encryptedInfo),
39
+ };
40
+ }
41
+ exports.getEncryptionKeysForOrder = getEncryptionKeysForOrder;
42
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3JkZXJIZWxwZXJzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL3V0aWxzL2hlbHBlcnMvb3JkZXJIZWxwZXJzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLG1EQU1nQztBQUNoQyxtQ0FBb0M7QUFDcEMsNEVBQWlEO0FBQ2pELHFFQUEyQztBQUdwQyxLQUFLLFVBQVUsb0JBQW9CLENBQ3hDLG1CQUFrQztJQUVsQyxNQUFNLGlCQUFpQixHQUFHLE1BQU0sa0JBQU0sQ0FBQyxVQUFVLENBQy9DLE1BQU0sQ0FBQyxJQUFJLENBQUMsbUJBQW1CLENBQUMsR0FBSSxFQUFFLG1CQUFtQixDQUFDLFFBQVEsQ0FBQyxFQUNuRSxFQUFFLFFBQVEsRUFBRSxpQkFBUSxDQUFDLE1BQU0sRUFBRSxJQUFJLEVBQUUsc0JBQWEsQ0FBQyxNQUFNLEVBQUUsQ0FDMUQsQ0FBQztJQUVGLE9BQU87UUFDTCxHQUFHLEVBQUUsaUJBQWlCLENBQUMsSUFBSTtRQUMzQixRQUFRLEVBQUUsaUJBQWlCLENBQUMsUUFBUTtRQUNwQyxJQUFJLEVBQUUsd0JBQWUsQ0FBQyxLQUFLO0tBQzVCLENBQUM7QUFDSixDQUFDO0FBYkQsb0RBYUM7QUFFTSxLQUFLLFVBQVUseUJBQXlCLENBQUMsTUFNL0M7SUFDQyxNQUFNLGdCQUFnQixHQUFHLGtCQUFNLENBQUMsWUFBWSxDQUFDLE1BQU0sQ0FBQyxvQkFBb0IsQ0FBQyxDQUFDO0lBRTFFLE1BQU0saUJBQWlCLEdBQUcsTUFBTSxvQkFBb0IsQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDO0lBRXZFLE1BQU0sSUFBSSxHQUFHLElBQUEsbUJBQVUsRUFBQyxXQUFXLENBQUMsQ0FBQztJQUNyQyxJQUFJLENBQUMsYUFBYSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsaUJBQWlCLENBQUMsR0FBSSxFQUFFLGlCQUFpQixDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUM7SUFDcEYsTUFBTSxTQUFTLEdBQUc7UUFDaEIsR0FBRyxFQUFFLElBQUksQ0FBQyxZQUFZLENBQUMsaUJBQWlCLENBQUMsUUFBUSxDQUFDO1FBQ2xELFFBQVEsRUFBRSxpQkFBUSxDQUFDLE1BQU07UUFDekIsSUFBSSxFQUFFLHdCQUFlLENBQUMsS0FBSztLQUNkLENBQUM7SUFFaEIsTUFBTSxrQkFBa0IsR0FBdUI7UUFDN0MsU0FBUyxFQUFFLGdCQUFnQjtRQUMzQixNQUFNLEVBQUUsTUFBTSxDQUFDLE1BQU0sSUFBSSxFQUFFO1FBQzNCLE9BQU8sRUFBRSxNQUFNLENBQUMsT0FBTyxJQUFJLEVBQUU7S0FDOUIsQ0FBQztJQUVGLE1BQU0sYUFBYSxHQUFHLE1BQU0seUJBQVksQ0FBQyxpQkFBaUIsQ0FDeEQsTUFBTSxDQUFDLE9BQU8sRUFDZCxJQUFJLENBQUMsU0FBUyxDQUFDLGtCQUFrQixDQUFDLEVBQ2xDLE1BQU0sQ0FBQyxpQkFBaUIsQ0FDekIsQ0FBQztJQUVGLE9BQU87UUFDTCxTQUFTLEVBQUUsSUFBSSxDQUFDLFNBQVMsQ0FBQyxTQUFTLENBQUM7UUFDcEMsYUFBYSxFQUFFLElBQUksQ0FBQyxTQUFTLENBQUMsYUFBYSxDQUFDO0tBQzdDLENBQUM7QUFDSixDQUFDO0FBbkNELDhEQW1DQyJ9
@@ -9,6 +9,8 @@ declare class TIIGenerator {
9
9
  private static checkQuote;
10
10
  static verifyTcb(tcb: TCB, quoteString: string, pubKey: string, sgxApiUrl: string): Promise<void>;
11
11
  static verifyTlb(tlb: TLBlockUnserializeResultType, tlbString: string, offerId: string, sgxApiUrl: string): Promise<void>;
12
+ private static getVerifiedBlockEncryption;
13
+ static encryptByTeeBlock(offerId: string, data: string, sgxApiUrl: string): Promise<Encryption>;
12
14
  static generateByOffer(offerId: BlockchainId, solutionHashes: Hash[], linkageString: string | undefined, resource: Resource, args: any, encryption: Encryption, sgxApiUrl: string): Promise<string>;
13
15
  static generate(orderId: BlockchainId, resource: Resource, args: any, encryption: Encryption, sgxApiUrl: string): Promise<string>;
14
16
  static getSolutionHashesAndLinkage(inputOffers: BlockchainId[]): Promise<{