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

package/cjs/constants/index.js

@@ -549,64 +549,24 @@ exports.MAINNET_BUNDLES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.EoaCloseOnPrice,
         protocol: exports.PROTOCOLS.AaveV4,
     },
-    [enums_1.Bundles.MainnetIds.MAKER_SW_LIQUIDATION_PROTECTION]: {
-        strategyOrBundleId: enums_1.Bundles.MainnetIds.MAKER_SW_LIQUIDATION_PROTECTION,
-        strategyId: enums_1.Strategies.Identifiers.LiquidationProtection,
-        protocol: exports.PROTOCOLS.MakerDAO,
-    },
-    [enums_1.Bundles.MainnetIds.AAVE_V3_SW_LIQUIDATION_PROTECTION]: {
-        strategyOrBundleId: enums_1.Bundles.MainnetIds.AAVE_V3_SW_LIQUIDATION_PROTECTION,
-        strategyId: enums_1.Strategies.Identifiers.LiquidationProtection,
-        protocol: exports.PROTOCOLS.AaveV3,
-    },
-    [enums_1.Bundles.MainnetIds.AAVE_V4_SW_LIQUIDATION_PROTECTION]: {
-        strategyOrBundleId: enums_1.Bundles.MainnetIds.AAVE_V4_SW_LIQUIDATION_PROTECTION,
-        strategyId: enums_1.Strategies.Identifiers.LiquidationProtection,
-        protocol: exports.PROTOCOLS.AaveV4,
-    },
-    [enums_1.Bundles.MainnetIds.SPARK_SW_LIQUIDATION_PROTECTION]: {
-        strategyOrBundleId: enums_1.Bundles.MainnetIds.SPARK_SW_LIQUIDATION_PROTECTION,
-        strategyId: enums_1.Strategies.Identifiers.LiquidationProtection,
-        protocol: exports.PROTOCOLS.Spark,
-    },
-    [enums_1.Bundles.MainnetIds.COMP_V3_SW_LIQUIDATION_PROTECTION]: {
-        strategyOrBundleId: enums_1.Bundles.MainnetIds.COMP_V3_SW_LIQUIDATION_PROTECTION,
-        strategyId: enums_1.Strategies.Identifiers.LiquidationProtection,
-        protocol: exports.PROTOCOLS.CompoundV3,
-    },
-    [enums_1.Bundles.MainnetIds.COMP_V3_EOA_LIQUIDATION_PROTECTION]: {
-        strategyOrBundleId: enums_1.Bundles.MainnetIds.COMP_V3_EOA_LIQUIDATION_PROTECTION,
-        strategyId: enums_1.Strategies.Identifiers.EoaLiquidationProtection,
-        protocol: exports.PROTOCOLS.CompoundV3,
-    },
-    [enums_1.Bundles.MainnetIds.MORPHO_BLUE_SW_LIQUIDATION_PROTECTION]: {
-        strategyOrBundleId: enums_1.Bundles.MainnetIds.MORPHO_BLUE_SW_LIQUIDATION_PROTECTION,
-        strategyId: enums_1.Strategies.Identifiers.LiquidationProtection,
+    [enums_1.Bundles.MainnetIds.MORPHO_BLUE_REPAY_ON_PRICE]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.MORPHO_BLUE_REPAY_ON_PRICE,
+        strategyId: enums_1.Strategies.Identifiers.RepayOnPrice,
         protocol: exports.PROTOCOLS.MorphoBlue,
     },
