@defisaver/automation-sdk 3.3.16-liq-prot-dev → 3.3.17

package/esm/constants/index.js

@@ -543,64 +543,24 @@ export const MAINNET_BUNDLES_INFO = {
         strategyId: Strategies.Identifiers.EoaCloseOnPrice,
         protocol: PROTOCOLS.AaveV4,
     },
-    [Bundles.MainnetIds.MAKER_SW_LIQUIDATION_PROTECTION]: {
-        strategyOrBundleId: Bundles.MainnetIds.MAKER_SW_LIQUIDATION_PROTECTION,
-        strategyId: Strategies.Identifiers.LiquidationProtection,
-        protocol: PROTOCOLS.MakerDAO,
-    },
-    [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,
+    [Bundles.MainnetIds.MORPHO_BLUE_REPAY_ON_PRICE]: {
+        strategyOrBundleId: Bundles.MainnetIds.MORPHO_BLUE_REPAY_ON_PRICE,
+        strategyId: Strategies.Identifiers.RepayOnPrice,
         protocol: PROTOCOLS.MorphoBlue,
     },
-    [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_BOOST_ON_PRICE]: {
+        strategyOrBundleId: Bundles.MainnetIds.MORPHO_BLUE_EOA_BOOST_ON_PRICE,
+        strategyId: Strategies.Identifiers.EoaBoostOnPrice,
+        protocol: PROTOCOLS.MorphoBlue,
     },
-    [Bundles.MainnetIds.MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION]: {
-        strategyOrBundleId: Bundles.MainnetIds.MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION,
-        strategyId: Strategies.Identifiers.EoaLiquidationProtection,
+    [Bundles.MainnetIds.MORPHO_BLUE_EOA_REPAY_ON_PRICE]: {
+        strategyOrBundleId: Bundles.MainnetIds.MORPHO_BLUE_EOA_REPAY_ON_PRICE,
+        strategyId: Strategies.Identifiers.EoaRepayOnPrice,
         protocol: PROTOCOLS.MorphoBlue,
     },
-    [Bundles.MainnetIds.MORPHO_BLUE_REPAY_ON_PRICE]: {
-        strategyOrBundleId: Bundles.MainnetIds.MORPHO_BLUE_REPAY_ON_PRICE,
-        strategyId: Strategies.Identifiers.RepayOnPrice,
+    [Bundles.MainnetIds.MORPHO_BLUE_EOA_CLOSE]: {
+        strategyOrBundleId: Bundles.MainnetIds.MORPHO_BLUE_EOA_CLOSE,
+        strategyId: Strategies.Identifiers.EoaCloseOnPrice,
         protocol: PROTOCOLS.MorphoBlue,
     },
 };
@@ -660,16 +620,6 @@ export const OPTIMISM_BUNDLES_INFO = {
         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 = {
     [Bundles.BaseIds.AAVE_V3_REPAY]: {
@@ -812,35 +762,30 @@ export const BASE_BUNDLES_INFO = {
         strategyId: Strategies.Identifiers.RepayOnPrice,
         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.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_REPAY]: {
+        strategyOrBundleId: Bundles.BaseIds.MORPHO_BLUE_EOA_REPAY,
+        strategyId: Strategies.Identifiers.EoaRepay,
+        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_BOOST]: {
+        strategyOrBundleId: Bundles.BaseIds.MORPHO_BLUE_EOA_BOOST,
+        strategyId: Strategies.Identifiers.EoaBoost,
+        protocol: PROTOCOLS.MorphoBlue,
     },
-    [Bundles.BaseIds.MORPHO_BLUE_SW_LIQUIDATION_PROTECTION]: {
-        strategyOrBundleId: Bundles.BaseIds.MORPHO_BLUE_SW_LIQUIDATION_PROTECTION,
-        strategyId: Strategies.Identifiers.LiquidationProtection,
+    [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.FLUID_T1_SW_LIQUIDATION_PROTECTION]: {
-        strategyOrBundleId: Bundles.BaseIds.FLUID_T1_SW_LIQUIDATION_PROTECTION,
-        strategyId: Strategies.Identifiers.LiquidationProtection,
-        protocol: PROTOCOLS.FluidT1,
+    [Bundles.BaseIds.MORPHO_BLUE_EOA_REPAY_ON_PRICE]: {
+        strategyOrBundleId: Bundles.BaseIds.MORPHO_BLUE_EOA_REPAY_ON_PRICE,
+        strategyId: Strategies.Identifiers.EoaRepayOnPrice,
+        protocol: PROTOCOLS.MorphoBlue,
     },
-    [Bundles.BaseIds.AAVE_V3_EOA_LIQUIDATION_PROTECTION]: {
-        strategyOrBundleId: Bundles.BaseIds.AAVE_V3_EOA_LIQUIDATION_PROTECTION,
-        strategyId: Strategies.Identifiers.EoaLiquidationProtection,
-        protocol: PROTOCOLS.AaveV3,
+    [Bundles.BaseIds.MORPHO_BLUE_EOA_CLOSE]: {
+        strategyOrBundleId: Bundles.BaseIds.MORPHO_BLUE_EOA_CLOSE,
+        strategyId: Strategies.Identifiers.EoaCloseOnPrice,
+        protocol: PROTOCOLS.MorphoBlue,
     },
 };
 export const ARBITRUM_BUNDLES_INFO = {
@@ -994,39 +939,19 @@ export const ARBITRUM_BUNDLES_INFO = {
         strategyId: Strategies.Identifiers.RepayOnPrice,
         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.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,
+    [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.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_REPAY_ON_PRICE]: {
+        strategyOrBundleId: Bundles.ArbitrumIds.MORPHO_BLUE_EOA_REPAY_ON_PRICE,
+        strategyId: Strategies.Identifiers.EoaRepayOnPrice,
+        protocol: PROTOCOLS.MorphoBlue,
     },
-    [Bundles.ArbitrumIds.MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION]: {
-        strategyOrBundleId: Bundles.ArbitrumIds.MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION,
-        strategyId: Strategies.Identifiers.EoaLiquidationProtection,
+    [Bundles.ArbitrumIds.MORPHO_BLUE_EOA_CLOSE]: {
+        strategyOrBundleId: Bundles.ArbitrumIds.MORPHO_BLUE_EOA_CLOSE,
+        strategyId: Strategies.Identifiers.EoaCloseOnPrice,
         protocol: PROTOCOLS.MorphoBlue,
     },
 };

package/esm/index.d.ts

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

package/esm/index.js

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

package/esm/services/strategiesService.js

@@ -66,7 +66,7 @@ function parseMakerLeverageManagement(position, parseData) {
     const { subStruct, subId, subHash } = parseData.subscriptionEventData;
     const { isEnabled } = parseData.strategiesSubsData;
     const triggerData = triggerService.makerRatioTrigger.decode(subStruct.triggerData);
-    const subData = subDataService.legacyMakerLeverageManagementSubData.decode(subStruct.subData);
+    const subData = subDataService.makerLeverageManagementSubData.decode(subStruct.subData);
     _position.strategyData.decoded.triggerData = triggerData;
     _position.strategyData.decoded.subData = subData;
     _position.positionId = getPositionId(_position.chainId, _position.protocol.id, subData.vaultId);
@@ -94,24 +94,6 @@ function parseMakerLeverageManagement(position, parseData) {
     _position.strategy.strategyId = Strategies.IdOverrides.LeverageManagement;
     return _position;
 }
-function parseMakerLiquidationProtection(position, parseData) {
-    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, parseData) {
     const _position = cloneDeep(position);
     const { subStruct } = parseData.subscriptionEventData;
@@ -149,7 +131,7 @@ function parseAaveV2LeverageManagement(position, parseData) {
     const { subStruct, subId, subHash } = parseData.subscriptionEventData;
     const { isEnabled } = parseData.strategiesSubsData;
     const triggerData = triggerService.aaveV2RatioTrigger.decode(subStruct.triggerData);
-    const subData = subDataService.legacyAaveV2LeverageManagementSubData.decode(subStruct.subData);
+    const subData = subDataService.aaveV2LeverageManagementSubData.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);
@@ -185,10 +167,10 @@ function parseAaveV3LeverageManagement(position, parseData) {
     const isEOA = _position.strategy.strategyId.includes('eoa');
     let subData;
     if (isEOA) {
-        subData = subDataService.aaveV3LeverageManagementSubData.decode(subStruct.subData);
+        subData = subDataService.aaveV3LeverageManagementSubDataWithoutSubProxy.decode(subStruct.subData);
     }
     else {
-        subData = subDataService.legacyAaveV3LeverageManagementSubData.decode(subStruct.subData);
+        subData = subDataService.aaveV3LeverageManagementSubData.decode(subStruct.subData);
     }
     _position.strategyData.decoded.triggerData = triggerData;
     _position.strategyData.decoded.subData = subData;
@@ -222,26 +204,6 @@ function parseAaveV3LeverageManagement(position, parseData) {
     }
     return _position;
 }
-function parseAaveV3LiquidationProtection(position, parseData) {
-    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, parseData) {
     const _position = cloneDeep(position);
     const { subStruct } = parseData.subscriptionEventData;
@@ -371,26 +333,6 @@ function parseAaveV4LeverageManagement(position, parseData) {
     }
     return _position;
 }
-function parseAaveV4LiquidationProtection(position, parseData) {
-    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, parseData) {
     const _position = cloneDeep(position);
     const { subStruct } = parseData.subscriptionEventData;
@@ -510,7 +452,7 @@ function parseCompoundV2LeverageManagement(position, parseData) {
     const { subStruct, subId, subHash } = parseData.subscriptionEventData;
     const { isEnabled } = parseData.strategiesSubsData;
     const triggerData = triggerService.compoundV2RatioTrigger.decode(subStruct.triggerData);
-    const subData = subDataService.legacyCompoundV2LeverageManagementSubData.decode(subStruct.subData);
+    const subData = subDataService.compoundV2LeverageManagementSubData.decode(subStruct.subData);
     _position.strategyData.decoded.triggerData = triggerData;
     _position.strategyData.decoded.subData = subData;
     _position.owner = triggerData.owner.toLowerCase();
@@ -544,7 +486,7 @@ function parseCompoundV3LeverageManagement(position, parseData) {
     const _position = cloneDeep(position);
     const { subStruct, subId, subHash } = parseData.subscriptionEventData;
     const { isEnabled } = parseData.strategiesSubsData;
-    const subDataDecoder = subDataService.compoundV3LeverageManagementSubData;
+    const subDataDecoder = subDataService.compoundV3LeverageManagementSubDataWithoutSubProxy;
     const triggerData = triggerService.compoundV3RatioTrigger.decode(subStruct.triggerData);
     const subData = subDataDecoder.decode(subStruct.subData);
     _position.strategyData.decoded.triggerData = triggerData;
@@ -575,27 +517,6 @@ function parseCompoundV3LeverageManagement(position, parseData) {
     _position.strategy.strategyId = isEOA ? Strategies.IdOverrides.EoaLeverageManagement : Strategies.IdOverrides.LeverageManagement;
     return _position;
 }
-function parseCompoundV3LiquidationProtection(position, parseData) {
-    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, parseData) {
     const _position = cloneDeep(position);
     const { subStruct } = parseData.subscriptionEventData;
@@ -669,7 +590,7 @@ function parseExchangeDca(position, parseData, chainId) {
 function parseExchangeLimitOrder(position, parseData, chainId) {
     const _position = cloneDeep(position);
     const { subStruct } = parseData.subscriptionEventData;
-    _position.strategyData.decoded.subData = subDataService.legacyExchangeLimitOrderSubData.decode(subStruct.subData, chainId);
+    _position.strategyData.decoded.subData = subDataService.exchangeLimitOrderSubData.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);
@@ -681,7 +602,7 @@ function parseLiquityLeverageManagement(position, parseData) {
     const { subStruct, subId, subHash } = parseData.subscriptionEventData;
     const { isEnabled } = parseData.strategiesSubsData;
     const triggerData = triggerService.liquityRatioTrigger.decode(subStruct.triggerData);
-    const subData = subDataService.legacyLiquityLeverageManagementSubData.decode(subStruct.subData);
+    const subData = subDataService.liquityLeverageManagementSubData.decode(subStruct.subData);
     _position.strategyData.decoded.triggerData = triggerData;
     _position.strategyData.decoded.subData = subData;
     _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner);
@@ -747,7 +668,7 @@ function parseSparkLeverageManagement(position, parseData) {
     const { subStruct, subId, subHash } = parseData.subscriptionEventData;
     const { isEnabled } = parseData.strategiesSubsData;
     const triggerData = triggerService.sparkRatioTrigger.decode(subStruct.triggerData);
-    const subData = subDataService.legacySparkLeverageManagementSubData.decode(subStruct.subData);
+    const subData = subDataService.sparkLeverageManagementSubData.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);
@@ -775,25 +696,6 @@ function parseSparkLeverageManagement(position, parseData) {
     _position.strategy.strategyId = Strategies.IdOverrides.LeverageManagement;
     return _position;
 }
-function parseSparkLiquidationProtection(position, parseData) {
-    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, parseData) {
     const _position = cloneDeep(position);
     const { subStruct } = parseData.subscriptionEventData;
@@ -918,6 +820,7 @@ function parseMorphoBlueLeverageManagement(position, parseData) {
     const _position = cloneDeep(position);
     const { subStruct, subId, subHash } = parseData.subscriptionEventData;
     const { isEnabled } = parseData.strategiesSubsData;
+    const isEOA = _position.strategy.strategyId.includes('eoa');
     const triggerData = triggerService.morphoBlueRatioTrigger.decode(subStruct.triggerData);
     const subData = subDataService.morphoBlueLeverageManagementSubData.decode(subStruct.subData);
     _position.strategyData.decoded.triggerData = triggerData;
@@ -931,7 +834,7 @@ function parseMorphoBlueLeverageManagement(position, parseData) {
             repayEnabled: isEnabled,
             subId1: Number(subId),
             subHashRepay: subHash,
-            mergeWithId: Strategies.Identifiers.Boost,
+            mergeWithId: isEOA ? Strategies.Identifiers.EoaBoost : Strategies.Identifiers.Boost,
         };
     }
     else {
@@ -941,36 +844,16 @@ function parseMorphoBlueLeverageManagement(position, parseData) {
             boostEnabled: isEnabled,
             subId2: Number(subId),
             subHashBoost: subHash,
-            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 parseMorphoBlueLiquidationProtection(position, parseData) {
-    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, parseData) {
     const _position = cloneDeep(position);
     const { subStruct } = parseData.subscriptionEventData;
+    const isEOA = _position.strategy.strategyId.includes('eoa');
     const triggerData = triggerService.morphoBluePriceTrigger.decode(subStruct.triggerData);
     const subData = subDataService.morphoBlueLeverageManagementOnPriceSubData.decode(subStruct.subData);
     _position.strategyData.decoded.triggerData = triggerData;
@@ -993,11 +876,15 @@ function parseMorphoBlueLeverageManagementOnPrice(position, parseData) {
         ratio: subData.targetRatio,
         ratioState: triggerData.priceState,
     };
+    _position.strategy.strategyId = isEOA
+        ? Strategies.IdOverrides.EoaLeverageManagementOnPrice
+        : Strategies.IdOverrides.LeverageManagementOnPrice;
     return _position;
 }
 function parseMorphoBlueCloseOnPrice(position, parseData) {
     const _position = cloneDeep(position);
     const { subStruct } = parseData.subscriptionEventData;
+    const isEOA = _position.strategy.strategyId.includes('eoa');
     const triggerData = triggerService.morphoBluePriceRangeTrigger.decode(subStruct.triggerData);
     const subData = subDataService.morphoBlueCloseOnPriceSubData.decode(subStruct.subData);
     _position.strategyData.decoded.triggerData = triggerData;
@@ -1012,6 +899,7 @@ function parseMorphoBlueCloseOnPrice(position, parseData) {
     ]);
     const marketId = web3.utils.keccak256(marketIdEncodedData);
     const { takeProfitType, stopLossType } = getStopLossAndTakeProfitTypeByCloseStrategyType(+subData.closeType);
+    _position.strategy.strategyId = isEOA ? Strategies.Identifiers.EoaCloseOnPrice : Strategies.Identifiers.CloseOnPrice;
     _position.specific = {
         subHash: _position.subHash,
         marketId,
@@ -1120,25 +1008,6 @@ function parseFluidT1LeverageManagement(position, parseData) {
     _position.strategy.strategyId = Strategies.IdOverrides.LeverageManagement;
     return _position;
 }
-function parseFluidT1LiquidationProtection(position, parseData) {
-    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 = {
     [ProtocolIdentifiers.StrategiesAutomation.MakerDAO]: {
         [Strategies.Identifiers.SavingsLiqProtection]: parseMakerSavingsLiqProtection,
@@ -1148,7 +1017,6 @@ const parsingMethodsMapping = {
         [Strategies.Identifiers.TrailingStopToDebt]: parseMakerTrailingStop,
         [Strategies.Identifiers.Repay]: parseMakerLeverageManagement,
         [Strategies.Identifiers.Boost]: parseMakerLeverageManagement,
-        [Strategies.Identifiers.LiquidationProtection]: parseMakerLiquidationProtection,
     },
     [ProtocolIdentifiers.StrategiesAutomation.Liquity]: {
         [Strategies.Identifiers.CloseOnPriceToColl]: parseLiquityCloseOnPrice,
@@ -1187,8 +1055,6 @@ const parsingMethodsMapping = {
         [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,
@@ -1203,8 +1069,6 @@ const parsingMethodsMapping = {
         [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,
@@ -1221,8 +1085,6 @@ const parsingMethodsMapping = {
         [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,
@@ -1242,7 +1104,6 @@ const parsingMethodsMapping = {
         [Strategies.Identifiers.BoostOnPrice]: parseSparkLeverageManagementOnPrice,
         [Strategies.Identifiers.CloseOnPrice]: parseSparkCloseOnPrice,
         [Strategies.Identifiers.CollateralSwitch]: parseSparkCollateralSwitch,
-        [Strategies.Identifiers.LiquidationProtection]: parseSparkLiquidationProtection,
     },
     [ProtocolIdentifiers.StrategiesAutomation.CrvUSD]: {
         [Strategies.Identifiers.Repay]: parseCrvUSDLeverageManagement,
@@ -1256,14 +1117,14 @@ const parsingMethodsMapping = {
         [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.LiquidationProtection]: parseMorphoBlueLiquidationProtection,
-        [Strategies.Identifiers.EoaLiquidationProtection]: parseMorphoBlueLiquidationProtection,
+        [Strategies.Identifiers.EoaCloseOnPrice]: parseMorphoBlueCloseOnPrice,
     },
     [ProtocolIdentifiers.StrategiesAutomation.FluidT1]: {
         [Strategies.Identifiers.Repay]: parseFluidT1LeverageManagement,
         [Strategies.Identifiers.Boost]: parseFluidT1LeverageManagement,
-        [Strategies.Identifiers.LiquidationProtection]: parseFluidT1LiquidationProtection,
     },
 };
 function getParsingMethod(id, strategy) {