@defisaver/automation-sdk 3.3.14 → 3.3.15-liq-prot-1-dev

package/cjs/services/subDataService.d.ts

@@ -71,6 +71,14 @@ export declare const makerLeverageManagementWithoutSubProxy: {
         daiAddr: string;
     };
 };
+export declare const makerLiquidationProtectionSubData: {
+    encode(vaultId: number, targetRatio: number, daiAddr?: EthereumAddress): string[];
+    decode(subData: string[]): {
+        vaultId: number;
+        targetRatio: number;
+        daiAddr: string;
+    };
+};
 /**
   __       __    ______      __    __   __  .___________.____    ____    ____    ____  __
 |  |     |  |  /  __  \    |  |  |  | |  | |           |\   \  /   /    \   \  /   / /_ |
@@ -89,6 +97,13 @@ export declare const liquityLeverageManagementSubData: {
         targetRatio: number;
     };
 };
+export declare const liquityLeverageManagementSubDataWithoutSubProxy: {
+    encode(targetRatio: number, ratioState: RatioState): string[];
+    decode(subData: string[]): {
+        targetRatio: number;
+        ratioState: RatioState;
+    };
+};
 export declare const liquityCloseSubData: {
     encode(closeToAssetAddr: EthereumAddress, chainId?: ChainId, collAddr?: EthereumAddress, debtAddr?: EthereumAddress): string[];
     decode(subData: string[]): {
@@ -177,6 +192,14 @@ export declare const aaveV2LeverageManagementSubData: {
         targetRatio: number;
     };
 };
+export declare const aaveV2LeverageManagementSubDataWithoutSubProxy: {
+    encode(market: EthereumAddress, targetRatio: number, ratioState: RatioState): string[];
+    decode(subData: string[]): {
+        market: EthereumAddress;
+        targetRatio: number;
+        ratioState: RatioState;
+    };
+};
 /**
      ___           ___   ____    ____  _______    ____    ____  ____
     /   \         /   \  \   \  /   / |   ____|   \   \  /   / |___ \
@@ -197,6 +220,13 @@ export declare const aaveV3LeverageManagementSubDataWithoutSubProxy: {
         ratioState: RatioState;
     };
 };
+export declare const aaveV3LiquidationProtectionSubData: {
+    encode(targetRatio: number, ratioState: RatioState, market: EthereumAddress, user: EthereumAddress): string[];
+    decode(subData: string[]): {
+        targetRatio: number;
+        ratioState: RatioState;
+    };
+};
 export declare const aaveV3LeverageManagementOnPriceGeneric: {
     encode(collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, marketAddr: EthereumAddress, targetRatio: number, user: EthereumAddress): string[];
     decode(subData: string[]): {
@@ -269,6 +299,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[]) => {
@@ -320,6 +359,13 @@ export declare const compoundV2LeverageManagementSubData: {
         targetRatio: number;
     };
 };
+export declare const compoundV2LeverageManagementSubDataWithoutSubProxy: {
+    encode(targetRatio: number, ratioState: RatioState): string[];
+    decode(subData: string[]): {
+        targetRatio: number;
+        ratioState: RatioState;
+    };
+};
 /**
   ______   ______   .___  ___. .______      ____    ____  ____
  /      | /  __  \  |   \/   | |   _  \     \   \  /   / |___ \
@@ -328,16 +374,22 @@ export declare const compoundV2LeverageManagementSubData: {
 |  `----.|  `--'  | |  |  |  | |  |            \    /     ___) |
  \______| \______/  |__|  |__| | _|             \__/     |____/
  */