-    [enums_1.Bundles.MainnetIds.FLUID_T1_SW_LIQUIDATION_PROTECTION]: {
-        strategyOrBundleId: enums_1.Bundles.MainnetIds.FLUID_T1_SW_LIQUIDATION_PROTECTION,
-        strategyId: enums_1.Strategies.Identifiers.LiquidationProtection,
-        protocol: exports.PROTOCOLS.FluidT1,
-    },
-    [enums_1.Bundles.MainnetIds.AAVE_V3_EOA_LIQUIDATION_PROTECTION]: {
-        strategyOrBundleId: enums_1.Bundles.MainnetIds.AAVE_V3_EOA_LIQUIDATION_PROTECTION,
-        strategyId: enums_1.Strategies.Identifiers.EoaLiquidationProtection,
-        protocol: exports.PROTOCOLS.AaveV3,
-    },
-    [enums_1.Bundles.MainnetIds.AAVE_V4_EOA_LIQUIDATION_PROTECTION]: {
-        strategyOrBundleId: enums_1.Bundles.MainnetIds.AAVE_V4_EOA_LIQUIDATION_PROTECTION,
-        strategyId: enums_1.Strategies.Identifiers.EoaLiquidationProtection,
-        protocol: exports.PROTOCOLS.AaveV4,
+    [enums_1.Bundles.MainnetIds.MORPHO_BLUE_EOA_BOOST_ON_PRICE]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.MORPHO_BLUE_EOA_BOOST_ON_PRICE,
+        strategyId: enums_1.Strategies.Identifiers.EoaBoostOnPrice,
+        protocol: exports.PROTOCOLS.MorphoBlue,
     },
-    [enums_1.Bundles.MainnetIds.MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION]: {
-        strategyOrBundleId: enums_1.Bundles.MainnetIds.MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION,
-        strategyId: enums_1.Strategies.Identifiers.EoaLiquidationProtection,
+    [enums_1.Bundles.MainnetIds.MORPHO_BLUE_EOA_REPAY_ON_PRICE]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.MORPHO_BLUE_EOA_REPAY_ON_PRICE,
+        strategyId: enums_1.Strategies.Identifiers.EoaRepayOnPrice,
         protocol: exports.PROTOCOLS.MorphoBlue,
     },
-    [enums_1.Bundles.MainnetIds.MORPHO_BLUE_REPAY_ON_PRICE]: {
-        strategyOrBundleId: enums_1.Bundles.MainnetIds.MORPHO_BLUE_REPAY_ON_PRICE,
-        strategyId: enums_1.Strategies.Identifiers.RepayOnPrice,
+    [enums_1.Bundles.MainnetIds.MORPHO_BLUE_EOA_CLOSE]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.MORPHO_BLUE_EOA_CLOSE,
+        strategyId: enums_1.Strategies.Identifiers.EoaCloseOnPrice,
         protocol: exports.PROTOCOLS.MorphoBlue,
     },
 };
@@ -666,16 +626,6 @@ exports.OPTIMISM_BUNDLES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.EoaCloseOnPrice,
         protocol: exports.PROTOCOLS.AaveV3,
     },
