@super-protocol/sdk-js 3.4.0 → 3.5.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.
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 +176 -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 +7 -5
  23. package/dist/cjs/models/Offer.js +20 -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 +146 -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 +7 -5
  75. package/dist/mjs/models/Offer.js +20 -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
@@ -4,23 +4,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.OrderReportService = void 0;
7
- const node_forge_1 = __importDefault(require("node-forge"));
8
7
  const util_1 = require("util");
9
8
  const zlib_1 = __importDefault(require("zlib"));
10
9
  const dto_js_1 = require("@super-protocol/dto-js");
11
10
  const OrderReport_js_1 = require("../proto/OrderReport.js");
12
- const TeeCertificateService_js_1 = require("./TeeCertificateService.js");
13
11
  const constants_js_1 = require("../constants.js");
14
12
  const calculateObjectHash_js_1 = require("../utils/helpers/calculateObjectHash.js");
13
+ const helper_js_1 = require("../certificates/helper.js");
14
+ const TeeCertificateService_js_1 = require("./TeeCertificateService.js");
15
15
  const gzipPromise = (0, util_1.promisify)(zlib_1.default.gzip);
16
16
  const unzipPromise = (0, util_1.promisify)(zlib_1.default.unzip);
17
- const rootCertDer = Buffer.from(node_forge_1.default.pki.pemToDer(constants_js_1.SUPERPROTOCOL_CA).bytes(), 'binary');
18
17
  class OrderReportService {
19
- static teeCertificateService = new TeeCertificateService_js_1.TeeCertificateService();
20
18
  static async encode(orderReport) {
21
- const certsDer = this.certsToDerArray(orderReport.certificate);
19
+ const { certs } = helper_js_1.CertificatesHelper.extractCAFromChain(orderReport.certificate);
20
+ const certsDer = helper_js_1.CertificatesHelper.pemChainToDer(certs);
22
21
  const orderReportProto = {
23
- certificates: this.removeRootCertificateFromChain(certsDer),
22
+ certificates: certsDer,
24
23
  workloadInfo: {
25
24
  runtimeInfo: orderReport.workloadInfo.runtimeInfo.map((ri) => ({
26
25
  type: ri.type,
@@ -39,14 +38,7 @@ class OrderReportService {
39
38
  static async decode(encodedOrderReport) {
40
39
  const decompressed = await unzipPromise(encodedOrderReport);
41
40
  const orderReportProto = OrderReport_js_1.OrderReportProto.decode(decompressed);
42
- const certsPem = orderReportProto.certificates.map((derCert) => node_forge_1.default.pem.encode({
43
- contentDomain: null,
44
- dekInfo: null,
45
- headers: [],
46
- procType: null,
47
- type: 'CERTIFICATE',
48
- body: Buffer.from(derCert).toString('binary'),
49
- }));
41
+ const certsPem = helper_js_1.CertificatesHelper.derChainToPem(orderReportProto.certificates);
50
42
  if (!orderReportProto.workloadInfo) {
51
43
  throw new Error(`Wrong order report! Missing workloadInfo`);
52
44
  }
@@ -65,34 +57,25 @@ class OrderReportService {
65
57
  return result;
66
58
  });
67
59
  return {
68
- certificate: certsPem.join('').trim(),
60
+ certificate: certsPem,
69
61
  workloadInfo: {
70
62
  runtimeInfo,
71
63
  created: orderReportProto.workloadInfo.created,
72
64
  },
73
65
  };
74
66
  }
75
- static removeRootCertificateFromChain(certsDer) {
76
- return certsDer.filter((certDer) => !certDer.equals(rootCertDer));
77
- }
78
67
  static async validateOrderReport(orderReport) {
79
- await this.teeCertificateService.validateTeeReportCertChain(orderReport.certificate);
80
- const workloadInfoHashFromCert = this.teeCertificateService.getExtensionValue(orderReport.certificate, constants_js_1.OID_CUSTOM_EXTENSION_ORDER_REPORT_WORKLOAD_INFO_HASH);
68
+ await TeeCertificateService_js_1.TeeCertificateService.validateTeeCertChainOrFail(orderReport.certificate);
69
+ const workloadInfoHashFromCert = helper_js_1.CertificatesHelper.getExtensionValue(orderReport.certificate, constants_js_1.OID_CUSTOM_EXTENSION_ORDER_REPORT_WORKLOAD_INFO_HASH);
81
70
  if (!workloadInfoHashFromCert) {
82
71
  throw new Error(`WorkloadInfoHash is missing in certificate!`);
83
72
  }
84
73
  const workloadInfoHash = await (0, calculateObjectHash_js_1.calculateObjectHash)(orderReport.workloadInfo);
85
- const isHashMatch = Buffer.compare(Buffer.from(workloadInfoHashFromCert, 'binary'), Buffer.from(workloadInfoHash.hash, workloadInfoHash.encoding)) === 0;
74
+ const isHashMatch = Buffer.compare(workloadInfoHashFromCert, Buffer.from(workloadInfoHash.hash, workloadInfoHash.encoding)) === 0;
86
75
  if (!isHashMatch) {
87
76
  throw new Error(`WorkloadInfoHash in the certificate doesn't match the WorkloadInfoHash in the orderReport`);
88
77
  }
89
78
  }
90
- static certsToDerArray(certificate) {
91
- const certs = this.teeCertificateService.splitPemCerts(certificate);
92
- return certs.map((pemCert) => {
93
- return Buffer.from(node_forge_1.default.pki.pemToDer(pemCert).bytes(), 'binary');
94
- });
95
- }
96
79
  static hashToBinary(hash) {
97
80
  if (!hash) {
98
81
  return;
@@ -114,4 +97,4 @@ class OrderReportService {
114
97
  }
115
98
  }
116
99
  exports.OrderReportService = OrderReportService;
117
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiT3JkZXJSZXBvcnRTZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3RlZS9PcmRlclJlcG9ydFNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsNERBQStCO0FBQy9CLCtCQUFpQztBQUNqQyxnREFBd0I7QUFDeEIsbURBT2dDO0FBR2hDLDREQUEyRDtBQUMzRCx5RUFBbUU7QUFDbkUsa0RBR3lCO0FBQ3pCLG9GQUE4RTtBQUU5RSxNQUFNLFdBQVcsR0FBRyxJQUFBLGdCQUFTLEVBQUMsY0FBSSxDQUFDLElBQUksQ0FBQyxDQUFDO0FBQ3pDLE1BQU0sWUFBWSxHQUFHLElBQUEsZ0JBQVMsRUFBQyxjQUFJLENBQUMsS0FBSyxDQUFDLENBQUM7QUFDM0MsTUFBTSxXQUFXLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxvQkFBSyxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsK0JBQWdCLENBQUMsQ0FBQyxLQUFLLEVBQUUsRUFBRSxRQUFRLENBQUMsQ0FBQztBQUV4RixNQUFhLGtCQUFrQjtJQUNyQixNQUFNLENBQVUscUJBQXFCLEdBQUcsSUFBSSxnREFBcUIsRUFBRSxDQUFDO0lBRTVFLE1BQU0sQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLFdBQXdCO1FBQzFDLE1BQU0sUUFBUSxHQUFHLElBQUksQ0FBQyxlQUFlLENBQUMsV0FBVyxDQUFDLFdBQVcsQ0FBQyxDQUFDO1FBRS9ELE1BQU0sZ0JBQWdCLEdBQXFCO1lBQ3pDLFlBQVksRUFBRSxJQUFJLENBQUMsOEJBQThCLENBQUMsUUFBUSxDQUFDO1lBQzNELFlBQVksRUFBRTtnQkFDWixXQUFXLEVBQUUsV0FBVyxDQUFDLFlBQVksQ0FBQyxXQUFXLENBQUMsR0FBRyxDQUFDLENBQUMsRUFBRSxFQUFFLEVBQUUsQ0FBQyxDQUFDO29CQUM3RCxJQUFJLEVBQUUsRUFBRSxDQUFDLElBQUk7b0JBQ2IsSUFBSSxFQUFFLEVBQUUsQ0FBQyxJQUFJ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
100
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiT3JkZXJSZXBvcnRTZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3RlZS9PcmRlclJlcG9ydFNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsK0JBQWlDO0FBQ2pDLGdEQUF3QjtBQUN4QixtREFPZ0M7QUFHaEMsNERBQTJEO0FBQzNELGtEQUF1RjtBQUN2RixvRkFBOEU7QUFDOUUseURBQStEO0FBQy9ELHlFQUFtRTtBQUVuRSxNQUFNLFdBQVcsR0FBRyxJQUFBLGdCQUFTLEVBQUMsY0FBSSxDQUFDLElBQUksQ0FBQyxDQUFDO0FBQ3pDLE1BQU0sWUFBWSxHQUFHLElBQUEsZ0JBQVMsRUFBQyxjQUFJLENBQUMsS0FBSyxDQUFDLENBQUM7QUFFM0MsTUFBYSxrQkFBa0I7SUFDN0IsTUFBTSxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsV0FBd0I7UUFDMUMsTUFBTSxFQUFFLEtBQUssRUFBRSxHQUFHLDhCQUFrQixDQUFDLGtCQUFrQixDQUFDLFdBQVcsQ0FBQyxXQUFXLENBQUMsQ0FBQztRQUNqRixNQUFNLFFBQVEsR0FBRyw4QkFBa0IsQ0FBQyxhQUFhLENBQUMsS0FBSyxDQUFDLENBQUM7UUFFekQsTUFBTSxnQkFBZ0IsR0FBcUI7WUFDekMsWUFBWSxFQUFFLFFBQVE7WUFDdEIsWUFBWSxFQUFFO2dCQUNaLFdBQVcsRUFBRSxXQUFXLENBQUMsWUFBWSxDQUFDLFdBQVcsQ0FBQyxHQUFHLENBQUMsQ0FBQyxFQUFFLEVBQUUsRUFBRSxDQUFDLENBQUM7b0JBQzdELElBQUksRUFBRSxFQUFFLENBQUMsSUFBSTtvQkFDYixJQUFJLEVBQUUsRUFBRSxDQUFDLElBQUk7b0JBQ2IsSUFBSSxFQUFFLElBQUksQ0FBQyxZQUFZLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQztvQkFDaEMsZ0JBQWdCLEVBQUUsSUFBSSxDQUFDLFlBQVksQ0FBQyxFQUFFLENBQUMsZ0JBQWdCLENBQUM7b0JBQ3hE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
@@ -63,7 +63,7 @@ class QuoteValidator {
63
63
  }
64
64
  case types_js_1.QuoteType.TDX: {
65
65
  const mrEnclave = QuoteParser_js_1.TeeParser.getMrEnclave(quote);
66
- await TeeSignatureVerifier_js_1.TeeSignatureVerifier.validateSignatureTdx(mrEnclave, options);
66
+ await TeeSignatureVerifier_js_1.TeeSignatureVerifier.validateSignatureTdxAndSnp(mrEnclave, options);
67
67
  break;
68
68
  }
69
69
  }
@@ -452,4 +452,4 @@ class QuoteValidator {
452
452
  }
453
453
  }
454
454
  exports.QuoteValidator = QuoteValidator;
455
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"QuoteValidator.js","sourceRoot":"","sources":["../../../src/tee/QuoteValidator.ts"],"names":[],"mappings":"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"}
455
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"QuoteValidator.js","sourceRoot":"","sources":["../../../src/tee/QuoteValidator.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,wDAAgC;AAChC,4DAA+B;AAC/B,qCAAoD;AACpD,yDAA8C;AAC9C,iCAAkD;AAClD,mCAAiC;AACjC,oDAAuB;AACvB,qDAAyE;AACzE,yCAOoB;AACpB,6DAAsC;AAEtC,2CAAqD;AACrD,+CAAyF;AACzF,mDAAiE;AACjE,kEAAwC;AACxC,uEAAwF;AAExF,MAAM,EAAE,EAAE,EAAE,GAAG,kBAAQ,CAAC;AACxB,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,oBAAK,CAAC;AAE7B,MAAM,kBAAkB,GAAG,uCAAuC,CAAC;AACnE,MAAM,qBAAqB,GAAG,mEAAmE,CAAC;AAClG,MAAM,OAAO,GAAG,uBAAuB,CAAC;AACxC,MAAM,SAAS,GAAG,GAAG,OAAO,IAAI,CAAC;AACjC,MAAM,SAAS,GAAG,GAAG,OAAO,IAAI,CAAC;AACjC,MAAM,OAAO,GAAG,GAAG,OAAO,IAAI,CAAC;AAC/B,MAAM,UAAU,GAAG,GAAG,OAAO,KAAK,CAAC;AACnC,MAAM,kBAAkB,GAAG,IAAI,UAAU,CAAC;IACxC,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG;IAChG,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG;IAChG,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG;IAChG,GAAG;CACJ,CAAC,CAAC;AAQH,MAAa,cAAc;IACR,SAAS,CAAU;IACnB,OAAO,CAAS;IAChB,YAAY,CAAe;IAC3B,YAAY,CAAe;IACpC,MAAM,CAAoB;IAElC,YAAY,OAAe;QACzB,IAAI,CAAC,SAAS,GAAG,OAAO,KAAK,kBAAkB,CAAC;QAChD,IAAI,CAAC,OAAO,GAAG,GAAG,OAAO,uBAAuB,CAAC;QACjD,IAAI,CAAC,YAAY,GAAG,IAAI,6BAAY,EAAE,CAAC;QACvC,IAAI,CAAC,YAAY,GAAG,IAAI,6BAAY,EAAE,CAAC;QACvC,IAAI,CAAC,MAAM,GAAG,mBAAU,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,cAAc,CAAC,IAAI,EAAE,CAAC,CAAC;IACrE,CAAC;IAED,MAAM,CAAC,YAAY,CAAC,SAAiB,EAAE,OAAgC;QACrE,OAAO,8CAAoB,CAAC,YAAY,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAC/D,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,cAAc,CACzB,KAAa,EACb,UAAiC,EAAE,qBAAqB,EAAE,8CAAoB,CAAC,YAAY,EAAE;QAE7F,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,6BAAY,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;QAEnE,QAAQ,SAAS,EAAE,CAAC;YAClB,KAAK,oBAAS,CAAC,GAAG,CAAC,CAAC,CAAC;gBACnB,MAAM,MAAM,GAAG,IAAI,6BAAY,EAAE,CAAC;gBAClC,MAAM,WAAW,GAAG,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;gBAC7C,MAAM,MAAM,GAAG,MAAM,CAAC,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;gBACtD,8CAAoB,CAAC,oBAAoB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;gBAC3D,MAAM;YACR,CAAC;YACD,KAAK,oBAAS,CAAC,GAAG,CAAC,CAAC,CAAC;gBACnB,MAAM,SAAS,GAAG,0BAAS,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;gBAChD,MAAM,8CAAoB,CAAC,0BAA0B,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;gBAC1E,MAAM;YACR,CAAC;QACH,CAAC;IACH,CAAC;IAEO,UAAU,CAAC,KAAa;QAC9B,MAAM,KAAK,GAAG,6BAA6B,CAAC;QAC5C,MAAM,GAAG,GAAG,2BAA2B,CAAC;QAExC,OAAO,KAAK;aACT,KAAK,CAAC,KAAK,CAAC;aACZ,MAAM,CAAC,OAAO,CAAC;aACf,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;IACxE,CAAC;IAEO,iBAAiB,CAAC,QAAgB,EAAE,SAAiB;QAC3D,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QACzC,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAEtC,OAAO,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;IACrD,CAAC;IAEO,iBAAiB,CAAC,QAAyB,EAAE,SAAiB;QACpE,IAAI,QAAQ,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACzC,KAAK,MAAM,KAAK,IAAI,QAAQ,CAAC,KAA0B,EAAE,CAAC;gBACxD,IAAI,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;oBACjC,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAe,CAAC,CAAC;oBACjD,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;wBACtB,OAAO,QAAQ,CAAC;oBAClB,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QAED,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YAClC,KAAK,MAAM,KAAK,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;gBACnC,MAAM,MAAM,GAAG,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;gBACxD,IAAI,MAAM,EAAE,CAAC;oBACX,OAAO,MAAM,CAAC;gBAChB,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,qBAAqB,CAAC,IAAY,EAAE,SAAiB,EAAE,GAAW;QACxE,MAAM,UAAU,GAAG,IAAI,EAAE,CAAC,MAAM,CAAC,CAAC;QAElC,OAAO,UAAU,CAAC,MAAM,CACtB,IAAI,EACJ;YACE,CAAC,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC,EAAE,EAAE,CAAC;YAC5B,CAAC,EAAE,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;SAC1B,EACD,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,KAAK,CAAC,CACrC,CAAC;IACJ,CAAC;IAEO,cAAc,CAAC,IAAY,EAAE,EAAU;QAC7C,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,OAAO,IAAI,GAAG,GAAG,IAAI,GAAG,GAAG,EAAE,CAAC;IAChC,CAAC;IAEO,oBAAoB,CAC1B,OAAoB,EACpB,YAAyB,EACzB,QAAqB;QAErB,OAAO,CACL,gBAAC,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,YAAY,CAAC,OAAO,CAAC;YAC/C,gBAAC,CAAC,OAAO,CAAC,YAAY,CAAC,MAAM,EAAE,QAAQ,CAAC,OAAO,CAAC,CACjD,CAAC;IACJ,CAAC;IAEO,MAAM,CAAC,OAAe;QAC5B,MAAM,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC;YACxC,CAAC,CAAC,6BAAS,CAAC,QAAQ,CAAC,OAAO,CAAC;YAC7B,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAChC,MAAM,MAAM,GAAG,IAAA,gBAAO,EAAC,MAAoB,CAAC,CAAC;QAE7C,OAAO,IAAI,iCAAyB,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;IAClE,CAAC;IAEO,sBAAsB,CAAC,GAA8B,EAAE,OAAiB;QAC9E,IAAI,CAAC,GAAG,CAAC,UAAU,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC;YACvC,MAAM,IAAI,kCAAsB,CAAC,sDAAsD,CAAC,CAAC;QAC3F,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC;YACzF,MAAM,IAAI,kCAAsB,CAAC,qDAAqD,CAAC,CAAC;QAC1F,CAAC;QACD,IAAI,GAAG,CAAC,mBAAmB,EAAE,CAAC;YAC5B,MAAM,YAAY,GAAG,GAAG,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAC5D,OAAO,CAAC,QAAQ,CACd,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAC7E,CACF,CAAC;YACF,IAAI,YAAY,EAAE,CAAC;gBACjB,MAAM,IAAI,kCAAsB,CAAC,gCAAgC,CAAC,CAAC;YACrE,CAAC;QACH,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,eAAe,CAC3B,KAAmB;QAEnB,MAAM,iBAAiB,GAAG,MAAM,eAAK,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,OAAO,kCAAkC,CAAC,CAAC;QAC7F,MAAM,aAAa,GAAG,kBAAkB,CAAC,iBAAiB,CAAC,OAAO,CAAC,0BAA0B,CAAC,CAAC,CAAC;QAChG,MAAM,CAAC,kBAAkB,EAAE,cAAc,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC,mBAAmB;QAChG,MAAM,mBAAmB,GAAG,kBAAW,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC;QACjF,MAAM,eAAe,GAAG,kBAAW,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC;QAEzE,IACE,CAAC,IAAI,CAAC,cAAc,CAClB,mBAAmB,CAAC,SAAS,CAAC,OAAO,EAAE,EACvC,mBAAmB,CAAC,OAAO,CAAC,OAAO,EAAE,CACtC,EACD,CAAC;YACD,MAAM,IAAI,kCAAsB,CAAC,mDAAmD,CAAC,CAAC;QACxF,CAAC;QACD,IACE,CAAC,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE,eAAe,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,EAC5F,CAAC;YACD,MAAM,IAAI,kCAAsB,CAAC,+CAA+C,CAAC,CAAC;QACpF,CAAC;QACD,IAAI,CAAC,gBAAC,CAAC,OAAO,CAAC,eAAe,CAAC,MAAM,EAAE,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;YAChE,MAAM,IAAI,kCAAsB,CAAC,qCAAqC,CAAC,CAAC;QAC1E,CAAC;QACD,IAAI,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,SAAS,CAAC,MAAM,EAAE,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC;YAC/E,MAAM,IAAI,kCAAsB,CAAC,yCAAyC,CAAC,CAAC;QAC9E,CAAC;QAED,MAAM,OAAO,GAAG,kBAAW,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;QAChF,MAAM,QAAQ,GAAG,KAAK,CAAC,uBAAuB,CAAC;QAE/C,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC;YACjF,MAAM,IAAI,kCAAsB,CAAC,8CAA8C,CAAC,CAAC;QACnF,CAAC;QACD,IAAI,QAAQ,KAAK,CAAC,EAAE,CAAC;YACnB,MAAM,IAAI,kCAAsB,CAAC,wCAAwC,QAAQ,EAAE,CAAC,CAAC;QACvF,CAAC;QACD,IAAI,cAAc,KAAK,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;YACnD,MAAM,IAAI,kCAAsB,CAAC,2DAA2D,CAAC,CAAC;QAChG,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,OAAO,EAAE,mBAAmB,EAAE,eAAe,CAAC,EAAE,CAAC;YAC9E,MAAM,IAAI,kCAAsB,CAAC,uCAAuC,CAAC,CAAC;QAC5E,CAAC;QAED,MAAM,OAAO,GAAG;YACd,eAAe,CAAC,YAAY;YAC5B,mBAAmB,CAAC,YAAY;YAChC,OAAO,CAAC,YAAY;SACrB,CAAC;QAEF,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS;YAC7B,CAAC,CAAC,qBAAqB;YACvB,CAAC,CAAC,GAAG,IAAI,CAAC,OAAO,YAAY,qBAAqB,EAAE,CAAC;QACvD,MAAM,WAAW,GAAG,MAAM,eAAK,CAAC,GAAG,CAAC,QAAQ,EAAE;YAC5C,YAAY,EAAE,aAAa;SAC5B,CAAC,CAAC;QACH,MAAM,WAAW,GAAG,IAAA,gBAAO,EAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;QAC3D,IAAI,CAAC,sBAAsB,CACzB,IAAI,iCAAyB,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC,EAC7D,OAAO,CACR,CAAC;QAEF,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;QACxD,IAAI,CAAC,sBAAsB,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QAElD,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,CAAC;IAClD,CAAC;IAEO,KAAK,CAAC,uBAAuB,CACnC,KAAmB,EACnB,YAAoB;QAEpB,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACvD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;QAEzE,OAAO,IAAI,CAAC,qBAAqB,CAAC,UAAU,EAAE,SAAS,EAAE,YAAY,CAAC,CAAC;IACzE,CAAC;IAEO,KAAK,CAAC,kBAAkB,CAC9B,KAAmB,EACnB,MAA4B;QAE5B,MAAM,UAAU,GAAG,KAAK,CAAC,oBAAoB,CAAC;QAC9C,MAAM,cAAc,GAAG,KAAK,CAAC,mBAAmB,CAAC;QACjD,MAAM,gBAAgB,GAAG,MAAM,CAAC,QAAQ,CAAC;QACzC,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;QAC7F,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,gBAAgB,EAAE,cAAc,CAAC,CAAC;QAEhE,OAAO,MAAM,KAAK,CAAC,CAAC;IACtB,CAAC;IAEO,KAAK,CAAC,4BAA4B,CAAC,KAAmB;QAC5D,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;QACnD,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAClD,MAAM,YAAY,GAChB,KAAK,CAAC,SAAS,KAAK,oBAAS,CAAC,GAAG;YAC/B,CAAC,CAAC,MAAM,CAAC,IAAI,CAAE,KAA6B,CAAC,MAAM,CAAC;YACpD,CAAC,CAAC,MAAM,CAAC,IAAI,CAAE,KAA6B,CAAC,WAAW,CAAC,CAAC;QAC9D,MAAM,QAAQ,GACZ,KAAK,CAAC,SAAS,KAAK,oBAAS,CAAC,GAAG;YAC/B,CAAC,CAAC,MAAM,CAAC,IAAI,CAAE,KAA6B,CAAC,yBAAyB,CAAC;YACvE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAE,KAA6B,CAAC,cAAc,CAAC,CAAC;QAEjE,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC;QAE7F,MAAM,UAAU,GAAG,IAAI,EAAE,CAAC,MAAM,CAAC,CAAC;QAElC,OAAO,UAAU,CAAC,MAAM,CACtB,cAAc,EACd;YACE,CAAC,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC,EAAE,EAAE,CAAC;YAC3B,CAAC,EAAE,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;SACzB,EACD,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CACvC,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,sBAAsB,CAClC,KAAmB,EACnB,MAA4B,EAC5B,YAAoB;QAEpB,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,uBAAuB,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC,EAAE,CAAC;YAC/D,MAAM,IAAI,kCAAsB,CAAC,2BAA2B,CAAC,CAAC;QAChE,CAAC;QACD,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC;YACpD,MAAM,IAAI,kCAAsB,CAAC,sBAAsB,CAAC,CAAC;QAC3D,CAAC;QACD,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,4BAA4B,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;YACtD,MAAM,IAAI,kCAAsB,CAAC,gCAAgC,CAAC,CAAC;QACrE,CAAC;IACH,CAAC;IAEO,mBAAmB,CAAC,OAAoB;QAC9C,MAAM,gBAAgB,GAAG,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,KAAK,OAAO,CAAC,CAAC;QACjF,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACtB,MAAM,IAAI,kCAAsB,CAAC,uCAAuC,CAAC,CAAC;QAC5E,CAAC;QAED,OAAO,gBAAgB,CAAC;IAC1B,CAAC;IAEO,oBAAoB,CAC1B,gBAA2B,EAC3B,SAAiB,EACjB,UAA2B;QAE3B,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,SAAS,CAAC,CAAC;QAC1F,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,kCAAsB,CAAC,OAAO,SAAS,0CAA0C,CAAC,CAAC;QAC/F,CAAC;QACD,MAAM,IAAI,GAAI,OAAO,CAAC,KAA2B,CAAC,MAAM,CACtD,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,KAAK,UAAU,CAC/C,CAAC;QACF,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACjB,MAAM,IAAI,kCAAsB,CAAC,eAAe,SAAS,YAAY,UAAU,YAAY,CAAC,CAAC;QAC/F,CAAC;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAe,CAAC,CAAC;QAExD,OAAO,UAAU,KAAK,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC;IACzF,CAAC;IAEO,KAAK,CAAC,UAAU,CACtB,KAAa,EACb,WAAmB,EACnB,SAAoB;QAEpB,IAAI,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,cAAc,KAAK,EAAE,CAAC;QAClD,IAAI,SAAS,KAAK,oBAAS,CAAC,GAAG,EAAE,CAAC;YAChC,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,mBAAmB,EAAE,mBAAmB,CAAC,CAAC;QACpE,CAAC;QACD,MAAM,OAAO,GAAG,MAAM,eAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACxC,MAAM,aAAa,GAAG,uBAAuB,CAAC;QAC9C,MAAM,YAAY,GAAG,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,cAAc;QACxG,IAAI,YAAY,CAAC,CAAC,CAAC,KAAK,WAAW,EAAE,CAAC;YACpC,MAAM,IAAI,kCAAsB,CAAC,2CAA2C,CAAC,CAAC;QAChF,CAAC;QAED,MAAM,OAAO,GAAG,kBAAW,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAClE,MAAM,GAAG,GAAG,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC;QACrC,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QAC7D,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,aAAa,CAC7C,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAClD,CAAC;QAEF,MAAM,MAAM,GAAG,IAAI,CAAC,qBAAqB,CAAC,cAAc,EAAE,SAAS,EAAE,GAAG,CAAC,CAAC;QAC1E,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,kCAAsB,CAAC,iCAAiC,CAAC,CAAC;QACtE,CAAC;QAED,IAAI,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;YAC3D,MAAM,IAAI,kCAAsB,CAAC,qCAAqC,CAAC,CAAC;QAC1E,CAAC;QAED,OAAO,OAAO,CAAC,IAAgB,CAAC;IAClC,CAAC;IAEO,KAAK,CAAC,aAAa,CAAC,WAAmB,EAAE,SAAoB;QACnE,IAAI,aAAa,GAAG,GAAG,IAAI,CAAC,OAAO,cAAc,CAAC;QAClD,IAAI,SAAS,KAAK,oBAAS,CAAC,GAAG,EAAE,CAAC;YAChC,aAAa,GAAG,aAAa,CAAC,OAAO,CAAC,mBAAmB,EAAE,mBAAmB,CAAC,CAAC;QAClF,CAAC;QACD,MAAM,cAAc,GAAG,MAAM,eAAK,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QACtD,MAAM,gBAAgB,GAAG,mCAAmC,CAAC;QAC7D,MAAM,eAAe,GAAG,IAAI,CAAC,UAAU,CACrC,kBAAkB,CAAC,cAAc,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAC7D,CAAC,CAAC,qBAAqB;QACxB,IAAI,eAAe,CAAC,CAAC,CAAC,KAAK,WAAW,EAAE,CAAC;YACvC,MAAM,IAAI,kCAAsB,CAAC,wDAAwD,CAAC,CAAC;QAC7F,CAAC;QAED,MAAM,cAAc,GAAG,kBAAW,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC5E,MAAM,GAAG,GAAG,cAAc,CAAC,SAAS,CAAC,MAAM,CAAC;QAC5C,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QACpE,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,aAAa,CAC7C,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CACjE,CAAC;QAEF,MAAM,MAAM,GAAG,IAAI,CAAC,qBAAqB,CAAC,cAAc,EAAE,SAAS,EAAE,GAAG,CAAC,CAAC;QAC1E,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,kCAAsB,CAAC,yCAAyC,CAAC,CAAC;QAC9E,CAAC;QAED,IAAI,cAAc,CAAC,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;YAC1E,MAAM,IAAI,kCAAsB,CAAC,kDAAkD,CAAC,CAAC;QACvF,CAAC;QAED,OAAO,cAAc,CAAC,IAAmB,CAAC;IAC5C,CAAC;IAEO,mBAAmB,CACzB,MAA4B,EAC5B,UAAuB;QAEvB,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACjD,IAAI,QAAQ,CAAC,WAAW,EAAE,KAAK,UAAU,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC;YACnE,MAAM,IAAI,kCAAsB,CAAC,8BAA8B,CAAC,CAAC;QACnE,CAAC;QACD,IAAI,MAAM,CAAC,SAAS,KAAK,UAAU,CAAC,eAAe,CAAC,SAAS,EAAE,CAAC;YAC9D,MAAM,IAAI,kCAAsB,CAAC,gCAAgC,CAAC,CAAC;QACrE,CAAC;QACD,MAAM,QAAQ,GAAG,UAAU,CAAC,eAAe,CAAC,SAAS,CAAC,IAAI,CACxD,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,CACnD,CAAC;QAEF,MAAM,MAAM,GAAG,QAAQ,EAAE,SAA+B,CAAC;QACzD,IAAI,MAAM,EAAE,CAAC;YACX,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,8BAA8B,QAAQ,EAAE,SAAS,EAAE,CAAC,CAAC;YACtE,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,OAAO,gCAAkB,CAAC,SAAS,CAAC;IACtC,CAAC;IAEO,YAAY,CAClB,KAAa,EACb,KAAa,EACb,OAAiB,EACjB,gBAA2B;QAE3B,IAAI,KAAK,CAAC,WAAW,EAAE,KAAK,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;YAChE,MAAM,IAAI,kCAAsB,CAAC,gCAAgC,CAAC,CAAC;QACrE,CAAC;QACD,IAAI,KAAK,KAAK,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;YACpC,MAAM,IAAI,kCAAsB,CAAC,gCAAgC,CAAC,CAAC;QACrE,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,oBAAoB,CAAC,gBAAgB,EAAE,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC1F,MAAM,aAAa,GAAG,CAAC,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACpD,IAAI,CAAC,oBAAoB,CAAC,gBAAgB,EAAE,GAAG,OAAO,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CACtF,CAAC;QACF,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAC7C,CAAC,QAAQ,EAAE,EAAE,CACX,QAAQ,CAAC,GAAG,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC;YACrC,QAAQ,CAAC,GAAG,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,IAAI,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAC7F,CAAC;QAEF,MAAM,MAAM,GAAG,QAAQ,EAAE,SAAwB,CAAC;QAClD,IAAI,MAAM,EAAE,CAAC;YACX,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,QAAQ,EAAE,SAAS,EAAE,CAAC,CAAC;YACzD,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,OAAO,yBAAW,CAAC,SAAS,CAAC;IAC/B,CAAC;IAEO,wBAAwB,CAC9B,gBAAoC,EACpC,SAAsB;QAEtB,IAAI,gBAAgB,KAAK,gCAAkB,CAAC,SAAS,EAAE,CAAC;YACtD,IAAI,SAAS,KAAK,yBAAW,CAAC,QAAQ,IAAI,SAAS,KAAK,yBAAW,CAAC,iBAAiB,EAAE,CAAC;gBACtF,OAAO,qCAAuB,CAAC,mBAAmB,CAAC;YACrD,CAAC;YACD,IACE,SAAS,KAAK,yBAAW,CAAC,4BAA4B;gBACtD,SAAS,KAAK,yBAAW,CAAC,iCAAiC,EAC3D,CAAC;gBACD,OAAO,qCAAuB,CAAC,oBAAoB,CAAC;YACtD,CAAC;QACH,CAAC;QACD,IAAI,gBAAgB,KAAK,gCAAkB,CAAC,OAAO,IAAI,SAAS,KAAK,yBAAW,CAAC,OAAO,EAAE,CAAC;YACzF,MAAM,IAAI,kCAAsB,CAAC,4BAA4B,CAAC,CAAC;QACjE,CAAC;QACD,IAAI,SAAS,KAAK,yBAAW,CAAC,QAAQ,EAAE,CAAC;YACvC,OAAO,qCAAuB,CAAC,QAAQ,CAAC;QAC1C,CAAC;QACD,IAAI,SAAS,KAAK,yBAAW,CAAC,SAAS,EAAE,CAAC;YACxC,OAAO,qCAAuB,CAAC,mBAAmB,CAAC;QACrD,CAAC;QACD,IAAI,SAAS,KAAK,yBAAW,CAAC,mBAAmB,EAAE,CAAC;YAClD,OAAO,qCAAuB,CAAC,mBAAmB,CAAC;QACrD,CAAC;QACD,OAAO,qCAAuB,CAAC,oBAAoB,CAAC;IACtD,CAAC;IAEO,mCAAmC,CAAC,MAA+B;QACzE,QAAQ,MAAM,EAAE,CAAC;YACf,KAAK,qCAAuB,CAAC,QAAQ;gBACnC,OAAO,+DAA+D,CAAC;YACzE,KAAK,qCAAuB,CAAC,mBAAmB;gBAC9C,OAAO;8GAC+F,CAAC;YACzG,KAAK,qCAAuB,CAAC,mBAAmB;gBAC9C,OAAO;4FAC6E,CAAC;YACvF,KAAK,qCAAuB,CAAC,oBAAoB;gBAC/C,OAAO;6HAC8G,CAAC;YACxH;gBACE,OAAO,4BAA4B,CAAC;QACxC,CAAC;IACH,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,KAAiB,EAAE,QAAoB;QACtD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC;QAEnE,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACvC,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QACrD,IAAI,WAAW,CAAC,qBAAqB,KAAK,qCAAuB,CAAC,QAAQ,EAAE,CAAC;YAC3E,IAAI,WAAW,CAAC,qBAAqB,KAAK,qCAAuB,CAAC,KAAK,EAAE,CAAC;gBACxE,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;YACtC,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,yCAAyC,CAAC,CAAC;YACtE,CAAC;QACH,CAAC;QAED,MAAM,mBAAmB,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,WAAW,EAAE,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC9F,IAAI,CAAC,mBAAmB,EAAE,CAAC;YACzB,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;QACjD,CAAC;IACH,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,WAAmB;QACtC,MAAM,cAAc,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;IACnD,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,WAAmB;QAChC,IAAI,CAAC;YACH,MAAM,SAAS,GAAG,0BAAS,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;YAC5D,MAAM,KAAK,GACT,SAAS,CAAC,IAAI,KAAK,oBAAS,CAAC,GAAG;gBAC9B,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,WAAW,CAAC;gBAC3C,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;YAChD,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YAE7D,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;YAEnE,MAAM,IAAI,CAAC,sBAAsB,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;YAC3E,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,wCAAwC,CAAC,CAAC;YAE3D,MAAM,gBAAgB,GAAG,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;YAC3D,MAAM,KAAK,GAAG,IAAI,CAAC,oBAAoB,CAAC,gBAAgB,EAAE,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAC5F,MAAM,KAAK,GAAG,IAAI,CAAC,oBAAoB,CAAC,gBAAgB,EAAE,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAE5F,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,WAAW,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC;YAC1E,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,WAAW,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC;YAEzE,MAAM,gBAAgB,GAAG,IAAI,CAAC,mBAAmB,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;YACtE,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,gBAAgB,CAAC,CAAC,CAAC,gFAAgF;YAE9J,MAAM,qBAAqB,GAAG,IAAI,CAAC,wBAAwB,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC;YACzF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,8BAA8B,qBAAqB,EAAE,CAAC,CAAC;YAExE,OAAO;gBACL,qBAAqB;gBACrB,WAAW,EAAE,IAAI,CAAC,mCAAmC,CAAC,qBAAqB,CAAC;aAC7E,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,qBAAqB,KAAK,EAAE,CAAC,CAAC;YAEhD,OAAO;gBACL,qBAAqB,EAAE,qCAAuB,CAAC,KAAK;gBACpD,WAAW,EAAE,IAAI,CAAC,mCAAmC,CAAC,qCAAuB,CAAC,KAAK,CAAC;gBACpF,KAAK;aACN,CAAC;QACJ,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,kBAAkB,CAAC,WAAmB,EAAE,cAAsB;QACzE,MAAM,SAAS,GAAG,0BAAS,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;QAC5D,MAAM,KAAK,GACT,SAAS,CAAC,IAAI,KAAK,oBAAS,CAAC,GAAG;YAC9B,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,WAAW,CAAC;YAC3C,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;QAEhD,IAAI,eAAoC,CAAC;QACzC,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC;QAC9D,IAAI,SAAS,CAAC,IAAI,KAAK,oBAAS,CAAC,GAAG,EAAE,CAAC;YACrC,eAAe,GAAG,IAAI,CAAC,YAAY;iBAChC,WAAW,CAAE,KAA6B,CAAC,MAAM,CAAC;iBAClD,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC;QAC5C,CAAC;aAAM,CAAC;YACN,eAAe,GAAG,IAAI,CAAC,YAAY;iBAChC,SAAS,CAAE,KAA6B,CAAC,WAAW,CAAC;iBACrD,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC;QAC9C,CAAC;QAED,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;QAEpE,OAAO,aAAa,KAAK,CAAC,CAAC;IAC7B,CAAC;IAEO,KAAK,CAAC,aAAa,CAAC,IAAY;QACtC,MAAM,QAAQ,GAAG;YACf,IAAI,EAAE,sBAAa,CAAC,MAAM;YAC1B,QAAQ,EAAE,iBAAQ,CAAC,MAAM;SAC1B,CAAC;QACF,MAAM,QAAQ,GAAG,MAAM,kBAAM,CAAC,UAAU,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QACzD,OAAO,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACvD,CAAC;CACF;AA1jBD,wCA0jBC"}
@@ -1,19 +1,16 @@
1
- /// <reference types="node" />
2
- export type ParseTlsCertificateResult = {
3
- userData: Buffer;
4
- mrEnclave: Buffer;
5
- mrSigner: Buffer;
6
- dataHash: Buffer;
7
- };
1
+ export declare enum ValidateTeeCertChainErrorCode {
2
+ CERT_CHAIN_IS_INVALID = "CERT_CHAIN_IS_INVALID",
3
+ NOT_ALLOWED_CHALLENGE = "NOT_ALLOWED_CHALLENGE",
4
+ CHALLENGE_IS_INVALID = "CHALLENGE_IS_INVALID"
5
+ }
6
+ export interface ValidateTeeCertChainResult {
7
+ isValid: boolean;
8
+ errorCode?: string;
9
+ errorMessage?: string;
10
+ }
8
11
  export declare class TeeCertificateService {
9
- private readonly certOidQuote;
10
- private getCertificatePublicKey;
11
- parseAndValidateCertificate(certificatePem: string | Buffer, sgxApiUrl: string): Promise<ParseTlsCertificateResult>;
12
- fromRawToPem(data: Uint8Array): string;
13
- splitPemCerts(certs: string): string[];
14
- validateCertChain(certsPem: string, caPem: string): boolean;
15
- getExtensionValue(certPem: string, oid: string): string | undefined;
16
- validateTeeReportCertChain(certsPem: string): Promise<void>;
17
- private validateChallengeSgx;
18
- private validateChallengeTdx;
12
+ static validateTeeCertChainOrFail(certsPem: string): Promise<void>;
13
+ static validateTeeCertChain(certsPem: string): Promise<ValidateTeeCertChainResult>;
14
+ private static validateChallengeSgx;
15
+ private static validateChallengeTdxAndSnp;
19
16
  }
@@ -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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVGVlQ2VydGlmaWNhdGVTZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3RlZS9UZWVDZXJ0aWZpY2F0ZVNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsNERBQStCO0FBQy9CLHFEQUFnRDtBQUNoRCwyREFBcUQ7QUFDckQsa0RBQW1EO0FBQ25ELDJEQUtvQztBQUNwQyx1RUFBaUU7QUFDakUsMkNBQW9EO0FBU3BELE1BQWEscUJBQXFCO0lBQ2YsWUFBWSxHQUFHLDRCQUE0QixDQUFDO0lBRXJELHVCQUF1QixDQUFDLFdBQWtDO1FBQ2hFLE1BQU0sWUFBWSxHQUFHLG9CQUFLLENBQUMsSUFBSTthQUM1QixLQUFLLENBQUMsb0JBQUssQ0FBQyxHQUFHLENBQUMsZUFBZSxDQUFDLFdBQVcsQ0FBQyxTQUFTLENBQUMsQ0FBQzthQUN2RCxRQUFRLEVBQUUsQ0FBQztRQUVkLE9BQU8sTUFBTSxDQUFDLElBQUksQ0FBQyxZQUFZLEVBQUUsUUFBUSxDQUFDLENBQUM7SUFDN0MsQ0FBQztJQUVELEtBQUssQ0FBQywyQkFBMkIsQ0FDL0IsY0FBK0IsRUFDL0IsU0FBaUI7UUFFakIsTUFBTSxHQUFHLEdBQUcsTUFBTSxDQUFDLFFBQVEsQ0FBQyxjQUFjLENBQUMsQ0FBQyxDQUFDLENBQUMsY0FBYyxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUMsQ0FBQyxjQUFjLENBQUM7UUFDekYsTUFBTSxXQUFXLEdBQUcsb0JBQUssQ0FBQyxHQUFHLENBQUMsa0JBQWtCLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDdEQsTUFBTSxVQUFVLEdBQUcsV0FBVyxDQUFDLFVBQVUsQ0FBQztRQUUxQyxNQUFNLEtBQUssR0FBRyxVQUFVLENBQUMsSUFBSSxDQUFDLENBQUMsR0FBRyxFQUFFLEVBQUUsQ0FBQyxHQUFHLENBQUMsRUFBRSxLQUFLLElBQUksQ0FBQyxZQUFZLENBQUMsQ0FBQztRQUNyRSxNQUFNLFdBQVcsR0FB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
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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVGVlU2lnbmF0dXJlVmVyaWZpZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdGVlL1RlZVNpZ25hdHVyZVZlcmlmaWVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLGtEQUE2QztBQUM3Qyw0REFBK0I7QUFDL0Isa0RBQThGO0FBQzlGLDBDQUFvRDtBQUVwRCx3REFBNEQ7QUFPNUQsTUFBYSxvQkFBb0I7SUFDL0I7Ozs7T0FJRztJQUNILE1BQU0sQ0FBQyxvQkFBb0IsQ0FBQyxRQUFvQjtRQUM5QyxJQUFJLFFBQVEsQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLEtBQUssMENBQTJCLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUM7WUFDN0UsTUFBTSxJQUFJLGdDQUFxQixDQUFDLGdDQUFnQyxDQUFDLENBQUM7UUFDcEUsQ0FBQztJQUNILENBQUM7SUFFRDs7Ozs7O09BTUc7SUFDSCxNQUFNLENBQUMsS0FBSyxDQUFDLDBCQUEwQixDQUNyQyxTQUFxQixFQUNyQixVQUFpQyxFQUFFLHFCQUFxQixFQUFFLG9CQUFvQixDQUFDLFlBQVksRUFBRTtRQUU3RixNQUFNLEVBQUUscUJBQXFCLEVBQUUsR0FBRyxPQUFPLENBQUM7UUFDMUMsTUFBTSxJQUFJLEdBQUcsb0JBQUssQ0FBQyxHQUFHLENBQUMsa0JBQWtCLENBQUMsNkNBQThCLENBQUMsQ0FBQztRQUMxRSxNQUFNLFdBQVcsR0FBRyxvQkFBSyxDQUFDLEdBQUcsQ0FBQyxzQkFBc0IsQ0FBQyxvQkFBSyxDQUFDLEdBQUcsQ0FBQyxhQUFhLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztRQUM5RixJQUFJLENBQUMsV0FBVyxFQUFFLENBQUM7WUFDakIsTUFBTSxJQUFJLEtBQUssQ0FBQyx5QkFBeUIsQ0FBQyxDQUFDO1FBQzdDLENBQUM7UUFFRCxNQUFNLFNBQVMsR0FBRyxJQUFJLENBQUMsU0FBUyxDQUFDO1FBQ2pDLElBQ0UsQ0FBQyxNQUFNLENBQUMsU0FBUyxDQUFDLGNBQWMsQ0FBQyxJQUFJLENBQUMsU0FBUyxFQUFFLEdBQUcsQ0FBQztZQUNyRCxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUMsY0FBYyxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUUsR0FBRyxDQUFDLEVBQ3JELENBQUM7WUFDRCxNQUFNLElBQUksZ0NBQXFCLENBQUMsNkNBQTZDLENBQUMsQ0FBQztRQUNqRixDQUFDO1FBRUQsTUFBTSxNQUFNLEdBQUcsb0JBQUssQ0FBQyxFQUFFLENBQUMsTUFBTTthQUMzQixNQUFNLEVBQUU7YUFDUixNQUFNLENBQUMsTUFBTSxDQUFDLFlBQVksQ0FBQyxHQUFHLFNBQVMsQ0FBQyxDQUFDO2FBQ3pDLE1BQU0sRUFBRSxDQUFDO1FBQ1osTUFBTSxTQUFTLEdBQUcsTUFBTSxxQkFBcUIsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUM7UUFFdEUsTUFBTSxnQkFBZ0IsR0FBSSxTQUFxQyxDQUFDLE1BQU0sQ0FDcEUsTUFBTSxDQUFDLEtBQUssRUFBRSxFQUNkLE1BQU0sQ0FBQyxZQUFZLENBQUMsR0FBRyxTQUFTLENBQUMsQ0FDbEMsQ0FBQztRQUNGLElBQUksQ0FBQyxnQkFBZ0IsRUFBRSxDQUFDO1lBQ3RCLE1BQU0sSUFBSSxnQ0FBcUIsQ0FBQywwQkFBMEIsQ0FBQyxDQUFDO1FBQzlELENBQUM7SUFDSCxDQUFDO0lBRUQsTUFBTSxDQUFDLEtBQUssQ0FBQyxZQUFZLENBQUMsU0FBaUIsRUFBRSxPQUFnQztRQUMzRSxNQUFNLE9BQU8sR0FBRyxPQUFPLEVBQUUsT0FBTyxJQUFJLHdEQUF3RCxDQUFDO1FBQzdGLE1BQU0sUUFBUSxHQUFHLE9BQU8sRUFBRSxRQUFRLElBQUksQ0FBQyxDQUFDO1FBQ3hDLE1BQU0sYUFBYSxHQUFHLE9BQU8sRUFBRSxhQUFhLElBQUksSUFBSSxDQUFDO1FBQ3JELE1BQU0sWUFBWSxHQUFHLFNBQVMsQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLENBQUM7UUFFL0MsTUFBTSxhQUFhLEdBQUcsZUFBSyxDQUFDLE1BQU0sQ0FBQztZQUNqQyxPQUFPO1NBQ1IsQ0FBQyxDQUFDO1FBQ0gsSUFBSSxDQUFDO1lBQ0gsTUFBTSxRQUFRLEdBQUcsTUFBTSxJQUFBLDBCQUFlLEVBQWdCO2dCQUNwRCxXQUFXLENBQUMsUUFBUTtvQkFDbEIsT0FBTyxFQUFFLFVBQVUsRUFBRSxRQUFRLENBQUMsTUFBTSxLQUFLLEdBQUcsRUFBRSxDQUFDO2dCQUNqRCxDQUFDO2dCQUNELE9BQU87b0JBQ0wsT0FBTyxhQUFhLENBQUMsR0FBRyxDQUFDLDhCQUE4QixZQUFZLE9BQU8sRUFBRTt3QkFDMUUsWUFBWSxFQUFFLGFBQWE7cUJBQzVCLENBQUMsQ0FBQztnQkFDTCxDQUFDO2dCQUNELFVBQVUsQ0FBQyxHQUFHO29CQUNaLElBQUksZUFBSyxDQUFDLFlBQVksQ0FBQyxHQUFHLENBQUMsSUFBSSxHQUFHLENBQUMsUUFBUSxFQUFFLENBQUM7d0JBQzVDLE1BQU0sTUFBTSxHQUFHLEdBQUcsQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDO3dCQUVuQyxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sR0FBRyxHQUFHLElBQUksTUFBTSxJQUFJLEdBQUcsRUFBRSxDQUFDO29CQUN0RCxDQUFDO29CQUNELE9BQU8sRUFBRSxTQUFTLEVBQUUsZUFBSyxDQUFDLFlBQVksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDO2dCQUNoRCxDQUFDO2dCQUNELGFBQWE7Z0JBQ2IsUUFBUTthQUNULENBQUMsQ0FBQztZQUVILE9BQU8sTUFBTSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDcEMsQ0FBQztRQUFDLE9BQU8sR0FBRyxFQUFFLENBQUM7WUFDYixJQUFJLGVBQUssQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFDLElBQUksR0FBRyxDQUFDLFFBQVEsRUFBRSxNQUFNLEtBQUssR0FBRyxFQUFFLENBQUM7Z0JBQzVELE1BQU0sSUFBSSxnQ0FBcUIsQ0FBQywwQ0FBMEMsWUFBWSxFQUFFLENBQUMsQ0FBQztZQUM1RixDQUFDO1lBRUQsTUFBTSxHQUFHLENBQUM7UUFDWixDQUFDO0lBQ0gsQ0FBQztDQUNGO0FBN0ZELG9EQTZGQyJ9
@@ -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;