-export declare const compoundV3LeverageManagementSubData: {
-    encode(market: EthereumAddress, baseToken: EthereumAddress, triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean, isEOA: boolean): string[];
+export declare const compoundV3LeverageManagementSubDataWithoutSubProxy: {
+    encode(market: EthereumAddress, baseToken: EthereumAddress, targetRatio: number, ratioState: RatioState): string[];
     decode(subData: string[]): {
+        market: EthereumAddress;
+        baseToken: EthereumAddress;
         targetRatio: number;
+        ratioState: RatioState;
     };
 };
-export declare const compoundV3L2LeverageManagementSubData: {
-    encode(market: EthereumAddress, baseToken: EthereumAddress, triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean, isEOA: boolean): string;
+export declare const compoundV3LiquidationProtectionSubDataWithoutSubProxy: {
+    encode(market: EthereumAddress, baseToken: EthereumAddress, targetRatio: number, ratioState: RatioState): string[];
     decode(subData: string[]): {
+        market: EthereumAddress;
+        baseToken: EthereumAddress;
         targetRatio: number;
+        ratioState: RatioState;
     };
 };
 export declare const compoundV3LeverageManagementOnPriceSubData: {
@@ -386,6 +438,14 @@ export declare const exchangeLimitOrderSubData: {
         amount: string;
     };
 };
+export declare const exchangeLimitOrderSubDataWithoutSubProxy: {
+    encode(fromToken: EthereumAddress, toToken: EthereumAddress, amount: string): string[];
+    decode: (subData: string[], chainId: ChainId) => {
+        fromToken: string;
+        toToken: string;
+        amount: string;
+    };
+};
 /**
      _______..______      ___      .______       __  ___
     /       ||   _  \    /   \     |   _  \     |  |/  /
@@ -406,6 +466,13 @@ export declare const sparkLeverageManagementSubDataWithoutSubProxy: {
         ratioState: RatioState;
     };
 };
+export declare const sparkLiquidationProtectionSubData: {
+    encode(targetRatio: number, ratioState: RatioState): 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[]): {
@@ -484,6 +551,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[]): {
@@ -525,3 +604,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,7 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fluidLeverageManagementSubData = exports.morphoBlueCloseOnPriceSubData = exports.morphoBlueLeverageManagementOnPriceSubData = exports.morphoBlueLeverageManagementSubData = exports.crvUSDPaybackSubData = exports.crvUSDLeverageManagementSubData = exports.sparkCollateralSwitchSubData = exports.sparkLeverageManagementOnPriceSubData = exports.sparkCloseGenericSubData = exports.sparkLeverageManagementSubDataWithoutSubProxy = exports.sparkLeverageManagementSubData = exports.exchangeLimitOrderSubData = exports.exchangeDcaSubData = exports.compoundV3CloseSubData = exports.compoundV3LeverageManagementOnPriceSubData = exports.compoundV3L2LeverageManagementSubData = exports.compoundV3LeverageManagementSubData = 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.aaveV2LeverageManagementSubData = exports.liquityV2PaybackSubData = exports.liquityV2LeverageManagementOnPriceSubData = exports.liquityV2CloseSubData = exports.liquityV2LeverageManagementSubData = exports.liquityDebtInFrontRepaySubData = exports.liquityDsrSupplySubData = exports.liquityDsrPaybackSubData = exports.liquityCloseSubData = exports.liquityLeverageManagementSubData = exports.liquityRepayFromSavingsSubData = exports.makerLeverageManagementWithoutSubProxy = exports.makerLeverageManagementSubData = exports.makerCloseSubData = exports.makerRepayFromSavingsSubData = exports.liquityPaybackUsingChickenBondSubData = exports.cBondsRebondSubData = exports.morphoAaveV2LeverageManagementSubData = void 0;
+exports.crvUSDLeverageManagementSubData = exports.sparkCollateralSwitchSubData = exports.sparkLeverageManagementOnPriceSubData = exports.sparkCloseGenericSubData = exports.sparkLiquidationProtectionSubData = exports.sparkLeverageManagementSubDataWithoutSubProxy = exports.sparkLeverageManagementSubData = exports.exchangeLimitOrderSubDataWithoutSubProxy = exports.exchangeLimitOrderSubData = exports.exchangeDcaSubData = exports.compoundV3CloseSubData = exports.compoundV3LeverageManagementOnPriceSubData = exports.compoundV3LiquidationProtectionSubDataWithoutSubProxy = exports.compoundV3LeverageManagementSubDataWithoutSubProxy = exports.compoundV2LeverageManagementSubDataWithoutSubProxy = exports.compoundV2LeverageManagementSubData = exports.aaveV4CollateralSwitchSubData = exports.aaveV4CloseSubData = exports.aaveV4LeverageManagementOnPriceSubData = exports.aaveV4LiquidationProtectionSubData = exports.aaveV4LeverageManagementSubData = exports.aaveV3LeverageManagementOnPriceSubData = exports.aaveV3QuotePriceSubData = exports.aaveV3CollateralSwitchSubData = exports.aaveV3CloseGenericSubData = exports.aaveV3LeverageManagementOnPriceGeneric = exports.aaveV3LiquidationProtectionSubData = 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.makerLiquidationProtectionSubData = exports.makerLeverageManagementWithoutSubProxy = exports.makerLeverageManagementSubData = 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 = 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");
@@ -131,6 +132,8 @@ exports.makerLeverageManagementSubData = {
         return { vaultId, targetRatio };
     },
 };
+// ! Any change here will PROBABLY require a change in makerLiquidationProtectionSubData as well, since it is copy paste
+// ! Double check before changing
 exports.makerLeverageManagementWithoutSubProxy = {
     encode(vaultId, targetRatio, daiAddr) {
         const encodedVaultId = web3_eth_abi_1.default.encodeParameter('uint256', vaultId);
@@ -145,6 +148,20 @@ exports.makerLeverageManagementWithoutSubProxy = {
         return { vaultId, targetRatio, daiAddr };
     },
 };
+exports.makerLiquidationProtectionSubData = {
+    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));
+        const encodedDaiAddr = web3_eth_abi_1.default.encodeParameter('address', daiAddr || (0, tokens_1.getAssetInfo)('DAI', 1).address);
+        return [encodedVaultId, encodedTargetRatio, encodedDaiAddr];
+    },
+    decode(subData) {
+        const vaultId = +web3_eth_abi_1.default.decodeParameter('uint256', subData[0]).toString();
+        const targetRatio = (0, utils_1.weiToRatioPercentage)(web3_eth_abi_1.default.decodeParameter('uint256', subData[1]));
+        const daiAddr = web3_eth_abi_1.default.decodeParameter('address', subData[2]).toString();
+        return { vaultId, targetRatio, daiAddr };
+    },
+};
 /**
   __       __    ______      __    __   __  .___________.____    ____    ____    ____  __
 |  |     |  |  /  __  \    |  |  |  | |  | |           |\   \  /   /    \   \  /   / /_ |
@@ -167,6 +184,23 @@ exports.liquityLeverageManagementSubData = {
         return { targetRatio };
     },
 };
+exports.liquityLeverageManagementSubDataWithoutSubProxy = {
+    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));
+        const isRepay = ratioState === enums_1.RatioState.UNDER;
+        const collActionType = isRepay ? enums_1.CollActionType.WITHDRAW : enums_1.CollActionType.SUPPLY;
+        const debtActionType = isRepay ? enums_1.DebtActionType.PAYBACK : enums_1.DebtActionType.BORROW;
+        const collActionTypeEncoded = web3_eth_abi_1.default.encodeParameter('uint8', collActionType);
+        const debtActionTypeEncoded = web3_eth_abi_1.default.encodeParameter('uint8', debtActionType);
+        return [encodedRatioState, encodedTargetRatio, collActionTypeEncoded, debtActionTypeEncoded];
+    },
+    decode(subData) {
+        const ratioState = web3_eth_abi_1.default.decodeParameter('uint8', subData[0]);
+        const targetRatio = (0, utils_1.weiToRatioPercentage)(web3_eth_abi_1.default.decodeParameter('uint256', subData[1]));
+        return { targetRatio, ratioState };
+    },
+};
 exports.liquityCloseSubData = {
     encode(closeToAssetAddr, chainId = enums_1.ChainId.Ethereum, collAddr, debtAddr) {
         const _collAddr = collAddr || (0, tokens_1.getAssetInfo)('WETH', chainId).address;
@@ -398,6 +432,25 @@ exports.aaveV2LeverageManagementSubData = {
         return { targetRatio };
     },
 };
+exports.aaveV2LeverageManagementSubDataWithoutSubProxy = {
+    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));
+        const encodedRatioState = web3_eth_abi_1.default.encodeParameter('uint8', ratioState);
+        const isBoost = ratioState === enums_1.RatioState.OVER;
+        if (isBoost) {
+            const enableAsCollEncoded = web3_eth_abi_1.default.encodeParameter('uint256', 1);
+            return [encodedMarket, encodedTargetRatio, encodedRatioState, enableAsCollEncoded];
+        }
+        return [encodedMarket, encodedTargetRatio, encodedRatioState];
+    },
+    decode(subData) {
+        const market = web3_eth_abi_1.default.decodeParameter('address', subData[0]);
+        const targetRatio = (0, utils_1.weiToRatioPercentage)(web3_eth_abi_1.default.decodeParameter('uint256', subData[1]));
+        const ratioState = web3_eth_abi_1.default.decodeParameter('uint8', subData[2]);
+        return { market, targetRatio, ratioState };
+    },
+};
 /**
      ___           ___   ____    ____  _______    ____    ____  ____
     /   \         /   \  \   \  /   / |   ____|   \   \  /   / |___ \
@@ -413,6 +466,8 @@ exports.aaveV3LeverageManagementSubData = {
         return { targetRatio };
     },
 };
+// ! Any change here will PROBABLY require a change in aaveV3LiquidationProtectionSubData as well
+// ! Double check before changing. Liquidation protection is using Generic encoding for both - EOA and SW
 exports.aaveV3LeverageManagementSubDataWithoutSubProxy = {
     encode(targetRatio, ratioState, market, user, isGeneric) {
         const encodedTargetRatio = web3_eth_abi_1.default.encodeParameter('uint256', (0, utils_1.ratioPercentageToWei)(targetRatio));
@@ -432,6 +487,20 @@ exports.aaveV3LeverageManagementSubDataWithoutSubProxy = {
         return { targetRatio, ratioState };
     },
 };
+exports.aaveV3LiquidationProtectionSubData = {
+    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)(web3_eth_abi_1.default.decodeParameter('uint256', subData[0]));
+        const ratioState = web3_eth_abi_1.default.decodeParameter('uint8', subData[1]);
+        return { targetRatio, ratioState };
+    },
+};
 exports.aaveV3LeverageManagementOnPriceGeneric = {
     encode(collAsset, collAssetId, debtAsset, debtAssetId, marketAddr, targetRatio, user) {
         const encodedColl = web3_eth_abi_1.default.encodeParameter('address', collAsset);
@@ -593,6 +662,8 @@ exports.aaveV3LeverageManagementOnPriceSubData = {
  /  _____  \   /  _____  \  \    /    |  |____       \    /       | |
 /__/     \__\ /__/     \__\  \__/     |_______|       \__/        |_|
  */
+// ! Any change here will PROBABLY require a change in aaveV4LiquidationProtectionSubData as well, since it is copy paste
+// ! Double check before changing
 exports.aaveV4LeverageManagementSubData = {
     encode: (spoke, owner, ratioState, targetRatio) => {
         const spokeEncoded = web3_eth_abi_1.default.encodeParameter('address', spoke);
@@ -619,6 +690,32 @@ exports.aaveV4LeverageManagementSubData = {
         };
     },
 };
+exports.aaveV4LiquidationProtectionSubData = {
+    encode: (spoke, owner, ratioState, targetRatio) => {
+        const spokeEncoded = web3_eth_abi_1.default.encodeParameter('address', spoke);
+        const ownerEncoded = web3_eth_abi_1.default.encodeParameter('address', owner);
+        const ratioStateEncoded = web3_eth_abi_1.default.encodeParameter('uint8', ratioState);
+        const targetRatioEncoded = web3_eth_abi_1.default.encodeParameter('uint256', (0, utils_1.ratioPercentageToWei)(targetRatio));
+        // Add two empty slots for future addons (e.g tsi or slippage settings)
+        return [
+            spokeEncoded,
+            ownerEncoded,
+            ratioStateEncoded,
+            targetRatioEncoded,
+            constants_1.EMPTY_SLOT,
+            constants_1.EMPTY_SLOT,
+        ];
+    },
+    decode: (subData) => {
+        const spoke = web3_eth_abi_1.default.decodeParameter('address', subData[0]);
+        const owner = web3_eth_abi_1.default.decodeParameter('address', subData[1]);
+        const ratioState = Number(web3_eth_abi_1.default.decodeParameter('uint8', subData[2]));
+        const targetRatio = (0, utils_1.weiToRatioPercentage)(web3_eth_abi_1.default.decodeParameter('uint256', subData[3]));
+        return {
+            spoke, owner, ratioState, targetRatio,
+        };
+    },
+};
 exports.aaveV4LeverageManagementOnPriceSubData = {
     encode: (spoke, owner, collAsset, collAssetId, debtAsset, debtAssetId, ratioState, targetRatio) => {
         const spokeEncoded = web3_eth_abi_1.default.encodeParameter('address', spoke);
@@ -752,6 +849,23 @@ exports.compoundV2LeverageManagementSubData = {
         return { targetRatio };
     },
 };
+exports.compoundV2LeverageManagementSubDataWithoutSubProxy = {
+    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);
+        const isBoost = ratioState === enums_1.RatioState.OVER;
+        if (isBoost) {
+            const enableAsCollEncoded = web3_eth_abi_1.default.encodeParameter('uint256', 1);
+            return [encodedTargetRatio, encodedRatioState, enableAsCollEncoded];
+        }
+        return [encodedTargetRatio, encodedRatioState];
+    },
+    decode(subData) {
+        const targetRatio = (0, utils_1.weiToRatioPercentage)(web3_eth_abi_1.default.decodeParameter('uint256', subData[0]));
+        const ratioState = web3_eth_abi_1.default.decodeParameter('uint8', subData[1]);
+        return { targetRatio, ratioState };
+    },
+};
 /**
   ______   ______   .___  ___. .______      ____    ____  ____
  /      | /  __  \  |   \/   | |   _  \     \   \  /   / |___ \
@@ -760,46 +874,42 @@ exports.compoundV2LeverageManagementSubData = {
 |  `----.|  `--'  | |  |  |  | |  |            \    /     ___) |
  \______| \______/  |__|  |__| | _|             \__/     |____/
  */
-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,
-        ];
+// ! Any change here will PROBABLY require a change in compoundV3LiquidationProtectionSubDataWithoutSubProxy as well, since it is copy paste
+// ! Double check before changing
+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);
+        const encodedRatioState = web3_eth_abi_1.default.encodeParameter('uint8', ratioState);
+        const encodedTargetRatio = web3_eth_abi_1.default.encodeParameter('uint256', (0, utils_1.ratioPercentageToWei)(targetRatio));
+        return [encodedMarket, encodedBaseToken, encodedRatioState, encodedTargetRatio];
     },
     decode(subData) {
-        const weiRatio = web3_eth_abi_1.default.decodeParameter('uint256', subData[3]);
-        const targetRatio = (0, utils_1.weiToRatioPercentage)(weiRatio);
-        return { targetRatio };
+        const market = web3_eth_abi_1.default.decodeParameter('address', subData[0]);
+        const baseToken = web3_eth_abi_1.default.decodeParameter('address', subData[1]);
+        const ratioState = web3_eth_abi_1.default.decodeParameter('uint8', subData[2]);
+        const targetRatio = (0, utils_1.weiToRatioPercentage)(web3_eth_abi_1.default.decodeParameter('uint256', subData[3]));
+        return {
+            market, baseToken, targetRatio, ratioState,
+        };
     },
 };
