@defisaver/automation-sdk 3.3.2-dev → 3.3.2-dev.1

package/cjs/constants/index.js

@@ -101,11 +101,6 @@ exports.MAINNET_STRATEGIES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.Payback,
         protocol: exports.PROTOCOLS.LiquityV2,
     },
-    [enums_1.Strategies.MainnetIds.LIQUITY_V2_INTEREST_RATE_ADJUSTMENT]: {
-        strategyOrBundleId: enums_1.Strategies.MainnetIds.LIQUITY_V2_INTEREST_RATE_ADJUSTMENT,
-        strategyId: enums_1.Strategies.Identifiers.InterestRateAdjustment,
-        protocol: exports.PROTOCOLS.LiquityV2,
-    },
 };
 exports.OPTIMISM_STRATEGIES_INFO = {
     [enums_1.Strategies.OptimismIds.EXCHANGE_DCA]: {
@@ -433,6 +428,31 @@ exports.MAINNET_BUNDLES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.EoaCloseOnPrice,
         protocol: exports.PROTOCOLS.CompoundV3,
     },
+    [enums_1.Bundles.MainnetIds.AAVE_V3_EOA_REPAY]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.AAVE_V3_EOA_REPAY,
+        strategyId: enums_1.Strategies.Identifiers.EoaRepay,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
+    [enums_1.Bundles.MainnetIds.AAVE_V3_EOA_BOOST]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.AAVE_V3_EOA_BOOST,
+        strategyId: enums_1.Strategies.Identifiers.EoaBoost,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
+    [enums_1.Bundles.MainnetIds.AAVE_V3_EOA_REPAY_ON_PRICE]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.AAVE_V3_EOA_REPAY_ON_PRICE,
+        strategyId: enums_1.Strategies.Identifiers.EoaRepayOnPrice,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
+    [enums_1.Bundles.MainnetIds.AAVE_V3_EOA_BOOST_ON_PRICE]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.AAVE_V3_EOA_BOOST_ON_PRICE,
+        strategyId: enums_1.Strategies.Identifiers.EoaBoostOnPrice,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
+    [enums_1.Bundles.MainnetIds.AAVE_V3_EOA_CLOSE]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.AAVE_V3_EOA_CLOSE,
+        strategyId: enums_1.Strategies.Identifiers.EoaCloseOnPrice,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
 };
 exports.OPTIMISM_BUNDLES_INFO = {
     [enums_1.Bundles.OptimismIds.AAVE_V3_REPAY]: {
@@ -465,6 +485,31 @@ exports.OPTIMISM_BUNDLES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.RepayOnPrice,
         protocol: exports.PROTOCOLS.AaveV3,
     },
+    [enums_1.Bundles.OptimismIds.AAVE_V3_EOA_REPAY]: {
+        strategyOrBundleId: enums_1.Bundles.OptimismIds.AAVE_V3_EOA_REPAY,
+        strategyId: enums_1.Strategies.Identifiers.EoaRepay,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
+    [enums_1.Bundles.OptimismIds.AAVE_V3_EOA_BOOST]: {
+        strategyOrBundleId: enums_1.Bundles.OptimismIds.AAVE_V3_EOA_BOOST,
+        strategyId: enums_1.Strategies.Identifiers.EoaBoost,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
+    [enums_1.Bundles.OptimismIds.AAVE_V3_EOA_REPAY_ON_PRICE]: {
+        strategyOrBundleId: enums_1.Bundles.OptimismIds.AAVE_V3_EOA_REPAY_ON_PRICE,
+        strategyId: enums_1.Strategies.Identifiers.EoaRepayOnPrice,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
+    [enums_1.Bundles.OptimismIds.AAVE_V3_EOA_BOOST_ON_PRICE]: {
+        strategyOrBundleId: enums_1.Bundles.OptimismIds.AAVE_V3_EOA_BOOST_ON_PRICE,
+        strategyId: enums_1.Strategies.Identifiers.EoaBoostOnPrice,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
+    [enums_1.Bundles.OptimismIds.AAVE_V3_EOA_CLOSE]: {
+        strategyOrBundleId: enums_1.Bundles.OptimismIds.AAVE_V3_EOA_CLOSE,
+        strategyId: enums_1.Strategies.Identifiers.EoaCloseOnPrice,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
 };
 exports.BASE_BUNDLES_INFO = {
     [enums_1.Bundles.BaseIds.AAVE_V3_REPAY]: {
@@ -572,6 +617,31 @@ exports.BASE_BUNDLES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.EoaBoost,
         protocol: exports.PROTOCOLS.CompoundV3,
     },
+    [enums_1.Bundles.BaseIds.AAVE_V3_EOA_REPAY]: {
+        strategyOrBundleId: enums_1.Bundles.BaseIds.AAVE_V3_EOA_REPAY,
+        strategyId: enums_1.Strategies.Identifiers.EoaRepay,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
+    [enums_1.Bundles.BaseIds.AAVE_V3_EOA_BOOST]: {
+        strategyOrBundleId: enums_1.Bundles.BaseIds.AAVE_V3_EOA_BOOST,
+        strategyId: enums_1.Strategies.Identifiers.EoaBoost,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
+    [enums_1.Bundles.BaseIds.AAVE_V3_EOA_REPAY_ON_PRICE]: {
+        strategyOrBundleId: enums_1.Bundles.BaseIds.AAVE_V3_EOA_REPAY_ON_PRICE,
+        strategyId: enums_1.Strategies.Identifiers.EoaRepayOnPrice,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
+    [enums_1.Bundles.BaseIds.AAVE_V3_EOA_BOOST_ON_PRICE]: {
+        strategyOrBundleId: enums_1.Bundles.BaseIds.AAVE_V3_EOA_BOOST_ON_PRICE,
+        strategyId: enums_1.Strategies.Identifiers.EoaBoostOnPrice,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
+    [enums_1.Bundles.BaseIds.AAVE_V3_EOA_CLOSE]: {
+        strategyOrBundleId: enums_1.Bundles.BaseIds.AAVE_V3_EOA_CLOSE,
+        strategyId: enums_1.Strategies.Identifiers.EoaCloseOnPrice,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
 };
 exports.ARBITRUM_BUNDLES_INFO = {
     [enums_1.Bundles.ArbitrumIds.AAVE_V3_REPAY]: {
@@ -664,6 +734,31 @@ exports.ARBITRUM_BUNDLES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.EoaBoost,
         protocol: exports.PROTOCOLS.CompoundV3,
     },
+    [enums_1.Bundles.ArbitrumIds.AAVE_V3_EOA_REPAY]: {
+        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.AAVE_V3_EOA_REPAY,
+        strategyId: enums_1.Strategies.Identifiers.EoaRepay,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
+    [enums_1.Bundles.ArbitrumIds.AAVE_V3_EOA_BOOST]: {
+        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.AAVE_V3_EOA_BOOST,
+        strategyId: enums_1.Strategies.Identifiers.EoaBoost,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
+    [enums_1.Bundles.ArbitrumIds.AAVE_V3_EOA_REPAY_ON_PRICE]: {
+        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.AAVE_V3_EOA_REPAY_ON_PRICE,
+        strategyId: enums_1.Strategies.Identifiers.EoaRepayOnPrice,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
+    [enums_1.Bundles.ArbitrumIds.AAVE_V3_EOA_BOOST_ON_PRICE]: {
+        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.AAVE_V3_EOA_BOOST_ON_PRICE,
+        strategyId: enums_1.Strategies.Identifiers.EoaBoostOnPrice,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
+    [enums_1.Bundles.ArbitrumIds.AAVE_V3_EOA_CLOSE]: {
+        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.AAVE_V3_EOA_CLOSE,
+        strategyId: enums_1.Strategies.Identifiers.EoaCloseOnPrice,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
 };
 exports.BUNDLES_INFO = {
     [enums_1.ChainId.Ethereum]: exports.MAINNET_BUNDLES_INFO,

package/cjs/index.d.ts

@@ -13,11 +13,12 @@ import * as strategiesService from './services/strategiesService';
 import * as constants from './constants';
 import * as enums from './types/enums';
 import type * as types from './types';
-import { getRatioStateInfoForAaveCloseStrategy, compareSubHashes, encodeSubId } from './services/utils';
+import { getRatioStateInfoForAaveCloseStrategy, compareSubHashes, encodeSubId, getCloseStrategyType } from './services/utils';
 declare const utils: {
     getRatioStateInfoForAaveCloseStrategy: typeof getRatioStateInfoForAaveCloseStrategy;
     compareSubHashes: typeof compareSubHashes;
     encodeSubId: typeof encodeSubId;
+    getCloseStrategyType: typeof getCloseStrategyType;
 };
 export { LegacyMakerAutomation, LegacyAaveAutomation, LegacyCompoundAutomation, EthereumStrategies, OptimismStrategies, ArbitrumStrategies, BaseStrategies, triggerService, subDataService, strategySubService, utils, enums, constants, strategiesService, };
 export type { types };

package/cjs/index.js

@@ -60,6 +60,6 @@ const enums = __importStar(require("./types/enums"));
 exports.enums = enums;
 const utils_1 = require("./services/utils");
 const utils = {
-    getRatioStateInfoForAaveCloseStrategy: utils_1.getRatioStateInfoForAaveCloseStrategy, compareSubHashes: utils_1.compareSubHashes, encodeSubId: utils_1.encodeSubId,
+    getRatioStateInfoForAaveCloseStrategy: utils_1.getRatioStateInfoForAaveCloseStrategy, compareSubHashes: utils_1.compareSubHashes, encodeSubId: utils_1.encodeSubId, getCloseStrategyType: utils_1.getCloseStrategyType,
 };
 exports.utils = utils;

package/cjs/services/strategiesService.js

@@ -189,21 +189,25 @@ function parseAaveV2LeverageManagement(position, parseData) {
 }
 function parseAaveV3LeverageManagement(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.aaveV3RatioTrigger.decode(subStruct.triggerData);
     const subData = subDataService.aaveV3LeverageManagementSubData.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.market);
-    const isRepay = _position.strategy.strategyId === enums_1.Strategies.Identifiers.Repay;
+    // TODO -> check if this change breaks something?
+    const isEOA = _position.strategy.strategyId.includes('eoa');
+    // TODO -> check if this change breaks something?
+    const isRepay = [enums_1.Strategies.Identifiers.Repay, enums_1.Strategies.Identifiers.EoaRepay].includes(_position.strategy.strategyId);
     if (isRepay) {
         _position.specific = {
             triggerRepayRatio: triggerData.ratio,
             targetRepayRatio: subData.targetRatio,
             repayEnabled: true,
             subId1: Number(subId),
-            mergeWithId: enums_1.Strategies.Identifiers.Boost,
+            subHashRepay: subHash,
+            mergeWithId: isEOA ? enums_1.Strategies.Identifiers.EoaBoost : enums_1.Strategies.Identifiers.Boost,
         };
     }
     else {
@@ -212,10 +216,11 @@ function parseAaveV3LeverageManagement(position, parseData) {
             targetBoostRatio: subData.targetRatio,
             boostEnabled: isEnabled,
             subId2: Number(subId),
-            mergeId: enums_1.Strategies.Identifiers.Boost,
+            subHashBoost: subHash,
+            mergeId: isEOA ? enums_1.Strategies.Identifiers.EoaBoost : enums_1.Strategies.Identifiers.Boost,
         };
     }
-    _position.strategy.strategyId = enums_1.Strategies.IdOverrides.LeverageManagement;
+    _position.strategy.strategyId = isEOA ? enums_1.Strategies.IdOverrides.EoaLeverageManagement : enums_1.Strategies.IdOverrides.LeverageManagement;
     return _position;
 }
 function parseMorphoAaveV2LeverageManagement(position, parseData) {
@@ -268,7 +273,13 @@ function parseAaveV3CloseOnPrice(position, parseData) {
         ratioState: triggerData.ratioState,
     };
     const { ratioState } = (0, utils_1.getRatioStateInfoForAaveCloseStrategy)(_position.specific.ratioState, (0, utils_1.wethToEthByAddress)(_position.specific.collAsset, parseData.chainId), (0, utils_1.wethToEthByAddress)(_position.specific.debtAsset, parseData.chainId), parseData.chainId);
-    _position.strategy.strategyId = (0, utils_1.isRatioStateOver)(ratioState) ? enums_1.Strategies.IdOverrides.TakeProfit : enums_1.Strategies.IdOverrides.StopLoss;
+    // TODO -> Check if those changes break something?
+    const isEOA = _position.strategy.strategyId.includes('eoa');
+    _position.strategy.strategyId = isEOA
+        ? enums_1.Strategies.Identifiers.EoaCloseOnPrice
+        : (_position.strategy.strategyId = (0, utils_1.isRatioStateOver)(ratioState)
+            ? enums_1.Strategies.IdOverrides.TakeProfit
+            : enums_1.Strategies.IdOverrides.StopLoss);
     return _position;
 }
 function parseAaveV3CloseOnPriceWithMaximumGasPrice(position, parseData) {
@@ -342,13 +353,14 @@ function parseCompoundV3LeverageManagement(position, parseData) {
     _position.strategyData.decoded.subData = subData;
     _position.positionId = (0, utils_1.getPositionId)(_position.chainId, _position.protocol.id, triggerData.owner.toLowerCase(), triggerData.market);
     const isRepay = [enums_1.Strategies.Identifiers.Repay, enums_1.Strategies.Identifiers.EoaRepay].includes(_position.strategy.strategyId);
+    const isEOA = _position.strategy.strategyId.includes('eoa');
     if (isRepay) {
         _position.specific = {
             triggerRepayRatio: triggerData.ratio,
             targetRepayRatio: subData.targetRatio,
             repayEnabled: true,
             subId1: Number(subId),
-            mergeWithId: enums_1.Strategies.Identifiers.Boost,
+            mergeWithId: isEOA ? enums_1.Strategies.Identifiers.EoaBoost : enums_1.Strategies.Identifiers.Boost,
         };
     }
     else {
@@ -357,10 +369,9 @@ function parseCompoundV3LeverageManagement(position, parseData) {
             targetBoostRatio: subData.targetRatio,
             boostEnabled: isEnabled,
             subId2: Number(subId),
-            mergeId: enums_1.Strategies.Identifiers.Boost,
+            mergeId: isEOA ? enums_1.Strategies.Identifiers.EoaBoost : enums_1.Strategies.Identifiers.Boost,
         };
     }
-    const isEOA = _position.strategy.strategyId.includes('eoa');
     _position.strategy.strategyId = isEOA ? enums_1.Strategies.IdOverrides.EoaLeverageManagement : enums_1.Strategies.IdOverrides.LeverageManagement;
     return _position;
 }
@@ -714,6 +725,9 @@ function parseAaveV3LeverageManagementOnPrice(position, parseData) {
         collAssetId: subData.collAssetId,
         ratio: subData.targetRatio,
     };
+    // TODO -> check if this change breaks something?
+    const isEOA = _position.strategy.strategyId.includes('eoa');
+    _position.strategy.strategyId = isEOA ? enums_1.Strategies.IdOverrides.EoaLeverageManagementOnPrice : enums_1.Strategies.IdOverrides.LeverageManagementOnPrice;
     return _position;
 }
 function parseLiquityV2CloseOnPrice(position, parseData) {
@@ -812,23 +826,6 @@ function parseFluidT1LeverageManagement(position, parseData) {
     _position.strategy.strategyId = enums_1.Strategies.IdOverrides.LeverageManagement;
     return _position;
 }
-function parseLiquityV2InterestRateAdjustment(position, parseData) {
-    const _position = (0, lodash_1.cloneDeep)(position);
-    const { subStruct } = parseData.subscriptionEventData;
-    const triggerData = triggerService.liquityV2InterestRateAdjustmentTrigger.decode(subStruct.triggerData);
-    const subData = subDataService.liquityV2InterestRateAdjustmentSubData.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.specific = {
-        market: subData.market,
-        troveId: subData.troveId,
-        criticalDebtInFrontLimit: triggerData.criticalDebtInFrontLimit,
-        nonCriticalDebtInFrontLimit: triggerData.nonCriticalDebtInFrontLimit,
-        interestRateChange: subData.interestRateChange,
-    };
-    return _position;
-}
 const parsingMethodsMapping = {
     [enums_1.ProtocolIdentifiers.StrategiesAutomation.MakerDAO]: {
         [enums_1.Strategies.Identifiers.SavingsLiqProtection]: parseMakerSavingsLiqProtection,
@@ -856,7 +853,6 @@ const parsingMethodsMapping = {
         [enums_1.Strategies.Identifiers.BoostOnPrice]: parseLiquityV2LeverageManagementOnPrice,
         [enums_1.Strategies.Identifiers.RepayOnPrice]: parseLiquityV2LeverageManagementOnPrice,
         [enums_1.Strategies.Identifiers.Payback]: parseLiquityV2Payback,
-        [enums_1.Strategies.Identifiers.InterestRateAdjustment]: parseLiquityV2InterestRateAdjustment,
     },
     [enums_1.ProtocolIdentifiers.StrategiesAutomation.AaveV2]: {
         [enums_1.Strategies.Identifiers.Repay]: parseAaveV2LeverageManagement,
@@ -871,6 +867,11 @@ const parsingMethodsMapping = {
         [enums_1.Strategies.Identifiers.CloseToCollateralWithGasPrice]: parseAaveV3CloseOnPriceWithMaximumGasPrice,
         [enums_1.Strategies.Identifiers.OpenOrderFromCollateral]: parseAaveV3LeverageManagementOnPrice,
         [enums_1.Strategies.Identifiers.RepayOnPrice]: parseAaveV3LeverageManagementOnPrice,
+        [enums_1.Strategies.Identifiers.EoaRepay]: parseAaveV3LeverageManagement,
+        [enums_1.Strategies.Identifiers.EoaBoost]: parseAaveV3LeverageManagement,
+        [enums_1.Strategies.Identifiers.EoaRepayOnPrice]: parseAaveV3LeverageManagementOnPrice,
+        [enums_1.Strategies.Identifiers.EoaBoostOnPrice]: parseAaveV3LeverageManagementOnPrice,
+        [enums_1.Strategies.Identifiers.EoaCloseOnPrice]: parseAaveV3CloseOnPrice,
     },
     [enums_1.ProtocolIdentifiers.StrategiesAutomation.CompoundV2]: {
         [enums_1.Strategies.Identifiers.Repay]: parseCompoundV2LeverageManagement,

package/cjs/services/strategySubService.d.ts

@@ -60,7 +60,9 @@ export declare const aaveV3Encode: {
         marketAddr: EthereumAddress;
         targetRatio: number;
     }): (number | boolean | string[])[];
-    leverageManagementWithoutSubProxy(strategyOrBundleId: number, market: EthereumAddress, user: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number): (number | boolean | string[])[];
+    leverageManagementWithoutSubProxy(strategyOrBundleId: number, market: EthereumAddress, user: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number, isGeneric?: boolean): (number | boolean | string[])[];
+    leverageManagementOnPriceGeneric(strategyOrBundleId: number, price: number, ratioState: RatioState, collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, marketAddr: EthereumAddress, targetRatio: number, user: EthereumAddress): (number | boolean | string[])[];
+    closeOnPriceGeneric(strategyOrBundleId: number, collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, marketAddr: EthereumAddress, user: EthereumAddress, stopLossPrice?: number, stopLossType?: CloseToAssetType, takeProfitPrice?: number, takeProfitType?: CloseToAssetType): (number | boolean | string[])[];
 };
 export declare const compoundV2Encode: {
     leverageManagement(triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean): string[];
@@ -107,7 +109,6 @@ export declare const liquityV2Encode: {
     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)[];
-    interestRateAdjustment(market: EthereumAddress, troveId: string, criticalDebtInFrontLimit: string, nonCriticalDebtInFrontLimit: string, interestRateChange: string): (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

@@ -175,12 +175,25 @@ exports.aaveV3Encode = {
         const triggerDataEncoded = triggerService.aaveV3QuotePriceTrigger.encode(baseTokenAddress, quoteTokenAddress, price, state);
         return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
     },
-    leverageManagementWithoutSubProxy(strategyOrBundleId, market, user, ratioState, targetRatio, triggerRatio) {
+    leverageManagementWithoutSubProxy(strategyOrBundleId, market, user, ratioState, targetRatio, triggerRatio, isGeneric = false) {
         const isBundle = true;
-        const subData = subDataService.aaveV3LeverageManagementSubDataWithoutSubProxy.encode(targetRatio, ratioState);
+        const subData = subDataService.aaveV3LeverageManagementSubDataWithoutSubProxy.encode(targetRatio, ratioState, market, user, isGeneric);
         const triggerData = triggerService.aaveV3RatioTrigger.encode(user, market, triggerRatio, ratioState);
         return [strategyOrBundleId, isBundle, triggerData, subData];
     },
+    leverageManagementOnPriceGeneric(strategyOrBundleId, price, ratioState, collAsset, collAssetId, debtAsset, debtAssetId, marketAddr, targetRatio, user) {
+        const isBundle = true;
+        const subDataEncoded = subDataService.aaveV3LeverageManagementOnPriceGeneric.encode(collAsset, collAssetId, debtAsset, debtAssetId, marketAddr, targetRatio, user);
+        const triggerDataEncoded = triggerService.aaveV3QuotePriceTrigger.encode(collAsset, debtAsset, price, ratioState);
+        return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
+    },
+    closeOnPriceGeneric(strategyOrBundleId, collAsset, collAssetId, debtAsset, debtAssetId, marketAddr, user, 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 subDataEncoded = subDataService.aaveV3CloseGenericSubData.encode(collAsset, collAssetId, debtAsset, debtAssetId, closeType, marketAddr, user);
+        const triggerDataEncoded = triggerService.aaveV3QuotePriceRangeTrigger.encode(collAsset, debtAsset, stopLossPrice, takeProfitPrice);
+        return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
+    },
 };
 exports.compoundV2Encode = {
     leverageManagement(triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled) {
@@ -317,13 +330,6 @@ exports.liquityV2Encode = {
         const triggerData = triggerService.liquityV2RatioTrigger.encode(market, troveId, triggerRatio, ratioState);
         return [strategyId, isBundle, triggerData, subData];
     },
-    interestRateAdjustment(market, troveId, criticalDebtInFrontLimit, nonCriticalDebtInFrontLimit, interestRateChange) {
-        const strategyId = enums_1.Strategies.MainnetIds.LIQUITY_V2_INTEREST_RATE_ADJUSTMENT;
-        const isBundle = false;
-        const subData = subDataService.liquityV2InterestRateAdjustmentSubData.encode(market, troveId, interestRateChange);
-        const triggerData = triggerService.liquityV2InterestRateAdjustmentTrigger.encode(market, troveId, criticalDebtInFrontLimit, nonCriticalDebtInFrontLimit);
-        return [strategyId, isBundle, triggerData, subData];
-    },
 };
 exports.fluidEncode = {
     leverageManagement(nftId, vault, ratioState, targetRatio, triggerRatio, strategyOrBundleId) {