@defisaver/automation-sdk 3.1.10 → 3.1.14-spark-dev

package/src/services/strategiesService.ts

@@ -7,7 +7,9 @@ import type {
   Position, ParseData, StrategiesToProtocolVersionMapping, BundleOrStrategy, StrategyOrBundleIds,
   BundleInfoUnion, StrategyInfoUnion,
 } from '../types';
-import { ChainId, ProtocolIdentifiers, Strategies } from '../types/enums';
+import {
+  ChainId, ProtocolIdentifiers, RatioState, Strategies,
+} from '../types/enums';
 
 import {
   getPositionId, getRatioStateInfoForAaveCloseStrategy, getStopLossAndTakeProfitTypeByCloseStrategyType, isRatioStateOver, wethToEthByAddress,
@@ -17,10 +19,6 @@ import * as triggerService from './triggerService';
 
 const web3 = new Web3();
 
-const SPARK_MARKET_ADDRESSES = {
-  [ChainId.Ethereum]: '0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE',
-};
-
 const AAVE_V3_MARKET_ADDRESSES = {
   [ChainId.Ethereum]: '0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e',
   [ChainId.Optimism]: '0xa97684ead0e402dC232d5A977953DF7ECBaB3CDb',
@@ -231,26 +229,33 @@ function parseAaveV2LeverageManagement(position: Position.Automated, parseData:
 function parseAaveV3LeverageManagement(position: Position.Automated, parseData: ParseData): Position.Automated {
   const _position = cloneDeep(position);
 
-  const { subStruct, subId } = parseData.subscriptionEventData;
+  const { subStruct, subId, subHash } = parseData.subscriptionEventData;
   const { isEnabled } = parseData.strategiesSubsData;
 
   const triggerData = triggerService.aaveV3RatioTrigger.decode(subStruct.triggerData);
-  const subData = subDataService.aaveV3LeverageManagementSubData.decode(subStruct.subData);
+  const isEOA = _position.strategy.strategyId.includes('eoa');
+  let subData;
+  if (isEOA) {
+    subData = subDataService.aaveV3LeverageManagementSubDataWithoutSubProxy.decode(subStruct.subData);
+  } else {
+    subData = subDataService.aaveV3LeverageManagementSubData.decode(subStruct.subData);
+  }
 
   _position.strategyData.decoded.triggerData = triggerData;
   _position.strategyData.decoded.subData = subData;
 
   _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, triggerData.market);
 
-  const isRepay = _position.strategy.strategyId === Strategies.Identifiers.Repay;
+  const isRepay = [Strategies.Identifiers.Repay, Strategies.Identifiers.EoaRepay].includes(_position.strategy.strategyId as Strategies.Identifiers);
 
   if (isRepay) {
     _position.specific = {
       triggerRepayRatio: triggerData.ratio,
       targetRepayRatio: subData.targetRatio,
-      repayEnabled: true,
+      repayEnabled: isEnabled,
       subId1: Number(subId),
-      mergeWithId: Strategies.Identifiers.Boost,
+      mergeWithId: isEOA ? Strategies.Identifiers.EoaBoost : Strategies.Identifiers.Boost,
+      subHashRepay: subHash,
     };
   } else {
     _position.specific = {
@@ -258,38 +263,161 @@ function parseAaveV3LeverageManagement(position: Position.Automated, parseData:
       targetBoostRatio: subData.targetRatio,
       boostEnabled: isEnabled,
       subId2: Number(subId),
-      mergeId: Strategies.Identifiers.Boost,
+      mergeId: isEOA ? Strategies.Identifiers.EoaBoost : Strategies.Identifiers.Boost,
+      subHashBoost: subHash,
     };
   }
+  if (!isEOA) {
+    _position.strategy.strategyId = Strategies.IdOverrides.LeverageManagement;
+  } else {
+    _position.strategy.strategyId = Strategies.IdOverrides.EoaLeverageManagement;
+  }
 
-  _position.strategy.strategyId = Strategies.IdOverrides.LeverageManagement;
+  return _position;
+}
+
+function parseAaveV3LeverageManagementOnPrice(position: Position.Automated, parseData: ParseData): Position.Automated {
+  const _position = cloneDeep(position);
+  const { subStruct } = parseData.subscriptionEventData;
+
+  const triggerData = triggerService.aaveV3QuotePriceTrigger.decode(subStruct.triggerData);
+  const isEOA = _position.strategy.strategyId.includes('eoa');
+  let subData;
+  if (isEOA) {
+    subData = subDataService.aaveV3LeverageManagementOnPriceGeneric.decode(subStruct.subData);
+  } else {
+    subData = subDataService.aaveV3LeverageManagementOnPriceSubData.decode(subStruct.subData);
+  }
+
+  _position.strategyData.decoded.triggerData = triggerData;
+  _position.strategyData.decoded.subData = subData;
+  _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, Math.random());
+
+  _position.specific = {
+    collAsset: subData.collAsset,
+    debtAsset: subData.debtAsset,
+    baseToken: triggerData.baseTokenAddress,
+    quoteToken: triggerData.quoteTokenAddress,
+    price: triggerData.price,
+    ratioState: triggerData.ratioState,
+    debtAssetId: subData.debtAssetId,
+    collAssetId: subData.collAssetId,
+    ratio: subData.targetRatio,
+  };
 
   return _position;
 }
 
-function parseMorphoAaveV2LeverageManagement(position: Position.Automated, parseData: ParseData): Position.Automated {
+function parseAaveV3CloseOnPrice(position: Position.Automated, parseData: ParseData): Position.Automated {
   const _position = cloneDeep(position);
 
-  const { subStruct, subId } = parseData.subscriptionEventData;
-  const { isEnabled } = parseData.strategiesSubsData;
+  const { subStruct } = parseData.subscriptionEventData;
 
-  const triggerData = triggerService.morphoAaveV2RatioTrigger.decode(subStruct.triggerData);
-  const subData = subDataService.morphoAaveV2LeverageManagementSubData.decode(subStruct.subData);
+  const isEOA = _position.strategy.strategyId.includes('eoa');
+
+  _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, AAVE_V3_MARKET_ADDRESSES[_position.chainId]);
+
+  if (isEOA) {
+    const triggerData = triggerService.aaveV3QuotePriceRangeTrigger.decode(subStruct.triggerData);
+    const subData = subDataService.aaveV3CloseGenericSubData.decode(subStruct.subData);
+
+    const { takeProfitType, stopLossType } = getStopLossAndTakeProfitTypeByCloseStrategyType(+subData.closeType);
 
+    _position.strategyData.decoded.triggerData = triggerData;
+    _position.strategyData.decoded.subData = subData;
+
+    _position.specific = {
+      collAsset: subData.collAsset,
+      collAssetId: subData.collAssetId,
+      debtAsset: subData.debtAsset,
+      debtAssetId: subData.debtAssetId,
+      baseToken: triggerData.collToken,
+      quoteToken: triggerData.debtToken,
+      stopLossPrice: triggerData.lowerPrice,
+      takeProfitPrice: triggerData.upperPrice,
+      stopLossType,
+      takeProfitType,
+    };
+
+    _position.strategy.strategyId = Strategies.Identifiers.EoaCloseOnPrice;
+  } else {
+    const triggerData = triggerService.aaveV3QuotePriceTrigger.decode(subStruct.triggerData);
+    const subData = subDataService.aaveV3QuotePriceSubData.decode(subStruct.subData);
+
+    _position.strategyData.decoded.triggerData = triggerData;
+    _position.strategyData.decoded.subData = subData;
+
+    _position.specific = {
+      collAsset: subData.collAsset,
+      collAssetId: subData.collAssetId,
+      debtAsset: subData.debtAsset,
+      debtAssetId: subData.debtAssetId,
+      baseToken: triggerData.baseTokenAddress,
+      quoteToken: triggerData.quoteTokenAddress,
+      price: triggerData.price,
+      ratioState: triggerData.ratioState,
+    };
+
+    const { ratioState } = getRatioStateInfoForAaveCloseStrategy(
+      _position.specific.ratioState,
+      wethToEthByAddress(_position.specific.collAsset, parseData.chainId),
+      wethToEthByAddress(_position.specific.debtAsset, parseData.chainId),
+      parseData.chainId,
+    );
+
+    _position.strategy.strategyId = isRatioStateOver(ratioState)
+      ? Strategies.IdOverrides.TakeProfit
+      : Strategies.IdOverrides.StopLoss;
+  }
+
+  return _position;
+}
+
+function parseAaveV3CollateralSwitch(position: Position.Automated, parseData: ParseData): Position.Automated {
+  const _position = cloneDeep(position);
+  const { subStruct } = parseData.subscriptionEventData;
+  const triggerData = triggerService.aaveV3QuotePriceTrigger.decode(subStruct.triggerData);
+  const subData = subDataService.aaveV3CollateralSwitchSubData.decode(subStruct.subData);
   _position.strategyData.decoded.triggerData = triggerData;
   _position.strategyData.decoded.subData = subData;
+  _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, subData.marketAddr);
 
-  _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner);
+  return _position;
+}
 