-exports.compoundV3L2LeverageManagementSubData = {
-    encode(market, baseToken, triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled, isEOA) {
-        let subInput = '0x';
-        subInput = subInput.concat(market.slice(2));
-        subInput = subInput.concat(baseToken.slice(2));
-        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');
-        subInput = subInput.concat(isEOA ? '01' : '00');
-        return subInput;
+exports.compoundV3LiquidationProtectionSubDataWithoutSubProxy = {
+    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);
+        const encodedRatioState = web3_eth_abi_1.default.encodeParameter('uint8', ratioState);
+        const encodedTargetRatio = web3_eth_abi_1.default.encodeParameter('uint256', (0, utils_1.ratioPercentageToWei)(targetRatio));
+        return [encodedMarket, encodedBaseToken, encodedRatioState, encodedTargetRatio];
     },
     decode(subData) {
-        const ratioWei = web3_eth_abi_1.default.decodeParameter('uint256', subData[3]);
-        const targetRatio = (0, utils_1.weiToRatioPercentage)(ratioWei);
-        return { targetRatio };
+        const market = web3_eth_abi_1.default.decodeParameter('address', subData[0]);
+        const baseToken = web3_eth_abi_1.default.decodeParameter('address', subData[1]);
+        const ratioState = web3_eth_abi_1.default.decodeParameter('uint8', subData[2]);
+        const targetRatio = (0, utils_1.weiToRatioPercentage)(web3_eth_abi_1.default.decodeParameter('uint256', subData[3]));
+        return {
+            market, baseToken, targetRatio, ratioState,
+        };
     },
 };
 exports.compoundV3LeverageManagementOnPriceSubData = {
@@ -905,6 +1015,21 @@ exports.exchangeLimitOrderSubData = {
         return { fromToken, toToken, amount };
     },
 };
