@super-protocol/sdk-js 3.0.0-beta.13 → 3.0.0-beta.14

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 (37) hide show
  1. package/dist/cjs/TeeInputGeneratorBase.js +4 -4
  2. package/dist/cjs/contracts/abi.d.ts +322 -781
  3. package/dist/cjs/contracts/abi.js +382 -974
  4. package/dist/cjs/models/TCB.d.ts +1 -2
  5. package/dist/cjs/models/TCB.js +8 -13
  6. package/dist/cjs/models/TeeOffer.js +1 -7
  7. package/dist/cjs/staticModels/Consensus.d.ts +8 -8
  8. package/dist/cjs/staticModels/Consensus.js +41 -34
  9. package/dist/cjs/tee/TeeBlockVerifier.d.ts +1 -2
  10. package/dist/cjs/tee/TeeBlockVerifier.js +4 -6
  11. package/dist/cjs/types/Consensus.d.ts +3 -1
  12. package/dist/cjs/types/Consensus.js +1 -1
  13. package/dist/cjs/types/Superpro.d.ts +1 -2
  14. package/dist/cjs/types/Superpro.js +2 -3
  15. package/dist/cjs/utils/helper.d.ts +0 -2
  16. package/dist/cjs/utils/helper.js +3 -18
  17. package/dist/mjs/TeeInputGeneratorBase.js +4 -4
  18. package/dist/mjs/contracts/abi.d.ts +322 -781
  19. package/dist/mjs/contracts/abi.js +380 -972
  20. package/dist/mjs/models/TCB.d.ts +1 -2
  21. package/dist/mjs/models/TCB.js +8 -13
  22. package/dist/mjs/models/TeeOffer.js +1 -7
  23. package/dist/mjs/staticModels/Consensus.d.ts +8 -8
  24. package/dist/mjs/staticModels/Consensus.js +42 -35
  25. package/dist/mjs/tee/TeeBlockVerifier.d.ts +1 -2
  26. package/dist/mjs/tee/TeeBlockVerifier.js +4 -6
  27. package/dist/mjs/types/Consensus.d.ts +3 -1
  28. package/dist/mjs/types/Consensus.js +1 -1
  29. package/dist/mjs/types/Superpro.d.ts +1 -2
  30. package/dist/mjs/types/Superpro.js +2 -3
  31. package/dist/mjs/utils/helper.d.ts +0 -2
  32. package/dist/mjs/utils/helper.js +2 -15
  33. package/package.json +1 -1
  34. package/dist/cjs/staticModels/ProviderRewards.d.ts +0 -17
  35. package/dist/cjs/staticModels/ProviderRewards.js +0 -82
  36. package/dist/mjs/staticModels/ProviderRewards.d.ts +0 -17
  37. package/dist/mjs/staticModels/ProviderRewards.js +0 -77
@@ -1,5 +1,4 @@
1
1
  import { BlockchainId, TcbData, TcbPublicData, TcbUtilityData, TransactionOptions } from '../types/index.js';
