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

package/esm/services/subDataService.js

@@ -4,8 +4,70 @@ import { fromWei, toWei } from 'web3-utils';
 import { assetAmountInEth, getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
 import { otherAddresses } from '@defisaver/sdk';
 import { ChainId, CollActionType, DebtActionType, RatioState, } from '../types/enums';
-import { ZERO_ADDRESS } from '../constants';
+import { EMPTY_SLOT, ZERO_ADDRESS } from '../constants';
 import { compareAddresses, ratioPercentageToWei, weiToRatioPercentage } from './utils';
+/**
+ _______   _______ .______   .______       _______   ______     ___   .___________. _______  _______
+|       \ |   ____||   _  \  |   _  \     |   ____| /      |   /   \  |           ||   ____||       \
+|  .--.  ||  |__   |  |_)  | |  |_)  |    |  |__   |  ,----'  /  ^  \ `---|  |----`|  |__   |  .--.  |
+|  |  |  ||   __|  |   ___/  |      /     |   __|  |  |      /  /_\  \    |  |     |   __|  |  |  |  |
+|  '--'  ||  |____ |  |      |  |\  \----.|  |____ |  `----./  _____  \   |  |     |  |____ |  '--'  |
+|_______/ |_______|| _|      | _| `._____||_______| \______/__/     \__\  |__|     |_______||_______/
+ */
+export const morphoAaveV2LeverageManagementSubData = {
+    encode(triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled) {
+        return [
+            ratioPercentageToWei(triggerRepayRatio),
+            ratioPercentageToWei(triggerBoostRatio),
+            ratioPercentageToWei(targetBoostRatio),
+            ratioPercentageToWei(targetRepayRatio),
+            // @ts-ignore
+            boostEnabled,
+        ];
+    },
+    decode(subData) {
+        const ratioWei = AbiCoder.decodeParameter('uint128', subData[1]);
+        const targetRatio = weiToRatioPercentage(ratioWei);
+        return { targetRatio };
+    },
+};
+export const cBondsRebondSubData = {
+    encode(bondId) {
+        const bondIdEncoded = AbiCoder.encodeParameter('uint256', bondId);
+        return [bondIdEncoded];
+    },
+    decode(subData) {
+        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, sourceType, chainId = ChainId.Ethereum) => {
+        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) => {
+        const sourceId = AbiCoder.decodeParameter('uint256', subData[0]).toString();
+        const sourceType = AbiCoder.decodeParameter('uint256', subData[1]).toString();
+        return { sourceId, sourceType };
+    },
+};
+/**
+.___  ___.      ___       __  ___  _______ .______
+|   \/   |     /   \     |  |/  / |   ____||   _  \
+|  \  /  |    /  ^  \    |  '  /  |  |__   |  |_)  |
+|  |\/|  |   /  /_\  \   |    <   |   __|  |      /
+|  |  |  |  /  _____  \  |  .  \  |  |____ |  |\  \----.
+|__|  |__| /__/     \__\ |__|\__\ |_______|| _| `._____|
+ */
 export const makerRepayFromSavingsSubData = {
     encode(vaultId, targetRatioPercentage, chainId, daiAddr, mcdCdpManagerAddr) {
         const _daiAddr = daiAddr || getAssetInfo('DAI', chainId).address;
@@ -29,13 +91,6 @@ export const makerRepayFromSavingsSubData = {
         };
     },
 };
-export const liquityRepayFromSavingsSubData = {
-    decode(subData) {
-        const weiRatio = AbiCoder.decodeParameter('uint256', subData[1]);
-        const targetRatio = weiToRatioPercentage(weiRatio);
-        return { targetRatio };
-    },
-};
 export const makerCloseSubData = {
     encode(vaultId, closeToAssetAddr, chainId, daiAddr, mcdCdpManagerAddr) {
         const _daiAddr = daiAddr || getAssetInfo('DAI', chainId).address;
@@ -70,6 +125,35 @@ export const makerLeverageManagementSubData = {
         return { vaultId, targetRatio };
     },
 };
+export const makerLeverageManagementWithoutSubProxy = {
+    encode(vaultId, targetRatio, daiAddr) {
+        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) {
+        const vaultId = +AbiCoder.decodeParameter('uint256', subData[0]).toString();
+        const targetRatio = weiToRatioPercentage(AbiCoder.decodeParameter('uint256', subData[1]));
+        const daiAddr = AbiCoder.decodeParameter('address', subData[2]).toString();
+        return { vaultId, targetRatio, daiAddr };
+    },
+};
+/**
+  __       __    ______      __    __   __  .___________.____    ____    ____    ____  __
+|  |     |  |  /  __  \    |  |  |  | |  | |           |\   \  /   /    \   \  /   / /_ |
+|  |     |  | |  |  |  |   |  |  |  | |  | `---|  |----` \   \/   /      \   \/   /   | |
+|  |     |  | |  |  |  |   |  |  |  | |  |     |  |       \_    _/        \      /    | |
+|  `----.|  | |  `--'  '--.|  `--'  | |  |     |  |         |  |           \    /     | |
+|_______||__|  \_____\_____\\______/  |__|     |__|         |__|            \__/      |_|
+ */
+export const liquityRepayFromSavingsSubData = {
+    decode(subData) {
+        const weiRatio = AbiCoder.decodeParameter('uint256', subData[1]);
+        const targetRatio = weiToRatioPercentage(weiRatio);
+        return { targetRatio };
+    },
+};
 export const liquityLeverageManagementSubData = {
     decode: (subData) => {
         const weiRatio = AbiCoder.decodeParameter('uint256', subData[1]);
@@ -96,6 +180,201 @@ export const liquityCloseSubData = {
         return { closeToAssetAddr, debtAddr };
     },
 };
+export const liquityDsrPaybackSubData = {
+    encode: (targetRatio) => {
+        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];
+    },
+    decode: (subData) => {
+        const weiRatio = AbiCoder.decodeParameter('uint256', subData[1]);
+        const targetRatio = weiToRatioPercentage(weiRatio);
+        return { targetRatio };
+    },
+};
+export const liquityDsrSupplySubData = {
+    encode: (targetRatio) => {
+        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) => {
+        const weiRatio = AbiCoder.decodeParameter('uint256', subData[1]);
+        const targetRatio = weiToRatioPercentage(weiRatio);
+        return { targetRatio };
+    },
+};
+export const liquityDebtInFrontRepaySubData = {
+    encode: (targetRatioIncrease) => {
+        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
+        return [wethAddressEncoded, lusdAddressEncoded, targetRatioIncreaseEncoded, withdrawIdEncoded, paybackIdEncoded];
+    },
+    decode: (subData) => {
+        const weiRatio = AbiCoder.decodeParameter('uint256', subData[2]);
+        const targetRatioIncrease = weiToRatioPercentage(weiRatio);
+        return { targetRatioIncrease };
+    },
+};
+/**
+ *  __       __    ______      __    __   __  .___________.____    ____    ____    ____  ___
+|  |     |  |  /  __  \    |  |  |  | |  | |           |\   \  /   /    \   \  /   / |__ \
+|  |     |  | |  |  |  |   |  |  |  | |  | `---|  |----` \   \/   /      \   \/   /     ) |
+|  |     |  | |  |  |  |   |  |  |  | |  |     |  |       \_    _/        \      /     / /
+|  `----.|  | |  `--'  '--.|  `--'  | |  |     |  |         |  |           \    /     / /_
+|_______||__|  \_____\_____\\______/  |__|     |__|         |__|            \__/     |____|
+ */
+export const liquityV2LeverageManagementSubData = {
+    encode: (market, troveId, collToken, boldToken, ratioState, targetRatio) => {
+        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) => {
+        const market = AbiCoder.decodeParameter('address', subData[0]);
+        const troveId = AbiCoder.decodeParameter('uint256', subData[1]);
+        const collToken = AbiCoder.decodeParameter('address', subData[2]);
+        const boldToken = AbiCoder.decodeParameter('address', subData[3]);
+        const ratioState = AbiCoder.decodeParameter('uint8', subData[4]);
+        const weiRatio = AbiCoder.decodeParameter('uint256', subData[5]);
+        const targetRatio = weiToRatioPercentage(weiRatio);
+        return {
+            market, troveId, collToken, boldToken, ratioState, targetRatio,
+        };
+    },
+};
+export const liquityV2CloseSubData = {
+    encode(market, troveId, collToken, boldToken, closeType) {
+        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) {
+        const market = AbiCoder.decodeParameter('address', subData[0]);
+        const troveId = AbiCoder.decodeParameter('uint256', subData[1]);
+        const collToken = AbiCoder.decodeParameter('address', subData[2]);
+        const boldToken = AbiCoder.decodeParameter('address', subData[3]);
+        // skip wethAddress and gasCompensation
+        const closeType = AbiCoder.decodeParameter('uint8', subData[6]);
+        return {
+            market, troveId, collToken, boldToken, closeType,
+        };
+    },
+};
+export const liquityV2LeverageManagementOnPriceSubData = {
+    encode(market, troveId, collToken, boldToken, targetRatio, isRepayOnPrice) {
+        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) {
+        const market = AbiCoder.decodeParameter('address', subData[0]);
+        const troveId = AbiCoder.decodeParameter('uint256', subData[1]);
+        const collToken = AbiCoder.decodeParameter('address', subData[2]);
+        const boldToken = AbiCoder.decodeParameter('address', subData[3]);
+        const weiRatio = AbiCoder.decodeParameter('uint256', subData[4]);
+        const targetRatio = weiToRatioPercentage(weiRatio);
+        return {
+            market, troveId, collToken, boldToken, targetRatio,
+        };
+    },
+};
+export const liquityV2PaybackSubData = {
+    encode: (market, troveId, boldToken, targetRatio, 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) => {
+        const market = AbiCoder.decodeParameter('address', subData[0]);
+        const troveId = AbiCoder.decodeParameter('uint256', subData[1]);
+        const boldToken = AbiCoder.decodeParameter('address', subData[2]);
+        const weiRatio = AbiCoder.decodeParameter('uint256', subData[3]);
+        const ratioState = AbiCoder.decodeParameter('uint8', subData[4]);
+        const targetRatio = weiToRatioPercentage(weiRatio);
+        return {
+            market, troveId, boldToken, ratioState, targetRatio,
+        };
+    },
+};
+/**
+     ___           ___   ____    ____  _______    ____    ____  ___
+    /   \         /   \  \   \  /   / |   ____|   \   \  /   / |__ \
+   /  ^  \       /  ^  \  \   \/   /  |  |__       \   \/   /     ) |
+  /  /_\  \     /  /_\  \  \      /   |   __|       \      /     / /
+ /  _____  \   /  _____  \  \    /    |  |____       \    /     / /_
+/__/     \__\ /__/     \__\  \__/     |_______|       \__/     |____|
+ */
 export const aaveV2LeverageManagementSubData = {
     encode(triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled) {
         return [
@@ -113,6 +392,14 @@ export const aaveV2LeverageManagementSubData = {
         return { targetRatio };
     },
 };
+/**
+     ___           ___   ____    ____  _______    ____    ____  ____
+    /   \         /   \  \   \  /   / |   ____|   \   \  /   / |___ \
+   /  ^  \       /  ^  \  \   \/   /  |  |__       \   \/   /    __) |
+  /  /_\  \     /  /_\  \  \      /   |   __|       \      /    |__ <
+ /  _____  \   /  _____  \  \    /    |  |____       \    /     ___) |
+/__/     \__\ /__/     \__\  \__/     |_______|       \__/     |____/
+ */
 export const aaveV3LeverageManagementSubData = {
     decode(subData) {
         const ratioWei = AbiCoder.decodeParameter('uint256', subData[0]);
@@ -120,6 +407,127 @@ export const aaveV3LeverageManagementSubData = {
         return { targetRatio };
     },
 };
+export const aaveV3LeverageManagementSubDataWithoutSubProxy = {
+    encode(targetRatio, ratioState, market, user, isGeneric) {
+        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) {
+        const targetRatio = weiToRatioPercentage(AbiCoder.decodeParameter('uint256', subData[0]));
+        const ratioState = AbiCoder.decodeParameter('uint8', subData[1]);
+        return { targetRatio, ratioState };
+    },
+};
+export const aaveV3LeverageManagementOnPriceGeneric = {
+    encode(collAsset, collAssetId, debtAsset, debtAssetId, marketAddr, targetRatio, user) {
+        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) {
+        const collAsset = AbiCoder.decodeParameter('address', subData[0]);
+        const collAssetId = Number(AbiCoder.decodeParameter('uint8', subData[1]));
+        const debtAsset = AbiCoder.decodeParameter('address', subData[2]);
+        const debtAssetId = Number(AbiCoder.decodeParameter('uint8', subData[3]));
+        const marketAddr = AbiCoder.decodeParameter('address', subData[4]);
+        const weiRatio = AbiCoder.decodeParameter('uint256', subData[5]);
+        const targetRatio = weiToRatioPercentage(weiRatio);
+        const owner = AbiCoder.decodeParameter('address', subData[6]);
+        return {
+            collAsset,
+            collAssetId,
+            debtAsset,
+            debtAssetId,
+            marketAddr,
+            targetRatio,
+            owner,
+        };
+    },
+};
+export const aaveV3CloseGenericSubData = {
+    encode(collAsset, collAssetId, debtAsset, debtAssetId, closeType, marketAddr, user) {
+        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) {
+        const collAsset = AbiCoder.decodeParameter('address', subData[0]);
+        const collAssetId = Number(AbiCoder.decodeParameter('uint8', subData[1]));
+        const debtAsset = AbiCoder.decodeParameter('address', subData[2]);
+        const debtAssetId = Number(AbiCoder.decodeParameter('uint8', subData[3]));
+        const closeType = Number(AbiCoder.decodeParameter('uint8', subData[4]));
+        const marketAddr = AbiCoder.decodeParameter('address', subData[5]);
+        const owner = AbiCoder.decodeParameter('address', subData[6]);
+        return {
+            collAsset, collAssetId, debtAsset, debtAssetId, closeType, marketAddr, owner,
+        };
+    },
+};
+export const aaveV3CollateralSwitchSubData = {
+    encode(fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, useOnBehalf = false) {
+        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) {
+        const fromAsset = AbiCoder.decodeParameter('address', subData[0]);
+        const fromAssetId = Number(AbiCoder.decodeParameter('uint8', subData[1]));
+        const toAsset = AbiCoder.decodeParameter('address', subData[2]);
+        const toAssetId = Number(AbiCoder.decodeParameter('uint8', subData[3]));
+        const marketAddr = AbiCoder.decodeParameter('address', subData[4]);
+        const amountToSwitch = AbiCoder.decodeParameter('uint256', subData[5]);
+        return {
+            fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch,
+        };
+    },
+};
 export const aaveV3QuotePriceSubData = {
     encode(collAsset, collAssetId, debtAsset, debtAssetId, nullAddress = ZERO_ADDRESS) {
         const encodedColl = AbiCoder.encodeParameter('address', collAsset);
@@ -139,6 +547,188 @@ export const aaveV3QuotePriceSubData = {
         };
     },
 };
+export const aaveV3LeverageManagementOnPriceSubData = {
+    encode(collAsset, collAssetId, debtAsset, debtAssetId, marketAddr, targetRatio) {
+        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) {
+        const collAsset = AbiCoder.decodeParameter('address', subData[0]);
+        const collAssetId = Number(AbiCoder.decodeParameter('uint8', subData[1]));
+        const debtAsset = AbiCoder.decodeParameter('address', subData[2]);
+        const debtAssetId = Number(AbiCoder.decodeParameter('uint8', subData[3]));
+        const marketAddr = AbiCoder.decodeParameter('address', subData[4]);
+        const weiRatio = AbiCoder.decodeParameter('uint256', subData[5]);
+        const targetRatio = weiToRatioPercentage(weiRatio);
+        return {
+            collAsset, collAssetId, debtAsset, debtAssetId, marketAddr, targetRatio,
+        };
+    },
+};
+/**
+ *      ___           ___   ____    ____  _______    ____    ____  _  _
+    /   \         /   \  \   \  /   / |   ____|   \   \  /   / | || |
+   /  ^  \       /  ^  \  \   \/   /  |  |__       \   \/   /  | || |_
+  /  /_\  \     /  /_\  \  \      /   |   __|       \      /   |__   _|
+ /  _____  \   /  _____  \  \    /    |  |____       \    /       | |
+/__/     \__\ /__/     \__\  \__/     |_______|       \__/        |_|
+ */
+export const aaveV4LeverageManagementSubData = {
+    encode: (spoke, owner, ratioState, targetRatio) => {
+        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) => {
+        const spoke = AbiCoder.decodeParameter('address', subData[0]);
+        const owner = AbiCoder.decodeParameter('address', subData[1]);
+        const ratioState = Number(AbiCoder.decodeParameter('uint8', subData[2]));
+        const targetRatio = weiToRatioPercentage(AbiCoder.decodeParameter('uint256', subData[3]));
+        return {
+            spoke, owner, ratioState, targetRatio,
+        };
+    },
+};
+export const aaveV4LeverageManagementOnPriceSubData = {
+    encode: (spoke, owner, collAsset, collAssetId, debtAsset, debtAssetId, ratioState, targetRatio) => {
+        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) => {
+        const spoke = AbiCoder.decodeParameter('address', subData[0]);
+        const owner = AbiCoder.decodeParameter('address', subData[1]);
+        const collAsset = AbiCoder.decodeParameter('address', subData[2]);
+        const collAssetId = Number(AbiCoder.decodeParameter('uint256', subData[3]));
+        const debtAsset = AbiCoder.decodeParameter('address', subData[4]);
+        const debtAssetId = Number(AbiCoder.decodeParameter('uint256', subData[5]));
+        const ratioState = Number(AbiCoder.decodeParameter('uint8', subData[6]));
+        const targetRatio = weiToRatioPercentage(AbiCoder.decodeParameter('uint256', subData[7]));
+        return {
+            spoke, owner, collAsset, collAssetId, debtAsset, debtAssetId, ratioState, targetRatio,
+        };
+    },
+};
+export const aaveV4CloseSubData = {
+    encode: (spoke, owner, collAsset, collAssetId, debtAsset, debtAssetId, closeType) => {
+        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) => {
+        const spoke = AbiCoder.decodeParameter('address', subData[0]);
+        const owner = AbiCoder.decodeParameter('address', subData[1]);
+        const collAsset = AbiCoder.decodeParameter('address', subData[2]);
+        const collAssetId = Number(AbiCoder.decodeParameter('uint256', subData[3]));
+        const debtAsset = AbiCoder.decodeParameter('address', subData[4]);
+        const debtAssetId = Number(AbiCoder.decodeParameter('uint256', subData[5]));
+        const closeType = Number(AbiCoder.decodeParameter('uint8', subData[6]));
+        return {
+            spoke, owner, collAsset, collAssetId, debtAsset, debtAssetId, closeType,
+        };
+    },
+};
+export const aaveV4CollateralSwitchSubData = {
+    encode: (spoke, owner, fromAsset, fromAssetId, toAsset, toAssetId, amountToSwitch) => {
+        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) => {
+        const spoke = AbiCoder.decodeParameter('address', subData[0]);
+        const owner = AbiCoder.decodeParameter('address', subData[1]);
+        const fromAsset = AbiCoder.decodeParameter('address', subData[2]);
+        const fromAssetId = Number(AbiCoder.decodeParameter('uint256', subData[3]));
+        const toAsset = AbiCoder.decodeParameter('address', subData[4]);
+        const toAssetId = Number(AbiCoder.decodeParameter('uint256', subData[5]));
+        const amountToSwitch = AbiCoder.decodeParameter('uint256', subData[6]);
+        return {
+            spoke, owner, fromAsset, fromAssetId, toAsset, toAssetId, amountToSwitch,
+        };
+    },
+};
+/**
+  ______   ______   .___  ___. .______      ____    ____  ___
+ /      | /  __  \  |   \/   | |   _  \     \   \  /   / |__ \
+|  ,----'|  |  |  | |  \  /  | |  |_)  |     \   \/   /     ) |
+|  |     |  |  |  | |  |\/|  | |   ___/       \      /     / /
+|  `----.|  `--'  | |  |  |  | |  |            \    /     / /_
+ \______| \______/  |__|  |__| | _|             \__/     |____|
+ */
 export const compoundV2LeverageManagementSubData = {
     encode(triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled) {
         return [
@@ -156,6 +746,14 @@ export const compoundV2LeverageManagementSubData = {
         return { targetRatio };
     },
 };
+/**
+  ______   ______   .___  ___. .______      ____    ____  ____
+ /      | /  __  \  |   \/   | |   _  \     \   \  /   / |___ \
+|  ,----'|  |  |  | |  \  /  | |  |_)  |     \   \/   /    __) |
+|  |     |  |  |  | |  |\/|  | |   ___/       \      /    |__ <
+|  `----.|  `--'  | |  |  |  | |  |            \    /     ___) |
+ \______| \______/  |__|  |__| | _|             \__/     |____/
+ */
 export const compoundV3LeverageManagementSubData = {
     encode(market, baseToken, triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled, isEOA) {
         return [
@@ -176,7 +774,7 @@ export const compoundV3LeverageManagementSubData = {
     },
 };
 export const compoundV3L2LeverageManagementSubData = {
-    encode(market, baseToken, triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled) {
+    encode(market, baseToken, triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled, isEOA) {
         let subInput = '0x';
         subInput = subInput.concat(market.slice(2));
         subInput = subInput.concat(baseToken.slice(2));
@@ -189,6 +787,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;
     },
     decode(subData) {
@@ -197,52 +796,70 @@ export const compoundV3L2LeverageManagementSubData = {
         return { targetRatio };
     },
 };
-export const morphoAaveV2LeverageManagementSubData = {
-    encode(triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled) {
+export const compoundV3LeverageManagementOnPriceSubData = {
+    encode(market, collToken, baseToken, targetRatio, ratioState, user) {
+        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) {
-        const ratioWei = AbiCoder.decodeParameter('uint128', subData[1]);
-        const targetRatio = weiToRatioPercentage(ratioWei);
-        return { targetRatio };
+        const market = AbiCoder.decodeParameter('address', subData[0]);
+        const collToken = AbiCoder.decodeParameter('address', subData[1]);
+        const baseToken = AbiCoder.decodeParameter('address', subData[2]);
+        const weiRatio = AbiCoder.decodeParameter('uint256', subData[3]);
+        const targetRatio = weiToRatioPercentage(weiRatio);
+        const ratioState = Number(AbiCoder.decodeParameter('uint8', subData[4]));
+        const owner = AbiCoder.decodeParameter('address', subData[5]);
+        return {
+            market, collToken, baseToken, targetRatio, ratioState, owner,
+        };
     },
 };
-export const cBondsRebondSubData = {
-    encode(bondId) {
-        const bondIdEncoded = AbiCoder.encodeParameter('uint256', bondId);
-        return [bondIdEncoded];
+export const compoundV3CloseSubData = {
+    encode(market, collToken, baseToken, closeType, user) {
+        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);
+        return [
+            marketEncoded,
+            collTokenEncoded,
+            baseTokenEncoded,
+            closeTypeEncoded,
+            userEncoded,
+        ];
     },
     decode(subData) {
-        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, sourceType, chainId = ChainId.Ethereum) => {
-        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) => {
-        const sourceId = AbiCoder.decodeParameter('uint256', subData[0]).toString();
-        const sourceType = AbiCoder.decodeParameter('uint256', subData[1]).toString();
-        return { sourceId, sourceType };
+        const market = AbiCoder.decodeParameter('address', subData[0]);
+        const collToken = AbiCoder.decodeParameter('address', subData[1]);
+        const baseToken = AbiCoder.decodeParameter('address', subData[2]);
+        const closeType = Number(AbiCoder.decodeParameter('uint8', subData[3]));
+        const owner = AbiCoder.decodeParameter('address', subData[4]);
+        return {
+            market, collToken, baseToken, closeType, owner,
+        };
     },
 };
+/**
+ __________   ___   ______  __    __       ___      .__   __.   _______  _______
+|   ____\  \ /  /  /      ||  |  |  |     /   \     |  \ |  |  /  _____||   ____|
+|  |__   \  V  /  |  ,----'|  |__|  |    /  ^  \    |   \|  | |  |  __  |  |__
+|   __|   >   <   |  |     |   __   |   /  /_\  \   |  . `  | |  | |_ | |   __|
+|  |____ /  .  \  |  `----.|  |  |  |  /  _____  \  |  |\   | |  |__| | |  |____
+|_______/__/ \__\  \______||__|  |__| /__/     \__\ |__| \__|  \______| |_______|
+ */
 export const exchangeDcaSubData = {
     encode: (fromToken, toToken, amount, interval) => {
         const sellTokenEncoded = AbiCoder.encodeParameter('address', fromToken);
@@ -282,6 +899,14 @@ export const exchangeLimitOrderSubData = {
         return { fromToken, toToken, amount };
     },
 };
+/**
+     _______..______      ___      .______       __  ___
+    /       ||   _  \    /   \     |   _  \     |  |/  /
+   |   (----`|  |_)  |  /  ^  \    |  |_)  |    |  '  /
+    \   \    |   ___/  /  /_\  \   |      /     |    <
+.----)   |   |  |     /  _____  \  |  |\  \----.|  .  \
+|_______/    | _|    /__/     \__\ | _| `._____||__|\__\
+ */
 export const sparkLeverageManagementSubData = {
     decode(subData) {
         const ratioWei = AbiCoder.decodeParameter('uint256', subData[0]);
@@ -289,74 +914,115 @@ export const sparkLeverageManagementSubData = {
         return { targetRatio };
     },
 };
-export const sparkQuotePriceSubData = {
-    encode(collAsset, collAssetId, debtAsset, debtAssetId, nullAddress = ZERO_ADDRESS) {
+export const sparkLeverageManagementSubDataWithoutSubProxy = {
+    encode(targetRatio, ratioState) {
+        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) {
+        const targetRatio = weiToRatioPercentage(AbiCoder.decodeParameter('uint256', subData[0]));
+        const ratioState = AbiCoder.decodeParameter('uint8', subData[1]);
+        return { targetRatio, ratioState };
+    },
+};
+export const sparkCloseGenericSubData = {
+    encode(collAsset, collAssetId, debtAsset, debtAssetId, closeType, marketAddr, user) {
         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];
+        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) {
         const collAsset = AbiCoder.decodeParameter('address', subData[0]);
         const collAssetId = Number(AbiCoder.decodeParameter('uint8', subData[1]));
         const debtAsset = AbiCoder.decodeParameter('address', subData[2]);
         const debtAssetId = Number(AbiCoder.decodeParameter('uint8', subData[3]));
+        const closeType = Number(AbiCoder.decodeParameter('uint8', subData[4]));
+        const marketAddr = AbiCoder.decodeParameter('address', subData[5]);
+        const owner = AbiCoder.decodeParameter('address', subData[6]);
         return {
-            collAsset, collAssetId, debtAsset, debtAssetId,
+            collAsset, collAssetId, debtAsset, debtAssetId, closeType, marketAddr, owner,
         };
     },
 };
-export const liquityDsrPaybackSubData = {
-    encode: (targetRatio) => {
-        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];
-    },
-    decode: (subData) => {
-        const weiRatio = AbiCoder.decodeParameter('uint256', subData[1]);
-        const targetRatio = weiToRatioPercentage(weiRatio);
-        return { targetRatio };
-    },
-};
-export const liquityDsrSupplySubData = {
-    encode: (targetRatio) => {
-        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];
+export const sparkLeverageManagementOnPriceSubData = {
+    encode(collAsset, collAssetId, debtAsset, debtAssetId, marketAddr, targetRatio) {
+        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) => {
-        const weiRatio = AbiCoder.decodeParameter('uint256', subData[1]);
+    decode(subData) {
+        const collAsset = AbiCoder.decodeParameter('address', subData[0]);
+        const collAssetId = Number(AbiCoder.decodeParameter('uint16', subData[1]));
+        const debtAsset = AbiCoder.decodeParameter('address', subData[2]);
+        const debtAssetId = Number(AbiCoder.decodeParameter('uint16', subData[3]));
+        const marketAddr = AbiCoder.decodeParameter('address', subData[4]);
+        const weiRatio = AbiCoder.decodeParameter('uint256', subData[5]);
         const targetRatio = weiToRatioPercentage(weiRatio);
-        return { targetRatio };
+        return {
+            collAsset, collAssetId, debtAsset, debtAssetId, marketAddr, targetRatio,
+        };
     },
 };
-export const liquityDebtInFrontRepaySubData = {
-    encode: (targetRatioIncrease) => {
-        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
-        return [wethAddressEncoded, lusdAddressEncoded, targetRatioIncreaseEncoded, withdrawIdEncoded, paybackIdEncoded];
+export const sparkCollateralSwitchSubData = {
+    encode(fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, useOnBehalf = false) {
+        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) => {
-        const weiRatio = AbiCoder.decodeParameter('uint256', subData[2]);
-        const targetRatioIncrease = weiToRatioPercentage(weiRatio);
-        return { targetRatioIncrease };
+    decode(subData) {
+        const fromAsset = AbiCoder.decodeParameter('address', subData[0]);
+        const fromAssetId = Number(AbiCoder.decodeParameter('uint8', subData[1]));
+        const toAsset = AbiCoder.decodeParameter('address', subData[2]);
+        const toAssetId = Number(AbiCoder.decodeParameter('uint8', subData[3]));
+        const marketAddr = AbiCoder.decodeParameter('address', subData[4]);
+        const amountToSwitch = AbiCoder.decodeParameter('uint256', subData[5]);
+        return {
+            fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch,
+        };
     },
 };
+/**
+  ______ .______     ____    ____  __    __       _______. _______
+ /      ||   _  \    \   \  /   / |  |  |  |     /       ||       \
+|  ,----'|  |_)  |    \   \/   /  |  |  |  |    |   (----`|  .--.  |
+|  |     |      /      \      /   |  |  |  |     \   \    |  |  |  |
+|  `----.|  |\  \----.  \    /    |  `--'  | .----)   |   |  '--'  |
+ \______|| _| `._____|   \__/      \______/  |_______/    |_______/
+ */
 export const crvUSDLeverageManagementSubData = {
     encode: (controllerAddr, ratioState, targetRatio, collTokenAddr, crvUSDAddr) => {
         const controllerAddrEncoded = AbiCoder.encodeParameter('address', controllerAddr);
@@ -402,6 +1068,14 @@ export const crvUSDPaybackSubData = {
         };
     },
 };
+/**
+.___  ___.   ______   .______      .______    __    __    ______
+|   \/   |  /  __  \  |   _  \     |   _  \  |  |  |  |  /  __  \
+|  \  /  | |  |  |  | |  |_)  |    |  |_)  | |  |__|  | |  |  |  |
+|  |\/|  | |  |  |  | |      /     |   ___/  |   __   | |  |  |  |
+|  |  |  | |  `--'  | |  |\  \----.|  |      |  |  |  | |  `--'  |
+|__|  |__|  \______/  | _| `._____|| _|      |__|  |__|  \______/
+ */
 export const morphoBlueLeverageManagementSubData = {
     encode: (loanToken, collToken, oracle, irm, lltv, ratioState, targetRatio, user, isEOA) => {
         const loanTokenEncoded = AbiCoder.encodeParameter('address', loanToken);
@@ -435,141 +1109,6 @@ export const morphoBlueLeverageManagementSubData = {
         };
     },
 };
-export const aaveV3LeverageManagementOnPriceSubData = {
-    encode(collAsset, collAssetId, debtAsset, debtAssetId, marketAddr, targetRatio) {
-        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) {
-        const collAsset = AbiCoder.decodeParameter('address', subData[0]);
-        const collAssetId = Number(AbiCoder.decodeParameter('uint8', subData[1]));
-        const debtAsset = AbiCoder.decodeParameter('address', subData[2]);
-        const debtAssetId = Number(AbiCoder.decodeParameter('uint8', subData[3]));
-        const marketAddr = AbiCoder.decodeParameter('address', subData[4]);
-        const weiRatio = AbiCoder.decodeParameter('uint256', subData[5]);
-        const targetRatio = weiToRatioPercentage(weiRatio);
-        return {
-            collAsset, collAssetId, debtAsset, debtAssetId, marketAddr, targetRatio,
-        };
-    },
-};
-export const liquityV2LeverageManagementSubData = {
-    encode: (market, troveId, collToken, boldToken, ratioState, targetRatio) => {
-        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) => {
-        const market = AbiCoder.decodeParameter('address', subData[0]);
-        const troveId = AbiCoder.decodeParameter('uint256', subData[1]);
-        const collToken = AbiCoder.decodeParameter('address', subData[2]);
-        const boldToken = AbiCoder.decodeParameter('address', subData[3]);
-        const ratioState = AbiCoder.decodeParameter('uint8', subData[4]);
-        const weiRatio = AbiCoder.decodeParameter('uint256', subData[5]);
-        const targetRatio = weiToRatioPercentage(weiRatio);
-        return {
-            market, troveId, collToken, boldToken, ratioState, targetRatio,
-        };
-    },
-};
-export const liquityV2CloseSubData = {
-    encode(market, troveId, collToken, boldToken, closeType) {
-        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) {
-        const market = AbiCoder.decodeParameter('address', subData[0]);
-        const troveId = AbiCoder.decodeParameter('uint256', subData[1]);
-        const collToken = AbiCoder.decodeParameter('address', subData[2]);
-        const boldToken = AbiCoder.decodeParameter('address', subData[3]);
-        // skip wethAddress and gasCompensation
-        const closeType = AbiCoder.decodeParameter('uint8', subData[6]);
-        return {
-            market, troveId, collToken, boldToken, closeType,
-        };
-    },
-};
-export const liquityV2LeverageManagementOnPriceSubData = {
-    encode(market, troveId, collToken, boldToken, targetRatio, isRepayOnPrice) {
-        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) {
-        const market = AbiCoder.decodeParameter('address', subData[0]);
-        const troveId = AbiCoder.decodeParameter('uint256', subData[1]);
-        const collToken = AbiCoder.decodeParameter('address', subData[2]);
-        const boldToken = AbiCoder.decodeParameter('address', subData[3]);
-        const weiRatio = AbiCoder.decodeParameter('uint256', subData[4]);
-        const targetRatio = weiToRatioPercentage(weiRatio);
-        return {
-            market, troveId, collToken, boldToken, targetRatio,
-        };
-    },
-};
 export const morphoBlueLeverageManagementOnPriceSubData = {
     encode(loanToken, collToken, oracle, irm, lltv, targetRatio, user) {
         const loanTokenEncoded = AbiCoder.encodeParameter('address', loanToken);
@@ -601,33 +1140,44 @@ export const morphoBlueLeverageManagementOnPriceSubData = {
         };
     },
 };
-export const liquityV2PaybackSubData = {
-    encode: (market, troveId, boldToken, targetRatio, 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, collToken, oracle, irm, lltv, user, closeType) {
+        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) => {
-        const market = AbiCoder.decodeParameter('address', subData[0]);
-        const troveId = AbiCoder.decodeParameter('uint256', subData[1]);
-        const boldToken = AbiCoder.decodeParameter('address', subData[2]);
-        const weiRatio = AbiCoder.decodeParameter('uint256', subData[3]);
-        const ratioState = AbiCoder.decodeParameter('uint8', subData[4]);
-        const targetRatio = weiToRatioPercentage(weiRatio);
+    decode(subData) {
+        const loanToken = AbiCoder.decodeParameter('address', subData[0]);
+        const collToken = AbiCoder.decodeParameter('address', subData[1]);
+        const oracle = AbiCoder.decodeParameter('address', subData[2]);
+        const irm = AbiCoder.decodeParameter('address', subData[3]);
+        const lltv = AbiCoder.decodeParameter('uint256', subData[4]);
+        const user = AbiCoder.decodeParameter('address', subData[5]);
+        const closeType = Number(AbiCoder.decodeParameter('uint8', subData[6]));
         return {
-            market, troveId, boldToken, ratioState, targetRatio,
+            loanToken,
+            collToken,
+            oracle,
+            irm,
+            lltv,
+            user,
+            closeType,
         };
     },
 };
+/**
+_______  __       __    __   __   _______
+|   ____||  |     |  |  |  | |  | |       \
+|  |__   |  |     |  |  |  | |  | |  .--.  |
+|   __|  |  |     |  |  |  | |  | |  |  |  |
+|  |     |  `----.|  `--'  | |  | |  '--'  |
+|__|     |_______| \______/  |__| |_______/
+ */
 export const fluidLeverageManagementSubData = {
     encode: (nftId, vault, ratioState, targetRatio) => {
         const nftIdEncoded = AbiCoder.encodeParameter('uint256', nftId);