@defisaver/automation-sdk 3.2.0 → 3.2.2

package/.env

@@ -1,5 +1,4 @@
-# Used for testing
-RPC_1=https://eth-mainnet.g.alchemy.com/v2/4jm0fn2xvapd3pDpmdE8Y1rZKEp71U0Y
-RPC_10=https://opt-mainnet.g.alchemy.com/v2/4jm0fn2xvapd3pDpmdE8Y1rZKEp71U0Y
-RPC_42161=https://arb-mainnet.g.alchemy.com/v2/4jm0fn2xvapd3pDpmdE8Y1rZKEp71U0Y
-RPC_8453=https://base-mainnet.g.alchemy.com/v2/4jm0fn2xvapd3pDpmdE8Y1rZKEp71U0Y
+RPC_1 = https://eth-mainnet.alchemyapi.io/v2/Pwh-hdbsP7Bf0CP_UMw4_Pw-NfHhSpIA
+RPC_10 = https://base-mainnet.g.alchemy.com/v2/TERsAaPNcA7sgCVHHAMBvd95UtT4wCEf
+RPC_8453 = https://arb-mainnet.alchemyapi.io/v2/Pwh-hdbsP7Bf0CP_UMw4_Pw-NfHhSpIA
+RPC_42161 = https://opt-mainnet.g.alchemy.com/v2/Pwh-hdbsP7Bf0CP_UMw4_Pw-NfHhSpIA

package/cjs/automation/private/StrategiesAutomation.js

@@ -126,7 +126,6 @@ class StrategiesAutomation extends Automation_1.default {
             }
         });
         if (mergeExtension.length > 0) {
-            console.error('Not all merge-able extensions were used', mergeExtension);
             subscriptions = [...subscriptions, ...mergeExtension.map((s) => (Object.assign(Object.assign({}, s), { subIds: [s.subId] })))];
         }
         return subscriptions;
