@super-protocol/sdk-js 3.4.0-beta.2 → 3.4.0-beta.20

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 (105) hide show
  1. package/dist/cjs/certificates/crl.d.ts +6 -0
  2. package/dist/cjs/certificates/crl.js +66 -0
  3. package/dist/cjs/certificates/helper.d.ts +23 -0
  4. package/dist/cjs/certificates/helper.js +179 -0
  5. package/dist/cjs/certificates/index.d.ts +2 -0
  6. package/dist/cjs/certificates/index.js +19 -0
  7. package/dist/cjs/certificates/ocsp.d.ts +9 -0
  8. package/dist/cjs/certificates/ocsp.js +124 -0
  9. package/dist/cjs/certificates/types.d.ts +4 -0
  10. package/dist/cjs/certificates/types.js +3 -0
  11. package/dist/cjs/connectors/BaseConnector.d.ts +1 -0
  12. package/dist/cjs/connectors/BaseConnector.js +1 -1
  13. package/dist/cjs/connectors/BlockchainConnector.js +2 -2
  14. package/dist/cjs/constants.d.ts +9 -0
  15. package/dist/cjs/constants.js +11 -2
  16. package/dist/cjs/contracts/abi.d.ts +8 -8
  17. package/dist/cjs/contracts/abi.js +9 -9
  18. package/dist/cjs/crypto/types.d.ts +0 -4
  19. package/dist/cjs/crypto/utils.d.ts +2 -3
  20. package/dist/cjs/crypto/utils.js +46 -26
  21. package/dist/cjs/crypto/utils.spec.d.ts +1 -0
  22. package/dist/cjs/crypto/utils.spec.js +176 -0
  23. package/dist/cjs/index.d.ts +2 -0
  24. package/dist/cjs/index.js +5 -2
  25. package/dist/cjs/models/Offer.js +12 -8
  26. package/dist/cjs/models/Order.d.ts +1 -1
  27. package/dist/cjs/models/Order.js +4 -2
  28. package/dist/cjs/staticModels/OfferResources.js +3 -3
  29. package/dist/cjs/staticModels/OffersStorageRequests.js +3 -3
  30. package/dist/cjs/staticModels/Orders.d.ts +3 -3
  31. package/dist/cjs/staticModels/Orders.js +9 -3
  32. package/dist/cjs/staticModels/SecretRequests.js +2 -2
  33. package/dist/cjs/store.d.ts +2 -0
  34. package/dist/cjs/store.js +3 -1
  35. package/dist/cjs/tee/OrderReportService.d.ts +0 -3
  36. package/dist/cjs/tee/OrderReportService.js +12 -28
  37. package/dist/cjs/tee/QuoteValidator.js +2 -2
  38. package/dist/cjs/tee/TeeCertificateService.d.ts +1 -5
  39. package/dist/cjs/tee/TeeCertificateService.js +20 -36
  40. package/dist/cjs/tee/TeeSignatureVerifier.d.ts +2 -2
  41. package/dist/cjs/tee/TeeSignatureVerifier.js +3 -3
  42. package/dist/cjs/types/Order.js +7 -3
  43. package/dist/cjs/utils/TxManager.d.ts +3 -1
  44. package/dist/cjs/utils/TxManager.js +41 -4
  45. package/dist/cjs/utils/helper.d.ts +1 -1
  46. package/dist/cjs/utils/helper.js +8 -9
  47. package/dist/cjs/utils/order/index.d.ts +1 -0
  48. package/dist/cjs/utils/order/index.js +2 -1
  49. package/dist/cjs/utils/order/types.d.ts +2 -3
  50. package/dist/cjs/utils/order/validate-order.js +18 -9
  51. package/dist/cjs/utils/order/versify.d.ts +2 -0
  52. package/dist/cjs/utils/order/versify.js +43 -0
  53. package/dist/mjs/certificates/crl.d.ts +6 -0
  54. package/dist/mjs/certificates/crl.js +39 -0
  55. package/dist/mjs/certificates/helper.d.ts +23 -0
  56. package/dist/mjs/certificates/helper.js +149 -0
  57. package/dist/mjs/certificates/index.d.ts +2 -0
  58. package/dist/mjs/certificates/index.js +3 -0
  59. package/dist/mjs/certificates/ocsp.d.ts +9 -0
  60. package/dist/mjs/certificates/ocsp.js +94 -0
  61. package/dist/mjs/certificates/types.d.ts +4 -0
  62. package/dist/mjs/certificates/types.js +2 -0
  63. package/dist/mjs/connectors/BaseConnector.d.ts +1 -0
  64. package/dist/mjs/connectors/BaseConnector.js +1 -1
  65. package/dist/mjs/connectors/BlockchainConnector.js +2 -2
  66. package/dist/mjs/constants.d.ts +9 -0
  67. package/dist/mjs/constants.js +10 -1
  68. package/dist/mjs/contracts/abi.d.ts +8 -8
  69. package/dist/mjs/contracts/abi.js +9 -9
  70. package/dist/mjs/crypto/types.d.ts +0 -4
  71. package/dist/mjs/crypto/utils.d.ts +2 -3
  72. package/dist/mjs/crypto/utils.js +46 -26
  73. package/dist/mjs/crypto/utils.spec.d.ts +1 -0
  74. package/dist/mjs/crypto/utils.spec.js +174 -0
  75. package/dist/mjs/index.d.ts +2 -0
  76. package/dist/mjs/index.js +3 -1
  77. package/dist/mjs/models/Offer.js +12 -8
  78. package/dist/mjs/models/Order.d.ts +1 -1
  79. package/dist/mjs/models/Order.js +4 -2
  80. package/dist/mjs/staticModels/OfferResources.js +3 -3
  81. package/dist/mjs/staticModels/OffersStorageRequests.js +3 -3
  82. package/dist/mjs/staticModels/Orders.d.ts +3 -3
  83. package/dist/mjs/staticModels/Orders.js +10 -4
  84. package/dist/mjs/staticModels/SecretRequests.js +2 -2
  85. package/dist/mjs/store.d.ts +2 -0
  86. package/dist/mjs/store.js +4 -2
  87. package/dist/mjs/tee/OrderReportService.d.ts +0 -3
  88. package/dist/mjs/tee/OrderReportService.js +13 -29
  89. package/dist/mjs/tee/QuoteValidator.js +2 -2
  90. package/dist/mjs/tee/TeeCertificateService.d.ts +1 -5
  91. package/dist/mjs/tee/TeeCertificateService.js +20 -36
  92. package/dist/mjs/tee/TeeSignatureVerifier.d.ts +2 -2
  93. package/dist/mjs/tee/TeeSignatureVerifier.js +3 -3
  94. package/dist/mjs/types/Order.js +7 -3
  95. package/dist/mjs/utils/TxManager.d.ts +3 -1
  96. package/dist/mjs/utils/TxManager.js +42 -5
  97. package/dist/mjs/utils/helper.d.ts +1 -1
  98. package/dist/mjs/utils/helper.js +9 -10
  99. package/dist/mjs/utils/order/index.d.ts +1 -0
  100. package/dist/mjs/utils/order/index.js +2 -1
  101. package/dist/mjs/utils/order/types.d.ts +2 -3
  102. package/dist/mjs/utils/order/validate-order.js +18 -9
  103. package/dist/mjs/utils/order/versify.d.ts +2 -0
  104. package/dist/mjs/utils/order/versify.js +36 -0
  105. package/package.json +4 -4
