@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.
- package/dist/cjs/TIIGenerator.d.ts +2 -0
- package/dist/cjs/TIIGenerator.js +28 -16
- package/dist/cjs/contracts/abi.d.ts +107 -33
- package/dist/cjs/contracts/abi.js +131 -34
- package/dist/cjs/crypto/Crypto.d.ts +2 -1
- package/dist/cjs/crypto/Crypto.js +10 -2
- package/dist/cjs/crypto/nodejs/ECIES.d.ts +5 -3
- package/dist/cjs/crypto/nodejs/ECIES.js +26 -5
- package/dist/cjs/models/Order.js +14 -32
- package/dist/cjs/staticModels/Orders.js +31 -58
- package/dist/cjs/types/Order.d.ts +22 -2
- package/dist/cjs/types/Order.js +45 -2
- package/dist/cjs/utils/helpers/index.d.ts +1 -0
- package/dist/cjs/utils/helpers/index.js +2 -1
- package/dist/cjs/utils/helpers/orderHelpers.d.ts +12 -0
- package/dist/cjs/utils/helpers/orderHelpers.js +42 -0
- package/dist/mjs/TIIGenerator.d.ts +2 -0
- package/dist/mjs/TIIGenerator.js +28 -16
- package/dist/mjs/contracts/abi.d.ts +107 -33
- package/dist/mjs/contracts/abi.js +131 -34
- package/dist/mjs/crypto/Crypto.d.ts +2 -1
- package/dist/mjs/crypto/Crypto.js +10 -2
- package/dist/mjs/crypto/nodejs/ECIES.d.ts +5 -3
- package/dist/mjs/crypto/nodejs/ECIES.js +27 -6
- package/dist/mjs/models/Order.js +15 -33
- package/dist/mjs/staticModels/Orders.js +12 -39
- package/dist/mjs/types/Order.d.ts +22 -2
- package/dist/mjs/types/Order.js +42 -1
- package/dist/mjs/utils/helpers/index.d.ts +1 -0
- package/dist/mjs/utils/helpers/index.js +2 -1
- package/dist/mjs/utils/helpers/orderHelpers.d.ts +12 -0
- package/dist/mjs/utils/helpers/orderHelpers.js +34 -0
- package/package.json +4 -4
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
/// <reference types="node" />
|
|
3
3
|
/// <reference types="node" />
|
|
4
|
-
import { Encryption, Hash } from '@super-protocol/dto-js';
|
|
4
|
+
import { Encryption, Hash, EncryptionKey } from '@super-protocol/dto-js';
|
|
5
5
|
import fs from 'fs';
|
|
6
6
|
import { Readable } from 'stream';
|
|
7
7
|
declare class Crypto {
|
|
@@ -50,5 +50,6 @@ declare class Crypto {
|
|
|
50
50
|
* @returns Hash structure with hash itself hash algorithm and encoding
|
|
51
51
|
*/
|
|
52
52
|
static createHash(inputStream: Readable, hashInfo: Omit<Hash, 'hash'>): Promise<Hash>;
|
|
53
|
+
static getPublicKey(privateKey: EncryptionKey): EncryptionKey;
|
|
53
54
|
}
|
|
54
55
|
export default Crypto;
|
|
@@ -59,7 +59,7 @@ class Crypto {
|
|
|
59
59
|
case CryptoAlgorithm.ARIA:
|
|
60
60
|
return ARIA.decrypt(encryption);
|
|
61
61
|
case CryptoAlgorithm.ECIES:
|
|
62
|
-
return
|
|
62
|
+
return ECIES.decrypt(encryption);
|
|
63
63
|
case CryptoAlgorithm.RSAHybrid:
|
|
64
64
|
return RSAHybrid.decrypt(encryption);
|
|
65
65
|
default:
|
|
@@ -90,6 +90,14 @@ class Crypto {
|
|
|
90
90
|
? NativeCrypto.createHashFromBuffer(param1, algo, encoding)
|
|
91
91
|
: await NativeCrypto.createHashFromStream(param1, algo, encoding);
|
|
92
92
|
}
|
|
93
|
+
static getPublicKey(privateKey) {
|
|
94
|
+
switch (privateKey.algo) {
|
|
95
|
+
case CryptoAlgorithm.ECIES:
|
|
96
|
+
return ECIES.getPublicKeyEncryption(privateKey);
|
|
97
|
+
default:
|
|
98
|
+
throw Error(`${privateKey.algo} algorithm not supported`);
|
|
99
|
+
}
|
|
100
|
+
}
|
|
93
101
|
}
|
|
94
102
|
export default Crypto;
|
|
95
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
103
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ3J5cHRvLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NyeXB0by9DcnlwdG8udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUdMLGVBQWUsR0FNaEIsTUFBTSx3QkFBd0IsQ0FBQztBQUVoQyxPQUFPLEdBQUcsTUFBTSxpQkFBaUIsQ0FBQztBQUNsQyxPQUFPLElBQUksTUFBTSxrQkFBa0IsQ0FBQztBQUNwQyxPQUFPLEtBQUssTUFBTSxtQkFBbUIsQ0FBQztBQUN0QyxPQUFPLFNBQVMsTUFBTSx3QkFBd0IsQ0FBQztBQUMvQyxPQUFPLFlBQVksTUFBTSwwQkFBMEIsQ0FBQztBQUdwRCxNQUFNLE1BQU07SUFDVjs7Ozs7OztPQU9HO0lBQ0gsTUFBTSxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsT0FBZSxFQUFFLFVBQXNCO1FBQzFELFFBQVEsVUFBVSxDQUFDLElBQUksRUFBRSxDQUFDO1lBQ3hCLEtBQUssZUFBZSxDQUFDLEdBQUc7Z0JBQ3RCLE9BQU8sTUFBTSxHQUFHLENBQUMsT0FBTyxDQUFDLE9BQU8sRUFBRSxVQUFVLENBQUMsQ0FBQztZQUVoRCxLQUFLLGVBQWUsQ0FBQyxJQUFJO2dCQUN2QixPQUFPLE1BQU0sSUFBSSxDQUFDLE9BQU8sQ0FBQyxPQUFPLEVBQUUsVUFBVSxDQUFDLENBQUM7WUFFakQsS0FBSyxlQUFlLENBQUMsS0FBSztnQkFDeEIsT0FBTyxNQUFNLEtBQUssQ0FBQyxPQUFPLENBQUMsT0FBTyxFQUFFLFVBQVUsQ0FBQyxDQUFDO1lBRWxELEtBQUssZUFBZSxDQUFDLFNBQVM7Z0JBQzVCLE9BQU8sTUFBTSxTQUFTLENBQUMsT0FBTyxDQUFDLE9BQU8sRUFBRSxVQUFVLENBQUMsQ0FBQztZQUV0RDtnQkFDRSxNQUFNLEtBQUssQ0FBQyxHQUFHLFVBQVUsQ0FBQyxJQUFJLDBCQUEwQixDQUFDLENBQUM7UUFDOUQsQ0FBQztJQUNILENBQUM7SUFFRDs7Ozs7OztPQU9HO0lBQ0ks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
|
|
@@ -1,6 +1,8 @@
|
|
|
1
|
-
import { ECIESEncryption, Encryption } from '@super-protocol/dto-js';
|
|
1
|
+
import { ECIESEncryption, Encryption, EncryptionKey } from '@super-protocol/dto-js';
|
|
2
2
|
declare class ECIES {
|
|
3
|
-
static encrypt(content: string, encryption: Encryption):
|
|
4
|
-
static decrypt(encryption: ECIESEncryption):
|
|
3
|
+
static encrypt(content: string, encryption: Encryption): ECIESEncryption;
|
|
4
|
+
static decrypt(encryption: ECIESEncryption): string;
|
|
5
|
+
static getPublicFromPrivate(privateKey: Pick<EncryptionKey, 'key' | 'encoding'>): string;
|
|
6
|
+
static getPublicKeyEncryption: (encryption: EncryptionKey) => EncryptionKey;
|
|
5
7
|
}
|
|
6
8
|
export default ECIES;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { CryptoAlgorithm } from '@super-protocol/dto-js';
|
|
1
|
+
import { CryptoAlgorithm, Encoding, } from '@super-protocol/dto-js';
|
|
2
2
|
import crypto from 'crypto';
|
|
3
3
|
class ECIES {
|
|
4
|
-
static
|
|
4
|
+
static encrypt(content, encryption) {
|
|
5
5
|
if (!encryption.key)
|
|
6
6
|
throw Error('Encryption key is not provided');
|
|
7
7
|
const ecdh = crypto.createECDH('secp256k1');
|
|
@@ -9,7 +9,7 @@ class ECIES {
|
|
|
9
9
|
const epk = ecdh.getPublicKey();
|
|
10
10
|
const pk = ecdh.computeSecret(Buffer.from(encryption.key, encryption.encoding));
|
|
11
11
|
const hash = crypto.createHash('sha512').update(pk).digest();
|
|
12
|
-
const cipherKey = hash.
|
|
12
|
+
const cipherKey = hash.subarray(0, 32), macKey = hash.subarray(32);
|
|
13
13
|
const iv = crypto.randomBytes(16);
|
|
14
14
|
const cipher = crypto.createCipheriv('aes-256-cbc', cipherKey, iv);
|
|
15
15
|
let ct = cipher.update(content);
|
|
@@ -25,7 +25,7 @@ class ECIES {
|
|
|
25
25
|
ciphertext: ct.toString(encryption.encoding),
|
|
26
26
|
};
|
|
27
27
|
}
|
|
28
|
-
static
|
|
28
|
+
static decrypt(encryption) {
|
|
29
29
|
if (!encryption.key)
|
|
30
30
|
throw Error('Decryption key is not provided');
|
|
31
31
|
const iv = Buffer.from(encryption.iv, encryption.encoding), epk = Buffer.from(encryption.ephemPublicKey, encryption.encoding), ct = Buffer.from(encryption.ciphertext, encryption.encoding), mac = Buffer.from(encryption.mac, encryption.encoding);
|
|
@@ -33,7 +33,7 @@ class ECIES {
|
|
|
33
33
|
ecdh.setPrivateKey(Buffer.from(encryption.key, encryption.encoding));
|
|
34
34
|
const pk = ecdh.computeSecret(epk);
|
|
35
35
|
const hash = crypto.createHash('sha512').update(pk).digest();
|
|
36
|
-
const cipherKey = hash.
|
|
36
|
+
const cipherKey = hash.subarray(0, 32), macKey = hash.subarray(32);
|
|
37
37
|
const m = crypto
|
|
38
38
|
.createHmac('sha256', macKey)
|
|
39
39
|
.update(Buffer.concat([iv, epk, ct]))
|
|
@@ -46,6 +46,27 @@ class ECIES {
|
|
|
46
46
|
const result = Buffer.concat([pt, decipher.final()]);
|
|
47
47
|
return result.toString('binary');
|
|
48
48
|
}
|
|
49
|
+
static getPublicFromPrivate(privateKey) {
|
|
50
|
+
const ecdh = crypto.createECDH('secp256k1');
|
|
51
|
+
ecdh.setPrivateKey(Buffer.from(privateKey.key, privateKey.encoding));
|
|
52
|
+
return ecdh.getPublicKey(privateKey.encoding);
|
|
53
|
+
}
|
|
54
|
+
static getPublicKeyEncryption = (encryption) => {
|
|
55
|
+
if (encryption.algo !== CryptoAlgorithm.ECIES) {
|
|
56
|
+
throw Error('Only ECIES result encryption is supported');
|
|
57
|
+
}
|
|
58
|
+
if (encryption.encoding !== Encoding.base64) {
|
|
59
|
+
throw new Error('Only base64 result encryption is supported');
|
|
60
|
+
}
|
|
61
|
+
if (!encryption.key) {
|
|
62
|
+
throw new Error('Encryption private key is not provided');
|
|
63
|
+
}
|
|
64
|
+
return {
|
|
65
|
+
algo: encryption.algo,
|
|
66
|
+
encoding: encryption.encoding,
|
|
67
|
+
key: this.getPublicFromPrivate(encryption),
|
|
68
|
+
};
|
|
69
|
+
};
|
|
49
70
|
}
|
|
50
71
|
export default ECIES;
|
|
51
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
72
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRUNJRVMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvY3J5cHRvL25vZGVqcy9FQ0lFUy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsZUFBZSxFQUVmLFFBQVEsR0FHVCxNQUFNLHdCQUF3QixDQUFDO0FBQ2hDLE9BQU8sTUFBTSxNQUFNLFFBQVEsQ0FBQztBQUU1QixNQUFNLEtBQUs7SUFDRixNQUFNLENBQUMsT0FBTyxDQUFDLE9BQWUsRUFBRSxVQUFzQjtRQUMzRCxJQUFJLENBQUMsVUFBVSxDQUFDLEdBQUc7WUFBRSxNQUFNLEtBQUssQ0FBQyxnQ0FBZ0MsQ0FBQyxDQUFDO1FBRW5FLE1BQU0sSUFBSSxHQUFHLE1BQU0sQ0FBQyxVQUFVLENBQUMsV0FBVyxDQUFDLENBQUM7UUFFNUMsSUFBSSxDQUFDLFlBQVksRUFBRSxDQUFDO1FBQ3BCLE1BQU0sR0FBRyxHQUFHLElBQUksQ0FBQyxZQUFZLEVBQUUsQ0FBQztRQUVoQyxNQUFNLEVBQUUsR0FBRyxJQUFJLENBQUMsYUFBYSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLEdBQUcsRUFBRSxVQUFVLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQztRQUVoRixNQUFNLElBQUksR0FBRyxNQUFNLENBQUMsVUFBVSxDQUFDLFFBQVEsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQztRQUU3RCxNQUFNLFNBQVMsR0FBRyxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsRUFDcEMsTUFBTSxHQUFHLElBQUksQ0FBQyxRQUFRLENBQUMsRUFBRSxDQUFDLENBQUM7UUFDN0IsTUFBTSxFQUFFLEdBQUcsTUFBTSxDQUFDLFdBQVcsQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUVsQyxNQUFNLE1BQU0sR0FBRyxNQUFNLENBQUMsY0FBYyxDQUFDLGFBQWEsRUFBRSxTQUFTLEVBQUUs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
|
package/dist/mjs/models/Order.js
CHANGED
|
@@ -7,10 +7,9 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
7
7
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
8
8
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
9
9
|
};
|
|
10
|
-
import { OrderStatus, } from '../types/index.js';
|
|
10
|
+
import { OrderStatus, orderInfoFromRaw, orderInfoToRaw, } from '../types/index.js';
|
|
11
11
|
import rootLogger from '../logger.js';
|
|
12
12
|
import { checkIfActionAccountInitialized, cleanWeb3Data, convertOrderUsage, formatUsage, incrementMethodCall, unpackSlotInfo, } from '../utils/helper.js';
|
|
13
|
-
import { formatBytes32String } from 'ethers/lib/utils.js';
|
|
14
13
|
import { BlockchainConnector, BlockchainEventsListener } from '../connectors/index.js';
|
|
15
14
|
import TeeOffers from '../staticModels/TeeOffers.js';
|
|
16
15
|
import TxManager from '../utils/TxManager.js';
|
|
@@ -75,12 +74,9 @@ class Order {
|
|
|
75
74
|
}
|
|
76
75
|
const orderInfoParams = await Order.contract.methods.getOrder(this.id).call();
|
|
77
76
|
const orderArgs = await Order.contract.methods.getOrderArgs(this.id).call();
|
|
78
|
-
const
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
status: orderInfoParams[1].status.toString(),
|
|
82
|
-
};
|
|
83
|
-
return (this.orderInfo = orderInfo);
|
|
77
|
+
const cleanedOrderInfo = cleanWeb3Data(orderInfoParams[1]);
|
|
78
|
+
const finalOrderInfo = orderInfoFromRaw(cleanedOrderInfo, cleanWeb3Data(orderArgs));
|
|
79
|
+
return (this.orderInfo = finalOrderInfo);
|
|
84
80
|
}
|
|
85
81
|
async checkIfOrderExistsWithInterval() {
|
|
86
82
|
const offerExists = await tryWithInterval({
|
|
@@ -303,27 +299,16 @@ class Order {
|
|
|
303
299
|
async createSubOrder(subOrderInfo, slots, blockParentOrder, deposit, transactionOptions, checkTxBeforeSend = false) {
|
|
304
300
|
checkIfActionAccountInitialized(transactionOptions);
|
|
305
301
|
deposit = deposit ?? '0';
|
|
306
|
-
const
|
|
307
|
-
|
|
308
|
-
externalId: formatBytes32String(subOrderInfo.externalId),
|
|
309
|
-
};
|
|
302
|
+
const args = subOrderInfo.args;
|
|
303
|
+
const preparedInfo = orderInfoToRaw(subOrderInfo);
|
|
310
304
|
const params = {
|
|
311
305
|
blockParentOrder,
|
|
312
306
|
deposit,
|
|
313
307
|
};
|
|
314
|
-
const { args, ...restPreparedInfo } = preparedInfo;
|
|
315
308
|
if (checkTxBeforeSend) {
|
|
316
|
-
await TxManager.dryRun(Order.contract.methods.createSubOrder(this.id,
|
|
317
|
-
...restPreparedInfo,
|
|
318
|
-
expectedPrice: restPreparedInfo.expectedPrice ?? '0',
|
|
319
|
-
maxPriceSlippage: restPreparedInfo.maxPriceSlippage ?? '0',
|
|
320
|
-
}, slots, args, params), transactionOptions);
|
|
309
|
+
await TxManager.dryRun(Order.contract.methods.createSubOrder(this.id, preparedInfo, slots, args, params), transactionOptions);
|
|
321
310
|
}
|
|
322
|
-
await TxManager.execute(Order.contract.methods.createSubOrder(this.id,
|
|
323
|
-
...restPreparedInfo,
|
|
324
|
-
expectedPrice: restPreparedInfo.expectedPrice ?? '0',
|
|
325
|
-
maxPriceSlippage: restPreparedInfo.maxPriceSlippage ?? '0',
|
|
326
|
-
}, slots, args, params), transactionOptions);
|
|
311
|
+
await TxManager.execute(Order.contract.methods.createSubOrder(this.id, preparedInfo, slots, args, params), transactionOptions);
|
|
327
312
|
}
|
|
328
313
|
/**
|
|
329
314
|
* Function for creating pack of sub orders (wokflow) for current order
|
|
@@ -338,17 +323,14 @@ class Order {
|
|
|
338
323
|
}
|
|
339
324
|
const promises = [];
|
|
340
325
|
for (let orderInfoIndex = 0; orderInfoIndex < subOrdersInfo.length; orderInfoIndex++) {
|
|
341
|
-
const
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
expectedPrice: subOrdersInfo[orderInfoIndex].expectedPrice ?? '0',
|
|
345
|
-
maxPriceSlippage: subOrdersInfo[orderInfoIndex].maxPriceSlippage ?? '0',
|
|
346
|
-
};
|
|
326
|
+
const { blocking, deposit, ...orderInfo } = subOrdersInfo[orderInfoIndex];
|
|
327
|
+
const args = orderInfo.args;
|
|
328
|
+
const preparedInfo = orderInfoToRaw(orderInfo);
|
|
347
329
|
const params = {
|
|
348
|
-
blockParentOrder:
|
|
349
|
-
deposit
|
|
330
|
+
blockParentOrder: blocking,
|
|
331
|
+
deposit,
|
|
350
332
|
};
|
|
351
|
-
const transactionCall = Order.contract.methods.createSubOrder(this.id, preparedInfo, subOrdersSlots[orderInfoIndex],
|
|
333
|
+
const transactionCall = Order.contract.methods.createSubOrder(this.id, preparedInfo, subOrdersSlots[orderInfoIndex], args, params);
|
|
352
334
|
promises.push(TxManager.execute(transactionCall, transactionOptions));
|
|
353
335
|
}
|
|
354
336
|
return (await Promise.all(promises)).map((tx) => tx.transactionHash);
|
|
@@ -535,4 +517,4 @@ __decorate([
|
|
|
535
517
|
__metadata("design:returntype", Promise)
|
|
536
518
|
], Order.prototype, "createSubOrders", null);
|
|
537
519
|
export default Order;
|
|
538
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Order.js","sourceRoot":"","sources":["../../../src/models/Order.ts"],"names":[],"mappings":"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"}
|
|
520
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Order.js","sourceRoot":"","sources":["../../../src/models/Order.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,9 +7,10 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
7
7
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
8
8
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
9
9
|
};
|
|
10
|
-
import {
|
|
10
|
+
import { parseBytes32String } from 'ethers/lib/utils.js';
|
|
11
11
|
import rootLogger from '../logger.js';
|
|
12
12
|
import { checkIfActionAccountInitialized, cleanWeb3Data, convertBigIntToString, incrementMethodCall, } from '../utils/helper.js';
|
|
13
|
+
import { orderInfoToRaw, } from '../types/index.js';
|
|
13
14
|
import Superpro from './Superpro.js';
|
|
14
15
|
import TxManager from '../utils/TxManager.js';
|
|
15
16
|
import { BlockchainConnector, BlockchainEventsListener } from '../connectors/index.js';
|
|
@@ -54,23 +55,12 @@ class Orders {
|
|
|
54
55
|
const contract = BlockchainConnector.getInstance().getContract();
|
|
55
56
|
checkIfActionAccountInitialized(transactionOptions);
|
|
56
57
|
deposit = deposit ?? '0';
|
|
57
|
-
const
|
|
58
|
-
|
|
59
|
-
externalId: formatBytes32String(orderInfo.externalId),
|
|
60
|
-
};
|
|
61
|
-
const { args, ...restOrderInfoArguments } = orderInfoArguments;
|
|
58
|
+
const args = orderInfo.args;
|
|
59
|
+
const orderInfoArguments = orderInfoToRaw(orderInfo);
|
|
62
60
|
if (checkTxBeforeSend) {
|
|
63
|
-
await TxManager.dryRun(contract.methods.createOrder(
|
|
64
|
-
...restOrderInfoArguments,
|
|
65
|
-
expectedPrice: restOrderInfoArguments.expectedPrice ?? '0',
|
|
66
|
-
maxPriceSlippage: restOrderInfoArguments.maxPriceSlippage ?? '0',
|
|
67
|
-
}, slots, args, deposit, suspended), transactionOptions);
|
|
61
|
+
await TxManager.dryRun(contract.methods.createOrder(orderInfoArguments, slots, args, deposit, suspended), transactionOptions);
|
|
68
62
|
}
|
|
69
|
-
await TxManager.execute(contract.methods.createOrder(
|
|
70
|
-
...restOrderInfoArguments,
|
|
71
|
-
expectedPrice: restOrderInfoArguments.expectedPrice ?? '0',
|
|
72
|
-
maxPriceSlippage: restOrderInfoArguments.maxPriceSlippage ?? '0',
|
|
73
|
-
}, slots, args, deposit, suspended), transactionOptions);
|
|
63
|
+
await TxManager.execute(contract.methods.createOrder(orderInfoArguments, slots, args, deposit, suspended), transactionOptions);
|
|
74
64
|
}
|
|
75
65
|
static async getByExternalId(filter, fromBlock, toBlock) {
|
|
76
66
|
const founded = await StaticModel.findItemsById('OrderCreated', filter, fromBlock, toBlock);
|
|
@@ -90,31 +80,14 @@ class Orders {
|
|
|
90
80
|
const contract = BlockchainConnector.getInstance().getContract();
|
|
91
81
|
checkIfActionAccountInitialized(transactionOptions);
|
|
92
82
|
workflowDeposit = workflowDeposit ?? '0';
|
|
93
|
-
const
|
|
94
|
-
|
|
95
|
-
externalId: formatBytes32String(parentOrderInfo.externalId),
|
|
96
|
-
};
|
|
97
|
-
const subOrdersInfoArgs = subOrdersInfo.map((o) => ({
|
|
98
|
-
...o,
|
|
99
|
-
externalId: formatBytes32String(o.externalId),
|
|
100
|
-
expectedPrice: o.expectedPrice ?? '0',
|
|
101
|
-
maxPriceSlippage: o.maxPriceSlippage ?? '0',
|
|
102
|
-
}));
|
|
83
|
+
const parentArgs = parentOrderInfo.args;
|
|
84
|
+
const parentOrderInfoArgs = orderInfoToRaw(parentOrderInfo);
|
|
103
85
|
const subOrdersArgs = subOrdersInfo.map((i) => i.args);
|
|
86
|
+
const subOrdersInfoArgs = subOrdersInfo.map((o) => orderInfoToRaw(o));
|
|
104
87
|
if (checkTxBeforeSend) {
|
|
105
|
-
|
|
106
|
-
await TxManager.dryRun(contract.methods.createWorkflow({
|
|
107
|
-
...restParentOrderInfoArgs,
|
|
108
|
-
expectedPrice: restParentOrderInfoArgs.expectedPrice ?? '0',
|
|
109
|
-
maxPriceSlippage: restParentOrderInfoArgs.maxPriceSlippage ?? '0',
|
|
110
|
-
}, parentOrderSlot, args, workflowDeposit, subOrdersInfoArgs, subOrdersSlots, subOrdersArgs), transactionOptions);
|
|
88
|
+
await TxManager.dryRun(contract.methods.createWorkflow(parentOrderInfoArgs, parentOrderSlot, parentArgs, workflowDeposit, subOrdersInfoArgs, subOrdersSlots, subOrdersArgs), transactionOptions);
|
|
111
89
|
}
|
|
112
|
-
|
|
113
|
-
await TxManager.execute(contract.methods.createWorkflow({
|
|
114
|
-
...restParentOrderInfoArgs,
|
|
115
|
-
expectedPrice: restParentOrderInfoArgs.expectedPrice ?? '0',
|
|
116
|
-
maxPriceSlippage: restParentOrderInfoArgs.maxPriceSlippage ?? '0',
|
|
117
|
-
}, parentOrderSlot, args, workflowDeposit, subOrdersInfoArgs, subOrdersSlots, subOrdersArgs), transactionOptions);
|
|
90
|
+
await TxManager.execute(contract.methods.createWorkflow(parentOrderInfoArgs, parentOrderSlot, parentArgs, workflowDeposit, subOrdersInfoArgs, subOrdersSlots, subOrdersArgs), transactionOptions);
|
|
118
91
|
}
|
|
119
92
|
/**
|
|
120
93
|
* Function for cancel workflow
|
|
@@ -496,4 +469,4 @@ __decorate([
|
|
|
496
469
|
__metadata("design:returntype", Promise)
|
|
497
470
|
], Orders, "createWorkflow", null);
|
|
498
471
|
export default Orders;
|
|
499
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Orders.js","sourceRoot":"","sources":["../../../src/staticModels/Orders.ts"],"names":[],"mappings":"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"}
|
|
472
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Orders.js","sourceRoot":"","sources":["../../../src/staticModels/Orders.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,UAAU,MAAM,cAAc,CAAC;AACtC,OAAO,EACL,+BAA+B,EAC/B,aAAa,EACb,qBAAqB,EACrB,mBAAmB,GACpB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAaL,cAAc,GACf,MAAM,mBAAmB,CAAC;AAC3B,OAAO,QAAQ,MAAM,eAAe,CAAC;AACrC,OAAO,SAAS,MAAM,uBAAuB,CAAC;AAC9C,OAAO,EAAE,mBAAmB,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AACvF,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAE3C,OAAO,WAAW,MAAM,kBAAkB,CAAC;AAE3C,MAAM,MAAM;IACF,MAAM,CAAU,MAAM,GAAG,UAAU,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,CAAC;IAEpE,MAAM,CAAC,MAAM,CAAkB;IAE/B,MAAM,KAAK,OAAO;QACvB,OAAO,QAAQ,CAAC,OAAO,CAAC;IAC1B,CAAC;IAED;;;OAGG;IACI,MAAM,CAAC,KAAK,CAAC,MAAM;QACxB,MAAM,QAAQ,GAAG,mBAAmB,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE,CAAC;QACjE,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,EAAE,CAAC;QAChC,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAEvC,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,QAAQ,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;QAC3E,KAAK,IAAI,OAAO,GAAG,SAAS,CAAC,IAAI,GAAG,CAAC,EAAE,OAAO,IAAI,WAAW,EAAE,OAAO,EAAE,EAAE,CAAC;YACzE,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;QACpC,CAAC;QACD,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAEpC,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED;;OAEG;IACI,MAAM,CAAC,KAAK,CAAC,QAAQ;QAC1B,MAAM,QAAQ,GAAG,mBAAmB,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE,CAAC;QAEjE,OAAO,MAAM,CAAC,MAAM,QAAQ,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;IAChE,CAAC;IAED;;;;;;OAMG;IAEiB,AAAb,MAAM,CAAC,KAAK,CAAC,WAAW,CAC7B,SAAoB,EACpB,KAAiB,EACjB,OAAqB,EACrB,SAAS,GAAG,KAAK,EACjB,kBAAuC,EACvC,iBAAiB,GAAG,KAAK;QAEzB,MAAM,QAAQ,GAAG,mBAAmB,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE,CAAC;QACjE,+BAA+B,CAAC,kBAAkB,CAAC,CAAC;QACpD,OAAO,GAAG,OAAO,IAAI,GAAG,CAAC;QACzB,MAAM,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC;QAC5B,MAAM,kBAAkB,GAAG,cAAc,CAAC,SAAS,CAAC,CAAC;QAErD,IAAI,iBAAiB,EAAE,CAAC;YACtB,MAAM,SAAS,CAAC,MAAM,CACpB,QAAQ,CAAC,OAAO,CAAC,WAAW,CAC1B,kBAAkB,EAClB,KAAK,EACL,IAAI,EACJ,OAAO,EACP,SAAS,CACV,EACD,kBAAkB,CACnB,CAAC;QACJ,CAAC;QAED,MAAM,SAAS,CAAC,OAAO,CACrB,QAAQ,CAAC,OAAO,CAAC,WAAW,CAC1B,kBAAkB,EAClB,KAAK,EACL,IAAI,EACJ,OAAO,EACP,SAAS,CACV,EACD,kBAAkB,CACnB,CAAC;IACJ,CAAC;IAGmB,AAAb,MAAM,CAAC,KAAK,CAAC,eAAe,CACjC,MAGC,EACD,SAA2B,EAC3B,OAAyB;QAEzB,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,aAAa,CAAC,cAAc,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;QAE5F,IAAI,CAAC,OAAO;YAAE,OAAO,IAAI,CAAC;QAE1B,OAAO,OAA4B,CAAC;IACtC,CAAC;IAED;;;;;;;OAOG;IAEiB,AAAb,MAAM,CAAC,KAAK,CAAC,cAAc,CAChC,eAA0B,EAC1B,eAA2B,EAC3B,aAA0B,EAC1B,cAA4B,EAC5B,eAA4B,EAC5B,kBAAuC,EACvC,iBAAiB,GAAG,KAAK;QAEzB,MAAM,QAAQ,GAAG,mBAAmB,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE,CAAC;QACjE,+BAA+B,CAAC,kBAAkB,CAAC,CAAC;QACpD,eAAe,GAAG,eAAe,IAAI,GAAG,CAAC;QACzC,MAAM,UAAU,GAAG,eAAe,CAAC,IAAI,CAAC;QACxC,MAAM,mBAAmB,GAAG,cAAc,CAAC,eAAe,CAAC,CAAC;QAE5D,MAAM,aAAa,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACvD,MAAM,iBAAiB,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC;QAEtE,IAAI,iBAAiB,EAAE,CAAC;YACtB,MAAM,SAAS,CAAC,MAAM,CACpB,QAAQ,CAAC,OAAO,CAAC,cAAc,CAC7B,mBAAmB,EACnB,eAAe,EACf,UAAU,EACV,eAAe,EACf,iBAAiB,EACjB,cAAc,EACd,aAAa,CACd,EACD,kBAAkB,CACnB,CAAC;QACJ,CAAC;QAED,MAAM,SAAS,CAAC,OAAO,CACrB,QAAQ,CAAC,OAAO,CAAC,cAAc,CAC7B,mBAAmB,EACnB,eAAe,EACf,UAAU,EACV,eAAe,EACf,iBAAiB,EACjB,cAAc,EACd,aAAa,CACd,EACD,kBAAkB,CACnB,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,KAAK,CAAC,cAAc,CAChC,aAA2B,EAC3B,kBAAuC;QAEvC,MAAM,QAAQ,GAAG,mBAAmB,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE,CAAC;QACjE,+BAA+B,CAAC,kBAAkB,CAAC,CAAC;QAEpD,MAAM,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,cAAc,CAAC,aAAa,CAAC,EAAE,kBAAkB,CAAC,CAAC;IAC9F,CAAC;IAED;;;;;OAKG;IACI,MAAM,CAAC,KAAK,CAAC,kBAAkB,CACpC,OAAqB,EACrB,MAAmB,EACnB,kBAAuC;QAEvC,MAAM,QAAQ,GAAG,mBAAmB,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE,CAAC;QACjE,+BAA+B,CAAC,kBAAkB,CAAC,CAAC;QAEpD,MAAM,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,kBAAkB,CAAC,CAAC;IAC7F,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,uBAAuB,CACzC,QAAwB,EACxB,kBAAuC;QAEvC,MAAM,QAAQ,GAAG,mBAAmB,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE,CAAC;QACjE,+BAA+B,CAAC,kBAAkB,CAAC,CAAC;QAEpD,IAAI,aAAqB,CAAC;QAC1B,IAAI,CAAC;YACH,aAAa,GAAG,MAAM,CACpB,CAAC,MAAM,SAAS,CAAC,MAAM,CACrB,QAAQ,CAAC,OAAO,CAAC,kBAAkB,CAAC,QAAQ,CAAC,EAC7C,kBAAkB,CACnB,CAAW,CACb,CAAC;QACJ,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,aAAa,GAAG,CAAC,CAAC;QACpB,CAAC;QAED,IAAI,aAAa,KAAK,QAAQ,CAAC,MAAM,EAAE,CAAC;YACtC,MAAM,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,kBAAkB,CAAC,QAAQ,CAAC,EAAE,kBAAkB,CAAC,CAAC;QAC7F,CAAC;aAAM,CAAC;YACN,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;gBAC/B,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,YAAY,EAAE,CAAC;YAC1C,CAAC;QACH,CAAC;IACH,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,SAAS,CAAC,QAAgC;QACtD,MAAM,QAAQ,GAAG,wBAAwB,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE,CAAC;QACtE,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC,CAAC;QAE/D,MAAM,YAAY,GAAG,QAAQ,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC;QACpD,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAe,EAAQ,EAAE;YAChD,MAAM,WAAW,GAAG,aAAa,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YACtD,QAAQ,CACE,WAAW,CAAC,QAAQ,EAC5B,kBAAkB,CAAS,WAAW,CAAC,UAAU,CAAC,EACpC,WAAW,CAAC,OAAO,EACnB,WAAW,CAAC,aAAa,EACzB,WAAW,CAAC,OAAO,EACpB,WAAW,CAAC,OAAO,EACnB,WAAW,CAAC,MAAM,EACpB;gBACT,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC;gBAChC,IAAI,EAAU,KAAK,CAAC,SAAS;aAC9B,CACF,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAY,EAAE,EAAE;YACxC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrB,CAAC,CAAC,CAAC;QAEH,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC;IAC1C,CAAC;IAED;;;;;OAKG;IACI,MAAM,CAAC,SAAS,CAAC,QAAgC,EAAE,OAAgB;QACxE,MAAM,QAAQ,GAAG,wBAAwB,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE,CAAC;QACtE,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC,CAAC;QAE/D,MAAM,YAAY,GAAG,QAAQ,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC;QACpD,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAe,EAAQ,EAAE;YAChD,MAAM,WAAW,GAAG,aAAa,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YACtD,IAAI,OAAO,IAAI,WAAW,CAAC,OAAO,IAAI,qBAAqB,CAAC,OAAO,CAAC,EAAE,CAAC;gBACrE,OAAO;YACT,CAAC;YACD,QAAQ,CACQ,WAAW,CAAC,OAAO,EACzB,WAAW,CAAC,QAAQ,EACjB;gBACT,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC;gBAChC,IAAI,EAAU,KAAK,CAAC,SAAS;aAC9B,CACF,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAY,EAAE,EAAE;YACxC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrB,CAAC,CAAC,CAAC;QAEH,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC;IAC1C,CAAC;IAED;;;;;OAKG;IACI,MAAM,CAAC,eAAe,CAC3B,QAAuC,EACvC,OAAsB;QAEtB,MAAM,QAAQ,GAAG,wBAAwB,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE,CAAC;QACtE,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,uBAAuB,EAAE,CAAC,CAAC;QAEtE,MAAM,YAAY,GAAG,QAAQ,CAAC,MAAM,CAAC,kBAAkB,EAAE,CAAC;QAC1D,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAe,EAAQ,EAAE;YAChD,MAAM,WAAW,GAAG,aAAa,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YACtD,IAAI,OAAO,IAAI,WAAW,CAAC,OAAO,IAAI,qBAAqB,CAAC,OAAO,CAAC,EAAE,CAAC;gBACrE,OAAO;YACT,CAAC;YACD,QAAQ,CACQ,WAAW,CAAC,OAAO,EACpB,WAAW,CAAC,MAAM,EACpB;gBACT,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC;gBAChC,IAAI,EAAU,KAAK,CAAC,SAAS;aAC9B,CACF,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAY,EAAE,EAAE;YACxC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrB,CAAC,CAAC,CAAC;QAEH,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC;IAC1C,CAAC;IAED;;;;;;OAMG;IACI,MAAM,CAAC,iBAAiB,CAC7B,QAAwC,EACxC,QAAiB,EACjB,OAAsB;QAEtB,MAAM,QAAQ,GAAG,wBAAwB,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE,CAAC;QACtE,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,wBAAwB,EAAE,CAAC,CAAC;QAEvE,MAAM,YAAY,GAAG,QAAQ,CAAC,MAAM,CAAC,oBAAoB,EAAE,CAAC;QAC5D,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAe,EAAQ,EAAE;YAChD,MAAM,WAAW,GAAG,aAAa,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YACtD,IAAI,OAAO,IAAI,WAAW,CAAC,OAAO,IAAI,qBAAqB,CAAC,OAAO,CAAC,EAAE,CAAC;gBACrE,OAAO;YACT,CAAC;YACD,IAAI,QAAQ,IAAI,WAAW,CAAC,QAAQ,IAAI,QAAQ,EAAE,CAAC;gBACjD,OAAO;YACT,CAAC;YACD,QAAQ,CACQ,WAAW,CAAC,OAAO,EACzB,WAAW,CAAC,QAAQ,EACf,WAAW,CAAC,MAAM,EACpB;gBACT,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC;gBAChC,IAAI,EAAU,KAAK,CAAC,SAAS;aAC9B,CACF,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAY,EAAE,EAAE;YACxC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrB,CAAC,CAAC,CAAC;QAEH,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC;IAC1C,CAAC;IAED;;;;;OAKG;IACI,MAAM,CAAC,kBAAkB,CAC9B,QAAwC,EACxC,OAAsB;QAEtB,MAAM,QAAQ,GAAG,wBAAwB,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE,CAAC;QACtE,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,wBAAwB,EAAE,CAAC,CAAC;QAEvE,MAAM,YAAY,GAAG,QAAQ,CAAC,MAAM,CAAC,oBAAoB,EAAE,CAAC;QAC5D,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAe,EAAQ,EAAE;YAChD,MAAM,WAAW,GAAG,aAAa,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YACtD,IAAI,OAAO,IAAI,WAAW,CAAC,OAAO,IAAI,qBAAqB,CAAC,OAAO,CAAC,EAAE,CAAC;gBACrE,OAAO;YACT,CAAC;YACD,QAAQ,CACQ,WAAW,CAAC,OAAO,EACzB,WAAW,CAAC,QAAQ,EACf,WAAW,CAAC,MAAM,EACpB;gBACT,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC;gBAChC,IAAI,EAAU,KAAK,CAAC,SAAS;aAC9B,CACF,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAY,EAAE,EAAE;YACxC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrB,CAAC,CAAC,CAAC;QAEH,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC;IAC1C,CAAC;IAED;;;;;;OAMG;IACI,MAAM,CAAC,iBAAiB,CAC7B,QAAwC,EACxC,OAAsB,EACtB,aAAsB;QAEtB,MAAM,QAAQ,GAAG,wBAAwB,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE,CAAC;QACtE,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,wBAAwB,EAAE,CAAC,CAAC;QAEvE,MAAM,YAAY,GAAG,QAAQ,CAAC,MAAM,CAAC,oBAAoB,EAAE,CAAC;QAC5D,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAe,EAAQ,EAAE;YAChD,MAAM,WAAW,GAAG,aAAa,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YACtD,IAAI,OAAO,IAAI,WAAW,CAAC,OAAO,IAAI,qBAAqB,CAAC,OAAO,CAAC,EAAE,CAAC;gBACrE,OAAO;YACT,CAAC;YACD,IAAI,aAAa,IAAI,WAAW,CAAC,aAAa,IAAI,aAAa,EAAE,CAAC;gBAChE,OAAO;YACT,CAAC;YACD,QAAQ,CACQ,WAAW,CAAC,OAAO,EACzB,WAAW,CAAC,aAAa,EACpB,WAAW,CAAC,MAAM,EACpB;gBACT,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC;gBAChC,IAAI,EAAU,KAAK,CAAC,SAAS;aAC9B,CACF,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAY,EAAE,EAAE;YACxC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrB,CAAC,CAAC,CAAC;QAEH,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC;IAC1C,CAAC;IAED;;;;;;OAMG;IACI,MAAM,CAAC,wBAAwB,CACpC,QAA+C,EAC/C,QAAiB,EACjB,OAAsB;QAEtB,MAAM,QAAQ,GAAG,wBAAwB,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE,CAAC;QACtE,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,+BAA+B,EAAE,CAAC,CAAC;QAE9E,MAAM,YAAY,GAAG,QAAQ,CAAC,MAAM,CAAC,2BAA2B,EAAE,CAAC;QACnE,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAe,EAAQ,EAAE;YAChD,MAAM,WAAW,GAAG,aAAa,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YACtD,IAAI,OAAO,IAAI,WAAW,CAAC,OAAO,IAAI,qBAAqB,CAAC,OAAO,CAAC,EAAE,CAAC;gBACrE,OAAO;YACT,CAAC;YACD,IAAI,QAAQ,IAAI,WAAW,CAAC,QAAQ,IAAI,QAAQ,EAAE,CAAC;gBACjD,OAAO;YACT,CAAC;YACD,QAAQ,CACQ,WAAW,CAAC,OAAO,EACzB,WAAW,CAAC,QAAQ,EACnB,WAAW,CAAC,eAAe,EACzB;gBACT,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC;gBAChC,IAAI,EAAU,KAAK,CAAC,SAAS;aAC9B,CACF,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAY,EAAE,EAAE;YACxC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrB,CAAC,CAAC,CAAC;QAEH,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC;IAC1C,CAAC;IAED;;;;;;OAMG;IACI,MAAM,CAAC,wBAAwB,CACpC,QAA+C,EAC/C,QAAiB,EACjB,OAAsB;QAEtB,MAAM,QAAQ,GAAG,wBAAwB,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE,CAAC;QACtE,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,+BAA+B,EAAE,CAAC,CAAC;QAE9E,MAAM,YAAY,GAAG,QAAQ,CAAC,MAAM,CAAC,2BAA2B,EAAE,CAAC;QACnE,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAe,EAAQ,EAAE;YAChD,MAAM,WAAW,GAAG,aAAa,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YACtD,IAAI,OAAO,IAAI,WAAW,CAAC,OAAO,IAAI,qBAAqB,CAAC,OAAO,CAAC,EAAE,CAAC;gBACrE,OAAO;YACT,CAAC;YACD,IAAI,QAAQ,IAAI,WAAW,CAAC,QAAQ,IAAI,QAAQ,EAAE,CAAC;gBACjD,OAAO;YACT,CAAC;YACD,QAAQ,CACQ,WAAW,CAAC,OAAO,EACzB,WAAW,CAAC,QAAQ,EACpB,WAAW,CAAC,eAAe,EACxB;gBACT,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC;gBAChC,IAAI,EAAU,KAAK,CAAC,SAAS;aAC9B,CACF,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAY,EAAE,EAAE;YACxC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrB,CAAC,CAAC,CAAC;QAEH,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC;IAC1C,CAAC;IAED;;;;;;OAMG;IACI,MAAM,CAAC,4BAA4B,CACxC,QAAmD,EACnD,QAAiB,EACjB,OAAsB;QAEtB,MAAM,QAAQ,GAAG,wBAAwB,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE,CAAC;QACtE,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,mCAAmC,EAAE,CAAC,CAAC;QAElF,MAAM,YAAY,GAAG,QAAQ,CAAC,MAAM,CAAC,+BAA+B,EAAE,CAAC;QACvE,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAe,EAAQ,EAAE;YAChD,MAAM,WAAW,GAAG,aAAa,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YACtD,IAAI,OAAO,IAAI,WAAW,CAAC,OAAO,IAAI,qBAAqB,CAAC,OAAO,CAAC,EAAE,CAAC;gBACrE,OAAO;YACT,CAAC;YACD,IAAI,QAAQ,IAAI,WAAW,CAAC,QAAQ,IAAI,QAAQ,EAAE,CAAC;gBACjD,OAAO;YACT,CAAC;YACD,QAAQ,CACE,WAAW,CAAC,QAAQ,EACd,WAAW,CAAC,OAAO,EACpB,WAAW,CAAC,KAAK,EACnB;gBACT,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC;gBAChC,IAAI,EAAU,KAAK,CAAC,SAAS;aAC9B,CACF,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAY,EAAE,EAAE;YACxC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrB,CAAC,CAAC,CAAC;QAEH,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC;IAC1C,CAAC;IAED;;;;;;OAMG;IACI,MAAM,CAAC,iBAAiB,CAC7B,QAAuC,EACvC,aAAsB,EACtB,OAAsB;QAEtB,MAAM,QAAQ,GAAG,wBAAwB,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE,CAAC;QACtE,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,uBAAuB,EAAE,CAAC,CAAC;QAEtE,MAAM,YAAY,GAAG,QAAQ,CAAC,MAAM,CAAC,mBAAmB,EAAE,CAAC;QAC3D,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAe,EAAQ,EAAE;YAChD,MAAM,WAAW,GAAG,aAAa,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YACtD,IAAI,OAAO,IAAI,WAAW,CAAC,OAAO,IAAI,qBAAqB,CAAC,OAAO,CAAC,EAAE,CAAC;gBACrE,OAAO;YACT,CAAC;YACD,IAAI,aAAa,IAAI,WAAW,CAAC,aAAa,IAAI,aAAa,EAAE,CAAC;gBAChE,OAAO;YACT,CAAC;YACD,QAAQ,CACE,WAAW,CAAC,aAAa,EACnB,WAAW,CAAC,OAAO,EACpB,WAAW,CAAC,MAAM,EACpB;gBACT,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC;gBAChC,IAAI,EAAU,KAAK,CAAC,SAAS;aAC9B,CACF,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAY,EAAE,EAAE;YACxC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrB,CAAC,CAAC,CAAC;QAEH,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC;IAC1C,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,mBAAmB,CAAC,aAAyB;QACzD,MAAM,SAAS,GAAG,aAAa,CAAC,SAAS,CAAC;QAC1C,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,aAAa,CAAC,QAAQ,CAAC;QAEtE,OAAO;YACL,QAAQ,EAAE,QAAQ,GAAG,SAAS;YAC9B,GAAG,EAAE,GAAG,GAAG,SAAS;YACpB,SAAS,EAAE,SAAS,GAAG,SAAS;YAChC,QAAQ,EAAE,QAAQ,GAAG,SAAS;SAC/B,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,oBAAoB,CAAC,aAAyB;QAC1D,MAAM,SAAS,GAAG,aAAa,CAAC,SAAS,CAAC;QAC1C,MAAM,SAAS,GAAG,aAAa,CAAC,SAAS,CAAC;QAE1C,MAAM,UAAU,GAAG,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;QAE/D,OAAO;YACL,SAAS,EAAE,SAAS,CAAC,SAAS;YAC9B,KAAK,EAAE,UAAU,CAAC,QAAQ,EAAE;YAC5B,cAAc,EAAE,SAAS,CAAC,cAAc;YACxC,cAAc,EAAE,SAAS,CAAC,cAAc;SACzC,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,sBAAsB,CAAC,aAAyB;QAC5D,OAAO,aAAa,CAAC,UAAU,CAAC,MAAM,CACpC,CAAC,eAAe,EAAE,UAAU,EAAE,eAAe,EAAE,EAAE;YAC/C,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,OAAO,EAAE,GAAG,UAAU,CAAC;YACxD,MAAM,WAAW,GAAG,aAAa,CAAC,YAAY,CAAC,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;YAExE,eAAe,CAAC,SAAS,IAAI,SAAS,GAAG,WAAW,CAAC;YACrD,eAAe,CAAC,YAAY,IAAI,YAAY,GAAG,WAAW,CAAC;YAC3D,eAAe,CAAC,OAAO,IAAI,OAAO,GAAG,WAAW,CAAC;YACjD,OAAO,eAAe,CAAC;QACzB,CAAC,EACD;YACE,SAAS,EAAE,CAAC;YACZ,YAAY,EAAE,CAAC;YACf,OAAO,EAAE,CAAC;SACX,CACF,CAAC;IACJ,CAAC;;AAnmBmB;IADnB,mBAAmB,EAAE;;;;+BAsCrB;AAGmB;IADnB,mBAAmB,EAAE;;;;mCAcrB;AAWmB;IADnB,mBAAmB,EAAE;;;;kCA8CrB;AAwjBH,eAAe,MAAM,CAAC"}
|
|
@@ -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
|
-
|
|
25
|
-
|
|
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
|
+
};
|
package/dist/mjs/types/Order.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { formatBytes32String, parseBytes32String } from 'ethers/lib/utils.js';
|
|
1
2
|
export var OrderStatus;
|
|
2
3
|
(function (OrderStatus) {
|
|
3
4
|
OrderStatus["New"] = "0";
|
|
@@ -9,4 +10,44 @@ export var OrderStatus;
|
|
|
9
10
|
OrderStatus["Blocked"] = "6";
|
|
10
11
|
OrderStatus["Suspended"] = "7";
|
|
11
12
|
})(OrderStatus || (OrderStatus = {}));
|
|
12
|
-
|
|
13
|
+
export const orderInfoToRaw = (orderInfo) => {
|
|
14
|
+
const resultInfo = JSON.stringify({
|
|
15
|
+
publicKey: orderInfo.resultInfo.publicKey,
|
|
16
|
+
encryptedInfo: orderInfo.resultInfo.encryptedInfo,
|
|
17
|
+
encryptedArgs: orderInfo.encryptedArgs,
|
|
18
|
+
});
|
|
19
|
+
return {
|
|
20
|
+
offerId: orderInfo.offerId,
|
|
21
|
+
resultInfo: resultInfo,
|
|
22
|
+
encryptedRequirements_DEPRECATED: '',
|
|
23
|
+
encryptedArgs_DEPRECATED: '',
|
|
24
|
+
status: orderInfo.status,
|
|
25
|
+
externalId: formatBytes32String(orderInfo.externalId),
|
|
26
|
+
expectedPrice: orderInfo.expectedPrice ?? '0',
|
|
27
|
+
maxPriceSlippage: orderInfo.maxPriceSlippage ?? '0',
|
|
28
|
+
};
|
|
29
|
+
};
|
|
30
|
+
export const orderInfoFromRaw = (orderInfoBch, args) => {
|
|
31
|
+
let publicKey = '';
|
|
32
|
+
let encryptedInfo = '';
|
|
33
|
+
let encryptedArgs = orderInfoBch.encryptedArgs_DEPRECATED;
|
|
34
|
+
try {
|
|
35
|
+
const parsedFields = JSON.parse(orderInfoBch.resultInfo);
|
|
36
|
+
publicKey = parsedFields.publicKey ?? publicKey;
|
|
37
|
+
encryptedInfo = parsedFields.encryptedInfo ?? encryptedInfo;
|
|
38
|
+
encryptedArgs = parsedFields.encryptedArgs ?? encryptedArgs;
|
|
39
|
+
}
|
|
40
|
+
catch (e) { }
|
|
41
|
+
return {
|
|
42
|
+
resultInfo: {
|
|
43
|
+
publicKey,
|
|
44
|
+
encryptedInfo,
|
|
45
|
+
},
|
|
46
|
+
encryptedArgs,
|
|
47
|
+
offerId: orderInfoBch.offerId,
|
|
48
|
+
status: orderInfoBch.status,
|
|
49
|
+
externalId: parseBytes32String(orderInfoBch.externalId),
|
|
50
|
+
args,
|
|
51
|
+
};
|
|
52
|
+
};
|
|
53
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiT3JkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdHlwZXMvT3JkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLG1CQUFtQixFQUFFLGtCQUFrQixFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFJOUUsTUFBTSxDQUFOLElBQVksV0FTWDtBQVRELFdBQVksV0FBVztJQUNyQix3QkFBUyxDQUFBO0lBQ1QsK0JBQWdCLENBQUE7SUFDaEIsOEJBQWUsQ0FBQTtJQUNmLDZCQUFjLENBQUE7SUFDZCx5QkFBVSxDQUFBO0lBQ1YsMEJBQVcsQ0FBQTtJQUNYLDRCQUFhLENBQUE7SUFDYiw4QkFBZSxDQUFBO0FBQ2pCLENBQUMsRUFUVyxXQUFXLEtBQVgsV0FBVyxRQVN0QjtBQXVDRCxNQUFNLENBQUMsTUFBTSxjQUFjLEdBQUcsQ0FBQyxTQUFvQixFQUFnQixFQUFFO0lBQ25FLE1BQU0sVUFBVSxHQUFHLElBQUksQ0FBQyxTQUFTLENBQUM7UUFDaEMsU0FBUyxFQUFFLFNBQVMsQ0FBQyxVQUFVLENBQUMsU0FBUztRQUN6QyxhQUFhLEVBQUUsU0FBUyxDQUFDLFVBQVUsQ0FBQyxhQUFhO1FBQ2pELGFBQWEsRUFBRSxTQUFTLENBQUMsYUFBYTtLQUN2QyxDQUFDLENBQUM7SUFDSCxPQUFPO1FBQ0wsT0FBTyxFQUFFLFNBQVMsQ0FBQyxPQUFPO1FBQzFCLFVBQVUsRUFBRSxVQUFVO1FBQ3RCLGdDQUFnQyxFQUFFLEVBQUU7UUFDcEMsd0JBQXdCLEVBQUUsRUFBRTtRQUM1QixNQUFNLEVBQUUsU0FBUyxDQUFDLE1BQU07UUFDeEIsVUFBVSxFQUFFLG1CQUFtQixDQUFDLFNBQVMsQ0FBQyxVQUFVLENBQUM7UUFDckQsYUFBYSxFQUFFLFNBQVMsQ0FBQyxhQUFhLElBQUksR0FBRztRQUM3QyxnQkFBZ0IsRUFBRSxTQUFTLENBQUMsZ0JBQWdCLElBQUksR0FBRztLQUNwRCxDQUFDO0FBQ0osQ0FBQyxDQUFDO0FBRUYsTUFBTSxDQUFDLE1BQU0sZ0JBQWdCLEdBQUcsQ0FBQyxZQUEwQixFQUFFLElBQWUsRUFBYSxFQUFFO0lBQ3pGLElBQUksU0FBUyxHQUFHLEVBQUUsQ0FBQztJQUNuQixJQUFJLGFBQWEsR0FBRyxFQUFFLENBQUM7SUFDdkIsSUFBSSxhQUFhLEdBQUcsWUFBWSxDQUFDLHdCQUF3QixDQUFDO0lBQzFELElBQUksQ0FBQztRQUNILE1BQU0sWUFBWSxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsWUFBWSxDQUFDLFVBQVUsQ0FBQyxDQUFDO1FBQ3pELFNBQVMsR0FBRyxZQUFZLENBQUMsU0FBUyxJQUFJLFNBQVMsQ0FBQztRQUNoRCxhQUFhLEdBQUcsWUFBWSxDQUFDLGFBQWEsSUFBSSxhQUFhLENBQUM7UUFDNUQsYUFBYSxHQUFHLFlBQVksQ0FBQyxhQUFhLElBQUksYUFBYSxDQUFDO0lBQzlELENBQUM7SUFBQyxPQUFPLENBQUMsRUFBRSxDQUFDLENBQUEsQ0FBQztJQUVkLE9BQU87UUFDTCxVQUFVLEVBQUU7WUFDVixTQUFTO1lBQ1QsYUFBYTtTQUNkO1FBQ0QsYUFBYTtRQUNiLE9BQU8sRUFBRSxZQUFZLENBQUMsT0FBTztRQUM3QixNQUFNLEVBQUUsWUFBWSxDQUFDLE1BQU07UUFDM0IsVUFBVSxFQUFFLGtCQUFrQixDQUFDLFlBQVksQ0FBQyxVQUFVLENBQUM7UUFDdkQsSUFBSTtLQUNMLENBQUM7QUFDSixDQUFDLENBQUMifQ==
|
|
@@ -1,2 +1,3 @@
|
|
|
1
1
|
export * from './tryWithInterval.js';
|
|
2
|
-
|
|
2
|
+
export * from './orderHelpers.js';
|
|
3
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvdXRpbHMvaGVscGVycy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLHNCQUFzQixDQUFDO0FBQ3JDLGNBQWMsbUJBQW1CLENBQUMifQ==
|
|
@@ -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
|
+
}>;
|