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

package/esm/services/subDataService.d.ts

@@ -71,6 +71,14 @@ export declare const makerLeverageManagementWithoutSubProxy: {
         daiAddr: string;
     };
 };
+export declare const makerLiquidationProtectionSubData: {
+    encode(vaultId: number, targetRatio: number, daiAddr?: EthereumAddress): string[];
+    decode(subData: string[]): {
+        vaultId: number;
+        targetRatio: number;
+        daiAddr: string;
+    };
+};
 /**
   __       __    ______      __    __   __  .___________.____    ____    ____    ____  __
 |  |     |  |  /  __  \    |  |  |  | |  | |           |\   \  /   /    \   \  /   / /_ |
@@ -89,6 +97,13 @@ export declare const liquityLeverageManagementSubData: {
         targetRatio: number;
     };
 };
+export declare const liquityLeverageManagementSubDataWithoutSubProxy: {
+    encode(targetRatio: number, ratioState: RatioState): string[];
+    decode(subData: string[]): {
+        targetRatio: number;
+        ratioState: RatioState;
+    };
+};
 export declare const liquityCloseSubData: {
     encode(closeToAssetAddr: EthereumAddress, chainId?: ChainId, collAddr?: EthereumAddress, debtAddr?: EthereumAddress): string[];
     decode(subData: string[]): {
@@ -177,6 +192,14 @@ export declare const aaveV2LeverageManagementSubData: {
         targetRatio: number;
     };
 };
+export declare const aaveV2LeverageManagementSubDataWithoutSubProxy: {
+    encode(market: EthereumAddress, targetRatio: number, ratioState: RatioState): string[];
+    decode(subData: string[]): {
+        market: EthereumAddress;
+        targetRatio: number;
+        ratioState: RatioState;
+    };
+};
 /**
      ___           ___   ____    ____  _______    ____    ____  ____
     /   \         /   \  \   \  /   / |   ____|   \   \  /   / |___ \
@@ -197,6 +220,13 @@ export declare const aaveV3LeverageManagementSubDataWithoutSubProxy: {
         ratioState: RatioState;
     };
 };
+export declare const aaveV3LiquidationProtectionSubData: {
+    encode(targetRatio: number, ratioState: RatioState, market: EthereumAddress, user: EthereumAddress): string[];
+    decode(subData: string[]): {
+        targetRatio: number;
+        ratioState: RatioState;
+    };
+};
 export declare const aaveV3LeverageManagementOnPriceGeneric: {
     encode(collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, marketAddr: EthereumAddress, targetRatio: number, user: EthereumAddress): string[];
     decode(subData: string[]): {
@@ -269,6 +299,15 @@ export declare const aaveV4LeverageManagementSubData: {
         targetRatio: number;
     };
 };
+export declare const aaveV4LiquidationProtectionSubData: {
+    encode: (spoke: EthereumAddress, owner: EthereumAddress, ratioState: RatioState, targetRatio: number) => string[];
+    decode: (subData: string[]) => {
+        spoke: string;
+        owner: string;
+        ratioState: RatioState;
+        targetRatio: number;
+    };
+};
 export declare const aaveV4LeverageManagementOnPriceSubData: {
     encode: (spoke: EthereumAddress, owner: EthereumAddress, collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, ratioState: RatioState, targetRatio: number) => string[];
     decode: (subData: string[]) => {
@@ -320,6 +359,13 @@ export declare const compoundV2LeverageManagementSubData: {
         targetRatio: number;
     };
 };
+export declare const compoundV2LeverageManagementSubDataWithoutSubProxy: {
+    encode(targetRatio: number, ratioState: RatioState): string[];
+    decode(subData: string[]): {
+        targetRatio: number;
+        ratioState: RatioState;
+    };
+};
 /**
   ______   ______   .___  ___. .______      ____    ____  ____
  /      | /  __  \  |   \/   | |   _  \     \   \  /   / |___ \
@@ -334,7 +380,22 @@ export declare const compoundV3LeverageManagementSubData: {
         targetRatio: number;
     };
 };
-export declare const compoundV3L2LeverageManagementSubData: {
+export declare const compoundV3LeverageManagementSubDataWithoutSubProxy: {
+    encode(market: EthereumAddress, baseToken: EthereumAddress, targetRatio: number, ratioState: RatioState): string[];
+    decode(subData: string[]): {
+        market: EthereumAddress;
+        baseToken: EthereumAddress;
+        targetRatio: number;
+        ratioState: RatioState;
+    };
+};
+export declare const compoundV3LiquidationProtectionSubData: {
+    encode(market: EthereumAddress, baseToken: EthereumAddress, triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean, isEOA: boolean): string[];
+    decode(subData: string[]): {
+        targetRatio: number;
+    };
+};
+export declare const compoundV3L2LiquidationProtectionSubData: {
     encode(market: EthereumAddress, baseToken: EthereumAddress, triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean, isEOA: boolean): string;
     decode(subData: string[]): {
         targetRatio: number;
@@ -386,6 +447,14 @@ export declare const exchangeLimitOrderSubData: {
         amount: string;
     };
 };
+export declare const exchangeLimitOrderSubDataWithoutSubProxy: {
+    encode(fromToken: EthereumAddress, toToken: EthereumAddress, amount: string): string[];
+    decode: (subData: string[], chainId: ChainId) => {
+        fromToken: string;
+        toToken: string;
+        amount: string;
+    };
+};
 /**
      _______..______      ___      .______       __  ___
     /       ||   _  \    /   \     |   _  \     |  |/  /
@@ -406,6 +475,13 @@ export declare const sparkLeverageManagementSubDataWithoutSubProxy: {
         ratioState: RatioState;
     };
 };
+export declare const sparkLiquidationProtectionSubData: {
+    encode(targetRatio: number, ratioState: RatioState): string[];
+    decode(subData: string[]): {
+        targetRatio: number;
+        ratioState: RatioState;
+    };
+};
 export declare const sparkCloseGenericSubData: {
     encode(collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, closeType: CloseStrategyType, marketAddr: EthereumAddress, user: EthereumAddress): string[];
     decode(subData: string[]): {
@@ -484,6 +560,18 @@ export declare const morphoBlueLeverageManagementSubData: {
         targetRatio: number;
     };
 };
+export declare const morphoBlueLiquidationProtectionSubData: {
+    encode: (loanToken: EthereumAddress, collToken: EthereumAddress, oracle: EthereumAddress, irm: EthereumAddress, lltv: string, ratioState: RatioState, targetRatio: number, user: EthereumAddress, isEOA: boolean) => string[];
+    decode: (subData: string[]) => {
+        loanToken: string;
+        collToken: string;
+        oracle: string;
+        irm: string;
+        lltv: string;
+        user: string;
+        targetRatio: number;
+    };
+};
 export declare const morphoBlueLeverageManagementOnPriceSubData: {
     encode(loanToken: EthereumAddress, collToken: EthereumAddress, oracle: EthereumAddress, irm: EthereumAddress, lltv: string, targetRatio: number, user: EthereumAddress): string[];
     decode(subData: string[]): {
@@ -525,3 +613,12 @@ export declare const fluidLeverageManagementSubData: {
         targetRatio: number;
     };
 };
+export declare const fluidLiquidationProtectionSubData: {
+    encode: (nftId: string, vault: EthereumAddress, ratioState: RatioState, targetRatio: number) => string[];
+    decode: (subData: string[]) => {
+        nftId: string;
+        vault: string;
+        ratioState: RatioState;
+        targetRatio: number;
+    };
+};

package/esm/services/subDataService.js

@@ -125,6 +125,8 @@ export const makerLeverageManagementSubData = {
         return { vaultId, targetRatio };
     },
 };
+// ! Any change here will PROBABLY require a change in makerLiquidationProtectionSubData as well, since it is copy paste
+// ! Double check before changing
 export const makerLeverageManagementWithoutSubProxy = {
     encode(vaultId, targetRatio, daiAddr) {
         const encodedVaultId = AbiCoder.encodeParameter('uint256', vaultId);
@@ -139,6 +141,20 @@ export const makerLeverageManagementWithoutSubProxy = {
         return { vaultId, targetRatio, daiAddr };
     },
 };
+export const makerLiquidationProtectionSubData = {
+    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 };
+    },
+};
 /**
   __       __    ______      __    __   __  .___________.____    ____    ____    ____  __
 |  |     |  |  /  __  \    |  |  |  | |  | |           |\   \  /   /    \   \  /   / /_ |
@@ -161,6 +177,23 @@ export const liquityLeverageManagementSubData = {
         return { targetRatio };
     },
 };
+export const liquityLeverageManagementSubDataWithoutSubProxy = {
+    encode(targetRatio, ratioState) {
+        const encodedRatioState = AbiCoder.encodeParameter('uint8', ratioState);
+        const encodedTargetRatio = 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 [encodedRatioState, encodedTargetRatio, collActionTypeEncoded, debtActionTypeEncoded];
+    },
+    decode(subData) {
+        const ratioState = AbiCoder.decodeParameter('uint8', subData[0]);
+        const targetRatio = weiToRatioPercentage(AbiCoder.decodeParameter('uint256', subData[1]));
+        return { targetRatio, ratioState };
+    },
+};
 export const liquityCloseSubData = {
     encode(closeToAssetAddr, chainId = ChainId.Ethereum, collAddr, debtAddr) {
         const _collAddr = collAddr || getAssetInfo('WETH', chainId).address;
@@ -392,6 +425,25 @@ export const aaveV2LeverageManagementSubData = {
         return { targetRatio };
     },
 };
+export const aaveV2LeverageManagementSubDataWithoutSubProxy = {
+    encode(market, targetRatio, ratioState) {
+        const encodedMarket = AbiCoder.encodeParameter('address', market);
+        const encodedTargetRatio = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
+        const encodedRatioState = AbiCoder.encodeParameter('uint8', ratioState);
+        const isBoost = ratioState === RatioState.OVER;
+        if (isBoost) {
+            const enableAsCollEncoded = AbiCoder.encodeParameter('uint256', 1);
+            return [encodedMarket, encodedTargetRatio, encodedRatioState, enableAsCollEncoded];
+        }
+        return [encodedMarket, encodedTargetRatio, encodedRatioState];
+    },
+    decode(subData) {
+        const market = AbiCoder.decodeParameter('address', subData[0]);
+        const targetRatio = weiToRatioPercentage(AbiCoder.decodeParameter('uint256', subData[1]));
+        const ratioState = AbiCoder.decodeParameter('uint8', subData[2]);
+        return { market, targetRatio, ratioState };
+    },
+};
 /**
      ___           ___   ____    ____  _______    ____    ____  ____
     /   \         /   \  \   \  /   / |   ____|   \   \  /   / |___ \
@@ -407,6 +459,8 @@ export const aaveV3LeverageManagementSubData = {
         return { targetRatio };
     },
 };
+// ! Any change here will PROBABLY require a change in aaveV3LiquidationProtectionSubData as well
+// ! Double check before changing. Liquidation protection is using Generic encoding for both - EOA and SW
 export const aaveV3LeverageManagementSubDataWithoutSubProxy = {
     encode(targetRatio, ratioState, market, user, isGeneric) {
         const encodedTargetRatio = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
@@ -426,6 +480,20 @@ export const aaveV3LeverageManagementSubDataWithoutSubProxy = {
         return { targetRatio, ratioState };
     },
 };
+export const aaveV3LiquidationProtectionSubData = {
+    encode(targetRatio, ratioState, market, user) {
+        const encodedTargetRatio = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
+        const encodedRatioState = AbiCoder.encodeParameter('uint8', ratioState);
+        const encodedMarket = AbiCoder.encodeParameter('address', market);
+        const encodedUser = AbiCoder.encodeParameter('address', user);
+        return [encodedTargetRatio, encodedRatioState, encodedMarket, encodedUser];
+    },
+    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);
@@ -587,6 +655,8 @@ export const aaveV3LeverageManagementOnPriceSubData = {
  /  _____  \   /  _____  \  \    /    |  |____       \    /       | |
 /__/     \__\ /__/     \__\  \__/     |_______|       \__/        |_|
  */