+exports.exchangeLimitOrderSubDataWithoutSubProxy = {
+    encode(fromToken, toToken, amount) {
+        return [
+            web3_eth_abi_1.default.encodeParameter('address', fromToken),
+            web3_eth_abi_1.default.encodeParameter('address', toToken),
+            web3_eth_abi_1.default.encodeParameter('uint256', amount),
+        ];
+    },
+    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();
+        const amount = (0, tokens_1.assetAmountInEth)(web3_eth_abi_1.default.decodeParameter('uint256', subData[2]).toString(), (0, tokens_1.getAssetInfoByAddress)(fromToken, chainId).symbol);
+        return { fromToken, toToken, amount };
+    },
+};
 /**
      _______..______      ___      .______       __  ___
     /       ||   _  \    /   \     |   _  \     |  |/  /
@@ -920,6 +1045,8 @@ exports.sparkLeverageManagementSubData = {
         return { targetRatio };
     },
 };
+// ! Any change here will PROBABLY require a change in sparkLiquidationProtectionSubData as well, since it is copy paste
+// ! Double check before changing
 exports.sparkLeverageManagementSubDataWithoutSubProxy = {
     encode(targetRatio, ratioState) {
         const encodedTargetRatio = web3_eth_abi_1.default.encodeParameter('uint256', (0, utils_1.ratioPercentageToWei)(targetRatio));
@@ -934,6 +1061,20 @@ exports.sparkLeverageManagementSubDataWithoutSubProxy = {
         return { targetRatio, ratioState };
     },
 };
+exports.sparkLiquidationProtectionSubData = {
+    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);
+        const encodedUseDefaultMarket = web3_eth_abi_1.default.encodeParameter('bool', true);
+        const encodedUseOnBehalf = web3_eth_abi_1.default.encodeParameter('bool', false);
+        return [encodedTargetRatio, encodedRatioState, encodedUseDefaultMarket, encodedUseOnBehalf];
+    },
+    decode(subData) {
+        const targetRatio = (0, utils_1.weiToRatioPercentage)(web3_eth_abi_1.default.decodeParameter('uint256', subData[0]));
+        const ratioState = web3_eth_abi_1.default.decodeParameter('uint8', subData[1]);
+        return { targetRatio, ratioState };
+    },
+};
 exports.sparkCloseGenericSubData = {
     encode(collAsset, collAssetId, debtAsset, debtAssetId, closeType, marketAddr, user) {
         const encodedColl = web3_eth_abi_1.default.encodeParameter('address', collAsset);
@@ -1082,6 +1223,8 @@ exports.crvUSDPaybackSubData = {
 |  |  |  | |  `--'  | |  |\  \----.|  |      |  |  |  | |  `--'  |
 |__|  |__|  \______/  | _| `._____|| _|      |__|  |__|  \______/
  */