-  const isRepay = _position.strategy.strategyId === Strategies.Identifiers.Repay;
+function parseSparkCollateralSwitch(position: Position.Automated, parseData: ParseData): Position.Automated {
+  const _position = cloneDeep(position);
+  const { subStruct } = parseData.subscriptionEventData;
+  const triggerData = triggerService.sparkQuotePriceTrigger.decode(subStruct.triggerData);
+  const subData = subDataService.sparkCollateralSwitchSubData.decode(subStruct.subData);
+  _position.strategyData.decoded.triggerData = triggerData;
+  _position.strategyData.decoded.subData = subData;
+  _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, subData.marketAddr);
+  return _position;
+}
+
+function parseAaveV4LeverageManagement(position: Position.Automated, parseData: ParseData): Position.Automated {
+  const _position = cloneDeep(position);
+  const { subStruct, subId, subHash } = parseData.subscriptionEventData;
+  const { isEnabled } = parseData.strategiesSubsData;
+  const triggerData = triggerService.aaveV4RatioTrigger.decode(subStruct.triggerData);
+  const subData = subDataService.aaveV4LeverageManagementSubData.decode(subStruct.subData);
+  const isEOA = _position.strategy.strategyId.includes('eoa');
+  const isRepay = [Strategies.Identifiers.Repay, Strategies.Identifiers.EoaRepay].includes(_position.strategy.strategyId as Strategies.Identifiers);
+
+  _position.strategyData.decoded.triggerData = triggerData;
+  _position.strategyData.decoded.subData = subData;
+  _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, triggerData.spoke);
+  _position.strategy.strategyId = isEOA ? Strategies.IdOverrides.EoaLeverageManagement : Strategies.IdOverrides.LeverageManagement;
 
   if (isRepay) {
     _position.specific = {
       triggerRepayRatio: triggerData.ratio,
       targetRepayRatio: subData.targetRatio,
-      repayEnabled: true,
+      repayEnabled: isEnabled,
       subId1: Number(subId),
-      mergeWithId: Strategies.Identifiers.Boost,
+      mergeWithId: isEOA ? Strategies.Identifiers.EoaBoost : Strategies.Identifiers.Boost,
+      subHashRepay: subHash,
     };
   } else {
     _position.specific = {
@@ -297,47 +425,114 @@ function parseMorphoAaveV2LeverageManagement(position: Position.Automated, parse
       targetBoostRatio: subData.targetRatio,
       boostEnabled: isEnabled,
       subId2: Number(subId),
-      mergeId: Strategies.Identifiers.Boost,
+      mergeId: isEOA ? Strategies.Identifiers.EoaBoost : Strategies.Identifiers.Boost,
+      subHashBoost: subHash,
     };
   }
 
-  _position.strategy.strategyId = Strategies.IdOverrides.LeverageManagement;
-
   return _position;
 }
 
