@super-protocol/sdk-js 2.2.0-beta.5 → 2.2.0-beta.51

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 (73) hide show
  1. package/dist/cjs/constants.d.ts +1 -4
  2. package/dist/cjs/constants.js +3 -6
  3. package/dist/cjs/contracts/abi.d.ts +135 -26
  4. package/dist/cjs/contracts/abi.js +172 -33
  5. package/dist/cjs/crypto/index.d.ts +1 -0
  6. package/dist/cjs/crypto/index.js +16 -1
  7. package/dist/cjs/index.d.ts +2 -0
  8. package/dist/cjs/index.js +5 -2
  9. package/dist/cjs/models/TCB.js +2 -2
  10. package/dist/cjs/models/TeeOffer.d.ts +3 -3
  11. package/dist/cjs/models/TeeOffer.js +15 -12
  12. package/dist/cjs/providers/storage/parseStorageCredentials.d.ts +5 -0
  13. package/dist/cjs/providers/storage/parseStorageCredentials.js +13 -0
  14. package/dist/cjs/staticModels/LoaderSecretsPublicKeys.d.ts +1 -1
  15. package/dist/cjs/staticModels/LoaderSecretsPublicKeys.js +9 -5
  16. package/dist/cjs/staticModels/LoaderSessions.d.ts +3 -3
  17. package/dist/cjs/staticModels/LoaderSessions.js +11 -7
  18. package/dist/cjs/staticModels/OfferResources.d.ts +2 -2
  19. package/dist/cjs/staticModels/OfferResources.js +20 -10
  20. package/dist/cjs/staticModels/OffersStorageAllocated.d.ts +2 -3
  21. package/dist/cjs/staticModels/OffersStorageAllocated.js +15 -11
  22. package/dist/cjs/staticModels/OffersStorageRequests.d.ts +1 -1
  23. package/dist/cjs/staticModels/OffersStorageRequests.js +10 -5
  24. package/dist/cjs/staticModels/SecretRequests.d.ts +2 -2
  25. package/dist/cjs/staticModels/SecretRequests.js +19 -10
  26. package/dist/cjs/staticModels/TeeOffers.d.ts +0 -2
  27. package/dist/cjs/staticModels/TeeOffers.js +1 -32
  28. package/dist/cjs/tee/TeeBlockVerifier.d.ts +3 -4
  29. package/dist/cjs/tee/TeeBlockVerifier.js +1 -1
  30. package/dist/cjs/types/DistributedSecretStorage.d.ts +5 -0
  31. package/dist/cjs/types/Superpro.d.ts +2 -1
  32. package/dist/cjs/types/Superpro.js +2 -1
  33. package/dist/cjs/utils/CryptoKeysTransformer.d.ts +9 -1
  34. package/dist/cjs/utils/CryptoKeysTransformer.js +79 -15
  35. package/dist/cjs/utils/helper.d.ts +7 -1
  36. package/dist/cjs/utils/helper.js +85 -2
  37. package/dist/mjs/constants.d.ts +1 -4
  38. package/dist/mjs/constants.js +2 -5
  39. package/dist/mjs/contracts/abi.d.ts +135 -26
  40. package/dist/mjs/contracts/abi.js +172 -33
  41. package/dist/mjs/crypto/index.d.ts +1 -0
  42. package/dist/mjs/crypto/index.js +2 -1
  43. package/dist/mjs/index.d.ts +2 -0
  44. package/dist/mjs/index.js +3 -1
  45. package/dist/mjs/models/TCB.js +2 -2
  46. package/dist/mjs/models/TeeOffer.d.ts +3 -3
  47. package/dist/mjs/models/TeeOffer.js +16 -13
  48. package/dist/mjs/providers/storage/parseStorageCredentials.d.ts +5 -0
  49. package/dist/mjs/providers/storage/parseStorageCredentials.js +9 -0
  50. package/dist/mjs/staticModels/LoaderSecretsPublicKeys.d.ts +1 -1
  51. package/dist/mjs/staticModels/LoaderSecretsPublicKeys.js +10 -6
  52. package/dist/mjs/staticModels/LoaderSessions.d.ts +3 -3
  53. package/dist/mjs/staticModels/LoaderSessions.js +12 -8
  54. package/dist/mjs/staticModels/OfferResources.d.ts +2 -2
  55. package/dist/mjs/staticModels/OfferResources.js +21 -11
  56. package/dist/mjs/staticModels/OffersStorageAllocated.d.ts +2 -3
  57. package/dist/mjs/staticModels/OffersStorageAllocated.js +16 -12
  58. package/dist/mjs/staticModels/OffersStorageRequests.d.ts +1 -1
  59. package/dist/mjs/staticModels/OffersStorageRequests.js +11 -6
  60. package/dist/mjs/staticModels/SecretRequests.d.ts +2 -2
  61. package/dist/mjs/staticModels/SecretRequests.js +20 -11
  62. package/dist/mjs/staticModels/TeeOffers.d.ts +0 -2
  63. package/dist/mjs/staticModels/TeeOffers.js +1 -32
  64. package/dist/mjs/tee/TeeBlockVerifier.d.ts +3 -4
  65. package/dist/mjs/tee/TeeBlockVerifier.js +1 -1
  66. package/dist/mjs/types/DistributedSecretStorage.d.ts +5 -0
  67. package/dist/mjs/types/Superpro.d.ts +2 -1
  68. package/dist/mjs/types/Superpro.js +2 -1
  69. package/dist/mjs/utils/CryptoKeysTransformer.d.ts +9 -1
  70. package/dist/mjs/utils/CryptoKeysTransformer.js +79 -15
  71. package/dist/mjs/utils/helper.d.ts +7 -1
  72. package/dist/mjs/utils/helper.js +78 -1
  73. package/package.json +3 -3
@@ -1,2 +1,3 @@
1
1
  import Crypto from './Crypto.js';
2
2
  export default Crypto;
3
+ export * from './types.js';
@@ -1,3 +1,4 @@
1
1
  import Crypto from './Crypto.js';
2
2
  export default Crypto;
3
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY3J5cHRvL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sTUFBTSxNQUFNLGFBQWEsQ0FBQztBQUNqQyxlQUFlLE1BQU0sQ0FBQyJ9
3
+ export * from './types.js';
4
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY3J5cHRvL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sTUFBTSxNQUFNLGFBQWEsQ0FBQztBQUNqQyxlQUFlLE1BQU0sQ0FBQztBQUN0QixjQUFjLFlBQVksQ0FBQyJ9
@@ -3,6 +3,7 @@ export * from './connectors/BlockchainConnector.js';
3
3
  export { Config } from './connectors/BaseConnector.js';
4
4
  export { default as BlockchainEventsListener } from './connectors/BlockchainEventsListener.js';
5
5
  export { default as Crypto } from './crypto/index.js';
6
+ export * from './crypto/index.js';
6
7
  export { default as TIIGenerator } from './TIIGenerator.js';
7
8
  export * from './TIIGenerator.js';
8
9
  export { default as RIGenerator } from './RIGenerator.js';
@@ -63,6 +64,7 @@ export { default as StorageObject } from './types/storage/StorageObject.js';
63
64
  export { default as StorageAccess } from './types/storage/StorageAccess.js';
64
65
  export { default as getStorageProvider } from './providers/storage/getStorageProvider.js';
65
66
  export { default as IStorageProvider } from './providers/storage/IStorageProvider.js';
67
+ export { parseStorageCredentials } from './providers/storage/parseStorageCredentials.js';
66
68
  export * from './utils/CryptoKeysTransformer.js';
67
69
  export * as helpers from './utils/helpers/index.js';
68
70
  export * as constants from './constants.js';
package/dist/mjs/index.js CHANGED
@@ -2,6 +2,7 @@ export { default as BlockchainConnector } from './connectors/BlockchainConnector
2
2
  export * from './connectors/BlockchainConnector.js';
3
3
  export { default as BlockchainEventsListener } from './connectors/BlockchainEventsListener.js';
4
4
  export { default as Crypto } from './crypto/index.js';
