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

package/cjs/constants/index.js

@@ -117,6 +117,11 @@ exports.MAINNET_STRATEGIES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.EoaCollateralSwitch,
         protocol: exports.PROTOCOLS.AaveV4,
     },
+    [enums_1.Strategies.MainnetIds.SPARK_COLLATERAL_SWITCH]: {
+        strategyOrBundleId: enums_1.Strategies.MainnetIds.SPARK_COLLATERAL_SWITCH,
+        strategyId: enums_1.Strategies.Identifiers.CollateralSwitch,
+        protocol: exports.PROTOCOLS.Spark,
+    },
 };
 exports.OPTIMISM_STRATEGIES_INFO = {
     [enums_1.Strategies.OptimismIds.EXCHANGE_DCA]: {

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 } = parseData.subscriptionEventData;
+    const { subStruct, subId, subHash } = parseData.subscriptionEventData;
     const { isEnabled } = parseData.strategiesSubsData;
     const triggerData = triggerService.makerRatioTrigger.decode(subStruct.triggerData);
     const subData = subDataService.makerLeverageManagementSubData.decode(subStruct.subData);
@@ -104,9 +104,10 @@ function parseMakerLeverageManagement(position, parseData) {
         _position.specific = {
             triggerRepayRatio: triggerData.ratio,
             targetRepayRatio: subData.targetRatio,
-            repayEnabled: true,
+            repayEnabled: isEnabled,
             subId1: Number(subId),
             mergeWithId: enums_1.Strategies.Identifiers.Boost,
+            subHashRepay: subHash,
         };
     }
     else {
@@ -116,6 +117,7 @@ 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;
@@ -155,7 +157,7 @@ function parseLiquityTrailingStop(position, parseData) {
 }
 function parseAaveV2LeverageManagement(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.aaveV2RatioTrigger.decode(subStruct.triggerData);
     const subData = subDataService.aaveV2LeverageManagementSubData.decode(subStruct.subData);
@@ -167,9 +169,10 @@ function parseAaveV2LeverageManagement(position, parseData) {
         _position.specific = {
             triggerRepayRatio: triggerData.ratio,
             targetRepayRatio: subData.targetRatio,
-            repayEnabled: true,
+            repayEnabled: isEnabled,
             subId1: Number(subId),
             mergeWithId: enums_1.Strategies.Identifiers.Boost,
+            subHashRepay: subHash,
         };
     }
     else {
@@ -179,6 +182,7 @@ 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;
@@ -314,6 +318,16 @@ function parseAaveV3CollateralSwitch(position, parseData) {
     _position.positionId = (0, utils_1.getPositionId)(_position.chainId, _position.protocol.id, _position.owner, subData.marketAddr);
     return _position;
 }
+function parseSparkCollateralSwitch(position, parseData) {
+    const _position = (0, lodash_1.cloneDeep)(position);
+    const { subStruct } = parseData.subscriptionEventData;
+    const triggerData = triggerService.sparkQuotePriceTrigger.decode(subStruct.triggerData);
+    const subData = subDataService.sparkCollateralSwitchSubData.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.marketAddr);
+    return _position;
+}
 function parseAaveV4LeverageManagement(position, parseData) {
     const _position = (0, lodash_1.cloneDeep)(position);
     const { subStruct, subId, subHash } = parseData.subscriptionEventData;
@@ -406,7 +420,7 @@ function parseAaveV4CollateralSwitch(position, parseData) {
 }
 function parseMorphoAaveV2LeverageManagement(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.morphoAaveV2RatioTrigger.decode(subStruct.triggerData);
     const subData = subDataService.morphoAaveV2LeverageManagementSubData.decode(subStruct.subData);
@@ -418,9 +432,10 @@ function parseMorphoAaveV2LeverageManagement(position, parseData) {
         _position.specific = {
             triggerRepayRatio: triggerData.ratio,
             targetRepayRatio: subData.targetRatio,
-            repayEnabled: true,
+            repayEnabled: isEnabled,
             subId1: Number(subId),
             mergeWithId: enums_1.Strategies.Identifiers.Boost,
+            subHashRepay: subHash,
         };
     }
     else {
@@ -430,6 +445,7 @@ 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;
@@ -462,7 +478,7 @@ function parseAaveV3CloseOnPriceWithMaximumGasPrice(position, parseData) {
 }
 function parseCompoundV2LeverageManagement(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.compoundV2RatioTrigger.decode(subStruct.triggerData);
     const subData = subDataService.compoundV2LeverageManagementSubData.decode(subStruct.subData);
@@ -475,9 +491,10 @@ function parseCompoundV2LeverageManagement(position, parseData) {
         _position.specific = {
             triggerRepayRatio: triggerData.ratio,
             targetRepayRatio: subData.targetRatio,
-            repayEnabled: true,
+            repayEnabled: isEnabled,
             subId1: Number(subId),
             mergeWithId: enums_1.Strategies.Identifiers.Boost,
+            subHashRepay: subHash,
         };
     }
     else {
@@ -487,6 +504,7 @@ function parseCompoundV2LeverageManagement(position, parseData) {
             boostEnabled: isEnabled,
             subId2: Number(subId),
             mergeId: enums_1.Strategies.Identifiers.Boost,
+            subHashBoost: subHash,
         };
     }
     const isEOA = _position.strategy.strategyId.includes('eoa');
@@ -495,11 +513,9 @@ function parseCompoundV2LeverageManagement(position, parseData) {
 }
 function parseCompoundV3LeverageManagement(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 subDataDecoder = position.chainId !== 1
-        ? subDataService.compoundV3L2LeverageManagementSubData
-        : subDataService.compoundV3LeverageManagementSubData;
+    const subDataDecoder = subDataService.compoundV3LeverageManagementSubDataWithoutSubProxy;
     const triggerData = triggerService.compoundV3RatioTrigger.decode(subStruct.triggerData);
     const subData = subDataDecoder.decode(subStruct.subData);
     _position.strategyData.decoded.triggerData = triggerData;
@@ -511,9 +527,10 @@ function parseCompoundV3LeverageManagement(position, parseData) {
         _position.specific = {
             triggerRepayRatio: triggerData.ratio,
             targetRepayRatio: subData.targetRatio,
-            repayEnabled: true,
+            repayEnabled: isEnabled,
             subId1: Number(subId),
             mergeWithId: isEOA ? enums_1.Strategies.Identifiers.EoaBoost : enums_1.Strategies.Identifiers.Boost,
+            subHashRepay: subHash,
         };
     }
     else {
@@ -523,6 +540,7 @@ 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;
@@ -610,7 +628,7 @@ function parseExchangeLimitOrder(position, parseData, chainId) {
 }
 function parseLiquityLeverageManagement(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.liquityRatioTrigger.decode(subStruct.triggerData);
     const subData = subDataService.liquityLeverageManagementSubData.decode(subStruct.subData);
@@ -622,9 +640,10 @@ function parseLiquityLeverageManagement(position, parseData) {
         _position.specific = {
             triggerRepayRatio: triggerData.ratio,
             targetRepayRatio: subData.targetRatio,
-            repayEnabled: true,
+            repayEnabled: isEnabled,
             subId1: Number(subId),
             mergeWithId: enums_1.Strategies.Identifiers.Boost,
+            subHashRepay: subHash,
         };
     }
     else {
@@ -634,6 +653,7 @@ 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;
@@ -674,7 +694,7 @@ function parseLiquityV2LeverageManagement(position, parseData) {
 }
 function parseSparkLeverageManagement(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.sparkRatioTrigger.decode(subStruct.triggerData);
     const subData = subDataService.sparkLeverageManagementSubData.decode(subStruct.subData);
@@ -686,9 +706,10 @@ function parseSparkLeverageManagement(position, parseData) {
         _position.specific = {
             triggerRepayRatio: triggerData.ratio,
             targetRepayRatio: subData.targetRatio,
-            repayEnabled: true,
+            repayEnabled: isEnabled,
             subId1: Number(subId),
             mergeWithId: enums_1.Strategies.Identifiers.Boost,
+            subHashRepay: subHash,
         };
     }
     else {
@@ -698,6 +719,7 @@ 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;
@@ -880,6 +902,7 @@ function parseMorphoBlueLeverageManagementOnPrice(position, parseData) {
         debtAsset: subData.loanToken,
         price: triggerData.price,
         ratio: subData.targetRatio,
+        ratioState: triggerData.priceState,
     };
     return _position;
 }
@@ -1103,6 +1126,7 @@ const parsingMethodsMapping = {
         [enums_1.Strategies.Identifiers.RepayOnPrice]: parseSparkLeverageManagementOnPrice,
         [enums_1.Strategies.Identifiers.BoostOnPrice]: parseSparkLeverageManagementOnPrice,
         [enums_1.Strategies.Identifiers.CloseOnPrice]: parseSparkCloseOnPrice,
+        [enums_1.Strategies.Identifiers.CollateralSwitch]: parseSparkCollateralSwitch,
     },
     [enums_1.ProtocolIdentifiers.StrategiesAutomation.CrvUSD]: {
         [enums_1.Strategies.Identifiers.Repay]: parseCrvUSDLeverageManagement,

package/cjs/services/strategySubService.d.ts

@@ -5,14 +5,13 @@ 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)[];
-    leverageManagement(triggerRepayRatio: string, triggerBoostRatio: string, targetBoostRatio: string, targetRepayRatio: string, boostEnabled: boolean): (string | boolean)[];
+    leverageManagementWithoutSubProxy(strategyOrBundleId: number, user: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number): (number | boolean | string[])[];
     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)[];
@@ -21,10 +20,9 @@ export declare const chickenBondsEncode: {
     rebond(bondId: number): string[];
 };
 export declare const aaveV2Encode: {
-    leverageManagement(triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean): string[];
+    leverageManagementWithoutSubProxy(strategyOrBundleId: number, market: EthereumAddress, user: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number): (number | 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;
@@ -67,25 +65,21 @@ 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: {
-    leverageManagement(triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean): string[];
+    leverageManagementWithoutSubProxy(strategyOrBundleId: number, user: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number): (number | boolean | string[])[];
 };
 export declare const compoundV3Encode: {
-    leverageManagement(market: EthereumAddress, baseToken: EthereumAddress, triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean, isEOA: boolean): string[];
+    leverageManagementWithoutSubProxy(strategyOrBundleId: number, market: EthereumAddress, baseToken: EthereumAddress, user: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number): (number | 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)[];
-    limitOrder(fromToken: EthereumAddress, toToken: EthereumAddress, amount: string, targetPrice: string, goodUntil: string | number, orderType: OrderType): string[];
+    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)[];
 };
 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;
@@ -101,6 +95,7 @@ export declare const sparkEncode: {
     }): (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[])[];
     leverageManagementWithoutSubProxy(strategyOrBundleId: number, market: EthereumAddress, user: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number): (number | boolean | string[])[];
+    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 crvUSDEncode: {
     leverageManagement(owner: EthereumAddress, controllerAddr: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number, collTokenAddr: EthereumAddress, crvUSDAddr: EthereumAddress): (boolean | string[] | Bundles.MainnetIds)[];

package/cjs/services/strategySubService.js

@@ -22,12 +22,8 @@ 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.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"));
+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;
 const tokens_1 = require("@defisaver/tokens");
 const enums_1 = require("../types/enums");
 const constants_1 = require("../constants");
@@ -60,16 +56,6 @@ 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);
@@ -107,14 +93,11 @@ exports.liquityEncode = {
         const isBundle = true;
         return [strategyId, 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,
-        ];
+    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];
     },
     dsrPayback(proxyAddress, triggerRatio, targetRatio) {
         (0, utils_1.requireAddress)(proxyAddress);
@@ -147,24 +130,14 @@ exports.chickenBondsEncode = {
     },
 };
 exports.aaveV2Encode = {
-    leverageManagement(triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled) {
-        return subDataService.aaveV2LeverageManagementSubData.encode(triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled);
+    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];
     },
 };
 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);
@@ -213,13 +186,19 @@ exports.aaveV3Encode = {
     },
 };
 exports.compoundV2Encode = {
-    leverageManagement(triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled) {
-        return subDataService.compoundV2LeverageManagementSubData.encode(triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled);
+    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];
     },
 };
 exports.compoundV3Encode = {
-    leverageManagement(market, baseToken, triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled, isEOA) {
-        return subDataService.compoundV3LeverageManagementSubData.encode(market, baseToken, triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled, isEOA);
+    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];
     },
     leverageManagementOnPrice(strategyOrBundleId, market, collToken, baseToken, targetRatio, price, priceState, ratioState, // REPAY for repay on price, BOOST for boost on price
     user) {
@@ -236,11 +215,6 @@ 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);
@@ -254,24 +228,15 @@ exports.exchangeEncode = {
         const strategyId = constants_1.STRATEGY_IDS[network].EXCHANGE_DCA;
         return [strategyId, false, triggerData, subData];
     },
-    limitOrder(fromToken, toToken, amount, targetPrice, goodUntil, orderType) {
-        return subDataService.exchangeLimitOrderSubData.encode(fromToken, toToken, amount, targetPrice, goodUntil, orderType);
+    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];
     },
 };
 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);
@@ -292,6 +257,12 @@ exports.sparkEncode = {
         const triggerData = triggerService.sparkRatioTrigger.encode(user, market, triggerRatio, ratioState);
         return [strategyOrBundleId, isBundle, triggerData, subData];
     },
+    collateralSwitch(strategyOrBundleId, fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, baseTokenAddress, quoteTokenAddress, price, state) {
+        const isBundle = false;
+        const subDataEncoded = subDataService.sparkCollateralSwitchSubData.encode(fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch);
+        const triggerDataEncoded = triggerService.sparkQuotePriceTrigger.encode(baseTokenAddress, quoteTokenAddress, price, state);
+        return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
+    },
 };
 exports.crvUSDEncode = {
     leverageManagement(owner, controllerAddr, ratioState, targetRatio, triggerRatio, collTokenAddr, crvUSDAddr) {