@defisaver/automation-sdk 3.3.16-dev-13082-morpho-eoa-dev → 3.3.16-liq-prot-dev

package/src/constants/index.ts

@@ -573,24 +573,65 @@ export const MAINNET_BUNDLES_INFO: MainnetBundleInfo = {
     strategyId: Strategies.Identifiers.EoaCloseOnPrice,
     protocol: PROTOCOLS.AaveV4,
   },
-  [Bundles.MainnetIds.MORPHO_BLUE_REPAY_ON_PRICE]: {
-    strategyOrBundleId: Bundles.MainnetIds.MORPHO_BLUE_REPAY_ON_PRICE,
-    strategyId: Strategies.Identifiers.RepayOnPrice,
-    protocol: PROTOCOLS.MorphoBlue,
+  [Bundles.MainnetIds.MAKER_SW_LIQUIDATION_PROTECTION]: {
+    strategyOrBundleId: Bundles.MainnetIds.MAKER_SW_LIQUIDATION_PROTECTION,
+    strategyId: Strategies.Identifiers.LiquidationProtection,
+    protocol: PROTOCOLS.MakerDAO,
   },
-  [Bundles.MainnetIds.MORPHO_BLUE_EOA_BOOST_ON_PRICE]: {
-    strategyOrBundleId: Bundles.MainnetIds.MORPHO_BLUE_EOA_BOOST_ON_PRICE,
-    strategyId: Strategies.Identifiers.EoaBoostOnPrice,
+  [Bundles.MainnetIds.AAVE_V3_SW_LIQUIDATION_PROTECTION]: {
+    strategyOrBundleId: Bundles.MainnetIds.AAVE_V3_SW_LIQUIDATION_PROTECTION,
+    strategyId: Strategies.Identifiers.LiquidationProtection,
+    protocol: PROTOCOLS.AaveV3,
+  },
+  [Bundles.MainnetIds.AAVE_V4_SW_LIQUIDATION_PROTECTION]: {
+    strategyOrBundleId: Bundles.MainnetIds.AAVE_V4_SW_LIQUIDATION_PROTECTION,
+    strategyId: Strategies.Identifiers.LiquidationProtection,
+    protocol: PROTOCOLS.AaveV4,
+  },
+  [Bundles.MainnetIds.SPARK_SW_LIQUIDATION_PROTECTION]: {
+    strategyOrBundleId: Bundles.MainnetIds.SPARK_SW_LIQUIDATION_PROTECTION,
+    strategyId: Strategies.Identifiers.LiquidationProtection,
+    protocol: PROTOCOLS.Spark,
+  },
+  [Bundles.MainnetIds.COMP_V3_SW_LIQUIDATION_PROTECTION]: {
+    strategyOrBundleId: Bundles.MainnetIds.COMP_V3_SW_LIQUIDATION_PROTECTION,
+    strategyId: Strategies.Identifiers.LiquidationProtection,
+    protocol: PROTOCOLS.CompoundV3,
+  },
+  [Bundles.MainnetIds.COMP_V3_EOA_LIQUIDATION_PROTECTION]: {
+    strategyOrBundleId: Bundles.MainnetIds.COMP_V3_EOA_LIQUIDATION_PROTECTION,
+    strategyId: Strategies.Identifiers.EoaLiquidationProtection,
+    protocol: PROTOCOLS.CompoundV3,
+  },
+  [Bundles.MainnetIds.MORPHO_BLUE_SW_LIQUIDATION_PROTECTION]: {
+    strategyOrBundleId:
+      Bundles.MainnetIds.MORPHO_BLUE_SW_LIQUIDATION_PROTECTION,
+    strategyId: Strategies.Identifiers.LiquidationProtection,
     protocol: PROTOCOLS.MorphoBlue,
   },
-  [Bundles.MainnetIds.MORPHO_BLUE_EOA_REPAY_ON_PRICE]: {
-    strategyOrBundleId: Bundles.MainnetIds.MORPHO_BLUE_EOA_REPAY_ON_PRICE,
-    strategyId: Strategies.Identifiers.EoaRepayOnPrice,
+  [Bundles.MainnetIds.FLUID_T1_SW_LIQUIDATION_PROTECTION]: {
+    strategyOrBundleId: Bundles.MainnetIds.FLUID_T1_SW_LIQUIDATION_PROTECTION,
+    strategyId: Strategies.Identifiers.LiquidationProtection,
+    protocol: PROTOCOLS.FluidT1,
+  },
+  [Bundles.MainnetIds.AAVE_V3_EOA_LIQUIDATION_PROTECTION]: {
+    strategyOrBundleId: Bundles.MainnetIds.AAVE_V3_EOA_LIQUIDATION_PROTECTION,
+    strategyId: Strategies.Identifiers.EoaLiquidationProtection,
+    protocol: PROTOCOLS.AaveV3,
+  },
+  [Bundles.MainnetIds.AAVE_V4_EOA_LIQUIDATION_PROTECTION]: {
+    strategyOrBundleId: Bundles.MainnetIds.AAVE_V4_EOA_LIQUIDATION_PROTECTION,
+    strategyId: Strategies.Identifiers.EoaLiquidationProtection,
+    protocol: PROTOCOLS.AaveV4,
+  },
+  [Bundles.MainnetIds.MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION]: {
+    strategyOrBundleId: Bundles.MainnetIds.MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION,
+    strategyId: Strategies.Identifiers.EoaLiquidationProtection,
     protocol: PROTOCOLS.MorphoBlue,
   },
-  [Bundles.MainnetIds.MORPHO_BLUE_EOA_CLOSE]: {
-    strategyOrBundleId: Bundles.MainnetIds.MORPHO_BLUE_EOA_CLOSE,
-    strategyId: Strategies.Identifiers.EoaCloseOnPrice,
+  [Bundles.MainnetIds.MORPHO_BLUE_REPAY_ON_PRICE]: {
+    strategyOrBundleId: Bundles.MainnetIds.MORPHO_BLUE_REPAY_ON_PRICE,
+    strategyId: Strategies.Identifiers.RepayOnPrice,
     protocol: PROTOCOLS.MorphoBlue,
   },
 };
@@ -651,7 +692,16 @@ export const OPTIMISM_BUNDLES_INFO: OptimismBundleInfo = {
     strategyId: Strategies.Identifiers.EoaCloseOnPrice,
     protocol: PROTOCOLS.AaveV3,
   },
-
+  [Bundles.OptimismIds.AAVE_V3_SW_LIQUIDATION_PROTECTION]: {
+    strategyOrBundleId: Bundles.OptimismIds.AAVE_V3_SW_LIQUIDATION_PROTECTION,
+    strategyId: Strategies.Identifiers.LiquidationProtection,
+    protocol: PROTOCOLS.AaveV3,
+  },
+  [Bundles.OptimismIds.AAVE_V3_EOA_LIQUIDATION_PROTECTION]: {
+    strategyOrBundleId: Bundles.OptimismIds.AAVE_V3_EOA_LIQUIDATION_PROTECTION,
+    strategyId: Strategies.Identifiers.EoaLiquidationProtection,
+    protocol: PROTOCOLS.AaveV3,
+  },
 };
 
 export const BASE_BUNDLES_INFO: BaseBundleInfo = {
@@ -795,30 +845,35 @@ export const BASE_BUNDLES_INFO: BaseBundleInfo = {
     strategyId: Strategies.Identifiers.RepayOnPrice,
     protocol: PROTOCOLS.MorphoBlue,
   },
-  [Bundles.BaseIds.MORPHO_BLUE_EOA_REPAY]: {
-    strategyOrBundleId: Bundles.BaseIds.MORPHO_BLUE_EOA_REPAY,
-    strategyId: Strategies.Identifiers.EoaRepay,
-    protocol: PROTOCOLS.MorphoBlue,
+  [Bundles.BaseIds.AAVE_V3_SW_LIQUIDATION_PROTECTION]: {
+    strategyOrBundleId: Bundles.BaseIds.AAVE_V3_SW_LIQUIDATION_PROTECTION,
+    strategyId: Strategies.Identifiers.LiquidationProtection,
+    protocol: PROTOCOLS.AaveV3,
   },
-  [Bundles.BaseIds.MORPHO_BLUE_EOA_BOOST]: {
-    strategyOrBundleId: Bundles.BaseIds.MORPHO_BLUE_EOA_BOOST,
-    strategyId: Strategies.Identifiers.EoaBoost,
-    protocol: PROTOCOLS.MorphoBlue,
+  [Bundles.BaseIds.COMP_V3_SW_LIQUIDATION_PROTECTION]: {
+    strategyOrBundleId: Bundles.BaseIds.COMP_V3_SW_LIQUIDATION_PROTECTION,
+    strategyId: Strategies.Identifiers.LiquidationProtection,
+    protocol: PROTOCOLS.CompoundV3,
   },
-  [Bundles.BaseIds.MORPHO_BLUE_EOA_BOOST_ON_PRICE]: {
-    strategyOrBundleId: Bundles.BaseIds.MORPHO_BLUE_EOA_BOOST_ON_PRICE,
-    strategyId: Strategies.Identifiers.EoaBoostOnPrice,
-    protocol: PROTOCOLS.MorphoBlue,
+  [Bundles.BaseIds.COMP_V3_EOA_LIQUIDATION_PROTECTION]: {
+    strategyOrBundleId: Bundles.BaseIds.COMP_V3_EOA_LIQUIDATION_PROTECTION,
+    strategyId: Strategies.Identifiers.EoaLiquidationProtection,
+    protocol: PROTOCOLS.CompoundV3,
   },
-  [Bundles.BaseIds.MORPHO_BLUE_EOA_REPAY_ON_PRICE]: {
-    strategyOrBundleId: Bundles.BaseIds.MORPHO_BLUE_EOA_REPAY_ON_PRICE,
-    strategyId: Strategies.Identifiers.EoaRepayOnPrice,
+  [Bundles.BaseIds.MORPHO_BLUE_SW_LIQUIDATION_PROTECTION]: {
+    strategyOrBundleId: Bundles.BaseIds.MORPHO_BLUE_SW_LIQUIDATION_PROTECTION,
+    strategyId: Strategies.Identifiers.LiquidationProtection,
     protocol: PROTOCOLS.MorphoBlue,
   },
-  [Bundles.BaseIds.MORPHO_BLUE_EOA_CLOSE]: {
-    strategyOrBundleId: Bundles.BaseIds.MORPHO_BLUE_EOA_CLOSE,
-    strategyId: Strategies.Identifiers.EoaCloseOnPrice,
-    protocol: PROTOCOLS.MorphoBlue,
+  [Bundles.BaseIds.FLUID_T1_SW_LIQUIDATION_PROTECTION]: {
+    strategyOrBundleId: Bundles.BaseIds.FLUID_T1_SW_LIQUIDATION_PROTECTION,
+    strategyId: Strategies.Identifiers.LiquidationProtection,
+    protocol: PROTOCOLS.FluidT1,
+  },
+  [Bundles.BaseIds.AAVE_V3_EOA_LIQUIDATION_PROTECTION]: {
+    strategyOrBundleId: Bundles.BaseIds.AAVE_V3_EOA_LIQUIDATION_PROTECTION,
+    strategyId: Strategies.Identifiers.EoaLiquidationProtection,
+    protocol: PROTOCOLS.AaveV3,
   },
 };
 
@@ -973,19 +1028,40 @@ export const ARBITRUM_BUNDLES_INFO: ArbitrumBundleInfo = {
     strategyId: Strategies.Identifiers.RepayOnPrice,
     protocol: PROTOCOLS.MorphoBlue,
   },
-  [Bundles.ArbitrumIds.MORPHO_BLUE_EOA_BOOST_ON_PRICE]: {
-    strategyOrBundleId: Bundles.ArbitrumIds.MORPHO_BLUE_EOA_BOOST_ON_PRICE,
-    strategyId: Strategies.Identifiers.EoaBoostOnPrice,
-    protocol: PROTOCOLS.MorphoBlue,
+  [Bundles.ArbitrumIds.AAVE_V3_SW_LIQUIDATION_PROTECTION]: {
+    strategyOrBundleId: Bundles.ArbitrumIds.AAVE_V3_SW_LIQUIDATION_PROTECTION,
+    strategyId: Strategies.Identifiers.LiquidationProtection,
+    protocol: PROTOCOLS.AaveV3,
   },
-  [Bundles.ArbitrumIds.MORPHO_BLUE_EOA_REPAY_ON_PRICE]: {
-    strategyOrBundleId: Bundles.ArbitrumIds.MORPHO_BLUE_EOA_REPAY_ON_PRICE,
-    strategyId: Strategies.Identifiers.EoaRepayOnPrice,
+  [Bundles.ArbitrumIds.COMP_V3_SW_LIQUIDATION_PROTECTION]: {
+    strategyOrBundleId: Bundles.ArbitrumIds.COMP_V3_SW_LIQUIDATION_PROTECTION,
+    strategyId: Strategies.Identifiers.LiquidationProtection,
+    protocol: PROTOCOLS.CompoundV3,
+  },
+  [Bundles.ArbitrumIds.COMP_V3_EOA_LIQUIDATION_PROTECTION]: {
+    strategyOrBundleId: Bundles.ArbitrumIds.COMP_V3_EOA_LIQUIDATION_PROTECTION,
+    strategyId: Strategies.Identifiers.EoaLiquidationProtection,
+    protocol: PROTOCOLS.CompoundV3,
+  },
+  [Bundles.ArbitrumIds.MORPHO_BLUE_SW_LIQUIDATION_PROTECTION]: {
+    strategyOrBundleId:
+      Bundles.ArbitrumIds.MORPHO_BLUE_SW_LIQUIDATION_PROTECTION,
+    strategyId: Strategies.Identifiers.LiquidationProtection,
     protocol: PROTOCOLS.MorphoBlue,
   },
-  [Bundles.ArbitrumIds.MORPHO_BLUE_EOA_CLOSE]: {
-    strategyOrBundleId: Bundles.ArbitrumIds.MORPHO_BLUE_EOA_CLOSE,
-    strategyId: Strategies.Identifiers.EoaCloseOnPrice,
+  [Bundles.ArbitrumIds.FLUID_T1_SW_LIQUIDATION_PROTECTION]: {
+    strategyOrBundleId: Bundles.ArbitrumIds.FLUID_T1_SW_LIQUIDATION_PROTECTION,
+    strategyId: Strategies.Identifiers.LiquidationProtection,
+    protocol: PROTOCOLS.FluidT1,
+  },
+  [Bundles.ArbitrumIds.AAVE_V3_EOA_LIQUIDATION_PROTECTION]: {
+    strategyOrBundleId: Bundles.ArbitrumIds.AAVE_V3_EOA_LIQUIDATION_PROTECTION,
+    strategyId: Strategies.Identifiers.EoaLiquidationProtection,
+    protocol: PROTOCOLS.AaveV3,
+  },
+  [Bundles.ArbitrumIds.MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION]: {
+    strategyOrBundleId: Bundles.ArbitrumIds.MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION,
+    strategyId: Strategies.Identifiers.EoaLiquidationProtection,
     protocol: PROTOCOLS.MorphoBlue,
   },
 };

package/src/index.ts

@@ -24,18 +24,34 @@ import * as enums from './types/enums';
 import type * as types from './types';
 
 import {
-  getRatioStateInfoForAaveCloseStrategy, compareSubHashes, encodeSubId, getCloseStrategyType,
+  getRatioStateInfoForAaveCloseStrategy,
+  compareSubHashes,
+  encodeSubId,
+  getCloseStrategyType,
 } from './services/utils';
 
 const utils = {
-  getRatioStateInfoForAaveCloseStrategy, compareSubHashes, encodeSubId, getCloseStrategyType,
+  compareSubHashes,
+  encodeSubId,
+  getCloseStrategyType,
+  getRatioStateInfoForAaveCloseStrategy,
 };
 
 export {
-  LegacyMakerAutomation, LegacyAaveAutomation, LegacyCompoundAutomation,
-  EthereumStrategies, OptimismStrategies, ArbitrumStrategies, BaseStrategies,
-  triggerService, subDataService, strategySubService, utils,
-  enums, constants, strategiesService,
+  ArbitrumStrategies,
+  BaseStrategies,
+  EthereumStrategies,
+  LegacyAaveAutomation,
+  LegacyCompoundAutomation,
+  LegacyMakerAutomation,
+  OptimismStrategies,
+  constants,
+  enums,
+  strategiesService,
+  strategySubService,
+  subDataService,
+  triggerService,
+  utils,
 };
 
 export type { types };

package/src/services/strategiesService.ts

@@ -106,7 +106,7 @@ function parseMakerLeverageManagement(position: Position.Automated, parseData: P
   const { isEnabled } = parseData.strategiesSubsData;
 
   const triggerData = triggerService.makerRatioTrigger.decode(subStruct.triggerData);
-  const subData = subDataService.makerLeverageManagementSubData.decode(subStruct.subData);
+  const subData = subDataService.legacyMakerLeverageManagementSubData.decode(subStruct.subData);
 
   _position.strategyData.decoded.triggerData = triggerData;
   _position.strategyData.decoded.subData = subData;
@@ -140,6 +140,33 @@ function parseMakerLeverageManagement(position: Position.Automated, parseData: P
   return _position;
 }
 
+function parseMakerLiquidationProtection(position: Position.Automated, parseData: ParseData): Position.Automated {
+  const _position = cloneDeep(position);
+
+  const { subStruct, subId } = parseData.subscriptionEventData;
+  const { isEnabled } = parseData.strategiesSubsData;
+
+  const triggerData = triggerService.makerRatioTrigger.decode(subStruct.triggerData);
+  const subData = subDataService.makerLiquidationProtectionSubData.decode(subStruct.subData);
+
+  _position.strategyData.decoded.triggerData = triggerData;
+  _position.strategyData.decoded.subData = subData;
+
+  _position.positionId = getPositionId(_position.chainId, _position.protocol.id, subData.vaultId);
+
+
+  _position.specific = {
+    triggerRepayRatio: triggerData.ratio,
+    targetRepayRatio: subData.targetRatio,
+    repayEnabled: isEnabled,
+    subId1: Number(subId),
+  };
+
+  _position.strategy.strategyId = Strategies.IdOverrides.LiquidationProtection;
+
+  return _position;
+}
+
 function parseLiquityCloseOnPrice(position: Position.Automated, parseData: ParseData): Position.Automated {
   const _position = cloneDeep(position);
 
@@ -196,7 +223,7 @@ function parseAaveV2LeverageManagement(position: Position.Automated, parseData:
   const { isEnabled } = parseData.strategiesSubsData;
 
   const triggerData = triggerService.aaveV2RatioTrigger.decode(subStruct.triggerData);
-  const subData = subDataService.aaveV2LeverageManagementSubData.decode(subStruct.subData);
+  const subData = subDataService.legacyAaveV2LeverageManagementSubData.decode(subStruct.subData);
 
   _position.strategyData.decoded.triggerData = triggerData;
   _position.strategyData.decoded.subData = subData;
@@ -240,9 +267,9 @@ function parseAaveV3LeverageManagement(position: Position.Automated, parseData:
   const isEOA = _position.strategy.strategyId.includes('eoa');
   let subData;
   if (isEOA) {
-    subData = subDataService.aaveV3LeverageManagementSubDataWithoutSubProxy.decode(subStruct.subData);
-  } else {
     subData = subDataService.aaveV3LeverageManagementSubData.decode(subStruct.subData);
+  } else {
+    subData = subDataService.legacyAaveV3LeverageManagementSubData.decode(subStruct.subData);
   }
 
   _position.strategyData.decoded.triggerData = triggerData;
@@ -280,6 +307,35 @@ function parseAaveV3LeverageManagement(position: Position.Automated, parseData:
   return _position;
 }
 
+function parseAaveV3LiquidationProtection(position: Position.Automated, parseData: ParseData): Position.Automated {
+  const _position = cloneDeep(position);
+
+  const { subStruct, subId, subHash } = parseData.subscriptionEventData;
+  const { isEnabled } = parseData.strategiesSubsData;
+
+  const triggerData = triggerService.aaveV3RatioTrigger.decode(subStruct.triggerData);
+
+  const subData = subDataService.aaveV3LiquidationProtectionSubData.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);
+
+  _position.specific = {
+    triggerRepayRatio: triggerData.ratio,
+    targetRepayRatio: subData.targetRatio,
+    repayEnabled: isEnabled,
+    subId1: Number(subId),
+    subHashRepay: subHash,
+  };
+
+  const isEOA = _position.strategy.strategyId.includes('eoa');
+  _position.strategy.strategyId = isEOA ? Strategies.IdOverrides.EoaLiquidationProtection : Strategies.IdOverrides.LiquidationProtection;
+
+  return _position;
+}
+
 function parseAaveV3LeverageManagementOnPrice(position: Position.Automated, parseData: ParseData): Position.Automated {
   const _position = cloneDeep(position);
   const { subStruct } = parseData.subscriptionEventData;
@@ -437,6 +493,31 @@ function parseAaveV4LeverageManagement(position: Position.Automated, parseData:
   return _position;
 }
 
+function parseAaveV4LiquidationProtection(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.aaveV4LiquidationProtectionSubData.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.IdOverrides.EoaLiquidationProtection : Strategies.IdOverrides.LiquidationProtection;
+
+  _position.specific = {
+    triggerRepayRatio: triggerData.ratio,
+    targetRepayRatio: subData.targetRatio,
+    repayEnabled: isEnabled,
+    subId1: Number(subId),
+    subHashRepay: subHash,
+  };
+
+  return _position;
+}
+
+
 function parseAaveV4LeverageManagementOnPrice(position: Position.Automated, parseData: ParseData): Position.Automated {
   const _position = cloneDeep(position);
   const { subStruct } = parseData.subscriptionEventData;
@@ -589,7 +670,7 @@ function parseCompoundV2LeverageManagement(position: Position.Automated, parseDa
   const { isEnabled } = parseData.strategiesSubsData;
 
   const triggerData = triggerService.compoundV2RatioTrigger.decode(subStruct.triggerData);
-  const subData = subDataService.compoundV2LeverageManagementSubData.decode(subStruct.subData);
+  const subData = subDataService.legacyCompoundV2LeverageManagementSubData.decode(subStruct.subData);
 
   _position.strategyData.decoded.triggerData = triggerData;
   _position.strategyData.decoded.subData = subData;
@@ -631,7 +712,7 @@ function parseCompoundV3LeverageManagement(position: Position.Automated, parseDa
   const { subStruct, subId, subHash } = parseData.subscriptionEventData;
   const { isEnabled } = parseData.strategiesSubsData;
 
-  const subDataDecoder = subDataService.compoundV3LeverageManagementSubDataWithoutSubProxy;
+  const subDataDecoder = subDataService.compoundV3LeverageManagementSubData;
 
   const triggerData = triggerService.compoundV3RatioTrigger.decode(subStruct.triggerData);
   const subData = subDataDecoder.decode(subStruct.subData);
@@ -670,6 +751,39 @@ function parseCompoundV3LeverageManagement(position: Position.Automated, parseDa
   return _position;
 }
 
+
+function parseCompoundV3LiquidationProtection(position: Position.Automated, parseData: ParseData): Position.Automated {
+  const _position = cloneDeep(position);
+
+  const { subStruct, subId, subHash } = parseData.subscriptionEventData;
+  const { isEnabled } = parseData.strategiesSubsData;
+
+  const subDataDecoder = subDataService.compoundV3LiquidationProtectionSubData;
+
+  const triggerData = triggerService.compoundV3RatioTrigger.decode(subStruct.triggerData);
+  const subData = subDataDecoder.decode(subStruct.subData);
+
+  _position.strategyData.decoded.triggerData = triggerData;
+  _position.strategyData.decoded.subData = subData;
+
+  _position.positionId = getPositionId(_position.chainId, _position.protocol.id, triggerData.owner.toLowerCase(), triggerData.market);
+
+  const isEOA = _position.strategy.strategyId.includes('eoa');
+
+  _position.specific = {
+    triggerRepayRatio: triggerData.ratio,
+    targetRepayRatio: subData.targetRatio,
+    repayEnabled: isEnabled,
+    subId1: Number(subId),
+    subHashRepay: subHash,
+  };
+
+  _position.strategy.strategyId = isEOA ? Strategies.IdOverrides.EoaLiquidationProtection : Strategies.IdOverrides.LiquidationProtection;
+
+  return _position;
+}
+
+
 function parseCompoundV3LeverageManagementOnPrice(position: Position.Automated, parseData: ParseData): Position.Automated {
   const _position = cloneDeep(position);
 
@@ -774,7 +888,7 @@ function parseExchangeLimitOrder(position: Position.Automated, parseData: ParseD
 
   const { subStruct } = parseData.subscriptionEventData;
 
-  _position.strategyData.decoded.subData = subDataService.exchangeLimitOrderSubData.decode(subStruct.subData, chainId);
+  _position.strategyData.decoded.subData = subDataService.legacyExchangeLimitOrderSubData.decode(subStruct.subData, chainId);
   const fromTokenDecimals = getAssetInfoByAddress(_position.strategyData.decoded.subData.fromToken, chainId).decimals;
   const toTokenDecimals = getAssetInfoByAddress(_position.strategyData.decoded.subData.toToken, chainId).decimals;
   _position.strategyData.decoded.triggerData = triggerService.exchangeOffchainPriceTrigger.decode(subStruct.triggerData, fromTokenDecimals, toTokenDecimals);
@@ -791,7 +905,7 @@ function parseLiquityLeverageManagement(position: Position.Automated, parseData:
   const { isEnabled } = parseData.strategiesSubsData;
 
   const triggerData = triggerService.liquityRatioTrigger.decode(subStruct.triggerData);
-  const subData = subDataService.liquityLeverageManagementSubData.decode(subStruct.subData);
+  const subData = subDataService.legacyLiquityLeverageManagementSubData.decode(subStruct.subData);
 
   _position.strategyData.decoded.triggerData = triggerData;
   _position.strategyData.decoded.subData = subData;
@@ -875,7 +989,7 @@ function parseSparkLeverageManagement(position: Position.Automated, parseData: P
   const { isEnabled } = parseData.strategiesSubsData;
 
   const triggerData = triggerService.sparkRatioTrigger.decode(subStruct.triggerData);
-  const subData = subDataService.sparkLeverageManagementSubData.decode(subStruct.subData);
+  const subData = subDataService.legacySparkLeverageManagementSubData.decode(subStruct.subData);
 
   _position.strategyData.decoded.triggerData = triggerData;
   _position.strategyData.decoded.subData = subData;
@@ -909,6 +1023,34 @@ function parseSparkLeverageManagement(position: Position.Automated, parseData: P
   return _position;
 }
 
+function parseSparkLiquidationProtection(position: Position.Automated, parseData: ParseData): Position.Automated {
+  const _position = cloneDeep(position);
+
+  const { subStruct, subId, subHash } = parseData.subscriptionEventData;
+  const { isEnabled } = parseData.strategiesSubsData;
+
+  const triggerData = triggerService.sparkRatioTrigger.decode(subStruct.triggerData);
+  const subData = subDataService.sparkLiquidationProtectionSubData.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);
+
+  _position.specific = {
+    triggerRepayRatio: triggerData.ratio,
+    targetRepayRatio: subData.targetRatio,
+    repayEnabled: isEnabled,
+    subId1: Number(subId),
+    subHashRepay: subHash,
+  };
+
+  _position.strategy.strategyId = Strategies.IdOverrides.LiquidationProtection;
+
+  return _position;
+}
+
+
 function parseSparkLeverageManagementOnPrice(position: Position.Automated, parseData: ParseData): Position.Automated {
   const _position = cloneDeep(position);
   const { subStruct } = parseData.subscriptionEventData;
@@ -1109,6 +1251,34 @@ function parseMorphoBlueLeverageManagement(position: Position.Automated, parseDa
   return _position;
 }
 
+
+function parseMorphoBlueLiquidationProtection(position: Position.Automated, parseData: ParseData): Position.Automated {
+  const _position = cloneDeep(position);
+
+  const { subStruct, subId, subHash } = parseData.subscriptionEventData;
+  const { isEnabled } = parseData.strategiesSubsData;
+  const triggerData = triggerService.morphoBlueRatioTrigger.decode(subStruct.triggerData);
+  const subData = subDataService.morphoBlueLiquidationProtectionSubData.decode(subStruct.subData);
+
+  _position.strategyData.decoded.triggerData = triggerData;
+  _position.strategyData.decoded.subData = subData;
+
+  _position.positionId = getPositionId(_position.chainId, _position.protocol.id, triggerData.owner.toLowerCase(), triggerData.marketId);
+
+  _position.specific = {
+    triggerRepayRatio: triggerData.ratio,
+    targetRepayRatio: subData.targetRatio,
+    repayEnabled: isEnabled,
+    subId1: Number(subId),
+    subHashRepay: subHash,
+  };
+
+  const isEOA = _position.strategy.strategyId.includes('eoa');
+  _position.strategy.strategyId = isEOA ? Strategies.IdOverrides.EoaLiquidationProtection : Strategies.IdOverrides.LiquidationProtection;
+
+  return _position;
+}
+
 function parseMorphoBlueLeverageManagementOnPrice(position: Position.Automated, parseData: ParseData): Position.Automated {
   const _position = cloneDeep(position);
 
@@ -1315,6 +1485,37 @@ function parseFluidT1LeverageManagement(position: Position.Automated, parseData:
   return _position;
 }
 
+
+function parseFluidT1LiquidationProtection(position: Position.Automated, parseData: ParseData): Position.Automated {
+  const _position = cloneDeep(position);
+
+  const { subStruct, subId, subHash } = parseData.subscriptionEventData;
+  const { isEnabled } = parseData.strategiesSubsData;
+
+  const triggerData = triggerService.fluidRatioTrigger.decode(subStruct.triggerData);
+  const subData = subDataService.fluidLiquidationProtectionSubData.decode(subStruct.subData);
+
+  _position.strategyData.decoded.triggerData = triggerData;
+  _position.strategyData.decoded.subData = subData;
+
+  _position.positionId = getPositionId(
+    _position.chainId, _position.protocol.id, _position.owner, triggerData.nftId, subData.vault,
+  );
+
+  _position.specific = {
+    triggerRepayRatio: triggerData.ratio,
+    targetRepayRatio: subData.targetRatio,
+    repayEnabled: isEnabled,
+    subId1: Number(subId),
+    subHashRepay: subHash,
+  };
+
+  _position.strategy.strategyId = Strategies.IdOverrides.LiquidationProtection;
+
+  return _position;
+}
+
+
 const parsingMethodsMapping: StrategiesToProtocolVersionMapping = {
   [ProtocolIdentifiers.StrategiesAutomation.MakerDAO]: {
     [Strategies.Identifiers.SavingsLiqProtection]: parseMakerSavingsLiqProtection,
@@ -1324,6 +1525,7 @@ const parsingMethodsMapping: StrategiesToProtocolVersionMapping = {
     [Strategies.Identifiers.TrailingStopToDebt]: parseMakerTrailingStop,
     [Strategies.Identifiers.Repay]: parseMakerLeverageManagement,
     [Strategies.Identifiers.Boost]: parseMakerLeverageManagement,
+    [Strategies.Identifiers.LiquidationProtection]: parseMakerLiquidationProtection,
   },
   [ProtocolIdentifiers.StrategiesAutomation.Liquity]: {
     [Strategies.Identifiers.CloseOnPriceToColl]: parseLiquityCloseOnPrice,
@@ -1362,6 +1564,8 @@ const parsingMethodsMapping: StrategiesToProtocolVersionMapping = {
     [Strategies.Identifiers.EoaBoostOnPrice]: parseAaveV3LeverageManagementOnPrice,
     [Strategies.Identifiers.EoaCloseOnPrice]: parseAaveV3CloseOnPrice,
     [Strategies.Identifiers.CollateralSwitch]: parseAaveV3CollateralSwitch,
+    [Strategies.Identifiers.LiquidationProtection]: parseAaveV3LiquidationProtection,
+    [Strategies.Identifiers.EoaLiquidationProtection]: parseAaveV3LiquidationProtection,
   },
   [ProtocolIdentifiers.StrategiesAutomation.AaveV4]: {
     [Strategies.Identifiers.Repay]: parseAaveV4LeverageManagement,
@@ -1376,6 +1580,8 @@ const parsingMethodsMapping: StrategiesToProtocolVersionMapping = {
     [Strategies.Identifiers.EoaCloseOnPrice]: parseAaveV4CloseOnPrice,
     [Strategies.Identifiers.CollateralSwitch]: parseAaveV4CollateralSwitch,
     [Strategies.Identifiers.EoaCollateralSwitch]: parseAaveV4CollateralSwitch,
+    [Strategies.Identifiers.LiquidationProtection]: parseAaveV4LiquidationProtection,
+    [Strategies.Identifiers.EoaLiquidationProtection]: parseAaveV4LiquidationProtection,
   },
   [ProtocolIdentifiers.StrategiesAutomation.CompoundV2]: {
     [Strategies.Identifiers.Repay]: parseCompoundV2LeverageManagement,
@@ -1392,6 +1598,8 @@ const parsingMethodsMapping: StrategiesToProtocolVersionMapping = {
     [Strategies.Identifiers.EoaBoostOnPrice]: parseCompoundV3LeverageManagementOnPrice,
     [Strategies.Identifiers.CloseOnPrice]: parseCompoundV3CloseOnPrice,
     [Strategies.Identifiers.EoaCloseOnPrice]: parseCompoundV3CloseOnPrice,
+    [Strategies.Identifiers.LiquidationProtection]: parseCompoundV3LiquidationProtection,
+    [Strategies.Identifiers.EoaLiquidationProtection]: parseCompoundV3LiquidationProtection,
   },
   [ProtocolIdentifiers.StrategiesAutomation.ChickenBonds]: {
     [Strategies.Identifiers.Rebond]: parseChickenBondsRebond,
@@ -1411,6 +1619,7 @@ const parsingMethodsMapping: StrategiesToProtocolVersionMapping = {
     [Strategies.Identifiers.BoostOnPrice]: parseSparkLeverageManagementOnPrice,
     [Strategies.Identifiers.CloseOnPrice]: parseSparkCloseOnPrice,
     [Strategies.Identifiers.CollateralSwitch]: parseSparkCollateralSwitch,
+    [Strategies.Identifiers.LiquidationProtection]: parseSparkLiquidationProtection,
   },
   [ProtocolIdentifiers.StrategiesAutomation.CrvUSD]: {
     [Strategies.Identifiers.Repay]: parseCrvUSDLeverageManagement,
@@ -1424,14 +1633,14 @@ const parsingMethodsMapping: StrategiesToProtocolVersionMapping = {
     [Strategies.Identifiers.EoaBoost]: parseMorphoBlueLeverageManagement,
     [Strategies.Identifiers.BoostOnPrice]: parseMorphoBlueLeverageManagementOnPrice,
     [Strategies.Identifiers.RepayOnPrice]: parseMorphoBlueLeverageManagementOnPrice,
-    [Strategies.Identifiers.EoaBoostOnPrice]: parseMorphoBlueLeverageManagementOnPrice,
-    [Strategies.Identifiers.EoaRepayOnPrice]: parseMorphoBlueLeverageManagementOnPrice,
     [Strategies.Identifiers.CloseOnPrice]: parseMorphoBlueCloseOnPrice,
-    [Strategies.Identifiers.EoaCloseOnPrice]: parseMorphoBlueCloseOnPrice,
+    [Strategies.Identifiers.LiquidationProtection]: parseMorphoBlueLiquidationProtection,
+    [Strategies.Identifiers.EoaLiquidationProtection]: parseMorphoBlueLiquidationProtection,
   },
   [ProtocolIdentifiers.StrategiesAutomation.FluidT1]: {
     [Strategies.Identifiers.Repay]: parseFluidT1LeverageManagement,
     [Strategies.Identifiers.Boost]: parseFluidT1LeverageManagement,
+    [Strategies.Identifiers.LiquidationProtection]: parseFluidT1LiquidationProtection,
   },
 };