-    [enums_1.Bundles.OptimismIds.AAVE_V3_SW_LIQUIDATION_PROTECTION]: {
-        strategyOrBundleId: enums_1.Bundles.OptimismIds.AAVE_V3_SW_LIQUIDATION_PROTECTION,
-        strategyId: enums_1.Strategies.Identifiers.LiquidationProtection,
-        protocol: exports.PROTOCOLS.AaveV3,
-    },
-    [enums_1.Bundles.OptimismIds.AAVE_V3_EOA_LIQUIDATION_PROTECTION]: {
-        strategyOrBundleId: enums_1.Bundles.OptimismIds.AAVE_V3_EOA_LIQUIDATION_PROTECTION,
-        strategyId: enums_1.Strategies.Identifiers.EoaLiquidationProtection,
-        protocol: exports.PROTOCOLS.AaveV3,
-    },
 };
 exports.BASE_BUNDLES_INFO = {
     [enums_1.Bundles.BaseIds.AAVE_V3_REPAY]: {
@@ -818,35 +768,30 @@ exports.BASE_BUNDLES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.RepayOnPrice,
         protocol: exports.PROTOCOLS.MorphoBlue,
     },
-    [enums_1.Bundles.BaseIds.AAVE_V3_SW_LIQUIDATION_PROTECTION]: {
-        strategyOrBundleId: enums_1.Bundles.BaseIds.AAVE_V3_SW_LIQUIDATION_PROTECTION,
-        strategyId: enums_1.Strategies.Identifiers.LiquidationProtection,
-        protocol: exports.PROTOCOLS.AaveV3,
-    },
-    [enums_1.Bundles.BaseIds.COMP_V3_SW_LIQUIDATION_PROTECTION]: {
-        strategyOrBundleId: enums_1.Bundles.BaseIds.COMP_V3_SW_LIQUIDATION_PROTECTION,
-        strategyId: enums_1.Strategies.Identifiers.LiquidationProtection,
-        protocol: exports.PROTOCOLS.CompoundV3,
+    [enums_1.Bundles.BaseIds.MORPHO_BLUE_EOA_REPAY]: {
+        strategyOrBundleId: enums_1.Bundles.BaseIds.MORPHO_BLUE_EOA_REPAY,
+        strategyId: enums_1.Strategies.Identifiers.EoaRepay,
+        protocol: exports.PROTOCOLS.MorphoBlue,
     },
-    [enums_1.Bundles.BaseIds.COMP_V3_EOA_LIQUIDATION_PROTECTION]: {
-        strategyOrBundleId: enums_1.Bundles.BaseIds.COMP_V3_EOA_LIQUIDATION_PROTECTION,
-        strategyId: enums_1.Strategies.Identifiers.EoaLiquidationProtection,
-        protocol: exports.PROTOCOLS.CompoundV3,
+    [enums_1.Bundles.BaseIds.MORPHO_BLUE_EOA_BOOST]: {
+        strategyOrBundleId: enums_1.Bundles.BaseIds.MORPHO_BLUE_EOA_BOOST,
+        strategyId: enums_1.Strategies.Identifiers.EoaBoost,
+        protocol: exports.PROTOCOLS.MorphoBlue,
     },
-    [enums_1.Bundles.BaseIds.MORPHO_BLUE_SW_LIQUIDATION_PROTECTION]: {
-        strategyOrBundleId: enums_1.Bundles.BaseIds.MORPHO_BLUE_SW_LIQUIDATION_PROTECTION,
-        strategyId: enums_1.Strategies.Identifiers.LiquidationProtection,
+    [enums_1.Bundles.BaseIds.MORPHO_BLUE_EOA_BOOST_ON_PRICE]: {
+        strategyOrBundleId: enums_1.Bundles.BaseIds.MORPHO_BLUE_EOA_BOOST_ON_PRICE,
+        strategyId: enums_1.Strategies.Identifiers.EoaBoostOnPrice,
         protocol: exports.PROTOCOLS.MorphoBlue,
     },
-    [enums_1.Bundles.BaseIds.FLUID_T1_SW_LIQUIDATION_PROTECTION]: {
-        strategyOrBundleId: enums_1.Bundles.BaseIds.FLUID_T1_SW_LIQUIDATION_PROTECTION,
-        strategyId: enums_1.Strategies.Identifiers.LiquidationProtection,
-        protocol: exports.PROTOCOLS.FluidT1,
+    [enums_1.Bundles.BaseIds.MORPHO_BLUE_EOA_REPAY_ON_PRICE]: {
+        strategyOrBundleId: enums_1.Bundles.BaseIds.MORPHO_BLUE_EOA_REPAY_ON_PRICE,
+        strategyId: enums_1.Strategies.Identifiers.EoaRepayOnPrice,
+        protocol: exports.PROTOCOLS.MorphoBlue,
     },
-    [enums_1.Bundles.BaseIds.AAVE_V3_EOA_LIQUIDATION_PROTECTION]: {
-        strategyOrBundleId: enums_1.Bundles.BaseIds.AAVE_V3_EOA_LIQUIDATION_PROTECTION,
-        strategyId: enums_1.Strategies.Identifiers.EoaLiquidationProtection,
-        protocol: exports.PROTOCOLS.AaveV3,
+    [enums_1.Bundles.BaseIds.MORPHO_BLUE_EOA_CLOSE]: {
+        strategyOrBundleId: enums_1.Bundles.BaseIds.MORPHO_BLUE_EOA_CLOSE,
+        strategyId: enums_1.Strategies.Identifiers.EoaCloseOnPrice,
+        protocol: exports.PROTOCOLS.MorphoBlue,
     },
 };
 exports.ARBITRUM_BUNDLES_INFO = {
@@ -1000,39 +945,19 @@ exports.ARBITRUM_BUNDLES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.RepayOnPrice,
         protocol: exports.PROTOCOLS.MorphoBlue,
     },
-    [enums_1.Bundles.ArbitrumIds.AAVE_V3_SW_LIQUIDATION_PROTECTION]: {
-        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.AAVE_V3_SW_LIQUIDATION_PROTECTION,
-        strategyId: enums_1.Strategies.Identifiers.LiquidationProtection,
-        protocol: exports.PROTOCOLS.AaveV3,
-    },
-    [enums_1.Bundles.ArbitrumIds.COMP_V3_SW_LIQUIDATION_PROTECTION]: {
-        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.COMP_V3_SW_LIQUIDATION_PROTECTION,
-        strategyId: enums_1.Strategies.Identifiers.LiquidationProtection,
-        protocol: exports.PROTOCOLS.CompoundV3,
-    },
-    [enums_1.Bundles.ArbitrumIds.COMP_V3_EOA_LIQUIDATION_PROTECTION]: {
-        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.COMP_V3_EOA_LIQUIDATION_PROTECTION,
-        strategyId: enums_1.Strategies.Identifiers.EoaLiquidationProtection,
-        protocol: exports.PROTOCOLS.CompoundV3,
-    },
-    [enums_1.Bundles.ArbitrumIds.MORPHO_BLUE_SW_LIQUIDATION_PROTECTION]: {
-        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.MORPHO_BLUE_SW_LIQUIDATION_PROTECTION,
-        strategyId: enums_1.Strategies.Identifiers.LiquidationProtection,
+    [enums_1.Bundles.ArbitrumIds.MORPHO_BLUE_EOA_BOOST_ON_PRICE]: {
+        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.MORPHO_BLUE_EOA_BOOST_ON_PRICE,
+        strategyId: enums_1.Strategies.Identifiers.EoaBoostOnPrice,
         protocol: exports.PROTOCOLS.MorphoBlue,
     },
-    [enums_1.Bundles.ArbitrumIds.FLUID_T1_SW_LIQUIDATION_PROTECTION]: {
-        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.FLUID_T1_SW_LIQUIDATION_PROTECTION,
-        strategyId: enums_1.Strategies.Identifiers.LiquidationProtection,
-        protocol: exports.PROTOCOLS.FluidT1,
-    },
-    [enums_1.Bundles.ArbitrumIds.AAVE_V3_EOA_LIQUIDATION_PROTECTION]: {
-        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.AAVE_V3_EOA_LIQUIDATION_PROTECTION,
-        strategyId: enums_1.Strategies.Identifiers.EoaLiquidationProtection,
-        protocol: exports.PROTOCOLS.AaveV3,
+    [enums_1.Bundles.ArbitrumIds.MORPHO_BLUE_EOA_REPAY_ON_PRICE]: {
+        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.MORPHO_BLUE_EOA_REPAY_ON_PRICE,
+        strategyId: enums_1.Strategies.Identifiers.EoaRepayOnPrice,
+        protocol: exports.PROTOCOLS.MorphoBlue,
     },
-    [enums_1.Bundles.ArbitrumIds.MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION]: {
-        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION,
-        strategyId: enums_1.Strategies.Identifiers.EoaLiquidationProtection,
+    [enums_1.Bundles.ArbitrumIds.MORPHO_BLUE_EOA_CLOSE]: {
+        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.MORPHO_BLUE_EOA_CLOSE,
+        strategyId: enums_1.Strategies.Identifiers.EoaCloseOnPrice,
         protocol: exports.PROTOCOLS.MorphoBlue,
     },
 };

package/cjs/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/cjs/index.js

@@ -30,7 +30,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.utils = exports.triggerService = exports.subDataService = exports.strategySubService = exports.strategiesService = exports.enums = exports.constants = exports.OptimismStrategies = exports.LegacyMakerAutomation = exports.LegacyCompoundAutomation = exports.LegacyAaveAutomation = exports.EthereumStrategies = exports.BaseStrategies = exports.ArbitrumStrategies = void 0;
+exports.strategiesService = exports.constants = exports.enums = exports.utils = exports.strategySubService = exports.subDataService = exports.triggerService = exports.BaseStrategies = exports.ArbitrumStrategies = exports.OptimismStrategies = exports.EthereumStrategies = exports.LegacyCompoundAutomation = exports.LegacyAaveAutomation = exports.LegacyMakerAutomation = void 0;
 require("./configuration");
 const LegacyMakerAutomation_1 = __importDefault(require("./automation/public/legacy/LegacyMakerAutomation"));
 exports.LegacyMakerAutomation = LegacyMakerAutomation_1.default;
@@ -60,9 +60,6 @@ const enums = __importStar(require("./types/enums"));
 exports.enums = enums;
 const utils_1 = require("./services/utils");
 const utils = {
-    compareSubHashes: utils_1.compareSubHashes,
-    encodeSubId: utils_1.encodeSubId,
-    getCloseStrategyType: utils_1.getCloseStrategyType,
-    getRatioStateInfoForAaveCloseStrategy: utils_1.getRatioStateInfoForAaveCloseStrategy,
+    getRatioStateInfoForAaveCloseStrategy: utils_1.getRatioStateInfoForAaveCloseStrategy, compareSubHashes: utils_1.compareSubHashes, encodeSubId: utils_1.encodeSubId, getCloseStrategyType: utils_1.getCloseStrategyType,
 };
 exports.utils = utils;

package/cjs/services/strategiesService.js

@@ -95,7 +95,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 = (0, utils_1.getPositionId)(_position.chainId, _position.protocol.id, subData.vaultId);
@@ -123,24 +123,6 @@ function parseMakerLeverageManagement(position, parseData) {
     _position.strategy.strategyId = enums_1.Strategies.IdOverrides.LeverageManagement;
     return _position;
 }
-function parseMakerLiquidationProtection(position, parseData) {
-    const _position = (0, lodash_1.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 = (0, utils_1.getPositionId)(_position.chainId, _position.protocol.id, subData.vaultId);
-    _position.specific = {
-        triggerRepayRatio: triggerData.ratio,
-        targetRepayRatio: subData.targetRatio,
-        repayEnabled: isEnabled,
-        subId1: Number(subId),
-    };
-    _position.strategy.strategyId = enums_1.Strategies.IdOverrides.LiquidationProtection;
-    return _position;
-}
 function parseLiquityCloseOnPrice(position, parseData) {
     const _position = (0, lodash_1.cloneDeep)(position);
     const { subStruct } = parseData.subscriptionEventData;
@@ -178,7 +160,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 = (0, utils_1.getPositionId)(_position.chainId, _position.protocol.id, _position.owner, triggerData.market);
@@ -214,10 +196,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;
@@ -251,26 +233,6 @@ function parseAaveV3LeverageManagement(position, parseData) {
     }
     return _position;
 }
-function parseAaveV3LiquidationProtection(position, parseData) {
-    const _position = (0, lodash_1.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 = (0, utils_1.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 ? enums_1.Strategies.IdOverrides.EoaLiquidationProtection : enums_1.Strategies.IdOverrides.LiquidationProtection;
-    return _position;
-}
 function parseAaveV3LeverageManagementOnPrice(position, parseData) {
     const _position = (0, lodash_1.cloneDeep)(position);
     const { subStruct } = parseData.subscriptionEventData;
@@ -400,26 +362,6 @@ function parseAaveV4LeverageManagement(position, parseData) {
     }
     return _position;
 }
-function parseAaveV4LiquidationProtection(position, parseData) {
-    const _position = (0, lodash_1.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 = (0, utils_1.getPositionId)(_position.chainId, _position.protocol.id, _position.owner, triggerData.spoke);
-    _position.strategy.strategyId = isEOA ? enums_1.Strategies.IdOverrides.EoaLiquidationProtection : enums_1.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 = (0, lodash_1.cloneDeep)(position);
     const { subStruct } = parseData.subscriptionEventData;
@@ -539,7 +481,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();
@@ -573,7 +515,7 @@ function parseCompoundV3LeverageManagement(position, parseData) {
     const _position = (0, lodash_1.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;
@@ -604,27 +546,6 @@ function parseCompoundV3LeverageManagement(position, parseData) {
     _position.strategy.strategyId = isEOA ? enums_1.Strategies.IdOverrides.EoaLeverageManagement : enums_1.Strategies.IdOverrides.LeverageManagement;
     return _position;
 }
-function parseCompoundV3LiquidationProtection(position, parseData) {
-    const _position = (0, lodash_1.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 = (0, utils_1.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 ? enums_1.Strategies.IdOverrides.EoaLiquidationProtection : enums_1.Strategies.IdOverrides.LiquidationProtection;
-    return _position;
-}
 function parseCompoundV3LeverageManagementOnPrice(position, parseData) {
     const _position = (0, lodash_1.cloneDeep)(position);
     const { subStruct } = parseData.subscriptionEventData;
@@ -698,7 +619,7 @@ function parseExchangeDca(position, parseData, chainId) {
 function parseExchangeLimitOrder(position, parseData, chainId) {
     const _position = (0, lodash_1.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 = (0, tokens_1.getAssetInfoByAddress)(_position.strategyData.decoded.subData.fromToken, chainId).decimals;
     const toTokenDecimals = (0, tokens_1.getAssetInfoByAddress)(_position.strategyData.decoded.subData.toToken, chainId).decimals;
     _position.strategyData.decoded.triggerData = triggerService.exchangeOffchainPriceTrigger.decode(subStruct.triggerData, fromTokenDecimals, toTokenDecimals);
@@ -710,7 +631,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 = (0, utils_1.getPositionId)(_position.chainId, _position.protocol.id, _position.owner);
@@ -776,7 +697,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 = (0, utils_1.getPositionId)(_position.chainId, _position.protocol.id, _position.owner, triggerData.market);
@@ -804,25 +725,6 @@ function parseSparkLeverageManagement(position, parseData) {
     _position.strategy.strategyId = enums_1.Strategies.IdOverrides.LeverageManagement;
     return _position;
 }
-function parseSparkLiquidationProtection(position, parseData) {
-    const _position = (0, lodash_1.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 = (0, utils_1.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 = enums_1.Strategies.IdOverrides.LiquidationProtection;
-    return _position;
-}
 function parseSparkLeverageManagementOnPrice(position, parseData) {
     const _position = (0, lodash_1.cloneDeep)(position);
     const { subStruct } = parseData.subscriptionEventData;
@@ -947,6 +849,7 @@ function parseMorphoBlueLeverageManagement(position, parseData) {
     const _position = (0, lodash_1.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;
@@ -960,7 +863,7 @@ function parseMorphoBlueLeverageManagement(position, parseData) {
             repayEnabled: isEnabled,
             subId1: Number(subId),
             subHashRepay: subHash,
-            mergeWithId: enums_1.Strategies.Identifiers.Boost,
+            mergeWithId: isEOA ? enums_1.Strategies.Identifiers.EoaBoost : enums_1.Strategies.Identifiers.Boost,
         };
     }
     else {
@@ -970,36 +873,16 @@ function parseMorphoBlueLeverageManagement(position, parseData) {
             boostEnabled: isEnabled,
             subId2: Number(subId),
             subHashBoost: subHash,
-            mergeId: enums_1.Strategies.Identifiers.Boost,
+            mergeId: isEOA ? enums_1.Strategies.Identifiers.EoaBoost : enums_1.Strategies.Identifiers.Boost,
         };
     }
-    const isEOA = _position.strategy.strategyId.includes('eoa');
     _position.strategy.strategyId = isEOA ? enums_1.Strategies.IdOverrides.EoaLeverageManagement : enums_1.Strategies.IdOverrides.LeverageManagement;
     return _position;
 }
-function parseMorphoBlueLiquidationProtection(position, parseData) {
-    const _position = (0, lodash_1.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 = (0, utils_1.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 ? enums_1.Strategies.IdOverrides.EoaLiquidationProtection : enums_1.Strategies.IdOverrides.LiquidationProtection;
-    return _position;
-}
 function parseMorphoBlueLeverageManagementOnPrice(position, parseData) {
     const _position = (0, lodash_1.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;
@@ -1022,11 +905,15 @@ function parseMorphoBlueLeverageManagementOnPrice(position, parseData) {
         ratio: subData.targetRatio,
         ratioState: triggerData.priceState,
     };
+    _position.strategy.strategyId = isEOA
+        ? enums_1.Strategies.IdOverrides.EoaLeverageManagementOnPrice
+        : enums_1.Strategies.IdOverrides.LeverageManagementOnPrice;
     return _position;
 }
 function parseMorphoBlueCloseOnPrice(position, parseData) {
     const _position = (0, lodash_1.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;
@@ -1041,6 +928,7 @@ function parseMorphoBlueCloseOnPrice(position, parseData) {
     ]);
     const marketId = web3.utils.keccak256(marketIdEncodedData);
     const { takeProfitType, stopLossType } = (0, utils_1.getStopLossAndTakeProfitTypeByCloseStrategyType)(+subData.closeType);
+    _position.strategy.strategyId = isEOA ? enums_1.Strategies.Identifiers.EoaCloseOnPrice : enums_1.Strategies.Identifiers.CloseOnPrice;
     _position.specific = {
         subHash: _position.subHash,
         marketId,
@@ -1149,25 +1037,6 @@ function parseFluidT1LeverageManagement(position, parseData) {
     _position.strategy.strategyId = enums_1.Strategies.IdOverrides.LeverageManagement;
     return _position;
 }
-function parseFluidT1LiquidationProtection(position, parseData) {
-    const _position = (0, lodash_1.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 = (0, utils_1.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 = enums_1.Strategies.IdOverrides.LiquidationProtection;
-    return _position;
-}
 const parsingMethodsMapping = {
     [enums_1.ProtocolIdentifiers.StrategiesAutomation.MakerDAO]: {
         [enums_1.Strategies.Identifiers.SavingsLiqProtection]: parseMakerSavingsLiqProtection,
@@ -1177,7 +1046,6 @@ const parsingMethodsMapping = {
         [enums_1.Strategies.Identifiers.TrailingStopToDebt]: parseMakerTrailingStop,
         [enums_1.Strategies.Identifiers.Repay]: parseMakerLeverageManagement,
         [enums_1.Strategies.Identifiers.Boost]: parseMakerLeverageManagement,
-        [enums_1.Strategies.Identifiers.LiquidationProtection]: parseMakerLiquidationProtection,
     },
     [enums_1.ProtocolIdentifiers.StrategiesAutomation.Liquity]: {
         [enums_1.Strategies.Identifiers.CloseOnPriceToColl]: parseLiquityCloseOnPrice,
@@ -1216,8 +1084,6 @@ const parsingMethodsMapping = {
         [enums_1.Strategies.Identifiers.EoaBoostOnPrice]: parseAaveV3LeverageManagementOnPrice,
         [enums_1.Strategies.Identifiers.EoaCloseOnPrice]: parseAaveV3CloseOnPrice,
         [enums_1.Strategies.Identifiers.CollateralSwitch]: parseAaveV3CollateralSwitch,
-        [enums_1.Strategies.Identifiers.LiquidationProtection]: parseAaveV3LiquidationProtection,
-        [enums_1.Strategies.Identifiers.EoaLiquidationProtection]: parseAaveV3LiquidationProtection,
     },
     [enums_1.ProtocolIdentifiers.StrategiesAutomation.AaveV4]: {
         [enums_1.Strategies.Identifiers.Repay]: parseAaveV4LeverageManagement,
@@ -1232,8 +1098,6 @@ const parsingMethodsMapping = {
         [enums_1.Strategies.Identifiers.EoaCloseOnPrice]: parseAaveV4CloseOnPrice,
         [enums_1.Strategies.Identifiers.CollateralSwitch]: parseAaveV4CollateralSwitch,
         [enums_1.Strategies.Identifiers.EoaCollateralSwitch]: parseAaveV4CollateralSwitch,
-        [enums_1.Strategies.Identifiers.LiquidationProtection]: parseAaveV4LiquidationProtection,
-        [enums_1.Strategies.Identifiers.EoaLiquidationProtection]: parseAaveV4LiquidationProtection,
     },
     [enums_1.ProtocolIdentifiers.StrategiesAutomation.CompoundV2]: {
         [enums_1.Strategies.Identifiers.Repay]: parseCompoundV2LeverageManagement,
@@ -1250,8 +1114,6 @@ const parsingMethodsMapping = {
         [enums_1.Strategies.Identifiers.EoaBoostOnPrice]: parseCompoundV3LeverageManagementOnPrice,
         [enums_1.Strategies.Identifiers.CloseOnPrice]: parseCompoundV3CloseOnPrice,
         [enums_1.Strategies.Identifiers.EoaCloseOnPrice]: parseCompoundV3CloseOnPrice,
-        [enums_1.Strategies.Identifiers.LiquidationProtection]: parseCompoundV3LiquidationProtection,
-        [enums_1.Strategies.Identifiers.EoaLiquidationProtection]: parseCompoundV3LiquidationProtection,
     },
     [enums_1.ProtocolIdentifiers.StrategiesAutomation.ChickenBonds]: {
         [enums_1.Strategies.Identifiers.Rebond]: parseChickenBondsRebond,
@@ -1271,7 +1133,6 @@ const parsingMethodsMapping = {
         [enums_1.Strategies.Identifiers.BoostOnPrice]: parseSparkLeverageManagementOnPrice,
         [enums_1.Strategies.Identifiers.CloseOnPrice]: parseSparkCloseOnPrice,
         [enums_1.Strategies.Identifiers.CollateralSwitch]: parseSparkCollateralSwitch,
-        [enums_1.Strategies.Identifiers.LiquidationProtection]: parseSparkLiquidationProtection,
     },
     [enums_1.ProtocolIdentifiers.StrategiesAutomation.CrvUSD]: {
         [enums_1.Strategies.Identifiers.Repay]: parseCrvUSDLeverageManagement,
@@ -1285,14 +1146,14 @@ const parsingMethodsMapping = {
         [enums_1.Strategies.Identifiers.EoaBoost]: parseMorphoBlueLeverageManagement,
         [enums_1.Strategies.Identifiers.BoostOnPrice]: parseMorphoBlueLeverageManagementOnPrice,
         [enums_1.Strategies.Identifiers.RepayOnPrice]: parseMorphoBlueLeverageManagementOnPrice,
+        [enums_1.Strategies.Identifiers.EoaBoostOnPrice]: parseMorphoBlueLeverageManagementOnPrice,
+        [enums_1.Strategies.Identifiers.EoaRepayOnPrice]: parseMorphoBlueLeverageManagementOnPrice,
         [enums_1.Strategies.Identifiers.CloseOnPrice]: parseMorphoBlueCloseOnPrice,
-        [enums_1.Strategies.Identifiers.LiquidationProtection]: parseMorphoBlueLiquidationProtection,
-        [enums_1.Strategies.Identifiers.EoaLiquidationProtection]: parseMorphoBlueLiquidationProtection,
+        [enums_1.Strategies.Identifiers.EoaCloseOnPrice]: parseMorphoBlueCloseOnPrice,
     },
     [enums_1.ProtocolIdentifiers.StrategiesAutomation.FluidT1]: {
         [enums_1.Strategies.Identifiers.Repay]: parseFluidT1LeverageManagement,
         [enums_1.Strategies.Identifiers.Boost]: parseFluidT1LeverageManagement,
-        [enums_1.Strategies.Identifiers.LiquidationProtection]: parseFluidT1LiquidationProtection,
     },
 };
 function getParsingMethod(id, strategy) {