@defisaver/automation-sdk 3.1.4-dev-2 → 3.1.4-dev-4

package/cjs/constants/index.js

@@ -368,6 +368,16 @@ exports.MAINNET_BUNDLES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.CloseOnPrice,
         protocol: exports.PROTOCOLS.LiquityV2,
     },
+    [enums_1.Bundles.MainnetIds.LIQUITY_V2_REPAY_ON_PRICE]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.LIQUITY_V2_REPAY_ON_PRICE,
+        strategyId: enums_1.Strategies.Identifiers.OpenOrderFromCollateral,
+        protocol: exports.PROTOCOLS.LiquityV2,
+    },
+    [enums_1.Bundles.MainnetIds.LIQUITY_V2_BOOST_ON_PRICE]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.LIQUITY_V2_BOOST_ON_PRICE,
+        strategyId: enums_1.Strategies.Identifiers.RepayOnPrice,
+        protocol: exports.PROTOCOLS.LiquityV2,
+    },
 };
 exports.OPTIMISM_BUNDLES_INFO = {
     [enums_1.Bundles.OptimismIds.AAVE_V3_REPAY]: {

package/cjs/services/strategiesService.js

@@ -670,6 +670,26 @@ function parseLiquityV2CloseOnPrice(position, parseData) {
     };
     return _position;
 }
+function parseLiquityV2LeverageManagementOnPrice(position, parseData) {
+    const _position = (0, lodash_1.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 = (0, utils_1.getPositionId)(_position.chainId, _position.protocol.id, _position.owner, Math.random());
+    /// @TODO: what does even go here
+    /*
+    _position.specific = {
+      market: subData.market,
+      troveId: subData.troveId,
+      ratio: subData.targetRatio,
+      price: triggerData.price,
+      ratioState: triggerData.ratioState,
+    };
+    */
+    return _position;
+}
 const parsingMethodsMapping = {
     [enums_1.ProtocolIdentifiers.StrategiesAutomation.MakerDAO]: {
         [enums_1.Strategies.Identifiers.SavingsLiqProtection]: parseMakerSavingsLiqProtection,
@@ -694,6 +714,8 @@ const parsingMethodsMapping = {
         [enums_1.Strategies.Identifiers.Repay]: parseLiquityV2LeverageManagement,
         [enums_1.Strategies.Identifiers.Boost]: parseLiquityV2LeverageManagement,
         [enums_1.Strategies.Identifiers.CloseOnPrice]: parseLiquityV2CloseOnPrice,
+        [enums_1.Strategies.Identifiers.OpenOrderFromCollateral]: parseLiquityV2LeverageManagementOnPrice,
+        [enums_1.Strategies.Identifiers.RepayOnPrice]: parseLiquityV2LeverageManagementOnPrice,
     },
     [enums_1.ProtocolIdentifiers.StrategiesAutomation.AaveV2]: {
         [enums_1.Strategies.Identifiers.Repay]: parseAaveV2LeverageManagement,

package/cjs/services/strategySubService.d.ts

@@ -99,6 +99,7 @@ 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)[];
 };
 export declare const liquityV2Encode: {
-    leverageManagement(market: EthereumAddress, troveId: string, ratioState: RatioState, targetRatio: number, triggerRatio: number, strategyOrBundleId: number): (number | boolean | string[])[];
+    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[])[];
 };

package/cjs/services/strategySubService.js

@@ -266,15 +266,10 @@ exports.morphoBlueEncode = {
     },
 };
 exports.liquityV2Encode = {
-    leverageManagement(market, troveId, ratioState, targetRatio, triggerRatio, strategyOrBundleId) {
+    leverageManagement(market, troveId, collToken, boldToken, ratioState, targetRatio, triggerRatio, strategyOrBundleId) {
         const isBundle = true;
-        const isRepay = ratioState === enums_1.RatioState.UNDER;
-        const subData = subDataService.liquityV2LeverageManagementSubData.encode(market, troveId, ratioState, targetRatio);
+        const subData = subDataService.liquityV2LeverageManagementSubData.encode(market, troveId, collToken, boldToken, ratioState, targetRatio);
         const triggerData = triggerService.liquityV2RatioTrigger.encode(market, troveId, triggerRatio, ratioState);
-        // TODO: we can hardcode right bundles after testing
-        // const strategyOrBundleId = ratioState === RatioState.OVER
-        //   ? Bundles.MainnetIds.LIQUITY_V2_BOOST
-        //   : 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) {
@@ -282,8 +277,12 @@ exports.liquityV2Encode = {
         const closeType = (0, utils_1.getCloseStrategyType)(stopLossPrice, stopLossType, takeProfitPrice, takeProfitType);
         const subData = subDataService.liquityV2CloseSubData.encode(market, troveId, collToken, boldToken, closeType);
         const triggerData = triggerService.closePriceTrigger.encode(collToken, stopLossPrice, takeProfitPrice);
-        // TODO: we can hardcode bundleID after testing
-        // Bundles.MainnetIds.LIQUITY_V2_CLOSE;
         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];
+    },
 };

package/cjs/services/subDataService.d.ts

@@ -191,10 +191,12 @@ export declare const aaveV3LeverageManagementOnPriceSubData: {
     };
 };
 export declare const liquityV2LeverageManagementSubData: {
-    encode: (market: EthereumAddress, troveId: string, ratioState: RatioState, targetRatio: number) => string[];
+    encode: (market: EthereumAddress, troveId: string, collToken: EthereumAddress, boldToken: EthereumAddress, ratioState: RatioState, targetRatio: number) => string[];
     decode: (subData: string[]) => {
         market: string;
         troveId: string;
+        collToken: string;
+        boldToken: string;
         ratioState: RatioState;
         targetRatio: number;
     };
@@ -209,3 +211,13 @@ export declare const liquityV2CloseSubData: {
         closeType: CloseStrategyType;
     };
 };
+export declare const liquityV2LeverageManagementOnPriceSubData: {
+    encode(market: EthereumAddress, troveId: string, collToken: EthereumAddress, boldToken: EthereumAddress, targetRatio: number, isRepayOnPrice: boolean): string[];
+    decode(subData: string[]): {
+        market: EthereumAddress;
+        troveId: string;
+        collToken: EthereumAddress;
+        boldToken: EthereumAddress;
+        targetRatio: number;
+    };
+};

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.liquityV2CloseSubData = exports.liquityV2LeverageManagementSubData = exports.aaveV3LeverageManagementOnPriceSubData = 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.liquityV2LeverageManagementOnPriceSubData = exports.liquityV2CloseSubData = exports.liquityV2LeverageManagementSubData = exports.aaveV3LeverageManagementOnPriceSubData = 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");
@@ -474,9 +474,11 @@ exports.aaveV3LeverageManagementOnPriceSubData = {
     },
 };
 exports.liquityV2LeverageManagementSubData = {
-    encode: (market, troveId, ratioState, targetRatio) => {
+    encode: (market, troveId, collToken, boldToken, ratioState, targetRatio) => {
         const marketEncoded = web3_eth_abi_1.default.encodeParameter('address', market);
         const troveIdEncoded = web3_eth_abi_1.default.encodeParameter('uint256', troveId);
+        const collTokenEncoded = web3_eth_abi_1.default.encodeParameter('address', collToken);
+        const boldTokenEncoded = web3_eth_abi_1.default.encodeParameter('address', boldToken);
         const ratioStateEncoded = web3_eth_abi_1.default.encodeParameter('uint8', ratioState);
         const targetRatioEncoded = web3_eth_abi_1.default.encodeParameter('uint256', (0, utils_1.ratioPercentageToWei)(targetRatio));
         const isRepay = ratioState === enums_1.RatioState.UNDER;
@@ -484,16 +486,27 @@ exports.liquityV2LeverageManagementSubData = {
         const debtActionType = isRepay ? enums_1.DebtActionType.PAYBACK : enums_1.DebtActionType.BORROW;
         const collActionTypeEncoded = web3_eth_abi_1.default.encodeParameter('uint8', collActionType);
         const debtActionTypeEncoded = web3_eth_abi_1.default.encodeParameter('uint8', debtActionType);
-        return [marketEncoded, troveIdEncoded, ratioStateEncoded, targetRatioEncoded, collActionTypeEncoded, debtActionTypeEncoded];
+        return [
+            marketEncoded,
+            troveIdEncoded,
+            collTokenEncoded,
+            boldTokenEncoded,
+            ratioStateEncoded,
+            targetRatioEncoded,
+            collActionTypeEncoded,
+            debtActionTypeEncoded,
+        ];
     },
     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 ratioState = web3_eth_abi_1.default.decodeParameter('uint8', subData[2]);
-        const weiRatio = web3_eth_abi_1.default.decodeParameter('uint256', subData[3]);
+        const collToken = web3_eth_abi_1.default.decodeParameter('address', subData[2]);
+        const boldToken = web3_eth_abi_1.default.decodeParameter('address', subData[3]);
+        const ratioState = web3_eth_abi_1.default.decodeParameter('uint8', subData[4]);
+        const weiRatio = web3_eth_abi_1.default.decodeParameter('uint256', subData[5]);
         const targetRatio = (0, utils_1.weiToRatioPercentage)(weiRatio);
         return {
-            market, troveId, ratioState, targetRatio,
+            market, troveId, collToken, boldToken, ratioState, targetRatio,
         };
     },
 };
@@ -505,6 +518,8 @@ exports.liquityV2CloseSubData = {
         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 gasCompensation = new decimal_js_1.default('0.0375').mul(1e18).toString();
+        const gasCompensationEncoded = web3_eth_abi_1.default.encodeParameter('uint256', gasCompensation);
         const closeTypeEncoded = web3_eth_abi_1.default.encodeParameter('uint8', closeType);
         return [
             marketEncoded,
@@ -512,6 +527,7 @@ exports.liquityV2CloseSubData = {
             collAddrEncoded,
             boldTokenEncoded,
             wethAddressEncoded,
+            gasCompensationEncoded,
             closeTypeEncoded,
         ];
     },
@@ -520,10 +536,43 @@ exports.liquityV2CloseSubData = {
         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]);
+        // skip wethAddress and gasCompensation
+        const closeType = web3_eth_abi_1.default.decodeParameter('uint8', subData[6]);
         return {
             market, troveId, collToken, boldToken, closeType,
         };
     },
 };
