@defisaver/automation-sdk 3.3.17 → 3.3.18-spark-eoa-dev

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.makerLeverageManagementSubData.decode(subStruct.subData);
+    const subData = subDataService.legacyMakerLeverageManagementSubData.decode(subStruct.subData);
     _position.strategyData.decoded.triggerData = triggerData;
     _position.strategyData.decoded.subData = subData;
     _position.positionId = getPositionId(_position.chainId, _position.protocol.id, subData.vaultId);
@@ -94,6 +94,24 @@ 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;
@@ -131,7 +149,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.aaveV2LeverageManagementSubData.decode(subStruct.subData);
+    const subData = subDataService.legacyAaveV2LeverageManagementSubData.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);
@@ -167,10 +185,10 @@ function parseAaveV3LeverageManagement(position, parseData) {
     const isEOA = _position.strategy.strategyId.includes('eoa');
     let subData;
     if (isEOA) {
-        subData = subDataService.aaveV3LeverageManagementSubDataWithoutSubProxy.decode(subStruct.subData);
+        subData = subDataService.aaveV3LeverageManagementSubData.decode(subStruct.subData);
     }
     else {
-        subData = subDataService.aaveV3LeverageManagementSubData.decode(subStruct.subData);
+        subData = subDataService.legacyAaveV3LeverageManagementSubData.decode(subStruct.subData);
     }
     _position.strategyData.decoded.triggerData = triggerData;
     _position.strategyData.decoded.subData = subData;
@@ -204,6 +222,26 @@ 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;
@@ -292,11 +330,17 @@ function parseAaveV3CollateralSwitch(position, parseData) {
 function parseSparkCollateralSwitch(position, parseData) {
     const _position = cloneDeep(position);
     const { subStruct } = parseData.subscriptionEventData;
+    const isEOA = _position.strategy.strategyId.includes('eoa');
     const triggerData = triggerService.sparkQuotePriceTrigger.decode(subStruct.triggerData);
-    const subData = subDataService.sparkCollateralSwitchSubData.decode(subStruct.subData);
+    const subData = isEOA
+        ? subDataService.sparkGenericFLCollateralSwitchSubData.decode(subStruct.subData)
+        : subDataService.sparkCollateralSwitchSubData.decode(subStruct.subData);
     _position.strategyData.decoded.triggerData = triggerData;
     _position.strategyData.decoded.subData = subData;
     _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, subData.marketAddr);
+    _position.strategy.strategyId = isEOA
+        ? Strategies.Identifiers.EoaCollateralSwitch
+        : Strategies.Identifiers.CollateralSwitch;
     return _position;
 }
 function parseAaveV4LeverageManagement(position, parseData) {
@@ -333,6 +377,26 @@ 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;
@@ -452,7 +516,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.compoundV2LeverageManagementSubData.decode(subStruct.subData);
+    const subData = subDataService.legacyCompoundV2LeverageManagementSubData.decode(subStruct.subData);
     _position.strategyData.decoded.triggerData = triggerData;
     _position.strategyData.decoded.subData = subData;
     _position.owner = triggerData.owner.toLowerCase();
@@ -486,7 +550,7 @@ function parseCompoundV3LeverageManagement(position, parseData) {
     const _position = cloneDeep(position);
     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);
     _position.strategyData.decoded.triggerData = triggerData;
@@ -517,6 +581,27 @@ 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;
@@ -590,7 +675,7 @@ function parseExchangeDca(position, parseData, chainId) {
 function parseExchangeLimitOrder(position, parseData, chainId) {
     const _position = cloneDeep(position);
     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);
@@ -602,7 +687,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.liquityLeverageManagementSubData.decode(subStruct.subData);
+    const subData = subDataService.legacyLiquityLeverageManagementSubData.decode(subStruct.subData);
     _position.strategyData.decoded.triggerData = triggerData;
     _position.strategyData.decoded.subData = subData;
     _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner);
@@ -667,19 +752,22 @@ function parseSparkLeverageManagement(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.sparkRatioTrigger.decode(subStruct.triggerData);
-    const subData = subDataService.sparkLeverageManagementSubData.decode(subStruct.subData);
+    const subData = isEOA
+        ? subDataService.sparkGenericLeverageManagementSubData.decode(subStruct.subData)
+        : subDataService.legacySparkLeverageManagementSubData.decode(subStruct.subData);
     _position.strategyData.decoded.triggerData = triggerData;
     _position.strategyData.decoded.subData = subData;
     _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, triggerData.market);
-    const isRepay = _position.strategy.strategyId === Strategies.Identifiers.Repay;
+    const isRepay = [Strategies.Identifiers.Repay, Strategies.Identifiers.EoaRepay].includes(_position.strategy.strategyId);
     if (isRepay) {
         _position.specific = {
             triggerRepayRatio: triggerData.ratio,
             targetRepayRatio: subData.targetRatio,
             repayEnabled: isEnabled,
             subId1: Number(subId),
-            mergeWithId: Strategies.Identifiers.Boost,
+            mergeWithId: isEOA ? Strategies.Identifiers.EoaBoost : Strategies.Identifiers.Boost,
             subHashRepay: subHash,
         };
     }
@@ -689,18 +777,48 @@ function parseSparkLeverageManagement(position, parseData) {
             targetBoostRatio: subData.targetRatio,
             boostEnabled: isEnabled,
             subId2: Number(subId),
-            mergeId: Strategies.Identifiers.Boost,
+            mergeId: isEOA ? Strategies.Identifiers.EoaBoost : Strategies.Identifiers.Boost,
             subHashBoost: subHash,
         };
     }
-    _position.strategy.strategyId = Strategies.IdOverrides.LeverageManagement;
+    _position.strategy.strategyId = isEOA
+        ? Strategies.IdOverrides.EoaLeverageManagement
+        : Strategies.IdOverrides.LeverageManagement;
+    return _position;
+}
+function parseSparkLiquidationProtection(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.sparkRatioTrigger.decode(subStruct.triggerData);
+    const subData = isEOA
+        ? subDataService.sparkGenericLiquidationProtectionSubData.decode(subStruct.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 = isEOA
+        ? Strategies.IdOverrides.EoaLiquidationProtection
+        : Strategies.IdOverrides.LiquidationProtection;
+    _position.strategy.strategyId = Strategies.IdOverrides.LiquidationProtection;
     return _position;
 }
 function parseSparkLeverageManagementOnPrice(position, parseData) {
     const _position = cloneDeep(position);
     const { subStruct } = parseData.subscriptionEventData;
+    const isEOA = _position.strategy.strategyId.includes('eoa');
     const triggerData = triggerService.sparkQuotePriceTrigger.decode(subStruct.triggerData);
-    const subData = subDataService.sparkLeverageManagementOnPriceSubData.decode(subStruct.subData);
+    const subData = isEOA
+        ? subDataService.sparkLeverageManagementOnPriceGenericSubData.decode(subStruct.subData)
+        : subDataService.sparkLeverageManagementOnPriceSubData.decode(subStruct.subData);
     _position.strategyData.decoded.triggerData = triggerData;
     _position.strategyData.decoded.subData = subData;
     _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, subData.marketAddr);
@@ -717,6 +835,9 @@ function parseSparkLeverageManagementOnPrice(position, parseData) {
         price: triggerData.price,
         ratioState: triggerData.ratioState,
     };
+    _position.strategy.strategyId = isEOA
+        ? Strategies.IdOverrides.EoaLeverageManagementOnPrice
+        : Strategies.IdOverrides.LeverageManagementOnPrice;
     return _position;
 }
 function parseSparkCloseOnPrice(position, parseData) {
@@ -724,9 +845,11 @@ function parseSparkCloseOnPrice(position, parseData) {
     const { subStruct } = parseData.subscriptionEventData;
     const triggerData = triggerService.sparkQuotePriceRangeTrigger.decode(subStruct.triggerData);
     const subData = subDataService.sparkCloseGenericSubData.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, subData.marketAddr);
+    _position.strategy.strategyId = isEOA ? Strategies.Identifiers.EoaCloseOnPrice : Strategies.Identifiers.CloseOnPrice;
     const { takeProfitType, stopLossType } = getStopLossAndTakeProfitTypeByCloseStrategyType(+subData.closeType);
     _position.specific = {
         collAsset: subData.collAsset,
@@ -850,6 +973,26 @@ function parseMorphoBlueLeverageManagement(position, parseData) {
     _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;
@@ -1008,6 +1151,25 @@ 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,
@@ -1017,6 +1179,7 @@ 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,
@@ -1055,6 +1218,8 @@ 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,
@@ -1069,6 +1234,8 @@ 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,
@@ -1085,6 +1252,8 @@ 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,
@@ -1103,7 +1272,15 @@ const parsingMethodsMapping = {
         [Strategies.Identifiers.RepayOnPrice]: parseSparkLeverageManagementOnPrice,
         [Strategies.Identifiers.BoostOnPrice]: parseSparkLeverageManagementOnPrice,
         [Strategies.Identifiers.CloseOnPrice]: parseSparkCloseOnPrice,
+        [Strategies.Identifiers.EoaRepay]: parseSparkLeverageManagement,
+        [Strategies.Identifiers.EoaBoost]: parseSparkLeverageManagement,
+        [Strategies.Identifiers.EoaRepayOnPrice]: parseSparkLeverageManagementOnPrice,
+        [Strategies.Identifiers.EoaBoostOnPrice]: parseSparkLeverageManagementOnPrice,
+        [Strategies.Identifiers.EoaCloseOnPrice]: parseSparkCloseOnPrice,
         [Strategies.Identifiers.CollateralSwitch]: parseSparkCollateralSwitch,
+        [Strategies.Identifiers.EoaCollateralSwitch]: parseSparkCollateralSwitch,
+        [Strategies.Identifiers.LiquidationProtection]: parseSparkLiquidationProtection,
+        [Strategies.Identifiers.EoaLiquidationProtection]: parseSparkLiquidationProtection,
     },
     [ProtocolIdentifiers.StrategiesAutomation.CrvUSD]: {
         [Strategies.Identifiers.Repay]: parseCrvUSDLeverageManagement,
@@ -1120,11 +1297,14 @@ const parsingMethodsMapping = {
         [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) {

package/esm/services/strategySubService.d.ts

@@ -1,26 +1,24 @@
-import type { OrderType } from '../types/enums';
-import { CloseToAssetType, Bundles, ChainId, RatioState, Strategies } from '../types/enums';
+import { Bundles, ChainId, CloseToAssetType, RatioState, Strategies } from '../types/enums';
 import type { EthereumAddress, StrategyOrBundleIds } from '../types';
+import type { OrderType } from '../types/enums';
 export declare const makerEncode: {
     repayFromSavings(bundleId: StrategyOrBundleIds, vaultId: number, triggerRepayRatio: number, targetRepayRatio: number, isBundle?: boolean, chainId?: ChainId, daiAddr?: EthereumAddress, mcdCdpManagerAddr?: EthereumAddress): (boolean | string[] | Strategies.MainnetIds | Strategies.OptimismIds | Strategies.ArbitrumIds | Strategies.BaseIds | Bundles.MainnetIds | Bundles.OptimismIds | Bundles.ArbitrumIds | Bundles.BaseIds)[];
     closeOnPrice(vaultId: number, ratioState: RatioState, price: string, closeToAssetAddr: EthereumAddress, chainlinkCollAddress: EthereumAddress, chainId?: ChainId, daiAddr?: EthereumAddress, mcdCdpManagerAddr?: EthereumAddress): (boolean | string[] | Strategies.MainnetIds)[];
     trailingStop(vaultId: number, triggerPercentage: number, closeToAssetAddr: EthereumAddress, chainlinkCollAddress: EthereumAddress, roundId: number, chainId?: ChainId, daiAddr?: EthereumAddress, mcdCdpManagerAddr?: EthereumAddress): (boolean | string[] | Strategies.MainnetIds)[];
-    leverageManagementWithoutSubProxy(vaultId: number, triggerRatio: number, targetRatio: number, ratioState: RatioState, isBoost: boolean, daiAddr?: EthereumAddress): (boolean | string[] | Bundles.MainnetIds)[];
+    leverageManagement(vaultId: number, triggerRatio: number, targetRatio: number, ratioState: RatioState, isBoost: boolean, daiAddr?: EthereumAddress): (boolean | string[] | Bundles.MainnetIds)[];
+    liquidationProtection(vaultId: number, triggerRatio: number, targetRatio: number, ratioState: RatioState, daiAddr?: EthereumAddress): (boolean | string[] | Bundles.MainnetIds)[];
 };
 export declare const liquityEncode: {
     closeOnPrice(priceOverOrUnder: RatioState, price: string, closeToAssetAddr: EthereumAddress, chainlinkCollAddress: EthereumAddress, chainId?: ChainId, collAddr?: EthereumAddress, debtAddr?: EthereumAddress): (boolean | string[] | Strategies.MainnetIds)[];
     trailingStop(triggerPercentage: number, closeToAssetAddr: EthereumAddress, chainlinkCollAddress: EthereumAddress, roundId: number, chainId?: ChainId, collAddr?: EthereumAddress, debtAddr?: EthereumAddress): (boolean | string[] | Strategies.MainnetIds)[];
     paybackFromChickenBondStrategySub(proxyAddress: EthereumAddress, ratio: number, sourceId: string, sourceType: number, ratioState?: RatioState): (boolean | string[] | Bundles.MainnetIds)[];
-    leverageManagementWithoutSubProxy(strategyOrBundleId: number, user: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number): (number | boolean | string[])[];
+    leverageManagement(strategyOrBundleId: number, user: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number): (number | boolean | string[])[];
     dsrPayback(proxyAddress: EthereumAddress, triggerRatio: number, targetRatio: number): (boolean | string[] | Strategies.MainnetIds)[];
     dsrSupply(proxyAddress: EthereumAddress, triggerRatio: number, targetRatio: number): (boolean | string[] | Strategies.MainnetIds)[];
     debtInFrontRepay(proxyAddress: EthereumAddress, debtInFrontMin: string, targetRatioIncrease: number): (boolean | string[] | Strategies.MainnetIds)[];
 };
-export declare const chickenBondsEncode: {
-    rebond(bondId: number): string[];
-};
 export declare const aaveV2Encode: {
-    leverageManagementWithoutSubProxy(strategyOrBundleId: number, market: EthereumAddress, user: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number): (number | boolean | string[])[];
+    leverageManagement(strategyOrBundleId: number, market: EthereumAddress, user: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number): (number | boolean | string[])[];
 };
 export declare const aaveV3Encode: {
     closeToAsset(strategyOrBundleId: number, isBundle: boolean | undefined, triggerData: {
@@ -59,25 +57,24 @@ export declare const aaveV3Encode: {
         marketAddr: EthereumAddress;
         targetRatio: number;
     }): (number | boolean | string[])[];
-    leverageManagementWithoutSubProxy(strategyOrBundleId: number, market: EthereumAddress, user: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number, isGeneric?: boolean): (number | boolean | string[])[];
+    leverageManagement(strategyOrBundleId: number, market: EthereumAddress, user: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number, isGeneric?: boolean): (number | boolean | string[])[];
+    liquidationProtection(strategyOrBundleId: number, market: EthereumAddress, user: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number): (number | boolean | string[])[];
     leverageManagementOnPriceGeneric(strategyOrBundleId: number, price: number, ratioState: RatioState, collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, marketAddr: EthereumAddress, targetRatio: number, user: EthereumAddress): (number | boolean | string[])[];
     closeOnPriceGeneric(strategyOrBundleId: number, collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, marketAddr: EthereumAddress, user: EthereumAddress, stopLossPrice?: number, stopLossType?: CloseToAssetType, takeProfitPrice?: number, takeProfitType?: CloseToAssetType): (number | boolean | string[])[];
     collateralSwitch(strategyOrBundleId: number, fromAsset: EthereumAddress, fromAssetId: number, toAsset: EthereumAddress, toAssetId: number, marketAddr: EthereumAddress, amountToSwitch: string, baseTokenAddress: EthereumAddress, quoteTokenAddress: EthereumAddress, price: number, state: RatioState): (number | boolean | string[])[];
 };
 export declare const compoundV2Encode: {
-    leverageManagementWithoutSubProxy(strategyOrBundleId: number, user: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number): (number | boolean | string[])[];
+    leverageManagement(strategyOrBundleId: number, user: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number): (number | boolean | string[])[];
 };
 export declare const compoundV3Encode: {
-    leverageManagementWithoutSubProxy(strategyOrBundleId: number, market: EthereumAddress, baseToken: EthereumAddress, user: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number): (number | boolean | string[])[];
+    leverageManagement(strategyOrBundleId: number, market: EthereumAddress, baseToken: EthereumAddress, user: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number): (number | boolean | string[])[];
+    liquidationProtection(strategyOrBundleId: number, market: EthereumAddress, baseToken: EthereumAddress, user: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number): (number | boolean | string[])[];
     leverageManagementOnPrice(strategyOrBundleId: number, market: EthereumAddress, collToken: EthereumAddress, baseToken: EthereumAddress, targetRatio: number, price: number, priceState: RatioState, ratioState: RatioState, user: EthereumAddress): (number | boolean | string[])[];
     closeOnPrice(strategyOrBundleId: number, market: EthereumAddress, collToken: EthereumAddress, baseToken: EthereumAddress, stopLossPrice: number | undefined, stopLossType: CloseToAssetType | undefined, takeProfitPrice: number | undefined, takeProfitType: CloseToAssetType | undefined, user: EthereumAddress): (number | boolean | string[])[];
 };
-export declare const morphoAaveV2Encode: {
-    leverageManagement(triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean): string[];
-};
 export declare const exchangeEncode: {
     dca(fromToken: EthereumAddress, toToken: EthereumAddress, amount: string, timestamp: number, interval: number, network: ChainId): (boolean | string[] | Strategies.MainnetIds | Strategies.OptimismIds | Strategies.ArbitrumIds | Strategies.BaseIds)[];
-    limitOrderWithoutSubProxy(fromToken: EthereumAddress, toToken: EthereumAddress, amount: string, targetPrice: string, goodUntil: string | number, orderType: OrderType, fromTokenDecimals: number, toTokenDecimals: number, network: ChainId): (boolean | string[] | Strategies.MainnetIds | Strategies.OptimismIds | Strategies.ArbitrumIds | Strategies.BaseIds)[];
+    limitOrder(fromToken: EthereumAddress, toToken: EthereumAddress, amount: string, targetPrice: string, goodUntil: string | number, orderType: OrderType, fromTokenDecimals: number, toTokenDecimals: number, network: ChainId): (boolean | string[] | Strategies.MainnetIds | Strategies.OptimismIds | Strategies.ArbitrumIds | Strategies.BaseIds)[];
 };
 export declare const sparkEncode: {
     leverageManagementOnPrice(strategyOrBundleId: number, isBundle: boolean | undefined, triggerData: {
@@ -94,17 +91,23 @@ export declare const sparkEncode: {
         targetRatio: number;
     }): (number | boolean | string[])[];
     closeOnPriceGeneric(strategyOrBundleId: number, collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, marketAddr: EthereumAddress, user: EthereumAddress, stopLossPrice?: number, stopLossType?: CloseToAssetType, takeProfitPrice?: number, takeProfitType?: CloseToAssetType): (number | boolean | string[])[];
-    leverageManagementWithoutSubProxy(strategyOrBundleId: number, market: EthereumAddress, user: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number): (number | boolean | string[])[];
+    leverageManagement(strategyOrBundleId: number, market: EthereumAddress, user: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number): (number | boolean | string[])[];
+    liquidationProtection(strategyOrBundleId: number, market: EthereumAddress, user: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number): (number | boolean | string[])[];
+    leverageManagementGeneric(strategyOrBundleId: number, market: EthereumAddress, user: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number): (number | boolean | string[])[];
+    liquidationProtectionGeneric(strategyOrBundleId: number, market: EthereumAddress, user: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number): (number | boolean | string[])[];
+    leverageManagementOnPriceGeneric(strategyOrBundleId: number, price: number, ratioState: RatioState, collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, marketAddr: EthereumAddress, targetRatio: number, user: EthereumAddress): (number | boolean | string[])[];
     collateralSwitch(strategyOrBundleId: number, fromAsset: EthereumAddress, fromAssetId: number, toAsset: EthereumAddress, toAssetId: number, marketAddr: EthereumAddress, amountToSwitch: string, baseTokenAddress: EthereumAddress, quoteTokenAddress: EthereumAddress, price: number, state: RatioState): (number | boolean | string[])[];
+    collateralSwitchGeneric(strategyOrBundleId: number, fromAsset: EthereumAddress, fromAssetId: number, toAsset: EthereumAddress, toAssetId: number, marketAddr: EthereumAddress, amountToSwitch: string, user: EthereumAddress, baseTokenAddress: EthereumAddress, quoteTokenAddress: EthereumAddress, price: number, state: RatioState): (number | boolean | string[])[];
 };
 export declare const crvUSDEncode: {
     leverageManagement(owner: EthereumAddress, controllerAddr: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number, collTokenAddr: EthereumAddress, crvUSDAddr: EthereumAddress): (boolean | string[] | Bundles.MainnetIds)[];
     payback(proxyAddress: EthereumAddress, addressToPullTokensFrom: EthereumAddress, positionOwner: EthereumAddress, paybackAmount: string, crvUSDAddr: EthereumAddress, controllerAddr: EthereumAddress, minHealthRatio: number): (boolean | string[] | Strategies.MainnetIds)[];
 };
-export type MorphoBlueBundleStrategy = 'repay' | 'boost' | 'repayOnPrice' | 'boostOnPrice' | 'close';
+export type MorphoBlueBundleStrategy = 'repay' | 'boost' | 'repayOnPrice' | 'boostOnPrice' | 'close' | 'liquidationProtection';
 export declare function getMorphoBlueBundleId(network: ChainId, strategy: MorphoBlueBundleStrategy, isEOA: boolean): number;
 export declare const morphoBlueEncode: {
     leverageManagement(marketId: string, loanToken: EthereumAddress, collToken: EthereumAddress, oracle: EthereumAddress, irm: EthereumAddress, lltv: string, ratioState: RatioState, targetRatio: number, triggerRatio: number, user: EthereumAddress, isEOA: boolean, network: ChainId): (number | boolean | string[])[];
+    liquidationProtection(marketId: string, loanToken: EthereumAddress, collToken: EthereumAddress, oracle: EthereumAddress, irm: EthereumAddress, lltv: string, ratioState: RatioState, targetRatio: number, triggerRatio: number, user: EthereumAddress, isEOA: boolean, network: ChainId): (number | boolean | string[])[];
     leverageManagementOnPrice(strategyOrBundleId: number, isBundle: boolean | undefined, loanToken: EthereumAddress, collToken: EthereumAddress, oracle: EthereumAddress, irm: EthereumAddress, lltv: string, user: EthereumAddress, targetRatio: number, price: number, priceState: RatioState): (number | boolean | string[])[];
     leverageManagementOnPriceGeneric(loanToken: EthereumAddress, collToken: EthereumAddress, oracle: EthereumAddress, irm: EthereumAddress, lltv: string, user: EthereumAddress, targetRatio: number, price: number, priceState: RatioState, isBoost: boolean, isEOA: boolean, network: ChainId): (number | boolean | string[])[];
     closeOnPrice(strategyOrBundleId: number, loanToken: EthereumAddress, collToken: EthereumAddress, oracle: EthereumAddress, irm: EthereumAddress, lltv: string, user: EthereumAddress, stopLossPrice?: number, stopLossType?: CloseToAssetType, takeProfitPrice?: number, takeProfitType?: CloseToAssetType): (number | boolean | string[])[];
@@ -118,9 +121,11 @@ export declare const liquityV2Encode: {
 };
 export declare const fluidEncode: {
     leverageManagement(nftId: string, vault: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number, strategyOrBundleId: number): (number | boolean | string[])[];
+    liquidationProtection(nftId: string, vault: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number, strategyOrBundleId: number): (number | boolean | string[])[];
 };
 export declare const aaveV4Encode: {
     leverageManagement(strategyOrBundleId: number, owner: EthereumAddress, spoke: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number): (number | boolean | string[])[];
+    liquidationProtection(strategyOrBundleId: number, owner: EthereumAddress, spoke: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number): (number | boolean | string[])[];
     leverageManagementOnPrice(strategyOrBundleId: number, owner: EthereumAddress, spoke: EthereumAddress, collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, targetRatio: number, price: string, priceState: RatioState, ratioState: RatioState): (number | boolean | string[])[];
     closeOnPrice(strategyOrBundleId: number, owner: EthereumAddress, spoke: EthereumAddress, collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, stopLossPrice?: string, stopLossType?: CloseToAssetType, takeProfitPrice?: string, takeProfitType?: CloseToAssetType): (number | boolean | string[])[];
     collateralSwitch(strategyOrBundleId: number, owner: EthereumAddress, spoke: EthereumAddress, fromAsset: EthereumAddress, fromAssetId: number, toAsset: EthereumAddress, toAssetId: number, amountToSwitch: string, price: string, ratioState: RatioState): (number | boolean | string[])[];