@defisaver/automation-sdk 3.2.0 → 3.2.2

package/cjs/types/enums.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Bundles = exports.Strategies = exports.ProtocolIdentifiers = exports.BundleProtocols = exports.OrderType = exports.RatioState = exports.ChainId = void 0;
+exports.Bundles = exports.Strategies = exports.ProtocolIdentifiers = exports.CloseToAssetType = exports.CloseStrategyType = exports.DebtActionType = exports.CollActionType = exports.BundleProtocols = exports.OrderType = exports.RatioState = exports.ChainId = void 0;
 var ChainId;
 (function (ChainId) {
     ChainId[ChainId["Ethereum"] = 1] = "Ethereum";
@@ -24,6 +24,32 @@ var BundleProtocols;
     BundleProtocols["Yearn"] = "yearn";
     BundleProtocols["Rari"] = "rari";
 })(BundleProtocols = exports.BundleProtocols || (exports.BundleProtocols = {}));
+var CollActionType;
+(function (CollActionType) {
+    CollActionType[CollActionType["SUPPLY"] = 0] = "SUPPLY";
+    CollActionType[CollActionType["WITHDRAW"] = 1] = "WITHDRAW";
+})(CollActionType = exports.CollActionType || (exports.CollActionType = {}));
+var DebtActionType;
+(function (DebtActionType) {
+    DebtActionType[DebtActionType["PAYBACK"] = 0] = "PAYBACK";
+    DebtActionType[DebtActionType["BORROW"] = 1] = "BORROW";
+})(DebtActionType = exports.DebtActionType || (exports.DebtActionType = {}));
+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 = exports.CloseStrategyType || (exports.CloseStrategyType = {}));
+var CloseToAssetType;
+(function (CloseToAssetType) {
+    CloseToAssetType[CloseToAssetType["COLLATERAL"] = 0] = "COLLATERAL";
+    CloseToAssetType[CloseToAssetType["DEBT"] = 1] = "DEBT";
+})(CloseToAssetType = exports.CloseToAssetType || (exports.CloseToAssetType = {}));
 /**
  * @dev Follow the naming convention:
  *      - Enum name consists of two parts, name and version
@@ -37,6 +63,7 @@ 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";
@@ -47,6 +74,7 @@ var ProtocolIdentifiers;
         StrategiesAutomation["Spark"] = "Spark";
         StrategiesAutomation["CrvUSD"] = "CurveUSD";
         StrategiesAutomation["MorphoBlue"] = "MorphoBlue";
+        StrategiesAutomation["FluidT1"] = "FluidT1";
     })(StrategiesAutomation = ProtocolIdentifiers.StrategiesAutomation || (ProtocolIdentifiers.StrategiesAutomation = {}));
     let LegacyAutomation;
     (function (LegacyAutomation) {
@@ -73,6 +101,7 @@ 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) {
@@ -104,6 +133,7 @@ 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";
@@ -114,6 +144,7 @@ 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;
@@ -171,6 +202,14 @@ 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) {
@@ -193,6 +232,9 @@ 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) {
@@ -204,5 +246,7 @@ 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 = exports.Bundles || (exports.Bundles = {}));

package/cjs/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/esm/automation/private/StrategiesAutomation.js

@@ -121,7 +121,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) => (Object.assign(Object.assign({}, s), { subIds: [s.subId] })))];
         }
         return subscriptions;
@@ -145,10 +144,10 @@ export default class StrategiesAutomation extends Automation {
                 const replaceSubWithUpdate = (index) => __awaiter(this, void 0, void 0, function* () {
                     var _a;
                     const sub = strategiesSubs[index];
-                    let latestUpdate = subscriptionEvents[index].returnValues;
+                    let latestUpdate = Object.assign({}, subscriptionEvents[index].returnValues);
                     if (latestUpdate.subHash !== (sub === null || sub === void 0 ? void 0 : sub.strategySubHash)) {
                         const updates = yield this.getUpdateDataEventsFromSubStorage(Object.assign(Object.assign({}, addToObjectIf(!!_options, _options)), { filter: { subId: latestUpdate.subId } }));
-                        latestUpdate = Object.assign(Object.assign({}, latestUpdate), (_a = updates === null || updates === void 0 ? void 0 : updates[updates.length - 1]) === null || _a === void 0 ? void 0 : _a.returnValues);
+                        latestUpdate = Object.assign(Object.assign(Object.assign({}, latestUpdate), (_a = updates === null || updates === void 0 ? void 0 : updates[updates.length - 1]) === null || _a === void 0 ? void 0 : _a.returnValues), { 2: latestUpdate[2] });
                     }
                     subscriptions.push(this.getParsedSubscriptions({
                         chainId: this.chainId,
@@ -157,12 +156,12 @@ export default class StrategiesAutomation extends Automation {
                         strategiesSubsData: sub,
                     }));
                 });
-                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, 50);
+                }, 50);
                 yield pool.start();
                 if (options === null || options === void 0 ? void 0 : options.mergeSubs) {
                     subscriptions = this.mergeSubs(subscriptions);

package/esm/constants/index.js

@@ -90,6 +90,11 @@ export const MAINNET_STRATEGIES_INFO = {
         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 = {
     [Strategies.OptimismIds.EXCHANGE_DCA]: {
@@ -347,6 +352,46 @@ export const MAINNET_BUNDLES_INFO = {
         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 = {
     [Bundles.OptimismIds.AAVE_V3_REPAY]: {
@@ -431,6 +476,21 @@ export const BASE_BUNDLES_INFO = {
         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 = {
     [Bundles.ArbitrumIds.AAVE_V3_REPAY]: {
@@ -473,6 +533,16 @@ export const ARBITRUM_BUNDLES_INFO = {
         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 = {
     [ChainId.Ethereum]: MAINNET_BUNDLES_INFO,

package/esm/services/strategiesService.js

@@ -1,10 +1,12 @@
 import { getAssetInfoByAddress } from '@defisaver/tokens';
 import { cloneDeep } from 'lodash';
+import Web3 from 'web3';
 import { BUNDLES_INFO, STRATEGIES_INFO } from '../constants';
 import { ChainId, ProtocolIdentifiers, Strategies } from '../types/enums';
-import { getPositionId, getRatioStateInfoForAaveCloseStrategy, isRatioStateOver, wethToEthByAddress, } from './utils';
+import { 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',
 };
@@ -403,6 +405,39 @@ function parseLiquityLeverageManagement(position, parseData) {
     _position.strategy.strategyId = Strategies.IdOverrides.LeverageManagement;
     return _position;
 }
+function parseLiquityV2LeverageManagement(position, parseData) {
+    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, parseData) {
     const _position = cloneDeep(position);
     const { subStruct, subId } = parseData.subscriptionEventData;
@@ -564,6 +599,32 @@ function parseMorphoBlueLeverageManagement(position, parseData) {
     _position.strategy.strategyId = isEOA ? Strategies.IdOverrides.EoaLeverageManagement : Strategies.IdOverrides.LeverageManagement;
     return _position;
 }
+function parseMorphoBlueLeverageManagementOnPrice(position, parseData) {
+    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, parseData) {
     const _position = cloneDeep(position);
     const { subStruct } = parseData.subscriptionEventData;
@@ -585,6 +646,103 @@ function parseAaveV3LeverageManagementOnPrice(position, parseData) {
     };
     return _position;
 }
+function parseLiquityV2CloseOnPrice(position, parseData) {
+    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, parseData) {
+    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, parseData) {
+    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, 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.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 = {
     [ProtocolIdentifiers.StrategiesAutomation.MakerDAO]: {
         [Strategies.Identifiers.SavingsLiqProtection]: parseMakerSavingsLiqProtection,
@@ -605,6 +763,14 @@ const parsingMethodsMapping = {
         [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,
@@ -656,6 +822,11 @@ const parsingMethodsMapping = {
         [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,
     },
 };
 function getParsingMethod(id, strategy) {

package/esm/services/strategySubService.d.ts

@@ -1,5 +1,5 @@
 import type { OrderType } from '../types/enums';
-import { Bundles, ChainId, RatioState, Strategies } from '../types/enums';
+import { CloseToAssetType, Bundles, ChainId, RatioState, Strategies } from '../types/enums';
 import type { EthereumAddress, StrategyOrBundleIds } from '../types';
 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)[];
@@ -97,4 +97,14 @@ export declare const crvUSDEncode: {
 };
 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): (boolean | string[] | Bundles.MainnetIds)[] | (boolean | string[] | Bundles.BaseIds)[];
+    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[])[];
+};
+export declare const liquityV2Encode: {
+    leverageManagement(market: EthereumAddress, troveId: string, collToken: EthereumAddress, boldToken: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number, strategyOrBundleId: number): (number | boolean | string[])[];
+    closeOnPrice(strategyOrBundleId: number, market: EthereumAddress, troveId: string, collToken: EthereumAddress, boldToken: EthereumAddress, stopLossPrice?: number, stopLossType?: CloseToAssetType, takeProfitPrice?: number, takeProfitType?: CloseToAssetType): (number | boolean | string[])[];
+    leverageManagementOnPrice(strategyOrBundleId: number, market: EthereumAddress, price: number, state: RatioState, troveId: string, collToken: EthereumAddress, boldToken: EthereumAddress, targetRatio: number, isRepayOnPrice: boolean): (number | boolean | string[])[];
+    payback(market: EthereumAddress, troveId: string, boldToken: EthereumAddress, targetRatio: number, ratioState: RatioState, triggerRatio: number): (boolean | string[] | Strategies.MainnetIds)[];
+};
+export declare const fluidEncode: {
+    leverageManagement(nftId: string, vault: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number, strategyOrBundleId: number): (number | boolean | string[])[];
 };

package/esm/services/strategySubService.js

@@ -1,10 +1,10 @@
 import Dec from 'decimal.js';
 import { getAssetInfo } from '@defisaver/tokens';
-import { Bundles, ChainId, RatioState, Strategies, } from '../types/enums';
+import { CloseToAssetType, Bundles, ChainId, RatioState, Strategies, } from '../types/enums';
 import { STRATEGY_IDS } from '../constants';
 import * as subDataService from './subDataService';
 import * as triggerService from './triggerService';
-import { compareAddresses, requireAddress, requireAddresses } from './utils';
+import { compareAddresses, getCloseStrategyType, requireAddress, requireAddresses, } from './utils';
 export const makerEncode = {
     repayFromSavings(bundleId, vaultId, triggerRepayRatio, targetRepayRatio, isBundle = true, chainId = ChainId.Ethereum, daiAddr, mcdCdpManagerAddr) {
         const subData = subDataService.makerRepayFromSavingsSubData.encode(vaultId, targetRepayRatio, chainId, daiAddr, mcdCdpManagerAddr);
@@ -235,4 +235,45 @@ export const morphoBlueEncode = {
         const isBundle = true;
         return [strategyOrBundleId, isBundle, triggerData, subData];
     },
+    leverageManagementOnPrice(strategyOrBundleId, isBundle = true, loanToken, collToken, oracle, irm, lltv, user, targetRatio, price, priceState) {
+        const subData = subDataService.morphoBlueLeverageManagementOnPriceSubData.encode(loanToken, collToken, oracle, irm, lltv, targetRatio, user);
+        const triggerData = triggerService.morphoBluePriceTrigger.encode(oracle, collToken, loanToken, price, priceState);
+        return [strategyOrBundleId, isBundle, triggerData, subData];
+    },
+};
+export const liquityV2Encode = {
+    leverageManagement(market, troveId, collToken, boldToken, ratioState, targetRatio, triggerRatio, strategyOrBundleId) {
+        const isBundle = true;
+        const subData = subDataService.liquityV2LeverageManagementSubData.encode(market, troveId, collToken, boldToken, ratioState, targetRatio);
+        const triggerData = triggerService.liquityV2RatioTrigger.encode(market, troveId, triggerRatio, ratioState);
+        return [strategyOrBundleId, isBundle, triggerData, subData];
+    },
+    closeOnPrice(strategyOrBundleId, market, troveId, collToken, boldToken, stopLossPrice = 0, stopLossType = CloseToAssetType.DEBT, takeProfitPrice = 0, takeProfitType = CloseToAssetType.COLLATERAL) {
+        const isBundle = true;
+        const closeType = getCloseStrategyType(stopLossPrice, stopLossType, takeProfitPrice, takeProfitType);
+        const subData = subDataService.liquityV2CloseSubData.encode(market, troveId, collToken, boldToken, closeType);
+        const triggerData = triggerService.closePriceTrigger.encode(collToken, stopLossPrice, takeProfitPrice);
+        return [strategyOrBundleId, isBundle, triggerData, subData];
+    },
+    leverageManagementOnPrice(strategyOrBundleId, market, price, state, troveId, collToken, boldToken, targetRatio, isRepayOnPrice) {
+        const subDataEncoded = subDataService.liquityV2LeverageManagementOnPriceSubData.encode(market, troveId, collToken, boldToken, targetRatio, isRepayOnPrice);
+        const triggerDataEncoded = triggerService.liquityV2QuotePriceTrigger.encode(market, price, state);
+        const isBundle = true;
+        return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
+    },
+    payback(market, troveId, boldToken, targetRatio, ratioState, triggerRatio) {
+        const strategyId = Strategies.MainnetIds.LIQUITY_V2_PAYBACK;
+        const isBundle = false;
+        const subData = subDataService.liquityV2PaybackSubData.encode(market, troveId, boldToken, targetRatio, ratioState);
+        const triggerData = triggerService.liquityV2RatioTrigger.encode(market, troveId, triggerRatio, ratioState);
+        return [strategyId, isBundle, triggerData, subData];
+    },
+};
+export const fluidEncode = {
+    leverageManagement(nftId, vault, ratioState, targetRatio, triggerRatio, strategyOrBundleId) {
+        const isBundle = true;
+        const subData = subDataService.fluidLeverageManagementSubData.encode(nftId, vault, ratioState, targetRatio);
+        const triggerData = triggerService.fluidRatioTrigger.encode(nftId, triggerRatio, ratioState);
+        return [strategyOrBundleId, isBundle, triggerData, subData];
+    },
 };