@defisaver/automation-sdk 3.0.0 → 3.0.2-dev

package/umd/index.js

@@ -372,6 +372,16 @@ var MAINNET_BUNDLES_INFO = {
     strategyOrBundleId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Bundles.MainnetIds.CRVUSD_BOOST,
     strategyId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Strategies.Identifiers.Boost,
     protocol: PROTOCOLS.CrvUSD
+  },
+  [_types_enums__WEBPACK_IMPORTED_MODULE_0__.Bundles.MainnetIds.MORPHO_BLUE_REPAY]: {
+    strategyOrBundleId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Bundles.MainnetIds.MORPHO_BLUE_REPAY,
+    strategyId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Strategies.Identifiers.Repay,
+    protocol: PROTOCOLS.MorphoBlue
+  },
+  [_types_enums__WEBPACK_IMPORTED_MODULE_0__.Bundles.MainnetIds.MORPHO_BLUE_BOOST]: {
+    strategyOrBundleId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Bundles.MainnetIds.MORPHO_BLUE_BOOST,
+    strategyId: _types_enums__WEBPACK_IMPORTED_MODULE_0__.Strategies.Identifiers.Boost,
+    protocol: PROTOCOLS.MorphoBlue
   }
 };
 var OPTIMISM_BUNDLES_INFO = {
@@ -499,6 +509,7 @@ var ProtocolIdentifiers;
     StrategiesAutomation["Exchange"] = "Exchange";
     StrategiesAutomation["Spark"] = "Spark";
     StrategiesAutomation["CrvUSD"] = "CurveUSD";
+    StrategiesAutomation["MorphoBlue"] = "MorphoBlue";
   })(StrategiesAutomation || (StrategiesAutomation = {}));
   _ProtocolIdentifiers.StrategiesAutomation = StrategiesAutomation;
   var LegacyAutomation;
@@ -610,6 +621,8 @@ var Bundles;
     MainnetIds[MainnetIds["COMP_V2_BOOST"] = 21] = "COMP_V2_BOOST";
     MainnetIds[MainnetIds["CRVUSD_REPAY"] = 26] = "CRVUSD_REPAY";
     MainnetIds[MainnetIds["CRVUSD_BOOST"] = 27] = "CRVUSD_BOOST";
+    MainnetIds[MainnetIds["MORPHO_BLUE_REPAY"] = 32] = "MORPHO_BLUE_REPAY";
+    MainnetIds[MainnetIds["MORPHO_BLUE_BOOST"] = 33] = "MORPHO_BLUE_BOOST";
   })(MainnetIds || (MainnetIds = {}));
   _Bundles.MainnetIds = MainnetIds;
   var OptimismIds;
