@super-protocol/sdk-js 3.4.0 → 3.5.0-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.
Files changed (109) hide show
  1. package/dist/cjs/certificates/crl.d.ts +6 -0
  2. package/dist/cjs/certificates/crl.js +66 -0
  3. package/dist/cjs/certificates/helper.d.ts +23 -0
  4. package/dist/cjs/certificates/helper.js +177 -0
  5. package/dist/cjs/certificates/index.d.ts +2 -0
  6. package/dist/cjs/certificates/index.js +19 -0
  7. package/dist/cjs/certificates/ocsp.d.ts +9 -0
  8. package/dist/cjs/certificates/ocsp.js +124 -0
  9. package/dist/cjs/certificates/types.d.ts +4 -0
  10. package/dist/cjs/certificates/types.js +3 -0
  11. package/dist/cjs/constants.d.ts +6 -1
  12. package/dist/cjs/constants.js +8 -3
  13. package/dist/cjs/contracts/abi.d.ts +90 -30
  14. package/dist/cjs/contracts/abi.js +114 -36
  15. package/dist/cjs/crypto/types.d.ts +0 -4
  16. package/dist/cjs/crypto/utils.d.ts +2 -3
  17. package/dist/cjs/crypto/utils.js +46 -26
  18. package/dist/cjs/crypto/utils.spec.d.ts +1 -0
  19. package/dist/cjs/crypto/utils.spec.js +176 -0
  20. package/dist/cjs/index.d.ts +4 -2
  21. package/dist/cjs/index.js +9 -6
  22. package/dist/cjs/models/Offer.d.ts +9 -5
  23. package/dist/cjs/models/Offer.js +24 -13
  24. package/dist/cjs/models/Order.d.ts +1 -1
  25. package/dist/cjs/models/Order.js +4 -2
  26. package/dist/cjs/providers/storage/fs-storage-provider.js +3 -4
  27. package/dist/cjs/staticModels/LoaderSecretsAccessPublicKeys.d.ts +9 -0
  28. package/dist/cjs/staticModels/LoaderSecretsAccessPublicKeys.js +48 -0
  29. package/dist/cjs/staticModels/OfferResources.js +3 -3
  30. package/dist/cjs/staticModels/OffersStorageRequests.js +3 -3
  31. package/dist/cjs/staticModels/Orders.d.ts +3 -3
  32. package/dist/cjs/staticModels/Orders.js +9 -3
  33. package/dist/cjs/staticModels/SecretRequests.js +2 -2
  34. package/dist/cjs/tee/OrderReportService.d.ts +0 -3
  35. package/dist/cjs/tee/OrderReportService.js +11 -28
  36. package/dist/cjs/tee/QuoteValidator.js +2 -2
  37. package/dist/cjs/tee/TeeCertificateService.d.ts +14 -17
  38. package/dist/cjs/tee/TeeCertificateService.js +60 -73
  39. package/dist/cjs/tee/TeeSignatureVerifier.d.ts +2 -2
  40. package/dist/cjs/tee/TeeSignatureVerifier.js +3 -3
  41. package/dist/cjs/types/DistributedSecretStorage.d.ts +1 -1
  42. package/dist/cjs/types/OrderUsage.d.ts +2 -0
  43. package/dist/cjs/types/ValueOfferSlot.d.ts +1 -0
  44. package/dist/cjs/utils/TxManager.js +16 -27
  45. package/dist/cjs/utils/helper.d.ts +2 -2
  46. package/dist/cjs/utils/helper.js +8 -6
  47. package/dist/cjs/utils/order/index.d.ts +1 -0
  48. package/dist/cjs/utils/order/index.js +2 -1
  49. package/dist/cjs/utils/order/types.d.ts +2 -2
  50. package/dist/cjs/utils/order/validate-order.js +18 -9
  51. package/dist/cjs/utils/order/versify.d.ts +2 -0
  52. package/dist/cjs/utils/order/versify.js +43 -0
  53. package/dist/mjs/certificates/crl.d.ts +6 -0
  54. package/dist/mjs/certificates/crl.js +39 -0
  55. package/dist/mjs/certificates/helper.d.ts +23 -0
  56. package/dist/mjs/certificates/helper.js +147 -0
  57. package/dist/mjs/certificates/index.d.ts +2 -0
  58. package/dist/mjs/certificates/index.js +3 -0
  59. package/dist/mjs/certificates/ocsp.d.ts +9 -0
  60. package/dist/mjs/certificates/ocsp.js +94 -0
  61. package/dist/mjs/certificates/types.d.ts +4 -0
  62. package/dist/mjs/certificates/types.js +2 -0
  63. package/dist/mjs/constants.d.ts +6 -1
  64. package/dist/mjs/constants.js +7 -2
  65. package/dist/mjs/contracts/abi.d.ts +90 -30
  66. package/dist/mjs/contracts/abi.js +113 -35
  67. package/dist/mjs/crypto/types.d.ts +0 -4
  68. package/dist/mjs/crypto/utils.d.ts +2 -3
  69. package/dist/mjs/crypto/utils.js +46 -26
  70. package/dist/mjs/crypto/utils.spec.d.ts +1 -0
  71. package/dist/mjs/crypto/utils.spec.js +174 -0
  72. package/dist/mjs/index.d.ts +4 -2
  73. package/dist/mjs/index.js +5 -3
  74. package/dist/mjs/models/Offer.d.ts +9 -5
  75. package/dist/mjs/models/Offer.js +24 -13
  76. package/dist/mjs/models/Order.d.ts +1 -1
  77. package/dist/mjs/models/Order.js +4 -2
  78. package/dist/mjs/providers/storage/fs-storage-provider.js +3 -4
  79. package/dist/mjs/staticModels/LoaderSecretsAccessPublicKeys.d.ts +9 -0
  80. package/dist/mjs/staticModels/LoaderSecretsAccessPublicKeys.js +43 -0
  81. package/dist/mjs/staticModels/OfferResources.js +3 -3
  82. package/dist/mjs/staticModels/OffersStorageRequests.js +3 -3
  83. package/dist/mjs/staticModels/Orders.d.ts +3 -3
  84. package/dist/mjs/staticModels/Orders.js +10 -4
  85. package/dist/mjs/staticModels/SecretRequests.js +2 -2
  86. package/dist/mjs/tee/OrderReportService.d.ts +0 -3
  87. package/dist/mjs/tee/OrderReportService.js +12 -29
  88. package/dist/mjs/tee/QuoteValidator.js +2 -2
  89. package/dist/mjs/tee/TeeCertificateService.d.ts +14 -17
  90. package/dist/mjs/tee/TeeCertificateService.js +59 -69
  91. package/dist/mjs/tee/TeeSignatureVerifier.d.ts +2 -2
  92. package/dist/mjs/tee/TeeSignatureVerifier.js +3 -3
  93. package/dist/mjs/types/DistributedSecretStorage.d.ts +1 -1
  94. package/dist/mjs/types/OrderUsage.d.ts +2 -0
  95. package/dist/mjs/types/ValueOfferSlot.d.ts +1 -0
  96. package/dist/mjs/utils/TxManager.js +17 -28
  97. package/dist/mjs/utils/helper.d.ts +2 -2
  98. package/dist/mjs/utils/helper.js +6 -4
  99. package/dist/mjs/utils/order/index.d.ts +1 -0
  100. package/dist/mjs/utils/order/index.js +2 -1
  101. package/dist/mjs/utils/order/types.d.ts +2 -2
  102. package/dist/mjs/utils/order/validate-order.js +18 -9
  103. package/dist/mjs/utils/order/versify.d.ts +2 -0
  104. package/dist/mjs/utils/order/versify.js +36 -0
  105. package/package.json +4 -4
  106. package/dist/cjs/staticModels/LoaderSecretsPublicKeys.d.ts +0 -9
  107. package/dist/cjs/staticModels/LoaderSecretsPublicKeys.js +0 -48
  108. package/dist/mjs/staticModels/LoaderSecretsPublicKeys.d.ts +0 -9
  109. package/dist/mjs/staticModels/LoaderSecretsPublicKeys.js +0 -43
