@defisaver/automation-sdk 2.1.5 → 3.0.0

package/umd/index.js

@@ -1517,6 +1517,11 @@ class StrategiesAutomation extends _Automation__WEBPACK_IMPORTED_MODULE_6__["def
       return true;
     });
   }
+  _mergeCheck(s, current) {
+    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
+    || 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
+    || s.strategyData.decoded.subData.controller.toLowerCase() === current.strategyData.decoded.triggerData.controller.toLowerCase());
+  }
   _getSubscriptions(addresses, options) {
     var _this5 = this;
     return _asyncToGenerator(function* () {
@@ -1562,38 +1567,35 @@ class StrategiesAutomation extends _Automation__WEBPACK_IMPORTED_MODULE_6__["def
           };
         }()));
         if (options !== null && options !== void 0 && options.mergeWithSameId) {
-          subscriptions = subscriptions.reduce((list, current) => {
-            var copyList = [...list];
-            if ((0,_services_utils__WEBPACK_IMPORTED_MODULE_2__.isDefined)(current)) {
-              if (current.specific.mergeWithSameId) {
-                var mergePairIndex = copyList.findIndex(s => s && s.specific.mergeWithSameId && s.owner === current.owner && s.strategy.strategyId === current.strategy.strategyId && s.protocol.id === current.protocol.id && (s.protocol.id !== _types_enums__WEBPACK_IMPORTED_MODULE_1__.ProtocolIdentifiers.StrategiesAutomation.MakerDAO // reflexer needs to get added if we have it
-                || 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
-                || s.strategyData.decoded.subData.controller.toLowerCase() === current.strategyData.decoded.triggerData.controller.toLowerCase()));
-                if (mergePairIndex !== -1) {
-                  var mergePair = copyList[mergePairIndex];
-                  if ((0,_services_utils__WEBPACK_IMPORTED_MODULE_2__.isDefined)(mergePair)) {
-                    copyList[mergePairIndex] = _objectSpread(_objectSpread(_objectSpread({}, mergePair), current), {}, {
-                      // @ts-ignore
-                      blockNumber: decimal_js__WEBPACK_IMPORTED_MODULE_0___default().max(mergePair.blockNumber, current.blockNumber).toNumber(),
-                      subIds: (0,_services_utils__WEBPACK_IMPORTED_MODULE_2__.isDefined)(mergePair.subIds) ? [...mergePair.subIds, current.subId] : undefined,
-                      isEnabled: mergePair.isEnabled || current.isEnabled,
-                      subId: mergePair.subId,
-                      specific: _objectSpread(_objectSpread(_objectSpread({}, mergePair.specific), current.specific), {}, {
-                        mergeWithSameId: false
-                      })
-                    });
-                    return copyList;
-                  }
-                }
-              }
+          var mergeBase = subscriptions.filter(s => (0,_services_utils__WEBPACK_IMPORTED_MODULE_2__.isDefined)(s) && s.specific.mergeWithId);
+          var mergeExtension = subscriptions.filter(s => (0,_services_utils__WEBPACK_IMPORTED_MODULE_2__.isDefined)(s) && s.specific.mergeId);
+          subscriptions = subscriptions.filter(s => (0,_services_utils__WEBPACK_IMPORTED_MODULE_2__.isDefined)(s) && !(s !== null && s !== void 0 && s.specific.mergeWithId) && !(s !== null && s !== void 0 && s.specific.mergeId)).map(s => _objectSpread(_objectSpread({}, s), {}, {
+            subIds: [s.subId]
+          }));
+          mergeBase.forEach(current => {
+            var mergePairIndexWithEnabledCheck = mergeExtension.findIndex(s => _this5._mergeCheck(s, current) && s.isEnabled === current.isEnabled);
+            var mergePairIndexWithoutEnabledCheck = mergeExtension.findIndex(s => _this5._mergeCheck(s, current));
+            var mergePairIndex = mergePairIndexWithEnabledCheck !== -1 ? mergePairIndexWithEnabledCheck : mergePairIndexWithoutEnabledCheck;
+            if (mergePairIndex !== -1) {
+              var mergePair = mergeExtension[mergePairIndex];
+              mergeExtension.splice(mergePairIndex, 1);
+              subscriptions.push(_objectSpread(_objectSpread(_objectSpread({}, mergePair), current), {}, {
+                // @ts-ignore
+                blockNumber: decimal_js__WEBPACK_IMPORTED_MODULE_0___default().max(mergePair.blockNumber, current.blockNumber).toNumber(),
+                subIds: [current.subId, mergePair.subId],
+                isEnabled: mergePair.isEnabled || current.isEnabled,
+                specific: _objectSpread(_objectSpread({}, mergePair.specific), current.specific)
+              }));
             } else {
-              return copyList;
+              subscriptions.push(current);
             }
-            copyList.push(_objectSpread(_objectSpread({}, current), {}, {
-              subIds: [current.subId]
-            }));
-            return copyList;
-          }, []);
+          });
+          if (mergeExtension.length > 0) {
+            console.error('Not all merge-able extensions were used', mergeExtension);
+            subscriptions = [...subscriptions, ...mergeExtension.map(s => _objectSpread(_objectSpread({}, s), {}, {
+              subIds: [s.subId]
+            }))];
+          }
         }
       }
       return _options.unexpiredOnly ? _this5.removeExpiredSubscriptions(subscriptions) : subscriptions;
