@defisaver/automation-sdk 3.1.10 → 3.1.14-spark-dev

package/src/services/subDataService.ts

@@ -11,10 +11,82 @@ import {
   ChainId, CollActionType, DebtActionType, RatioState,
 } from '../types/enums';
 
-import { AAVE_V3_VARIABLE_BORROW_RATE, ZERO_ADDRESS } from '../constants';
+import { EMPTY_SLOT, ZERO_ADDRESS } from '../constants';
 
 import { compareAddresses, ratioPercentageToWei, weiToRatioPercentage } from './utils';
 
+/**
+ _______   _______ .______   .______       _______   ______     ___   .___________. _______  _______
+|       \ |   ____||   _  \  |   _  \     |   ____| /      |   /   \  |           ||   ____||       \
+|  .--.  ||  |__   |  |_)  | |  |_)  |    |  |__   |  ,----'  /  ^  \ `---|  |----`|  |__   |  .--.  |
+|  |  |  ||   __|  |   ___/  |      /     |   __|  |  |      /  /_\  \    |  |     |   __|  |  |  |  |
+|  '--'  ||  |____ |  |      |  |\  \----.|  |____ |  `----./  _____  \   |  |     |  |____ |  '--'  |
+|_______/ |_______|| _|      | _| `._____||_______| \______/__/     \__\  |__|     |_______||_______/
+ */
+export const morphoAaveV2LeverageManagementSubData = {
+  encode(
+    triggerRepayRatio: number,
+    triggerBoostRatio: number,
+    targetBoostRatio: number,
+    targetRepayRatio: number,
+    boostEnabled: boolean,
+  ): SubData {
+    return [
+      ratioPercentageToWei(triggerRepayRatio),
+      ratioPercentageToWei(triggerBoostRatio),
+      ratioPercentageToWei(targetBoostRatio),
+      ratioPercentageToWei(targetRepayRatio),
+      // @ts-ignore
+      boostEnabled,
+    ];
+  },
+  decode(subData: SubData): { targetRatio: number } {
+    const ratioWei = AbiCoder.decodeParameter('uint128', subData[1]) as any as string;
+    const targetRatio = weiToRatioPercentage(ratioWei);
+
+    return { targetRatio };
+  },
+};
+export const cBondsRebondSubData = {
+  encode(bondId: number | string): SubData {
+    const bondIdEncoded = AbiCoder.encodeParameter('uint256', bondId);
+    return [bondIdEncoded];
+  },
+  decode(subData: SubData): { bondId: string } {
+    const bondId = AbiCoder.decodeParameter('uint256', subData[1])!.toString();
+    return { bondId };
+  },
+};
+export const liquityPaybackUsingChickenBondSubData = {
+  /**
+   * @param sourceId bondId or subId
+   * @param sourceType 0 for bond, 1 for subId
+   * @param chainId
+   */
+  encode: (sourceId: string, sourceType: number, chainId: ChainId = ChainId.Ethereum): SubData => {
+    const sourceIdEncoded = AbiCoder.encodeParameter('uint256', sourceId);
+    const sourceTypeEncoded = AbiCoder.encodeParameter('uint256', sourceType);
+    const lusdAddressEncoded = AbiCoder.encodeParameter('address', getAssetInfo('LUSD', chainId).address);
+    const bLusdAddressEncoded = AbiCoder.encodeParameter('address', getAssetInfo('bLUSD', chainId).address);
+
+    return [sourceIdEncoded, sourceTypeEncoded, lusdAddressEncoded, bLusdAddressEncoded];
+  },
+  decode: (subData: SubData) => {
+    const sourceId = AbiCoder.decodeParameter('uint256', subData[0])!.toString();
+    const sourceType = AbiCoder.decodeParameter('uint256', subData[1])!.toString();
+
+    return { sourceId, sourceType };
+  },
+};
+
+/**
+.___  ___.      ___       __  ___  _______ .______
+|   \/   |     /   \     |  |/  / |   ____||   _  \
+|  \  /  |    /  ^  \    |  '  /  |  |__   |  |_)  |
+|  |\/|  |   /  /_\  \   |    <   |   __|  |      /
+|  |  |  |  /  _____  \  |  .  \  |  |____ |  |\  \----.
+|__|  |__| /__/     \__\ |__|\__\ |_______|| _| `._____|
+ */
 export const makerRepayFromSavingsSubData = {
   encode(
     vaultId: number,
@@ -49,16 +121,6 @@ export const makerRepayFromSavingsSubData = {
     };
   },
 };
-
-export const liquityRepayFromSavingsSubData = {
-  decode(subData: SubData): { targetRatio: number } {
-    const weiRatio = AbiCoder.decodeParameter('uint256', subData[1]) as any as string;
-    const targetRatio = weiToRatioPercentage(weiRatio);
-
-    return { targetRatio };
-  },
-};
-
 export const makerCloseSubData = {
   encode(
     vaultId: number,
@@ -94,7 +156,6 @@ export const makerCloseSubData = {
     };
   },
 };
