@defisaver/automation-sdk 3.3.15-liq-prot-2-dev → 3.3.16

package/cjs/services/strategySubService.test.js

@@ -1225,6 +1225,73 @@ describe('Feature: strategySubService.ts', () => {
                 });
             });
         });
+        describe('leverageManagementOnPrice()', () => {
+            const examples = [
+                [
+                    [
+                        enums_1.Bundles.MainnetIds.MORPHO_BLUE_REPAY_ON_PRICE,
+                        true,
+                        ['0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000000000000000000000000000000000003a352944000000000000000000000000000000000000000000000000000000000000000001'],
+                        [
+                            '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                            '0x0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0',
+                            '0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc',
+                            '0x0000000000000000000000000000000000000000000000000000000000000000',
+                            '0x0000000000000000000000000000000000000000000000000d1d507e40be8000',
+                            '0x0000000000000000000000000000000000000000000000001bc16d674ec80000',
+                            '0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c',
+                        ],
+                    ],
+                    [
+                        enums_1.Bundles.MainnetIds.MORPHO_BLUE_REPAY_ON_PRICE,
+                        true,
+                        web3Utils.toChecksumAddress('0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2'),
+                        web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'),
+                        web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'),
+                        web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
+                        '945000000000000000',
+                        web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'),
+                        200,
+                        2500,
+                        enums_1.RatioState.UNDER,
+                    ],
+                ],
+                [
+                    [
+                        enums_1.Bundles.MainnetIds.MORPHO_BLUE_BOOST_ON_PRICE,
+                        true,
+                        ['0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000000000000000000000000000000000005d21dba0000000000000000000000000000000000000000000000000000000000000000000'],
+                        [
+                            '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                            '0x0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0',
+                            '0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc',
+                            '0x0000000000000000000000000000000000000000000000000000000000000000',
+                            '0x0000000000000000000000000000000000000000000000000d1d507e40be8000',
+                            '0x00000000000000000000000000000000000000000000000016345785d8a00000',
+                            '0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c',
+                        ],
+                    ],
+                    [
+                        enums_1.Bundles.MainnetIds.MORPHO_BLUE_BOOST_ON_PRICE,
+                        true,
+                        web3Utils.toChecksumAddress('0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2'),
+                        web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'),
+                        web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'),
+                        web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
+                        '945000000000000000',
+                        web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'),
+                        160,
+                        4000,
+                        enums_1.RatioState.OVER,
+                    ],
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    (0, chai_1.expect)(strategySubService_1.morphoBlueEncode.leverageManagementOnPrice(...actual)).to.eql(expected);
+                });
+            });
+        });
         describe('closeOnPrice()', () => {
             const examples = [
                 [

package/cjs/services/subDataService.d.ts

@@ -71,14 +71,6 @@ 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;
-    };
-};
 /**
   __       __    ______      __    __   __  .___________.____    ____    ____    ____  __
 |  |     |  |  /  __  \    |  |  |  | |  | |           |\   \  /   /    \   \  /   / /_ |
@@ -220,13 +212,6 @@ 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[]): {
@@ -299,15 +284,6 @@ 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[]) => {
@@ -374,16 +350,13 @@ export declare const compoundV2LeverageManagementSubDataWithoutSubProxy: {
 |  `----.|  `--'  | |  |  |  | |  |            \    /     ___) |
  \______| \______/  |__|  |__| | _|             \__/     |____/
  */
-export declare const compoundV3LeverageManagementSubDataWithoutSubProxy: {
-    encode(market: EthereumAddress, baseToken: EthereumAddress, targetRatio: number, ratioState: RatioState): string[];
+export declare const compoundV3LeverageManagementSubData: {
+    encode(market: EthereumAddress, baseToken: EthereumAddress, triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean, isEOA: boolean): string[];
     decode(subData: string[]): {
-        market: EthereumAddress;
-        baseToken: EthereumAddress;
         targetRatio: number;
-        ratioState: RatioState;
     };
 };
-export declare const compoundV3LiquidationProtectionSubDataWithoutSubProxy: {
+export declare const compoundV3LeverageManagementSubDataWithoutSubProxy: {
     encode(market: EthereumAddress, baseToken: EthereumAddress, targetRatio: number, ratioState: RatioState): string[];
     decode(subData: string[]): {
         market: EthereumAddress;
@@ -466,13 +439,6 @@ 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[]): {
@@ -551,18 +517,6 @@ 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[]): {
@@ -604,12 +558,3 @@ export declare const fluidLeverageManagementSubData: {
         targetRatio: number;
     };
 };
-export declare const fluidLiquidationProtectionSubData: {
-    encode: (nftId: string, vault: EthereumAddress, ratioState: RatioState, targetRatio: number) => string[];
-    decode: (subData: string[]) => {
-        nftId: string;
-        vault: string;
-        ratioState: RatioState;
-        targetRatio: number;
-    };
-};

package/cjs/services/subDataService.js

@@ -3,8 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.crvUSDLeverageManagementSubData = exports.sparkCollateralSwitchSubData = exports.sparkLeverageManagementOnPriceSubData = exports.sparkCloseGenericSubData = exports.sparkLiquidationProtectionSubData = exports.sparkLeverageManagementSubDataWithoutSubProxy = exports.sparkLeverageManagementSubData = exports.exchangeLimitOrderSubDataWithoutSubProxy = exports.exchangeLimitOrderSubData = exports.exchangeDcaSubData = exports.compoundV3CloseSubData = exports.compoundV3LeverageManagementOnPriceSubData = exports.compoundV3LiquidationProtectionSubDataWithoutSubProxy = exports.compoundV3LeverageManagementSubDataWithoutSubProxy = exports.compoundV2LeverageManagementSubDataWithoutSubProxy = exports.compoundV2LeverageManagementSubData = exports.aaveV4CollateralSwitchSubData = exports.aaveV4CloseSubData = exports.aaveV4LeverageManagementOnPriceSubData = exports.aaveV4LiquidationProtectionSubData = exports.aaveV4LeverageManagementSubData = exports.aaveV3LeverageManagementOnPriceSubData = exports.aaveV3QuotePriceSubData = exports.aaveV3CollateralSwitchSubData = exports.aaveV3CloseGenericSubData = exports.aaveV3LeverageManagementOnPriceGeneric = exports.aaveV3LiquidationProtectionSubData = exports.aaveV3LeverageManagementSubDataWithoutSubProxy = exports.aaveV3LeverageManagementSubData = exports.aaveV2LeverageManagementSubDataWithoutSubProxy = exports.aaveV2LeverageManagementSubData = exports.liquityV2PaybackSubData = exports.liquityV2LeverageManagementOnPriceSubData = exports.liquityV2CloseSubData = exports.liquityV2LeverageManagementSubData = exports.liquityDebtInFrontRepaySubData = exports.liquityDsrSupplySubData = exports.liquityDsrPaybackSubData = exports.liquityCloseSubData = exports.liquityLeverageManagementSubDataWithoutSubProxy = exports.liquityLeverageManagementSubData = exports.liquityRepayFromSavingsSubData = exports.makerLiquidationProtectionSubData = exports.makerLeverageManagementWithoutSubProxy = exports.makerLeverageManagementSubData = exports.makerCloseSubData = exports.makerRepayFromSavingsSubData = exports.liquityPaybackUsingChickenBondSubData = exports.cBondsRebondSubData = exports.morphoAaveV2LeverageManagementSubData = void 0;
-exports.fluidLiquidationProtectionSubData = exports.fluidLeverageManagementSubData = exports.morphoBlueCloseOnPriceSubData = exports.morphoBlueLeverageManagementOnPriceSubData = exports.morphoBlueLiquidationProtectionSubData = exports.morphoBlueLeverageManagementSubData = exports.crvUSDPaybackSubData = void 0;
+exports.morphoBlueCloseOnPriceSubData = exports.morphoBlueLeverageManagementOnPriceSubData = exports.morphoBlueLeverageManagementSubData = exports.crvUSDPaybackSubData = exports.crvUSDLeverageManagementSubData = exports.sparkCollateralSwitchSubData = exports.sparkLeverageManagementOnPriceSubData = exports.sparkCloseGenericSubData = exports.sparkLeverageManagementSubDataWithoutSubProxy = exports.sparkLeverageManagementSubData = exports.exchangeLimitOrderSubDataWithoutSubProxy = exports.exchangeLimitOrderSubData = exports.exchangeDcaSubData = exports.compoundV3CloseSubData = exports.compoundV3LeverageManagementOnPriceSubData = exports.compoundV3LeverageManagementSubDataWithoutSubProxy = exports.compoundV3LeverageManagementSubData = exports.compoundV2LeverageManagementSubDataWithoutSubProxy = exports.compoundV2LeverageManagementSubData = exports.aaveV4CollateralSwitchSubData = exports.aaveV4CloseSubData = exports.aaveV4LeverageManagementOnPriceSubData = exports.aaveV4LeverageManagementSubData = exports.aaveV3LeverageManagementOnPriceSubData = exports.aaveV3QuotePriceSubData = exports.aaveV3CollateralSwitchSubData = exports.aaveV3CloseGenericSubData = exports.aaveV3LeverageManagementOnPriceGeneric = exports.aaveV3LeverageManagementSubDataWithoutSubProxy = exports.aaveV3LeverageManagementSubData = exports.aaveV2LeverageManagementSubDataWithoutSubProxy = exports.aaveV2LeverageManagementSubData = exports.liquityV2PaybackSubData = exports.liquityV2LeverageManagementOnPriceSubData = exports.liquityV2CloseSubData = exports.liquityV2LeverageManagementSubData = exports.liquityDebtInFrontRepaySubData = exports.liquityDsrSupplySubData = exports.liquityDsrPaybackSubData = exports.liquityCloseSubData = exports.liquityLeverageManagementSubDataWithoutSubProxy = exports.liquityLeverageManagementSubData = exports.liquityRepayFromSavingsSubData = exports.makerLeverageManagementWithoutSubProxy = exports.makerLeverageManagementSubData = exports.makerCloseSubData = exports.makerRepayFromSavingsSubData = exports.liquityPaybackUsingChickenBondSubData = exports.cBondsRebondSubData = exports.morphoAaveV2LeverageManagementSubData = void 0;
+exports.fluidLeverageManagementSubData = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const web3_eth_abi_1 = __importDefault(require("web3-eth-abi"));
 const web3_utils_1 = require("web3-utils");
@@ -132,8 +132,6 @@ exports.makerLeverageManagementSubData = {
         return { vaultId, targetRatio };
     },
 };
-// ! Any change here will PROBABLY require a change in makerLiquidationProtectionSubData as well, since it is copy paste
-// ! Double check before changing
 exports.makerLeverageManagementWithoutSubProxy = {
     encode(vaultId, targetRatio, daiAddr) {
         const encodedVaultId = web3_eth_abi_1.default.encodeParameter('uint256', vaultId);
@@ -148,20 +146,6 @@ exports.makerLeverageManagementWithoutSubProxy = {
         return { vaultId, targetRatio, daiAddr };
     },
 };
-exports.makerLiquidationProtectionSubData = {
-    encode(vaultId, targetRatio, daiAddr) {
-        const encodedVaultId = web3_eth_abi_1.default.encodeParameter('uint256', vaultId);
-        const encodedTargetRatio = web3_eth_abi_1.default.encodeParameter('uint256', (0, utils_1.ratioPercentageToWei)(targetRatio));
-        const encodedDaiAddr = web3_eth_abi_1.default.encodeParameter('address', daiAddr || (0, tokens_1.getAssetInfo)('DAI', 1).address);
-        return [encodedVaultId, encodedTargetRatio, encodedDaiAddr];
-    },
-    decode(subData) {
-        const vaultId = +web3_eth_abi_1.default.decodeParameter('uint256', subData[0]).toString();
-        const targetRatio = (0, utils_1.weiToRatioPercentage)(web3_eth_abi_1.default.decodeParameter('uint256', subData[1]));
-        const daiAddr = web3_eth_abi_1.default.decodeParameter('address', subData[2]).toString();
-        return { vaultId, targetRatio, daiAddr };
-    },
-};
 /**
   __       __    ______      __    __   __  .___________.____    ____    ____    ____  __
 |  |     |  |  /  __  \    |  |  |  | |  | |           |\   \  /   /    \   \  /   / /_ |
@@ -466,8 +450,6 @@ exports.aaveV3LeverageManagementSubData = {
         return { targetRatio };
     },
 };
-// ! Any change here will PROBABLY require a change in aaveV3LiquidationProtectionSubData as well
-// ! Double check before changing. Liquidation protection is using Generic encoding for both - EOA and SW
 exports.aaveV3LeverageManagementSubDataWithoutSubProxy = {
     encode(targetRatio, ratioState, market, user, isGeneric) {
         const encodedTargetRatio = web3_eth_abi_1.default.encodeParameter('uint256', (0, utils_1.ratioPercentageToWei)(targetRatio));
@@ -487,20 +469,6 @@ exports.aaveV3LeverageManagementSubDataWithoutSubProxy = {
         return { targetRatio, ratioState };
     },
 };
-exports.aaveV3LiquidationProtectionSubData = {
-    encode(targetRatio, ratioState, market, user) {
-        const encodedTargetRatio = web3_eth_abi_1.default.encodeParameter('uint256', (0, utils_1.ratioPercentageToWei)(targetRatio));
-        const encodedRatioState = web3_eth_abi_1.default.encodeParameter('uint8', ratioState);
-        const encodedMarket = web3_eth_abi_1.default.encodeParameter('address', market);
-        const encodedUser = web3_eth_abi_1.default.encodeParameter('address', user);
-        return [encodedTargetRatio, encodedRatioState, encodedMarket, encodedUser];
-    },
-    decode(subData) {
-        const targetRatio = (0, utils_1.weiToRatioPercentage)(web3_eth_abi_1.default.decodeParameter('uint256', subData[0]));
-        const ratioState = web3_eth_abi_1.default.decodeParameter('uint8', subData[1]);
-        return { targetRatio, ratioState };
-    },
-};
 exports.aaveV3LeverageManagementOnPriceGeneric = {
     encode(collAsset, collAssetId, debtAsset, debtAssetId, marketAddr, targetRatio, user) {
         const encodedColl = web3_eth_abi_1.default.encodeParameter('address', collAsset);
@@ -662,8 +630,6 @@ exports.aaveV3LeverageManagementOnPriceSubData = {
  /  _____  \   /  _____  \  \    /    |  |____       \    /       | |
 /__/     \__\ /__/     \__\  \__/     |_______|       \__/        |_|
  */
-// ! Any change here will PROBABLY require a change in aaveV4LiquidationProtectionSubData as well, since it is copy paste
-// ! Double check before changing
 exports.aaveV4LeverageManagementSubData = {
     encode: (spoke, owner, ratioState, targetRatio) => {
         const spokeEncoded = web3_eth_abi_1.default.encodeParameter('address', spoke);
@@ -690,32 +656,6 @@ exports.aaveV4LeverageManagementSubData = {
         };
     },
 };
-exports.aaveV4LiquidationProtectionSubData = {
-    encode: (spoke, owner, ratioState, targetRatio) => {
-        const spokeEncoded = web3_eth_abi_1.default.encodeParameter('address', spoke);
-        const ownerEncoded = web3_eth_abi_1.default.encodeParameter('address', owner);
-        const ratioStateEncoded = web3_eth_abi_1.default.encodeParameter('uint8', ratioState);
-        const targetRatioEncoded = web3_eth_abi_1.default.encodeParameter('uint256', (0, utils_1.ratioPercentageToWei)(targetRatio));
-        // Add two empty slots for future addons (e.g tsi or slippage settings)
-        return [
-            spokeEncoded,
-            ownerEncoded,
-            ratioStateEncoded,
-            targetRatioEncoded,
-            constants_1.EMPTY_SLOT,
-            constants_1.EMPTY_SLOT,
-        ];
-    },
-    decode: (subData) => {
-        const spoke = web3_eth_abi_1.default.decodeParameter('address', subData[0]);
-        const owner = web3_eth_abi_1.default.decodeParameter('address', subData[1]);
-        const ratioState = Number(web3_eth_abi_1.default.decodeParameter('uint8', subData[2]));
-        const targetRatio = (0, utils_1.weiToRatioPercentage)(web3_eth_abi_1.default.decodeParameter('uint256', subData[3]));
-        return {
-            spoke, owner, ratioState, targetRatio,
-        };
-    },
-};
 exports.aaveV4LeverageManagementOnPriceSubData = {
     encode: (spoke, owner, collAsset, collAssetId, debtAsset, debtAssetId, ratioState, targetRatio) => {
         const spokeEncoded = web3_eth_abi_1.default.encodeParameter('address', spoke);
@@ -874,27 +814,26 @@ exports.compoundV2LeverageManagementSubDataWithoutSubProxy = {
 |  `----.|  `--'  | |  |  |  | |  |            \    /     ___) |
  \______| \______/  |__|  |__| | _|             \__/     |____/
  */
-// ! Any change here will PROBABLY require a change in compoundV3LiquidationProtectionSubDataWithoutSubProxy as well, since it is copy paste
-// ! Double check before changing
-exports.compoundV3LeverageManagementSubDataWithoutSubProxy = {
-    encode(market, baseToken, targetRatio, ratioState) {
-        const encodedMarket = web3_eth_abi_1.default.encodeParameter('address', market);
-        const encodedBaseToken = web3_eth_abi_1.default.encodeParameter('address', baseToken);
-        const encodedRatioState = web3_eth_abi_1.default.encodeParameter('uint8', ratioState);
-        const encodedTargetRatio = web3_eth_abi_1.default.encodeParameter('uint256', (0, utils_1.ratioPercentageToWei)(targetRatio));
-        return [encodedMarket, encodedBaseToken, encodedRatioState, encodedTargetRatio];
+exports.compoundV3LeverageManagementSubData = {
+    encode(market, baseToken, triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled, isEOA) {
+        return [
+            market,
+            baseToken,
+            new decimal_js_1.default(triggerRepayRatio).mul(1e16).toString(),
+            new decimal_js_1.default(triggerBoostRatio).mul(1e16).toString(),
+            new decimal_js_1.default(targetBoostRatio).mul(1e16).toString(),
+            new decimal_js_1.default(targetRepayRatio).mul(1e16).toString(),
+            // @ts-ignore // TODO
+            boostEnabled, isEOA,
+        ];
     },
     decode(subData) {
-        const market = web3_eth_abi_1.default.decodeParameter('address', subData[0]);
-        const baseToken = web3_eth_abi_1.default.decodeParameter('address', subData[1]);
-        const ratioState = web3_eth_abi_1.default.decodeParameter('uint8', subData[2]);
-        const targetRatio = (0, utils_1.weiToRatioPercentage)(web3_eth_abi_1.default.decodeParameter('uint256', subData[3]));
-        return {
-            market, baseToken, targetRatio, ratioState,
-        };
+        const weiRatio = web3_eth_abi_1.default.decodeParameter('uint256', subData[3]);
+        const targetRatio = (0, utils_1.weiToRatioPercentage)(weiRatio);
+        return { targetRatio };
     },
 };
-exports.compoundV3LiquidationProtectionSubDataWithoutSubProxy = {
+exports.compoundV3LeverageManagementSubDataWithoutSubProxy = {
     encode(market, baseToken, targetRatio, ratioState) {
         const encodedMarket = web3_eth_abi_1.default.encodeParameter('address', market);
         const encodedBaseToken = web3_eth_abi_1.default.encodeParameter('address', baseToken);
@@ -1045,8 +984,6 @@ exports.sparkLeverageManagementSubData = {
         return { targetRatio };
     },
 };
-// ! Any change here will PROBABLY require a change in sparkLiquidationProtectionSubData as well, since it is copy paste
-// ! Double check before changing
 exports.sparkLeverageManagementSubDataWithoutSubProxy = {
     encode(targetRatio, ratioState) {
         const encodedTargetRatio = web3_eth_abi_1.default.encodeParameter('uint256', (0, utils_1.ratioPercentageToWei)(targetRatio));
@@ -1061,20 +998,6 @@ exports.sparkLeverageManagementSubDataWithoutSubProxy = {
         return { targetRatio, ratioState };
     },
 };
-exports.sparkLiquidationProtectionSubData = {
-    encode(targetRatio, ratioState) {
-        const encodedTargetRatio = web3_eth_abi_1.default.encodeParameter('uint256', (0, utils_1.ratioPercentageToWei)(targetRatio));
-        const encodedRatioState = web3_eth_abi_1.default.encodeParameter('uint8', ratioState);
-        const encodedUseDefaultMarket = web3_eth_abi_1.default.encodeParameter('bool', true);
-        const encodedUseOnBehalf = web3_eth_abi_1.default.encodeParameter('bool', false);
-        return [encodedTargetRatio, encodedRatioState, encodedUseDefaultMarket, encodedUseOnBehalf];
-    },
-    decode(subData) {
-        const targetRatio = (0, utils_1.weiToRatioPercentage)(web3_eth_abi_1.default.decodeParameter('uint256', subData[0]));
-        const ratioState = web3_eth_abi_1.default.decodeParameter('uint8', subData[1]);
-        return { targetRatio, ratioState };
-    },
-};
 exports.sparkCloseGenericSubData = {
     encode(collAsset, collAssetId, debtAsset, debtAssetId, closeType, marketAddr, user) {
         const encodedColl = web3_eth_abi_1.default.encodeParameter('address', collAsset);
@@ -1223,8 +1146,6 @@ exports.crvUSDPaybackSubData = {
 |  |  |  | |  `--'  | |  |\  \----.|  |      |  |  |  | |  `--'  |
 |__|  |__|  \______/  | _| `._____|| _|      |__|  |__|  \______/
  */
-// ! Any change here will PROBABLY require a change in morphoBlueLiquidationProtectionSubData as well, since it is copy paste
-// ! Double check before changing
 exports.morphoBlueLeverageManagementSubData = {
     encode: (loanToken, collToken, oracle, irm, lltv, ratioState, targetRatio, user, isEOA) => {
         const loanTokenEncoded = web3_eth_abi_1.default.encodeParameter('address', loanToken);
@@ -1258,39 +1179,6 @@ exports.morphoBlueLeverageManagementSubData = {
         };
     },
 };
-exports.morphoBlueLiquidationProtectionSubData = {
-    encode: (loanToken, collToken, oracle, irm, lltv, ratioState, targetRatio, user, isEOA) => {
-        const loanTokenEncoded = web3_eth_abi_1.default.encodeParameter('address', loanToken);
-        const collTokenEncoded = web3_eth_abi_1.default.encodeParameter('address', collToken);
-        const oracleEncoded = web3_eth_abi_1.default.encodeParameter('address', oracle);
-        const irmEncoded = web3_eth_abi_1.default.encodeParameter('address', irm);
-        const lltvEncoded = web3_eth_abi_1.default.encodeParameter('uint256', lltv);
-        const ratioStateEncoded = web3_eth_abi_1.default.encodeParameter('uint8', ratioState);
-        const targetRatioEncoded = web3_eth_abi_1.default.encodeParameter('uint256', (0, utils_1.ratioPercentageToWei)(targetRatio));
-        const userEncoded = web3_eth_abi_1.default.encodeParameter('address', user);
-        const isEOAEncoded = web3_eth_abi_1.default.encodeParameter('bool', isEOA);
-        return [loanTokenEncoded, collTokenEncoded, oracleEncoded, irmEncoded, lltvEncoded, ratioStateEncoded, targetRatioEncoded, userEncoded, isEOAEncoded];
-    },
-    decode: (subData) => {
-        const loanToken = web3_eth_abi_1.default.decodeParameter('address', subData[0]);
-        const collToken = web3_eth_abi_1.default.decodeParameter('address', subData[1]);
-        const oracle = web3_eth_abi_1.default.decodeParameter('address', subData[2]);
-        const irm = web3_eth_abi_1.default.decodeParameter('address', subData[3]);
-        const lltv = web3_eth_abi_1.default.decodeParameter('uint256', subData[4]);
-        const weiRatio = web3_eth_abi_1.default.decodeParameter('uint256', subData[6]);
-        const user = web3_eth_abi_1.default.decodeParameter('address', subData[7]);
-        const targetRatio = (0, utils_1.weiToRatioPercentage)(weiRatio);
-        return {
-            loanToken,
-            collToken,
-            oracle,
-            irm,
-            lltv,
-            user,
-            targetRatio,
-        };
-    },
-};
 exports.morphoBlueLeverageManagementOnPriceSubData = {
     encode(loanToken, collToken, oracle, irm, lltv, targetRatio, user) {
         const loanTokenEncoded = web3_eth_abi_1.default.encodeParameter('address', loanToken);
@@ -1360,8 +1248,6 @@ _______  __       __    __   __   _______
 |  |     |  `----.|  `--'  | |  | |  '--'  |
 |__|     |_______| \______/  |__| |_______/
  */
-// ! Any change here will PROBABLY require a change in fluidLeverageManagementSubData as well, since it is copy paste
-// ! Double check before changing
 exports.fluidLeverageManagementSubData = {
     encode: (nftId, vault, ratioState, targetRatio) => {
         const nftIdEncoded = web3_eth_abi_1.default.encodeParameter('uint256', nftId);
@@ -1395,35 +1281,3 @@ exports.fluidLeverageManagementSubData = {
         };
     },
 };
-exports.fluidLiquidationProtectionSubData = {
-    encode: (nftId, vault, ratioState, targetRatio) => {
-        const nftIdEncoded = web3_eth_abi_1.default.encodeParameter('uint256', nftId);
-        const vaultEncoded = web3_eth_abi_1.default.encodeParameter('address', vault);
-        const ratioStateEncoded = web3_eth_abi_1.default.encodeParameter('uint8', ratioState);
-        const targetRatioEncoded = web3_eth_abi_1.default.encodeParameter('uint256', (0, utils_1.ratioPercentageToWei)(targetRatio));
-        const wrapEthEncoded = web3_eth_abi_1.default.encodeParameter('bool', true);
-        const collActionType = enums_1.CollActionType.WITHDRAW;
-        const debtActionType = enums_1.DebtActionType.PAYBACK;
-        const collActionTypeEncoded = web3_eth_abi_1.default.encodeParameter('uint8', collActionType);
-        const debtActionTypeEncoded = web3_eth_abi_1.default.encodeParameter('uint8', debtActionType);
-        return [
-            nftIdEncoded,
-            vaultEncoded,
-            ratioStateEncoded,
-            targetRatioEncoded,
-            wrapEthEncoded,
-            collActionTypeEncoded,
-            debtActionTypeEncoded,
-        ];
-    },
-    decode: (subData) => {
-        const nftId = web3_eth_abi_1.default.decodeParameter('uint256', subData[0]);
-        const vault = web3_eth_abi_1.default.decodeParameter('address', subData[1]);
-        const ratioState = web3_eth_abi_1.default.decodeParameter('uint8', subData[2]);
-        const weiRatio = web3_eth_abi_1.default.decodeParameter('uint256', subData[3]);
-        const targetRatio = (0, utils_1.weiToRatioPercentage)(weiRatio);
-        return {
-            nftId, vault, ratioState, targetRatio,
-        };
-    },
-};

package/cjs/services/subDataService.test.js

@@ -713,6 +713,74 @@ describe('Feature: subDataService.ts', () => {
             });
         });
     });
+    describe('When testing subDataService.compoundV3LeverageManagementSubData', () => {
+        describe('encode()', () => {
+            const examples = [
+                [
+                    [
+                        web3Utils.toChecksumAddress('0x1C0F620155e85491f8D35440eb17538Ca5c55212'),
+                        web3Utils.toChecksumAddress((0, tokens_1.getAssetInfo)('USDC', enums_1.ChainId.Ethereum).address),
+                        new decimal_js_1.default(160).mul(1e16).toString(),
+                        new decimal_js_1.default(220).mul(1e16).toString(),
+                        new decimal_js_1.default(180).mul(1e16).toString(),
+                        new decimal_js_1.default(190).mul(1e16).toString(),
+                        true, false,
+                    ],
+                    [
+                        web3Utils.toChecksumAddress('0x1C0F620155e85491f8D35440eb17538Ca5c55212'),
+                        web3Utils.toChecksumAddress((0, tokens_1.getAssetInfo)('USDC', enums_1.ChainId.Ethereum).address),
+                        160, 220, 180, 190,
+                        true, false,
+                    ]
+                ],
+                [
+                    [
+                        web3Utils.toChecksumAddress('0xaC0F620155e85491f8D35440eb17538Ca5c55212'),
+                        web3Utils.toChecksumAddress((0, tokens_1.getAssetInfo)('WETH', enums_1.ChainId.Ethereum).address),
+                        new decimal_js_1.default(160).mul(1e16).toString(),
+                        new decimal_js_1.default(210).mul(1e16).toString(),
+                        new decimal_js_1.default(180).mul(1e16).toString(),
+                        new decimal_js_1.default(190).mul(1e16).toString(),
+                        false, true,
+                    ],
+                    [
+                        web3Utils.toChecksumAddress('0xaC0F620155e85491f8D35440eb17538Ca5c55212'),
+                        web3Utils.toChecksumAddress((0, tokens_1.getAssetInfo)('WETH', enums_1.ChainId.Ethereum).address),
+                        160, 210, 180, 190,
+                        false, true,
+                    ]
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${expected}`, () => {
+                    (0, chai_1.expect)(subDataService.compoundV3LeverageManagementSubData.encode(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe('decode()', () => {
+            const examples = [
+                [
+                    { targetRatio: 123 },
+                    [
+                        '0x0000000000000000000000000000000000000000000000000000000000000000', '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000', '0x0000000000000000000000000000000000000000000000001111d67bb1bb0000',
+                    ],
+                ],
+                [
+                    { targetRatio: 200 },
+                    [
+                        '0x0000000000000000000000000000000000000000000000000000000000000000', '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000', '0x0000000000000000000000000000000000000000000000001bc16d674ec80000',
+                    ],
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    (0, chai_1.expect)(subDataService.compoundV3LeverageManagementSubData.decode(actual)).to.eql(expected);
+                });
+            });
+        });
+    });
     describe('When testing subDataService.morphoAaveV2LeverageManagementSubData', () => {
         describe('encode()', () => {
             const examples = [
@@ -1411,6 +1479,106 @@ describe('Feature: subDataService.ts', () => {
             });
         });
     });
+    describe('When testing subDataService.morphoBlueLeverageManagementOnPriceSubData', () => {
+        describe('encode()', () => {
+            const examples = [
+                [
+                    [
+                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                        '0x0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0',
+                        '0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        '0x0000000000000000000000000000000000000000000000000d1d507e40be8000',
+                        '0x0000000000000000000000000000000000000000000000001bc16d674ec80000',
+                        '0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c',
+                    ],
+                    [
+                        web3Utils.toChecksumAddress('0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2'),
+                        web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'),
+                        web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'),
+                        web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
+                        '945000000000000000',
+                        200,
+                        web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'),
+                    ],
+                ],
+                [
+                    [
+                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                        '0x0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0',
+                        '0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        '0x0000000000000000000000000000000000000000000000000d1d507e40be8000',
+                        '0x00000000000000000000000000000000000000000000000016345785d8a00000',
+                        '0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c',
+                    ],
+                    [
+                        web3Utils.toChecksumAddress('0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2'),
+                        web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'),
+                        web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'),
+                        web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
+                        '945000000000000000',
+                        160,
+                        web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'),
+                    ],
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${expected}`, () => {
+                    (0, chai_1.expect)(subDataService.morphoBlueLeverageManagementOnPriceSubData.encode(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe('decode()', () => {
+            const examples = [
+                [
+                    {
+                        loanToken: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
+                        collToken: '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0',
+                        oracle: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
+                        irm: '0x0000000000000000000000000000000000000000',
+                        lltv: '945000000000000000',
+                        targetRatio: 200,
+                        user: '0x1031d218133AFaB8C2B819B1366c7e434Ad91e9c',
+                    },
+                    [
+                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                        '0x0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0',
+                        '0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        '0x0000000000000000000000000000000000000000000000000d1d507e40be8000',
+                        '0x0000000000000000000000000000000000000000000000001bc16d674ec80000',
+                        '0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c',
+                    ],
+                ],
+                [
+                    {
+                        loanToken: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
+                        collToken: '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0',
+                        oracle: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
+                        irm: '0x0000000000000000000000000000000000000000',
+                        lltv: '945000000000000000',
+                        targetRatio: 160,
+                        user: '0x1031d218133AFaB8C2B819B1366c7e434Ad91e9c',
+                    },
+                    [
+                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                        '0x0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0',
+                        '0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        '0x0000000000000000000000000000000000000000000000000d1d507e40be8000',
+                        '0x00000000000000000000000000000000000000000000000016345785d8a00000',
+                        '0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c',
+                    ],
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    (0, chai_1.expect)(subDataService.morphoBlueLeverageManagementOnPriceSubData.decode(actual)).to.eql(expected);
+                });
+            });
+        });
+    });
     describe('When testing subDataService.aaveV3LeverageManagementOnPriceSubData', () => {
         describe('encode()', () => {
             const examples = [