@defisaver/automation-sdk 3.3.12-strategies-refactor-dev → 3.3.12-strategies-refactor-2-dev

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 (4) hide show
  1. package/cjs/services/strategiesService.js +29 -17
  2. package/esm/services/strategiesService.js +29 -17
  3. package/package.json +1 -1
  4. package/src/services/strategiesService.ts +29 -17
package/cjs/services/strategiesService.js CHANGED
@@ -92,7 +92,7 @@ function parseMakerTrailingStop(position, parseData) {
92
92
  }
93
93
  function parseMakerLeverageManagement(position, parseData) {
94
94
  const _position = (0, lodash_1.cloneDeep)(position);
95
- const { subStruct, subId } = parseData.subscriptionEventData;
95
+ const { subStruct, subId, subHash } = parseData.subscriptionEventData;
96
96
  const { isEnabled } = parseData.strategiesSubsData;
97
97
  const triggerData = triggerService.makerRatioTrigger.decode(subStruct.triggerData);
98
98
  const subData = subDataService.makerLeverageManagementSubData.decode(subStruct.subData);
@@ -104,9 +104,10 @@ function parseMakerLeverageManagement(position, parseData) {
104
104
  _position.specific = {
105
105
  triggerRepayRatio: triggerData.ratio,
106
106
  targetRepayRatio: subData.targetRatio,
107
- repayEnabled: true,
107
+ repayEnabled: isEnabled,
108
108
  subId1: Number(subId),
109
109
  mergeWithId: enums_1.Strategies.Identifiers.Boost,
110
+ subHashRepay: subHash,
110
111
  };
111
112
  }
112
113
  else {
@@ -116,6 +117,7 @@ function parseMakerLeverageManagement(position, parseData) {
116
117
  boostEnabled: isEnabled,
117
118
  subId2: Number(subId),
118
119
  mergeId: enums_1.Strategies.Identifiers.Boost,
120
+ subHashBoost: subHash,
119
121
  };
120
122
  }
121
123
  _position.strategy.strategyId = enums_1.Strategies.IdOverrides.LeverageManagement;
@@ -155,7 +157,7 @@ function parseLiquityTrailingStop(position, parseData) {
155
157
  }
156
158
  function parseAaveV2LeverageManagement(position, parseData) {
157
159
  const _position = (0, lodash_1.cloneDeep)(position);
158
- const { subStruct, subId } = parseData.subscriptionEventData;
160
+ const { subStruct, subId, subHash } = parseData.subscriptionEventData;
159
161
  const { isEnabled } = parseData.strategiesSubsData;
160
162
  const triggerData = triggerService.aaveV2RatioTrigger.decode(subStruct.triggerData);
161
163
  const subData = subDataService.aaveV2LeverageManagementSubData.decode(subStruct.subData);
@@ -167,9 +169,10 @@ function parseAaveV2LeverageManagement(position, parseData) {
167
169
  _position.specific = {
168
170
  triggerRepayRatio: triggerData.ratio,
169
171
  targetRepayRatio: subData.targetRatio,
170
- repayEnabled: true,
172
+ repayEnabled: isEnabled,
171
173
  subId1: Number(subId),
172
174
  mergeWithId: enums_1.Strategies.Identifiers.Boost,
175
+ subHashRepay: subHash,
173
176
  };
174
177
  }
175
178
  else {
@@ -179,6 +182,7 @@ function parseAaveV2LeverageManagement(position, parseData) {
179
182
  boostEnabled: isEnabled,
180
183
  subId2: Number(subId),
181
184
  mergeId: enums_1.Strategies.Identifiers.Boost,
185
+ subHashBoost: subHash,
182
186
  };
183
187
  }
184
188
  _position.strategy.strategyId = enums_1.Strategies.IdOverrides.LeverageManagement;
@@ -406,7 +410,7 @@ function parseAaveV4CollateralSwitch(position, parseData) {
406
410
  }
407
411
  function parseMorphoAaveV2LeverageManagement(position, parseData) {
408
412
  const _position = (0, lodash_1.cloneDeep)(position);
409
- const { subStruct, subId } = parseData.subscriptionEventData;
413
+ const { subStruct, subId, subHash } = parseData.subscriptionEventData;
410
414
  const { isEnabled } = parseData.strategiesSubsData;
411
415
  const triggerData = triggerService.morphoAaveV2RatioTrigger.decode(subStruct.triggerData);
412
416
  const subData = subDataService.morphoAaveV2LeverageManagementSubData.decode(subStruct.subData);
@@ -418,9 +422,10 @@ function parseMorphoAaveV2LeverageManagement(position, parseData) {
418
422
  _position.specific = {
419
423
  triggerRepayRatio: triggerData.ratio,
420
424
  targetRepayRatio: subData.targetRatio,
421
- repayEnabled: true,
425
+ repayEnabled: isEnabled,
422
426
  subId1: Number(subId),
423
427
  mergeWithId: enums_1.Strategies.Identifiers.Boost,
428
+ subHashRepay: subHash,
424
429
  };
425
430
  }
426
431
  else {
@@ -430,6 +435,7 @@ function parseMorphoAaveV2LeverageManagement(position, parseData) {
430
435
  boostEnabled: isEnabled,
431
436
  subId2: Number(subId),
432
437
  mergeId: enums_1.Strategies.Identifiers.Boost,
438
+ subHashBoost: subHash,
433
439
  };
434
440
  }
435
441
  _position.strategy.strategyId = enums_1.Strategies.IdOverrides.LeverageManagement;
@@ -462,7 +468,7 @@ function parseAaveV3CloseOnPriceWithMaximumGasPrice(position, parseData) {
462
468
  }
463
469
  function parseCompoundV2LeverageManagement(position, parseData) {
464
470
  const _position = (0, lodash_1.cloneDeep)(position);
465
- const { subStruct, subId } = parseData.subscriptionEventData;
471
+ const { subStruct, subId, subHash } = parseData.subscriptionEventData;
466
472
  const { isEnabled } = parseData.strategiesSubsData;
467
473
  const triggerData = triggerService.compoundV2RatioTrigger.decode(subStruct.triggerData);
468
474
  const subData = subDataService.compoundV2LeverageManagementSubData.decode(subStruct.subData);
@@ -475,9 +481,10 @@ function parseCompoundV2LeverageManagement(position, parseData) {
475
481
  _position.specific = {
476
482
  triggerRepayRatio: triggerData.ratio,
477
483
  targetRepayRatio: subData.targetRatio,
478
- repayEnabled: true,
484
+ repayEnabled: isEnabled,
479
485
  subId1: Number(subId),
480
486
  mergeWithId: enums_1.Strategies.Identifiers.Boost,
487
+ subHashRepay: subHash,
481
488
  };
482
489
  }
483
490
  else {
@@ -487,6 +494,7 @@ function parseCompoundV2LeverageManagement(position, parseData) {
487
494
  boostEnabled: isEnabled,
488
495
  subId2: Number(subId),
489
496
  mergeId: enums_1.Strategies.Identifiers.Boost,
497
+ subHashBoost: subHash,
490
498
  };
491
499
  }
492
500
  const isEOA = _position.strategy.strategyId.includes('eoa');
@@ -495,11 +503,9 @@ function parseCompoundV2LeverageManagement(position, parseData) {
495
503
  }
496
504
  function parseCompoundV3LeverageManagement(position, parseData) {
497
505
  const _position = (0, lodash_1.cloneDeep)(position);
498
- const { subStruct, subId } = parseData.subscriptionEventData;
506
+ const { subStruct, subId, subHash } = parseData.subscriptionEventData;
499
507
  const { isEnabled } = parseData.strategiesSubsData;
500
- const subDataDecoder = position.chainId !== 1
501
- ? subDataService.compoundV3L2LeverageManagementSubData
502
- : subDataService.compoundV3LeverageManagementSubData;
508
+ const subDataDecoder = subDataService.compoundV3LeverageManagementSubDataWithoutSubProxy;
503
509
  const triggerData = triggerService.compoundV3RatioTrigger.decode(subStruct.triggerData);
504
510
  const subData = subDataDecoder.decode(subStruct.subData);
505
511
  _position.strategyData.decoded.triggerData = triggerData;
@@ -511,9 +517,10 @@ function parseCompoundV3LeverageManagement(position, parseData) {
511
517
  _position.specific = {
512
518
  triggerRepayRatio: triggerData.ratio,
513
519
  targetRepayRatio: subData.targetRatio,
514
- repayEnabled: true,
520
+ repayEnabled: isEnabled,
515
521
  subId1: Number(subId),
516
522
  mergeWithId: isEOA ? enums_1.Strategies.Identifiers.EoaBoost : enums_1.Strategies.Identifiers.Boost,
523
+ subHashRepay: subHash,
517
524
  };
518
525
  }
519
526
  else {
@@ -523,6 +530,7 @@ function parseCompoundV3LeverageManagement(position, parseData) {
523
530
  boostEnabled: isEnabled,
524
531
  subId2: Number(subId),
525
532
  mergeId: isEOA ? enums_1.Strategies.Identifiers.EoaBoost : enums_1.Strategies.Identifiers.Boost,
533
+ subHashBoost: subHash,
526
534
  };
527
535
  }
528
536
  _position.strategy.strategyId = isEOA ? enums_1.Strategies.IdOverrides.EoaLeverageManagement : enums_1.Strategies.IdOverrides.LeverageManagement;
@@ -610,7 +618,7 @@ function parseExchangeLimitOrder(position, parseData, chainId) {
610
618
  }
611
619
  function parseLiquityLeverageManagement(position, parseData) {
612
620
  const _position = (0, lodash_1.cloneDeep)(position);
613
- const { subStruct, subId } = parseData.subscriptionEventData;
621
+ const { subStruct, subId, subHash } = parseData.subscriptionEventData;
614
622
  const { isEnabled } = parseData.strategiesSubsData;
615
623
  const triggerData = triggerService.liquityRatioTrigger.decode(subStruct.triggerData);
616
624
  const subData = subDataService.liquityLeverageManagementSubData.decode(subStruct.subData);
@@ -622,9 +630,10 @@ function parseLiquityLeverageManagement(position, parseData) {
622
630
  _position.specific = {
623
631
  triggerRepayRatio: triggerData.ratio,
624
632
  targetRepayRatio: subData.targetRatio,
625
- repayEnabled: true,
633
+ repayEnabled: isEnabled,
626
634
  subId1: Number(subId),
627
635
  mergeWithId: enums_1.Strategies.Identifiers.Boost,
636
+ subHashRepay: subHash,
628
637
  };
629
638
  }
630
639
  else {
@@ -634,6 +643,7 @@ function parseLiquityLeverageManagement(position, parseData) {
634
643
  boostEnabled: isEnabled,
635
644
  subId2: Number(subId),
636
645
  mergeId: enums_1.Strategies.Identifiers.Boost,
646
+ subHashBoost: subHash,
637
647
  };
638
648
  }
639
649
  _position.strategy.strategyId = enums_1.Strategies.IdOverrides.LeverageManagement;
@@ -674,7 +684,7 @@ function parseLiquityV2LeverageManagement(position, parseData) {
674
684
  }
675
685
  function parseSparkLeverageManagement(position, parseData) {
676
686
  const _position = (0, lodash_1.cloneDeep)(position);
677
- const { subStruct, subId } = parseData.subscriptionEventData;
687
+ const { subStruct, subId, subHash } = parseData.subscriptionEventData;
678
688
  const { isEnabled } = parseData.strategiesSubsData;
679
689
  const triggerData = triggerService.sparkRatioTrigger.decode(subStruct.triggerData);
680
690
  const subData = subDataService.sparkLeverageManagementSubData.decode(subStruct.subData);
@@ -686,9 +696,10 @@ function parseSparkLeverageManagement(position, parseData) {
686
696
  _position.specific = {
687
697
  triggerRepayRatio: triggerData.ratio,
688
698
  targetRepayRatio: subData.targetRatio,
689
- repayEnabled: true,
699
+ repayEnabled: isEnabled,
690
700
  subId1: Number(subId),
691
701
  mergeWithId: enums_1.Strategies.Identifiers.Boost,
702
+ subHashRepay: subHash,
692
703
  };
693
704
  }
694
705
  else {
@@ -698,6 +709,7 @@ function parseSparkLeverageManagement(position, parseData) {
698
709
  boostEnabled: isEnabled,
699
710
  subId2: Number(subId),
700
711
  mergeId: enums_1.Strategies.Identifiers.Boost,
712
+ subHashBoost: subHash,
701
713
  };
702
714
  }
703
715
  _position.strategy.strategyId = enums_1.Strategies.IdOverrides.LeverageManagement;
package/esm/services/strategiesService.js CHANGED
@@ -63,7 +63,7 @@ function parseMakerTrailingStop(position, parseData) {
63
63
  }
64
64
  function parseMakerLeverageManagement(position, parseData) {
65
65
  const _position = cloneDeep(position);
66
- const { subStruct, subId } = parseData.subscriptionEventData;
66
+ const { subStruct, subId, subHash } = parseData.subscriptionEventData;
67
67
  const { isEnabled } = parseData.strategiesSubsData;
68
68
  const triggerData = triggerService.makerRatioTrigger.decode(subStruct.triggerData);
69
69
  const subData = subDataService.makerLeverageManagementSubData.decode(subStruct.subData);
@@ -75,9 +75,10 @@ function parseMakerLeverageManagement(position, parseData) {
75
75
  _position.specific = {
76
76
  triggerRepayRatio: triggerData.ratio,
77
77
  targetRepayRatio: subData.targetRatio,
78
- repayEnabled: true,
78
+ repayEnabled: isEnabled,
79
79
  subId1: Number(subId),
80
80
  mergeWithId: Strategies.Identifiers.Boost,
81
+ subHashRepay: subHash,
81
82
  };
82
83
  }
83
84
  else {
@@ -87,6 +88,7 @@ function parseMakerLeverageManagement(position, parseData) {
87
88
  boostEnabled: isEnabled,
88
89
  subId2: Number(subId),
89
90
  mergeId: Strategies.Identifiers.Boost,
91
+ subHashBoost: subHash,
90
92
  };
91
93
  }
92
94
  _position.strategy.strategyId = Strategies.IdOverrides.LeverageManagement;
@@ -126,7 +128,7 @@ function parseLiquityTrailingStop(position, parseData) {
126
128
  }
127
129
  function parseAaveV2LeverageManagement(position, parseData) {
128
130
  const _position = cloneDeep(position);
129
- const { subStruct, subId } = parseData.subscriptionEventData;
131
+ const { subStruct, subId, subHash } = parseData.subscriptionEventData;
130
132
  const { isEnabled } = parseData.strategiesSubsData;
131
133
  const triggerData = triggerService.aaveV2RatioTrigger.decode(subStruct.triggerData);
132
134
  const subData = subDataService.aaveV2LeverageManagementSubData.decode(subStruct.subData);
@@ -138,9 +140,10 @@ function parseAaveV2LeverageManagement(position, parseData) {
138
140
  _position.specific = {
139
141
  triggerRepayRatio: triggerData.ratio,
140
142
  targetRepayRatio: subData.targetRatio,
141
- repayEnabled: true,
143
+ repayEnabled: isEnabled,
142
144
  subId1: Number(subId),
143
145
  mergeWithId: Strategies.Identifiers.Boost,
146
+ subHashRepay: subHash,
144
147
  };
145
148
  }
146
149
  else {
@@ -150,6 +153,7 @@ function parseAaveV2LeverageManagement(position, parseData) {
150
153
  boostEnabled: isEnabled,
151
154
  subId2: Number(subId),
152
155
  mergeId: Strategies.Identifiers.Boost,
156
+ subHashBoost: subHash,
153
157
  };
154
158
  }
155
159
  _position.strategy.strategyId = Strategies.IdOverrides.LeverageManagement;
@@ -377,7 +381,7 @@ function parseAaveV4CollateralSwitch(position, parseData) {
377
381
  }
378
382
  function parseMorphoAaveV2LeverageManagement(position, parseData) {
379
383
  const _position = cloneDeep(position);
380
- const { subStruct, subId } = parseData.subscriptionEventData;
384
+ const { subStruct, subId, subHash } = parseData.subscriptionEventData;
381
385
  const { isEnabled } = parseData.strategiesSubsData;
382
386
  const triggerData = triggerService.morphoAaveV2RatioTrigger.decode(subStruct.triggerData);
383
387
  const subData = subDataService.morphoAaveV2LeverageManagementSubData.decode(subStruct.subData);
@@ -389,9 +393,10 @@ function parseMorphoAaveV2LeverageManagement(position, parseData) {
389
393
  _position.specific = {
390
394
  triggerRepayRatio: triggerData.ratio,
391
395
  targetRepayRatio: subData.targetRatio,
392
- repayEnabled: true,
396
+ repayEnabled: isEnabled,
393
397
  subId1: Number(subId),
394
398
  mergeWithId: Strategies.Identifiers.Boost,
399
+ subHashRepay: subHash,
395
400
  };
396
401
  }
397
402
  else {
@@ -401,6 +406,7 @@ function parseMorphoAaveV2LeverageManagement(position, parseData) {
401
406
  boostEnabled: isEnabled,
402
407
  subId2: Number(subId),
403
408
  mergeId: Strategies.Identifiers.Boost,
409
+ subHashBoost: subHash,
404
410
  };
405
411
  }
406
412
  _position.strategy.strategyId = Strategies.IdOverrides.LeverageManagement;
@@ -433,7 +439,7 @@ function parseAaveV3CloseOnPriceWithMaximumGasPrice(position, parseData) {
433
439
  }
434
440
  function parseCompoundV2LeverageManagement(position, parseData) {
435
441
  const _position = cloneDeep(position);
436
- const { subStruct, subId } = parseData.subscriptionEventData;
442
+ const { subStruct, subId, subHash } = parseData.subscriptionEventData;
437
443
  const { isEnabled } = parseData.strategiesSubsData;
438
444
  const triggerData = triggerService.compoundV2RatioTrigger.decode(subStruct.triggerData);
439
445
  const subData = subDataService.compoundV2LeverageManagementSubData.decode(subStruct.subData);
@@ -446,9 +452,10 @@ function parseCompoundV2LeverageManagement(position, parseData) {
446
452
  _position.specific = {
447
453
  triggerRepayRatio: triggerData.ratio,
448
454
  targetRepayRatio: subData.targetRatio,
449
- repayEnabled: true,
455
+ repayEnabled: isEnabled,
450
456
  subId1: Number(subId),
451
457
  mergeWithId: Strategies.Identifiers.Boost,
458
+ subHashRepay: subHash,
452
459
  };
453
460
  }
454
461
  else {
@@ -458,6 +465,7 @@ function parseCompoundV2LeverageManagement(position, parseData) {
458
465
  boostEnabled: isEnabled,
459
466
  subId2: Number(subId),
460
467
  mergeId: Strategies.Identifiers.Boost,
468
+ subHashBoost: subHash,
461
469
  };
462
470
  }
463
471
  const isEOA = _position.strategy.strategyId.includes('eoa');
@@ -466,11 +474,9 @@ function parseCompoundV2LeverageManagement(position, parseData) {
466
474
  }
467
475
  function parseCompoundV3LeverageManagement(position, parseData) {
468
476
  const _position = cloneDeep(position);
469
- const { subStruct, subId } = parseData.subscriptionEventData;
477
+ const { subStruct, subId, subHash } = parseData.subscriptionEventData;
470
478
  const { isEnabled } = parseData.strategiesSubsData;
471
- const subDataDecoder = position.chainId !== 1
472
- ? subDataService.compoundV3L2LeverageManagementSubData
473
- : subDataService.compoundV3LeverageManagementSubData;
479
+ const subDataDecoder = subDataService.compoundV3LeverageManagementSubDataWithoutSubProxy;
474
480
  const triggerData = triggerService.compoundV3RatioTrigger.decode(subStruct.triggerData);
475
481
  const subData = subDataDecoder.decode(subStruct.subData);
476
482
  _position.strategyData.decoded.triggerData = triggerData;
@@ -482,9 +488,10 @@ function parseCompoundV3LeverageManagement(position, parseData) {
482
488
  _position.specific = {
483
489
  triggerRepayRatio: triggerData.ratio,
484
490
  targetRepayRatio: subData.targetRatio,
485
- repayEnabled: true,
491
+ repayEnabled: isEnabled,
486
492
  subId1: Number(subId),
487
493
  mergeWithId: isEOA ? Strategies.Identifiers.EoaBoost : Strategies.Identifiers.Boost,
494
+ subHashRepay: subHash,
488
495
  };
489
496
  }
490
497
  else {
@@ -494,6 +501,7 @@ function parseCompoundV3LeverageManagement(position, parseData) {
494
501
  boostEnabled: isEnabled,
495
502
  subId2: Number(subId),
496
503
  mergeId: isEOA ? Strategies.Identifiers.EoaBoost : Strategies.Identifiers.Boost,
504
+ subHashBoost: subHash,
497
505
  };
498
506
  }
499
507
  _position.strategy.strategyId = isEOA ? Strategies.IdOverrides.EoaLeverageManagement : Strategies.IdOverrides.LeverageManagement;
@@ -581,7 +589,7 @@ function parseExchangeLimitOrder(position, parseData, chainId) {
581
589
  }
582
590
  function parseLiquityLeverageManagement(position, parseData) {
583
591
  const _position = cloneDeep(position);
584
- const { subStruct, subId } = parseData.subscriptionEventData;
592
+ const { subStruct, subId, subHash } = parseData.subscriptionEventData;
585
593
  const { isEnabled } = parseData.strategiesSubsData;
586
594
  const triggerData = triggerService.liquityRatioTrigger.decode(subStruct.triggerData);
587
595
  const subData = subDataService.liquityLeverageManagementSubData.decode(subStruct.subData);
@@ -593,9 +601,10 @@ function parseLiquityLeverageManagement(position, parseData) {
593
601
  _position.specific = {
594
602
  triggerRepayRatio: triggerData.ratio,
595
603
  targetRepayRatio: subData.targetRatio,
596
- repayEnabled: true,
604
+ repayEnabled: isEnabled,
597
605
  subId1: Number(subId),
598
606
  mergeWithId: Strategies.Identifiers.Boost,
607
+ subHashRepay: subHash,
599
608
  };
600
609
  }
601
610
  else {
@@ -605,6 +614,7 @@ function parseLiquityLeverageManagement(position, parseData) {
605
614
  boostEnabled: isEnabled,
606
615
  subId2: Number(subId),
607
616
  mergeId: Strategies.Identifiers.Boost,
617
+ subHashBoost: subHash,
608
618
  };
609
619
  }
610
620
  _position.strategy.strategyId = Strategies.IdOverrides.LeverageManagement;
@@ -645,7 +655,7 @@ function parseLiquityV2LeverageManagement(position, parseData) {
645
655
  }
646
656
  function parseSparkLeverageManagement(position, parseData) {
647
657
  const _position = cloneDeep(position);
648
- const { subStruct, subId } = parseData.subscriptionEventData;
658
+ const { subStruct, subId, subHash } = parseData.subscriptionEventData;
649
659
  const { isEnabled } = parseData.strategiesSubsData;
650
660
  const triggerData = triggerService.sparkRatioTrigger.decode(subStruct.triggerData);
651
661
  const subData = subDataService.sparkLeverageManagementSubData.decode(subStruct.subData);
@@ -657,9 +667,10 @@ function parseSparkLeverageManagement(position, parseData) {
657
667
  _position.specific = {
658
668
  triggerRepayRatio: triggerData.ratio,
659
669
  targetRepayRatio: subData.targetRatio,
660
- repayEnabled: true,
670
+ repayEnabled: isEnabled,
661
671
  subId1: Number(subId),
662
672
  mergeWithId: Strategies.Identifiers.Boost,
673
+ subHashRepay: subHash,
663
674
  };
664
675
  }
665
676
  else {
@@ -669,6 +680,7 @@ function parseSparkLeverageManagement(position, parseData) {
669
680
  boostEnabled: isEnabled,
670
681
  subId2: Number(subId),
671
682
  mergeId: Strategies.Identifiers.Boost,
683
+ subHashBoost: subHash,
672
684
  };
673
685
  }
674
686
  _position.strategy.strategyId = Strategies.IdOverrides.LeverageManagement;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@defisaver/automation-sdk",
3
- "version": "3.3.12-strategies-refactor-dev",
3
+ "version": "3.3.12-strategies-refactor-2-dev",
4
4
  "description": "",
5
5
  "main": "./cjs/index.js",
6
6
  "module": "./esm/index.js",
package/src/services/strategiesService.ts CHANGED
@@ -102,7 +102,7 @@ function parseMakerTrailingStop(position: Position.Automated, parseData: ParseDa
102
102
  function parseMakerLeverageManagement(position: Position.Automated, parseData: ParseData): Position.Automated {
103
103
  const _position = cloneDeep(position);
104
104
 
105
- const { subStruct, subId } = parseData.subscriptionEventData;
105
+ const { subStruct, subId, subHash } = parseData.subscriptionEventData;
106
106
  const { isEnabled } = parseData.strategiesSubsData;
107
107
 
108
108
  const triggerData = triggerService.makerRatioTrigger.decode(subStruct.triggerData);
@@ -119,9 +119,10 @@ function parseMakerLeverageManagement(position: Position.Automated, parseData: P
119
119
  _position.specific = {
120
120
  triggerRepayRatio: triggerData.ratio,
121
121
  targetRepayRatio: subData.targetRatio,
122
- repayEnabled: true,
122
+ repayEnabled: isEnabled,
123
123
  subId1: Number(subId),
124
124
  mergeWithId: Strategies.Identifiers.Boost,
125
+ subHashRepay: subHash,
125
126
  };
126
127
  } else {
127
128
  _position.specific = {
@@ -130,6 +131,7 @@ function parseMakerLeverageManagement(position: Position.Automated, parseData: P
130
131
  boostEnabled: isEnabled,
131
132
  subId2: Number(subId),
132
133
  mergeId: Strategies.Identifiers.Boost,
134
+ subHashBoost: subHash,
133
135
  };
134
136
  }
135
137
 
@@ -190,7 +192,7 @@ function parseLiquityTrailingStop(position: Position.Automated, parseData: Parse
190
192
  function parseAaveV2LeverageManagement(position: Position.Automated, parseData: ParseData): Position.Automated {
191
193
  const _position = cloneDeep(position);
192
194
 
193
- const { subStruct, subId } = parseData.subscriptionEventData;
195
+ const { subStruct, subId, subHash } = parseData.subscriptionEventData;
194
196
  const { isEnabled } = parseData.strategiesSubsData;
195
197
 
196
198
  const triggerData = triggerService.aaveV2RatioTrigger.decode(subStruct.triggerData);
@@ -207,9 +209,10 @@ function parseAaveV2LeverageManagement(position: Position.Automated, parseData:
207
209
  _position.specific = {
208
210
  triggerRepayRatio: triggerData.ratio,
209
211
  targetRepayRatio: subData.targetRatio,
210
- repayEnabled: true,
212
+ repayEnabled: isEnabled,
211
213
  subId1: Number(subId),
212
214
  mergeWithId: Strategies.Identifiers.Boost,
215
+ subHashRepay: subHash,
213
216
  };
214
217
  } else {
215
218
  _position.specific = {
@@ -218,6 +221,7 @@ function parseAaveV2LeverageManagement(position: Position.Automated, parseData:
218
221
  boostEnabled: isEnabled,
219
222
  subId2: Number(subId),
220
223
  mergeId: Strategies.Identifiers.Boost,
224
+ subHashBoost: subHash,
221
225
  };
222
226
  }
223
227
 
@@ -490,7 +494,7 @@ function parseAaveV4CollateralSwitch(position: Position.Automated, parseData: Pa
490
494
  function parseMorphoAaveV2LeverageManagement(position: Position.Automated, parseData: ParseData): Position.Automated {
491
495
  const _position = cloneDeep(position);
492
496
 
493
- const { subStruct, subId } = parseData.subscriptionEventData;
497
+ const { subStruct, subId, subHash } = parseData.subscriptionEventData;
494
498
  const { isEnabled } = parseData.strategiesSubsData;
495
499
 
496
500
  const triggerData = triggerService.morphoAaveV2RatioTrigger.decode(subStruct.triggerData);
@@ -507,9 +511,10 @@ function parseMorphoAaveV2LeverageManagement(position: Position.Automated, parse
507
511
  _position.specific = {
508
512
  triggerRepayRatio: triggerData.ratio,
509
513
  targetRepayRatio: subData.targetRatio,
510
- repayEnabled: true,
514
+ repayEnabled: isEnabled,
511
515
  subId1: Number(subId),
512
516
  mergeWithId: Strategies.Identifiers.Boost,
517
+ subHashRepay: subHash,
513
518
  };
514
519
  } else {
515
520
  _position.specific = {
@@ -518,6 +523,7 @@ function parseMorphoAaveV2LeverageManagement(position: Position.Automated, parse
518
523
  boostEnabled: isEnabled,
519
524
  subId2: Number(subId),
520
525
  mergeId: Strategies.Identifiers.Boost,
526
+ subHashBoost: subHash,
521
527
  };
522
528
  }
523
529
 
@@ -568,7 +574,7 @@ function parseAaveV3CloseOnPriceWithMaximumGasPrice(position: Position.Automated
568
574
  function parseCompoundV2LeverageManagement(position: Position.Automated, parseData: ParseData): Position.Automated {
569
575
  const _position = cloneDeep(position);
570
576
 
571
- const { subStruct, subId } = parseData.subscriptionEventData;
577
+ const { subStruct, subId, subHash } = parseData.subscriptionEventData;
572
578
  const { isEnabled } = parseData.strategiesSubsData;
573
579
 
574
580
  const triggerData = triggerService.compoundV2RatioTrigger.decode(subStruct.triggerData);
@@ -586,9 +592,10 @@ function parseCompoundV2LeverageManagement(position: Position.Automated, parseDa
586
592
  _position.specific = {
587
593
  triggerRepayRatio: triggerData.ratio,
588
594
  targetRepayRatio: subData.targetRatio,
589
- repayEnabled: true,
595
+ repayEnabled: isEnabled,
590
596
  subId1: Number(subId),
591
597
  mergeWithId: Strategies.Identifiers.Boost,
598
+ subHashRepay: subHash,
592
599
  };
593
600
  } else {
594
601
  _position.specific = {
@@ -597,6 +604,7 @@ function parseCompoundV2LeverageManagement(position: Position.Automated, parseDa
597
604
  boostEnabled: isEnabled,
598
605
  subId2: Number(subId),
599
606
  mergeId: Strategies.Identifiers.Boost,
607
+ subHashBoost: subHash,
600
608
  };
601
609
  }
602
610
 
@@ -609,12 +617,10 @@ function parseCompoundV2LeverageManagement(position: Position.Automated, parseDa
609
617
  function parseCompoundV3LeverageManagement(position: Position.Automated, parseData: ParseData): Position.Automated {
610
618
  const _position = cloneDeep(position);
611
619
 
612
- const { subStruct, subId } = parseData.subscriptionEventData;
620
+ const { subStruct, subId, subHash } = parseData.subscriptionEventData;
613
621
  const { isEnabled } = parseData.strategiesSubsData;
614
622
 
615
- const subDataDecoder = position.chainId !== 1
616
- ? subDataService.compoundV3L2LeverageManagementSubData
617
- : subDataService.compoundV3LeverageManagementSubData;
623
+ const subDataDecoder = subDataService.compoundV3LeverageManagementSubDataWithoutSubProxy;
618
624
 
619
625
  const triggerData = triggerService.compoundV3RatioTrigger.decode(subStruct.triggerData);
620
626
  const subData = subDataDecoder.decode(subStruct.subData);
@@ -632,9 +638,10 @@ function parseCompoundV3LeverageManagement(position: Position.Automated, parseDa
632
638
  _position.specific = {
633
639
  triggerRepayRatio: triggerData.ratio,
634
640
  targetRepayRatio: subData.targetRatio,
635
- repayEnabled: true,
641
+ repayEnabled: isEnabled,
636
642
  subId1: Number(subId),
637
643
  mergeWithId: isEOA ? Strategies.Identifiers.EoaBoost : Strategies.Identifiers.Boost,
644
+ subHashRepay: subHash,
638
645
  };
639
646
  } else {
640
647
  _position.specific = {
@@ -643,6 +650,7 @@ function parseCompoundV3LeverageManagement(position: Position.Automated, parseDa
643
650
  boostEnabled: isEnabled,
644
651
  subId2: Number(subId),
645
652
  mergeId: isEOA ? Strategies.Identifiers.EoaBoost : Strategies.Identifiers.Boost,
653
+ subHashBoost: subHash,
646
654
  };
647
655
  }
648
656
 
@@ -768,7 +776,7 @@ function parseExchangeLimitOrder(position: Position.Automated, parseData: ParseD
768
776
  function parseLiquityLeverageManagement(position: Position.Automated, parseData: ParseData): Position.Automated {
769
777
  const _position = cloneDeep(position);
770
778
 
771
- const { subStruct, subId } = parseData.subscriptionEventData;
779
+ const { subStruct, subId, subHash } = parseData.subscriptionEventData;
772
780
  const { isEnabled } = parseData.strategiesSubsData;
773
781
 
774
782
  const triggerData = triggerService.liquityRatioTrigger.decode(subStruct.triggerData);
@@ -785,9 +793,10 @@ function parseLiquityLeverageManagement(position: Position.Automated, parseData:
785
793
  _position.specific = {
786
794
  triggerRepayRatio: triggerData.ratio,
787
795
  targetRepayRatio: subData.targetRatio,
788
- repayEnabled: true,
796
+ repayEnabled: isEnabled,
789
797
  subId1: Number(subId),
790
798
  mergeWithId: Strategies.Identifiers.Boost,
799
+ subHashRepay: subHash,
791
800
  };
792
801
  } else {
793
802
  _position.specific = {
@@ -796,6 +805,7 @@ function parseLiquityLeverageManagement(position: Position.Automated, parseData:
796
805
  boostEnabled: isEnabled,
797
806
  subId2: Number(subId),
798
807
  mergeId: Strategies.Identifiers.Boost,
808
+ subHashBoost: subHash,
799
809
  };
800
810
  }
801
811
 
@@ -850,7 +860,7 @@ function parseLiquityV2LeverageManagement(position: Position.Automated, parseDat
850
860
  function parseSparkLeverageManagement(position: Position.Automated, parseData: ParseData): Position.Automated {
851
861
  const _position = cloneDeep(position);
852
862
 
853
- const { subStruct, subId } = parseData.subscriptionEventData;
863
+ const { subStruct, subId, subHash } = parseData.subscriptionEventData;
854
864
  const { isEnabled } = parseData.strategiesSubsData;
855
865
 
856
866
  const triggerData = triggerService.sparkRatioTrigger.decode(subStruct.triggerData);
@@ -867,9 +877,10 @@ function parseSparkLeverageManagement(position: Position.Automated, parseData: P
867
877
  _position.specific = {
868
878
  triggerRepayRatio: triggerData.ratio,
869
879
  targetRepayRatio: subData.targetRatio,
870
- repayEnabled: true,
880
+ repayEnabled: isEnabled,
871
881
  subId1: Number(subId),
872
882
  mergeWithId: Strategies.Identifiers.Boost,
883
+ subHashRepay: subHash,
873
884
  };
874
885
  } else {
875
886
  _position.specific = {
@@ -878,6 +889,7 @@ function parseSparkLeverageManagement(position: Position.Automated, parseData: P
878
889
  boostEnabled: isEnabled,
879
890
  subId2: Number(subId),
880
891
  mergeId: Strategies.Identifiers.Boost,
892
+ subHashBoost: subHash,
881
893
  };
882
894
  }
883
895