-
 export const makerLeverageManagementSubData = {
   decode: (subData:SubData) => {
     const vaultId = +AbiCoder.decodeParameter('uint256', subData[0])!.toString();
@@ -103,7 +164,42 @@ export const makerLeverageManagementSubData = {
     return { vaultId, targetRatio };
   },
 };
+export const makerLeverageManagementWithoutSubProxy = {
+  encode(
+    vaultId: number,
+    targetRatio: number,
+    daiAddr?: EthereumAddress,
+  ): SubData {
+    const encodedVaultId = AbiCoder.encodeParameter('uint256', vaultId);
+    const encodedTargetRatio = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
+    const encodedDaiAddr = AbiCoder.encodeParameter('address', daiAddr || getAssetInfo('DAI', 1).address);
+    return [encodedVaultId, encodedTargetRatio, encodedDaiAddr];
+  },
+  decode(subData: SubData): { vaultId: number, targetRatio: number, daiAddr: string } {
+    const vaultId = +AbiCoder.decodeParameter('uint256', subData[0])!.toString();
+    const targetRatio = weiToRatioPercentage(AbiCoder.decodeParameter('uint256', subData[1]) as any as string);
+    const daiAddr = AbiCoder.decodeParameter('address', subData[2])!.toString();
+
+    return { vaultId, targetRatio, daiAddr };
+  },
+};
+
+/**
+  __       __    ______      __    __   __  .___________.____    ____    ____    ____  __
+|  |     |  |  /  __  \    |  |  |  | |  | |           |\   \  /   /    \   \  /   / /_ |
+|  |     |  | |  |  |  |   |  |  |  | |  | `---|  |----` \   \/   /      \   \/   /   | |
+|  |     |  | |  |  |  |   |  |  |  | |  |     |  |       \_    _/        \      /    | |
+|  `----.|  | |  `--'  '--.|  `--'  | |  |     |  |         |  |           \    /     | |
+|_______||__|  \_____\_____\\______/  |__|     |__|         |__|            \__/      |_|
+ */
+export const liquityRepayFromSavingsSubData = {
+  decode(subData: SubData): { targetRatio: number } {
+    const weiRatio = AbiCoder.decodeParameter('uint256', subData[1]) as any as string;
+    const targetRatio = weiToRatioPercentage(weiRatio);
 
+    return { targetRatio };
+  },
+};
 export const liquityLeverageManagementSubData = {
   decode: (subData:SubData) => {
     const weiRatio = AbiCoder.decodeParameter('uint256', subData[1]) as any as string;
@@ -111,7 +207,6 @@ export const liquityLeverageManagementSubData = {
     return { targetRatio };
   },
 };
-
 export const liquityCloseSubData = {
   encode(
     closeToAssetAddr: EthereumAddress,
@@ -138,115 +233,797 @@ export const liquityCloseSubData = {
     return { closeToAssetAddr, debtAddr };
   },
 };
+export const liquityDsrPaybackSubData = {
+  encode: (targetRatio: number) => {
+    const daiAddress = getAssetInfo('DAI').address;
+    const lusdAddress = getAssetInfo('LUSD').address;
 
-export const aaveV2LeverageManagementSubData = {
-  encode(
-    triggerRepayRatio: number,
-    triggerBoostRatio: number,
-    targetBoostRatio: number,
-    targetRepayRatio: number,
-    boostEnabled: boolean,
-  ): SubData {
-    return [
-      new Dec(triggerRepayRatio).mul(1e16).toString(),
-      new Dec(triggerBoostRatio).mul(1e16).toString(),
-      new Dec(targetBoostRatio).mul(1e16).toString(),
-      new Dec(targetRepayRatio).mul(1e16).toString(),
-      // @ts-ignore // TODO
-      boostEnabled,
-    ];
-  },
-  decode(subData: SubData): { targetRatio: number } {
-    const ratioWei = AbiCoder.decodeParameter('uint256', subData[1]) as any as string;
-    const targetRatio = weiToRatioPercentage(ratioWei);
+    const ratioStateEncoded = AbiCoder.encodeParameter('uint8', RatioState.UNDER);
+    const targetRatioEncoded = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
+    const daiAddressEncoded = AbiCoder.encodeParameter('address', daiAddress);
+    const lusdAddressEncoded = AbiCoder.encodeParameter('address', lusdAddress);
 
+    return [ratioStateEncoded, targetRatioEncoded, daiAddressEncoded, lusdAddressEncoded];
+  },
+  decode: (subData: SubData) => {
+    const weiRatio = AbiCoder.decodeParameter('uint256', subData[1]) as any as string;
+    const targetRatio = weiToRatioPercentage(weiRatio);
     return { targetRatio };
   },
 };
+export const liquityDsrSupplySubData = {
+  encode: (targetRatio: number) => {
+    const daiAddress = getAssetInfo('DAI').address;
+    const wethAddress = getAssetInfo('WETH').address;
 
-export const aaveV3LeverageManagementSubData = { // TODO encode?
-  decode(subData: SubData): { targetRatio: number } {
-    const ratioWei = AbiCoder.decodeParameter('uint256', subData[0]) as any as string;
-    const targetRatio = weiToRatioPercentage(ratioWei);
+    const ratioStateEncoded = AbiCoder.encodeParameter('uint8', RatioState.UNDER);
+    const targetRatioEncoded = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
+    const daiAddressEncoded = AbiCoder.encodeParameter('address', daiAddress);
+    const wethAddressEncoded = AbiCoder.encodeParameter('address', wethAddress);
 
+    return [ratioStateEncoded, targetRatioEncoded, daiAddressEncoded, wethAddressEncoded];
+  },
+  decode: (subData: SubData) => {
+    const weiRatio = AbiCoder.decodeParameter('uint256', subData[1]) as any as string;
+    const targetRatio = weiToRatioPercentage(weiRatio);
     return { targetRatio };
   },
 };
+export const liquityDebtInFrontRepaySubData = {
+  encode: (targetRatioIncrease: number) => {
+    const wethAddress = getAssetInfo('WETH').address;
+    const lusdAddress = getAssetInfo('LUSD').address;
 
-export const aaveV3QuotePriceSubData = {
-  encode(
-    collAsset: EthereumAddress,
-    collAssetId: number,
-    debtAsset: EthereumAddress,
-    debtAssetId: number,
-    nullAddress: EthereumAddress = ZERO_ADDRESS,
-  ): SubData {
-    const encodedColl = AbiCoder.encodeParameter('address', collAsset);
-    const encodedCollId = AbiCoder.encodeParameter('uint8', collAssetId);
-
-    const encodedDebt = AbiCoder.encodeParameter('address', debtAsset);
-    const encodedDebtId = AbiCoder.encodeParameter('uint8', debtAssetId);
-
-    const encodedNullAddress = AbiCoder.encodeParameter('address', nullAddress);
+    const wethAddressEncoded = AbiCoder.encodeParameter('address', wethAddress);
+    const lusdAddressEncoded = AbiCoder.encodeParameter('address', lusdAddress);
+    const targetRatioIncreaseEncoded = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatioIncrease));
+    const withdrawIdEncoded = AbiCoder.encodeParameter('uint8', 1); // withdraw - 1
+    const paybackIdEncoded = AbiCoder.encodeParameter('uint8', 0); // payback - 0
 
-    return [encodedColl, encodedCollId, encodedDebt, encodedDebtId, encodedNullAddress];
+    return [wethAddressEncoded, lusdAddressEncoded, targetRatioIncreaseEncoded, withdrawIdEncoded, paybackIdEncoded];
   },
-  decode(subData: SubData): { collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number } {
-    const collAsset = AbiCoder.decodeParameter('address', subData[0]) as unknown as EthereumAddress;
-    const collAssetId = Number(AbiCoder.decodeParameter('uint8', subData[1]));
-
-    const debtAsset = AbiCoder.decodeParameter('address', subData[2]) as unknown as EthereumAddress;
-    const debtAssetId = Number(AbiCoder.decodeParameter('uint8', subData[3]));
-
-    return {
-      collAsset, collAssetId, debtAsset, debtAssetId,
-    };
+  decode: (subData: SubData) => {
+    const weiRatio = AbiCoder.decodeParameter('uint256', subData[2]) as any as string;
+    const targetRatioIncrease = weiToRatioPercentage(weiRatio);
+    return { targetRatioIncrease };
   },
 };
 
-export const compoundV2LeverageManagementSubData = {
-  encode(
-    triggerRepayRatio: number,
-    triggerBoostRatio: number,
-    targetBoostRatio: number,
-    targetRepayRatio: number,
-    boostEnabled: boolean,
-  ): SubData {
+/**
+ *  __       __    ______      __    __   __  .___________.____    ____    ____    ____  ___
+|  |     |  |  /  __  \    |  |  |  | |  | |           |\   \  /   /    \   \  /   / |__ \
+|  |     |  | |  |  |  |   |  |  |  | |  | `---|  |----` \   \/   /      \   \/   /     ) |
+|  |     |  | |  |  |  |   |  |  |  | |  |     |  |       \_    _/        \      /     / /
+|  `----.|  | |  `--'  '--.|  `--'  | |  |     |  |         |  |           \    /     / /_
+|_______||__|  \_____\_____\\______/  |__|     |__|         |__|            \__/     |____|
+ */
+export const liquityV2LeverageManagementSubData = {
+  encode: (
+    market: EthereumAddress,
+    troveId: string,
+    collToken: EthereumAddress,
+    boldToken: EthereumAddress,
+    ratioState: RatioState,
+    targetRatio: number,
+  ) => {
+    const marketEncoded = AbiCoder.encodeParameter('address', market);
+    const troveIdEncoded = AbiCoder.encodeParameter('uint256', troveId);
+    const collTokenEncoded = AbiCoder.encodeParameter('address', collToken);
+    const boldTokenEncoded = AbiCoder.encodeParameter('address', boldToken);
+    const ratioStateEncoded = AbiCoder.encodeParameter('uint8', ratioState);
+    const targetRatioEncoded = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
+
+    const isRepay = ratioState === RatioState.UNDER;
+    const collActionType = isRepay ? CollActionType.WITHDRAW : CollActionType.SUPPLY;
+    const debtActionType = isRepay ? DebtActionType.PAYBACK : DebtActionType.BORROW;
+
+    const collActionTypeEncoded = AbiCoder.encodeParameter('uint8', collActionType);
+    const debtActionTypeEncoded = AbiCoder.encodeParameter('uint8', debtActionType);
+
     return [
-      new Dec(triggerRepayRatio).mul(1e16).toString(),
-      new Dec(triggerBoostRatio).mul(1e16).toString(),
-      new Dec(targetBoostRatio).mul(1e16).toString(),
-      new Dec(targetRepayRatio).mul(1e16).toString(),
-      // @ts-ignore // TODO
-      boostEnabled,
+      marketEncoded,
+      troveIdEncoded,
+      collTokenEncoded,
+      boldTokenEncoded,
+      ratioStateEncoded,
+      targetRatioEncoded,
+      collActionTypeEncoded,
+      debtActionTypeEncoded,
     ];
   },
-  decode(subData: SubData): { targetRatio: number } {
-    const weiRatio = AbiCoder.decodeParameter('uint256', subData[0]) as any as string;
+  decode: (subData: SubData) => {
+    const market = AbiCoder.decodeParameter('address', subData[0]) as unknown as EthereumAddress;
+    const troveId = AbiCoder.decodeParameter('uint256', subData[1]) as any as string;
+    const collToken = AbiCoder.decodeParameter('address', subData[2]) as any as EthereumAddress;
+    const boldToken = AbiCoder.decodeParameter('address', subData[3]) as any as EthereumAddress;
+    const ratioState = AbiCoder.decodeParameter('uint8', subData[4]) as any as RatioState;
+    const weiRatio = AbiCoder.decodeParameter('uint256', subData[5]) as any as string;
     const targetRatio = weiToRatioPercentage(weiRatio);
 
-    return { targetRatio };
+    return {
+      market, troveId, collToken, boldToken, ratioState, targetRatio,
+    };
   },
 };
-
-export const compoundV3LeverageManagementSubData = {
+export const liquityV2CloseSubData = {
   encode(
     market: EthereumAddress,
-    baseToken: EthereumAddress,
-    triggerRepayRatio: number,
-    triggerBoostRatio: number,
-    targetBoostRatio: number,
-    targetRepayRatio: number,
-    boostEnabled: boolean,
-    isEOA: boolean,
+    troveId: string,
+    collToken: EthereumAddress,
+    boldToken: EthereumAddress,
+    closeType: CloseStrategyType,
   ): SubData {
-    return [
-      market,
-      baseToken,
-      new Dec(triggerRepayRatio).mul(1e16).toString(),
-      new Dec(triggerBoostRatio).mul(1e16).toString(),
-      new Dec(targetBoostRatio).mul(1e16).toString(),
-      new Dec(targetRepayRatio).mul(1e16).toString(),
+    const marketEncoded = AbiCoder.encodeParameter('address', market);
+    const troveIdEncoded = AbiCoder.encodeParameter('uint256', troveId);
+    const collAddrEncoded = AbiCoder.encodeParameter('address', collToken);
+    const boldTokenEncoded = AbiCoder.encodeParameter('address', boldToken);
+    const wethAddress = getAssetInfo('WETH').address;
+    const wethAddressEncoded = AbiCoder.encodeParameter('address', wethAddress);
+    const gasCompensation = new Dec('0.0375').mul(1e18).toString();
+    const gasCompensationEncoded = AbiCoder.encodeParameter('uint256', gasCompensation);
+    const closeTypeEncoded = AbiCoder.encodeParameter('uint8', closeType);
+
+    return [
+      marketEncoded,
+      troveIdEncoded,
+      collAddrEncoded,
+      boldTokenEncoded,
+      wethAddressEncoded,
+      gasCompensationEncoded,
+      closeTypeEncoded,
+    ];
+  },
+  decode(subData: SubData): {
+    market: EthereumAddress,
+    troveId: string,
+    collToken: EthereumAddress,
+    boldToken: EthereumAddress,
+    closeType: CloseStrategyType,
+  } {
+    const market = AbiCoder.decodeParameter('address', subData[0]) as unknown as EthereumAddress;
+    const troveId = AbiCoder.decodeParameter('uint256', subData[1]) as any as string;
+    const collToken = AbiCoder.decodeParameter('address', subData[2]) as any as EthereumAddress;
+    const boldToken = AbiCoder.decodeParameter('address', subData[3]) as any as EthereumAddress;
+    // skip wethAddress and gasCompensation
+    const closeType = AbiCoder.decodeParameter('uint8', subData[6]) as any as CloseStrategyType;
+
+    return {
+      market, troveId, collToken, boldToken, closeType,
+    };
+  },
+};
+export const liquityV2LeverageManagementOnPriceSubData = {
+  encode(
+    market: EthereumAddress,
+    troveId: string,
+    collToken: EthereumAddress,
+    boldToken: EthereumAddress,
+    targetRatio: number,
+    isRepayOnPrice: boolean,
+  ): SubData {
+    const encodedMarket = AbiCoder.encodeParameter('address', market);
+    const encodedTroveId = AbiCoder.encodeParameter('uint256', troveId);
+    const encodedCollToken = AbiCoder.encodeParameter('address', collToken);
+    const encodedBoldToken = AbiCoder.encodeParameter('address', boldToken);
+    const encodedTargetRatio = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
+
+    const collActionType = isRepayOnPrice ? CollActionType.WITHDRAW : CollActionType.SUPPLY;
+    const debtActionType = isRepayOnPrice ? DebtActionType.PAYBACK : DebtActionType.BORROW;
+
+    const encodedCollActionType = AbiCoder.encodeParameter('uint8', collActionType);
+    const encodedDebtActionType = AbiCoder.encodeParameter('uint8', debtActionType);
+
+    return [
+      encodedMarket,
+      encodedTroveId,
+      encodedCollToken,
+      encodedBoldToken,
+      encodedTargetRatio,
+      encodedCollActionType,
+      encodedDebtActionType,
+    ];
+  },
+  decode(subData: SubData): {
+    market: EthereumAddress,
+    troveId: string,
+    collToken: EthereumAddress,
+    boldToken: EthereumAddress,
+    targetRatio: number,
+  } {
+    const market = AbiCoder.decodeParameter('address', subData[0]) as unknown as EthereumAddress;
+    const troveId = AbiCoder.decodeParameter('uint256', subData[1]) as any as string;
+    const collToken = AbiCoder.decodeParameter('address', subData[2]) as unknown as EthereumAddress;
+    const boldToken = AbiCoder.decodeParameter('address', subData[3]) as unknown as EthereumAddress;
+    const weiRatio = AbiCoder.decodeParameter('uint256', subData[4]) as any as string;
+    const targetRatio = weiToRatioPercentage(weiRatio);
+
+    return {
+      market, troveId, collToken, boldToken, targetRatio,
+    };
+  },
+};
+export const liquityV2PaybackSubData = {
+  encode: (
+    market: EthereumAddress,
+    troveId: string,
+    boldToken: EthereumAddress,
+    targetRatio: number,
+    ratioState: RatioState,
+  ) => {
+    const marketEncoded = AbiCoder.encodeParameter('address', market);
+    const troveIdEncoded = AbiCoder.encodeParameter('uint256', troveId);
+    const boldTokenEncoded = AbiCoder.encodeParameter('address', boldToken);
+    const targetRatioEncoded = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
+    const ratioStateEncoded = AbiCoder.encodeParameter('uint8', ratioState);
+
+    return [
+      marketEncoded,
+      troveIdEncoded,
+      boldTokenEncoded,
+      targetRatioEncoded,
+      ratioStateEncoded,
+    ];
+  },
+  decode: (subData: SubData) => {
+    const market = AbiCoder.decodeParameter('address', subData[0]) as unknown as EthereumAddress;
+    const troveId = AbiCoder.decodeParameter('uint256', subData[1]) as any as string;
+    const boldToken = AbiCoder.decodeParameter('address', subData[2]) as any as EthereumAddress;
+    const weiRatio = AbiCoder.decodeParameter('uint256', subData[3]) as any as string;
+    const ratioState = AbiCoder.decodeParameter('uint8', subData[4]) as any as RatioState;
+    const targetRatio = weiToRatioPercentage(weiRatio);
+
+    return {
+      market, troveId, boldToken, ratioState, targetRatio,
+    };
+  },
+};
+
+/**
+     ___           ___   ____    ____  _______    ____    ____  ___
+    /   \         /   \  \   \  /   / |   ____|   \   \  /   / |__ \
+   /  ^  \       /  ^  \  \   \/   /  |  |__       \   \/   /     ) |
+  /  /_\  \     /  /_\  \  \      /   |   __|       \      /     / /
+ /  _____  \   /  _____  \  \    /    |  |____       \    /     / /_
+/__/     \__\ /__/     \__\  \__/     |_______|       \__/     |____|
+ */
+export const aaveV2LeverageManagementSubData = {
+  encode(
+    triggerRepayRatio: number,
+    triggerBoostRatio: number,
+    targetBoostRatio: number,
+    targetRepayRatio: number,
+    boostEnabled: boolean,
+  ): SubData {
+    return [
+      new Dec(triggerRepayRatio).mul(1e16).toString(),
+      new Dec(triggerBoostRatio).mul(1e16).toString(),
+      new Dec(targetBoostRatio).mul(1e16).toString(),
+      new Dec(targetRepayRatio).mul(1e16).toString(),
+      // @ts-ignore // TODO
+      boostEnabled,
+    ];
+  },
+  decode(subData: SubData): { targetRatio: number } {
+    const ratioWei = AbiCoder.decodeParameter('uint256', subData[1]) as any as string;
+    const targetRatio = weiToRatioPercentage(ratioWei);
+
+    return { targetRatio };
+  },
+};
+
+/**
+     ___           ___   ____    ____  _______    ____    ____  ____
+    /   \         /   \  \   \  /   / |   ____|   \   \  /   / |___ \
+   /  ^  \       /  ^  \  \   \/   /  |  |__       \   \/   /    __) |
+  /  /_\  \     /  /_\  \  \      /   |   __|       \      /    |__ <
+ /  _____  \   /  _____  \  \    /    |  |____       \    /     ___) |
+/__/     \__\ /__/     \__\  \__/     |_______|       \__/     |____/
+ */
+export const aaveV3LeverageManagementSubData = {
+  decode(subData: SubData): { targetRatio: number } {
+    const ratioWei = AbiCoder.decodeParameter('uint256', subData[0]) as any as string;
+    const targetRatio = weiToRatioPercentage(ratioWei);
+
+    return { targetRatio };
+  },
+};
+export const aaveV3LeverageManagementSubDataWithoutSubProxy = {
+  encode(
+    targetRatio: number,
+    ratioState: RatioState,
+    market: EthereumAddress,
+    user: EthereumAddress,
+    isGeneric: boolean,
+  ): SubData {
+    const encodedTargetRatio = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
+    const encodedRatioState = AbiCoder.encodeParameter('uint8', ratioState);
+
+    if (isGeneric) {
+      const encodedMarket = AbiCoder.encodeParameter('address', market);
+      const encodedUser = AbiCoder.encodeParameter('address', user);
+      return [encodedTargetRatio, encodedRatioState, encodedMarket, encodedUser];
+    }
+    const encodedUseDefaultMarket = AbiCoder.encodeParameter('bool', true);
+    const encodedUseOnBehalf = AbiCoder.encodeParameter('bool', false);
+    return [encodedTargetRatio, encodedRatioState, encodedUseDefaultMarket, encodedUseOnBehalf];
+  },
+  decode(subData: SubData): { targetRatio: number, ratioState: RatioState } {
+    const targetRatio = weiToRatioPercentage(AbiCoder.decodeParameter('uint256', subData[0]) as any as string);
+    const ratioState = AbiCoder.decodeParameter('uint8', subData[1]) as any as RatioState;
+
+    return { targetRatio, ratioState };
+  },
+};
+export const aaveV3LeverageManagementOnPriceGeneric = {
+  encode(
+    collAsset: EthereumAddress,
+    collAssetId: number,
+    debtAsset: EthereumAddress,
+    debtAssetId: number,
+    marketAddr: EthereumAddress,
+    targetRatio: number,
+    user: EthereumAddress,
+  ): SubData {
+    const encodedColl = AbiCoder.encodeParameter('address', collAsset);
+    const encodedCollId = AbiCoder.encodeParameter('uint8', collAssetId);
+    const encodedDebt = AbiCoder.encodeParameter('address', debtAsset);
+    const encodedDebtId = AbiCoder.encodeParameter('uint8', debtAssetId);
+    const encodedMarket = AbiCoder.encodeParameter('address', marketAddr);
+    const encodedTargetRatio = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
+    const userEncoded = AbiCoder.encodeParameter('address', user);
+
+    return [
+      encodedColl,
+      encodedCollId,
+      encodedDebt,
+      encodedDebtId,
+      encodedMarket,
+      encodedTargetRatio,
+      userEncoded,
+    ];
+  },
+  decode(subData: SubData): {
+    collAsset: EthereumAddress,
+    collAssetId: number,
+    debtAsset: EthereumAddress,
+    debtAssetId: number,
+    marketAddr: EthereumAddress,
+    targetRatio: number,
+    owner: EthereumAddress,
+  } {
+    const collAsset = AbiCoder.decodeParameter('address', subData[0]) as unknown as EthereumAddress;
+    const collAssetId = Number(AbiCoder.decodeParameter('uint8', subData[1]));
+    const debtAsset = AbiCoder.decodeParameter('address', subData[2]) as unknown as EthereumAddress;
+    const debtAssetId = Number(AbiCoder.decodeParameter('uint8', subData[3]));
+    const marketAddr = AbiCoder.decodeParameter('address', subData[4]) as unknown as EthereumAddress;
+
+    const weiRatio = AbiCoder.decodeParameter('uint256', subData[5]) as unknown as string;
+    const targetRatio = weiToRatioPercentage(weiRatio);
+
+    const owner = AbiCoder.decodeParameter('address', subData[6]) as unknown as EthereumAddress;
+
+    return {
+      collAsset,
+      collAssetId,
+      debtAsset,
+      debtAssetId,
+      marketAddr,
+      targetRatio,
+      owner,
+    };
+  },
+};
+export const aaveV3CloseGenericSubData = {
+  encode(
+    collAsset: EthereumAddress,
+    collAssetId: number,
+    debtAsset: EthereumAddress,
+    debtAssetId: number,
+    closeType: CloseStrategyType,
+    marketAddr: EthereumAddress,
+    user: EthereumAddress,
+  ): SubData {
+    const encodedColl = AbiCoder.encodeParameter('address', collAsset);
+    const encodedCollId = AbiCoder.encodeParameter('uint8', collAssetId);
+    const encodedDebt = AbiCoder.encodeParameter('address', debtAsset);
+    const encodedDebtId = AbiCoder.encodeParameter('uint8', debtAssetId);
+    const encodedCloseType = AbiCoder.encodeParameter('uint8', closeType);
+    const encodedMarket = AbiCoder.encodeParameter('address', marketAddr);
+    const userEncoded = AbiCoder.encodeParameter('address', user);
+
+    return [
+      encodedColl,
+      encodedCollId,
+      encodedDebt,
+      encodedDebtId,
+      encodedCloseType,
+      encodedMarket,
+      userEncoded,
+    ];
+  },
+
+  decode(subData: SubData): {
+    collAsset: EthereumAddress,
+    collAssetId: number,
+    debtAsset: EthereumAddress,
+    debtAssetId: number,
+    closeType: CloseStrategyType,
+    marketAddr: EthereumAddress,
+    owner: EthereumAddress,
+  } {
+    const collAsset = AbiCoder.decodeParameter('address', subData[0]) as unknown as EthereumAddress;
+    const collAssetId = Number(AbiCoder.decodeParameter('uint8', subData[1]));
+    const debtAsset = AbiCoder.decodeParameter('address', subData[2]) as unknown as EthereumAddress;
+    const debtAssetId = Number(AbiCoder.decodeParameter('uint8', subData[3]));
+    const closeType = Number(AbiCoder.decodeParameter('uint8', subData[4])) as CloseStrategyType;
+    const marketAddr = AbiCoder.decodeParameter('address', subData[5]) as unknown as EthereumAddress;
+    const owner = AbiCoder.decodeParameter('address', subData[6]) as unknown as EthereumAddress;
+
+    return {
+      collAsset, collAssetId, debtAsset, debtAssetId, closeType, marketAddr, owner,
+    };
+  },
+};
+export const aaveV3CollateralSwitchSubData = {
+  encode(
+    fromAsset: EthereumAddress,
+    fromAssetId: number,
+    toAsset: EthereumAddress,
+    toAssetId: number,
+    marketAddr: EthereumAddress,
+    amountToSwitch: string,
+    useOnBehalf: boolean = false,
+  ): SubData {
+    const encodedFromAsset = AbiCoder.encodeParameter('address', fromAsset);
+    const encodedFromAssetId = AbiCoder.encodeParameter('uint8', fromAssetId);
+    const encodedToAsset = AbiCoder.encodeParameter('address', toAsset);
+    const encodedToAssetId = AbiCoder.encodeParameter('uint8', toAssetId);
+    const encodedMarketAddr = AbiCoder.encodeParameter('address', marketAddr);
+    const encodedAmountToSwitch = AbiCoder.encodeParameter('uint256', amountToSwitch);
+    const encodedUseOnBehalf = AbiCoder.encodeParameter('bool', useOnBehalf);
+
+    return [
+      encodedFromAsset,
+      encodedFromAssetId,
+      encodedToAsset,
+      encodedToAssetId,
+      encodedMarketAddr,
+      encodedAmountToSwitch,
+      encodedUseOnBehalf,
+    ];
+  },
+  decode(subData: SubData): {
+    fromAsset: EthereumAddress,
+    fromAssetId: number,
+    toAsset: EthereumAddress,
+    toAssetId: number,
+    marketAddr: EthereumAddress,
+    amountToSwitch: string,
+  } {
+    const fromAsset = AbiCoder.decodeParameter('address', subData[0]) as unknown as EthereumAddress;
+    const fromAssetId = Number(AbiCoder.decodeParameter('uint8', subData[1]));
+    const toAsset = AbiCoder.decodeParameter('address', subData[2]) as unknown as EthereumAddress;
+    const toAssetId = Number(AbiCoder.decodeParameter('uint8', subData[3]));
+    const marketAddr = AbiCoder.decodeParameter('address', subData[4]) as unknown as EthereumAddress;
+    const amountToSwitch = AbiCoder.decodeParameter('uint256', subData[5]) as unknown as string;
+
+    return {
+      fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch,
+    };
+  },
+};
+export const aaveV3QuotePriceSubData = {
+  encode(
+    collAsset: EthereumAddress,
+    collAssetId: number,
+    debtAsset: EthereumAddress,
+    debtAssetId: number,
+    nullAddress: EthereumAddress = ZERO_ADDRESS,
+  ): SubData {
+    const encodedColl = AbiCoder.encodeParameter('address', collAsset);
+    const encodedCollId = AbiCoder.encodeParameter('uint8', collAssetId);
+
+    const encodedDebt = AbiCoder.encodeParameter('address', debtAsset);
+    const encodedDebtId = AbiCoder.encodeParameter('uint8', debtAssetId);
+
+    const encodedNullAddress = AbiCoder.encodeParameter('address', nullAddress);
+
+    return [encodedColl, encodedCollId, encodedDebt, encodedDebtId, encodedNullAddress];
+  },
+  decode(subData: SubData): { collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number } {
+    const collAsset = AbiCoder.decodeParameter('address', subData[0]) as unknown as EthereumAddress;
+    const collAssetId = Number(AbiCoder.decodeParameter('uint8', subData[1]));
+
+    const debtAsset = AbiCoder.decodeParameter('address', subData[2]) as unknown as EthereumAddress;
+    const debtAssetId = Number(AbiCoder.decodeParameter('uint8', subData[3]));
+
+    return {
+      collAsset, collAssetId, debtAsset, debtAssetId,
+    };
+  },
+};
+export const aaveV3LeverageManagementOnPriceSubData = {
+  encode(
+    collAsset: EthereumAddress,
+    collAssetId: number,
+    debtAsset: EthereumAddress,
+    debtAssetId: number,
+    marketAddr: EthereumAddress,
+    targetRatio: number,
+  ): SubData {
+    const encodedColl = AbiCoder.encodeParameter('address', collAsset);
+    const encodedCollId = AbiCoder.encodeParameter('uint8', collAssetId);
+    const encodedDebt = AbiCoder.encodeParameter('address', debtAsset);
+    const encodedDebtId = AbiCoder.encodeParameter('uint8', debtAssetId);
+    const encodedMarket = AbiCoder.encodeParameter('address', marketAddr);
+    const encodedTargetRatio = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
+    const useOnBehalfEncoded = AbiCoder.encodeParameter('bool', false);
+
+    return [
+      encodedColl,
+      encodedCollId,
+      encodedDebt,
+      encodedDebtId,
+      encodedMarket,
+      encodedTargetRatio,
+      useOnBehalfEncoded,
+    ];
+  },
+  decode(subData: SubData): {
+    collAsset: EthereumAddress,
+    collAssetId: number,
+    debtAsset: EthereumAddress,
+    debtAssetId: number,
+    marketAddr: EthereumAddress,
+    targetRatio: number,
+  } {
+    const collAsset = AbiCoder.decodeParameter('address', subData[0]) as unknown as EthereumAddress;
+    const collAssetId = Number(AbiCoder.decodeParameter('uint8', subData[1]));
+    const debtAsset = AbiCoder.decodeParameter('address', subData[2]) as unknown as EthereumAddress;
+    const debtAssetId = Number(AbiCoder.decodeParameter('uint8', subData[3]));
+    const marketAddr = AbiCoder.decodeParameter('address', subData[4]) as unknown as EthereumAddress;
+
+    const weiRatio = AbiCoder.decodeParameter('uint256', subData[5]) as any as string;
+    const targetRatio = weiToRatioPercentage(weiRatio);
+
+    return {
+      collAsset, collAssetId, debtAsset, debtAssetId, marketAddr, targetRatio,
+    };
+  },
+};
+
+/**
+ *      ___           ___   ____    ____  _______    ____    ____  _  _
+    /   \         /   \  \   \  /   / |   ____|   \   \  /   / | || |
+   /  ^  \       /  ^  \  \   \/   /  |  |__       \   \/   /  | || |_
+  /  /_\  \     /  /_\  \  \      /   |   __|       \      /   |__   _|
+ /  _____  \   /  _____  \  \    /    |  |____       \    /       | |
+/__/     \__\ /__/     \__\  \__/     |_______|       \__/        |_|
+ */
+export const aaveV4LeverageManagementSubData = {
+  encode: (
+    spoke: EthereumAddress,
+    owner: EthereumAddress,
+    ratioState: RatioState,
+    targetRatio: number,
+  ) => {
+    const spokeEncoded = AbiCoder.encodeParameter('address', spoke);
+    const ownerEncoded = AbiCoder.encodeParameter('address', owner);
+    const ratioStateEncoded = AbiCoder.encodeParameter('uint8', ratioState);
+    const targetRatioEncoded = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
+    // Add two empty slots for future addons (e.g tsi or slippage settings)
+    return [
+      spokeEncoded,
+      ownerEncoded,
+      ratioStateEncoded,
+      targetRatioEncoded,
+      EMPTY_SLOT,
+      EMPTY_SLOT,
+    ];
+  },
+  decode: (subData: SubData) => {
+    const spoke = AbiCoder.decodeParameter('address', subData[0]) as unknown as EthereumAddress;
+    const owner = AbiCoder.decodeParameter('address', subData[1]) as unknown as EthereumAddress;
+    const ratioState = Number(AbiCoder.decodeParameter('uint8', subData[2])) as RatioState;
+    const targetRatio = weiToRatioPercentage(AbiCoder.decodeParameter('uint256', subData[3]) as any as string);
+    return {
+      spoke, owner, ratioState, targetRatio,
+    };
+  },
+};
+export const aaveV4LeverageManagementOnPriceSubData = {
+  encode: (
+    spoke: EthereumAddress,
+    owner: EthereumAddress,
+    collAsset: EthereumAddress,
+    collAssetId: number,
+    debtAsset: EthereumAddress,
+    debtAssetId: number,
+    ratioState: RatioState,
+    targetRatio: number,
+  ) => {
+    const spokeEncoded = AbiCoder.encodeParameter('address', spoke);
+    const ownerEncoded = AbiCoder.encodeParameter('address', owner);
+    const collAssetEncoded = AbiCoder.encodeParameter('address', collAsset);
+    const collAssetIdEncoded = AbiCoder.encodeParameter('uint256', collAssetId);
+    const debtAssetEncoded = AbiCoder.encodeParameter('address', debtAsset);
+    const debtAssetIdEncoded = AbiCoder.encodeParameter('uint256', debtAssetId);
+    const ratioStateEncoded = AbiCoder.encodeParameter('uint8', ratioState);
+    const targetRatioEncoded = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
+    // Add two empty slots for future addons (e.g tsi or slippage settings)
+    return [
+      spokeEncoded,
+      ownerEncoded,
+      collAssetEncoded,
+      collAssetIdEncoded,
+      debtAssetEncoded,
+      debtAssetIdEncoded,
+      ratioStateEncoded,
+      targetRatioEncoded,
+      EMPTY_SLOT,
+      EMPTY_SLOT,
+    ];
+  },
+  decode: (subData: SubData) => {
+    const spoke = AbiCoder.decodeParameter('address', subData[0]) as unknown as EthereumAddress;
+    const owner = AbiCoder.decodeParameter('address', subData[1]) as unknown as EthereumAddress;
+    const collAsset = AbiCoder.decodeParameter('address', subData[2]) as unknown as EthereumAddress;
+    const collAssetId = Number(AbiCoder.decodeParameter('uint256', subData[3]));
+    const debtAsset = AbiCoder.decodeParameter('address', subData[4]) as unknown as EthereumAddress;
+    const debtAssetId = Number(AbiCoder.decodeParameter('uint256', subData[5]));
+    const ratioState = Number(AbiCoder.decodeParameter('uint8', subData[6])) as RatioState;
+    const targetRatio = weiToRatioPercentage(AbiCoder.decodeParameter('uint256', subData[7]) as any as string);
+    return {
+      spoke, owner, collAsset, collAssetId, debtAsset, debtAssetId, ratioState, targetRatio,
+    };
+  },
+};
+export const aaveV4CloseSubData = {
+  encode: (
+    spoke: EthereumAddress,
+    owner: EthereumAddress,
+    collAsset: EthereumAddress,
+    collAssetId: number,
+    debtAsset: EthereumAddress,
+    debtAssetId: number,
+    closeType: CloseStrategyType,
+  ) => {
+    const spokeEncoded = AbiCoder.encodeParameter('address', spoke);
+    const ownerEncoded = AbiCoder.encodeParameter('address', owner);
+    const collAssetEncoded = AbiCoder.encodeParameter('address', collAsset);
+    const collAssetIdEncoded = AbiCoder.encodeParameter('uint256', collAssetId);
+    const debtAssetEncoded = AbiCoder.encodeParameter('address', debtAsset);
+    const debtAssetIdEncoded = AbiCoder.encodeParameter('uint256', debtAssetId);
+    const closeTypeEncoded = AbiCoder.encodeParameter('uint8', closeType);
+    // Add two empty slots for future addons (e.g tsi or slippage settings)
+    return [
+      spokeEncoded,
+      ownerEncoded,
+      collAssetEncoded,
+      collAssetIdEncoded,
+      debtAssetEncoded,
+      debtAssetIdEncoded,
+      closeTypeEncoded,
+      EMPTY_SLOT,
+      EMPTY_SLOT,
+    ];
+  },
+  decode: (subData: SubData) => {
+    const spoke = AbiCoder.decodeParameter('address', subData[0]) as unknown as EthereumAddress;
+    const owner = AbiCoder.decodeParameter('address', subData[1]) as unknown as EthereumAddress;
+    const collAsset = AbiCoder.decodeParameter('address', subData[2]) as unknown as EthereumAddress;
+    const collAssetId = Number(AbiCoder.decodeParameter('uint256', subData[3]));
+    const debtAsset = AbiCoder.decodeParameter('address', subData[4]) as unknown as EthereumAddress;
+    const debtAssetId = Number(AbiCoder.decodeParameter('uint256', subData[5]));
+    const closeType = Number(AbiCoder.decodeParameter('uint8', subData[6])) as CloseStrategyType;
+    return {
+      spoke, owner, collAsset, collAssetId, debtAsset, debtAssetId, closeType,
+    };
+  },
+};
+export const aaveV4CollateralSwitchSubData = {
+  encode: (
+    spoke: EthereumAddress,
+    owner: EthereumAddress,
+    fromAsset: EthereumAddress,
+    fromAssetId: number,
+    toAsset: EthereumAddress,
+    toAssetId: number,
+    amountToSwitch: string,
+  ) => {
+    const spokeEncoded = AbiCoder.encodeParameter('address', spoke);
+    const ownerEncoded = AbiCoder.encodeParameter('address', owner);
+    const fromAssetEncoded = AbiCoder.encodeParameter('address', fromAsset);
+    const fromAssetIdEncoded = AbiCoder.encodeParameter('uint256', fromAssetId);
+    const toAssetEncoded = AbiCoder.encodeParameter('address', toAsset);
+    const toAssetIdEncoded = AbiCoder.encodeParameter('uint256', toAssetId);
+    const amountToSwitchEncoded = AbiCoder.encodeParameter('uint256', amountToSwitch);
+    // Add two empty slots for future addons (e.g tsi or slippage settings)
+    return [
+      spokeEncoded,
+      ownerEncoded,
+      fromAssetEncoded,
+      fromAssetIdEncoded,
+      toAssetEncoded,
+      toAssetIdEncoded,
+      amountToSwitchEncoded,
+      EMPTY_SLOT,
+      EMPTY_SLOT,
+    ];
+  },
+  decode: (subData: SubData) => {
+    const spoke = AbiCoder.decodeParameter('address', subData[0]) as unknown as EthereumAddress;
+    const owner = AbiCoder.decodeParameter('address', subData[1]) as unknown as EthereumAddress;
+    const fromAsset = AbiCoder.decodeParameter('address', subData[2]) as unknown as EthereumAddress;
+    const fromAssetId = Number(AbiCoder.decodeParameter('uint256', subData[3]));
+    const toAsset = AbiCoder.decodeParameter('address', subData[4]) as unknown as EthereumAddress;
+    const toAssetId = Number(AbiCoder.decodeParameter('uint256', subData[5]));
+    const amountToSwitch = AbiCoder.decodeParameter('uint256', subData[6]) as any as string;
+    return {
+      spoke, owner, fromAsset, fromAssetId, toAsset, toAssetId, amountToSwitch,
+    };
+  },
+};
+
+/**
+  ______   ______   .___  ___. .______      ____    ____  ___
+ /      | /  __  \  |   \/   | |   _  \     \   \  /   / |__ \
+|  ,----'|  |  |  | |  \  /  | |  |_)  |     \   \/   /     ) |
+|  |     |  |  |  | |  |\/|  | |   ___/       \      /     / /
+|  `----.|  `--'  | |  |  |  | |  |            \    /     / /_
+ \______| \______/  |__|  |__| | _|             \__/     |____|
+ */
+export const compoundV2LeverageManagementSubData = {
+  encode(
+    triggerRepayRatio: number,
+    triggerBoostRatio: number,
+    targetBoostRatio: number,
+    targetRepayRatio: number,
+    boostEnabled: boolean,
+  ): SubData {
+    return [
+      new Dec(triggerRepayRatio).mul(1e16).toString(),
+      new Dec(triggerBoostRatio).mul(1e16).toString(),
+      new Dec(targetBoostRatio).mul(1e16).toString(),
+      new Dec(targetRepayRatio).mul(1e16).toString(),
+      // @ts-ignore // TODO
+      boostEnabled,
+    ];
+  },
+  decode(subData: SubData): { targetRatio: number } {
+    const weiRatio = AbiCoder.decodeParameter('uint256', subData[0]) as any as string;
+    const targetRatio = weiToRatioPercentage(weiRatio);
+
+    return { targetRatio };
+  },
+};
+
+/**
+  ______   ______   .___  ___. .______      ____    ____  ____
+ /      | /  __  \  |   \/   | |   _  \     \   \  /   / |___ \
+|  ,----'|  |  |  | |  \  /  | |  |_)  |     \   \/   /    __) |
+|  |     |  |  |  | |  |\/|  | |   ___/       \      /    |__ <
+|  `----.|  `--'  | |  |  |  | |  |            \    /     ___) |
+ \______| \______/  |__|  |__| | _|             \__/     |____/
+ */
+export const compoundV3LeverageManagementSubData = {
+  encode(
+    market: EthereumAddress,
+    baseToken: EthereumAddress,
+    triggerRepayRatio: number,
+    triggerBoostRatio: number,
+    targetBoostRatio: number,
+    targetRepayRatio: number,
+    boostEnabled: boolean,
+    isEOA: boolean,
+  ): SubData {
+    return [
+      market,
+      baseToken,
+      new Dec(triggerRepayRatio).mul(1e16).toString(),
+      new Dec(triggerBoostRatio).mul(1e16).toString(),
+      new Dec(targetBoostRatio).mul(1e16).toString(),
+      new Dec(targetRepayRatio).mul(1e16).toString(),
       // @ts-ignore // TODO
       boostEnabled, isEOA,
     ];
@@ -258,7 +1035,6 @@ export const compoundV3LeverageManagementSubData = {
     return { targetRatio };
   },
 };
-
 export const compoundV3L2LeverageManagementSubData = {
   encode(
     market: EthereumAddress,
@@ -268,6 +1044,7 @@ export const compoundV3L2LeverageManagementSubData = {
     targetBoostRatio: number,
     targetRepayRatio: number,
     boostEnabled: boolean,
+    isEOA: boolean,
   ): string {
     let subInput = '0x';
 
@@ -282,6 +1059,7 @@ export const compoundV3L2LeverageManagementSubData = {
     subInput = subInput.concat(new Dec(targetRepayRatio).mul(1e16).toHex().slice(2)
       .padStart(32, '0'));
     subInput = subInput.concat(boostEnabled ? '01' : '00');
+    subInput = subInput.concat(isEOA ? '01' : '00');
 
     return subInput;
   },
@@ -292,65 +1070,101 @@ export const compoundV3L2LeverageManagementSubData = {
     return { targetRatio };
   },
 };
-
-export const morphoAaveV2LeverageManagementSubData = {
+export const compoundV3LeverageManagementOnPriceSubData = {
   encode(
-    triggerRepayRatio: number,
-    triggerBoostRatio: number,
-    targetBoostRatio: number,
-    targetRepayRatio: number,
-    boostEnabled: boolean,
+    market: EthereumAddress,
+    collToken: EthereumAddress,
+    baseToken: EthereumAddress,
+    targetRatio: number,
+    ratioState: RatioState,
+    user: EthereumAddress,
   ): SubData {
+    const marketEncoded = AbiCoder.encodeParameter('address', market);
+    const collTokenEncoded = AbiCoder.encodeParameter('address', collToken);
+    const baseTokenEncoded = AbiCoder.encodeParameter('address', baseToken);
+    const targetRatioEncoded = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
+    const ratioStateEncoded = AbiCoder.encodeParameter('uint8', ratioState);
+    const userEncoded = AbiCoder.encodeParameter('address', user);
+
     return [
-      ratioPercentageToWei(triggerRepayRatio),
-      ratioPercentageToWei(triggerBoostRatio),
-      ratioPercentageToWei(targetBoostRatio),
-      ratioPercentageToWei(targetRepayRatio),
-      // @ts-ignore
-      boostEnabled,
+      marketEncoded,
+      collTokenEncoded,
+      baseTokenEncoded,
+      targetRatioEncoded,
+      ratioStateEncoded,
+      userEncoded,
     ];
   },
-  decode(subData: SubData): { targetRatio: number } {
-    const ratioWei = AbiCoder.decodeParameter('uint128', subData[1]) as any as string;
-    const targetRatio = weiToRatioPercentage(ratioWei);
-
-    return { targetRatio };
-  },
-};
+  decode(subData: SubData): {
+    market: EthereumAddress,
+    collToken: EthereumAddress,
+    baseToken: EthereumAddress,
+    targetRatio: number,
+    ratioState: RatioState,
+    owner: EthereumAddress,
+  } {
+    const market = AbiCoder.decodeParameter('address', subData[0]) as unknown as EthereumAddress;
+    const collToken = AbiCoder.decodeParameter('address', subData[1]) as unknown as EthereumAddress;
+    const baseToken = AbiCoder.decodeParameter('address', subData[2]) as unknown as EthereumAddress;
+    const weiRatio = AbiCoder.decodeParameter('uint256', subData[3]) as any as string;
+    const targetRatio = weiToRatioPercentage(weiRatio);
+    const ratioState = Number(AbiCoder.decodeParameter('uint8', subData[4])) as any as RatioState;
+    const owner = AbiCoder.decodeParameter('address', subData[5]) as unknown as EthereumAddress;
 
-export const cBondsRebondSubData = {
-  encode(bondId: number | string): SubData {
-    const bondIdEncoded = AbiCoder.encodeParameter('uint256', bondId);
-    return [bondIdEncoded];
-  },
-  decode(subData: SubData): { bondId: string } {
-    const bondId = AbiCoder.decodeParameter('uint256', subData[1])!.toString();
-    return { bondId };
+    return {
+      market, collToken, baseToken, targetRatio, ratioState, owner,
+    };
   },
 };
+export const compoundV3CloseSubData = {
+  encode(
+    market: EthereumAddress,
+    collToken: EthereumAddress,
+    baseToken: EthereumAddress,
+    closeType: CloseStrategyType,
+    user: EthereumAddress,
+  ): SubData {
+    const marketEncoded = AbiCoder.encodeParameter('address', market);
+    const collTokenEncoded = AbiCoder.encodeParameter('address', collToken);
+    const baseTokenEncoded = AbiCoder.encodeParameter('address', baseToken);
+    const closeTypeEncoded = AbiCoder.encodeParameter('uint8', closeType);
+    const userEncoded = AbiCoder.encodeParameter('address', user);
 
-export const liquityPaybackUsingChickenBondSubData = {
-  /**
-   * @param sourceId bondId or subId
-   * @param sourceType 0 for bond, 1 for subId
-   * @param chainId
-   */
-  encode: (sourceId: string, sourceType: number, chainId: ChainId = ChainId.Ethereum): SubData => {
-    const sourceIdEncoded = AbiCoder.encodeParameter('uint256', sourceId);
-    const sourceTypeEncoded = AbiCoder.encodeParameter('uint256', sourceType);
-    const lusdAddressEncoded = AbiCoder.encodeParameter('address', getAssetInfo('LUSD', chainId).address);
-    const bLusdAddressEncoded = AbiCoder.encodeParameter('address', getAssetInfo('bLUSD', chainId).address);
-
-    return [sourceIdEncoded, sourceTypeEncoded, lusdAddressEncoded, bLusdAddressEncoded];
+    return [
+      marketEncoded,
+      collTokenEncoded,
+      baseTokenEncoded,
+      closeTypeEncoded,
+      userEncoded,
+    ];
   },
-  decode: (subData: SubData) => {
-    const sourceId = AbiCoder.decodeParameter('uint256', subData[0])!.toString();
-    const sourceType = AbiCoder.decodeParameter('uint256', subData[1])!.toString();
+  decode(subData: SubData): {
+    market: EthereumAddress,
+    collToken: EthereumAddress,
+    baseToken: EthereumAddress,
+    closeType: CloseStrategyType,
+    owner: EthereumAddress,
+  } {
+    const market = AbiCoder.decodeParameter('address', subData[0]) as unknown as EthereumAddress;
+    const collToken = AbiCoder.decodeParameter('address', subData[1]) as unknown as EthereumAddress;
+    const baseToken = AbiCoder.decodeParameter('address', subData[2]) as unknown as EthereumAddress;
+    const closeType = Number(AbiCoder.decodeParameter('uint8', subData[3])) as CloseStrategyType;
+    const owner = AbiCoder.decodeParameter('address', subData[4]) as unknown as EthereumAddress;
 
-    return { sourceId, sourceType };
+    return {
+      market, collToken, baseToken, closeType, owner,
+    };
   },
 };
 
+/**
+ __________   ___   ______  __    __       ___      .__   __.   _______  _______
+|   ____\  \ /  /  /      ||  |  |  |     /   \     |  \ |  |  /  _____||   ____|
+|  |__   \  V  /  |  ,----'|  |__|  |    /  ^  \    |   \|  | |  |  __  |  |__
+|   __|   >   <   |  |     |   __   |   /  /_\  \   |  . `  | |  | |_ | |   __|
+|  |____ /  .  \  |  `----.|  |  |  |  /  _____  \  |  |\   | |  |__| | |  |____
+|_______/__/ \__\  \______||__|  |__| /__/     \__\ |__| \__|  \______| |_______|
+ */
 export const exchangeDcaSubData = {
   encode: (fromToken: EthereumAddress, toToken: EthereumAddress, amount: string, interval: number) : SubData => {
     const sellTokenEncoded = AbiCoder.encodeParameter('address', fromToken);
@@ -373,7 +1187,6 @@ export const exchangeDcaSubData = {
     };
   },
 };
-
 export const exchangeLimitOrderSubData = {
   encode(fromToken: EthereumAddress, toToken: EthereumAddress, amount: string, targetPrice: string, goodUntil: string | number, orderType: OrderType) : SubData {
     return [
@@ -393,7 +1206,15 @@ export const exchangeLimitOrderSubData = {
   },
 };
 
-export const sparkLeverageManagementSubData = { // TODO encode?
+/**
+     _______..______      ___      .______       __  ___
+    /       ||   _  \    /   \     |   _  \     |  |/  /
+   |   (----`|  |_)  |  /  ^  \    |  |_)  |    |  '  /
+    \   \    |   ___/  /  /_\  \   |      /     |    <
+.----)   |   |  |     /  _____  \  |  |\  \----.|  .  \
+|_______/    | _|    /__/     \__\ | _| `._____||__|\__\
+ */
+export const sparkLeverageManagementSubData = {
   decode(subData: SubData): { targetRatio: number } {
     const ratioWei = AbiCoder.decodeParameter('uint256', subData[0]) as any as string;
     const targetRatio = weiToRatioPercentage(ratioWei);
@@ -401,96 +1222,172 @@ export const sparkLeverageManagementSubData = { // TODO encode?
     return { targetRatio };
   },
 };
+export const sparkLeverageManagementSubDataWithoutSubProxy = {
+  encode(
+    targetRatio: number,
+    ratioState: RatioState,
+  ): SubData {
+    const encodedTargetRatio = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
+    const encodedRatioState = AbiCoder.encodeParameter('uint8', ratioState);
+
+    const encodedUseDefaultMarket = AbiCoder.encodeParameter('bool', true);
+    const encodedUseOnBehalf = AbiCoder.encodeParameter('bool', false);
+    return [encodedTargetRatio, encodedRatioState, encodedUseDefaultMarket, encodedUseOnBehalf];
+  },
+  decode(subData: SubData): { targetRatio: number, ratioState: RatioState } {
+    const targetRatio = weiToRatioPercentage(AbiCoder.decodeParameter('uint256', subData[0]) as any as string);
+    const ratioState = AbiCoder.decodeParameter('uint8', subData[1]) as any as RatioState;
 
-export const sparkQuotePriceSubData = {
+    return { targetRatio, ratioState };
+  },
+};
+export const sparkCloseGenericSubData = {
   encode(
     collAsset: EthereumAddress,
     collAssetId: number,
     debtAsset: EthereumAddress,
     debtAssetId: number,
-    nullAddress: EthereumAddress = ZERO_ADDRESS,
+    closeType: CloseStrategyType,
+    marketAddr: EthereumAddress,
+    user: EthereumAddress,
   ): SubData {
     const encodedColl = AbiCoder.encodeParameter('address', collAsset);
     const encodedCollId = AbiCoder.encodeParameter('uint8', collAssetId);
-
     const encodedDebt = AbiCoder.encodeParameter('address', debtAsset);
     const encodedDebtId = AbiCoder.encodeParameter('uint8', debtAssetId);
+    const encodedCloseType = AbiCoder.encodeParameter('uint8', closeType);
+    const encodedMarket = AbiCoder.encodeParameter('address', marketAddr);
+    const userEncoded = AbiCoder.encodeParameter('address', user);
 
-    const encodedNullAddress = AbiCoder.encodeParameter('address', nullAddress);
-
-    return [encodedColl, encodedCollId, encodedDebt, encodedDebtId, encodedNullAddress];
+    return [
+      encodedColl,
+      encodedCollId,
+      encodedDebt,
+      encodedDebtId,
+      encodedCloseType,
+      encodedMarket,
+      userEncoded,
+    ];
   },
-  decode(subData: SubData): { collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number } {
+
+  decode(subData: SubData): {
+    collAsset: EthereumAddress,
+    collAssetId: number,
+    debtAsset: EthereumAddress,
+    debtAssetId: number,
+    closeType: CloseStrategyType,
+    marketAddr: EthereumAddress,
+    owner: EthereumAddress,
+  } {
     const collAsset = AbiCoder.decodeParameter('address', subData[0]) as unknown as EthereumAddress;
     const collAssetId = Number(AbiCoder.decodeParameter('uint8', subData[1]));
-
     const debtAsset = AbiCoder.decodeParameter('address', subData[2]) as unknown as EthereumAddress;
     const debtAssetId = Number(AbiCoder.decodeParameter('uint8', subData[3]));
+    const closeType = Number(AbiCoder.decodeParameter('uint8', subData[4])) as CloseStrategyType;
+    const marketAddr = AbiCoder.decodeParameter('address', subData[5]) as unknown as EthereumAddress;
+    const owner = AbiCoder.decodeParameter('address', subData[6]) as unknown as EthereumAddress;
 
     return {
-      collAsset, collAssetId, debtAsset, debtAssetId,
+      collAsset, collAssetId, debtAsset, debtAssetId, closeType, marketAddr, owner,
     };
   },
 };
-
-export const liquityDsrPaybackSubData = {
-  encode: (targetRatio: number) => {
-    const daiAddress = getAssetInfo('DAI').address;
-    const lusdAddress = getAssetInfo('LUSD').address;
-
-    const ratioStateEncoded = AbiCoder.encodeParameter('uint8', RatioState.UNDER);
-    const targetRatioEncoded = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
-    const daiAddressEncoded = AbiCoder.encodeParameter('address', daiAddress);
-    const lusdAddressEncoded = AbiCoder.encodeParameter('address', lusdAddress);
-
-    return [ratioStateEncoded, targetRatioEncoded, daiAddressEncoded, lusdAddressEncoded];
+export const sparkLeverageManagementOnPriceSubData = {
+  encode(
+    collAsset: EthereumAddress,
+    collAssetId: number,
+    debtAsset: EthereumAddress,
+    debtAssetId: number,
+    marketAddr: EthereumAddress,
+    targetRatio: number,
+  ): SubData {
+    const encodedColl = AbiCoder.encodeParameter('address', collAsset);
+    const encodedCollId = AbiCoder.encodeParameter('uint16', collAssetId);
+    const encodedDebt = AbiCoder.encodeParameter('address', debtAsset);
+    const encodedDebtId = AbiCoder.encodeParameter('uint16', debtAssetId);
+    const encodedMarket = AbiCoder.encodeParameter('address', marketAddr);
+    const encodedTargetRatio = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
+    const useOnBehalfEncoded = AbiCoder.encodeParameter('bool', false);
+    return [encodedColl, encodedCollId, encodedDebt, encodedDebtId, encodedMarket, encodedTargetRatio, useOnBehalfEncoded];
   },
-  decode: (subData: SubData) => {
-    const weiRatio = AbiCoder.decodeParameter('uint256', subData[1]) as any as string;
+  decode(subData: SubData): {
+    collAsset: EthereumAddress,
+    collAssetId: number,
+    debtAsset: EthereumAddress,
+    debtAssetId: number,
+    marketAddr: EthereumAddress,
+    targetRatio: number,
+  } {
+    const collAsset = AbiCoder.decodeParameter('address', subData[0]) as unknown as EthereumAddress;
+    const collAssetId = Number(AbiCoder.decodeParameter('uint16', subData[1]));
+    const debtAsset = AbiCoder.decodeParameter('address', subData[2]) as unknown as EthereumAddress;
+    const debtAssetId = Number(AbiCoder.decodeParameter('uint16', subData[3]));
+    const marketAddr = AbiCoder.decodeParameter('address', subData[4]) as unknown as EthereumAddress;
+    const weiRatio = AbiCoder.decodeParameter('uint256', subData[5]) as any as string;
     const targetRatio = weiToRatioPercentage(weiRatio);
-    return { targetRatio };
+    return {
+      collAsset, collAssetId, debtAsset, debtAssetId, marketAddr, targetRatio,
+    };
   },
 };
+export const sparkCollateralSwitchSubData = {
+  encode(
+    fromAsset: EthereumAddress,
+    fromAssetId: number,
+    toAsset: EthereumAddress,
+    toAssetId: number,
+    marketAddr: EthereumAddress,
+    amountToSwitch: string,
+    useOnBehalf: boolean = false,
+  ): SubData {
+    const encodedFromAsset = AbiCoder.encodeParameter('address', fromAsset);
+    const encodedFromAssetId = AbiCoder.encodeParameter('uint8', fromAssetId);
+    const encodedToAsset = AbiCoder.encodeParameter('address', toAsset);
+    const encodedToAssetId = AbiCoder.encodeParameter('uint8', toAssetId);
+    const encodedMarketAddr = AbiCoder.encodeParameter('address', marketAddr);
+    const encodedAmountToSwitch = AbiCoder.encodeParameter('uint256', amountToSwitch);
+    const encodedUseOnBehalf = AbiCoder.encodeParameter('bool', useOnBehalf);
 
-export const liquityDsrSupplySubData = {
-  encode: (targetRatio: number) => {
-    const daiAddress = getAssetInfo('DAI').address;
-    const wethAddress = getAssetInfo('WETH').address;
-
-    const ratioStateEncoded = AbiCoder.encodeParameter('uint8', RatioState.UNDER);
-    const targetRatioEncoded = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
-    const daiAddressEncoded = AbiCoder.encodeParameter('address', daiAddress);
-    const wethAddressEncoded = AbiCoder.encodeParameter('address', wethAddress);
-
-    return [ratioStateEncoded, targetRatioEncoded, daiAddressEncoded, wethAddressEncoded];
-  },
-  decode: (subData: SubData) => {
-    const weiRatio = AbiCoder.decodeParameter('uint256', subData[1]) as any as string;
-    const targetRatio = weiToRatioPercentage(weiRatio);
-    return { targetRatio };
+    return [
+      encodedFromAsset,
+      encodedFromAssetId,
+      encodedToAsset,
+      encodedToAssetId,
+      encodedMarketAddr,
+      encodedAmountToSwitch,
+      encodedUseOnBehalf,
+    ];
   },
-};
-
-export const liquityDebtInFrontRepaySubData = {
-  encode: (targetRatioIncrease: number) => {
-    const wethAddress = getAssetInfo('WETH').address;
-    const lusdAddress = getAssetInfo('LUSD').address;
-
-    const wethAddressEncoded = AbiCoder.encodeParameter('address', wethAddress);
-    const lusdAddressEncoded = AbiCoder.encodeParameter('address', lusdAddress);
-    const targetRatioIncreaseEncoded = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatioIncrease));
-    const withdrawIdEncoded = AbiCoder.encodeParameter('uint8', 1); // withdraw - 1
-    const paybackIdEncoded = AbiCoder.encodeParameter('uint8', 0); // payback - 0
+  decode(subData: SubData): {
+    fromAsset: EthereumAddress,
+    fromAssetId: number,
+    toAsset: EthereumAddress,
+    toAssetId: number,
+    marketAddr: EthereumAddress,
+    amountToSwitch: string,
+  } {
+    const fromAsset = AbiCoder.decodeParameter('address', subData[0]) as unknown as EthereumAddress;
+    const fromAssetId = Number(AbiCoder.decodeParameter('uint8', subData[1]));
+    const toAsset = AbiCoder.decodeParameter('address', subData[2]) as unknown as EthereumAddress;
+    const toAssetId = Number(AbiCoder.decodeParameter('uint8', subData[3]));
+    const marketAddr = AbiCoder.decodeParameter('address', subData[4]) as unknown as EthereumAddress;
+    const amountToSwitch = AbiCoder.decodeParameter('uint256', subData[5]) as unknown as string;
 
-    return [wethAddressEncoded, lusdAddressEncoded, targetRatioIncreaseEncoded, withdrawIdEncoded, paybackIdEncoded];
-  },
-  decode: (subData: SubData) => {
-    const weiRatio = AbiCoder.decodeParameter('uint256', subData[2]) as any as string;
-    const targetRatioIncrease = weiToRatioPercentage(weiRatio);
-    return { targetRatioIncrease };
+    return {
+      fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch,
+    };
   },
 };
 
+
+/**
+  ______ .______     ____    ____  __    __       _______. _______
+ /      ||   _  \    \   \  /   / |  |  |  |     /       ||       \
+|  ,----'|  |_)  |    \   \/   /  |  |  |  |    |   (----`|  .--.  |
+|  |     |      /      \      /   |  |  |  |     \   \    |  |  |  |
+|  `----.|  |\  \----.  \    /    |  `--'  | .----)   |   |  '--'  |
+ \______|| _| `._____|   \__/      \______/  |_______/    |_______/
+ */
 export const crvUSDLeverageManagementSubData = {
   encode: (
     controllerAddr: EthereumAddress,
@@ -514,7 +1411,6 @@ export const crvUSDLeverageManagementSubData = {
     return { controller, targetRatio };
   },
 };
-
 export const crvUSDPaybackSubData = {
   encode: (
     controllerAddr: EthereumAddress,
@@ -551,6 +1447,14 @@ export const crvUSDPaybackSubData = {
   },
 };
 
+/**
+.___  ___.   ______   .______      .______    __    __    ______
+|   \/   |  /  __  \  |   _  \     |   _  \  |  |  |  |  /  __  \
+|  \  /  | |  |  |  | |  |_)  |    |  |_)  | |  |__|  | |  |  |  |
+|  |\/|  | |  |  |  | |      /     |   ___/  |   __   | |  |  |  |
+|  |  |  | |  `--'  | |  |\  \----.|  |      |  |  |  | |  `--'  |
+|__|  |__|  \______/  | _| `._____|| _|      |__|  |__|  \______/
+ */
 export const morphoBlueLeverageManagementSubData = {
   encode: (
     loanToken: EthereumAddress,
@@ -595,204 +1499,6 @@ export const morphoBlueLeverageManagementSubData = {
     };
   },
 };
-
-export const aaveV3LeverageManagementOnPriceSubData = {
-  encode(
-    collAsset: EthereumAddress,
-    collAssetId: number,
-    debtAsset: EthereumAddress,
-    debtAssetId: number,
-    marketAddr: EthereumAddress,
-    targetRatio: number,
-  ): SubData {
-    const encodedColl = AbiCoder.encodeParameter('address', collAsset);
-    const encodedCollId = AbiCoder.encodeParameter('uint8', collAssetId);
-    const encodedDebt = AbiCoder.encodeParameter('address', debtAsset);
-    const encodedDebtId = AbiCoder.encodeParameter('uint8', debtAssetId);
-    const encodedMarket = AbiCoder.encodeParameter('address', marketAddr);
-    const encodedTargetRatio = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
-    const useOnBehalfEncoded = AbiCoder.encodeParameter('bool', false);
-
-    return [
-      encodedColl,
-      encodedCollId,
-      encodedDebt,
-      encodedDebtId,
-      encodedMarket,
-      encodedTargetRatio,
-      useOnBehalfEncoded,
-    ];
-  },
-  decode(subData: SubData): {
-    collAsset: EthereumAddress,
-    collAssetId: number,
-    debtAsset: EthereumAddress,
-    debtAssetId: number,
-    marketAddr: EthereumAddress,
-    targetRatio: number,
-  } {
-    const collAsset = AbiCoder.decodeParameter('address', subData[0]) as unknown as EthereumAddress;
-    const collAssetId = Number(AbiCoder.decodeParameter('uint8', subData[1]));
-    const debtAsset = AbiCoder.decodeParameter('address', subData[2]) as unknown as EthereumAddress;
-    const debtAssetId = Number(AbiCoder.decodeParameter('uint8', subData[3]));
-    const marketAddr = AbiCoder.decodeParameter('address', subData[4]) as unknown as EthereumAddress;
-
-    const weiRatio = AbiCoder.decodeParameter('uint256', subData[5]) as any as string;
-    const targetRatio = weiToRatioPercentage(weiRatio);
-
-    return {
-      collAsset, collAssetId, debtAsset, debtAssetId, marketAddr, targetRatio,
-    };
-  },
-};
-
-export const liquityV2LeverageManagementSubData = {
-  encode: (
-    market: EthereumAddress,
-    troveId: string,
-    collToken: EthereumAddress,
-    boldToken: EthereumAddress,
-    ratioState: RatioState,
-    targetRatio: number,
-  ) => {
-    const marketEncoded = AbiCoder.encodeParameter('address', market);
-    const troveIdEncoded = AbiCoder.encodeParameter('uint256', troveId);
-    const collTokenEncoded = AbiCoder.encodeParameter('address', collToken);
-    const boldTokenEncoded = AbiCoder.encodeParameter('address', boldToken);
-    const ratioStateEncoded = AbiCoder.encodeParameter('uint8', ratioState);
-    const targetRatioEncoded = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
-
-    const isRepay = ratioState === RatioState.UNDER;
-    const collActionType = isRepay ? CollActionType.WITHDRAW : CollActionType.SUPPLY;
-    const debtActionType = isRepay ? DebtActionType.PAYBACK : DebtActionType.BORROW;
-
-    const collActionTypeEncoded = AbiCoder.encodeParameter('uint8', collActionType);
-    const debtActionTypeEncoded = AbiCoder.encodeParameter('uint8', debtActionType);
-
-    return [
-      marketEncoded,
-      troveIdEncoded,
-      collTokenEncoded,
-      boldTokenEncoded,
-      ratioStateEncoded,
-      targetRatioEncoded,
-      collActionTypeEncoded,
-      debtActionTypeEncoded,
-    ];
-  },
-  decode: (subData: SubData) => {
-    const market = AbiCoder.decodeParameter('address', subData[0]) as unknown as EthereumAddress;
-    const troveId = AbiCoder.decodeParameter('uint256', subData[1]) as any as string;
-    const collToken = AbiCoder.decodeParameter('address', subData[2]) as any as EthereumAddress;
-    const boldToken = AbiCoder.decodeParameter('address', subData[3]) as any as EthereumAddress;
-    const ratioState = AbiCoder.decodeParameter('uint8', subData[4]) as any as RatioState;
-    const weiRatio = AbiCoder.decodeParameter('uint256', subData[5]) as any as string;
-    const targetRatio = weiToRatioPercentage(weiRatio);
-
-    return {
-      market, troveId, collToken, boldToken, ratioState, targetRatio,
-    };
-  },
-};
-
-export const liquityV2CloseSubData = {
-  encode(
-    market: EthereumAddress,
-    troveId: string,
-    collToken: EthereumAddress,
-    boldToken: EthereumAddress,
-    closeType: CloseStrategyType,
-  ): SubData {
-    const marketEncoded = AbiCoder.encodeParameter('address', market);
-    const troveIdEncoded = AbiCoder.encodeParameter('uint256', troveId);
-    const collAddrEncoded = AbiCoder.encodeParameter('address', collToken);
-    const boldTokenEncoded = AbiCoder.encodeParameter('address', boldToken);
-    const wethAddress = getAssetInfo('WETH').address;
-    const wethAddressEncoded = AbiCoder.encodeParameter('address', wethAddress);
-    const gasCompensation = new Dec('0.0375').mul(1e18).toString();
-    const gasCompensationEncoded = AbiCoder.encodeParameter('uint256', gasCompensation);
-    const closeTypeEncoded = AbiCoder.encodeParameter('uint8', closeType);
-
-    return [
-      marketEncoded,
-      troveIdEncoded,
-      collAddrEncoded,
-      boldTokenEncoded,
-      wethAddressEncoded,
-      gasCompensationEncoded,
-      closeTypeEncoded,
-    ];
-  },
-  decode(subData: SubData): {
-    market: EthereumAddress,
-    troveId: string,
-    collToken: EthereumAddress,
-    boldToken: EthereumAddress,
-    closeType: CloseStrategyType,
-  } {
-    const market = AbiCoder.decodeParameter('address', subData[0]) as unknown as EthereumAddress;
-    const troveId = AbiCoder.decodeParameter('uint256', subData[1]) as any as string;
-    const collToken = AbiCoder.decodeParameter('address', subData[2]) as any as EthereumAddress;
-    const boldToken = AbiCoder.decodeParameter('address', subData[3]) as any as EthereumAddress;
-    // skip wethAddress and gasCompensation
-    const closeType = AbiCoder.decodeParameter('uint8', subData[6]) as any as CloseStrategyType;
-
-    return {
-      market, troveId, collToken, boldToken, closeType,
-    };
-  },
-};
-
-export const liquityV2LeverageManagementOnPriceSubData = {
-  encode(
-    market: EthereumAddress,
-    troveId: string,
-    collToken: EthereumAddress,
-    boldToken: EthereumAddress,
-    targetRatio: number,
-    isRepayOnPrice: boolean,
-  ): SubData {
-    const encodedMarket = AbiCoder.encodeParameter('address', market);
-    const encodedTroveId = AbiCoder.encodeParameter('uint256', troveId);
-    const encodedCollToken = AbiCoder.encodeParameter('address', collToken);
-    const encodedBoldToken = AbiCoder.encodeParameter('address', boldToken);
-    const encodedTargetRatio = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
-
-    const collActionType = isRepayOnPrice ? CollActionType.WITHDRAW : CollActionType.SUPPLY;
-    const debtActionType = isRepayOnPrice ? DebtActionType.PAYBACK : DebtActionType.BORROW;
-
-    const encodedCollActionType = AbiCoder.encodeParameter('uint8', collActionType);
-    const encodedDebtActionType = AbiCoder.encodeParameter('uint8', debtActionType);
-
-    return [
-      encodedMarket,
-      encodedTroveId,
-      encodedCollToken,
-      encodedBoldToken,
-      encodedTargetRatio,
-      encodedCollActionType,
-      encodedDebtActionType,
-    ];
-  },
-  decode(subData: SubData): {
-    market: EthereumAddress,
-    troveId: string,
-    collToken: EthereumAddress,
-    boldToken: EthereumAddress,
-    targetRatio: number,
-  } {
-    const market = AbiCoder.decodeParameter('address', subData[0]) as unknown as EthereumAddress;
-    const troveId = AbiCoder.decodeParameter('uint256', subData[1]) as any as string;
-    const collToken = AbiCoder.decodeParameter('address', subData[2]) as unknown as EthereumAddress;
-    const boldToken = AbiCoder.decodeParameter('address', subData[3]) as unknown as EthereumAddress;
-    const weiRatio = AbiCoder.decodeParameter('uint256', subData[4]) as any as string;
-    const targetRatio = weiToRatioPercentage(weiRatio);
-
-    return {
-      market, troveId, collToken, boldToken, targetRatio,
-    };
-  },
-};
 export const morphoBlueLeverageManagementOnPriceSubData = {
   encode(
     loanToken: EthereumAddress,
@@ -833,43 +1539,54 @@ export const morphoBlueLeverageManagementOnPriceSubData = {
     };
   },
 };
-
-export const liquityV2PaybackSubData = {
-  encode: (
-    market: EthereumAddress,
-    troveId: string,
-    boldToken: EthereumAddress,
-    targetRatio: number,
-    ratioState: RatioState,
-  ) => {
-    const marketEncoded = AbiCoder.encodeParameter('address', market);
-    const troveIdEncoded = AbiCoder.encodeParameter('uint256', troveId);
-    const boldTokenEncoded = AbiCoder.encodeParameter('address', boldToken);
-    const targetRatioEncoded = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
-    const ratioStateEncoded = AbiCoder.encodeParameter('uint8', ratioState);
-
-    return [
-      marketEncoded,
-      troveIdEncoded,
-      boldTokenEncoded,
-      targetRatioEncoded,
-      ratioStateEncoded,
-    ];
+export const morphoBlueCloseOnPriceSubData = {
+  encode(
+    loanToken: EthereumAddress,
+    collToken: EthereumAddress,
+    oracle: EthereumAddress,
+    irm: EthereumAddress,
+    lltv: string,
+    user: EthereumAddress,
+    closeType: CloseStrategyType,
+  ): SubData {
+    const loanTokenEncoded = AbiCoder.encodeParameter('address', loanToken);
+    const collTokenEncoded = AbiCoder.encodeParameter('address', collToken);
+    const oracleEncoded = AbiCoder.encodeParameter('address', oracle);
+    const irmEncoded = AbiCoder.encodeParameter('address', irm);
+    const lltvEncoded = AbiCoder.encodeParameter('uint256', lltv);
+    const userEncoded = AbiCoder.encodeParameter('address', user);
+    const closeTypeEncoded = AbiCoder.encodeParameter('uint8', closeType);
+    return [loanTokenEncoded, collTokenEncoded, oracleEncoded, irmEncoded, lltvEncoded, userEncoded, closeTypeEncoded];
   },
-  decode: (subData: SubData) => {
-    const market = AbiCoder.decodeParameter('address', subData[0]) as unknown as EthereumAddress;
-    const troveId = AbiCoder.decodeParameter('uint256', subData[1]) as any as string;
-    const boldToken = AbiCoder.decodeParameter('address', subData[2]) as any as EthereumAddress;
-    const weiRatio = AbiCoder.decodeParameter('uint256', subData[3]) as any as string;
-    const ratioState = AbiCoder.decodeParameter('uint8', subData[4]) as any as RatioState;
-    const targetRatio = weiToRatioPercentage(weiRatio);
+  decode(subData: SubData) {
+    const loanToken = AbiCoder.decodeParameter('address', subData[0]) as unknown as EthereumAddress;
+    const collToken = AbiCoder.decodeParameter('address', subData[1]) as any as EthereumAddress;
+    const oracle = AbiCoder.decodeParameter('address', subData[2]) as any as EthereumAddress;
+    const irm = AbiCoder.decodeParameter('address', subData[3]) as any as EthereumAddress;
+    const lltv = AbiCoder.decodeParameter('uint256', subData[4]) as any as EthereumAddress;
+    const user = AbiCoder.decodeParameter('address', subData[5]) as any as EthereumAddress;
+    const closeType = Number(AbiCoder.decodeParameter('uint8', subData[6])) as CloseStrategyType;
 
     return {
-      market, troveId, boldToken, ratioState, targetRatio,
+      loanToken,
+      collToken,
+      oracle,
+      irm,
+      lltv,
+      user,
+      closeType,
     };
   },
 };
 
+/**
+_______  __       __    __   __   _______
+|   ____||  |     |  |  |  | |  | |       \
+|  |__   |  |     |  |  |  | |  | |  .--.  |
+|   __|  |  |     |  |  |  | |  | |  |  |  |
+|  |     |  `----.|  `--'  | |  | |  '--'  |
+|__|     |_______| \______/  |__| |_______/
+ */
 export const fluidLeverageManagementSubData = {
   encode: (
     nftId: string,