@@ -1,7 +1,7 @@
1
1
  import store from '../store.js';
2
2
  import Web3 from 'web3';
3
3
  import { Monitoring } from './Monitoring.js';
4
- import { BLOCKCHAIN_BATCH_REQUEST_TIMEOUT, FIVE_MINUTES, POLYGON_AMOY_CHAIN_ID, POLYGON_MAIN_CHAIN_ID, } from '../constants.js';
4
+ import { BLOCKCHAIN_BATCH_REQUEST_TIMEOUT, FIVE_MINUTES, POLYGON_AMOY_CHAIN_ID, POLYGON_MAIN_CHAIN_ID, POLYGON_AMOY_GASSTATION_URL, POLYGON_MAIN_GASSTATION_URL, } from '../constants.js';
5
5
  import { ethers } from 'ethers';
6
6
  import axios from 'axios';
7
7
  /**
@@ -36,10 +36,10 @@ async function getMaxPriorityFeePerGasGasStation() {
36
36
  let url;
37
37
  switch (store.chainId) {
38
38
  case POLYGON_AMOY_CHAIN_ID:
39
- url = 'https://gasstation.polygon.technology/amoy';
39
+ url = POLYGON_AMOY_GASSTATION_URL;
40
40
  break;
41
41
  case POLYGON_MAIN_CHAIN_ID:
42
- url = 'https://gasstation.polygon.technology/v2';
42
+ url = POLYGON_MAIN_GASSTATION_URL;
43
43
  break;
44
44
  default:
45
45
  return;
@@ -73,11 +73,13 @@ async function getMaxPriorityFeePerGasGasStation() {
73
73
  * Merge transaction options from arguments and from store
74
74
  * Used in all set methods
75
75
  */