@@ -1170,8 +1183,8 @@ class LegacyAutomation extends _Automation__WEBPACK_IMPORTED_MODULE_4__["default
   getParsedSubscriptions(addresses, options) {
     var _this4 = this;
     return _asyncToGenerator(function* () {
-      // Legacy automation was disabled on block 18213086
-      if (!(options !== null && options !== 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 && options.fromBlock && new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(options === null || options === void 0 ? void 0 : options.fromBlock.toString()).lt(18213086)) {
+      var legacyAutomationSunset = 18213086;
+      if (!(options !== null && options !== 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 && options.fromBlock && new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(options === null || options === void 0 ? void 0 : options.fromBlock.toString()).gte(legacyAutomationSunset)) {
         return [];
       }
       var subscriptions = yield _this4._getSubscriptions(addresses, options);
@@ -1451,6 +1464,10 @@ class StrategiesAutomation extends _Automation__WEBPACK_IMPORTED_MODULE_6__["def
   getEventFromSubStorage(event, options) {
     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)) {
+        return [];
+      }
       return (0,_services_ethereumService__WEBPACK_IMPORTED_MODULE_4__.getEventsFromContract)(_this.subStorageContract, _this.subStorageContractFork, event, options);
     })();
   }
@@ -1520,7 +1537,42 @@ class StrategiesAutomation extends _Automation__WEBPACK_IMPORTED_MODULE_6__["def
   _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());
+    || s.strategyData.decoded.subData.controller.toLowerCase() === current.strategyData.decoded.triggerData.controller.toLowerCase()) && (s.protocol.id !== _types_enums__WEBPACK_IMPORTED_MODULE_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) {
+    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;
@@ -1566,36 +1618,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;
@@ -2227,6 +2251,44 @@ function parseCrvUSDLeverageManagement(position, parseData) {
   _position.strategy.strategyId = _types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.IdOverrides.LeverageManagement;
   return _position;
 }
+function parseMorphoBlueLeverageManagement(position, parseData) {
+  var _position = (0,lodash__WEBPACK_IMPORTED_MODULE_1__.cloneDeep)(position);
+  var {
+    subStruct,
+    subId,
+    subHash
+  } = parseData.subscriptionEventData;
+  var {
+    isEnabled
+  } = parseData.strategiesSubsData;
+  var triggerData = _triggerService__WEBPACK_IMPORTED_MODULE_6__.morphoBlueRatioTrigger.decode(subStruct.triggerData);
+  var subData = _subDataService__WEBPACK_IMPORTED_MODULE_5__.morphoBlueLeverageManagementSubData.decode(subStruct.subData);
+  _position.strategyData.decoded.triggerData = triggerData;
+  _position.strategyData.decoded.subData = subData;
+  var isRepay = _position.strategy.strategyId === _types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.Repay;
+  if (isRepay) {
+    _position.specific = {
+      triggerRepayRatio: triggerData.ratio,
+      targetRepayRatio: subData.targetRatio,
+      repayEnabled: isEnabled,
+      subId1: Number(subId),
+      subHashRepay: subHash,
+      mergeWithId: _types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.Boost
+    };
+  } else {
+    _position.specific = {
+      triggerBoostRatio: triggerData.ratio,
+      targetBoostRatio: subData.targetRatio,
+      boostEnabled: isEnabled,
+      subId2: Number(subId),
+      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.marketId);
+  _position.strategy.strategyId = _types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.IdOverrides.LeverageManagement;
+  return _position;
+}
 var parsingMethodsMapping = {
   [_types_enums__WEBPACK_IMPORTED_MODULE_3__.ProtocolIdentifiers.StrategiesAutomation.MakerDAO]: {
     [_types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.SavingsLiqProtection]: parseMakerSavingsLiqProtection,
@@ -2289,6 +2351,10 @@ var parsingMethodsMapping = {
   [_types_enums__WEBPACK_IMPORTED_MODULE_3__.ProtocolIdentifiers.StrategiesAutomation.CrvUSD]: {
     [_types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.Repay]: parseCrvUSDLeverageManagement,
     [_types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.Boost]: parseCrvUSDLeverageManagement
+  },
+  [_types_enums__WEBPACK_IMPORTED_MODULE_3__.ProtocolIdentifiers.StrategiesAutomation.MorphoBlue]: {
+    [_types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.Repay]: parseMorphoBlueLeverageManagement,
+    [_types_enums__WEBPACK_IMPORTED_MODULE_3__.Strategies.Identifiers.Boost]: parseMorphoBlueLeverageManagement
   }
 };
 function getParsingMethod(id, strategy) {
@@ -19576,6 +19642,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   makerLeverageManagementSubData: () => (/* binding */ makerLeverageManagementSubData),
 /* harmony export */   makerRepayFromSavingsSubData: () => (/* binding */ makerRepayFromSavingsSubData),
 /* harmony export */   morphoAaveV2LeverageManagementSubData: () => (/* binding */ morphoAaveV2LeverageManagementSubData),
+/* harmony export */   morphoBlueLeverageManagementSubData: () => (/* binding */ morphoBlueLeverageManagementSubData),
 /* harmony export */   sparkLeverageManagementSubData: () => (/* binding */ sparkLeverageManagementSubData),
 /* harmony export */   sparkQuotePriceSubData: () => (/* binding */ sparkQuotePriceSubData)
 /* harmony export */ });
@@ -19991,6 +20058,38 @@ var crvUSDLeverageManagementSubData = {
     };
   }
 };
+var morphoBlueLeverageManagementSubData = {
+  encode: (loanToken, collToken, oracle, irm, lltv, ratioState, targetRatio, user) => {
+    var loanTokenEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('address', loanToken);
+    var collTokenEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('address', collToken);
+    var oracleEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('address', oracle);
+    var irmEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('address', irm);
+    var lltvEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('uint256', lltv);
+    var ratioStateEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('uint8', ratioState);
+    var targetRatioEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('uint256', (0,_utils__WEBPACK_IMPORTED_MODULE_6__.ratioPercentageToWei)(targetRatio));
+    var userEncoded = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameter('address', user);
+    return [loanTokenEncoded, collTokenEncoded, oracleEncoded, irmEncoded, lltvEncoded, ratioStateEncoded, targetRatioEncoded, userEncoded];
+  },
+  decode: subData => {
+    var loanToken = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameter('address', subData[0]);
+    var collToken = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameter('address', subData[1]);
+    var oracle = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameter('address', subData[2]);
+    var irm = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameter('address', subData[3]);
+    var lltv = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameter('uint256', subData[4]);
+    var weiRatio = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameter('uint256', subData[6]);
+    var user = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameter('address', subData[7]);
+    var targetRatio = (0,_utils__WEBPACK_IMPORTED_MODULE_6__.weiToRatioPercentage)(weiRatio);
+    return {
+      loanToken,
+      collToken,
+      oracle,
+      irm,
+      lltv,
+      user,
+      targetRatio
+    };
+  }
+};
 
 /***/ }),
 /* 31 */
@@ -33059,6 +33158,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   liquityRatioTrigger: () => (/* binding */ liquityRatioTrigger),
 /* harmony export */   makerRatioTrigger: () => (/* binding */ makerRatioTrigger),
 /* harmony export */   morphoAaveV2RatioTrigger: () => (/* binding */ morphoAaveV2RatioTrigger),
+/* harmony export */   morphoBlueRatioTrigger: () => (/* binding */ morphoBlueRatioTrigger),
 /* harmony export */   sparkQuotePriceTrigger: () => (/* binding */ sparkQuotePriceTrigger),
 /* harmony export */   sparkRatioTrigger: () => (/* binding */ sparkRatioTrigger),
 /* harmony export */   trailingStopTrigger: () => (/* binding */ trailingStopTrigger)
@@ -33391,6 +33491,23 @@ var crvUSDRatioTrigger = {
     };
   }
 };
