@defisaver/automation-sdk 3.0.2-dev → 3.0.2

package/esm/automation/private/StrategiesAutomation.js

@@ -32,7 +32,9 @@ class StrategiesAutomation extends Automation_1.default {
     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)) {
+            // 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);

package/esm/services/strategiesService.js

@@ -520,6 +520,7 @@ function parseCrvUSDLeverageManagement(position, parseData) {
     const subData = subDataService.crvUSDLeverageManagementSubData.decode(subStruct.subData);
     _position.strategyData.decoded.triggerData = triggerData;
     _position.strategyData.decoded.subData = subData;
+    _position.positionId = (0, utils_1.getPositionId)(_position.chainId, _position.protocol.id, _position.owner, triggerData.controller);
     const isRepay = _position.strategy.strategyId === enums_1.Strategies.Identifiers.Repay;
     if (isRepay) {
         _position.specific = {
@@ -541,7 +542,6 @@ function parseCrvUSDLeverageManagement(position, parseData) {
             mergeId: enums_1.Strategies.Identifiers.Boost,
         };
     }
-    _position.positionId = (0, utils_1.getPositionId)(_position.chainId, _position.protocol.id, _position.owner, triggerData.controller);
     _position.strategy.strategyId = enums_1.Strategies.IdOverrides.LeverageManagement;
     return _position;
 }
@@ -553,6 +553,7 @@ function parseMorphoBlueLeverageManagement(position, parseData) {
     const subData = subDataService.morphoBlueLeverageManagementSubData.decode(subStruct.subData);
     _position.strategyData.decoded.triggerData = triggerData;
     _position.strategyData.decoded.subData = subData;
+    _position.positionId = (0, utils_1.getPositionId)(_position.chainId, _position.protocol.id, _position.owner, triggerData.marketId);
     const isRepay = _position.strategy.strategyId === enums_1.Strategies.Identifiers.Repay;
     if (isRepay) {
         _position.specific = {
@@ -574,7 +575,6 @@ function parseMorphoBlueLeverageManagement(position, parseData) {
             mergeId: enums_1.Strategies.Identifiers.Boost,
         };
     }
-    _position.positionId = (0, utils_1.getPositionId)(_position.chainId, _position.protocol.id, _position.owner, triggerData.marketId);
     _position.strategy.strategyId = enums_1.Strategies.IdOverrides.LeverageManagement;
     return _position;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/automation-sdk",
-  "version": "3.0.2-dev",
+  "version": "3.0.2",
   "description": "",
   "main": "./umd/index.js",
   "module": "./esm/index.js",

package/src/automation/private/StrategiesAutomation.ts

@@ -46,7 +46,9 @@ export default class StrategiesAutomation extends Automation {
   }
 
   protected async getEventFromSubStorage(event: string, options?: PastEventOptions) {
-    if (new Dec(this.subStorageContract.createdBlock.toString()).gt(options?.fromBlock?.toString() || 0)) {
+    // 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 Dec(this.subStorageContract.createdBlock.toString()).gt(options?.fromBlock?.toString() || this.subStorageContract.createdBlock.toString())) {
       return [];
     }
     return getEventsFromContract<SubStorage>(this.subStorageContract, this.subStorageContractFork, event, options);

package/src/services/ethereumService.ts

@@ -66,4 +66,4 @@ export async function getEventsFromContract<T extends BaseContract>(
   }
 
   return [...events, ...eventsFork];
-}
+}

package/src/services/strategiesService.ts

@@ -692,7 +692,10 @@ function parseCrvUSDLeverageManagement(position: Position.Automated, parseData:
   _position.strategyData.decoded.triggerData = triggerData;
   _position.strategyData.decoded.subData = subData;
 
+  _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, triggerData.controller);
+
   const isRepay = _position.strategy.strategyId === Strategies.Identifiers.Repay;
+
   if (isRepay) {
     _position.specific = {
       triggerRepayRatio: triggerData.ratio,
@@ -713,7 +716,6 @@ function parseCrvUSDLeverageManagement(position: Position.Automated, parseData:
     };
   }
 
-  _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, triggerData.controller);
   _position.strategy.strategyId = Strategies.IdOverrides.LeverageManagement;
 
   return _position;
@@ -729,6 +731,9 @@ function parseMorphoBlueLeverageManagement(position: Position.Automated, parseDa
 
   _position.strategyData.decoded.triggerData = triggerData;
   _position.strategyData.decoded.subData = subData;
+
+  _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, triggerData.marketId);
+
   const isRepay = _position.strategy.strategyId === Strategies.Identifiers.Repay;
 
   if (isRepay) {
@@ -751,7 +756,6 @@ function parseMorphoBlueLeverageManagement(position: Position.Automated, parseDa
     };
   }
 
-  _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, triggerData.marketId);
   _position.strategy.strategyId = Strategies.IdOverrides.LeverageManagement;
 
   return _position;

package/umd/index.js

@@ -1465,7 +1465,9 @@ class StrategiesAutomation extends _Automation__WEBPACK_IMPORTED_MODULE_6__["def
     var _this = this;
     return _asyncToGenerator(function* () {
       var _options$fromBlock;
-      if (new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(_this.subStorageContract.createdBlock.toString()).gt((options === null || options === void 0 ? void 0 : (_options$fromBlock = options.fromBlock) === null || _options$fromBlock === void 0 ? void 0 : _options$fromBlock.toString()) || 0)) {
+      // 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__WEBPACK_IMPORTED_MODULE_0___default())(_this.subStorageContract.createdBlock.toString()).gt((options === null || options === void 0 ? void 0 : (_options$fromBlock = options.fromBlock) === null || _options$fromBlock === void 0 ? void 0 : _options$fromBlock.toString()) || _this.subStorageContract.createdBlock.toString())) {
         return [];
       }
       return (0,_services_ethereumService__WEBPACK_IMPORTED_MODULE_4__.getEventsFromContract)(_this.subStorageContract, _this.subStorageContractFork, event, options);
@@ -2227,6 +2229,7 @@ function parseCrvUSDLeverageManagement(position, parseData) {
   var subData = _subDataService__WEBPACK_IMPORTED_MODULE_5__.crvUSDLeverageManagementSubData.decode(subStruct.subData);
   _position.strategyData.decoded.triggerData = triggerData;
   _position.strategyData.decoded.subData = subData;
+  _position.positionId = (0,_utils__WEBPACK_IMPORTED_MODULE_4__.getPositionId)(_position.chainId, _position.protocol.id, _position.owner, triggerData.controller);
   var isRepay = _position.strategy.strategyId === _types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.Repay;
   if (isRepay) {
     _position.specific = {
@@ -2247,7 +2250,6 @@ function parseCrvUSDLeverageManagement(position, parseData) {
       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;
   return _position;
 }
@@ -2265,6 +2267,7 @@ function parseMorphoBlueLeverageManagement(position, parseData) {
   var subData = _subDataService__WEBPACK_IMPORTED_MODULE_5__.morphoBlueLeverageManagementSubData.decode(subStruct.subData);
   _position.strategyData.decoded.triggerData = triggerData;
   _position.strategyData.decoded.subData = subData;
+  _position.positionId = (0,_utils__WEBPACK_IMPORTED_MODULE_4__.getPositionId)(_position.chainId, _position.protocol.id, _position.owner, triggerData.marketId);
   var isRepay = _position.strategy.strategyId === _types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.Repay;
   if (isRepay) {
     _position.specific = {
@@ -2285,7 +2288,6 @@ function parseMorphoBlueLeverageManagement(position, parseData) {
       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.marketId);
   _position.strategy.strategyId = _types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.IdOverrides.LeverageManagement;
   return _position;
 }