76
- export const createTransactionOptions = async (options) => {
76
+ export const createTransactionOptions = async (externalTransactionSigner, options) => {
77
77
  if (!options)
78
78
  options = {};
79
79
  if (!options.from)
80
80
  options.from = store.actionAccount;
81
+ if (externalTransactionSigner)
82
+ return options;
81
83
  if (!options.gas)
82
84
  options.gas = BigInt(0);
83
85
  if (!options.maxPriorityFeePerGas) {
@@ -90,7 +92,7 @@ export const createTransactionOptions = async (options) => {
90
92
  if (maxPriorityFeePerGasGasStation && maxPriorityFeePerGas > maxPriorityFeePerGasGasStation) {
91
93
  maxPriorityFeePerGas = maxPriorityFeePerGasGasStation;
92
94
  }
93
- options.maxPriorityFeePerGas = (maxPriorityFeePerGas * 3n) / 2n;
95
+ options.maxPriorityFeePerGas = multiplyBigIntByNumber(maxPriorityFeePerGas, store.maxPriorityFeePerGasMultiplier);
94
96
  }
95
97
  if (!options.maxFeePerGas) {
96
98
  const web3 = options.web3 || store.web3Https;
@@ -98,10 +100,7 @@ export const createTransactionOptions = async (options) => {
98
100
  throw Error('web3 is undefined, define it in transaction options or initialize BlockchainConnector with web3 instance.');
99
101
  }
100
102
  const baseFee = await getBaseBlockFee(web3);
101
- const multiplier = 10n;
102
- options.maxFeePerGas =
103
- (baseFee > options.maxPriorityFeePerGas ? baseFee : options.maxPriorityFeePerGas) *
104
- multiplier;
103
+ options.maxFeePerGas = multiplyBigIntByNumber(options.maxPriorityFeePerGas + baseFee, store.maxFeePerGasMultiplier);
105
104
  }
106
105
  delete options.web3;
107
106
  return options;
@@ -436,4 +435,4 @@ export const executeBatchAsync = async (batch, timeout = BLOCKCHAIN_BATCH_REQUES
436
435
  export const preparePrivateKey = (pk) => {
437
436
  return pk.startsWith('0x') ? pk : '0x' + pk;
438
437
  };
439
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"helper.js","sourceRoot":"","sources":["../../../src/utils/helper.ts"],"names":[],"mappings":"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"}
438
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"helper.js","sourceRoot":"","sources":["../../../src/utils/helper.ts"],"names":[],"mappings":"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"}
@@ -1,3 +1,4 @@
1
1
  export * from './complete-order.js';
2
2
  export * from './types.js';
3
3
  export * from './validate-order.js';
4
+ export * from './versify.js';
@@ -1,4 +1,5 @@
1
1
  export * from './complete-order.js';
2
2
  export * from './types.js';
3
3
  export * from './validate-order.js';
4
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvdXRpbHMvb3JkZXIvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxxQkFBcUIsQ0FBQztBQUNwQyxjQUFjLFlBQVksQ0FBQztBQUMzQixjQUFjLHFCQUFxQixDQUFDIn0=
4
+ export * from './versify.js';
5
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvdXRpbHMvb3JkZXIvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxxQkFBcUIsQ0FBQztBQUNwQyxjQUFjLFlBQVksQ0FBQztBQUMzQixjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMsY0FBYyxDQUFDIn0=
@@ -1,5 +1,5 @@
1
1
  import { Encryption, StorageProviderResource } from '@super-protocol/dto-js';
2
- import { BlockchainId, OfferInfo, OfferType, OrderArgs, OrderInfo, OrderStatus } from '../../types/index.js';
2
+ import { BlockchainId, OfferInfo, OfferType, OrderArgs, OrderInfo, OrderStatus, VersionedOfferId } from '../../types/index.js';
3
3
  export type SolutionOfferProperties = {
4
4
  portForwarding?: number;
5
5
  groupingOffers?: boolean;
@@ -15,12 +15,11 @@ export type ValidateOrderParams = {
15
15
  orderArgs: OrderArgs;
16
16
  offerId: BlockchainId;
17
17
  offerType: OfferType;
18
- offerVersion: number;
19
18
  };
20
19
  };
21
20
  export type ValidateOrderOptions = {
22
21
  isRestrictedByOfferType: (offerId: BlockchainId, type: OfferType) => Promise<boolean>;
23
- isRestrictionsPermitThatOffer: (offerId: BlockchainId, otherOfferId: BlockchainId) => Promise<boolean>;
22
+ isRestrictionsPermitThatOffer: (offerId: BlockchainId, otherOfferId: VersionedOfferId) => Promise<boolean>;
24
23
  };
25
24
  type TerminatedOrderStatus = OrderStatus.Done | OrderStatus.Canceled | OrderStatus.Error;
26
25
  export type CompleteOrderParams = {
@@ -7,7 +7,7 @@ const defaultOptions = {
7
7
  return new Offer(offerId).isRestrictedByOfferType(type);
8
8
  },
9
9
  isRestrictionsPermitThatOffer(offerId, otherOfferId) {
10
- return new Offer(offerId).isRestrictionsPermitThatOffer(otherOfferId);
10
+ return new Offer(offerId).isRestrictionsPermitThatOffer(otherOfferId.id, otherOfferId.version);
11
11
  },
12
12
  };
13
13
  const validatePort = (port) => {
@@ -44,21 +44,30 @@ export const validateOrder = async (params, options = defaultOptions) => {
44
44
  if (!params.parentOrder)
45
45
  throw Error('Offer restricted by TEE, but no parent offer found');
46
46
  // Check if parent offer complies with restrictions
47
- const restrictionsPermitParentOffer = await options.isRestrictionsPermitThatOffer(params.order.offerId, params.parentOrder.offerId);
47
+ const parentOrderOfferId = {
48
+ id: params.parentOrder.offerId,
49
+ version: 0,
50
+ };
51
+ const restrictionsPermitParentOffer = await options.isRestrictionsPermitThatOffer(params.order.offerId, parentOrderOfferId);
48
52
  if (!restrictionsPermitParentOffer)
49
53
  throw Error("Parent TEE offer doesn't comply with restrictions");
50
54
  if (params.parentOrder.offerType !== OfferType.TeeOffer)
51
55
  throw Error('Offer restricted by TEE, but parent offer is not TEE');
52
56
  // Check if each input offer (from parent order) complies with restrictions
53
57
  const inputOffersTypes = new Map();
54
- await Promise.all(params.parentOrder.orderArgs.inputOffersIds.map(async (offerId) => {
55
- if (offerId === params.order.offerId)
58
+ await Promise.all(params.parentOrder.orderArgs.inputOffersIds.map(async (inputOfferId, index) => {
59
+ if (inputOfferId === params.order.offerId)
56
60
  return true;
57
- const type = await new Offer(offerId).getOfferType();
58
- inputOffersTypes.set(type, true);
59
- const restrictionsPermitParentOffer = await options.isRestrictionsPermitThatOffer(params.order.offerId, offerId);
61
+ const offerType = await new Offer(inputOfferId).getOfferType();
62
+ inputOffersTypes.set(offerType, true);
63
+ const inputOfferVersion = params.parentOrder.orderArgs.inputOffersVersions[index];
64
+ const otherInputOfferId = {
65
+ id: inputOfferId,
66
+ version: inputOfferVersion,
67
+ };
68
+ const restrictionsPermitParentOffer = await options.isRestrictionsPermitThatOffer(params.order.offerId, otherInputOfferId);
60
69
  if (!restrictionsPermitParentOffer)
61
- throw Error(`TEE input offer ${type}: ${offerId} doesn't comply with restrictions`);
70
+ throw Error(`TEE input offer doesn't comply with restrictions (inputOfferId=${inputOfferId}, inputOfferVersion=${inputOfferVersion}, offerType=${offerType}, parentOrderOfferId=${params.parentOrder?.offerId})`);
62
71
  }));
63
72
  // Check if all required (by restrictions) offer types exist in input offers (from parent order)
64
73
  params.order.offerInfo.restrictions.types.forEach((type) => {
@@ -68,4 +77,4 @@ export const validateOrder = async (params, options = defaultOptions) => {
68
77
  throw Error(`Offers with type ${type} not found in TEE input offers, but required by restrictions`);
69
78
  });
70
79
  };
71
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFsaWRhdGUtb3JkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvdXRpbHMvb3JkZXIvdmFsaWRhdGUtb3JkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ2hELE9BQU8sS0FBSyxNQUFNLHVCQUF1QixDQUFDO0FBQzFDLE9BQU8sRUFBRSxVQUFVLEVBQUUsU0FBUyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFHN0QsTUFBTSx3QkFBd0IsR0FBRyxDQUFDLFVBQVUsQ0FBQyxDQUFDO0FBRTlDLE1BQU0sY0FBYyxHQUF5QjtJQUMzQyx1QkFBdUIsQ0FBQyxPQUFlLEVBQUUsSUFBZTtRQUN0RCxPQUFPLElBQUksS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDLHVCQUF1QixDQUFDLElBQUksQ0FBQyxDQUFDO0lBQzFELENBQUM7SUFFRCw2QkFBNkIsQ0FBQyxPQUFlLEVBQUUsWUFBb0I7UUFDakUsT0FBTyxJQUFJLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQyw2QkFBNkIsQ0FBQyxZQUFZLENBQUMsQ0FBQztJQUN4RSxDQUFDO0NBQ0YsQ0FBQztBQUVGLE1BQU0sWUFBWSxHQUFHLENBQUMsSUFBcUIsRUFBVSxFQUFFO0lBQ3JELE1BQU0sVUFBVSxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUNoQyxJQUFJLENBQUMsTUFBTSxDQUFDLFNBQVMsQ0FBQyxVQUFVLENBQUMsSUFBSSxVQUFVLElBQUksQ0FBQyxJQUFJLFVBQVUsR0FBRyxLQUFLLEVBQUUsQ0FBQztRQUMzRSxNQUFNLElBQUksS0FBSyxDQUFDLHdCQUF3QixJQUFJLEVBQUUsQ0FBQyxDQUFDO0lBQ2xELENBQUM7SUFDRCxJQUFJLENBQUMsd0JBQXdCLENBQUMsUUFBUSxDQUFDLFVBQVUsQ0FBQyxFQUFFLENBQUM7UUFDbkQsTUFBTSxJQUFJLEtBQUssQ0FBQyxRQUFR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
80
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFsaWRhdGUtb3JkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvdXRpbHMvb3JkZXIvdmFsaWRhdGUtb3JkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ2hELE9BQU8sS0FBSyxNQUFNLHVCQUF1QixDQUFDO0FBQzFDLE9BQU8sRUFBRSxVQUFVLEVBQUUsU0FBUyxFQUFvQixNQUFNLHNCQUFzQixDQUFDO0FBRy9FLE1BQU0sd0JBQXdCLEdBQUcsQ0FBQyxVQUFVLENBQUMsQ0FBQztBQUU5QyxNQUFNLGNBQWMsR0FBeUI7SUFDM0MsdUJBQXVCLENBQUMsT0FBZSxFQUFFLElBQWU7UUFDdEQsT0FBTyxJQUFJLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQyx1QkFBdUIsQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUMxRCxDQUFDO0lBRUQsNkJBQTZCLENBQUMsT0FBZSxFQUFFLFlBQThCO1FBQzNFLE9BQU8sSUFBSSxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUMsNkJBQTZCLENBQUMsWUFBWSxDQUFDLEVBQUUsRUFBRSxZQUFZLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDakcsQ0FBQztDQUNGLENBQUM7QUFFRixNQUFNLFlBQVksR0FBRyxDQUFDLElBQXFCLEVBQVUsRUFBRTtJQUNyRCxNQUFNLFVBQVUsR0FBRyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDaEMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUMsVUFBVSxDQUFDLElBQUksVUFBVSxJQUFJLENBQUMsSUFBSSxVQUFVLEdBQUcsS0FBSyxFQUFFLENBQUM7UUFDM0UsTUFBTSxJQUFJLEtBQUssQ0FBQyx3QkFBd0IsSUFBSSxFQUFFLENBQUMsQ0FBQztJQUNsRCxDQUFDO0lBQ0QsSUFBSSxDQUFDLHdCQUF3QixDQUFDLFFBQVEsQ0FBQyxVQUFVLENBQUMsRUFBRSxDQUFD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
@@ -0,0 +1,2 @@
1
+ import { OrderInfo } from '../../types/index.js';
2
+ export declare const versify: (info: OrderInfo, isTeeOffer: boolean) => Promise<OrderInfo>;
@@ -0,0 +1,36 @@
1
+ import Offer from '../../models/Offer.js';
2
+ export const versify = async (info, isTeeOffer) => {
3
+ const { offerId, offerVersion, args } = info;
4
+ const getActualOfferVersion = async (params) => {
5
+ if (params.isTeeOffer || params.offerId === '0') {
6
+ return params.offerVersion;
7
+ }
8
+ const actualVersion = params.offerVersion
9
+ ? params.offerVersion
10
+ : await new Offer(params.offerId).getLastVersionNumber();
11
+ return actualVersion || 0;
12
+ };
13
+ args.outputOfferVersion;
14
+ return {
15
+ ...info,
16
+ offerVersion: await getActualOfferVersion({
17
+ isTeeOffer,
18
+ offerId,
19
+ offerVersion,
20
+ }),
21
+ args: {
22
+ ...args,
23
+ outputOfferVersion: await getActualOfferVersion({
24
+ isTeeOffer,
25
+ offerId: args.outputOfferId,
26
+ offerVersion: args.outputOfferVersion,
27
+ }),
28
+ inputOffersVersions: await Promise.all(args.inputOffersVersions.map((offerVersion, index) => getActualOfferVersion({
29
+ isTeeOffer: false,
30
+ offerId: args.inputOffersIds[index],
31
+ offerVersion,
32
+ }))),
33
+ },
34
+ };
35
+ };
36
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVyc2lmeS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy91dGlscy9vcmRlci92ZXJzaWZ5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxNQUFNLHVCQUF1QixDQUFDO0FBRTFDLE1BQU0sQ0FBQyxNQUFNLE9BQU8sR0FBRyxLQUFLLEVBQUUsSUFBZSxFQUFFLFVBQW1CLEVBQXNCLEVBQUU7SUFDeEYsTUFBTSxFQUFFLE9BQU8sRUFBRSxZQUFZLEVBQUUsSUFBSSxFQUFFLEdBQUcsSUFBSSxDQUFDO0lBQzdDLE1BQU0scUJBQXFCLEdBQUcsS0FBSyxFQUFFLE1BSXBDLEVBQW1CLEVBQUU7UUFDcEIsSUFBSSxNQUFNLENBQUMsVUFBVSxJQUFJLE1BQU0sQ0FBQyxPQUFPLEtBQUssR0FBRyxFQUFFLENBQUM7WUFDaEQsT0FBTyxNQUFNLENBQUMsWUFBWSxDQUFDO1FBQzdCLENBQUM7UUFFRCxNQUFNLGFBQWEsR0FBRyxNQUFNLENBQUMsWUFBWTtZQUN2QyxDQUFDLENBQUMsTUFBTSxDQUFDLFlBQVk7WUFDckIsQ0FBQyxDQUFDLE1BQU0sSUFBSSxLQUFLLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDLG9CQUFvQixFQUFFLENBQUM7UUFFM0QsT0FBTyxhQUFhLElBQUksQ0FBQyxDQUFDO0lBQzVCLENBQUMsQ0FBQztJQUVGLElBQUksQ0FBQyxrQkFBa0IsQ0FBQztJQUV4QixPQUFPO1FBQ0wsR0FBRyxJQUFJO1FBQ1AsWUFBWSxFQUFFLE1BQU0scUJBQXFCLENBQUM7WUFDeEMsVUFBVTtZQUNWLE9BQU87WUFDUCxZQUFZO1NBQ2IsQ0FBQztRQUNGLElBQUksRUFBRTtZQUNKLEdBQUcsSUFBSTtZQUNQLGtCQUFrQixFQUFFLE1BQU0scUJBQXFCLENBQUM7Z0JBQzlDLFVBQVU7Z0JBQ1YsT0FBTyxFQUFFLElBQUksQ0FBQyxhQUFhO2dCQUMzQixZQUFZLEVBQUUsSUFBSSxDQUFDLGtCQUFrQjthQUN0QyxDQUFDO1lBQ0YsbUJBQW1CLEVBQUUsTUFBTSxPQUFPLENBQUMsR0FBRyxDQUNwQyxJQUFJLENBQUMsbUJBQW1CLENBQUMsR0FBRyxDQUFDLENBQUMsWUFBWSxFQUFFLEtBQUssRUFBRSxFQUFFLENBQ25ELHFCQUFxQixDQUFDO2dCQUNwQixVQUFVLEVBQUUsS0FBSztnQkFDakIsT0FBTyxFQUFFLElBQUksQ0FBQyxjQUFjLENBQUMsS0FBSyxDQUFDO2dCQUNuQyxZQUFZO2FBQ2IsQ0FBQyxDQUNILENBQ0Y7U0FDRjtLQUNGLENBQUM7QUFDSixDQUFDLENBQUMifQ==
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@super-protocol/sdk-js",
3
- "version": "3.4.0-beta.2",
3
+ "version": "3.4.0-beta.20",
4
4
  "main": "dist/cjs/index.js",
5
5
  "module": "dist/mjs/index.js",
6
6
  "exports": {
@@ -61,8 +61,8 @@
61
61
  "@fidm/x509": "^1.2.1",
62
62
  "@msgpack/msgpack": "^2.8.0",
63
63
  "@sinclair/typebox": "0.33.17",
64
- "@super-protocol/dto-js": "1.1.2",
65
- "@super-protocol/pki-common": "1.5.4",
64
+ "@super-protocol/dto-js": "1.1.3",
65
+ "@super-protocol/pki-common": "1.6.1",
66
66
  "@super-protocol/uplink-nodejs": "^1.2.20",
67
67
  "asn1js": "^3.0.5",
68
68
  "axios": "^1.5.1",
@@ -77,7 +77,7 @@
77
77
  "object-hash": "^3.0.0",
78
78
  "p-queue": "6.6.2",
79
79
  "pino": "^7.2.0",
80
- "pkijs": "^3.0.15",
80
+ "pkijs": "^3.2.4",
81
81
  "protobufjs": "^6.11.2",
82
82
  "ua-parser-js": "^1.0.37",
83
83
  "uuid": "^9.0.1",