@@ -1725,18 +1727,19 @@ function parseMakerLeverageManagement(position, parseData) {
       triggerRepayRatio: triggerData.ratio,
       targetRepayRatio: subData.targetRatio,
       repayEnabled: true,
-      subId1: Number(subId)
+      subId1: Number(subId),
+      mergeWithId: _types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.Boost
     };
   } else {
     _position.specific = {
       triggerBoostRatio: triggerData.ratio,
       targetBoostRatio: subData.targetRatio,
       boostEnabled: isEnabled,
-      subId2: Number(subId)
+      subId2: Number(subId),
+      mergeId: _types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.Boost
     };
   }
   _position.strategy.strategyId = _types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.IdOverrides.LeverageManagement;
-  _position.specific.mergeWithSameId = true;
   return _position;
 }
 function parseLiquityCloseOnPrice(position, parseData) {
@@ -1795,18 +1798,19 @@ function parseAaveV2LeverageManagement(position, parseData) {
       triggerRepayRatio: triggerData.ratio,
       targetRepayRatio: subData.targetRatio,
       repayEnabled: true,
-      subId1: Number(subId)
+      subId1: Number(subId),
+      mergeWithId: _types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.Boost
     };
   } else {
     _position.specific = {
       triggerBoostRatio: triggerData.ratio,
       targetBoostRatio: subData.targetRatio,
       boostEnabled: isEnabled,
-      subId2: Number(subId)
+      subId2: Number(subId),
+      mergeId: _types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.Boost
     };
   }
   _position.strategy.strategyId = _types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.IdOverrides.LeverageManagement;
-  _position.specific.mergeWithSameId = true;
   return _position;
 }
 function parseAaveV3LeverageManagement(position, parseData) {
@@ -1829,18 +1833,19 @@ function parseAaveV3LeverageManagement(position, parseData) {
       triggerRepayRatio: triggerData.ratio,
       targetRepayRatio: subData.targetRatio,
       repayEnabled: true,
-      subId1: Number(subId)
+      subId1: Number(subId),
+      mergeWithId: _types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.Boost
     };
   } else {
     _position.specific = {
       triggerBoostRatio: triggerData.ratio,
       targetBoostRatio: subData.targetRatio,
       boostEnabled: isEnabled,
-      subId2: Number(subId)
+      subId2: Number(subId),
+      mergeId: _types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.Boost
     };
   }
   _position.strategy.strategyId = _types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.IdOverrides.LeverageManagement;
-  _position.specific.mergeWithSameId = true;
   return _position;
 }
 function parseMorphoAaveV2LeverageManagement(position, parseData) {
@@ -1863,18 +1868,19 @@ function parseMorphoAaveV2LeverageManagement(position, parseData) {
       triggerRepayRatio: triggerData.ratio,
       targetRepayRatio: subData.targetRatio,
       repayEnabled: true,
-      subId1: Number(subId)
+      subId1: Number(subId),
+      mergeWithId: _types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.Boost
     };
   } else {
     _position.specific = {
       triggerBoostRatio: triggerData.ratio,
       targetBoostRatio: subData.targetRatio,
       boostEnabled: isEnabled,
-      subId2: Number(subId)
+      subId2: Number(subId),
+      mergeId: _types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.Boost
     };
   }
   _position.strategy.strategyId = _types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.IdOverrides.LeverageManagement;
-  _position.specific.mergeWithSameId = true;
   return _position;
 }
 function parseAaveV3CloseOnPrice(position, parseData) {
@@ -1951,18 +1957,19 @@ function parseCompoundV2LeverageManagement(position, parseData) {
       triggerRepayRatio: triggerData.ratio,
       targetRepayRatio: subData.targetRatio,
       repayEnabled: true,
-      subId1: Number(subId)
+      subId1: Number(subId),
+      mergeWithId: _types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.Boost
     };
   } else {
     _position.specific = {
       triggerBoostRatio: triggerData.ratio,
       targetBoostRatio: subData.targetRatio,
       boostEnabled: isEnabled,
-      subId2: Number(subId)
+      subId2: Number(subId),
+      mergeId: _types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.Boost
     };
   }
   _position.strategy.strategyId = _types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.IdOverrides.LeverageManagement;