2
- import { ConsensusBenchmark } from '@super-protocol/dto-js';
3
2
  declare class TCB {
4
3
  private static readonly logger;
5
4
  tcbId: BlockchainId;
@@ -15,7 +14,7 @@ declare class TCB {
15
14
  * @param transactionOptions - object what contains alternative action account or gas limit (optional)
16
15
  */
17
16
  private addToSupply;
18
- apply(publicData: TcbPublicData, benchmark: ConsensusBenchmark, quote: string, publicKey: string, transactionOptions?: TransactionOptions): Promise<void>;
17
+ apply(publicData: TcbPublicData, quote: string, publicKey: string, transactionOptions?: TransactionOptions): Promise<void>;
19
18
  /**
20
19
  * Assign TCB from SuspiciousBlocks table to check
21
20
  * @param transactionOptions - object what contains alternative action account or gas limit (optional)
@@ -8,7 +8,6 @@ const index_js_1 = require("../connectors/index.js");
8
8
  const helper_js_1 = require("../utils/helper.js");
9
9
  const Consensus_js_1 = __importDefault(require("../staticModels/Consensus.js"));
10
10
  const logger_js_1 = __importDefault(require("../logger.js"));
11
- const ProviderRewards_js_1 = __importDefault(require("../staticModels/ProviderRewards.js"));
12
11
  class TCB {
13
12
  static logger = logger_js_1.default.child({ className: 'TCB' });
14
13
  tcbId;
@@ -22,10 +21,10 @@ class TCB {
22
21
  applyTcbMarks(marks, transactionOptions) {
23
22
  return TxManager_js_1.default.execute(TCB.contract.methods.applyTcbMarks(marks, this.tcbId), transactionOptions);
24
23
  }
25
- setTcbData(publicData, benchmark, quote, publicKey, transactionOptions) {
24
+ setTcbData(publicData, quote, publicKey, transactionOptions) {
26
25
  (0, helper_js_1.checkIfActionAccountInitialized)(transactionOptions);
27
26
  const formattedDeviceId = (0, helper_js_1.packDeviceId)(publicData.deviceId);
28
- return TxManager_js_1.default.execute(TCB.contract.methods.setTcbData(this.tcbId, (0, helper_js_1.formatBenchmarkTo)(benchmark), publicData.properties, formattedDeviceId, quote, publicKey), transactionOptions);
27
+ return TxManager_js_1.default.execute(TCB.contract.methods.setTcbData(this.tcbId, (0, helper_js_1.formatBenchmarkTo)(publicData.benchmark), publicData.properties, formattedDeviceId, quote, publicKey), transactionOptions);
29
28
  }
30
29
  /**
31
30
  * Add data to TeeConfirmationBlock and push it to Consensus
@@ -38,7 +37,7 @@ class TCB {
38
37
  (0, helper_js_1.checkIfActionAccountInitialized)(transactionOptions);
39
38
  return TxManager_js_1.default.execute(TCB.contract.methods.addTcbToSupply(this.tcbId), transactionOptions);
40
39
  }
41
- async apply(publicData, benchmark, quote, publicKey, transactionOptions) {
40
+ async apply(publicData, quote, publicKey, transactionOptions) {
42
41
  const logger = TCB.logger.child({
43
42
  deviceId: publicData.deviceId,
44
43
  method: 'apply',
@@ -47,7 +46,7 @@ class TCB {
47
46
  logger.debug('apply tcb marks');
48
47
  await this.applyTcbMarks(publicData.checkingTcbMarks, transactionOptions);
49
48
  logger.debug('set tcb data');
50
- await this.setTcbData(publicData, benchmark, quote, publicKey, transactionOptions);
49
+ await this.setTcbData(publicData, quote, publicKey, transactionOptions);
51
50
  logger.debug('add to supply');
52
51
  await this.addToSupply(transactionOptions);
53
52
  logger.debug('apply is done');
@@ -77,9 +76,7 @@ class TCB {
77
76
  */
78
77
  async claimRewards(transactionOptions) {
79
78
  (0, helper_js_1.checkIfActionAccountInitialized)();
80
- const { teeOfferId } = (await Consensus_js_1.default.getTcbsUtilityData([this.tcbId]))[this.tcbId];
81
- const { epochIndex } = await this.get();
82
- await ProviderRewards_js_1.default.claimRewards(epochIndex, teeOfferId, transactionOptions);
79
+ await TxManager_js_1.default.execute(TCB.contract.methods.claimRewards(this.tcbId), transactionOptions);
83
80
  }
84
81
  /**
85
82
  * Function unlock previously locked TCB rewards (by claimRewards)
@@ -115,11 +112,9 @@ class TCB {
115
112
  /**
116
113
  * Function for fetching TCB avaliable reward
117
114
  */
118
- async getRewardAmount() {
119
- const { teeOfferId } = (await Consensus_js_1.default.getTcbsUtilityData([this.tcbId]))[this.tcbId];
120
- const { epochIndex } = await this.get();
121
- return TCB.contract.methods.getTcbReward(epochIndex, teeOfferId).call();
115
+ getRewardAmount() {
116
+ return TCB.contract.methods.getTcbReward(this.tcbId).call();
122
117
  }
123
118
  }
124
119
  exports.default = TCB;
125
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVENCLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21vZGVscy9UQ0IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFFQSx5RUFBOEM7QUFDOUMscURBQTZEO0FBUzdELGtEQUs0QjtBQUM1QixnRkFBcUQ7QUFDckQsNkRBQXNDO0FBQ3RDLDRGQUFpRTtBQUVqRSxNQUFNLEdBQUc7SUFDQyxNQUFNLENBQVUsTUFBTSxHQUFHLG1CQUFVLENBQUMsS0FBSyxDQUFDLEVBQUUsU0FBUyxFQUFFLEtBQUssRUFBRSxDQUFDLENBQUM7SUFDakUsS0FBSyxDQUFlO0lBQ25CLE1BQU0sQ0FBQyxRQUFRLENBQXVCO0lBRTlDLFlBQVksS0FBbUI7UUFDN0IsSUFBSSxDQUFDLEtBQUssR0FBRyxLQUFLLENBQUM7UUFDbkIsSUFBSSxDQUFDLEdBQUcsQ0FBQyxRQUFRLEVBQUUsQ0FBQztZQUNsQixHQUFHLENBQUMsUUFBUSxHQUFHLDhCQUFtQixDQUFDLFdBQVcsRUFBRSxDQUFDLFdBQVcsRUFBRSxDQUFDO1FBQ2pFLENBQUM7SUFDSCxDQUFDO0lBRU8sYUFBYSxDQUNuQixLQUEwQixFQUMxQixrQkFBdUM7UUFFdkMsT0FBTyxzQkFBUyxDQUFDLE9BQU8sQ0FDdEIsR0FBRyxDQUFDLFFBQVEsQ0FBQyxPQUFPLENBQUMsYUFBYSxDQUFDLEtBQUssRUFBRSxJQUFJLENBQUMsS0FBSyxDQUFDLEVBQ3JELGtCQUFrQixDQUNuQixDQUFDO0lBQ0osQ0FBQztJQUVPLFVBQVUsQ0FDaEIsVUFBeUIsRUFDekIsU0FBNkIsRUFDN0IsS0FBYSxFQUNiLFNBQWlCLEVBQ2pCLGtCQUF1QztRQUV2QyxJQUFBLDJDQUErQixFQUFDLGtCQUFrQixDQUFDLENBQUM7UUFFcEQsTUFBTSxpQkFBaUIsR0FBRyxJQUFBLHdCQUFZLEVBQUMsVUFBVSxDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBQzVELE9BQU8sc0JBQVMsQ0FBQyxPQUFPLENBQ3RCLEdBQUcsQ0FB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
120
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVENCLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21vZGVscy9UQ0IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFFQSx5RUFBOEM7QUFDOUMscURBQTZEO0FBUzdELGtEQUs0QjtBQUM1QixnRkFBcUQ7QUFDckQsNkRBQXNDO0FBRXRDLE1BQU0sR0FBRztJQUNDLE1BQU0sQ0FBVSxNQUFNLEdBQUcsbUJBQVUsQ0FBQyxLQUFLLENBQUMsRUFBRSxTQUFTLEVBQUUsS0FBSyxFQUFFLENBQUMsQ0FBQztJQUNqRSxLQUFLLENBQWU7SUFDbkIsTUFBTSxDQUFDLFFBQVEsQ0FBdUI7SUFFOUMsWUFBWSxLQUFtQjtRQUM3QixJQUFJLENBQUMsS0FBSyxHQUFHLEtBQUssQ0FBQztRQUNuQixJQUFJLENBQUMsR0FBRyxDQUFDLFFBQVEsRUFBRSxDQUFDO1lBQ2xCLEdBQUcsQ0FBQyxRQUFRLEdBQUcsOEJBQW1CLENBQUMsV0FBVyxFQUFFLENBQUMsV0FBVyxFQUFFLENBQUM7UUFDakUsQ0FBQztJQUNILENBQUM7SUFFTyxhQUFhLENBQ25CLEtBQTBCLEVBQzFCLGtCQUF1QztRQUV2QyxPQUFPLHNCQUFTLENBQUMsT0FBTyxDQUN0QixHQUFHLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxhQUFhLENBQUMsS0FBSyxFQUFFLElBQUksQ0FBQyxLQUFLLENBQUMsRUFDckQsa0JBQWtCLENBQ25CLENBQUM7SUFDSixDQUFDO0lBRU8sVUFBVSxDQUNoQixVQUF5QixFQUN6QixLQUFhLEVBQ2IsU0FBaUIsRUFDakIsa0JBQXVDO1FBRXZDLElBQUEsMkNBQStCLEVBQUMsa0JBQWtCLENBQUMsQ0FBQztRQUVwRCxNQUFNLGlCQUFpQixHQUFHLElBQUEsd0JBQVksRUFBQyxVQUFVLENBQUMsUUFBUSxDQUFDLENBQUM7UUFDNUQsT0FBTyxzQkFBUyxDQUFDLE9BQU8sQ0FDdEIsR0FBRyxDQUFDLFFBQVEsQ0FBQyxPQUFPLENBQUMsVUFB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
@@ -186,18 +186,12 @@ class TeeOffer {
186
186
  const { checkingTcbIds } = await tcb.getPublicData();
187
187
  const tcbsPublicData = await Consensus_js_1.default.getTcbsPublicData(checkingTcbIds);
188
188
  const tcbsUtilityData = await Consensus_js_1.default.getTcbsUtilityData(checkingTcbIds);
189
- const teeOfferIds = [];
190
- for (const tcbId of checkingTcbIds) {
191
- teeOfferIds.push(tcbsUtilityData[tcbId].teeOfferId);
192
- }
193
- const benchmarks = await Consensus_js_1.default.getBenchmarksByTcbIds(checkingTcbIds, teeOfferIds);
194
189
  const tcbsForVerification = [];
195
190
  for (const checkingTcbId of checkingTcbIds) {
196
191
  const { checkingTcbMarks, ...otherPublicData } = tcbsPublicData[checkingTcbId];
197
192
  const { quote, pubKey } = tcbsUtilityData[checkingTcbId];
198
193
  tcbsForVerification.push({
199
194
  ...otherPublicData,
200
- benchmark: benchmarks[checkingTcbId],
201
195
  checkingTcbId,
202
196
  checkingTcbMarks: checkingTcbMarks.map((mark) => mark),
203
197
  pubKey,
@@ -616,4 +610,4 @@ __decorate([
616
610
  __metadata("design:returntype", Promise)
617
611
  ], TeeOffer.prototype, "setSubtype", null);
618
612
  exports.default = TeeOffer;
619
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"TeeOffer.js","sourceRoot":"","sources":["../../../src/models/TeeOffer.ts"],"names":[],"mappings":"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"}
613
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"TeeOffer.js","sourceRoot":"","sources":["../../../src/models/TeeOffer.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAEA,kDAY4B;AAC5B,gDAY2B;AAC3B,qDAA6D;AAC7D,yEAA8C;AAS9C,kDAA0D;AAC1D,gFAAqD;AACrD,iDAAyC;AAEzC,gFAAqD;AAErD,MAAM,QAAQ;IACJ,MAAM,CAAC,QAAQ,CAAuB;IAEvC,EAAE,CAAe;IAEjB,aAAa,CAAmB;IAChC,WAAW,CAAe;IAC1B,SAAS,CAAgB;IAEzB,IAAI,CAAa;IACjB,iBAAiB,CAAU;IAC3B,QAAQ,CAAU;IAClB,OAAO,CAAW;IAClB,GAAG,CAAU;IACb,YAAY,CAAU;IACtB,YAAY,CAAU;IACtB,OAAO,CAAW;IAClB,YAAY,CAAW;IACvB,UAAU,CAAe;IAEhC,YAAY,OAAqB;QAC/B,IAAI,CAAC,EAAE,GAAG,OAAO,CAAC;QAClB,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;YACvB,QAAQ,CAAC,QAAQ,GAAG,8BAAmB,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE,CAAC;QACtE,CAAC;IACH,CAAC;IAED;;OAEG;IAEI,SAAS;QACd,OAAO,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAClE,CAAC;IAED;;OAEG;IAEU,AAAN,KAAK,CAAC,aAAa,CACxB,MAAoB,EACpB,SAAiB,EACjB,UAA0B,EAC1B,YAAsB;QAEtB,IAAI,CAAC,UAAU,GAAG,MAAM,QAAQ,CAAC,QAAQ,CAAC,OAAO;aAC9C,kBAAkB,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,YAAY,CAAC;aACxE,IAAI,EAAE;aACN,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;QAEzC,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,aAAa;QACxB,OAAO,MAAM,CAAC,MAAM,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,qBAAqB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IACvF,CAAC;IAED;;OAEG;IAEU,AAAN,KAAK,CAAC,iBAAiB;QAC5B,IAAI,CAAC,YAAY,GAAG,MAAM,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAEtF,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAED;;OAEG;IAEU,AAAN,KAAK,CAAC,OAAO;QAClB,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAC7E,MAAM,EACJ,cAAc,EAAE,eAAe,EAC/B,OAAO,EAAE,QAAQ,EACjB,GAAG,SAAS,EACb,GAAG,IAAA,yBAAa,EAAC;YAChB,GAAG,IAAI;YACP,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,YAAY,EAAE,CAAC,MAAM,IAAI,CAAC,eAAe,EAAE,CAAiB;SAC7D,CAAC,CAAC;QAEH,IAAI,CAAC,SAAS,GAAG,SAAyB,CAAC;QAE3C,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAED;;OAEG;IAEU,AAAN,KAAK,CAAC,eAAe;QAC1B,MAAM,YAAY,GAAiB,MAAM,QAAQ,CAAC,QAAQ,CAAC,OAAO;aAC/D,uBAAuB,CAAC,IAAI,CAAC,EAAE,CAAC;aAChC,IAAI,EAAE;aACN,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;YACjB,OAAO;gBACL,QAAQ,EAAE,IAAA,yBAAa,EAAC,QAAQ,CAAC,QAAQ,CAAa;gBACtD,UAAU,EAAE,IAAA,oCAAwB,EAAC,IAAA,yBAAa,EAAC,QAAQ,CAAC,UAAU,CAAkB,CAAC;aAC1E,CAAC;QACpB,CAAC,CAAC,CAAC;QAEL,OAAO,sBAAS,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC;IACpD,CAAC;IAED;;;OAGG;IACI,aAAa,CAAC,QAAsB;QACzC,OAAO,QAAQ,CAAC,QAAQ,CAAC,OAAO;aAC7B,aAAa,CAAC,QAAQ,CAAC;aACvB,IAAI,EAAE;aACN,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAA,wCAA4B,EAAC,MAA2B,CAAC,CAAC,CAAC;IACjF,CAAC;IAEM,KAAK,CAAC,UAAU,CAAC,KAAK,GAAG,CAAC,EAAE,GAAG,GAAG,MAAM;QAC7C,MAAM,YAAY,GAAG,MAAM,CACzB,MAAM,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,uBAAuB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CACxE,CAAC;QACF,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;YACvB,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,MAAM,cAAc,GAAwB,MAAM,QAAQ,CAAC,QAAQ,CAAC,OAAO;aACxE,kBAAkB,CAAC,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,GAAG,CAAC;aACvC,IAAI,EAAE;aACN,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAA,kCAAsB,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAE9E,OAAO,cAAc,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAA,wCAA4B,EAAC,MAAM,CAAC,CAAC,CAAC;IAC9E,CAAC;IAED;;;OAGG;IACI,cAAc,CAAC,QAAsB;QAC1C,OAAO,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC,IAAI,EAAE,CAAC;IAClF,CAAC;IAED;;;;;;OAMG;IAEU,AAAN,KAAK,CAAC,SAAS,CACpB,IAAgB,EAChB,KAAgB,EAChB,UAAU,GAAG,SAAS,EACtB,kBAAuC;QAEvC,MAAM,QAAQ,GAAG,8BAAmB,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE,CAAC;QACjE,IAAA,2CAA+B,EAAC,kBAAkB,CAAC,CAAC;QAEpD,MAAM,mBAAmB,GAAG,IAAA,8BAAmB,EAAC,UAAU,CAAC,CAAC;QAC5D,MAAM,sBAAS,CAAC,OAAO,CACrB,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,EAAE,mBAAmB,EAAE,IAAA,kCAAsB,EAAC,IAAI,CAAC,EAAE,KAAK,CAAC,EAC7F,kBAAkB,CACnB,CAAC;IACJ,CAAC;IAED;;;;;;OAMG;IAEU,AAAN,KAAK,CAAC,YAAY,CACvB,QAAsB,EACtB,OAAmB,EACnB,QAAmB,EACnB,kBAAuC;QAEvC,IAAA,2CAA+B,EAAC,kBAAkB,CAAC,CAAC;QAEpD,MAAM,sBAAS,CAAC,OAAO,CACrB,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,gBAAgB,CACxC,IAAI,CAAC,EAAE,EACP,QAAQ,EACR,IAAA,kCAAsB,EAAC,OAAO,CAAC,CAChC,EACD,kBAAkB,CACnB,CAAC;QAEF,MAAM,sBAAS,CAAC,OAAO,CACrB,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,EAAE,QAAQ,EAAE,QAAQ,CAAC,EACxE,kBAAkB,CACnB,CAAC;IACJ,CAAC;IAED;;;;OAIG;IAEU,AAAN,KAAK,CAAC,YAAY,CACvB,QAAsB,EACtB,kBAAuC;QAEvC,IAAA,2CAA+B,EAAC,kBAAkB,CAAC,CAAC;QAEpD,MAAM,sBAAS,CAAC,OAAO,CACrB,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,EAAE,QAAQ,CAAC,EACzD,kBAAkB,CACnB,CAAC;IACJ,CAAC;IAGa,AAAN,KAAK,CAAC,aAAa,CACzB,QAAgB,EAChB,kBAAuC;QAEvC,IAAA,2CAA+B,GAAE,CAAC;QAElC,MAAM,sBAAS,CAAC,OAAO,CACrB,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,EAAE,QAAQ,CAAC,EAC1D,kBAAkB,CACnB,CAAC;IACJ,CAAC;IAGa,AAAN,KAAK,CAAC,4BAA4B,CACxC,QAAgB,EAChB,kBAAuC;QAEvC,MAAM,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;QACvD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC/C,MAAM,GAAG,GAAG,IAAI,cAAG,CAAC,KAAK,CAAC,CAAC;QAE3B,MAAM,GAAG,CAAC,uBAAuB,CAAC,kBAAkB,CAAC,CAAC;QACtD,MAAM,GAAG,CAAC,6BAA6B,CAAC,kBAAkB,CAAC,CAAC;QAE5D,OAAO,GAAG,CAAC;IACb,CAAC;IAED;;;;;OAKG;IAEU,AAAN,KAAK,CAAC,uBAAuB,CAClC,QAAgB,EAChB,kBAAuC;QAEvC,IAAA,2CAA+B,GAAE,CAAC;QAElC,QAAQ,GAAG,IAAA,wBAAY,EAAC,QAAQ,CAAC,CAAC;QAClC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,4BAA4B,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;QAClF,MAAM,EAAE,cAAc,EAAE,GAAG,MAAM,GAAG,CAAC,aAAa,EAAE,CAAC;QACrD,MAAM,cAAc,GAAG,MAAM,sBAAS,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAC;QACzE,MAAM,eAAe,GAAG,MAAM,sBAAS,CAAC,kBAAkB,CAAC,cAAc,CAAC,CAAC;QAE3E,MAAM,mBAAmB,GAA2B,EAAE,CAAC;QACvD,KAAK,MAAM,aAAa,IAAI,cAAc,EAAE,CAAC;YAC3C,MAAM,EAAE,gBAAgB,EAAE,GAAG,eAAe,EAAE,GAAG,cAAc,CAAC,aAAa,CAAC,CAAC;YAC/E,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,eAAe,CAAC,aAAa,CAAC,CAAC;YACzD,mBAAmB,CAAC,IAAI,CAAC;gBACvB,GAAG,eAAe;gBAClB,aAAa;gBACb,gBAAgB,EAAE,gBAAgB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAyB,CAAC;gBAC3E,MAAM;gBACN,KAAK;aACN,CAAC,CAAC;QACL,CAAC;QAED,OAAO;YACL,KAAK,EAAE,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE;YAC3B,mBAAmB;SACpB,CAAC;IACJ,CAAC;IAED;;OAEG;IAEU,AAAN,KAAK,CAAC,UAAU,CAAC,OAAe;QACrC,OAAO,MAAM,QAAQ,CAAC,QAAQ,CAAC,OAAO;aACnC,eAAe,CAAC,IAAI,CAAC,EAAE,EAAE,OAAO,CAAC;aACjC,IAAI,EAAE;aACN,IAAI,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,IAAA,yBAAa,EAAC,YAAY,CAAiB,CAAC,CAAC;IACzE,CAAC;IAED;;OAEG;IAEU,AAAN,KAAK,CAAC,eAAe;QAC1B,OAAO,MAAM,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,qBAAqB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC/E,CAAC;IAED;;;OAGG;IACI,YAAY,CAAC,MAAoB;QACtC,OAAO,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;IAChF,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,WAAW,CAAC,MAAoB;QAC3C,MAAM,IAAI,GAAiB,MAAM,QAAQ,CAAC,QAAQ,CAAC,OAAO;aACvD,mBAAmB,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,CAAC;aACpC,IAAI,EAAE,CAAC;QAEV,MAAM,gBAAgB,GAAG,MAAM,sBAAS,CAAC,cAAc,EAAE,CAAC;QAE1D,OAAO,IAAA,8BAAkB,EAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;IACpD,CAAC;IAED;;;;;OAKG;IACI,KAAK,CAAC,QAAQ,CAAC,KAAK,GAAG,CAAC,EAAE,GAAG,GAAG,MAAM;QAC3C,MAAM,kBAAkB,GAAG,MAAM,CAC/B,MAAM,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,qBAAqB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CACtE,CAAC;QACF,IAAI,kBAAkB,KAAK,CAAC,EAAE,CAAC;YAC7B,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,MAAM,KAAK,GAAmB,MAAM,QAAQ,CAAC,QAAQ,CAAC,OAAO;aAC1D,gBAAgB,CAAC,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,GAAG,CAAC;aACrC,IAAI,EAAE;aACN,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,kCAAsB,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACtE,MAAM,gBAAgB,GAAG,MAAM,sBAAS,CAAC,cAAc,EAAE,CAAC;QAE1D,MAAM,WAAW,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACrC,IAAA,8BAAkB,EAAC,IAAoB,EAAE,gBAAgB,CAAC,CAC3D,CAAC;QAEF,OAAO,WAAW,CAAC;IACrB,CAAC;IAED;;;;;OAKG;IAEU,AAAN,KAAK,CAAC,OAAO,CAClB,IAAc,EACd,KAAgB,EAChB,UAAU,GAAG,SAAS,EACtB,kBAAuC;QAEvC,IAAA,2CAA+B,EAAC,kBAAkB,CAAC,CAAC;QAEpD,IAAI,GAAG,IAAA,wBAAY,EAAC,IAAI,EAAE,MAAM,sBAAS,CAAC,cAAc,EAAE,CAAC,CAAC;QAC5D,MAAM,mBAAmB,GAAG,IAAA,8BAAmB,EAAC,UAAU,CAAC,CAAC;QAC5D,MAAM,sBAAS,CAAC,OAAO,CACrB,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,EAAE,mBAAmB,EAAE,IAAI,EAAE,KAAK,CAAC,EACpF,kBAAkB,CACnB,CAAC;IACJ,CAAC;IAED;;;;;;OAMG;IAEU,AAAN,KAAK,CAAC,UAAU,CACrB,MAAoB,EACpB,OAAiB,EACjB,QAAmB,EACnB,kBAAuC;QAEvC,IAAA,2CAA+B,EAAC,kBAAkB,CAAC,CAAC;QAEpD,OAAO,GAAG,IAAA,wBAAY,EAAC,OAAO,EAAE,MAAM,sBAAS,CAAC,cAAc,EAAE,CAAC,CAAC;QAClE,MAAM,sBAAS,CAAC,OAAO,CACrB,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,sBAAsB,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,EACpF,kBAAkB,CACnB,CAAC;QACF,MAAM,sBAAS,CAAC,OAAO,CACrB,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,uBAAuB,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,CAAC,EAC5E,kBAAkB,CACnB,CAAC;IACJ,CAAC;IAED;;;;OAIG;IAEU,AAAN,KAAK,CAAC,UAAU,CACrB,MAAoB,EACpB,kBAAuC;QAEvC,IAAA,2CAA+B,EAAC,kBAAkB,CAAC,CAAC;QAEpD,MAAM,sBAAS,CAAC,OAAO,CACrB,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,CAAC,EAC7D,kBAAkB,CACnB,CAAC;IACJ,CAAC;IAED;;;;;OAKG;IAEU,AAAN,KAAK,CAAC,aAAa,CACxB,UAAkB,EAClB,WAA6B,EAC7B,kBAAuC;QAEvC,IAAA,2CAA+B,EAAC,kBAAkB,CAAC,CAAC;QAEpD,MAAM,eAAe,GAAG,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,kBAAkB,CAClE,IAAI,CAAC,EAAE,EACP,UAAU,EACV,WAAW,CACZ,CAAC;QACF,MAAM,sBAAS,CAAC,OAAO,CAAC,eAAe,EAAE,kBAAkB,CAAC,CAAC;IAC/D,CAAC;IAED;;;;;OAKG;IAEU,AAAN,KAAK,CAAC,aAAa,CACxB,OAAe,EACf,kBAAuC;QAEvC,IAAA,2CAA+B,EAAC,kBAAkB,CAAC,CAAC;QAEpD,MAAM,eAAe,GAAG,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;QACvF,MAAM,sBAAS,CAAC,OAAO,CAAC,eAAe,EAAE,kBAAkB,CAAC,CAAC;IAC/D,CAAC;IAED;;;OAGG;IACI,cAAc;QACnB,OAAO,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAClE,CAAC;IAED;;;SAGK;IACE,mBAAmB;QACxB,OAAO,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,mBAAmB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACvE,CAAC;IAEM,KAAK,CAAC,sBAAsB,CAAC,QAAgB;QAClD,MAAM,EAAE,eAAe,EAAE,eAAe,EAAE,eAAe,EAAE,iBAAiB,EAAE,GAAG,IAAA,yBAAa,EAC5F,MAAM,QAAQ,CAAC,QAAQ,CAAC,OAAO;aAC5B,sBAAsB,CAAC,IAAI,CAAC,EAAE,EAAE,IAAA,wBAAY,EAAC,QAAQ,CAAC,CAAC;aACvD,IAAI,EAAE,CACV,CAAC;QAEF,OAAO,eAAe,IAAI,eAAe,IAAI,eAAe,IAAI,iBAAiB,CAAC;IACpF,CAAC;IAED;;OAEG;IAEU,AAAN,KAAK,CAAC,oBAAoB;QAC/B,IAAI,CAAC,iBAAiB,GAAG,MAAM,QAAQ,CAAC,QAAQ,CAAC,OAAO;aACrD,yBAAyB,CAAC,IAAI,CAAC,EAAE,CAAC;aAClC,IAAI,EAAE,CAAC;QAEV,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAChC,CAAC;IAED;;OAEG;IAEU,AAAN,KAAK,CAAC,YAAY;QACvB,IAAI,CAAC,IAAI,GAAG,MAAM,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAEzE,OAAO,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAe,CAAC;IAC3C,CAAC;IAED;;OAEG;IAEU,AAAN,KAAK,CAAC,UAAU;QACrB,IAAI,CAAC,IAAI,GAAG,MAAM,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAE/E,OAAO,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAqB,CAAC;IACjD,CAAC;IAGM,mBAAmB;QACxB,OAAO,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACtE,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,gBAAgB;QAC3B,IAAI,CAAC,aAAa,GAAG,IAAA,iCAAqB,EACxC,MAAM,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,wBAAwB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CACzE,CAAC;QAEF,OAAO,IAAI,CAAC,aAAc,CAAC;IAC7B,CAAC;IAED;;OAEG;IAEU,AAAN,KAAK,CAAC,UAAU;QACrB,MAAM,OAAO,GAAY,MAAM,QAAQ,CAAC,QAAQ,CAAC,OAAO;aACrD,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC;aACxB,IAAI,EAAE;aACN,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAA,yBAAa,EAAC,OAAO,CAAY,CAAC,CAAC;QAExD,0DAA0D;QAC1D,OAAO,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC;QACjD,OAAO,CAAC,YAAY,GAAG,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC;QAEnD,OAAO,CAAC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,CAAC;IAClC,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,OAAO,CAAC,IAAY,EAAE,kBAAuC;QACxE,IAAA,2CAA+B,EAAC,kBAAkB,CAAC,CAAC;QAEpD,MAAM,sBAAS,CAAC,OAAO,CACrB,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,EACrD,kBAAkB,CACnB,CAAC;QACF,IAAI,IAAI,CAAC,SAAS;YAAE,IAAI,CAAC,SAAS,CAAC,IAAI,GAAG,IAAI,CAAC;IACjD,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,OAAO,CAClB,OAAqB,EACrB,kBAAuC;QAEvC,IAAA,2CAA+B,EAAC,kBAAkB,CAAC,CAAC;QAEpD,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,GAAG,SAAS,EAAE,GAAG,OAAO,CAAC;QAExD,MAAM,IAAI,CAAC,eAAe,CAAC,YAAY,EAAE,kBAAkB,CAAC,CAAC;QAE7D,MAAM,sBAAS,CAAC,OAAO,CACrB,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,EAAE;YACjD,GAAG,SAAS;YACZ,OAAO,EAAE,OAAO;YAChB,cAAc,EAAE,EAAE;SACnB,CAAC,EACF,kBAAkB,CACnB,CAAC;QAEF,IAAI,IAAI,CAAC,SAAS;YAAE,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC;IAC/C,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,eAAe,CAC1B,eAA6B,EAC7B,kBAAuC;QAEvC,IAAA,2CAA+B,EAAC,kBAAkB,CAAC,CAAC;QAEpD,eAAe,GAAG,MAAM,sBAAS,CAAC,gBAAgB,CAAC,eAAe,CAAC,CAAC;QAEpE,MAAM,sBAAS,CAAC,OAAO,CACrB,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,uBAAuB,CAC/C,IAAI,CAAC,EAAE,EACP,eAAe,CAAC,QAAQ,EACxB,IAAA,kCAAsB,EAAC,eAAe,CAAC,UAAU,CAAC,CACnD,EACD,kBAAkB,CACnB,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,cAAc,CACzB,WAAmB,EACnB,kBAAuC;QAEvC,IAAA,2CAA+B,EAAC,kBAAkB,CAAC,CAAC;QAEpD,MAAM,sBAAS,CAAC,OAAO,CACrB,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,mBAAmB,CAAC,IAAI,CAAC,EAAE,EAAE,WAAW,CAAC,EACnE,kBAAkB,CACnB,CAAC;QACF,IAAI,IAAI,CAAC,SAAS;YAAE,IAAI,CAAC,SAAS,CAAC,WAAW,GAAG,WAAW,CAAC;IAC/D,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,OAAO,CAClB,aAAqB,EACrB,kBAAuC;QAEvC,IAAA,2CAA+B,EAAC,kBAAkB,CAAC,CAAC;QAEpD,MAAM,sBAAS,CAAC,OAAO,CACrB,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,EAAE,aAAa,CAAC,EACnE,kBAAkB,CACnB,CAAC;QACF,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACnB,IAAI,CAAC,SAAS,CAAC,aAAa,GAAG,aAAa,CAAC;QAC/C,CAAC;IACH,CAAC;IAED;;;;OAIG;IAEU,AAAN,KAAK,CAAC,UAAU,CACrB,UAA2B,EAC3B,kBAAuC;QAEvC,IAAA,2CAA+B,EAAC,kBAAkB,CAAC,CAAC;QAEpD,MAAM,eAAe,GAAG,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;QAC1F,MAAM,sBAAS,CAAC,OAAO,CAAC,eAAe,EAAE,kBAAkB,CAAC,CAAC;IAC/D,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,OAAO,CAAC,kBAAuC;QAC1D,IAAA,2CAA+B,EAAC,kBAAkB,CAAC,CAAC;QAEpD,MAAM,sBAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,kBAAkB,CAAC,CAAC;IAC/F,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,MAAM,CAAC,kBAAuC;QACzD,IAAA,2CAA+B,EAAC,kBAAkB,CAAC,CAAC;QAEpD,MAAM,sBAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,kBAAkB,CAAC,CAAC;IAC9F,CAAC;CACF;AAhpBQ;IADN,IAAA,+BAAmB,GAAE;;;;yCAGrB;AAMY;IADZ,IAAA,+BAAmB,GAAE;;;;6CAarB;AAaY;IADZ,IAAA,+BAAmB,GAAE;;;;iDAKrB;AAMY;IADZ,IAAA,+BAAmB,GAAE;;;;uCAgBrB;AAMY;IADZ,IAAA,+BAAmB,GAAE;;;;+CAarB;AA6CY;IADZ,IAAA,+BAAmB,GAAE;;;;yCAerB;AAUY;IADZ,IAAA,+BAAmB,GAAE;;;;4CAsBrB;AAQY;IADZ,IAAA,+BAAmB,GAAE;;;;4CAWrB;AAGa;IADb,IAAA,+BAAmB,GAAE;;;;6CAWrB;AAGa;IADb,IAAA,+BAAmB,GAAE;;;;4DAarB;AASY;IADZ,IAAA,+BAAmB,GAAE;;;;uDA8BrB;AAMY;IADZ,IAAA,+BAAmB,GAAE;;;;0CAMrB;AAMY;IADZ,IAAA,+BAAmB,GAAE;;;;+CAGrB;AA0DY;IADZ,IAAA,+BAAmB,GAAE;;;;uCAerB;AAUY;IADZ,IAAA,+BAAmB,GAAE;;;;0CAkBrB;AAQY;IADZ,IAAA,+BAAmB,GAAE;;;;0CAWrB;AASY;IADZ,IAAA,+BAAmB,GAAE;;;;6CAcrB;AASY;IADZ,IAAA,+BAAmB,GAAE;;;;6CASrB;AAgCY;IADZ,IAAA,+BAAmB,GAAE;;;;oDAOrB;AAMY;IADZ,IAAA,+BAAmB,GAAE;;;;4CAKrB;AAMY;IADZ,IAAA,+BAAmB,GAAE;;;;0CAKrB;AAGM;IADN,IAAA,+BAAmB,GAAE;;;;mDAGrB;AAiBY;IADZ,IAAA,+BAAmB,GAAE;;;;0CAYrB;AA+GY;IADZ,IAAA,+BAAmB,GAAE;;;;0CASrB;AAuBH,kBAAe,QAAQ,CAAC"}
@@ -1,5 +1,4 @@
1
- import { ConsensusConstants, TransactionOptions, BlockInfo, BlockchainId, TokenAmount, TcbPublicData, TcbUtilityData } from '../types/index.js';
2
- import { ConsensusBenchmark } from '@super-protocol/dto-js';
1
+ import { EpochInfo, ConsensusConstants, TransactionOptions, BlockInfo, BlockchainId, TokenAmount, TcbPublicData, TcbUtilityData } from '../types/index.js';
3
2
  declare class Consensus {
4
3
  private static readonly logger;
5
4
  private static tcbIds?;
@@ -11,16 +10,16 @@ declare class Consensus {
11
10
  */
12
11
  static getAllTcbs(): Promise<BlockchainId[]>;
13
12
  static getTcbsCount(): Promise<number>;
13
+ static getEpochTime(time: number): Promise<{
14
+ epochStart: number;
15
+ epochEnd: number;
16
+ epochIndex: number;
17
+ }>;
18
+ static getEpoch(epochIndex: number): Promise<EpochInfo>;
14
19
  static getSuspiciousBlockTable(): Promise<string[]>;
15
20
  static getTcbsPublicData(tcbIds: BlockchainId[], batchSize?: number): Promise<{
16
21
  [tcbId: BlockchainId]: TcbPublicData;
17
22
  }>;
18
- static getTcbsEpochIndex(tcbIds: BlockchainId[], batchSize?: number): Promise<{
19
- [tcbId: BlockchainId]: number;
20
- }>;
21
- static getBenchmarksByTcbIds(tcbIds: BlockchainId[], teeOfferIds?: string[], batchSize?: undefined): Promise<{
22
- [tcbId: BlockchainId]: ConsensusBenchmark;
23
- }>;
24
23
  static getTcbsUtilityData(tcbIds: BlockchainId[], batchSize?: number): Promise<{
25
24
  [tcbId: BlockchainId]: TcbUtilityData;
26
25
  }>;
@@ -33,6 +32,7 @@ declare class Consensus {
33
32
  static onTcbCompleted(callback: onTcbCompletedCallback): () => void;
34
33
  static onTcbInitialized(callback: onTcbInitializedCallback): () => void;
35
34
  static onTcbBenchmarkChanged(callback: onTcbBenchmarkChangedCallback): () => void;
35
+ static onRewardsClaimed(callback: onRewardsClaimedCallback): () => void;
36
36
  static onTcbRewardUnlocked(callback: onTcbRewardUnlockedCallback): () => void;
37
37
  }
38
38
  export type onRewardsClaimedCallback = (tcbId: BlockchainId, amount: TokenAmount, claimer: string, block?: BlockInfo) => void;
@@ -9,9 +9,7 @@ const Superpro_js_1 = __importDefault(require("./Superpro.js"));
9
9
  const helper_js_1 = require("../utils/helper.js");
10
10
  const TxManager_js_1 = __importDefault(require("../utils/TxManager.js"));
11
11
  const index_js_1 = require("../connectors/index.js");
12
- const ProviderRewards_js_1 = __importDefault(require("./ProviderRewards.js"));
13
12
  const TCB_REQUEST_BATCH_SIZE = 10; // expected response less then 100k bytes
14
- const EPOCH_INDEXES_REQUEST_BATCH_SIZE = 50;
15
13
  class Consensus {
16
14
  static logger = logger_js_1.default.child({ className: 'Consensus' });
17
15
  static tcbIds;
@@ -44,6 +42,26 @@ class Consensus {
44
42
  const contract = index_js_1.BlockchainConnector.getInstance().getContract();
45
43
  return Number(await contract.methods.getTcbsCount().call());
46
44
  }
45
+ static async getEpochTime(time) {
46
+ const contract = index_js_1.BlockchainConnector.getInstance().getContract();
47
+ const response = await contract.methods.getEpochTime(time).call();
48
+ return {
49
+ epochStart: Number(response[0]),
50
+ epochEnd: Number(response[1]),
51
+ epochIndex: Number(response[2]),
52
+ };
53
+ }
54
+ static async getEpoch(epochIndex) {
55
+ const contract = index_js_1.BlockchainConnector.getInstance().getContract();
56
+ const epochInfo = await contract.methods.getEpoch(epochIndex).call();
57
+ const cleanedEpochInfo = (0, helper_js_1.cleanWeb3Data)(epochInfo);
58
+ const output = {
59
+ ...cleanedEpochInfo,
60
+ benchmark: (0, helper_js_1.formatBenchmark)(epochInfo.benchmark),
61
+ penaltyBenchmark: (0, helper_js_1.formatBenchmark)(epochInfo.penaltyBenchmark),
62
+ };
63
+ return output;
64
+ }
47
65
  static getSuspiciousBlockTable() {
48
66
  const contract = index_js_1.BlockchainConnector.getInstance().getContract();
49
67
  return contract.methods.getSuspiciousBlockTable().call();
@@ -61,41 +79,11 @@ class Consensus {
61
79
  tcbsPublicData[tcbIndex].checkingTcbIds?.map((id) => id.toString()) || [];
62
80
  tcbsPublicData[tcbIndex].checkingTcbMarks =
63
81
  tcbsPublicData[tcbIndex].checkingTcbMarks?.map((mark) => Number(mark)) || [];
82
+ tcbsPublicData[tcbIndex].benchmark = (0, helper_js_1.formatBenchmark)(tcbsPublicData[tcbIndex].benchmark);
64
83
  response[tcbIds[tcbIndex]] = tcbsPublicData[tcbIndex];
65
84
  }
66
85
  return response;
67
86
  }
68
- static async getTcbsEpochIndex(tcbIds, batchSize = EPOCH_INDEXES_REQUEST_BATCH_SIZE) {
69
- const contract = index_js_1.BlockchainConnector.getInstance().getContract();
70
- const response = {};
71
- const getTcbsEpochIndexHelper = async (ids) => {
72
- return contract.methods.getTcbsEpochIndex(ids).call();
73
- };
74
- const epochIndexes = await Consensus.batchCall(getTcbsEpochIndexHelper, tcbIds, batchSize, helper_js_1.formatEpochIndexes);
75
- for (let index = 0; index < epochIndexes.length; index++) {
76
- response[tcbIds[index]] = epochIndexes[index];
77
- }
78
- return response;
79
- }
80
- static async getBenchmarksByTcbIds(tcbIds, teeOfferIds = [], batchSize = undefined) {
81
- if (teeOfferIds.length === 0) {
82
- const tcbsUtilityData = await Consensus.getTcbsUtilityData(tcbIds);
83
- for (const tcbId of tcbIds) {
84
- teeOfferIds.push(tcbsUtilityData[tcbId].teeOfferId);
85
- }
86
- }
87
- const epochIndexes = await Consensus.getTcbsEpochIndex(tcbIds);
88
- const epochIndexesFormatted = [];
89
- for (const key in epochIndexes) {
90
- epochIndexesFormatted.push(epochIndexes[key]);
91
- }
92
- const benchmarks = await ProviderRewards_js_1.default.getBenchmarks(epochIndexesFormatted, teeOfferIds, batchSize);
93
- const response = {};
94
- for (let index = 0; index < benchmarks.length; index++) {
95
- response[tcbIds[index]] = benchmarks[index];
96
- }
97
- return response;
98
- }
99
87
  static async getTcbsUtilityData(tcbIds, batchSize = TCB_REQUEST_BATCH_SIZE) {
100
88
  const contract = index_js_1.BlockchainConnector.getInstance().getContract();
101
89
  const response = {};
@@ -230,6 +218,25 @@ class Consensus {
230
218
  event: 'TcbBenchmarkChanged',
231
219
  });
232
220
  }
221
+ static onRewardsClaimed(callback) {
222
+ const listener = index_js_1.BlockchainEventsListener.getInstance();
223
+ const logger = this.logger.child({ method: 'onRewardsClaimed' });
224
+ const onData = (event) => {
225
+ const parsedEvent = (0, helper_js_1.cleanWeb3Data)(event.returnValues);
226
+ callback(parsedEvent.tcbId, parsedEvent.amount, parsedEvent.claimer, {
227
+ index: Number(event.blockNumber),
228
+ hash: event.blockHash,
229
+ });
230
+ };
231
+ const onError = (error) => {
232
+ logger.warn(error);
233
+ };
234
+ return listener.subscribeEvent({
235
+ onError,
236
+ onData,
237
+ event: 'RewardsClaimed',
238
+ });
239
+ }
233
240
  static onTcbRewardUnlocked(callback) {
234
241
  const listener = index_js_1.BlockchainEventsListener.getInstance();
235
242
  const logger = this.logger.child({ method: 'onTcbRewardUnlocked' });
@@ -251,4 +258,4 @@ class Consensus {
251
258
  }
252
259
  }
253
260
  exports.default = Consensus;
254
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Consensus.js","sourceRoot":"","sources":["../../../src/staticModels/Consensus.ts"],"names":[],"mappings":";;;;;AAAA,6DAAsC;AACtC,8DAAmC;AACnC,gEAAqC;AAUrC,kDAO4B;AAC5B,yEAA8C;AAC9C,qDAAuF;AAOvF,8EAAmD;AAEnD,MAAM,sBAAsB,GAAG,EAAE,CAAC,CAAC,yCAAyC;AAC5E,MAAM,gCAAgC,GAAG,EAAE,CAAC;AAG5C,MAAM,SAAS;IACL,MAAM,CAAU,MAAM,GAAG,mBAAU,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC,CAAC;IACtE,MAAM,CAAC,MAAM,CAAkB;IAEhC,MAAM,KAAK,OAAO;QACvB,OAAO,qBAAQ,CAAC,OAAO,CAAC;IAC1B,CAAC;IAEO,MAAM,CAAC,KAAK,CAAC,SAAS,CAC5B,MAAyB,EACzB,GAAa,EACb,SAAiB,EACjB,QAA4B;QAE5B,MAAM,OAAO,GAAQ,EAAE,CAAC;QACxB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,IAAI,SAAS,EAAE,CAAC;YAC/C,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,CAAC;YAC1C,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC,CAAC;YACnC,OAAO,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;QACpC,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IACD;;;OAGG;IACI,MAAM,CAAC,KAAK,CAAC,UAAU;QAC5B,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;QAE1C,MAAM,SAAS,GAAG,MAAM,SAAS,CAAC,YAAY,EAAE,CAAC;QACjD,KAAK,IAAI,KAAK,GAAG,MAAM,CAAC,IAAI,GAAG,CAAC,EAAE,KAAK,IAAI,SAAS,EAAE,KAAK,EAAE,EAAE,CAAC;YAC9D,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC/B,CAAC;QACD,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAEjC,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,YAAY;QAC9B,MAAM,QAAQ,GAAG,8BAAmB,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE,CAAC;QAEjE,OAAO,MAAM,CAAC,MAAM,QAAQ,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;IAC9D,CAAC;IAEM,MAAM,CAAC,uBAAuB;QACnC,MAAM,QAAQ,GAAG,8BAAmB,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE,CAAC;QAEjE,OAAO,QAAQ,CAAC,OAAO,CAAC,uBAAuB,EAAE,CAAC,IAAI,EAAE,CAAC;IAC3D,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,iBAAiB,CACnC,MAAsB,EACtB,SAAS,GAAG,sBAAsB;QAElC,MAAM,QAAQ,GAAG,8BAAmB,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE,CAAC;QAEjE,MAAM,QAAQ,GAA6C,EAAE,CAAC;QAC9D,MAAM,uBAAuB,GAAG,KAAK,EAAE,GAAmB,EAAgB,EAAE;YAC1E,OAAO,QAAQ,CAAC,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;QACxD,CAAC,CAAC;QAEF,MAAM,cAAc,GAAoB,MAAM,SAAS,CAAC,SAAS,CAC/D,uBAAuB,EACvB,MAAM,EACN,SAAS,EACT,+BAAmB,CACpB,CAAC;QAEF,KAAK,IAAI,QAAQ,GAAG,CAAC,EAAE,QAAQ,GAAG,cAAc,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE,CAAC;YACpE,cAAc,CAAC,QAAQ,CAAC,CAAC,QAAQ,GAAG,IAAA,0BAAc,EAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,CAAC;YACtF,cAAc,CAAC,QAAQ,CAAC,CAAC,cAAc;gBACrC,cAAc,CAAC,QAAQ,CAAC,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC;YAC5E,cAAc,CAAC,QAAQ,CAAC,CAAC,gBAAgB;gBACvC,cAAc,CAAC,QAAQ,CAAC,CAAC,gBAAgB,EAAE,GAAG,CAC5C,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAsB,CAC5C,IAAI,EAAE,CAAC;YAEV,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,cAAc,CAAC,QAAQ,CAAC,CAAC;QACxD,CAAC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,iBAAiB,CACnC,MAAsB,EACtB,SAAS,GAAG,gCAAgC;QAE5C,MAAM,QAAQ,GAAG,8BAAmB,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE,CAAC;QAEjE,MAAM,QAAQ,GAAsC,EAAE,CAAC;QACvD,MAAM,uBAAuB,GAAG,KAAK,EAAE,GAAmB,EAAgB,EAAE;YAC1E,OAAO,QAAQ,CAAC,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;QACxD,CAAC,CAAC;QAEF,MAAM,YAAY,GAAa,MAAM,SAAS,CAAC,SAAS,CACtD,uBAAuB,EACvB,MAAM,EACN,SAAS,EACT,8BAAkB,CACnB,CAAC;QAEF,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,YAAY,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC;YACzD,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC;QAChD,CAAC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,qBAAqB,CACvC,MAAsB,EACtB,cAAwB,EAAE,EAC1B,SAAS,GAAG,SAAS;QAErB,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC7B,MAAM,eAAe,GAAG,MAAM,SAAS,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;YACnE,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;gBAC3B,WAAW,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,UAAU,CAAC,CAAC;YACtD,CAAC;QACH,CAAC;QACD,MAAM,YAAY,GAAG,MAAM,SAAS,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;QAC/D,MAAM,qBAAqB,GAAa,EAAE,CAAC;QAC3C,KAAK,MAAM,GAAG,IAAI,YAAY,EAAE,CAAC;YAC/B,qBAAqB,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC;QAChD,CAAC;QAED,MAAM,UAAU,GAAG,MAAM,4BAAe,CAAC,aAAa,CAAC,qBAAqB,EAAE,WAAW,EAAC,SAAS,CAAC,CAAC;QAErG,MAAM,QAAQ,GAAkD,EAAE,CAAC;QACnE,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,UAAU,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC;YACvD,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;QAC9C,CAAC;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,kBAAkB,CACpC,MAAsB,EACtB,SAAS,GAAG,sBAAsB;QAElC,MAAM,QAAQ,GAAG,8BAAmB,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE,CAAC;QAEjE,MAAM,QAAQ,GAA8C,EAAE,CAAC;QAC/D,MAAM,wBAAwB,GAAG,KAAK,EAAE,GAAmB,EAAgB,EAAE;YAC3E,OAAO,QAAQ,CAAC,OAAO,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;QACzD,CAAC,CAAC;QACF,MAAM,oBAAoB,GAAG,CAAC,KAAY,EAAE,EAAE,CAC5C,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,kCAAsB,EAAC,IAAI,CAAmB,CAAC,CAAC;QACtE,MAAM,cAAc,GAAqB,MAAM,SAAS,CAAC,SAAS,CAChE,wBAAwB,EACxB,MAAM,EACN,SAAS,EACT,oBAAoB,CACrB,CAAC;QAEF,KAAK,IAAI,QAAQ,GAAG,CAAC,EAAE,QAAQ,GAAG,cAAc,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE,CAAC;YACpE,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,cAAc,CAAC,QAAQ,CAAC,CAAC;QACxD,CAAC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,qBAAqB,CACvC,MAAsB,EACtB,kBAAuC;QAEvC,MAAM,QAAQ,GAAG,8BAAmB,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE,CAAC;QACjE,IAAA,2CAA+B,EAAC,kBAAkB,CAAC,CAAC;QAEpD,IAAI,aAAqB,CAAC;QAC1B,IAAI,CAAC;YACH,aAAa,GAAG,MAAM,CACpB,CAAC,MAAM,sBAAS,CAAC,MAAM,CACrB,QAAQ,CAAC,OAAO,CAAC,qBAAqB,CAAC,MAAM,CAAC,EAC9C,kBAAkB,CACnB,CAAW,CACb,CAAC;QACJ,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,aAAa,GAAG,CAAC,CAAC;QACpB,CAAC;QAED,IAAI,aAAa,KAAK,MAAM,CAAC,MAAM,EAAE,CAAC;YACpC,MAAM,sBAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,qBAAqB,CAAC,MAAM,CAAC,EAAE,kBAAkB,CAAC,CAAC;QAC9F,CAAC;aAAM,CAAC;YACN,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;gBAC3B,MAAM,IAAI,gBAAG,CAAC,KAAK,CAAC,CAAC,aAAa,EAAE,CAAC;YACvC,CAAC;QACH,CAAC;IACH,CAAC;IAEM,MAAM,CAAC,2BAA2B;QACvC,MAAM,QAAQ,GAAG,8BAAmB,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE,CAAC;QAEjE,OAAO,QAAQ,CAAC,OAAO;aACpB,2BAA2B,EAAE;aAC7B,IAAI,EAAE;aACN,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;IACrC,CAAC;IAEM,MAAM,CAAC,iBAAiB;QAC7B,MAAM,QAAQ,GAAG,8BAAmB,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE,CAAC;QAEjE,OAAO,QAAQ,CAAC,OAAO;aACpB,iBAAiB,EAAE;aACnB,IAAI,EAAE;aACN,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;IACnD,CAAC;IAEM,MAAM,CAAC,qBAAqB;QACjC,MAAM,QAAQ,GAAG,8BAAmB,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE,CAAC;QAEjE,OAAO,QAAQ,CAAC,OAAO;aACpB,qBAAqB,EAAE;aACvB,IAAI,EAAE;aACN,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;IACrC,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,YAAY;QAC9B,MAAM,QAAQ,GAAG,8BAAmB,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE,CAAC;QACjE,MAAM,QAAQ,GAAuB,MAAM,QAAQ,CAAC,OAAO,CAAC,qBAAqB,EAAE,CAAC,IAAI,EAAE,CAAC;QAE3F,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEM,MAAM,CAAC,WAAW,CAAC,QAA6B;QACrD,MAAM,QAAQ,GAAG,mCAAwB,CAAC,WAAW,EAAE,CAAC;QACxD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,CAAC;QAC5D,MAAM,MAAM,GAA4B,CAAC,KAAe,EAAQ,EAAE;YAChE,MAAM,WAAW,GAAG,IAAA,yBAAa,EAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YACtD,QAAQ,CACE,WAAW,CAAC,KAAK,EACjB,WAAW,CAAC,QAAQ,EACjB;gBACT,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC;gBAChC,IAAI,EAAU,KAAK,CAAC,SAAS;aAC9B,CACF,CAAC;QACJ,CAAC,CAAC;QACF,MAAM,OAAO,GAA6B,CAAC,KAAY,EAAE,EAAE;YACzD,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrB,CAAC,CAAC;QACF,OAAO,QAAQ,CAAC,cAAc,CAAC;YAC7B,OAAO;YACP,MAAM;YACN,KAAK,EAAE,WAAW;SACnB,CAAC,CAAC;IACL,CAAC;IAEM,MAAM,CAAC,cAAc,CAAC,QAAgC;QAC3D,MAAM,QAAQ,GAAG,mCAAwB,CAAC,WAAW,EAAE,CAAC;QACxD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC,CAAC;QAC/D,MAAM,MAAM,GAA4B,CAAC,KAAe,EAAQ,EAAE;YAChE,MAAM,WAAW,GAAG,IAAA,yBAAa,EAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YACtD,QAAQ,CACE,WAAW,CAAC,KAAK,EACjB,WAAW,CAAC,QAAQ,EACjB;gBACT,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC;gBAChC,IAAI,EAAU,KAAK,CAAC,SAAS;aAC9B,CACF,CAAC;QACJ,CAAC,CAAC;QACF,MAAM,OAAO,GAA6B,CAAC,KAAY,EAAE,EAAE;YACzD,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrB,CAAC,CAAC;QACF,OAAO,QAAQ,CAAC,cAAc,CAAC;YAC7B,OAAO;YACP,MAAM;YACN,KAAK,EAAE,cAAc;SACtB,CAAC,CAAC;IACL,CAAC;IAEM,MAAM,CAAC,gBAAgB,CAAC,QAAkC;QAC/D,MAAM,QAAQ,GAAG,mCAAwB,CAAC,WAAW,EAAE,CAAC;QACxD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,kBAAkB,EAAE,CAAC,CAAC;QACjE,MAAM,MAAM,GAA4B,CAAC,KAAe,EAAQ,EAAE;YAChE,MAAM,WAAW,GAAG,IAAA,yBAAa,EAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YACtD,QAAQ,CACE,WAAW,CAAC,KAAK,EACjB,WAAW,CAAC,QAAQ,EACjB;gBACT,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC;gBAChC,IAAI,EAAU,KAAK,CAAC,SAAS;aAC9B,CACF,CAAC;QACJ,CAAC,CAAC;QACF,MAAM,OAAO,GAA6B,CAAC,KAAY,EAAE,EAAE;YACzD,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrB,CAAC,CAAC;QACF,OAAO,QAAQ,CAAC,cAAc,CAAC;YAC7B,OAAO;YACP,MAAM;YACN,KAAK,EAAE,gBAAgB;SACxB,CAAC,CAAC;IACL,CAAC;IAEM,MAAM,CAAC,qBAAqB,CAAC,QAAuC;QACzE,MAAM,QAAQ,GAAG,mCAAwB,CAAC,WAAW,EAAE,CAAC;QACxD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,uBAAuB,EAAE,CAAC,CAAC;QACtE,MAAM,MAAM,GAA4B,CAAC,KAAe,EAAE,EAAE;YAC1D,MAAM,WAAW,GAAG,IAAA,yBAAa,EAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YACtD,QAAQ,CACE,WAAW,CAAC,KAAK,EACjB,WAAW,CAAC,QAAQ,EACjB;gBACT,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC;gBAChC,IAAI,EAAU,KAAK,CAAC,SAAS;aAC9B,CACF,CAAC;QACJ,CAAC,CAAC;QACF,MAAM,OAAO,GAA6B,CAAC,KAAY,EAAE,EAAE;YACzD,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrB,CAAC,CAAC;QACF,OAAO,QAAQ,CAAC,cAAc,CAAC;YAC7B,OAAO;YACP,MAAM;YACN,KAAK,EAAE,qBAAqB;SAC7B,CAAC,CAAC;IACL,CAAC;IAEM,MAAM,CAAC,mBAAmB,CAAC,QAAqC;QACrE,MAAM,QAAQ,GAAG,mCAAwB,CAAC,WAAW,EAAE,CAAC;QACxD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,qBAAqB,EAAE,CAAC,CAAC;QACpE,MAAM,MAAM,GAA4B,CAAC,KAAe,EAAE,EAAE;YAC1D,MAAM,WAAW,GAAG,IAAA,yBAAa,EAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YACtD,QAAQ,CACQ,WAAW,CAAC,KAAK,EAClB,WAAW,CAAC,OAAO,EACrB;gBACT,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC;gBAChC,IAAI,EAAU,KAAK,CAAC,SAAS;aAC9B,CACF,CAAC;QACJ,CAAC,CAAC;QACF,MAAM,OAAO,GAA6B,CAAC,KAAY,EAAE,EAAE;YACzD,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrB,CAAC,CAAC;QACF,OAAO,QAAQ,CAAC,cAAc,CAAC;YAC7B,OAAO;YACP,MAAM;YACN,KAAK,EAAE,mBAAmB;SAC3B,CAAC,CAAC;IACL,CAAC;;AAkCH,kBAAe,SAAS,CAAC"}
261
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Consensus.js","sourceRoot":"","sources":["../../../src/staticModels/Consensus.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,5 @@
1
1
  import { TCB } from '../models/index.js';
2
- import { TcbUtilityData } from '../types/index.js';
3
2
  export declare class TeeBlockVerifier {
4
3
  private static readonly verifiedTcbs;
5
- static verifyTcb(tcb: TCB, utilityData: TcbUtilityData, sgxApiUrl: string): Promise<void>;
4
+ static verifyTcb(tcb: TCB, quoteString: string, pubKey: string, sgxApiUrl: string): Promise<void>;
6
5
  }
@@ -8,21 +8,19 @@ const logger_js_1 = __importDefault(require("../logger.js"));
8
8
  const config_js_1 = require("../config.js");
9
9
  const QuoteValidator_js_1 = require("./QuoteValidator.js");
10
10
  const TcbSerializer_js_1 = require("./TcbSerializer.js");
11
- const Consensus_js_1 = __importDefault(require("../staticModels/Consensus.js"));
12
11
  class TeeBlockVerifier {
13
12
  static verifiedTcbs = new Set();
14
- static async verifyTcb(tcb, utilityData, sgxApiUrl) {
13
+ static async verifyTcb(tcb, quoteString, pubKey, sgxApiUrl) {
15
14
  // check cache
16
15
  if (this.verifiedTcbs.has(tcb.tcbId)) {
17
16
  logger_js_1.default.trace(`Tcb id = ${tcb.tcbId}, already validated`);
18
17
  return;
19
18
  }
20
- const quote = Buffer.from(utilityData.quote, 'base64');
19
+ const quote = Buffer.from(quoteString, 'base64');
21
20
  const signedTcbData = {
22
21
  checkingTcbId: tcb.tcbId.toString(),
23
- pubKey: utilityData.pubKey,
22
+ pubKey,
24
23
  ...(await tcb.getPublicData()),
25
- benchmark: (await Consensus_js_1.default.getBenchmarksByTcbIds([tcb.tcbId], [utilityData.teeOfferId]))[0],
26
24
  };
27
25
  const validator = new QuoteValidator_js_1.QuoteValidator(sgxApiUrl);
28
26
  await validator.checkQuote(quote, TcbSerializer_js_1.TcbDataSerializer.serialize(signedTcbData));
@@ -38,4 +36,4 @@ class TeeBlockVerifier {
38
36
  }
39
37
  }
40
38
  exports.TeeBlockVerifier = TeeBlockVerifier;
41
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVGVlQmxvY2tWZXJpZmllci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy90ZWUvVGVlQmxvY2tWZXJpZmllci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSw2REFBa0M7QUFDbEMsNENBQXNDO0FBRXRDLDJEQUFxRDtBQUVyRCx5REFBdUQ7QUFDdkQsZ0ZBQXFEO0FBRXJELE1BQWEsZ0JBQWdCO0lBQ25CLE1BQU0sQ0FBVSxZQUFZLEdBQXNCLElBQUksR0FBRyxFQUFFLENBQUM7SUFFcEUsTUFBTSxDQUFDLEtBQUssQ0FBQyxTQUFTLENBQUMsR0FBUSxFQUFFLFdBQTJCLEVBQUUsU0FBaUI7UUFDN0UsY0FBYztRQUNkLElBQUksSUFBSSxDQUFDLFlBQVksQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUM7WUFDckMsbUJBQU0sQ0FBQyxLQUFLLENBQUMsWUFBWSxHQUFHLENBQUMsS0FBSyxxQkFBcUIsQ0FBQyxDQUFDO1lBQ3pELE9BQU87UUFDVCxDQUFDO1FBRUQsTUFBTSxLQUFLLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsS0FBSyxFQUFFLFFBQVEsQ0FBQyxDQUFDO1FBQ3ZELE1BQU0sYUFBYSxHQUFHO1lBQ3BCLGFBQWEsRUFBRSxHQUFHLENBQUMsS0FBSyxDQUFDLFFBQVEsRUFBRTtZQUNuQyxNQUFNLEVBQUUsV0FBVyxDQUFDLE1BQU07WUFDMUIsR0FBRyxDQUFDLE1BQU0sR0FBRyxDQUFDLGFBQWEsRUFBRSxDQUFDO1lBQzlCLFNBQVMsRUFBRSxDQUFDLE1BQU0sc0JBQVMsQ0FBQyxxQkFBcUIsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLFdBQVcsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1NBQzdGLENBQUM7UUFFRixNQUFNLFNBQVMsR0FBRyxJQUFJLGtDQUFjLENBQUMsU0FBUyxDQUFDLENBQUM7UUFDaEQsTUFBTSxTQUFTLENBQUMsVUFBVSxDQUFDLEtBQUssRUFBRSxvQ0FBaUIsQ0FBQyxTQUFTLENBQUMsYUFBYSxDQUFDLENBQUMsQ0FBQztRQUM5RSxNQUFNLFNBQVMsQ0FBQyxjQUFjLENBQUMsS0FBSyxDQUFDLENBQUM7UUFFdEMsZUFBZTtRQUNmLElBQUksQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUNqQyxJQUFJLElBQUksQ0FBQyxZQUFZLENBQUMsSUFBSSxHQUFHLGtCQUFNLENBQUMsY0FBYyxFQUFFLENBQUM7WUFDbkQsTUFBTSxDQUFDLEtBQUssQ0FBQyxHQUFHLElBQUksQ0FBQyxZQUFZLENBQUMsT0FBTyxFQUFFLENBQUMsSUFBSSxFQUFFLENBQUMsS0FBeUIsQ0FBQztZQUM3RSxJQUFJLENBQUMsWUFBWSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQztZQUNoQyxtQkFBTSxDQUFDLEtBQUssQ0FDVixLQUFLLEVBQ0wsWUFBWSxLQUFLLHdDQUF3QyxJQUFJLENBQUMsWUFBWSxDQUFDLElBQUksa0JBQWtCLGtCQUFNLENBQUMsY0FBYyxFQUFFLENBQ3pILENBQUM7UUFDSixDQUFDO1FBQ0QsbUJBQU0sQ0FBQyxLQUFLLENBQ1YsR0FBRyxDQUFDLEtBQUssRUFDVCxZQUFZLEdBQUcsQ0FBQyxLQUFLLG9DQUFvQyxJQUFJLENBQUMsWUFBWSxDQUFDLElBQUksa0JBQWtCLGtCQUFNLENBQUMsY0FBYyxFQUFFLENBQ3pILENBQUM7SUFDSixDQUFDOztBQXBDSCw0Q0FxQ0MifQ==
39
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVGVlQmxvY2tWZXJpZmllci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy90ZWUvVGVlQmxvY2tWZXJpZmllci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSw2REFBa0M7QUFDbEMsNENBQXNDO0FBRXRDLDJEQUFxRDtBQUVyRCx5REFBdUQ7QUFFdkQsTUFBYSxnQkFBZ0I7SUFDbkIsTUFBTSxDQUFVLFlBQVksR0FBc0IsSUFBSSxHQUFHLEVBQUUsQ0FBQztJQUVwRSxNQUFNLENBQUMsS0FBSyxDQUFDLFNBQVMsQ0FDcEIsR0FBUSxFQUNSLFdBQW1CLEVBQ25CLE1BQWMsRUFDZCxTQUFpQjtRQUVqQixjQUFjO1FBQ2QsSUFBSSxJQUFJLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQztZQUNyQyxtQkFBTSxDQUFDLEtBQUssQ0FBQyxZQUFZLEdBQUcsQ0FBQyxLQUFLLHFCQUFxQixDQUFDLENBQUM7WUFDekQsT0FBTztRQUNULENBQUM7UUFFRCxNQUFNLEtBQUssR0FBRyxNQUFNLENBQUMsSUFBSSxDQUFDLFdBQVcsRUFBRSxRQUFRLENBQUMsQ0FBQztRQUNqRCxNQUFNLGFBQWEsR0FBRztZQUNwQixhQUFhLEVBQUUsR0FBRyxDQUFDLEtBQUssQ0FBQyxRQUFRLEVBQUU7WUFDbkMsTUFBTTtZQUNOLEdBQUcsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxhQUFhLEVBQUUsQ0FBQztTQUMvQixDQUFDO1FBRUYsTUFBTSxTQUFTLEdBQUcsSUFBSSxrQ0FBYyxDQUFDLFNBQVMsQ0FBQyxDQUFDO1FBQ2hELE1BQU0sU0FBUyxDQUFDLFVBQVUsQ0FBQyxLQUFLLEVBQUUsb0NBQWlCLENBQUMsU0FBUyxDQUFDLGFBQWEsQ0FBQyxDQUFDLENBQUM7UUFDOUUsTUFBTSxTQUFTLENBQUMsY0FBYyxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBRXRDLGVBQWU7UUFDZixJQUFJLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDakMsSUFBSSxJQUFJLENBQUMsWUFBWSxDQUFDLElBQUksR0FBRyxrQkFBTSxDQUFDLGNBQWMsRUFBRSxDQUFDO1lBQ25ELE1BQU0sQ0FBQyxLQUFLLENBQUMsR0FBRyxJQUFJLENBQUMsWUFBWSxDQUFDLE9BQU8sRUFBRSxDQUFDLElBQUksRUFBRSxDQUFDLEtBQXlCLENBQUM7WUFDN0UsSUFBSSxDQUFDLFlBQVksQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUM7WUFDaEMsbUJBQU0sQ0FBQyxLQUFLLENBQ1YsS0FBSyxFQUNMLFlBQVksS0FBSyx3Q0FBd0MsSUFBSSxDQUFDLFlBQVksQ0FBQyxJQUFJLGtCQUFrQixrQkFBTSxDQUFDLGNBQWMsRUFBRSxDQUN6SCxDQUFDO1FBQ0osQ0FBQztRQUNELG1CQUFNLENBQUMsS0FBSyxDQUNWLEdBQUcsQ0FBQyxLQUFLLEVBQ1QsWUFBWSxHQUFHLENBQUMsS0FBSyxvQ0FBb0MsSUFBSSxDQUFDLFlBQVksQ0FBQyxJQUFJLGtCQUFrQixrQkFBTSxDQUFDLGNBQWMsRUFBRSxDQUN6SCxDQUFDO0lBQ0osQ0FBQzs7QUF4Q0gsNENBeUNDIn0=
@@ -16,6 +16,7 @@ export type TcbPublicData = {
16
16
  checkingTcbIds: BlockchainId[];
17
17
  checkingTcbMarks: TcbVerifiedStatus[];
18
18
  deviceId: string;
19
+ benchmark: ConsensusBenchmark;
19
20
  properties: string;
20
21
  };
21
22
  export type TcbUtilityData = {
@@ -26,6 +27,7 @@ export type TcbUtilityData = {
26
27
  export type TcbData = {
27
28
  status: TcbStatus;
28
29
  previousTcb: BlockchainId;
30
+ timeInitialized: number;
29
31
  timeAdded: number;
30
32
  lastBlocksTakenAmount: number;
31
33
  suspiciousBlocksTakenAmount: number;
@@ -34,7 +36,7 @@ export type TcbData = {
34
36
  lastBlocksTaken: boolean;
35
37
  suspiciousBlocksTaken: boolean;
36
38
  checked: boolean;
37
- epochIndex: number;
39
+ rewardClaimed: boolean;
38
40
  };
39
41
  export declare enum TcbStatus {
40
42
  Inited = "0",
@@ -16,4 +16,4 @@ exports.ConsensusConstantsStructure = {
16
16
  MAX_BECHMARK_OVERRUN_PERCENT: Number,
17
17
  CONSENSUS_EPOCH_DURATION: Number,
18
18
  };
19
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ29uc2Vuc3VzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3R5cGVzL0NvbnNlbnN1cy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUE0Q0EsSUFBWSxTQUtYO0FBTEQsV0FBWSxTQUFTO0lBQ25CLHlCQUFZLENBQUE7SUFDWiw0QkFBZSxDQUFBO0lBQ2YseUJBQVksQ0FBQTtJQUNaLG1DQUFzQixDQUFBO0FBQ3hCLENBQUMsRUFMVyxTQUFTLHlCQUFULFNBQVMsUUFLcEI7QUFpQlksUUFBQSwyQkFBMkIsR0FBRztJQUN6QyxZQUFZLEVBQUUsTUFBTTtJQUNwQixZQUFZLEVBQUUsTUFBTTtJQUNwQixXQUFXLEVBQUUsTUFBTTtJQUNuQix1QkFBdUIsRUFBRSxNQUFNO0lBQy9CLDRCQUE0QixFQUFFLE1BQU07SUFDcEMsd0JBQXdCLEVBQUUsTUFBTTtDQUNqQyxDQUFDIn0=
19
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ29uc2Vuc3VzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3R5cGVzL0NvbnNlbnN1cy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUE4Q0EsSUFBWSxTQUtYO0FBTEQsV0FBWSxTQUFTO0lBQ25CLHlCQUFZLENBQUE7SUFDWiw0QkFBZSxDQUFBO0lBQ2YseUJBQVksQ0FBQTtJQUNaLG1DQUFzQixDQUFBO0FBQ3hCLENBQUMsRUFMVyxTQUFTLHlCQUFULFNBQVMsUUFLcEI7QUFpQlksUUFBQSwyQkFBMkIsR0FBRztJQUN6QyxZQUFZLEVBQUUsTUFBTTtJQUNwQixZQUFZLEVBQUUsTUFBTTtJQUNwQixXQUFXLEVBQUUsTUFBTTtJQUNuQix1QkFBdUIsRUFBRSxNQUFNO0lBQy9CLDRCQUE0QixFQUFFLE1BQU07SUFDcEMsd0JBQXdCLEVBQUUsTUFBTTtDQUNqQyxDQUFDIn0=
@@ -5,6 +5,5 @@ export declare enum ParamName {
5
5
  StopDelaySeconds = "3",
6
6
  TeeOfferSecDeposit = "4",
7
7
  OfferSecDeposit = "5",
8
- TeeRewardPerEpoch = "6",
9
- StorageRequestFee = "7"
8
+ StorageRequestFee = "6"
10
9
  }
@@ -9,7 +9,6 @@ var ParamName;
9
9
  ParamName["StopDelaySeconds"] = "3";
10
10
  ParamName["TeeOfferSecDeposit"] = "4";
11
11
  ParamName["OfferSecDeposit"] = "5";
12
- ParamName["TeeRewardPerEpoch"] = "6";
13
- ParamName["StorageRequestFee"] = "7";
12
+ ParamName["StorageRequestFee"] = "6";
14
13
  })(ParamName || (exports.ParamName = ParamName = {}));
15
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU3VwZXJwcm8uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdHlwZXMvU3VwZXJwcm8udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsSUFBWSxTQVNYO0FBVEQsV0FBWSxTQUFTO0lBQ25CLHNDQUF5QixDQUFBO0lBQ3pCLDZDQUFnQyxDQUFBO0lBQ2hDLGdDQUFtQixDQUFBO0lBQ25CLG1DQUFzQixDQUFBO0lBQ3RCLHFDQUF3QixDQUFBO0lBQ3hCLGtDQUFxQixDQUFBO0lBQ3JCLG9DQUF1QixDQUFBO0lBQ3ZCLG9DQUF1QixDQUFBO0FBQ3pCLENBQUMsRUFUVyxTQUFTLHlCQUFULFNBQVMsUUFTcEIifQ==
14
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU3VwZXJwcm8uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdHlwZXMvU3VwZXJwcm8udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsSUFBWSxTQVFYO0FBUkQsV0FBWSxTQUFTO0lBQ25CLHNDQUF5QixDQUFBO0lBQ3pCLDZDQUFnQyxDQUFBO0lBQ2hDLGdDQUFtQixDQUFBO0lBQ25CLG1DQUFzQixDQUFBO0lBQ3RCLHFDQUF3QixDQUFBO0lBQ3hCLGtDQUFxQixDQUFBO0lBQ3JCLG9DQUF1QixDQUFBO0FBQ3pCLENBQUMsRUFSVyxTQUFTLHlCQUFULFNBQVMsUUFRcEIifQ==
@@ -36,11 +36,9 @@ export declare function convertSecretRequestFromRaw(secretRequestRaw: SecretRequ
36
36
  export declare function convertOfferStorageAllocatedFromRaw(offerStorageAllocatedRaw: OfferStorageAllocated): OfferStorageAllocated;
37
37
  export declare function convertOfferStorageRequestFromRaw(offerStorageRequestRaw: OfferStorageRequest): OfferStorageRequest;
38
38
  export declare function formatTcbPublicData(unparsedPublicData: any[]): TcbPublicData[];
39
- export declare function formatEpochIndexes(epochIndexes: string[]): number[];
40
39
  export declare function formatTeeOfferSlot(slot: TeeOfferSlot, coresDenominator: number): TeeOfferSlot;
41
40
  export declare function formatOfferSlot(slot: ValueOfferSlotRaw, coresDenominator: number): ValueOfferSlot;
42
41
  export declare function createBenchmarkInfo(mark: number, size: number): BenchmarkInfo;
43
- export declare function formatBenchmarks(benchmarks: ConsensusBenchmarkStorage[]): ConsensusBenchmark[];
44
42
  export declare function formatBenchmark(benchmark: ConsensusBenchmarkStorage): ConsensusBenchmark;
45
43
  export declare function formatBenchmarkTo(benchmark: ConsensusBenchmark): ConsensusBenchmarkStorage;
46
44
  export declare function formatUsage(usage: SlotUsage): SlotUsage;