+// ! Any change here will PROBABLY require a change in aaveV4LiquidationProtectionSubData as well, since it is copy paste
+// ! Double check before changing
 export const aaveV4LeverageManagementSubData = {
     encode: (spoke, owner, ratioState, targetRatio) => {
         const spokeEncoded = AbiCoder.encodeParameter('address', spoke);
@@ -613,6 +683,32 @@ export const aaveV4LeverageManagementSubData = {
         };
     },
 };
+export const aaveV4LiquidationProtectionSubData = {
+    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);
@@ -746,6 +842,23 @@ export const compoundV2LeverageManagementSubData = {
         return { targetRatio };
     },
 };
+export const compoundV2LeverageManagementSubDataWithoutSubProxy = {
+    encode(targetRatio, ratioState) {
+        const encodedTargetRatio = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
+        const encodedRatioState = AbiCoder.encodeParameter('uint8', ratioState);
+        const isBoost = ratioState === RatioState.OVER;
+        if (isBoost) {
+            const enableAsCollEncoded = AbiCoder.encodeParameter('uint256', 1);
+            return [encodedTargetRatio, encodedRatioState, enableAsCollEncoded];
+        }
+        return [encodedTargetRatio, encodedRatioState];
+    },
+    decode(subData) {
+        const targetRatio = weiToRatioPercentage(AbiCoder.decodeParameter('uint256', subData[0]));
+        const ratioState = AbiCoder.decodeParameter('uint8', subData[1]);
+        return { targetRatio, ratioState };
+    },
+};
 /**
   ______   ______   .___  ___. .______      ____    ____  ____
  /      | /  __  \  |   \/   | |   _  \     \   \  /   / |___ \
@@ -754,6 +867,8 @@ export const compoundV2LeverageManagementSubData = {
 |  `----.|  `--'  | |  |  |  | |  |            \    /     ___) |
  \______| \______/  |__|  |__| | _|             \__/     |____/
  */