@@ -150,10 +149,10 @@ class StrategiesAutomation extends Automation_1.default {
                 const replaceSubWithUpdate = (index) => __awaiter(this, void 0, void 0, function* () {
                     var _a;
                     const sub = strategiesSubs[index];
-                    let latestUpdate = subscriptionEvents[index].returnValues;
+                    let latestUpdate = Object.assign({}, subscriptionEvents[index].returnValues);
                     if (latestUpdate.subHash !== (sub === null || sub === void 0 ? void 0 : sub.strategySubHash)) {
                         const updates = yield this.getUpdateDataEventsFromSubStorage(Object.assign(Object.assign({}, (0, utils_1.addToObjectIf)(!!_options, _options)), { filter: { subId: latestUpdate.subId } }));
-                        latestUpdate = Object.assign(Object.assign({}, latestUpdate), (_a = updates === null || updates === void 0 ? void 0 : updates[updates.length - 1]) === null || _a === void 0 ? void 0 : _a.returnValues);
+                        latestUpdate = Object.assign(Object.assign(Object.assign({}, latestUpdate), (_a = updates === null || updates === void 0 ? void 0 : updates[updates.length - 1]) === null || _a === void 0 ? void 0 : _a.returnValues), { 2: latestUpdate[2] });
                     }
                     subscriptions.push(this.getParsedSubscriptions({
                         chainId: this.chainId,
@@ -162,12 +161,12 @@ class StrategiesAutomation extends Automation_1.default {
                         strategiesSubsData: sub,
                     }));
                 });
-                const generatePromises = function* () {
+                // eslint-disable-next-line func-names
+                const pool = new es6_promise_pool_1.default(function* () {
                     for (let index = 0; index < strategiesSubs.length; index++) {
                         yield replaceSubWithUpdate(index);
                     }
-                };
-                const pool = new es6_promise_pool_1.default(generatePromises, 50);
+                }, 50);
                 yield pool.start();
                 if (options === null || options === void 0 ? void 0 : options.mergeSubs) {
                     subscriptions = this.mergeSubs(subscriptions);

package/cjs/constants/index.js

@@ -96,6 +96,11 @@ exports.MAINNET_STRATEGIES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.Payback,
         protocol: exports.PROTOCOLS.CrvUSD,
     },
+    [enums_1.Strategies.MainnetIds.LIQUITY_V2_PAYBACK]: {
+        strategyOrBundleId: enums_1.Strategies.MainnetIds.LIQUITY_V2_PAYBACK,
+        strategyId: enums_1.Strategies.Identifiers.Payback,
+        protocol: exports.PROTOCOLS.LiquityV2,
+    },
 };
 exports.OPTIMISM_STRATEGIES_INFO = {
     [enums_1.Strategies.OptimismIds.EXCHANGE_DCA]: {
@@ -353,6 +358,46 @@ exports.MAINNET_BUNDLES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.RepayOnPrice,
         protocol: exports.PROTOCOLS.AaveV3,
     },
+    [enums_1.Bundles.MainnetIds.LIQUITY_V2_REPAY]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.LIQUITY_V2_REPAY,
+        strategyId: enums_1.Strategies.Identifiers.Repay,
+        protocol: exports.PROTOCOLS.LiquityV2,
+    },
+    [enums_1.Bundles.MainnetIds.LIQUITY_V2_BOOST]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.LIQUITY_V2_BOOST,
+        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,
+    },
+    [enums_1.Bundles.MainnetIds.LIQUITY_V2_REPAY_ON_PRICE]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.LIQUITY_V2_REPAY_ON_PRICE,
+        strategyId: enums_1.Strategies.Identifiers.RepayOnPrice,
+        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.BoostOnPrice,
+        protocol: exports.PROTOCOLS.LiquityV2,
+    },
+    [enums_1.Bundles.MainnetIds.MORPHO_BLUE_BOOST_ON_PRICE]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.MORPHO_BLUE_BOOST_ON_PRICE,
+        strategyId: enums_1.Strategies.Identifiers.BoostOnPrice,
+        protocol: exports.PROTOCOLS.MorphoBlue,
+    },
+    [enums_1.Bundles.MainnetIds.FLUID_T1_REPAY]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.FLUID_T1_REPAY,
+        strategyId: enums_1.Strategies.Identifiers.Repay,
+        protocol: exports.PROTOCOLS.FluidT1,
+    },
+    [enums_1.Bundles.MainnetIds.FLUID_T1_BOOST]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.FLUID_T1_BOOST,
+        strategyId: enums_1.Strategies.Identifiers.Boost,
+        protocol: exports.PROTOCOLS.FluidT1,
+    },
 };
 exports.OPTIMISM_BUNDLES_INFO = {
     [enums_1.Bundles.OptimismIds.AAVE_V3_REPAY]: {
@@ -437,6 +482,21 @@ exports.BASE_BUNDLES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.RepayOnPrice,
         protocol: exports.PROTOCOLS.AaveV3,
     },
+    [enums_1.Bundles.BaseIds.MORPHO_BLUE_BOOST_ON_PRICE]: {
+        strategyOrBundleId: enums_1.Bundles.BaseIds.MORPHO_BLUE_BOOST_ON_PRICE,
+        strategyId: enums_1.Strategies.Identifiers.BoostOnPrice,
+        protocol: exports.PROTOCOLS.MorphoBlue,
+    },
+    [enums_1.Bundles.BaseIds.FLUID_T1_REPAY]: {
+        strategyOrBundleId: enums_1.Bundles.BaseIds.FLUID_T1_REPAY,
+        strategyId: enums_1.Strategies.Identifiers.Repay,
+        protocol: exports.PROTOCOLS.FluidT1,
+    },
+    [enums_1.Bundles.BaseIds.FLUID_T1_BOOST]: {
+        strategyOrBundleId: enums_1.Bundles.BaseIds.FLUID_T1_BOOST,
+        strategyId: enums_1.Strategies.Identifiers.Boost,
+        protocol: exports.PROTOCOLS.FluidT1,
+    },
 };
 exports.ARBITRUM_BUNDLES_INFO = {
     [enums_1.Bundles.ArbitrumIds.AAVE_V3_REPAY]: {
@@ -479,6 +539,16 @@ exports.ARBITRUM_BUNDLES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.RepayOnPrice,
         protocol: exports.PROTOCOLS.AaveV3,
     },
+    [enums_1.Bundles.ArbitrumIds.FLUID_T1_REPAY]: {
+        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.FLUID_T1_REPAY,
+        strategyId: enums_1.Strategies.Identifiers.Repay,
+        protocol: exports.PROTOCOLS.FluidT1,
+    },
+    [enums_1.Bundles.ArbitrumIds.FLUID_T1_BOOST]: {
+        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.FLUID_T1_BOOST,
+        strategyId: enums_1.Strategies.Identifiers.Boost,
+        protocol: exports.PROTOCOLS.FluidT1,
+    },
 };
 exports.BUNDLES_INFO = {
     [enums_1.ChainId.Ethereum]: exports.MAINNET_BUNDLES_INFO,

package/cjs/services/strategiesService.js

@@ -22,15 +22,20 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseStrategiesAutomatedPosition = void 0;
 const tokens_1 = require("@defisaver/tokens");
 const lodash_1 = require("lodash");
+const web3_1 = __importDefault(require("web3"));
 const constants_1 = require("../constants");
 const enums_1 = require("../types/enums");
 const utils_1 = require("./utils");
 const subDataService = __importStar(require("./subDataService"));
 const triggerService = __importStar(require("./triggerService"));
+const web3 = new web3_1.default();
 const SPARK_MARKET_ADDRESSES = {
     [enums_1.ChainId.Ethereum]: '0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE',
 };
@@ -429,6 +434,39 @@ function parseLiquityLeverageManagement(position, parseData) {
     _position.strategy.strategyId = enums_1.Strategies.IdOverrides.LeverageManagement;
     return _position;
 }
+function parseLiquityV2LeverageManagement(position, parseData) {
+    const _position = (0, lodash_1.cloneDeep)(position);
+    const { subStruct, subId, subHash } = parseData.subscriptionEventData;
+    const { isEnabled } = parseData.strategiesSubsData;
+    const triggerData = triggerService.liquityV2RatioTrigger.decode(subStruct.triggerData);
+    const subData = subDataService.liquityV2LeverageManagementSubData.decode(subStruct.subData);
+    _position.strategyData.decoded.triggerData = triggerData;
+    _position.strategyData.decoded.subData = subData;
+    _position.positionId = (0, utils_1.getPositionId)(_position.chainId, _position.protocol.id, _position.owner, triggerData.troveId, triggerData.market);
+    const isRepay = _position.strategy.strategyId === enums_1.Strategies.Identifiers.Repay;
+    if (isRepay) {
+        _position.specific = {
+            triggerRepayRatio: triggerData.ratio,
+            targetRepayRatio: subData.targetRatio,
+            repayEnabled: isEnabled,
+            subId1: Number(subId),
+            subHashRepay: subHash,
+            mergeWithId: enums_1.Strategies.Identifiers.Boost,
+        };
+    }
+    else {
+        _position.specific = {
+            triggerBoostRatio: triggerData.ratio,
+            targetBoostRatio: subData.targetRatio,
+            boostEnabled: isEnabled,
+            subId2: Number(subId),
+            subHashBoost: subHash,
+            mergeId: enums_1.Strategies.Identifiers.Boost,
+        };
+    }
+    _position.strategy.strategyId = enums_1.Strategies.IdOverrides.LeverageManagement;
+    return _position;
+}
 function parseSparkLeverageManagement(position, parseData) {
     const _position = (0, lodash_1.cloneDeep)(position);
     const { subStruct, subId } = parseData.subscriptionEventData;
@@ -590,6 +628,32 @@ function parseMorphoBlueLeverageManagement(position, parseData) {
     _position.strategy.strategyId = isEOA ? enums_1.Strategies.IdOverrides.EoaLeverageManagement : enums_1.Strategies.IdOverrides.LeverageManagement;
     return _position;
 }
+function parseMorphoBlueLeverageManagementOnPrice(position, parseData) {
+    const _position = (0, lodash_1.cloneDeep)(position);
+    const { subStruct } = parseData.subscriptionEventData;
+    const triggerData = triggerService.morphoBluePriceTrigger.decode(subStruct.triggerData);
+    const subData = subDataService.morphoBlueLeverageManagementOnPriceSubData.decode(subStruct.subData);
+    _position.strategyData.decoded.triggerData = triggerData;
+    _position.strategyData.decoded.subData = subData;
+    _position.positionId = (0, utils_1.getPositionId)(_position.chainId, _position.protocol.id, _position.owner, Math.random());
+    const marketIdEncodedData = web3.eth.abi.encodeParameters(['address', 'address', 'address', 'address', 'uint256'], [
+        subData.loanToken,
+        subData.collToken,
+        subData.oracle,
+        subData.irm,
+        subData.lltv,
+    ]);
+    const marketId = web3.utils.keccak256(marketIdEncodedData);
+    _position.specific = {
+        subHash: _position.subHash,
+        marketId,
+        collAsset: subData.collToken,
+        debtAsset: subData.loanToken,
+        price: triggerData.price,
+        ratio: subData.targetRatio,
+    };
+    return _position;
+}
 function parseAaveV3LeverageManagementOnPrice(position, parseData) {
     const _position = (0, lodash_1.cloneDeep)(position);
     const { subStruct } = parseData.subscriptionEventData;
@@ -611,6 +675,103 @@ function parseAaveV3LeverageManagementOnPrice(position, parseData) {
     };
     return _position;
 }
+function parseLiquityV2CloseOnPrice(position, parseData) {
+    const _position = (0, lodash_1.cloneDeep)(position);
+    const { subStruct } = parseData.subscriptionEventData;
+    const triggerData = triggerService.closePriceTrigger.decode(subStruct.triggerData);
+    const subData = subDataService.liquityV2CloseSubData.decode(subStruct.subData);
+    _position.strategyData.decoded.triggerData = triggerData;
+    _position.strategyData.decoded.subData = subData;
+    _position.positionId = (0, utils_1.getPositionId)(_position.chainId, _position.protocol.id, _position.owner, subData.troveId, subData.market);
+    const { takeProfitType, stopLossType } = (0, utils_1.getStopLossAndTakeProfitTypeByCloseStrategyType)(+subData.closeType);
+    // User can have:
+    // - Only TakeProfit
+    // - Only StopLoss
+    // - Both
+    // TODO: see on frontend what specific data we need here because stop-loss and take-profit is one bundle now
+    _position.strategy.strategyId = enums_1.Strategies.Identifiers.CloseOnPrice;
+    _position.specific = {
+        market: subData.market,
+        troveId: subData.troveId,
+        stopLossPrice: triggerData.lowerPrice,
+        takeProfitPrice: triggerData.upperPrice,
+        closeToAssetAddr: triggerData.tokenAddr,
+        takeProfitType,
+        stopLossType,
+    };
+    return _position;
+}
+function parseLiquityV2LeverageManagementOnPrice(position, parseData) {
+    const _position = (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());
+    _position.specific = {
+        subHash: _position.subHash,
+        market: subData.market,
+        troveId: subData.troveId,
+        collAsset: subData.collToken,
+        debtAsset: subData.boldToken,
+        price: triggerData.price,
+        ratio: subData.targetRatio,
+        ratioState: triggerData.ratioState,
+    };
+    return _position;
+}
+function parseLiquityV2Payback(position, parseData) {
+    const _position = (0, lodash_1.cloneDeep)(position);
+    const { subStruct } = parseData.subscriptionEventData;
+    const triggerData = triggerService.liquityV2RatioTrigger.decode(subStruct.triggerData);
+    const subData = subDataService.liquityV2PaybackSubData.decode(subStruct.subData);
+    _position.strategyData.decoded.triggerData = triggerData;
+    _position.strategyData.decoded.subData = subData;
+    _position.positionId = (0, utils_1.getPositionId)(_position.chainId, _position.protocol.id, _position.owner, triggerData.troveId, triggerData.market);
+    _position.strategy.strategyId = enums_1.Strategies.Identifiers.Payback;
+    _position.specific = {
+        subHash: _position.subHash,
+        market: subData.market,
+        troveId: subData.troveId,
+        targetRatio: subData.targetRatio,
+        triggerRatio: triggerData.ratio,
+    };
+    return _position;
+}
+function parseFluidT1LeverageManagement(position, parseData) {
+    const _position = (0, lodash_1.cloneDeep)(position);
+    const { subStruct, subId, subHash } = parseData.subscriptionEventData;
+    const { isEnabled } = parseData.strategiesSubsData;
+    const triggerData = triggerService.fluidRatioTrigger.decode(subStruct.triggerData);
+    const subData = subDataService.fluidLeverageManagementSubData.decode(subStruct.subData);
+    _position.strategyData.decoded.triggerData = triggerData;
+    _position.strategyData.decoded.subData = subData;
+    _position.positionId = (0, utils_1.getPositionId)(_position.chainId, _position.protocol.id, _position.owner, triggerData.nftId, subData.vault);
+    const isRepay = _position.strategy.strategyId === enums_1.Strategies.Identifiers.Repay;
+    if (isRepay) {
+        _position.specific = {
+            triggerRepayRatio: triggerData.ratio,
+            targetRepayRatio: subData.targetRatio,
+            repayEnabled: isEnabled,
+            subId1: Number(subId),
+            subHashRepay: subHash,
+            mergeWithId: enums_1.Strategies.Identifiers.Boost,
+        };
+    }
+    else {
+        _position.specific = {
+            triggerBoostRatio: triggerData.ratio,
+            targetBoostRatio: subData.targetRatio,
+            boostEnabled: isEnabled,
+            subId2: Number(subId),
+            subHashBoost: subHash,
+            mergeId: enums_1.Strategies.Identifiers.Boost,
+        };
+    }
+    _position.strategy.strategyId = enums_1.Strategies.IdOverrides.LeverageManagement;
+    return _position;
+}
 const parsingMethodsMapping = {
     [enums_1.ProtocolIdentifiers.StrategiesAutomation.MakerDAO]: {
         [enums_1.Strategies.Identifiers.SavingsLiqProtection]: parseMakerSavingsLiqProtection,
@@ -631,6 +792,14 @@ const parsingMethodsMapping = {
         [enums_1.Strategies.Identifiers.SavingsDsrSupply]: parseLiquitySavingsLiqProtection,
         [enums_1.Strategies.Identifiers.DebtInFrontRepay]: parseLiquityDebtInFrontRepay,
     },
+    [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.Strategies.Identifiers.BoostOnPrice]: parseLiquityV2LeverageManagementOnPrice,
+        [enums_1.Strategies.Identifiers.RepayOnPrice]: parseLiquityV2LeverageManagementOnPrice,
+        [enums_1.Strategies.Identifiers.Payback]: parseLiquityV2Payback,
+    },
     [enums_1.ProtocolIdentifiers.StrategiesAutomation.AaveV2]: {
         [enums_1.Strategies.Identifiers.Repay]: parseAaveV2LeverageManagement,
         [enums_1.Strategies.Identifiers.Boost]: parseAaveV2LeverageManagement,
@@ -682,6 +851,11 @@ const parsingMethodsMapping = {
         [enums_1.Strategies.Identifiers.Boost]: parseMorphoBlueLeverageManagement,
         [enums_1.Strategies.Identifiers.EoaRepay]: parseMorphoBlueLeverageManagement,
         [enums_1.Strategies.Identifiers.EoaBoost]: parseMorphoBlueLeverageManagement,
+        [enums_1.Strategies.Identifiers.BoostOnPrice]: parseMorphoBlueLeverageManagementOnPrice,
+    },
+    [enums_1.ProtocolIdentifiers.StrategiesAutomation.FluidT1]: {
+        [enums_1.Strategies.Identifiers.Repay]: parseFluidT1LeverageManagement,
+        [enums_1.Strategies.Identifiers.Boost]: parseFluidT1LeverageManagement,
     },
 };
 function getParsingMethod(id, strategy) {

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)[];
@@ -97,4 +97,14 @@ export declare const crvUSDEncode: {
 };
 export declare const morphoBlueEncode: {
     leverageManagement(marketId: string, loanToken: EthereumAddress, collToken: EthereumAddress, oracle: EthereumAddress, irm: EthereumAddress, lltv: string, ratioState: RatioState, targetRatio: number, triggerRatio: number, user: EthereumAddress, isEOA: boolean, network: ChainId): (boolean | string[] | Bundles.MainnetIds)[] | (boolean | string[] | Bundles.BaseIds)[];
+    leverageManagementOnPrice(strategyOrBundleId: number, isBundle: boolean | undefined, loanToken: EthereumAddress, collToken: EthereumAddress, oracle: EthereumAddress, irm: EthereumAddress, lltv: string, user: EthereumAddress, targetRatio: number, price: number, priceState: RatioState): (number | boolean | string[])[];
+};
+export declare const liquityV2Encode: {
+    leverageManagement(market: EthereumAddress, troveId: string, collToken: EthereumAddress, boldToken: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number, strategyOrBundleId: number): (number | boolean | string[])[];
+    closeOnPrice(strategyOrBundleId: number, market: EthereumAddress, troveId: string, collToken: EthereumAddress, boldToken: EthereumAddress, stopLossPrice?: number, stopLossType?: CloseToAssetType, takeProfitPrice?: number, takeProfitType?: CloseToAssetType): (number | boolean | string[])[];
+    leverageManagementOnPrice(strategyOrBundleId: number, market: EthereumAddress, price: number, state: RatioState, troveId: string, collToken: EthereumAddress, boldToken: EthereumAddress, targetRatio: number, isRepayOnPrice: boolean): (number | boolean | string[])[];
+    payback(market: EthereumAddress, troveId: string, boldToken: EthereumAddress, targetRatio: number, ratioState: RatioState, triggerRatio: number): (boolean | string[] | Strategies.MainnetIds)[];
+};
+export declare const fluidEncode: {
+    leverageManagement(nftId: string, vault: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number, strategyOrBundleId: number): (number | boolean | string[])[];
 };

package/cjs/services/strategySubService.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.morphoBlueEncode = exports.crvUSDEncode = exports.sparkEncode = exports.exchangeEncode = exports.morphoAaveV2Encode = exports.compoundV3L2Encode = exports.compoundV3Encode = exports.compoundV2Encode = exports.aaveV3Encode = exports.aaveV2Encode = exports.chickenBondsEncode = exports.liquityEncode = exports.makerEncode = void 0;
+exports.fluidEncode = exports.liquityV2Encode = exports.morphoBlueEncode = exports.crvUSDEncode = exports.sparkEncode = exports.exchangeEncode = exports.morphoAaveV2Encode = exports.compoundV3L2Encode = exports.compoundV3Encode = exports.compoundV2Encode = exports.aaveV3Encode = exports.aaveV2Encode = exports.chickenBondsEncode = exports.liquityEncode = exports.makerEncode = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
 const enums_1 = require("../types/enums");
@@ -264,4 +264,45 @@ exports.morphoBlueEncode = {
         const isBundle = true;
         return [strategyOrBundleId, isBundle, triggerData, subData];
     },
+    leverageManagementOnPrice(strategyOrBundleId, isBundle = true, loanToken, collToken, oracle, irm, lltv, user, targetRatio, price, priceState) {
+        const subData = subDataService.morphoBlueLeverageManagementOnPriceSubData.encode(loanToken, collToken, oracle, irm, lltv, targetRatio, user);
+        const triggerData = triggerService.morphoBluePriceTrigger.encode(oracle, collToken, loanToken, price, priceState);
+        return [strategyOrBundleId, isBundle, triggerData, subData];
+    },
+};
+exports.liquityV2Encode = {
+    leverageManagement(market, troveId, collToken, boldToken, ratioState, targetRatio, triggerRatio, strategyOrBundleId) {
+        const isBundle = true;
+        const subData = subDataService.liquityV2LeverageManagementSubData.encode(market, troveId, collToken, boldToken, ratioState, targetRatio);
+        const triggerData = triggerService.liquityV2RatioTrigger.encode(market, troveId, triggerRatio, ratioState);
+        return [strategyOrBundleId, isBundle, triggerData, subData];
+    },
+    closeOnPrice(strategyOrBundleId, market, troveId, collToken, boldToken, stopLossPrice = 0, stopLossType = 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.closePriceTrigger.encode(collToken, stopLossPrice, takeProfitPrice);
+        return [strategyOrBundleId, isBundle, triggerData, subData];
+    },
+    leverageManagementOnPrice(strategyOrBundleId, market, price, state, troveId, collToken, boldToken, targetRatio, isRepayOnPrice) {
+        const subDataEncoded = subDataService.liquityV2LeverageManagementOnPriceSubData.encode(market, troveId, collToken, boldToken, targetRatio, isRepayOnPrice);
+        const triggerDataEncoded = triggerService.liquityV2QuotePriceTrigger.encode(market, price, state);
+        const isBundle = true;
+        return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
+    },
+    payback(market, troveId, boldToken, targetRatio, ratioState, triggerRatio) {
+        const strategyId = enums_1.Strategies.MainnetIds.LIQUITY_V2_PAYBACK;
+        const isBundle = false;
+        const subData = subDataService.liquityV2PaybackSubData.encode(market, troveId, boldToken, targetRatio, ratioState);
+        const triggerData = triggerService.liquityV2RatioTrigger.encode(market, troveId, triggerRatio, ratioState);
+        return [strategyId, isBundle, triggerData, subData];
+    },
+};
+exports.fluidEncode = {
+    leverageManagement(nftId, vault, ratioState, targetRatio, triggerRatio, strategyOrBundleId) {
+        const isBundle = true;
+        const subData = subDataService.fluidLeverageManagementSubData.encode(nftId, vault, ratioState, targetRatio);
+        const triggerData = triggerService.fluidRatioTrigger.encode(nftId, triggerRatio, ratioState);
+        return [strategyOrBundleId, isBundle, triggerData, subData];
+    },
 };

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[];
@@ -190,3 +190,65 @@ export declare const aaveV3LeverageManagementOnPriceSubData: {
         targetRatio: number;
     };
 };
+export declare const liquityV2LeverageManagementSubData: {
+    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;
+    };
+};
+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;
+    };
+};
+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;
+    };
+};
+export declare const morphoBlueLeverageManagementOnPriceSubData: {
+    encode(loanToken: EthereumAddress, collToken: EthereumAddress, oracle: EthereumAddress, irm: EthereumAddress, lltv: string, targetRatio: number, user: EthereumAddress): string[];
+    decode(subData: string[]): {
+        loanToken: string;
+        collToken: string;
+        oracle: string;
+        irm: string;
+        lltv: string;
+        targetRatio: number;
+        user: string;
+    };
+};
+export declare const liquityV2PaybackSubData: {
+    encode: (market: EthereumAddress, troveId: string, boldToken: EthereumAddress, targetRatio: number, ratioState: RatioState) => string[];
+    decode: (subData: string[]) => {
+        market: string;
+        troveId: string;
+        boldToken: string;
+        ratioState: RatioState;
+        targetRatio: number;
+    };
+};
+export declare const fluidLeverageManagementSubData: {
+    encode: (nftId: string, vault: EthereumAddress, ratioState: RatioState, targetRatio: number) => string[];
+    decode: (subData: string[]) => {
+        nftId: string;
+        vault: string;
+        ratioState: RatioState;
+        targetRatio: number;
+    };
+};