@defisaver/automation-sdk 3.0.1 → 3.0.2

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.js

@@ -30,7 +30,13 @@ class StrategiesAutomation extends Automation_1.default {
         this.assert();
     }
     getEventFromSubStorage(event, options) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            // only used for backfilling, so in case options?.fromBlock in undefined
+            // (just like we omit fromBlock when we call from app when not on fork), we still want to fetch events
+            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()) || this.subStorageContract.createdBlock.toString())) {
+                return [];
+            }
             return (0, ethereumService_1.getEventsFromContract)(this.subStorageContract, this.subStorageContractFork, event, options);
         });
     }
@@ -95,7 +101,9 @@ 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));

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

@@ -1 +1 @@
-export {};
+import '../../configuration';