+exports.liquityV2LeverageManagementOnPriceSubData = {
+    encode(market, troveId, collToken, boldToken, targetRatio, isRepayOnPrice) {
+        const encodedMarket = web3_eth_abi_1.default.encodeParameter('address', market);
+        const encodedTroveId = web3_eth_abi_1.default.encodeParameter('uint256', troveId);
+        const encodedCollToken = web3_eth_abi_1.default.encodeParameter('address', collToken);
+        const encodedBoldToken = web3_eth_abi_1.default.encodeParameter('address', boldToken);
+        const encodedTargetRatio = web3_eth_abi_1.default.encodeParameter('uint256', (0, utils_1.ratioPercentageToWei)(targetRatio));
+        const collActionType = isRepayOnPrice ? enums_1.CollActionType.WITHDRAW : enums_1.CollActionType.SUPPLY;
+        const debtActionType = isRepayOnPrice ? enums_1.DebtActionType.PAYBACK : enums_1.DebtActionType.BORROW;
+        const encodedCollActionType = web3_eth_abi_1.default.encodeParameter('uint8', collActionType);
+        const encodedDebtActionType = web3_eth_abi_1.default.encodeParameter('uint8', debtActionType);
+        return [
+            encodedMarket,
+            encodedTroveId,
+            encodedCollToken,
+            encodedBoldToken,
+            encodedTargetRatio,
+            encodedCollActionType,
+            encodedDebtActionType,
+        ];
+    },
+    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]);
+        const weiRatio = web3_eth_abi_1.default.decodeParameter('uint256', subData[4]);
+        const targetRatio = (0, utils_1.weiToRatioPercentage)(weiRatio);
+        return {
+            market, troveId, collToken, boldToken, targetRatio,
+        };
+    },
+};