@@ -1,101 +1,88 @@
1
1
  "use strict";
2
- var __importDefault = (this && this.__importDefault) || function (mod) {
3
- return (mod && mod.__esModule) ? mod : { "default": mod };
4
- };
5
2
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.TeeCertificateService = void 0;
7
- const node_forge_1 = __importDefault(require("node-forge"));
8
- const QuoteParser_js_1 = require("./QuoteParser.js");
9
- const QuoteValidator_js_1 = require("./QuoteValidator.js");
3
+ exports.TeeCertificateService = exports.ValidateTeeCertChainErrorCode = void 0;
10
4
  const constants_js_1 = require("../constants.js");
11
5
  const pki_common_1 = require("@super-protocol/pki-common");
12
6
  const TeeSignatureVerifier_js_1 = require("./TeeSignatureVerifier.js");
13
7
  const errors_js_1 = require("./errors.js");
8
+ const index_js_1 = require("../certificates/index.js");
9
+ var ValidateTeeCertChainErrorCode;
10
+ (function (ValidateTeeCertChainErrorCode) {
11
+ ValidateTeeCertChainErrorCode["CERT_CHAIN_IS_INVALID"] = "CERT_CHAIN_IS_INVALID";
12
+ ValidateTeeCertChainErrorCode["NOT_ALLOWED_CHALLENGE"] = "NOT_ALLOWED_CHALLENGE";
13
+ ValidateTeeCertChainErrorCode["CHALLENGE_IS_INVALID"] = "CHALLENGE_IS_INVALID";
14
+ })(ValidateTeeCertChainErrorCode || (exports.ValidateTeeCertChainErrorCode = ValidateTeeCertChainErrorCode = {}));
14
15
  class TeeCertificateService {
15
- certOidQuote = '0.6.9.42.840.113741.1337.6';
16
- getCertificatePublicKey(certificate) {
17
- const publicKeyDer = node_forge_1.default.asn1
18
- .toDer(node_forge_1.default.pki.publicKeyToAsn1(certificate.publicKey))
19
- .getBytes();
20
- return Buffer.from(publicKeyDer, 'binary');
21
- }
22
- async parseAndValidateCertificate(certificatePem, sgxApiUrl) {
23
- const pem = Buffer.isBuffer(certificatePem) ? certificatePem.toString() : certificatePem;
24
- const certificate = node_forge_1.default.pki.certificateFromPem(pem);
25
- const extensions = certificate.extensions;
26
- const quote = extensions.find((ext) => ext.id === this.certOidQuote);
27
- const quoteBuffer = Buffer.from(quote.value, 'binary');
28
- const validator = new QuoteValidator_js_1.QuoteValidator(sgxApiUrl);
29
- await validator.checkQuote(quoteBuffer, this.getCertificatePublicKey(certificate));
30
- const parser = new QuoteParser_js_1.TeeSgxParser();
31
- const parsedQuote = parser.parseQuote(quoteBuffer);
32
- const report = parser.parseReport(parsedQuote.report);
33
- return {
34
- userData: Buffer.from(parsedQuote.header.userData),
35
- mrEnclave: Buffer.from(report.mrEnclave),
36
- mrSigner: Buffer.from(report.mrSigner),
37
- dataHash: Buffer.from(report.dataHash),
38
- };
39
- }
40
- fromRawToPem(data) {
41
- const base64 = Buffer.from(data).toString('base64');
42
- return `-----BEGIN CERTIFICATE-----\n${base64.match(/.{1,64}/g).join('\n')}\n-----END CERTIFICATE-----`;
43
- }
44
- splitPemCerts(certs) {
45
- const pemRegex = /(-----BEGIN CERTIFICATE-----[\s\S]*?-----END CERTIFICATE-----)/g;
46
- return certs.match(pemRegex) || [];
16
+ static async validateTeeCertChainOrFail(certsPem) {
17
+ const result = await TeeCertificateService.validateTeeCertChain(certsPem);
18
+ if (!result.isValid) {
19
+ throw new Error(result.errorMessage);
20
+ }
47
21
  }
48
- validateCertChain(certsPem, caPem) {
49
- const certs = this.splitPemCerts(certsPem).map((cert) => node_forge_1.default.pki.certificateFromPem(cert));
50
- const ca = node_forge_1.default.pki.certificateFromPem(caPem);
51
- try {
52
- return node_forge_1.default.pki.verifyCertificateChain(node_forge_1.default.pki.createCaStore([ca]), certs);
22
+ static async validateTeeCertChain(certsPem) {
23
+ const { isValid, errorMessage } = await index_js_1.CertificatesHelper.validateCertChain(certsPem, constants_js_1.SUPERPROTOCOL_CA);
24
+ if (!isValid) {
25
+ return {
26
+ isValid: false,
27
+ errorCode: ValidateTeeCertChainErrorCode.CERT_CHAIN_IS_INVALID,
28
+ errorMessage: `Cert chain is invalid! (${errorMessage})`,
29
+ };
53
30
  }
54
- catch (err) {
55
- return false;
31
+ const sortedCerts = index_js_1.CertificatesHelper.sortCertsFromLeafToRoot(certsPem);
32
+ const challenges = sortedCerts.map((cert) => index_js_1.CertificatesHelper.getExtensionValue(cert, pki_common_1.OID_CUSTOM_EXTENSION_CHALLENGE_TYPE)?.toString('binary'));
33
+ if (challenges.some((challenge) => !challenge || challenge === pki_common_1.ChallengeType.Untrusted)) {
34
+ return {
35
+ isValid: false,
36
+ errorCode: ValidateTeeCertChainErrorCode.NOT_ALLOWED_CHALLENGE,
37
+ errorMessage: `Cert chain has cert without or Untrusted challenge`,
38
+ };
56
39
  }
57
- }
58
- getExtensionValue(certPem, oid) {
59
- const cert = node_forge_1.default.pki.certificateFromPem(certPem);
60
- const extension = cert.extensions.find((ext) => ext.id === oid);
61
- return extension?.value;
62
- }
63
- async validateTeeReportCertChain(certsPem) {
64
- const isCertChainValid = this.validateCertChain(certsPem, constants_js_1.SUPERPROTOCOL_CA);
65
- if (!isCertChainValid) {
66
- throw new Error(`Cert chain is invalid!`);
40
+ const leafCertChallengeType = challenges[0];
41
+ try {
42
+ switch (leafCertChallengeType) {
43
+ case pki_common_1.ChallengeType.SGXDCAP:
44
+ TeeCertificateService.validateChallengeSgx(certsPem);
45
+ break;
46
+ case pki_common_1.ChallengeType.TDX:
47
+ case pki_common_1.ChallengeType.AMDSEV:
48
+ await TeeCertificateService.validateChallengeTdxAndSnp(certsPem);
49
+ break;
50
+ default:
51
+ return {
52
+ isValid: false,
53
+ errorCode: ValidateTeeCertChainErrorCode.NOT_ALLOWED_CHALLENGE,
54
+ errorMessage: `Challenge type ${leafCertChallengeType || `[none]`} is missing or not allowed!`,
55
+ };
56
+ }
67
57
  }
68
- const challengeType = this.getExtensionValue(certsPem, pki_common_1.OID_CUSTOM_EXTENSION_CHALLENGE_TYPE);
69
- switch (challengeType) {
70
- case pki_common_1.ChallengeType.SGXDCAP:
71
- this.validateChallengeSgx(certsPem);
72
- break;
73
- case pki_common_1.ChallengeType.TDX:
74
- await this.validateChallengeTdx(certsPem);
75
- break;
76
- default:
77
- throw new Error(`Challenge type ${challengeType || `[none]`} is missing or not allowed!`);
58
+ catch (err) {
59
+ return {
60
+ isValid: false,
61
+ errorCode: ValidateTeeCertChainErrorCode.CHALLENGE_IS_INVALID,
62
+ errorMessage: `Challenge is not valid! (${err.message})`,
63
+ };
78
64
  }
65
+ return { isValid: true };
79
66
  }
80
- validateChallengeSgx(certPem) {
81
- const mrSignerBinaryString = this.getExtensionValue(certPem, pki_common_1.OID_CUSTOM_EXTENSION_CHALLENGE_COMMON_ID);
67
+ static validateChallengeSgx(certPem) {
68
+ const mrSignerBinaryString = index_js_1.CertificatesHelper.getExtensionValue(certPem, pki_common_1.OID_CUSTOM_EXTENSION_CHALLENGE_COMMON_ID);
82
69
  if (!mrSignerBinaryString) {
83
70
  throw new Error(`SGX challenge signature is wrong!`);
84
71
  }
85
72
  try {
86
- TeeSignatureVerifier_js_1.TeeSignatureVerifier.validateSignatureSgx(Buffer.from(mrSignerBinaryString, 'binary'));
73
+ TeeSignatureVerifier_js_1.TeeSignatureVerifier.validateSignatureSgx(mrSignerBinaryString);
87
74
  }
88
75
  catch (err) {
89
76
  throw new Error(`SGX challenge signature is wrong!`);
90
77
  }
91
78
  }
92
- async validateChallengeTdx(certPem) {
93
- const mrEnclaveBinaryString = this.getExtensionValue(certPem, pki_common_1.OID_CUSTOM_EXTENSION_CHALLENGE_ID);
79
+ static async validateChallengeTdxAndSnp(certPem) {
80
+ const mrEnclaveBinaryString = index_js_1.CertificatesHelper.getExtensionValue(certPem, pki_common_1.OID_CUSTOM_EXTENSION_CHALLENGE_ID);
94
81
  if (!mrEnclaveBinaryString) {
95
82
  throw new Error(`Challenge id is missing in certificate!`);
96
83
  }
97
84
  try {
98
- await TeeSignatureVerifier_js_1.TeeSignatureVerifier.validateSignatureTdx(Buffer.from(mrEnclaveBinaryString, 'binary'));
85
+ await TeeSignatureVerifier_js_1.TeeSignatureVerifier.validateSignatureTdxAndSnp(mrEnclaveBinaryString);
99
86
  }
100
87
  catch (err) {
101
88
  const message = `Tdx signature is invalid!`;
@@ -107,4 +94,4 @@ class TeeCertificateService {
107
94
  }
108
95
  }
109
96
  exports.TeeCertificateService = TeeCertificateService;
110
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVGVlQ2VydGlmaWNhdGVTZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3RlZS9UZWVDZXJ0aWZpY2F0ZVNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsNERBQStCO0FBQy9CLHFEQUFnRDtBQUNoRCwyREFBcUQ7QUFDckQsa0RBQW1EO0FBQ25ELDJEQUtvQztBQUNwQyx1RUFBaUU7QUFDakUsMkNBQW9EO0FBU3BELE1BQWEscUJBQXFCO0lBQ2YsWUFBWSxHQUFHLDRCQUE0QixDQUFDO0lBRXJELHVCQUF1QixDQUFDLFdBQWtDO1FBQ2hFLE1BQU0sWUFBWSxHQUFHLG9CQUFLLENBQUMsSUFBSTthQUM1QixLQUFLLENBQUMsb0JBQUssQ0FBQyxHQUFHLENBQUMsZUFBZSxDQUFDLFdBQVcsQ0FBQyxTQUFTLENBQUMsQ0FBQzthQUN2RCxRQUFRLEVBQUUsQ0FBQztRQUVkLE9BQU8sTUFBTSxDQUFDLElBQUksQ0FBQyxZQUFZLEVBQUUsUUFBUSxDQUFDLENBQUM7SUFDN0MsQ0FBQztJQUVELEtBQUssQ0FBQywyQkFBMkIsQ0FDL0IsY0FBK0IsRUFDL0IsU0FBaUI7UUFFakIsTUFBTSxHQUFHLEdBQUcsTUFBTSxDQUFDLFFBQVEsQ0FBQyxjQUFjLENBQUMsQ0FBQyxDQUFDLENBQUMsY0FBYyxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUMsQ0FBQyxjQUFjLENBQUM7UUFDekYsTUFBTSxXQUFXLEdBQUcsb0JBQUssQ0FBQyxHQUFHLENBQUMsa0JBQWtCLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDdEQsTUFBTSxVQUFVLEdBQUcsV0FBVyxDQUFDLFVBQVUsQ0FBQztRQUUxQyxNQUFNLEtBQUssR0FBRyxVQUFVLENBQUMsSUFBSSxDQUFDLENBQUMsR0FBRyxFQUFFLEVBQUUsQ0FBQyxHQUFHLENBQUMsRUFBRSxLQUFLLElBQUksQ0FBQyxZQUFZLENBQUMsQ0FBQztRQUNyRSxNQUFNLFdBQVcsR0FBRyxNQUFNLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxLQUFLLEVBQUUsUUFBUSxDQUFDLENBQUM7UUFDdkQsTUFBTSxTQUFTLEdBQUcsSUFBSSxrQ0FBYyxDQUFDLFNBQVMsQ0FBQyxDQUFDO1FBQ2hELE1BQU0sU0FBUyxDQUFDLFVBQVUsQ0FBQyxXQUFXLEVBQUUsSUFBSSxDQUFDLHVCQUF1QixDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUM7UUFFbkYsTUFBTSxNQUFNLEdBQUcsSUFBSSw2QkFBWSxFQUFFLENBQUM7UUFDbEMsTUFBTSxXQUFXLEdBQUcsTUFBTSxDQUFDLFVBQVUsQ0FBQyxXQUFXLENBQUMsQ0FBQztRQUNuRCxNQUFNLE1BQU0sR0FBRyxNQUFNLENBQUMsV0FBVyxDQUFDLFdBQVcsQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUV0RCxPQUFPO1lBQ0wsUUFBUSxFQUFFLE1BQU0sQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUM7WUFDbEQsU0FBUyxFQUFFLE1BQU0sQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLFNBQVMsQ0FBQztZQUN4QyxRQUFRLEVBQUUsTUFBTSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDO1lBQ3RDLFFBQVEsRUFBRSxNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUM7U0FDdkMsQ0FBQztJQUNKLENBQUM7SUFFRCxZQUFZLENBQUMsSUFBZ0I7UUFDM0IsTUFBTSxNQUFNLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxRQUFRLENBQUMsUUFBUSxDQUFDLENBQUM7UUFDcEQsT0FBTyxnQ0FBZ0MsTUFBTSxDQUFDLEtBQUssQ0FBQyxVQUFVLENBQUUsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLDZCQUE2QixDQUFDO0lBQzNHLENBQUM7SUFFRCxhQUFhLENBQUMsS0FBYTtRQUN6QixNQUFNLFFBQVEsR0FBRyxpRUFBaUUsQ0FBQztRQUNuRixPQUFPLEtBQUssQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLElBQUksRUFBRSxDQUFDO0lBQ3JDLENBQUM7SUFFRCxpQkFBaUIsQ0FBQyxRQUFnQixFQUFFLEtBQWE7UUFDL0MsTUFBTSxLQUFLLEdBQUcsSUFBSSxDQUFDLGFBQWEsQ0FBQyxRQUFRLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLEVBQUUsRUFBRSxDQUFDLG9CQUFLLENBQUMsR0FBRyxDQUFDLGtCQUFrQixDQUFDLElBQUksQ0FBQyxDQUFDLENBQUM7UUFDN0YsTUFBTSxFQUFFLEdBQUcsb0JBQUssQ0FBQyxHQUFHLENBQUMsa0JBQWtCLENBQUMsS0FBSyxDQUFDLENBQUM7UUFFL0MsSUFBSSxDQUFDO1lBQ0gsT0FBTyxvQkFBSyxDQUFDLEdBQUcsQ0FBQyxzQkFBc0IsQ0FBQyxvQkFBSyxDQUFDLEdBQUcsQ0FBQyxhQUFhLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxFQUFFLEtBQUssQ0FBQyxDQUFDO1FBQ2hGLENBQUM7UUFBQyxPQUFPLEdBQUcsRUFBRSxDQUFDO1lBQ2IsT0FBTyxLQUFLLENBQUM7UUFDZixDQUFDO0lBQ0gsQ0FBQztJQUVELGlCQUFpQixDQUFDLE9BQWUsRUFBRSxHQUFXO1FBQzVDLE1BQU0sSUFBSSxHQUFHLG9CQUFLLENBQUMsR0FBRyxDQUFDLGtCQUFrQixDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ25ELE1BQU0sU0FBUyxHQUFHLElBQUksQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLENBQUMsR0FBRyxFQUFFLEVBQUUsQ0FBQyxHQUFHLENBQUMsRUFBRSxLQUFLLEdBQUcsQ0FBQyxDQUFDO1FBQ2hFLE9BQU8sU0FBUyxFQUFFLEtBQUssQ0FBQztJQUMxQixDQUFDO0lBRUQsS0FBSyxDQUFDLDBCQUEwQixDQUFDLFFBQWdCO1FBQy9DLE1BQU0sZ0JBQWdCLEdBQUcsSUFBSSxDQUFDLGlCQUFpQixDQUFDLFFBQVEsRUFBRSwrQkFBZ0IsQ0FBQyxDQUFDO1FBQzVFLElBQUksQ0FBQyxnQkFBZ0IsRUFBRSxDQUFDO1lBQ3RCLE1BQU0sSUFBSSxLQUFLLENBQUMsd0JBQXdCLENBQUMsQ0FBQztRQUM1QyxDQUFDO1FBRUQsTUFBTSxhQUFhLEdBQUcsSUFBSSxDQUFDLGlCQUFpQixDQUFDLFFBQVEsRUFBRSxnREFBbUMsQ0FBQyxDQUFDO1FBRTVGLFFBQVEsYUFBYSxFQUFFLENBQUM7WUFDdEIsS0FBSywwQkFBYSxDQUFDLE9BQU87Z0JBQ3hCLElBQUksQ0FBQyxvQkFBb0IsQ0FBQyxRQUFRLENBQUMsQ0FBQztnQkFDcEMsTUFBTTtZQUNSLEtBQUssMEJBQWEsQ0FBQyxHQUFHO2dCQUNwQixNQUFNLElBQUksQ0FBQyxvQkFBb0IsQ0FBQyxRQUFRLENBQUMsQ0FBQztnQkFDMUMsTUFBTTtZQUNSO2dCQUNFLE1BQU0sSUFBSSxLQUFLLENBQUMsa0JBQWtCLGFBQWEsSUFBSSxRQUFRLDZCQUE2QixDQUFDLENBQUM7UUFDOUYsQ0FBQztJQUNILENBQUM7SUFFTyxvQkFBb0IsQ0FBQyxPQUFlO1FBQzFDLE1BQU0sb0JBQW9CLEdBQUcsSUFBSSxDQUFDLGlCQUFpQixDQUNqRCxPQUFPLEVBQ1AscURBQXdDLENBQ3pDLENBQUM7UUFDRixJQUFJLENBQUMsb0JBQW9CLEVBQUUsQ0FBQztZQUMxQixNQUFNLElBQUksS0FBSyxDQUFDLG1DQUFtQyxDQUFDLENBQUM7UUFDdkQsQ0FBQztRQUVELElBQUksQ0FBQztZQUNILDhDQUFvQixDQUFDLG9CQUFvQixDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsb0JBQW9CLEVBQUUsUUFBUSxDQUFDLENBQUMsQ0FBQztRQUN6RixDQUFDO1FBQUMsT0FBTyxHQUFHLEVBQUUsQ0FBQztZQUNiLE1BQU0sSUFBSSxLQUFLLENBQUMsbUNBQW1DLENBQUMsQ0FBQztRQUN2RCxDQUFDO0lBQ0gsQ0FBQztJQUVPLEtBQUssQ0FBQyxvQkFBb0IsQ0FBQyxPQUFlO1FBQ2hELE1BQU0scUJBQXFCLEdBQUcsSUFBSSxDQUFDLGlCQUFpQixDQUNsRCxPQUFPLEVBQ1AsOENBQWlDLENBQ2xDLENBQUM7UUFDRixJQUFJLENBQUMscUJBQXFCLEVBQUUsQ0FBQztZQUMzQixNQUFNLElBQUksS0FBSyxDQUFDLHlDQUF5QyxDQUFDLENBQUM7UUFDN0QsQ0FBQztRQUVELElBQUksQ0FBQztZQUNILE1BQU0sOENBQW9CLENBQUMsb0JBQW9CLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxxQkFBcUIsRUFBRSxRQUFRLENBQUMsQ0FBQyxDQUFDO1FBQ2hHLENBQUM7UUFBQyxPQUFPLEdBQUcsRUFBRSxDQUFDO1lBQ2IsTUFBTSxPQUFPLEdBQUcsMkJBQTJCLENBQUM7WUFDNUMsSUFBSSxHQUFHLFlBQVksaUNBQXFCLEVBQUUsQ0FBQztnQkFDekMsTUFBTSxJQUFJLEtBQUssQ0FBQyxHQUFHLE9BQU8sSUFBSSxHQUFHLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FBQztZQUMvQyxDQUFDO1lBQ0QsTUFBTSxJQUFJLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUMzQixDQUFDO0lBQ0gsQ0FBQztDQUNGO0FBdEhELHNEQXNIQyJ9
97
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVGVlQ2VydGlmaWNhdGVTZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3RlZS9UZWVDZXJ0aWZpY2F0ZVNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsa0RBQW1EO0FBQ25ELDJEQUtvQztBQUNwQyx1RUFBaUU7QUFDakUsMkNBQW9EO0FBQ3BELHVEQUE4RDtBQUU5RCxJQUFZLDZCQUlYO0FBSkQsV0FBWSw2QkFBNkI7SUFDdkMsZ0ZBQStDLENBQUE7SUFDL0MsZ0ZBQStDLENBQUE7SUFDL0MsOEVBQTZDLENBQUE7QUFDL0MsQ0FBQyxFQUpXLDZCQUE2Qiw2Q0FBN0IsNkJBQTZCLFFBSXhDO0FBT0QsTUFBYSxxQkFBcUI7SUFDaEMsTUFBTSxDQUFDLEtBQUssQ0FBQywwQkFBMEIsQ0FBQyxRQUFnQjtRQUN0RCxNQUFNLE1BQU0sR0FBRyxNQUFNLHFCQUFxQixDQUFDLG9CQUFvQixDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBQzFFLElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTyxFQUFFLENBQUM7WUFDcEIsTUFBTSxJQUFJLEtBQUssQ0FBQyxNQUFNLENBQUMsWUFBWSxDQUFDLENBQUM7UUFDdkMsQ0FBQztJQUNILENBQUM7SUFFRCxNQUFNLENBQUMsS0FBSyxDQUFDLG9CQUFvQixDQUFDLFFBQWdCO1FBQ2hELE1BQU0sRUFBRSxPQUFPLEVBQUUsWUFBWSxFQUFFLEdBQUcsTUFBTSw2QkFBa0IsQ0FBQyxpQkFBaUIsQ0FDMUUsUUFBUSxFQUNSLCtCQUFnQixDQUNqQixDQUFDO1FBRUYsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO1lBQ2IsT0FBTztnQkFDTCxPQUFPLEVBQUUsS0FBSztnQkFDZCxTQUFTLEVBQUUsNkJBQTZCLENBQUMscUJBQXFCO2dCQUM5RCxZQUFZLEVBQUUsMkJBQTJCLFlBQVksR0FBRzthQUN6RCxDQUFDO1FBQ0osQ0FBQztRQUVELE1BQU0sV0FBVyxHQUFHLDZCQUFrQixD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
@@ -12,12 +12,12 @@ export declare class TeeSignatureVerifier {
12
12
  */
13
13
  static validateSignatureSgx(mrSigner: BinaryType): void;
14
14
  /**
15
- * Validates TDX TEE signature by verifying the MRENCLAVE
15
+ * Validates TDX and SEV-SNP TEE signature by verifying the MRENCLAVE
16
16
  * @param mrEnclave - Binary measurement of the TEE environment to verify
17
17
  * @param options - Configuration for signature validation
18
18
  * @param options.getMrEnclaveSignature - Function to retrieve signature for verification (defaults to TeeSignatureVerifier.getSignature)
19
19
  * @throws Error If signature validation fails or signature cannot be retrieved
20
20
  */
21
- static validateSignatureTdx(mrEnclave: BinaryType, options?: CheckSignatureOptions): Promise<void>;
21
+ static validateSignatureTdxAndSnp(mrEnclave: BinaryType, options?: CheckSignatureOptions): Promise<void>;
22
22
  static getSignature(mrEnclave: Buffer, options?: GetTdxSignatureOptions): Promise<Buffer>;
23
23
  }
@@ -21,13 +21,13 @@ class TeeSignatureVerifier {
21
21
  }
22
22
  }
23
23
  /**
24
- * Validates TDX TEE signature by verifying the MRENCLAVE
24
+ * Validates TDX and SEV-SNP TEE signature by verifying the MRENCLAVE
25
25
  * @param mrEnclave - Binary measurement of the TEE environment to verify
26
26
  * @param options - Configuration for signature validation
27
27
  * @param options.getMrEnclaveSignature - Function to retrieve signature for verification (defaults to TeeSignatureVerifier.getSignature)
28
28
  * @throws Error If signature validation fails or signature cannot be retrieved
29
29
  */
30
- static async validateSignatureTdx(mrEnclave, options = { getMrEnclaveSignature: TeeSignatureVerifier.getSignature }) {
30
+ static async validateSignatureTdxAndSnp(mrEnclave, options = { getMrEnclaveSignature: TeeSignatureVerifier.getSignature }) {
31
31
  const { getMrEnclaveSignature } = options;
32
32
  const cert = node_forge_1.default.pki.certificateFromPem(constants_js_1.TEE_LOADER_TRUSTED_CERTIFICATE);
33
33
  const isCertValid = node_forge_1.default.pki.verifyCertificateChain(node_forge_1.default.pki.createCaStore([cert]), [cert]);
@@ -88,4 +88,4 @@ class TeeSignatureVerifier {
88
88
  }
89
89
  }
90
90
  exports.TeeSignatureVerifier = TeeSignatureVerifier;
91
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVGVlU2lnbmF0dXJlVmVyaWZpZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdGVlL1RlZVNpZ25hdHVyZVZlcmlmaWVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLGtEQUE2QztBQUM3Qyw0REFBK0I7QUFDL0Isa0RBQThGO0FBQzlGLDBDQUFvRDtBQUVwRCx3REFBNEQ7QUFPNUQsTUFBYSxvQkFBb0I7SUFDL0I7Ozs7T0FJRztJQUNILE1BQU0sQ0FBQyxvQkFBb0IsQ0FBQyxRQUFvQjtRQUM5QyxJQUFJLFFBQVEsQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLEtBQUssMENBQTJCLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUM7WUFDN0UsTUFBTSxJQUFJLGdDQUFxQixDQUFDLGdDQUFnQyxDQUFDLENBQUM7UUFDcEUsQ0FBQztJQUNILENBQUM7SUFFRDs7Ozs7O09BTUc7SUFDSCxNQUFNLENBQUMsS0FBSyxDQUFDLG9CQUFvQixDQUMvQixTQUFxQixFQUNyQixVQUFpQyxFQUFFLHFCQUFxQixFQUFFLG9CQUFvQixDQUFDLFlBQVksRUFBRTtRQUU3RixNQUFNLEVBQUUscUJBQXFCLEVBQUUsR0FBRyxPQUFPLENBQUM7UUFDMUMsTUFBTSxJQUFJLEdBQUcsb0JBQUssQ0FBQyxHQUFHLENBQUMsa0JBQWtCLENBQUMsNkNBQThCLENBQUMsQ0FBQztRQUMxRSxNQUFNLFdBQVcsR0FBRyxvQkFBSyxDQUFDLEdBQUcsQ0FBQyxzQkFBc0IsQ0FBQyxvQkFBSyxDQUFDLEdBQUcsQ0FBQyxhQUFhLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztRQUM5RixJQUFJLENBQUMsV0FBVyxFQUFFLENBQUM7WUFDakIsTUFBTSxJQUFJLEtBQUssQ0FBQyx5QkFBeUIsQ0FBQyxDQUFDO1FBQzdDLENBQUM7UUFFRCxNQUFNLFNBQVMsR0FBRyxJQUFJLENB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
91
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVGVlU2lnbmF0dXJlVmVyaWZpZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdGVlL1RlZVNpZ25hdHVyZVZlcmlmaWVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLGtEQUE2QztBQUM3Qyw0REFBK0I7QUFDL0Isa0RBQThGO0FBQzlGLDBDQUFvRDtBQUVwRCx3REFBNEQ7QUFPNUQsTUFBYSxvQkFBb0I7SUFDL0I7Ozs7T0FJRztJQUNILE1BQU0sQ0FBQyxvQkFBb0IsQ0FBQyxRQUFvQjtRQUM5QyxJQUFJLFFBQVEsQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLEtBQUssMENBQTJCLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUM7WUFDN0UsTUFBTSxJQUFJLGdDQUFxQixDQUFDLGdDQUFnQyxDQUFDLENBQUM7UUFDcEUsQ0FBQztJQUNILENBQUM7SUFFRDs7Ozs7O09BTUc7SUFDSCxNQUFNLENBQUMsS0FBSyxDQUFDLDBCQUEwQixDQUNyQyxTQUFxQixFQUNyQixVQUFpQyxFQUFFLHFCQUFxQixFQUFFLG9CQUFvQixDQUFDLFlBQVksRUFBRTtRQUU3RixNQUFNLEVBQUUscUJBQXFCLEVBQUUsR0FBRyxPQUFPLENBQUM7UUFDMUMsTUFBTSxJQUFJLEdBQUcsb0JBQUssQ0FBQyxHQUFHLENBQUMsa0JBQWtCLENBQUMsNkNBQThCLENBQUMsQ0FBQztRQUMxRSxNQUFNLFdBQVcsR0FBRyxvQkFBSyxDQUFDLEdBQUcsQ0FBQyxzQkFBc0IsQ0FBQyxvQkFBSyxDQUFDLEdBQUcsQ0FBQyxhQUFhLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztRQUM5RixJQUFJLENBQUMsV0FBVyxFQUFFLENBQUM7WUFDakIsTUFBTSxJQUFJLEtBQUssQ0FBQyx5QkFBeUIsQ0FBQyxDQUFDO1FBQzdDLENBQUM7UUFFRCxNQUFNLFNBQVMsR0FBRyxJQUFJLENB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
@@ -12,7 +12,7 @@ export type Signature = {
12
12
  s: Uint8Array;
13
13
  v: number;
14
14
  };
15
- export type LoaderSecretPublicKey = {
15
+ export type LoaderSecretAccessPublicKey = {
16
16
  secretPublicKey: PublicKey;
17
17
  signature: Signature;
18
18
  signedTime: number;
@@ -16,6 +16,7 @@ export type OrderUsage = OrderUsageBase & {
16
16
  optionsCount: number[];
17
17
  slotInfo: SlotInfo;
18
18
  slotUsage: SlotUsage;
19
+ slotId: BlockchainId;
19
20
  };
20
21
  export type OrderUsageRaw = OrderUsageBase & {
21
22
  slotCount: number;
@@ -23,4 +24,5 @@ export type OrderUsageRaw = OrderUsageBase & {
23
24
  optionUsage: SlotUsage[];
24
25
  optionIds: BlockchainId[];
25
26
  optionsCount: number[];
27
+ slotId: BlockchainId;
26
28
  };
@@ -6,6 +6,7 @@ type ValueOfferSlotBase = {
6
6
  id: BlockchainId;
7
7
  info: SlotInfo;
8
8
  usage: SlotUsage;
9
+ metadata: string;
9
10
  };
10
11
  export type ValueOfferSlot = ValueOfferSlotBase & {
11
12
  option: OptionInfo;
@@ -129,36 +129,25 @@ class TxManager {
129
129
  maxPriorityFeePerGas,
130
130
  maxFeePerGas,
131
131
  };
132
- let estimatedGas;
133
- if (transactionCall) {
134
- try {
135
- estimatedGas = await transactionCall.estimateGas(txData);
136
- }
137
- catch (e) {
138
- TxManager.logger.debug({ error: e }, 'Fail to calculate estimated gas');
139
- estimatedGas = constants_js_1.defaultGasLimit;
140
- }
132
+ if (transactionOptions.gas) {
133
+ TxManager.logger.warn({
134
+ specifiedGas: transactionOptions.gas,
135
+ }, 'Gas overriding');
136
+ txData.gas = transactionOptions.gas;
141
137
  }
142
138
  else {
143
- try {
144
- estimatedGas = await store_js_1.default.web3Https.eth.estimateGas(txData);
145
- }
146
- catch (e) {
147
- TxManager.logger.debug({ error: e }, 'Fail to calculate estimated gas');
148
- estimatedGas = constants_js_1.defaultGasLimit;
139
+ let estimatedGas;
140
+ const txDataForEstimate = {
141
+ ...txData,
142
+ gas: undefined,
143
+ };
144
+ if (transactionCall) {
145
+ estimatedGas = await transactionCall.estimateGas(txDataForEstimate);
149
146
  }
150
- }
151
- txData.gas = (0, helper_js_1.multiplyBigIntByNumber)(estimatedGas, store_js_1.default.gasLimitMultiplier);
152
- // defaultGasLimit is max gas limit
153
- txData.gas = txData.gas < constants_js_1.defaultGasLimit ? txData.gas : constants_js_1.defaultGasLimit;
154
- if (transactionOptions.gas) {
155
- if (transactionOptions.gas < estimatedGas) {
156
- TxManager.logger.warn({
157
- estimated: estimatedGas,
158
- specified: transactionOptions.gas,
159
- }, 'Overriding gas is lower than estimated');
147
+ else {
148
+ estimatedGas = await store_js_1.default.web3Https.eth.estimateGas(txDataForEstimate);
160
149
  }
161
- txData.gas = transactionOptions.gas;
150
+ txData.gas = (0, helper_js_1.multiplyBigIntByNumber)(estimatedGas, store_js_1.default.gasLimitMultiplier);
162
151
  }
163
152
  let nonceTracker;
164
153
  // TODO: Consider a better way to organize different strategies for publishing transactions.
@@ -211,4 +200,4 @@ class TxManager {
211
200
  }
212
201
  }
213
202
  exports.default = TxManager;
214
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"TxManager.js","sourceRoot":"","sources":["../../../src/utils/TxManager.ts"],"names":[],"mappings":"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"}
203
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"TxManager.js","sourceRoot":"","sources":["../../../src/utils/TxManager.ts"],"names":[],"mappings":"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"}
@@ -2,7 +2,7 @@ import { TransactionOptions } from '../types/Web3.js';
2
2
  import Web3 from 'web3';
3
3
  import { Web3BatchRequest } from 'web3-core';
4
4
  import { SlotInfo } from '../types/SlotInfo.js';
5
- import { ConsensusBenchmarkStorage, LoaderSecretPublicKey, LoaderSession, OfferResource, OfferStorageAllocated, OfferStorageRequest, OptionInfo, OptionInfoRaw, OrderUsage, OrderUsageRaw, SecretRequest, SlotUsage, TcbPublicData, TeeOfferOption, TeeOfferOptionRaw, TeeOfferSlot, ValueOfferSlot, ValueOfferSlotRaw, ConsensusBenchmarkPriceMultipliers } from '../types/index.js';
5
+ import { ConsensusBenchmarkStorage, LoaderSecretAccessPublicKey, LoaderSession, OfferResource, OfferStorageAllocated, OfferStorageRequest, OptionInfo, OptionInfoRaw, OrderUsage, OrderUsageRaw, SecretRequest, SlotUsage, TcbPublicData, TeeOfferOption, TeeOfferOptionRaw, TeeOfferSlot, ValueOfferSlot, ValueOfferSlotRaw, ConsensusBenchmarkPriceMultipliers } from '../types/index.js';
6
6
  import { BenchmarkInfo, ConsensusBenchmark } from '@super-protocol/dto-js';
7
7
  /**
8
8
  * Function for checking if provider action account initialized (required for set methods)
@@ -27,7 +27,7 @@ export declare function packDeviceId(hexedDeviceId: string): string;
27
27
  export declare function unpackDeviceId(bytes32: string): string;
28
28
  export declare function convertBigIntToString(obj: any): any;
29
29
  export declare function convertTeeOfferOptionFromRaw(option: TeeOfferOptionRaw): TeeOfferOption;
30
- export declare function convertLoaderSecretPublicKeyFromRaw(loaderSecretPublicKeyRaw: LoaderSecretPublicKey): LoaderSecretPublicKey;
30
+ export declare function convertLoaderSecretAccessPublicKeyFromRaw(loaderSecretAccessPublicKeyRaw: LoaderSecretAccessPublicKey): LoaderSecretAccessPublicKey;
31
31
  export declare function convertLoaderSessionFromRaw(loaderSessionRaw: LoaderSession): LoaderSession;
32
32
  export declare function convertOfferResourceFromRaw(offerResourceRaw: OfferResource): OfferResource;
33
33
  export declare function convertSecretRequestFromRaw(secretRequestRaw: SecretRequest): SecretRequest;
@@ -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.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.formatTcbPublicData = exports.convertOfferStorageRequestFromRaw = exports.convertOfferStorageAllocatedFromRaw = exports.convertSecretRequestFromRaw = exports.convertOfferResourceFromRaw = exports.convertLoaderSessionFromRaw = exports.convertLoaderSecretPublicKeyFromRaw = exports.convertTeeOfferOptionFromRaw = exports.convertBigIntToString = exports.unpackDeviceId = exports.packDeviceId = exports.incrementMethodCall = exports.isNodeJS = exports.createTransactionOptions = exports.multiplyBigIntByNumber = exports.getMaxPriorityFeePerGas = exports.getBaseBlockFee = exports.checkForUsingExternalTxManager = exports.checkIfActionAccountInitialized = void 0;
6
+ 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.formatTcbPublicData = exports.convertOfferStorageRequestFromRaw = exports.convertOfferStorageAllocatedFromRaw = exports.convertSecretRequestFromRaw = exports.convertOfferResourceFromRaw = exports.convertLoaderSessionFromRaw = exports.convertLoaderSecretAccessPublicKeyFromRaw = exports.convertTeeOfferOptionFromRaw = exports.convertBigIntToString = exports.unpackDeviceId = exports.packDeviceId = exports.incrementMethodCall = exports.isNodeJS = exports.createTransactionOptions = exports.multiplyBigIntByNumber = exports.getMaxPriorityFeePerGas = exports.getBaseBlockFee = exports.checkForUsingExternalTxManager = exports.checkIfActionAccountInitialized = void 0;
7
7
  const store_js_1 = __importDefault(require("../store.js"));
8
8
  const web3_1 = __importDefault(require("web3"));
9
9
  const Monitoring_js_1 = require("./Monitoring.js");
@@ -111,7 +111,7 @@ const createTransactionOptions = async (externalTransactionSigner, options) => {
111
111
  throw Error('web3 is undefined, define it in transaction options or initialize BlockchainConnector with web3 instance.');
112
112
  }
113
113
  const baseFee = await (0, exports.getBaseBlockFee)(web3);
114
- options.maxFeePerGas = (0, exports.multiplyBigIntByNumber)(baseFee > options.maxPriorityFeePerGas ? baseFee : options.maxPriorityFeePerGas, store_js_1.default.maxFeePerGasMultiplier);
114
+ options.maxFeePerGas = (0, exports.multiplyBigIntByNumber)(options.maxPriorityFeePerGas + baseFee, store_js_1.default.maxFeePerGasMultiplier);
115
115
  }
116
116
  delete options.web3;
117
117
  return options;
@@ -204,8 +204,8 @@ function transformSignatureFromRaw(signature) {
204
204
  s: typeof signature.s === 'string' ? ethers_1.ethers.utils.arrayify(signature.s) : signature.s,
205
205
  };
206
206
  }
207
- function convertLoaderSecretPublicKeyFromRaw(loaderSecretPublicKeyRaw) {
208
- const loaderSecretPublicKey = (0, exports.cleanWeb3Data)({ ...loaderSecretPublicKeyRaw });
207
+ function convertLoaderSecretAccessPublicKeyFromRaw(loaderSecretAccessPublicKeyRaw) {
208
+ const loaderSecretPublicKey = (0, exports.cleanWeb3Data)({ ...loaderSecretAccessPublicKeyRaw });
209
209
  const secretPublicKey = transformPublicKeyFromRaw(loaderSecretPublicKey.secretPublicKey);
210
210
  const signature = transformSignatureFromRaw(loaderSecretPublicKey.signature);
211
211
  return {
@@ -216,7 +216,7 @@ function convertLoaderSecretPublicKeyFromRaw(loaderSecretPublicKeyRaw) {
216
216
  timestamp: Number(loaderSecretPublicKey.timestamp),
217
217
  };
218
218
  }
219
- exports.convertLoaderSecretPublicKeyFromRaw = convertLoaderSecretPublicKeyFromRaw;
219
+ exports.convertLoaderSecretAccessPublicKeyFromRaw = convertLoaderSecretAccessPublicKeyFromRaw;
220
220
  function convertLoaderSessionFromRaw(loaderSessionRaw) {
221
221
  const loaderSession = (0, exports.cleanWeb3Data)({ ...loaderSessionRaw });
222
222
  const sessionPublicKey = transformPublicKeyFromRaw(loaderSession.sessionPublicKey);
@@ -306,6 +306,7 @@ function formatOfferSlot(slot, coresDenominator) {
306
306
  option: convertOptionInfoFromRaw(slot.option),
307
307
  info: unpackSlotInfo(slot.info, coresDenominator),
308
308
  usage: formatUsage(slot.usage),
309
+ metadata: slot.metadata,
309
310
  };
310
311
  }
311
312
  exports.formatOfferSlot = formatOfferSlot;
@@ -377,6 +378,7 @@ function convertOrderUsage(usage, slotInfo, slotUsage) {
377
378
  optionsCount: usage.optionsCount,
378
379
  slotInfo,
379
380
  slotUsage,
381
+ slotId: usage.slotId,
380
382
  };
381
383
  }
382
384
  exports.convertOrderUsage = convertOrderUsage;
@@ -479,4 +481,4 @@ const preparePrivateKey = (pk) => {
479
481
  return pk.startsWith('0x') ? pk : '0x' + pk;
480
482
  };
481
483
  exports.preparePrivateKey = preparePrivateKey;
482
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"helper.js","sourceRoot":"","sources":["../../../src/utils/helper.ts"],"names":[],"mappings":"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"}
484
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"helper.js","sourceRoot":"","sources":["../../../src/utils/helper.ts"],"names":[],"mappings":"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"}
@@ -1,3 +1,4 @@
1
1
  export * from './complete-order.js';
2
2
  export * from './types.js';
3
3
  export * from './validate-order.js';
4
+ export * from './versify.js';
@@ -17,4 +17,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
17
17
  __exportStar(require("./complete-order.js"), exports);
18
18
  __exportStar(require("./types.js"), exports);
19
19
  __exportStar(require("./validate-order.js"), exports);
20
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvdXRpbHMvb3JkZXIvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHNEQUFvQztBQUNwQyw2Q0FBMkI7QUFDM0Isc0RBQW9DIn0=
20
+ __exportStar(require("./versify.js"), exports);
21
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvdXRpbHMvb3JkZXIvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHNEQUFvQztBQUNwQyw2Q0FBMkI7QUFDM0Isc0RBQW9DO0FBQ3BDLCtDQUE2QiJ9
@@ -1,5 +1,5 @@
1
1
  import { Encryption, StorageProviderResource } from '@super-protocol/dto-js';
2
- import { BlockchainId, OfferInfo, OfferType, OrderArgs, OrderInfo, OrderStatus } from '../../types/index.js';
2
+ import { BlockchainId, OfferInfo, OfferType, OrderArgs, OrderInfo, OrderStatus, VersionedOfferId } from '../../types/index.js';
3
3
  export type SolutionOfferProperties = {
4
4
  portForwarding?: number;
5
5
  groupingOffers?: boolean;
@@ -19,7 +19,7 @@ export type ValidateOrderParams = {
19
19
  };
20
20
  export type ValidateOrderOptions = {
21
21
  isRestrictedByOfferType: (offerId: BlockchainId, type: OfferType) => Promise<boolean>;
22
- isRestrictionsPermitThatOffer: (offerId: BlockchainId, otherOfferId: BlockchainId) => Promise<boolean>;
22
+ isRestrictionsPermitThatOffer: (offerId: BlockchainId, otherOfferId: VersionedOfferId) => Promise<boolean>;
23
23
  };
24
24
  type TerminatedOrderStatus = OrderStatus.Done | OrderStatus.Canceled | OrderStatus.Error;
25
25
  export type CompleteOrderParams = {