@super-protocol/sdk-js 2.2.0-beta.93 → 2.2.0-beta.95
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/RIGenerator.d.ts +1 -0
- package/dist/cjs/RIGenerator.js +5 -4
- package/dist/cjs/staticModels/Offers.js +7 -2
- package/dist/cjs/types/Order.d.ts +1 -0
- package/dist/cjs/utils/helpers/OrderArgsHelper.d.ts +3 -2
- package/dist/cjs/utils/helpers/OrderArgsHelper.js +43 -15
- package/dist/mjs/RIGenerator.d.ts +1 -0
- package/dist/mjs/RIGenerator.js +5 -4
- package/dist/mjs/staticModels/Offers.js +7 -2
- package/dist/mjs/types/Order.d.ts +1 -0
- package/dist/mjs/utils/helpers/OrderArgsHelper.d.ts +3 -2
- package/dist/mjs/utils/helpers/OrderArgsHelper.js +43 -15
- package/package.json +2 -2
|
@@ -12,6 +12,7 @@ declare class RIGenerator extends TeeInputGeneratorBase {
|
|
|
12
12
|
dataHashes: Hash[];
|
|
13
13
|
imageHashes: Hash[];
|
|
14
14
|
linkage?: string;
|
|
15
|
+
argsHash?: Hash;
|
|
15
16
|
}): Promise<OrderResultInfo>;
|
|
16
17
|
static getResultInfo(encryptedResultInfo: Encryption, privateKey: Buffer): Promise<OrderEncryptedInfo>;
|
|
17
18
|
}
|
package/dist/cjs/RIGenerator.js
CHANGED
|
@@ -32,6 +32,7 @@ class RIGenerator extends TeeInputGeneratorBase_js_1.default {
|
|
|
32
32
|
dataHashes: params.dataHashes || [],
|
|
33
33
|
imageHashes: params.imageHashes || [],
|
|
34
34
|
linkage: params.linkage ?? '',
|
|
35
|
+
...(params.argsHash && { argsHash: params.argsHash }),
|
|
35
36
|
};
|
|
36
37
|
const encryptedInfo = await this.encryptByTeeBlock(params.offerId, JSON.stringify(orderInfoToEncrypt), params.pccsServiceApiUrl);
|
|
37
38
|
return {
|
|
@@ -40,12 +41,12 @@ class RIGenerator extends TeeInputGeneratorBase_js_1.default {
|
|
|
40
41
|
};
|
|
41
42
|
}
|
|
42
43
|
static async getResultInfo(encryptedResultInfo, privateKey) {
|
|
43
|
-
const
|
|
44
|
+
const res = await index_js_1.default.decrypt({
|
|
44
45
|
...encryptedResultInfo,
|
|
45
46
|
key: privateKey.toString(encryptedResultInfo.encoding),
|
|
46
|
-
})
|
|
47
|
-
return
|
|
47
|
+
});
|
|
48
|
+
return JSON.parse(res);
|
|
48
49
|
}
|
|
49
50
|
}
|
|
50
51
|
exports.default = RIGenerator;
|
|
51
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
52
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUklHZW5lcmF0b3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvUklHZW5lcmF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSxtREFPZ0M7QUFDaEMsbUNBQW9DO0FBRXBDLGlFQUF1QztBQUN2QywwRkFBK0Q7QUFFL0QsTUFBTSxXQUFZLFNBQVEsa0NBQXFCO0lBQzdDLE1BQU0sQ0FBQyxLQUFLLENBQUMsb0JBQW9CLENBQUMsbUJBQWtDO1FBQ2xFLE1BQU0saUJBQWlCLEdBQUcsTUFBTSxrQkFBTSxDQUFDLFVBQVUsQ0FDL0MsTUFBTSxDQUFDLElBQUksQ0FBQyxtQkFBbUIsQ0FBQyxHQUFJLEVBQUUsbUJBQW1CLENBQUMsUUFBUSxDQUFDLEVBQ25FLEVBQUUsUUFBUSxFQUFFLGlCQUFRLENBQUMsTUFBTSxFQUFFLElBQUksRUFBRSxzQkFBYSxDQUFDLE1BQU0sRUFBRSxDQUMxRCxDQUFDO1FBRUYsT0FBTztZQUNMLEdBQUcsRUFBRSxpQkFBaUIsQ0FBQyxJQUFJO1lBQzNCLFFBQVEsRUFBRSxpQkFBaUIsQ0FBQyxRQUFRO1lBQ3BDLElBQUksRUFBRSx3QkFBZSxDQUFDLEtBQUs7U0FDNUIsQ0FBQztJQUNKLENBQUM7SUFFRCxNQUFNLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxNQVNyQjtRQUNDLE1BQU0sZ0JBQWdCLEdBQUcsa0JBQU0sQ0FBQyxZQUFZLENBQUMsTUFBTSxDQUFDLG9CQUFvQixDQUFDLENBQUM7UUFFMUUsTUFBTSxpQkFBaUIsR0FBRyxNQUFNLElBQUksQ0FBQyxvQkFBb0IsQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDO1FBRTVFLE1BQU0sSUFBSSxHQUFHLElBQUEsbUJBQVUsRUFBQyxXQUFXLENBQUMsQ0FBQztRQUNyQyxJQUFJLENBQUMsYUFBYSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsaUJBQWlCLENBQUMsR0FBSSxFQUFFLGlCQUFpQixDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUM7UUFDcEYsTUFBTSxTQUFTLEdBQUc7WUFDaEIsR0FBRyxFQUFFLElBQUksQ0FBQyxZQUFZLENBQUMsaUJBQWlCLENBQUMsUUFBUSxDQUFDO1lBQ2xELFFBQVEsRUFBRSxpQkFBUSxDQUFDLE1BQU07WUFDekIsSUFBSSxFQUFFLHdCQUFlLENBQUMsS0FBSztTQUNkLENBQUM7UUFFaEIsTUFBTSxrQkFBa0IsR0FBdUI7WUFDN0MsU0FBUyxFQUFFLGdCQUFnQjtZQUMzQixjQUFjLEVBQUUsTUFBTSxDQUFDLGNBQWMsSUFBSSxFQUFFO1lBQzNDLFVBQVUsRUFBRSxNQUFNLENBQUMsVUFBVSxJQUFJLEVBQUU7WUFDbkMsV0FBVyxFQUFFLE1BQU0sQ0FBQyxXQUFXLElBQUksRUFBRTtZQUNyQyxPQUFPLEVBQUUsTUFBTSxDQUFDLE9BQU8sSUFBSSxFQUFFO1lBQzdCLEdBQUcsQ0FBQyxNQUFNLENBQUMsUUFBUSxJQUFJLEVBQUUsUUFBUSxFQUFFLE1BQU0sQ0FBQyxRQUFRLEVBQUUsQ0FBQztTQUN0RCxDQUFDO1FBRUYsTUFBTSxhQUFhLEdBQUcsTUFBTSxJQUFJLENBQUMsaUJBQWlCLENBQ2hELE1BQU0sQ0FBQyxPQUFPLEVBQ2QsSUFBSSxDQUFDLFNBQVMsQ0FBQyxrQkFBa0IsQ0FBQyxFQUNsQyxNQUFNLENBQUMsaUJBQWlCLENBQ3pCLENBQUM7UUFFRixPQUFPO1lBQ0wsU0FBUyxFQUFFLElBQUksQ0FBQyxTQUFTLENBQUMsU0FBUyxDQUFDO1lBQ3BDLGFBQWEsRUFBRSxJQUFJLENBQUMsU0FBUyxDQUFDLGFBQWEsQ0FBQztTQUM3QyxDQUFDO0lBQ0osQ0FBQztJQUVELE1BQU0sQ0FBQyxLQUFLLENBQUMsYUFBYSxDQUN4QixtQkFBK0IsRUFDL0IsVUFBa0I7UUFFbEIsTUFBTSxHQUFHLEdBQUcsTUFBTSxrQkFBTSxDQUFDLE9BQU8sQ0FBQztZQUMvQixHQUFHLG1CQUFtQjtZQUN0QixHQUFHLEVBQUUsVUFBVSxDQUFDLFFBQVEsQ0FBQyxtQkFBbUIsQ0FBQyxRQUFRLENBQUM7U0FDdkQsQ0FBQyxDQUFDO1FBRUgsT0FBTyxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQ3pCLENBQUM7Q0FDRjtBQUVELGtCQUFlLFdBQVcsQ0FBQyJ9
|
|
@@ -51,7 +51,12 @@ class Offers {
|
|
|
51
51
|
const contract = index_js_2.BlockchainConnector.getInstance().getContract();
|
|
52
52
|
(0, helper_js_1.checkIfActionAccountInitialized)(transactionOptions);
|
|
53
53
|
const formattedExternalId = (0, utils_js_1.formatBytes32String)(externalId);
|
|
54
|
-
|
|
54
|
+
const { restrictions, linkage, ...rest } = offerInfo;
|
|
55
|
+
const offerInfoRaw = {
|
|
56
|
+
...rest,
|
|
57
|
+
linkage_DEPRECATED: linkage,
|
|
58
|
+
};
|
|
59
|
+
await TxManager_js_1.default.execute(contract.methods.createValueOffer(providerAuthorityAccount, offerInfoRaw, restrictions, formattedExternalId, enabled), transactionOptions);
|
|
55
60
|
}
|
|
56
61
|
static async getByExternalId(filter, fromBlock, toBlock) {
|
|
57
62
|
const founded = await StaticModel_js_1.default.findItemsById('OfferCreated', filter, fromBlock, toBlock);
|
|
@@ -205,4 +210,4 @@ class Offers {
|
|
|
205
210
|
}
|
|
206
211
|
}
|
|
207
212
|
exports.default = Offers;
|
|
208
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
213
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Offers.js","sourceRoot":"","sources":["../../../src/staticModels/Offers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { Encryption, StorageProviderResource, TeeOrderEncryptedArgs } from '@super-protocol/dto-js';
|
|
1
|
+
import { Encryption, Hash, StorageProviderResource, TeeOrderEncryptedArgs } from '@super-protocol/dto-js';
|
|
2
2
|
import StorageAccess from '../../types/storage/StorageAccess.js';
|
|
3
3
|
export declare class OrderArgsHelper {
|
|
4
4
|
static decryptOrderArgs<T>(encryptedArgs: string, ecdhPrivateKey: string): Promise<T | undefined>;
|
|
5
5
|
static encryptOrderArgs(args: unknown, encryption: Encryption): Promise<string>;
|
|
6
|
-
static
|
|
6
|
+
static isMoreThanGivenSize(args: Record<string, unknown>, sizeInBytes?: number): boolean;
|
|
7
7
|
static uploadToStorage(params: {
|
|
8
8
|
args: TeeOrderEncryptedArgs;
|
|
9
9
|
key: string;
|
|
@@ -13,4 +13,5 @@ export declare class OrderArgsHelper {
|
|
|
13
13
|
};
|
|
14
14
|
encryption: Encryption;
|
|
15
15
|
}): Promise<StorageProviderResource>;
|
|
16
|
+
static calculateArgsHash(args: TeeOrderEncryptedArgs): Promise<Hash>;
|
|
16
17
|
}
|
|
@@ -5,16 +5,37 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.OrderArgsHelper = void 0;
|
|
7
7
|
const lodash_1 = __importDefault(require("lodash"));
|
|
8
|
+
const dto_js_1 = require("@super-protocol/dto-js");
|
|
8
9
|
const index_js_1 = __importDefault(require("../../crypto/index.js"));
|
|
9
10
|
const uploadObjectToStorage_js_1 = require("./uploadObjectToStorage.js");
|
|
10
11
|
const isStringArray = (item) => Array.isArray(item) && item.every(lodash_1.default.isString);
|
|
11
|
-
const
|
|
12
|
+
const isEncryptedData = (arg) => {
|
|
13
|
+
if (!lodash_1.default.isString(arg)) {
|
|
14
|
+
return false;
|
|
15
|
+
}
|
|
16
|
+
try {
|
|
17
|
+
const encryption = JSON.parse(arg);
|
|
18
|
+
return Boolean(encryption.encoding && encryption.algo && encryption.ciphertext);
|
|
19
|
+
}
|
|
20
|
+
catch {
|
|
21
|
+
return false;
|
|
22
|
+
}
|
|
23
|
+
};
|
|
12
24
|
const isEncryptedArgs = (arg) => Boolean(lodash_1.default.isPlainObject(arg) &&
|
|
13
25
|
isStringArray(arg.data) &&
|
|
14
26
|
isStringArray(arg.image) &&
|
|
15
27
|
isStringArray(arg.solution) &&
|
|
16
|
-
(!arg.configuration ||
|
|
17
|
-
|
|
28
|
+
(!arg.configuration || isEncryptedData(arg.configuration)));
|
|
29
|
+
const sortArrayByHash = async (array) => {
|
|
30
|
+
const elementsWithHashes = await Promise.all(array.map(async (element) => {
|
|
31
|
+
const hashObj = await index_js_1.default.createHash(Buffer.from(element), {
|
|
32
|
+
algo: dto_js_1.HashAlgorithm.SHA256,
|
|
33
|
+
encoding: dto_js_1.Encoding.hex,
|
|
34
|
+
});
|
|
35
|
+
return { element, hash: hashObj.hash };
|
|
36
|
+
}));
|
|
37
|
+
return lodash_1.default.chain(elementsWithHashes).sortBy(['hash']).map('element').value();
|
|
38
|
+
};
|
|
18
39
|
class OrderArgsHelper {
|
|
19
40
|
static async decryptOrderArgs(encryptedArgs, ecdhPrivateKey) {
|
|
20
41
|
if (!encryptedArgs) {
|
|
@@ -30,17 +51,11 @@ class OrderArgsHelper {
|
|
|
30
51
|
const encryptedArgs = await index_js_1.default.encrypt(JSON.stringify(args), encryption);
|
|
31
52
|
return JSON.stringify(encryptedArgs);
|
|
32
53
|
}
|
|
33
|
-
static
|
|
34
|
-
|
|
35
|
-
const
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
inc(args.solution);
|
|
39
|
-
inc(args.data);
|
|
40
|
-
inc(args.image);
|
|
41
|
-
inc(args.configuration?.data);
|
|
42
|
-
totalElements += args.configuration?.solution ? 1 : 0;
|
|
43
|
-
return totalElements > elementsCount;
|
|
54
|
+
static isMoreThanGivenSize(args, sizeInBytes = 2.5 * 1024) {
|
|
55
|
+
const serializedData = JSON.stringify(args);
|
|
56
|
+
const encoder = new TextEncoder();
|
|
57
|
+
const data = encoder.encode(serializedData);
|
|
58
|
+
return data.length > sizeInBytes;
|
|
44
59
|
}
|
|
45
60
|
static uploadToStorage(params) {
|
|
46
61
|
const { access, args, key, encryption } = params;
|
|
@@ -54,6 +69,19 @@ class OrderArgsHelper {
|
|
|
54
69
|
encryption,
|
|
55
70
|
});
|
|
56
71
|
}
|
|
72
|
+
static async calculateArgsHash(args) {
|
|
73
|
+
const entries = Object.entries(args);
|
|
74
|
+
const resultObject = {};
|
|
75
|
+
for (const [key, value] of lodash_1.default.sortBy(entries, [0])) {
|
|
76
|
+
if (isStringArray(value) && value.length > 1) {
|
|
77
|
+
resultObject[key] = await sortArrayByHash(value);
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
return index_js_1.default.createHash(Buffer.from(JSON.stringify(resultObject)), {
|
|
81
|
+
algo: dto_js_1.HashAlgorithm.SHA256,
|
|
82
|
+
encoding: dto_js_1.Encoding.hex,
|
|
83
|
+
});
|
|
84
|
+
}
|
|
57
85
|
}
|
|
58
86
|
exports.OrderArgsHelper = OrderArgsHelper;
|
|
59
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
87
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiT3JkZXJBcmdzSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL3V0aWxzL2hlbHBlcnMvT3JkZXJBcmdzSGVscGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLG9EQUF1QjtBQUN2QixtREFPZ0M7QUFDaEMscUVBQTJDO0FBRTNDLHlFQUFtRTtBQUVuRSxNQUFNLGFBQWEsR0FBRyxDQUFDLElBQWEsRUFBb0IsRUFBRSxDQUN4RCxLQUFLLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLElBQUksQ0FBQyxLQUFLLENBQUMsZ0JBQUMsQ0FBQyxRQUFRLENBQUMsQ0FBQztBQUVoRCxNQUFNLGVBQWUsR0FBRyxDQUFDLEdBQVksRUFBVyxFQUFFO0lBQ2hELElBQUksQ0FBQyxnQkFBQyxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDO1FBQ3JCLE9BQU8sS0FBSyxDQUFDO0lBQ2YsQ0FBQztJQUVELElBQUksQ0FBQztRQUNILE1BQU0sVUFBVSxHQUFlLElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7UUFFL0MsT0FBTyxPQUFPLENBQUMsVUFBVSxDQUFDLFFBQVEsSUFBSSxVQUFVLENBQUMsSUFBSSxJQUFJLFVBQVUsQ0FBQyxVQUFVLENBQUMsQ0FBQztJQUNsRixDQUFDO0lBQUMsTUFBTSxDQUFDO1FBQ1AsT0FBTyxLQUFLLENBQUM7SUFDZixDQUFDO0FBQ0gsQ0FBQyxDQUFDO0FBRUYsTUFBTSxlQUFlLEdBQUcsQ0FBQyxHQUF5QyxFQUFXLEVBQUUsQ0FDN0UsT0FBTyxDQUNMLGdCQUFDLENBQUMsYUFBYSxDQUFDLEdBQUcsQ0FBQztJQUNsQixhQUFhLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQztJQUN2QixhQUFhLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQztJQUN4QixhQUFhLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQztJQUMzQixDQUFDLENBQUMsR0FB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
|
|
@@ -12,6 +12,7 @@ declare class RIGenerator extends TeeInputGeneratorBase {
|
|
|
12
12
|
dataHashes: Hash[];
|
|
13
13
|
imageHashes: Hash[];
|
|
14
14
|
linkage?: string;
|
|
15
|
+
argsHash?: Hash;
|
|
15
16
|
}): Promise<OrderResultInfo>;
|
|
16
17
|
static getResultInfo(encryptedResultInfo: Encryption, privateKey: Buffer): Promise<OrderEncryptedInfo>;
|
|
17
18
|
}
|
package/dist/mjs/RIGenerator.js
CHANGED
|
@@ -27,6 +27,7 @@ class RIGenerator extends TeeInputGeneratorBase {
|
|
|
27
27
|
dataHashes: params.dataHashes || [],
|
|
28
28
|
imageHashes: params.imageHashes || [],
|
|
29
29
|
linkage: params.linkage ?? '',
|
|
30
|
+
...(params.argsHash && { argsHash: params.argsHash }),
|
|
30
31
|
};
|
|
31
32
|
const encryptedInfo = await this.encryptByTeeBlock(params.offerId, JSON.stringify(orderInfoToEncrypt), params.pccsServiceApiUrl);
|
|
32
33
|
return {
|
|
@@ -35,12 +36,12 @@ class RIGenerator extends TeeInputGeneratorBase {
|
|
|
35
36
|
};
|
|
36
37
|
}
|
|
37
38
|
static async getResultInfo(encryptedResultInfo, privateKey) {
|
|
38
|
-
const
|
|
39
|
+
const res = await Crypto.decrypt({
|
|
39
40
|
...encryptedResultInfo,
|
|
40
41
|
key: privateKey.toString(encryptedResultInfo.encoding),
|
|
41
|
-
})
|
|
42
|
-
return
|
|
42
|
+
});
|
|
43
|
+
return JSON.parse(res);
|
|
43
44
|
}
|
|
44
45
|
}
|
|
45
46
|
export default RIGenerator;
|
|
46
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
47
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUklHZW5lcmF0b3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvUklHZW5lcmF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUdMLFFBQVEsRUFDUixlQUFlLEVBRWYsYUFBYSxHQUNkLE1BQU0sd0JBQXdCLENBQUM7QUFDaEMsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLFFBQVEsQ0FBQztBQUVwQyxPQUFPLE1BQU0sTUFBTSxtQkFBbUIsQ0FBQztBQUN2QyxPQUFPLHFCQUFxQixNQUFNLDRCQUE0QixDQUFDO0FBRS9ELE1BQU0sV0FBWSxTQUFRLHFCQUFxQjtJQUM3QyxNQUFNLENBQUMsS0FBSyxDQUFDLG9CQUFvQixDQUFDLG1CQUFrQztRQUNsRSxNQUFNLGlCQUFpQixHQUFHLE1BQU0sTUFBTSxDQUFDLFVBQVUsQ0FDL0MsTUFBTSxDQUFDLElBQUksQ0FBQyxtQkFBbUIsQ0FBQyxHQUFJLEVBQUUsbUJBQW1CLENBQUMsUUFBUSxDQUFDLEVBQ25FLEVBQUUsUUFBUSxFQUFFLFFBQVEsQ0FBQyxNQUFNLEVBQUUsSUFBSSxFQUFFLGFBQWEsQ0FBQyxNQUFNLEVBQUUsQ0FDMUQsQ0FBQztRQUVGLE9BQU87WUFDTCxHQUFHLEVBQUUsaUJBQWlCLENBQUMsSUFBSTtZQUMzQixRQUFRLEVBQUUsaUJBQWlCLENBQUMsUUFBUTtZQUNwQyxJQUFJLEVBQUUsZUFBZSxDQUFDLEtBQUs7U0FDNUIsQ0FBQztJQUNKLENBQUM7SUFFRCxNQUFNLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxNQVNyQjtRQUNDLE1BQU0sZ0JBQWdCLEdBQUcsTUFBTSxDQUFDLFlBQVksQ0FBQyxNQUFNLENBQUMsb0JBQW9CLENBQUMsQ0FBQztRQUUxRSxNQUFNLGlCQUFpQixHQUFHLE1BQU0sSUFBSSxDQUFDLG9CQUFvQixDQUFDLGdCQUFnQixDQUFDLENBQUM7UUFFNUUsTUFBTSxJQUFJLEdBQUcsVUFBVSxDQUFDLFdBQVcsQ0FBQyxDQUFDO1FBQ3JDLElBQUksQ0FBQyxhQUFhLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxHQUFJLEVBQUUsaUJBQWlCLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQztRQUNwRixNQUFNLFNBQVMsR0FBRztZQUNoQixHQUFHLEVBQUUsSUFBSSxDQUFDLFlBQVksQ0FBQyxpQkFBaUIsQ0FBQyxRQUFRLENBQUM7WUFDbEQsUUFBUSxFQUFFLFFBQVEsQ0FBQyxNQUFNO1lBQ3pCLElBQUksRUFBRSxlQUFlLENBQUMsS0FBSztTQUNkLENBQUM7UUFFaEIsTUFBTSxrQkFBa0IsR0FBdUI7WUFDN0MsU0FBUyxFQUFFLGdCQUFnQjtZQUMzQixjQUFjLEVBQUUsTUFBTSxDQUFDLGNBQWMsSUFBSSxFQUFFO1lBQzNDLFVBQVUsRUFBRSxNQUFNLENBQUMsVUFBVSxJQUFJLEVBQUU7WUFDbkMsV0FBVyxFQUFFLE1BQU0sQ0FBQyxXQUFXLElBQUksRUFBRTtZQUNyQyxPQUFPLEVBQUUsTUFBTSxDQUFDLE9BQU8sSUFBSSxFQUFFO1lBQzdCLEdBQUcsQ0FBQyxNQUFNLENBQUMsUUFBUSxJQUFJLEVBQUUsUUFBUSxFQUFFLE1BQU0sQ0FBQyxRQUFRLEVBQUUsQ0FBQztTQUN0RCxDQUFDO1FBRUYsTUFBTSxhQUFhLEdBQUcsTUFBTSxJQUFJLENBQUMsaUJBQWlCLENBQ2hELE1BQU0sQ0FBQyxPQUFPLEVBQ2QsSUFBSSxDQUFDLFNBQVMsQ0FBQyxrQkFBa0IsQ0FBQyxFQUNsQyxNQUFNLENBQUMsaUJBQWlCLENBQ3pCLENBQUM7UUFFRixPQUFPO1lBQ0wsU0FBUyxFQUFFLElBQUksQ0FBQyxTQUFTLENBQUMsU0FBUyxDQUFDO1lBQ3BDLGFBQWEsRUFBRSxJQUFJLENBQUMsU0FBUyxDQUFDLGFBQWEsQ0FBQztTQUM3QyxDQUFDO0lBQ0osQ0FBQztJQUVELE1BQU0sQ0FBQyxLQUFLLENBQUMsYUFBYSxDQUN4QixtQkFBK0IsRUFDL0IsVUFBa0I7UUFFbEIsTUFBTSxHQUFHLEdBQUcsTUFBTSxNQUFNLENBQUMsT0FBTyxDQUFDO1lBQy9CLEdBQUcsbUJBQW1CO1lBQ3RCLEdBQUcsRUFBRSxVQUFVLENBQUMsUUFBUSxDQUFDLG1CQUFtQixDQUFDLFFBQVEsQ0FBQztTQUN2RCxDQUFDLENBQUM7UUFFSCxPQUFPLElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDekIsQ0FBQztDQUNGO0FBRUQsZUFBZSxXQUFXLENBQUMifQ==
|
|
@@ -46,7 +46,12 @@ class Offers {
|
|
|
46
46
|
const contract = BlockchainConnector.getInstance().getContract();
|
|
47
47
|
checkIfActionAccountInitialized(transactionOptions);
|
|
48
48
|
const formattedExternalId = formatBytes32String(externalId);
|
|
49
|
-
|
|
49
|
+
const { restrictions, linkage, ...rest } = offerInfo;
|
|
50
|
+
const offerInfoRaw = {
|
|
51
|
+
...rest,
|
|
52
|
+
linkage_DEPRECATED: linkage,
|
|
53
|
+
};
|
|
54
|
+
await TxManager.execute(contract.methods.createValueOffer(providerAuthorityAccount, offerInfoRaw, restrictions, formattedExternalId, enabled), transactionOptions);
|
|
50
55
|
}
|
|
51
56
|
static async getByExternalId(filter, fromBlock, toBlock) {
|
|
52
57
|
const founded = await StaticModel.findItemsById('OfferCreated', filter, fromBlock, toBlock);
|
|
@@ -200,4 +205,4 @@ class Offers {
|
|
|
200
205
|
}
|
|
201
206
|
}
|
|
202
207
|
export default Offers;
|
|
203
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
208
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Offers.js","sourceRoot":"","sources":["../../../src/staticModels/Offers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { Encryption, StorageProviderResource, TeeOrderEncryptedArgs } from '@super-protocol/dto-js';
|
|
1
|
+
import { Encryption, Hash, StorageProviderResource, TeeOrderEncryptedArgs } from '@super-protocol/dto-js';
|
|
2
2
|
import StorageAccess from '../../types/storage/StorageAccess.js';
|
|
3
3
|
export declare class OrderArgsHelper {
|
|
4
4
|
static decryptOrderArgs<T>(encryptedArgs: string, ecdhPrivateKey: string): Promise<T | undefined>;
|
|
5
5
|
static encryptOrderArgs(args: unknown, encryption: Encryption): Promise<string>;
|
|
6
|
-
static
|
|
6
|
+
static isMoreThanGivenSize(args: Record<string, unknown>, sizeInBytes?: number): boolean;
|
|
7
7
|
static uploadToStorage(params: {
|
|
8
8
|
args: TeeOrderEncryptedArgs;
|
|
9
9
|
key: string;
|
|
@@ -13,4 +13,5 @@ export declare class OrderArgsHelper {
|
|
|
13
13
|
};
|
|
14
14
|
encryption: Encryption;
|
|
15
15
|
}): Promise<StorageProviderResource>;
|
|
16
|
+
static calculateArgsHash(args: TeeOrderEncryptedArgs): Promise<Hash>;
|
|
16
17
|
}
|
|
@@ -1,14 +1,35 @@
|
|
|
1
1
|
import _ from 'lodash';
|
|
2
|
+
import { Encoding, HashAlgorithm, } from '@super-protocol/dto-js';
|
|
2
3
|
import Crypto from '../../crypto/index.js';
|
|
3
4
|
import { uploadObjectToStorage } from './uploadObjectToStorage.js';
|
|
4
5
|
const isStringArray = (item) => Array.isArray(item) && item.every(_.isString);
|
|
5
|
-
const
|
|
6
|
+
const isEncryptedData = (arg) => {
|
|
7
|
+
if (!_.isString(arg)) {
|
|
8
|
+
return false;
|
|
9
|
+
}
|
|
10
|
+
try {
|
|
11
|
+
const encryption = JSON.parse(arg);
|
|
12
|
+
return Boolean(encryption.encoding && encryption.algo && encryption.ciphertext);
|
|
13
|
+
}
|
|
14
|
+
catch {
|
|
15
|
+
return false;
|
|
16
|
+
}
|
|
17
|
+
};
|
|
6
18
|
const isEncryptedArgs = (arg) => Boolean(_.isPlainObject(arg) &&
|
|
7
19
|
isStringArray(arg.data) &&
|
|
8
20
|
isStringArray(arg.image) &&
|
|
9
21
|
isStringArray(arg.solution) &&
|
|
10
|
-
(!arg.configuration ||
|
|
11
|
-
|
|
22
|
+
(!arg.configuration || isEncryptedData(arg.configuration)));
|
|
23
|
+
const sortArrayByHash = async (array) => {
|
|
24
|
+
const elementsWithHashes = await Promise.all(array.map(async (element) => {
|
|
25
|
+
const hashObj = await Crypto.createHash(Buffer.from(element), {
|
|
26
|
+
algo: HashAlgorithm.SHA256,
|
|
27
|
+
encoding: Encoding.hex,
|
|
28
|
+
});
|
|
29
|
+
return { element, hash: hashObj.hash };
|
|
30
|
+
}));
|
|
31
|
+
return _.chain(elementsWithHashes).sortBy(['hash']).map('element').value();
|
|
32
|
+
};
|
|
12
33
|
export class OrderArgsHelper {
|
|
13
34
|
static async decryptOrderArgs(encryptedArgs, ecdhPrivateKey) {
|
|
14
35
|
if (!encryptedArgs) {
|
|
@@ -24,17 +45,11 @@ export class OrderArgsHelper {
|
|
|
24
45
|
const encryptedArgs = await Crypto.encrypt(JSON.stringify(args), encryption);
|
|
25
46
|
return JSON.stringify(encryptedArgs);
|
|
26
47
|
}
|
|
27
|
-
static
|
|
28
|
-
|
|
29
|
-
const
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
inc(args.solution);
|
|
33
|
-
inc(args.data);
|
|
34
|
-
inc(args.image);
|
|
35
|
-
inc(args.configuration?.data);
|
|
36
|
-
totalElements += args.configuration?.solution ? 1 : 0;
|
|
37
|
-
return totalElements > elementsCount;
|
|
48
|
+
static isMoreThanGivenSize(args, sizeInBytes = 2.5 * 1024) {
|
|
49
|
+
const serializedData = JSON.stringify(args);
|
|
50
|
+
const encoder = new TextEncoder();
|
|
51
|
+
const data = encoder.encode(serializedData);
|
|
52
|
+
return data.length > sizeInBytes;
|
|
38
53
|
}
|
|
39
54
|
static uploadToStorage(params) {
|
|
40
55
|
const { access, args, key, encryption } = params;
|
|
@@ -48,5 +63,18 @@ export class OrderArgsHelper {
|
|
|
48
63
|
encryption,
|
|
49
64
|
});
|
|
50
65
|
}
|
|
66
|
+
static async calculateArgsHash(args) {
|
|
67
|
+
const entries = Object.entries(args);
|
|
68
|
+
const resultObject = {};
|
|
69
|
+
for (const [key, value] of _.sortBy(entries, [0])) {
|
|
70
|
+
if (isStringArray(value) && value.length > 1) {
|
|
71
|
+
resultObject[key] = await sortArrayByHash(value);
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
return Crypto.createHash(Buffer.from(JSON.stringify(resultObject)), {
|
|
75
|
+
algo: HashAlgorithm.SHA256,
|
|
76
|
+
encoding: Encoding.hex,
|
|
77
|
+
});
|
|
78
|
+
}
|
|
51
79
|
}
|
|
52
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
80
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiT3JkZXJBcmdzSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL3V0aWxzL2hlbHBlcnMvT3JkZXJBcmdzSGVscGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sQ0FBQyxNQUFNLFFBQVEsQ0FBQztBQUN2QixPQUFPLEVBQ0wsUUFBUSxFQUdSLGFBQWEsR0FHZCxNQUFNLHdCQUF3QixDQUFDO0FBQ2hDLE9BQU8sTUFBTSxNQUFNLHVCQUF1QixDQUFDO0FBRTNDLE9BQU8sRUFBRSxxQkFBcUIsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBRW5FLE1BQU0sYUFBYSxHQUFHLENBQUMsSUFBYSxFQUFvQixFQUFFLENBQ3hELEtBQUssQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLENBQUM7QUFFaEQsTUFBTSxlQUFlLEdBQUcsQ0FBQyxHQUFZLEVBQVcsRUFBRTtJQUNoRCxJQUFJLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDO1FBQ3JCLE9BQU8sS0FBSyxDQUFDO0lBQ2YsQ0FBQztJQUVELElBQUksQ0FBQztRQUNILE1BQU0sVUFBVSxHQUFlLElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7UUFFL0MsT0FBTyxPQUFPLENBQUMsVUFBVSxDQUFDLFFBQVEsSUFBSSxVQUFVLENBQUMsSUFBSSxJQUFJLFVBQVUsQ0FBQyxVQUFVLENBQUMsQ0FBQztJQUNsRixDQUFDO0lBQUMsTUFBTSxDQUFDO1FBQ1AsT0FBTyxLQUFLLENBQUM7SUFDZixDQUFDO0FBQ0gsQ0FBQyxDQUFDO0FBRUYsTUFBTSxlQUFlLEdBQUcsQ0FBQyxHQUF5QyxFQUFXLEVBQUUsQ0FDN0UsT0FBTyxDQUNMLENBQUMsQ0FBQyxhQUFhLENBQUMsR0FBRyxDQUFDO0lBQ2xCLGFBQWEsQ0FBQyxHQUFHLENBQUMs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
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@super-protocol/sdk-js",
|
|
3
|
-
"version": "2.2.0-beta.
|
|
3
|
+
"version": "2.2.0-beta.95",
|
|
4
4
|
"main": "dist/cjs/index.js",
|
|
5
5
|
"module": "dist/mjs/index.js",
|
|
6
6
|
"exports": {
|
|
@@ -58,7 +58,7 @@
|
|
|
58
58
|
"dependencies": {
|
|
59
59
|
"@aws-sdk/client-s3": "^3.470.0",
|
|
60
60
|
"@fidm/x509": "^1.2.1",
|
|
61
|
-
"@super-protocol/dto-js": "0.1.
|
|
61
|
+
"@super-protocol/dto-js": "0.1.2",
|
|
62
62
|
"@super-protocol/tee-lib": "^0.1.2",
|
|
63
63
|
"@super-protocol/uplink-nodejs": "^1.2.20",
|
|
64
64
|
"asn1js": "^3.0.5",
|