package/cjs/services/triggerService.d.ts

@@ -198,6 +198,14 @@ export declare const liquityV2RatioTrigger: {
         ratioState: number;
     };
 };
+export declare const liquityV2QuotePriceTrigger: {
+    encode(market: EthereumAddress, price: number, ratioState: RatioState): string[];
+    decode(triggerData: string[]): {
+        market: string;
+        price: string;
+        ratioState: number;
+    };
+};
 export declare const closePriceTrigger: {
     encode(tokenAddr: EthereumAddress, lowerPrice: number, upperPrice: number): string[];
     decode(triggerData: 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.closePriceTrigger = 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.closePriceTrigger = exports.liquityV2QuotePriceTrigger = 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,6 +380,22 @@ exports.liquityV2RatioTrigger = {
         };
     },
 };
+exports.liquityV2QuotePriceTrigger = {
+    encode(market, price, ratioState) {
+        // Price is always in 18 decimals
+        const _price = new decimal_js_1.default(price.toString()).mul(Math.pow(10, 18)).floor().toString();
+        return [web3_eth_abi_1.default.encodeParameters(['address', 'uint256', 'uint8'], [market, _price, ratioState])];
+    },
+    decode(triggerData) {
+        const decodedData = web3_eth_abi_1.default.decodeParameters(['address', 'uint256', 'uint8'], triggerData[0]);
+        const price = new decimal_js_1.default(decodedData[1]).div(Math.pow(10, 18)).toDP(18).toString();
+        return {
+            market: decodedData[0],
+            price,
+            ratioState: Number(decodedData[2]),
+        };
+    },
+};
 exports.closePriceTrigger = {
     encode(tokenAddr, lowerPrice, upperPrice) {
         const lowerPriceFormatted = new decimal_js_1.default(lowerPrice).mul(1e8).floor().toString();

package/cjs/types/enums.d.ts

@@ -178,7 +178,9 @@ export declare namespace Bundles {
         AAVE_V3_REPAY_ON_PRICE = 37,
         LIQUITY_V2_REPAY = 39,
         LIQUITY_V2_BOOST = 40,
-        LIQUITY_V2_CLOSE = 41
+        LIQUITY_V2_CLOSE = 41,
+        LIQUITY_V2_REPAY_ON_PRICE = 42,
+        LIQUITY_V2_BOOST_ON_PRICE = 43
     }
     enum OptimismIds {
         AAVE_V3_REPAY = 0,

package/cjs/types/enums.js

@@ -202,6 +202,8 @@ var Bundles;
         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 = Bundles.MainnetIds || (Bundles.MainnetIds = {}));
     let OptimismIds;
     (function (OptimismIds) {

package/esm/constants/index.js

@@ -362,6 +362,16 @@ export const MAINNET_BUNDLES_INFO = {
         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.OpenOrderFromCollateral,
+        protocol: PROTOCOLS.LiquityV2,
+    },
+    [Bundles.MainnetIds.LIQUITY_V2_BOOST_ON_PRICE]: {
+        strategyOrBundleId: Bundles.MainnetIds.LIQUITY_V2_BOOST_ON_PRICE,
+        strategyId: Strategies.Identifiers.RepayOnPrice,
+        protocol: PROTOCOLS.LiquityV2,
+    },
 };
 export const OPTIMISM_BUNDLES_INFO = {
     [Bundles.OptimismIds.AAVE_V3_REPAY]: {

package/esm/services/strategiesService.js

@@ -644,6 +644,26 @@ function parseLiquityV2CloseOnPrice(position, parseData) {
     };
     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());
+    /// @TODO: what does even go here
+    /*
+    _position.specific = {
+      market: subData.market,
+      troveId: subData.troveId,
+      ratio: subData.targetRatio,
+      price: triggerData.price,
+      ratioState: triggerData.ratioState,
+    };
+    */
+    return _position;
+}
 const parsingMethodsMapping = {
     [ProtocolIdentifiers.StrategiesAutomation.MakerDAO]: {
         [Strategies.Identifiers.SavingsLiqProtection]: parseMakerSavingsLiqProtection,
@@ -668,6 +688,8 @@ const parsingMethodsMapping = {
         [Strategies.Identifiers.Repay]: parseLiquityV2LeverageManagement,
         [Strategies.Identifiers.Boost]: parseLiquityV2LeverageManagement,
         [Strategies.Identifiers.CloseOnPrice]: parseLiquityV2CloseOnPrice,
+        [Strategies.Identifiers.OpenOrderFromCollateral]: parseLiquityV2LeverageManagementOnPrice,
+        [Strategies.Identifiers.RepayOnPrice]: parseLiquityV2LeverageManagementOnPrice,
     },
     [ProtocolIdentifiers.StrategiesAutomation.AaveV2]: {
         [Strategies.Identifiers.Repay]: parseAaveV2LeverageManagement,

package/esm/services/strategySubService.d.ts

@@ -99,6 +99,7 @@ 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)[];
 };
 export declare const liquityV2Encode: {
-    leverageManagement(market: EthereumAddress, troveId: string, ratioState: RatioState, targetRatio: number, triggerRatio: number, strategyOrBundleId: number): (number | boolean | string[])[];
+    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[])[];
 };

package/esm/services/strategySubService.js

@@ -237,15 +237,10 @@ export const morphoBlueEncode = {
     },
 };
 export const liquityV2Encode = {
-    leverageManagement(market, troveId, ratioState, targetRatio, triggerRatio, strategyOrBundleId) {
+    leverageManagement(market, troveId, collToken, boldToken, ratioState, targetRatio, triggerRatio, strategyOrBundleId) {
         const isBundle = true;
-        const isRepay = ratioState === RatioState.UNDER;
-        const subData = subDataService.liquityV2LeverageManagementSubData.encode(market, troveId, ratioState, targetRatio);
+        const subData = subDataService.liquityV2LeverageManagementSubData.encode(market, troveId, collToken, boldToken, ratioState, targetRatio);
         const triggerData = triggerService.liquityV2RatioTrigger.encode(market, troveId, triggerRatio, ratioState);
-        // TODO: we can hardcode right bundles after testing
-        // const strategyOrBundleId = ratioState === RatioState.OVER
-        //   ? Bundles.MainnetIds.LIQUITY_V2_BOOST
-        //   : 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) {
@@ -253,8 +248,12 @@ export const liquityV2Encode = {
         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);
-        // TODO: we can hardcode bundleID after testing
-        // Bundles.MainnetIds.LIQUITY_V2_CLOSE;
         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];
+    },
 };

package/esm/services/subDataService.d.ts

@@ -191,10 +191,12 @@ export declare const aaveV3LeverageManagementOnPriceSubData: {
     };
 };
 export declare const liquityV2LeverageManagementSubData: {
-    encode: (market: EthereumAddress, troveId: string, ratioState: RatioState, targetRatio: number) => string[];
+    encode: (market: EthereumAddress, troveId: string, collToken: EthereumAddress, boldToken: EthereumAddress, ratioState: RatioState, targetRatio: number) => string[];
     decode: (subData: string[]) => {
         market: string;
         troveId: string;
+        collToken: string;
+        boldToken: string;
         ratioState: RatioState;
         targetRatio: number;
     };
@@ -209,3 +211,13 @@ export declare const liquityV2CloseSubData: {
         closeType: CloseStrategyType;
     };
 };
+export declare const liquityV2LeverageManagementOnPriceSubData: {
+    encode(market: EthereumAddress, troveId: string, collToken: EthereumAddress, boldToken: EthereumAddress, targetRatio: number, isRepayOnPrice: boolean): string[];
+    decode(subData: string[]): {
+        market: EthereumAddress;
+        troveId: string;
+        collToken: EthereumAddress;
+        boldToken: EthereumAddress;
+        targetRatio: number;
+    };
+};

package/esm/services/subDataService.js

@@ -468,9 +468,11 @@ export const aaveV3LeverageManagementOnPriceSubData = {
     },
 };
 export const liquityV2LeverageManagementSubData = {
-    encode: (market, troveId, ratioState, targetRatio) => {
+    encode: (market, troveId, collToken, boldToken, ratioState, targetRatio) => {
         const marketEncoded = AbiCoder.encodeParameter('address', market);
         const troveIdEncoded = AbiCoder.encodeParameter('uint256', troveId);
+        const collTokenEncoded = AbiCoder.encodeParameter('address', collToken);
+        const boldTokenEncoded = AbiCoder.encodeParameter('address', boldToken);
         const ratioStateEncoded = AbiCoder.encodeParameter('uint8', ratioState);
         const targetRatioEncoded = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
         const isRepay = ratioState === RatioState.UNDER;
@@ -478,16 +480,27 @@ export const liquityV2LeverageManagementSubData = {
         const debtActionType = isRepay ? DebtActionType.PAYBACK : DebtActionType.BORROW;
         const collActionTypeEncoded = AbiCoder.encodeParameter('uint8', collActionType);
         const debtActionTypeEncoded = AbiCoder.encodeParameter('uint8', debtActionType);
-        return [marketEncoded, troveIdEncoded, ratioStateEncoded, targetRatioEncoded, collActionTypeEncoded, debtActionTypeEncoded];
+        return [
+            marketEncoded,
+            troveIdEncoded,
+            collTokenEncoded,
+            boldTokenEncoded,
+            ratioStateEncoded,
+            targetRatioEncoded,
+            collActionTypeEncoded,
+            debtActionTypeEncoded,
+        ];
     },
     decode: (subData) => {
         const market = AbiCoder.decodeParameter('address', subData[0]);
         const troveId = AbiCoder.decodeParameter('uint256', subData[1]);
-        const ratioState = AbiCoder.decodeParameter('uint8', subData[2]);
-        const weiRatio = AbiCoder.decodeParameter('uint256', subData[3]);
+        const collToken = AbiCoder.decodeParameter('address', subData[2]);
+        const boldToken = AbiCoder.decodeParameter('address', subData[3]);
+        const ratioState = AbiCoder.decodeParameter('uint8', subData[4]);
+        const weiRatio = AbiCoder.decodeParameter('uint256', subData[5]);
         const targetRatio = weiToRatioPercentage(weiRatio);
         return {
-            market, troveId, ratioState, targetRatio,
+            market, troveId, collToken, boldToken, ratioState, targetRatio,
         };
     },
 };
@@ -499,6 +512,8 @@ export const liquityV2CloseSubData = {
         const boldTokenEncoded = AbiCoder.encodeParameter('address', boldToken);
         const wethAddress = getAssetInfo('WETH').address;
         const wethAddressEncoded = AbiCoder.encodeParameter('address', wethAddress);
+        const gasCompensation = new Dec('0.0375').mul(1e18).toString();
+        const gasCompensationEncoded = AbiCoder.encodeParameter('uint256', gasCompensation);
         const closeTypeEncoded = AbiCoder.encodeParameter('uint8', closeType);
         return [
             marketEncoded,
@@ -506,6 +521,7 @@ export const liquityV2CloseSubData = {
             collAddrEncoded,
             boldTokenEncoded,
             wethAddressEncoded,
+            gasCompensationEncoded,
             closeTypeEncoded,
         ];
     },
@@ -514,10 +530,43 @@ export const liquityV2CloseSubData = {
         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]);
+        // skip wethAddress and gasCompensation
+        const closeType = AbiCoder.decodeParameter('uint8', subData[6]);
         return {
             market, troveId, collToken, boldToken, closeType,
         };
     },
 };
