@defisaver/automation-sdk 3.0.0 → 3.0.1

package/src/automation/private/StrategiesAutomation.ts

@@ -10,7 +10,7 @@ import type {
 import type { ChainId } from '../../types/enums';
 import { Strategies, ProtocolIdentifiers } from '../../types/enums';
 
-import { addToObjectIf, isDefined } from '../../services/utils';
+import { addToObjectIf, isDefined, isUndefined } from '../../services/utils';
 import { getAbiItem, makeSubStorageContract } from '../../services/contractService';
 import { getEventsFromContract, multicall } from '../../services/ethereumService';
 import { parseStrategiesAutomatedPosition } from '../../services/strategiesService';
@@ -122,6 +122,52 @@ export default class StrategiesAutomation extends Automation {
       );
   }
 
+  protected mergeSubs(_subscriptions:(Position.Automated | null)[]) {
+    const mergeBase = _subscriptions.filter(s => isDefined(s) && isDefined(s.specific.mergeWithId)) as Position.Automated[];
+    const mergeExtension = _subscriptions.filter(s => isDefined(s) && isDefined(s.specific.mergeId)) as Position.Automated[];
+
+    let subscriptions:Position.Automated[] = (_subscriptions.filter(s => isDefined(s) && isUndefined(s.specific.mergeWithId) && isUndefined(s.specific.mergeId)) as Position.Automated[]).map((s) => ({
+      ...s,
+      subIds: [s.subId],
+    }));
+    mergeBase.forEach((current) => {
+      const mergePairIndexSubEnabled = mergeExtension.findIndex(s => this._mergeCheck(s, current) && s.isEnabled === current.isEnabled);
+      const mergePairIndexSubDisabled = mergeExtension.findIndex(s => this._mergeCheck(s, current));
+
+      const mergePairIndex = mergePairIndexSubEnabled !== -1 ? mergePairIndexSubEnabled : mergePairIndexSubDisabled;
+
+      if (mergePairIndex !== -1) {
+        const mergePair = mergeExtension[mergePairIndex];
+        mergeExtension.splice(mergePairIndex, 1);
+        subscriptions.push({
+          ...mergePair,
+          ...current,
+          // @ts-ignore
+          blockNumber: Dec.max(mergePair.blockNumber, current.blockNumber).toNumber(),
+          subIds: [current.subId, mergePair.subId],
+          isEnabled: mergePair.isEnabled || current.isEnabled,
+          specific: {
+            ...mergePair.specific,
+            ...current.specific,
+          },
+        });
+      } else {
+        subscriptions.push({
+          ...current,
+          subIds: [current.subId],
+        });
+      }
+    });
+    if (mergeExtension.length > 0) {
+      console.error('Not all merge-able extensions were used', mergeExtension);
+      subscriptions = [...subscriptions, ...mergeExtension.map((s) => ({
+        ...s,
+        subIds: [s.subId],
+      }))];
+    }
+    return subscriptions;
+  }
+
   protected async _getSubscriptions(addresses?: EthereumAddress[], options?: SubscriptionOptions): Promise<(Position.Automated | null)[]> {
     const _options = {
       ...addToObjectIf(isDefined(options), options),
@@ -169,46 +215,8 @@ export default class StrategiesAutomation extends Automation {
         });
       }));
 
