@defisaver/automation-sdk 3.0.0 → 3.0.2-dev

package/.env.dev

@@ -2,4 +2,4 @@
 RPC_1=
 RPC_10=
 RPC_8453=
-RPC_42161=
+RPC_42161=

package/README.md

@@ -15,10 +15,10 @@ const ethereumStrategies = new EthereumStrategies({
 const subscriptions = await ethereumStrategies.getSubscriptionsFor(
   // Pass one or multiple owner addresses, or use getSubscriptions method to fetch all subscriptions
   ['0x000000000000000000000000000000000000dEaD'],
-  { 
+  {
     fromBlock: 0,
     toBlock: 'latest',
-    mergeWithSameId: true, // Used for merging subscriptions with same strategy ID (e.g. boost and repay)
+    mergeSubs: true, // Used for merging subscriptions with same strategy ID (e.g. boost and repay)
     enabledOnly: true,
     unexpiredOnly: true, // Referring to exchange subscriptions
   }
@@ -38,4 +38,4 @@ const subscriptions = await ethereumStrategies.getSubscriptionsFor(
 - Write parsing for the strategy in `./src/services/strategeiesService.ts` and add assign it to `const parsingMethodsMapping`
 - Write tests for each method
 - Run tests with `yarn test` or `yarn test fileName` for a specific file (e.g. `yarn test utils`)
-- Congrats! 🥳
+- Congrats! 🥳

package/esm/automation/private/LegacyAutomation.js

@@ -83,11 +83,11 @@ class LegacyAutomation extends Automation_1.default {
     }
     getParsedSubscriptions(addresses, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            // Legacy automation was disabled on block 18213086
+            const legacyAutomationSunset = 18213086;
             if (!(options === null || options === void 0 ? 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 ? void 0 : options.fromBlock) && new decimal_js_1.default(options === null || options === void 0 ? void 0 : options.fromBlock.toString()).lt(18213086))) {
+                || ((options === null || options === void 0 ? void 0 : options.fromBlock) && new decimal_js_1.default(options === null || options === void 0 ? void 0 : options.fromBlock.toString()).gte(legacyAutomationSunset))) {
                 return [];
             }
             const subscriptions = yield this._getSubscriptions(addresses, options);

package/esm/automation/private/StrategiesAutomation.d.ts

@@ -25,6 +25,7 @@ export default class StrategiesAutomation extends Automation {
      */
     protected removeExpiredSubscriptions(subscriptions: (Position.Automated | null)[]): (Position.Automated | null)[];
     private _mergeCheck;
+    protected mergeSubs(_subscriptions: (Position.Automated | null)[]): Position.Automated[];
     protected _getSubscriptions(addresses?: EthereumAddress[], options?: SubscriptionOptions): Promise<(Position.Automated | null)[]>;
     getSubscriptions(options?: SubscriptionOptions): Promise<(Position.Automated | null)[]>;
     getSubscriptionsFor(addresses: EthereumAddress[], options?: SubscriptionOptions): Promise<(Position.Automated | null)[]>;

package/esm/automation/private/StrategiesAutomation.js

@@ -30,7 +30,11 @@ class StrategiesAutomation extends Automation_1.default {
         this.assert();
     }
     getEventFromSubStorage(event, options) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            if (new decimal_js_1.default(this.subStorageContract.createdBlock.toString()).gt(((_a = options === null || options === void 0 ? void 0 : options.fromBlock) === null || _a === void 0 ? void 0 : _a.toString()) || 0)) {
+                return [];
+            }
             return (0, ethereumService_1.getEventsFromContract)(this.subStorageContract, this.subStorageContractFork, event, options);
         });
     }
@@ -95,7 +99,34 @@ class StrategiesAutomation extends Automation_1.default {
             && (s.protocol.id !== enums_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 !== enums_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());
+                || s.strategyData.decoded.subData.controller.toLowerCase() === current.strategyData.decoded.triggerData.controller.toLowerCase())
+            && (s.protocol.id !== enums_1.ProtocolIdentifiers.StrategiesAutomation.MorphoBlue // merge morpho blue with the same marketId
+                || s.strategyData.decoded.triggerData.marketId.toLowerCase() === current.strategyData.decoded.triggerData.marketId.toLowerCase());
+    }
+    mergeSubs(_subscriptions) {
+        const mergeBase = _subscriptions.filter(s => (0, utils_1.isDefined)(s) && (0, utils_1.isDefined)(s.specific.mergeWithId));
+        const mergeExtension = _subscriptions.filter(s => (0, utils_1.isDefined)(s) && (0, utils_1.isDefined)(s.specific.mergeId));
+        let subscriptions = _subscriptions.filter(s => (0, utils_1.isDefined)(s) && (0, utils_1.isUndefined)(s.specific.mergeWithId) && (0, utils_1.isUndefined)(s.specific.mergeId)).map((s) => (Object.assign(Object.assign({}, 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(Object.assign(Object.assign(Object.assign({}, mergePair), current), { 
+                    // @ts-ignore
+                    blockNumber: decimal_js_1.default.max(mergePair.blockNumber, current.blockNumber).toNumber(), subIds: [current.subId, mergePair.subId], isEnabled: mergePair.isEnabled || current.isEnabled, specific: Object.assign(Object.assign({}, mergePair.specific), current.specific) }));
+            }
+            else {
+                subscriptions.push(Object.assign(Object.assign({}, current), { subIds: [current.subId] }));
+            }
+        });
+        if (mergeExtension.length > 0) {
+            console.error('Not all merge-able extensions were used', mergeExtension);
+            subscriptions = [...subscriptions, ...mergeExtension.map((s) => (Object.assign(Object.assign({}, s), { subIds: [s.subId] })))];
+        }
+        return subscriptions;
     }
     _getSubscriptions(addresses, options) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -127,29 +158,8 @@ class StrategiesAutomation extends Automation_1.default {
                         strategiesSubsData: sub,
                     });
                 })));
-                if (options === null || options === void 0 ? void 0 : options.mergeWithSameId) {
-                    const mergeBase = subscriptions.filter(s => (0, utils_1.isDefined)(s) && s.specific.mergeWithId);
-                    const mergeExtension = subscriptions.filter(s => (0, utils_1.isDefined)(s) && s.specific.mergeId);
-                    subscriptions = subscriptions.filter(s => (0, utils_1.isDefined)(s) && !(s === null || s === void 0 ? void 0 : s.specific.mergeWithId) && !(s === null || s === void 0 ? void 0 : s.specific.mergeId)).map((s) => (Object.assign(Object.assign({}, 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(Object.assign(Object.assign(Object.assign({}, mergePair), current), { 
-                                // @ts-ignore
-                                blockNumber: decimal_js_1.default.max(mergePair.blockNumber, current.blockNumber).toNumber(), subIds: [current.subId, mergePair.subId], isEnabled: mergePair.isEnabled || current.isEnabled, specific: Object.assign(Object.assign({}, 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) => (Object.assign(Object.assign({}, s), { subIds: [s.subId] })))];
-                    }
+                if (options === null || options === void 0 ? void 0 : options.mergeSubs) {
+                    subscriptions = this.mergeSubs(subscriptions);
                 }
             }
             return _options.unexpiredOnly ? this.removeExpiredSubscriptions(subscriptions) : subscriptions;

package/esm/automation/private/StrategiesAutomation.test.d.ts

@@ -0,0 +1 @@
+import '../../configuration';