@defisaver/automation-sdk 3.2.0 → 3.2.2

package/esm/types/enums.js

@@ -21,6 +21,32 @@ export var BundleProtocols;
     BundleProtocols["Yearn"] = "yearn";
     BundleProtocols["Rari"] = "rari";
 })(BundleProtocols || (BundleProtocols = {}));
+export var CollActionType;
+(function (CollActionType) {
+    CollActionType[CollActionType["SUPPLY"] = 0] = "SUPPLY";
+    CollActionType[CollActionType["WITHDRAW"] = 1] = "WITHDRAW";
+})(CollActionType || (CollActionType = {}));
+export var DebtActionType;
+(function (DebtActionType) {
+    DebtActionType[DebtActionType["PAYBACK"] = 0] = "PAYBACK";
+    DebtActionType[DebtActionType["BORROW"] = 1] = "BORROW";
+})(DebtActionType || (DebtActionType = {}));
+export var CloseStrategyType;
+(function (CloseStrategyType) {
+    CloseStrategyType[CloseStrategyType["TAKE_PROFIT_IN_COLLATERAL"] = 0] = "TAKE_PROFIT_IN_COLLATERAL";
+    CloseStrategyType[CloseStrategyType["STOP_LOSS_IN_COLLATERAL"] = 1] = "STOP_LOSS_IN_COLLATERAL";
+    CloseStrategyType[CloseStrategyType["TAKE_PROFIT_IN_DEBT"] = 2] = "TAKE_PROFIT_IN_DEBT";
+    CloseStrategyType[CloseStrategyType["STOP_LOSS_IN_DEBT"] = 3] = "STOP_LOSS_IN_DEBT";
+    CloseStrategyType[CloseStrategyType["TAKE_PROFIT_AND_STOP_LOSS_IN_COLLATERAL"] = 4] = "TAKE_PROFIT_AND_STOP_LOSS_IN_COLLATERAL";
+    CloseStrategyType[CloseStrategyType["TAKE_PROFIT_IN_COLLATERAL_AND_STOP_LOSS_IN_DEBT"] = 5] = "TAKE_PROFIT_IN_COLLATERAL_AND_STOP_LOSS_IN_DEBT";
+    CloseStrategyType[CloseStrategyType["TAKE_PROFIT_AND_STOP_LOSS_IN_DEBT"] = 6] = "TAKE_PROFIT_AND_STOP_LOSS_IN_DEBT";
+    CloseStrategyType[CloseStrategyType["TAKE_PROFIT_IN_DEBT_AND_STOP_LOSS_IN_COLLATERAL"] = 7] = "TAKE_PROFIT_IN_DEBT_AND_STOP_LOSS_IN_COLLATERAL";
+})(CloseStrategyType || (CloseStrategyType = {}));
+export var CloseToAssetType;
+(function (CloseToAssetType) {
+    CloseToAssetType[CloseToAssetType["COLLATERAL"] = 0] = "COLLATERAL";
+    CloseToAssetType[CloseToAssetType["DEBT"] = 1] = "DEBT";
+})(CloseToAssetType || (CloseToAssetType = {}));
 /**
  * @dev Follow the naming convention:
  *      - Enum name consists of two parts, name and version
@@ -34,6 +60,7 @@ export var ProtocolIdentifiers;
     (function (StrategiesAutomation) {
         StrategiesAutomation["MakerDAO"] = "MakerDAO";
         StrategiesAutomation["Liquity"] = "Liquity";
+        StrategiesAutomation["LiquityV2"] = "Liquity__V2";
         StrategiesAutomation["ChickenBonds"] = "Chicken Bonds";
         StrategiesAutomation["CompoundV2"] = "Compound__V2";
         StrategiesAutomation["CompoundV3"] = "Compound__V3";
@@ -44,6 +71,7 @@ export var ProtocolIdentifiers;
         StrategiesAutomation["Spark"] = "Spark";
         StrategiesAutomation["CrvUSD"] = "CurveUSD";
         StrategiesAutomation["MorphoBlue"] = "MorphoBlue";
+        StrategiesAutomation["FluidT1"] = "FluidT1";
     })(StrategiesAutomation = ProtocolIdentifiers.StrategiesAutomation || (ProtocolIdentifiers.StrategiesAutomation = {}));
     let LegacyAutomation;
     (function (LegacyAutomation) {
@@ -70,6 +98,7 @@ export var Strategies;
         MainnetIds[MainnetIds["LIQUITY_DSR_SUPPLY"] = 70] = "LIQUITY_DSR_SUPPLY";
         MainnetIds[MainnetIds["LIQUITY_DEBT_IN_FRONT_REPAY"] = 75] = "LIQUITY_DEBT_IN_FRONT_REPAY";
         MainnetIds[MainnetIds["CURVEUSD_PAYBACK"] = 92] = "CURVEUSD_PAYBACK";
+        MainnetIds[MainnetIds["LIQUITY_V2_PAYBACK"] = 113] = "LIQUITY_V2_PAYBACK";
     })(MainnetIds = Strategies.MainnetIds || (Strategies.MainnetIds = {}));
     let OptimismIds;
     (function (OptimismIds) {
@@ -101,6 +130,7 @@ export var Strategies;
         Identifiers["CloseToCollateralWithGasPrice"] = "close-to-collateral-with-gas-price";
         Identifiers["CloseOnPriceToDebt"] = "close-on-price-to-debt";
         Identifiers["CloseOnPriceToColl"] = "close-on-price-to-collateral";
+        Identifiers["CloseOnPrice"] = "close-on-price";
         Identifiers["TrailingStopToColl"] = "trailing-stop-to-collateral";
         Identifiers["TrailingStopToDebt"] = "trailing-stop-to-debt";
         Identifiers["Rebond"] = "rebond";
@@ -111,6 +141,7 @@ export var Strategies;
         Identifiers["DebtInFrontRepay"] = "debt-in-front-repay";
         Identifiers["OpenOrderFromCollateral"] = "open-order-from-collateral";
         Identifiers["OpenOrderFromDebt"] = "open-order-from-debt";
+        Identifiers["BoostOnPrice"] = "boost-on-price";
         Identifiers["RepayOnPrice"] = "repay-on-price";
     })(Identifiers = Strategies.Identifiers || (Strategies.Identifiers = {}));
     let IdOverrides;
@@ -168,6 +199,14 @@ export var Bundles;
         MainnetIds[MainnetIds["MORPHO_BLUE_EOA_BOOST"] = 35] = "MORPHO_BLUE_EOA_BOOST";
         MainnetIds[MainnetIds["AAVE_V3_OPEN_ORDER_FROM_COLLATERAL"] = 36] = "AAVE_V3_OPEN_ORDER_FROM_COLLATERAL";
         MainnetIds[MainnetIds["AAVE_V3_REPAY_ON_PRICE"] = 37] = "AAVE_V3_REPAY_ON_PRICE";
+        MainnetIds[MainnetIds["MORPHO_BLUE_BOOST_ON_PRICE"] = 38] = "MORPHO_BLUE_BOOST_ON_PRICE";
+        MainnetIds[MainnetIds["LIQUITY_V2_REPAY"] = 39] = "LIQUITY_V2_REPAY";
+        MainnetIds[MainnetIds["LIQUITY_V2_BOOST"] = 40] = "LIQUITY_V2_BOOST";
+        MainnetIds[MainnetIds["LIQUITY_V2_CLOSE"] = 41] = "LIQUITY_V2_CLOSE";
+        MainnetIds[MainnetIds["LIQUITY_V2_REPAY_ON_PRICE"] = 42] = "LIQUITY_V2_REPAY_ON_PRICE";
+        MainnetIds[MainnetIds["LIQUITY_V2_BOOST_ON_PRICE"] = 43] = "LIQUITY_V2_BOOST_ON_PRICE";
+        MainnetIds[MainnetIds["FLUID_T1_REPAY"] = 44] = "FLUID_T1_REPAY";
+        MainnetIds[MainnetIds["FLUID_T1_BOOST"] = 45] = "FLUID_T1_BOOST";
     })(MainnetIds = Bundles.MainnetIds || (Bundles.MainnetIds = {}));
     let OptimismIds;
     (function (OptimismIds) {
@@ -190,6 +229,9 @@ export var Bundles;
         BaseIds[BaseIds["MORPHO_BLUE_BOOST"] = 9] = "MORPHO_BLUE_BOOST";
         BaseIds[BaseIds["AAVE_V3_OPEN_ORDER_FROM_COLLATERAL"] = 10] = "AAVE_V3_OPEN_ORDER_FROM_COLLATERAL";
         BaseIds[BaseIds["AAVE_V3_REPAY_ON_PRICE"] = 11] = "AAVE_V3_REPAY_ON_PRICE";
+        BaseIds[BaseIds["MORPHO_BLUE_BOOST_ON_PRICE"] = 12] = "MORPHO_BLUE_BOOST_ON_PRICE";
+        BaseIds[BaseIds["FLUID_T1_REPAY"] = 13] = "FLUID_T1_REPAY";
+        BaseIds[BaseIds["FLUID_T1_BOOST"] = 14] = "FLUID_T1_BOOST";
     })(BaseIds = Bundles.BaseIds || (Bundles.BaseIds = {}));
     let ArbitrumIds;
     (function (ArbitrumIds) {
@@ -201,5 +243,7 @@ export var Bundles;
         ArbitrumIds[ArbitrumIds["COMP_V3_SW_BOOST_BUNDLE"] = 5] = "COMP_V3_SW_BOOST_BUNDLE";
         ArbitrumIds[ArbitrumIds["AAVE_V3_OPEN_ORDER_FROM_COLLATERAL"] = 6] = "AAVE_V3_OPEN_ORDER_FROM_COLLATERAL";
         ArbitrumIds[ArbitrumIds["AAVE_V3_REPAY_ON_PRICE"] = 7] = "AAVE_V3_REPAY_ON_PRICE";
+        ArbitrumIds[ArbitrumIds["FLUID_T1_REPAY"] = 8] = "FLUID_T1_REPAY";
+        ArbitrumIds[ArbitrumIds["FLUID_T1_BOOST"] = 9] = "FLUID_T1_BOOST";
     })(ArbitrumIds = Bundles.ArbitrumIds || (Bundles.ArbitrumIds = {}));
 })(Bundles || (Bundles = {}));

package/esm/types/index.d.ts

@@ -2,7 +2,7 @@ import type Web3 from 'web3';
 import type { AbiItem } from 'web3-utils';
 import type { BaseContract, BlockType } from './contracts/generated/types';
 import type { Subscribe, StrategyModel } from './contracts/generated/SubStorage';
-import type { ChainId, Strategies, Bundles, ProtocolIdentifiers, RatioState } from './enums';
+import type { ChainId, Strategies, Bundles, ProtocolIdentifiers, RatioState, CloseToAssetType } from './enums';
 export type PlaceholderType = any;
 export type EthereumAddress = string;
 export type BlockNumber = BlockType;
@@ -123,6 +123,10 @@ export declare namespace Position {
         interface BoostOnPriceAave extends CloseOnPriceAave {
             ratio: number;
         }
+        interface BoostOnPriceMorpho extends Base {
+            marketId: string;
+            subHash: string;
+        }
         interface CloseOnPriceWithMaximumGasPriceAave extends Base {
             collAsset: EthereumAddress;
             collAssetId: number;
@@ -134,6 +138,26 @@ export declare namespace Position {
             maximumGasPrice: string;
             ratioState: RatioState;
         }
+        interface CloseOnPriceLiquityV2 extends Base {
+            market: EthereumAddress;
+            troveId: string;
+            stopLossPrice: string;
+            takeProfitPrice: string;
+            closeToAssetAddr: EthereumAddress;
+            stopLossType: CloseToAssetType | undefined;
+            takeProfitType: CloseToAssetType | undefined;
+        }
+        interface BoostOnPriceLiquityV2 extends Base {
+            market: EthereumAddress;
+            troveId: string;
+            subHash: string;
+        }
+        interface PaybackLiquityV2 extends Base {
+            market: EthereumAddress;
+            troveId: string;
+            targetRatio: number;
+            triggerRatio: number;
+        }
         interface TrailingStop extends Base {
             roundId: number;
             triggerPercentage: number;
@@ -148,7 +172,7 @@ export declare namespace Position {
             subHashRepay?: string;
         }
     }
-    type SpecificAny = Specific.CloseOnPrice | Specific.TrailingStop | Specific.RatioProtection | Specific.CloseOnPriceAave | Specific.BoostOnPriceAave | Specific.CloseOnPriceWithMaximumGasPriceAave | Specific.DebtInFrontRepay | Specific.LeverageManagementCrvUSD;
+    type SpecificAny = Specific.CloseOnPrice | Specific.TrailingStop | Specific.RatioProtection | Specific.CloseOnPriceAave | Specific.BoostOnPriceAave | Specific.CloseOnPriceWithMaximumGasPriceAave | Specific.DebtInFrontRepay | Specific.LeverageManagementCrvUSD | Specific.CloseOnPriceLiquityV2 | Specific.BoostOnPriceMorpho | Specific.BoostOnPriceLiquityV2 | Specific.PaybackLiquityV2;
     interface Automated {
         chainId: ChainId;
         positionId: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/automation-sdk",
-  "version": "3.2.0",
+  "version": "3.2.2",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
@@ -23,9 +23,8 @@
   "repository": "https://github.com/defisaver/automation-sdk",
   "license": "ISC",
   "dependencies": {
-    "@defisaver/eslint-config": "^1.0.1",
-    "@defisaver/sdk": "^1.0.61",
-    "@defisaver/tokens": "^1.5.50",
+    "@defisaver/sdk": "^1.2.20",
+    "@defisaver/tokens": "^1.5.56",
     "@ethersproject/address": "^5.0.10",
     "@ethersproject/solidity": "^5.0.9",
     "decimal.js": "^10.4.3",
@@ -47,7 +46,6 @@
     "husky": "^8.0.0",
     "jsdoc-to-markdown": "^6.0.1",
     "mocha": "^10.2.0",
-    "react": "^18.2.0",
     "ts-node": "^10.9.1",
     "typechain": "^8.1.0",
     "typechain-target-web3-v1-3mihai3": "^6.0.1",

package/src/automation/private/StrategiesAutomation.ts

@@ -169,7 +169,6 @@ export default class StrategiesAutomation extends Automation {
       }
     });
     if (mergeExtension.length > 0) {
-      console.error('Not all merge-able extensions were used', mergeExtension);
       subscriptions = [...subscriptions, ...mergeExtension.map((s) => ({
         ...s,
         subIds: [s.subId],
@@ -206,7 +205,7 @@ export default class StrategiesAutomation extends Automation {
 
       const replaceSubWithUpdate = async (index: number) => {
         const sub = strategiesSubs[index];
-        let latestUpdate = subscriptionEvents[index].returnValues;
+        let latestUpdate = { ...subscriptionEvents[index].returnValues };
 
         if (latestUpdate.subHash !== sub?.strategySubHash) {
           const updates = await this.getUpdateDataEventsFromSubStorage({
@@ -216,6 +215,7 @@ export default class StrategiesAutomation extends Automation {
           latestUpdate = {
             ...latestUpdate, // Update is missing proxy, hence this
             ...updates?.[updates.length - 1]?.returnValues,
+            2: latestUpdate[2], // type issue
           };
         }
         subscriptions.push(
@@ -228,12 +228,12 @@ export default class StrategiesAutomation extends Automation {
         );
       };
 
-      const generatePromises = function* () {
+      // eslint-disable-next-line func-names
+      const pool = new PromisePool(function* () {
         for (let index = 0; index < strategiesSubs.length; index++) {
           yield replaceSubWithUpdate(index);
         }
-      };
-      const pool = new PromisePool(generatePromises as any, 50);
+      } as any, 50);
       await pool.start();
 
       if (options?.mergeSubs) {

package/src/constants/index.ts

@@ -113,6 +113,11 @@ export const MAINNET_STRATEGIES_INFO: MainnetStrategiesInfo = {
     strategyId: Strategies.Identifiers.Payback,
     protocol: PROTOCOLS.CrvUSD,
   },
+  [Strategies.MainnetIds.LIQUITY_V2_PAYBACK]: {
+    strategyOrBundleId: Strategies.MainnetIds.LIQUITY_V2_PAYBACK,
+    strategyId: Strategies.Identifiers.Payback,
+    protocol: PROTOCOLS.LiquityV2,
+  },
 };
 
 export const OPTIMISM_STRATEGIES_INFO: OptimismStrategiesInfo = {
@@ -376,6 +381,46 @@ export const MAINNET_BUNDLES_INFO: MainnetBundleInfo = {
     strategyId: Strategies.Identifiers.RepayOnPrice,
     protocol: PROTOCOLS.AaveV3,
   },
+  [Bundles.MainnetIds.LIQUITY_V2_REPAY]: {
+    strategyOrBundleId: Bundles.MainnetIds.LIQUITY_V2_REPAY,
+    strategyId: Strategies.Identifiers.Repay,
+    protocol: PROTOCOLS.LiquityV2,
+  },
+  [Bundles.MainnetIds.LIQUITY_V2_BOOST]: {
+    strategyOrBundleId: Bundles.MainnetIds.LIQUITY_V2_BOOST,
+    strategyId: Strategies.Identifiers.Boost,
+    protocol: PROTOCOLS.LiquityV2,
+  },
+  [Bundles.MainnetIds.LIQUITY_V2_CLOSE]: {
+    strategyOrBundleId: Bundles.MainnetIds.LIQUITY_V2_CLOSE,
+    strategyId: Strategies.Identifiers.CloseOnPrice,
+    protocol: PROTOCOLS.LiquityV2,
+  },
+  [Bundles.MainnetIds.LIQUITY_V2_REPAY_ON_PRICE]: {
+    strategyOrBundleId: Bundles.MainnetIds.LIQUITY_V2_REPAY_ON_PRICE,
+    strategyId: Strategies.Identifiers.RepayOnPrice,
+    protocol: PROTOCOLS.LiquityV2,
+  },
+  [Bundles.MainnetIds.LIQUITY_V2_BOOST_ON_PRICE]: {
+    strategyOrBundleId: Bundles.MainnetIds.LIQUITY_V2_BOOST_ON_PRICE,
+    strategyId: Strategies.Identifiers.BoostOnPrice,
+    protocol: PROTOCOLS.LiquityV2,
+  },
+  [Bundles.MainnetIds.MORPHO_BLUE_BOOST_ON_PRICE]: {
+    strategyOrBundleId: Bundles.MainnetIds.MORPHO_BLUE_BOOST_ON_PRICE,
+    strategyId: Strategies.Identifiers.BoostOnPrice,
+    protocol: PROTOCOLS.MorphoBlue,
+  },
+  [Bundles.MainnetIds.FLUID_T1_REPAY]: {
+    strategyOrBundleId: Bundles.MainnetIds.FLUID_T1_REPAY,
+    strategyId: Strategies.Identifiers.Repay,
+    protocol: PROTOCOLS.FluidT1,
+  },
+  [Bundles.MainnetIds.FLUID_T1_BOOST]: {
+    strategyOrBundleId: Bundles.MainnetIds.FLUID_T1_BOOST,
+    strategyId: Strategies.Identifiers.Boost,
+    protocol: PROTOCOLS.FluidT1,
+  },
 };
 
 export const OPTIMISM_BUNDLES_INFO: OptimismBundleInfo = {
@@ -462,6 +507,21 @@ export const BASE_BUNDLES_INFO: BaseBundleInfo = {
     strategyId: Strategies.Identifiers.RepayOnPrice,
     protocol: PROTOCOLS.AaveV3,
   },
+  [Bundles.BaseIds.MORPHO_BLUE_BOOST_ON_PRICE]: {
+    strategyOrBundleId: Bundles.BaseIds.MORPHO_BLUE_BOOST_ON_PRICE,
+    strategyId: Strategies.Identifiers.BoostOnPrice,
+    protocol: PROTOCOLS.MorphoBlue,
+  },
+  [Bundles.BaseIds.FLUID_T1_REPAY]: {
+    strategyOrBundleId: Bundles.BaseIds.FLUID_T1_REPAY,
+    strategyId: Strategies.Identifiers.Repay,
+    protocol: PROTOCOLS.FluidT1,
+  },
+  [Bundles.BaseIds.FLUID_T1_BOOST]: {
+    strategyOrBundleId: Bundles.BaseIds.FLUID_T1_BOOST,
+    strategyId: Strategies.Identifiers.Boost,
+    protocol: PROTOCOLS.FluidT1,
+  },
 };
 
 export const ARBITRUM_BUNDLES_INFO: ArbitrumBundleInfo = {
@@ -505,6 +565,16 @@ export const ARBITRUM_BUNDLES_INFO: ArbitrumBundleInfo = {
     strategyId: Strategies.Identifiers.RepayOnPrice,
     protocol: PROTOCOLS.AaveV3,
   },
+  [Bundles.ArbitrumIds.FLUID_T1_REPAY]: {
+    strategyOrBundleId: Bundles.ArbitrumIds.FLUID_T1_REPAY,
+    strategyId: Strategies.Identifiers.Repay,
+    protocol: PROTOCOLS.FluidT1,
+  },
+  [Bundles.ArbitrumIds.FLUID_T1_BOOST]: {
+    strategyOrBundleId: Bundles.ArbitrumIds.FLUID_T1_BOOST,
+    strategyId: Strategies.Identifiers.Boost,
+    protocol: PROTOCOLS.FluidT1,
+  },
 };
 
 export const BUNDLES_INFO: BundlesInfo = {

package/src/services/strategiesService.ts

@@ -1,6 +1,7 @@
 import { getAssetInfoByAddress } from '@defisaver/tokens';
 import { cloneDeep } from 'lodash';
 
+import Web3 from 'web3';
 import { BUNDLES_INFO, STRATEGIES_INFO } from '../constants';
 import type {
   Position, ParseData, StrategiesToProtocolVersionMapping, BundleOrStrategy, StrategyOrBundleIds,
@@ -9,11 +10,13 @@ import type {
 import { ChainId, ProtocolIdentifiers, Strategies } from '../types/enums';
 
 import {
-  getPositionId, getRatioStateInfoForAaveCloseStrategy, isRatioStateOver, wethToEthByAddress,
+  getPositionId, getRatioStateInfoForAaveCloseStrategy, getStopLossAndTakeProfitTypeByCloseStrategyType, isRatioStateOver, wethToEthByAddress,
 } from './utils';
 import * as subDataService from './subDataService';
 import * as triggerService from './triggerService';
 
+const web3 = new Web3();
+
 const SPARK_MARKET_ADDRESSES = {
   [ChainId.Ethereum]: '0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE',
 };
@@ -563,6 +566,49 @@ function parseLiquityLeverageManagement(position: Position.Automated, parseData:
   return _position;
 }
 
+function parseLiquityV2LeverageManagement(position: Position.Automated, parseData: ParseData): Position.Automated {
+  const _position = cloneDeep(position);
+
+  const { subStruct, subId, subHash } = parseData.subscriptionEventData;
+  const { isEnabled } = parseData.strategiesSubsData;
+
+  const triggerData = triggerService.liquityV2RatioTrigger.decode(subStruct.triggerData);
+  const subData = subDataService.liquityV2LeverageManagementSubData.decode(subStruct.subData);
+
+  _position.strategyData.decoded.triggerData = triggerData;
+  _position.strategyData.decoded.subData = subData;
+
+  _position.positionId = getPositionId(
+    _position.chainId, _position.protocol.id, _position.owner, triggerData.troveId, triggerData.market,
+  );
+
+  const isRepay = _position.strategy.strategyId === Strategies.Identifiers.Repay;
+
+  if (isRepay) {
+    _position.specific = {
+      triggerRepayRatio: triggerData.ratio,
+      targetRepayRatio: subData.targetRatio,
+      repayEnabled: isEnabled,
+      subId1: Number(subId),
+      subHashRepay: subHash,
+      mergeWithId: Strategies.Identifiers.Boost,
+    };
+  } else {
+    _position.specific = {
+      triggerBoostRatio: triggerData.ratio,
+      targetBoostRatio: subData.targetRatio,
+      boostEnabled: isEnabled,
+      subId2: Number(subId),
+      subHashBoost: subHash,
+      mergeId: Strategies.Identifiers.Boost,
+    };
+  }
+
+  _position.strategy.strategyId = Strategies.IdOverrides.LeverageManagement;
+
+  return _position;
+}
+
 function parseSparkLeverageManagement(position: Position.Automated, parseData: ParseData): Position.Automated {
   const _position = cloneDeep(position);
 
@@ -779,6 +825,42 @@ function parseMorphoBlueLeverageManagement(position: Position.Automated, parseDa
   return _position;
 }
 
+function parseMorphoBlueLeverageManagementOnPrice(position: Position.Automated, parseData: ParseData): Position.Automated {
+  const _position = cloneDeep(position);
+
+  const { subStruct } = parseData.subscriptionEventData;
+  const triggerData = triggerService.morphoBluePriceTrigger.decode(subStruct.triggerData);
+  const subData = subDataService.morphoBlueLeverageManagementOnPriceSubData.decode(subStruct.subData);
+
+  _position.strategyData.decoded.triggerData = triggerData;
+  _position.strategyData.decoded.subData = subData;
+  _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, Math.random());
+
+  const marketIdEncodedData = web3.eth.abi.encodeParameters(
+    ['address', 'address', 'address', 'address', 'uint256'],
+    [
+      subData.loanToken,
+      subData.collToken,
+      subData.oracle,
+      subData.irm,
+      subData.lltv,
+    ],
+  );
+
+  const marketId = web3.utils.keccak256(marketIdEncodedData);
+
+  _position.specific = {
+    subHash: _position.subHash,
+    marketId,
+    collAsset: subData.collToken,
+    debtAsset: subData.loanToken,
+    price: triggerData.price,
+    ratio: subData.targetRatio,
+  };
+
+  return _position;
+}
+
 function parseAaveV3LeverageManagementOnPrice(position: Position.Automated, parseData: ParseData): Position.Automated {
   const _position = cloneDeep(position);
 
@@ -806,6 +888,134 @@ function parseAaveV3LeverageManagementOnPrice(position: Position.Automated, pars
   return _position;
 }
 
+function parseLiquityV2CloseOnPrice(position: Position.Automated, parseData: ParseData): Position.Automated {
+  const _position = cloneDeep(position);
+
+  const { subStruct } = parseData.subscriptionEventData;
+
+  const triggerData = triggerService.closePriceTrigger.decode(subStruct.triggerData);
+  const subData = subDataService.liquityV2CloseSubData.decode(subStruct.subData);
+
+  _position.strategyData.decoded.triggerData = triggerData;
+  _position.strategyData.decoded.subData = subData;
+
+  _position.positionId = getPositionId(
+    _position.chainId, _position.protocol.id, _position.owner, subData.troveId, subData.market,
+  );
+
+  const { takeProfitType, stopLossType } = getStopLossAndTakeProfitTypeByCloseStrategyType(+subData.closeType);
+
+  // User can have:
+  // - Only TakeProfit
+  // - Only StopLoss
+  // - Both
+  // TODO: see on frontend what specific data we need here because stop-loss and take-profit is one bundle now
+  _position.strategy.strategyId = Strategies.Identifiers.CloseOnPrice;
+  _position.specific = {
+    market: subData.market,
+    troveId: subData.troveId,
+    stopLossPrice: triggerData.lowerPrice,
+    takeProfitPrice: triggerData.upperPrice,
+    closeToAssetAddr: triggerData.tokenAddr,
+    takeProfitType,
+    stopLossType,
+  };
+
+  return _position;
+}
+
+function parseLiquityV2LeverageManagementOnPrice(position: Position.Automated, parseData: ParseData): Position.Automated {
+  const _position = cloneDeep(position);
+
+  const { subStruct } = parseData.subscriptionEventData;
+
+  const triggerData = triggerService.liquityV2QuotePriceTrigger.decode(subStruct.triggerData);
+  const subData = subDataService.liquityV2LeverageManagementOnPriceSubData.decode(subStruct.subData);
+
+  _position.strategyData.decoded.triggerData = triggerData;
+  _position.strategyData.decoded.subData = subData;
+  _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, Math.random());
+
+  _position.specific = {
+    subHash: _position.subHash,
+    market: subData.market,
+    troveId: subData.troveId,
+    collAsset: subData.collToken,
+    debtAsset: subData.boldToken,
+    price: triggerData.price,
+    ratio: subData.targetRatio,
+    ratioState: triggerData.ratioState,
+  };
+
+  return _position;
+}
+
+function parseLiquityV2Payback(position: Position.Automated, parseData: ParseData): Position.Automated {
+  const _position = cloneDeep(position);
+
+  const { subStruct } = parseData.subscriptionEventData;
+  const triggerData = triggerService.liquityV2RatioTrigger.decode(subStruct.triggerData);
+  const subData = subDataService.liquityV2PaybackSubData.decode(subStruct.subData);
+
+  _position.strategyData.decoded.triggerData = triggerData;
+  _position.strategyData.decoded.subData = subData;
+  _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, triggerData.troveId, triggerData.market);
+  _position.strategy.strategyId = Strategies.Identifiers.Payback;
+
+  _position.specific = {
+    subHash: _position.subHash,
+    market: subData.market,
+    troveId: subData.troveId,
+    targetRatio: subData.targetRatio,
+    triggerRatio: triggerData.ratio,
+  };
+
+  return _position;
+}
+
+function parseFluidT1LeverageManagement(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.fluidLeverageManagementSubData.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,
+  );
+
+  const isRepay = _position.strategy.strategyId === Strategies.Identifiers.Repay;
+
+  if (isRepay) {
+    _position.specific = {
+      triggerRepayRatio: triggerData.ratio,
+      targetRepayRatio: subData.targetRatio,
+      repayEnabled: isEnabled,
+      subId1: Number(subId),
+      subHashRepay: subHash,
+      mergeWithId: Strategies.Identifiers.Boost,
+    };
+  } else {
+    _position.specific = {
+      triggerBoostRatio: triggerData.ratio,
+      targetBoostRatio: subData.targetRatio,
+      boostEnabled: isEnabled,
+      subId2: Number(subId),
+      subHashBoost: subHash,
+      mergeId: Strategies.Identifiers.Boost,
+    };
+  }
+
+  _position.strategy.strategyId = Strategies.IdOverrides.LeverageManagement;
+
+  return _position;
+}
+
 const parsingMethodsMapping: StrategiesToProtocolVersionMapping = {
   [ProtocolIdentifiers.StrategiesAutomation.MakerDAO]: {
     [Strategies.Identifiers.SavingsLiqProtection]: parseMakerSavingsLiqProtection,
@@ -826,6 +1036,14 @@ const parsingMethodsMapping: StrategiesToProtocolVersionMapping = {
     [Strategies.Identifiers.SavingsDsrSupply]: parseLiquitySavingsLiqProtection,
     [Strategies.Identifiers.DebtInFrontRepay]: parseLiquityDebtInFrontRepay,
   },
+  [ProtocolIdentifiers.StrategiesAutomation.LiquityV2]: {
+    [Strategies.Identifiers.Repay]: parseLiquityV2LeverageManagement,
+    [Strategies.Identifiers.Boost]: parseLiquityV2LeverageManagement,
+    [Strategies.Identifiers.CloseOnPrice]: parseLiquityV2CloseOnPrice,
+    [Strategies.Identifiers.BoostOnPrice]: parseLiquityV2LeverageManagementOnPrice,
+    [Strategies.Identifiers.RepayOnPrice]: parseLiquityV2LeverageManagementOnPrice,
+    [Strategies.Identifiers.Payback]: parseLiquityV2Payback,
+  },
   [ProtocolIdentifiers.StrategiesAutomation.AaveV2]: {
     [Strategies.Identifiers.Repay]: parseAaveV2LeverageManagement,
     [Strategies.Identifiers.Boost]: parseAaveV2LeverageManagement,
@@ -877,6 +1095,11 @@ const parsingMethodsMapping: StrategiesToProtocolVersionMapping = {
     [Strategies.Identifiers.Boost]: parseMorphoBlueLeverageManagement,
     [Strategies.Identifiers.EoaRepay]: parseMorphoBlueLeverageManagement,
     [Strategies.Identifiers.EoaBoost]: parseMorphoBlueLeverageManagement,
+    [Strategies.Identifiers.BoostOnPrice]: parseMorphoBlueLeverageManagementOnPrice,
+  },
+  [ProtocolIdentifiers.StrategiesAutomation.FluidT1]: {
+    [Strategies.Identifiers.Repay]: parseFluidT1LeverageManagement,
+    [Strategies.Identifiers.Boost]: parseFluidT1LeverageManagement,
   },
 };