@defisaver/automation-sdk 3.3.2-dev → 3.3.2-dev.0

package/esm/services/strategySubService.test.js

@@ -466,6 +466,320 @@ describe('Feature: strategySubService.ts', () => {
                 });
             });
         });
+        describe('leverageManagementOnPriceGeneric()', () => {
+            const examples = [
+                [
+                    [
+                        Bundles.MainnetIds.AAVE_V3_EOA_REPAY_ON_PRICE,
+                        true,
+                        ['0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc200000000000000000000000000000000000000000000000000000026e1f9c6000000000000000000000000000000000000000000000000000000000000000001'],
+                        [
+                            '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                            '0x0000000000000000000000000000000000000000000000000000000000000000',
+                            '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                            '0x0000000000000000000000000000000000000000000000000000000000000001',
+                            '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
+                            '0x0000000000000000000000000000000000000000000000001bc16d674ec80000',
+                            '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        ],
+                    ],
+                    [
+                        Bundles.MainnetIds.AAVE_V3_EOA_REPAY_ON_PRICE,
+                        1670,
+                        RatioState.UNDER,
+                        web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+                        0,
+                        web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+                        1,
+                        web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
+                        200,
+                        web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
+                    ]
+                ],
+                [
+                    [
+                        Bundles.MainnetIds.AAVE_V3_EOA_BOOST_ON_PRICE,
+                        true,
+                        ['0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c5990000000000000000000000000000000000000000000000000000000002faf0800000000000000000000000000000000000000000000000000000000000000000'],
+                        [
+                            '0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c599',
+                            '0x0000000000000000000000000000000000000000000000000000000000000002',
+                            '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                            '0x0000000000000000000000000000000000000000000000000000000000000001',
+                            '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
+                            '0x0000000000000000000000000000000000000000000000001bc16d674ec80000',
+                            '0x0000000000000000000000001234567890123456789012345678901234567890',
+                        ],
+                    ],
+                    [
+                        Bundles.MainnetIds.AAVE_V3_EOA_BOOST_ON_PRICE,
+                        0.5,
+                        RatioState.OVER,
+                        web3Utils.toChecksumAddress(getAssetInfo('WBTC', ChainId.Ethereum).address),
+                        2,
+                        web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+                        1,
+                        web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
+                        200,
+                        web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
+                    ]
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(aaveV3Encode.leverageManagementOnPriceGeneric(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe('closeOnPriceGeneric()', () => {
+            const examples = [
+                // Stop loss only (to debt)
+                [
+                    [
+                        Bundles.MainnetIds.AAVE_V3_EOA_CLOSE,
+                        true,
+                        ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb4800000000000000000000000000000000000000000000000000000022ecb25c000000000000000000000000000000000000000000000000000000000000000000'],
+                        [
+                            '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                            '0x0000000000000000000000000000000000000000000000000000000000000000',
+                            '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                            '0x0000000000000000000000000000000000000000000000000000000000000001',
+                            '0x0000000000000000000000000000000000000000000000000000000000000003',
+                            '0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e',
+                            '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        ],
+                    ],
+                    [
+                        Bundles.MainnetIds.AAVE_V3_EOA_CLOSE,
+                        web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+                        0,
+                        web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+                        1,
+                        web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'),
+                        web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
+                        1500,
+                        CloseToAssetType.DEBT,
+                        0,
+                        CloseToAssetType.COLLATERAL, // takeProfitType (not used since price is 0)
+                    ]
+                ],
+                // Take profit only (to collateral)
+                [
+                    [
+                        Bundles.MainnetIds.AAVE_V3_EOA_CLOSE,
+                        true,
+                        ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000746a528800'],
+                        [
+                            '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                            '0x0000000000000000000000000000000000000000000000000000000000000000',
+                            '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                            '0x0000000000000000000000000000000000000000000000000000000000000001',
+                            '0x0000000000000000000000000000000000000000000000000000000000000000',
+                            '0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e',
+                            '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        ],
+                    ],
+                    [
+                        Bundles.MainnetIds.AAVE_V3_EOA_CLOSE,
+                        web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+                        0,
+                        web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+                        1,
+                        web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'),
+                        web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
+                        0,
+                        CloseToAssetType.DEBT,
+                        5000,
+                        CloseToAssetType.COLLATERAL, // takeProfitType
+                    ]
+                ],
+                // Both stop loss and take profit with useOnBehalf
+                [
+                    [
+                        Bundles.MainnetIds.AAVE_V3_EOA_CLOSE,
+                        true,
+                        ['0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c599000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb4800000000000000000000000000000000000000000000000000000022ecb25c000000000000000000000000000000000000000000000000000000005d21dba000'],
+                        [
+                            '0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c599',
+                            '0x0000000000000000000000000000000000000000000000000000000000000002',
+                            '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                            '0x0000000000000000000000000000000000000000000000000000000000000001',
+                            '0x0000000000000000000000000000000000000000000000000000000000000004',
+                            '0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e',
+                            '0x0000000000000000000000001234567890123456789012345678901234567890',
+                        ],
+                    ],
+                    [
+                        Bundles.MainnetIds.AAVE_V3_EOA_CLOSE,
+                        web3Utils.toChecksumAddress(getAssetInfo('WBTC', ChainId.Ethereum).address),
+                        2,
+                        web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+                        1,
+                        web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'),
+                        web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
+                        1500,
+                        CloseToAssetType.COLLATERAL,
+                        4000,
+                        CloseToAssetType.COLLATERAL, // takeProfitType
+                    ]
+                ],
+                // Stop loss only (to collateral) - CloseStrategyType.STOP_LOSS_IN_COLLATERAL
+                [
+                    [
+                        Bundles.MainnetIds.AAVE_V3_EOA_CLOSE,
+                        true,
+                        ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb4800000000000000000000000000000000000000000000000000000022ecb25c000000000000000000000000000000000000000000000000000000000000000000'],
+                        [
+                            '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                            '0x0000000000000000000000000000000000000000000000000000000000000000',
+                            '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                            '0x0000000000000000000000000000000000000000000000000000000000000001',
+                            '0x0000000000000000000000000000000000000000000000000000000000000001',
+                            '0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e',
+                            '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        ],
+                    ],
+                    [
+                        Bundles.MainnetIds.AAVE_V3_EOA_CLOSE,
+                        web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+                        0,
+                        web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+                        1,
+                        web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'),
+                        web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
+                        1500,
+                        CloseToAssetType.COLLATERAL,
+                        0,
+                        CloseToAssetType.DEBT, // takeProfitType (not used since price is 0)
+                    ]
+                ],
+                // Take profit only (to debt) - CloseStrategyType.TAKE_PROFIT_IN_DEBT
+                [
+                    [
+                        Bundles.MainnetIds.AAVE_V3_EOA_CLOSE,
+                        true,
+                        ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000746a528800'],
+                        [
+                            '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                            '0x0000000000000000000000000000000000000000000000000000000000000000',
+                            '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                            '0x0000000000000000000000000000000000000000000000000000000000000001',
+                            '0x0000000000000000000000000000000000000000000000000000000000000002',
+                            '0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e',
+                            '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        ],
+                    ],
+                    [
+                        Bundles.MainnetIds.AAVE_V3_EOA_CLOSE,
+                        web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+                        0,
+                        web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+                        1,
+                        web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'),
+                        web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
+                        0,
+                        CloseToAssetType.COLLATERAL,
+                        5000,
+                        CloseToAssetType.DEBT, // takeProfitType
+                    ]
+                ],
+                // Take profit in collateral and stop loss in debt - CloseStrategyType.TAKE_PROFIT_IN_COLLATERAL_AND_STOP_LOSS_IN_DEBT
+                [
+                    [
+                        Bundles.MainnetIds.AAVE_V3_EOA_CLOSE,
+                        true,
+                        ['0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c599000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb4800000000000000000000000000000000000000000000000000000022ecb25c000000000000000000000000000000000000000000000000000000005d21dba000'],
+                        [
+                            '0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c599',
+                            '0x0000000000000000000000000000000000000000000000000000000000000002',
+                            '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                            '0x0000000000000000000000000000000000000000000000000000000000000001',
+                            '0x0000000000000000000000000000000000000000000000000000000000000005',
+                            '0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e',
+                            '0x0000000000000000000000001234567890123456789012345678901234567890',
+                        ],
+                    ],
+                    [
+                        Bundles.MainnetIds.AAVE_V3_EOA_CLOSE,
+                        web3Utils.toChecksumAddress(getAssetInfo('WBTC', ChainId.Ethereum).address),
+                        2,
+                        web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+                        1,
+                        web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'),
+                        web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
+                        1500,
+                        CloseToAssetType.DEBT,
+                        4000,
+                        CloseToAssetType.COLLATERAL, // takeProfitType
+                    ]
+                ],
+                // Both stop loss and take profit in debt - CloseStrategyType.TAKE_PROFIT_AND_STOP_LOSS_IN_DEBT
+                [
+                    [
+                        Bundles.MainnetIds.AAVE_V3_EOA_CLOSE,
+                        true,
+                        ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb4800000000000000000000000000000000000000000000000000000022ecb25c000000000000000000000000000000000000000000000000000000005d21dba000'],
+                        [
+                            '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                            '0x0000000000000000000000000000000000000000000000000000000000000000',
+                            '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                            '0x0000000000000000000000000000000000000000000000000000000000000001',
+                            '0x0000000000000000000000000000000000000000000000000000000000000006',
+                            '0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e',
+                            '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        ],
+                    ],
+                    [
+                        Bundles.MainnetIds.AAVE_V3_EOA_CLOSE,
+                        web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+                        0,
+                        web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+                        1,
+                        web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'),
+                        web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
+                        1500,
+                        CloseToAssetType.DEBT,
+                        4000,
+                        CloseToAssetType.DEBT, // takeProfitType
+                    ]
+                ],
+                // Take profit in debt and stop loss in collateral - CloseStrategyType.TAKE_PROFIT_IN_DEBT_AND_STOP_LOSS_IN_COLLATERAL
+                [
+                    [
+                        Bundles.MainnetIds.AAVE_V3_EOA_CLOSE,
+                        true,
+                        ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb4800000000000000000000000000000000000000000000000000000022ecb25c000000000000000000000000000000000000000000000000000000005d21dba000'],
+                        [
+                            '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                            '0x0000000000000000000000000000000000000000000000000000000000000000',
+                            '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                            '0x0000000000000000000000000000000000000000000000000000000000000001',
+                            '0x0000000000000000000000000000000000000000000000000000000000000007',
+                            '0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e',
+                            '0x0000000000000000000000009876543210987654321098765432109876543210',
+                        ],
+                    ],
+                    [
+                        Bundles.MainnetIds.AAVE_V3_EOA_CLOSE,
+                        web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+                        0,
+                        web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+                        1,
+                        web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'),
+                        web3Utils.toChecksumAddress('0x9876543210987654321098765432109876543210'),
+                        1500,
+                        CloseToAssetType.COLLATERAL,
+                        4000,
+                        CloseToAssetType.DEBT, // takeProfitType
+                    ]
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(aaveV3Encode.closeOnPriceGeneric(...actual)).to.eql(expected);
+                });
+            });
+        });
     });
     describe('When testing strategySubService.compoundV2Encode', () => {
         describe('leverageManagement()', () => {

package/esm/services/subDataService.d.ts

@@ -52,12 +52,36 @@ export declare const aaveV3LeverageManagementSubData: {
     };
 };
 export declare const aaveV3LeverageManagementSubDataWithoutSubProxy: {
-    encode(targetRatio: number, ratioState: RatioState): string[];
+    encode(targetRatio: number, ratioState: RatioState, market: EthereumAddress, user: EthereumAddress, isGeneric: boolean): 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[]): {
+        collAsset: EthereumAddress;
+        collAssetId: number;
+        debtAsset: EthereumAddress;
+        debtAssetId: number;
+        marketAddr: EthereumAddress;
+        targetRatio: number;
+        user: EthereumAddress;
+    };
+};
+export declare const aaveV3CloseGenericSubData: {
+    encode(collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, closeType: CloseStrategyType, marketAddr: EthereumAddress, user: EthereumAddress): string[];
+    decode(subData: string[]): {
+        collAsset: EthereumAddress;
+        collAssetId: number;
+        debtAsset: EthereumAddress;
+        debtAssetId: number;
+        closeType: CloseStrategyType;
+        marketAddr: EthereumAddress;
+        user: EthereumAddress;
+    };
+};
 export declare const aaveV3QuotePriceSubData: {
     encode(collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, nullAddress?: EthereumAddress): string[];
     decode(subData: string[]): {
@@ -280,11 +304,3 @@ export declare const compoundV3CloseSubData: {
         owner: EthereumAddress;
     };
 };
-export declare const liquityV2InterestRateAdjustmentSubData: {
-    encode: (market: EthereumAddress, troveId: string, interestRateChange: string) => string[];
-    decode: (subData: string[]) => {
-        market: string;
-        troveId: string;
-        interestRateChange: string;
-    };
-};

package/esm/services/subDataService.js

@@ -121,9 +121,14 @@ export const aaveV3LeverageManagementSubData = {
     },
 };
 export const aaveV3LeverageManagementSubDataWithoutSubProxy = {
-    encode(targetRatio, ratioState) {
+    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];
@@ -134,6 +139,77 @@ export const aaveV3LeverageManagementSubDataWithoutSubProxy = {
         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 user = AbiCoder.decodeParameter('address', subData[6]);
+        return {
+            collAsset,
+            collAssetId,
+            debtAsset,
+            debtAssetId,
+            marketAddr,
+            targetRatio,
+            user,
+        };
+    },
+};
+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 user = AbiCoder.decodeParameter('address', subData[6]);
+        return {
+            collAsset, collAssetId, debtAsset, debtAssetId, closeType, marketAddr, user,
+        };
+    },
+};
 export const aaveV3QuotePriceSubData = {
     encode(collAsset, collAssetId, debtAsset, debtAssetId, nullAddress = ZERO_ADDRESS) {
         const encodedColl = AbiCoder.encodeParameter('address', collAsset);
@@ -732,27 +808,3 @@ export const compoundV3CloseSubData = {
         };
     },
 };
-export const liquityV2InterestRateAdjustmentSubData = {
-    encode: (market, troveId, interestRateChange) => {
-        const marketEncoded = AbiCoder.encodeParameter('address', market);
-        const troveIdEncoded = AbiCoder.encodeParameter('uint256', troveId);
-        const interestRateChangeWei = new Dec(interestRateChange).mul(1e16).toString();
-        const interestRateChangeEncoded = AbiCoder.encodeParameter('uint256', interestRateChangeWei.toString());
-        return [
-            marketEncoded,
-            troveIdEncoded,
-            interestRateChangeEncoded,
-        ];
-    },
-    decode: (subData) => {
-        const market = AbiCoder.decodeParameter('address', subData[0]);
-        const troveId = AbiCoder.decodeParameter('uint256', subData[1]);
-        const interestRateChangeWei = AbiCoder.decodeParameter('uint256', subData[2]);
-        const interestRateChange = new Dec(interestRateChangeWei).div(Math.pow(10, 16)).toString();
-        return {
-            market,
-            troveId,
-            interestRateChange,
-        };
-    },
-};