@super-protocol/sdk-js 3.15.3-beta.0 → 3.15.3-beta.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/certificates/serializer.d.ts +5 -3
- package/dist/cjs/certificates/serializer.js +26 -11
- package/dist/cjs/certificates/types.d.ts +1 -1
- package/dist/cjs/constants.d.ts +1 -0
- package/dist/cjs/constants.js +3 -2
- package/dist/cjs/tee/TeeBlockVerifier.js +3 -3
- package/dist/cjs/utils/helper.d.ts +4 -2
- package/dist/cjs/utils/helper.js +20 -90
- package/dist/mjs/certificates/serializer.d.ts +5 -3
- package/dist/mjs/certificates/serializer.js +26 -11
- package/dist/mjs/certificates/types.d.ts +1 -1
- package/dist/mjs/constants.d.ts +1 -0
- package/dist/mjs/constants.js +2 -1
- package/dist/mjs/tee/TeeBlockVerifier.js +3 -3
- package/dist/mjs/utils/helper.d.ts +4 -2
- package/dist/mjs/utils/helper.js +18 -90
- package/package.json +1 -1
|
@@ -1,11 +1,13 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { BufferedChunkedX509Cert } from './types.js';
|
|
2
|
+
import { ChunkedX509Cert } from '@super-protocol/dto-js';
|
|
2
3
|
export declare const BLOCKCHAIN_CERT_TBS_PARTS: string[];
|
|
3
4
|
export declare class CertificateSerializer {
|
|
4
5
|
static serializeCertChain(certChainPem: string): string;
|
|
5
6
|
static deserializeCertChain(input: string): string;
|
|
6
7
|
static isSerializedCertChain(certChainBase64: string): boolean;
|
|
7
|
-
static serializeForBlockchain(certPem: string):
|
|
8
|
-
static deserializeFromBlockchain(
|
|
8
|
+
static serializeForBlockchain(certPem: string): ChunkedX509Cert;
|
|
9
|
+
static deserializeFromBlockchain(blockchainCert: ChunkedX509Cert): string;
|
|
9
10
|
private static removeLeadingZerosIfNeeded;
|
|
10
11
|
private static getPart;
|
|
12
|
+
static chunkedToBufferedChunkedX509Cert(blockchainCert: ChunkedX509Cert): BufferedChunkedX509Cert;
|
|
11
13
|
}
|
|
@@ -10,6 +10,7 @@ const binary_splitter_js_1 = require("./binary-splitter.js");
|
|
|
10
10
|
const helper_js_1 = require("./helper.js");
|
|
11
11
|
const constants_js_1 = require("../constants.js");
|
|
12
12
|
const pki_common_1 = require("@super-protocol/pki-common");
|
|
13
|
+
const helper_js_2 = require("../utils/helper.js");
|
|
13
14
|
const CERTS_CHAIN_DELIMITER = ';';
|
|
14
15
|
const CERTS_SERIALIZATION_PREFIX = 'certs:';
|
|
15
16
|
exports.BLOCKCHAIN_CERT_TBS_PARTS = [
|
|
@@ -69,18 +70,19 @@ class CertificateSerializer {
|
|
|
69
70
|
throw new Error(`Unexpected serialized parts found in certificate: ${serializedParts.map((part) => part.name || part.oid).join(', ')}`);
|
|
70
71
|
}
|
|
71
72
|
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,
|
|
73
|
+
nonSerializedParts: nonSerializedParts.map(helper_js_2.toBlockchainHex),
|
|
74
|
+
expirationDate: (0, helper_js_2.toBlockchainHex)(expirationDate.value),
|
|
75
|
+
ca: (0, helper_js_2.toBlockchainHex)(ca.value),
|
|
76
|
+
userData: (0, helper_js_2.toBlockchainHex)(userData?.value),
|
|
77
|
+
serialNumber: (0, helper_js_2.toBlockchainHex)(serial.value),
|
|
78
|
+
signature: (0, helper_js_2.toBlockchainHex)(signature.value),
|
|
79
|
+
publicKey: (0, helper_js_2.toBlockchainHex)(publicKey.value),
|
|
80
|
+
mrEnclave: (0, helper_js_2.toBlockchainHex)(mrEnclave?.value),
|
|
81
|
+
mrSigner: (0, helper_js_2.toBlockchainHex)(mrSigner?.value),
|
|
81
82
|
};
|
|
82
83
|
}
|
|
83
|
-
static deserializeFromBlockchain(
|
|
84
|
+
static deserializeFromBlockchain(blockchainCert) {
|
|
85
|
+
const data = CertificateSerializer.chunkedToBufferedChunkedX509Cert(blockchainCert);
|
|
84
86
|
const bufferParts = [];
|
|
85
87
|
bufferParts.push(Buffer.from(data.nonSerializedParts[0]));
|
|
86
88
|
bufferParts.push(Buffer.from(data.nonSerializedParts[1]));
|
|
@@ -124,6 +126,19 @@ class CertificateSerializer {
|
|
|
124
126
|
}
|
|
125
127
|
return part;
|
|
126
128
|
}
|
|
129
|
+
static chunkedToBufferedChunkedX509Cert(blockchainCert) {
|
|
130
|
+
return {
|
|
131
|
+
nonSerializedParts: blockchainCert.nonSerializedParts.map((part) => (0, helper_js_2.fromBlockchainHex)(part)),
|
|
132
|
+
expirationDate: (0, helper_js_2.fromBlockchainHex)(blockchainCert.expirationDate),
|
|
133
|
+
ca: (0, helper_js_2.fromBlockchainHex)(blockchainCert.ca),
|
|
134
|
+
userData: (0, helper_js_2.fromBlockchainHexOptional)(blockchainCert.userData),
|
|
135
|
+
publicKey: (0, helper_js_2.fromBlockchainHex)(blockchainCert.publicKey),
|
|
136
|
+
serialNumber: (0, helper_js_2.fromBlockchainHex)(blockchainCert.serialNumber),
|
|
137
|
+
mrEnclave: (0, helper_js_2.fromBlockchainHexOptional)(blockchainCert.mrEnclave),
|
|
138
|
+
mrSigner: (0, helper_js_2.fromBlockchainHexOptional)(blockchainCert.mrSigner),
|
|
139
|
+
signature: (0, helper_js_2.fromBlockchainHex)(blockchainCert.signature),
|
|
140
|
+
};
|
|
141
|
+
}
|
|
127
142
|
}
|
|
128
143
|
exports.CertificateSerializer = CertificateSerializer;
|
|
129
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
144
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"serializer.js","sourceRoot":"","sources":["../../../src/certificates/serializer.ts"],"names":[],"mappings":"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"}
|
|
@@ -70,7 +70,7 @@ export type ParsedCert = {
|
|
|
70
70
|
authorityKeyIdentifier?: string;
|
|
71
71
|
subjectKeyIdentifier?: string;
|
|
72
72
|
};
|
|
73
|
-
export type
|
|
73
|
+
export type BufferedChunkedX509Cert = {
|
|
74
74
|
nonSerializedParts: Uint8Array[];
|
|
75
75
|
expirationDate: Uint8Array;
|
|
76
76
|
ca: Uint8Array;
|
package/dist/cjs/constants.d.ts
CHANGED
|
@@ -27,6 +27,7 @@ export declare const AMOY_TX_GAS_LIMIT: bigint;
|
|
|
27
27
|
export declare const DEFAULT_OFFER_VERSION = 0;
|
|
28
28
|
export declare const HTTPS_PORT = 443;
|
|
29
29
|
export declare const ZERO_HASH: Hash;
|
|
30
|
+
export declare const ZERO32_HEX = "0x0000000000000000000000000000000000000000000000000000000000000000";
|
|
30
31
|
export declare const TEE_LOADER_TRUSTED_MRSIGNER = "4a5cb479b8a30fa3821b88aa29bad04788ea006a9e09925bf3ec36398fc9d64b";
|
|
31
32
|
export declare const TEE_PKI_TRUSTED_MRSIGNER = "34ea7ca88034fe80f209e97cd0f8442f7ba621eb2a5f60393ab05871ae6b979d";
|
|
32
33
|
export declare const OPBNB_MAIN_CHAIN_ID = 204;
|
package/dist/cjs/constants.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.SUPERPROTOCOL_CA = exports.OID_OCSP_NONCE = exports.OID_OCSP_ISSUER_ACCESS_METHOD = exports.OID_OCSP_ACCESS_METHOD = exports.OID_CRL_DISTRIBUTION_POINTS = exports.OID_AUTHORITY_INFORMATION_ACCESS_EXTENSION = exports.OID_CUSTOM_EXTENSION_USER_DATA = exports.OID_CUSTOM_EXTENSION_ORDER_REPORT_WORKLOAD_INFO_HASH = exports.OID_CUSTOM_EXTENSION_ORDER_REPORT_SIGNATURE_KEY_HASH = exports.OID_CUSTOM_EXTENSION_ORDER_REPORT_HARDWARE_CONTEXT = exports.OID_CUSTOM_EXTENSION_ORDER_REPORT = exports.TEE_LOADER_TRUSTED_CERTIFICATE = exports.OPBNB_MAX_PRIORITY_FEE_PER_GAS = exports.OPBNB_TX_GAS_LIMIT = exports.OPBNB_TEST_CHAIN_ID = exports.OPBNB_MAIN_CHAIN_ID = exports.TEE_PKI_TRUSTED_MRSIGNER = exports.TEE_LOADER_TRUSTED_MRSIGNER = exports.ZERO_HASH = exports.HTTPS_PORT = exports.DEFAULT_OFFER_VERSION = exports.AMOY_TX_GAS_LIMIT = exports.AMOY_TX_COST_LIMIT = exports.OCSP_URL = exports.POLYGON_MAIN_GASSTATION_URL = exports.POLYGON_AMOY_GASSTATION_URL = exports.POLYGON_AMOY_CHAIN_ID = exports.POLYGON_MAIN_CHAIN_ID = exports.MAX_RPC_BATCH_SIZE = exports.BLOCKCHAIN_BATCH_REQUEST_TIMEOUT = exports.TRANSACTION_RETRY_ATTEMPTS = exports.BLOCKCHAIN_CALL_RETRY_INTERVAL = exports.BLOCKCHAIN_CALL_RETRY_ATTEMPTS = exports.POLYGON_MATIC_EVENT_PATH = exports.BLOCK_SIZE_TO_FETCH_TRANSACTION = exports.FIVE_MINUTES = exports.ONE_HOUR = exports.ONE_DAY = exports.txIntervalMs = exports.txConcurrency = exports.defaultMaxPriorityFeePerGasMultiplier = exports.defaultMaxFeePerGasMultiplier = exports.defaultGasLimitMultiplier = exports.defaultGasPrice = exports.defaultGasLimit = exports.defaultBlockchainUrl = void 0;
|
|
3
|
+
exports.SUPERPROTOCOL_CA = exports.OID_OCSP_NONCE = exports.OID_OCSP_ISSUER_ACCESS_METHOD = exports.OID_OCSP_ACCESS_METHOD = exports.OID_CRL_DISTRIBUTION_POINTS = exports.OID_AUTHORITY_INFORMATION_ACCESS_EXTENSION = exports.OID_CUSTOM_EXTENSION_USER_DATA = exports.OID_CUSTOM_EXTENSION_ORDER_REPORT_WORKLOAD_INFO_HASH = exports.OID_CUSTOM_EXTENSION_ORDER_REPORT_SIGNATURE_KEY_HASH = exports.OID_CUSTOM_EXTENSION_ORDER_REPORT_HARDWARE_CONTEXT = exports.OID_CUSTOM_EXTENSION_ORDER_REPORT = exports.TEE_LOADER_TRUSTED_CERTIFICATE = exports.OPBNB_MAX_PRIORITY_FEE_PER_GAS = exports.OPBNB_TX_GAS_LIMIT = exports.OPBNB_TEST_CHAIN_ID = exports.OPBNB_MAIN_CHAIN_ID = exports.TEE_PKI_TRUSTED_MRSIGNER = exports.TEE_LOADER_TRUSTED_MRSIGNER = exports.ZERO32_HEX = exports.ZERO_HASH = exports.HTTPS_PORT = exports.DEFAULT_OFFER_VERSION = exports.AMOY_TX_GAS_LIMIT = exports.AMOY_TX_COST_LIMIT = exports.OCSP_URL = exports.POLYGON_MAIN_GASSTATION_URL = exports.POLYGON_AMOY_GASSTATION_URL = exports.POLYGON_AMOY_CHAIN_ID = exports.POLYGON_MAIN_CHAIN_ID = exports.MAX_RPC_BATCH_SIZE = exports.BLOCKCHAIN_BATCH_REQUEST_TIMEOUT = exports.TRANSACTION_RETRY_ATTEMPTS = exports.BLOCKCHAIN_CALL_RETRY_INTERVAL = exports.BLOCKCHAIN_CALL_RETRY_ATTEMPTS = exports.POLYGON_MATIC_EVENT_PATH = exports.BLOCK_SIZE_TO_FETCH_TRANSACTION = exports.FIVE_MINUTES = exports.ONE_HOUR = exports.ONE_DAY = exports.txIntervalMs = exports.txConcurrency = exports.defaultMaxPriorityFeePerGasMultiplier = exports.defaultMaxFeePerGasMultiplier = exports.defaultGasLimitMultiplier = exports.defaultGasPrice = exports.defaultGasLimit = exports.defaultBlockchainUrl = void 0;
|
|
4
4
|
const dto_js_1 = require("@super-protocol/dto-js");
|
|
5
5
|
exports.defaultBlockchainUrl = 'http://127.0.0.1:8545';
|
|
6
6
|
exports.defaultGasLimit = BigInt(7000000);
|
|
@@ -34,6 +34,7 @@ exports.ZERO_HASH = {
|
|
|
34
34
|
algo: dto_js_1.HashAlgorithm.SHA256,
|
|
35
35
|
encoding: dto_js_1.Encoding.base64,
|
|
36
36
|
};
|
|
37
|
+
exports.ZERO32_HEX = '0x0000000000000000000000000000000000000000000000000000000000000000';
|
|
37
38
|
exports.TEE_LOADER_TRUSTED_MRSIGNER = '4a5cb479b8a30fa3821b88aa29bad04788ea006a9e09925bf3ec36398fc9d64b';
|
|
38
39
|
exports.TEE_PKI_TRUSTED_MRSIGNER = '34ea7ca88034fe80f209e97cd0f8442f7ba621eb2a5f60393ab05871ae6b979d';
|
|
39
40
|
// opBNB Network Constants
|
|
@@ -441,4 +442,4 @@ OVFXeEhSQXZaVUdPZFJRN2N2cVJYYXFJPQotLS0tLUVORCBDRVJUSUZJQ0FURS0t
|
|
|
441
442
|
LS0tCgAwCgYIKoZIzj0EAwIDSAAwRQIgDTaE8oMgfCSqhbOeqnn6FD2ypLS4arzW
|
|
442
443
|
th/G0VQ3e40CIQCEcpjpdAP63KCipYLE1UEmHJOBOvcKNjevt/2O9DkwXA==
|
|
443
444
|
-----END CERTIFICATE-----`;
|
|
444
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
445
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uc3RhbnRzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbnN0YW50cy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSxtREFBdUU7QUFFMUQsUUFBQSxvQkFBb0IsR0FBRyx1QkFBdUIsQ0FBQztBQUMvQyxRQUFBLGVBQWUsR0FBRyxNQUFNLENBQUMsT0FBTyxDQUFDLENBQUM7QUFDbEMsUUFBQSxlQUFlLEdBQUcsTUFBTSxDQUFDLFVBQVUsQ0FBQyxDQUFDO0FBQ3JDLFFBQUEseUJBQXlCLEdBQUcsR0FBRyxDQUFDO0FBQ2hDLFFBQUEsNkJBQTZCLEdBQUcsQ0FBQyxDQUFDO0FBQ2xDLFFBQUEscUNBQXFDLEdBQUcsR0FBRyxDQUFDO0FBQzVDLFFBQUEsYUFBYSxHQUFHLEVBQUUsQ0FBQztBQUNuQixRQUFBLFlBQVksR0FBRyxFQUFFLENBQUM7QUFDbEIsUUFBQSxPQUFPLEdBQUcsRUFBRSxHQUFHLEVBQUUsR0FBRyxFQUFFLENBQUM7QUFDdkIsUUFBQSxRQUFRLEdBQUcsRUFBRSxHQUFHLEVBQUUsQ0FBQztBQUNuQixRQUFBLFlBQVksR0FBRyxDQUFDLEdBQUcsRUFBRSxDQUFDO0FBQ3RCLFFBQUEsK0JBQStCLEdBQUcsR0FBRyxDQUFDO0FBQ3RDLFFBQUEsd0JBQXdCLEdBQUcsNENBQTRDLENBQUM7QUFDeEUsUUFBQSw4QkFBOEIsR0FBRyxFQUFFLENBQUM7QUFDcEMsUUFBQSw4QkFBOEIsR0FBRyxJQUFJLENBQUM7QUFDdEMsUUFBQSwwQkFBMEIsR0FBRyxDQUFDLENBQUM7QUFDL0IsUUFBQSxnQ0FBZ0MsR0FBRyxLQUFLLENBQUM7QUFDekMsUUFBQSxrQkFBa0IsR0FBRyxJQUFJLENBQUM7QUFDMUIsUUFBQSxxQkFBcUIsR0FBRyxHQUFHLENBQUM7QUFDNUIsUUFBQSxxQkFBcUIsR0FBRyxLQUFLLENBQUM7QUFDOUIsUUFBQSwyQkFBMkIsR0FBRyw0Q0FBNEMsQ0FBQztBQUMzRSxRQUFBLDJCQUEyQixH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
|
|
@@ -11,7 +11,6 @@ const index_js_1 = require("../certificates/index.js");
|
|
|
11
11
|
const TeeCertificateService_js_1 = require("./TeeCertificateService.js");
|
|
12
12
|
const index_js_2 = require("../utils/helpers/index.js");
|
|
13
13
|
const constants_js_1 = require("../constants.js");
|
|
14
|
-
const helper_js_1 = require("../utils/helper.js");
|
|
15
14
|
class TeeBlockVerifier {
|
|
16
15
|
static verifiedTcbs = new Set();
|
|
17
16
|
static async verifyTcb(tcb, utilityData) {
|
|
@@ -26,7 +25,8 @@ class TeeBlockVerifier {
|
|
|
26
25
|
benchmark: (await Consensus_js_1.default.getBenchmarksByTcbIds([tcb.tcbId], [utilityData.teeOfferId]))[tcb.tcbId],
|
|
27
26
|
};
|
|
28
27
|
const { certsChain } = await tcb.get();
|
|
29
|
-
|
|
28
|
+
const certChainPem = certsChain.map(index_js_1.CertificateSerializer.deserializeFromBlockchain).join('\n');
|
|
29
|
+
await TeeBlockVerifier.verifyWithCertificates(certChainPem, signedTcbData);
|
|
30
30
|
// update cache
|
|
31
31
|
this.verifiedTcbs.add(tcb.tcbId);
|
|
32
32
|
if (this.verifiedTcbs.size > config_js_1.config.TLB_CACHE_SIZE) {
|
|
@@ -51,4 +51,4 @@ class TeeBlockVerifier {
|
|
|
51
51
|
}
|
|
52
52
|
}
|
|
53
53
|
exports.TeeBlockVerifier = TeeBlockVerifier;
|
|
54
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
54
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVGVlQmxvY2tWZXJpZmllci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy90ZWUvVGVlQmxvY2tWZXJpZmllci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSw2REFBa0M7QUFDbEMsNENBQXNDO0FBR3RDLGdGQUFxRDtBQUNyRCx1REFBcUY7QUFDckYseUVBQW1FO0FBQ25FLHdEQUFnRTtBQUNoRSxrREFBaUU7QUFTakUsTUFBYSxnQkFBZ0I7SUFDbkIsTUFBTSxDQUFVLFlBQVksR0FBc0IsSUFBSSxHQUFHLEVBQUUsQ0FBQztJQUVwRSxNQUFNLENBQUMsS0FBSyxDQUFDLFNBQVMsQ0FBQyxHQUFRLEVBQUUsV0FBMkI7UUFDMUQsY0FBYztRQUNkLElBQUksSUFBSSxDQUFDLFlBQVksQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUM7WUFDckMsbUJBQU0sQ0FBQyxLQUFLLENBQUMsWUFBWSxHQUFHLENBQUMsS0FBSyxxQkFBcUIsQ0FBQyxDQUFDO1lBQ3pELE9BQU87UUFDVCxDQUFDO1FBRUQsTUFBTSxhQUFhLEdBQUc7WUFDcEIsVUFBVSxFQUFFLFdBQVcsQ0FBQyxVQUFVLENBQUMsUUFBUSxFQUFFO1lBQzdDLE1BQU0sRUFBRSxXQUFXLENBQUMsTUFBTTtZQUMxQixTQUFTLEVBQUUsQ0FBQyxNQUFNLHNCQUFTLENBQUMscUJBQXFCLENBQUMsQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQyxXQUFXLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQyxDQUN2RixHQUFHLENBQUMsS0FBSyxDQUNWO1NBQ0YsQ0FBQztRQUVGLE1BQU0sRUFBRSxVQUFVLEVBQUUsR0FBRyxNQUFNLEdBQUcsQ0FBQyxHQUFHLEVBQUUsQ0FBQztRQUN2QyxNQUFNLFlBQVksR0FBRyxVQUFVLENBQUMsR0FBRyxDQUFDLGdDQUFxQixDQUFDLHlCQUF5QixDQUFDLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ2hHLE1BQU0sZ0JBQWdCLENBQUMsc0JBQXNCLENBQUMsWUFBWSxFQUFFLGFBQWEsQ0FBQyxDQUFDO1FBRTNFLGVBQWU7UUFDZixJQUFJLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDakMsSUFBSSxJQUFJLENBQUMsWUFBWSxDQUFDLElBQUksR0FBRyxrQkFBTSxDQUFDLGNBQWMsRUFBRSxDQUFDO1lBQ25ELE1BQU0sQ0FBQyxLQUFLLENBQUMsR0FBRyxJQUFJLENBQUMsWUFBWSxDQUFDLE9BQU8sRUFBRSxDQUFDLElBQUksRUFBRSxDQUFDLEtBQXlCLENBQUM7WUFDN0UsSUFBSSxDQUFDLFlBQVksQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUM7WUFDaEMsbUJBQU0sQ0FBQyxLQUFLLENBQ1YsS0FBSyxFQUNMLFlBQVksS0FBSyx3Q0FBd0MsSUFBSSxDQUFDLFlBQVksQ0FBQyxJQUFJLGtCQUFrQixrQkFBTSxDQUFDLGNBQWMsRUFBRSxDQUN6SCxDQUFDO1FBQ0osQ0FBQztRQUNELG1CQUFNLENBQUMsS0FBSyxDQUNWLEdBQUcsQ0FBQyxLQUFLLEVBQ1QsWUFBWSxHQUFHLENBQUMsS0FBSyxvQ0FBb0MsSUFBSSxDQUFDLFlBQVksQ0FBQyxJQUFJLGtCQUFrQixrQkFBTSxDQUFDLGNBQWMsRUFBRSxDQUN6SCxDQUFDO0lBQ0osQ0FBQztJQUVPLE1BQU0sQ0FBQyxLQUFLLENBQUMsc0JBQXNCLENBQ3pDLEtBQWEsRUFDYixhQUFzQjtRQUV0QixNQUFNLFNBQVMsR0FBRyxnQ0FBcUIsQ0FBQyxvQkFBb0IsQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUNwRSxNQUFNLGdEQUFxQixDQUFDLDBCQUEwQixDQUFDLFNBQVMsQ0FBQyxDQUFDO1FBRWxFLE1BQU0sb0JBQW9CLEdBQUcsNkJBQWtCLENBQUMsaUJBQWlCLENBQy9ELFNBQVMsRUFDVCw2Q0FBOEIsQ0FDL0IsQ0FBQztRQUNGLElBQUksQ0FBQyxvQkFBb0IsRUFBRSxDQUFDO1lBQzFCLE1BQU0sSUFBSSxLQUFLLENBQUMsdURBQXVELENBQUMsQ0FBQztRQUMzRSxDQUFDO1FBRUQsTUFBTSxnQkFBZ0IsR0FBRyxJQUFBLDhCQUFtQixFQUFDLGFBQWEsQ0FBQyxDQUFDO1FBQzVELE1BQU0sc0JBQXNCLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxJQUFJLEVBQUUsZ0JBQWdCLENBQUMsUUFBUSxDQUFDLENBQUM7UUFDN0YsSUFBSSxNQUFNLENBQUMsT0FBTyxDQUFDLG9CQUFvQixFQUFFLHNCQUFzQixDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUM7WUFDdkUsTUFBTSxJQUFJLEtBQUssQ0FBQyx1Q0FBdUMsQ0FBQyxDQUFDO1FBQzNELENBQUM7SUFDSCxDQUFDOztBQTFESCw0Q0EyREMifQ==
|
|
@@ -2,7 +2,7 @@ import { TransactionOptions } from '../types/Web3.js';
|
|
|
2
2
|
import Web3, { JsonRpcOptionalRequest } from 'web3';
|
|
3
3
|
import { SlotInfo } from '../types/SlotInfo.js';
|
|
4
4
|
import { ConsensusBenchmarkStorage, LoaderSecretAccessPublicKey, LoaderSession, OfferResource, OfferStorageAllocated, OfferStorageRequest, OptionInfo, OptionInfoRaw, OrderUsage, OrderUsageRaw, SecretRequest, SlotUsage, TeeOfferOption, TeeOfferOptionRaw, TeeOfferSlot, ValueOfferSlot, ValueOfferSlotRaw, ConsensusBenchmarkPriceMultipliers, OfferVersion, OfferVersionInfo, OfferVersionInfoRaw, OfferVersionRaw, TeeOfferInfo, TeeOfferInfoRaw, HardwareInfoRaw, HardwareInfo, OfferInfoRaw, OfferInfo, ValueOfferRestrictionsSpecification, OfferType, OfferGroup, Origins } from '../types/index.js';
|
|
5
|
-
import { BenchmarkInfo,
|
|
5
|
+
import { BenchmarkInfo, ConsensusBenchmark } from '@super-protocol/dto-js';
|
|
6
6
|
import { BatchResponse, BatchResponseSuccess, ExecuteBatchOptions } from './types.js';
|
|
7
7
|
/**
|
|
8
8
|
* Function for checking if provider action account initialized (required for set methods)
|
|
@@ -58,7 +58,6 @@ export declare function formatPriceMultipliers(priceMultipliers: ConsensusBenchm
|
|
|
58
58
|
export declare function formatBenchmarks(benchmarks: ConsensusBenchmarkStorage[]): ConsensusBenchmark[];
|
|
59
59
|
export declare function formatBenchmark(benchmark: ConsensusBenchmarkStorage): ConsensusBenchmark;
|
|
60
60
|
export declare function formatBenchmarkTo(benchmark: ConsensusBenchmark): ConsensusBenchmarkStorage;
|
|
61
|
-
export declare function formatCertsChain(certsChain: ChunkedX509Cert[]): string;
|
|
62
61
|
export declare function formatUsage(usage: SlotUsage): SlotUsage;
|
|
63
62
|
export declare function convertOrderUsage(usage: OrderUsageRaw, slotInfo: SlotInfo, slotUsage: SlotUsage): OrderUsage;
|
|
64
63
|
export declare function convertOptionInfoFromRaw(optionInfo: OptionInfoRaw): OptionInfo;
|
|
@@ -74,3 +73,6 @@ export declare function executeBatchAsync<T>(requests: JsonRpcOptionalRequest[],
|
|
|
74
73
|
export declare function executeBatchAsync<T>(requests: JsonRpcOptionalRequest[], options?: ExecuteBatchOptions): Promise<BatchResponse<T>[]>;
|
|
75
74
|
export declare const preparePrivateKey: (pk: string) => string;
|
|
76
75
|
export declare const isIpAddress: (host: string) => boolean;
|
|
76
|
+
export declare const fromBlockchainHexOptional: (hex?: string) => Uint8Array | undefined;
|
|
77
|
+
export declare const fromBlockchainHex: (hex: string) => Uint8Array;
|
|
78
|
+
export declare const toBlockchainHex: (u?: Uint8Array) => string;
|
package/dist/cjs/utils/helper.js
CHANGED
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.isIpAddress = exports.preparePrivateKey = exports.executeBatchAsync = exports.transformComplexObject = exports.cleanWeb3Data = exports.isValidBytes32Hex = exports.packSlotInfo = exports.unpackSlotInfo = exports.convertOptionInfoToRaw = exports.convertOptionInfoFromRaw = exports.convertOrderUsage = exports.formatUsage = exports.
|
|
6
|
+
exports.toBlockchainHex = exports.fromBlockchainHex = exports.fromBlockchainHexOptional = exports.isIpAddress = exports.preparePrivateKey = exports.executeBatchAsync = exports.transformComplexObject = exports.cleanWeb3Data = exports.isValidBytes32Hex = exports.packSlotInfo = exports.unpackSlotInfo = exports.convertOptionInfoToRaw = exports.convertOptionInfoFromRaw = exports.convertOrderUsage = exports.formatUsage = exports.formatBenchmarkTo = exports.formatBenchmark = exports.formatBenchmarks = exports.formatPriceMultipliers = exports.createBenchmarkInfo = exports.formatOfferSlot = exports.formatTeeOfferSlot = exports.formatEpochIndexes = exports.convertValueOfferInfo = exports.convertTeeOfferInfo = exports.convertHardwareInfo = exports.convertOfferVersion = exports.convertOfferVersionInfo = exports.convertOrigins = exports.convertOfferStorageRequestFromRaw = exports.convertOfferStorageAllocatedFromRaw = exports.convertSecretRequestFromRaw = exports.convertOfferResourceFromRaw = exports.convertLoaderSessionFromRaw = exports.convertLoaderSecretAccessPublicKeyFromRaw = exports.convertTeeOfferOptionFromRaw = exports.convertBigIntToString = exports.incrementMethodCall = exports.isNodeJS = exports.createTransactionOptions = exports.getGasLimitForNetwork = exports.multiplyBigIntByNumber = exports.getMaxPriorityFeePerGas = exports.getBaseBlockFee = exports.checkForUsingExternalTxManager = exports.checkIfActionAccountInitialized = void 0;
|
|
7
7
|
const lodash_1 = __importDefault(require("lodash"));
|
|
8
8
|
const store_js_1 = __importDefault(require("../store.js"));
|
|
9
9
|
const web3_1 = __importDefault(require("web3"));
|
|
@@ -408,94 +408,6 @@ function formatBenchmarkTo(benchmark) {
|
|
|
408
408
|
};
|
|
409
409
|
}
|
|
410
410
|
exports.formatBenchmarkTo = formatBenchmarkTo;
|
|
411
|
-
function formatCertsChain(certsChain) {
|
|
412
|
-
const zeroHash = '0x0000000000000000000000000000000000000000000000000000000000000000';
|
|
413
|
-
const formattedCertsChain = certsChain.map((cert) => {
|
|
414
|
-
let packedData = web3_1.default.utils.encodePacked({
|
|
415
|
-
type: 'bytes',
|
|
416
|
-
value: cert.nonSerializedParts[0],
|
|
417
|
-
}, {
|
|
418
|
-
type: 'bytes',
|
|
419
|
-
value: cert.nonSerializedParts[1],
|
|
420
|
-
}, {
|
|
421
|
-
type: 'bytes',
|
|
422
|
-
value: cert.serialNumber,
|
|
423
|
-
}, {
|
|
424
|
-
type: 'bytes',
|
|
425
|
-
value: cert.nonSerializedParts[2],
|
|
426
|
-
}, {
|
|
427
|
-
type: 'bytes',
|
|
428
|
-
value: cert.expirationDate,
|
|
429
|
-
}, {
|
|
430
|
-
type: 'bytes',
|
|
431
|
-
value: cert.nonSerializedParts[3],
|
|
432
|
-
}, {
|
|
433
|
-
type: 'bytes',
|
|
434
|
-
value: cert.publicKey,
|
|
435
|
-
}, {
|
|
436
|
-
type: 'bytes',
|
|
437
|
-
value: cert.nonSerializedParts[4],
|
|
438
|
-
}, {
|
|
439
|
-
type: 'bytes',
|
|
440
|
-
value: cert.ca,
|
|
441
|
-
});
|
|
442
|
-
let index = 5;
|
|
443
|
-
if (cert.userData != zeroHash) {
|
|
444
|
-
packedData = web3_1.default.utils.encodePacked({
|
|
445
|
-
type: 'bytes',
|
|
446
|
-
value: packedData,
|
|
447
|
-
}, {
|
|
448
|
-
type: 'bytes',
|
|
449
|
-
value: cert.nonSerializedParts[5],
|
|
450
|
-
}, {
|
|
451
|
-
type: 'bytes32',
|
|
452
|
-
value: cert.userData,
|
|
453
|
-
});
|
|
454
|
-
index++;
|
|
455
|
-
}
|
|
456
|
-
if (cert.mrEnclave != zeroHash) {
|
|
457
|
-
packedData = web3_1.default.utils.encodePacked({
|
|
458
|
-
type: 'bytes',
|
|
459
|
-
value: packedData,
|
|
460
|
-
}, {
|
|
461
|
-
type: 'bytes',
|
|
462
|
-
value: cert.nonSerializedParts[index],
|
|
463
|
-
}, {
|
|
464
|
-
type: 'bytes32',
|
|
465
|
-
value: cert.mrEnclave,
|
|
466
|
-
});
|
|
467
|
-
index++;
|
|
468
|
-
}
|
|
469
|
-
if (cert.mrSigner != zeroHash) {
|
|
470
|
-
packedData = web3_1.default.utils.encodePacked({
|
|
471
|
-
type: 'bytes',
|
|
472
|
-
value: packedData,
|
|
473
|
-
}, {
|
|
474
|
-
type: 'bytes',
|
|
475
|
-
value: cert.nonSerializedParts[index],
|
|
476
|
-
}, {
|
|
477
|
-
type: 'bytes32',
|
|
478
|
-
value: cert.mrSigner,
|
|
479
|
-
});
|
|
480
|
-
index++;
|
|
481
|
-
}
|
|
482
|
-
if (index < cert.nonSerializedParts.length - 2) {
|
|
483
|
-
packedData = web3_1.default.utils.encodePacked({
|
|
484
|
-
type: 'bytes',
|
|
485
|
-
value: packedData,
|
|
486
|
-
}, {
|
|
487
|
-
type: 'bytes',
|
|
488
|
-
value: cert.nonSerializedParts[index],
|
|
489
|
-
});
|
|
490
|
-
}
|
|
491
|
-
return {
|
|
492
|
-
type: 'bytes',
|
|
493
|
-
value: packedData,
|
|
494
|
-
};
|
|
495
|
-
});
|
|
496
|
-
return web3_1.default.utils.encodePacked(...formattedCertsChain);
|
|
497
|
-
}
|
|
498
|
-
exports.formatCertsChain = formatCertsChain;
|
|
499
411
|
function formatUsage(usage) {
|
|
500
412
|
return {
|
|
501
413
|
priceType: usage.priceType.toString(),
|
|
@@ -662,4 +574,22 @@ const isIpAddress = (host) => {
|
|
|
662
574
|
return Boolean(host.match(/^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/));
|
|
663
575
|
};
|
|
664
576
|
exports.isIpAddress = isIpAddress;
|
|
665
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"helper.js","sourceRoot":"","sources":["../../../src/utils/helper.ts"],"names":[],"mappings":"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"}
|
|
577
|
+
const fromBlockchainHexOptional = (hex) => {
|
|
578
|
+
const cleaned = hex?.startsWith('0x') ? hex.slice(2) : hex;
|
|
579
|
+
if (!cleaned || hex === constants_js_1.ZERO32_HEX)
|
|
580
|
+
return;
|
|
581
|
+
return new Uint8Array(Buffer.from(cleaned, 'hex'));
|
|
582
|
+
};
|
|
583
|
+
exports.fromBlockchainHexOptional = fromBlockchainHexOptional;
|
|
584
|
+
const fromBlockchainHex = (hex) => {
|
|
585
|
+
const converted = (0, exports.fromBlockchainHexOptional)(hex);
|
|
586
|
+
return converted ? converted : new Uint8Array();
|
|
587
|
+
};
|
|
588
|
+
exports.fromBlockchainHex = fromBlockchainHex;
|
|
589
|
+
const toBlockchainHex = (u) => {
|
|
590
|
+
if (!u || u.length === 0)
|
|
591
|
+
return constants_js_1.ZERO32_HEX;
|
|
592
|
+
return '0x' + Buffer.from(u).toString('hex');
|
|
593
|
+
};
|
|
594
|
+
exports.toBlockchainHex = toBlockchainHex;
|
|
595
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"helper.js","sourceRoot":"","sources":["../../../src/utils/helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,13 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { BufferedChunkedX509Cert } from './types.js';
|
|
2
|
+
import { ChunkedX509Cert } from '@super-protocol/dto-js';
|
|
2
3
|
export declare const BLOCKCHAIN_CERT_TBS_PARTS: string[];
|
|
3
4
|
export declare class CertificateSerializer {
|
|
4
5
|
static serializeCertChain(certChainPem: string): string;
|
|
5
6
|
static deserializeCertChain(input: string): string;
|
|
6
7
|
static isSerializedCertChain(certChainBase64: string): boolean;
|
|
7
|
-
static serializeForBlockchain(certPem: string):
|
|
8
|
-
static deserializeFromBlockchain(
|
|
8
|
+
static serializeForBlockchain(certPem: string): ChunkedX509Cert;
|
|
9
|
+
static deserializeFromBlockchain(blockchainCert: ChunkedX509Cert): string;
|
|
9
10
|
private static removeLeadingZerosIfNeeded;
|
|
10
11
|
private static getPart;
|
|
12
|
+
static chunkedToBufferedChunkedX509Cert(blockchainCert: ChunkedX509Cert): BufferedChunkedX509Cert;
|
|
11
13
|
}
|
|
@@ -4,6 +4,7 @@ import { CertificateBinarySplitter, CertificateNonOidParts } from './binary-spli
|
|
|
4
4
|
import { CertificatesHelper } from './helper.js';
|
|
5
5
|
import { OID_CUSTOM_EXTENSION_USER_DATA } from '../constants.js';
|
|
6
6
|
import { OID_CUSTOM_EXTENSION_CHALLENGE_COMMON_ID, OID_CUSTOM_EXTENSION_CHALLENGE_ID, } from '@super-protocol/pki-common';
|
|
7
|
+
import { fromBlockchainHex, fromBlockchainHexOptional, toBlockchainHex } from '../utils/helper.js';
|
|
7
8
|
const CERTS_CHAIN_DELIMITER = ';';
|
|
8
9
|
const CERTS_SERIALIZATION_PREFIX = 'certs:';
|
|
9
10
|
export const BLOCKCHAIN_CERT_TBS_PARTS = [
|
|
@@ -63,18 +64,19 @@ export class CertificateSerializer {
|
|
|
63
64
|
throw new Error(`Unexpected serialized parts found in certificate: ${serializedParts.map((part) => part.name || part.oid).join(', ')}`);
|
|
64
65
|
}
|
|
65
66
|
return {
|
|
66
|
-
nonSerializedParts,
|
|
67
|
-
expirationDate: expirationDate.value,
|
|
68
|
-
ca: ca.value,
|
|
69
|
-
userData: userData?.value,
|
|
70
|
-
serialNumber: serial.value,
|
|
71
|
-
signature: signature.value,
|
|
72
|
-
publicKey: publicKey.value,
|
|
73
|
-
mrEnclave: mrEnclave?.value,
|
|
74
|
-
mrSigner: mrSigner?.value,
|
|
67
|
+
nonSerializedParts: nonSerializedParts.map(toBlockchainHex),
|
|
68
|
+
expirationDate: toBlockchainHex(expirationDate.value),
|
|
69
|
+
ca: toBlockchainHex(ca.value),
|
|
70
|
+
userData: toBlockchainHex(userData?.value),
|
|
71
|
+
serialNumber: toBlockchainHex(serial.value),
|
|
72
|
+
signature: toBlockchainHex(signature.value),
|
|
73
|
+
publicKey: toBlockchainHex(publicKey.value),
|
|
74
|
+
mrEnclave: toBlockchainHex(mrEnclave?.value),
|
|
75
|
+
mrSigner: toBlockchainHex(mrSigner?.value),
|
|
75
76
|
};
|
|
76
77
|
}
|
|
77
|
-
static deserializeFromBlockchain(
|
|
78
|
+
static deserializeFromBlockchain(blockchainCert) {
|
|
79
|
+
const data = CertificateSerializer.chunkedToBufferedChunkedX509Cert(blockchainCert);
|
|
78
80
|
const bufferParts = [];
|
|
79
81
|
bufferParts.push(Buffer.from(data.nonSerializedParts[0]));
|
|
80
82
|
bufferParts.push(Buffer.from(data.nonSerializedParts[1]));
|
|
@@ -118,5 +120,18 @@ export class CertificateSerializer {
|
|
|
118
120
|
}
|
|
119
121
|
return part;
|
|
120
122
|
}
|
|
123
|
+
static chunkedToBufferedChunkedX509Cert(blockchainCert) {
|
|
124
|
+
return {
|
|
125
|
+
nonSerializedParts: blockchainCert.nonSerializedParts.map((part) => fromBlockchainHex(part)),
|
|
126
|
+
expirationDate: fromBlockchainHex(blockchainCert.expirationDate),
|
|
127
|
+
ca: fromBlockchainHex(blockchainCert.ca),
|
|
128
|
+
userData: fromBlockchainHexOptional(blockchainCert.userData),
|
|
129
|
+
publicKey: fromBlockchainHex(blockchainCert.publicKey),
|
|
130
|
+
serialNumber: fromBlockchainHex(blockchainCert.serialNumber),
|
|
131
|
+
mrEnclave: fromBlockchainHexOptional(blockchainCert.mrEnclave),
|
|
132
|
+
mrSigner: fromBlockchainHexOptional(blockchainCert.mrSigner),
|
|
133
|
+
signature: fromBlockchainHex(blockchainCert.signature),
|
|
134
|
+
};
|
|
135
|
+
}
|
|
121
136
|
}
|
|
122
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
137
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"serializer.js","sourceRoot":"","sources":["../../../src/certificates/serializer.ts"],"names":[],"mappings":"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"}
|
|
@@ -70,7 +70,7 @@ export type ParsedCert = {
|
|
|
70
70
|
authorityKeyIdentifier?: string;
|
|
71
71
|
subjectKeyIdentifier?: string;
|
|
72
72
|
};
|
|
73
|
-
export type
|
|
73
|
+
export type BufferedChunkedX509Cert = {
|
|
74
74
|
nonSerializedParts: Uint8Array[];
|
|
75
75
|
expirationDate: Uint8Array;
|
|
76
76
|
ca: Uint8Array;
|
package/dist/mjs/constants.d.ts
CHANGED
|
@@ -27,6 +27,7 @@ export declare const AMOY_TX_GAS_LIMIT: bigint;
|
|
|
27
27
|
export declare const DEFAULT_OFFER_VERSION = 0;
|
|
28
28
|
export declare const HTTPS_PORT = 443;
|
|
29
29
|
export declare const ZERO_HASH: Hash;
|
|
30
|
+
export declare const ZERO32_HEX = "0x0000000000000000000000000000000000000000000000000000000000000000";
|
|
30
31
|
export declare const TEE_LOADER_TRUSTED_MRSIGNER = "4a5cb479b8a30fa3821b88aa29bad04788ea006a9e09925bf3ec36398fc9d64b";
|
|
31
32
|
export declare const TEE_PKI_TRUSTED_MRSIGNER = "34ea7ca88034fe80f209e97cd0f8442f7ba621eb2a5f60393ab05871ae6b979d";
|
|
32
33
|
export declare const OPBNB_MAIN_CHAIN_ID = 204;
|
package/dist/mjs/constants.js
CHANGED
|
@@ -31,6 +31,7 @@ export const ZERO_HASH = {
|
|
|
31
31
|
algo: HashAlgorithm.SHA256,
|
|
32
32
|
encoding: Encoding.base64,
|
|
33
33
|
};
|
|
34
|
+
export const ZERO32_HEX = '0x0000000000000000000000000000000000000000000000000000000000000000';
|
|
34
35
|
export const TEE_LOADER_TRUSTED_MRSIGNER = '4a5cb479b8a30fa3821b88aa29bad04788ea006a9e09925bf3ec36398fc9d64b';
|
|
35
36
|
export const TEE_PKI_TRUSTED_MRSIGNER = '34ea7ca88034fe80f209e97cd0f8442f7ba621eb2a5f60393ab05871ae6b979d';
|
|
36
37
|
// opBNB Network Constants
|
|
@@ -438,4 +439,4 @@ OVFXeEhSQXZaVUdPZFJRN2N2cVJYYXFJPQotLS0tLUVORCBDRVJUSUZJQ0FURS0t
|
|
|
438
439
|
LS0tCgAwCgYIKoZIzj0EAwIDSAAwRQIgDTaE8oMgfCSqhbOeqnn6FD2ypLS4arzW
|
|
439
440
|
th/G0VQ3e40CIQCEcpjpdAP63KCipYLE1UEmHJOBOvcKNjevt/2O9DkwXA==
|
|
440
441
|
-----END CERTIFICATE-----`;
|
|
441
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
442
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uc3RhbnRzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbnN0YW50cy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsUUFBUSxFQUFRLGFBQWEsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRXZFLE1BQU0sQ0FBQyxNQUFNLG9CQUFvQixHQUFHLHVCQUF1QixDQUFDO0FBQzVELE1BQU0sQ0FBQyxNQUFNLGVBQWUsR0FBRyxNQUFNLENBQUMsT0FBTyxDQUFDLENBQUM7QUFDL0MsTUFBTSxDQUFDLE1BQU0sZUFBZSxHQUFHLE1BQU0sQ0FBQyxVQUFVLENBQUMsQ0FBQztBQUNsRCxNQUFNLENBQUMsTUFBTSx5QkFBeUIsR0FBRyxHQUFHLENBQUM7QUFDN0MsTUFBTSxDQUFDLE1BQU0sNkJBQTZCLEdBQUcsQ0FBQyxDQUFDO0FBQy9DLE1BQU0sQ0FBQyxNQUFNLHFDQUFxQyxHQUFHLEdBQUcsQ0FBQztBQUN6RCxNQUFNLENBQUMsTUFBTSxhQUFhLEdBQUcsRUFBRSxDQUFDO0FBQ2hDLE1BQU0sQ0FBQyxNQUFNLFlBQVksR0FBRyxFQUFFLENBQUM7QUFDL0IsTUFBTSxDQUFDLE1BQU0sT0FBTyxHQUFHLEVBQUUsR0FBRyxFQUFFLEdBQUcsRUFBRSxDQUFDO0FBQ3BDLE1BQU0sQ0FBQyxNQUFNLFFBQVEsR0FBRyxFQUFFLEdBQUcsRUFBRSxDQUFDO0FBQ2hDLE1BQU0sQ0FBQyxNQUFNLFlBQVksR0FBRyxDQUFDLEdBQUcsRUFBRSxDQUFDO0FBQ25DLE1BQU0sQ0FBQyxNQUFNLCtCQUErQixHQUFHLEdBQUcsQ0FBQztBQUNuRCxNQUFNLENBQUMsTUFBTSx3QkFBd0IsR0FBRyw0Q0FBNEMsQ0FBQztBQUNyRixNQUFNLENBQUMsTUFBTSw4QkFBOEIsR0FBRyxFQUFFLENBQUM7QUFDakQsTUFBTSxDQUFDLE1BQU0sOEJBQThCLEdBQUcsSUFBSSxDQUFDO0FBQ25ELE1BQU0sQ0FBQyxNQUFNLDBCQUEwQixHQUFHLENBQUMsQ0FBQztBQUM1QyxNQUFNLENBQUMsTUFBTSxnQ0FBZ0MsR0FBRyxLQUFLLENBQUM7QUFDdEQsTUFBTSxDQUFDLE1BQU0sa0JBQWtCLEdBQUcsSUFBSSxDQUFDO0FBQ3ZDLE1BQU0sQ0FBQyxNQUFNLHFCQUFxQixHQUFHLEdBQUcsQ0FBQztBQUN6QyxNQUFNLENBQUMsTUFBTSxxQkFBcUIsR0FBRyxLQUFLLENBQUM7QUFDM0MsTUFBTSxDQUFDLE1BQU0sMkJBQTJCLEdBQUcsNENBQTRDLENBQUM7QUFDeEYsTUFBTSxDQUFDLE1BQU0sMkJBQTJCLEdBQUcsMENBQTBDLENBQUM7QUFDdEYsTUFBTSxDQUFDLE1BQU0sUUFBUSxHQUFHLDhDQUE4QyxDQUFDO0FBQ3ZFLE1BQU0sQ0FBQyxNQUFNLGtCQUFrQixHQUFHLE1BQU0sQ0FBQyxvQkFBb0IsQ0FBQyxDQUFDO0FBQy9ELE1BQU0sQ0FBQyxNQUFNLGlCQUFpQixHQUFHLE1BQU0sQ0FBQyxTQUFTLENBQUMsQ0FBQztBQUNuRCxNQUFNLENBQUMsTUFBTSxxQkFBcUIsR0FBRyxDQUFDLENBQUM7QUFDdkMsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHLEdBQUcsQ0FBQztBQUM5QixNQUFNLENBQUMsTUFBTSxTQUFTLEdBQVM7SUFDN0IsSUFBSSxFQUFFLGtFQUFrRTtJQUN4RSxJQUFJLEVBQUUsYUFBYSxDQUFDLE1BQU07SUFDMUIsUUFBUSxFQUFFLFFBQVEsQ0FBQyxNQUFNO0NBQzFCLENBQUM7QUFDRixNQUFNLENBQUMsTUFBTSxVQUFVLEdBQUcsb0VBQW9FLENBQUM7QUFDL0YsTUFBTSxDQUFDLE1BQU0sMkJBQTJCLEdBQ3RDLGtFQUFrRSxDQUFDO0FBQ3JFLE1BQU0sQ0FBQyxNQUFNLHdCQUF3QixHQUNuQyxrRUFBa0UsQ0FBQztBQUVyRSwwQkFBMEI7QUFDMUIsTUFBTSxDQUFDLE1BQU0sbUJBQW1CLEdBQUcsR0FBRyxDQUFDO0FBQ3ZDLE1BQU0sQ0FBQyxNQUFNLG1CQUFtQixHQUFHLElBQUksQ0FBQztBQUN4QyxxRUFBcUU7QUFDckUsd0NBQXdDO0FBRXhDLG1CQUFtQjtBQUNuQixNQUFNLENBQUMsTUFBTSxrQkFBa0IsR0FBRyxNQUFNLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyw4QkFBOEI7QUFFakYsNEJBQTRCO0FBQzVCLE1BQU0sQ0FBQyxNQUFNLDhCQUE4QixHQUFHLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLHFCQUFxQjtBQUVoRixNQUFNLENBQUMsTUFBTSw4QkFBOEIsR0FBRzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OzBCQXdCcEIsQ0FBQztBQUMzQixNQUFNLENBQUMsTUFBTSxpQ0FBaUMsR0FBRyxrQkFBa0IsQ0FBQztBQUNwRSxNQUFNLENBQUMsTUFBTSxrREFBa0QsR0FBRyxHQUFHLGlDQUFpQyxJQUFJLENBQUM7QUFDM0csTUFBTSxDQUFDLE1BQU0sb0RBQW9ELEdBQUcsR0FBRyxpQ0FBaUMsSUFBSSxDQUFDO0FBQzdHLE1BQU0sQ0FBQyxNQUFNLG9EQUFvRCxHQUFHLEdBQUcsaUNBQWlDLElBQUksQ0FBQztBQUM3RyxNQUFNLENBQUMsTUFBTSw4QkFBOEIsR0FBRyxHQUFHLGlDQUFpQyxJQUFJLENBQUM7QUFDdkYsTUFBTSxDQUFDLE1BQU0sMENBQTBDLEdBQUcsbUJBQW1CLENBQUM7QUFDOUUsTUFBTSxDQUFDLE1BQU0sMkJBQTJCLEdBQUcsV0FBVyxDQUFDO0FBQ3ZELE1BQU0sQ0FBQyxNQUFNLHNCQUFzQixHQUFHLG9CQUFvQixDQUFDO0FBQzNELE1BQU0sQ0FBQyxNQUFNLDZCQUE2QixHQUFHLG9CQUFvQixDQUFDO0FBQ2xFLE1BQU0sQ0FBQyxNQUFNLGNBQWMsR0FBRyxzQkFBc0IsQ0FBQztBQUNyRCxNQUFNLENBQUMsTUFBTSxnQkFBZ0IsR0FBRzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OzBCQXdXTixDQUFDIn0=
|
|
@@ -5,7 +5,6 @@ import { CertificateSerializer, CertificatesHelper } from '../certificates/index
|
|
|
5
5
|
import { TeeCertificateService } from './TeeCertificateService.js';
|
|
6
6
|
import { calculateObjectHash } from '../utils/helpers/index.js';
|
|
7
7
|
import { OID_CUSTOM_EXTENSION_USER_DATA } from '../constants.js';
|
|
8
|
-
import { formatCertsChain } from '../utils/helper.js';
|
|
9
8
|
export class TeeBlockVerifier {
|
|
10
9
|
static verifiedTcbs = new Set();
|
|
11
10
|
static async verifyTcb(tcb, utilityData) {
|
|
@@ -20,7 +19,8 @@ export class TeeBlockVerifier {
|
|
|
20
19
|
benchmark: (await Consensus.getBenchmarksByTcbIds([tcb.tcbId], [utilityData.teeOfferId]))[tcb.tcbId],
|
|
21
20
|
};
|
|
22
21
|
const { certsChain } = await tcb.get();
|
|
23
|
-
|
|
22
|
+
const certChainPem = certsChain.map(CertificateSerializer.deserializeFromBlockchain).join('\n');
|
|
23
|
+
await TeeBlockVerifier.verifyWithCertificates(certChainPem, signedTcbData);
|
|
24
24
|
// update cache
|
|
25
25
|
this.verifiedTcbs.add(tcb.tcbId);
|
|
26
26
|
if (this.verifiedTcbs.size > config.TLB_CACHE_SIZE) {
|
|
@@ -44,4 +44,4 @@ export class TeeBlockVerifier {
|
|
|
44
44
|
}
|
|
45
45
|
}
|
|
46
46
|
}
|
|
47
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
47
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVGVlQmxvY2tWZXJpZmllci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy90ZWUvVGVlQmxvY2tWZXJpZmllci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLE1BQU0sTUFBTSxjQUFjLENBQUM7QUFDbEMsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLGNBQWMsQ0FBQztBQUd0QyxPQUFPLFNBQVMsTUFBTSw4QkFBOEIsQ0FBQztBQUNyRCxPQUFPLEVBQUUscUJBQXFCLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUNyRixPQUFPLEVBQUUscUJBQXFCLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQztBQUNuRSxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUNoRSxPQUFPLEVBQUUsOEJBQThCLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQVNqRSxNQUFNLE9BQU8sZ0JBQWdCO0lBQ25CLE1BQU0sQ0FBVSxZQUFZLEdBQXNCLElBQUksR0FBRyxFQUFFLENBQUM7SUFFcEUsTUFBTSxDQUFDLEtBQUssQ0FBQyxTQUFTLENBQUMsR0FBUSxFQUFFLFdBQTJCO1FBQzFELGNBQWM7UUFDZCxJQUFJLElBQUksQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDO1lBQ3JDLE1BQU0sQ0FBQyxLQUFLLENBQUMsWUFBWSxHQUFHLENBQUMsS0FBSyxxQkFBcUIsQ0FBQyxDQUFDO1lBQ3pELE9BQU87UUFDVCxDQUFDO1FBRUQsTUFBTSxhQUFhLEdBQUc7WUFDcEIsVUFBVSxFQUFFLFdBQVcsQ0FBQyxVQUFVLENBQUMsUUFBUSxFQUFFO1lBQzdDLE1BQU0sRUFBRSxXQUFXLENBQUMsTUFBTTtZQUMxQixTQUFTLEVBQUUsQ0FBQyxNQUFNLFNBQVMsQ0FBQyxxQkFBcUIsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLFdBQVcsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDLENBQ3ZGLEdBQUcsQ0FBQyxLQUFLLENBQ1Y7U0FDRixDQUFDO1FBRUYsTUFBTSxFQUFFLFVBQVUsRUFBRSxHQUFHLE1BQU0sR0FBRyxDQUFDLEdBQUcsRUFBRSxDQUFDO1FBQ3ZDLE1BQU0sWUFBWSxHQUFHLFVBQVUsQ0FBQyxHQUFHLENBQUMscUJBQXFCLENBQUMseUJBQXlCLENBQUMsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDaEcsTUFBTSxnQkFBZ0IsQ0FBQyxzQkFBc0IsQ0FBQyxZQUFZLEVBQUUsYUFBYSxDQUFDLENBQUM7UUFFM0UsZUFBZTtRQUNmLElBQUksQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUNqQyxJQUFJLElBQUksQ0FBQyxZQUFZLENBQUMsSUFBSSxHQUFHLE1BQU0sQ0FBQyxjQUFjLEVBQUUsQ0FBQztZQUNuRCxNQUFNLENBQUMsS0FBSyxDQUFDLEdBQUcsSUFBSSxDQUFDLFlBQVksQ0FBQyxPQUFPLEVBQUUsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxLQUF5QixDQUFDO1lBQzdFLElBQUksQ0FBQyxZQUFZLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDO1lBQ2hDLE1BQU0sQ0FBQyxLQUFLLENBQ1YsS0FBSyxFQUNMLFlBQVksS0FBSyx3Q0FBd0MsSUFBSSxDQUFDLFlBQVksQ0FBQyxJQUFJLGtCQUFrQixNQUFNLENBQUMsY0FBYyxFQUFFLENBQ3pILENBQUM7UUFDSixDQUFDO1FBQ0QsTUFBTSxDQUFDLEtBQUssQ0FDVixHQUFHLENBQUMsS0FBSyxFQUNULFlBQVksR0FBRyxDQUFDLEtBQUssb0NBQW9DLElBQUksQ0FBQyxZQUFZLENBQUMsSUFBSSxrQkFBa0IsTUFBTSxDQUFDLGNBQWMsRUFBRSxDQUN6SCxDQUFDO0lBQ0osQ0FBQztJQUVPLE1BQU0sQ0FBQyxLQUFLLENBQUMsc0JBQXNCLENBQ3pDLEtBQWEsRUFDYixhQUFzQjtRQUV0QixNQUFNLFNBQVMsR0FBRyxxQkFBcUIsQ0FBQyxvQkFBb0IsQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUNwRSxNQUFNLHFCQUFxQixDQUFDLDBCQUEwQixDQUFDLFNBQVMsQ0FBQyxDQUFDO1FBRWxFLE1BQU0sb0JBQW9CLEdBQUcsa0JBQWtCLENBQUMsaUJBQWlCLENBQy9ELFNBQVMsRUFDVCw4QkFBOEIsQ0FDL0IsQ0FBQztRQUNGLElBQUksQ0FBQyxvQkFBb0IsRUFBRSxDQUFDO1lBQzFCLE1BQU0sSUFBSSxLQUFLLENBQUMsdURBQXVELENBQUMsQ0FBQztRQUMzRSxDQUFDO1FBRUQsTUFBTSxnQkFBZ0IsR0FBRyxtQkFBbUIsQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUM1RCxNQUFNLHNCQUFzQixHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsSUFBSSxFQUFFLGdCQUFnQixDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBQzdGLElBQUksTUFBTSxDQUFDLE9BQU8sQ0FBQyxvQkFBb0IsRUFBRSxzQkFBc0IsQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDO1lBQ3ZFLE1BQU0sSUFBSSxLQUFLLENBQUMsdUNBQXVDLENBQUMsQ0FBQztRQUMzRCxDQUFDO0lBQ0gsQ0FBQyJ9
|
|
@@ -2,7 +2,7 @@ import { TransactionOptions } from '../types/Web3.js';
|
|
|
2
2
|
import Web3, { JsonRpcOptionalRequest } from 'web3';
|
|
3
3
|
import { SlotInfo } from '../types/SlotInfo.js';
|
|
4
4
|
import { ConsensusBenchmarkStorage, LoaderSecretAccessPublicKey, LoaderSession, OfferResource, OfferStorageAllocated, OfferStorageRequest, OptionInfo, OptionInfoRaw, OrderUsage, OrderUsageRaw, SecretRequest, SlotUsage, TeeOfferOption, TeeOfferOptionRaw, TeeOfferSlot, ValueOfferSlot, ValueOfferSlotRaw, ConsensusBenchmarkPriceMultipliers, OfferVersion, OfferVersionInfo, OfferVersionInfoRaw, OfferVersionRaw, TeeOfferInfo, TeeOfferInfoRaw, HardwareInfoRaw, HardwareInfo, OfferInfoRaw, OfferInfo, ValueOfferRestrictionsSpecification, OfferType, OfferGroup, Origins } from '../types/index.js';
|
|
5
|
-
import { BenchmarkInfo,
|
|
5
|
+
import { BenchmarkInfo, ConsensusBenchmark } from '@super-protocol/dto-js';
|
|
6
6
|
import { BatchResponse, BatchResponseSuccess, ExecuteBatchOptions } from './types.js';
|
|
7
7
|
/**
|
|
8
8
|
* Function for checking if provider action account initialized (required for set methods)
|
|
@@ -58,7 +58,6 @@ export declare function formatPriceMultipliers(priceMultipliers: ConsensusBenchm
|
|
|
58
58
|
export declare function formatBenchmarks(benchmarks: ConsensusBenchmarkStorage[]): ConsensusBenchmark[];
|
|
59
59
|
export declare function formatBenchmark(benchmark: ConsensusBenchmarkStorage): ConsensusBenchmark;
|
|
60
60
|
export declare function formatBenchmarkTo(benchmark: ConsensusBenchmark): ConsensusBenchmarkStorage;
|
|
61
|
-
export declare function formatCertsChain(certsChain: ChunkedX509Cert[]): string;
|
|
62
61
|
export declare function formatUsage(usage: SlotUsage): SlotUsage;
|
|
63
62
|
export declare function convertOrderUsage(usage: OrderUsageRaw, slotInfo: SlotInfo, slotUsage: SlotUsage): OrderUsage;
|
|
64
63
|
export declare function convertOptionInfoFromRaw(optionInfo: OptionInfoRaw): OptionInfo;
|
|
@@ -74,3 +73,6 @@ export declare function executeBatchAsync<T>(requests: JsonRpcOptionalRequest[],
|
|
|
74
73
|
export declare function executeBatchAsync<T>(requests: JsonRpcOptionalRequest[], options?: ExecuteBatchOptions): Promise<BatchResponse<T>[]>;
|
|
75
74
|
export declare const preparePrivateKey: (pk: string) => string;
|
|
76
75
|
export declare const isIpAddress: (host: string) => boolean;
|
|
76
|
+
export declare const fromBlockchainHexOptional: (hex?: string) => Uint8Array | undefined;
|
|
77
|
+
export declare const fromBlockchainHex: (hex: string) => Uint8Array;
|
|
78
|
+
export declare const toBlockchainHex: (u?: Uint8Array) => string;
|
package/dist/mjs/utils/helper.js
CHANGED
|
@@ -3,9 +3,9 @@ import store from '../store.js';
|
|
|
3
3
|
import Web3 from 'web3';
|
|
4
4
|
import { Monitoring } from './Monitoring.js';
|
|
5
5
|
import { OfferVersionStatus, } from '../types/index.js';
|
|
6
|
-
import { POLYGON_AMOY_CHAIN_ID, POLYGON_MAIN_CHAIN_ID, POLYGON_AMOY_GASSTATION_URL, POLYGON_MAIN_GASSTATION_URL, MAX_RPC_BATCH_SIZE, OPBNB_MAIN_CHAIN_ID, OPBNB_TEST_CHAIN_ID, AMOY_TX_GAS_LIMIT, OPBNB_TX_GAS_LIMIT, defaultGasLimit, FIVE_MINUTES, BLOCKCHAIN_BATCH_REQUEST_TIMEOUT, } from '../constants.js';
|
|
6
|
+
import { POLYGON_AMOY_CHAIN_ID, POLYGON_MAIN_CHAIN_ID, POLYGON_AMOY_GASSTATION_URL, POLYGON_MAIN_GASSTATION_URL, MAX_RPC_BATCH_SIZE, OPBNB_MAIN_CHAIN_ID, OPBNB_TEST_CHAIN_ID, AMOY_TX_GAS_LIMIT, OPBNB_TX_GAS_LIMIT, defaultGasLimit, FIVE_MINUTES, BLOCKCHAIN_BATCH_REQUEST_TIMEOUT, ZERO32_HEX, } from '../constants.js';
|
|
7
7
|
import { ethers } from 'ethers';
|
|
8
|
-
import { HashSchema
|
|
8
|
+
import { HashSchema } from '@super-protocol/dto-js';
|
|
9
9
|
import axios from 'axios';
|
|
10
10
|
import { deserializeBySchema } from './schema-utils/index.js';
|
|
11
11
|
/**
|
|
@@ -371,93 +371,6 @@ export function formatBenchmarkTo(benchmark) {
|
|
|
371
371
|
cpuInfo: benchmark.cpuInfo,
|
|
372
372
|
};
|
|
373
373
|
}
|
|
374
|
-
export function formatCertsChain(certsChain) {
|
|
375
|
-
const zeroHash = '0x0000000000000000000000000000000000000000000000000000000000000000';
|
|
376
|
-
const formattedCertsChain = certsChain.map((cert) => {
|
|
377
|
-
let packedData = Web3.utils.encodePacked({
|
|
378
|
-
type: 'bytes',
|
|
379
|
-
value: cert.nonSerializedParts[0],
|
|
380
|
-
}, {
|
|
381
|
-
type: 'bytes',
|
|
382
|
-
value: cert.nonSerializedParts[1],
|
|
383
|
-
}, {
|
|
384
|
-
type: 'bytes',
|
|
385
|
-
value: cert.serialNumber,
|
|
386
|
-
}, {
|
|
387
|
-
type: 'bytes',
|
|
388
|
-
value: cert.nonSerializedParts[2],
|
|
389
|
-
}, {
|
|
390
|
-
type: 'bytes',
|
|
391
|
-
value: cert.expirationDate,
|
|
392
|
-
}, {
|
|
393
|
-
type: 'bytes',
|
|
394
|
-
value: cert.nonSerializedParts[3],
|
|
395
|
-
}, {
|
|
396
|
-
type: 'bytes',
|
|
397
|
-
value: cert.publicKey,
|
|
398
|
-
}, {
|
|
399
|
-
type: 'bytes',
|
|
400
|
-
value: cert.nonSerializedParts[4],
|
|
401
|
-
}, {
|
|
402
|
-
type: 'bytes',
|
|
403
|
-
value: cert.ca,
|
|
404
|
-
});
|
|
405
|
-
let index = 5;
|
|
406
|
-
if (cert.userData != zeroHash) {
|
|
407
|
-
packedData = Web3.utils.encodePacked({
|
|
408
|
-
type: 'bytes',
|
|
409
|
-
value: packedData,
|
|
410
|
-
}, {
|
|
411
|
-
type: 'bytes',
|
|
412
|
-
value: cert.nonSerializedParts[5],
|
|
413
|
-
}, {
|
|
414
|
-
type: 'bytes32',
|
|
415
|
-
value: cert.userData,
|
|
416
|
-
});
|
|
417
|
-
index++;
|
|
418
|
-
}
|
|
419
|
-
if (cert.mrEnclave != zeroHash) {
|
|
420
|
-
packedData = Web3.utils.encodePacked({
|
|
421
|
-
type: 'bytes',
|
|
422
|
-
value: packedData,
|
|
423
|
-
}, {
|
|
424
|
-
type: 'bytes',
|
|
425
|
-
value: cert.nonSerializedParts[index],
|
|
426
|
-
}, {
|
|
427
|
-
type: 'bytes32',
|
|
428
|
-
value: cert.mrEnclave,
|
|
429
|
-
});
|
|
430
|
-
index++;
|
|
431
|
-
}
|
|
432
|
-
if (cert.mrSigner != zeroHash) {
|
|
433
|
-
packedData = Web3.utils.encodePacked({
|
|
434
|
-
type: 'bytes',
|
|
435
|
-
value: packedData,
|
|
436
|
-
}, {
|
|
437
|
-
type: 'bytes',
|
|
438
|
-
value: cert.nonSerializedParts[index],
|
|
439
|
-
}, {
|
|
440
|
-
type: 'bytes32',
|
|
441
|
-
value: cert.mrSigner,
|
|
442
|
-
});
|
|
443
|
-
index++;
|
|
444
|
-
}
|
|
445
|
-
if (index < cert.nonSerializedParts.length - 2) {
|
|
446
|
-
packedData = Web3.utils.encodePacked({
|
|
447
|
-
type: 'bytes',
|
|
448
|
-
value: packedData,
|
|
449
|
-
}, {
|
|
450
|
-
type: 'bytes',
|
|
451
|
-
value: cert.nonSerializedParts[index],
|
|
452
|
-
});
|
|
453
|
-
}
|
|
454
|
-
return {
|
|
455
|
-
type: 'bytes',
|
|
456
|
-
value: packedData,
|
|
457
|
-
};
|
|
458
|
-
});
|
|
459
|
-
return Web3.utils.encodePacked(...formattedCertsChain);
|
|
460
|
-
}
|
|
461
374
|
export function formatUsage(usage) {
|
|
462
375
|
return {
|
|
463
376
|
priceType: usage.priceType.toString(),
|
|
@@ -612,4 +525,19 @@ export const preparePrivateKey = (pk) => {
|
|
|
612
525
|
export const isIpAddress = (host) => {
|
|
613
526
|
return Boolean(host.match(/^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/));
|
|
614
527
|
};
|
|
615
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"helper.js","sourceRoot":"","sources":["../../../src/utils/helper.ts"],"names":[],"mappings":"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"}
|
|
528
|
+
export const fromBlockchainHexOptional = (hex) => {
|
|
529
|
+
const cleaned = hex?.startsWith('0x') ? hex.slice(2) : hex;
|
|
530
|
+
if (!cleaned || hex === ZERO32_HEX)
|
|
531
|
+
return;
|
|
532
|
+
return new Uint8Array(Buffer.from(cleaned, 'hex'));
|
|
533
|
+
};
|
|
534
|
+
export const fromBlockchainHex = (hex) => {
|
|
535
|
+
const converted = fromBlockchainHexOptional(hex);
|
|
536
|
+
return converted ? converted : new Uint8Array();
|
|
537
|
+
};
|
|
538
|
+
export const toBlockchainHex = (u) => {
|
|
539
|
+
if (!u || u.length === 0)
|
|
540
|
+
return ZERO32_HEX;
|
|
541
|
+
return '0x' + Buffer.from(u).toString('hex');
|
|
542
|
+
};
|
|
543
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"helper.js","sourceRoot":"","sources":["../../../src/utils/helper.ts"],"names":[],"mappings":"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"}
|