-function parseAaveV3CloseOnPrice(position: Position.Automated, parseData: ParseData): Position.Automated {
+function parseAaveV4LeverageManagementOnPrice(position: Position.Automated, parseData: ParseData): Position.Automated {
   const _position = cloneDeep(position);
-
   const { subStruct } = parseData.subscriptionEventData;
-
-  const triggerData = triggerService.aaveV3QuotePriceTrigger.decode(subStruct.triggerData);
-  const subData = subDataService.aaveV3QuotePriceSubData.decode(subStruct.subData);
+  const triggerData = triggerService.aaveV4QuotePriceTrigger.decode(subStruct.triggerData);
+  const subData = subDataService.aaveV4LeverageManagementOnPriceSubData.decode(subStruct.subData);
+  const isEOA = _position.strategy.strategyId.includes('eoa');
 
   _position.strategyData.decoded.triggerData = triggerData;
   _position.strategyData.decoded.subData = subData;
-
-  _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, AAVE_V3_MARKET_ADDRESSES[_position.chainId]);
+  _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, triggerData.spoke);
+  _position.strategy.strategyId = isEOA ? Strategies.IdOverrides.EoaLeverageManagementOnPrice : Strategies.IdOverrides.LeverageManagementOnPrice;
 
   _position.specific = {
     collAsset: subData.collAsset,
     collAssetId: subData.collAssetId,
     debtAsset: subData.debtAsset,
     debtAssetId: subData.debtAssetId,
-    baseToken: triggerData.baseTokenAddress,
-    quoteToken: triggerData.quoteTokenAddress,
     price: triggerData.price,
     ratioState: triggerData.ratioState,
+    ratio: subData.targetRatio,
   };
 
