@defisaver/automation-sdk 3.1.1-dev → 3.1.1-dev-2

package/cjs/constants/index.js

@@ -373,6 +373,11 @@ exports.MAINNET_BUNDLES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.Boost,
         protocol: exports.PROTOCOLS.LiquityV2,
     },
+    [enums_1.Bundles.MainnetIds.LIQUITY_V2_CLOSE]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.LIQUITY_V2_CLOSE,
+        strategyId: enums_1.Strategies.Identifiers.CloseOnPrice,
+        protocol: exports.PROTOCOLS.LiquityV2,
+    },
 };
 exports.OPTIMISM_BUNDLES_INFO = {
     [enums_1.Bundles.OptimismIds.AAVE_V3_REPAY]: {

package/cjs/services/strategiesService.js

@@ -431,7 +431,7 @@ function parseLiquityLeverageManagement(position, parseData) {
 }
 function parseLiquityV2LeverageManagement(position, parseData) {
     const _position = (0, lodash_1.cloneDeep)(position);
-    const { subStruct, subId } = parseData.subscriptionEventData;
+    const { subStruct, subId, subHash } = parseData.subscriptionEventData;
     const { isEnabled } = parseData.strategiesSubsData;
     const triggerData = triggerService.liquityV2RatioTrigger.decode(subStruct.triggerData);
     const subData = subDataService.liquityV2LeverageManagementSubData.decode(subStruct.subData);
@@ -443,8 +443,9 @@ function parseLiquityV2LeverageManagement(position, parseData) {
         _position.specific = {
             triggerRepayRatio: triggerData.ratio,
             targetRepayRatio: subData.targetRatio,
-            repayEnabled: true,
+            repayEnabled: isEnabled,
             subId1: Number(subId),
+            subHashRepay: subHash,
             mergeWithId: enums_1.Strategies.Identifiers.Boost,
         };
     }
@@ -454,6 +455,7 @@ function parseLiquityV2LeverageManagement(position, parseData) {
             targetBoostRatio: subData.targetRatio,
             boostEnabled: isEnabled,
             subId2: Number(subId),
+            subHashBoost: subHash,
             mergeId: enums_1.Strategies.Identifiers.Boost,
         };
     }
@@ -642,6 +644,23 @@ function parseAaveV3OpenOrderFromCollateral(position, parseData) {
     };
     return _position;
 }
+function parseLiquityV2CloseOnPrice(position, parseData) {
+    const _position = (0, lodash_1.cloneDeep)(position);
+    const { subStruct } = parseData.subscriptionEventData;
+    const triggerData = triggerService.shouldClosePriceTrigger.decode(subStruct.triggerData);
+    const subData = subDataService.liquityV2CloseSubData.decode(subStruct.subData);
+    _position.strategyData.decoded.triggerData = triggerData;
+    _position.strategyData.decoded.subData = subData;
+    _position.positionId = (0, utils_1.getPositionId)(_position.chainId, _position.protocol.id, _position.owner, subData.troveId, subData.market);
+    // 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 = enums_1.Strategies.Identifiers.CloseOnPrice;
+    _position.specific = {};
+    return _position;
+}
 const parsingMethodsMapping = {
     [enums_1.ProtocolIdentifiers.StrategiesAutomation.MakerDAO]: {
         [enums_1.Strategies.Identifiers.SavingsLiqProtection]: parseMakerSavingsLiqProtection,
@@ -665,6 +684,7 @@ const parsingMethodsMapping = {
     [enums_1.ProtocolIdentifiers.StrategiesAutomation.LiquityV2]: {
         [enums_1.Strategies.Identifiers.Repay]: parseLiquityV2LeverageManagement,
         [enums_1.Strategies.Identifiers.Boost]: parseLiquityV2LeverageManagement,
+        [enums_1.Strategies.Identifiers.CloseOnPrice]: parseLiquityV2CloseOnPrice,
     },
     [enums_1.ProtocolIdentifiers.StrategiesAutomation.AaveV2]: {
         [enums_1.Strategies.Identifiers.Repay]: parseAaveV2LeverageManagement,

package/cjs/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)[];
@@ -100,4 +100,5 @@ export declare const morphoBlueEncode: {
 };
 export declare const liquityV2Encode: {
     leverageManagement(market: EthereumAddress, troveId: string, 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[])[];
 };

package/cjs/services/strategySubService.js

@@ -274,4 +274,13 @@ exports.liquityV2Encode = {
         //   : Bundles.MainnetIds.LIQUITY_V2_REPAY;
         return [strategyOrBundleId, isBundle, triggerData, subData];
     },
+    closeOnPrice(strategyOrBundleId, market, troveId, collToken, boldToken, stopLossPrice = 0, stopLossType = enums_1.CloseToAssetType.DEBT, takeProfitPrice = 0, takeProfitType = enums_1.CloseToAssetType.COLLATERAL) {
+        const isBundle = true;
+        const closeType = (0, utils_1.getCloseStrategyType)(stopLossPrice, stopLossType, takeProfitPrice, takeProfitType);
+        const subData = subDataService.liquityV2CloseSubData.encode(market, troveId, collToken, boldToken, closeType);
+        const triggerData = triggerService.shouldClosePriceTrigger.encode(collToken, stopLossPrice, takeProfitPrice);
+        // TODO: we can hardcode bundleID after testing
+        // Bundles.MainnetIds.LIQUITY_V2_CLOSE;
+        return [strategyOrBundleId, isBundle, triggerData, subData];
+    },
 };

package/cjs/services/subDataService.d.ts

@@ -1,5 +1,5 @@
 import type { EthereumAddress } from '../types';
-import type { OrderType } from '../types/enums';
+import type { CloseStrategyType, OrderType } from '../types/enums';
 import { ChainId, RatioState } from '../types/enums';
 export declare const makerRepayFromSavingsSubData: {
     encode(vaultId: number, targetRatioPercentage: number, chainId: ChainId, daiAddr?: EthereumAddress, mcdCdpManagerAddr?: EthereumAddress): string[];
@@ -199,3 +199,13 @@ export declare const liquityV2LeverageManagementSubData: {
         targetRatio: number;
     };
 };
+export declare const liquityV2CloseSubData: {
+    encode(market: EthereumAddress, troveId: string, collToken: EthereumAddress, boldToken: EthereumAddress, closeType: CloseStrategyType): string[];
+    decode(subData: string[]): {
+        market: EthereumAddress;
+        troveId: string;
+        collToken: EthereumAddress;
+        boldToken: EthereumAddress;
+        closeType: CloseStrategyType;
+    };
+};

package/cjs/services/subDataService.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.liquityV2LeverageManagementSubData = exports.aaveV3OpenOrderSubData = exports.morphoBlueLeverageManagementSubData = exports.crvUSDPaybackSubData = exports.crvUSDLeverageManagementSubData = exports.liquityDebtInFrontRepaySubData = exports.liquityDsrSupplySubData = exports.liquityDsrPaybackSubData = exports.sparkQuotePriceSubData = exports.sparkLeverageManagementSubData = exports.exchangeLimitOrderSubData = exports.exchangeDcaSubData = exports.liquityPaybackUsingChickenBondSubData = exports.cBondsRebondSubData = exports.morphoAaveV2LeverageManagementSubData = exports.compoundV3L2LeverageManagementSubData = exports.compoundV3LeverageManagementSubData = exports.compoundV2LeverageManagementSubData = exports.aaveV3QuotePriceSubData = exports.aaveV3LeverageManagementSubData = exports.aaveV2LeverageManagementSubData = exports.liquityCloseSubData = exports.liquityLeverageManagementSubData = exports.makerLeverageManagementSubData = exports.makerCloseSubData = exports.liquityRepayFromSavingsSubData = exports.makerRepayFromSavingsSubData = void 0;
+exports.liquityV2CloseSubData = exports.liquityV2LeverageManagementSubData = exports.aaveV3OpenOrderSubData = exports.morphoBlueLeverageManagementSubData = exports.crvUSDPaybackSubData = exports.crvUSDLeverageManagementSubData = exports.liquityDebtInFrontRepaySubData = exports.liquityDsrSupplySubData = exports.liquityDsrPaybackSubData = exports.sparkQuotePriceSubData = exports.sparkLeverageManagementSubData = exports.exchangeLimitOrderSubData = exports.exchangeDcaSubData = exports.liquityPaybackUsingChickenBondSubData = exports.cBondsRebondSubData = exports.morphoAaveV2LeverageManagementSubData = exports.compoundV3L2LeverageManagementSubData = exports.compoundV3LeverageManagementSubData = exports.compoundV2LeverageManagementSubData = exports.aaveV3QuotePriceSubData = exports.aaveV3LeverageManagementSubData = exports.aaveV2LeverageManagementSubData = exports.liquityCloseSubData = exports.liquityLeverageManagementSubData = exports.makerLeverageManagementSubData = exports.makerCloseSubData = exports.liquityRepayFromSavingsSubData = exports.makerRepayFromSavingsSubData = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const web3_eth_abi_1 = __importDefault(require("web3-eth-abi"));
 const web3_utils_1 = require("web3-utils");
@@ -497,3 +497,33 @@ exports.liquityV2LeverageManagementSubData = {
         };
     },
 };
+exports.liquityV2CloseSubData = {
+    encode(market, troveId, collToken, boldToken, closeType) {
+        const marketEncoded = web3_eth_abi_1.default.encodeParameter('address', market);
+        const troveIdEncoded = web3_eth_abi_1.default.encodeParameter('uint256', troveId);
+        const collAddrEncoded = web3_eth_abi_1.default.encodeParameter('address', collToken);
+        const boldTokenEncoded = web3_eth_abi_1.default.encodeParameter('address', boldToken);
+        const wethAddress = (0, tokens_1.getAssetInfo)('WETH').address;
+        const wethAddressEncoded = web3_eth_abi_1.default.encodeParameter('address', wethAddress);
+        const closeTypeEncoded = web3_eth_abi_1.default.encodeParameter('uint8', closeType);
+        return [
+            marketEncoded,
+            troveIdEncoded,
+            collAddrEncoded,
+            boldTokenEncoded,
+            wethAddressEncoded,
+            closeTypeEncoded,
+        ];
+    },
+    decode(subData) {
+        const market = web3_eth_abi_1.default.decodeParameter('address', subData[0]);
+        const troveId = web3_eth_abi_1.default.decodeParameter('uint256', subData[1]);
+        const collToken = web3_eth_abi_1.default.decodeParameter('address', subData[2]);
+        const boldToken = web3_eth_abi_1.default.decodeParameter('address', subData[3]);
+        // skip wethAddress
+        const closeType = web3_eth_abi_1.default.decodeParameter('uint8', subData[5]);
+        return {
+            market, troveId, collToken, boldToken, closeType,
+        };
+    },
+};

package/cjs/services/triggerService.d.ts

@@ -198,3 +198,11 @@ export declare const liquityV2RatioTrigger: {
         ratioState: number;
     };
 };