+export const liquityV2LeverageManagementOnPriceSubData = {
+    encode(market, troveId, collToken, boldToken, targetRatio, isRepayOnPrice) {
+        const encodedMarket = AbiCoder.encodeParameter('address', market);
+        const encodedTroveId = AbiCoder.encodeParameter('uint256', troveId);
+        const encodedCollToken = AbiCoder.encodeParameter('address', collToken);
+        const encodedBoldToken = AbiCoder.encodeParameter('address', boldToken);
+        const encodedTargetRatio = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
+        const collActionType = isRepayOnPrice ? CollActionType.WITHDRAW : CollActionType.SUPPLY;
+        const debtActionType = isRepayOnPrice ? DebtActionType.PAYBACK : DebtActionType.BORROW;
+        const encodedCollActionType = AbiCoder.encodeParameter('uint8', collActionType);
+        const encodedDebtActionType = AbiCoder.encodeParameter('uint8', debtActionType);
+        return [
+            encodedMarket,
+            encodedTroveId,
+            encodedCollToken,
+            encodedBoldToken,
+            encodedTargetRatio,
+            encodedCollActionType,
+            encodedDebtActionType,
+        ];
+    },
+    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]);
+        const weiRatio = AbiCoder.decodeParameter('uint256', subData[4]);
+        const targetRatio = weiToRatioPercentage(weiRatio);
+        return {
+            market, troveId, collToken, boldToken, targetRatio,
+        };
+    },
+};