+// ! Any change here will PROBABLY require a change in morphoBlueLiquidationProtectionSubData as well, since it is copy paste
+// ! Double check before changing
 exports.morphoBlueLeverageManagementSubData = {
     encode: (loanToken, collToken, oracle, irm, lltv, ratioState, targetRatio, user, isEOA) => {
         const loanTokenEncoded = web3_eth_abi_1.default.encodeParameter('address', loanToken);
@@ -1115,6 +1258,39 @@ exports.morphoBlueLeverageManagementSubData = {
         };
     },
 };
+exports.morphoBlueLiquidationProtectionSubData = {
+    encode: (loanToken, collToken, oracle, irm, lltv, ratioState, targetRatio, user, isEOA) => {
+        const loanTokenEncoded = web3_eth_abi_1.default.encodeParameter('address', loanToken);
+        const collTokenEncoded = web3_eth_abi_1.default.encodeParameter('address', collToken);
+        const oracleEncoded = web3_eth_abi_1.default.encodeParameter('address', oracle);
+        const irmEncoded = web3_eth_abi_1.default.encodeParameter('address', irm);
+        const lltvEncoded = web3_eth_abi_1.default.encodeParameter('uint256', lltv);
+        const ratioStateEncoded = web3_eth_abi_1.default.encodeParameter('uint8', ratioState);
+        const targetRatioEncoded = web3_eth_abi_1.default.encodeParameter('uint256', (0, utils_1.ratioPercentageToWei)(targetRatio));
+        const userEncoded = web3_eth_abi_1.default.encodeParameter('address', user);
+        const isEOAEncoded = web3_eth_abi_1.default.encodeParameter('bool', isEOA);
+        return [loanTokenEncoded, collTokenEncoded, oracleEncoded, irmEncoded, lltvEncoded, ratioStateEncoded, targetRatioEncoded, userEncoded, isEOAEncoded];
+    },
+    decode: (subData) => {
+        const loanToken = web3_eth_abi_1.default.decodeParameter('address', subData[0]);
+        const collToken = web3_eth_abi_1.default.decodeParameter('address', subData[1]);
+        const oracle = web3_eth_abi_1.default.decodeParameter('address', subData[2]);
+        const irm = web3_eth_abi_1.default.decodeParameter('address', subData[3]);
+        const lltv = web3_eth_abi_1.default.decodeParameter('uint256', subData[4]);
+        const weiRatio = web3_eth_abi_1.default.decodeParameter('uint256', subData[6]);
+        const user = web3_eth_abi_1.default.decodeParameter('address', subData[7]);
+        const targetRatio = (0, utils_1.weiToRatioPercentage)(weiRatio);
+        return {
+            loanToken,
+            collToken,
+            oracle,
+            irm,
+            lltv,
+            user,
+            targetRatio,
+        };
+    },
+};
 exports.morphoBlueLeverageManagementOnPriceSubData = {
     encode(loanToken, collToken, oracle, irm, lltv, targetRatio, user) {
         const loanTokenEncoded = web3_eth_abi_1.default.encodeParameter('address', loanToken);
@@ -1184,6 +1360,8 @@ _______  __       __    __   __   _______
 |  |     |  `----.|  `--'  | |  | |  '--'  |
 |__|     |_______| \______/  |__| |_______/
  */
+// ! Any change here will PROBABLY require a change in fluidLeverageManagementSubData as well, since it is copy paste
+// ! Double check before changing
 exports.fluidLeverageManagementSubData = {
     encode: (nftId, vault, ratioState, targetRatio) => {
         const nftIdEncoded = web3_eth_abi_1.default.encodeParameter('uint256', nftId);
@@ -1217,3 +1395,35 @@ exports.fluidLeverageManagementSubData = {
         };
     },
 };
+exports.fluidLiquidationProtectionSubData = {
+    encode: (nftId, vault, ratioState, targetRatio) => {
+        const nftIdEncoded = web3_eth_abi_1.default.encodeParameter('uint256', nftId);
+        const vaultEncoded = web3_eth_abi_1.default.encodeParameter('address', vault);
+        const ratioStateEncoded = web3_eth_abi_1.default.encodeParameter('uint8', ratioState);
+        const targetRatioEncoded = web3_eth_abi_1.default.encodeParameter('uint256', (0, utils_1.ratioPercentageToWei)(targetRatio));
+        const wrapEthEncoded = web3_eth_abi_1.default.encodeParameter('bool', true);
+        const collActionType = enums_1.CollActionType.WITHDRAW;
+        const debtActionType = enums_1.DebtActionType.PAYBACK;
+        const collActionTypeEncoded = web3_eth_abi_1.default.encodeParameter('uint8', collActionType);
+        const debtActionTypeEncoded = web3_eth_abi_1.default.encodeParameter('uint8', debtActionType);
+        return [
+            nftIdEncoded,
+            vaultEncoded,
+            ratioStateEncoded,
+            targetRatioEncoded,
+            wrapEthEncoded,
+            collActionTypeEncoded,
+            debtActionTypeEncoded,
+        ];
+    },
+    decode: (subData) => {
+        const nftId = web3_eth_abi_1.default.decodeParameter('uint256', subData[0]);
+        const vault = web3_eth_abi_1.default.decodeParameter('address', subData[1]);
+        const ratioState = web3_eth_abi_1.default.decodeParameter('uint8', subData[2]);
+        const weiRatio = web3_eth_abi_1.default.decodeParameter('uint256', subData[3]);
+        const targetRatio = (0, utils_1.weiToRatioPercentage)(weiRatio);
+        return {
+            nftId, vault, ratioState, targetRatio,
+        };
+    },
+};