5
+ export * from './crypto/index.js';
5
6
  export { default as TIIGenerator } from './TIIGenerator.js';
6
7
  export * from './TIIGenerator.js';
7
8
  export { default as RIGenerator } from './RIGenerator.js';
@@ -58,6 +59,7 @@ export { default as StorageKeyValueAdapter } from './providers/storage/StorageKe
58
59
  export { default as StorageAdapter, CacheEvents, } from './providers/storage/StorageAdapter.js';
59
60
  export { default as StorageContentWriter, ContentWriterType, } from './providers/storage/StorageContentWriter.js';
60
61
  export { default as getStorageProvider } from './providers/storage/getStorageProvider.js';
62
+ export { parseStorageCredentials } from './providers/storage/parseStorageCredentials.js';
61
63
  export * from './utils/CryptoKeysTransformer.js';
62
64
  export * as helpers from './utils/helpers/index.js';
63
65
  export * as constants from './constants.js';
@@ -74,4 +76,4 @@ export { default as BrowserEventProvider } from './analytics/eventProviders/Brow
74
76
  export { default as AxiosTransport } from './analytics/transports/AxiosTransport.js';
75
77
  export { default as FetchTransport } from './analytics/transports/FetchTransport.js';
76
78
  export * from './utils/cache/index.js';
77
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE9BQU8sSUFBSSxtQkFBbUIsRUFBRSxNQUFNLHFDQUFxQyxDQUFDO0FBRXJGLGNBQWMscUNBQXFDLENBQUM7QUFJcEQsT0FBTyxFQUFFLE9BQU8sSUFBSSx3QkFBd0IsRUFBRSxNQUFNLDBDQUEwQyxDQUFDO0FBRS9GLE9BQU8sRUFBRSxPQUFPLElBQUksTUFBTSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFFdEQsT0FBTyxFQUFFLE9BQU8sSUFBSSxZQUFZLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUM1RCxjQUFjLG1CQUFtQixDQUFDO0FBRWxDLE9BQU8sRUFBRSxPQUFPLElBQUksV0FBVyxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDMUQsY0FBYyxtQkFBbUIsQ0FBQztBQUVsQyxPQUFPLEVBQUUsT0FBTyxJQUFJLFNBQVMsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ25FLGNBQWMsNkJBQTZCLENBQUM7QUFFNUMsT0FBTyxFQUFFLE9BQU8sSUFBSSxNQUFNLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUM3RCxjQUFjLDBCQUEwQixDQUFDO0FBRXpDLE9BQU8sRUFBRSxPQUFPLElBQUksWUFBWSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDekUsY0FBYyxnQ0FBZ0MsQ0FBQztBQUUvQyxPQUFPLEVBQUUsT0FBTyxJQUFJLFlBQVksRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3pFLGNBQWMsZ0NBQWdDLENBQUM7QUFFL0MsT0FBTyxFQUFFLE9BQU8sSUFBSSxNQUFNLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUM3RCxjQUFjLDBCQUEwQixDQUFDO0FBRXpDLE9BQU8sRUFBRSxPQUFPLElBQUksU0FBUyxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDbkUsY0FBYyw2QkFBNkIsQ0FBQztBQUU1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
79
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE9BQU8sSUFBSSxtQkFBbUIsRUFBRSxNQUFNLHFDQUFxQyxDQUFDO0FBRXJGLGNBQWMscUNBQXFDLENBQUM7QUFJcEQsT0FBTyxFQUFFLE9BQU8sSUFBSSx3QkFBd0IsRUFBRSxNQUFNLDBDQUEwQyxDQUFDO0FBRS9GLE9BQU8sRUFBRSxPQUFPLElBQUksTUFBTSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDdEQsY0FBYyxtQkFBbUIsQ0FBQztBQUVsQyxPQUFPLEVBQUUsT0FBTyxJQUFJLFlBQVksRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQzVELGNBQWMsbUJBQW1CLENBQUM7QUFFbEMsT0FBTyxFQUFFLE9BQU8sSUFBSSxXQUFXLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUMxRCxjQUFjLG1CQUFtQixDQUFDO0FBRWxDLE9BQU8sRUFBRSxPQUFPLElBQUksU0FBUyxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDbkUsY0FBYyw2QkFBNkIsQ0FBQztBQUU1QyxPQUFPLEVBQUUsT0FBTyxJQUFJLE1BQU0sRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQzdELGNBQWMsMEJBQTBCLENBQUM7QUFFekMsT0FBTyxFQUFFLE9BQU8sSUFBSSxZQUFZLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUN6RSxjQUFjLGdDQUFnQyxDQUFDO0FBRS9DLE9BQU8sRUFBRSxPQUFPLElBQUksWUFBWSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDekUsY0FBYyxnQ0FBZ0MsQ0FBQztBQUUvQyxPQUFPLEVBQUUsT0FBTyxJQUFJLE1BQU0sRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQzdELGNBQWMsMEJBQTBCLENBQUM7QUFFekMsT0FBTyxFQUFFLE9BQU8sSUFBSSxTQUFTLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNu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
@@ -18,8 +18,8 @@ class TCB {
18
18
  }
19
19
  setTcbData(publicData, quote, publicKey, transactionOptions) {
20
20
  checkIfActionAccountInitialized(transactionOptions);
21
- const fromattedDeviceId = packDeviceId(publicData.deviceId);
22
- return TxManager.execute(TCB.contract.methods.setTcbData(this.tcbId, publicData.benchmark, publicData.properties, fromattedDeviceId, quote, publicKey), transactionOptions);
21
+ const formattedDeviceId = packDeviceId(publicData.deviceId);
22
+ return TxManager.execute(TCB.contract.methods.setTcbData(this.tcbId, publicData.benchmark, publicData.properties, formattedDeviceId, quote, publicKey), transactionOptions);
23
23
  }
24
24
  /**
25
25
  * Add data to TeeConfirmationBlock and push it to Consensus
@@ -75,7 +75,7 @@ declare class TeeOffer {
75
75
  * @param transactionOptions - object what contains alternative action account or gas limit (optional)
76
76
  */
77
77
  deleteOption(optionId: BlockchainId, transactionOptions?: TransactionOptions): Promise<void>;
78
- initializeTcb(transactionOptions?: TransactionOptions): Promise<void>;
78
+ private initializeTcb;
79
79
  private initializeTcbAndAssignBlocks;
80
80
  /**
81
81
  * Function initialize TCB and returns list of anothers' TCB for their checking
@@ -83,7 +83,7 @@ declare class TeeOffer {
83
83
  * @param transactionOptions - object what contains alternative action account or gas limit (optional)
84
84
  * @returns tcbId and lists of anothers' TCB for their checking
85
85
  */
86
- getListsForVerification(transactionOptions?: TransactionOptions): Promise<GetTcbRequest>;
86
+ getListsForVerification(deviceId: string, transactionOptions?: TransactionOptions): Promise<GetTcbRequest>;
87
87
  /**
88
88
  * Function for fetching whether tee offer slot exists or not
89
89
  * @param slotId - Slot ID
@@ -132,7 +132,7 @@ declare class TeeOffer {
132
132
  * @param teeOfferId - id of TEE offer
133
133
  * */
134
134
  getInitializedTcbId(): Promise<BlockchainId>;
135
- isTcbCreationAvailable(): Promise<boolean>;
135
+ isTcbCreationAvailable(deviceId: string): Promise<boolean>;
136
136
  /**
137
137
  * Function for fetching TEE offer provider authority account from blockchain
138
138
  */
@@ -7,7 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
7
7
  var __metadata = (this && this.__metadata) || function (k, v) {
8
8
  if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
9
9
  };
10
- import { checkIfActionAccountInitialized, incrementMethodCall, packSlotInfo, convertTeeOfferOptionFromRaw, formatTeeOfferSlot, cleanWeb3Data, convertBigIntToString, transformComplexObject, convertOptionInfoFromRaw, convertOptionInfoToRaw, } from '../utils/helper.js';
10
+ import { checkIfActionAccountInitialized, incrementMethodCall, packSlotInfo, convertTeeOfferOptionFromRaw, formatTeeOfferSlot, cleanWeb3Data, convertBigIntToString, transformComplexObject, convertOptionInfoFromRaw, convertOptionInfoToRaw, packDeviceId, } from '../utils/helper.js';
11
11
  import { BlockchainConnector } from '../connectors/index.js';