package/esm/services/triggerService.d.ts

@@ -198,6 +198,14 @@ export declare const liquityV2RatioTrigger: {
         ratioState: number;
     };
 };
+export declare const liquityV2QuotePriceTrigger: {
+    encode(market: EthereumAddress, price: number, ratioState: RatioState): string[];
+    decode(triggerData: string[]): {
+        market: string;
+        price: string;
+        ratioState: number;
+    };
+};
 export declare const closePriceTrigger: {
     encode(tokenAddr: EthereumAddress, lowerPrice: number, upperPrice: number): string[];
     decode(triggerData: string[]): {

package/esm/services/triggerService.js

@@ -351,6 +351,22 @@ export const liquityV2RatioTrigger = {
         };
     },
 };
+export const liquityV2QuotePriceTrigger = {
+    encode(market, price, ratioState) {
+        // Price is always in 18 decimals
+        const _price = new Dec(price.toString()).mul(Math.pow(10, 18)).floor().toString();
+        return [AbiCoder.encodeParameters(['address', 'uint256', 'uint8'], [market, _price, ratioState])];
+    },
+    decode(triggerData) {
+        const decodedData = AbiCoder.decodeParameters(['address', 'uint256', 'uint8'], triggerData[0]);
+        const price = new Dec(decodedData[1]).div(Math.pow(10, 18)).toDP(18).toString();
+        return {
+            market: decodedData[0],
+            price,
+            ratioState: Number(decodedData[2]),
+        };
+    },
+};
 export const closePriceTrigger = {
     encode(tokenAddr, lowerPrice, upperPrice) {
         const lowerPriceFormatted = new Dec(lowerPrice).mul(1e8).floor().toString();

package/esm/types/enums.d.ts

@@ -178,7 +178,9 @@ export declare namespace Bundles {
         AAVE_V3_REPAY_ON_PRICE = 37,
         LIQUITY_V2_REPAY = 39,
         LIQUITY_V2_BOOST = 40,
-        LIQUITY_V2_CLOSE = 41
+        LIQUITY_V2_CLOSE = 41,
+        LIQUITY_V2_REPAY_ON_PRICE = 42,
+        LIQUITY_V2_BOOST_ON_PRICE = 43
     }
     enum OptimismIds {
         AAVE_V3_REPAY = 0,

package/esm/types/enums.js

@@ -199,6 +199,8 @@ export var Bundles;
         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 = Bundles.MainnetIds || (Bundles.MainnetIds = {}));
     let OptimismIds;
     (function (OptimismIds) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/automation-sdk",
-  "version": "3.1.4-dev-2",
+  "version": "3.1.4-dev-4",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
@@ -24,8 +24,8 @@
   "license": "ISC",
   "dependencies": {
     "@defisaver/eslint-config": "^1.0.1",
-    "@defisaver/sdk": "^1.0.61",
-    "@defisaver/tokens": "^1.5.50",
+    "@defisaver/sdk": "^1.2.16-dev-liquity-v2-5",
+    "@defisaver/tokens": "^1.5.52-dev-5",
     "@ethersproject/address": "^5.0.10",
     "@ethersproject/solidity": "^5.0.9",
     "decimal.js": "^10.4.3",

package/src/constants/index.ts

@@ -391,6 +391,16 @@ export const MAINNET_BUNDLES_INFO: MainnetBundleInfo = {
     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.OpenOrderFromCollateral,
+    protocol: PROTOCOLS.LiquityV2,
+  },
+  [Bundles.MainnetIds.LIQUITY_V2_BOOST_ON_PRICE]: {
+    strategyOrBundleId: Bundles.MainnetIds.LIQUITY_V2_BOOST_ON_PRICE,
+    strategyId: Strategies.Identifiers.RepayOnPrice,
+    protocol: PROTOCOLS.LiquityV2,
+  },
 };
 
 export const OPTIMISM_BUNDLES_INFO: OptimismBundleInfo = {

package/src/services/strategiesService.ts

@@ -885,6 +885,31 @@ function parseLiquityV2CloseOnPrice(position: Position.Automated, parseData: Par
   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());
+  /// @TODO: what does even go here
+  /*
+  _position.specific = {
+    market: subData.market,
+    troveId: subData.troveId,
+    ratio: subData.targetRatio,
+    price: triggerData.price,
+    ratioState: triggerData.ratioState,
+  };
+  */
+
+  return _position;
+}
+
 const parsingMethodsMapping: StrategiesToProtocolVersionMapping = {
   [ProtocolIdentifiers.StrategiesAutomation.MakerDAO]: {
     [Strategies.Identifiers.SavingsLiqProtection]: parseMakerSavingsLiqProtection,
@@ -909,6 +934,8 @@ const parsingMethodsMapping: StrategiesToProtocolVersionMapping = {
     [Strategies.Identifiers.Repay]: parseLiquityV2LeverageManagement,
     [Strategies.Identifiers.Boost]: parseLiquityV2LeverageManagement,
     [Strategies.Identifiers.CloseOnPrice]: parseLiquityV2CloseOnPrice,
+    [Strategies.Identifiers.OpenOrderFromCollateral]: parseLiquityV2LeverageManagementOnPrice,
+    [Strategies.Identifiers.RepayOnPrice]: parseLiquityV2LeverageManagementOnPrice,
   },
   [ProtocolIdentifiers.StrategiesAutomation.AaveV2]: {
     [Strategies.Identifiers.Repay]: parseAaveV2LeverageManagement,

package/src/services/strategySubService.ts

@@ -530,22 +530,17 @@ export const liquityV2Encode = {
   leverageManagement(
     market: EthereumAddress,
     troveId: string,
+    collToken: EthereumAddress,
+    boldToken: EthereumAddress,
     ratioState: RatioState,
     targetRatio: number,
     triggerRatio: number,
     strategyOrBundleId: number,
   ) {
     const isBundle = true;
-    const isRepay = ratioState === RatioState.UNDER;
-
-    const subData = subDataService.liquityV2LeverageManagementSubData.encode(market, troveId, ratioState, targetRatio);
+    const subData = subDataService.liquityV2LeverageManagementSubData.encode(market, troveId, collToken, boldToken, ratioState, targetRatio);
     const triggerData = triggerService.liquityV2RatioTrigger.encode(market, troveId, triggerRatio, ratioState);
 
-    // TODO: we can hardcode right bundles after testing
-    // const strategyOrBundleId = ratioState === RatioState.OVER
-    //   ? Bundles.MainnetIds.LIQUITY_V2_BOOST
-    //   : Bundles.MainnetIds.LIQUITY_V2_REPAY;
-
     return [strategyOrBundleId, isBundle, triggerData, subData];
   },
   closeOnPrice(
@@ -565,9 +560,25 @@ export const liquityV2Encode = {
     const subData = subDataService.liquityV2CloseSubData.encode(market, troveId, collToken, boldToken, closeType);
     const triggerData = triggerService.closePriceTrigger.encode(collToken, stopLossPrice, takeProfitPrice);
 
-    // TODO: we can hardcode bundleID after testing
-    // Bundles.MainnetIds.LIQUITY_V2_CLOSE;
-
     return [strategyOrBundleId, isBundle, triggerData, subData];
   },
+  leverageManagementOnPrice(
+    strategyOrBundleId: number,
+    market: EthereumAddress,
+    price: number,
+    state: RatioState,
+    troveId: string,
+    collToken: EthereumAddress,
+    boldToken: EthereumAddress,
+    targetRatio: number,
+    isRepayOnPrice: boolean,
+  ) {
+    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];
+  },
 };

package/src/services/subDataService.ts

@@ -650,11 +650,15 @@ export const liquityV2LeverageManagementSubData = {
   encode: (
     market: EthereumAddress,
     troveId: string,
+    collToken: EthereumAddress,
+    boldToken: EthereumAddress,
     ratioState: RatioState,
     targetRatio: number,
   ) => {
     const marketEncoded = AbiCoder.encodeParameter('address', market);
     const troveIdEncoded = AbiCoder.encodeParameter('uint256', troveId);
+    const collTokenEncoded = AbiCoder.encodeParameter('address', collToken);
+    const boldTokenEncoded = AbiCoder.encodeParameter('address', boldToken);
     const ratioStateEncoded = AbiCoder.encodeParameter('uint8', ratioState);
     const targetRatioEncoded = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
 
@@ -665,17 +669,28 @@ export const liquityV2LeverageManagementSubData = {
     const collActionTypeEncoded = AbiCoder.encodeParameter('uint8', collActionType);
     const debtActionTypeEncoded = AbiCoder.encodeParameter('uint8', debtActionType);
 
-    return [marketEncoded, troveIdEncoded, ratioStateEncoded, targetRatioEncoded, collActionTypeEncoded, debtActionTypeEncoded];
+    return [
+      marketEncoded,
+      troveIdEncoded,
+      collTokenEncoded,
+      boldTokenEncoded,
+      ratioStateEncoded,
+      targetRatioEncoded,
+      collActionTypeEncoded,
+      debtActionTypeEncoded,
+    ];
   },
   decode: (subData: SubData) => {
     const market = AbiCoder.decodeParameter('address', subData[0]) as unknown as EthereumAddress;
     const troveId = AbiCoder.decodeParameter('uint256', subData[1]) as any as string;
-    const ratioState = AbiCoder.decodeParameter('uint8', subData[2]) as any as RatioState;
-    const weiRatio = AbiCoder.decodeParameter('uint256', subData[3]) 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;
+    const ratioState = AbiCoder.decodeParameter('uint8', subData[4]) as any as RatioState;
+    const weiRatio = AbiCoder.decodeParameter('uint256', subData[5]) as any as string;
     const targetRatio = weiToRatioPercentage(weiRatio);
 
     return {
-      market, troveId, ratioState, targetRatio,
+      market, troveId, collToken, boldToken, ratioState, targetRatio,
     };
   },
 };
@@ -694,6 +709,8 @@ export const liquityV2CloseSubData = {
     const boldTokenEncoded = AbiCoder.encodeParameter('address', boldToken);
     const wethAddress = getAssetInfo('WETH').address;
     const wethAddressEncoded = AbiCoder.encodeParameter('address', wethAddress);
+    const gasCompensation = new Dec('0.0375').mul(1e18).toString();
+    const gasCompensationEncoded = AbiCoder.encodeParameter('uint256', gasCompensation);
     const closeTypeEncoded = AbiCoder.encodeParameter('uint8', closeType);
 
     return [
@@ -702,6 +719,7 @@ export const liquityV2CloseSubData = {
       collAddrEncoded,
       boldTokenEncoded,
       wethAddressEncoded,
+      gasCompensationEncoded,
       closeTypeEncoded,
     ];
   },
@@ -716,11 +734,62 @@ export const liquityV2CloseSubData = {
     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;
+    // skip wethAddress and gasCompensation
+    const closeType = AbiCoder.decodeParameter('uint8', subData[6]) as any as CloseStrategyType;
 
     return {
       market, troveId, collToken, boldToken, closeType,
     };
   },
 };
+
+export const liquityV2LeverageManagementOnPriceSubData = {
+  encode(
+    market: EthereumAddress,
+    troveId: string,
+    collToken: EthereumAddress,
+    boldToken: EthereumAddress,
+    targetRatio: number,
+    isRepayOnPrice: boolean,
+  ): SubData {
+    const encodedMarket = AbiCoder.encodeParameter('address', market);
+    const encodedTroveId = AbiCoder.encodeParameter('uint256', troveId);
+    const encodedCollToken = AbiCoder.encodeParameter('address', collToken);
+    const encodedBoldToken = AbiCoder.encodeParameter('address', boldToken);
+    const encodedTargetRatio = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
+
+    const collActionType = isRepayOnPrice ? CollActionType.WITHDRAW : CollActionType.SUPPLY;
+    const debtActionType = isRepayOnPrice ? DebtActionType.PAYBACK : DebtActionType.BORROW;
+
+    const encodedCollActionType = AbiCoder.encodeParameter('uint8', collActionType);
+    const encodedDebtActionType = AbiCoder.encodeParameter('uint8', debtActionType);
+
+    return [
+      encodedMarket,
+      encodedTroveId,
+      encodedCollToken,
+      encodedBoldToken,
+      encodedTargetRatio,
+      encodedCollActionType,
+      encodedDebtActionType,
+    ];
+  },
+  decode(subData: SubData): {
+    market: EthereumAddress,
+    troveId: string,
+    collToken: EthereumAddress,
+    boldToken: EthereumAddress,
+    targetRatio: number,
+  } {
+    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 unknown as EthereumAddress;
+    const boldToken = AbiCoder.decodeParameter('address', subData[3]) as unknown as EthereumAddress;
+    const weiRatio = AbiCoder.decodeParameter('uint256', subData[4]) as any as string;
+    const targetRatio = weiToRatioPercentage(weiRatio);
+
+    return {
+      market, troveId, collToken, boldToken, targetRatio,
+    };
+  },
+};

package/src/services/triggerService.ts

@@ -471,6 +471,29 @@ export const liquityV2RatioTrigger = {
   },
 };
 
+export const liquityV2QuotePriceTrigger = {
+  encode(
+    market: EthereumAddress,
+    price: number,
+    ratioState: RatioState,
+  ) {
+    // Price is always in 18 decimals
+    const _price = new Dec(price.toString()).mul(10 ** 18).floor().toString();
+    return [AbiCoder.encodeParameters(['address', 'uint256', 'uint8'], [market, _price, ratioState])];
+  },
+  decode(
+    triggerData: TriggerData,
+  ) {
+    const decodedData = AbiCoder.decodeParameters(['address', 'uint256', 'uint8'], triggerData[0]);
+    const price = new Dec(decodedData[1] as string).div(10 ** 18).toDP(18).toString();
+    return {
+      market: decodedData[0] as EthereumAddress,
+      price,
+      ratioState: Number(decodedData[2]),
+    };
+  },
+};
+
 export const closePriceTrigger = {
   encode(
     tokenAddr: EthereumAddress,

package/src/types/enums.ts

@@ -194,6 +194,8 @@ export namespace Bundles {
     LIQUITY_V2_REPAY = 39,
     LIQUITY_V2_BOOST = 40,
     LIQUITY_V2_CLOSE = 41,
+    LIQUITY_V2_REPAY_ON_PRICE = 42,
+    LIQUITY_V2_BOOST_ON_PRICE = 43,
   }
 
   export enum OptimismIds {