@defisaver/automation-sdk 3.0.1 → 3.0.2-dev2

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 (49) hide show
  1. package/esm/automation/private/LegacyAutomation.js +2 -2
  2. package/esm/automation/private/StrategiesAutomation.js +9 -1
  3. package/esm/automation/private/StrategiesAutomation.test.d.ts +1 -1
  4. package/esm/automation/private/StrategiesAutomation.test.js +500 -499
  5. package/esm/constants/index.d.ts +4 -25
  6. package/esm/constants/index.js +77 -1
  7. package/esm/services/ethereumService.test.d.ts +1 -1
  8. package/esm/services/ethereumService.test.js +1 -0
  9. package/esm/services/strategiesService.js +63 -3
  10. package/esm/services/strategiesService.test.d.ts +1 -1
  11. package/esm/services/strategiesService.test.js +1 -0
  12. package/esm/services/strategySubService.d.ts +17 -0
  13. package/esm/services/strategySubService.js +30 -1
  14. package/esm/services/strategySubService.test.d.ts +1 -1
  15. package/esm/services/strategySubService.test.js +152 -0
  16. package/esm/services/subDataService.d.ts +32 -0
  17. package/esm/services/subDataService.js +96 -1
  18. package/esm/services/subDataService.test.d.ts +1 -1
  19. package/esm/services/subDataService.test.js +193 -0
  20. package/esm/services/triggerService.d.ts +17 -0
  21. package/esm/services/triggerService.js +31 -1
  22. package/esm/services/triggerService.test.d.ts +1 -1
  23. package/esm/services/triggerService.test.js +65 -0
  24. package/esm/services/utils.test.d.ts +1 -1
  25. package/esm/services/utils.test.js +1 -0
  26. package/esm/types/enums.d.ts +27 -8
  27. package/esm/types/enums.js +19 -0
  28. package/package.json +3 -3
  29. package/scripts/generateContractTypes.js +1 -1
  30. package/src/automation/private/LegacyAutomation.ts +2 -2
  31. package/src/automation/private/StrategiesAutomation.test.ts +503 -501
  32. package/src/automation/private/StrategiesAutomation.ts +9 -0
  33. package/src/constants/index.ts +80 -3
  34. package/src/services/ethereumService.test.ts +1 -0
  35. package/src/services/ethereumService.ts +1 -1
  36. package/src/services/strategiesService.test.ts +1 -0
  37. package/src/services/strategiesService.ts +81 -3
  38. package/src/services/strategySubService.test.ts +187 -1
  39. package/src/services/strategySubService.ts +68 -0
  40. package/src/services/subDataService.test.ts +212 -1
  41. package/src/services/subDataService.ts +134 -1
  42. package/src/services/triggerService.test.ts +70 -0
  43. package/src/services/triggerService.ts +44 -1
  44. package/src/services/utils.test.ts +1 -0
  45. package/src/types/enums.ts +19 -0
  46. package/umd/index.js +397 -58
  47. package/.env +0 -4
  48. package/.yarn/releases/yarn-1.22.1.cjs +0 -147386
  49. package/.yarnrc.yml +0 -3
package/umd/index.js CHANGED
@@ -68,6 +68,7 @@ class LegacyMakerAutomation extends _private_LegacyAutomation__WEBPACK_IMPORTED_
68
68
  "use strict";
69
69
  __webpack_require__.r(__webpack_exports__);
