@super-protocol/sdk-js 3.12.1-beta.1 → 3.13.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/dist/cjs/certificates/binary-splitter.d.ts +26 -0
- package/dist/cjs/certificates/binary-splitter.js +269 -0
- package/dist/cjs/certificates/generator.d.ts +38 -0
- package/dist/cjs/certificates/generator.js +237 -0
- package/dist/cjs/certificates/helper.d.ts +5 -2
- package/dist/cjs/certificates/helper.js +19 -15
- package/dist/cjs/certificates/index.d.ts +1 -0
- package/dist/cjs/certificates/index.js +2 -1
- package/dist/cjs/certificates/serializer.d.ts +5 -0
- package/dist/cjs/certificates/serializer.js +98 -2
- package/dist/cjs/certificates/setup-crypto.d.ts +3 -0
- package/dist/cjs/certificates/setup-crypto.js +51 -0
- package/dist/cjs/certificates/types.d.ts +77 -0
- package/dist/cjs/connectors/BlockchainConnector.js +11 -8
- package/dist/cjs/connectors/BlockchainEventsListener.d.ts +4 -4
- package/dist/cjs/connectors/BlockchainEventsListener.js +9 -8
- package/dist/cjs/constants.d.ts +5 -1
- package/dist/cjs/constants.js +12 -5
- package/dist/cjs/index.d.ts +0 -2
- package/dist/cjs/index.js +3 -6
- package/dist/cjs/models/Offer.d.ts +1 -1
- package/dist/cjs/models/Offer.js +10 -3
- package/dist/cjs/models/Order.d.ts +1 -1
- package/dist/cjs/models/Order.js +21 -20
- package/dist/cjs/models/TeeOffer.d.ts +2 -2
- package/dist/cjs/models/TeeOffer.js +18 -3
- package/dist/cjs/proto/OrderReport.d.ts +206 -15
- package/dist/cjs/proto/OrderReport.js +169 -3
- package/dist/cjs/staticModels/ActiveOrders.d.ts +1 -1
- package/dist/cjs/staticModels/ActiveOrders.js +1 -1
- package/dist/cjs/staticModels/OfferResources.js +3 -4
- package/dist/cjs/staticModels/Offers.d.ts +3 -4
- package/dist/cjs/staticModels/Offers.js +16 -17
- package/dist/cjs/staticModels/OffersCommon.d.ts +18 -0
- package/dist/cjs/staticModels/OffersCommon.js +79 -0
- package/dist/cjs/staticModels/Orders.d.ts +6 -5
- package/dist/cjs/staticModels/Orders.js +96 -5
- package/dist/cjs/staticModels/SecretRequests.js +2 -3
- package/dist/cjs/staticModels/StaticModel.d.ts +14 -2
- package/dist/cjs/staticModels/StaticModel.js +90 -2
- package/dist/cjs/staticModels/SuperproToken.d.ts +26 -1
- package/dist/cjs/staticModels/SuperproToken.js +40 -1
- package/dist/cjs/staticModels/TeeOffers.d.ts +4 -4
- package/dist/cjs/staticModels/TeeOffers.js +17 -16
- package/dist/cjs/tee/OrderReportService.js +4 -2
- package/dist/cjs/tee/QuoteValidator.d.ts +3 -2
- package/dist/cjs/tee/QuoteValidator.js +5 -4
- package/dist/cjs/tee/TeeCertificateService.d.ts +1 -1
- package/dist/cjs/tee/TeeCertificateService.js +11 -14
- package/dist/cjs/tee/TeeSignatureVerifier.d.ts +6 -4
- package/dist/cjs/tee/TeeSignatureVerifier.js +60 -32
- package/dist/cjs/tee/types.d.ts +1 -1
- package/dist/cjs/types/Order.d.ts +28 -2
- package/dist/cjs/types/Order.js +23 -2
- package/dist/cjs/types/index.d.ts +0 -1
- package/dist/cjs/types/index.js +1 -2
- package/dist/cjs/utils/CryptoKeysTransformer.d.ts +4 -0
- package/dist/cjs/utils/CryptoKeysTransformer.js +50 -1
- package/dist/cjs/utils/TxManager.d.ts +2 -0
- package/dist/cjs/utils/TxManager.js +56 -25
- package/dist/cjs/utils/helper.d.ts +11 -3
- package/dist/cjs/utils/helper.js +56 -12
- package/dist/cjs/utils/helpers/getRawRpc.d.ts +2 -0
- package/dist/cjs/utils/helpers/getRawRpc.js +19 -0
- package/dist/cjs/utils/helpers/index.d.ts +1 -0
- package/dist/cjs/utils/helpers/index.js +2 -1
- package/dist/cjs/utils/types.d.ts +14 -0
- package/dist/cjs/utils/types.js +3 -0
- package/dist/mjs/certificates/binary-splitter.d.ts +26 -0
- package/dist/mjs/certificates/binary-splitter.js +265 -0
- package/dist/mjs/certificates/generator.d.ts +38 -0
- package/dist/mjs/certificates/generator.js +230 -0
- package/dist/mjs/certificates/helper.d.ts +5 -2
- package/dist/mjs/certificates/helper.js +19 -15
- package/dist/mjs/certificates/index.d.ts +1 -0
- package/dist/mjs/certificates/index.js +2 -1
- package/dist/mjs/certificates/serializer.d.ts +5 -0
- package/dist/mjs/certificates/serializer.js +94 -1
- package/dist/mjs/certificates/setup-crypto.d.ts +3 -0
- package/dist/mjs/certificates/setup-crypto.js +22 -0
- package/dist/mjs/certificates/types.d.ts +77 -0
- package/dist/mjs/connectors/BlockchainConnector.js +11 -8
- package/dist/mjs/connectors/BlockchainEventsListener.d.ts +4 -4
- package/dist/mjs/connectors/BlockchainEventsListener.js +9 -8
- package/dist/mjs/constants.d.ts +5 -1
- package/dist/mjs/constants.js +11 -4
- package/dist/mjs/index.d.ts +0 -2
- package/dist/mjs/index.js +1 -3
- package/dist/mjs/models/Offer.d.ts +1 -1
- package/dist/mjs/models/Offer.js +10 -3
- package/dist/mjs/models/Order.d.ts +1 -1
- package/dist/mjs/models/Order.js +22 -21
- package/dist/mjs/models/TeeOffer.d.ts +2 -2
- package/dist/mjs/models/TeeOffer.js +18 -3
- package/dist/mjs/proto/OrderReport.d.ts +206 -15
- package/dist/mjs/proto/OrderReport.js +168 -2
- package/dist/mjs/staticModels/ActiveOrders.d.ts +1 -1
- package/dist/mjs/staticModels/ActiveOrders.js +1 -1
- package/dist/mjs/staticModels/OfferResources.js +4 -5
- package/dist/mjs/staticModels/Offers.d.ts +3 -4
- package/dist/mjs/staticModels/Offers.js +16 -17
- package/dist/mjs/staticModels/OffersCommon.d.ts +18 -0
- package/dist/mjs/staticModels/OffersCommon.js +73 -0
- package/dist/mjs/staticModels/Orders.d.ts +6 -5
- package/dist/mjs/staticModels/Orders.js +98 -7
- package/dist/mjs/staticModels/SecretRequests.js +3 -4
- package/dist/mjs/staticModels/StaticModel.d.ts +14 -2
- package/dist/mjs/staticModels/StaticModel.js +90 -2
- package/dist/mjs/staticModels/SuperproToken.d.ts +26 -1
- package/dist/mjs/staticModels/SuperproToken.js +40 -1
- package/dist/mjs/staticModels/TeeOffers.d.ts +4 -4
- package/dist/mjs/staticModels/TeeOffers.js +17 -16
- package/dist/mjs/tee/OrderReportService.js +4 -2
- package/dist/mjs/tee/QuoteValidator.d.ts +3 -2
- package/dist/mjs/tee/QuoteValidator.js +5 -4
- package/dist/mjs/tee/TeeCertificateService.d.ts +1 -1
- package/dist/mjs/tee/TeeCertificateService.js +12 -15
- package/dist/mjs/tee/TeeSignatureVerifier.d.ts +6 -4
- package/dist/mjs/tee/TeeSignatureVerifier.js +59 -31
- package/dist/mjs/tee/types.d.ts +1 -1
- package/dist/mjs/types/Order.d.ts +28 -2
- package/dist/mjs/types/Order.js +21 -1
- package/dist/mjs/types/index.d.ts +0 -1
- package/dist/mjs/types/index.js +1 -2
- package/dist/mjs/utils/CryptoKeysTransformer.d.ts +4 -0
- package/dist/mjs/utils/CryptoKeysTransformer.js +50 -1
- package/dist/mjs/utils/TxManager.d.ts +2 -0
- package/dist/mjs/utils/TxManager.js +57 -26
- package/dist/mjs/utils/helper.d.ts +11 -3
- package/dist/mjs/utils/helper.js +54 -12
- package/dist/mjs/utils/helpers/getRawRpc.d.ts +2 -0
- package/dist/mjs/utils/helpers/getRawRpc.js +15 -0
- package/dist/mjs/utils/helpers/index.d.ts +1 -0
- package/dist/mjs/utils/helpers/index.js +2 -1
- package/dist/mjs/utils/types.d.ts +14 -0
- package/dist/mjs/utils/types.js +2 -0
- package/package.json +5 -3
- package/readme.md +11 -0
- package/dist/cjs/contracts/Campaign.d.ts +0 -1036
- package/dist/cjs/contracts/Campaign.js +0 -1347
- package/dist/cjs/staticModels/Campaign.d.ts +0 -56
- package/dist/cjs/staticModels/Campaign.js +0 -219
- package/dist/cjs/types/Campaign.d.ts +0 -57
- package/dist/cjs/types/Campaign.js +0 -11
- package/dist/mjs/contracts/Campaign.d.ts +0 -1036
- package/dist/mjs/contracts/Campaign.js +0 -1344
- package/dist/mjs/staticModels/Campaign.d.ts +0 -56
- package/dist/mjs/staticModels/Campaign.js +0 -214
- package/dist/mjs/types/Campaign.d.ts +0 -57
- package/dist/mjs/types/Campaign.js +0 -8
|
@@ -31,29 +31,20 @@ const lodash_1 = __importDefault(require("lodash"));
|
|
|
31
31
|
const axios_1 = __importDefault(require("axios"));
|
|
32
32
|
const node_forge_1 = __importDefault(require("node-forge"));
|
|
33
33
|
const pkijs = __importStar(require("pkijs"));
|
|
34
|
+
const x509_1 = require("@peculiar/x509");
|
|
34
35
|
const memory_js_1 = require("../utils/cache/memory.js");
|
|
35
36
|
const ocsp_js_1 = require("./ocsp.js");
|
|
36
37
|
const crl_js_1 = require("./crl.js");
|
|
37
|
-
|
|
38
|
-
//pkijs initCryptoEngine method doesn't work properly in nodejs
|
|
39
|
-
//https://github.com/PeculiarVentures/PKI.js/blob/91c596be220c5010b38415a68bd100942dfd321e/src/CryptoEngine/CryptoEngineInit.ts#L4
|
|
40
|
-
try {
|
|
41
|
-
pkijs.getEngine();
|
|
42
|
-
}
|
|
43
|
-
catch (err) {
|
|
44
|
-
if (err.message === `Please call 'setEngine' before call to 'getEngine'`) {
|
|
45
|
-
pkijs.setEngine('Node', new pkijs.CryptoEngine({ name: 'Node', crypto: crypto_1.webcrypto }));
|
|
46
|
-
}
|
|
47
|
-
}
|
|
38
|
+
require("./setup-crypto.js");
|
|
48
39
|
class CertificatesHelper {
|
|
49
40
|
static downloadedCertificateCache = (0, memory_js_1.createMemoryCache)();
|
|
50
|
-
static derToPem(data) {
|
|
41
|
+
static derToPem(data, type = 'CERTIFICATE') {
|
|
51
42
|
return node_forge_1.default.pem.encode({
|
|
52
43
|
contentDomain: null,
|
|
53
44
|
dekInfo: null,
|
|
54
45
|
headers: [],
|
|
55
46
|
procType: null,
|
|
56
|
-
type
|
|
47
|
+
type,
|
|
57
48
|
body: Buffer.from(data).toString('binary'),
|
|
58
49
|
});
|
|
59
50
|
}
|
|
@@ -90,7 +81,10 @@ class CertificatesHelper {
|
|
|
90
81
|
return certs.map((certPem) => CertificatesHelper.pemToDer(certPem));
|
|
91
82
|
}
|
|
92
83
|
static derChainToPem(certsDer) {
|
|
93
|
-
return certsDer
|
|
84
|
+
return certsDer
|
|
85
|
+
.map((cert) => CertificatesHelper.derToPem(cert))
|
|
86
|
+
.join('')
|
|
87
|
+
.trim();
|
|
94
88
|
}
|
|
95
89
|
static async downloadCertWithCache(url) {
|
|
96
90
|
const responseData = await CertificatesHelper.downloadedCertificateCache.wrap(url, async () => {
|
|
@@ -121,6 +115,16 @@ class CertificatesHelper {
|
|
|
121
115
|
const chains = leafs.map(buildChain).sort((one, two) => two.length - one.length);
|
|
122
116
|
return chains.flat();
|
|
123
117
|
}
|
|
118
|
+
static getCertPublicKeyAlgorithm(certPem) {
|
|
119
|
+
const cert = new x509_1.X509Certificate(certPem);
|
|
120
|
+
const publicKey = cert.publicKey;
|
|
121
|
+
return publicKey.algorithm;
|
|
122
|
+
}
|
|
123
|
+
static getCsrPublicKeyAlgorithm(csrPem) {
|
|
124
|
+
const csr = new x509_1.Pkcs10CertificateRequest(csrPem);
|
|
125
|
+
const publicKey = csr.publicKey;
|
|
126
|
+
return publicKey.algorithm;
|
|
127
|
+
}
|
|
124
128
|
static async validateCertChain(certsPem, caPem, options = {}) {
|
|
125
129
|
const { offline } = options;
|
|
126
130
|
// reverse() is needed because pkijs expects certificates to be ordered from root to leaf
|
|
@@ -174,4 +178,4 @@ class CertificatesHelper {
|
|
|
174
178
|
}
|
|
175
179
|
}
|
|
176
180
|
exports.CertificatesHelper = CertificatesHelper;
|
|
177
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
181
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NlcnRpZmljYXRlcy9oZWxwZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSxvREFBdUI7QUFDdkIsa0RBQTBCO0FBQzFCLDREQUErQjtBQUMvQiw2Q0FBK0I7QUFDL0IseUNBQTJFO0FBQzNFLHdEQUE2RDtBQUU3RCx1Q0FBdUM7QUFDdkMscUNBQXFDO0FBQ3JDLDZCQUEyQjtBQUUzQixNQUFhLGtCQUFrQjtJQUNyQixNQUFNLENBQUMsMEJBQTBCLEdBQUcsSUFBQSw2QkFBaUIsR0FBRSxDQUFDO0lBRWhFLE1BQU0sQ0FBQyxRQUFRLENBQUMsSUFBaUIsRUFBRSxPQUFlLGFBQWE7UUFDN0QsT0FBTyxvQkFBSyxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUM7WUFDdEIsYUFBYSxFQUFFLElBQUk7WUFDbkIsT0FBTyxFQUFFLElBQUk7WUFDYixPQUFPLEVBQUUsRUFBRTtZQUNYLFFBQVEsRUFBRSxJQUFJO1lBQ2QsSUFBSTtZQUNKLElBQUksRUFBRSxNQUFNLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDLFFBQVEsQ0FBQyxRQUFRLENBQUM7U0FDM0MsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVELE1BQU0sQ0FBQyxRQUFRLENBQUMsT0FBZTtRQUM3QixPQUFPLE1BQU0sQ0FBQyxJQUFJLENBQUMsb0JBQUssQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxDQUFDLEtBQUssRUFBRSxFQUFFLFFBQVEsQ0FBQyxDQUFDO0lBQ3BFLENBQUM7SUFFRCxNQUFNLENBQUMsYUFBYSxDQUFDLEtBQWE7UUFDaEMsTUFBTSxRQUFRLEdBQUcsaUVBQWlFLENBQUM7UUFDbkYsT0FBTyxLQUFLLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxJQUFJLEVBQUUsQ0FBQztJQUNyQyxDQUFDO0lBRUQsTUFBTSxD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
|
|
@@ -17,4 +17,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
17
17
|
__exportStar(require("./helper.js"), exports);
|
|
18
18
|
__exportStar(require("./types.js"), exports);
|
|
19
19
|
__exportStar(require("./serializer.js"), exports);
|
|
20
|
-
|
|
20
|
+
__exportStar(require("./generator.js"), exports);
|
|
21
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY2VydGlmaWNhdGVzL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSw4Q0FBNEI7QUFDNUIsNkNBQTJCO0FBQzNCLGtEQUFnQztBQUNoQyxpREFBK0IifQ==
|
|
@@ -1,5 +1,10 @@
|
|
|
1
|
+
import { BlockchainCert } from './types.js';
|
|
2
|
+
export declare const BLOCKCHAIN_CERT_TBS_PARTS: string[];
|
|
1
3
|
export declare class CertificateSerializer {
|
|
2
4
|
static serializeCertChain(certChainPem: string): string;
|
|
3
5
|
static deserializeCertChain(input: string): string;
|
|
4
6
|
static isSerializedCertChain(certChainBase64: string): boolean;
|
|
7
|
+
static serializeForBlockchain(certPem: string): BlockchainCert;
|
|
8
|
+
static deserializeFromBlockchain(data: BlockchainCert): string;
|
|
9
|
+
private static getPart;
|
|
5
10
|
}
|
|
@@ -1,9 +1,26 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.CertificateSerializer = void 0;
|
|
6
|
+
exports.CertificateSerializer = exports.BLOCKCHAIN_CERT_TBS_PARTS = void 0;
|
|
7
|
+
const node_forge_1 = __importDefault(require("node-forge"));
|
|
8
|
+
const lodash_1 = __importDefault(require("lodash"));
|
|
9
|
+
const binary_splitter_js_1 = require("./binary-splitter.js");
|
|
4
10
|
const helper_js_1 = require("./helper.js");
|
|
11
|
+
const constants_js_1 = require("../constants.js");
|
|
12
|
+
const pki_common_1 = require("@super-protocol/pki-common");
|
|
5
13
|
const CERTS_CHAIN_DELIMITER = ';';
|
|
6
14
|
const CERTS_SERIALIZATION_PREFIX = 'certs:';
|
|
15
|
+
exports.BLOCKCHAIN_CERT_TBS_PARTS = [
|
|
16
|
+
'serialNumber',
|
|
17
|
+
'expirationDate',
|
|
18
|
+
'publicKey',
|
|
19
|
+
'ca',
|
|
20
|
+
'userData',
|
|
21
|
+
'mrEnclave',
|
|
22
|
+
'mrSigner',
|
|
23
|
+
];
|
|
7
24
|
class CertificateSerializer {
|
|
8
25
|
static serializeCertChain(certChainPem) {
|
|
9
26
|
const certsDer = helper_js_1.CertificatesHelper.pemChainToDer(certChainPem);
|
|
@@ -22,6 +39,85 @@ class CertificateSerializer {
|
|
|
22
39
|
static isSerializedCertChain(certChainBase64) {
|
|
23
40
|
return certChainBase64.startsWith(CERTS_SERIALIZATION_PREFIX);
|
|
24
41
|
}
|
|
42
|
+
static serializeForBlockchain(certPem) {
|
|
43
|
+
const certAlgorithm = helper_js_1.CertificatesHelper.getCertPublicKeyAlgorithm(certPem);
|
|
44
|
+
if (certAlgorithm.name !== 'ECDSA' || certAlgorithm.namedCurve !== 'K-256') {
|
|
45
|
+
throw new Error(`Unsupported certificate algorithm: ${certAlgorithm.name}${certAlgorithm.namedCurve ? `with curve ${certAlgorithm.namedCurve}` : ''}. Only ECDSA with secp256k1 curve is supported.`);
|
|
46
|
+
}
|
|
47
|
+
const certDer = helper_js_1.CertificatesHelper.pemToDer(certPem);
|
|
48
|
+
const parts = new binary_splitter_js_1.CertificateBinarySplitter(certDer).split([
|
|
49
|
+
binary_splitter_js_1.CertificateNonOidParts.SERIAL_NUMBER,
|
|
50
|
+
binary_splitter_js_1.CertificateNonOidParts.SIGNATURE,
|
|
51
|
+
binary_splitter_js_1.CertificateNonOidParts.NOT_AFTER,
|
|
52
|
+
binary_splitter_js_1.CertificateNonOidParts.SUBJECT_PUBLIC_KEY_INFO,
|
|
53
|
+
], [
|
|
54
|
+
node_forge_1.default.pki.oids['basicConstraints'],
|
|
55
|
+
constants_js_1.OID_CUSTOM_EXTENSION_USER_DATA,
|
|
56
|
+
pki_common_1.OID_CUSTOM_EXTENSION_CHALLENGE_ID,
|
|
57
|
+
pki_common_1.OID_CUSTOM_EXTENSION_CHALLENGE_COMMON_ID,
|
|
58
|
+
]);
|
|
59
|
+
const [nonSerializedParts, serializedParts] = lodash_1.default.partition(parts, (part) => part instanceof Uint8Array);
|
|
60
|
+
const expirationDate = CertificateSerializer.getPart(serializedParts, 'notAfter');
|
|
61
|
+
const serial = CertificateSerializer.getPart(serializedParts, 'serialNumber');
|
|
62
|
+
const publicKey = CertificateSerializer.getPart(serializedParts, 'publicKey');
|
|
63
|
+
const ca = CertificateSerializer.getPart(serializedParts, node_forge_1.default.pki.oids['basicConstraints']);
|
|
64
|
+
const userData = CertificateSerializer.getPart(serializedParts, constants_js_1.OID_CUSTOM_EXTENSION_USER_DATA, false);
|
|
65
|
+
const mrEnclave = CertificateSerializer.getPart(serializedParts, pki_common_1.OID_CUSTOM_EXTENSION_CHALLENGE_ID, false);
|
|
66
|
+
const mrSigner = CertificateSerializer.getPart(serializedParts, pki_common_1.OID_CUSTOM_EXTENSION_CHALLENGE_COMMON_ID, false);
|
|
67
|
+
const signature = CertificateSerializer.getPart(serializedParts, 'signature');
|
|
68
|
+
if (serializedParts.length !== 0) {
|
|
69
|
+
throw new Error(`Unexpected serialized parts found in certificate: ${serializedParts.map((part) => part.name || part.oid).join(', ')}`);
|
|
70
|
+
}
|
|
71
|
+
return {
|
|
72
|
+
nonSerializedParts,
|
|
73
|
+
expirationDate: expirationDate.value,
|
|
74
|
+
ca: ca.value,
|
|
75
|
+
userData: userData?.value,
|
|
76
|
+
serialNumber: serial.value,
|
|
77
|
+
signature: signature.value,
|
|
78
|
+
publicKey: publicKey.value,
|
|
79
|
+
mrEnclave: mrEnclave?.value,
|
|
80
|
+
mrSigner: mrSigner?.value,
|
|
81
|
+
};
|
|
82
|
+
}
|
|
83
|
+
static deserializeFromBlockchain(data) {
|
|
84
|
+
const bufferParts = [];
|
|
85
|
+
bufferParts.push(Buffer.from(data.nonSerializedParts[0]));
|
|
86
|
+
bufferParts.push(Buffer.from(data.nonSerializedParts[1]));
|
|
87
|
+
let partIndex = 2;
|
|
88
|
+
for (const field of exports.BLOCKCHAIN_CERT_TBS_PARTS) {
|
|
89
|
+
const value = data[field];
|
|
90
|
+
if (value) {
|
|
91
|
+
bufferParts.push(Buffer.from(value));
|
|
92
|
+
if (partIndex < data.nonSerializedParts.length) {
|
|
93
|
+
bufferParts.push(Buffer.from(data.nonSerializedParts[partIndex++]));
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
// adding signature part
|
|
98
|
+
// if no custom extensions, it is needed to add additional block with keyUsage extension
|
|
99
|
+
// if custom extension present - keyUsage extension will be a part of block before this custom extension
|
|
100
|
+
// 3 - because asn1 bytes between r and s values are 2 or 3 bytes long (2 for positive value, 3 for negative value)
|
|
101
|
+
if (data.nonSerializedParts[partIndex]?.byteLength > 3) {
|
|
102
|
+
bufferParts.push(Buffer.from(data.nonSerializedParts[partIndex++]));
|
|
103
|
+
}
|
|
104
|
+
const rValue = data.signature.slice(0, 32);
|
|
105
|
+
bufferParts.push(Buffer.from(rValue));
|
|
106
|
+
if (partIndex < data.nonSerializedParts.length) {
|
|
107
|
+
bufferParts.push(Buffer.from(data.nonSerializedParts[partIndex++]));
|
|
108
|
+
}
|
|
109
|
+
const sValue = data.signature.slice(32, 64);
|
|
110
|
+
bufferParts.push(Buffer.from(sValue));
|
|
111
|
+
const certDer = Buffer.concat(bufferParts);
|
|
112
|
+
return helper_js_1.CertificatesHelper.derToPem(certDer);
|
|
113
|
+
}
|
|
114
|
+
static getPart(parts, nameOrOid, mandatory = true) {
|
|
115
|
+
const part = lodash_1.default.remove(parts, (part) => part.name === nameOrOid || part.oid === nameOrOid)[0];
|
|
116
|
+
if (!part && mandatory) {
|
|
117
|
+
throw new Error(`Part with name or OID "${nameOrOid}" not found in certificate`);
|
|
118
|
+
}
|
|
119
|
+
return part;
|
|
120
|
+
}
|
|
25
121
|
}
|
|
26
122
|
exports.CertificateSerializer = CertificateSerializer;
|
|
27
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
123
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VyaWFsaXplci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jZXJ0aWZpY2F0ZXMvc2VyaWFsaXplci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSw0REFBK0I7QUFDL0Isb0RBQXVCO0FBQ3ZCLDZEQUF5RjtBQUN6RiwyQ0FBaUQ7QUFDakQsa0RBQWlFO0FBQ2pFLDJEQUdvQztBQUdwQyxNQUFNLHFCQUFxQixHQUFHLEdBQUcsQ0FBQztBQUNsQyxNQUFNLDBCQUEwQixHQUFHLFFBQVEsQ0FBQztBQUUvQixRQUFBLHlCQUF5QixHQUFHO0lBQ3ZDLGNBQWM7SUFDZCxnQkFBZ0I7SUFDaEIsV0FBVztJQUNYLElBQUk7SUFDSixVQUFVO0lBQ1YsV0FBVztJQUNYLFVBQVU7Q0FDWCxDQUFDO0FBRUYsTUFBYSxxQkFBcUI7SUFDaEMsTUFBTSxDQUFDLGtCQUFrQixDQUFDLFlBQW9CO1FBQzVDLE1BQU0sUUFBUSxHQUFHLDhCQUFrQixDQUFDLGFBQWEsQ0FBQyxZQUFZLENBQUMsQ0FBQztRQUVoRSxPQUFPLEdBQUcsMEJBQTBCLEdBQUcsUUFBUSxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxRQUFRLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMscUJBQXFCLENBQUMsRUFBRSxDQUFDO0lBQ3BJLENBQUM7SUFFRCxNQUFNLENBQUMsb0JBQW9CLENBQUMsS0FBYTtRQUN2QyxJQUFJLENBQUMsS0FBSyxDQUFDLFVBQVUsQ0FBQywwQkFBMEIsQ0FBQyxFQUFFLENBQUM7WUFDbEQsTUFBTSxJQUFJLEtBQUssQ0FBQyxtQkFBbUIsMEJBQTBCLFlBQVksQ0FBQyxDQUFDO1FBQzdFLENBQUM7UUFFRCxNQUFNLFFBQVEsR0FBRyxLQUFLO2FBQ25CLEtBQUssQ0FBQywwQkFBMEIsQ0FBQyxDQUFDLENBQUMsQ0FBQztZ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
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
25
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
|
+
};
|
|
28
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
+
exports.cryptoProvider = void 0;
|
|
30
|
+
const x509 = __importStar(require("@peculiar/x509"));
|
|
31
|
+
const webcrypto_1 = __importDefault(require("@peculiar/webcrypto"));
|
|
32
|
+
const pkijs = __importStar(require("pkijs"));
|
|
33
|
+
const cryptoProvider = new webcrypto_1.default.Crypto();
|
|
34
|
+
exports.cryptoProvider = cryptoProvider;
|
|
35
|
+
x509.cryptoProvider.set(cryptoProvider);
|
|
36
|
+
pkijs.setEngine('Node', new pkijs.CryptoEngine({ name: 'Node', crypto: cryptoProvider }));
|
|
37
|
+
pkijs.ECNamedCurves.register('K-256', '1.3.132.0.10', 32);
|
|
38
|
+
const originGetAlgorithmByOIDFn = pkijs.CryptoEngine.prototype.getAlgorithmByOID;
|
|
39
|
+
function getAlgorithmByOID(oid, safety, target) {
|
|
40
|
+
if (oid === '1.3.132.0.10') {
|
|
41
|
+
return {
|
|
42
|
+
name: 'K-256',
|
|
43
|
+
};
|
|
44
|
+
}
|
|
45
|
+
return originGetAlgorithmByOIDFn(oid, safety, target);
|
|
46
|
+
}
|
|
47
|
+
pkijs.CryptoEngine.prototype.getAlgorithmByOID = getAlgorithmByOID;
|
|
48
|
+
x509.PemConverter.isPem = (data) => {
|
|
49
|
+
return typeof data === 'string' && data.startsWith('-----BEGIN');
|
|
50
|
+
};
|
|
51
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2V0dXAtY3J5cHRvLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NlcnRpZmljYXRlcy9zZXR1cC1jcnlwdG8udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSxxREFBdUM7QUFDdkMsb0VBQTRDO0FBQzVDLDZDQUErQjtBQUUvQixNQUFNLGNBQWMsR0FBRyxJQUFJLG1CQUFTLENBQUMsTUFBTSxFQUFFLENBQUM7QUF3QnJDLHdDQUFjO0FBdEJ2QixJQUFJLENBQUMsY0FBYyxDQUFDLEdBQUcsQ0FBQyxjQUFjLENBQUMsQ0FBQztBQUV4QyxLQUFLLENBQUMsU0FBUyxDQUFDLE1BQU0sRUFBRSxJQUFJLEtBQUssQ0FBQyxZQUFZLENBQUMsRUFBRSxJQUFJLEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBRSxjQUFjLEVBQUUsQ0FBQyxDQUFDLENBQUM7QUFFMUYsS0FBSyxDQUFDLGFBQWEsQ0FBQyxRQUFRLENBQUMsT0FBTyxFQUFFLGNBQWMsRUFBRSxFQUFFLENBQUMsQ0FBQztBQUUxRCxNQUFNLHlCQUF5QixHQUFHLEtBQUssQ0FBQyxZQUFZLENBQUMsU0FBUyxDQUFDLGlCQUFpQixDQUFDO0FBQ2pGLFNBQVMsaUJBQWlCLENBQUMsR0FBVyxFQUFFLE1BQWdCLEVBQUUsTUFBZTtJQUN2RSxJQUFJLEdBQUcsS0FBSyxjQUFjLEVBQUUsQ0FBQztRQUMzQixPQUFPO1lBQ0wsSUFBSSxFQUFFLE9BQU87U0FDZCxDQUFDO0lBQ0osQ0FBQztJQUVELE9BQU8seUJBQXlCLENBQUMsR0FBRyxFQUFFLE1BQU0sRUFBRSxNQUFNLENBQUMsQ0FBQztBQUN4RCxDQUFDO0FBQ0QsS0FBSyxDQUFDLFlBQVksQ0FBQyxTQUFTLENBQUMsaUJBQWlCLEdBQUcsaUJBQWlCLENBQUM7QUFFbkUsSUFBSSxDQUFDLFlBQVksQ0FBQyxLQUFLLEdBQUcsQ0FBQyxJQUFZLEVBQWtCLEVBQUU7SUFDekQsT0FBTyxPQUFPLElBQUksS0FBSyxRQUFRLElBQUksSUFBSSxDQUFDLFVBQVUsQ0FBQyxZQUFZLENBQUMsQ0FBQztBQUNuRSxDQUFDLENBQUMifQ==
|
|
@@ -1,4 +1,81 @@
|
|
|
1
|
+
/// <reference types="node" />
|
|
1
2
|
export type ValidateCertChainResult = {
|
|
2
3
|
isValid: boolean;
|
|
3
4
|
errorMessage?: string;
|
|
4
5
|
};
|
|
6
|
+
export type SignatureAlgorithm = 'RSASSA-PKCS1-SHA256' | 'ECDSA-secp256k1-SHA256' | 'ECDSA-P-256-SHA256';
|
|
7
|
+
export type AlgorithmObj = {
|
|
8
|
+
name: string;
|
|
9
|
+
namedCurve?: string;
|
|
10
|
+
hash?: {
|
|
11
|
+
name: string;
|
|
12
|
+
};
|
|
13
|
+
};
|
|
14
|
+
export type CustomExtension = {
|
|
15
|
+
oid: string;
|
|
16
|
+
value: Buffer;
|
|
17
|
+
};
|
|
18
|
+
export type CertificatePrincipal = {
|
|
19
|
+
country?: string;
|
|
20
|
+
stateName?: string;
|
|
21
|
+
localityName: string;
|
|
22
|
+
organization?: string;
|
|
23
|
+
organizationalUnit?: string;
|
|
24
|
+
commonName: string;
|
|
25
|
+
};
|
|
26
|
+
export type PemOrCryptoKeys = {
|
|
27
|
+
/**
|
|
28
|
+
* spki format for PEM
|
|
29
|
+
*/
|
|
30
|
+
publicKey: string | CryptoKey;
|
|
31
|
+
/**
|
|
32
|
+
* pkcs8 format for PEM
|
|
33
|
+
*/
|
|
34
|
+
privateKey: string | CryptoKey;
|
|
35
|
+
};
|
|
36
|
+
export type GenerateCertParams = PemOrCryptoKeys & {
|
|
37
|
+
subject: CertificatePrincipal | string;
|
|
38
|
+
issuer: CertificatePrincipal | string;
|
|
39
|
+
notAfter: Date;
|
|
40
|
+
dnsNames?: string[];
|
|
41
|
+
ca?: boolean;
|
|
42
|
+
ocspSigning?: boolean;
|
|
43
|
+
customExtensions?: CustomExtension[];
|
|
44
|
+
};
|
|
45
|
+
export type GenerateCsrParams = PemOrCryptoKeys & {
|
|
46
|
+
subject: CertificatePrincipal | string;
|
|
47
|
+
dnsNames?: string[];
|
|
48
|
+
customExtensions?: CustomExtension[];
|
|
49
|
+
};
|
|
50
|
+
export type ParsedCsr = {
|
|
51
|
+
publicKey: CryptoKey;
|
|
52
|
+
subject: string;
|
|
53
|
+
extensions: CustomExtension[];
|
|
54
|
+
dnsNames?: string[];
|
|
55
|
+
};
|
|
56
|
+
export type ParsedCert = {
|
|
57
|
+
serialNumber: string;
|
|
58
|
+
publicKey: CryptoKey;
|
|
59
|
+
subject: string;
|
|
60
|
+
issuer: string;
|
|
61
|
+
notBefore: Date;
|
|
62
|
+
notAfter: Date;
|
|
63
|
+
extensions: CustomExtension[];
|
|
64
|
+
dnsNames?: string[];
|
|
65
|
+
};
|
|
66
|
+
export type BlockchainCert = {
|
|
67
|
+
nonSerializedParts: Uint8Array[];
|
|
68
|
+
expirationDate: Uint8Array;
|
|
69
|
+
ca: Uint8Array;
|
|
70
|
+
userData?: Uint8Array;
|
|
71
|
+
serialNumber: Uint8Array;
|
|
72
|
+
signature: Uint8Array;
|
|
73
|
+
publicKey: Uint8Array;
|
|
74
|
+
mrEnclave?: Uint8Array;
|
|
75
|
+
mrSigner?: Uint8Array;
|
|
76
|
+
};
|
|
77
|
+
export type CertBinaryItem = {
|
|
78
|
+
name: string;
|
|
79
|
+
oid?: string;
|
|
80
|
+
value: Uint8Array;
|
|
81
|
+
};
|
|
@@ -269,20 +269,23 @@ class BlockchainConnector extends BaseConnector_js_1.BaseConnector {
|
|
|
269
269
|
}
|
|
270
270
|
validAddresses.forEach((address) => (transactionsByAddress[address] = []));
|
|
271
271
|
while (startBlock <= lastBlock) {
|
|
272
|
-
const
|
|
272
|
+
const requests = [];
|
|
273
273
|
const batchLastBlock = Math.min(startBlock + batchSize - 1, lastBlock);
|
|
274
274
|
for (let blockNumber = startBlock; blockNumber <= batchLastBlock; blockNumber++) {
|
|
275
275
|
const hexedBlockNumber = '0x' + blockNumber.toString(16);
|
|
276
|
-
|
|
277
|
-
.add({
|
|
276
|
+
requests.push({
|
|
278
277
|
jsonrpc: '2.0',
|
|
279
278
|
method: 'eth_getBlockByNumber',
|
|
280
279
|
params: [hexedBlockNumber, true],
|
|
281
|
-
})
|
|
282
|
-
.catch((err) => this.logger.error(err));
|
|
280
|
+
});
|
|
283
281
|
}
|
|
284
|
-
const
|
|
285
|
-
|
|
282
|
+
const blocksResult = await (0, helper_js_1.executeBatchAsync)(requests, {
|
|
283
|
+
timeout,
|
|
284
|
+
throwOnError: true,
|
|
285
|
+
});
|
|
286
|
+
blocksResult
|
|
287
|
+
.map((result) => result.result)
|
|
288
|
+
.forEach((block) => {
|
|
286
289
|
if (!block?.transactions)
|
|
287
290
|
return;
|
|
288
291
|
block.transactions.forEach((transaction) => {
|
|
@@ -341,4 +344,4 @@ __decorate([
|
|
|
341
344
|
__metadata("design:returntype", Promise)
|
|
342
345
|
], BlockchainConnector.prototype, "getTransactions", null);
|
|
343
346
|
exports.default = BlockchainConnector;
|
|
344
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"BlockchainConnector.js","sourceRoot":"","sources":["../../../src/connectors/BlockchainConnector.ts"],"names":[],"mappings":"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"}
|
|
347
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"BlockchainConnector.js","sourceRoot":"","sources":["../../../src/connectors/BlockchainConnector.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,26 +2,26 @@ import { BaseConnector, Config } from './BaseConnector.js';
|
|
|
2
2
|
import { Contract } from 'web3';
|
|
3
3
|
import { EventLog } from 'web3-types';
|
|
4
4
|
import { abi } from '../contracts/abi.js';
|
|
5
|
-
import { abi as campaignAbi } from '../contracts/Campaign.js';
|
|
6
5
|
import { LogsSubscription } from 'web3-eth-contract';
|
|
7
6
|
export type WssSubscriptionOnDataFn = (event: EventLog) => Promise<void> | void;
|
|
8
7
|
export type WssSubscriptionOnErrorFn = (error: Error) => Promise<void> | void;
|
|
9
8
|
type UnsubscribeFn = () => Promise<void> | void;
|
|
10
9
|
type SubscribeParams = {
|
|
11
|
-
|
|
10
|
+
unsubscribeAndRemove: UnsubscribeFn;
|
|
12
11
|
onData: WssSubscriptionOnDataFn;
|
|
13
12
|
onError: WssSubscriptionOnErrorFn;
|
|
14
13
|
subscription?: LogsSubscription;
|
|
15
14
|
event: string;
|
|
16
|
-
contract?: Contract<typeof abi
|
|
15
|
+
contract?: Contract<typeof abi>;
|
|
17
16
|
};
|
|
17
|
+
type SubscriptionEvent = Omit<SubscribeParams, 'unsubscribeAndRemove' | 'subscription'>;
|
|
18
18
|
export default class BlockchainEventsListener extends BaseConnector {
|
|
19
19
|
private static instance;
|
|
20
20
|
private isSubscribingBlocked;
|
|
21
21
|
private constructor();
|
|
22
22
|
static getInstance(): BlockchainEventsListener;
|
|
23
23
|
private readonly subscriptions;
|
|
24
|
-
subscribeEvent(params:
|
|
24
|
+
subscribeEvent(params: SubscriptionEvent): UnsubscribeFn;
|
|
25
25
|
private resubscribe;
|
|
26
26
|
unsubscribeAll(): Promise<boolean>;
|
|
27
27
|
/**
|
|
@@ -63,10 +63,11 @@ class BlockchainEventsListener extends BaseConnector_js_1.BaseConnector {
|
|
|
63
63
|
event: params.event,
|
|
64
64
|
key,
|
|
65
65
|
}, `created subscription`);
|
|
66
|
-
const
|
|
66
|
+
const unsubscribeAndRemove = async () => {
|
|
67
67
|
this.logger.trace(`Unsubscribing ${subscription.id} for event "${params.event}"...`);
|
|
68
|
-
|
|
68
|
+
subscription.removeAllListeners();
|
|
69
69
|
this.subscriptions.delete(key);
|
|
70
|
+
await subscription.unsubscribe();
|
|
70
71
|
};
|
|
71
72
|
new Promise((resolve) => {
|
|
72
73
|
subscription.once('connected', (subscriptionId) => {
|
|
@@ -85,14 +86,14 @@ class BlockchainEventsListener extends BaseConnector_js_1.BaseConnector {
|
|
|
85
86
|
onData: params.onData,
|
|
86
87
|
onError: params.onError,
|
|
87
88
|
subscription,
|
|
88
|
-
|
|
89
|
+
unsubscribeAndRemove,
|
|
89
90
|
event: params.event,
|
|
90
91
|
});
|
|
91
92
|
})
|
|
92
93
|
.catch((err) => {
|
|
93
94
|
this.logger.error({ err }, 'Subscription readiness error');
|
|
94
95
|
});
|
|
95
|
-
return
|
|
96
|
+
return unsubscribeAndRemove;
|
|
96
97
|
}
|
|
97
98
|
async resubscribe() {
|
|
98
99
|
if (!this.subscriptions.size) {
|
|
@@ -104,12 +105,12 @@ class BlockchainEventsListener extends BaseConnector_js_1.BaseConnector {
|
|
|
104
105
|
const events = [];
|
|
105
106
|
for (const [, item] of this.subscriptions) {
|
|
106
107
|
try {
|
|
107
|
-
await item.
|
|
108
|
+
await item.unsubscribeAndRemove();
|
|
108
109
|
}
|
|
109
110
|
catch (err) {
|
|
110
111
|
this.logger.error({ err }, 'Failed to unsubscribe');
|
|
111
112
|
}
|
|
112
|
-
events.push(lodash_1.default.omit(item, ['
|
|
113
|
+
events.push(lodash_1.default.omit(item, ['unsubscribeAndRemove', 'subscription']));
|
|
113
114
|
}
|
|
114
115
|
if (events.length) {
|
|
115
116
|
try {
|
|
@@ -132,7 +133,7 @@ class BlockchainEventsListener extends BaseConnector_js_1.BaseConnector {
|
|
|
132
133
|
try {
|
|
133
134
|
for (const [id, item] of this.subscriptions) {
|
|
134
135
|
promises.push({
|
|
135
|
-
unsubscribe: item.
|
|
136
|
+
unsubscribe: item.unsubscribeAndRemove(),
|
|
136
137
|
id,
|
|
137
138
|
event: item.event,
|
|
138
139
|
});
|
|
@@ -242,4 +243,4 @@ class BlockchainEventsListener extends BaseConnector_js_1.BaseConnector {
|
|
|
242
243
|
}
|
|
243
244
|
}
|
|
244
245
|
exports.default = BlockchainEventsListener;
|
|
245
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
246
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"BlockchainEventsListener.js","sourceRoot":"","sources":["../../../src/connectors/BlockchainEventsListener.ts"],"names":[],"mappings":"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"}
|