+var morphoBlueRatioTrigger = {
+  encode(marketId,
+  // bytes32
+  owner, ratioPercentage, ratioState) {
+    var ratioWei = (0,_utils__WEBPACK_IMPORTED_MODULE_4__.ratioPercentageToWei)(ratioPercentage);
+    return [web3_eth_abi__WEBPACK_IMPORTED_MODULE_2___default().encodeParameters(['bytes32', 'address', 'uint256', 'uint8'], [marketId, owner, ratioWei, ratioState])];
+  },
+  decode(triggerData) {
+    var decodedData = web3_eth_abi__WEBPACK_IMPORTED_MODULE_2___default().decodeParameters(['bytes32', 'address', 'uint256', 'uint8'], triggerData[0]);
+    return {
+      marketId: decodedData[0],
+      owner: decodedData[1],
+      ratio: (0,_utils__WEBPACK_IMPORTED_MODULE_4__.weiToRatioPercentage)(decodedData[2]),
+      ratioState: Number(decodedData[3])
+    };
+  }
+};
 
 /***/ }),
 /* 322 */
@@ -33462,6 +33579,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   liquityEncode: () => (/* binding */ liquityEncode),
 /* harmony export */   makerEncode: () => (/* binding */ makerEncode),
 /* harmony export */   morphoAaveV2Encode: () => (/* binding */ morphoAaveV2Encode),
+/* harmony export */   morphoBlueEncode: () => (/* binding */ morphoBlueEncode),
 /* harmony export */   sparkEncode: () => (/* binding */ sparkEncode)
 /* harmony export */ });
 /* harmony import */ var decimal_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2);
@@ -33712,6 +33830,17 @@ var crvUSDEncode = {
     return [strategyOrBundleId, isBundle, triggerData, subData];
   }
 };
+var morphoBlueEncode = {
+  leverageManagement(marketId, loanToken, collToken, oracle, irm, lltv, ratioState, targetRatio, triggerRatio, user) {
+    var subData = _subDataService__WEBPACK_IMPORTED_MODULE_4__.morphoBlueLeverageManagementSubData.encode(loanToken, collToken, oracle, irm, lltv, ratioState, targetRatio, user);
+    var triggerData = _triggerService__WEBPACK_IMPORTED_MODULE_5__.morphoBlueRatioTrigger.encode(marketId, user, triggerRatio, ratioState);
+
+    // over is boost, under is repay
+    var strategyOrBundleId = ratioState === _types_enums__WEBPACK_IMPORTED_MODULE_2__.RatioState.OVER ? _types_enums__WEBPACK_IMPORTED_MODULE_2__.Bundles.MainnetIds.MORPHO_BLUE_BOOST : _types_enums__WEBPACK_IMPORTED_MODULE_2__.Bundles.MainnetIds.MORPHO_BLUE_REPAY;
+    var isBundle = true;
+    return [strategyOrBundleId, isBundle, triggerData, subData];
+  }
+};
 
 /***/ })
 /******/ 	]);

package/.env

@@ -1,4 +0,0 @@
-RPC_1=
-RPC_10=
-RPC_8453=
-RPC_42161=