70
70
  /* harmony export */ __webpack_require__.d(__webpack_exports__, {
71
+ /* harmony export */ AAVE_V3_VARIABLE_BORROW_RATE: () => (/* binding */ AAVE_V3_VARIABLE_BORROW_RATE),
71
72
  /* harmony export */ ARBITRUM_BUNDLES_INFO: () => (/* binding */ ARBITRUM_BUNDLES_INFO),
72
73
  /* harmony export */ ARBITRUM_STRATEGIES_INFO: () => (/* binding */ ARBITRUM_STRATEGIES_INFO),
73
74
  /* harmony export */ BUNDLES_INFO: () => (/* binding */ BUNDLES_INFO),
@@ -91,6 +92,7 @@ __webpack_require__.r(__webpack_exports__);
91
92
 
92
93
  // General
93
94
  var ZERO_ADDRESS = '0x0000000000000000000000000000000000000000';
95
+ var AAVE_V3_VARIABLE_BORROW_RATE = 2;
94
96
  var PROTOCOLS = (() => {
95
97
  var protocolsMapping = {};
96
98
  Object.entries(_types_enums__WEBPACK_IMPORTED_MODULE_0__.ProtocolIdentifiers.StrategiesAutomation).forEach(_ref => {
@@ -178,6 +180,16 @@ var MAINNET_STRATEGIES_INFO = {
178
180
  strategyOrBundleId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Strategies.MainnetIds.LIQUITY_DEBT_IN_FRONT_REPAY,
179
181
  strategyId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Strategies.Identifiers.DebtInFrontRepay,
180
182
  protocol: PROTOCOLS.Liquity
183
+ },
184
+ [_types_enums__WEBPACK_IMPORTED_MODULE_0__.Strategies.MainnetIds.CURVEUSD_PAYBACK]: {
185
+ strategyOrBundleId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Strategies.MainnetIds.CURVEUSD_PAYBACK,
186
+ strategyId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Strategies.Identifiers.Payback,
187
+ protocol: PROTOCOLS.CrvUSD
188
+ },
189
+ [_types_enums__WEBPACK_IMPORTED_MODULE_0__.Strategies.MainnetIds.AAVE_V3_OPEN_ORDER_FROM_DEBT]: {
190
+ strategyOrBundleId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Strategies.MainnetIds.AAVE_V3_OPEN_ORDER_FROM_DEBT,
191
+ strategyId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Strategies.Identifiers.OpenOrderFromDebt,
192
+ protocol: PROTOCOLS.AaveV3
181
193
  }
182
194
  };
183
195
  var OPTIMISM_STRATEGIES_INFO = {
@@ -190,6 +202,11 @@ var OPTIMISM_STRATEGIES_INFO = {
190
202
  strategyOrBundleId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Strategies.OptimismIds.EXCHANGE_LIMIT_ORDER,
191
203
  strategyId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Strategies.Identifiers.LimitOrder,
192
204
  protocol: PROTOCOLS.Exchange
205
+ },
206
+ [_types_enums__WEBPACK_IMPORTED_MODULE_0__.Strategies.OptimismIds.AAVE_V3_OPEN_ORDER_FROM_DEBT]: {
207
+ strategyOrBundleId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Strategies.OptimismIds.AAVE_V3_OPEN_ORDER_FROM_DEBT,
208
+ strategyId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Strategies.Identifiers.OpenOrderFromDebt,
209
+ protocol: PROTOCOLS.AaveV3
193
210
  }
194
211
  };
195
212
  var ARBITRUM_STRATEGIES_INFO = {
@@ -202,6 +219,11 @@ var ARBITRUM_STRATEGIES_INFO = {
202
219
  strategyOrBundleId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Strategies.ArbitrumIds.EXCHANGE_LIMIT_ORDER,
203
220
  strategyId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Strategies.Identifiers.LimitOrder,
204
221
  protocol: PROTOCOLS.Exchange
222
+ },
223
+ [_types_enums__WEBPACK_IMPORTED_MODULE_0__.Strategies.ArbitrumIds.AAVE_V3_OPEN_ORDER_FROM_DEBT]: {
224
+ strategyOrBundleId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Strategies.ArbitrumIds.AAVE_V3_OPEN_ORDER_FROM_DEBT,
225
+ strategyId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Strategies.Identifiers.OpenOrderFromDebt,
226
+ protocol: PROTOCOLS.AaveV3
205
227
  }
206
228
  };
207
229
  var STRATEGIES_INFO = {
@@ -258,6 +280,26 @@ var MAINNET_BUNDLES_INFO = {
258
280
  strategyId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Strategies.Identifiers.EoaBoost,
259
281
  protocol: PROTOCOLS.CompoundV3
260
282
  },
283
+ [_types_enums__WEBPACK_IMPORTED_MODULE_0__.Bundles.MainnetIds.COMP_V3_SW_REPAY_V2_BUNDLE]: {
284
+ strategyOrBundleId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Bundles.MainnetIds.COMP_V3_SW_REPAY_V2_BUNDLE,
285
+ strategyId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Strategies.Identifiers.Repay,
286
+ protocol: PROTOCOLS.CompoundV3
287
+ },
288
+ [_types_enums__WEBPACK_IMPORTED_MODULE_0__.Bundles.MainnetIds.COMP_V3_SW_BOOST_V2_BUNDLE]: {
289
+ strategyOrBundleId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Bundles.MainnetIds.COMP_V3_SW_BOOST_V2_BUNDLE,
290
+ strategyId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Strategies.Identifiers.Boost,
291
+ protocol: PROTOCOLS.CompoundV3
292
+ },
293
+ [_types_enums__WEBPACK_IMPORTED_MODULE_0__.Bundles.MainnetIds.COMP_V3_EOA_REPAY_V2_BUNDLE]: {
294
+ strategyOrBundleId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Bundles.MainnetIds.COMP_V3_EOA_REPAY_V2_BUNDLE,
295
+ strategyId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Strategies.Identifiers.EoaRepay,
296
+ protocol: PROTOCOLS.CompoundV3
297
+ },
298
+ [_types_enums__WEBPACK_IMPORTED_MODULE_0__.Bundles.MainnetIds.COMP_V3_EOA_BOOST_V2_BUNDLE]: {
299
+ strategyOrBundleId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Bundles.MainnetIds.COMP_V3_EOA_BOOST_V2_BUNDLE,
300
+ strategyId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Strategies.Identifiers.EoaBoost,
301
+ protocol: PROTOCOLS.CompoundV3
302
+ },
261
303
  [_types_enums__WEBPACK_IMPORTED_MODULE_0__.Bundles.MainnetIds.LIQUITY_PAYBACK_USING_CHICKEN_BOND]: {
262
304
  strategyOrBundleId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Bundles.MainnetIds.LIQUITY_PAYBACK_USING_CHICKEN_BOND,
263
305
  strategyId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Strategies.Identifiers.BondProtection,
@@ -372,6 +414,31 @@ var MAINNET_BUNDLES_INFO = {
372
414
  strategyOrBundleId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Bundles.MainnetIds.CRVUSD_BOOST,
373
415
  strategyId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Strategies.Identifiers.Boost,
374
416
  protocol: PROTOCOLS.CrvUSD
417
+ },
418
+ [_types_enums__WEBPACK_IMPORTED_MODULE_0__.Bundles.MainnetIds.MORPHO_BLUE_REPAY]: {
419
+ strategyOrBundleId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Bundles.MainnetIds.MORPHO_BLUE_REPAY,
420
+ strategyId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Strategies.Identifiers.Repay,
421
+ protocol: PROTOCOLS.MorphoBlue
422
+ },
423
+ [_types_enums__WEBPACK_IMPORTED_MODULE_0__.Bundles.MainnetIds.MORPHO_BLUE_BOOST]: {
424
+ strategyOrBundleId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Bundles.MainnetIds.MORPHO_BLUE_BOOST,
425
+ strategyId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Strategies.Identifiers.Boost,
426
+ protocol: PROTOCOLS.MorphoBlue
427
+ },
428
+ [_types_enums__WEBPACK_IMPORTED_MODULE_0__.Bundles.MainnetIds.MORPHO_BLUE_EOA_REPAY]: {
429
+ strategyOrBundleId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Bundles.MainnetIds.MORPHO_BLUE_EOA_REPAY,
430
+ strategyId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Strategies.Identifiers.EoaRepay,
431
+ protocol: PROTOCOLS.MorphoBlue
432
+ },
433
+ [_types_enums__WEBPACK_IMPORTED_MODULE_0__.Bundles.MainnetIds.MORPHO_BLUE_EOA_BOOST]: {
434
+ strategyOrBundleId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Bundles.MainnetIds.MORPHO_BLUE_EOA_BOOST,
435
+ strategyId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Strategies.Identifiers.EoaBoost,
436
+ protocol: PROTOCOLS.MorphoBlue
437
+ },
438
+ [_types_enums__WEBPACK_IMPORTED_MODULE_0__.Bundles.MainnetIds.AAVE_V3_OPEN_ORDER_FROM_COLLATERAL]: {
439
+ strategyOrBundleId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Bundles.MainnetIds.AAVE_V3_OPEN_ORDER_FROM_COLLATERAL,
440
+ strategyId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Strategies.Identifiers.OpenOrderFromCollateral,
441
+ protocol: PROTOCOLS.AaveV3
375
442
  }
376
443
  };
377
444
  var OPTIMISM_BUNDLES_INFO = {
@@ -394,6 +461,11 @@ var OPTIMISM_BUNDLES_INFO = {
394
461
  strategyOrBundleId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Bundles.OptimismIds.AAVE_V3_CLOSE_TO_COLLATERAL,
395
462
  strategyId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Strategies.Identifiers.CloseToCollateral,
396
463
  protocol: PROTOCOLS.AaveV3
464
+ },
465
+ [_types_enums__WEBPACK_IMPORTED_MODULE_0__.Bundles.OptimismIds.AAVE_V3_OPEN_ORDER_FROM_COLLATERAL]: {
466
+ strategyOrBundleId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Bundles.OptimismIds.AAVE_V3_OPEN_ORDER_FROM_COLLATERAL,
467
+ strategyId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Strategies.Identifiers.OpenOrderFromCollateral,
468
+ protocol: PROTOCOLS.AaveV3
397
469
  }
398
470
  };
399
471
  var ARBITRUM_BUNDLES_INFO = {
@@ -426,6 +498,11 @@ var ARBITRUM_BUNDLES_INFO = {
426
498
  strategyOrBundleId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Bundles.ArbitrumIds.COMP_V3_SW_REPAY_BUNDLE,
427
499
  strategyId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Strategies.Identifiers.Repay,
428
500
  protocol: PROTOCOLS.CompoundV3
501
+ },
502
+ [_types_enums__WEBPACK_IMPORTED_MODULE_0__.Bundles.ArbitrumIds.AAVE_V3_OPEN_ORDER_FROM_COLLATERAL]: {
503
+ strategyOrBundleId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Bundles.ArbitrumIds.AAVE_V3_OPEN_ORDER_FROM_COLLATERAL,
504
+ strategyId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Strategies.Identifiers.OpenOrderFromCollateral,
505
+ protocol: PROTOCOLS.AaveV3
429
506
  }
430
507
  };
431
508
  var BUNDLES_INFO = {
@@ -499,6 +576,7 @@ var ProtocolIdentifiers;
499
576
  StrategiesAutomation["Exchange"] = "Exchange";
500
577
  StrategiesAutomation["Spark"] = "Spark";
501
578
  StrategiesAutomation["CrvUSD"] = "CurveUSD";
579
+ StrategiesAutomation["MorphoBlue"] = "MorphoBlue";
502
580
  })(StrategiesAutomation || (StrategiesAutomation = {}));
503
581
  _ProtocolIdentifiers.StrategiesAutomation = StrategiesAutomation;
504
582
  var LegacyAutomation;
@@ -526,18 +604,22 @@ var Strategies;
526
604
  MainnetIds[MainnetIds["LIQUITY_DSR_PAYBACK"] = 69] = "LIQUITY_DSR_PAYBACK";
527
605
  MainnetIds[MainnetIds["LIQUITY_DSR_SUPPLY"] = 70] = "LIQUITY_DSR_SUPPLY";
528
606
  MainnetIds[MainnetIds["LIQUITY_DEBT_IN_FRONT_REPAY"] = 75] = "LIQUITY_DEBT_IN_FRONT_REPAY";
607
+ MainnetIds[MainnetIds["CURVEUSD_PAYBACK"] = 92] = "CURVEUSD_PAYBACK";
608
+ MainnetIds[MainnetIds["AAVE_V3_OPEN_ORDER_FROM_DEBT"] = 96] = "AAVE_V3_OPEN_ORDER_FROM_DEBT";
529
609
  })(MainnetIds || (MainnetIds = {}));
530
610
  _Strategies.MainnetIds = MainnetIds;
531
611
  var OptimismIds;
532
612
  (function (OptimismIds) {
533
613
  OptimismIds[OptimismIds["EXCHANGE_DCA"] = 8] = "EXCHANGE_DCA";
534
614
  OptimismIds[OptimismIds["EXCHANGE_LIMIT_ORDER"] = 9] = "EXCHANGE_LIMIT_ORDER";
615
+ OptimismIds[OptimismIds["AAVE_V3_OPEN_ORDER_FROM_DEBT"] = 12] = "AAVE_V3_OPEN_ORDER_FROM_DEBT";
535
616
  })(OptimismIds || (OptimismIds = {}));
536
617
  _Strategies.OptimismIds = OptimismIds;
537
618
  var ArbitrumIds;
538
619
  (function (ArbitrumIds) {
539
620
  ArbitrumIds[ArbitrumIds["EXCHANGE_DCA"] = 8] = "EXCHANGE_DCA";
540
621
  ArbitrumIds[ArbitrumIds["EXCHANGE_LIMIT_ORDER"] = 9] = "EXCHANGE_LIMIT_ORDER";
622
+ ArbitrumIds[ArbitrumIds["AAVE_V3_OPEN_ORDER_FROM_DEBT"] = 16] = "AAVE_V3_OPEN_ORDER_FROM_DEBT";
541
623
  })(ArbitrumIds || (ArbitrumIds = {}));
542
624
  _Strategies.ArbitrumIds = ArbitrumIds;
543
625
  var Identifiers;
@@ -558,10 +640,13 @@ var Strategies;
558
640
  Identifiers["TrailingStopToColl"] = "trailing-stop-to-collateral";
559
641
  Identifiers["TrailingStopToDebt"] = "trailing-stop-to-debt";
560
642
  Identifiers["Rebond"] = "rebond";
643
+ Identifiers["Payback"] = "payback";
561
644
  Identifiers["BondProtection"] = "bond-protection";
562
645
  Identifiers["Dca"] = "dca";
563
646
  Identifiers["LimitOrder"] = "limit-order";
564
647
  Identifiers["DebtInFrontRepay"] = "debt-in-front-repay";
648
+ Identifiers["OpenOrderFromCollateral"] = "open-order-from-collateral";
649
+ Identifiers["OpenOrderFromDebt"] = "open-order-from-debt";
565
650
  })(Identifiers || (Identifiers = {}));
566
651
  _Strategies.Identifiers = Identifiers;
567
652
  var IdOverrides;
@@ -610,6 +695,15 @@ var Bundles;
610
695
  MainnetIds[MainnetIds["COMP_V2_BOOST"] = 21] = "COMP_V2_BOOST";
611
696
  MainnetIds[MainnetIds["CRVUSD_REPAY"] = 26] = "CRVUSD_REPAY";
612
697
  MainnetIds[MainnetIds["CRVUSD_BOOST"] = 27] = "CRVUSD_BOOST";
698
+ MainnetIds[MainnetIds["COMP_V3_SW_REPAY_V2_BUNDLE"] = 28] = "COMP_V3_SW_REPAY_V2_BUNDLE";
699
+ MainnetIds[MainnetIds["COMP_V3_SW_BOOST_V2_BUNDLE"] = 29] = "COMP_V3_SW_BOOST_V2_BUNDLE";
700
+ MainnetIds[MainnetIds["COMP_V3_EOA_REPAY_V2_BUNDLE"] = 30] = "COMP_V3_EOA_REPAY_V2_BUNDLE";
701
+ MainnetIds[MainnetIds["COMP_V3_EOA_BOOST_V2_BUNDLE"] = 31] = "COMP_V3_EOA_BOOST_V2_BUNDLE";
702
+ MainnetIds[MainnetIds["MORPHO_BLUE_REPAY"] = 32] = "MORPHO_BLUE_REPAY";
703
+ MainnetIds[MainnetIds["MORPHO_BLUE_BOOST"] = 33] = "MORPHO_BLUE_BOOST";
704
+ MainnetIds[MainnetIds["MORPHO_BLUE_EOA_REPAY"] = 34] = "MORPHO_BLUE_EOA_REPAY";
705
+ MainnetIds[MainnetIds["MORPHO_BLUE_EOA_BOOST"] = 35] = "MORPHO_BLUE_EOA_BOOST";
706
+ MainnetIds[MainnetIds["AAVE_V3_OPEN_ORDER_FROM_COLLATERAL"] = 36] = "AAVE_V3_OPEN_ORDER_FROM_COLLATERAL";
613
707
  })(MainnetIds || (MainnetIds = {}));