+// ! Any change here will PROBABLY require a change in compoundV3LiquidationProtectionSubData as well, since it is copy paste
+// ! Double check before changing
 export const compoundV3LeverageManagementSubData = {
     encode(market, baseToken, triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled, isEOA) {
         return [
@@ -773,8 +888,51 @@ export const compoundV3LeverageManagementSubData = {
         return { targetRatio };
     },
 };
-export const compoundV3L2LeverageManagementSubData = {
-    encode(market, baseToken, triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled, isEOA) {
+// ! Any change here will PROBABLY require a change in compoundV3L2LiquidationProtectionSubData as well, since it is copy paste
+// ! Double check before changing
+export const compoundV3LeverageManagementSubDataWithoutSubProxy = {
+    encode(market, baseToken, targetRatio, ratioState) {
+        const encodedMarket = AbiCoder.encodeParameter('address', market);
+        const encodedBaseToken = AbiCoder.encodeParameter('address', baseToken);
+        const encodedRatioState = AbiCoder.encodeParameter('uint8', ratioState);
+        const encodedTargetRatio = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
+        return [encodedMarket, encodedBaseToken, encodedRatioState, encodedTargetRatio];
+    },
+    decode(subData) {
+        const market = AbiCoder.decodeParameter('address', subData[0]);
+        const baseToken = AbiCoder.decodeParameter('address', subData[1]);
+        const ratioState = AbiCoder.decodeParameter('uint8', subData[2]);
+        const targetRatio = weiToRatioPercentage(AbiCoder.decodeParameter('uint256', subData[3]));
+        return {
+            market, baseToken, targetRatio, ratioState,
+        };
+    },
+};
+export const compoundV3LiquidationProtectionSubData = {
+    encode(market, baseToken, triggerRepayRatio, 
+    // TODO -> can remove boost stuff ? Not sure if want it to be compatible or not.
+    triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled, isEOA) {
+        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,
+        ];
+    },
+    decode(subData) {
+        const weiRatio = AbiCoder.decodeParameter('uint256', subData[3]);
+        const targetRatio = weiToRatioPercentage(weiRatio);
+        return { targetRatio };
+    },
+};
+export const compoundV3L2LiquidationProtectionSubData = {
+    encode(market, baseToken, triggerRepayRatio, 
+    // TODO -> can remove boost stuff ? Not sure if want it to be compatible or not.
+    triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled, isEOA) {
         let subInput = '0x';
         subInput = subInput.concat(market.slice(2));
         subInput = subInput.concat(baseToken.slice(2));
@@ -899,6 +1057,21 @@ export const exchangeLimitOrderSubData = {
         return { fromToken, toToken, amount };
     },
 };
+export const exchangeLimitOrderSubDataWithoutSubProxy = {
+    encode(fromToken, toToken, amount) {
+        return [
+            AbiCoder.encodeParameter('address', fromToken),
+            AbiCoder.encodeParameter('address', toToken),
+            AbiCoder.encodeParameter('uint256', amount),
+        ];
+    },
+    decode: (subData, chainId) => {
+        const fromToken = AbiCoder.decodeParameter('address', subData[0]).toString();
+        const toToken = AbiCoder.decodeParameter('address', subData[1]).toString();
+        const amount = assetAmountInEth(AbiCoder.decodeParameter('uint256', subData[2]).toString(), getAssetInfoByAddress(fromToken, chainId).symbol);
+        return { fromToken, toToken, amount };
+    },
+};
 /**
      _______..______      ___      .______       __  ___
     /       ||   _  \    /   \     |   _  \     |  |/  /
@@ -914,6 +1087,8 @@ export const sparkLeverageManagementSubData = {
         return { targetRatio };
     },
 };
+// ! Any change here will PROBABLY require a change in sparkLiquidationProtectionSubData as well, since it is copy paste
+// ! Double check before changing
 export const sparkLeverageManagementSubDataWithoutSubProxy = {
     encode(targetRatio, ratioState) {
         const encodedTargetRatio = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
@@ -928,6 +1103,20 @@ export const sparkLeverageManagementSubDataWithoutSubProxy = {
         return { targetRatio, ratioState };
     },
 };
+export const sparkLiquidationProtectionSubData = {
+    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);
@@ -1076,6 +1265,8 @@ export const crvUSDPaybackSubData = {
 |  |  |  | |  `--'  | |  |\  \----.|  |      |  |  |  | |  `--'  |
 |__|  |__|  \______/  | _| `._____|| _|      |__|  |__|  \______/
  */
+// ! Any change here will PROBABLY require a change in morphoBlueLiquidationProtectionSubData as well, since it is copy paste
+// ! Double check before changing
 export const morphoBlueLeverageManagementSubData = {
     encode: (loanToken, collToken, oracle, irm, lltv, ratioState, targetRatio, user, isEOA) => {
         const loanTokenEncoded = AbiCoder.encodeParameter('address', loanToken);
@@ -1109,6 +1300,39 @@ export const morphoBlueLeverageManagementSubData = {
         };
     },
 };
+export const morphoBlueLiquidationProtectionSubData = {
+    encode: (loanToken, collToken, oracle, irm, lltv, ratioState, targetRatio, user, isEOA) => {
+        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 ratioStateEncoded = AbiCoder.encodeParameter('uint8', ratioState);
+        const targetRatioEncoded = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
+        const userEncoded = AbiCoder.encodeParameter('address', user);
+        const isEOAEncoded = AbiCoder.encodeParameter('bool', isEOA);
+        return [loanTokenEncoded, collTokenEncoded, oracleEncoded, irmEncoded, lltvEncoded, ratioStateEncoded, targetRatioEncoded, userEncoded, isEOAEncoded];
+    },
+    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 weiRatio = AbiCoder.decodeParameter('uint256', subData[6]);
+        const user = AbiCoder.decodeParameter('address', subData[7]);
+        const targetRatio = weiToRatioPercentage(weiRatio);
+        return {
+            loanToken,
+            collToken,
+            oracle,
+            irm,
+            lltv,
+            user,
+            targetRatio,
+        };
+    },
+};
 export const morphoBlueLeverageManagementOnPriceSubData = {
     encode(loanToken, collToken, oracle, irm, lltv, targetRatio, user) {
         const loanTokenEncoded = AbiCoder.encodeParameter('address', loanToken);
@@ -1178,6 +1402,8 @@ _______  __       __    __   __   _______
 |  |     |  `----.|  `--'  | |  | |  '--'  |
 |__|     |_______| \______/  |__| |_______/
  */
+// ! Any change here will PROBABLY require a change in fluidLeverageManagementSubData as well, since it is copy paste
+// ! Double check before changing
 export const fluidLeverageManagementSubData = {
     encode: (nftId, vault, ratioState, targetRatio) => {
         const nftIdEncoded = AbiCoder.encodeParameter('uint256', nftId);
@@ -1185,9 +1411,40 @@ export const fluidLeverageManagementSubData = {
         const ratioStateEncoded = AbiCoder.encodeParameter('uint8', ratioState);
         const targetRatioEncoded = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
         const wrapEthEncoded = AbiCoder.encodeParameter('bool', true);
-        const isRepay = ratioState === RatioState.UNDER;
-        const collActionType = isRepay ? CollActionType.WITHDRAW : CollActionType.SUPPLY;
-        const debtActionType = isRepay ? DebtActionType.PAYBACK : DebtActionType.BORROW;
+        const collActionType = CollActionType.WITHDRAW;
+        const debtActionType = DebtActionType.PAYBACK;
+        const collActionTypeEncoded = AbiCoder.encodeParameter('uint8', collActionType);
+        const debtActionTypeEncoded = AbiCoder.encodeParameter('uint8', debtActionType);
+        return [
+            nftIdEncoded,
+            vaultEncoded,
+            ratioStateEncoded,
+            targetRatioEncoded,
+            wrapEthEncoded,
+            collActionTypeEncoded,
+            debtActionTypeEncoded,
+        ];
+    },
+    decode: (subData) => {
+        const nftId = AbiCoder.decodeParameter('uint256', subData[0]);
+        const vault = AbiCoder.decodeParameter('address', subData[1]);
+        const ratioState = AbiCoder.decodeParameter('uint8', subData[2]);
+        const weiRatio = AbiCoder.decodeParameter('uint256', subData[3]);
+        const targetRatio = weiToRatioPercentage(weiRatio);
+        return {
+            nftId, vault, ratioState, targetRatio,
+        };
+    },
+};
+export const fluidLiquidationProtectionSubData = {
+    encode: (nftId, vault, ratioState, targetRatio) => {
+        const nftIdEncoded = AbiCoder.encodeParameter('uint256', nftId);
+        const vaultEncoded = AbiCoder.encodeParameter('address', vault);
+        const ratioStateEncoded = AbiCoder.encodeParameter('uint8', ratioState);
+        const targetRatioEncoded = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
+        const wrapEthEncoded = AbiCoder.encodeParameter('bool', true);
+        const collActionType = CollActionType.WITHDRAW;
+        const debtActionType = DebtActionType.PAYBACK;
         const collActionTypeEncoded = AbiCoder.encodeParameter('uint8', collActionType);
         const debtActionTypeEncoded = AbiCoder.encodeParameter('uint8', debtActionType);
         return [

package/esm/services/subDataService.test.js

@@ -1309,48 +1309,6 @@ describe('Feature: subDataService.ts', () => {
             });
         });
     });
-    describe('When testing subDataService.compoundV3L2LeverageManagementSubData', () => {
-        describe('encode()', () => {
-            const examples = [
-                [
-                    '0x0313D212133AFab8F2b829B1066c7e43caD94e2c0213D212133AfaB8F2b829B1066C7E43cAD94E2c000000000000000016345785d8a0000000000000000000001e87f85809dc0000000000000000000018fae27693b4000000000000000000001a5e27eef13e00000100',
-                    [web3Utils.toChecksumAddress('0x0313d212133AFaB8F2B829B1066c7E43cAd94E2c'), web3Utils.toChecksumAddress('0x0213d212133AFaB8F2B829B1066c7E43cAd94E2c'), 160, 220, 180, 190, true, false]
-                ],
-                [
-                    '0x0313D212133AFab8F2b829B1066c7e43caD94e2c0413d212133afAb8F2B829b1066C7e43cAd94e2c000000000000000016345785d8a0000000000000000000001e87f85809dc0000000000000000000018fae27693b4000000000000000000000f43fc2c04ee00000000',
-                    [web3Utils.toChecksumAddress('0x0313d212133AFaB8F2B829B1066c7E43cAd94E2c'), web3Utils.toChecksumAddress('0x0413d212133AFaB8F2B829B1066c7E43cAd94E2c'), 160, 220, 180, 110, false, false]
-                ],
-            ];
-            examples.forEach(([expected, actual]) => {
-                it(`Given ${actual} should return expected value: ${expected}`, () => {
-                    expect(subDataService.compoundV3L2LeverageManagementSubData.encode(...actual)).to.eql(expected);
-                });
-            });
-        });
-        describe('decode()', () => {
-            const examples = [
-                [
-                    { targetRatio: 200 },
-                    [
-                        '0x0000000000000000000000000313d212133AFaB8F2B829B1066c7E43cAd94E2c', '0x0000000000000000000000000213d212133AFaB8F2B829B1066c7E43cAd94E2c',
-                        '0x0000000000000000000000000000000000000000000000000000000000000001', '0x0000000000000000000000000000000000000000000000001bc16d674ec80000',
-                    ],
-                ],
-                [
-                    { targetRatio: 123 },
-                    [
-                        '0x0000000000000000000000000313d212133AFaB8F2B829B1066c7E43cAd94E2c', '0x0000000000000000000000000413d212133AFaB8F2B829B1066c7E43cAd94E2c',
-                        '0x0000000000000000000000000000000000000000000000000000000000000000', '0x0000000000000000000000000000000000000000000000001111d67bb1bb0000',
-                    ],
-                ],
-            ];
-            examples.forEach(([expected, actual]) => {
-                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    expect(subDataService.compoundV3L2LeverageManagementSubData.decode(actual)).to.eql(expected);
-                });
-            });
-        });
-    });
     describe('When testing subDataService.morphoBlueLeverageManagementSubData', () => {
         describe('encode()', () => {
             const examples = [

package/esm/services/utils.d.ts

@@ -1,5 +1,5 @@
 import type { EthereumAddress } from '../types';
-import { ChainId, CloseStrategyType, CloseToAssetType, RatioState } from '../types/enums';
+import { Bundles, ChainId, CloseStrategyType, CloseToAssetType, RatioState } from '../types/enums';
 export declare function isDefined<T>(value: T): value is NonNullable<T>;
 export declare function isUndefined(value: unknown): boolean;
 export declare function compareAddresses(firstAddress: EthereumAddress, secondAddress: EthereumAddress): boolean;
@@ -28,3 +28,5 @@ export declare function getStopLossAndTakeProfitTypeByCloseStrategyType(closeStr
     stopLossType: CloseToAssetType | undefined;
     takeProfitType: CloseToAssetType | undefined;
 };
+export declare function getBundleIdsByNetwork(network: ChainId): typeof Bundles.MainnetIds | typeof Bundles.OptimismIds | typeof Bundles.ArbitrumIds | typeof Bundles.BaseIds;
+export declare function getCompoundV3LeverageManagementBundleId(network: ChainId, isEOA: boolean, isBoost: boolean): number;

package/esm/services/utils.js

@@ -2,7 +2,7 @@ import Dec from 'decimal.js';
 import * as web3Utils from 'web3-utils';
 import AbiCoder from 'web3-eth-abi';
 import { getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
-import { ChainId, CloseStrategyType, CloseToAssetType, RatioState, } from '../types/enums';
+import { Bundles, ChainId, CloseStrategyType, CloseToAssetType, RatioState, } from '../types/enums';
 export function isDefined(value) {
     return value !== undefined && value !== null;
 }
@@ -137,3 +137,34 @@ export function getStopLossAndTakeProfitTypeByCloseStrategyType(closeStrategyTyp
             throw new Error('CloseStrategyType not supported');
     }
 }
+export function getBundleIdsByNetwork(network) {
+    switch (network) {
+        case ChainId.Arbitrum:
+            return Bundles.ArbitrumIds;
+        case ChainId.Base:
+            return Bundles.BaseIds;
+        case ChainId.Optimism:
+            return Bundles.OptimismIds;
+        default:
+            return Bundles.MainnetIds;
+    }
+}
+// Mainnet uses the V2 bundle ids; L2s use the original bundle ids.
+export function getCompoundV3LeverageManagementBundleId(network, isEOA, isBoost) {
+    switch (Number(network)) {
+        case ChainId.Ethereum:
+            if (isEOA)
+                return isBoost ? Bundles.MainnetIds.COMP_V3_EOA_BOOST_V2_BUNDLE : Bundles.MainnetIds.COMP_V3_EOA_REPAY_V2_BUNDLE;
+            return isBoost ? Bundles.MainnetIds.COMP_V3_SW_BOOST_V2_BUNDLE : Bundles.MainnetIds.COMP_V3_SW_REPAY_V2_BUNDLE;
+        case ChainId.Base:
+            if (isEOA)
+                return isBoost ? Bundles.BaseIds.COMP_V3_EOA_BOOST : Bundles.BaseIds.COMP_V3_EOA_REPAY;
+            return isBoost ? Bundles.BaseIds.COMP_V3_SW_BOOST_BUNDLE : Bundles.BaseIds.COMP_V3_SW_REPAY_BUNDLE;
+        case ChainId.Arbitrum:
+            if (isEOA)
+                return isBoost ? Bundles.ArbitrumIds.COMP_V3_EOA_BOOST : Bundles.ArbitrumIds.COMP_V3_EOA_REPAY;
+            return isBoost ? Bundles.ArbitrumIds.COMP_V3_SW_BOOST_BUNDLE : Bundles.ArbitrumIds.COMP_V3_SW_REPAY_BUNDLE;
+        default:
+            throw new Error(`Compound V3 leverage management is not supported on network ${network}`);
+    }
+}