-  const { ratioState } = getRatioStateInfoForAaveCloseStrategy(
-    _position.specific.ratioState,
-    wethToEthByAddress(_position.specific.collAsset, parseData.chainId),
-    wethToEthByAddress(_position.specific.debtAsset, parseData.chainId),
-    parseData.chainId,
-  );
+  return _position;
+}
+
+function parseAaveV4CloseOnPrice(position: Position.Automated, parseData: ParseData): Position.Automated {
+  const _position = cloneDeep(position);
+  const { subStruct } = parseData.subscriptionEventData;
+  const triggerData = triggerService.aaveV4QuotePriceRangeTrigger.decode(subStruct.triggerData);
+  const subData = subDataService.aaveV4CloseSubData.decode(subStruct.subData);
+  const { takeProfitType, stopLossType } = getStopLossAndTakeProfitTypeByCloseStrategyType(+subData.closeType);
+  const isEOA = _position.strategy.strategyId.includes('eoa');
+
+  _position.strategyData.decoded.triggerData = triggerData;
+  _position.strategyData.decoded.subData = subData;
+  _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, triggerData.spoke);
+  _position.strategy.strategyId = isEOA ? Strategies.Identifiers.EoaCloseOnPrice : Strategies.Identifiers.CloseOnPrice;
+
+  _position.specific = {
+    collAsset: subData.collAsset,
+    collAssetId: subData.collAssetId,
+    debtAsset: subData.debtAsset,
+    debtAssetId: subData.debtAssetId,
+    stopLossPrice: triggerData.lowerPrice,
+    takeProfitPrice: triggerData.upperPrice,
+    stopLossType,
+    takeProfitType,
+  };
+
+  return _position;
+}
+
+function parseAaveV4CollateralSwitch(position: Position.Automated, parseData: ParseData): Position.Automated {
+  const _position = cloneDeep(position);
+  const { subStruct } = parseData.subscriptionEventData;
+  const triggerData = triggerService.aaveV4QuotePriceTrigger.decode(subStruct.triggerData);
+  const subData = subDataService.aaveV4CollateralSwitchSubData.decode(subStruct.subData);
+  const isEOA = _position.strategy.strategyId.includes('eoa');
+  _position.strategyData.decoded.triggerData = triggerData;
+  _position.strategyData.decoded.subData = subData;
+  _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, triggerData.spoke);
+  _position.strategy.strategyId = isEOA ? Strategies.Identifiers.EoaCollateralSwitch : Strategies.Identifiers.CollateralSwitch;
+  return _position;
+}
+
+function parseMorphoAaveV2LeverageManagement(position: Position.Automated, parseData: ParseData): Position.Automated {
+  const _position = cloneDeep(position);
+
+  const { subStruct, subId } = parseData.subscriptionEventData;
+  const { isEnabled } = parseData.strategiesSubsData;
+
+  const triggerData = triggerService.morphoAaveV2RatioTrigger.decode(subStruct.triggerData);
+  const subData = subDataService.morphoAaveV2LeverageManagementSubData.decode(subStruct.subData);
+
+  _position.strategyData.decoded.triggerData = triggerData;
+  _position.strategyData.decoded.subData = subData;
+
+  _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner);
 