-  _position.specific.mergeWithSameId = true;
   return _position;
 }
 function parseCompoundV3LeverageManagement(position, parseData) {
@@ -1987,19 +1994,20 @@ function parseCompoundV3LeverageManagement(position, parseData) {
       triggerRepayRatio: triggerData.ratio,
       targetRepayRatio: subData.targetRatio,
       repayEnabled: true,
-      subId1: Number(subId)
+      subId1: Number(subId),
+      mergeWithId: _types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.Boost
     };
   } else {
     _position.specific = {
       triggerBoostRatio: triggerData.ratio,
       targetBoostRatio: subData.targetRatio,
       boostEnabled: isEnabled,
-      subId2: Number(subId)
+      subId2: Number(subId),
+      mergeId: _types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.Boost
     };
   }
   var isEOA = _position.strategy.strategyId.includes('eoa');
   _position.strategy.strategyId = isEOA ? _types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.IdOverrides.EoaLeverageManagement : _types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.IdOverrides.LeverageManagement;
-  _position.specific.mergeWithSameId = true;
   return _position;
 }
 function parseChickenBondsRebond(position, parseData) {
@@ -2071,18 +2079,19 @@ function parseLiquityLeverageManagement(position, parseData) {
       triggerRepayRatio: triggerData.ratio,
       targetRepayRatio: subData.targetRatio,
       repayEnabled: true,
-      subId1: Number(subId)
+      subId1: Number(subId),
+      mergeWithId: _types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.Boost
     };
   } else {
     _position.specific = {
       triggerBoostRatio: triggerData.ratio,
       targetBoostRatio: subData.targetRatio,
       boostEnabled: isEnabled,
-      subId2: Number(subId)
+      subId2: Number(subId),
+      mergeId: _types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.Boost
     };
   }
   _position.strategy.strategyId = _types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.IdOverrides.LeverageManagement;
-  _position.specific.mergeWithSameId = true;
   return _position;
 }
 function parseSparkLeverageManagement(position, parseData) {
@@ -2105,18 +2114,19 @@ function parseSparkLeverageManagement(position, parseData) {
       triggerRepayRatio: triggerData.ratio,
       targetRepayRatio: subData.targetRatio,
       repayEnabled: true,
-      subId1: Number(subId)
+      subId1: Number(subId),
+      mergeWithId: _types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.Boost
     };
   } else {
     _position.specific = {
       triggerBoostRatio: triggerData.ratio,
       targetBoostRatio: subData.targetRatio,
       boostEnabled: isEnabled,
-      subId2: Number(subId)
+      subId2: Number(subId),
+      mergeId: _types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.Boost
     };
   }
   _position.strategy.strategyId = _types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.IdOverrides.LeverageManagement;
-  _position.specific.mergeWithSameId = true;
   return _position;
 }
 function parseSparkCloseOnPrice(position, parseData) {
@@ -2200,7 +2210,8 @@ function parseCrvUSDLeverageManagement(position, parseData) {
       targetRepayRatio: subData.targetRatio,
       repayEnabled: isEnabled,
       subId1: Number(subId),
-      subHashRepay: subHash
+      subHashRepay: subHash,
+      mergeWithId: _types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.Boost
     };
   } else {
     _position.specific = {
@@ -2208,12 +2219,12 @@ function parseCrvUSDLeverageManagement(position, parseData) {
       targetBoostRatio: subData.targetRatio,
       boostEnabled: isEnabled,
       subId2: Number(subId),
-      subHashBoost: subHash
+      subHashBoost: subHash,
+      mergeId: _types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.Boost
     };
   }
   _position.positionId = (0,_utils__WEBPACK_IMPORTED_MODULE_4__.getPositionId)(_position.chainId, _position.protocol.id, _position.owner, triggerData.controller);
   _position.strategy.strategyId = _types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.IdOverrides.LeverageManagement;
-  _position.specific.mergeWithSameId = true;
   return _position;
 }
 var parsingMethodsMapping = {
@@ -19780,7 +19791,6 @@ var compoundV3L2LeverageManagementSubData = {
     return subInput;
   },
   decode(subData) {
-    console.log(subData);
     var ratioWei = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameter('uint256', subData[3]);
     var targetRatio = (0,_utils__WEBPACK_IMPORTED_MODULE_6__.weiToRatioPercentage)(ratioWei);
     return {