+export declare const shouldClosePriceTrigger: {
+    encode(tokenAddr: EthereumAddress, lowerPrice: number, upperPrice: number): string[];
+    decode(triggerData: string[]): {
+        tokenAddr: EthereumAddress;
+        lowerPrice: string;
+        upperPrice: string;
+    };
+};

package/cjs/services/triggerService.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.liquityV2RatioTrigger = exports.morphoBlueRatioTrigger = exports.crvUsdHealthRatioTrigger = exports.crvUSDRatioTrigger = exports.curveUsdSoftLiquidationTrigger = exports.curveUsdBorrowRateTrigger = exports.sparkQuotePriceTrigger = exports.sparkRatioTrigger = exports.exchangeOffchainPriceTrigger = exports.exchangeTimestampTrigger = exports.compoundV3RatioTrigger = exports.cBondsRebondTrigger = exports.aaveV2RatioTrigger = exports.liquityDebtInFrontWithLimitTrigger = exports.liquityDebtInFrontTrigger = exports.liquityRatioTrigger = exports.compoundV2RatioTrigger = exports.aaveV3QuotePriceWithMaximumGasPriceTrigger = exports.aaveV3QuotePriceTrigger = exports.morphoAaveV2RatioTrigger = exports.aaveV3RatioTrigger = exports.makerRatioTrigger = exports.trailingStopTrigger = exports.chainlinkPriceTrigger = void 0;
+exports.shouldClosePriceTrigger = exports.liquityV2RatioTrigger = exports.morphoBlueRatioTrigger = exports.crvUsdHealthRatioTrigger = exports.crvUSDRatioTrigger = exports.curveUsdSoftLiquidationTrigger = exports.curveUsdBorrowRateTrigger = exports.sparkQuotePriceTrigger = exports.sparkRatioTrigger = exports.exchangeOffchainPriceTrigger = exports.exchangeTimestampTrigger = exports.compoundV3RatioTrigger = exports.cBondsRebondTrigger = exports.aaveV2RatioTrigger = exports.liquityDebtInFrontWithLimitTrigger = exports.liquityDebtInFrontTrigger = exports.liquityRatioTrigger = exports.compoundV2RatioTrigger = exports.aaveV3QuotePriceWithMaximumGasPriceTrigger = exports.aaveV3QuotePriceTrigger = exports.morphoAaveV2RatioTrigger = exports.aaveV3RatioTrigger = exports.makerRatioTrigger = exports.trailingStopTrigger = exports.chainlinkPriceTrigger = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
 const web3_eth_abi_1 = __importDefault(require("web3-eth-abi"));