-      if (options?.mergeWithSameId) {
-        const mergeBase = subscriptions.filter(s => isDefined(s) && s.specific.mergeWithId) as Position.Automated[];
-        const mergeExtension = subscriptions.filter(s => isDefined(s) && s.specific.mergeId) as Position.Automated[];
-
-        subscriptions = (subscriptions.filter(s => isDefined(s) && !s?.specific.mergeWithId && !s?.specific.mergeId) as Position.Automated[]).map((s) => ({
-          ...s,
-          subIds: [s.subId],
-        }));
-        mergeBase.forEach((current) => {
-          const mergePairIndexWithEnabledCheck = mergeExtension.findIndex(s => this._mergeCheck(s, current) && s.isEnabled === current.isEnabled);
-          const mergePairIndexWithoutEnabledCheck = mergeExtension.findIndex(s => this._mergeCheck(s, current));
-
-          const mergePairIndex = mergePairIndexWithEnabledCheck !== -1 ? mergePairIndexWithEnabledCheck : mergePairIndexWithoutEnabledCheck;
-
-          if (mergePairIndex !== -1) {
-            const mergePair = mergeExtension[mergePairIndex];
-            mergeExtension.splice(mergePairIndex, 1);
-            subscriptions.push({
-              ...mergePair,
-              ...current,
-              // @ts-ignore
-              blockNumber: Dec.max(mergePair.blockNumber, current.blockNumber).toNumber(),
-              subIds: [current.subId, mergePair.subId],
-              isEnabled: mergePair.isEnabled || current.isEnabled,
-              specific: {
-                ...mergePair.specific,
-                ...current.specific,
-              },
-            });
-          } else {
-            subscriptions.push(current);
-          }
-        });
-        if (mergeExtension.length > 0) {
-          console.error('Not all merge-able extensions were used', mergeExtension);
-          subscriptions = [...subscriptions, ...mergeExtension.map((s) => ({
-            ...s,
-            subIds: [s.subId],
-          }))];
-        }
+      if (options?.mergeSubs) {
+        subscriptions = this.mergeSubs(subscriptions);
       }
     }
 

package/src/types/index.ts

@@ -64,7 +64,7 @@ export declare namespace Multicall {
 interface _SubscriptionOptions {
   toBlock: BlockNumber,
   fromBlock: BlockNumber,
-  mergeWithSameId: boolean,
+  mergeSubs: boolean,
   enabledOnly: boolean,
   unexpiredOnly: boolean,
 }

package/umd/index.js

@@ -1522,6 +1522,40 @@ class StrategiesAutomation extends _Automation__WEBPACK_IMPORTED_MODULE_6__["def
     || 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());
   }
+  mergeSubs(_subscriptions) {
+    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));
+    var mergeExtension = _subscriptions.filter(s => (0,_services_utils__WEBPACK_IMPORTED_MODULE_2__.isDefined)(s) && (0,_services_utils__WEBPACK_IMPORTED_MODULE_2__.isDefined)(s.specific.mergeId));
+    var subscriptions = _subscriptions.filter(s => (0,_services_utils__WEBPACK_IMPORTED_MODULE_2__.isDefined)(s) && (0,_services_utils__WEBPACK_IMPORTED_MODULE_2__.isUndefined)(s.specific.mergeWithId) && (0,_services_utils__WEBPACK_IMPORTED_MODULE_2__.isUndefined)(s.specific.mergeId)).map(s => _objectSpread(_objectSpread({}, s), {}, {
+      subIds: [s.subId]
+    }));
+    mergeBase.forEach(current => {
+      var mergePairIndexSubEnabled = mergeExtension.findIndex(s => this._mergeCheck(s, current) && s.isEnabled === current.isEnabled);
+      var mergePairIndexSubDisabled = mergeExtension.findIndex(s => this._mergeCheck(s, current));
+      var mergePairIndex = mergePairIndexSubEnabled !== -1 ? mergePairIndexSubEnabled : mergePairIndexSubDisabled;
+      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 {
+        subscriptions.push(_objectSpread(_objectSpread({}, current), {}, {
+          subIds: [current.subId]
+        }));
+      }
+    });
+    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 subscriptions;
+  }
   _getSubscriptions(addresses, options) {
     var _this5 = this;
     return _asyncToGenerator(function* () {
@@ -1566,36 +1600,8 @@ class StrategiesAutomation extends _Automation__WEBPACK_IMPORTED_MODULE_6__["def
             return _ref.apply(this, arguments);
           };
         }()));
-        if (options !== null && options !== void 0 && options.mergeWithSameId) {
-          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 {
-              subscriptions.push(current);
-            }
-          });
-          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]
-            }))];
-          }
+        if (options !== null && options !== void 0 && options.mergeSubs) {
+          subscriptions = _this5.mergeSubs(subscriptions);
         }
       }
       return _options.unexpiredOnly ? _this5.removeExpiredSubscriptions(subscriptions) : subscriptions;