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

package/src/services/strategiesService.ts

@@ -106,7 +106,7 @@ function parseMakerLeverageManagement(position: Position.Automated, parseData: P
   const { isEnabled } = parseData.strategiesSubsData;
 
   const triggerData = triggerService.makerRatioTrigger.decode(subStruct.triggerData);
-  const subData = subDataService.legacyMakerLeverageManagementSubData.decode(subStruct.subData);
+  const subData = subDataService.makerLeverageManagementSubData.decode(subStruct.subData);
 
   _position.strategyData.decoded.triggerData = triggerData;
   _position.strategyData.decoded.subData = subData;
@@ -140,33 +140,6 @@ function parseMakerLeverageManagement(position: Position.Automated, parseData: P
   return _position;
 }
 
-function parseMakerLiquidationProtection(position: Position.Automated, parseData: ParseData): Position.Automated {
-  const _position = cloneDeep(position);
-
-  const { subStruct, subId } = parseData.subscriptionEventData;
-  const { isEnabled } = parseData.strategiesSubsData;
-
-  const triggerData = triggerService.makerRatioTrigger.decode(subStruct.triggerData);
-  const subData = subDataService.makerLiquidationProtectionSubData.decode(subStruct.subData);
-
-  _position.strategyData.decoded.triggerData = triggerData;
-  _position.strategyData.decoded.subData = subData;
-
-  _position.positionId = getPositionId(_position.chainId, _position.protocol.id, subData.vaultId);
-
-
-  _position.specific = {
-    triggerRepayRatio: triggerData.ratio,
-    targetRepayRatio: subData.targetRatio,
-    repayEnabled: isEnabled,
-    subId1: Number(subId),
-  };
-
-  _position.strategy.strategyId = Strategies.IdOverrides.LiquidationProtection;
-
-  return _position;
-}
-
 function parseLiquityCloseOnPrice(position: Position.Automated, parseData: ParseData): Position.Automated {
   const _position = cloneDeep(position);
 
@@ -223,7 +196,7 @@ function parseAaveV2LeverageManagement(position: Position.Automated, parseData:
   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;
@@ -267,9 +240,9 @@ function parseAaveV3LeverageManagement(position: Position.Automated, 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;
@@ -307,35 +280,6 @@ function parseAaveV3LeverageManagement(position: Position.Automated, parseData:
   return _position;
 }
 
-function parseAaveV3LiquidationProtection(position: Position.Automated, parseData: ParseData): Position.Automated {
-  const _position = cloneDeep(position);
-
-  const { subStruct, subId, subHash } = parseData.subscriptionEventData;
-  const { isEnabled } = parseData.strategiesSubsData;
-
-  const triggerData = triggerService.aaveV3RatioTrigger.decode(subStruct.triggerData);
-
-  const subData = subDataService.aaveV3LiquidationProtectionSubData.decode(subStruct.subData);
-
-  _position.strategyData.decoded.triggerData = triggerData;
-  _position.strategyData.decoded.subData = subData;
-
-  _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, triggerData.market);
-
-  _position.specific = {
-    triggerRepayRatio: triggerData.ratio,
-    targetRepayRatio: subData.targetRatio,
-    repayEnabled: isEnabled,
-    subId1: Number(subId),
-    subHashRepay: subHash,
-  };
-
-  const isEOA = _position.strategy.strategyId.includes('eoa');
-  _position.strategy.strategyId = isEOA ? Strategies.IdOverrides.EoaLiquidationProtection : Strategies.IdOverrides.LiquidationProtection;
-
-  return _position;
-}
-
 function parseAaveV3LeverageManagementOnPrice(position: Position.Automated, parseData: ParseData): Position.Automated {
   const _position = cloneDeep(position);
   const { subStruct } = parseData.subscriptionEventData;
@@ -493,31 +437,6 @@ function parseAaveV4LeverageManagement(position: Position.Automated, parseData:
   return _position;
 }
 
-function parseAaveV4LiquidationProtection(position: Position.Automated, parseData: ParseData): Position.Automated {
-  const _position = cloneDeep(position);
-  const { subStruct, subId, subHash } = parseData.subscriptionEventData;
-  const { isEnabled } = parseData.strategiesSubsData;
-  const triggerData = triggerService.aaveV4RatioTrigger.decode(subStruct.triggerData);
-  const subData = subDataService.aaveV4LiquidationProtectionSubData.decode(subStruct.subData);
-  const isEOA = _position.strategy.strategyId.includes('eoa');
-
-  _position.strategyData.decoded.triggerData = triggerData;
-  _position.strategyData.decoded.subData = subData;
-  _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, triggerData.spoke);
-  _position.strategy.strategyId = isEOA ? Strategies.IdOverrides.EoaLiquidationProtection : Strategies.IdOverrides.LiquidationProtection;
-
-  _position.specific = {
-    triggerRepayRatio: triggerData.ratio,
-    targetRepayRatio: subData.targetRatio,
-    repayEnabled: isEnabled,
-    subId1: Number(subId),
-    subHashRepay: subHash,
-  };
-
-  return _position;
-}
-
-
 function parseAaveV4LeverageManagementOnPrice(position: Position.Automated, parseData: ParseData): Position.Automated {
   const _position = cloneDeep(position);
   const { subStruct } = parseData.subscriptionEventData;
@@ -670,7 +589,7 @@ function parseCompoundV2LeverageManagement(position: Position.Automated, parseDa
   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;
@@ -712,7 +631,7 @@ function parseCompoundV3LeverageManagement(position: Position.Automated, parseDa
   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);
@@ -751,39 +670,6 @@ function parseCompoundV3LeverageManagement(position: Position.Automated, parseDa
   return _position;
 }
 
-
-function parseCompoundV3LiquidationProtection(position: Position.Automated, parseData: ParseData): Position.Automated {
-  const _position = cloneDeep(position);
-
-  const { subStruct, subId, subHash } = parseData.subscriptionEventData;
-  const { isEnabled } = parseData.strategiesSubsData;
-
-  const subDataDecoder = subDataService.compoundV3LiquidationProtectionSubData;
-
-  const triggerData = triggerService.compoundV3RatioTrigger.decode(subStruct.triggerData);
-  const subData = subDataDecoder.decode(subStruct.subData);
-
-  _position.strategyData.decoded.triggerData = triggerData;
-  _position.strategyData.decoded.subData = subData;
-
-  _position.positionId = getPositionId(_position.chainId, _position.protocol.id, triggerData.owner.toLowerCase(), triggerData.market);
-
-  const isEOA = _position.strategy.strategyId.includes('eoa');
-
-  _position.specific = {
-    triggerRepayRatio: triggerData.ratio,
-    targetRepayRatio: subData.targetRatio,
-    repayEnabled: isEnabled,
-    subId1: Number(subId),
-    subHashRepay: subHash,
-  };
-
-  _position.strategy.strategyId = isEOA ? Strategies.IdOverrides.EoaLiquidationProtection : Strategies.IdOverrides.LiquidationProtection;
-
-  return _position;
-}
-
-
 function parseCompoundV3LeverageManagementOnPrice(position: Position.Automated, parseData: ParseData): Position.Automated {
   const _position = cloneDeep(position);
 
@@ -888,7 +774,7 @@ function parseExchangeLimitOrder(position: Position.Automated, parseData: ParseD
 
   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);
@@ -905,7 +791,7 @@ function parseLiquityLeverageManagement(position: Position.Automated, parseData:
   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;
@@ -989,7 +875,7 @@ function parseSparkLeverageManagement(position: Position.Automated, parseData: P
   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;
@@ -1023,34 +909,6 @@ function parseSparkLeverageManagement(position: Position.Automated, parseData: P
   return _position;
 }
 
-function parseSparkLiquidationProtection(position: Position.Automated, parseData: ParseData): Position.Automated {
-  const _position = cloneDeep(position);
-
-  const { subStruct, subId, subHash } = parseData.subscriptionEventData;
-  const { isEnabled } = parseData.strategiesSubsData;
-
-  const triggerData = triggerService.sparkRatioTrigger.decode(subStruct.triggerData);
-  const subData = subDataService.sparkLiquidationProtectionSubData.decode(subStruct.subData);
-
-  _position.strategyData.decoded.triggerData = triggerData;
-  _position.strategyData.decoded.subData = subData;
-
-  _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, triggerData.market);
-
-  _position.specific = {
-    triggerRepayRatio: triggerData.ratio,
-    targetRepayRatio: subData.targetRatio,
-    repayEnabled: isEnabled,
-    subId1: Number(subId),
-    subHashRepay: subHash,
-  };
-
-  _position.strategy.strategyId = Strategies.IdOverrides.LiquidationProtection;
-
-  return _position;
-}
-
-
 function parseSparkLeverageManagementOnPrice(position: Position.Automated, parseData: ParseData): Position.Automated {
   const _position = cloneDeep(position);
   const { subStruct } = parseData.subscriptionEventData;
@@ -1214,6 +1072,7 @@ function parseMorphoBlueLeverageManagement(position: Position.Automated, parseDa
 
   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);
 
@@ -1231,7 +1090,7 @@ function parseMorphoBlueLeverageManagement(position: Position.Automated, parseDa
       repayEnabled: isEnabled,
       subId1: Number(subId),
       subHashRepay: subHash,
-      mergeWithId: Strategies.Identifiers.Boost,
+      mergeWithId: isEOA ? Strategies.Identifiers.EoaBoost : Strategies.Identifiers.Boost,
     };
   } else {
     _position.specific = {
@@ -1240,42 +1099,12 @@ function parseMorphoBlueLeverageManagement(position: Position.Automated, parseDa
       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: Position.Automated, parseData: ParseData): Position.Automated {
-  const _position = cloneDeep(position);
-
-  const { subStruct, subId, subHash } = parseData.subscriptionEventData;
-  const { isEnabled } = parseData.strategiesSubsData;
-  const triggerData = triggerService.morphoBlueRatioTrigger.decode(subStruct.triggerData);
-  const subData = subDataService.morphoBlueLiquidationProtectionSubData.decode(subStruct.subData);
-
-  _position.strategyData.decoded.triggerData = triggerData;
-  _position.strategyData.decoded.subData = subData;
-
-  _position.positionId = getPositionId(_position.chainId, _position.protocol.id, triggerData.owner.toLowerCase(), triggerData.marketId);
-
-  _position.specific = {
-    triggerRepayRatio: triggerData.ratio,
-    targetRepayRatio: subData.targetRatio,
-    repayEnabled: isEnabled,
-    subId1: Number(subId),
-    subHashRepay: subHash,
-  };
-
-  const isEOA = _position.strategy.strategyId.includes('eoa');
-  _position.strategy.strategyId = isEOA ? Strategies.IdOverrides.EoaLiquidationProtection : Strategies.IdOverrides.LiquidationProtection;
-
   return _position;
 }
 
@@ -1283,6 +1112,7 @@ function parseMorphoBlueLeverageManagementOnPrice(position: Position.Automated,
   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);
 
@@ -1313,6 +1143,10 @@ function parseMorphoBlueLeverageManagementOnPrice(position: Position.Automated,
     ratioState: triggerData.priceState,
   };
 
+  _position.strategy.strategyId = isEOA
+    ? Strategies.IdOverrides.EoaLeverageManagementOnPrice
+    : Strategies.IdOverrides.LeverageManagementOnPrice;
+
   return _position;
 }
 
@@ -1320,6 +1154,7 @@ function parseMorphoBlueCloseOnPrice(position: Position.Automated, parseData: Pa
   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);
@@ -1344,6 +1179,8 @@ function parseMorphoBlueCloseOnPrice(position: Position.Automated, parseData: Pa
 
   const { takeProfitType, stopLossType } = getStopLossAndTakeProfitTypeByCloseStrategyType(+subData.closeType);
 
+  _position.strategy.strategyId = isEOA ? Strategies.Identifiers.EoaCloseOnPrice : Strategies.Identifiers.CloseOnPrice;
+
   _position.specific = {
     subHash: _position.subHash,
     marketId,
@@ -1485,37 +1322,6 @@ function parseFluidT1LeverageManagement(position: Position.Automated, parseData:
   return _position;
 }
 
-
-function parseFluidT1LiquidationProtection(position: Position.Automated, parseData: ParseData): Position.Automated {
-  const _position = cloneDeep(position);
-
-  const { subStruct, subId, subHash } = parseData.subscriptionEventData;
-  const { isEnabled } = parseData.strategiesSubsData;
-
-  const triggerData = triggerService.fluidRatioTrigger.decode(subStruct.triggerData);
-  const subData = subDataService.fluidLiquidationProtectionSubData.decode(subStruct.subData);
-
-  _position.strategyData.decoded.triggerData = triggerData;
-  _position.strategyData.decoded.subData = subData;
-
-  _position.positionId = getPositionId(
-    _position.chainId, _position.protocol.id, _position.owner, triggerData.nftId, subData.vault,
-  );
-
-  _position.specific = {
-    triggerRepayRatio: triggerData.ratio,
-    targetRepayRatio: subData.targetRatio,
-    repayEnabled: isEnabled,
-    subId1: Number(subId),
-    subHashRepay: subHash,
-  };
-
-  _position.strategy.strategyId = Strategies.IdOverrides.LiquidationProtection;
-
-  return _position;
-}
-
-
 const parsingMethodsMapping: StrategiesToProtocolVersionMapping = {
   [ProtocolIdentifiers.StrategiesAutomation.MakerDAO]: {
     [Strategies.Identifiers.SavingsLiqProtection]: parseMakerSavingsLiqProtection,
@@ -1525,7 +1331,6 @@ const parsingMethodsMapping: StrategiesToProtocolVersionMapping = {
     [Strategies.Identifiers.TrailingStopToDebt]: parseMakerTrailingStop,
     [Strategies.Identifiers.Repay]: parseMakerLeverageManagement,
     [Strategies.Identifiers.Boost]: parseMakerLeverageManagement,
-    [Strategies.Identifiers.LiquidationProtection]: parseMakerLiquidationProtection,
   },
   [ProtocolIdentifiers.StrategiesAutomation.Liquity]: {
     [Strategies.Identifiers.CloseOnPriceToColl]: parseLiquityCloseOnPrice,
@@ -1564,8 +1369,6 @@ const parsingMethodsMapping: StrategiesToProtocolVersionMapping = {
     [Strategies.Identifiers.EoaBoostOnPrice]: parseAaveV3LeverageManagementOnPrice,
     [Strategies.Identifiers.EoaCloseOnPrice]: parseAaveV3CloseOnPrice,
     [Strategies.Identifiers.CollateralSwitch]: parseAaveV3CollateralSwitch,
-    [Strategies.Identifiers.LiquidationProtection]: parseAaveV3LiquidationProtection,
-    [Strategies.Identifiers.EoaLiquidationProtection]: parseAaveV3LiquidationProtection,
   },
   [ProtocolIdentifiers.StrategiesAutomation.AaveV4]: {
     [Strategies.Identifiers.Repay]: parseAaveV4LeverageManagement,
@@ -1580,8 +1383,6 @@ const parsingMethodsMapping: StrategiesToProtocolVersionMapping = {
     [Strategies.Identifiers.EoaCloseOnPrice]: parseAaveV4CloseOnPrice,
     [Strategies.Identifiers.CollateralSwitch]: parseAaveV4CollateralSwitch,
     [Strategies.Identifiers.EoaCollateralSwitch]: parseAaveV4CollateralSwitch,
-    [Strategies.Identifiers.LiquidationProtection]: parseAaveV4LiquidationProtection,
-    [Strategies.Identifiers.EoaLiquidationProtection]: parseAaveV4LiquidationProtection,
   },
   [ProtocolIdentifiers.StrategiesAutomation.CompoundV2]: {
     [Strategies.Identifiers.Repay]: parseCompoundV2LeverageManagement,
@@ -1598,8 +1399,6 @@ const parsingMethodsMapping: StrategiesToProtocolVersionMapping = {
     [Strategies.Identifiers.EoaBoostOnPrice]: parseCompoundV3LeverageManagementOnPrice,
     [Strategies.Identifiers.CloseOnPrice]: parseCompoundV3CloseOnPrice,
     [Strategies.Identifiers.EoaCloseOnPrice]: parseCompoundV3CloseOnPrice,
-    [Strategies.Identifiers.LiquidationProtection]: parseCompoundV3LiquidationProtection,
-    [Strategies.Identifiers.EoaLiquidationProtection]: parseCompoundV3LiquidationProtection,
   },
   [ProtocolIdentifiers.StrategiesAutomation.ChickenBonds]: {
     [Strategies.Identifiers.Rebond]: parseChickenBondsRebond,
@@ -1619,7 +1418,6 @@ const parsingMethodsMapping: StrategiesToProtocolVersionMapping = {
     [Strategies.Identifiers.BoostOnPrice]: parseSparkLeverageManagementOnPrice,
     [Strategies.Identifiers.CloseOnPrice]: parseSparkCloseOnPrice,
     [Strategies.Identifiers.CollateralSwitch]: parseSparkCollateralSwitch,
-    [Strategies.Identifiers.LiquidationProtection]: parseSparkLiquidationProtection,
   },
   [ProtocolIdentifiers.StrategiesAutomation.CrvUSD]: {
     [Strategies.Identifiers.Repay]: parseCrvUSDLeverageManagement,
@@ -1633,14 +1431,14 @@ const parsingMethodsMapping: StrategiesToProtocolVersionMapping = {
     [Strategies.Identifiers.EoaBoost]: parseMorphoBlueLeverageManagement,
     [Strategies.Identifiers.BoostOnPrice]: parseMorphoBlueLeverageManagementOnPrice,
     [Strategies.Identifiers.RepayOnPrice]: parseMorphoBlueLeverageManagementOnPrice,
+    [Strategies.Identifiers.EoaBoostOnPrice]: parseMorphoBlueLeverageManagementOnPrice,
+    [Strategies.Identifiers.EoaRepayOnPrice]: parseMorphoBlueLeverageManagementOnPrice,
     [Strategies.Identifiers.CloseOnPrice]: parseMorphoBlueCloseOnPrice,
-    [Strategies.Identifiers.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,
   },
 };