12
12
  import TxManager from '../utils/TxManager.js';
13
13
  import { formatBytes32String } from 'ethers/lib/utils.js';
@@ -150,12 +150,12 @@ class TeeOffer {
150
150
  checkIfActionAccountInitialized(transactionOptions);
151
151
  await TxManager.execute(TeeOffer.contract.methods.deleteOption(this.id, optionId), transactionOptions);
152
152
  }
153
- async initializeTcb(transactionOptions) {
153
+ async initializeTcb(deviceId, transactionOptions) {
154
154
  checkIfActionAccountInitialized();
155
- await TxManager.execute(TeeOffer.contract.methods.initializeTcb(this.id), transactionOptions);
155
+ await TxManager.execute(TeeOffer.contract.methods.initializeTcb(this.id, deviceId), transactionOptions);
156
156
  }
157
- async initializeTcbAndAssignBlocks(transactionOptions) {
158
- await this.initializeTcb(transactionOptions);
157
+ async initializeTcbAndAssignBlocks(deviceId, transactionOptions) {
158
+ await this.initializeTcb(deviceId, transactionOptions);
159
159
  const tcbId = await this.getInitializedTcbId();
160
160
  const tcb = new TCB(tcbId);
161
161
  await tcb.assignLastBlocksToCheck(transactionOptions);
@@ -168,9 +168,10 @@ class TeeOffer {
168
168
  * @param transactionOptions - object what contains alternative action account or gas limit (optional)
169
169
  * @returns tcbId and lists of anothers' TCB for their checking
170
170
  */
171
- async getListsForVerification(transactionOptions) {
171
+ async getListsForVerification(deviceId, transactionOptions) {
172
172
  checkIfActionAccountInitialized();
173
- const tcb = await this.initializeTcbAndAssignBlocks(transactionOptions);
173
+ deviceId = packDeviceId(deviceId);
174
+ const tcb = await this.initializeTcbAndAssignBlocks(deviceId, transactionOptions);
174
175
  const { checkingTcbIds } = await tcb.getPublicData();
175
176
  const tcbsPublicData = await Consensus.getTcbsPublicData(checkingTcbIds);
176
177
  const tcbsUtilityData = await Consensus.getTcbsUtilityData(checkingTcbIds);
@@ -275,8 +276,10 @@ class TeeOffer {
275
276
  getInitializedTcbId() {
276
277
  return TeeOffer.contract.methods.getInitializedTcbId(this.id).call();
277
278
  }
278
- async isTcbCreationAvailable() {
279
- const { offerNotBlocked, newEpochStarted, halfEpochPassed, benchmarkVerified } = await TeeOffer.contract.methods.isTcbCreationAvailable(this.id).call();
279
+ async isTcbCreationAvailable(deviceId) {
280
+ const { offerNotBlocked, newEpochStarted, halfEpochPassed, benchmarkVerified } = cleanWeb3Data(await TeeOffer.contract.methods
281
+ .isTcbCreationAvailable(this.id, packDeviceId(deviceId))
282
+ .call());
280
283
  return offerNotBlocked && newEpochStarted && halfEpochPassed && benchmarkVerified;
281
284
  }
282
285
  /**
@@ -460,19 +463,19 @@ __decorate([
460
463
  __decorate([
461
464
  incrementMethodCall(),
462
465
  __metadata("design:type", Function),
463
- __metadata("design:paramtypes", [Object]),
466
+ __metadata("design:paramtypes", [String, Object]),
464
467
  __metadata("design:returntype", Promise)
465
468
  ], TeeOffer.prototype, "initializeTcb", null);
466
469
  __decorate([
467
470
  incrementMethodCall(),
468
471
  __metadata("design:type", Function),
469
- __metadata("design:paramtypes", [Object]),
472
+ __metadata("design:paramtypes", [String, Object]),
470
473
  __metadata("design:returntype", Promise)
471
474
  ], TeeOffer.prototype, "initializeTcbAndAssignBlocks", null);
472
475
  __decorate([
473
476
  incrementMethodCall(),
474
477
  __metadata("design:type", Function),
475
- __metadata("design:paramtypes", [Object]),
478
+ __metadata("design:paramtypes", [String, Object]),
476
479
  __metadata("design:returntype", Promise)
477
480
  ], TeeOffer.prototype, "getListsForVerification", null);
478
481
  __decorate([
@@ -530,4 +533,4 @@ __decorate([
530
533
  __metadata("design:returntype", Promise)
531
534
  ], TeeOffer.prototype, "addTlb", null);
532
535
  export default TeeOffer;
533
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"TeeOffer.js","sourceRoot":"","sources":["../../../src/models/TeeOffer.ts"],"names":[],"mappings":"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"}
536
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"TeeOffer.js","sourceRoot":"","sources":["../../../src/models/TeeOffer.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,5 @@
1
+ import { StorageAccessCredentials } from '@super-protocol/dto-js';
2
+ import { S3Credentials, StorageCredentials, StorageType, StorjCredentials } from '@super-protocol/dto-js';
3
+ type StorageCredentialsType<T extends StorageType | unknown> = T extends StorageType.StorJ ? StorageCredentials<StorjCredentials> : T extends StorageType.S3 ? StorageCredentials<S3Credentials> : StorageCredentials<StorageAccessCredentials>;
4
+ export declare const parseStorageCredentials: <T extends unknown = unknown>(decryptedCredentials: string) => StorageCredentialsType<T>;
5
+ export {};
@@ -0,0 +1,9 @@
1
+ export const parseStorageCredentials = (decryptedCredentials) => {
2
+ const credentials = JSON.parse(decryptedCredentials);
3
+ return {
4
+ storageType: credentials.storageType,
5
+ downloadCredentials: JSON.parse(credentials.downloadCredentials),
6
+ uploadCredentials: JSON.parse(credentials.uploadCredentials),
7
+ };
8
+ };
9
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGFyc2VTdG9yYWdlQ3JlZGVudGlhbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvcHJvdmlkZXJzL3N0b3JhZ2UvcGFyc2VTdG9yYWdlQ3JlZGVudGlhbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBY0EsTUFBTSxDQUFDLE1BQU0sdUJBQXVCLEdBQUcsQ0FDckMsb0JBQTRCLEVBQ0QsRUFBRTtJQUM3QixNQUFNLFdBQVcsR0FBK0IsSUFBSSxDQUFDLEtBQUssQ0FBQyxvQkFBb0IsQ0FBQyxDQUFDO0lBRWpGLE9BQU87UUFDTCxXQUFXLEVBQUUsV0FBVyxDQUFDLFdBQVc7UUFDcEMsbUJBQW1CLEVBQUUsSUFBSSxDQUFDLEtBQUssQ0FBQyxXQUFXLENBQUMsbUJBQW1CLENBQUM7UUFDaEUsaUJBQWlCLEVBQUUsSUFBSSxDQUFDLEtBQUssQ0FBQyxXQUFXLENBQUMsaUJBQWlCLENBQUM7S0FDaEMsQ0FBQztBQUNqQyxDQUFDLENBQUMifQ==
@@ -1,7 +1,7 @@
1
1
  import { BlockInfo, BlockchainId, TransactionOptions, LoaderSecretPublicKey, PublicKey, Signature } from '../types/index.js';
2
2
  declare class LoaderSecretPublicKeys {
3
3
  private static readonly logger;
4
- static get(teeOfferId: BlockchainId): Promise<LoaderSecretPublicKey>;
4
+ static get(teeOfferId: BlockchainId): Promise<LoaderSecretPublicKey | undefined>;
5
5
  static set(teeOfferId: BlockchainId, signature: Signature, secretPublicKey: PublicKey, signedTime: number, transactionOptions?: TransactionOptions): Promise<void>;
6
6
  static onLoaderSecretPublicKeySessionUpdated(callback: onLoaderSecretPublicKeySessionUpdatedCallback): () => void;
7
7
  }
@@ -1,15 +1,19 @@
1
1
  import { BlockchainConnector, BlockchainEventsListener } from '../connectors/index.js';
2
- import { cleanWeb3Data } from '../utils/helper.js';
2
+ import { cleanWeb3Data, convertLoaderSecretPublicKeyFromRaw } from '../utils/helper.js';
3
3
  import TxManager from '../utils/TxManager.js';
4
4
  import rootLogger from '../logger.js';
5
5
  class LoaderSecretPublicKeys {
6
6
  static logger = rootLogger.child({ className: 'LoaderSecretPublicKeys' });
7
- static get(teeOfferId) {
7
+ static async get(teeOfferId) {
8
8
  const contract = BlockchainConnector.getInstance().getContract();
9
- return contract.methods
9
+ const secretPublicKey = await contract.methods
10
10
  .getLoaderSecretPublicKey(teeOfferId)
11
11
  .call()
12
- .then((secretKey) => cleanWeb3Data(secretKey));
12
+ .then((secretKey) => convertLoaderSecretPublicKeyFromRaw(secretKey));
13
+ if (Number(secretPublicKey.timestamp) === 0) {
14
+ return undefined;
15
+ }
16
+ return secretPublicKey;
13
17
  }
14
18
  static async set(teeOfferId, signature, secretPublicKey, signedTime, transactionOptions) {
15
19
  const contract = BlockchainConnector.getInstance().getContract();
@@ -20,7 +24,7 @@ class LoaderSecretPublicKeys {
20
24
  const logger = this.logger.child({ method: 'onLoaderSecretPublicKeySessionUpdated' });
21
25
  const onData = (event) => {
22
26
  const parsedEvent = cleanWeb3Data(event.returnValues);
23
- callback(parsedEvent.teeOfferId, cleanWeb3Data(parsedEvent.secretPublicKey), {
27
+ callback(parsedEvent.teeOfferIssuerId, cleanWeb3Data(parsedEvent.secretPublicKey), {
24
28
  index: Number(event.blockNumber),
25
29
  hash: event.blockHash,
26
30
  });
@@ -36,4 +40,4 @@ class LoaderSecretPublicKeys {
36
40
  }
37
41
  }
38
42
  export default LoaderSecretPublicKeys;
39
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTG9hZGVyU2VjcmV0c1B1YmxpY0tleXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc3RhdGljTW9kZWxzL0xvYWRlclNlY3JldHNQdWJsaWNLZXlzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSx3QkFBd0IsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBU3ZGLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNuRCxPQUFPLFNBQVMsTUFBTSx1QkFBdUIsQ0FBQztBQUU5QyxPQUFPLFVBQVUsTUFBTSxjQUFjLENBQUM7QUFNdEMsTUFBTSxzQkFBc0I7SUFDbEIsTUFBTSxDQUFVLE1BQU0sR0FBRyxVQUFVLENBQUMsS0FBSyxDQUFDLEVBQUUsU0FBUyxFQUFFLHdCQUF3QixFQUFFLENBQUMsQ0FBQztJQUVwRixNQUFNLENBQUMsR0FBRyxDQUFDLFVBQXdCO1FBQ3hDLE1BQU0sUUFBUSxHQUFHLG1CQUFtQixDQUFDLFdBQVcsRUFBRSxDQUFDLFdBQVcsRUFBRSxDQUFDO1FBRWpFLE9BQU8sUUFBUSxDQUFDLE9BQU87YUFDcEIsd0JBQXdCLENBQUMsVUFBVSxDQUFDO2FBQ3BDLElBQUksRUFBRTthQUNOLElBQUksQ0FBQyxDQUFDLFNBQVMsRUFBRSxFQUFFLENBQUMsYUFBYSxDQUFDLFNBQVMsQ0FBMEIsQ0FBQyxDQUFDO0lBQzVFLENBQUM7SUFFTSxNQUFNLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FDckIsVUFBd0IsRUFDeEIsU0FBb0IsRUFDcEIsZUFBMEIsRUFDMUIsVUFBa0IsRUFDbEIsa0JBQXVDO1FBRXZDLE1BQU0sUUFBUSxHQUFHLG1CQUFtQixDQUFDLFdBQVcsRUFBRSxDQUFDLFdBQVcsRUFBRSxDQUFDO1FBRWpFLE1BQU0sU0FBUyxDQUFDLE9BQU8sQ0FDckIsUUFBUSxDQUFDLE9BQU8sQ0FBQyx3QkFBd0IsQ0FBQyxVQUFVLEVBQUUsU0FBUyxFQUFFLGVBQWUsRUFBRSxVQUFVLENBQUMsRUFDN0Ysa0JBQWtCLENBQ25CLENBQUM7SUFDSixDQUFDO0lBRU0sTUFBTSxDQUFDLHFDQUFxQyxDQUNqRCxRQUF1RDtRQUV2RCxNQUFNLFFBQVEsR0FBRyx3QkFBd0IsQ0FBQyxXQUFXLEVBQUUsQ0FBQztRQUN4RCxNQUFNLE1BQU0sR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxFQUFFLE1BQU0sRUFBRSx1Q0FBdUMsRUFBRSxDQUFDLENBQUM7UUFDdEYsTUFBTSxNQUFNLEdBQTRCLENBQUMsS0FBZSxFQUFRLEVBQUU7WUFDaEUsTUFBTSxXQUFXLEdBQUcsYUFBYSxDQUFDLEtBQUssQ0FBQyxZQUFZLENBQUMsQ0FBQztZQUN0RCxRQUFRLENBQ1EsV0FBVyxDQUFDLFVBQVUsRUFDekIsYUFBYSxDQUFDLFdBQVcsQ0FBQyxlQUFlLENBQUMsRUFDMUM7Z0JBQ1QsS0FBSyxFQUFFLE1BQU0sQ0FBQyxLQUFLLENBQUMsV0FBVyxDQUFDO2dCQUNoQyxJQUFJLEVBQVUsS0FBSyxDQUFDLFNBQVM7YUFDOUIsQ0FDRixDQUFDO1FBQ0osQ0FBQyxDQUFDO1FBQ0YsTUFBTSxPQUFPLEdBQTZCLENBQUMsS0FBWSxFQUFFLEVBQUU7WUFDekQsTUFBTSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUNyQixDQUFDLENBQUM7UUFDRixPQUFPLFFBQVEsQ0FBQyxjQUFjLENBQUM7WUFDN0IsT0FBTztZQUNQLE1BQU07WUFDTixLQUFLLEVBQUUscUNBQXFDO1NBQzdDLENBQUMsQ0FBQztJQUNMLENBQUM7O0FBU0gsZUFBZSxzQkFBc0IsQ0FBQyJ9
43
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTG9hZGVyU2VjcmV0c1B1YmxpY0tleXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc3RhdGljTW9kZWxzL0xvYWRlclNlY3JldHNQdWJsaWNLZXlzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSx3QkFBd0IsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBU3ZGLE9BQU8sRUFBRSxhQUFhLEVBQUUsbUNBQW1DLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUN4RixPQUFPLFNBQVMsTUFBTSx1QkFBdUIsQ0FBQztBQUU5QyxPQUFPLFVBQVUsTUFBTSxjQUFjLENBQUM7QUFNdEMsTUFBTSxzQkFBc0I7SUFDbEIsTUFBTSxDQUFVLE1BQU0sR0FBRyxVQUFVLENBQUMsS0FBSyxDQUFDLEVBQUUsU0FBUyxFQUFFLHdCQUF3QixFQUFFLENBQUMsQ0FBQztJQUVwRixNQUFNLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxVQUF3QjtRQUM5QyxNQUFNLFFBQVEsR0FBRyxtQkFBbUIsQ0FBQyxXQUFXLEVBQUUsQ0FBQyxXQUFXLEVBQUUsQ0FBQztRQUNqRSxNQUFNLGVBQWUsR0FBRyxNQUFNLFFBQVEsQ0FBQyxPQUFPO2FBQzNDLHdCQUF3QixDQUFDLFVBQVUsQ0FBQzthQUNwQyxJQUFJLEVBQUU7YUFDTixJQUFJLENBQUMsQ0FBQyxTQUFTLEVBQUUsRUFBRSxDQUFDLG1DQUFtQyxDQUFDLFNBQWtDLENBQUMsQ0FBQyxDQUFDO1FBRWhHLElBQUksTUFBTSxDQUFDLGVBQWUsQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQztZQUM1QyxPQUFPLFNBQVMsQ0FBQztRQUNuQixDQUFDO1FBRUQsT0FBTyxlQUFlLENBQUM7SUFDekIsQ0FBQztJQUVNLE1BQU0sQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUNyQixVQUF3QixFQUN4QixTQUFvQixFQUNwQixlQUEwQixFQUMxQixVQUFrQixFQUNsQixrQkFBdUM7UUFFdkMsTUFBTSxRQUFRLEdBQUcsbUJBQW1CLENBQUMsV0FBVyxFQUFFLENBQUMsV0FBVyxFQUFFLENBQUM7UUFFakUsTUFBTSxTQUFTLENBQUMsT0FBTyxDQUNyQixRQUFRLENBQUMsT0FBTyxDQUFDLHdCQUF3QixDQUFDLFVBQVUsRUFBRSxTQUFTLEVBQUUsZUFBZSxFQUFFLFVBQVUsQ0FBQyxFQUM3RixrQkFBa0IsQ0FDbkIsQ0FBQztJQUNKLENBQUM7SUFFTSxNQUFNLENBQUMscUNBQXFDLENBQ2pELFFBQXVEO1FBRXZELE1BQU0sUUFBUSxHQUFHLHdCQUF3QixDQUFDLFdBQVcsRUFBRSxDQUFDO1FBQ3hELE1BQU0sTUFBTSxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLEVBQUUsTUFBTSxFQUFFLHVDQUF1QyxFQUFFLENBQUMsQ0FBQztRQUN0RixNQUFNLE1BQU0sR0FBNEIsQ0FBQyxLQUFlLEVBQVEsRUFBRTtZQUNoRSxNQUFNLFdBQVcsR0FBRyxhQUFhLENBQUMsS0FBSyxDQUFDLFlBQVksQ0FBQyxDQUFDO1lBQ3RELFFBQVEsQ0FDUSxXQUFXLENBQUMsZ0JBQWdCLEVBQy9CLGFBQWEsQ0FBQyxXQUFXLENBQUMsZUFBZSxDQUFDLEVBQzFDO2dCQUNULEtBQUssRUFBRSxNQUFNLENBQUMsS0FBSyxDQUFDLFdBQVcsQ0FBQztnQkFDaEMsSUFBSSxFQUFVLEtBQUssQ0FBQyxTQUFTO2FBQzlCLENBQ0YsQ0FBQztRQUNKLENBQUMsQ0FBQztRQUNGLE1BQU0sT0FBTyxHQUE2QixDQUFDLEtBQVksRUFBRSxFQUFFO1lBQ3pELE1BQU0sQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDckIsQ0FBQyxDQUFDO1FBQ0YsT0FBTyxRQUFRLENBQUMsY0FBYyxDQUFDO1lBQzdCLE9BQU87WUFDUCxNQUFNO1lBQ04sS0FBSyxFQUFFLHFDQUFxQztTQUM3QyxDQUFDLENBQUM7SUFDTCxDQUFDOztBQVNILGVBQWUsc0JBQXNCLENBQUMifQ==
@@ -3,11 +3,11 @@ declare class LoaderSessions {
3
3
  private static readonly logger;
4
4
  static getEnabledLoaders(): Promise<BlockchainId[]>;
5
5
  static getDisabledLoaders(): Promise<BlockchainId[]>;
6
- static get(teeOfferId: BlockchainId): Promise<LoaderSession>;
6
+ static get(teeOfferId: BlockchainId): Promise<LoaderSession | undefined>;
7
7
  static set(teeOfferIssuerId: BlockchainId, sessionPublicKey: PublicKey, signature: string, signedTime: number, transactionOptions?: TransactionOptions): Promise<void>;
8
8
  static setSessionAndRequestSecret(request: Omit<SecretRequest, 'timestamp'>, teeOfferIssuerId: BlockchainId, sessionPublicKey: PublicKey, signature: string, signedTime: number, transactionOptions?: TransactionOptions): Promise<void>;
9
- static disableLoader(teeOfferId: BlockchainId, transactionOptions?: TransactionOptions): Promise<void>;
9
+ static removeLoaderKeys(teeOfferId: BlockchainId, transactionOptions?: TransactionOptions): Promise<void>;
10
10
  static onLoaderSessionKeyUpdated(callback: onLoaderSessionKeyUpdatedCallback): () => void;
11
11
  }
12
- export type onLoaderSessionKeyUpdatedCallback = (loader: BlockchainId, teeOfferkeeperId: BlockchainId, publicSessionsKey: PublicKey, block?: BlockInfo) => void;
12
+ export type onLoaderSessionKeyUpdatedCallback = (teeOfferIssuerId: BlockchainId, publicSessionsKey: PublicKey, block?: BlockInfo) => void;
13
13
  export default LoaderSessions;
@@ -1,5 +1,5 @@
1
1
  import { BlockchainConnector, BlockchainEventsListener } from '../connectors/index.js';
2
- import { cleanWeb3Data } from '../utils/helper.js';
2
+ import { cleanWeb3Data, convertLoaderSessionFromRaw } from '../utils/helper.js';
3
3
  import TxManager from '../utils/TxManager.js';
4
4
  import rootLogger from '../logger.js';
5
5
  class LoaderSessions {
@@ -12,12 +12,16 @@ class LoaderSessions {
12
12
  const contract = BlockchainConnector.getInstance().getContract();
13
13
  return contract.methods.getDisabledLoaders().call();
14
14
  }
15
- static get(teeOfferId) {
15
+ static async get(teeOfferId) {
16
16
  const contract = BlockchainConnector.getInstance().getContract();
17
- return contract.methods
17
+ const loaderSession = await contract.methods
18
18
  .getLoaderSession(teeOfferId)
19
19
  .call()
20
- .then((session) => cleanWeb3Data(session));
20
+ .then((session) => convertLoaderSessionFromRaw(session));
21
+ if (Number(loaderSession.timestamp) === 0) {
22
+ return undefined;
23
+ }
24
+ return loaderSession;
21
25
  }
22
26
  static async set(teeOfferIssuerId, sessionPublicKey, signature, signedTime, transactionOptions) {
23
27
  const contract = BlockchainConnector.getInstance().getContract();
@@ -31,16 +35,16 @@ class LoaderSessions {
31
35
  timestamp: 0,
32
36
  }, sessionPublicKey, signature, teeOfferIssuerId, signedTime), transactionOptions);
33
37
  }
34
- static async disableLoader(teeOfferId, transactionOptions) {
38
+ static async removeLoaderKeys(teeOfferId, transactionOptions) {
35
39
  const contract = BlockchainConnector.getInstance().getContract();
36
- await TxManager.execute(contract.methods.disableLoader(teeOfferId), transactionOptions);
40
+ await TxManager.execute(contract.methods.removeLoaderKeys(teeOfferId), transactionOptions);
37
41
  }
38
42
  static onLoaderSessionKeyUpdated(callback) {
39
43
  const listener = BlockchainEventsListener.getInstance();
40
44
  const logger = this.logger.child({ method: 'onLoaderSessionKeyUpdated' });
41
45
  const onData = (event) => {
42
46
  const parsedEvent = cleanWeb3Data(event.returnValues);
43
- callback(parsedEvent.loader, parsedEvent.keeperOfferId, cleanWeb3Data(parsedEvent.publicSessionsKey), {
47
+ callback(parsedEvent.teeOfferIssuerId, cleanWeb3Data(parsedEvent.publicSessionsKey), {
44
48
  index: Number(event.blockNumber),
45
49
  hash: event.blockHash,
46
50
  });
@@ -56,4 +60,4 @@ class LoaderSessions {
56
60
  }
57
61
  }
58
62
  export default LoaderSessions;
59
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTG9hZGVyU2Vzc2lvbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc3RhdGljTW9kZWxzL0xvYWRlclNlc3Npb25zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSx3QkFBd0IsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBU3ZGLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNuRCxPQUFPLFNBQVMsTUFBTSx1QkFBdUIsQ0FBQztBQUU5QyxPQUFPLFVBQVUsTUFBTSxjQUFjLENBQUM7QUFNdEMsTUFBTSxjQUFjO0lBQ1YsTUFBTSxDQUFVLE1BQU0sR0FBRyxVQUFVLENBQUMsS0FBSyxDQUFDLEVBQUUsU0FBUyxFQUFFLGdCQUFnQixFQUFFLENBQUMsQ0FBQztJQUU1RSxNQUFNLENBQUMsaUJBQWlCO1FBQzdCLE1BQU0sUUFBUSxHQUFHLG1CQUFtQixDQUFDLFdBQVcsRUFBRSxDQUFDLFdBQVcsRUFBRSxDQUFDO1FBRWpFLE9BQU8sUUFBUSxDQUFDLE9BQU8sQ0FBQyxpQkFBaUIsRUFBRSxDQUFDLElBQUksRUFBRSxDQUFDO0lBQ3JELENBQUM7SUFFTSxNQUFNLENBQUMsa0JBQWtCO1FBQzlCLE1BQU0sUUFBUSxHQUFHLG1CQUFtQixDQUFDLFdBQVcsRUFBRSxDQUFDLFdBQVcsRUFBRSxDQUFDO1FBRWpFLE9BQU8sUUFBUSxDQUFDLE9BQU8sQ0FBQyxrQkFBa0IsRUFBRSxDQUFDLElBQUksRUFBRSxDQUFDO0lBQ3RELENBQUM7SUFFTSxNQUFNLENBQUMsR0FBRyxDQUFDLFVBQXdCO1FBQ3hDLE1BQU0sUUFBUSxHQUFHLG1CQUFtQixDQUFDLFdBQVcsRUFBRSxDQUFDLFdBQVcsRUFBRSxDQUFDO1FBRWpFLE9BQU8sUUFBUSxDQUFDLE9BQU87YUFDcEIsZ0JBQWdCLENBQUMsVUFBVSxDQUFDO2FBQzVCLElBQUksRUFBRTthQUNOLElBQUksQ0FBQyxDQUFD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
63
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTG9hZGVyU2Vzc2lvbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc3RhdGljTW9kZWxzL0xvYWRlclNlc3Npb25zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSx3QkFBd0IsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBU3ZGLE9BQU8sRUFBRSxhQUFhLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNoRixPQUFPLFNBQVMsTUFBTSx1QkFBdUIsQ0FBQztBQUU5QyxPQUFPLFVBQVUsTUFBTSxjQUFjLENBQUM7QUFNdEMsTUFBTSxjQUFjO0lBQ1YsTUFBTSxDQUFVLE1BQU0sR0FBRyxVQUFVLENBQUMsS0FBSyxDQUFDLEVBQUUsU0FBUyxFQUFFLGdCQUFnQixFQUFFLENBQUMsQ0FBQztJQUU1RSxNQUFNLENBQUMsaUJBQWlCO1FBQzdCLE1BQU0sUUFBUSxHQUFHLG1CQUFtQixDQUFDLFdBQVcsRUFBRSxDQUFDLFdBQVcsRUFBRSxDQUFDO1FBRWpFLE9BQU8sUUFBUSxDQUFDLE9BQU8sQ0FBQyxpQkFBaUIsRUFBRSxDQUFDLElBQUksRUFBRSxDQUFDO0lBQ3JELENBQUM7SUFFTSxNQUFNLENBQUMsa0JBQWtCO1FBQzlCLE1BQU0sUUFBUSxHQUFHLG1CQUFtQixDQUFDLFdBQVcsRUFBRSxDQUFDLFdBQVcsRUFBRSxDQUFDO1FBRWpFLE9BQU8sUUFBUSxDQUFDLE9BQU8sQ0FBQyxrQkFBa0IsRUFBRSxDQUFDLElBQUksRUFBRSxDQUFDO0lBQ3RELENBQUM7SUFFTSxNQUFNLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxVQUF3QjtRQUM5QyxNQUFNLFFBQVEsR0FBRyxtQkFBbUIsQ0FBQyxXQUFXLEVBQUUsQ0FBQyxXQUFXLEVBQUUsQ0FBQztRQUNqRSxNQUFNLGFBQWEsR0FBRyxNQUFNLFFBQVEsQ0FBQyxPQUFPO2FBQ3pDLGdCQUFnQixDQUFDLFVBQVUsQ0FB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
@@ -4,11 +4,11 @@ declare class OfferResources {
4
4
  static getByKeeperId(teeOfferKeeperId: BlockchainId): Promise<OfferResource[]>;
5
5
  static getByIssuerId(teeOfferIssuerId: BlockchainId): Promise<OfferResource[]>;
6
6
  static getByOfferVersion(offerId: BlockchainId, version?: number): Promise<OfferResource[]>;
7
- static get(teeOfferIssuerId: BlockchainId, teeOfferKeeperId: BlockchainId, offerId: BlockchainId, version?: number): Promise<OfferResource>;
7
+ static get(teeOfferIssuerId: BlockchainId, teeOfferKeeperId: BlockchainId, offerId: BlockchainId, version?: number): Promise<OfferResource | undefined>;
8
8
  static getCountByKeeperId(teeOfferKeeperId: BlockchainId): Promise<number>;
9
9
  static set(offerResource: Omit<OfferResource, 'timestamp'>, transactionOptions?: TransactionOptions): Promise<void>;
10
10
  static createOrder(requestOfferId: BlockchainId, requestOfferVersion: number | undefined, resultInfo: string, resultInfoSignatureBySecretKey: Signature, signedTime: number, transactionOptions?: TransactionOptions): Promise<void>;
11
- static clearOfferResources(teeOfferKeeperId: BlockchainId, transactionOptions?: TransactionOptions): Promise<void>;
11
+ static clear(teeOfferKeeperId: BlockchainId, transactionOptions?: TransactionOptions): Promise<void>;
12
12
  static onOfferResourceCreated(callback: onOfferResourceCreatedCallback): () => void;
13
13
  static onOrderResourceCreated(callback: onOrderResourceCreatedCallback): () => void;
14
14
  }
@@ -1,7 +1,8 @@
1
1
  import { BlockchainConnector, BlockchainEventsListener } from '../connectors/index.js';
2
- import { checkIfActionAccountInitialized, cleanWeb3Data } from '../utils/helper.js';
2
+ import { checkIfActionAccountInitialized, cleanWeb3Data, convertOfferResourceFromRaw, } from '../utils/helper.js';
3
3
  import TxManager from '../utils/TxManager.js';
4
4
  import rootLogger from '../logger.js';
5
+ import { AMOY_TX_GAS_LIMIT } from '../constants.js';
5
6
  class OfferResources {
6
7
  static logger = rootLogger.child({ className: 'OfferResources' });
7
8
  static getByKeeperId(teeOfferKeeperId) {
@@ -9,28 +10,32 @@ class OfferResources {
9
10
  return contract.methods
10
11
  .getOfferResourcesByKeeperId(teeOfferKeeperId)
11
12
  .call()
12
- .then((resources) => resources.map((resource) => cleanWeb3Data(resource)));
13
+ .then((resources) => resources.map((resource) => convertOfferResourceFromRaw(resource)));
13
14
  }
14
15
  static getByIssuerId(teeOfferIssuerId) {
15
16
  const contract = BlockchainConnector.getInstance().getContract();
16
17
  return contract.methods
17
18
  .getOfferResourcesByIssuerId(teeOfferIssuerId)
18
19
  .call()
19
- .then((resources) => resources.map((resource) => cleanWeb3Data(resource)));
20
+ .then((resources) => resources.map((resource) => convertOfferResourceFromRaw(resource)));
20
21
  }
21
22
  static getByOfferVersion(offerId, version = 0) {
22
23
  const contract = BlockchainConnector.getInstance().getContract();
23
24
  return contract.methods
24
25
  .getOfferResourcesByOfferVersion(offerId, version)
25
26
  .call()
26
- .then((resources) => resources.map((resource) => cleanWeb3Data(resource)));
27
+ .then((resources) => resources.map((resource) => convertOfferResourceFromRaw(resource)));
27
28
  }
28
- static get(teeOfferIssuerId, teeOfferKeeperId, offerId, version = 0) {
29
+ static async get(teeOfferIssuerId, teeOfferKeeperId, offerId, version = 0) {
29
30
  const contract = BlockchainConnector.getInstance().getContract();
30
- return contract.methods
31
+ const resource = await contract.methods
31
32
  .getOfferResource(teeOfferIssuerId, teeOfferKeeperId, offerId, version)
32
33
  .call()
33
- .then((resource) => cleanWeb3Data(resource));
34
+ .then((resource) => convertOfferResourceFromRaw(resource));
35
+ if (Number(resource.timestamp) === 0) {
36
+ return undefined;
37
+ }
38
+ return resource;
34
39
  }
35
40
  static async getCountByKeeperId(teeOfferKeeperId) {
36
41
  const contract = BlockchainConnector.getInstance().getContract();
@@ -42,6 +47,7 @@ class OfferResources {
42
47
  await TxManager.execute(contract.methods.setOfferResource({
43
48
  ...offerResource,
44
49
  offerVersion: offerResource.offerVersion ?? 0,
50
+ solutionHash: offerResource.solutionHash ?? '',
45
51
  timestamp: 0,
46
52
  }), transactionOptions);
47
53
  }
@@ -50,17 +56,21 @@ class OfferResources {
50
56
  checkIfActionAccountInitialized(transactionOptions);
51
57
  await TxManager.execute(contract.methods.createResourceOrder(requestOfferId, requestOfferVersion, resultInfo, resultInfoSignatureBySecretKey, signedTime), transactionOptions);
52
58
  }
53
- static async clearOfferResources(teeOfferKeeperId, transactionOptions) {
59
+ static async clear(teeOfferKeeperId, transactionOptions) {
54
60
  const contract = BlockchainConnector.getInstance().getContract();
55
61
  checkIfActionAccountInitialized(transactionOptions);
56
- await TxManager.execute(contract.methods.clearOfferResources(teeOfferKeeperId), transactionOptions);
62
+ const options = {
63
+ gas: AMOY_TX_GAS_LIMIT,
64
+ ...transactionOptions,
65
+ };
66
+ await TxManager.execute(contract.methods.clearOfferResources(teeOfferKeeperId), options);
57
67
  }
58
68
  static onOfferResourceCreated(callback) {
59
69
  const listener = BlockchainEventsListener.getInstance();
60
70
  const logger = this.logger.child({ method: 'onOfferResourceCreated' });
61
71
  const onData = (event) => {
62
72
  const parsedEvent = cleanWeb3Data(event.returnValues);
63
- callback(parsedEvent.offerId, parsedEvent.version, parsedEvent.keeperId, parsedEvent.issuerId, parsedEvent.transactionHash, {
73
+ callback(parsedEvent.offerId, parsedEvent.offerVersion, parsedEvent.teeOfferKeeperId, parsedEvent.teeOfferIssuerId, parsedEvent.transactionHash, {
64
74
  index: Number(event.blockNumber),
65
75
  hash: event.blockHash,
66
76
  });
@@ -95,4 +105,4 @@ class OfferResources {
95
105
  }
96
106
  }
97
107
  export default OfferResources;
98
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiT2ZmZXJSZXNvdXJjZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc3RhdGljTW9kZWxzL09mZmVyUmVzb3VyY2VzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSx3QkFBd0IsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBUXZGLE9BQU8sRUFBRSwrQkFBK0IsRUFBRSxhQUFhLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNwRixPQUFPLFNBQVMsTUFBTSx1QkFBdUIsQ0FBQztBQUU5QyxPQUFPLFVBQVUsTUFBTSxjQUFjLENBQUM7QUFNdEMsTUFBTSxjQUFjO0lBQ1YsTUFBTSxDQUFVLE1BQU0sR0FBRyxVQUFVLENBQUMsS0FBSyxDQUFDLEVBQUUsU0FBUyxFQUFFLGdCQUFnQixFQUFFLENBQUMsQ0FBQztJQUU1RSxNQUFNLENBQUMsYUFBYSxDQUFDLGdCQUE4QjtRQUN4RCxNQUFNLFFBQVEsR0FBRyxtQkFBbUIsQ0FBQyxXQUFXLEVBQUUsQ0FBQyxXQUFXLEVBQUUsQ0FBQztRQUVqRSxPQUFPLFFBQVEsQ0FBQyxPQUFPO2FBQ3BCLDJCQUEyQixDQUFDLGdCQUFnQixDQUFDO2FBQzdDLElBQUksRUFBRTthQUNOLElBQUksQ0FBQyxDQUFDLFNBQTJCLEVBQUUsRUFBRSxDQUNwQyxTQUFVLENBQUMsR0FBRyxDQUFDLENBQUMsUUFBUSxFQUFFLEVBQUUsQ0FBQyxhQUFhLENBQUMsUUFBUSxDQUFrQixDQUFDLENBQ3ZFLENBQUM7SUFDTixDQUFDO0lBRU0sTUFBTSxDQUFDLGFBQWEsQ0FBQyxnQkFBOEI7UUFDeEQsTUFBTSxRQUFRLEdBQUcsbUJBQW1CLENBQUMsV0FBVyxFQUFFLENBQUMsV0FBVyxFQUFFLENBQUM7UUFFakUsT0FBTyxRQUFRLENBQUMsT0FBTzthQUNwQiwyQkFBMkIsQ0FBQyxnQkFBZ0IsQ0FBQzthQUM3QyxJQUFJLEVBQUU7YUFDTixJQUFJLENBQUMsQ0FBQyxT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
108
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiT2ZmZXJSZXNvdXJjZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc3RhdGljTW9kZWxzL09mZmVyUmVzb3VyY2VzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSx3QkFBd0IsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBUXZGLE9BQU8sRUFDTCwrQkFBK0IsRUFDL0IsYUFBYSxFQUNiLDJCQUEyQixHQUM1QixNQUFNLG9CQUFvQixDQUFDO0FBQzVCLE9BQU8sU0FBUyxNQUFNLHVCQUF1QixDQUFDO0FBRTlDLE9BQU8sVUFBVSxNQUFNLGNBQWMsQ0FBQztBQUt0QyxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUVwRCxNQUFNLGNBQWM7SUFDVixNQUFNLENBQVUsTUFBTSxHQUFHLFVBQVUsQ0FBQyxLQUFLLENBQUMsRUFBRSxTQUFTLEVBQUUsZ0JBQWdCLEVBQUUsQ0FBQyxDQUFDO0lBRTVFLE1BQU0sQ0FBQyxhQUFhLENBQUMsZ0JBQThCO1FBQ3hELE1BQU0sUUFBUSxHQUFHLG1CQUFtQixDQUFDLFdBQVcsRUFBRSxDQUFDLFdBQVcsRUFBRSxDQUFDO1FBRWpFLE9BQU8sUUFBUSxDQUFDLE9BQU87YUFDcEIsMkJBQTJCLENBQUMsZ0JBQWdCLENBQUM7YUFDN0MsSUFBSSxFQUFFO2FBQ04sSUFBSSxDQUFDLENBQUMsU0FBMkIsRUFBRSxFQUFFLENBQ3BDLFNBQVUsQ0FBQyxHQUFHLENBQUMsQ0FBQyxRQUFRLEVBQUUsRUFBRSxDQUFDLDJCQUEyQixDQUFDLFFBQXlCLENBQUMsQ0FBQyxDQUNyRixDQUFDO0lBQ04sQ0FBQztJQUVNLE1BQU0sQ0FBQyxhQUFhLENBQUMsZ0JBQThCO1FBQ3hELE1BQU0sUUFBUSxHQUFHLG1CQUFtQixDQUFDLFdBQVcsRUFBRSxDQUFDLFdBQVcsRUFBRSxDQUFDO1FBRWpFLE9BQU8sUUFBUSxDQUFDLE9BQU87YUFDcEIs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
@@ -1,7 +1,6 @@
1
1
  import { BlockchainId, OfferStorageAllocated } from '../types/index.js';
2
2
  declare class OffersStorageAllocated {
3
- getNewStorageOrders(): Promise<BlockchainId[]>;
4
- static getUsedStorageOrders(): Promise<BlockchainId[]>;
5
- static getByOfferVersion(offerId: BlockchainId, offerVersion?: number): Promise<OfferStorageAllocated>;
3
+ static getByOfferVersion(offerId: BlockchainId, offerVersion?: number): Promise<OfferStorageAllocated | undefined>;
4
+ static getByIssuerId(teeOfferIssuerId: BlockchainId): Promise<OfferStorageAllocated[]>;
6
5
  }
7
6
  export default OffersStorageAllocated;
@@ -1,21 +1,25 @@
1
1
  import { BlockchainConnector } from '../connectors/index.js';
2
- import { cleanWeb3Data } from '../utils/helper.js';
2
+ import { convertOfferStorageAllocatedFromRaw } from '../utils/helper.js';
3
3
  class OffersStorageAllocated {
4
- getNewStorageOrders() {
4
+ static async getByOfferVersion(offerId, offerVersion = 0) {
5
5
  const contract = BlockchainConnector.getInstance().getContract();
6
- return contract.methods.getNewStorageOrders().call();
7
- }
8
- static getUsedStorageOrders() {
9
- const contract = BlockchainConnector.getInstance().getContract();
10
- return contract.methods.getUsedStorageOrders().call();
6
+ const allocated = await contract.methods
7
+ .getStorageOrdersAllocated(offerId, offerVersion)
8
+ .call()
9
+ .then((allocated) => convertOfferStorageAllocatedFromRaw(allocated));
10
+ if (Number(allocated.timestamp) === 0) {
11
+ return undefined;
12
+ }
13
+ return allocated;
11
14
  }
12
- static getByOfferVersion(offerId, offerVersion = 0) {
15
+ static async getByIssuerId(teeOfferIssuerId) {
13
16
  const contract = BlockchainConnector.getInstance().getContract();
14
- return contract.methods
15
- .getStorageOrdersAllocated(offerId, offerVersion)
17
+ const allocated = await contract.methods
18
+ .getStorageOrdersAllocatedByIssuer(teeOfferIssuerId)
16
19
  .call()
17
- .then((allocated) => cleanWeb3Data(allocated));
20
+ .then((allocatedOffers) => allocatedOffers.map((allocated) => convertOfferStorageAllocatedFromRaw(allocated)));
21
+ return allocated;
18
22
  }
19
23
  }
20
24
  export default OffersStorageAllocated;
21
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiT2ZmZXJzU3RvcmFnZUFsbG9jYXRlZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zdGF0aWNNb2RlbHMvT2ZmZXJzU3RvcmFnZUFsbG9jYXRlZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUU3RCxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFbkQsTUFBTSxzQkFBc0I7SUFDbkIsbUJBQW1CO1FBQ3hCLE1BQU0sUUFBUSxHQUFHLG1CQUFtQixDQUFDLFdBQVcsRUFBRSxDQUFDLFdBQVcsRUFBRSxDQUFDO1FBRWpFLE9BQU8sUUFBUSxDQUFDLE9BQU8sQ0FBQyxtQkFBbUIsRUFBRSxDQUFDLElBQUksRUFBRSxDQUFDO0lBQ3ZELENBQUM7SUFFTSxNQUFNLENBQUMsb0JBQW9CO1FBQ2hDLE1BQU0sUUFBUSxHQUFHLG1CQUFtQixDQUFDLFdBQVcsRUFBRSxDQUFDLFdBQVcsRUFBRSxDQUFDO1FBRWpFLE9BQU8sUUFBUSxDQUFDLE9BQU8sQ0FBQyxvQkFBb0IsRUFBRSxDQUFDLElBQUksRUFBRSxDQUFDO0lBQ3hELENBQUM7SUFFTSxNQUFNLENBQUMsaUJBQWlCLENBQzdCLE9BQXFCLEVBQ3JCLGVBQXVCLENBQUM7UUFFeEIsTUFBTSxRQUFRLEdBQUcsbUJBQW1CLENBQUMsV0FBVyxFQUFFLENBQUMsV0FBVyxFQUFFLENBQUM7UUFFakUsT0FBTyxRQUFRLENBQUMsT0FBTzthQUNwQix5QkFBeUIsQ0FBQyxPQUFPLEVBQUUsWUFBWSxDQUFDO2FBQ2hELElBQUksRUFBRTthQUNOLElBQUksQ0FBQyxDQUFDLFNBQVMsRUFBRSxFQUFFLENBQUMsYUFBYSxDQUFDLFNBQVMsQ0FBMEIsQ0FBQyxDQUFDO0lBQzVFLENBQUM7Q0FDRjtBQUVELGVBQWUsc0JBQXNCLENBQUMifQ==
25
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiT2ZmZXJzU3RvcmFnZUFsbG9jYXRlZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zdGF0aWNNb2RlbHMvT2ZmZXJzU3RvcmFnZUFsbG9jYXRlZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUU3RCxPQUFPLEVBQUUsbUNBQW1DLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUV6RSxNQUFNLHNCQUFzQjtJQUNuQixNQUFNLENBQUMsS0FBSyxDQUFDLGlCQUFpQixDQUNuQyxPQUFxQixFQUNyQixlQUF1QixDQUFDO1FBRXhCLE1BQU0sUUFBUSxHQUFHLG1CQUFtQixDQUFDLFdBQVcsRUFBRSxDQUFDLFdBQVcsRUFBRSxDQUFDO1FBQ2pFLE1BQU0sU0FBUyxHQUFHLE1BQU0sUUFBUSxDQUFDLE9BQU87YUFDckMseUJBQXlCLENBQUMsT0FBTyxFQUFFLFlBQVksQ0FBQzthQUNoRCxJQUFJLEVBQUU7YUFDTixJQUFJLENBQUMsQ0FBQyxTQUFTLEVBQUUsRUFBRSxDQUFDLG1DQUFtQyxDQUFDLFNBQWtDLENBQUMsQ0FBQyxDQUFDO1FBRWhHLElBQUksTUFBTSxDQUFDLFNBQVMsQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQztZQUN0QyxPQUFPLFNBQVMsQ0FBQztRQUNuQixDQUFDO1FBRUQsT0FBTyxTQUFTLENBQUM7SUFDbkIsQ0FBQztJQUVNLE1BQU0sQ0FBQyxLQUFLLENBQUMsYUFBYSxDQUMvQixnQkFBOEI7UUFFOUIsTUFBTSxRQUFRLEdBQUcsbUJBQW1CLENBQUMsV0FBVyxFQUFFLENBQUMsV0FBVyxFQUFFLENBQUM7UUFDakUsTUFBTSxTQUFTLEdBQUcsTUFBTSxRQUFRLENBQUMsT0FBTzthQUNyQyxpQ0FBaUMsQ0FBQyxnQkFBZ0IsQ0FBQzthQUNuRCxJQUFJLEVBQUU7YUFDTixJQUFJLENBQUMsQ0FBQyxlQUFpQyxFQUFFLEVBQUUsQ0FDMUMsZUFBZ0IsQ0FBQyxHQUFHLENBQUMsQ0FBQyxTQUFTLEVBQUUsRUFBRSxDQUNqQyxtQ0FBbUMsQ0FBQyxTQUFrQyxDQUFDLENBQ3hFLENBQ0YsQ0FBQztRQUVKLE9BQU8sU0FBUyxDQUFDO0lBQ25CLENBQUM7Q0FDRjtBQUVELGVBQWUsc0JBQXNCLENBQUMifQ==