@defisaver/automation-sdk 3.3.13-strategies-refactor-dev → 3.3.14

package/cjs/services/strategiesService.js

@@ -92,7 +92,7 @@ function parseMakerTrailingStop(position, parseData) {
 }
 function parseMakerLeverageManagement(position, parseData) {
     const _position = (0, lodash_1.cloneDeep)(position);
-    const { subStruct, subId, subHash } = parseData.subscriptionEventData;
+    const { subStruct, subId } = parseData.subscriptionEventData;
     const { isEnabled } = parseData.strategiesSubsData;
     const triggerData = triggerService.makerRatioTrigger.decode(subStruct.triggerData);
     const subData = subDataService.makerLeverageManagementSubData.decode(subStruct.subData);
@@ -104,10 +104,9 @@ function parseMakerLeverageManagement(position, parseData) {
         _position.specific = {
             triggerRepayRatio: triggerData.ratio,
             targetRepayRatio: subData.targetRatio,
-            repayEnabled: isEnabled,
+            repayEnabled: true,
             subId1: Number(subId),
             mergeWithId: enums_1.Strategies.Identifiers.Boost,
-            subHashRepay: subHash,
         };
     }
     else {
@@ -117,7 +116,6 @@ function parseMakerLeverageManagement(position, parseData) {
             boostEnabled: isEnabled,
             subId2: Number(subId),
             mergeId: enums_1.Strategies.Identifiers.Boost,
-            subHashBoost: subHash,
         };
     }
     _position.strategy.strategyId = enums_1.Strategies.IdOverrides.LeverageManagement;
@@ -157,7 +155,7 @@ function parseLiquityTrailingStop(position, parseData) {
 }
 function parseAaveV2LeverageManagement(position, parseData) {
     const _position = (0, lodash_1.cloneDeep)(position);
-    const { subStruct, subId, subHash } = parseData.subscriptionEventData;
+    const { subStruct, subId } = parseData.subscriptionEventData;
     const { isEnabled } = parseData.strategiesSubsData;
     const triggerData = triggerService.aaveV2RatioTrigger.decode(subStruct.triggerData);
     const subData = subDataService.aaveV2LeverageManagementSubData.decode(subStruct.subData);
@@ -169,10 +167,9 @@ function parseAaveV2LeverageManagement(position, parseData) {
         _position.specific = {
             triggerRepayRatio: triggerData.ratio,
             targetRepayRatio: subData.targetRatio,
-            repayEnabled: isEnabled,
+            repayEnabled: true,
             subId1: Number(subId),
             mergeWithId: enums_1.Strategies.Identifiers.Boost,
-            subHashRepay: subHash,
         };
     }
     else {
@@ -182,7 +179,6 @@ function parseAaveV2LeverageManagement(position, parseData) {
             boostEnabled: isEnabled,
             subId2: Number(subId),
             mergeId: enums_1.Strategies.Identifiers.Boost,
-            subHashBoost: subHash,
         };
     }
     _position.strategy.strategyId = enums_1.Strategies.IdOverrides.LeverageManagement;
@@ -420,7 +416,7 @@ function parseAaveV4CollateralSwitch(position, parseData) {
 }
 function parseMorphoAaveV2LeverageManagement(position, parseData) {
     const _position = (0, lodash_1.cloneDeep)(position);
-    const { subStruct, subId, subHash } = parseData.subscriptionEventData;
+    const { subStruct, subId } = parseData.subscriptionEventData;
     const { isEnabled } = parseData.strategiesSubsData;
     const triggerData = triggerService.morphoAaveV2RatioTrigger.decode(subStruct.triggerData);
     const subData = subDataService.morphoAaveV2LeverageManagementSubData.decode(subStruct.subData);
@@ -432,10 +428,9 @@ function parseMorphoAaveV2LeverageManagement(position, parseData) {
         _position.specific = {
             triggerRepayRatio: triggerData.ratio,
             targetRepayRatio: subData.targetRatio,
-            repayEnabled: isEnabled,
+            repayEnabled: true,
             subId1: Number(subId),
             mergeWithId: enums_1.Strategies.Identifiers.Boost,
-            subHashRepay: subHash,
         };
     }
     else {
@@ -445,7 +440,6 @@ function parseMorphoAaveV2LeverageManagement(position, parseData) {
             boostEnabled: isEnabled,
             subId2: Number(subId),
             mergeId: enums_1.Strategies.Identifiers.Boost,
-            subHashBoost: subHash,
         };
     }
     _position.strategy.strategyId = enums_1.Strategies.IdOverrides.LeverageManagement;
@@ -478,7 +472,7 @@ function parseAaveV3CloseOnPriceWithMaximumGasPrice(position, parseData) {
 }
 function parseCompoundV2LeverageManagement(position, parseData) {
     const _position = (0, lodash_1.cloneDeep)(position);
-    const { subStruct, subId, subHash } = parseData.subscriptionEventData;
+    const { subStruct, subId } = parseData.subscriptionEventData;
     const { isEnabled } = parseData.strategiesSubsData;
     const triggerData = triggerService.compoundV2RatioTrigger.decode(subStruct.triggerData);
     const subData = subDataService.compoundV2LeverageManagementSubData.decode(subStruct.subData);
@@ -491,10 +485,9 @@ function parseCompoundV2LeverageManagement(position, parseData) {
         _position.specific = {
             triggerRepayRatio: triggerData.ratio,
             targetRepayRatio: subData.targetRatio,
-            repayEnabled: isEnabled,
+            repayEnabled: true,
             subId1: Number(subId),
             mergeWithId: enums_1.Strategies.Identifiers.Boost,
-            subHashRepay: subHash,
         };
     }
     else {
@@ -504,7 +497,6 @@ function parseCompoundV2LeverageManagement(position, parseData) {
             boostEnabled: isEnabled,
             subId2: Number(subId),
             mergeId: enums_1.Strategies.Identifiers.Boost,
-            subHashBoost: subHash,
         };
     }
     const isEOA = _position.strategy.strategyId.includes('eoa');
@@ -513,9 +505,11 @@ function parseCompoundV2LeverageManagement(position, parseData) {
 }
 function parseCompoundV3LeverageManagement(position, parseData) {
     const _position = (0, lodash_1.cloneDeep)(position);
-    const { subStruct, subId, subHash } = parseData.subscriptionEventData;
+    const { subStruct, subId } = parseData.subscriptionEventData;
     const { isEnabled } = parseData.strategiesSubsData;
-    const subDataDecoder = subDataService.compoundV3LeverageManagementSubDataWithoutSubProxy;
+    const subDataDecoder = position.chainId !== 1
+        ? subDataService.compoundV3L2LeverageManagementSubData
+        : subDataService.compoundV3LeverageManagementSubData;
     const triggerData = triggerService.compoundV3RatioTrigger.decode(subStruct.triggerData);
     const subData = subDataDecoder.decode(subStruct.subData);
     _position.strategyData.decoded.triggerData = triggerData;
@@ -527,10 +521,9 @@ function parseCompoundV3LeverageManagement(position, parseData) {
         _position.specific = {
             triggerRepayRatio: triggerData.ratio,
             targetRepayRatio: subData.targetRatio,
-            repayEnabled: isEnabled,
+            repayEnabled: true,
             subId1: Number(subId),
             mergeWithId: isEOA ? enums_1.Strategies.Identifiers.EoaBoost : enums_1.Strategies.Identifiers.Boost,
-            subHashRepay: subHash,
         };
     }
     else {
@@ -540,7 +533,6 @@ function parseCompoundV3LeverageManagement(position, parseData) {
             boostEnabled: isEnabled,
             subId2: Number(subId),
             mergeId: isEOA ? enums_1.Strategies.Identifiers.EoaBoost : enums_1.Strategies.Identifiers.Boost,
-            subHashBoost: subHash,
         };
     }
     _position.strategy.strategyId = isEOA ? enums_1.Strategies.IdOverrides.EoaLeverageManagement : enums_1.Strategies.IdOverrides.LeverageManagement;
@@ -628,7 +620,7 @@ function parseExchangeLimitOrder(position, parseData, chainId) {
 }
 function parseLiquityLeverageManagement(position, parseData) {
     const _position = (0, lodash_1.cloneDeep)(position);
-    const { subStruct, subId, subHash } = parseData.subscriptionEventData;
+    const { subStruct, subId } = parseData.subscriptionEventData;
     const { isEnabled } = parseData.strategiesSubsData;
     const triggerData = triggerService.liquityRatioTrigger.decode(subStruct.triggerData);
     const subData = subDataService.liquityLeverageManagementSubData.decode(subStruct.subData);
@@ -640,10 +632,9 @@ function parseLiquityLeverageManagement(position, parseData) {
         _position.specific = {
             triggerRepayRatio: triggerData.ratio,
             targetRepayRatio: subData.targetRatio,
-            repayEnabled: isEnabled,
+            repayEnabled: true,
             subId1: Number(subId),
             mergeWithId: enums_1.Strategies.Identifiers.Boost,
-            subHashRepay: subHash,
         };
     }
     else {
@@ -653,7 +644,6 @@ function parseLiquityLeverageManagement(position, parseData) {
             boostEnabled: isEnabled,
             subId2: Number(subId),
             mergeId: enums_1.Strategies.Identifiers.Boost,
-            subHashBoost: subHash,
         };
     }
     _position.strategy.strategyId = enums_1.Strategies.IdOverrides.LeverageManagement;
@@ -694,7 +684,7 @@ function parseLiquityV2LeverageManagement(position, parseData) {
 }
 function parseSparkLeverageManagement(position, parseData) {
     const _position = (0, lodash_1.cloneDeep)(position);
-    const { subStruct, subId, subHash } = parseData.subscriptionEventData;
+    const { subStruct, subId } = parseData.subscriptionEventData;
     const { isEnabled } = parseData.strategiesSubsData;
     const triggerData = triggerService.sparkRatioTrigger.decode(subStruct.triggerData);
     const subData = subDataService.sparkLeverageManagementSubData.decode(subStruct.subData);
@@ -706,10 +696,9 @@ function parseSparkLeverageManagement(position, parseData) {
         _position.specific = {
             triggerRepayRatio: triggerData.ratio,
             targetRepayRatio: subData.targetRatio,
-            repayEnabled: isEnabled,
+            repayEnabled: true,
             subId1: Number(subId),
             mergeWithId: enums_1.Strategies.Identifiers.Boost,
-            subHashRepay: subHash,
         };
     }
     else {
@@ -719,7 +708,6 @@ function parseSparkLeverageManagement(position, parseData) {
             boostEnabled: isEnabled,
             subId2: Number(subId),
             mergeId: enums_1.Strategies.Identifiers.Boost,
-            subHashBoost: subHash,
         };
     }
     _position.strategy.strategyId = enums_1.Strategies.IdOverrides.LeverageManagement;
@@ -902,7 +890,6 @@ function parseMorphoBlueLeverageManagementOnPrice(position, parseData) {
         debtAsset: subData.loanToken,
         price: triggerData.price,
         ratio: subData.targetRatio,
-        ratioState: triggerData.priceState,
     };
     return _position;
 }

package/cjs/services/strategySubService.d.ts

@@ -5,13 +5,14 @@ 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)[];
     closeOnPrice(vaultId: number, ratioState: RatioState, price: string, closeToAssetAddr: EthereumAddress, chainlinkCollAddress: EthereumAddress, chainId?: ChainId, daiAddr?: EthereumAddress, mcdCdpManagerAddr?: EthereumAddress): (boolean | string[] | Strategies.MainnetIds)[];
     trailingStop(vaultId: number, triggerPercentage: number, closeToAssetAddr: EthereumAddress, chainlinkCollAddress: EthereumAddress, roundId: number, chainId?: ChainId, daiAddr?: EthereumAddress, mcdCdpManagerAddr?: EthereumAddress): (boolean | string[] | Strategies.MainnetIds)[];
+    leverageManagement(vaultId: number, triggerRepayRatio: string, triggerBoostRatio: string, targetBoostRatio: string, targetRepayRatio: string, boostEnabled: boolean): (string | number | boolean)[];
     leverageManagementWithoutSubProxy(vaultId: number, triggerRatio: number, targetRatio: number, ratioState: RatioState, isBoost: boolean, daiAddr?: EthereumAddress): (boolean | string[] | Bundles.MainnetIds)[];
 };
 export declare const liquityEncode: {
     closeOnPrice(priceOverOrUnder: RatioState, price: string, closeToAssetAddr: EthereumAddress, chainlinkCollAddress: EthereumAddress, chainId?: ChainId, collAddr?: EthereumAddress, debtAddr?: EthereumAddress): (boolean | string[] | Strategies.MainnetIds)[];
     trailingStop(triggerPercentage: number, closeToAssetAddr: EthereumAddress, chainlinkCollAddress: EthereumAddress, roundId: number, chainId?: ChainId, collAddr?: EthereumAddress, debtAddr?: EthereumAddress): (boolean | string[] | Strategies.MainnetIds)[];
     paybackFromChickenBondStrategySub(proxyAddress: EthereumAddress, ratio: number, sourceId: string, sourceType: number, ratioState?: RatioState): (boolean | string[] | Bundles.MainnetIds)[];
-    leverageManagementWithoutSubProxy(strategyOrBundleId: number, user: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number): (number | boolean | string[])[];
+    leverageManagement(triggerRepayRatio: string, triggerBoostRatio: string, targetBoostRatio: string, targetRepayRatio: string, boostEnabled: boolean): (string | boolean)[];
     dsrPayback(proxyAddress: EthereumAddress, triggerRatio: number, targetRatio: number): (boolean | string[] | Strategies.MainnetIds)[];
     dsrSupply(proxyAddress: EthereumAddress, triggerRatio: number, targetRatio: number): (boolean | string[] | Strategies.MainnetIds)[];
     debtInFrontRepay(proxyAddress: EthereumAddress, debtInFrontMin: string, targetRatioIncrease: number): (boolean | string[] | Strategies.MainnetIds)[];
@@ -20,9 +21,10 @@ export declare const chickenBondsEncode: {
     rebond(bondId: number): string[];
 };
 export declare const aaveV2Encode: {
-    leverageManagementWithoutSubProxy(strategyOrBundleId: number, market: EthereumAddress, user: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number): (number | boolean | string[])[];
+    leverageManagement(triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean): string[];
 };
 export declare const aaveV3Encode: {
+    leverageManagement(triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean): string;
     closeToAsset(strategyOrBundleId: number, isBundle: boolean | undefined, triggerData: {
         baseTokenAddress: EthereumAddress;
         quoteTokenAddress: EthereumAddress;
@@ -65,21 +67,25 @@ export declare const aaveV3Encode: {
     collateralSwitch(strategyOrBundleId: number, fromAsset: EthereumAddress, fromAssetId: number, toAsset: EthereumAddress, toAssetId: number, marketAddr: EthereumAddress, amountToSwitch: string, baseTokenAddress: EthereumAddress, quoteTokenAddress: EthereumAddress, price: number, state: RatioState): (number | boolean | string[])[];
 };
 export declare const compoundV2Encode: {
-    leverageManagementWithoutSubProxy(strategyOrBundleId: number, user: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number): (number | boolean | string[])[];
+    leverageManagement(triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean): string[];
 };
 export declare const compoundV3Encode: {
-    leverageManagementWithoutSubProxy(strategyOrBundleId: number, market: EthereumAddress, baseToken: EthereumAddress, user: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number): (number | boolean | string[])[];
+    leverageManagement(market: EthereumAddress, baseToken: EthereumAddress, triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean, isEOA: boolean): string[];
     leverageManagementOnPrice(strategyOrBundleId: number, market: EthereumAddress, collToken: EthereumAddress, baseToken: EthereumAddress, targetRatio: number, price: number, priceState: RatioState, ratioState: RatioState, user: EthereumAddress): (number | boolean | string[])[];
     closeOnPrice(strategyOrBundleId: number, market: EthereumAddress, collToken: EthereumAddress, baseToken: EthereumAddress, stopLossPrice: number | undefined, stopLossType: CloseToAssetType | undefined, takeProfitPrice: number | undefined, takeProfitType: CloseToAssetType | undefined, user: EthereumAddress): (number | boolean | string[])[];
 };
+export declare const compoundV3L2Encode: {
+    leverageManagement(market: EthereumAddress, baseToken: EthereumAddress, triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean, isEOA?: boolean): string;
+};
 export declare const morphoAaveV2Encode: {
     leverageManagement(triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean): string[];
 };
 export declare const exchangeEncode: {
     dca(fromToken: EthereumAddress, toToken: EthereumAddress, amount: string, timestamp: number, interval: number, network: ChainId): (boolean | string[] | Strategies.MainnetIds | Strategies.OptimismIds | Strategies.ArbitrumIds | Strategies.BaseIds)[];
-    limitOrderWithoutSubProxy(fromToken: EthereumAddress, toToken: EthereumAddress, amount: string, targetPrice: string, goodUntil: string | number, orderType: OrderType, fromTokenDecimals: number, toTokenDecimals: number, network: ChainId): (boolean | string[] | Strategies.MainnetIds | Strategies.OptimismIds | Strategies.ArbitrumIds | Strategies.BaseIds)[];
+    limitOrder(fromToken: EthereumAddress, toToken: EthereumAddress, amount: string, targetPrice: string, goodUntil: string | number, orderType: OrderType): string[];
 };
 export declare const sparkEncode: {
+    leverageManagement(triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean): string;
     leverageManagementOnPrice(strategyOrBundleId: number, isBundle: boolean | undefined, triggerData: {
         baseTokenAddr: EthereumAddress;
         quoteTokenAddr: EthereumAddress;

package/cjs/services/strategySubService.js

@@ -22,8 +22,12 @@ 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.aaveV4Encode = exports.fluidEncode = exports.liquityV2Encode = exports.morphoBlueEncode = exports.crvUSDEncode = exports.sparkEncode = exports.exchangeEncode = exports.morphoAaveV2Encode = exports.compoundV3Encode = exports.compoundV2Encode = exports.aaveV3Encode = exports.aaveV2Encode = exports.chickenBondsEncode = exports.liquityEncode = exports.makerEncode = void 0;
+exports.aaveV4Encode = 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");
 const constants_1 = require("../constants");
@@ -56,6 +60,16 @@ exports.makerEncode = {
         const isBundle = false;
         return [strategyOrBundleId, isBundle, triggerData, subData];
     },
+    leverageManagement(vaultId, triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled) {
+        return [
+            vaultId,
+            new decimal_js_1.default(triggerRepayRatio).mul(1e16).toString(),
+            new decimal_js_1.default(triggerBoostRatio).mul(1e16).toString(),
+            new decimal_js_1.default(targetBoostRatio).mul(1e16).toString(),
+            new decimal_js_1.default(targetRepayRatio).mul(1e16).toString(),
+            boostEnabled,
+        ];
+    },
     leverageManagementWithoutSubProxy(vaultId, triggerRatio, targetRatio, ratioState, isBoost, daiAddr) {
         const bundleId = isBoost ? enums_1.Bundles.MainnetIds.MAKER_BOOST : enums_1.Bundles.MainnetIds.MAKER_REPAY;
         const triggerData = triggerService.makerRatioTrigger.encode(vaultId, triggerRatio, ratioState);
@@ -93,11 +107,14 @@ exports.liquityEncode = {
         const isBundle = true;
         return [strategyId, isBundle, triggerData, subData];
     },
-    leverageManagementWithoutSubProxy(strategyOrBundleId, user, ratioState, targetRatio, triggerRatio) {
-        const isBundle = true;
-        const subData = subDataService.liquityLeverageManagementSubDataWithoutSubProxy.encode(targetRatio, ratioState);
-        const triggerData = triggerService.liquityRatioTrigger.encode(user, triggerRatio, ratioState);
-        return [strategyOrBundleId, isBundle, triggerData, subData];
+    leverageManagement(triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled) {
+        return [
+            new decimal_js_1.default(triggerRepayRatio).mul(1e16).toString(),
+            new decimal_js_1.default(triggerBoostRatio).mul(1e16).toString(),
+            new decimal_js_1.default(targetBoostRatio).mul(1e16).toString(),
+            new decimal_js_1.default(targetRepayRatio).mul(1e16).toString(),
+            boostEnabled,
+        ];
     },
     dsrPayback(proxyAddress, triggerRatio, targetRatio) {
         (0, utils_1.requireAddress)(proxyAddress);
@@ -130,14 +147,24 @@ exports.chickenBondsEncode = {
     },
 };
 exports.aaveV2Encode = {
-    leverageManagementWithoutSubProxy(strategyOrBundleId, market, user, ratioState, targetRatio, triggerRatio) {
-        const isBundle = true;
-        const subData = subDataService.aaveV2LeverageManagementSubDataWithoutSubProxy.encode(market, targetRatio, ratioState);
-        const triggerData = triggerService.aaveV2RatioTrigger.encode(user, market, triggerRatio, ratioState);
-        return [strategyOrBundleId, isBundle, triggerData, subData];
+    leverageManagement(triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled) {
+        return subDataService.aaveV2LeverageManagementSubData.encode(triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled);
     },
 };
 exports.aaveV3Encode = {
+    leverageManagement(triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled) {
+        let subInput = '0x';
+        subInput = subInput.concat(new decimal_js_1.default(triggerRepayRatio).mul(1e16).toHex().slice(2)
+            .padStart(32, '0'));
+        subInput = subInput.concat(new decimal_js_1.default(triggerBoostRatio).mul(1e16).toHex().slice(2)
+            .padStart(32, '0'));
+        subInput = subInput.concat(new decimal_js_1.default(targetBoostRatio).mul(1e16).toHex().slice(2)
+            .padStart(32, '0'));
+        subInput = subInput.concat(new decimal_js_1.default(targetRepayRatio).mul(1e16).toHex().slice(2)
+            .padStart(32, '0'));
+        subInput = subInput.concat(boostEnabled ? '01' : '00');
+        return subInput;
+    },
     closeToAsset(strategyOrBundleId, isBundle = true, triggerData, subData) {
         const { collAsset, collAssetId, debtAsset, debtAssetId, } = subData;
         const subDataEncoded = subDataService.aaveV3QuotePriceSubData.encode(collAsset, collAssetId, debtAsset, debtAssetId);
@@ -186,19 +213,13 @@ exports.aaveV3Encode = {
     },
 };
 exports.compoundV2Encode = {
-    leverageManagementWithoutSubProxy(strategyOrBundleId, user, ratioState, targetRatio, triggerRatio) {
-        const isBundle = true;
-        const subData = subDataService.compoundV2LeverageManagementSubDataWithoutSubProxy.encode(targetRatio, ratioState);
-        const triggerData = triggerService.compoundV2RatioTrigger.encode(user, triggerRatio, ratioState);
-        return [strategyOrBundleId, isBundle, triggerData, subData];
+    leverageManagement(triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled) {
+        return subDataService.compoundV2LeverageManagementSubData.encode(triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled);
     },
 };
 exports.compoundV3Encode = {
-    leverageManagementWithoutSubProxy(strategyOrBundleId, market, baseToken, user, ratioState, targetRatio, triggerRatio) {
-        const isBundle = true;
-        const subData = subDataService.compoundV3LeverageManagementSubDataWithoutSubProxy.encode(market, baseToken, targetRatio, ratioState);
-        const triggerData = triggerService.compoundV3RatioTrigger.encode(user, market, triggerRatio, ratioState);
-        return [strategyOrBundleId, isBundle, triggerData, subData];
+    leverageManagement(market, baseToken, triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled, isEOA) {
+        return subDataService.compoundV3LeverageManagementSubData.encode(market, baseToken, triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled, isEOA);
     },
     leverageManagementOnPrice(strategyOrBundleId, market, collToken, baseToken, targetRatio, price, priceState, ratioState, // REPAY for repay on price, BOOST for boost on price
     user) {
@@ -215,6 +236,11 @@ exports.compoundV3Encode = {
         return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
     },
 };
+exports.compoundV3L2Encode = {
+    leverageManagement(market, baseToken, triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled, isEOA = false) {
+        return subDataService.compoundV3L2LeverageManagementSubData.encode(market, baseToken, triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled, isEOA);
+    },
+};
 exports.morphoAaveV2Encode = {
     leverageManagement(triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled) {
         return subDataService.morphoAaveV2LeverageManagementSubData.encode(triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled);
@@ -228,15 +254,24 @@ exports.exchangeEncode = {
         const strategyId = constants_1.STRATEGY_IDS[network].EXCHANGE_DCA;
         return [strategyId, false, triggerData, subData];
     },
-    limitOrderWithoutSubProxy(fromToken, toToken, amount, targetPrice, goodUntil, orderType, fromTokenDecimals, toTokenDecimals, network) {
-        (0, utils_1.requireAddresses)([fromToken, toToken]);
-        const subData = subDataService.exchangeLimitOrderSubDataWithoutSubProxy.encode(fromToken, toToken, amount);
-        const triggerData = triggerService.exchangeOffchainPriceTrigger.encode(targetPrice, Number(goodUntil), orderType, fromTokenDecimals, toTokenDecimals);
-        const strategyId = constants_1.STRATEGY_IDS[network].EXCHANGE_LIMIT_ORDER;
-        return [strategyId, false, triggerData, subData];
+    limitOrder(fromToken, toToken, amount, targetPrice, goodUntil, orderType) {
+        return subDataService.exchangeLimitOrderSubData.encode(fromToken, toToken, amount, targetPrice, goodUntil, orderType);
     },
 };
 exports.sparkEncode = {
+    leverageManagement(triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled) {
+        let subInput = '0x';
+        subInput = subInput.concat(new decimal_js_1.default(triggerRepayRatio).mul(1e16).toHex().slice(2)
+            .padStart(32, '0'));
+        subInput = subInput.concat(new decimal_js_1.default(triggerBoostRatio).mul(1e16).toHex().slice(2)
+            .padStart(32, '0'));
+        subInput = subInput.concat(new decimal_js_1.default(targetBoostRatio).mul(1e16).toHex().slice(2)
+            .padStart(32, '0'));
+        subInput = subInput.concat(new decimal_js_1.default(targetRepayRatio).mul(1e16).toHex().slice(2)
+            .padStart(32, '0'));
+        subInput = subInput.concat(boostEnabled ? '01' : '00');
+        return subInput;
+    },
     leverageManagementOnPrice(strategyOrBundleId, isBundle = true, triggerData, subData) {
         const { collAsset, collAssetId, debtAsset, debtAssetId, marketAddr, targetRatio, } = subData;
         const subDataEncoded = subDataService.sparkLeverageManagementOnPriceSubData.encode(collAsset, collAssetId, debtAsset, debtAssetId, marketAddr, targetRatio);