614
708
  _Bundles.MainnetIds = MainnetIds;
615
709
  var OptimismIds;
@@ -618,6 +712,7 @@ var Bundles;
618
712
  OptimismIds[OptimismIds["AAVE_V3_BOOST"] = 1] = "AAVE_V3_BOOST";
619
713
  OptimismIds[OptimismIds["AAVE_V3_CLOSE_TO_DEBT"] = 2] = "AAVE_V3_CLOSE_TO_DEBT";
620
714
  OptimismIds[OptimismIds["AAVE_V3_CLOSE_TO_COLLATERAL"] = 3] = "AAVE_V3_CLOSE_TO_COLLATERAL";
715
+ OptimismIds[OptimismIds["AAVE_V3_OPEN_ORDER_FROM_COLLATERAL"] = 4] = "AAVE_V3_OPEN_ORDER_FROM_COLLATERAL";
621
716
  })(OptimismIds || (OptimismIds = {}));
622
717
  _Bundles.OptimismIds = OptimismIds;
623
718
  var ArbitrumIds;
@@ -628,6 +723,7 @@ var Bundles;
628
723
  ArbitrumIds[ArbitrumIds["AAVE_V3_CLOSE_TO_COLLATERAL"] = 3] = "AAVE_V3_CLOSE_TO_COLLATERAL";
629
724
  ArbitrumIds[ArbitrumIds["COMP_V3_SW_REPAY_BUNDLE"] = 4] = "COMP_V3_SW_REPAY_BUNDLE";
630
725
  ArbitrumIds[ArbitrumIds["COMP_V3_SW_BOOST_BUNDLE"] = 5] = "COMP_V3_SW_BOOST_BUNDLE";
726
+ ArbitrumIds[ArbitrumIds["AAVE_V3_OPEN_ORDER_FROM_COLLATERAL"] = 6] = "AAVE_V3_OPEN_ORDER_FROM_COLLATERAL";
631
727
  })(ArbitrumIds || (ArbitrumIds = {}));
632
728
  _Bundles.ArbitrumIds = ArbitrumIds;
633
729
  })(Bundles || (Bundles = {}));
