@super-protocol/sdk-js 2.2.0-beta.1 → 2.2.0-beta.100

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 (232) hide show
  1. package/dist/cjs/RIGenerator.d.ts +2 -0
  2. package/dist/cjs/RIGenerator.js +6 -4
  3. package/dist/cjs/TIIGenerator.d.ts +2 -1
  4. package/dist/cjs/TIIGenerator.js +13 -3
  5. package/dist/cjs/TeeInputGeneratorBase.d.ts +1 -1
  6. package/dist/cjs/TeeInputGeneratorBase.js +20 -32
  7. package/dist/cjs/analytics/eventProviders/BrowserEventProvider.d.ts +1 -0
  8. package/dist/cjs/analytics/eventProviders/BrowserEventProvider.js +3 -3
  9. package/dist/cjs/analytics/transports/AxiosTransport.js +1 -1
  10. package/dist/cjs/config.d.ts +0 -1
  11. package/dist/cjs/config.js +1 -2
  12. package/dist/cjs/constants.d.ts +5 -4
  13. package/dist/cjs/constants.js +31 -7
  14. package/dist/cjs/contracts/abi.d.ts +766 -104
  15. package/dist/cjs/contracts/abi.js +968 -119
  16. package/dist/cjs/crypto/index.d.ts +1 -0
  17. package/dist/cjs/crypto/index.js +16 -1
  18. package/dist/cjs/errors/base.error.d.ts +3 -0
  19. package/dist/cjs/errors/base.error.js +19 -0
  20. package/dist/cjs/errors/index.d.ts +2 -0
  21. package/dist/cjs/errors/index.js +8 -0
  22. package/dist/cjs/errors/not-found.error.d.ts +3 -0
  23. package/dist/cjs/errors/not-found.error.js +8 -0
  24. package/dist/cjs/errors/utils.d.ts +1 -0
  25. package/dist/cjs/errors/utils.js +25 -0
  26. package/dist/cjs/index.d.ts +9 -1
  27. package/dist/cjs/index.js +16 -2
  28. package/dist/cjs/models/Offer.d.ts +38 -6
  29. package/dist/cjs/models/Offer.js +119 -15
  30. package/dist/cjs/models/Order.d.ts +2 -90
  31. package/dist/cjs/models/Order.js +20 -91
  32. package/dist/cjs/models/Provider.js +1 -1
  33. package/dist/cjs/models/TCB.js +13 -5
  34. package/dist/cjs/models/TeeOffer.d.ts +35 -13
  35. package/dist/cjs/models/TeeOffer.js +117 -45
  36. package/dist/cjs/proto/Compression.d.ts +1 -1
  37. package/dist/cjs/proto/TRI.d.ts +41 -6
  38. package/dist/cjs/proto/TRI.js +18 -1
  39. package/dist/cjs/proto/TeeProperties.d.ts +5 -5
  40. package/dist/cjs/providers/storage/IStorageProvider.d.ts +1 -1
  41. package/dist/cjs/providers/storage/S3StorageProvider.d.ts +8 -7
  42. package/dist/cjs/providers/storage/S3StorageProvider.js +80 -38
  43. package/dist/cjs/providers/storage/StorageAdapter.d.ts +9 -7
  44. package/dist/cjs/providers/storage/StorageAdapter.js +27 -29
  45. package/dist/cjs/providers/storage/StorageContentWriter.d.ts +2 -2
  46. package/dist/cjs/providers/storage/StorageContentWriter.js +5 -5
  47. package/dist/cjs/providers/storage/StorageKeyValueAdapter.d.ts +8 -5
  48. package/dist/cjs/providers/storage/StorageKeyValueAdapter.js +30 -16
  49. package/dist/cjs/providers/storage/StorjAdapter.d.ts +5 -4
  50. package/dist/cjs/providers/storage/StorjAdapter.js +15 -9
  51. package/dist/cjs/providers/storage/StorjCredentialsManager.d.ts +24 -0
  52. package/dist/cjs/providers/storage/StorjCredentialsManager.js +86 -0
  53. package/dist/cjs/providers/storage/StorjStorageProvider.js +2 -2
  54. package/dist/cjs/providers/storage/fs-storage-provider.d.ts +19 -0
  55. package/dist/cjs/providers/storage/fs-storage-provider.js +143 -0
  56. package/dist/cjs/providers/storage/getStorageProvider.js +4 -1
  57. package/dist/cjs/providers/storage/parseStorageCredentials.d.ts +5 -0
  58. package/dist/cjs/providers/storage/parseStorageCredentials.js +21 -0
  59. package/dist/cjs/providers/storage/types.d.ts +22 -0
  60. package/dist/cjs/staticModels/LoaderSecretsPublicKeys.d.ts +1 -1
  61. package/dist/cjs/staticModels/LoaderSecretsPublicKeys.js +9 -5
  62. package/dist/cjs/staticModels/LoaderSessions.d.ts +4 -4
  63. package/dist/cjs/staticModels/LoaderSessions.js +16 -10
  64. package/dist/cjs/staticModels/OfferResources.d.ts +6 -6
  65. package/dist/cjs/staticModels/OfferResources.js +36 -15
  66. package/dist/cjs/staticModels/Offers.js +7 -2
  67. package/dist/cjs/staticModels/OffersStorageAllocated.d.ts +2 -3
  68. package/dist/cjs/staticModels/OffersStorageAllocated.js +15 -11
  69. package/dist/cjs/staticModels/OffersStorageRequests.d.ts +2 -2
  70. package/dist/cjs/staticModels/OffersStorageRequests.js +15 -8
  71. package/dist/cjs/staticModels/Orders.d.ts +5 -4
  72. package/dist/cjs/staticModels/Orders.js +7 -6
  73. package/dist/cjs/staticModels/SecretRequests.d.ts +2 -2
  74. package/dist/cjs/staticModels/SecretRequests.js +19 -10
  75. package/dist/cjs/staticModels/TeeOffers.d.ts +0 -2
  76. package/dist/cjs/staticModels/TeeOffers.js +5 -38
  77. package/dist/cjs/tee/QuoteParser.d.ts +61 -6
  78. package/dist/cjs/tee/QuoteParser.js +248 -29
  79. package/dist/cjs/tee/QuoteValidator.d.ts +11 -0
  80. package/dist/cjs/tee/QuoteValidator.js +131 -34
  81. package/dist/cjs/tee/TeeBlockVerifier.d.ts +3 -4
  82. package/dist/cjs/tee/TeeBlockVerifier.js +2 -8
  83. package/dist/cjs/tee/errors.d.ts +6 -3
  84. package/dist/cjs/tee/errors.js +9 -5
  85. package/dist/cjs/tee/types.d.ts +50 -9
  86. package/dist/cjs/tee/types.js +32 -1
  87. package/dist/cjs/types/DistributedSecretStorage.d.ts +8 -1
  88. package/dist/cjs/types/Offer.d.ts +20 -5
  89. package/dist/cjs/types/Offer.js +10 -2
  90. package/dist/cjs/types/OfferVersion.d.ts +13 -0
  91. package/dist/cjs/types/OfferVersion.js +9 -0
  92. package/dist/cjs/types/Order.d.ts +8 -2
  93. package/dist/cjs/types/Order.js +3 -1
  94. package/dist/cjs/types/SlotInfo.d.ts +1 -0
  95. package/dist/cjs/types/Superpro.d.ts +2 -1
  96. package/dist/cjs/types/Superpro.js +2 -1
  97. package/dist/cjs/types/TeeOfferInfo.d.ts +2 -1
  98. package/dist/cjs/types/index.d.ts +1 -0
  99. package/dist/cjs/types/index.js +2 -1
  100. package/dist/cjs/types/storage/StorageAccess.d.ts +3 -3
  101. package/dist/cjs/utils/CryptoKeysTransformer.d.ts +12 -4
  102. package/dist/cjs/utils/CryptoKeysTransformer.js +98 -10
  103. package/dist/cjs/utils/NonceTracker.js +1 -1
  104. package/dist/cjs/utils/helper.d.ts +7 -1
  105. package/dist/cjs/utils/helper.js +87 -2
  106. package/dist/cjs/utils/helpers/OrderArgsHelper.d.ts +17 -0
  107. package/dist/cjs/utils/helpers/OrderArgsHelper.js +87 -0
  108. package/dist/cjs/utils/helpers/index.d.ts +2 -0
  109. package/dist/cjs/utils/helpers/index.js +3 -1
  110. package/dist/cjs/utils/helpers/uploadObjectToStorage.d.ts +13 -0
  111. package/dist/cjs/utils/helpers/uploadObjectToStorage.js +55 -0
  112. package/dist/cjs/utils/schema-validators/index.d.ts +1 -0
  113. package/dist/cjs/utils/schema-validators/index.js +6 -0
  114. package/dist/cjs/utils/schema-validators/validator.d.ts +7 -0
  115. package/dist/cjs/utils/schema-validators/validator.js +49 -0
  116. package/dist/mjs/RIGenerator.d.ts +2 -0
  117. package/dist/mjs/RIGenerator.js +6 -4
  118. package/dist/mjs/TIIGenerator.d.ts +2 -1
  119. package/dist/mjs/TIIGenerator.js +13 -3
  120. package/dist/mjs/TeeInputGeneratorBase.d.ts +1 -1
  121. package/dist/mjs/TeeInputGeneratorBase.js +20 -32
  122. package/dist/mjs/analytics/eventProviders/BrowserEventProvider.d.ts +1 -0
  123. package/dist/mjs/analytics/eventProviders/BrowserEventProvider.js +3 -3
  124. package/dist/mjs/analytics/transports/AxiosTransport.js +1 -1
  125. package/dist/mjs/config.d.ts +0 -1
  126. package/dist/mjs/config.js +1 -2
  127. package/dist/mjs/constants.d.ts +5 -4
  128. package/dist/mjs/constants.js +30 -6
  129. package/dist/mjs/contracts/abi.d.ts +766 -104
  130. package/dist/mjs/contracts/abi.js +968 -119
  131. package/dist/mjs/crypto/index.d.ts +1 -0
  132. package/dist/mjs/crypto/index.js +2 -1
  133. package/dist/mjs/errors/base.error.d.ts +3 -0
  134. package/dist/mjs/errors/base.error.js +15 -0
  135. package/dist/mjs/errors/index.d.ts +2 -0
  136. package/dist/mjs/errors/index.js +3 -0
  137. package/dist/mjs/errors/not-found.error.d.ts +3 -0
  138. package/dist/mjs/errors/not-found.error.js +4 -0
  139. package/dist/mjs/errors/utils.d.ts +1 -0
  140. package/dist/mjs/errors/utils.js +18 -0
  141. package/dist/mjs/index.d.ts +9 -1
  142. package/dist/mjs/index.js +9 -2
  143. package/dist/mjs/models/Offer.d.ts +38 -6
  144. package/dist/mjs/models/Offer.js +120 -16
  145. package/dist/mjs/models/Order.d.ts +2 -90
  146. package/dist/mjs/models/Order.js +20 -91
  147. package/dist/mjs/models/Provider.js +1 -1
  148. package/dist/mjs/models/TCB.js +13 -5
  149. package/dist/mjs/models/TeeOffer.d.ts +35 -13
  150. package/dist/mjs/models/TeeOffer.js +113 -41
  151. package/dist/mjs/proto/Compression.d.ts +1 -1
  152. package/dist/mjs/proto/TRI.d.ts +41 -6
  153. package/dist/mjs/proto/TRI.js +18 -1
  154. package/dist/mjs/proto/TeeProperties.d.ts +5 -5
  155. package/dist/mjs/providers/storage/IStorageProvider.d.ts +1 -1
  156. package/dist/mjs/providers/storage/S3StorageProvider.d.ts +8 -7
  157. package/dist/mjs/providers/storage/S3StorageProvider.js +77 -38
  158. package/dist/mjs/providers/storage/StorageAdapter.d.ts +9 -7
  159. package/dist/mjs/providers/storage/StorageAdapter.js +27 -29
  160. package/dist/mjs/providers/storage/StorageContentWriter.d.ts +2 -2
  161. package/dist/mjs/providers/storage/StorageContentWriter.js +5 -5
  162. package/dist/mjs/providers/storage/StorageKeyValueAdapter.d.ts +8 -5
  163. package/dist/mjs/providers/storage/StorageKeyValueAdapter.js +30 -16
  164. package/dist/mjs/providers/storage/StorjAdapter.d.ts +5 -4
  165. package/dist/mjs/providers/storage/StorjAdapter.js +15 -9
  166. package/dist/mjs/providers/storage/StorjCredentialsManager.d.ts +24 -0
  167. package/dist/mjs/providers/storage/StorjCredentialsManager.js +82 -0
  168. package/dist/mjs/providers/storage/StorjStorageProvider.js +2 -2
  169. package/dist/mjs/providers/storage/fs-storage-provider.d.ts +19 -0
  170. package/dist/mjs/providers/storage/fs-storage-provider.js +113 -0
  171. package/dist/mjs/providers/storage/getStorageProvider.js +4 -1
  172. package/dist/mjs/providers/storage/parseStorageCredentials.d.ts +5 -0
  173. package/dist/mjs/providers/storage/parseStorageCredentials.js +17 -0
  174. package/dist/mjs/providers/storage/types.d.ts +22 -0
  175. package/dist/mjs/staticModels/LoaderSecretsPublicKeys.d.ts +1 -1
  176. package/dist/mjs/staticModels/LoaderSecretsPublicKeys.js +10 -6
  177. package/dist/mjs/staticModels/LoaderSessions.d.ts +4 -4
  178. package/dist/mjs/staticModels/LoaderSessions.js +17 -11
  179. package/dist/mjs/staticModels/OfferResources.d.ts +6 -6
  180. package/dist/mjs/staticModels/OfferResources.js +37 -16
  181. package/dist/mjs/staticModels/Offers.js +7 -2
  182. package/dist/mjs/staticModels/OffersStorageAllocated.d.ts +2 -3
  183. package/dist/mjs/staticModels/OffersStorageAllocated.js +16 -12
  184. package/dist/mjs/staticModels/OffersStorageRequests.d.ts +2 -2
  185. package/dist/mjs/staticModels/OffersStorageRequests.js +16 -9
  186. package/dist/mjs/staticModels/Orders.d.ts +5 -4
  187. package/dist/mjs/staticModels/Orders.js +7 -6
  188. package/dist/mjs/staticModels/SecretRequests.d.ts +2 -2
  189. package/dist/mjs/staticModels/SecretRequests.js +20 -11
  190. package/dist/mjs/staticModels/TeeOffers.d.ts +0 -2
  191. package/dist/mjs/staticModels/TeeOffers.js +5 -38
  192. package/dist/mjs/store.js +2 -2
  193. package/dist/mjs/tee/QuoteParser.d.ts +61 -6
  194. package/dist/mjs/tee/QuoteParser.js +245 -28
  195. package/dist/mjs/tee/QuoteValidator.d.ts +11 -0
  196. package/dist/mjs/tee/QuoteValidator.js +131 -34
  197. package/dist/mjs/tee/TeeBlockVerifier.d.ts +3 -4
  198. package/dist/mjs/tee/TeeBlockVerifier.js +2 -8
  199. package/dist/mjs/tee/errors.d.ts +6 -3
  200. package/dist/mjs/tee/errors.js +7 -4
  201. package/dist/mjs/tee/types.d.ts +50 -9
  202. package/dist/mjs/tee/types.js +28 -2
  203. package/dist/mjs/types/DistributedSecretStorage.d.ts +8 -1
  204. package/dist/mjs/types/Offer.d.ts +20 -5
  205. package/dist/mjs/types/Offer.js +9 -1
  206. package/dist/mjs/types/OfferVersion.d.ts +13 -0
  207. package/dist/mjs/types/OfferVersion.js +6 -0
  208. package/dist/mjs/types/Order.d.ts +8 -2
  209. package/dist/mjs/types/Order.js +3 -1
  210. package/dist/mjs/types/SlotInfo.d.ts +1 -0
  211. package/dist/mjs/types/Superpro.d.ts +2 -1
  212. package/dist/mjs/types/Superpro.js +2 -1
  213. package/dist/mjs/types/TeeOfferInfo.d.ts +2 -1
  214. package/dist/mjs/types/index.d.ts +1 -0
  215. package/dist/mjs/types/index.js +2 -1
  216. package/dist/mjs/types/storage/StorageAccess.d.ts +3 -3
  217. package/dist/mjs/utils/CryptoKeysTransformer.d.ts +12 -4
  218. package/dist/mjs/utils/CryptoKeysTransformer.js +98 -10
  219. package/dist/mjs/utils/NonceTracker.js +1 -1
  220. package/dist/mjs/utils/helper.d.ts +7 -1
  221. package/dist/mjs/utils/helper.js +80 -1
  222. package/dist/mjs/utils/helpers/OrderArgsHelper.d.ts +17 -0
  223. package/dist/mjs/utils/helpers/OrderArgsHelper.js +80 -0
  224. package/dist/mjs/utils/helpers/index.d.ts +2 -0
  225. package/dist/mjs/utils/helpers/index.js +3 -1
  226. package/dist/mjs/utils/helpers/uploadObjectToStorage.d.ts +13 -0
  227. package/dist/mjs/utils/helpers/uploadObjectToStorage.js +48 -0
  228. package/dist/mjs/utils/schema-validators/index.d.ts +1 -0
  229. package/dist/mjs/utils/schema-validators/index.js +2 -0
  230. package/dist/mjs/utils/schema-validators/validator.d.ts +7 -0
  231. package/dist/mjs/utils/schema-validators/validator.js +45 -0
  232. package/package.json +6 -5