@@ -380,3 +380,20 @@ exports.liquityV2RatioTrigger = {
         };
     },
 };
+exports.shouldClosePriceTrigger = {
+    encode(tokenAddr, lowerPrice, upperPrice) {
+        const lowerPriceFormatted = new decimal_js_1.default(lowerPrice).mul(1e8).floor().toString();
+        const upperPriceFormatted = new decimal_js_1.default(upperPrice).mul(1e8).floor().toString();
+        return [
+            web3_eth_abi_1.default.encodeParameters(['address', 'uint256', 'uint256'], [tokenAddr, lowerPriceFormatted, upperPriceFormatted]),
+        ];
+    },
+    decode(triggerData) {
+        const decodedData = web3_eth_abi_1.default.decodeParameters(['address', 'uint256', 'uint256'], triggerData[0]);
+        return {
+            tokenAddr: decodedData[0],
+            lowerPrice: new decimal_js_1.default(decodedData[1]).div(1e8).toString(),
+            upperPrice: new decimal_js_1.default(decodedData[2]).div(1e8).toString(),
+        };
+    },
+};

package/cjs/services/utils.d.ts

@@ -1,5 +1,5 @@
 import type { EthereumAddress } from '../types';
-import { ChainId, RatioState } from '../types/enums';
+import { ChainId, CloseStrategyType, CloseToAssetType, RatioState } from '../types/enums';
 export declare function isDefined<T>(value: T): value is NonNullable<T>;
 export declare function isUndefined(value: unknown): boolean;
 export declare function compareAddresses(firstAddress: EthereumAddress, secondAddress: EthereumAddress): boolean;
@@ -23,3 +23,4 @@ export declare function getRatioStateInfoForAaveCloseStrategy(currentRatioState:
     ratioState: RatioState;
 };
 export declare function getPositionId(...args: (number | string)[]): string;
+export declare function getCloseStrategyType(stopLossPrice: number, stopLossType: CloseToAssetType, takeProfitPrice: number, takeProfitType: CloseToAssetType): CloseStrategyType;

package/cjs/services/utils.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPositionId = exports.getRatioStateInfoForAaveCloseStrategy = exports.requireAddresses = exports.requireAddress = exports.isEmptyBytes = exports.isRatioStateUnder = exports.isRatioStateOver = exports.weiToRatioPercentage = exports.ratioPercentageToWei = exports.encodeSubId = exports.compareSubHashes = exports.wethToEthByAddress = exports.wethToEth = exports.ethToWeth = exports.addToObjectIf = exports.addToArrayIf = exports.isAddress = exports.compareAddresses = exports.isUndefined = exports.isDefined = void 0;
+exports.getCloseStrategyType = exports.getPositionId = exports.getRatioStateInfoForAaveCloseStrategy = exports.requireAddresses = exports.requireAddress = exports.isEmptyBytes = exports.isRatioStateUnder = exports.isRatioStateOver = exports.weiToRatioPercentage = exports.ratioPercentageToWei = exports.encodeSubId = exports.compareSubHashes = exports.wethToEthByAddress = exports.wethToEth = exports.ethToWeth = exports.addToObjectIf = exports.addToArrayIf = exports.isAddress = exports.compareAddresses = exports.isUndefined = exports.isDefined = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const web3Utils = __importStar(require("web3-utils"));
 const web3_eth_abi_1 = __importDefault(require("web3-eth-abi"));
@@ -129,3 +129,31 @@ function getPositionId(...args) {
     return args.map(arg => arg.toString().toLowerCase().split(' ').join('_')).join('-');
 }
 exports.getPositionId = getPositionId;
+function getCloseStrategyType(stopLossPrice, stopLossType, takeProfitPrice, takeProfitType) {
+    const isStopLoss = stopLossPrice > 0;
+    const isTakeProfit = takeProfitPrice > 0;
+    if (!isStopLoss && !isTakeProfit) {
+        throw new Error('CloseOnPrice: At least one price must be defined');
+    }
+    if (isStopLoss && isTakeProfit) {
+        if (stopLossType === enums_1.CloseToAssetType.COLLATERAL && takeProfitType === enums_1.CloseToAssetType.COLLATERAL) {
+            return enums_1.CloseStrategyType.TAKE_PROFIT_AND_STOP_LOSS_IN_COLLATERAL;
+        }
+        if (stopLossType === enums_1.CloseToAssetType.COLLATERAL) {
+            return enums_1.CloseStrategyType.TAKE_PROFIT_IN_DEBT_AND_STOP_LOSS_IN_COLLATERAL;
+        }
+        if (takeProfitType === enums_1.CloseToAssetType.COLLATERAL) {
+            return enums_1.CloseStrategyType.TAKE_PROFIT_IN_COLLATERAL_AND_STOP_LOSS_IN_DEBT;
+        }
+        return enums_1.CloseStrategyType.TAKE_PROFIT_AND_STOP_LOSS_IN_DEBT;
+    }
+    if (isStopLoss) {
+        return stopLossType === enums_1.CloseToAssetType.COLLATERAL
+            ? enums_1.CloseStrategyType.STOP_LOSS_IN_COLLATERAL
+            : enums_1.CloseStrategyType.STOP_LOSS_IN_DEBT;
+    }
+    return takeProfitType === enums_1.CloseToAssetType.COLLATERAL
+        ? enums_1.CloseStrategyType.TAKE_PROFIT_IN_COLLATERAL
+        : enums_1.CloseStrategyType.TAKE_PROFIT_IN_DEBT;
+}
+exports.getCloseStrategyType = getCloseStrategyType;