@@ -1170,8 +1266,8 @@ class LegacyAutomation extends _Automation__WEBPACK_IMPORTED_MODULE_4__["default
1170
1266
  getParsedSubscriptions(addresses, options) {
1171
1267
  var _this4 = this;
1172
1268
  return _asyncToGenerator(function* () {
1173
- // Legacy automation was disabled on block 18213086
1174
- if (!(options !== null && options !== void 0 && options.fromBlock) || (options === null || options === void 0 ? void 0 : options.fromBlock) === 'latest' || (options === null || options === void 0 ? void 0 : options.fromBlock) === 'pending' || options !== null && options !== void 0 && options.fromBlock && new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(options === null || options === void 0 ? void 0 : options.fromBlock.toString()).lt(18213086)) {
1269
+ var legacyAutomationSunset = 18213086;
1270
+ if (!(options !== null && options !== void 0 && options.fromBlock) || (options === null || options === void 0 ? void 0 : options.fromBlock) === 'latest' || (options === null || options === void 0 ? void 0 : options.fromBlock) === 'pending' || options !== null && options !== void 0 && options.fromBlock && new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(options === null || options === void 0 ? void 0 : options.fromBlock.toString()).gte(legacyAutomationSunset)) {
1175
1271
  return [];
1176
1272
  }
1177
1273
  var subscriptions = yield _this4._getSubscriptions(addresses, options);
@@ -1451,6 +1547,12 @@ class StrategiesAutomation extends _Automation__WEBPACK_IMPORTED_MODULE_6__["def
1451
1547
  getEventFromSubStorage(event, options) {
1452
1548
  var _this = this;
1453
1549
  return _asyncToGenerator(function* () {
1550
+ var _options$fromBlock;
1551
+ // only used for backfilling, so in case options?.fromBlock in undefined
1552
+ // (just like we omit fromBlock when we call from app when not on fork), we still want to fetch events
1553
+ if (new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(_this.subStorageContract.createdBlock.toString()).gt((options === null || options === void 0 ? void 0 : (_options$fromBlock = options.fromBlock) === null || _options$fromBlock === void 0 ? void 0 : _options$fromBlock.toString()) || _this.subStorageContract.createdBlock.toString())) {
1554
+ return [];
1555
+ }
1454
1556
  return (0,_services_ethereumService__WEBPACK_IMPORTED_MODULE_4__.getEventsFromContract)(_this.subStorageContract, _this.subStorageContractFork, event, options);
1455
1557
  })();
1456
1558
  }
@@ -1520,7 +1622,8 @@ class StrategiesAutomation extends _Automation__WEBPACK_IMPORTED_MODULE_6__["def
1520
1622
  _mergeCheck(s, current) {
1521
1623
  return s.owner === current.owner && s.strategy.strategyId === current.strategy.strategyId && s.protocol.id === current.protocol.id && s.specific.mergeId === current.specific.mergeWithId && (s.protocol.id !== _types_enums__WEBPACK_IMPORTED_MODULE_1__.ProtocolIdentifiers.StrategiesAutomation.MakerDAO // reflexer needs to get added if we have it
1522
1624
  || s.strategyData.decoded.subData.vaultId === current.strategyData.decoded.triggerData.vaultId) && (s.protocol.id !== _types_enums__WEBPACK_IMPORTED_MODULE_1__.ProtocolIdentifiers.StrategiesAutomation.CrvUSD // merge only crvUSD leverage management for the same market
1523
- || s.strategyData.decoded.subData.controller.toLowerCase() === current.strategyData.decoded.triggerData.controller.toLowerCase());
1625
+ || s.strategyData.decoded.subData.controller.toLowerCase() === current.strategyData.decoded.triggerData.controller.toLowerCase()) && (s.protocol.id !== _types_enums__WEBPACK_IMPORTED_MODULE_1__.ProtocolIdentifiers.StrategiesAutomation.MorphoBlue // merge morpho blue with the same marketId
1626
+ || s.strategyData.decoded.triggerData.marketId.toLowerCase() === current.strategyData.decoded.triggerData.marketId.toLowerCase());
1524
1627
  }
1525
1628
  mergeSubs(_subscriptions) {
1526
1629
  var mergeBase = _subscriptions.filter(s => (0,_services_utils__WEBPACK_IMPORTED_MODULE_2__.isDefined)(s) && (0,_services_utils__WEBPACK_IMPORTED_MODULE_2__.isDefined)(s.specific.mergeWithId));
@@ -1992,8 +2095,7 @@ function parseCompoundV3LeverageManagement(position, parseData) {
1992
2095
  var subData = subDataDecoder.decode(subStruct.subData);
1993
2096
  _position.strategyData.decoded.triggerData = triggerData;
1994
2097
  _position.strategyData.decoded.subData = subData;
1995
- _position.owner = triggerData.owner.toLowerCase();
1996
- _position.positionId = (0,_utils__WEBPACK_IMPORTED_MODULE_4__.getPositionId)(_position.chainId, _position.protocol.id, _position.owner, triggerData.market);
2098
+ _position.positionId = (0,_utils__WEBPACK_IMPORTED_MODULE_4__.getPositionId)(_position.chainId, _position.protocol.id, triggerData.owner.toLowerCase(), triggerData.market);
1997
2099
  var isRepay = [_types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.Repay, _types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.EoaRepay].includes(_position.strategy.strategyId);
1998
2100
  if (isRepay) {
1999
2101
  _position.specific = {
@@ -2209,6 +2311,7 @@ function parseCrvUSDLeverageManagement(position, parseData) {
2209
2311
  var subData = _subDataService__WEBPACK_IMPORTED_MODULE_5__.crvUSDLeverageManagementSubData.decode(subStruct.subData);
2210
2312
  _position.strategyData.decoded.triggerData = triggerData;
2211
2313
  _position.strategyData.decoded.subData = subData;
2314
+ _position.positionId = (0,_utils__WEBPACK_IMPORTED_MODULE_4__.getPositionId)(_position.chainId, _position.protocol.id, _position.owner, triggerData.controller);
2212
2315
  var isRepay = _position.strategy.strategyId === _types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.Repay;
2213
2316
  if (isRepay) {
2214
2317
  _position.specific = {
@@ -2229,10 +2332,71 @@ function parseCrvUSDLeverageManagement(position, parseData) {
2229
2332
  mergeId: _types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.Boost
2230
2333
  };
2231
2334
  }
2232
- _position.positionId = (0,_utils__WEBPACK_IMPORTED_MODULE_4__.getPositionId)(_position.chainId, _position.protocol.id, _position.owner, triggerData.controller);
2233
2335
  _position.strategy.strategyId = _types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.IdOverrides.LeverageManagement;
2234
2336
  return _position;
2235
2337
  }
2338
+ function parseCrvUSDPayback(position, parseData) {
2339
+ var _position = (0,lodash__WEBPACK_IMPORTED_MODULE_1__.cloneDeep)(position);
2340
+ var {
2341
+ subStruct
2342
+ } = parseData.subscriptionEventData;
2343
+ var triggerData = _triggerService__WEBPACK_IMPORTED_MODULE_6__.crvUsdHealthRatioTrigger.decode(subStruct.triggerData);
2344
+ var subData = _subDataService__WEBPACK_IMPORTED_MODULE_5__.crvUSDPaybackSubData.decode(subStruct.subData);
2345
+ _position.strategyData.decoded.triggerData = triggerData;
2346
+ _position.strategyData.decoded.subData = subData;
2347
+ _position.positionId = (0,_utils__WEBPACK_IMPORTED_MODULE_4__.getPositionId)(_position.chainId, _position.protocol.id, _position.owner, triggerData.controller, Math.random());
2348
+ _position.strategy.strategyId = _types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.Payback;
2349
+ return _position;
2350
+ }
2351
+ function parseMorphoBlueLeverageManagement(position, parseData) {
2352
+ var _position = (0,lodash__WEBPACK_IMPORTED_MODULE_1__.cloneDeep)(position);
2353
+ var {
2354
+ subStruct,
2355
+ subId,
2356
+ subHash
2357
+ } = parseData.subscriptionEventData;
2358
+ var {
2359
+ isEnabled
2360
+ } = parseData.strategiesSubsData;
2361
+ var triggerData = _triggerService__WEBPACK_IMPORTED_MODULE_6__.morphoBlueRatioTrigger.decode(subStruct.triggerData);
2362
+ var subData = _subDataService__WEBPACK_IMPORTED_MODULE_5__.morphoBlueLeverageManagementSubData.decode(subStruct.subData);
2363
+ _position.strategyData.decoded.triggerData = triggerData;
2364
+ _position.strategyData.decoded.subData = subData;
2365
+ _position.positionId = (0,_utils__WEBPACK_IMPORTED_MODULE_4__.getPositionId)(_position.chainId, _position.protocol.id, triggerData.owner.toLowerCase(), triggerData.marketId);
2366
+ var isRepay = [_types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.Repay, _types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.EoaRepay].includes(_position.strategy.strategyId);
2367
+ if (isRepay) {
2368
+ _position.specific = {
2369
+ triggerRepayRatio: triggerData.ratio,
2370
+ targetRepayRatio: subData.targetRatio,
2371
+ repayEnabled: isEnabled,
2372
+ subId1: Number(subId),
2373
+ subHashRepay: subHash,
2374
+ mergeWithId: _types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.Boost
2375
+ };
2376
+ } else {
2377
+ _position.specific = {
2378
+ triggerBoostRatio: triggerData.ratio,
2379
+ targetBoostRatio: subData.targetRatio,
2380
+ boostEnabled: isEnabled,
2381
+ subId2: Number(subId),
2382
+ subHashBoost: subHash,
2383
+ mergeId: _types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.Boost
2384
+ };
2385
+ }
2386
+ var isEOA = _position.strategy.strategyId.includes('eoa');
2387
+ _position.strategy.strategyId = isEOA ? _types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.IdOverrides.EoaLeverageManagement : _types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.IdOverrides.LeverageManagement;
2388
+ return _position;
2389
+ }
2390
+ function parseAaveV3OpenOrderFromCollateral(position, parseData) {
2391
+ var _position = (0,lodash__WEBPACK_IMPORTED_MODULE_1__.cloneDeep)(position);
2392
+ var {
2393
+ subStruct
2394
+ } = parseData.subscriptionEventData;
2395
+ _position.strategyData.decoded.triggerData = _triggerService__WEBPACK_IMPORTED_MODULE_6__.aaveV3QuotePriceTrigger.decode(subStruct.triggerData);
2396
+ _position.strategyData.decoded.subData = _subDataService__WEBPACK_IMPORTED_MODULE_5__.aaveV3OpenOrderSubData.decode(subStruct.subData);
2397
+ _position.positionId = (0,_utils__WEBPACK_IMPORTED_MODULE_4__.getPositionId)(_position.chainId, _position.protocol.id, _position.owner, Math.random());
2398
+ return _position;
2399
+ }
2236
2400
  var parsingMethodsMapping = {
2237
2401
  [_types_enums__WEBPACK_IMPORTED_MODULE_3__.ProtocolIdentifiers.StrategiesAutomation.MakerDAO]: {
2238
2402
  [_types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.SavingsLiqProtection]: parseMakerSavingsLiqProtection,
@@ -2263,7 +2427,8 @@ var parsingMethodsMapping = {
2263
2427
  [_types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.CloseToDebt]: parseAaveV3CloseOnPrice,
2264
2428
  [_types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.CloseToDebtWithGasPrice]: parseAaveV3CloseOnPriceWithMaximumGasPrice,
2265
2429
  [_types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.CloseToCollateral]: parseAaveV3CloseOnPrice,
2266
- [_types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.CloseToCollateralWithGasPrice]: parseAaveV3CloseOnPriceWithMaximumGasPrice
2430
+ [_types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.CloseToCollateralWithGasPrice]: parseAaveV3CloseOnPriceWithMaximumGasPrice,
2431
+ [_types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.OpenOrderFromCollateral]: parseAaveV3OpenOrderFromCollateral
2267
2432
  },
2268
2433
  [_types_enums__WEBPACK_IMPORTED_MODULE_3__.ProtocolIdentifiers.StrategiesAutomation.CompoundV2]: {
2269
2434
  [_types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.Repay]: parseCompoundV2LeverageManagement,
@@ -2294,7 +2459,14 @@ var parsingMethodsMapping = {
2294
2459
  },
2295
2460
  [_types_enums__WEBPACK_IMPORTED_MODULE_3__.ProtocolIdentifiers.StrategiesAutomation.CrvUSD]: {
2296
2461
  [_types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.Repay]: parseCrvUSDLeverageManagement,
2297
- [_types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.Boost]: parseCrvUSDLeverageManagement
2462
+ [_types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.Boost]: parseCrvUSDLeverageManagement,
2463
+ [_types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.Payback]: parseCrvUSDPayback
2464
+ },
2465
+ [_types_enums__WEBPACK_IMPORTED_MODULE_3__.ProtocolIdentifiers.StrategiesAutomation.MorphoBlue]: {
2466
+ [_types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.Repay]: parseMorphoBlueLeverageManagement,
2467
+ [_types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.Boost]: parseMorphoBlueLeverageManagement,
2468
+ [_types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.EoaRepay]: parseMorphoBlueLeverageManagement,
2469
+ [_types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.EoaBoost]: parseMorphoBlueLeverageManagement
2298
2470
  }
2299
2471
  };
2300
2472
  function getParsingMethod(id, strategy) {
@@ -19563,12 +19735,14 @@ __webpack_require__.r(__webpack_exports__);
19563
19735
  /* harmony export */ __webpack_require__.d(__webpack_exports__, {
19564
19736
  /* harmony export */ aaveV2LeverageManagementSubData: () => (/* binding */ aaveV2LeverageManagementSubData),
19565
19737
  /* harmony export */ aaveV3LeverageManagementSubData: () => (/* binding */ aaveV3LeverageManagementSubData),
19738
+ /* harmony export */ aaveV3OpenOrderSubData: () => (/* binding */ aaveV3OpenOrderSubData),
19566
19739
  /* harmony export */ aaveV3QuotePriceSubData: () => (/* binding */ aaveV3QuotePriceSubData),
19567
19740
  /* harmony export */ cBondsRebondSubData: () => (/* binding */ cBondsRebondSubData),
19568
19741
  /* harmony export */ compoundV2LeverageManagementSubData: () => (/* binding */ compoundV2LeverageManagementSubData),
19569
19742
  /* harmony export */ compoundV3L2LeverageManagementSubData: () => (/* binding */ compoundV3L2LeverageManagementSubData),
19570
19743
  /* harmony export */ compoundV3LeverageManagementSubData: () => (/* binding */ compoundV3LeverageManagementSubData),
19571
19744
  /* harmony export */ crvUSDLeverageManagementSubData: () => (/* binding */ crvUSDLeverageManagementSubData),
19745
+ /* harmony export */ crvUSDPaybackSubData: () => (/* binding */ crvUSDPaybackSubData),
19572
19746
  /* harmony export */ exchangeDcaSubData: () => (/* binding */ exchangeDcaSubData),
19573
19747
  /* harmony export */ exchangeLimitOrderSubData: () => (/* binding */ exchangeLimitOrderSubData),
19574
19748
  /* harmony export */ liquityCloseSubData: () => (/* binding */ liquityCloseSubData),
@@ -19582,6 +19756,7 @@ __webpack_require__.r(__webpack_exports__);
19582
19756
  /* harmony export */ makerLeverageManagementSubData: () => (/* binding */ makerLeverageManagementSubData),
19583
19757
  /* harmony export */ makerRepayFromSavingsSubData: () => (/* binding */ makerRepayFromSavingsSubData),
19584
19758
  /* harmony export */ morphoAaveV2LeverageManagementSubData: () => (/* binding */ morphoAaveV2LeverageManagementSubData),
19759
+ /* harmony export */ morphoBlueLeverageManagementSubData: () => (/* binding */ morphoBlueLeverageManagementSubData),
19585
19760
  /* harmony export */ sparkLeverageManagementSubData: () => (/* binding */ sparkLeverageManagementSubData),
19586
19761
  /* harmony export */ sparkQuotePriceSubData: () => (/* binding */ sparkQuotePriceSubData)
19587
19762
  /* harmony export */ });
@@ -19589,12 +19764,15 @@ __webpack_require__.r(__webpack_exports__);
19589
19764
  /* harmony import */ var decimal_js__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(decimal_js__WEBPACK_IMPORTED_MODULE_0__);
19590
19765
  /* harmony import */ var web3_eth_abi__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(19);
19591
19766
  /* harmony import */ var web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(web3_eth_abi__WEBPACK_IMPORTED_MODULE_1__);
19592
- /* harmony import */ var _defisaver_tokens__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(20);
19593
- /* harmony import */ var _defisaver_tokens__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_defisaver_tokens__WEBPACK_IMPORTED_MODULE_2__);
19594
- /* harmony import */ var _defisaver_sdk__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(31);
19595
- /* harmony import */ var _types_enums__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(5);
19596
- /* harmony import */ var _constants__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(4);
19597
- /* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(17);
19767
+ /* harmony import */ var web3_utils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(18);
19768
+ /* harmony import */ var web3_utils__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(web3_utils__WEBPACK_IMPORTED_MODULE_2__);
19769
+ /* harmony import */ var _defisaver_tokens__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(20);
19770
+ /* harmony import */ var _defisaver_tokens__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(_defisaver_tokens__WEBPACK_IMPORTED_MODULE_3__);
19771
+ /* harmony import */ var _defisaver_sdk__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(31);
19772
+ /* harmony import */ var _types_enums__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(5);
19773
+ /* harmony import */ var _constants__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(4);
19774
+ /* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(17);
19775
+
19598
19776
 
19599
19777
 
19600
19778
 
@@ -19604,11 +19782,11 @@ __webpack_require__.r(__webpack_exports__);
19604
19782
 
19605
19783
  var makerRepayFromSavingsSubData = {
19606
19784
  encode(vaultId, targetRatioPercentage, chainId, daiAddr, mcdCdpManagerAddr) {
19607
- var _daiAddr = daiAddr || (0,_defisaver_tokens__WEBPACK_IMPORTED_MODULE_2__.getAssetInfo)('DAI', chainId).address;
19785
+ var _daiAddr = daiAddr || (0,_defisaver_tokens__WEBPACK_IMPORTED_MODULE_3__.getAssetInfo)('DAI', chainId).address;
19608
19786
  // @ts-ignore // TODO - this requires change in @defisaver/tokens
19609
- var _mcdCdpManagerAddr = mcdCdpManagerAddr || (0,_defisaver_sdk__WEBPACK_IMPORTED_MODULE_3__.otherAddresses)(chainId).McdCdpManager;
19787
+ var _mcdCdpManagerAddr = mcdCdpManagerAddr || (0,_defisaver_sdk__WEBPACK_IMPORTED_MODULE_4__.otherAddresses)(chainId).McdCdpManager;
19610
19788
  var vaultIdEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('uint256', vaultId.toString());
19611
- var targetRatioWei = (0,_utils__WEBPACK_IMPORTED_MODULE_6__.ratioPercentageToWei)(targetRatioPercentage);
19789
+ var targetRatioWei = (0,_utils__WEBPACK_IMPORTED_MODULE_7__.ratioPercentageToWei)(targetRatioPercentage);
19612
19790
  var targetRatioEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('uint256', targetRatioWei);
19613
19791
  var daiAddrEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('address', _daiAddr);
19614
19792
  var mcdManagerAddrEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('address', _mcdCdpManagerAddr);
@@ -19617,7 +19795,7 @@ var makerRepayFromSavingsSubData = {
19617
19795
  decode(subData) {
19618
19796
  var vaultId = +web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameter('uint256', subData[0]).toString();
19619
19797
  var weiRatio = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameter('uint256', subData[1]);
19620
- var targetRatio = (0,_utils__WEBPACK_IMPORTED_MODULE_6__.weiToRatioPercentage)(weiRatio);
19798
+ var targetRatio = (0,_utils__WEBPACK_IMPORTED_MODULE_7__.weiToRatioPercentage)(weiRatio);
19621
19799
  var daiAddr = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameter('address', subData[2]).toString();
19622
19800
  var mcdManagerAddr = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameter('address', subData[3]).toString();
19623
19801
  return {
@@ -19631,7 +19809,7 @@ var makerRepayFromSavingsSubData = {
19631
19809
  var liquityRepayFromSavingsSubData = {
19632
19810
  decode(subData) {
19633
19811
  var weiRatio = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameter('uint256', subData[1]);
19634
- var targetRatio = (0,_utils__WEBPACK_IMPORTED_MODULE_6__.weiToRatioPercentage)(weiRatio);
19812
+ var targetRatio = (0,_utils__WEBPACK_IMPORTED_MODULE_7__.weiToRatioPercentage)(weiRatio);
19635
19813
  return {
19636
19814
  targetRatio
19637
19815
  };
@@ -19639,13 +19817,13 @@ var liquityRepayFromSavingsSubData = {
19639
19817
  };
19640
19818
  var makerCloseSubData = {
19641
19819
  encode(vaultId, closeToAssetAddr, chainId, daiAddr, mcdCdpManagerAddr) {
19642
- var _daiAddr = daiAddr || (0,_defisaver_tokens__WEBPACK_IMPORTED_MODULE_2__.getAssetInfo)('DAI', chainId).address;
19820
+ var _daiAddr = daiAddr || (0,_defisaver_tokens__WEBPACK_IMPORTED_MODULE_3__.getAssetInfo)('DAI', chainId).address;
19643
19821
  // @ts-ignore // TODO - this requires change in @defisaver/tokens
19644
- var _mcdCdpManagerAddr = mcdCdpManagerAddr || (0,_defisaver_sdk__WEBPACK_IMPORTED_MODULE_3__.otherAddresses)(chainId).McdCdpManager;
19822
+ var _mcdCdpManagerAddr = mcdCdpManagerAddr || (0,_defisaver_sdk__WEBPACK_IMPORTED_MODULE_4__.otherAddresses)(chainId).McdCdpManager;
19645
19823
  var vaultIdEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('uint256', vaultId.toString());
19646
19824
  var daiAddrEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('address', _daiAddr);
19647
19825
  var mcdManagerAddrEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('address', _mcdCdpManagerAddr);
19648
- if ((0,_utils__WEBPACK_IMPORTED_MODULE_6__.compareAddresses)(closeToAssetAddr, _daiAddr)) {
19826
+ if ((0,_utils__WEBPACK_IMPORTED_MODULE_7__.compareAddresses)(closeToAssetAddr, _daiAddr)) {
19649
19827
  // Close to DAI strategy
19650
19828
  return [vaultIdEncoded, daiAddrEncoded, mcdManagerAddrEncoded];
19651
19829
  }
@@ -19668,7 +19846,7 @@ var makerLeverageManagementSubData = {
19668
19846
  decode: subData => {
19669
19847
  var vaultId = +web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameter('uint256', subData[0]).toString();
19670
19848
  var weiRatio = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameter('uint256', subData[1]);
19671
- var targetRatio = (0,_utils__WEBPACK_IMPORTED_MODULE_6__.weiToRatioPercentage)(weiRatio);
19849
+ var targetRatio = (0,_utils__WEBPACK_IMPORTED_MODULE_7__.weiToRatioPercentage)(weiRatio);
19672
19850
  return {
19673
19851
  vaultId,
19674
19852
  targetRatio
@@ -19678,7 +19856,7 @@ var makerLeverageManagementSubData = {
19678
19856
  var liquityLeverageManagementSubData = {
19679
19857
  decode: subData => {
19680
19858
  var weiRatio = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameter('uint256', subData[1]);
19681
- var targetRatio = (0,_utils__WEBPACK_IMPORTED_MODULE_6__.weiToRatioPercentage)(weiRatio);
19859
+ var targetRatio = (0,_utils__WEBPACK_IMPORTED_MODULE_7__.weiToRatioPercentage)(weiRatio);
19682
19860
  return {
19683
19861
  targetRatio
19684
19862
  };
@@ -19686,11 +19864,11 @@ var liquityLeverageManagementSubData = {
19686
19864
  };
19687
19865
  var liquityCloseSubData = {
19688
19866
  encode(closeToAssetAddr) {
19689
- var chainId = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _types_enums__WEBPACK_IMPORTED_MODULE_4__.ChainId.Ethereum;
19867
+ var chainId = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _types_enums__WEBPACK_IMPORTED_MODULE_5__.ChainId.Ethereum;
19690
19868
  var collAddr = arguments.length > 2 ? arguments[2] : undefined;
19691
19869
  var debtAddr = arguments.length > 3 ? arguments[3] : undefined;
19692
- var _collAddr = collAddr || (0,_defisaver_tokens__WEBPACK_IMPORTED_MODULE_2__.getAssetInfo)('WETH', chainId).address;
19693
- var _debtAddr = debtAddr || (0,_defisaver_tokens__WEBPACK_IMPORTED_MODULE_2__.getAssetInfo)('LUSD', chainId).address;
19870
+ var _collAddr = collAddr || (0,_defisaver_tokens__WEBPACK_IMPORTED_MODULE_3__.getAssetInfo)('WETH', chainId).address;
19871
+ var _debtAddr = debtAddr || (0,_defisaver_tokens__WEBPACK_IMPORTED_MODULE_3__.getAssetInfo)('LUSD', chainId).address;
19694
19872
  var collAddrEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('address', _collAddr);
19695
19873
  var debtAddrEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('address', _debtAddr);
19696
19874
  // if (compareAddresses(closeToAssetAddr, _debtAddr)) { // Closing to debt strategy was not implemented, but it should be in the future
@@ -19717,7 +19895,7 @@ var aaveV2LeverageManagementSubData = {
19717
19895
  },
19718
19896
  decode(subData) {
19719
19897
  var ratioWei = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameter('uint256', subData[1]);
19720
- var targetRatio = (0,_utils__WEBPACK_IMPORTED_MODULE_6__.weiToRatioPercentage)(ratioWei);
19898
+ var targetRatio = (0,_utils__WEBPACK_IMPORTED_MODULE_7__.weiToRatioPercentage)(ratioWei);
19721
19899
  return {
19722
19900
  targetRatio
19723
19901
  };
@@ -19727,7 +19905,7 @@ var aaveV3LeverageManagementSubData = {
19727
19905
  // TODO encode?
19728
19906
  decode(subData) {
19729
19907
  var ratioWei = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameter('uint256', subData[0]);
19730
- var targetRatio = (0,_utils__WEBPACK_IMPORTED_MODULE_6__.weiToRatioPercentage)(ratioWei);
19908
+ var targetRatio = (0,_utils__WEBPACK_IMPORTED_MODULE_7__.weiToRatioPercentage)(ratioWei);
19731
19909
  return {
19732
19910
  targetRatio
19733
19911
  };
@@ -19735,7 +19913,7 @@ var aaveV3LeverageManagementSubData = {
19735
19913
  };
19736
19914
  var aaveV3QuotePriceSubData = {
19737
19915
  encode(collAsset, collAssetId, debtAsset, debtAssetId) {
19738
- var nullAddress = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : _constants__WEBPACK_IMPORTED_MODULE_5__.ZERO_ADDRESS;
19916
+ var nullAddress = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : _constants__WEBPACK_IMPORTED_MODULE_6__.ZERO_ADDRESS;
19739
19917
  var encodedColl = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('address', collAsset);
19740
19918
  var encodedCollId = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('uint8', collAssetId);
19741
19919
  var encodedDebt = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('address', debtAsset);
@@ -19764,7 +19942,7 @@ var compoundV2LeverageManagementSubData = {
19764
19942
  },
19765
19943
  decode(subData) {
19766
19944
  var weiRatio = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameter('uint256', subData[0]);
19767
- var targetRatio = (0,_utils__WEBPACK_IMPORTED_MODULE_6__.weiToRatioPercentage)(weiRatio);
19945
+ var targetRatio = (0,_utils__WEBPACK_IMPORTED_MODULE_7__.weiToRatioPercentage)(weiRatio);
19768
19946
  return {
19769
19947
  targetRatio
19770
19948
  };
@@ -19778,7 +19956,7 @@ var compoundV3LeverageManagementSubData = {
19778
19956
  },
19779
19957
  decode(subData) {
19780
19958
  var weiRatio = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameter('uint256', subData[3]);
19781
- var targetRatio = (0,_utils__WEBPACK_IMPORTED_MODULE_6__.weiToRatioPercentage)(weiRatio);
19959
+ var targetRatio = (0,_utils__WEBPACK_IMPORTED_MODULE_7__.weiToRatioPercentage)(weiRatio);
19782
19960
  return {
19783
19961
  targetRatio
19784
19962
  };
@@ -19798,7 +19976,7 @@ var compoundV3L2LeverageManagementSubData = {
19798
19976
  },
19799
19977
  decode(subData) {
19800
19978
  var ratioWei = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameter('uint256', subData[3]);
19801
- var targetRatio = (0,_utils__WEBPACK_IMPORTED_MODULE_6__.weiToRatioPercentage)(ratioWei);
19979
+ var targetRatio = (0,_utils__WEBPACK_IMPORTED_MODULE_7__.weiToRatioPercentage)(ratioWei);
19802
19980
  return {
19803
19981
  targetRatio
19804
19982
  };
@@ -19806,13 +19984,13 @@ var compoundV3L2LeverageManagementSubData = {
19806
19984
  };
19807
19985
  var morphoAaveV2LeverageManagementSubData = {
19808
19986
  encode(triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled) {
19809
- return [(0,_utils__WEBPACK_IMPORTED_MODULE_6__.ratioPercentageToWei)(triggerRepayRatio), (0,_utils__WEBPACK_IMPORTED_MODULE_6__.ratioPercentageToWei)(triggerBoostRatio), (0,_utils__WEBPACK_IMPORTED_MODULE_6__.ratioPercentageToWei)(targetBoostRatio), (0,_utils__WEBPACK_IMPORTED_MODULE_6__.ratioPercentageToWei)(targetRepayRatio),
19987
+ return [(0,_utils__WEBPACK_IMPORTED_MODULE_7__.ratioPercentageToWei)(triggerRepayRatio), (0,_utils__WEBPACK_IMPORTED_MODULE_7__.ratioPercentageToWei)(triggerBoostRatio), (0,_utils__WEBPACK_IMPORTED_MODULE_7__.ratioPercentageToWei)(targetBoostRatio), (0,_utils__WEBPACK_IMPORTED_MODULE_7__.ratioPercentageToWei)(targetRepayRatio),
19810
19988
  // @ts-ignore
19811
19989
  boostEnabled];
19812
19990
  },
19813
19991
  decode(subData) {
19814
19992
  var ratioWei = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameter('uint128', subData[1]);
19815
- var targetRatio = (0,_utils__WEBPACK_IMPORTED_MODULE_6__.weiToRatioPercentage)(ratioWei);
19993
+ var targetRatio = (0,_utils__WEBPACK_IMPORTED_MODULE_7__.weiToRatioPercentage)(ratioWei);
19816
19994
  return {
19817
19995
  targetRatio
19818
19996
  };
@@ -19837,11 +20015,11 @@ var liquityPaybackUsingChickenBondSubData = {
19837
20015
  * @param chainId
19838
20016
  */
19839
20017
  encode: function encode(sourceId, sourceType) {
19840
- var chainId = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : _types_enums__WEBPACK_IMPORTED_MODULE_4__.ChainId.Ethereum;
20018
+ var chainId = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : _types_enums__WEBPACK_IMPORTED_MODULE_5__.ChainId.Ethereum;
19841
20019
  var sourceIdEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('uint256', sourceId);
19842
20020
  var sourceTypeEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('uint256', sourceType);
19843
- var lusdAddressEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('address', (0,_defisaver_tokens__WEBPACK_IMPORTED_MODULE_2__.getAssetInfo)('LUSD', chainId).address);
19844
- var bLusdAddressEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('address', (0,_defisaver_tokens__WEBPACK_IMPORTED_MODULE_2__.getAssetInfo)('bLUSD', chainId).address);
20021
+ var lusdAddressEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('address', (0,_defisaver_tokens__WEBPACK_IMPORTED_MODULE_3__.getAssetInfo)('LUSD', chainId).address);
20022
+ var bLusdAddressEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('address', (0,_defisaver_tokens__WEBPACK_IMPORTED_MODULE_3__.getAssetInfo)('bLUSD', chainId).address);
19845
20023
  return [sourceIdEncoded, sourceTypeEncoded, lusdAddressEncoded, bLusdAddressEncoded];
19846
20024
  },
19847
20025
  decode: subData => {
@@ -19864,7 +20042,7 @@ var exchangeDcaSubData = {
19864
20042
  decode: (subData, chainId) => {
19865
20043
  var fromToken = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameter('address', subData[0]).toString();
19866
20044
  var toToken = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameter('address', subData[1]).toString();
19867
- var amount = (0,_defisaver_tokens__WEBPACK_IMPORTED_MODULE_2__.assetAmountInEth)(web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameter('uint256', subData[2]).toString(), (0,_defisaver_tokens__WEBPACK_IMPORTED_MODULE_2__.getAssetInfoByAddress)(fromToken, chainId).symbol);
20045
+ var amount = (0,_defisaver_tokens__WEBPACK_IMPORTED_MODULE_3__.assetAmountInEth)(web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameter('uint256', subData[2]).toString(), (0,_defisaver_tokens__WEBPACK_IMPORTED_MODULE_3__.getAssetInfoByAddress)(fromToken, chainId).symbol);
19868
20046
  var interval = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameter('uint256', subData[3]).toString();
19869
20047
  return {
19870
20048
  fromToken,
@@ -19881,7 +20059,7 @@ var exchangeLimitOrderSubData = {
19881
20059
  decode: (subData, chainId) => {
19882
20060
  var fromToken = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameter('address', subData[0]).toString();
19883
20061
  var toToken = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameter('address', subData[1]).toString();
19884
- var amount = (0,_defisaver_tokens__WEBPACK_IMPORTED_MODULE_2__.assetAmountInEth)(web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameter('uint256', subData[2]).toString(), (0,_defisaver_tokens__WEBPACK_IMPORTED_MODULE_2__.getAssetInfoByAddress)(fromToken, chainId).symbol);
20062
+ var amount = (0,_defisaver_tokens__WEBPACK_IMPORTED_MODULE_3__.assetAmountInEth)(web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameter('uint256', subData[2]).toString(), (0,_defisaver_tokens__WEBPACK_IMPORTED_MODULE_3__.getAssetInfoByAddress)(fromToken, chainId).symbol);
19885
20063
  return {
19886
20064
  fromToken,
19887
20065
  toToken,
@@ -19893,7 +20071,7 @@ var sparkLeverageManagementSubData = {
19893
20071
  // TODO encode?
19894
20072
  decode(subData) {
19895
20073
  var ratioWei = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameter('uint256', subData[0]);
19896
- var targetRatio = (0,_utils__WEBPACK_IMPORTED_MODULE_6__.weiToRatioPercentage)(ratioWei);
20074
+ var targetRatio = (0,_utils__WEBPACK_IMPORTED_MODULE_7__.weiToRatioPercentage)(ratioWei);
19897
20075
  return {
19898
20076
  targetRatio
19899
20077
  };
@@ -19901,7 +20079,7 @@ var sparkLeverageManagementSubData = {
19901
20079
  };
19902
20080
  var sparkQuotePriceSubData = {
19903
20081
  encode(collAsset, collAssetId, debtAsset, debtAssetId) {
19904
- var nullAddress = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : _constants__WEBPACK_IMPORTED_MODULE_5__.ZERO_ADDRESS;
20082
+ var nullAddress = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : _constants__WEBPACK_IMPORTED_MODULE_6__.ZERO_ADDRESS;
19905
20083
  var encodedColl = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('address', collAsset);
19906
20084
  var encodedCollId = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('uint8', collAssetId);
19907
20085
  var encodedDebt = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('address', debtAsset);
@@ -19924,17 +20102,17 @@ var sparkQuotePriceSubData = {
19924
20102
  };
19925
20103
  var liquityDsrPaybackSubData = {
19926
20104
  encode: targetRatio => {
19927
- var daiAddress = (0,_defisaver_tokens__WEBPACK_IMPORTED_MODULE_2__.getAssetInfo)('DAI').address;
19928
- var lusdAddress = (0,_defisaver_tokens__WEBPACK_IMPORTED_MODULE_2__.getAssetInfo)('LUSD').address;
19929
- var ratioStateEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('uint8', _types_enums__WEBPACK_IMPORTED_MODULE_4__.RatioState.UNDER);
19930
- var targetRatioEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('uint256', (0,_utils__WEBPACK_IMPORTED_MODULE_6__.ratioPercentageToWei)(targetRatio));
20105
+ var daiAddress = (0,_defisaver_tokens__WEBPACK_IMPORTED_MODULE_3__.getAssetInfo)('DAI').address;
20106
+ var lusdAddress = (0,_defisaver_tokens__WEBPACK_IMPORTED_MODULE_3__.getAssetInfo)('LUSD').address;
20107
+ var ratioStateEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('uint8', _types_enums__WEBPACK_IMPORTED_MODULE_5__.RatioState.UNDER);
20108
+ var targetRatioEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('uint256', (0,_utils__WEBPACK_IMPORTED_MODULE_7__.ratioPercentageToWei)(targetRatio));
19931
20109
  var daiAddressEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('address', daiAddress);
19932
20110
  var lusdAddressEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('address', lusdAddress);
19933
20111
  return [ratioStateEncoded, targetRatioEncoded, daiAddressEncoded, lusdAddressEncoded];
19934
20112
  },
19935
20113
  decode: subData => {
19936
20114
  var weiRatio = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameter('uint256', subData[1]);
19937
- var targetRatio = (0,_utils__WEBPACK_IMPORTED_MODULE_6__.weiToRatioPercentage)(weiRatio);
20115
+ var targetRatio = (0,_utils__WEBPACK_IMPORTED_MODULE_7__.weiToRatioPercentage)(weiRatio);
19938
20116
  return {
19939
20117
  targetRatio
19940
20118
  };
@@ -19942,17 +20120,17 @@ var liquityDsrPaybackSubData = {
19942
20120
  };
19943
20121
  var liquityDsrSupplySubData = {
19944
20122
  encode: targetRatio => {
19945
- var daiAddress = (0,_defisaver_tokens__WEBPACK_IMPORTED_MODULE_2__.getAssetInfo)('DAI').address;
19946
- var wethAddress = (0,_defisaver_tokens__WEBPACK_IMPORTED_MODULE_2__.getAssetInfo)('WETH').address;
19947
- var ratioStateEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('uint8', _types_enums__WEBPACK_IMPORTED_MODULE_4__.RatioState.UNDER);
19948
- var targetRatioEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('uint256', (0,_utils__WEBPACK_IMPORTED_MODULE_6__.ratioPercentageToWei)(targetRatio));
20123
+ var daiAddress = (0,_defisaver_tokens__WEBPACK_IMPORTED_MODULE_3__.getAssetInfo)('DAI').address;
20124
+ var wethAddress = (0,_defisaver_tokens__WEBPACK_IMPORTED_MODULE_3__.getAssetInfo)('WETH').address;
20125
+ var ratioStateEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('uint8', _types_enums__WEBPACK_IMPORTED_MODULE_5__.RatioState.UNDER);
20126
+ var targetRatioEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('uint256', (0,_utils__WEBPACK_IMPORTED_MODULE_7__.ratioPercentageToWei)(targetRatio));
19949
20127
  var daiAddressEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('address', daiAddress);
19950
20128
  var wethAddressEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('address', wethAddress);
19951
20129
  return [ratioStateEncoded, targetRatioEncoded, daiAddressEncoded, wethAddressEncoded];
19952
20130
  },
19953
20131
  decode: subData => {
19954
20132
  var weiRatio = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameter('uint256', subData[1]);
19955
- var targetRatio = (0,_utils__WEBPACK_IMPORTED_MODULE_6__.weiToRatioPercentage)(weiRatio);
20133
+ var targetRatio = (0,_utils__WEBPACK_IMPORTED_MODULE_7__.weiToRatioPercentage)(weiRatio);
19956
20134
  return {
19957
20135
  targetRatio
19958
20136
  };
@@ -19960,11 +20138,11 @@ var liquityDsrSupplySubData = {
19960
20138
  };
19961
20139
  var liquityDebtInFrontRepaySubData = {
19962
20140
  encode: targetRatioIncrease => {
19963
- var wethAddress = (0,_defisaver_tokens__WEBPACK_IMPORTED_MODULE_2__.getAssetInfo)('WETH').address;
19964
- var lusdAddress = (0,_defisaver_tokens__WEBPACK_IMPORTED_MODULE_2__.getAssetInfo)('LUSD').address;
20141
+ var wethAddress = (0,_defisaver_tokens__WEBPACK_IMPORTED_MODULE_3__.getAssetInfo)('WETH').address;
20142
+ var lusdAddress = (0,_defisaver_tokens__WEBPACK_IMPORTED_MODULE_3__.getAssetInfo)('LUSD').address;
19965
20143
  var wethAddressEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('address', wethAddress);
19966
20144
  var lusdAddressEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('address', lusdAddress);
19967
- var targetRatioIncreaseEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('uint256', (0,_utils__WEBPACK_IMPORTED_MODULE_6__.ratioPercentageToWei)(targetRatioIncrease));
20145
+ var targetRatioIncreaseEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('uint256', (0,_utils__WEBPACK_IMPORTED_MODULE_7__.ratioPercentageToWei)(targetRatioIncrease));
19968
20146
  var withdrawIdEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('uint8', 1); // withdraw - 1
19969
20147
  var paybackIdEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('uint8', 0); // payback - 0
19970
20148
 
@@ -19972,7 +20150,7 @@ var liquityDebtInFrontRepaySubData = {
19972
20150
  },
19973
20151
  decode: subData => {
19974
20152
  var weiRatio = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameter('uint256', subData[2]);
19975
- var targetRatioIncrease = (0,_utils__WEBPACK_IMPORTED_MODULE_6__.weiToRatioPercentage)(weiRatio);
20153
+ var targetRatioIncrease = (0,_utils__WEBPACK_IMPORTED_MODULE_7__.weiToRatioPercentage)(weiRatio);
19976
20154
  return {
19977
20155
  targetRatioIncrease
19978
20156
  };
@@ -19982,7 +20160,7 @@ var crvUSDLeverageManagementSubData = {
19982
20160
  encode: (controllerAddr, ratioState, targetRatio, collTokenAddr, crvUSDAddr) => {
19983
20161
  var controllerAddrEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('address', controllerAddr);
19984
20162
  var ratioStateEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('uint8', ratioState);
19985
- var targetRatioEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('uint256', (0,_utils__WEBPACK_IMPORTED_MODULE_6__.ratioPercentageToWei)(targetRatio));
20163
+ var targetRatioEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('uint256', (0,_utils__WEBPACK_IMPORTED_MODULE_7__.ratioPercentageToWei)(targetRatio));
19986
20164
  var collTokenAddrEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('address', collTokenAddr);
19987
20165
  var crvUSDAddrEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('address', crvUSDAddr);
19988
20166
  return [controllerAddrEncoded, ratioStateEncoded, targetRatioEncoded, collTokenAddrEncoded, crvUSDAddrEncoded];
@@ -19990,13 +20168,98 @@ var crvUSDLeverageManagementSubData = {
19990
20168
  decode: subData => {
19991
20169
  var controller = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameter('address', subData[0]);
19992
20170
  var weiRatio = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameter('uint256', subData[2]);
19993
- var targetRatio = (0,_utils__WEBPACK_IMPORTED_MODULE_6__.weiToRatioPercentage)(weiRatio);
20171
+ var targetRatio = (0,_utils__WEBPACK_IMPORTED_MODULE_7__.weiToRatioPercentage)(weiRatio);
19994
20172
  return {
19995
20173
  controller,
19996
20174
  targetRatio
19997
20175
  };
19998
20176
  }
19999
20177
  };
20178
+ var crvUSDPaybackSubData = {
20179
+ encode: (controllerAddr, addressToPullTokensFrom, positionOwner, paybackAmount, crvUSDAddr) => {
20180
+ var controllerAddrEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('address', controllerAddr);
20181
+ var addressToPullTokensFromEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('address', addressToPullTokensFrom);
20182
+ var positionOwnerEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('address', positionOwner);
20183
+ var paybackAmountEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('uint256', (0,web3_utils__WEBPACK_IMPORTED_MODULE_2__.toWei)(paybackAmount, 'ether'));
20184
+ var crvUSDAddrEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('address', crvUSDAddr);
20185
+ return [controllerAddrEncoded, addressToPullTokensFromEncoded, positionOwnerEncoded, paybackAmountEncoded, crvUSDAddrEncoded];
20186
+ },
20187
+ decode: subData => {
20188
+ var controller = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameter('address', subData[0]);
20189
+ var addressToPullTokensFrom = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameter('address', subData[1]);
20190
+ var positionOwner = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameter('address', subData[2]);
20191
+ var weiPaybackAmount = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameter('uint256', subData[3]);
20192
+ var paybackAmount = (0,web3_utils__WEBPACK_IMPORTED_MODULE_2__.fromWei)(weiPaybackAmount, 'ether');
20193
+ return {
20194
+ controller,
20195
+ addressToPullTokensFrom,
20196
+ positionOwner,
20197
+ paybackAmount
20198
+ };
20199
+ }
20200
+ };
20201
+ var morphoBlueLeverageManagementSubData = {
20202
+ encode: (loanToken, collToken, oracle, irm, lltv, ratioState, targetRatio, user, isEOA) => {
20203
+ var loanTokenEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('address', loanToken);
20204
+ var collTokenEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('address', collToken);
20205
+ var oracleEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('address', oracle);
20206
+ var irmEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('address', irm);
20207
+ var lltvEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('uint256', lltv);
20208
+ var ratioStateEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('uint8', ratioState);
20209
+ var targetRatioEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('uint256', (0,_utils__WEBPACK_IMPORTED_MODULE_7__.ratioPercentageToWei)(targetRatio));
20210
+ var userEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('address', user);
20211
+ var isEOAEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('bool', isEOA);
20212
+ return [loanTokenEncoded, collTokenEncoded, oracleEncoded, irmEncoded, lltvEncoded, ratioStateEncoded, targetRatioEncoded, userEncoded, isEOAEncoded];
20213
+ },
20214
+ decode: subData => {
20215
+ var loanToken = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameter('address', subData[0]);
20216
+ var collToken = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameter('address', subData[1]);
20217
+ var oracle = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameter('address', subData[2]);
20218
+ var irm = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameter('address', subData[3]);
20219
+ var lltv = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameter('uint256', subData[4]);
20220
+ var weiRatio = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameter('uint256', subData[6]);
20221
+ var user = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameter('address', subData[7]);
20222
+ var targetRatio = (0,_utils__WEBPACK_IMPORTED_MODULE_7__.weiToRatioPercentage)(weiRatio);
20223
+ return {
20224
+ loanToken,
20225
+ collToken,
20226
+ oracle,
20227
+ irm,
20228
+ lltv,
20229
+ user,
20230
+ targetRatio
20231
+ };
20232
+ }
20233
+ };
20234
+ var aaveV3OpenOrderSubData = {
20235
+ encode(collAsset, collAssetId, debtAsset, debtAssetId, marketAddr, targetRatio) {
20236
+ var encodedColl = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('address', collAsset);
20237
+ var encodedCollId = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('uint8', collAssetId);
20238
+ var encodedDebt = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('address', debtAsset);
20239
+ var encodedDebtId = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('uint8', debtAssetId);
20240
+ var encodedMarket = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('address', marketAddr);
20241
+ var encodedTargetRatio = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('uint256', (0,_utils__WEBPACK_IMPORTED_MODULE_7__.ratioPercentageToWei)(targetRatio));
20242
+ var useOnBehalfEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('bool', false);
20243
+ return [encodedColl, encodedCollId, encodedDebt, encodedDebtId, encodedMarket, encodedTargetRatio, useOnBehalfEncoded];
20244
+ },
20245
+ decode(subData) {
20246
+ var collAsset = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameter('address', subData[0]);
20247
+ var collAssetId = Number(web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameter('uint8', subData[1]));
20248
+ var debtAsset = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameter('address', subData[2]);
20249
+ var debtAssetId = Number(web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameter('uint8', subData[3]));
20250
+ var marketAddr = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameter('address', subData[4]);
20251
+ var weiRatio = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameter('uint256', subData[5]);
20252
+ var targetRatio = (0,_utils__WEBPACK_IMPORTED_MODULE_7__.weiToRatioPercentage)(weiRatio);
20253
+ return {
20254
+ collAsset,
20255
+ collAssetId,
20256
+ debtAsset,
20257
+ debtAssetId,
20258
+ marketAddr,
20259
+ targetRatio
20260
+ };
20261
+ }
20262
+ };
20000
20263
 
20001
20264
  /***/ }),
20002
20265
  /* 31 */
@@ -33056,6 +33319,7 @@ __webpack_require__.r(__webpack_exports__);
33056
33319
  /* harmony export */ compoundV2RatioTrigger: () => (/* binding */ compoundV2RatioTrigger),
33057
33320
  /* harmony export */ compoundV3RatioTrigger: () => (/* binding */ compoundV3RatioTrigger),
33058
33321
  /* harmony export */ crvUSDRatioTrigger: () => (/* binding */ crvUSDRatioTrigger),
33322
+ /* harmony export */ crvUsdHealthRatioTrigger: () => (/* binding */ crvUsdHealthRatioTrigger),
33059
33323
  /* harmony export */ curveUsdBorrowRateTrigger: () => (/* binding */ curveUsdBorrowRateTrigger),
33060
33324
  /* harmony export */ curveUsdSoftLiquidationTrigger: () => (/* binding */ curveUsdSoftLiquidationTrigger),
33061
33325
  /* harmony export */ exchangeOffchainPriceTrigger: () => (/* binding */ exchangeOffchainPriceTrigger),
@@ -33065,6 +33329,7 @@ __webpack_require__.r(__webpack_exports__);
33065
33329
  /* harmony export */ liquityRatioTrigger: () => (/* binding */ liquityRatioTrigger),
33066
33330
  /* harmony export */ makerRatioTrigger: () => (/* binding */ makerRatioTrigger),
33067
33331
  /* harmony export */ morphoAaveV2RatioTrigger: () => (/* binding */ morphoAaveV2RatioTrigger),
33332
+ /* harmony export */ morphoBlueRatioTrigger: () => (/* binding */ morphoBlueRatioTrigger),
33068
33333
  /* harmony export */ sparkQuotePriceTrigger: () => (/* binding */ sparkQuotePriceTrigger),
33069
33334
  /* harmony export */ sparkRatioTrigger: () => (/* binding */ sparkRatioTrigger),
33070
33335
  /* harmony export */ trailingStopTrigger: () => (/* binding */ trailingStopTrigger)
@@ -33397,6 +33662,37 @@ var crvUSDRatioTrigger = {
33397
33662
  };
33398
33663
  }
33399
33664
  };
33665
+ var crvUsdHealthRatioTrigger = {
33666
+ encode(owner, controller, ratioPercentage) {
33667
+ var ratioWei = (0,_utils__WEBPACK_IMPORTED_MODULE_4__.ratioPercentageToWei)(ratioPercentage);
33668
+ return [web3_eth_abi__WEBPACK_IMPORTED_MODULE_2___default().encodeParameters(['address', 'address', 'uint256'], [owner, controller, ratioWei])];
33669
+ },
33670
+ decode(triggerData) {
33671
+ var decodedData = web3_eth_abi__WEBPACK_IMPORTED_MODULE_2___default().decodeParameters(['address', 'address', 'uint256'], triggerData[0]);
33672
+ return {
33673
+ owner: decodedData[0],
33674
+ controller: decodedData[1],
33675
+ ratio: (0,_utils__WEBPACK_IMPORTED_MODULE_4__.weiToRatioPercentage)(decodedData[2])
33676
+ };
33677
+ }
33678
+ };
33679
+ var morphoBlueRatioTrigger = {
33680
+ encode(marketId,
33681
+ // bytes32
33682
+ owner, ratioPercentage, ratioState) {
33683
+ var ratioWei = (0,_utils__WEBPACK_IMPORTED_MODULE_4__.ratioPercentageToWei)(ratioPercentage);
33684
+ return [web3_eth_abi__WEBPACK_IMPORTED_MODULE_2___default().encodeParameters(['bytes32', 'address', 'uint256', 'uint8'], [marketId, owner, ratioWei, ratioState])];
33685
+ },
33686
+ decode(triggerData) {
33687
+ var decodedData = web3_eth_abi__WEBPACK_IMPORTED_MODULE_2___default().decodeParameters(['bytes32', 'address', 'uint256', 'uint8'], triggerData[0]);
33688
+ return {
33689
+ marketId: decodedData[0],
33690
+ owner: decodedData[1],
33691
+ ratio: (0,_utils__WEBPACK_IMPORTED_MODULE_4__.weiToRatioPercentage)(decodedData[2]),
33692
+ ratioState: Number(decodedData[3])
33693
+ };
33694
+ }
33695
+ };
33400
33696
 
33401
33697
  /***/ }),
33402
33698
  /* 322 */
@@ -33468,6 +33764,7 @@ __webpack_require__.r(__webpack_exports__);
33468
33764
  /* harmony export */ liquityEncode: () => (/* binding */ liquityEncode),
33469
33765
  /* harmony export */ makerEncode: () => (/* binding */ makerEncode),
33470
33766
  /* harmony export */ morphoAaveV2Encode: () => (/* binding */ morphoAaveV2Encode),
33767
+ /* harmony export */ morphoBlueEncode: () => (/* binding */ morphoBlueEncode),
33471
33768
  /* harmony export */ sparkEncode: () => (/* binding */ sparkEncode)
33472
33769
  /* harmony export */ });
33473
33770
  /* harmony import */ var decimal_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2);
@@ -33642,6 +33939,28 @@ var aaveV3Encode = {
33642
33939
  } = triggerData;
33643
33940
  var triggerDataEncoded = _triggerService__WEBPACK_IMPORTED_MODULE_5__.aaveV3QuotePriceWithMaximumGasPriceTrigger.encode(baseTokenAddress, quoteTokenAddress, price, ratioState, maximumGasPrice);
33644
33941
  return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
33942
+ },
33943
+ openOrder(strategyOrBundleId) {
33944
+ var isBundle = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
33945
+ var triggerData = arguments.length > 2 ? arguments[2] : undefined;
33946
+ var subData = arguments.length > 3 ? arguments[3] : undefined;
33947
+ var {
33948
+ collAsset,
33949
+ collAssetId,
33950
+ debtAsset,
33951
+ debtAssetId,
33952
+ marketAddr,
33953
+ targetRatio
33954
+ } = subData;
33955
+ var subDataEncoded = _subDataService__WEBPACK_IMPORTED_MODULE_4__.aaveV3OpenOrderSubData.encode(collAsset, collAssetId, debtAsset, debtAssetId, marketAddr, targetRatio);
33956
+ var {
33957
+ baseTokenAddress,
33958
+ quoteTokenAddress,
33959
+ price,
33960
+ state
33961
+ } = triggerData;
33962
+ var triggerDataEncoded = _triggerService__WEBPACK_IMPORTED_MODULE_5__.aaveV3QuotePriceTrigger.encode(baseTokenAddress, quoteTokenAddress, price, state);
33963
+ return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
33645
33964
  }
33646
33965
  };
33647
33966
  var compoundV2Encode = {
@@ -33716,6 +34035,26 @@ var crvUSDEncode = {
33716
34035
  var strategyOrBundleId = ratioState === _types_enums__WEBPACK_IMPORTED_MODULE_2__.RatioState.OVER ? _types_enums__WEBPACK_IMPORTED_MODULE_2__.Bundles.MainnetIds.CRVUSD_BOOST : _types_enums__WEBPACK_IMPORTED_MODULE_2__.Bundles.MainnetIds.CRVUSD_REPAY;
33717
34036
  var isBundle = true;
33718
34037
  return [strategyOrBundleId, isBundle, triggerData, subData];
34038
+ },
34039
+ payback(proxyAddress, addressToPullTokensFrom, positionOwner, paybackAmount, crvUSDAddr, controllerAddr, minHealthRatio) {
34040
+ var subData = _subDataService__WEBPACK_IMPORTED_MODULE_4__.crvUSDPaybackSubData.encode(controllerAddr, addressToPullTokensFrom, positionOwner, paybackAmount, crvUSDAddr);
34041
+ var triggerData = _triggerService__WEBPACK_IMPORTED_MODULE_5__.crvUsdHealthRatioTrigger.encode(proxyAddress, controllerAddr, minHealthRatio);
34042
+ var strategyId = _types_enums__WEBPACK_IMPORTED_MODULE_2__.Strategies.MainnetIds.CURVEUSD_PAYBACK;
34043
+ var isBundle = false;
34044
+ return [strategyId, isBundle, triggerData, subData];
34045
+ }
34046
+ };
34047
+ var morphoBlueEncode = {
34048
+ leverageManagement(marketId, loanToken, collToken, oracle, irm, lltv, ratioState, targetRatio, triggerRatio, user, isEOA) {
34049
+ var subData = _subDataService__WEBPACK_IMPORTED_MODULE_4__.morphoBlueLeverageManagementSubData.encode(loanToken, collToken, oracle, irm, lltv, ratioState, targetRatio, user, isEOA);
34050
+ var triggerData = _triggerService__WEBPACK_IMPORTED_MODULE_5__.morphoBlueRatioTrigger.encode(marketId, user, triggerRatio, ratioState);
34051
+
34052
+ // over is boost, under is repay
34053
+ var isBoost = ratioState === _types_enums__WEBPACK_IMPORTED_MODULE_2__.RatioState.OVER;
34054
+ var strategyOrBundleId;
34055
+ if (isBoost) strategyOrBundleId = isEOA ? _types_enums__WEBPACK_IMPORTED_MODULE_2__.Bundles.MainnetIds.MORPHO_BLUE_EOA_BOOST : _types_enums__WEBPACK_IMPORTED_MODULE_2__.Bundles.MainnetIds.MORPHO_BLUE_BOOST;else strategyOrBundleId = isEOA ? _types_enums__WEBPACK_IMPORTED_MODULE_2__.Bundles.MainnetIds.MORPHO_BLUE_EOA_REPAY : _types_enums__WEBPACK_IMPORTED_MODULE_2__.Bundles.MainnetIds.MORPHO_BLUE_REPAY;
34056
+ var isBundle = true;
34057
+ return [strategyOrBundleId, isBundle, triggerData, subData];
33719
34058
  }
33720
34059
  };
33721
34060