@super-protocol/sdk-js 3.12.1-beta.2 → 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 -59
- package/dist/cjs/staticModels/Campaign.js +0 -248
- 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 -59
- package/dist/mjs/staticModels/Campaign.js +0 -243
- package/dist/mjs/types/Campaign.d.ts +0 -57
- package/dist/mjs/types/Campaign.js +0 -8
|
@@ -14,6 +14,7 @@ import { QEIdentityStatuses, TCBStatuses, QuoteValidationStatuses } from './stat
|
|
|
14
14
|
import { Encoding, HashAlgorithm } from '@super-protocol/dto-js';
|
|
15
15
|
import Crypto from '../crypto/index.js';
|
|
16
16
|
import { TeeSignatureVerifier } from './TeeSignatureVerifier.js';
|
|
17
|
+
import { ChallengeType } from '@super-protocol/pki-common';
|
|
17
18
|
const { ec } = elliptic;
|
|
18
19
|
const { util, asn1 } = forge;
|
|
19
20
|
const INTEL_BASE_SGX_URL = 'https://api.trustedservices.intel.com';
|
|
@@ -42,8 +43,8 @@ export class QuoteValidator {
|
|
|
42
43
|
this.teeTdxParser = new TeeTdxParser();
|
|
43
44
|
this.logger = rootLogger.child({ className: QuoteValidator.name });
|
|
44
45
|
}
|
|
45
|
-
static getSignature(mrEnclave, options) {
|
|
46
|
-
return TeeSignatureVerifier.getSignature(mrEnclave, options);
|
|
46
|
+
static getSignature(mrEnclave, challengeType, options) {
|
|
47
|
+
return TeeSignatureVerifier.getSignature(mrEnclave, challengeType, options);
|
|
47
48
|
}
|
|
48
49
|
static async checkSignature(quote, options = { getMrEnclaveSignature: TeeSignatureVerifier.getSignature }) {
|
|
49
50
|
const { type: quoteType } = TeeSgxParser.determineQuoteType(quote);
|
|
@@ -57,7 +58,7 @@ export class QuoteValidator {
|
|
|
57
58
|
}
|
|
58
59
|
case QuoteType.TDX: {
|
|
59
60
|
const mrEnclave = TeeParser.getMrEnclave(quote);
|
|
60
|
-
await TeeSignatureVerifier.
|
|
61
|
+
await TeeSignatureVerifier.validateSignature(mrEnclave, ChallengeType.TDX, options);
|
|
61
62
|
break;
|
|
62
63
|
}
|
|
63
64
|
}
|
|
@@ -445,4 +446,4 @@ export class QuoteValidator {
|
|
|
445
446
|
return Buffer.from(hashData.hash, hashData.encoding);
|
|
446
447
|
}
|
|
447
448
|
}
|
|
448
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"QuoteValidator.js","sourceRoot":"","sources":["../../../src/tee/QuoteValidator.ts"],"names":[],"mappings":"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"}
|
|
449
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"QuoteValidator.js","sourceRoot":"","sources":["../../../src/tee/QuoteValidator.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,7 @@ export declare class TeeCertificateService {
|
|
|
14
14
|
private static validateChallenge;
|
|
15
15
|
private static validateGpuChallenge;
|
|
16
16
|
private static validateChallengeSgx;
|
|
17
|
-
private static
|
|
17
|
+
private static validateChallengeId;
|
|
18
18
|
private static getGpuInfoFromCert;
|
|
19
19
|
private static validateCertificateChallenge;
|
|
20
20
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { SUPERPROTOCOL_CA
|
|
1
|
+
import { SUPERPROTOCOL_CA } from '../constants.js';
|
|
2
2
|
import { ChallengeType, OID_CUSTOM_EXTENSION_CHALLENGE_CERTIFICATE_ID, OID_CUSTOM_EXTENSION_CHALLENGE_COMMON_ID, OID_CUSTOM_EXTENSION_CHALLENGE_ID, OID_CUSTOM_EXTENSION_CHALLENGE_SUBTYPE, OID_CUSTOM_EXTENSION_CHALLENGE_TYPE, OID_CUSTOM_EXTENSION_NVIDIA_INFO_GPU, } from '@super-protocol/pki-common';
|
|
3
3
|
import { TeeSignatureVerifier } from './TeeSignatureVerifier.js';
|
|
4
4
|
import { InvalidSignatureError, NotAllowedChallengeError } from './errors.js';
|
|
@@ -56,7 +56,7 @@ export class TeeCertificateService {
|
|
|
56
56
|
break;
|
|
57
57
|
case ChallengeType.TDX:
|
|
58
58
|
case ChallengeType.SEVSNP:
|
|
59
|
-
await TeeCertificateService.
|
|
59
|
+
await TeeCertificateService.validateChallengeId(cert, challengeType);
|
|
60
60
|
break;
|
|
61
61
|
case ChallengeType.Certificate:
|
|
62
62
|
await TeeCertificateService.validateCertificateChallenge(cert);
|
|
@@ -84,16 +84,19 @@ export class TeeCertificateService {
|
|
|
84
84
|
throw new Error(`SGX challenge signature is wrong!`);
|
|
85
85
|
}
|
|
86
86
|
}
|
|
87
|
-
static async
|
|
88
|
-
const
|
|
87
|
+
static async validateChallengeId(cert, challengeType) {
|
|
88
|
+
const oid = challengeType === ChallengeType.Certificate
|
|
89
|
+
? OID_CUSTOM_EXTENSION_CHALLENGE_CERTIFICATE_ID
|
|
90
|
+
: OID_CUSTOM_EXTENSION_CHALLENGE_ID;
|
|
91
|
+
const mrEnclaveBinaryString = CertificatesHelper.getExtensionValue(cert, oid);
|
|
89
92
|
if (!mrEnclaveBinaryString) {
|
|
90
93
|
throw new Error(`Challenge id is missing in certificate!`);
|
|
91
94
|
}
|
|
92
95
|
try {
|
|
93
|
-
await TeeSignatureVerifier.
|
|
96
|
+
await TeeSignatureVerifier.validateSignature(mrEnclaveBinaryString, challengeType);
|
|
94
97
|
}
|
|
95
98
|
catch (err) {
|
|
96
|
-
const message =
|
|
99
|
+
const message = `${challengeType} signature is invalid!`;
|
|
97
100
|
if (err instanceof InvalidSignatureError) {
|
|
98
101
|
throw new Error(`${message} ${err.message}`);
|
|
99
102
|
}
|
|
@@ -118,22 +121,16 @@ export class TeeCertificateService {
|
|
|
118
121
|
return gpusInfo.gpus;
|
|
119
122
|
}
|
|
120
123
|
static async validateCertificateChallenge(cert) {
|
|
121
|
-
|
|
122
|
-
if (!solutionHash) {
|
|
123
|
-
throw new Error(`Challenge id is missing in certificate!`);
|
|
124
|
-
}
|
|
125
|
-
if (!TRUSTED_PKI_SOLUTION_HASHES.includes(solutionHash.toString('hex'))) {
|
|
126
|
-
throw new Error(`Solution hash is not in trusted list!`);
|
|
127
|
-
}
|
|
124
|
+
await TeeCertificateService.validateChallengeId(cert, ChallengeType.Certificate);
|
|
128
125
|
const subType = CertificatesHelper.getExtensionValue(cert, OID_CUSTOM_EXTENSION_CHALLENGE_SUBTYPE)?.toString('binary');
|
|
129
126
|
switch (subType) {
|
|
130
127
|
case ChallengeType.TDX:
|
|
131
128
|
case ChallengeType.SEVSNP:
|
|
132
|
-
await TeeCertificateService.
|
|
129
|
+
await TeeCertificateService.validateChallengeId(cert, subType);
|
|
133
130
|
break;
|
|
134
131
|
default:
|
|
135
132
|
throw new Error(`Unsupported subtype: ${subType}`);
|
|
136
133
|
}
|
|
137
134
|
}
|
|
138
135
|
}
|
|
139
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
136
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVGVlQ2VydGlmaWNhdGVTZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3RlZS9UZWVDZXJ0aWZpY2F0ZVNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDbkQsT0FBTyxFQUNMLGFBQWEsRUFDYiw2Q0FBNkMsRUFDN0Msd0NBQXdDLEVBQ3hDLGlDQUFpQyxFQUNqQyxzQ0FBc0MsRUFDdEMsbUNBQW1DLEVBQ25DLG9DQUFvQyxHQUNyQyxNQUFNLDRCQUE0QixDQUFDO0FBQ3BDLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ2pFLE9BQU8sRUFBRSxxQkFBcUIsRUFBRSx3QkFBd0IsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUM5RSxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUM5RCxPQUFPLEVBQWtCLGNBQWMsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBR3JFLE1BQU0sQ0FBTixJQUFZLDZCQUlYO0FBSkQsV0FBWSw2QkFBNkI7SUFDdkMsZ0ZBQStDLENBQUE7SUFDL0MsZ0ZBQStDLENBQUE7SUFDL0MsOEVBQTZDLENBQUE7QUFDL0MsQ0FBQyxFQUpXLDZCQUE2QixLQUE3Qiw2QkFBNkIsUUFJeEM7QUFPRCxNQUFNLE9BQU8scUJBQXFCO0lBQ2hDLE1BQU0sQ0FBQyxLQUFLLENBQUMsMEJBQTBCLENBQUMsUUFBZ0I7UUFDdEQsTUFBTSxNQUFNLEdBQUcsTUFBTSxxQkFBcUIsQ0FBQyxvQkFBb0IsQ0FBQyxRQUFRLENBQUMsQ0FBQztRQUMxRSxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sRUFBRSxDQUFDO1lBQ3BCLE1BQU0sSUFBSSxLQUFLLENBQUMsTUFBTSxDQUFDLFlBQVksQ0FBQyxDQUFDO1FBQ3ZDLENBQUM7SUFDSCxDQUFDO0lBRUQsTUFBTSxDQUFDLEtBQUss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
|
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
-
import { BinaryType,
|
|
3
|
-
|
|
2
|
+
import { BinaryType, GetSignatureOptions } from './types.js';
|
|
3
|
+
import { ChallengeType } from '@super-protocol/pki-common';
|
|
4
|
+
export type GetMrEnclaveSignatureFn = (mrEnclave: Buffer, challengeType: ChallengeType) => Promise<Buffer>;
|
|
4
5
|
export type CheckSignatureOptions = {
|
|
5
6
|
getMrEnclaveSignature: GetMrEnclaveSignatureFn;
|
|
6
7
|
};
|
|
8
|
+
export declare const SignatureFolderMap: Partial<Record<ChallengeType, string>>;
|
|
7
9
|
export declare class TeeSignatureVerifier {
|
|
8
10
|
/**
|
|
9
11
|
* Validates tee signature for SGX
|
|
@@ -18,6 +20,6 @@ export declare class TeeSignatureVerifier {
|
|
|
18
20
|
* @param options.getMrEnclaveSignature - Function to retrieve signature for verification (defaults to TeeSignatureVerifier.getSignature)
|
|
19
21
|
* @throws Error If signature validation fails or signature cannot be retrieved
|
|
20
22
|
*/
|
|
21
|
-
static
|
|
22
|
-
static getSignature(mrEnclave: Buffer, options?:
|
|
23
|
+
static validateSignature(mrEnclave: BinaryType, challengeType: ChallengeType, options?: CheckSignatureOptions): Promise<void>;
|
|
24
|
+
static getSignature(mrEnclave: Buffer, challengeType: ChallengeType, options?: GetSignatureOptions): Promise<Buffer>;
|
|
23
25
|
}
|
|
@@ -3,6 +3,12 @@ import forge from 'node-forge';
|
|
|
3
3
|
import { TEE_LOADER_TRUSTED_CERTIFICATE, TEE_LOADER_TRUSTED_MRSIGNER, TEE_PKI_TRUSTED_MRSIGNER, } from '../constants.js';
|
|
4
4
|
import { InvalidSignatureError } from '../index.js';
|
|
5
5
|
import { tryWithInterval } from '../utils/helpers/index.js';
|
|
6
|
+
import { ChallengeType } from '@super-protocol/pki-common';
|
|
7
|
+
export const SignatureFolderMap = {
|
|
8
|
+
[ChallengeType.TDX]: 'tdx',
|
|
9
|
+
[ChallengeType.SEVSNP]: 'sev-snp',
|
|
10
|
+
[ChallengeType.Certificate]: 'pki-solution',
|
|
11
|
+
};
|
|
6
12
|
export class TeeSignatureVerifier {
|
|
7
13
|
/**
|
|
8
14
|
* Validates tee signature for SGX
|
|
@@ -21,7 +27,7 @@ export class TeeSignatureVerifier {
|
|
|
21
27
|
* @param options.getMrEnclaveSignature - Function to retrieve signature for verification (defaults to TeeSignatureVerifier.getSignature)
|
|
22
28
|
* @throws Error If signature validation fails or signature cannot be retrieved
|
|
23
29
|
*/
|
|
24
|
-
static async
|
|
30
|
+
static async validateSignature(mrEnclave, challengeType, options = { getMrEnclaveSignature: TeeSignatureVerifier.getSignature }) {
|
|
25
31
|
const { getMrEnclaveSignature } = options;
|
|
26
32
|
const cert = forge.pki.certificateFromPem(TEE_LOADER_TRUSTED_CERTIFICATE);
|
|
27
33
|
const isCertValid = forge.pki.verifyCertificateChain(forge.pki.createCaStore([cert]), [cert]);
|
|
@@ -37,48 +43,70 @@ export class TeeSignatureVerifier {
|
|
|
37
43
|
.create()
|
|
38
44
|
.update(String.fromCharCode(...mrEnclave))
|
|
39
45
|
.digest();
|
|
40
|
-
const signature = await getMrEnclaveSignature(Buffer.from(mrEnclave));
|
|
46
|
+
const signature = await getMrEnclaveSignature(Buffer.from(mrEnclave), challengeType);
|
|
41
47
|
const isSignatureValid = publicKey.verify(digest.bytes(), String.fromCharCode(...signature));
|
|
42
48
|
if (!isSignatureValid) {
|
|
43
49
|
throw new InvalidSignatureError('TDX signature is invalid');
|
|
44
50
|
}
|
|
45
51
|
}
|
|
46
|
-
static async getSignature(mrEnclave, options) {
|
|
47
|
-
const baseURL = options?.baseURL ?? 'https://raw.githubusercontent.com/Super-Protocol/sp-vm';
|
|
52
|
+
static async getSignature(mrEnclave, challengeType, options) {
|
|
53
|
+
const baseURL = options?.baseURL ?? 'https://raw.githubusercontent.com/Super-Protocol/sp-vm/main/signatures';
|
|
48
54
|
const retryMax = options?.retryMax ?? 3;
|
|
49
55
|
const retryInterval = options?.retryInterval ?? 1000;
|
|
50
56
|
const mrenclaveHex = mrEnclave.toString('hex');
|
|
51
57
|
const axiosInstance = axios.create({
|
|
52
58
|
baseURL,
|
|
53
59
|
});
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
60
|
+
const signaturePaths = [
|
|
61
|
+
`/${SignatureFolderMap[challengeType]}/latest/mrenclave-${mrenclaveHex}.json`,
|
|
62
|
+
`/${SignatureFolderMap[challengeType]}/pre-release/mrenclave-${mrenclaveHex}.json`,
|
|
63
|
+
`/mrenclave-${mrenclaveHex}.sign`,
|
|
64
|
+
];
|
|
65
|
+
for (const path of signaturePaths) {
|
|
66
|
+
try {
|
|
67
|
+
const response = await tryWithInterval({
|
|
68
|
+
checkResult(response) {
|
|
69
|
+
return { isResultOk: response.status === 200 };
|
|
70
|
+
},
|
|
71
|
+
handler() {
|
|
72
|
+
return axiosInstance.get(path, {
|
|
73
|
+
responseType: 'arraybuffer',
|
|
74
|
+
});
|
|
75
|
+
},
|
|
76
|
+
checkError(err) {
|
|
77
|
+
if (axios.isAxiosError(err) && err.response) {
|
|
78
|
+
const status = err.response.status;
|
|
79
|
+
return { retryable: status < 400 || status >= 500 };
|
|
80
|
+
}
|
|
81
|
+
return { retryable: axios.isAxiosError(err) };
|
|
82
|
+
},
|
|
83
|
+
retryInterval,
|
|
84
|
+
retryMax,
|
|
85
|
+
});
|
|
86
|
+
const buf = Buffer.from(response.data);
|
|
87
|
+
if (path.endsWith('.sign')) {
|
|
88
|
+
return buf;
|
|
89
|
+
}
|
|
90
|
+
const jsonText = buf.toString('utf8');
|
|
91
|
+
let parsed;
|
|
92
|
+
try {
|
|
93
|
+
parsed = JSON.parse(jsonText);
|
|
94
|
+
}
|
|
95
|
+
catch {
|
|
96
|
+
throw new InvalidSignatureError(`Incorrect JSON-signature for mrEnclave ${mrenclaveHex} on ${path}`);
|
|
97
|
+
}
|
|
98
|
+
if (typeof parsed.signature === 'string' && parsed.signature.length > 0) {
|
|
99
|
+
return Buffer.from(parsed.signature, 'base64');
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
catch (err) {
|
|
103
|
+
if (axios.isAxiosError(err) && err.response?.status === 404) {
|
|
104
|
+
continue;
|
|
105
|
+
}
|
|
106
|
+
throw err;
|
|
79
107
|
}
|
|
80
|
-
throw err;
|
|
81
108
|
}
|
|
109
|
+
throw new InvalidSignatureError(`${challengeType} signature is missing for mrEnclave ${mrenclaveHex}`);
|
|
82
110
|
}
|
|
83
111
|
}
|
|
84
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
112
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVGVlU2lnbmF0dXJlVmVyaWZpZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdGVlL1RlZVNpZ25hdHVyZVZlcmlmaWVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBd0IsTUFBTSxPQUFPLENBQUM7QUFDN0MsT0FBTyxLQUFLLE1BQU0sWUFBWSxDQUFDO0FBQy9CLE9BQU8sRUFDTCw4QkFBOEIsRUFDOUIsMkJBQTJCLEVBQzNCLHdCQUF3QixHQUN6QixNQUFNLGlCQUFpQixDQUFDO0FBQ3pCLE9BQU8sRUFBRSxxQkFBcUIsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUVwRCxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDNUQsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBVTNELE1BQU0sQ0FBQyxNQUFNLGtCQUFrQixHQUEyQztJQUN4RSxDQUFDLGFBQWEsQ0FBQyxHQUFHLENBQUMsRUFBRSxLQUFLO0lBQzFCLENBQUMsYUFBYSxDQUFDLE1BQU0sQ0FBQyxFQUFFLFNBQVM7SUFDakMsQ0FBQyxhQUFhLENBQUMsV0FBVyxDQUFDLEVBQUUsY0FBYztDQUM1QyxDQUFDO0FBRUYsTUFBTSxPQUFPLG9CQUFvQjtJQUMvQjs7OztPQUlHO0lBQ0gsTUFBTSxDQUFDLG9CQUFvQixDQUFDLFFBQW9CO1FBQzlDLElBQ0UsQ0FBQyxDQUFDLHdCQUF3QixFQUFFLDJCQUEyQixDQUFDLENBQUMsUUFBUSxDQUFDLFFBQVEsQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLENBQUMsRUFDM0YsQ0FBQztZQUNELE1BQU0sSUFBSSxxQkFBcUIsQ0FBQyxnQ0FBZ0MsQ0FBQyxDQUFDO1FBQ3BFLENBQUM7SUFDSCxDQUFDO0lBRUQ7Ozs7OztPQU1HO0lBQ0gsTUFBTSxDQUFDLEtBQUssQ0FBQyxpQkFBaUIsQ0FDNUIsU0FBcUIsRUFDckIsYUFBNEIsRUFDNUIsVUFBaUMsRUFBRSxx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
|
package/dist/mjs/tee/types.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { BytesLike } from 'ethers/lib/utils.js';
|
|
2
2
|
import { TokenAmount, BlockchainId } from './Web3.js';
|
|
3
|
-
import { EncryptionKey, RuntimeInputInfo, Hash } from '@super-protocol/dto-js';
|
|
4
|
-
import { OrderUsage, Origins } from '../types/index.js';
|
|
3
|
+
import { EncryptionKey, RuntimeInputInfo, Hash, SlotInfo } from '@super-protocol/dto-js';
|
|
4
|
+
import { OrderUsage, OrderUsageRaw, Origins, SlotUsage } from '../types/index.js';
|
|
5
5
|
export declare enum OrderStatus {
|
|
6
6
|
New = "0",
|
|
7
7
|
Processing = "1",
|
|
@@ -60,6 +60,26 @@ export type OrderResult = {
|
|
|
60
60
|
encryptedResult: string;
|
|
61
61
|
orderPrice: TokenAmount;
|
|
62
62
|
};
|
|
63
|
+
export type AggregatedOrderInfoRaw = {
|
|
64
|
+
parentOrderId: BlockchainId;
|
|
65
|
+
awaitingPayment: boolean;
|
|
66
|
+
currentCost: TokenAmount;
|
|
67
|
+
orderOutputReserve: TokenAmount;
|
|
68
|
+
totalDepositSpent: TokenAmount;
|
|
69
|
+
totalDepositUnspent: TokenAmount;
|
|
70
|
+
totalOrderDeposit: TokenAmount;
|
|
71
|
+
consumer: string;
|
|
72
|
+
deposit: TokenAmount;
|
|
73
|
+
info: OrderInfoRaw;
|
|
74
|
+
args: OrderArgs;
|
|
75
|
+
result: OrderResult;
|
|
76
|
+
selectedSlotInfo: SlotInfo;
|
|
77
|
+
selectedSlotUsage: SlotUsage;
|
|
78
|
+
selectedUsage: OrderUsageRaw;
|
|
79
|
+
origins: Origins;
|
|
80
|
+
startDate: number;
|
|
81
|
+
subOrdersIds: BlockchainId[];
|
|
82
|
+
};
|
|
63
83
|
export type OrderAggregatedInfo = {
|
|
64
84
|
parentOrderId: BlockchainId;
|
|
65
85
|
awaitingPayment: boolean;
|
|
@@ -77,6 +97,12 @@ export type OrderAggregatedInfo = {
|
|
|
77
97
|
startDate: number;
|
|
78
98
|
subOrdersIds: BlockchainId[];
|
|
79
99
|
};
|
|
100
|
+
export type GetAggregatedOrdersInfoResult = {
|
|
101
|
+
orderId: BlockchainId;
|
|
102
|
+
aggregatedInfo?: OrderAggregatedInfo;
|
|
103
|
+
error?: string;
|
|
104
|
+
};
|
|
105
|
+
export declare function aggregatedOrderInfoFromRaw(aggregatedInfo: AggregatedOrderInfoRaw, coresDenominator: number): OrderAggregatedInfo;
|
|
80
106
|
export type SubOrderParams = {
|
|
81
107
|
blockParentOrder: boolean;
|
|
82
108
|
deposit: TokenAmount;
|
package/dist/mjs/types/Order.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { formatBytes32String, parseBytes32String } from 'ethers/lib/utils.js';
|
|
2
|
+
import { convertOrderUsage, convertOrigins, formatUsage, unpackSlotInfo } from '../utils/helper.js';
|
|
2
3
|
export var OrderStatus;
|
|
3
4
|
(function (OrderStatus) {
|
|
4
5
|
OrderStatus["New"] = "0";
|
|
@@ -64,4 +65,23 @@ export const orderInfoFromRaw = (orderInfoBch, args) => {
|
|
|
64
65
|
tokenAddress: orderInfoBch.tokenAddress,
|
|
65
66
|
};
|
|
66
67
|
};
|
|
67
|
-
|
|
68
|
+
export function aggregatedOrderInfoFromRaw(aggregatedInfo, coresDenominator) {
|
|
69
|
+
return {
|
|
70
|
+
awaitingPayment: aggregatedInfo.awaitingPayment,
|
|
71
|
+
consumer: aggregatedInfo.consumer,
|
|
72
|
+
parentOrderId: BigInt(aggregatedInfo.parentOrderId).toString(),
|
|
73
|
+
currentCost: BigInt(aggregatedInfo.currentCost).toString(),
|
|
74
|
+
orderOutputReserve: BigInt(aggregatedInfo.orderOutputReserve).toString(),
|
|
75
|
+
totalDepositSpent: BigInt(aggregatedInfo.totalDepositSpent).toString(),
|
|
76
|
+
totalDepositUnspent: BigInt(aggregatedInfo.totalDepositUnspent).toString(),
|
|
77
|
+
totalOrderDeposit: BigInt(aggregatedInfo.totalOrderDeposit).toString(),
|
|
78
|
+
deposit: BigInt(aggregatedInfo.deposit).toString(),
|
|
79
|
+
info: orderInfoFromRaw(aggregatedInfo.info, aggregatedInfo.args),
|
|
80
|
+
result: aggregatedInfo.result,
|
|
81
|
+
selectedUsage: convertOrderUsage(aggregatedInfo.selectedUsage, unpackSlotInfo(aggregatedInfo.selectedSlotInfo, coresDenominator), formatUsage(aggregatedInfo.selectedSlotUsage)),
|
|
82
|
+
origins: convertOrigins(aggregatedInfo.origins),
|
|
83
|
+
startDate: Number(aggregatedInfo.startDate),
|
|
84
|
+
subOrdersIds: aggregatedInfo.subOrdersIds.map((id) => BigInt(id).toString()),
|
|
85
|
+
};
|
|
86
|
+
}
|
|
87
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiT3JkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdHlwZXMvT3JkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFhLG1CQUFtQixFQUFFLGtCQUFrQixFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFJekYsT0FBTyxFQUFFLGlCQUFpQixFQUFFLGNBQWMsRUFBRSxXQUFXLEVBQUUsY0FBYyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFcEcsTUFBTSxDQUFOLElBQVksV0FTWDtBQVRELFdBQVksV0FBVztJQUNyQix3QkFBUyxDQUFBO0lBQ1QsK0JBQWdCLENBQUE7SUFDaEIsOEJBQWUsQ0FBQTtJQUNmLDZCQUFjLENBQUE7SUFDZCx5QkFBVSxDQUFBO0lBQ1YsMEJBQVcsQ0FBQTtJQUNYLDRCQUFhLENBQUE7SUFDYiw4QkFBZSxDQUFBO0FBQ2pCLENBQUMsRUFUVyxXQUFXLEtBQVgsV0FBVyxRQVN0QjtBQTZDRCxNQUFNLENBQUMsTUFBTSxjQUFjLEdBQUcsQ0FBQyxTQUFvQixFQUFnQixFQUFFO0lBQ25FLE1BQU0sVUFBVSxHQUFHLElBQUksQ0FBQyxTQUFTLENBQUM7UUFDaEMsU0FBUyxFQUFFLFNBQVMsQ0FBQyxVQUFVLENBQUMsU0FBUztRQUN6QyxhQUFhLEVBQUUsU0FBUyxDQUFDLFVBQVUsQ0FBQyxhQUFhO1FBQ2pELGFBQWEsRUFBRSxTQUFTLENBQUMsYUFBYTtLQUN2QyxDQUFDLENBQUM7SUFDSCxPQUFPO1FBQ0wsT0FBTyxFQUFFLFNBQVMsQ0FBQyxPQUFPO1FBQzFCLFVBQVUsRUFBRSxVQUFVO1FBQ3RCLE1BQU0sRUFBRSxTQUFTLENBQUMsTUFBTTtRQUN4QixVQUFVLEVBQUUsbUJBQW1CLENBQUMsU0FBUyxDQUFDLFVBQVUsQ0FBQztRQUNyRCxhQUFhLEVBQUUsU0FBUyxDQUFDLGFBQWEsSUFBSSxHQUFHO1FBQzdDLGdCQUFnQixFQUFFLFNBQVMsQ0FBQyxnQkFBZ0IsSUFBSSxHQUFH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
|
package/dist/mjs/types/index.js
CHANGED
|
@@ -24,5 +24,4 @@ export * from './ValueOfferSlot.js';
|
|
|
24
24
|
export * from './Web3.js';
|
|
25
25
|
export * from './DistributedSecretStorage.js';
|
|
26
26
|
export * from './ProviderRewards.js';
|
|
27
|
-
|
|
28
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdHlwZXMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxpQkFBaUIsQ0FBQztBQUNoQyxjQUFjLGdCQUFnQixDQUFDO0FBQy9CLGNBQWMsa0JBQWtCLENBQUM7QUFDakMsY0FBYyxlQUFlLENBQUM7QUFDOUIsY0FBYyxhQUFhLENBQUM7QUFDNUIsY0FBYyxtQkFBbUIsQ0FBQztBQUNsQyxjQUFjLFlBQVksQ0FBQztBQUMzQixjQUFjLFlBQVksQ0FBQztBQUMzQixjQUFjLG1CQUFtQixDQUFDO0FBQ2xDLGNBQWMsaUJBQWlCLENBQUM7QUFDaEMsY0FBYyxZQUFZLENBQUM7QUFDM0IsY0FBYyxpQkFBaUIsQ0FBQztBQUNoQyxjQUFjLGNBQWMsQ0FBQztBQUM3QixjQUFjLGVBQWUsQ0FBQztBQUM5QixjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMsZUFBZSxDQUFDO0FBQzlCLGNBQWMsZ0JBQWdCLENBQUM7QUFDL0IsY0FBYyxlQUFlLENBQUM7QUFDOUIsY0FBYyxtQkFBbUIsQ0FBQztBQUNsQyxjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMsbUJBQW1CLENBQUM7QUFDbEMsY0FBYyxnQkFBZ0IsQ0FBQztBQUMvQixjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMsV0FBVyxDQUFDO0FBQzFCLGNBQWMsK0JBQStCLENBQUM7QUFDOUMsY0FBYyxzQkFBc0IsQ0FBQztBQUNyQyxjQUFjLGVBQWUsQ0FBQyJ9
|
|
27
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdHlwZXMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxpQkFBaUIsQ0FBQztBQUNoQyxjQUFjLGdCQUFnQixDQUFDO0FBQy9CLGNBQWMsa0JBQWtCLENBQUM7QUFDakMsY0FBYyxlQUFlLENBQUM7QUFDOUIsY0FBYyxhQUFhLENBQUM7QUFDNUIsY0FBYyxtQkFBbUIsQ0FBQztBQUNsQyxjQUFjLFlBQVksQ0FBQztBQUMzQixjQUFjLFlBQVksQ0FBQztBQUMzQixjQUFjLG1CQUFtQixDQUFDO0FBQ2xDLGNBQWMsaUJBQWlCLENBQUM7QUFDaEMsY0FBYyxZQUFZLENBQUM7QUFDM0IsY0FBYyxpQkFBaUIsQ0FBQztBQUNoQyxjQUFjLGNBQWMsQ0FBQztBQUM3QixjQUFjLGVBQWUsQ0FBQztBQUM5QixjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMsZUFBZSxDQUFDO0FBQzlCLGNBQWMsZ0JBQWdCLENBQUM7QUFDL0IsY0FBYyxlQUFlLENBQUM7QUFDOUIsY0FBYyxtQkFBbUIsQ0FBQztBQUNsQyxjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMsbUJBQW1CLENBQUM7QUFDbEMsY0FBYyxnQkFBZ0IsQ0FBQztBQUMvQixjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMsV0FBVyxDQUFDO0FBQzFCLGNBQWMsK0JBQStCLENBQUM7QUFDOUMsY0FBYyxzQkFBc0IsQ0FBQyJ9
|
|
@@ -33,5 +33,9 @@ export declare class CryptoKeysTransformer {
|
|
|
33
33
|
static ecdhPublicKeyToKeyObj(key: Buffer): KeyObject;
|
|
34
34
|
static ecdhPrivateKeyToKeyObj(key: Buffer, publicKey: Buffer): KeyObject;
|
|
35
35
|
static keyObjToEcdhPublicKey(keyObj: KeyObject): Buffer;
|
|
36
|
+
static pkcs8PemToCryptoKey(pkcs8Pem: string): Promise<CryptoKey>;
|
|
37
|
+
static spkiPemToCryptoKey(spkiPem: string): Promise<CryptoKey>;
|
|
38
|
+
static cryptoKeyToPkcs8Pem(privateKey: CryptoKey): Promise<string>;
|
|
39
|
+
static cryptoKeyToSpkiPem(publicKey: CryptoKey): Promise<string>;
|
|
36
40
|
}
|
|
37
41
|
export {};
|