@super-protocol/sdk-js 0.15.3-beta.4 → 0.16.0-beta.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/TIIGenerator.d.ts +1 -1
- package/build/TIIGenerator.js +13 -8
- package/build/connectors/BaseConnector.d.ts +2 -2
- package/build/connectors/BaseConnector.js +5 -4
- package/build/connectors/BlockchainConnector.d.ts +4 -4
- package/build/connectors/BlockchainConnector.js +30 -12
- package/build/connectors/BlockchainEventsListener.d.ts +2 -2
- package/build/connectors/BlockchainEventsListener.js +3 -2
- package/build/constants.js +4 -3
- package/build/crypto/Crypto.d.ts +2 -2
- package/build/crypto/Crypto.js +1 -0
- package/build/crypto/index.d.ts +1 -1
- package/build/crypto/index.js +1 -0
- package/build/crypto/nodejs/AES.d.ts +2 -2
- package/build/crypto/nodejs/AES.js +5 -4
- package/build/crypto/nodejs/ARIA.d.ts +2 -2
- package/build/crypto/nodejs/ARIA.js +5 -4
- package/build/crypto/nodejs/ECIES.d.ts +1 -1
- package/build/crypto/nodejs/ECIES.js +14 -13
- package/build/crypto/nodejs/NativeCrypto.d.ts +3 -3
- package/build/crypto/nodejs/NativeCrypto.js +9 -8
- package/build/crypto/nodejs/RSA-Hybrid.d.ts +3 -3
- package/build/crypto/nodejs/RSA-Hybrid.js +13 -12
- package/build/index.d.ts +67 -67
- package/build/index.js +1 -0
- package/build/logger.d.ts +1 -1
- package/build/logger.js +3 -2
- package/build/models/EtlModel.d.ts +3 -3
- package/build/models/EtlModel.js +6 -5
- package/build/models/Offer.d.ts +7 -7
- package/build/models/Offer.js +72 -20
- package/build/models/Order.d.ts +3 -3
- package/build/models/Order.js +118 -34
- package/build/models/Provider.d.ts +3 -3
- package/build/models/Provider.js +14 -5
- package/build/models/TCB.d.ts +2 -2
- package/build/models/TCB.js +2 -1
- package/build/models/TeeOffer.d.ts +11 -11
- package/build/models/TeeOffer.js +111 -34
- package/build/proto/Compression.js +1 -0
- package/build/proto/TRI.js +1 -0
- package/build/proto/TeeProperties.js +1 -0
- package/build/providers/storage/ChunksDownloadDecorator.d.ts +4 -4
- package/build/providers/storage/ChunksDownloadDecorator.js +5 -4
- package/build/providers/storage/IStorageProvider.d.ts +2 -2
- package/build/providers/storage/IStorageProvider.js +1 -0
- package/build/providers/storage/S3StorageProvider.d.ts +3 -3
- package/build/providers/storage/S3StorageProvider.js +14 -13
- package/build/providers/storage/StorageAdapter.d.ts +2 -2
- package/build/providers/storage/StorageAdapter.js +11 -10
- package/build/providers/storage/StorageContentWriter.d.ts +3 -3
- package/build/providers/storage/StorageContentWriter.js +4 -3
- package/build/providers/storage/StorageKeyValueAdapter.d.ts +3 -3
- package/build/providers/storage/StorageKeyValueAdapter.js +16 -15
- package/build/providers/storage/StorageMetadataReader.d.ts +3 -3
- package/build/providers/storage/StorageMetadataReader.js +4 -3
- package/build/providers/storage/StorjAdapter.d.ts +2 -2
- package/build/providers/storage/StorjAdapter.js +8 -6
- package/build/providers/storage/StorjStorageProvider.d.ts +3 -3
- package/build/providers/storage/StorjStorageProvider.js +9 -8
- package/build/providers/storage/getStorageProvider.d.ts +2 -2
- package/build/providers/storage/getStorageProvider.js +1 -0
- package/build/providers/storage/types.js +1 -0
- package/build/staticModels/ActiveOffers.d.ts +2 -2
- package/build/staticModels/ActiveOffers.js +3 -2
- package/build/staticModels/ActiveOrders.d.ts +1 -1
- package/build/staticModels/ActiveOrders.js +18 -5
- package/build/staticModels/BaseStaticModel.d.ts +1 -1
- package/build/staticModels/BaseStaticModel.js +1 -0
- package/build/staticModels/Consensus.d.ts +3 -3
- package/build/staticModels/Consensus.js +20 -19
- package/build/staticModels/Deposits.d.ts +2 -2
- package/build/staticModels/Deposits.js +29 -16
- package/build/staticModels/Marks.d.ts +1 -1
- package/build/staticModels/Marks.js +1 -0
- package/build/staticModels/ModelPackager.js +1 -0
- package/build/staticModels/Offers.d.ts +4 -4
- package/build/staticModels/Offers.js +27 -24
- package/build/staticModels/Orders.d.ts +3 -3
- package/build/staticModels/Orders.js +52 -39
- package/build/staticModels/ProviderRegistry.d.ts +3 -3
- package/build/staticModels/ProviderRegistry.js +17 -16
- package/build/staticModels/Superpro.d.ts +2 -2
- package/build/staticModels/Superpro.js +1 -0
- package/build/staticModels/SuperproToken.d.ts +2 -2
- package/build/staticModels/SuperproToken.js +8 -7
- package/build/staticModels/TeeOffers.d.ts +6 -6
- package/build/staticModels/TeeOffers.js +37 -32
- package/build/store.d.ts +1 -1
- package/build/store.js +1 -0
- package/build/tee/QuoteParser.d.ts +25 -0
- package/build/tee/QuoteParser.js +120 -0
- package/build/tee/QuoteValidator.d.ts +31 -0
- package/build/tee/QuoteValidator.js +298 -0
- package/build/tee/errors.d.ts +6 -0
- package/build/tee/errors.js +13 -0
- package/build/tee/interface.d.ts +63 -0
- package/build/tee/interface.js +3 -0
- package/build/tee/statuses.d.ts +21 -0
- package/build/tee/statuses.js +28 -0
- package/build/tee/types.d.ts +60 -0
- package/build/tee/types.js +3 -0
- package/build/types/Compressor.js +1 -0
- package/build/types/Consensus.js +1 -0
- package/build/types/DepositInfo.js +1 -0
- package/build/types/EtlModel.d.ts +1 -1
- package/build/types/EtlModel.js +1 -0
- package/build/types/Events.js +1 -0
- package/build/types/HardwareInfo.d.ts +2 -2
- package/build/types/HardwareInfo.js +1 -0
- package/build/types/Marks.js +1 -0
- package/build/types/Offer.js +1 -0
- package/build/types/OptionInfo.js +1 -0
- package/build/types/Order.d.ts +4 -4
- package/build/types/Order.js +1 -0
- package/build/types/Origins.js +1 -0
- package/build/types/Provider.d.ts +1 -1
- package/build/types/Provider.js +1 -0
- package/build/types/ResourceLoader.d.ts +2 -2
- package/build/types/ResourceLoader.js +1 -0
- package/build/types/SlotInfo.js +1 -0
- package/build/types/SlotUsage.js +1 -0
- package/build/types/Superpro.js +1 -0
- package/build/types/TeeOfferInfo.d.ts +1 -1
- package/build/types/TeeOfferInfo.js +1 -0
- package/build/types/TeeOfferOption.d.ts +2 -2
- package/build/types/TeeOfferOption.js +1 -0
- package/build/types/TeeOfferSlot.d.ts +2 -2
- package/build/types/TeeOfferSlot.js +1 -0
- package/build/types/ValueOfferSlot.d.ts +3 -3
- package/build/types/ValueOfferSlot.js +1 -0
- package/build/types/Web3.d.ts +1 -1
- package/build/types/Web3.js +1 -0
- package/build/types/blockchainConnector/StorageAccess.d.ts +1 -1
- package/build/types/blockchainConnector/StorageAccess.js +1 -0
- package/build/types/storage/StorageAccess.d.ts +1 -1
- package/build/types/storage/StorageAccess.js +1 -0
- package/build/types/storage/StorageFileAccess.d.ts +1 -1
- package/build/types/storage/StorageFileAccess.js +1 -0
- package/build/types/storage/StorageObject.js +1 -0
- package/build/utils/Monitoring.js +4 -3
- package/build/utils/NonceTracker.d.ts +1 -1
- package/build/utils/NonceTracker.js +3 -2
- package/build/utils/PubSub.js +1 -0
- package/build/utils/TxManager.d.ts +4 -4
- package/build/utils/TxManager.js +28 -20
- package/build/utils/compressors/GzipCompressor.d.ts +2 -2
- package/build/utils/compressors/GzipCompressor.js +1 -0
- package/build/utils/compressors/UncompressedCompressor.d.ts +2 -2
- package/build/utils/compressors/UncompressedCompressor.js +1 -0
- package/build/utils/compressors/index.d.ts +2 -2
- package/build/utils/compressors/index.js +1 -0
- package/build/utils/helpers/index.d.ts +1 -1
- package/build/utils/helpers/index.js +1 -0
- package/build/utils/helpers/tryWithInterval.js +1 -0
- package/build/utils/resourceLoaders/BaseResourceLoader.d.ts +3 -3
- package/build/utils/resourceLoaders/BaseResourceLoader.js +1 -0
- package/build/utils/resourceLoaders/StorageProviderLoader.d.ts +3 -3
- package/build/utils/resourceLoaders/StorageProviderLoader.js +1 -0
- package/build/utils/resourceLoaders/UrlResourceLoader.d.ts +2 -2
- package/build/utils/resourceLoaders/UrlResourceLoader.js +4 -3
- package/build/utils/resourceLoaders/getResourceLoader.d.ts +2 -2
- package/build/utils/resourceLoaders/getResourceLoader.js +1 -0
- package/build/utils/resourceLoaders/index.d.ts +1 -1
- package/build/utils/resourceLoaders/index.js +1 -0
- package/build/utils.d.ts +3 -3
- package/build/utils.js +11 -10
- package/package.json +9 -3
package/build/TIIGenerator.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
-
import { Encryption, Hash, Resource, TeeRunInfo } from
|
|
2
|
+
import { Encryption, Hash, Resource, TeeRunInfo } from '@super-protocol/dto-js';
|
|
3
3
|
declare class TIIGenerator {
|
|
4
4
|
static generateByOffer(offerId: string, solutionHashes: Hash[], linkageString: string | undefined, resource: Resource, args: any, encryption: Encryption): Promise<string>;
|
|
5
5
|
static generate(orderId: string, resource: Resource, args: any, encryption: Encryption): Promise<string>;
|
package/build/TIIGenerator.js
CHANGED
|
@@ -31,9 +31,9 @@ class TIIGenerator {
|
|
|
31
31
|
? JSON.parse(linkageString)
|
|
32
32
|
: {
|
|
33
33
|
encoding: dto_js_1.Encoding.base64,
|
|
34
|
-
mrenclave:
|
|
34
|
+
mrenclave: '',
|
|
35
35
|
};
|
|
36
|
-
const tlb = new tee_lib_1.TLBlockSerializerV1().unserializeTlb(Buffer.from(teeOfferInfo.tlb,
|
|
36
|
+
const tlb = new tee_lib_1.TLBlockSerializerV1().unserializeTlb(Buffer.from(teeOfferInfo.tlb, 'base64'));
|
|
37
37
|
// TODO: check env with SP-149
|
|
38
38
|
const mac = encryption.authTag || encryption.mac;
|
|
39
39
|
const rawTri = {
|
|
@@ -42,8 +42,10 @@ class TIIGenerator {
|
|
|
42
42
|
hash: Buffer.from(hash.hash, hash.encoding),
|
|
43
43
|
})),
|
|
44
44
|
mrenclave: Buffer.from(linkage.mrenclave, linkage.encoding),
|
|
45
|
-
args: JSON.stringify(args ||
|
|
46
|
-
encryption: Object.assign(Object.assign({}, encryption), { ciphertext: encryption.ciphertext
|
|
45
|
+
args: JSON.stringify(args || ''),
|
|
46
|
+
encryption: Object.assign(Object.assign({}, encryption), { ciphertext: encryption.ciphertext
|
|
47
|
+
? Buffer.from(encryption.ciphertext, encryption.encoding)
|
|
48
|
+
: undefined, key: encryption.key ? Buffer.from(encryption.key, encryption.encoding) : undefined, iv: encryption.iv
|
|
47
49
|
? Buffer.from(encryption.iv, encryption.encoding)
|
|
48
50
|
: undefined, mac: mac ? Buffer.from(mac, encryption.encoding) : undefined }),
|
|
49
51
|
};
|
|
@@ -56,7 +58,7 @@ class TIIGenerator {
|
|
|
56
58
|
encryptedResource: yield crypto_1.default.encrypt(JSON.stringify(resource), JSON.parse(teeOfferInfo.argsPublicKey)),
|
|
57
59
|
tri: yield crypto_1.default.encrypt(Buffer.from(compressedTri).toString(dto_js_1.Encoding.base64), {
|
|
58
60
|
algo: dto_js_1.CryptoAlgorithm.ECIES,
|
|
59
|
-
key: Buffer.from(tlb.data.teePubKeyData).toString(
|
|
61
|
+
key: Buffer.from(tlb.data.teePubKeyData).toString('base64'),
|
|
60
62
|
encoding: dto_js_1.Encoding.base64,
|
|
61
63
|
}),
|
|
62
64
|
});
|
|
@@ -109,7 +111,7 @@ class TIIGenerator {
|
|
|
109
111
|
decompressed = yield (0, node_gzip_1.ungzip)(compression.data);
|
|
110
112
|
break;
|
|
111
113
|
default:
|
|
112
|
-
throw Error(
|
|
114
|
+
throw Error('Unknown compression method');
|
|
113
115
|
}
|
|
114
116
|
const decoded = TRI_1.TRI.decode(decompressed);
|
|
115
117
|
return {
|
|
@@ -128,8 +130,10 @@ class TIIGenerator {
|
|
|
128
130
|
cipher: decoded.encryption.cipher,
|
|
129
131
|
encoding: dto_js_1.Encoding.base64,
|
|
130
132
|
key: Buffer.from(decoded.encryption.key).toString(dto_js_1.Encoding.base64),
|
|
131
|
-
iv: decoded.encryption.iv &&
|
|
132
|
-
|
|
133
|
+
iv: decoded.encryption.iv &&
|
|
134
|
+
Buffer.from(decoded.encryption.iv).toString(dto_js_1.Encoding.base64),
|
|
135
|
+
mac: decoded.encryption.mac &&
|
|
136
|
+
Buffer.from(decoded.encryption.mac).toString(dto_js_1.Encoding.base64),
|
|
133
137
|
},
|
|
134
138
|
};
|
|
135
139
|
});
|
|
@@ -150,3 +154,4 @@ class TIIGenerator {
|
|
|
150
154
|
}
|
|
151
155
|
}
|
|
152
156
|
exports.default = TIIGenerator;
|
|
157
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVElJR2VuZXJhdG9yLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL1RJSUdlbmVyYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7OztBQUFBLHlDQUF5QztBQUN6QyxvREFBdUI7QUFFdkIscURBQW9FO0FBQ3BFLHFDQUFrQztBQUNsQyxzREFBOEI7QUFDOUIsMkRBQW1DO0FBQ25DLDJEQUFtQztBQUNuQyxpRUFBeUM7QUFJekMsbURBWWdDO0FBQ2hDLHFEQUE0RjtBQUU1RixNQUFNLFlBQVk7SUFDUCxNQUFNLENBQU8sZUFBZSxDQUMvQixPQUFlLEVBQ2YsY0FBc0IsRUFDdEIsYUFBaUMsRUFDakMsUUFBa0IsRUFDbEIsSUFBUyxFQUNULFVBQXNCOztZQUV0QixNQUFNLFFBQVEsR0FBYSxJQUFJLGtCQUFRLENBQUMsT0FBTyxDQUFDLENBQUM7WUFDakQsTUFBTSxZQUFZLEdBQWlCLE1BQU0sUUFBUSxDQUFDLE9BQU8sRUFBRSxDQUFDO1lBRTVELE1BQU0sT0FBTyxHQUFZLGFBQWE7Z0JBQ2xDLENBQUMsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLGFBQWEsQ0FBQztnQkFDM0IsQ0FBQyxDQUFDO29CQUNJLFFBQVEsRUFBRSxpQkFBUSxDQUFDLE1BQU07b0JBQ3pCLFNBQVMsRUFBRSxFQUFFO2lCQUNoQixDQUFDO1lBRVIsTUFBTSxHQUFHLEdBQWlDLElBQUksNkJBQW1CLEVBQUUsQ0FBQyxjQUFjLENBQzlFLE1BQU0sQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUFDLEdBQUcsRUFBRSxRQUFRLENBQUMsQ0FDMUMsQ0FBQztZQUVGLDhCQUE4QjtZQUM5QixNQUFNLEdBQUcsR0FBSSxVQUFrQixDQUFDLE9BQU8sSUFBSyxVQUFrQyxDQUFDLEdBQUcsQ0FBQztZQUNuRixNQUFNLE1BQU0sR0FBRztnQkFDWCxjQUFjLEVBQUUsY0FBYyxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFLENBQUMsQ0FBQztv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
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { HttpProviderBase, WebsocketProviderBase } from
|
|
2
|
-
import { Contract } from
|
|
1
|
+
import { HttpProviderBase, WebsocketProviderBase } from 'web3-core-helpers';
|
|
2
|
+
import { Contract } from 'web3-eth-contract';
|
|
3
3
|
export type Config = {
|
|
4
4
|
contractAddress: string;
|
|
5
5
|
blockchainUrl?: string;
|
|
@@ -17,14 +17,14 @@ const logger_1 = __importDefault(require("../logger"));
|
|
|
17
17
|
class BaseConnector {
|
|
18
18
|
constructor() {
|
|
19
19
|
this.initialized = false;
|
|
20
|
-
this.logger = logger_1.default.child({ className: this.constructor[
|
|
20
|
+
this.logger = logger_1.default.child({ className: this.constructor['name'] });
|
|
21
21
|
}
|
|
22
22
|
isInitialized() {
|
|
23
23
|
return this.initialized;
|
|
24
24
|
}
|
|
25
25
|
checkIfInitialized() {
|
|
26
26
|
if (!this.initialized)
|
|
27
|
-
throw new Error(`${this.constructor[
|
|
27
|
+
throw new Error(`${this.constructor['name']} is not initialized, needs to run '${this.constructor['name']}.initialize(CONFIG)' first`);
|
|
28
28
|
}
|
|
29
29
|
/**
|
|
30
30
|
*
|
|
@@ -45,10 +45,11 @@ class BaseConnector {
|
|
|
45
45
|
shutdown() {
|
|
46
46
|
var _a;
|
|
47
47
|
if (this.initialized) {
|
|
48
|
-
(_a = this.provider) === null || _a === void 0 ? void 0 : _a.disconnect(0,
|
|
48
|
+
(_a = this.provider) === null || _a === void 0 ? void 0 : _a.disconnect(0, '');
|
|
49
49
|
this.initialized = false;
|
|
50
|
-
this.logger.trace(`${this.constructor[
|
|
50
|
+
this.logger.trace(`${this.constructor['name']} was shutdown`);
|
|
51
51
|
}
|
|
52
52
|
}
|
|
53
53
|
}
|
|
54
54
|
exports.BaseConnector = BaseConnector;
|
|
55
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQmFzZUNvbm5lY3Rvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb25uZWN0b3JzL0Jhc2VDb25uZWN0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsdURBQW1DO0FBcUJuQyxNQUFhLGFBQWE7SUFBMUI7UUFDYyxnQkFBVyxHQUFHLEtBQUssQ0FBQztRQUNwQixXQUFNLEdBQUcsZ0JBQVUsQ0FBQyxLQUFLLENBQUMsRUFBRSxTQUFTLEVBQUUsSUFBSSxDQUFDLFdBQVcsQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLENBQUM7SUF1Q2pGLENBQUM7SUFuQ1UsYUFBYTtRQUNoQixPQUFPLElBQUksQ0FBQyxXQUFXLENBQUM7SUFDNUIsQ0FBQztJQUVNLGtCQUFrQjtRQUNyQixJQUFJLENBQUMsSUFBSSxDQUFDLFdBQVc7WUFDakIsTUFBTSxJQUFJLEtBQUssQ0FDWCxHQUFHLElBQUksQ0FBQyxXQUFXLENBQUMsTUFBTSxDQUFDLHNDQUFzQyxJQUFJLENBQUMsV0FBVyxDQUFDLE1BQU0sQ0FBQyw0QkFBNEIsQ0FDeEgsQ0FBQztJQUNWLENBQUM7SUFFRDs7O09BR0c7SUFDSSxXQUFXO1FBQ2QsSUFBSSxDQUFDLGtCQUFrQixFQUFFLENBQUM7UUFFMUIsT0FBTyxJQUFJLENBQUMsUUFBUyxDQUFDO0lBQzFCLENBQUM7SUFFRDs7OztPQUlHO0lBQ1UsVUFBVSxDQUFDLE1BQWM7OERBQWtCLENBQUM7S0FBQTtJQUVsRCxRQUFROztRQUNYLElBQUksSUFBSSxDQUFDLFdBQVcsRUFBRTtZQUNsQixNQUFBLElBQUksQ0FBQyxRQUFRLDBDQUFFLFVBQVUsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUM7WUFDakMsSUFBSSxDQUFDLFdBQVcsR0FBRyxLQUFLLENBQUM7WUFDekIsSUFBSSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsR0FBRyxJQUFJLENBQUMsV0FBVyxDQUFDLE1BQU0sQ0FBQyxlQUFlLENBQUMsQ0FBQztTQUNqRTtJQUNMLENBQUM7Q0FDSjtBQXpDRCxzQ0F5Q0MifQ==
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { BaseConnector, Config } from
|
|
2
|
-
import { TransactionOptions, EventData, BlockInfo } from
|
|
3
|
-
import BlockchainTransaction from
|
|
4
|
-
import { TransactionReceipt } from
|
|
1
|
+
import { BaseConnector, Config } from './BaseConnector';
|
|
2
|
+
import { TransactionOptions, EventData, BlockInfo } from '../types/Web3';
|
|
3
|
+
import BlockchainTransaction from '../types/blockchainConnector/StorageAccess';
|
|
4
|
+
import { TransactionReceipt } from 'web3-core';
|
|
5
5
|
declare class BlockchainConnector extends BaseConnector {
|
|
6
6
|
private defaultActionAccount?;
|
|
7
7
|
private static instance;
|
|
@@ -5,6 +5,9 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
5
5
|
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
6
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
7
|
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
8
11
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
9
12
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
10
13
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -26,7 +29,7 @@ const utils_1 = require("../utils");
|
|
|
26
29
|
const TxManager_1 = __importDefault(require("../utils/TxManager"));
|
|
27
30
|
const app_json_1 = __importDefault(require("../contracts/app.json"));
|
|
28
31
|
const ethers_1 = require("ethers");
|
|
29
|
-
const Jsonrpc = require(
|
|
32
|
+
const Jsonrpc = require('web3-core-requestmanager/src/jsonrpc');
|
|
30
33
|
// TODO: remove this dependencies
|
|
31
34
|
const store_1 = __importDefault(require("../store"));
|
|
32
35
|
const Superpro_1 = __importDefault(require("../staticModels/Superpro"));
|
|
@@ -58,7 +61,7 @@ class BlockchainConnector extends BaseConnector_1.BaseConnector {
|
|
|
58
61
|
initialize(config) {
|
|
59
62
|
var _a;
|
|
60
63
|
return __awaiter(this, void 0, void 0, function* () {
|
|
61
|
-
this.logger.trace(config,
|
|
64
|
+
this.logger.trace(config, 'Initializing');
|
|
62
65
|
const url = (config === null || config === void 0 ? void 0 : config.blockchainUrl) || constants_1.defaultBlockchainUrl;
|
|
63
66
|
this.provider = new web3_1.default.providers.HttpProvider(url);
|
|
64
67
|
store_1.default.web3Https = new web3_1.default(this.provider);
|
|
@@ -79,7 +82,7 @@ class BlockchainConnector extends BaseConnector_1.BaseConnector {
|
|
|
79
82
|
SuperproToken_1.default.addressHttps = yield Superpro_1.default.getTokenAddress(this.contract);
|
|
80
83
|
Monitoring_1.Monitoring.getInstance().initializeLogging();
|
|
81
84
|
this.initialized = true;
|
|
82
|
-
this.logger.trace(
|
|
85
|
+
this.logger.trace('Initialized');
|
|
83
86
|
});
|
|
84
87
|
}
|
|
85
88
|
/**
|
|
@@ -115,7 +118,7 @@ class BlockchainConnector extends BaseConnector_1.BaseConnector {
|
|
|
115
118
|
var _a;
|
|
116
119
|
return __awaiter(this, void 0, void 0, function* () {
|
|
117
120
|
this.checkIfInitialized();
|
|
118
|
-
const block = yield ((_a = store_1.default.web3Https) === null || _a === void 0 ? void 0 : _a.eth.getBlock(
|
|
121
|
+
const block = yield ((_a = store_1.default.web3Https) === null || _a === void 0 ? void 0 : _a.eth.getBlock('latest'));
|
|
119
122
|
return block.timestamp;
|
|
120
123
|
});
|
|
121
124
|
}
|
|
@@ -127,7 +130,7 @@ class BlockchainConnector extends BaseConnector_1.BaseConnector {
|
|
|
127
130
|
getTransactionEvents(txHash) {
|
|
128
131
|
return __awaiter(this, void 0, void 0, function* () {
|
|
129
132
|
this.checkIfInitialized();
|
|
130
|
-
const parseReceiptEvents = require(
|
|
133
|
+
const parseReceiptEvents = require('web3-parse-receipt-events');
|
|
131
134
|
const receipt = yield store_1.default.web3Https.eth.getTransactionReceipt(txHash);
|
|
132
135
|
const tokenEvents = parseReceiptEvents(app_json_1.default.abi, SuperproToken_1.default.addressHttps, receipt);
|
|
133
136
|
parseReceiptEvents(app_json_1.default.abi, Superpro_1.default.address, receipt); // don't remove
|
|
@@ -216,12 +219,12 @@ class BlockchainConnector extends BaseConnector_1.BaseConnector {
|
|
|
216
219
|
executeBatchAsync(batch) {
|
|
217
220
|
return __awaiter(this, void 0, void 0, function* () {
|
|
218
221
|
return new Promise((resolve, reject) => {
|
|
219
|
-
|
|
222
|
+
const requests = batch.requests;
|
|
220
223
|
batch.requestManager.sendBatch(requests, (error, results) => {
|
|
221
224
|
if (error)
|
|
222
225
|
return reject(error);
|
|
223
226
|
results = results || [];
|
|
224
|
-
|
|
227
|
+
const response = requests
|
|
225
228
|
.map((request, index) => {
|
|
226
229
|
return results[index] || {};
|
|
227
230
|
})
|
|
@@ -232,7 +235,9 @@ class BlockchainConnector extends BaseConnector_1.BaseConnector {
|
|
|
232
235
|
if (!Jsonrpc.isValidResponse(result)) {
|
|
233
236
|
return web3_core_helpers_1.errors.InvalidResponse(result);
|
|
234
237
|
}
|
|
235
|
-
return requests[index].format
|
|
238
|
+
return requests[index].format
|
|
239
|
+
? requests[index].format(result.result)
|
|
240
|
+
: result.result;
|
|
236
241
|
});
|
|
237
242
|
resolve(response);
|
|
238
243
|
});
|
|
@@ -309,15 +314,28 @@ class BlockchainConnector extends BaseConnector_1.BaseConnector {
|
|
|
309
314
|
}
|
|
310
315
|
}
|
|
311
316
|
__decorate([
|
|
312
|
-
(0, utils_1.incrementMethodCall)()
|
|
317
|
+
(0, utils_1.incrementMethodCall)(),
|
|
318
|
+
__metadata("design:type", Function),
|
|
319
|
+
__metadata("design:paramtypes", [String]),
|
|
320
|
+
__metadata("design:returntype", Promise)
|
|
313
321
|
], BlockchainConnector.prototype, "getBalance", null);
|
|
314
322
|
__decorate([
|
|
315
|
-
(0, utils_1.incrementMethodCall)()
|
|
323
|
+
(0, utils_1.incrementMethodCall)(),
|
|
324
|
+
__metadata("design:type", Function),
|
|
325
|
+
__metadata("design:paramtypes", [String]),
|
|
326
|
+
__metadata("design:returntype", Promise)
|
|
316
327
|
], BlockchainConnector.prototype, "getTransactionEvents", null);
|
|
317
328
|
__decorate([
|
|
318
|
-
(0, utils_1.incrementMethodCall)()
|
|
329
|
+
(0, utils_1.incrementMethodCall)(),
|
|
330
|
+
__metadata("design:type", Function),
|
|
331
|
+
__metadata("design:paramtypes", [String, String, Object]),
|
|
332
|
+
__metadata("design:returntype", Promise)
|
|
319
333
|
], BlockchainConnector.prototype, "transfer", null);
|
|
320
334
|
__decorate([
|
|
321
|
-
(0, utils_1.incrementMethodCall)()
|
|
335
|
+
(0, utils_1.incrementMethodCall)(),
|
|
336
|
+
__metadata("design:type", Function),
|
|
337
|
+
__metadata("design:paramtypes", [Array, Number, Number, Number]),
|
|
338
|
+
__metadata("design:returntype", Promise)
|
|
322
339
|
], BlockchainConnector.prototype, "getTransactions", null);
|
|
323
340
|
exports.default = BlockchainConnector;
|
|
341
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"BlockchainConnector.js","sourceRoot":"","sources":["../../src/connectors/BlockchainConnector.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { BaseConnector, Config } from
|
|
2
|
-
import { WebsocketProviderBase } from
|
|
1
|
+
import { BaseConnector, Config } from './BaseConnector';
|
|
2
|
+
import { WebsocketProviderBase } from 'web3-core-helpers';
|
|
3
3
|
declare class BlockchainEventsListener extends BaseConnector {
|
|
4
4
|
private static instance;
|
|
5
5
|
private constructor();
|
|
@@ -38,7 +38,7 @@ class BlockchainEventsListener extends BaseConnector_1.BaseConnector {
|
|
|
38
38
|
*/
|
|
39
39
|
initialize(config) {
|
|
40
40
|
return __awaiter(this, void 0, void 0, function* () {
|
|
41
|
-
this.logger.trace(config,
|
|
41
|
+
this.logger.trace(config, 'Initializing');
|
|
42
42
|
if (this.provider) {
|
|
43
43
|
this.provider.reset();
|
|
44
44
|
}
|
|
@@ -56,7 +56,7 @@ class BlockchainEventsListener extends BaseConnector_1.BaseConnector {
|
|
|
56
56
|
Superpro_1.default.address = config.contractAddress;
|
|
57
57
|
SuperproToken_1.default.addressWss = yield Superpro_1.default.getTokenAddress(this.contract);
|
|
58
58
|
this.initialized = true;
|
|
59
|
-
this.logger.trace(
|
|
59
|
+
this.logger.trace('Initialized');
|
|
60
60
|
});
|
|
61
61
|
}
|
|
62
62
|
shutdown() {
|
|
@@ -65,3 +65,4 @@ class BlockchainEventsListener extends BaseConnector_1.BaseConnector {
|
|
|
65
65
|
}
|
|
66
66
|
}
|
|
67
67
|
exports.default = BlockchainEventsListener;
|
|
68
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQmxvY2tjaGFpbkV2ZW50c0xpc3RlbmVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2Nvbm5lY3RvcnMvQmxvY2tjaGFpbkV2ZW50c0xpc3RlbmVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7O0FBQUEsbURBQXdEO0FBQ3hELGdEQUF3QjtBQUN4QixxRUFBNEM7QUFJNUMsaUNBQWlDO0FBQ2pDLHFEQUE2QjtBQUM3Qix3RUFBZ0Q7QUFDaEQsa0ZBQTBEO0FBRTFELE1BQU0sd0JBQXlCLFNBQVEsNkJBQWE7SUFJaEQ7UUFDSSxLQUFLLEVBQUUsQ0FBQztJQUNaLENBQUM7SUFFTSxNQUFNLENBQUMsV0FBVztRQUNyQixJQUFJLENBQUMsd0JBQXdCLENBQUMsUUFBUSxFQUFFO1lBQ3BDLHdCQUF3QixDQUFDLFFBQVEsR0FBRyxJQUFJLHdCQUF3QixFQUFFLENBQUM7U0FDdEU7UUFFRCxPQUFPLHdCQUF3QixDQUFDLFFBQVEsQ0FBQztJQUM3QyxDQUFDO0lBRU0sV0FBVztRQUNkLE9BQTBDLElBQUksQ0FBQyxRQUFRLENBQUM7SUFDNUQsQ0FBQztJQUVEOzs7T0FHRztJQUNVLFVBQVUsQ0FBQyxNQUFjOztZQUNsQyxJQUFJLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxNQUFNLEVBQUUsY0FBYyxDQUFDLENBQUM7WUFFMUMsSUFBSSxJQUFJLENBQUMsUUFBUSxFQUFFO2dCQUNkLElBQUksQ0FBQyxRQUFrQyxDQUFDLEtBQUssRUFBRSxDQUFDO2FBQ3BEO1lBRUQsTUFBTSxnQkFBZ0IsR0FBRyxNQUFNLENBQUMsTUFBTSxDQUNsQztnQkFDSSxJQUFJLEVBQUUsSUFBSTtnQkFDVixLQUFLLEVBQUUsSUFBSTtnQkFDWCxXQUFXLEVBQUUsQ0FBQztnQkFDZCxTQUFTLEVBQUUsS0FBSzthQUNuQixFQUNELE1BQU0sQ0FBQyxTQUFTLENBQ25CLENBQUM7WUFFRixJQUFJLENBQUMsUUFBUSxHQUFHLElBQUksY0FBSSxDQUFDLFNBQVMsQ0FBQyxpQkFBaUIsQ0FBQyxNQUFNLENBQUMsYUFBYyxFQUFFO2dCQUN4RSxTQUFTLEVBQUUsZ0JBQWdCO2FBQzlCLENBQUMsQ0FBQztZQUNILGVBQUssQ0FBQyxPQUFPLEdBQUcsSUFBSSxjQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDO1lBRXhDLElBQUksQ0FBQyxRQUFRLEdBQUcsSUFBSSxlQUFLLENBQUMsT0FBUSxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQ2hDLGtCQUFPLENBQUMsR0FBRyxFQUN0QixNQUFNLENBQUMsZUFBZSxDQUN6QixDQUFDO1lBQ0Ysa0JBQVEsQ0FBQyxPQUFPLEdBQUcsTUFBTSxDQUFDLGVBQWUsQ0FBQztZQUMxQyx1QkFBYSxDQUFDLFVBQVUsR0FBRyxNQUFNLGtCQUFRLENBQUMsZUFBZSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQztZQUV6RSxJQUFJLENBQUMsV0FBVyxHQUFHLElBQUksQ0FBQztZQUV4QixJQUFJLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUNyQyxDQUFDO0tBQUE7SUFFTSxRQUFRO1FBQ1gsS0FBSyxDQUFDLFFBQVEsRUFBRSxDQUFDO1FBQ2pCLGVBQUssQ0FBQyxPQUFPLEdBQUcsU0FBUyxDQUFDO0lBQzlCLENBQUM7Q0FDSjtBQUVELGtCQUFlLHdCQUF3QixDQUFDIn0=
|
package/build/constants.js
CHANGED
|
@@ -1,15 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.BLOCKCHAIN_CALL_RETRY_INTERVAL = exports.BLOCKCHAIN_CALL_RETRY_ATTEMPTS = exports.POLYGON_MATIC_EVENT_PATH = exports.BLOCK_SIZE_TO_FETCH_TRANSACTION = exports.ONE_DAY = exports.txIntervalMs = exports.txConcurrency = exports.defaultGasLimitMultiplier = exports.defaultGasPriceMultiplier = exports.defaultGasPrice = exports.defaultGasLimit = exports.defaultBlockchainUrl = void 0;
|
|
4
|
-
exports.defaultBlockchainUrl =
|
|
4
|
+
exports.defaultBlockchainUrl = 'http://127.0.0.1:8545';
|
|
5
5
|
exports.defaultGasLimit = 7000000;
|
|
6
|
-
exports.defaultGasPrice =
|
|
6
|
+
exports.defaultGasPrice = '3000000000';
|
|
7
7
|
exports.defaultGasPriceMultiplier = 1;
|
|
8
8
|
exports.defaultGasLimitMultiplier = 1.2;
|
|
9
9
|
exports.txConcurrency = 30;
|
|
10
10
|
exports.txIntervalMs = 34;
|
|
11
11
|
exports.ONE_DAY = 24 * 60 * 60;
|
|
12
12
|
exports.BLOCK_SIZE_TO_FETCH_TRANSACTION = 500;
|
|
13
|
-
exports.POLYGON_MATIC_EVENT_PATH =
|
|
13
|
+
exports.POLYGON_MATIC_EVENT_PATH = '0x0000000000000000000000000000000000001010';
|
|
14
14
|
exports.BLOCKCHAIN_CALL_RETRY_ATTEMPTS = 10;
|
|
15
15
|
exports.BLOCKCHAIN_CALL_RETRY_INTERVAL = 3000;
|
|
16
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uc3RhbnRzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2NvbnN0YW50cy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBYSxRQUFBLG9CQUFvQixHQUFHLHVCQUF1QixDQUFDO0FBQy9DLFFBQUEsZUFBZSxHQUFHLE9BQU8sQ0FBQztBQUMxQixRQUFBLGVBQWUsR0FBRyxZQUFZLENBQUM7QUFDL0IsUUFBQSx5QkFBeUIsR0FBRyxDQUFDLENBQUM7QUFDOUIsUUFBQSx5QkFBeUIsR0FBRyxHQUFHLENBQUM7QUFDaEMsUUFBQSxhQUFhLEdBQUcsRUFBRSxDQUFDO0FBQ25CLFFBQUEsWUFBWSxHQUFHLEVBQUUsQ0FBQztBQUNsQixRQUFBLE9BQU8sR0FBRyxFQUFFLEdBQUcsRUFBRSxHQUFHLEVBQUUsQ0FBQztBQUN2QixRQUFBLCtCQUErQixHQUFHLEdBQUcsQ0FBQztBQUN0QyxRQUFBLHdCQUF3QixHQUFHLDRDQUE0QyxDQUFDO0FBQ3hFLFFBQUEsOEJBQThCLEdBQUcsRUFBRSxDQUFDO0FBQ3BDLFFBQUEsOEJBQThCLEdBQUcsSUFBSSxDQUFDIn0=
|
package/build/crypto/Crypto.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
-
import { Encryption } from
|
|
3
|
-
import fs from
|
|
2
|
+
import { Encryption } from '@super-protocol/dto-js';
|
|
3
|
+
import fs from 'fs';
|
|
4
4
|
declare class Crypto {
|
|
5
5
|
/**
|
|
6
6
|
* Used to encrypt data before sending it to blockchain
|
package/build/crypto/Crypto.js
CHANGED
|
@@ -107,3 +107,4 @@ class Crypto {
|
|
|
107
107
|
}
|
|
108
108
|
}
|
|
109
109
|
exports.default = Crypto;
|
|
110
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ3J5cHRvLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NyeXB0by9DcnlwdG8udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7QUFBQSxtREFPZ0M7QUFFaEMsdURBQStCO0FBQy9CLHlEQUFpQztBQUNqQywyREFBbUM7QUFDbkMscUVBQTRDO0FBRTVDLE1BQU0sTUFBTTtJQUNSOzs7Ozs7O09BT0c7SUFDSCxNQUFNLENBQU8sT0FBTyxDQUFDLE9BQWUsRUFBRSxVQUFzQjs7WUFDeEQsUUFBUSxVQUFVLENBQUMsSUFBSSxFQUFFO2dCQUNyQixLQUFLLHdCQUFlLENBQUMsR0FBRztvQkFDcEIsT0FBTyxNQUFNLGFBQUcsQ0FBQyxPQUFPLENBQUMsT0FBTyxFQUFFLFVBQVUsQ0FBQyxDQUFDO2dCQUVsRCxLQUFLLHdCQUFlLENBQUMsSUFBSTtvQkFDckIsT0FBTyxNQUFNLGNBQUksQ0FBQyxPQUFPLENBQUMsT0FBTyxFQUFFLFVBQVUsQ0FBQyxDQUFDO2dCQUVuRCxLQUFLLHdCQUFlLENBQUMsS0FBSztvQkFDdEIsT0FBTyxNQUFNLGVBQUssQ0FBQyxPQUFPLENBQUMsT0FBTyxFQUFFLFVBQVUsQ0FBQyxDQUFDO2dCQUVwRCxLQUFLLHdCQUFlLENBQUMsU0FBUztvQkFDMUIsT0FBTyxNQUFNLG9CQUFTLENBQUMsT0FBTyxDQUFDLE9BQU8sRUFBRSxVQUFVLENBQUMsQ0FBQztnQkFFeEQ7b0JBQ0ksTUFBTSxLQUFLLENBQUMsR0FBRyxVQUFVLENBQUMsSUFBSSwwQkFBMEIsQ0FBQyxDQUFDO2FBQ2pFO1FBQ0wsQ0FBQztLQUFBO0lBRUQ7Ozs7Ozs7T0FPRztJQUNJLE1BQU0sQ0FBTyxhQUFhLENBQzdCLFdBQTBCLEVBQzFCLFlBQTRCLEVBQzVCLFVBQXNCOztZQUV0QixRQUFRLFVBQVUsQ0FBQyxJQUFJLEVBQUU7Z0JBQ3JCLEtBQUssd0JBQWUsQ0FBQyxHQUFHO29CQUNwQixPQUFPLE1BQU0sYUFBRyxDQUFDLGFBQWEsQ0FBQyxXQUFXLEVBQUUsWUFBWSxFQUFFLFVBQVUsQ0FBQyxDQUFDO2dCQUMxRSxLQUFLLHdCQUFlLENBQUMsSUFBSTtvQkFDckIsT0FBTyxNQUFNLGNBQUksQ0FBQyxhQUFhLENBQUMsV0FBVyxFQUFFLFlBQVksRUFBRSxVQUFVLENBQUMsQ0FBQztnQkFDM0UsS0FBSyx3QkFBZSxDQUFDLFNBQVM7b0JBQzFCLE9BQU8sTUFBTSxvQkFBUyxDQUFDLGFBQWEsQ0FBQyxXQUFXLEVBQUUsWUFBWSxFQUFFLFVBQVUsQ0FBQyxDQUFDO2dCQUNoRjtvQkFDSSxNQUFNLEtBQUssQ0FBQyxHQUFHLFVBQVUsQ0FBQyxJQUFJLDBCQUEwQixDQUFDLENBQUM7YUFDakU7UUFDTCxDQUFDO0tBQUE7SUFFRDs7OztPQUlHO0lBQ0gsTUFBTSxDQUFPLE9BQU8sQ0FBQyxVQUFzQjs7WUFDdkMsUUFBUSxVQUFVLENBQUMsSUFBSSxFQUFFO2dCQUNyQixLQUFLLHdCQUFlLENBQUMsR0FBRztvQkFDcEIsT0FBTyxNQUFNLGFBQUcsQ0FBQyxPQUFPLENBQUMsVUFBMkIsQ0FBQyxDQUFDO2dCQUUxRCxLQUFLLHdCQUFlLENBQUMsSUFBSTtvQkFDckIsT0FBTyxNQUFNLGNBQUksQ0FBQyxPQUFPLENBQUMsVUFBNEIsQ0FBQyxDQUFDO2dCQUU1RCxLQUFLLHdCQUFlLENBQUMsS0FBSztvQkFDdEIsT0FBTyxNQUFNLGVBQUssQ0FBQyxPQUFPLENBQUMsVUFBNkIsQ0FBQyxDQUFDO2dCQUU5RCxLQUFLLHdCQUFlLENBQUMsU0FBUztvQkFDMUIsT0FBTyxNQUFNLG9CQUFTLENBQUMsT0FBTyxDQUFDLFVBQWlDLENBQUMsQ0FBQztnQkFFdEU7b0JBQ0ksTUFBTSxLQUFLLENBQUMsR0FBRyxVQUFVLENBQUMsSUFBSSwwQkFBMEIsQ0FBQyxDQUFDO2FBQ2pFO1FBQ0wsQ0FBQztLQUFBO0lBRUQ7Ozs7O09BS0c7SUFDSSxNQUFNLENBQU8sYUFBYSxDQUM3QixXQUEwQixFQUMxQixZQUE0QixFQUM1QixVQUFzQjs7WUFFdEIsUUFBUSxVQUFVLENBQUMsSUFBSSxFQUFFO2dCQUNyQixLQUFLLHdCQUFlLENBQUMsR0FBRztvQkFDcEIsT0FBTyxNQUFNLGFBQUcsQ0FBQyxhQUFhLENBQzFCLFdBQVcsRUFDWCxZQUFZLEVBQ1osVUFBMkIsQ0FDOUIsQ0FBQztnQkFDTixLQUFLLHdCQUFlLENBQUMsSUFBSTtvQkFDckIsT0FBTyxNQUFNLGNBQUksQ0FBQyxhQUFhLENBQzNCLFdBQVcsRUFDWCxZQUFZLEVBQ1osVUFBNEIsQ0FDL0IsQ0FBQztnQkFDTixLQUFLLHdCQUFlLENBQUMsU0FBUztvQkFDMUIsT0FBTyxNQUFNLG9CQUFTLENBQUMsYUFBYSxDQUNoQyxXQUFXLEVBQ1gsWUFBWSxFQUNaLFVBQWlDLENBQ3BDLENBQUM7Z0JBQ047b0JBQ0ksTUFBTSxLQUFLLENBQUMsR0FBRyxVQUFVLENBQUMsSUFBSSwwQkFBMEIsQ0FBQyxDQUFDO2FBQ2pFO1FBQ0wsQ0FBQztLQUFBO0NBQ0o7QUFFRCxrQkFBZSxNQUFNLENBQUMifQ==
|
package/build/crypto/index.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import Crypto from
|
|
1
|
+
import Crypto from './Crypto';
|
|
2
2
|
export default Crypto;
|
package/build/crypto/index.js
CHANGED
|
@@ -5,3 +5,4 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const Crypto_1 = __importDefault(require("./Crypto"));
|
|
7
7
|
exports.default = Crypto_1.default;
|
|
8
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY3J5cHRvL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBQUEsc0RBQThCO0FBQzlCLGtCQUFlLGdCQUFNLENBQUMifQ==
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
-
import { AESEncryption, Encryption } from
|
|
3
|
-
import { ReadStream, WriteStream } from
|
|
2
|
+
import { AESEncryption, Encryption } from '@super-protocol/dto-js';
|
|
3
|
+
import { ReadStream, WriteStream } from 'fs';
|
|
4
4
|
declare class AES {
|
|
5
5
|
static encrypt(content: string, encryption: Encryption): Promise<AESEncryption>;
|
|
6
6
|
/**
|
|
@@ -18,7 +18,7 @@ class AES {
|
|
|
18
18
|
static encrypt(content, encryption) {
|
|
19
19
|
return __awaiter(this, void 0, void 0, function* () {
|
|
20
20
|
if (!encryption.key)
|
|
21
|
-
throw Error(
|
|
21
|
+
throw Error('Encryption key is not provided');
|
|
22
22
|
encryption.cipher = encryption.cipher || dto_js_1.Cipher.AES_256_GCM;
|
|
23
23
|
const keyBuffer = Buffer.from(encryption.key, encryption.encoding);
|
|
24
24
|
const encrypted = NativeCrypto_1.default.encrypt(keyBuffer, content, encryption.cipher);
|
|
@@ -43,7 +43,7 @@ class AES {
|
|
|
43
43
|
static encryptStream(inputStream, outputStream, encryption) {
|
|
44
44
|
return __awaiter(this, void 0, void 0, function* () {
|
|
45
45
|
if (!encryption.key)
|
|
46
|
-
throw Error(
|
|
46
|
+
throw Error('Encryption key is not provided');
|
|
47
47
|
encryption.cipher = encryption.cipher || dto_js_1.Cipher.AES_256_GCM;
|
|
48
48
|
const keyBuffer = Buffer.from(encryption.key, encryption.encoding);
|
|
49
49
|
const encrypted = yield NativeCrypto_1.default.encryptStream(keyBuffer, inputStream, outputStream, encryption.cipher);
|
|
@@ -60,7 +60,7 @@ class AES {
|
|
|
60
60
|
static decrypt(encryption) {
|
|
61
61
|
return __awaiter(this, void 0, void 0, function* () {
|
|
62
62
|
if (!encryption.key)
|
|
63
|
-
throw Error(
|
|
63
|
+
throw Error('Decryption key is not provided');
|
|
64
64
|
const key = Buffer.from(encryption.key, encryption.encoding);
|
|
65
65
|
const params = {
|
|
66
66
|
iv: Buffer.from(encryption.iv, encryption.encoding),
|
|
@@ -80,7 +80,7 @@ class AES {
|
|
|
80
80
|
static decryptStream(inputStream, outputStream, encryption) {
|
|
81
81
|
return __awaiter(this, void 0, void 0, function* () {
|
|
82
82
|
if (!encryption.key)
|
|
83
|
-
throw Error(
|
|
83
|
+
throw Error('Decryption key is not provided');
|
|
84
84
|
const key = Buffer.from(encryption.key, encryption.encoding);
|
|
85
85
|
const params = {
|
|
86
86
|
iv: Buffer.from(encryption.iv, encryption.encoding),
|
|
@@ -93,3 +93,4 @@ class AES {
|
|
|
93
93
|
}
|
|
94
94
|
}
|
|
95
95
|
exports.default = AES;
|
|
96
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQUVTLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NyeXB0by9ub2RlanMvQUVTLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7O0FBQUEsbURBTWdDO0FBR2hDLGtFQUEwQztBQUUxQyxNQUFNLEdBQUc7SUFDRSxNQUFNLENBQU8sT0FBTyxDQUFDLE9BQWUsRUFBRSxVQUFzQjs7WUFDL0QsSUFBSSxDQUFDLFVBQVUsQ0FBQyxHQUFHO2dCQUFFLE1BQU0sS0FBSyxDQUFDLGdDQUFnQyxDQUFDLENBQUM7WUFDbkUsVUFBVSxDQUFDLE1BQU0sR0FBRyxVQUFVLENBQUMsTUFBTSxJQUFJLGVBQU0sQ0FBQyxXQUFXLENBQUM7WUFFNUQsTUFBTSxTQUFTLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsR0FBRyxFQUFFLFVBQVUsQ0FBQyxRQUFRLENBQUMsQ0FBQztZQUVuRSxNQUFNLFNBQVMsR0FBRyxzQkFBWSxDQUFDLE9BQU8sQ0FBQyxTQUFTLEVBQUUsT0FBTyxFQUFFLFVBQVUsQ0FBQyxNQUFNLENBQUMsQ0FBQztZQUU5RSxPQUFPO2dCQUNILElBQUksRUFBRSx3QkFBZSxDQUFDLEdBQUc7Z0JBQ3pCLFFBQVEsRUFBRSxVQUFVLENBQUMsUUFBUTtnQkFDN0IsTUFBTSxFQUFFLFVBQVUsQ0FBQyxNQUF3QztnQkFDM0QsVUFBVSxFQUFFLFNBQVMsQ0FBQyxVQUFVO2dCQUNoQyxFQUFFLEVBQUUsU0FBUyxDQUFDLEVBQUc7Z0JBQ2pCLEdBQUcsRUFBRSxTQUFTLENBQUMsR0FBSTthQUN0QixDQUFDO1FBQ04sQ0FBQztLQUFBO0lBRUQ7Ozs7Ozs7T0FPRztJQUNJLE1BQU0sQ0FBTyxhQUFhLENBQzdCLFdBQXVCLEVBQ3ZCLFlBQXlCLEVBQ3pCLFVBQXNCOztZQUV0QixJQUFJLENBQUMsVUFBVSxDQUFDLEdBQUc7Z0JBQUUsTUFBTSxLQUFLLENBQUMsZ0NBQWdDLENBQUMsQ0FBQztZQUNuRSxV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
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
-
import { ARIAEncryption, Encryption } from
|
|
3
|
-
import { ReadStream, WriteStream } from
|
|
2
|
+
import { ARIAEncryption, Encryption } from '@super-protocol/dto-js';
|
|
3
|
+
import { ReadStream, WriteStream } from 'fs';
|
|
4
4
|
declare class ARIA {
|
|
5
5
|
static encrypt(content: string, encryption: Encryption): Promise<ARIAEncryption>;
|
|
6
6
|
/**
|
|
@@ -18,7 +18,7 @@ class ARIA {
|
|
|
18
18
|
static encrypt(content, encryption) {
|
|
19
19
|
return __awaiter(this, void 0, void 0, function* () {
|
|
20
20
|
if (!encryption.key)
|
|
21
|
-
throw Error(
|
|
21
|
+
throw Error('Encryption key is not provided');
|
|
22
22
|
encryption.cipher = encryption.cipher || dto_js_1.Cipher.ARIA_256_GCM;
|
|
23
23
|
const keyBuffer = Buffer.from(encryption.key, encryption.encoding);
|
|
24
24
|
const encrypted = NativeCrypto_1.default.encrypt(keyBuffer, content, encryption.cipher);
|
|
@@ -43,7 +43,7 @@ class ARIA {
|
|
|
43
43
|
static encryptStream(inputStream, outputStream, encryption) {
|
|
44
44
|
return __awaiter(this, void 0, void 0, function* () {
|
|
45
45
|
if (!encryption.key)
|
|
46
|
-
throw Error(
|
|
46
|
+
throw Error('Encryption key is not provided');
|
|
47
47
|
encryption.cipher = encryption.cipher || dto_js_1.Cipher.ARIA_256_GCM;
|
|
48
48
|
const keyBuffer = Buffer.from(encryption.key, encryption.encoding);
|
|
49
49
|
const encrypted = yield NativeCrypto_1.default.encryptStream(keyBuffer, inputStream, outputStream, encryption.cipher);
|
|
@@ -59,7 +59,7 @@ class ARIA {
|
|
|
59
59
|
static decrypt(encryption) {
|
|
60
60
|
return __awaiter(this, void 0, void 0, function* () {
|
|
61
61
|
if (!encryption.key)
|
|
62
|
-
throw Error(
|
|
62
|
+
throw Error('Decryption key is not provided');
|
|
63
63
|
const key = Buffer.from(encryption.key, encryption.encoding);
|
|
64
64
|
const params = {
|
|
65
65
|
iv: Buffer.from(encryption.iv, encryption.encoding),
|
|
@@ -79,7 +79,7 @@ class ARIA {
|
|
|
79
79
|
static decryptStream(inputStream, outputStream, encryption) {
|
|
80
80
|
return __awaiter(this, void 0, void 0, function* () {
|
|
81
81
|
if (!encryption.key)
|
|
82
|
-
throw Error(
|
|
82
|
+
throw Error('Decryption key is not provided');
|
|
83
83
|
const key = Buffer.from(encryption.key, encryption.encoding);
|
|
84
84
|
const params = {
|
|
85
85
|
iv: Buffer.from(encryption.iv, encryption.encoding),
|
|
@@ -92,3 +92,4 @@ class ARIA {
|
|
|
92
92
|
}
|
|
93
93
|
}
|
|
94
94
|
exports.default = ARIA;
|
|
95
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQVJJQS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jcnlwdG8vbm9kZWpzL0FSSUEudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7QUFBQSxtREFNZ0M7QUFHaEMsa0VBQTBDO0FBRTFDLE1BQU0sSUFBSTtJQUNDLE1BQU0sQ0FBTyxPQUFPLENBQUMsT0FBZSxFQUFFLFVBQXNCOztZQUMvRCxJQUFJLENBQUMsVUFBVSxDQUFDLEdBQUc7Z0JBQUUsTUFBTSxLQUFLLENBQUMsZ0NBQWdDLENBQUMsQ0FBQztZQUNuRSxVQUFVLENBQUMsTUFBTSxHQUFHLFVBQVUsQ0FBQyxNQUFNLElBQUksZUFBTSxDQUFDLFlBQVksQ0FBQztZQUU3RCxNQUFNLFNBQVMsR0FBRyxNQUFNLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxHQUFHLEVBQUUsVUFBVSxDQUFDLFFBQVEsQ0FBQyxDQUFDO1lBRW5FLE1BQU0sU0FBUyxHQUFHLHNCQUFZLENBQUMsT0FBTyxDQUFDLFNBQVMsRUFBRSxPQUFPLEVBQUUsVUFBVSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1lBRTlFLE9BQU87Z0JBQ0gsSUFBSSxFQUFFLHdCQUFlLENBQUMsSUFBSTtnQkFDMUIsUUFBUSxFQUFFLFVBQVUsQ0FBQyxRQUFRO2dCQUM3QixNQUFNLEVBQUUsVUFBVSxDQUFDLE1BQXlDO2dCQUM1RCxVQUFVLEVBQUUsU0FBUyxDQUFDLFVBQVU7Z0JBQ2hDLEVBQUUsRUFBRSxTQUFTLENBQUMsRUFBRztnQkFDakIsR0FBRyxFQUFFLFNBQVMsQ0FBQyxHQUFJO2FBQ3RCLENBQUM7UUFDTixDQUFDO0tBQUE7SUFFRDs7Ozs7OztPQU9HO0lBQ0ksTUFBTSxDQUFPLGFBQWEsQ0FDN0IsV0FBdUIsRUFDdkIsWUFBeUIsRUFDekIsVUFBc0I7O1lBRXRCLElBQUksQ0FBQyxVQUFVLENBQUMsR0FBRztnQkFBRSxNQUFNLEtBQUssQ0FBQyxnQ0FBZ0MsQ0FBQyxDQUFDO1lBQ25F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
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ECIESEncryption, Encryption } from
|
|
1
|
+
import { ECIESEncryption, Encryption } from '@super-protocol/dto-js';
|
|
2
2
|
declare class ECIES {
|
|
3
3
|
static encrypt(content: string, encryption: Encryption): Promise<ECIESEncryption>;
|
|
4
4
|
static decrypt(encryption: ECIESEncryption): Promise<string>;
|
|
@@ -18,19 +18,19 @@ class ECIES {
|
|
|
18
18
|
static encrypt(content, encryption) {
|
|
19
19
|
return __awaiter(this, void 0, void 0, function* () {
|
|
20
20
|
if (!encryption.key)
|
|
21
|
-
throw Error(
|
|
22
|
-
const ecdh = crypto_1.default.createECDH(
|
|
23
|
-
ecdh.generateKeys(
|
|
21
|
+
throw Error('Encryption key is not provided');
|
|
22
|
+
const ecdh = crypto_1.default.createECDH('secp256k1');
|
|
23
|
+
ecdh.generateKeys('binary', 'uncompressed');
|
|
24
24
|
const epk = ecdh.getPublicKey();
|
|
25
25
|
const pk = ecdh.computeSecret(Buffer.from(encryption.key, encryption.encoding));
|
|
26
|
-
const hash = crypto_1.default.createHash(
|
|
26
|
+
const hash = crypto_1.default.createHash('sha512').update(pk).digest();
|
|
27
27
|
const cipherKey = hash.slice(0, 32), macKey = hash.slice(32);
|
|
28
28
|
const iv = crypto_1.default.randomBytes(16);
|
|
29
|
-
const cipher = crypto_1.default.createCipheriv(
|
|
29
|
+
const cipher = crypto_1.default.createCipheriv('aes-256-cbc', cipherKey, iv);
|
|
30
30
|
let ct = cipher.update(content);
|
|
31
31
|
ct = Buffer.concat([ct, cipher.final()]);
|
|
32
32
|
const dataToMac = Buffer.concat([iv, epk, ct]);
|
|
33
|
-
const mac = crypto_1.default.createHmac(
|
|
33
|
+
const mac = crypto_1.default.createHmac('sha256', macKey).update(dataToMac).digest();
|
|
34
34
|
return {
|
|
35
35
|
iv: iv.toString(encryption.encoding),
|
|
36
36
|
ephemPublicKey: epk.toString(encryption.encoding),
|
|
@@ -44,25 +44,26 @@ class ECIES {
|
|
|
44
44
|
static decrypt(encryption) {
|
|
45
45
|
return __awaiter(this, void 0, void 0, function* () {
|
|
46
46
|
if (!encryption.key)
|
|
47
|
-
throw Error(
|
|
47
|
+
throw Error('Decryption key is not provided');
|
|
48
48
|
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);
|
|
49
|
-
const ecdh = crypto_1.default.createECDH(
|
|
49
|
+
const ecdh = crypto_1.default.createECDH('secp256k1');
|
|
50
50
|
ecdh.setPrivateKey(Buffer.from(encryption.key, encryption.encoding));
|
|
51
51
|
const pk = ecdh.computeSecret(epk);
|
|
52
|
-
const hash = crypto_1.default.createHash(
|
|
52
|
+
const hash = crypto_1.default.createHash('sha512').update(pk).digest();
|
|
53
53
|
const cipherKey = hash.slice(0, 32), macKey = hash.slice(32);
|
|
54
54
|
const m = crypto_1.default
|
|
55
|
-
.createHmac(
|
|
55
|
+
.createHmac('sha256', macKey)
|
|
56
56
|
.update(Buffer.concat([iv, epk, ct]))
|
|
57
57
|
.digest();
|
|
58
58
|
if (m.compare(mac) !== 0 || mac.compare(m) !== 0) {
|
|
59
|
-
throw new Error(
|
|
59
|
+
throw new Error('Corrupted Ecies body: unmatched authentication code');
|
|
60
60
|
}
|
|
61
|
-
const decipher = crypto_1.default.createDecipheriv(
|
|
61
|
+
const decipher = crypto_1.default.createDecipheriv('aes-256-cbc', cipherKey, iv);
|
|
62
62
|
const pt = decipher.update(ct);
|
|
63
63
|
const result = Buffer.concat([pt, decipher.final()]);
|
|
64
|
-
return result.toString(
|
|
64
|
+
return result.toString('binary');
|
|
65
65
|
});
|
|
66
66
|
}
|
|
67
67
|
}
|
|
68
68
|
exports.default = ECIES;
|
|
69
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRUNJRVMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY3J5cHRvL25vZGVqcy9FQ0lFUy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7OztBQUFBLG1EQUFzRjtBQUN0RixvREFBNEI7QUFFNUIsTUFBTSxLQUFLO0lBQ0EsTUFBTSxDQUFPLE9BQU8sQ0FBQyxPQUFlLEVBQUUsVUFBc0I7O1lBQy9ELElBQUksQ0FBQyxVQUFVLENBQUMsR0FBRztnQkFBRSxNQUFNLEtBQUssQ0FBQyxnQ0FBZ0MsQ0FBQyxDQUFDO1lBRW5FLE1BQU0sSUFBSSxHQUFHLGdCQUFNLENBQUMsVUFBVSxDQUFDLFdBQVcsQ0FBQyxDQUFDO1lBRTVDLElBQUksQ0FBQyxZQUFZLENBQUMsUUFBUSxFQUFFLGNBQWMsQ0FBQyxDQUFDO1lBQzVDLE1BQU0sR0FBRyxHQUFHLElBQUksQ0FBQyxZQUFZLEVBQUUsQ0FBQztZQUVoQyxNQUFNLEVBQUUsR0FBRyxJQUFJLENBQUMsYUFBYSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLEdBQUcsRUFBRSxVQUFVLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQztZQUVoRixNQUFNLElBQUksR0FBRyxnQkFBTSxDQUFDLFVBQVUsQ0FBQyxRQUFRLENBQUMsQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLENBQUMsTUFBTSxFQUFFLENBQUM7WUFFN0QsTUFBTSxTQUFTLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLEVBQy9CLE1BQU0sR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQyxDQUFDO1lBQzVCLE1BQU0sRUFBRSxHQUFHLGdCQUFNLENBQUMsV0FBVyxDQUFDLEVBQUUsQ0FBQyxDQUFDO1lBRWxDLE1BQU0sTUFBTSxHQUFHLGdCQUFNLENBQUMsY0FBYyxDQUFDLGFBQWEsRUFBRSxTQUFTLEVBQUUsRUFBRSxDQUFDLENBQUM7WUFDbkUs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
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
/// <reference types="node" />
|
|
3
3
|
/// <reference types="node" />
|
|
4
|
-
import { ReadStream, WriteStream } from
|
|
5
|
-
import { Cipher, Decipher } from
|
|
6
|
-
import { Encoding, EncryptionWithMacIV } from
|
|
4
|
+
import { ReadStream, WriteStream } from 'fs';
|
|
5
|
+
import { Cipher, Decipher } from 'crypto';
|
|
6
|
+
import { Encoding, EncryptionWithMacIV } from '@super-protocol/dto-js';
|
|
7
7
|
/**
|
|
8
8
|
*
|
|
9
9
|
*/
|