package/cjs/types/enums.d.ts

@@ -25,6 +25,20 @@ export declare enum DebtActionType {
     PAYBACK = 0,
     BORROW = 1
 }
+export declare enum CloseStrategyType {
+    TAKE_PROFIT_IN_COLLATERAL = 0,
+    STOP_LOSS_IN_COLLATERAL = 1,
+    TAKE_PROFIT_IN_DEBT = 2,
+    STOP_LOSS_IN_DEBT = 3,
+    TAKE_PROFIT_AND_STOP_LOSS_IN_COLLATERAL = 4,
+    TAKE_PROFIT_IN_COLLATERAL_AND_STOP_LOSS_IN_DEBT = 5,
+    TAKE_PROFIT_AND_STOP_LOSS_IN_DEBT = 6,
+    TAKE_PROFIT_IN_DEBT_AND_STOP_LOSS_IN_COLLATERAL = 7
+}
+export declare enum CloseToAssetType {
+    COLLATERAL = 0,
+    DEBT = 1
+}
 /**
  * @dev Follow the naming convention:
  *      - Enum name consists of two parts, name and version
@@ -100,6 +114,7 @@ export declare namespace Strategies {
         CloseToCollateralWithGasPrice = "close-to-collateral-with-gas-price",
         CloseOnPriceToDebt = "close-on-price-to-debt",
         CloseOnPriceToColl = "close-on-price-to-collateral",
+        CloseOnPrice = "close-on-price",
         TrailingStopToColl = "trailing-stop-to-collateral",
         TrailingStopToDebt = "trailing-stop-to-debt",
         Rebond = "rebond",
@@ -163,7 +178,8 @@ export declare namespace Bundles {
         MORPHO_BLUE_EOA_BOOST = 35,
         AAVE_V3_OPEN_ORDER_FROM_COLLATERAL = 36,
         LIQUITY_V2_REPAY = 37,
-        LIQUITY_V2_BOOST = 38
+        LIQUITY_V2_BOOST = 38,
+        LIQUITY_V2_CLOSE = 39
     }
     enum OptimismIds {
         AAVE_V3_REPAY = 0,

package/cjs/types/enums.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Bundles = exports.Strategies = exports.ProtocolIdentifiers = exports.DebtActionType = exports.CollActionType = 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";
@@ -34,6 +34,22 @@ var 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
@@ -118,6 +134,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";
@@ -185,6 +202,7 @@ var Bundles;
         MainnetIds[MainnetIds["AAVE_V3_OPEN_ORDER_FROM_COLLATERAL"] = 36] = "AAVE_V3_OPEN_ORDER_FROM_COLLATERAL";
         MainnetIds[MainnetIds["LIQUITY_V2_REPAY"] = 37] = "LIQUITY_V2_REPAY";
         MainnetIds[MainnetIds["LIQUITY_V2_BOOST"] = 38] = "LIQUITY_V2_BOOST";
+        MainnetIds[MainnetIds["LIQUITY_V2_CLOSE"] = 39] = "LIQUITY_V2_CLOSE";
     })(MainnetIds = Bundles.MainnetIds || (Bundles.MainnetIds = {}));
     let OptimismIds;
     (function (OptimismIds) {

package/esm/constants/index.js

@@ -367,6 +367,11 @@ export const MAINNET_BUNDLES_INFO = {
         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,
+    },
 };
 export const OPTIMISM_BUNDLES_INFO = {
     [Bundles.OptimismIds.AAVE_V3_REPAY]: {

package/esm/services/strategiesService.js

@@ -405,7 +405,7 @@ function parseLiquityLeverageManagement(position, parseData) {
 }
 function parseLiquityV2LeverageManagement(position, parseData) {
     const _position = cloneDeep(position);
-    const { subStruct, subId } = parseData.subscriptionEventData;
+    const { subStruct, subId, subHash } = parseData.subscriptionEventData;
     const { isEnabled } = parseData.strategiesSubsData;
     const triggerData = triggerService.liquityV2RatioTrigger.decode(subStruct.triggerData);
     const subData = subDataService.liquityV2LeverageManagementSubData.decode(subStruct.subData);
@@ -417,8 +417,9 @@ function parseLiquityV2LeverageManagement(position, parseData) {
         _position.specific = {
             triggerRepayRatio: triggerData.ratio,
             targetRepayRatio: subData.targetRatio,
-            repayEnabled: true,
+            repayEnabled: isEnabled,
             subId1: Number(subId),
+            subHashRepay: subHash,
             mergeWithId: Strategies.Identifiers.Boost,
         };
     }
@@ -428,6 +429,7 @@ function parseLiquityV2LeverageManagement(position, parseData) {
             targetBoostRatio: subData.targetRatio,
             boostEnabled: isEnabled,
             subId2: Number(subId),
+            subHashBoost: subHash,
             mergeId: Strategies.Identifiers.Boost,
         };
     }
@@ -616,6 +618,23 @@ function parseAaveV3OpenOrderFromCollateral(position, parseData) {
     };
     return _position;
 }
+function parseLiquityV2CloseOnPrice(position, parseData) {
+    const _position = cloneDeep(position);
+    const { subStruct } = parseData.subscriptionEventData;
+    const triggerData = triggerService.shouldClosePriceTrigger.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);
+    // 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 = {};
+    return _position;
+}
 const parsingMethodsMapping = {
     [ProtocolIdentifiers.StrategiesAutomation.MakerDAO]: {
         [Strategies.Identifiers.SavingsLiqProtection]: parseMakerSavingsLiqProtection,
@@ -639,6 +658,7 @@ const parsingMethodsMapping = {
     [ProtocolIdentifiers.StrategiesAutomation.LiquityV2]: {
         [Strategies.Identifiers.Repay]: parseLiquityV2LeverageManagement,
         [Strategies.Identifiers.Boost]: parseLiquityV2LeverageManagement,
+        [Strategies.Identifiers.CloseOnPrice]: parseLiquityV2CloseOnPrice,
     },
     [ProtocolIdentifiers.StrategiesAutomation.AaveV2]: {
         [Strategies.Identifiers.Repay]: parseAaveV2LeverageManagement,

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)[];
@@ -100,4 +100,5 @@ export declare const morphoBlueEncode: {
 };
 export declare const liquityV2Encode: {
     leverageManagement(market: EthereumAddress, troveId: string, 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[])[];
 };

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);
@@ -245,4 +245,13 @@ export const liquityV2Encode = {
         //   : Bundles.MainnetIds.LIQUITY_V2_REPAY;
         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.shouldClosePriceTrigger.encode(collToken, stopLossPrice, takeProfitPrice);
+        // TODO: we can hardcode bundleID after testing
+        // Bundles.MainnetIds.LIQUITY_V2_CLOSE;
+        return [strategyOrBundleId, isBundle, triggerData, subData];
+    },
 };

package/esm/services/subDataService.d.ts

@@ -1,5 +1,5 @@
 import type { EthereumAddress } from '../types';
-import type { OrderType } from '../types/enums';
+import type { CloseStrategyType, OrderType } from '../types/enums';
 import { ChainId, RatioState } from '../types/enums';
 export declare const makerRepayFromSavingsSubData: {
     encode(vaultId: number, targetRatioPercentage: number, chainId: ChainId, daiAddr?: EthereumAddress, mcdCdpManagerAddr?: EthereumAddress): string[];
@@ -199,3 +199,13 @@ export declare const liquityV2LeverageManagementSubData: {
         targetRatio: number;
     };
 };
+export declare const liquityV2CloseSubData: {
+    encode(market: EthereumAddress, troveId: string, collToken: EthereumAddress, boldToken: EthereumAddress, closeType: CloseStrategyType): string[];
+    decode(subData: string[]): {
+        market: EthereumAddress;
+        troveId: string;
+        collToken: EthereumAddress;
+        boldToken: EthereumAddress;
+        closeType: CloseStrategyType;
+    };
+};

package/esm/services/subDataService.js

@@ -491,3 +491,33 @@ export const liquityV2LeverageManagementSubData = {
         };
     },
 };
+export const liquityV2CloseSubData = {
+    encode(market, troveId, collToken, boldToken, closeType) {
+        const marketEncoded = AbiCoder.encodeParameter('address', market);
+        const troveIdEncoded = AbiCoder.encodeParameter('uint256', troveId);
+        const collAddrEncoded = AbiCoder.encodeParameter('address', collToken);
+        const boldTokenEncoded = AbiCoder.encodeParameter('address', boldToken);
+        const wethAddress = getAssetInfo('WETH').address;
+        const wethAddressEncoded = AbiCoder.encodeParameter('address', wethAddress);
+        const closeTypeEncoded = AbiCoder.encodeParameter('uint8', closeType);
+        return [
+            marketEncoded,
+            troveIdEncoded,
+            collAddrEncoded,
+            boldTokenEncoded,
+            wethAddressEncoded,
+            closeTypeEncoded,
+        ];
+    },
+    decode(subData) {
+        const market = AbiCoder.decodeParameter('address', subData[0]);
+        const troveId = AbiCoder.decodeParameter('uint256', subData[1]);
+        const collToken = AbiCoder.decodeParameter('address', subData[2]);
+        const boldToken = AbiCoder.decodeParameter('address', subData[3]);
+        // skip wethAddress
+        const closeType = AbiCoder.decodeParameter('uint8', subData[5]);
+        return {
+            market, troveId, collToken, boldToken, closeType,
+        };
+    },
+};

package/esm/services/triggerService.d.ts

@@ -198,3 +198,11 @@ export declare const liquityV2RatioTrigger: {
         ratioState: number;
     };
 };
+export declare const shouldClosePriceTrigger: {
+    encode(tokenAddr: EthereumAddress, lowerPrice: number, upperPrice: number): string[];
+    decode(triggerData: string[]): {
+        tokenAddr: EthereumAddress;
+        lowerPrice: string;
+        upperPrice: string;
+    };
+};

package/esm/services/triggerService.js

@@ -351,3 +351,20 @@ export const liquityV2RatioTrigger = {
         };
     },
 };
+export const shouldClosePriceTrigger = {
+    encode(tokenAddr, lowerPrice, upperPrice) {
+        const lowerPriceFormatted = new Dec(lowerPrice).mul(1e8).floor().toString();
+        const upperPriceFormatted = new Dec(upperPrice).mul(1e8).floor().toString();
+        return [
+            AbiCoder.encodeParameters(['address', 'uint256', 'uint256'], [tokenAddr, lowerPriceFormatted, upperPriceFormatted]),
+        ];
+    },
+    decode(triggerData) {
+        const decodedData = AbiCoder.decodeParameters(['address', 'uint256', 'uint256'], triggerData[0]);
+        return {
+            tokenAddr: decodedData[0],
+            lowerPrice: new Dec(decodedData[1]).div(1e8).toString(),
+            upperPrice: new Dec(decodedData[2]).div(1e8).toString(),
+        };
+    },
+};

package/esm/services/utils.d.ts

@@ -1,5 +1,5 @@
 import type { EthereumAddress } from '../types';
-import { ChainId, RatioState } from '../types/enums';
+import { ChainId, CloseStrategyType, CloseToAssetType, RatioState } from '../types/enums';
 export declare function isDefined<T>(value: T): value is NonNullable<T>;
 export declare function isUndefined(value: unknown): boolean;
 export declare function compareAddresses(firstAddress: EthereumAddress, secondAddress: EthereumAddress): boolean;
@@ -23,3 +23,4 @@ export declare function getRatioStateInfoForAaveCloseStrategy(currentRatioState:
     ratioState: RatioState;
 };
 export declare function getPositionId(...args: (number | string)[]): string;
+export declare function getCloseStrategyType(stopLossPrice: number, stopLossType: CloseToAssetType, takeProfitPrice: number, takeProfitType: CloseToAssetType): CloseStrategyType;

package/esm/services/utils.js

@@ -2,7 +2,7 @@ import Dec from 'decimal.js';
 import * as web3Utils from 'web3-utils';
 import AbiCoder from 'web3-eth-abi';
 import { getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
-import { ChainId, RatioState } from '../types/enums';
+import { ChainId, CloseStrategyType, CloseToAssetType, RatioState, } from '../types/enums';
 export function isDefined(value) {
     return value !== undefined && value !== null;
 }
@@ -80,3 +80,30 @@ export function getRatioStateInfoForAaveCloseStrategy(currentRatioState, collAss
 export function getPositionId(...args) {
     return args.map(arg => arg.toString().toLowerCase().split(' ').join('_')).join('-');
 }
+export function getCloseStrategyType(stopLossPrice, stopLossType, takeProfitPrice, takeProfitType) {
+    const isStopLoss = stopLossPrice > 0;
+    const isTakeProfit = takeProfitPrice > 0;
+    if (!isStopLoss && !isTakeProfit) {
+        throw new Error('CloseOnPrice: At least one price must be defined');
+    }
+    if (isStopLoss && isTakeProfit) {
+        if (stopLossType === CloseToAssetType.COLLATERAL && takeProfitType === CloseToAssetType.COLLATERAL) {
+            return CloseStrategyType.TAKE_PROFIT_AND_STOP_LOSS_IN_COLLATERAL;
+        }
+        if (stopLossType === CloseToAssetType.COLLATERAL) {
+            return CloseStrategyType.TAKE_PROFIT_IN_DEBT_AND_STOP_LOSS_IN_COLLATERAL;
+        }
+        if (takeProfitType === CloseToAssetType.COLLATERAL) {
+            return CloseStrategyType.TAKE_PROFIT_IN_COLLATERAL_AND_STOP_LOSS_IN_DEBT;
+        }
+        return CloseStrategyType.TAKE_PROFIT_AND_STOP_LOSS_IN_DEBT;
+    }
+    if (isStopLoss) {
+        return stopLossType === CloseToAssetType.COLLATERAL
+            ? CloseStrategyType.STOP_LOSS_IN_COLLATERAL
+            : CloseStrategyType.STOP_LOSS_IN_DEBT;
+    }
+    return takeProfitType === CloseToAssetType.COLLATERAL
+        ? CloseStrategyType.TAKE_PROFIT_IN_COLLATERAL
+        : CloseStrategyType.TAKE_PROFIT_IN_DEBT;
+}

package/esm/types/enums.d.ts

@@ -25,6 +25,20 @@ export declare enum DebtActionType {
     PAYBACK = 0,
     BORROW = 1
 }
+export declare enum CloseStrategyType {
+    TAKE_PROFIT_IN_COLLATERAL = 0,
+    STOP_LOSS_IN_COLLATERAL = 1,
+    TAKE_PROFIT_IN_DEBT = 2,
+    STOP_LOSS_IN_DEBT = 3,
+    TAKE_PROFIT_AND_STOP_LOSS_IN_COLLATERAL = 4,
+    TAKE_PROFIT_IN_COLLATERAL_AND_STOP_LOSS_IN_DEBT = 5,
+    TAKE_PROFIT_AND_STOP_LOSS_IN_DEBT = 6,
+    TAKE_PROFIT_IN_DEBT_AND_STOP_LOSS_IN_COLLATERAL = 7
+}
+export declare enum CloseToAssetType {
+    COLLATERAL = 0,
+    DEBT = 1
+}
 /**
  * @dev Follow the naming convention:
  *      - Enum name consists of two parts, name and version
@@ -100,6 +114,7 @@ export declare namespace Strategies {
         CloseToCollateralWithGasPrice = "close-to-collateral-with-gas-price",
         CloseOnPriceToDebt = "close-on-price-to-debt",
         CloseOnPriceToColl = "close-on-price-to-collateral",
+        CloseOnPrice = "close-on-price",
         TrailingStopToColl = "trailing-stop-to-collateral",
         TrailingStopToDebt = "trailing-stop-to-debt",
         Rebond = "rebond",
@@ -163,7 +178,8 @@ export declare namespace Bundles {
         MORPHO_BLUE_EOA_BOOST = 35,
         AAVE_V3_OPEN_ORDER_FROM_COLLATERAL = 36,
         LIQUITY_V2_REPAY = 37,
-        LIQUITY_V2_BOOST = 38
+        LIQUITY_V2_BOOST = 38,
+        LIQUITY_V2_CLOSE = 39
     }
     enum OptimismIds {
         AAVE_V3_REPAY = 0,

package/esm/types/enums.js

@@ -31,6 +31,22 @@ export var 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
@@ -115,6 +131,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";
@@ -182,6 +199,7 @@ export var Bundles;
         MainnetIds[MainnetIds["AAVE_V3_OPEN_ORDER_FROM_COLLATERAL"] = 36] = "AAVE_V3_OPEN_ORDER_FROM_COLLATERAL";
         MainnetIds[MainnetIds["LIQUITY_V2_REPAY"] = 37] = "LIQUITY_V2_REPAY";
         MainnetIds[MainnetIds["LIQUITY_V2_BOOST"] = 38] = "LIQUITY_V2_BOOST";
+        MainnetIds[MainnetIds["LIQUITY_V2_CLOSE"] = 39] = "LIQUITY_V2_CLOSE";
     })(MainnetIds = Bundles.MainnetIds || (Bundles.MainnetIds = {}));
     let OptimismIds;
     (function (OptimismIds) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/automation-sdk",
-  "version": "3.1.1-dev",
+  "version": "3.1.1-dev-2",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",

package/src/constants/index.ts

@@ -385,6 +385,11 @@ export const MAINNET_BUNDLES_INFO: MainnetBundleInfo = {
     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,
+  },
 };
 
 export const OPTIMISM_BUNDLES_INFO: OptimismBundleInfo = {

package/src/services/strategiesService.ts

@@ -566,7 +566,7 @@ function parseLiquityLeverageManagement(position: Position.Automated, parseData:
 function parseLiquityV2LeverageManagement(position: Position.Automated, parseData: ParseData): Position.Automated {
   const _position = cloneDeep(position);
 
-  const { subStruct, subId } = parseData.subscriptionEventData;
+  const { subStruct, subId, subHash } = parseData.subscriptionEventData;
   const { isEnabled } = parseData.strategiesSubsData;
 
   const triggerData = triggerService.liquityV2RatioTrigger.decode(subStruct.triggerData);
@@ -585,8 +585,9 @@ function parseLiquityV2LeverageManagement(position: Position.Automated, parseDat
     _position.specific = {
       triggerRepayRatio: triggerData.ratio,
       targetRepayRatio: subData.targetRatio,
-      repayEnabled: true,
+      repayEnabled: isEnabled,
       subId1: Number(subId),
+      subHashRepay: subHash,
       mergeWithId: Strategies.Identifiers.Boost,
     };
   } else {
@@ -595,6 +596,7 @@ function parseLiquityV2LeverageManagement(position: Position.Automated, parseDat
       targetBoostRatio: subData.targetRatio,
       boostEnabled: isEnabled,
       subId2: Number(subId),
+      subHashBoost: subHash,
       mergeId: Strategies.Identifiers.Boost,
     };
   }
@@ -847,6 +849,32 @@ function parseAaveV3OpenOrderFromCollateral(position: Position.Automated, parseD
   return _position;
 }
 
+function parseLiquityV2CloseOnPrice(position: Position.Automated, parseData: ParseData): Position.Automated {
+  const _position = cloneDeep(position);
+
+  const { subStruct } = parseData.subscriptionEventData;
+
+  const triggerData = triggerService.shouldClosePriceTrigger.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,
+  );
+
+  // 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 = {};
+
+  return _position;
+}
+
 const parsingMethodsMapping: StrategiesToProtocolVersionMapping = {
   [ProtocolIdentifiers.StrategiesAutomation.MakerDAO]: {
     [Strategies.Identifiers.SavingsLiqProtection]: parseMakerSavingsLiqProtection,
@@ -870,6 +898,7 @@ const parsingMethodsMapping: StrategiesToProtocolVersionMapping = {
   [ProtocolIdentifiers.StrategiesAutomation.LiquityV2]: {
     [Strategies.Identifiers.Repay]: parseLiquityV2LeverageManagement,
     [Strategies.Identifiers.Boost]: parseLiquityV2LeverageManagement,
+    [Strategies.Identifiers.CloseOnPrice]: parseLiquityV2CloseOnPrice,
   },
   [ProtocolIdentifiers.StrategiesAutomation.AaveV2]: {
     [Strategies.Identifiers.Repay]: parseAaveV2LeverageManagement,

package/src/services/strategySubService.ts

@@ -3,6 +3,7 @@ import { getAssetInfo } from '@defisaver/tokens';
 
 import type { OrderType } from '../types/enums';
 import {
+  CloseStrategyType, CloseToAssetType,
   Bundles, ChainId, RatioState, Strategies,
 } from '../types/enums';
 import type { EthereumAddress, StrategyOrBundleIds } from '../types';
@@ -11,7 +12,9 @@ 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(
@@ -537,6 +540,28 @@ export const liquityV2Encode = {
     //   ? Bundles.MainnetIds.LIQUITY_V2_BOOST
     //   : Bundles.MainnetIds.LIQUITY_V2_REPAY;
 
+    return [strategyOrBundleId, isBundle, triggerData, subData];
+  },
+  closeOnPrice(
+    strategyOrBundleId: number,
+    market: EthereumAddress,
+    troveId: string,
+    collToken: EthereumAddress,
+    boldToken: EthereumAddress,
+    stopLossPrice: number = 0,
+    stopLossType: CloseToAssetType = CloseToAssetType.DEBT,
+    takeProfitPrice: number = 0,
+    takeProfitType: CloseToAssetType = 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.shouldClosePriceTrigger.encode(collToken, stopLossPrice, takeProfitPrice);
+
+    // TODO: we can hardcode bundleID after testing
+    // Bundles.MainnetIds.LIQUITY_V2_CLOSE;
+
     return [strategyOrBundleId, isBundle, triggerData, subData];
   },
 };

package/src/services/subDataService.ts

@@ -6,7 +6,7 @@ import { assetAmountInEth, getAssetInfo, getAssetInfoByAddress } from '@defisave
 import { otherAddresses } from '@defisaver/sdk';
 
 import type { SubData, EthereumAddress } from '../types';
-import type { OrderType } from '../types/enums';
+import type { CloseStrategyType, OrderType } from '../types/enums';
 import {
   ChainId, CollActionType, DebtActionType, RatioState,
 } from '../types/enums';
@@ -679,3 +679,48 @@ export const liquityV2LeverageManagementSubData = {
     };
   },
 };
+
+export const liquityV2CloseSubData = {
+  encode(
+    market: EthereumAddress,
+    troveId: string,
+    collToken: EthereumAddress,
+    boldToken: EthereumAddress,
+    closeType: CloseStrategyType,
+  ): SubData {
+    const marketEncoded = AbiCoder.encodeParameter('address', market);
+    const troveIdEncoded = AbiCoder.encodeParameter('uint256', troveId);
+    const collAddrEncoded = AbiCoder.encodeParameter('address', collToken);
+    const boldTokenEncoded = AbiCoder.encodeParameter('address', boldToken);
+    const wethAddress = getAssetInfo('WETH').address;
+    const wethAddressEncoded = AbiCoder.encodeParameter('address', wethAddress);
+    const closeTypeEncoded = AbiCoder.encodeParameter('uint8', closeType);
+
+    return [
+      marketEncoded,
+      troveIdEncoded,
+      collAddrEncoded,
+      boldTokenEncoded,
+      wethAddressEncoded,
+      closeTypeEncoded,
+    ];
+  },
+  decode(subData: SubData): {
+    market: EthereumAddress,
+    troveId: string,
+    collToken: EthereumAddress,
+    boldToken: EthereumAddress,
+    closeType: CloseStrategyType,
+  } {
+    const market = AbiCoder.decodeParameter('address', subData[0]) as unknown as EthereumAddress;
+    const troveId = AbiCoder.decodeParameter('uint256', subData[1]) as any as string;
+    const collToken = AbiCoder.decodeParameter('address', subData[2]) as any as EthereumAddress;
+    const boldToken = AbiCoder.decodeParameter('address', subData[3]) as any as EthereumAddress;
+    // skip wethAddress
+    const closeType = AbiCoder.decodeParameter('uint8', subData[5]) as any as CloseStrategyType;
+
+    return {
+      market, troveId, collToken, boldToken, closeType,
+    };
+  },
+};

package/src/services/triggerService.ts

@@ -470,3 +470,33 @@ export const liquityV2RatioTrigger = {
     };
   },
 };
+
+export const shouldClosePriceTrigger = {
+  encode(
+    tokenAddr: EthereumAddress,
+    lowerPrice: number,
+    upperPrice: number,
+  ) {
+    const lowerPriceFormatted = new Dec(lowerPrice).mul(1e8).floor().toString();
+    const upperPriceFormatted = new Dec(upperPrice).mul(1e8).floor().toString();
+
+    return [
+      AbiCoder.encodeParameters(
+        ['address', 'uint256', 'uint256'],
+        [tokenAddr, lowerPriceFormatted, upperPriceFormatted],
+      ),
+    ];
+  },
+  decode(triggerData: TriggerData): {
+    tokenAddr: EthereumAddress,
+    lowerPrice: string,
+    upperPrice: string,
+  } {
+    const decodedData = AbiCoder.decodeParameters(['address', 'uint256', 'uint256'], triggerData[0]);
+    return {
+      tokenAddr: decodedData[0] as EthereumAddress,
+      lowerPrice: new Dec(decodedData[1] as string).div(1e8).toString(),
+      upperPrice: new Dec(decodedData[2] as string).div(1e8).toString(),
+    };
+  },
+};

package/src/services/utils.ts

@@ -4,7 +4,9 @@ import AbiCoder from 'web3-eth-abi';
 import { getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
 
 import type { EthereumAddress } from '../types';
-import { ChainId, RatioState } from '../types/enums';
+import {
+  ChainId, CloseStrategyType, CloseToAssetType, RatioState,
+} from '../types/enums';
 
 export function isDefined<T>(value: T): value is NonNullable<T> {
   return value !== undefined && value !== null;
@@ -101,4 +103,36 @@ export function getRatioStateInfoForAaveCloseStrategy(
 
 export function getPositionId(...args: (number | string)[]) {
   return args.map(arg => arg.toString().toLowerCase().split(' ').join('_')).join('-');
+}
+
+export function getCloseStrategyType(
+  stopLossPrice: number,
+  stopLossType: CloseToAssetType,
+  takeProfitPrice: number,
+  takeProfitType: CloseToAssetType,
+): CloseStrategyType {
+  const isStopLoss = stopLossPrice > 0;
+  const isTakeProfit = takeProfitPrice > 0;
+
+  if (!isStopLoss && !isTakeProfit) {
+    throw new Error('CloseOnPrice: At least one price must be defined');
+  }
+
+  if (isStopLoss && isTakeProfit) {
+    if (stopLossType === CloseToAssetType.COLLATERAL && takeProfitType === CloseToAssetType.COLLATERAL) {
+      return CloseStrategyType.TAKE_PROFIT_AND_STOP_LOSS_IN_COLLATERAL;
+    } if (stopLossType === CloseToAssetType.COLLATERAL) {
+      return CloseStrategyType.TAKE_PROFIT_IN_DEBT_AND_STOP_LOSS_IN_COLLATERAL;
+    } if (takeProfitType === CloseToAssetType.COLLATERAL) {
+      return CloseStrategyType.TAKE_PROFIT_IN_COLLATERAL_AND_STOP_LOSS_IN_DEBT;
+    }
+    return CloseStrategyType.TAKE_PROFIT_AND_STOP_LOSS_IN_DEBT;
+  } if (isStopLoss) {
+    return stopLossType === CloseToAssetType.COLLATERAL
+      ? CloseStrategyType.STOP_LOSS_IN_COLLATERAL
+      : CloseStrategyType.STOP_LOSS_IN_DEBT;
+  }
+  return takeProfitType === CloseToAssetType.COLLATERAL
+    ? CloseStrategyType.TAKE_PROFIT_IN_COLLATERAL
+    : CloseStrategyType.TAKE_PROFIT_IN_DEBT;
 }

package/src/types/enums.ts

@@ -31,6 +31,22 @@ export enum DebtActionType {
   BORROW = 1,
 }
 
+export enum CloseStrategyType {
+  TAKE_PROFIT_IN_COLLATERAL = 0,
+  STOP_LOSS_IN_COLLATERAL = 1,
+  TAKE_PROFIT_IN_DEBT = 2,
+  STOP_LOSS_IN_DEBT = 3,
+  TAKE_PROFIT_AND_STOP_LOSS_IN_COLLATERAL = 4,
+  TAKE_PROFIT_IN_COLLATERAL_AND_STOP_LOSS_IN_DEBT = 5,
+  TAKE_PROFIT_AND_STOP_LOSS_IN_DEBT = 6,
+  TAKE_PROFIT_IN_DEBT_AND_STOP_LOSS_IN_COLLATERAL = 7,
+}
+
+export enum CloseToAssetType {
+  COLLATERAL = 0,
+  DEBT = 1,
+}
+
 /**
  * @dev Follow the naming convention:
  *      - Enum name consists of two parts, name and version
@@ -112,6 +128,7 @@ export namespace Strategies {
     CloseToCollateralWithGasPrice = 'close-to-collateral-with-gas-price',
     CloseOnPriceToDebt = 'close-on-price-to-debt',
     CloseOnPriceToColl = 'close-on-price-to-collateral',
+    CloseOnPrice = 'close-on-price',
     TrailingStopToColl = 'trailing-stop-to-collateral',
     TrailingStopToDebt = 'trailing-stop-to-debt',
     Rebond = 'rebond',
@@ -177,6 +194,7 @@ export namespace Bundles {
     AAVE_V3_OPEN_ORDER_FROM_COLLATERAL = 36,
     LIQUITY_V2_REPAY = 37,
     LIQUITY_V2_BOOST = 38,
+    LIQUITY_V2_CLOSE = 39,
   }
 
   export enum OptimismIds {