-  _position.strategy.strategyId = isRatioStateOver(ratioState) ? Strategies.IdOverrides.TakeProfit : Strategies.IdOverrides.StopLoss;
+  const isRepay = _position.strategy.strategyId === Strategies.Identifiers.Repay;
+
+  if (isRepay) {
+    _position.specific = {
+      triggerRepayRatio: triggerData.ratio,
+      targetRepayRatio: subData.targetRatio,
+      repayEnabled: true,
+      subId1: Number(subId),
+      mergeWithId: Strategies.Identifiers.Boost,
+    };
+  } else {
+    _position.specific = {
+      triggerBoostRatio: triggerData.ratio,
+      targetBoostRatio: subData.targetRatio,
+      boostEnabled: isEnabled,
+      subId2: Number(subId),
+      mergeId: Strategies.Identifiers.Boost,
+    };
+  }
+
+  _position.strategy.strategyId = Strategies.IdOverrides.LeverageManagement;
 
   return _position;
 }
@@ -416,7 +611,8 @@ function parseCompoundV2LeverageManagement(position: Position.Automated, parseDa
     };
   }
 
-  _position.strategy.strategyId = Strategies.IdOverrides.LeverageManagement;
+  const isEOA = _position.strategy.strategyId.includes('eoa');
+  _position.strategy.strategyId = isEOA ? Strategies.IdOverrides.EoaLeverageManagement : Strategies.IdOverrides.LeverageManagement;
 
   return _position;
 }
@@ -441,13 +637,15 @@ function parseCompoundV3LeverageManagement(position: Position.Automated, parseDa
 
   const isRepay = [Strategies.Identifiers.Repay, Strategies.Identifiers.EoaRepay].includes(_position.strategy.strategyId as Strategies.Identifiers);
 
+  const isEOA = _position.strategy.strategyId.includes('eoa');
+
   if (isRepay) {
     _position.specific = {
       triggerRepayRatio: triggerData.ratio,
       targetRepayRatio: subData.targetRatio,
       repayEnabled: true,
       subId1: Number(subId),
-      mergeWithId: Strategies.Identifiers.Boost,
+      mergeWithId: isEOA ? Strategies.Identifiers.EoaBoost : Strategies.Identifiers.Boost,
     };
   } else {
     _position.specific = {
@@ -455,13 +653,64 @@ function parseCompoundV3LeverageManagement(position: Position.Automated, parseDa
       targetBoostRatio: subData.targetRatio,
       boostEnabled: isEnabled,
       subId2: Number(subId),
-      mergeId: Strategies.Identifiers.Boost,
+      mergeId: isEOA ? Strategies.Identifiers.EoaBoost : Strategies.Identifiers.Boost,
     };
   }
 
-  const isEOA = _position.strategy.strategyId.includes('eoa');
   _position.strategy.strategyId = isEOA ? Strategies.IdOverrides.EoaLeverageManagement : Strategies.IdOverrides.LeverageManagement;
 
+  return _position;
+}
+
+function parseCompoundV3LeverageManagementOnPrice(position: Position.Automated, parseData: ParseData): Position.Automated {
+  const _position = cloneDeep(position);
+
+  const { subStruct } = parseData.subscriptionEventData;
+
+  const triggerData = triggerService.compoundV3PriceTrigger.decode(subStruct.triggerData);
+  const subData = subDataService.compoundV3LeverageManagementOnPriceSubData.decode(subStruct.subData);
+
+  _position.strategyData.decoded.triggerData = triggerData;
+  _position.strategyData.decoded.subData = subData;
+  _position.positionId = getPositionId(_position.chainId, _position.protocol.id, triggerData.market, triggerData.user, Math.random());
+
+  _position.specific = {
+    market: subData.market,
+    collToken: subData.collToken,
+    baseToken: subData.baseToken,
+    ratio: subData.targetRatio,
+    price: triggerData.price,
+    priceState: triggerData.priceState,
+  };
+
+  return _position;
+}
+
+function parseCompoundV3CloseOnPrice(position: Position.Automated, parseData: ParseData): Position.Automated {
+  const _position = cloneDeep(position);
+
+  const { subStruct } = parseData.subscriptionEventData;
+
+  const triggerData = triggerService.compoundV3PriceRangeTrigger.decode(subStruct.triggerData);
+  const subData = subDataService.compoundV3CloseSubData.decode(subStruct.subData);
+
+  _position.strategyData.decoded.triggerData = triggerData;
+  _position.strategyData.decoded.subData = subData;
+  _position.positionId = getPositionId(_position.chainId, _position.protocol.id, triggerData.market, Math.random());
+
+  const { takeProfitType, stopLossType } = getStopLossAndTakeProfitTypeByCloseStrategyType(+subData.closeType);
+  const isEOA = _position.strategy.strategyId.includes('eoa');
+  _position.strategy.strategyId = isEOA ? Strategies.Identifiers.EoaCloseOnPrice : Strategies.Identifiers.CloseOnPrice;
+
+  _position.specific = {
+    market: subData.market,
+    collToken: subData.collToken,
+    baseToken: subData.baseToken,
+    stopLossPrice: triggerData.lowerPrice,
+    takeProfitPrice: triggerData.upperPrice,
+    takeProfitType,
+    stopLossType,
+  };
 
   return _position;
 }
@@ -648,38 +897,61 @@ function parseSparkLeverageManagement(position: Position.Automated, parseData: P
   return _position;
 }
 
-function parseSparkCloseOnPrice(position: Position.Automated, parseData: ParseData): Position.Automated {
+function parseSparkLeverageManagementOnPrice(position: Position.Automated, parseData: ParseData): Position.Automated {
   const _position = cloneDeep(position);
-
   const { subStruct } = parseData.subscriptionEventData;
 
   const triggerData = triggerService.sparkQuotePriceTrigger.decode(subStruct.triggerData);
-  const subData = subDataService.sparkQuotePriceSubData.decode(subStruct.subData);
+  const subData = subDataService.sparkLeverageManagementOnPriceSubData.decode(subStruct.subData);
 
   _position.strategyData.decoded.triggerData = triggerData;
   _position.strategyData.decoded.subData = subData;
 
-  _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, SPARK_MARKET_ADDRESSES[_position.chainId as ChainId.Ethereum]);
+  _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, subData.marketAddr);
 
   _position.specific = {
+    // subData
     collAsset: subData.collAsset,
     collAssetId: subData.collAssetId,
     debtAsset: subData.debtAsset,
     debtAssetId: subData.debtAssetId,
-    baseToken: triggerData.baseTokenAddress,
-    quoteToken: triggerData.quoteTokenAddress,
+    ratio: subData.targetRatio,
+    // triggerData
+    baseToken: triggerData.baseTokenAddr,
+    quoteToken: triggerData.quoteTokenAddr,
     price: triggerData.price,
     ratioState: triggerData.ratioState,
   };
 
-  const { ratioState } = getRatioStateInfoForAaveCloseStrategy(
-    _position.specific.ratioState,
-    wethToEthByAddress(_position.specific.collAsset, parseData.chainId),
-    wethToEthByAddress(_position.specific.debtAsset, parseData.chainId),
-    parseData.chainId,
-  );
+  return _position;
+}
 
