@defisaver/automation-sdk 3.3.17 → 3.3.18-spark-eoa-dev

package/cjs/services/subDataService.d.ts

@@ -1,5 +1,5 @@
 import type { EthereumAddress } from '../types';
-import type { CloseStrategyType, OrderType } from '../types/enums';
+import type { CloseStrategyType } from '../types/enums';
 import { ChainId, RatioState } from '../types/enums';
 /**
  _______   _______ .______   .______       _______   ______     ___   .___________. _______  _______
@@ -10,13 +10,11 @@ import { ChainId, RatioState } from '../types/enums';
 |_______/ |_______|| _|      | _| `._____||_______| \______/__/     \__\  |__|     |_______||_______/
  */
 export declare const morphoAaveV2LeverageManagementSubData: {
-    encode(triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean): string[];
     decode(subData: string[]): {
         targetRatio: number;
     };
 };
 export declare const cBondsRebondSubData: {
-    encode(bondId: number | string): string[];
     decode(subData: string[]): {
         bondId: string;
     };
@@ -57,13 +55,21 @@ export declare const makerCloseSubData: {
         closeToAssetAddr: EthereumAddress;
     };
 };
-export declare const makerLeverageManagementSubData: {
+export declare const legacyMakerLeverageManagementSubData: {
     decode: (subData: string[]) => {
         vaultId: number;
         targetRatio: number;
     };
 };
-export declare const makerLeverageManagementWithoutSubProxy: {
+export declare const makerLeverageManagementSubData: {
+    encode(vaultId: number, targetRatio: number, daiAddr?: EthereumAddress): string[];
+    decode(subData: string[]): {
+        vaultId: number;
+        targetRatio: number;
+        daiAddr: string;
+    };
+};
+export declare const makerLiquidationProtectionSubData: {
     encode(vaultId: number, targetRatio: number, daiAddr?: EthereumAddress): string[];
     decode(subData: string[]): {
         vaultId: number;
@@ -84,12 +90,12 @@ export declare const liquityRepayFromSavingsSubData: {
         targetRatio: number;
     };
 };
-export declare const liquityLeverageManagementSubData: {
+export declare const legacyLiquityLeverageManagementSubData: {
     decode: (subData: string[]) => {
         targetRatio: number;
     };
 };
-export declare const liquityLeverageManagementSubDataWithoutSubProxy: {
+export declare const liquityLeverageManagementSubData: {
     encode(targetRatio: number, ratioState: RatioState): string[];
     decode(subData: string[]): {
         targetRatio: number;
@@ -178,13 +184,12 @@ export declare const liquityV2PaybackSubData: {
  /  _____  \   /  _____  \  \    /    |  |____       \    /     / /_
 /__/     \__\ /__/     \__\  \__/     |_______|       \__/     |____|
  */
-export declare const aaveV2LeverageManagementSubData: {
-    encode(triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean): string[];
+export declare const legacyAaveV2LeverageManagementSubData: {
     decode(subData: string[]): {
         targetRatio: number;
     };
 };
-export declare const aaveV2LeverageManagementSubDataWithoutSubProxy: {
+export declare const aaveV2LeverageManagementSubData: {
     encode(market: EthereumAddress, targetRatio: number, ratioState: RatioState): string[];
     decode(subData: string[]): {
         market: EthereumAddress;
@@ -200,12 +205,19 @@ export declare const aaveV2LeverageManagementSubDataWithoutSubProxy: {
  /  _____  \   /  _____  \  \    /    |  |____       \    /     ___) |
 /__/     \__\ /__/     \__\  \__/     |_______|       \__/     |____/
  */
+export declare const legacyAaveV3LeverageManagementSubData: {
+    decode(subData: string[]): {
+        targetRatio: number;
+    };
+};
 export declare const aaveV3LeverageManagementSubData: {
+    encode(targetRatio: number, ratioState: RatioState, market: EthereumAddress, user: EthereumAddress, isGeneric: boolean): string[];
     decode(subData: string[]): {
         targetRatio: number;
+        ratioState: RatioState;
     };
 };
-export declare const aaveV3LeverageManagementSubDataWithoutSubProxy: {
+export declare const aaveV3LiquidationProtectionSubData: {
     encode(targetRatio: number, ratioState: RatioState, market: EthereumAddress, user: EthereumAddress, isGeneric: boolean): string[];
     decode(subData: string[]): {
         targetRatio: number;
@@ -284,6 +296,15 @@ export declare const aaveV4LeverageManagementSubData: {
         targetRatio: number;
     };
 };
+export declare const aaveV4LiquidationProtectionSubData: {
+    encode: (spoke: EthereumAddress, owner: EthereumAddress, ratioState: RatioState, targetRatio: number) => string[];
+    decode: (subData: string[]) => {
+        spoke: string;
+        owner: string;
+        ratioState: RatioState;
+        targetRatio: number;
+    };
+};
 export declare const aaveV4LeverageManagementOnPriceSubData: {
     encode: (spoke: EthereumAddress, owner: EthereumAddress, collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, ratioState: RatioState, targetRatio: number) => string[];
     decode: (subData: string[]) => {
@@ -329,13 +350,12 @@ export declare const aaveV4CollateralSwitchSubData: {
 |  `----.|  `--'  | |  |  |  | |  |            \    /     / /_
  \______| \______/  |__|  |__| | _|             \__/     |____|
  */
-export declare const compoundV2LeverageManagementSubData: {
-    encode(triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean): string[];
+export declare const legacyCompoundV2LeverageManagementSubData: {
     decode(subData: string[]): {
         targetRatio: number;
     };
 };
-export declare const compoundV2LeverageManagementSubDataWithoutSubProxy: {
+export declare const compoundV2LeverageManagementSubData: {
     encode(targetRatio: number, ratioState: RatioState): string[];
     decode(subData: string[]): {
         targetRatio: number;
@@ -351,12 +371,15 @@ export declare const compoundV2LeverageManagementSubDataWithoutSubProxy: {
  \______| \______/  |__|  |__| | _|             \__/     |____/
  */
 export declare const compoundV3LeverageManagementSubData: {
-    encode(market: EthereumAddress, baseToken: EthereumAddress, triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean, isEOA: boolean): string[];
+    encode(market: EthereumAddress, baseToken: EthereumAddress, targetRatio: number, ratioState: RatioState): string[];
     decode(subData: string[]): {
+        market: EthereumAddress;
+        baseToken: EthereumAddress;
         targetRatio: number;
+        ratioState: RatioState;
     };
 };
-export declare const compoundV3LeverageManagementSubDataWithoutSubProxy: {
+export declare const compoundV3LiquidationProtectionSubData: {
     encode(market: EthereumAddress, baseToken: EthereumAddress, targetRatio: number, ratioState: RatioState): string[];
     decode(subData: string[]): {
         market: EthereumAddress;
@@ -403,15 +426,14 @@ export declare const exchangeDcaSubData: {
         interval: string;
     };
 };
-export declare const exchangeLimitOrderSubData: {
-    encode(fromToken: EthereumAddress, toToken: EthereumAddress, amount: string, targetPrice: string, goodUntil: string | number, orderType: OrderType): string[];
+export declare const legacyExchangeLimitOrderSubData: {
     decode: (subData: string[], chainId: ChainId) => {
         fromToken: string;
         toToken: string;
         amount: string;
     };
 };
-export declare const exchangeLimitOrderSubDataWithoutSubProxy: {
+export declare const exchangeLimitOrderSubData: {
     encode(fromToken: EthereumAddress, toToken: EthereumAddress, amount: string): string[];
     decode: (subData: string[], chainId: ChainId) => {
         fromToken: string;
@@ -427,18 +449,39 @@ export declare const exchangeLimitOrderSubDataWithoutSubProxy: {
 .----)   |   |  |     /  _____  \  |  |\  \----.|  .  \
 |_______/    | _|    /__/     \__\ | _| `._____||__|\__\
  */
+export declare const legacySparkLeverageManagementSubData: {
+    decode(subData: string[]): {
+        targetRatio: number;
+    };
+};
 export declare const sparkLeverageManagementSubData: {
+    encode(targetRatio: number, ratioState: RatioState): string[];
     decode(subData: string[]): {
         targetRatio: number;
+        ratioState: RatioState;
     };
 };
-export declare const sparkLeverageManagementSubDataWithoutSubProxy: {
+export declare const sparkLiquidationProtectionSubData: {
     encode(targetRatio: number, ratioState: RatioState): string[];
     decode(subData: string[]): {
         targetRatio: number;
         ratioState: RatioState;
     };
 };
+export declare const sparkGenericLeverageManagementSubData: {
+    encode(targetRatio: number, ratioState: RatioState, market: EthereumAddress, user: EthereumAddress): string[];
+    decode(subData: string[]): {
+        targetRatio: number;
+        ratioState: RatioState;
+    };
+};
+export declare const sparkGenericLiquidationProtectionSubData: {
+    encode(targetRatio: number, ratioState: RatioState, market: EthereumAddress, user: EthereumAddress): string[];
+    decode(subData: string[]): {
+        targetRatio: number;
+        ratioState: RatioState;
+    };
+};
 export declare const sparkCloseGenericSubData: {
     encode(collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, closeType: CloseStrategyType, marketAddr: EthereumAddress, user: EthereumAddress): string[];
     decode(subData: string[]): {
@@ -462,6 +505,18 @@ export declare const sparkLeverageManagementOnPriceSubData: {
         targetRatio: number;
     };
 };
+export declare const sparkLeverageManagementOnPriceGenericSubData: {
+    encode(collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, marketAddr: EthereumAddress, targetRatio: number, user: EthereumAddress): string[];
+    decode(subData: string[]): {
+        collAsset: string;
+        collAssetId: number;
+        debtAsset: string;
+        debtAssetId: number;
+        marketAddr: string;
+        targetRatio: number;
+        user: string;
+    };
+};
 export declare const sparkCollateralSwitchSubData: {
     encode(fromAsset: EthereumAddress, fromAssetId: number, toAsset: EthereumAddress, toAssetId: number, marketAddr: EthereumAddress, amountToSwitch: string, useOnBehalf?: boolean): string[];
     decode(subData: string[]): {
@@ -473,6 +528,18 @@ export declare const sparkCollateralSwitchSubData: {
         amountToSwitch: string;
     };
 };
+export declare const sparkGenericFLCollateralSwitchSubData: {
+    encode(fromAsset: EthereumAddress, fromAssetId: number, toAsset: EthereumAddress, toAssetId: number, marketAddr: EthereumAddress, amountToSwitch: string, user: EthereumAddress): string[];
+    decode(subData: string[]): {
+        fromAsset: EthereumAddress;
+        fromAssetId: number;
+        toAsset: EthereumAddress;
+        toAssetId: number;
+        marketAddr: EthereumAddress;
+        amountToSwitch: string;
+        user: EthereumAddress;
+    };
+};
 /**
   ______ .______     ____    ____  __    __       _______. _______
  /      ||   _  \    \   \  /   / |  |  |  |     /       ||       \
@@ -517,6 +584,18 @@ export declare const morphoBlueLeverageManagementSubData: {
         targetRatio: number;
     };
 };
+export declare const morphoBlueLiquidationProtectionSubData: {
+    encode: (loanToken: EthereumAddress, collToken: EthereumAddress, oracle: EthereumAddress, irm: EthereumAddress, lltv: string, ratioState: RatioState, targetRatio: number, user: EthereumAddress, isEOA: boolean) => string[];
+    decode: (subData: string[]) => {
+        loanToken: string;
+        collToken: string;
+        oracle: string;
+        irm: string;
+        lltv: string;
+        user: string;
+        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[]): {
@@ -558,3 +637,12 @@ export declare const fluidLeverageManagementSubData: {
         targetRatio: number;
     };
 };
+export declare const fluidLiquidationProtectionSubData: {
+    encode: (nftId: string, vault: EthereumAddress, ratioState: RatioState, targetRatio: number) => string[];
+    decode: (subData: string[]) => {
+        nftId: string;
+        vault: string;
+        ratioState: RatioState;
+        targetRatio: number;
+    };
+};

package/cjs/services/subDataService.js

@@ -3,8 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.morphoBlueCloseOnPriceSubData = exports.morphoBlueLeverageManagementOnPriceSubData = exports.morphoBlueLeverageManagementSubData = exports.crvUSDPaybackSubData = exports.crvUSDLeverageManagementSubData = exports.sparkCollateralSwitchSubData = exports.sparkLeverageManagementOnPriceSubData = exports.sparkCloseGenericSubData = exports.sparkLeverageManagementSubDataWithoutSubProxy = exports.sparkLeverageManagementSubData = exports.exchangeLimitOrderSubDataWithoutSubProxy = exports.exchangeLimitOrderSubData = exports.exchangeDcaSubData = exports.compoundV3CloseSubData = exports.compoundV3LeverageManagementOnPriceSubData = exports.compoundV3LeverageManagementSubDataWithoutSubProxy = exports.compoundV3LeverageManagementSubData = exports.compoundV2LeverageManagementSubDataWithoutSubProxy = exports.compoundV2LeverageManagementSubData = exports.aaveV4CollateralSwitchSubData = exports.aaveV4CloseSubData = exports.aaveV4LeverageManagementOnPriceSubData = exports.aaveV4LeverageManagementSubData = exports.aaveV3LeverageManagementOnPriceSubData = exports.aaveV3QuotePriceSubData = exports.aaveV3CollateralSwitchSubData = exports.aaveV3CloseGenericSubData = exports.aaveV3LeverageManagementOnPriceGeneric = exports.aaveV3LeverageManagementSubDataWithoutSubProxy = exports.aaveV3LeverageManagementSubData = exports.aaveV2LeverageManagementSubDataWithoutSubProxy = exports.aaveV2LeverageManagementSubData = exports.liquityV2PaybackSubData = exports.liquityV2LeverageManagementOnPriceSubData = exports.liquityV2CloseSubData = exports.liquityV2LeverageManagementSubData = exports.liquityDebtInFrontRepaySubData = exports.liquityDsrSupplySubData = exports.liquityDsrPaybackSubData = exports.liquityCloseSubData = exports.liquityLeverageManagementSubDataWithoutSubProxy = exports.liquityLeverageManagementSubData = exports.liquityRepayFromSavingsSubData = exports.makerLeverageManagementWithoutSubProxy = exports.makerLeverageManagementSubData = exports.makerCloseSubData = exports.makerRepayFromSavingsSubData = exports.liquityPaybackUsingChickenBondSubData = exports.cBondsRebondSubData = exports.morphoAaveV2LeverageManagementSubData = void 0;
-exports.fluidLeverageManagementSubData = void 0;
+exports.sparkLeverageManagementOnPriceSubData = exports.sparkCloseGenericSubData = exports.sparkGenericLiquidationProtectionSubData = exports.sparkGenericLeverageManagementSubData = exports.sparkLiquidationProtectionSubData = exports.sparkLeverageManagementSubData = exports.legacySparkLeverageManagementSubData = exports.exchangeLimitOrderSubData = exports.legacyExchangeLimitOrderSubData = exports.exchangeDcaSubData = exports.compoundV3CloseSubData = exports.compoundV3LeverageManagementOnPriceSubData = exports.compoundV3LiquidationProtectionSubData = exports.compoundV3LeverageManagementSubData = exports.compoundV2LeverageManagementSubData = exports.legacyCompoundV2LeverageManagementSubData = exports.aaveV4CollateralSwitchSubData = exports.aaveV4CloseSubData = exports.aaveV4LeverageManagementOnPriceSubData = exports.aaveV4LiquidationProtectionSubData = exports.aaveV4LeverageManagementSubData = exports.aaveV3LeverageManagementOnPriceSubData = exports.aaveV3QuotePriceSubData = exports.aaveV3CollateralSwitchSubData = exports.aaveV3CloseGenericSubData = exports.aaveV3LeverageManagementOnPriceGeneric = exports.aaveV3LiquidationProtectionSubData = exports.aaveV3LeverageManagementSubData = exports.legacyAaveV3LeverageManagementSubData = exports.aaveV2LeverageManagementSubData = exports.legacyAaveV2LeverageManagementSubData = exports.liquityV2PaybackSubData = exports.liquityV2LeverageManagementOnPriceSubData = exports.liquityV2CloseSubData = exports.liquityV2LeverageManagementSubData = exports.liquityDebtInFrontRepaySubData = exports.liquityDsrSupplySubData = exports.liquityDsrPaybackSubData = exports.liquityCloseSubData = exports.liquityLeverageManagementSubData = exports.legacyLiquityLeverageManagementSubData = exports.liquityRepayFromSavingsSubData = exports.makerLiquidationProtectionSubData = exports.makerLeverageManagementSubData = exports.legacyMakerLeverageManagementSubData = exports.makerCloseSubData = exports.makerRepayFromSavingsSubData = exports.liquityPaybackUsingChickenBondSubData = exports.cBondsRebondSubData = exports.morphoAaveV2LeverageManagementSubData = void 0;
+exports.fluidLiquidationProtectionSubData = exports.fluidLeverageManagementSubData = exports.morphoBlueCloseOnPriceSubData = exports.morphoBlueLeverageManagementOnPriceSubData = exports.morphoBlueLiquidationProtectionSubData = exports.morphoBlueLeverageManagementSubData = exports.crvUSDPaybackSubData = exports.crvUSDLeverageManagementSubData = exports.sparkGenericFLCollateralSwitchSubData = exports.sparkCollateralSwitchSubData = exports.sparkLeverageManagementOnPriceGenericSubData = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const web3_eth_abi_1 = __importDefault(require("web3-eth-abi"));
 const web3_utils_1 = require("web3-utils");
@@ -22,16 +22,6 @@ const utils_1 = require("./utils");
 |_______/ |_______|| _|      | _| `._____||_______| \______/__/     \__\  |__|     |_______||_______/
  */
 exports.morphoAaveV2LeverageManagementSubData = {
-    encode(triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled) {
-        return [
-            (0, utils_1.ratioPercentageToWei)(triggerRepayRatio),
-            (0, utils_1.ratioPercentageToWei)(triggerBoostRatio),
-            (0, utils_1.ratioPercentageToWei)(targetBoostRatio),
-            (0, utils_1.ratioPercentageToWei)(targetRepayRatio),
-            // @ts-ignore
-            boostEnabled,
-        ];
-    },
     decode(subData) {
         const ratioWei = web3_eth_abi_1.default.decodeParameter('uint128', subData[1]);
         const targetRatio = (0, utils_1.weiToRatioPercentage)(ratioWei);
@@ -39,10 +29,6 @@ exports.morphoAaveV2LeverageManagementSubData = {
     },
 };
 exports.cBondsRebondSubData = {
-    encode(bondId) {
-        const bondIdEncoded = web3_eth_abi_1.default.encodeParameter('uint256', bondId);
-        return [bondIdEncoded];
-    },
     decode(subData) {
         const bondId = web3_eth_abi_1.default.decodeParameter('uint256', subData[1]).toString();
         return { bondId };
@@ -124,7 +110,7 @@ exports.makerCloseSubData = {
         };
     },
 };
-exports.makerLeverageManagementSubData = {
+exports.legacyMakerLeverageManagementSubData = {
     decode: (subData) => {
         const vaultId = +web3_eth_abi_1.default.decodeParameter('uint256', subData[0]).toString();
         const weiRatio = web3_eth_abi_1.default.decodeParameter('uint256', subData[1]);
@@ -132,7 +118,7 @@ exports.makerLeverageManagementSubData = {
         return { vaultId, targetRatio };
     },
 };
-exports.makerLeverageManagementWithoutSubProxy = {
+exports.makerLeverageManagementSubData = {
     encode(vaultId, targetRatio, daiAddr) {
         const encodedVaultId = web3_eth_abi_1.default.encodeParameter('uint256', vaultId);
         const encodedTargetRatio = web3_eth_abi_1.default.encodeParameter('uint256', (0, utils_1.ratioPercentageToWei)(targetRatio));
@@ -146,6 +132,7 @@ exports.makerLeverageManagementWithoutSubProxy = {
         return { vaultId, targetRatio, daiAddr };
     },
 };
+exports.makerLiquidationProtectionSubData = exports.makerLeverageManagementSubData;
 /**
   __       __    ______      __    __   __  .___________.____    ____    ____    ____  __
 |  |     |  |  /  __  \    |  |  |  | |  | |           |\   \  /   /    \   \  /   / /_ |
@@ -161,14 +148,14 @@ exports.liquityRepayFromSavingsSubData = {
         return { targetRatio };
     },
 };
-exports.liquityLeverageManagementSubData = {
+exports.legacyLiquityLeverageManagementSubData = {
     decode: (subData) => {
         const weiRatio = web3_eth_abi_1.default.decodeParameter('uint256', subData[1]);
         const targetRatio = (0, utils_1.weiToRatioPercentage)(weiRatio);
         return { targetRatio };
     },
 };
-exports.liquityLeverageManagementSubDataWithoutSubProxy = {
+exports.liquityLeverageManagementSubData = {
     encode(targetRatio, ratioState) {
         const encodedRatioState = web3_eth_abi_1.default.encodeParameter('uint8', ratioState);
         const encodedTargetRatio = web3_eth_abi_1.default.encodeParameter('uint256', (0, utils_1.ratioPercentageToWei)(targetRatio));
@@ -399,24 +386,14 @@ exports.liquityV2PaybackSubData = {
  /  _____  \   /  _____  \  \    /    |  |____       \    /     / /_
 /__/     \__\ /__/     \__\  \__/     |_______|       \__/     |____|
  */
-exports.aaveV2LeverageManagementSubData = {
-    encode(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(),
-            // @ts-ignore // TODO
-            boostEnabled,
-        ];
-    },
+exports.legacyAaveV2LeverageManagementSubData = {
     decode(subData) {
         const ratioWei = web3_eth_abi_1.default.decodeParameter('uint256', subData[1]);
         const targetRatio = (0, utils_1.weiToRatioPercentage)(ratioWei);
         return { targetRatio };
     },
 };
-exports.aaveV2LeverageManagementSubDataWithoutSubProxy = {
+exports.aaveV2LeverageManagementSubData = {
     encode(market, targetRatio, ratioState) {
         const encodedMarket = web3_eth_abi_1.default.encodeParameter('address', market);
         const encodedTargetRatio = web3_eth_abi_1.default.encodeParameter('uint256', (0, utils_1.ratioPercentageToWei)(targetRatio));
@@ -443,14 +420,14 @@ exports.aaveV2LeverageManagementSubDataWithoutSubProxy = {
  /  _____  \   /  _____  \  \    /    |  |____       \    /     ___) |
 /__/     \__\ /__/     \__\  \__/     |_______|       \__/     |____/
  */
-exports.aaveV3LeverageManagementSubData = {
+exports.legacyAaveV3LeverageManagementSubData = {
     decode(subData) {
         const ratioWei = web3_eth_abi_1.default.decodeParameter('uint256', subData[0]);
         const targetRatio = (0, utils_1.weiToRatioPercentage)(ratioWei);
         return { targetRatio };
     },
 };
-exports.aaveV3LeverageManagementSubDataWithoutSubProxy = {
+exports.aaveV3LeverageManagementSubData = {
     encode(targetRatio, ratioState, market, user, isGeneric) {
         const encodedTargetRatio = web3_eth_abi_1.default.encodeParameter('uint256', (0, utils_1.ratioPercentageToWei)(targetRatio));
         const encodedRatioState = web3_eth_abi_1.default.encodeParameter('uint8', ratioState);
@@ -469,6 +446,7 @@ exports.aaveV3LeverageManagementSubDataWithoutSubProxy = {
         return { targetRatio, ratioState };
     },
 };
+exports.aaveV3LiquidationProtectionSubData = exports.aaveV3LeverageManagementSubData;
 exports.aaveV3LeverageManagementOnPriceGeneric = {
     encode(collAsset, collAssetId, debtAsset, debtAssetId, marketAddr, targetRatio, user) {
         const encodedColl = web3_eth_abi_1.default.encodeParameter('address', collAsset);
@@ -656,6 +634,7 @@ exports.aaveV4LeverageManagementSubData = {
         };
     },
 };
+exports.aaveV4LiquidationProtectionSubData = exports.aaveV4LeverageManagementSubData;
 exports.aaveV4LeverageManagementOnPriceSubData = {
     encode: (spoke, owner, collAsset, collAssetId, debtAsset, debtAssetId, ratioState, targetRatio) => {
         const spokeEncoded = web3_eth_abi_1.default.encodeParameter('address', spoke);
@@ -772,24 +751,14 @@ exports.aaveV4CollateralSwitchSubData = {
 |  `----.|  `--'  | |  |  |  | |  |            \    /     / /_
  \______| \______/  |__|  |__| | _|             \__/     |____|
  */
-exports.compoundV2LeverageManagementSubData = {
-    encode(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(),
-            // @ts-ignore // TODO
-            boostEnabled,
-        ];
-    },
+exports.legacyCompoundV2LeverageManagementSubData = {
     decode(subData) {
         const weiRatio = web3_eth_abi_1.default.decodeParameter('uint256', subData[0]);
         const targetRatio = (0, utils_1.weiToRatioPercentage)(weiRatio);
         return { targetRatio };
     },
 };
-exports.compoundV2LeverageManagementSubDataWithoutSubProxy = {
+exports.compoundV2LeverageManagementSubData = {
     encode(targetRatio, ratioState) {
         const encodedTargetRatio = web3_eth_abi_1.default.encodeParameter('uint256', (0, utils_1.ratioPercentageToWei)(targetRatio));
         const encodedRatioState = web3_eth_abi_1.default.encodeParameter('uint8', ratioState);
@@ -815,25 +784,6 @@ exports.compoundV2LeverageManagementSubDataWithoutSubProxy = {
  \______| \______/  |__|  |__| | _|             \__/     |____/
  */
 exports.compoundV3LeverageManagementSubData = {
-    encode(market, baseToken, triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled, isEOA) {
-        return [
-            market,
-            baseToken,
-            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(),
-            // @ts-ignore // TODO
-            boostEnabled, isEOA,
-        ];
-    },
-    decode(subData) {
-        const weiRatio = web3_eth_abi_1.default.decodeParameter('uint256', subData[3]);
-        const targetRatio = (0, utils_1.weiToRatioPercentage)(weiRatio);
-        return { targetRatio };
-    },
-};
-exports.compoundV3LeverageManagementSubDataWithoutSubProxy = {
     encode(market, baseToken, targetRatio, ratioState) {
         const encodedMarket = web3_eth_abi_1.default.encodeParameter('address', market);
         const encodedBaseToken = web3_eth_abi_1.default.encodeParameter('address', baseToken);
@@ -851,6 +801,7 @@ exports.compoundV3LeverageManagementSubDataWithoutSubProxy = {
         };
     },
 };
+exports.compoundV3LiquidationProtectionSubData = exports.compoundV3LeverageManagementSubData;
 exports.compoundV3LeverageManagementOnPriceSubData = {
     encode(market, collToken, baseToken, targetRatio, ratioState, user) {
         const marketEncoded = web3_eth_abi_1.default.encodeParameter('address', market);
@@ -936,17 +887,7 @@ exports.exchangeDcaSubData = {
         };
     },
 };
-exports.exchangeLimitOrderSubData = {
-    encode(fromToken, toToken, amount, targetPrice, goodUntil, orderType) {
-        return [
-            fromToken,
-            toToken,
-            amount,
-            targetPrice,
-            new decimal_js_1.default(goodUntil).toString(),
-            new decimal_js_1.default(orderType).toString(),
-        ];
-    },
+exports.legacyExchangeLimitOrderSubData = {
     decode: (subData, chainId) => {
         const fromToken = web3_eth_abi_1.default.decodeParameter('address', subData[0]).toString();
         const toToken = web3_eth_abi_1.default.decodeParameter('address', subData[1]).toString();
@@ -954,7 +895,7 @@ exports.exchangeLimitOrderSubData = {
         return { fromToken, toToken, amount };
     },
 };
-exports.exchangeLimitOrderSubDataWithoutSubProxy = {
+exports.exchangeLimitOrderSubData = {
     encode(fromToken, toToken, amount) {
         return [
             web3_eth_abi_1.default.encodeParameter('address', fromToken),
@@ -977,14 +918,14 @@ exports.exchangeLimitOrderSubDataWithoutSubProxy = {
 .----)   |   |  |     /  _____  \  |  |\  \----.|  .  \
 |_______/    | _|    /__/     \__\ | _| `._____||__|\__\
  */
-exports.sparkLeverageManagementSubData = {
+exports.legacySparkLeverageManagementSubData = {
     decode(subData) {
         const ratioWei = web3_eth_abi_1.default.decodeParameter('uint256', subData[0]);
         const targetRatio = (0, utils_1.weiToRatioPercentage)(ratioWei);
         return { targetRatio };
     },
 };
-exports.sparkLeverageManagementSubDataWithoutSubProxy = {
+exports.sparkLeverageManagementSubData = {
     encode(targetRatio, ratioState) {
         const encodedTargetRatio = web3_eth_abi_1.default.encodeParameter('uint256', (0, utils_1.ratioPercentageToWei)(targetRatio));
         const encodedRatioState = web3_eth_abi_1.default.encodeParameter('uint8', ratioState);
@@ -998,6 +939,22 @@ exports.sparkLeverageManagementSubDataWithoutSubProxy = {
         return { targetRatio, ratioState };
     },
 };
+exports.sparkLiquidationProtectionSubData = exports.sparkLeverageManagementSubData;
+exports.sparkGenericLeverageManagementSubData = {
+    encode(targetRatio, ratioState, market, user) {
+        const encodedTargetRatio = web3_eth_abi_1.default.encodeParameter('uint256', (0, utils_1.ratioPercentageToWei)(targetRatio));
+        const encodedRatioState = web3_eth_abi_1.default.encodeParameter('uint8', ratioState);
+        const encodedMarket = web3_eth_abi_1.default.encodeParameter('address', market);
+        const encodedUser = web3_eth_abi_1.default.encodeParameter('address', user);
+        return [encodedTargetRatio, encodedRatioState, encodedMarket, encodedUser];
+    },
+    decode(subData) {
+        const targetRatio = (0, utils_1.weiToRatioPercentage)(String(web3_eth_abi_1.default.decodeParameter('uint256', subData[0])));
+        const ratioState = Number(web3_eth_abi_1.default.decodeParameter('uint8', subData[1]));
+        return { targetRatio, ratioState };
+    },
+};
+exports.sparkGenericLiquidationProtectionSubData = exports.sparkGenericLeverageManagementSubData;
 exports.sparkCloseGenericSubData = {
     encode(collAsset, collAssetId, debtAsset, debtAssetId, closeType, marketAddr, user) {
         const encodedColl = web3_eth_abi_1.default.encodeParameter('address', collAsset);
@@ -1054,6 +1011,33 @@ exports.sparkLeverageManagementOnPriceSubData = {
         };
     },
 };
+exports.sparkLeverageManagementOnPriceGenericSubData = {
+    encode(collAsset, collAssetId, debtAsset, debtAssetId, marketAddr, targetRatio, user) {
+        const encodedColl = web3_eth_abi_1.default.encodeParameter('address', collAsset);
+        const encodedCollId = web3_eth_abi_1.default.encodeParameter('uint16', collAssetId);
+        const encodedDebt = web3_eth_abi_1.default.encodeParameter('address', debtAsset);
+        const encodedDebtId = web3_eth_abi_1.default.encodeParameter('uint16', debtAssetId);
+        const encodedMarket = web3_eth_abi_1.default.encodeParameter('address', marketAddr);
+        const encodedTargetRatio = web3_eth_abi_1.default.encodeParameter('uint256', (0, utils_1.ratioPercentageToWei)(targetRatio));
+        const encodedUser = web3_eth_abi_1.default.encodeParameter('address', user);
+        return [
+            encodedColl, encodedCollId, encodedDebt, encodedDebtId,
+            encodedMarket, encodedTargetRatio, encodedUser,
+        ];
+    },
+    decode(subData) {
+        const collAsset = web3_eth_abi_1.default.decodeParameter('address', subData[0]);
+        const collAssetId = Number(web3_eth_abi_1.default.decodeParameter('uint16', subData[1]));
+        const debtAsset = web3_eth_abi_1.default.decodeParameter('address', subData[2]);
+        const debtAssetId = Number(web3_eth_abi_1.default.decodeParameter('uint16', subData[3]));
+        const marketAddr = web3_eth_abi_1.default.decodeParameter('address', subData[4]);
+        const targetRatio = (0, utils_1.weiToRatioPercentage)(String(web3_eth_abi_1.default.decodeParameter('uint256', subData[5])));
+        const user = web3_eth_abi_1.default.decodeParameter('address', subData[6]);
+        return {
+            collAsset, collAssetId, debtAsset, debtAssetId, marketAddr, targetRatio, user,
+        };
+    },
+};
 exports.sparkCollateralSwitchSubData = {
     encode(fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, useOnBehalf = false) {
         const encodedFromAsset = web3_eth_abi_1.default.encodeParameter('address', fromAsset);
@@ -1085,6 +1069,38 @@ exports.sparkCollateralSwitchSubData = {
         };
     },
 };
+exports.sparkGenericFLCollateralSwitchSubData = {
+    encode(fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, user) {
+        const encodedFromAsset = web3_eth_abi_1.default.encodeParameter('address', fromAsset);
+        const encodedFromAssetId = web3_eth_abi_1.default.encodeParameter('uint16', fromAssetId);
+        const encodedToAsset = web3_eth_abi_1.default.encodeParameter('address', toAsset);
+        const encodedToAssetId = web3_eth_abi_1.default.encodeParameter('uint16', toAssetId);
+        const encodedMarketAddr = web3_eth_abi_1.default.encodeParameter('address', marketAddr);
+        const encodedAmountToSwitch = web3_eth_abi_1.default.encodeParameter('uint256', amountToSwitch);
+        const encodedUser = web3_eth_abi_1.default.encodeParameter('address', user);
+        return [
+            encodedFromAsset,
+            encodedFromAssetId,
+            encodedToAsset,
+            encodedToAssetId,
+            encodedMarketAddr,
+            encodedAmountToSwitch,
+            encodedUser,
+        ];
+    },
+    decode(subData) {
+        const fromAsset = web3_eth_abi_1.default.decodeParameter('address', subData[0]);
+        const fromAssetId = Number(web3_eth_abi_1.default.decodeParameter('uint16', subData[1]));
+        const toAsset = web3_eth_abi_1.default.decodeParameter('address', subData[2]);
+        const toAssetId = Number(web3_eth_abi_1.default.decodeParameter('uint16', subData[3]));
+        const marketAddr = web3_eth_abi_1.default.decodeParameter('address', subData[4]);
+        const amountToSwitch = web3_eth_abi_1.default.decodeParameter('uint256', subData[5]);
+        const user = web3_eth_abi_1.default.decodeParameter('address', subData[6]);
+        return {
+            fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, user,
+        };
+    },
+};
 /**
   ______ .______     ____    ____  __    __       _______. _______
  /      ||   _  \    \   \  /   / |  |  |  |     /       ||       \
@@ -1179,6 +1195,7 @@ exports.morphoBlueLeverageManagementSubData = {
         };
     },
 };
+exports.morphoBlueLiquidationProtectionSubData = exports.morphoBlueLeverageManagementSubData;
 exports.morphoBlueLeverageManagementOnPriceSubData = {
     encode(loanToken, collToken, oracle, irm, lltv, targetRatio, user) {
         const loanTokenEncoded = web3_eth_abi_1.default.encodeParameter('address', loanToken);
@@ -1281,3 +1298,4 @@ exports.fluidLeverageManagementSubData = {
         };
     },
 };
+exports.fluidLiquidationProtectionSubData = exports.fluidLeverageManagementSubData;