@@ -1,6 +1,7 @@
1
1
  import { StorageType } from '@super-protocol/dto-js';
2
2
  import StorjStorageProvider from './StorjStorageProvider.js';
3
3
  import { S3StorageProvider } from './S3StorageProvider.js';
4
+ import { FSStorageProvider } from './fs-storage-provider.js';
4
5
  export default (storageAccess) => {
5
6
  const key = storageAccess.storageType;
6
7
  switch (key) {
@@ -8,8 +9,10 @@ export default (storageAccess) => {
8
9
  return new StorjStorageProvider(storageAccess.credentials, storageAccess.maximumConcurrent);
9
10
  case StorageType.S3:
10
11
  return new S3StorageProvider(storageAccess.credentials);
12
+ case StorageType.FS:
13
+ return new FSStorageProvider(storageAccess.credentials);
11
14
  default:
12
15
  throw Error(`Unsupported storageType ${key}`);
13
16
  }
14
17
  };
15
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0U3RvcmFnZVByb3ZpZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL3Byb3ZpZGVycy9zdG9yYWdlL2dldFN0b3JhZ2VQcm92aWRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFHckQsT0FBTyxvQkFBb0IsTUFBTSwyQkFBMkIsQ0FBQztBQUM3RCxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUUzRCxlQUFlLENBQUMsYUFBNEIsRUFBb0IsRUFBRTtJQUNoRSxNQUFNLEdBQUcsR0FBRyxhQUFhLENBQUMsV0FBMEIsQ0FBQztJQUNyRCxRQUFRLEdBQUcsRUFBRSxDQUFDO1FBQ1osS0FBSyxXQUFXLENBQUMsS0FBSztZQUNwQixPQUFPLElBQUksb0JBQW9CLENBQUMsYUFBYSxDQUFDLFdBQVcsRUFBRSxhQUFhLENBQUMsaUJBQWlCLENBQUMsQ0FBQztRQUM5RixLQUFLLFdBQVcsQ0FBQyxFQUFFO1lBQ2pCLE9BQU8sSUFBSSxpQkFBaUIsQ0FBQyxhQUFhLENBQUMsV0FBVyxDQUFDLENBQUM7UUFDMUQ7WUFDRSxNQUFNLEtBQUssQ0FBQywyQkFBMkIsR0FBRyxFQUFFLENBQUMsQ0FBQztJQUNsRCxDQUFDO0FBQ0gsQ0FBQyxDQUFDIn0=
18
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0U3RvcmFnZVByb3ZpZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL3Byb3ZpZGVycy9zdG9yYWdlL2dldFN0b3JhZ2VQcm92aWRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQWdDLFdBQVcsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBR25GLE9BQU8sb0JBQW9CLE1BQU0sMkJBQTJCLENBQUM7QUFDN0QsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDM0QsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFN0QsZUFBZSxDQUFDLGFBQTRCLEVBQW9CLEVBQUU7SUFDaEUsTUFBTSxHQUFHLEdBQUcsYUFBYSxDQUFDLFdBQTBCLENBQUM7SUFDckQsUUFBUSxHQUFHLEVBQUUsQ0FBQztRQUNaLEtBQUssV0FBVyxDQUFDLEtBQUs7WUFDcEIsT0FBTyxJQUFJLG9CQUFvQixDQUFDLGFBQWEsQ0FBQyxXQUFXLEVBQUUsYUFBYSxDQUFDLGlCQUFpQixDQUFDLENBQUM7UUFDOUYsS0FBSyxXQUFXLENBQUMsRUFBRTtZQUNqQixPQUFPLElBQUksaUJBQWlCLENBQUMsYUFBYSxDQUFDLFdBQTRCLENBQUMsQ0FBQztRQUMzRSxLQUFLLFdBQVcsQ0FBQyxFQUFFO1lBQ2pCLE9BQU8sSUFBSSxpQkFBaUIsQ0FBQyxhQUFhLENBQUMsV0FBNEIsQ0FBQyxDQUFDO1FBQzNFO1lBQ0UsTUFBTSxLQUFLLENBQUMsMkJBQTJCLEdBQUcsRUFBRSxDQUFDLENBQUM7SUFDbEQsQ0FBQztBQUNILENBQUMsQ0FBQyJ9
@@ -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,17 @@
1
+ const tryParseJson = (probablyJson) => {
2
+ try {
3
+ return JSON.parse(probablyJson);
4
+ }
5
+ catch {
6
+ return probablyJson;
7
+ }
8
+ };
9
+ export const parseStorageCredentials = (decryptedCredentials) => {
10
+ const credentials = JSON.parse(decryptedCredentials);
11
+ return {
12
+ storageType: credentials.storageType,
13
+ downloadCredentials: tryParseJson(credentials.downloadCredentials),
14
+ uploadCredentials: tryParseJson(credentials.uploadCredentials),
15
+ };
16
+ };
17
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGFyc2VTdG9yYWdlQ3JlZGVudGlhbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvcHJvdmlkZXJzL3N0b3JhZ2UvcGFyc2VTdG9yYWdlQ3JlZGVudGlhbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBY0EsTUFBTSxZQUFZLEdBQUcsQ0FBQyxZQUFvQixFQUFpQyxFQUFFO0lBQzNFLElBQUksQ0FBQztRQUNILE9BQU8sSUFBSSxDQUFDLEtBQUssQ0FBQyxZQUFZLENBQUMsQ0FBQztJQUNsQyxDQUFDO0lBQUMsTUFBTyxDQUFDO1FBQ1IsT0FBTyxZQUFZLENBQUM7SUFDdEIsQ0FBQztBQUNILENBQUMsQ0FBQztBQUVGLE1BQU0sQ0FBQyxNQUFNLHVCQUF1QixHQUFHLENBQ3JDLG9CQUE0QixFQUNELEVBQUU7SUFDN0IsTUFBTSxXQUFXLEdBQStCLElBQUksQ0FBQyxLQUFLLENBQUMsb0JBQW9CLENBQUMsQ0FBQztJQUVqRixPQUFPO1FBQ0wsV0FBVyxFQUFFLFdBQVcsQ0FBQyxXQUFXO1FBQ3BDLG1CQUFtQixFQUFFLFlBQVksQ0FBQyxXQUFXLENBQUMsbUJBQW1CLENBQUM7UUFDbEUsaUJBQWlCLEVBQUUsWUFBWSxDQUFDLFdBQVcsQ0FBQyxpQkFBaUIsQ0FBQztLQUNsQyxDQUFDO0FBQ2pDLENBQUMsQ0FBQyJ9
@@ -1,3 +1,5 @@
1
+ /// <reference types="node" />
2
+ import { CacheEvents, StorageObject } from '../../index.js';
1
3
  export interface CacheRecord<V> {
2
4
  value: V | null;
3
5
  modifiedTs: number;
@@ -5,3 +7,23 @@ export interface CacheRecord<V> {
5
7
  export interface Performance {
6
8
  now(): number;
7
9
  }
10
+ export interface IStorageKeyValueAdapter<V extends object> {
11
+ set(key: string, value: V | null, privateKey?: string): Promise<void>;
12
+ delete(key: string): Promise<void>;
13
+ get(key: string, privateKey?: string): Promise<V | null>;
14
+ listFiles(key: string): Promise<StorageObject[]>;
15
+ }
16
+ export interface IStorageAdapter<V extends object> {
17
+ has(key: string): Promise<boolean>;
18
+ set(key: string, value: V, encryptionKeyBuffer?: Buffer): void;
19
+ delete(key: string): void;
20
+ run(): void;
21
+ clear(): void;
22
+ get(key: string, encryptionKeyBuffer?: Buffer): Promise<(V | null)[] | null>;
23
+ stop(): void;
24
+ subscribe(cb: (props: {
25
+ type: CacheEvents;
26
+ message: unknown;
27
+ }) => void): () => void;
28
+ shutdown(): Promise<void>;
29
+ }
@@ -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
- static setSessionAndRequestSecret(request: SecretRequest, teeOfferIssuerId: BlockchainId, sessionPublicKey: PublicKey, signature: string, signedTime: number, transactionOptions?: TransactionOptions): Promise<void>;
9
- static disableLoader(teeOfferId: BlockchainId, transactionOptions?: TransactionOptions): Promise<void>;
8
+ static setSessionAndRequestSecret(request: Omit<SecretRequest, 'timestamp'>, teeOfferIssuerId: BlockchainId, sessionPublicKey: PublicKey, signature: string, signedTime: number, 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();
@@ -25,20 +29,22 @@ class LoaderSessions {
25
29
  }
26
30
  static async setSessionAndRequestSecret(request, teeOfferIssuerId, sessionPublicKey, signature, signedTime, transactionOptions) {
27
31
  const contract = BlockchainConnector.getInstance().getContract();
28
- request.offerVersion = request.offerVersion ?? 0;
29
- request.timestamp = 0;
30
- await TxManager.execute(contract.methods.setLoaderSessionAndRequestSecret(request, sessionPublicKey, signature, teeOfferIssuerId, signedTime), transactionOptions);
32
+ await TxManager.execute(contract.methods.setLoaderSessionAndRequestSecret({
33
+ ...request,
34
+ offerVersion: request.offerVersion ?? 0,
35
+ timestamp: 0,
36
+ }, sessionPublicKey, signature, teeOfferIssuerId, signedTime), transactionOptions);
31
37
  }
32
- static async disableLoader(teeOfferId, transactionOptions) {
38
+ static async removeLoaderKeys(teeOfferId, transactionOptions) {
33
39
  const contract = BlockchainConnector.getInstance().getContract();
34
- await TxManager.execute(contract.methods.disableLoader(teeOfferId), transactionOptions);
40
+ await TxManager.execute(contract.methods.removeLoaderKeys(teeOfferId), transactionOptions);
35
41
  }
36
42
  static onLoaderSessionKeyUpdated(callback) {
37
43
  const listener = BlockchainEventsListener.getInstance();
38
44
  const logger = this.logger.child({ method: 'onLoaderSessionKeyUpdated' });
39
45
  const onData = (event) => {
40
46
  const parsedEvent = cleanWeb3Data(event.returnValues);
41
- callback(parsedEvent.loader, parsedEvent.keeperOfferId, cleanWeb3Data(parsedEvent.publicSessionsKey), {
47
+ callback(parsedEvent.teeOfferIssuerId, cleanWeb3Data(parsedEvent.publicSessionsKey), {
42
48
  index: Number(event.blockNumber),
43
49
  hash: event.blockHash,
44
50
  });
@@ -54,4 +60,4 @@ class LoaderSessions {
54
60
  }
55
61
  }
56
62
  export default LoaderSessions;
57
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTG9hZGVyU2Vzc2lvbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc3RhdGljTW9kZWxzL0xvYWRlclNlc3Npb25zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSx3QkFBd0IsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBU3ZGLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNuRCxPQUFPLFNBQVMsTUFBTSx1QkFBdUIsQ0FBQztBQUU5QyxPQUFPLFVBQVUsTUFBTSxjQUFjLENBQUM7QUFNdEMsTUFBTSxjQUFjO0lBQ1YsTUFBTSxDQUFVLE1BQU0sR0FBRyxVQUFVLENBQUMsS0FBSyxDQUFDLEVBQUUsU0FBUyxFQUFFLGdCQUFnQixFQUFFLENBQUMsQ0FBQztJQUU1RSxNQUFNLENBQUMsaUJBQWlCO1FBQzdCLE1BQU0sUUFBUSxHQUFHLG1CQUFtQixDQUFDLFdBQVcsRUFBRSxDQUFDLFdBQVcsRUFBRSxDQUFDO1FBRWpFLE9BQU8sUUFBUSxDQUFDLE9BQU8sQ0FBQyxpQkFBaUIsRUFBRSxDQUFDLElBQUksRUFBRSxDQUFDO0lBQ3JELENBQUM7SUFFTSxNQUFNLENBQUMsa0JBQWtCO1FBQzlCLE1BQU0sUUFBUSxHQUFHLG1CQUFtQixDQUFDLFdBQVcsRUFBRSxDQUFDLFdBQVcsRUFBRSxDQUFDO1FBRWpFLE9BQU8sUUFBUSxDQUFDLE9BQU8sQ0FBQyxrQkFBa0IsRUFBRSxDQUFDLElBQUksRUFBRSxDQUFDO0lBQ3RELENBQUM7SUFFTSxNQUFNLENBQUMsR0FBRyxDQUFDLFVBQXdCO1FBQ3hDLE1BQU0sUUFBUSxHQUFHLG1CQUFtQixDQUFDLFdBQVcsRUFBRSxDQUFDLFdBQVcsRUFBRSxDQUFDO1FBRWpFLE9BQU8sUUFBUSxDQUFDLE9BQU87YUFDcEIsZ0JBQWdCLENBQUMsVUFBVSxDQUFDO2FBQzVCLElBQUksRUFBRTthQUNOLElBQUksQ0FBQyxDQUFD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
63
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTG9hZGVyU2Vzc2lvbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc3RhdGljTW9kZWxzL0xvYWRlclNlc3Npb25zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSx3QkFBd0IsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBU3ZGLE9BQU8sRUFBRSxhQUFhLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNoRixPQUFPLFNBQVMsTUFBTSx1QkFBdUIsQ0FBQztBQUU5QyxPQUFPLFVBQVUsTUFBTSxjQUFjLENBQUM7QUFNdEMsTUFBTSxjQUFjO0lBQ1YsTUFBTSxDQUFVLE1BQU0sR0FBRyxVQUFVLENBQUMsS0FBSyxDQUFDLEVBQUUsU0FBUyxFQUFFLGdCQUFnQixFQUFFLENBQUMsQ0FBQztJQUU1RSxNQUFNLENBQUMsaUJBQWlCO1FBQzdCLE1BQU0sUUFBUSxHQUFHLG1CQUFtQixDQUFDLFdBQVcsRUFBRSxDQUFDLFdBQVcsRUFBRSxDQUFDO1FBRWpFLE9BQU8sUUFBUSxDQUFDLE9BQU8sQ0FBQyxpQkFBaUIsRUFBRSxDQUFDLElBQUksRUFBRSxDQUFDO0lBQ3JELENBQUM7SUFFTSxNQUFNLENBQUMsa0JBQWtCO1FBQzlCLE1BQU0sUUFBUSxHQUFHLG1CQUFtQixDQUFDLFdBQVcsRUFBRSxDQUFDLFdBQVcsRUFBRSxDQUFDO1FBRWpFLE9BQU8sUUFBUSxDQUFDLE9BQU8sQ0FBQyxrQkFBa0IsRUFBRSxDQUFDLElBQUksRUFBRSxDQUFDO0lBQ3RELENBQUM7SUFFTSxNQUFNLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxVQUF3QjtRQUM5QyxNQUFNLFFBQVEsR0FBRyxtQkFBbUIsQ0FBQyxXQUFXLEVBQUUsQ0FBQyxXQUFXLEVBQUUsQ0FBQztRQUNqRSxNQUFNLGFBQWEsR0FBRyxNQUFNLFFBQVEsQ0FBQyxPQUFPO2FBQ3pDLGdCQUFnQixDQUFDLFVBQVUsQ0FB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
@@ -1,15 +1,15 @@
1
- import { BlockchainId, TransactionOptions, BlockInfo, OfferResource } from '../types/index.js';
1
+ import { BlockchainId, TransactionOptions, BlockInfo, OfferResource, Signature } from '../types/index.js';
2
2
  declare class OfferResources {
3
3
  private static readonly logger;
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
- static set(offerResource: OfferResource, transactionOptions?: TransactionOptions): Promise<void>;
10
- static createOrder(requestOfferId: BlockchainId, requestOfferVersion: number | undefined, resultInfo: string, resultInfoSignatureBySecretKey: string, // hex
11
- signedTime: number, transactionOptions?: TransactionOptions): Promise<void>;
12
- static clearOfferResources(teeOfferKeeperId: BlockchainId, transactionOptions?: TransactionOptions): Promise<void>;
9
+ static set(offerResource: Omit<OfferResource, 'timestamp'>, transactionOptions?: TransactionOptions): Promise<void>;
10
+ static increaseReplicationFactor(offerResource: Omit<OfferResource, 'timestamp'>, n: number, transactionOptions?: TransactionOptions): Promise<void>;
11
+ static createOrder(requestOfferId: BlockchainId, requestOfferVersion: number | undefined, resultInfo: string, resultInfoSignatureBySecretKey: Signature, signedTime: number, transactionOptions?: TransactionOptions): Promise<void>;
12
+ static clear(teeOfferKeeperId: BlockchainId, transactionOptions?: TransactionOptions): Promise<void>;
13
13
  static onOfferResourceCreated(callback: onOfferResourceCreatedCallback): () => void;
14
14
  static onOrderResourceCreated(callback: onOrderResourceCreatedCallback): () => void;
15
15
  }
@@ -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();
@@ -39,27 +44,43 @@ class OfferResources {
39
44
  static async set(offerResource, transactionOptions) {
40
45
  const contract = BlockchainConnector.getInstance().getContract();
41
46
  checkIfActionAccountInitialized(transactionOptions);
42
- offerResource.offerVersion ?? 0;
43
- offerResource.timestamp ?? 0;
44
- await TxManager.execute(contract.methods.setOfferResource(offerResource), transactionOptions);
47
+ await TxManager.execute(contract.methods.setOfferResource({
48
+ ...offerResource,
49
+ offerVersion: offerResource.offerVersion ?? 0,
50
+ solutionHash: offerResource.solutionHash ?? '',
51
+ timestamp: 0,
52
+ }), transactionOptions);
45
53
  }
46
- static async createOrder(requestOfferId, requestOfferVersion = 0, resultInfo, resultInfoSignatureBySecretKey, // hex
47
- signedTime, transactionOptions) {
54
+ static async increaseReplicationFactor(offerResource, n, transactionOptions) {
55
+ const contract = BlockchainConnector.getInstance().getContract();
56
+ checkIfActionAccountInitialized(transactionOptions);
57
+ await TxManager.execute(contract.methods.increaseReplicationFactor({
58
+ ...offerResource,
59
+ offerVersion: offerResource.offerVersion ?? 0,
60
+ solutionHash: offerResource.solutionHash ?? '',
61
+ timestamp: 0,
62
+ }, n), transactionOptions);
63
+ }
64
+ static async createOrder(requestOfferId, requestOfferVersion = 0, resultInfo, resultInfoSignatureBySecretKey, signedTime, transactionOptions) {
48
65
  const contract = BlockchainConnector.getInstance().getContract();
49
66
  checkIfActionAccountInitialized(transactionOptions);
50
67
  await TxManager.execute(contract.methods.createResourceOrder(requestOfferId, requestOfferVersion, resultInfo, resultInfoSignatureBySecretKey, signedTime), transactionOptions);
51
68
  }
52
- static async clearOfferResources(teeOfferKeeperId, transactionOptions) {
69
+ static async clear(teeOfferKeeperId, transactionOptions) {
53
70
  const contract = BlockchainConnector.getInstance().getContract();
54
71
  checkIfActionAccountInitialized(transactionOptions);
55
- await TxManager.execute(contract.methods.clearOfferResources(teeOfferKeeperId), transactionOptions);
72
+ const options = {
73
+ gas: AMOY_TX_GAS_LIMIT,
74
+ ...transactionOptions,
75
+ };
76
+ await TxManager.execute(contract.methods.clearOfferResources(teeOfferKeeperId), options);
56
77
  }
57
78
  static onOfferResourceCreated(callback) {
58
79
  const listener = BlockchainEventsListener.getInstance();
59
80
  const logger = this.logger.child({ method: 'onOfferResourceCreated' });
60
81
  const onData = (event) => {
61
82
  const parsedEvent = cleanWeb3Data(event.returnValues);
62
- callback(parsedEvent.offerId, parsedEvent.version, parsedEvent.keeperId, parsedEvent.issuerId, parsedEvent.transactionHash, {
83
+ callback(parsedEvent.offerId, parsedEvent.offerVersion, parsedEvent.teeOfferKeeperId, parsedEvent.teeOfferIssuerId, parsedEvent.transactionHash, {
63
84
  index: Number(event.blockNumber),
64
85
  hash: event.blockHash,
65
86
  });
@@ -94,4 +115,4 @@ class OfferResources {
94
115
  }
95
116
  }
96
117
  export default OfferResources;
97
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiT2ZmZXJSZXNvdXJjZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc3RhdGljTW9kZWxzL09mZmVyUmVzb3VyY2VzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSx3QkFBd0IsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRXZGLE9BQU8sRUFBRSwrQkFBK0IsRUFBRSxhQUFhLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNwRixPQUFPLFNBQVMsTUFBTSx1QkFBdUIsQ0FBQztBQUU5QyxPQUFPLFVBQVUsTUFBTSxjQUFjLENBQUM7QUFNdEMsTUFBTSxjQUFjO0lBQ1YsTUFBTSxDQUFVLE1BQU0sR0FBRyxVQUFVLENBQUMsS0FBSyxDQUFDLEVBQUUsU0FBUyxFQUFFLGdCQUFnQixFQUFFLENBQUMsQ0FBQztJQUU1RSxNQUFNLENBQUMsYUFBYSxDQUFDLGdCQUE4QjtRQUN4RCxNQUFNLFFBQVEsR0FBRyxtQkFBbUIsQ0FBQyxXQUFXLEVBQUUsQ0FBQyxXQUFXLEVBQUUsQ0FBQztRQUVqRSxPQUFPLFFBQVEsQ0FBQyxPQUFPO2FBQ3BCLDJCQUEyQixDQUFDLGdCQUFnQixDQUFDO2FBQzdDLElBQUksRUFBRTthQUNOLElBQUksQ0FBQyxDQUFDLFNBQTJCLEVBQUUsRUFBRSxDQUNwQyxTQUFVLENBQUMsR0FBRyxDQUFDLENBQUMsUUFBUSxFQUFFLEVBQUUsQ0FBQyxhQUFhLENBQUMsUUFBUSxDQUFrQixDQUFDLENBQ3ZFLENBQUM7SUFDTixDQUFDO0lBRU0sTUFBTSxDQUFDLGFBQWEsQ0FBQyxnQkFBOEI7UUFDeEQsTUFBTSxRQUFRLEdBQUcsbUJBQW1CLENBQUMsV0FBVyxFQUFFLENBQUMsV0FBVyxFQUFFLENBQUM7UUFFakUsT0FBTyxRQUFRLENBQUMsT0FBTzthQUNwQiwyQkFBMkIsQ0FBQyxnQkFBZ0IsQ0FBQzthQUM3QyxJQUFJLEVBQUU7YUFDTixJQUFJLENBQUMsQ0FBQyxT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
118
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiT2ZmZXJSZXNvdXJjZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc3RhdGljTW9kZWxzL09mZmVyUmVzb3VyY2VzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSx3QkFBd0IsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBUXZGLE9BQU8sRUFDTCwrQkFBK0IsRUFDL0IsYUFBYSxFQUNiLDJCQUEyQixHQUM1QixNQUFNLG9CQUFvQixDQUFDO0FBQzVCLE9BQU8sU0FBUyxNQUFNLHVCQUF1QixDQUFDO0FBRTlDLE9BQU8sVUFBVSxNQUFNLGNBQWMsQ0FBQztBQUt0QyxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUVwRCxNQUFNLGNBQWM7SUFDVixNQUFNLENBQVUsTUFBTSxHQUFHLFVBQVUsQ0FBQyxLQUFLLENBQUMsRUFBRSxTQUFTLEVBQUUsZ0JBQWdCLEVBQUUsQ0FBQyxDQUFDO0lBRTVFLE1BQU0sQ0FBQyxhQUFhLENBQUMsZ0JBQThCO1FBQ3hELE1BQU0sUUFBUSxHQUFHLG1CQUFtQixDQUFDLFdBQVcsRUFBRSxDQUFDLFdBQVcsRUFBRSxDQUFDO1FBRWpFLE9BQU8sUUFBUSxDQUFDLE9BQU87YUFDcEIsMkJBQTJCLENBQUMsZ0JBQWdCLENBQUM7YUFDN0MsSUFBSSxFQUFFO2FBQ04sSUFBSSxDQUFDLENBQUMsU0FBMkIsRUFBRSxFQUFFLENBQ3BDLFNBQVUsQ0FBQyxHQUFHLENBQUMsQ0FBQyxRQUFRLEVBQUUsRUFBRSxDQUFDLDJCQUEyQixDQUFDLFFBQXlCLENBQUMsQ0FBQyxDQUNyRixDQUFDO0lBQ04sQ0FBQztJQUVNLE1BQU0sQ0FBQyxhQUFhLENBQUMsZ0JBQThCO1FBQ3hELE1BQU0sUUFBUSxHQUFHLG1CQUFtQixDQUFDLFdBQVcsRUFBRSxDQUFDLFdBQVcsRUFBRSxDQUFDO1FBRWpFLE9BQU8sUUFBUSxDQUFDLE9BQU87YUFDcEIs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
@@ -46,7 +46,12 @@ class Offers {
46
46
  const contract = BlockchainConnector.getInstance().getContract();
47
47
  checkIfActionAccountInitialized(transactionOptions);
48
48
  const formattedExternalId = formatBytes32String(externalId);
49
- await TxManager.execute(contract.methods.createValueOffer(providerAuthorityAccount, offerInfo, offerInfo.restrictions, formattedExternalId, enabled), transactionOptions);
49
+ const { restrictions, linkage, ...rest } = offerInfo;
50
+ const offerInfoRaw = {
51
+ ...rest,
52
+ linkage_DEPRECATED: linkage,
53
+ };
54
+ await TxManager.execute(contract.methods.createValueOffer(providerAuthorityAccount, offerInfoRaw, restrictions, formattedExternalId, enabled), transactionOptions);
50
55
  }
51
56
  static async getByExternalId(filter, fromBlock, toBlock) {
52
57
  const founded = await StaticModel.findItemsById('OfferCreated', filter, fromBlock, toBlock);
@@ -200,4 +205,4 @@ class Offers {
200
205
  }
201
206
  }
202
207
  export default Offers;
203
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Offers.js","sourceRoot":"","sources":["../../../src/staticModels/Offers.ts"],"names":[],"mappings":"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"}
208
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Offers.js","sourceRoot":"","sources":["../../../src/staticModels/Offers.ts"],"names":[],"mappings":"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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==
@@ -3,8 +3,8 @@ declare class OffersStorageRequests {
3
3
  private static readonly logger;
4
4
  static getCountByIssuerId(): Promise<number>;
5
5
  static getByIssuerId(teeOfferIssuerId: BlockchainId): Promise<OfferStorageRequest[]>;
6
- static getByOfferVersion(offerId: BlockchainId, offerVersion?: number): Promise<OfferStorageRequest>;
7
- static set(request: OfferStorageRequest, transactionOptions?: TransactionOptions): Promise<void>;
6
+ static getByOfferVersion(offerId: BlockchainId, offerVersion?: number): Promise<OfferStorageRequest | undefined>;
7
+ static set(request: Omit<OfferStorageRequest, 'orderId' | 'timestamp'>, transactionOptions?: TransactionOptions): Promise<void>;
8
8
  static cancel(offerId: BlockchainId, offerVersion?: number, transactionOptions?: TransactionOptions): Promise<void>;
9
9
  static onOfferStorageRequestCreated(callback: onOfferStorageRequestCreatedCallback): () => void;
10
10
  static onOfferStorageRequestCanceled(callback: onOfferStorageRequestCanceledCallback): () => void;
@@ -1,5 +1,5 @@
1
1
  import { BlockchainConnector, BlockchainEventsListener } from '../connectors/index.js';
2
- import { checkIfActionAccountInitialized, cleanWeb3Data } from '../utils/helper.js';
2
+ import { checkIfActionAccountInitialized, cleanWeb3Data, convertOfferStorageRequestFromRaw, } from '../utils/helper.js';
3
3
  import TxManager from '../utils/TxManager.js';
4
4
  import rootLogger from '../logger.js';
5
5
  class OffersStorageRequests {
@@ -13,21 +13,28 @@ class OffersStorageRequests {
13
13
  return contract.methods
14
14
  .getOffersStorageRequestsByIssuerId(teeOfferIssuerId)
15
15
  .call()
16
- .then((allocatedList) => allocatedList.map((allocated) => cleanWeb3Data(allocated)));
16
+ .then((storageRequestList) => storageRequestList.map((storageRequest) => convertOfferStorageRequestFromRaw(storageRequest)));
17
17
  }
18
- static getByOfferVersion(offerId, offerVersion = 0) {
18
+ static async getByOfferVersion(offerId, offerVersion = 0) {
19
19
  const contract = BlockchainConnector.getInstance().getContract();
20
- return contract.methods
20
+ const storageRequest = await contract.methods
21
21
  .getOffersStorageRequestsByOfferVersion(offerId, offerVersion)
22
22
  .call()
23
- .then((allocated) => cleanWeb3Data(allocated));
23
+ .then((sRequest) => convertOfferStorageRequestFromRaw(sRequest));
24
+ if (Number(storageRequest.timestamp) === 0) {
25
+ return undefined;
26
+ }
27
+ return storageRequest;
24
28
  }
25
29
  static async set(request, transactionOptions) {
26
30
  const contract = BlockchainConnector.getInstance().getContract();
27
31
  checkIfActionAccountInitialized(transactionOptions);
28
- request.offerVersion = request.offerVersion ?? 0;
29
- request.timestamp = 0;
30
- await TxManager.execute(contract.methods.setOffersStorageRequest(request), transactionOptions);
32
+ await TxManager.execute(contract.methods.setOffersStorageRequest({
33
+ ...request,
34
+ offerVersion: request.offerVersion ?? 0,
35
+ orderId: 0,
36
+ timestamp: 0,
37
+ }), transactionOptions);
31
38
  }
32
39
  static async cancel(offerId, offerVersion = 0, transactionOptions) {
33
40
  const contract = BlockchainConnector.getInstance().getContract();
@@ -74,4 +81,4 @@ class OffersStorageRequests {
74
81
  }
75
82
  }
76
83
  export default OffersStorageRequests;
77
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiT2ZmZXJzU3RvcmFnZVJlcXVlc3RzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3N0YXRpY01vZGVscy9PZmZlcnNTdG9yYWdlUmVxdWVzdHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLG1CQUFtQixFQUFFLHdCQUF3QixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFPdkYsT0FBTyxFQUFFLCtCQUErQixFQUFFLGFBQWEsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ3BGLE9BQU8sU0FBUyxNQUFNLHVCQUF1QixDQUFDO0FBRTlDLE9BQU8sVUFBVSxNQUFNLGNBQWMsQ0FBQztBQU10QyxNQUFNLHFCQUFxQjtJQUNqQixNQUFNLENBQVUsTUFBTSxHQUFHLFVBQVUsQ0FBQyxLQUFLLENBQUMsRUFBRSxTQUFTLEVBQUUsdUJBQXVCLEVBQUUsQ0FBQyxDQUFDO0lBRW5GLE1BQU0sQ0FBQyxLQUFLLENBQUMsa0JBQWtCO1FBQ3BDLE1BQU0sUUFBUSxHQUFHLG1CQUFtQixDQUFDLFdBQVcsRUFBRSxDQUFDLFdBQVcsRUFBRSxDQUFDO1FBRWpFLE9BQU8sTUFBTSxDQUFDLE1BQU0sUUFBUSxDQUFDLE9BQU8sQ0FBQyxzQ0FBc0MsRUFBRSxDQUFDLElBQUksRUFBRSxDQUFDLENBQUM7SUFDeEYsQ0FBQztJQUVNLE1BQU0sQ0FBQyxhQUFhLENBQUMsZ0JBQThCO1FBQ3hELE1BQU0sUUFBUSxHQUFHLG1CQUFtQixDQUFDLFdBQVcsRUFBRSxDQUFDLFdBQVcsRUFBRSxDQUFDO1FBRWpFLE9BQU8sUUFBUSxDQUFDLE9BQU87YUFDcEIsa0NBQWtDLENBQUMsZ0JBQWdCLENBQUM7YUFDcEQsSUFBSSxFQUFFO2FBQ04sSUFBSSxDQUFDLENBQUMsYUFBK0IsRUFBRSxFQUFFLENBQ3hDLGFBQWMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxTQUFTLEVBQUUsRUFBRSxDQUFDLGFBQWEsQ0FBQyxTQUFTLENBQXdCLENBQUMsQ0FD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
84
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiT2ZmZXJzU3RvcmFnZVJlcXVlc3RzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3N0YXRpY01vZGVscy9PZmZlcnNTdG9yYWdlUmVxdWVzdHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLG1CQUFtQixFQUFFLHdCQUF3QixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFPdkYsT0FBTyxFQUNMLCtCQUErQixFQUMvQixhQUFhLEVBQ2IsaUNBQWlDLEdBQ2xDLE1BQU0sb0JBQW9CLENBQUM7QUFDNUIsT0FBTyxTQUFTLE1BQU0sdUJBQXVCLENBQUM7QUFFOUMsT0FBTyxVQUFVLE1BQU0sY0FBYyxDQUFDO0FBTXRDLE1BQU0scUJBQXFCO0lBQ2pCLE1BQU0sQ0FBVSxNQUFNLEdBQUcsVUFBVSxDQUFDLEtBQUssQ0FBQyxFQUFFLFNBQVMsRUFBRSx1QkFBdUIsRUFBRSxDQUFDLENBQUM7SUFFbkYsTUFBTSxDQUFDLEtBQUssQ0FBQyxrQkFBa0I7UUFDcEMsTUFBTSxRQUFRLEdBQUcsbUJBQW1CLENBQUMsV0FBVyxFQUFFLENBQUMsV0FBVyxFQUFFLENBQUM7UUFFakUsT0FBTyxNQUFNLENBQUMsTUFBTSxRQUFRLENBQUMsT0FBTyxDQUFDLHNDQUFzQyxFQUFFLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQztJQUN4RixDQUFDO0lBRU0sTUFBTSxDQUFDLGFBQWEsQ0FBQyxnQkFBOEI7UUFDeEQsTUFBTSxRQUFRLEdBQUcsbUJBQW1CLENBQUMsV0FBVyxFQUFFLENBQUMsV0FBVyxFQUFFLENBQUM7UUFFakUsT0FBTyxRQUFRLENBQUMsT0FBTzthQUNwQixrQ0FBa0MsQ0FBQyxnQkFBZ0IsQ0FBQzthQUNwRCxJQUFJLEVBQUU7YUFDTixJQUFJLENBQUMsQ0FBQyxrQkFBb0MsRUFBRSxFQUFFLENBQzdDLGtCQUFtQixDQUFDLEdBQUcsQ0FBQyxDQUFDLGNBQWMsRUFBRSxFQUFFLENBQ3pDLGlDQUFpQyxDQUFD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