-  _position.strategy.strategyId = isRatioStateOver(ratioState) ? Strategies.IdOverrides.TakeProfit : Strategies.IdOverrides.StopLoss;
+function parseSparkCloseOnPrice(position: Position.Automated, parseData: ParseData): Position.Automated {
+  const _position = cloneDeep(position);
+  const { subStruct } = parseData.subscriptionEventData;
+
+  const triggerData = triggerService.sparkQuotePriceRangeTrigger.decode(subStruct.triggerData);
+  const subData = subDataService.sparkCloseGenericSubData.decode(subStruct.subData);
+
+  _position.strategyData.decoded.triggerData = triggerData;
+  _position.strategyData.decoded.subData = subData;
+
+  _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, subData.marketAddr);
+
+  const { takeProfitType, stopLossType } = getStopLossAndTakeProfitTypeByCloseStrategyType(+subData.closeType);
+
+  _position.specific = {
+    collAsset: subData.collAsset,
+    collAssetId: subData.collAssetId,
+    debtAsset: subData.debtAsset,
+    debtAssetId: subData.debtAssetId,
+    baseToken: triggerData.collToken,
+    quoteToken: triggerData.debtToken,
+    stopLossPrice: triggerData.lowerPrice,
+    takeProfitPrice: triggerData.upperPrice,
+    stopLossType,
+    takeProfitType,
+  };
 
   return _position;
 }
@@ -861,28 +1133,43 @@ function parseMorphoBlueLeverageManagementOnPrice(position: Position.Automated,
   return _position;
 }
 
-function parseAaveV3LeverageManagementOnPrice(position: Position.Automated, parseData: ParseData): Position.Automated {
+function parseMorphoBlueCloseOnPrice(position: Position.Automated, parseData: ParseData): Position.Automated {
   const _position = cloneDeep(position);
 
   const { subStruct } = parseData.subscriptionEventData;
 
-  const triggerData = triggerService.aaveV3QuotePriceTrigger.decode(subStruct.triggerData);
-  const subData = subDataService.aaveV3LeverageManagementOnPriceSubData.decode(subStruct.subData);
+  const triggerData = triggerService.morphoBluePriceRangeTrigger.decode(subStruct.triggerData);
+  const subData = subDataService.morphoBlueCloseOnPriceSubData.decode(subStruct.subData);
 
   _position.strategyData.decoded.triggerData = triggerData;
   _position.strategyData.decoded.subData = subData;
+
   _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, Math.random());
 
+  const marketIdEncodedData = web3.eth.abi.encodeParameters(
+    ['address', 'address', 'address', 'address', 'uint256'],
+    [
+      subData.loanToken,
+      subData.collToken,
+      subData.oracle,
+      subData.irm,
+      subData.lltv,
+    ],
+  );
+
+  const marketId = web3.utils.keccak256(marketIdEncodedData);
+
+  const { takeProfitType, stopLossType } = getStopLossAndTakeProfitTypeByCloseStrategyType(+subData.closeType);
+
   _position.specific = {
-    collAsset: subData.collAsset,
-    debtAsset: subData.debtAsset,
-    baseToken: triggerData.baseTokenAddress,
-    quoteToken: triggerData.quoteTokenAddress,
-    price: triggerData.price,
-    ratioState: triggerData.ratioState,
-    debtAssetId: subData.debtAssetId,
-    collAssetId: subData.collAssetId,
-    ratio: subData.targetRatio,
+    subHash: _position.subHash,
+    marketId,
+    collAsset: subData.collToken,
+    debtAsset: subData.loanToken,
+    stopLossPrice: triggerData.lowerPrice,
+    takeProfitPrice: triggerData.upperPrice,
+    stopLossType,
+    takeProfitType,
   };
 
   return _position;
@@ -909,7 +1196,6 @@ function parseLiquityV2CloseOnPrice(position: Position.Automated, parseData: Par
   // - Only TakeProfit
   // - Only StopLoss
   // - Both
-  // TODO: see on frontend what specific data we need here because stop-loss and take-profit is one bundle now
   _position.strategy.strategyId = Strategies.Identifiers.CloseOnPrice;
   _position.specific = {
     market: subData.market,
@@ -1057,6 +1343,26 @@ const parsingMethodsMapping: StrategiesToProtocolVersionMapping = {
     [Strategies.Identifiers.CloseToCollateralWithGasPrice]: parseAaveV3CloseOnPriceWithMaximumGasPrice,
     [Strategies.Identifiers.OpenOrderFromCollateral]: parseAaveV3LeverageManagementOnPrice,
     [Strategies.Identifiers.RepayOnPrice]: parseAaveV3LeverageManagementOnPrice,
+    [Strategies.Identifiers.EoaRepay]: parseAaveV3LeverageManagement,
+    [Strategies.Identifiers.EoaBoost]: parseAaveV3LeverageManagement,
+    [Strategies.Identifiers.EoaRepayOnPrice]: parseAaveV3LeverageManagementOnPrice,
+    [Strategies.Identifiers.EoaBoostOnPrice]: parseAaveV3LeverageManagementOnPrice,
+    [Strategies.Identifiers.EoaCloseOnPrice]: parseAaveV3CloseOnPrice,
+    [Strategies.Identifiers.CollateralSwitch]: parseAaveV3CollateralSwitch,
+  },
+  [ProtocolIdentifiers.StrategiesAutomation.AaveV4]: {
+    [Strategies.Identifiers.Repay]: parseAaveV4LeverageManagement,
+    [Strategies.Identifiers.Boost]: parseAaveV4LeverageManagement,
+    [Strategies.Identifiers.RepayOnPrice]: parseAaveV4LeverageManagementOnPrice,
+    [Strategies.Identifiers.BoostOnPrice]: parseAaveV4LeverageManagementOnPrice,
+    [Strategies.Identifiers.CloseOnPrice]: parseAaveV4CloseOnPrice,
+    [Strategies.Identifiers.EoaRepay]: parseAaveV4LeverageManagement,
+    [Strategies.Identifiers.EoaBoost]: parseAaveV4LeverageManagement,
+    [Strategies.Identifiers.EoaRepayOnPrice]: parseAaveV4LeverageManagementOnPrice,
+    [Strategies.Identifiers.EoaBoostOnPrice]: parseAaveV4LeverageManagementOnPrice,
+    [Strategies.Identifiers.EoaCloseOnPrice]: parseAaveV4CloseOnPrice,
+    [Strategies.Identifiers.CollateralSwitch]: parseAaveV4CollateralSwitch,
+    [Strategies.Identifiers.EoaCollateralSwitch]: parseAaveV4CollateralSwitch,
   },
   [ProtocolIdentifiers.StrategiesAutomation.CompoundV2]: {
     [Strategies.Identifiers.Repay]: parseCompoundV2LeverageManagement,
@@ -1067,6 +1373,12 @@ const parsingMethodsMapping: StrategiesToProtocolVersionMapping = {
     [Strategies.Identifiers.Boost]: parseCompoundV3LeverageManagement,
     [Strategies.Identifiers.EoaRepay]: parseCompoundV3LeverageManagement,
     [Strategies.Identifiers.EoaBoost]: parseCompoundV3LeverageManagement,
+    [Strategies.Identifiers.RepayOnPrice]: parseCompoundV3LeverageManagementOnPrice,
+    [Strategies.Identifiers.BoostOnPrice]: parseCompoundV3LeverageManagementOnPrice,
+    [Strategies.Identifiers.EoaRepayOnPrice]: parseCompoundV3LeverageManagementOnPrice,
+    [Strategies.Identifiers.EoaBoostOnPrice]: parseCompoundV3LeverageManagementOnPrice,
+    [Strategies.Identifiers.CloseOnPrice]: parseCompoundV3CloseOnPrice,
+    [Strategies.Identifiers.EoaCloseOnPrice]: parseCompoundV3CloseOnPrice,
   },
   [ProtocolIdentifiers.StrategiesAutomation.ChickenBonds]: {
     [Strategies.Identifiers.Rebond]: parseChickenBondsRebond,
@@ -1082,8 +1394,10 @@ const parsingMethodsMapping: StrategiesToProtocolVersionMapping = {
   [ProtocolIdentifiers.StrategiesAutomation.Spark]: {
     [Strategies.Identifiers.Repay]: parseSparkLeverageManagement,
     [Strategies.Identifiers.Boost]: parseSparkLeverageManagement,
-    [Strategies.Identifiers.CloseToDebt]: parseSparkCloseOnPrice,
-    [Strategies.Identifiers.CloseToCollateral]: parseSparkCloseOnPrice,
+    [Strategies.Identifiers.RepayOnPrice]: parseSparkLeverageManagementOnPrice,
+    [Strategies.Identifiers.BoostOnPrice]: parseSparkLeverageManagementOnPrice,
+    [Strategies.Identifiers.CloseOnPrice]: parseSparkCloseOnPrice,
+    [Strategies.Identifiers.CollateralSwitch]: parseSparkCollateralSwitch,
   },
   [ProtocolIdentifiers.StrategiesAutomation.CrvUSD]: {
     [Strategies.Identifiers.Repay]: parseCrvUSDLeverageManagement,
@@ -1096,6 +1410,7 @@ const parsingMethodsMapping: StrategiesToProtocolVersionMapping = {
     [Strategies.Identifiers.EoaRepay]: parseMorphoBlueLeverageManagement,
     [Strategies.Identifiers.EoaBoost]: parseMorphoBlueLeverageManagement,
     [Strategies.Identifiers.BoostOnPrice]: parseMorphoBlueLeverageManagementOnPrice,
+    [Strategies.Identifiers.CloseOnPrice]: parseMorphoBlueCloseOnPrice,
   },
   [ProtocolIdentifiers.StrategiesAutomation.FluidT1]: {
     [Strategies.Identifiers.Repay]: parseFluidT1LeverageManagement,