@defisaver/automation-sdk 3.3.21-debt-switch-dev-dev → 3.3.21-instant-twap-close-dev

package/esm/services/strategySubService.test.js

@@ -732,6 +732,117 @@ describe('Feature: strategySubService.ts', () => {
                 });
             });
         });
+        describe('instantCloseOnPriceGeneric()', () => {
+            const examples = [
+                // Stop loss only (to debt)
+                [
+                    [
+                        Bundles.MainnetIds.AAVE_V3_EOA_INSTANT_CLOSE,
+                        true,
+                        ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb4800000000000000000000000000000000000000000000000000000022ecb25c000000000000000000000000000000000000000000000000000000000000000000'],
+                        [
+                            '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                            '0x0000000000000000000000000000000000000000000000000000000000000000',
+                            '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                            '0x0000000000000000000000000000000000000000000000000000000000000001',
+                            '0x0000000000000000000000000000000000000000000000000000000000000003',
+                            '0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e',
+                            '0x0000000000000000000000001234567890123456789012345678901234567890',
+                            '0x0000000000000000000000000000000000000000000000000de0b6b3a7640000',
+                            '0x000000000000000000000000000000000000000000000000002386f26fc10000',
+                        ],
+                    ],
+                    [
+                        Bundles.MainnetIds.AAVE_V3_EOA_INSTANT_CLOSE,
+                        web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+                        0,
+                        web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+                        1,
+                        web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'),
+                        web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
+                        '1000000000000000000',
+                        '10000000000000000',
+                        1500,
+                        CloseToAssetType.DEBT,
+                        0,
+                        CloseToAssetType.COLLATERAL, // takeProfitType (not used since price is 0)
+                    ]
+                ],
+                // Take profit only (to collateral), zero tsi and slippage
+                [
+                    [
+                        Bundles.MainnetIds.AAVE_V3_EOA_INSTANT_CLOSE,
+                        true,
+                        ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000746a528800'],
+                        [
+                            '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                            '0x0000000000000000000000000000000000000000000000000000000000000000',
+                            '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                            '0x0000000000000000000000000000000000000000000000000000000000000001',
+                            '0x0000000000000000000000000000000000000000000000000000000000000000',
+                            '0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e',
+                            '0x0000000000000000000000001234567890123456789012345678901234567890',
+                            '0x0000000000000000000000000000000000000000000000000000000000000000',
+                            '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        ],
+                    ],
+                    [
+                        Bundles.MainnetIds.AAVE_V3_EOA_INSTANT_CLOSE,
+                        web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+                        0,
+                        web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+                        1,
+                        web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'),
+                        web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
+                        '0',
+                        '0',
+                        0,
+                        CloseToAssetType.DEBT,
+                        5000,
+                        CloseToAssetType.COLLATERAL, // takeProfitType
+                    ]
+                ],
+                // Take profit (to debt) and stop loss (to collateral)
+                [
+                    [
+                        Bundles.MainnetIds.AAVE_V3_EOA_INSTANT_CLOSE,
+                        true,
+                        ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb4800000000000000000000000000000000000000000000000000000022ecb25c000000000000000000000000000000000000000000000000000000005d21dba000'],
+                        [
+                            '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                            '0x0000000000000000000000000000000000000000000000000000000000000000',
+                            '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                            '0x0000000000000000000000000000000000000000000000000000000000000001',
+                            '0x0000000000000000000000000000000000000000000000000000000000000007',
+                            '0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e',
+                            '0x0000000000000000000000001234567890123456789012345678901234567890',
+                            '0x00000000000000000000000000000000000000000000000000b1a2bc2ec50000',
+                            '0x0000000000000000000000000000000000000000000000000011c37937e08000',
+                        ],
+                    ],
+                    [
+                        Bundles.MainnetIds.AAVE_V3_EOA_INSTANT_CLOSE,
+                        web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+                        0,
+                        web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+                        1,
+                        web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'),
+                        web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
+                        '50000000000000000',
+                        '5000000000000000',
+                        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.instantCloseOnPriceGeneric(...actual)).to.eql(expected);
+                });
+            });
+        });
         describe('collateralSwitch()', () => {
             const examples = [
                 // WETH -> USDC, price 100000, state UNDER
@@ -831,77 +942,6 @@ describe('Feature: strategySubService.ts', () => {
                 });
             });
         });
-        describe('debtSwitch()', () => {
-            const examples = [
-                // USDC -> DAI, price 100000, state UNDER
-                [
-                    [
-                        Strategies.MainnetIds.AAVE_V3_DEBT_SWITCH,
-                        false,
-                        ['0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480000000000000000000000006b175474e89094c44da98b954eedeac495271d0f000000000000000000000000000000000000000000000000000009184e72a0000000000000000000000000000000000000000000000000000000000000000001'],
-                        [
-                            '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-                            '0x0000000000000000000000000000000000000000000000000000000000000001',
-                            '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f',
-                            '0x0000000000000000000000000000000000000000000000000000000000000003',
-                            '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
-                            '0x0000000000000000000000000000000000000000000000008ac7230489e80000',
-                            '0x000000000000000000000000dd6ecd6c9b9f7e29e0f14bb9d5f0d0a3c6cb6c6a',
-                        ],
-                    ],
-                    [
-                        Strategies.MainnetIds.AAVE_V3_DEBT_SWITCH,
-                        web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
-                        1,
-                        web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
-                        3,
-                        web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
-                        '10000000000000000000',
-                        web3Utils.toChecksumAddress('0xDd6ecD6c9b9F7e29E0f14bb9D5F0D0A3C6cB6c6A'),
-                        web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
-                        web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
-                        100000,
-                        RatioState.UNDER,
-                    ]
-                ],
-                // DAI -> USDC (MaxUint256), price 1, state OVER
-                [
-                    [
-                        Strategies.MainnetIds.AAVE_V3_DEBT_SWITCH,
-                        false,
-                        ['0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480000000000000000000000000000000000000000000000000000000005f5e1000000000000000000000000000000000000000000000000000000000000000000'],
-                        [
-                            '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f',
-                            '0x0000000000000000000000000000000000000000000000000000000000000003',
-                            '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-                            '0x0000000000000000000000000000000000000000000000000000000000000001',
-                            '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
-                            '0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff',
-                            '0x000000000000000000000000dd6ecd6c9b9f7e29e0f14bb9d5f0d0a3c6cb6c6a',
-                        ],
-                    ],
-                    [
-                        Strategies.MainnetIds.AAVE_V3_DEBT_SWITCH,
-                        web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
-                        3,
-                        web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
-                        1,
-                        web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
-                        MAXUINT,
-                        web3Utils.toChecksumAddress('0xDd6ecD6c9b9F7e29E0f14bb9D5F0D0A3C6cB6c6A'),
-                        web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
-                        web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
-                        1,
-                        RatioState.OVER,
-                    ]
-                ],
-            ];
-            examples.forEach(([expected, actual]) => {
-                it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    expect(aaveV3Encode.debtSwitch(...actual)).to.eql(expected);
-                });
-            });
-        });
     });
     describe('When testing strategySubService.compoundV3Encode', () => {
         describe('leverageManagementOnPrice()', () => {

package/esm/services/subDataService.d.ts

@@ -248,19 +248,22 @@ export declare const aaveV3CloseGenericSubData: {
         owner: EthereumAddress;
     };
 };
-export declare const aaveV3CollateralSwitchSubData: {
-    encode(fromAsset: EthereumAddress, fromAssetId: number, toAsset: EthereumAddress, toAssetId: number, marketAddr: EthereumAddress, amountToSwitch: string, useOnBehalf?: boolean): string[];
+export declare const aaveV3InstantCloseGenericSubData: {
+    encode(collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, closeType: CloseStrategyType, marketAddr: EthereumAddress, user: EthereumAddress, tsi: string, slippage: string): string[];
     decode(subData: string[]): {
-        fromAsset: EthereumAddress;
-        fromAssetId: number;
-        toAsset: EthereumAddress;
-        toAssetId: number;
+        collAsset: EthereumAddress;
+        collAssetId: number;
+        debtAsset: EthereumAddress;
+        debtAssetId: number;
+        closeType: CloseStrategyType;
         marketAddr: EthereumAddress;
-        amountToSwitch: string;
+        owner: EthereumAddress;
+        tsi: string;
+        slippage: string;
     };
 };
-export declare const aaveV3DebtSwitchSubData: {
-    encode(fromAsset: EthereumAddress, fromAssetId: number, toAsset: EthereumAddress, toAssetId: number, marketAddr: EthereumAddress, amountToSwitch: string, user: EthereumAddress): string[];
+export declare const aaveV3CollateralSwitchSubData: {
+    encode(fromAsset: EthereumAddress, fromAssetId: number, toAsset: EthereumAddress, toAssetId: number, marketAddr: EthereumAddress, amountToSwitch: string, useOnBehalf?: boolean): string[];
     decode(subData: string[]): {
         fromAsset: EthereumAddress;
         fromAssetId: number;
@@ -268,7 +271,6 @@ export declare const aaveV3DebtSwitchSubData: {
         toAssetId: number;
         marketAddr: EthereumAddress;
         amountToSwitch: string;
-        user: EthereumAddress;
     };
 };
 export declare const aaveV3QuotePriceSubData: {

package/esm/services/subDataService.js

@@ -511,46 +511,53 @@ export const aaveV3CloseGenericSubData = {
         };
     },
 };
-export const aaveV3CollateralSwitchSubData = {
-    encode(fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, useOnBehalf = false) {
-        const encodedFromAsset = AbiCoder.encodeParameter('address', fromAsset);
-        const encodedFromAssetId = AbiCoder.encodeParameter('uint8', fromAssetId);
-        const encodedToAsset = AbiCoder.encodeParameter('address', toAsset);
-        const encodedToAssetId = AbiCoder.encodeParameter('uint8', toAssetId);
-        const encodedMarketAddr = AbiCoder.encodeParameter('address', marketAddr);
-        const encodedAmountToSwitch = AbiCoder.encodeParameter('uint256', amountToSwitch);
-        const encodedUseOnBehalf = AbiCoder.encodeParameter('bool', useOnBehalf);
+export const aaveV3InstantCloseGenericSubData = {
+    encode(collAsset, collAssetId, debtAsset, debtAssetId, closeType, marketAddr, user, tsi, slippage) {
+        const encodedColl = AbiCoder.encodeParameter('address', collAsset);
+        const encodedCollId = AbiCoder.encodeParameter('uint16', collAssetId);
+        const encodedDebt = AbiCoder.encodeParameter('address', debtAsset);
+        const encodedDebtId = AbiCoder.encodeParameter('uint16', debtAssetId);
+        const encodedCloseType = AbiCoder.encodeParameter('uint8', closeType);
+        const encodedMarket = AbiCoder.encodeParameter('address', marketAddr);
+        const encodedUser = AbiCoder.encodeParameter('address', user);
+        const encodedTsi = AbiCoder.encodeParameter('uint256', tsi);
+        const encodedSlippage = AbiCoder.encodeParameter('uint256', slippage);
         return [
-            encodedFromAsset,
-            encodedFromAssetId,
-            encodedToAsset,
-            encodedToAssetId,
-            encodedMarketAddr,
-            encodedAmountToSwitch,
-            encodedUseOnBehalf,
+            encodedColl,
+            encodedCollId,
+            encodedDebt,
+            encodedDebtId,
+            encodedCloseType,
+            encodedMarket,
+            encodedUser,
+            encodedTsi,
+            encodedSlippage,
         ];
     },
     decode(subData) {
-        const fromAsset = AbiCoder.decodeParameter('address', subData[0]);
-        const fromAssetId = Number(AbiCoder.decodeParameter('uint8', subData[1]));
-        const toAsset = AbiCoder.decodeParameter('address', subData[2]);
-        const toAssetId = Number(AbiCoder.decodeParameter('uint8', subData[3]));
-        const marketAddr = AbiCoder.decodeParameter('address', subData[4]);
-        const amountToSwitch = AbiCoder.decodeParameter('uint256', subData[5]);
+        const collAsset = AbiCoder.decodeParameter('address', subData[0]);
+        const collAssetId = Number(AbiCoder.decodeParameter('uint16', subData[1]));
+        const debtAsset = AbiCoder.decodeParameter('address', subData[2]);
+        const debtAssetId = Number(AbiCoder.decodeParameter('uint16', subData[3]));
+        const closeType = Number(AbiCoder.decodeParameter('uint8', subData[4]));
+        const marketAddr = AbiCoder.decodeParameter('address', subData[5]);
+        const owner = AbiCoder.decodeParameter('address', subData[6]);
+        const tsi = AbiCoder.decodeParameter('uint256', subData[7]);
+        const slippage = AbiCoder.decodeParameter('uint256', subData[8]);
         return {
-            fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch,
+            collAsset, collAssetId, debtAsset, debtAssetId, closeType, marketAddr, owner, tsi, slippage,
         };
     },
 };
-export const aaveV3DebtSwitchSubData = {
-    encode(fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, user) {
+export const aaveV3CollateralSwitchSubData = {
+    encode(fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, useOnBehalf = false) {
         const encodedFromAsset = AbiCoder.encodeParameter('address', fromAsset);
         const encodedFromAssetId = AbiCoder.encodeParameter('uint8', fromAssetId);
         const encodedToAsset = AbiCoder.encodeParameter('address', toAsset);
         const encodedToAssetId = AbiCoder.encodeParameter('uint8', toAssetId);
         const encodedMarketAddr = AbiCoder.encodeParameter('address', marketAddr);
         const encodedAmountToSwitch = AbiCoder.encodeParameter('uint256', amountToSwitch);
-        const encodedUser = AbiCoder.encodeParameter('address', user);
+        const encodedUseOnBehalf = AbiCoder.encodeParameter('bool', useOnBehalf);
         return [
             encodedFromAsset,
             encodedFromAssetId,
@@ -558,7 +565,7 @@ export const aaveV3DebtSwitchSubData = {
             encodedToAssetId,
             encodedMarketAddr,
             encodedAmountToSwitch,
-            encodedUser,
+            encodedUseOnBehalf,
         ];
     },
     decode(subData) {
@@ -568,9 +575,8 @@ export const aaveV3DebtSwitchSubData = {
         const toAssetId = Number(AbiCoder.decodeParameter('uint8', subData[3]));
         const marketAddr = AbiCoder.decodeParameter('address', subData[4]);
         const amountToSwitch = AbiCoder.decodeParameter('uint256', subData[5]);
-        const user = AbiCoder.decodeParameter('address', subData[6]);
         return {
-            fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, user,
+            fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch,
         };
     },
 };

package/esm/services/subDataService.test.js

@@ -510,110 +510,6 @@ describe('Feature: subDataService.ts', () => {
             });
         });
     });
-    describe('When testing subDataService.aaveV3DebtSwitchSubData', () => {
-        describe('encode()', () => {
-            const examples = [
-                // USDC -> DAI
-                [
-                    [
-                        '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-                        '0x0000000000000000000000000000000000000000000000000000000000000001',
-                        '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f',
-                        '0x0000000000000000000000000000000000000000000000000000000000000003',
-                        '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
-                        '0x0000000000000000000000000000000000000000000000008ac7230489e80000',
-                        '0x000000000000000000000000dd6ecd6c9b9f7e29e0f14bb9d5f0d0a3c6cb6c6a',
-                    ],
-                    [
-                        web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
-                        1,
-                        web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
-                        3,
-                        web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
-                        '10000000000000000000',
-                        web3Utils.toChecksumAddress('0xDd6ecD6c9b9F7e29E0f14bb9D5F0D0A3C6cB6c6A'),
-                    ]
-                ],
-                // DAI -> USDC (MaxUint256)
-                [
-                    [
-                        '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f',
-                        '0x0000000000000000000000000000000000000000000000000000000000000003',
-                        '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-                        '0x0000000000000000000000000000000000000000000000000000000000000001',
-                        '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
-                        '0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff',
-                        '0x000000000000000000000000dd6ecd6c9b9f7e29e0f14bb9d5f0d0a3c6cb6c6a',
-                    ],
-                    [
-                        web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
-                        3,
-                        web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
-                        1,
-                        web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
-                        MAXUINT,
-                        web3Utils.toChecksumAddress('0xDd6ecD6c9b9F7e29E0f14bb9D5F0D0A3C6cB6c6A'),
-                    ]
-                ],
-            ];
-            examples.forEach(([expected, actual]) => {
-                it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    expect(subDataService.aaveV3DebtSwitchSubData.encode(...actual)).to.eql(expected);
-                });
-            });
-        });
-        describe('decode()', () => {
-            const examples = [
-                // USDC -> DAI
-                [
-                    {
-                        fromAsset: web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
-                        fromAssetId: 1,
-                        toAsset: web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
-                        toAssetId: 3,
-                        marketAddr: web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
-                        amountToSwitch: '10000000000000000000',
-                        user: web3Utils.toChecksumAddress('0xDd6ecD6c9b9F7e29E0f14bb9D5F0D0A3C6cB6c6A'),
-                    },
-                    [
-                        '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-                        '0x0000000000000000000000000000000000000000000000000000000000000001',
-                        '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f',
-                        '0x0000000000000000000000000000000000000000000000000000000000000003',
-                        '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
-                        '0x0000000000000000000000000000000000000000000000008ac7230489e80000',
-                        '0x000000000000000000000000dd6ecd6c9b9f7e29e0f14bb9d5f0d0a3c6cb6c6a',
-                    ],
-                ],
-                // DAI -> USDC (MaxUint256)
-                [
-                    {
-                        fromAsset: web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
-                        fromAssetId: 3,
-                        toAsset: web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
-                        toAssetId: 1,
-                        marketAddr: web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
-                        amountToSwitch: MAXUINT,
-                        user: web3Utils.toChecksumAddress('0xDd6ecD6c9b9F7e29E0f14bb9D5F0D0A3C6cB6c6A'),
-                    },
-                    [
-                        '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f',
-                        '0x0000000000000000000000000000000000000000000000000000000000000003',
-                        '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-                        '0x0000000000000000000000000000000000000000000000000000000000000001',
-                        '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
-                        '0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff',
-                        '0x000000000000000000000000dd6ecd6c9b9f7e29e0f14bb9d5f0d0a3c6cb6c6a',
-                    ],
-                ],
-            ];
-            examples.forEach(([expected, actual]) => {
-                it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    expect(subDataService.aaveV3DebtSwitchSubData.decode(actual)).to.eql(expected);
-                });
-            });
-        });
-    });
     describe('When testing subDataService.sparkCollateralSwitchSubData', () => {
         describe('encode()', () => {
             const examples = [
@@ -2360,6 +2256,76 @@ describe('Feature: subDataService.ts', () => {
             });
         });
     });
+    describe("When testing subDataService.aaveV3InstantCloseGenericSubData", () => {
+        const WETH = web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address);
+        const USDC = web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address);
+        const MARKET = web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39');
+        const USER = web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890');
+        const examples = [
+            // TAKE_PROFIT_IN_COLLATERAL, zero tsi and slippage
+            [
+                [
+                    '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                    '0x0000000000000000000000000000000000000000000000000000000000000000',
+                    '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                    '0x0000000000000000000000000000000000000000000000000000000000000001',
+                    '0x0000000000000000000000000000000000000000000000000000000000000000',
+                    '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
+                    '0x0000000000000000000000001234567890123456789012345678901234567890',
+                    '0x0000000000000000000000000000000000000000000000000000000000000000',
+                    '0x0000000000000000000000000000000000000000000000000000000000000000',
+                ],
+                [WETH, 0, USDC, 1, CloseStrategyType.TAKE_PROFIT_IN_COLLATERAL, MARKET, USER, '0', '0'],
+            ],
+            // STOP_LOSS_IN_DEBT
+            [
+                [
+                    '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                    '0x0000000000000000000000000000000000000000000000000000000000000000',
+                    '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                    '0x0000000000000000000000000000000000000000000000000000000000000001',
+                    '0x0000000000000000000000000000000000000000000000000000000000000003',
+                    '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
+                    '0x0000000000000000000000001234567890123456789012345678901234567890',
+                    '0x0000000000000000000000000000000000000000000000000de0b6b3a7640000',
+                    '0x000000000000000000000000000000000000000000000000002386f26fc10000',
+                ],
+                [WETH, 0, USDC, 1, CloseStrategyType.STOP_LOSS_IN_DEBT, MARKET, USER, '1000000000000000000', '10000000000000000'],
+            ],
+            // TAKE_PROFIT_IN_DEBT_AND_STOP_LOSS_IN_COLLATERAL, asset ids above uint8 range
+            [
+                [
+                    '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                    '0x000000000000000000000000000000000000000000000000000000000000012c',
+                    '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                    '0x0000000000000000000000000000000000000000000000000000000000000190',
+                    '0x0000000000000000000000000000000000000000000000000000000000000007',
+                    '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
+                    '0x0000000000000000000000001234567890123456789012345678901234567890',
+                    '0x00000000000000000000000000000000000000000000000000b1a2bc2ec50000',
+                    '0x0000000000000000000000000000000000000000000000000011c37937e08000',
+                ],
+                [WETH, 300, USDC, 400, CloseStrategyType.TAKE_PROFIT_IN_DEBT_AND_STOP_LOSS_IN_COLLATERAL, MARKET, USER, '50000000000000000', '5000000000000000'],
+            ],
+        ];
+        describe("encode()", () => {
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(subDataService.aaveV3InstantCloseGenericSubData.encode(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe("decode()", () => {
+            examples.forEach(([encoded, [collAsset, collAssetId, debtAsset, debtAssetId, closeType, marketAddr, user, tsi, slippage]]) => {
+                const expected = {
+                    collAsset, collAssetId, debtAsset, debtAssetId, closeType, marketAddr, owner: user, tsi, slippage,
+                };
+                it(`Given ${JSON.stringify(encoded)} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(subDataService.aaveV3InstantCloseGenericSubData.decode(encoded)).to.eql(expected);
+                });
+            });
+        });
+    });
     describe('When testing subDataService.sparkLeverageManagementOnPriceSubData', () => {
         describe('encode()', () => {
             const examples = [

package/esm/types/enums.d.ts

@@ -91,30 +91,22 @@ export declare namespace Strategies {
         AAVE_V4_COLLATERAL_SWITCH = 154,
         AAVE_V4_COLLATERAL_SWITCH_EOA = 155,
         SPARK_COLLATERAL_SWITCH = 156,
-        SPARK_GENERIC_FL_COLLATERAL_SWITCH = 167,
-        AAVE_V3_DEBT_SWITCH = 168,
-        AAVE_V3_DEBT_SWITCH_EOA = 169
+        SPARK_GENERIC_FL_COLLATERAL_SWITCH = 167
     }
     enum OptimismIds {
         EXCHANGE_DCA = 8,
         EXCHANGE_LIMIT_ORDER = 9,
-        AAVE_V3_COLLATERAL_SWITCH = 24,
-        AAVE_V3_DEBT_SWITCH = 25,
-        AAVE_V3_DEBT_SWITCH_EOA = 26
+        AAVE_V3_COLLATERAL_SWITCH = 24
     }
     enum BaseIds {
         EXCHANGE_DCA = 8,
         EXCHANGE_LIMIT_ORDER = 9,
-        AAVE_V3_COLLATERAL_SWITCH = 56,
-        AAVE_V3_DEBT_SWITCH = 61,
-        AAVE_V3_DEBT_SWITCH_EOA = 62
+        AAVE_V3_COLLATERAL_SWITCH = 56
     }
     enum ArbitrumIds {
         EXCHANGE_DCA = 8,
         EXCHANGE_LIMIT_ORDER = 9,
-        AAVE_V3_COLLATERAL_SWITCH = 50,
-        AAVE_V3_DEBT_SWITCH = 55,
-        AAVE_V3_DEBT_SWITCH_EOA = 56
+        AAVE_V3_COLLATERAL_SWITCH = 50
     }
     enum Identifiers {
         SavingsLiqProtection = "smart-savings-liquidation-protection",
@@ -132,6 +124,8 @@ export declare namespace Strategies {
         CloseOnPriceToColl = "close-on-price-to-collateral",
         CloseOnPrice = "close-on-price",
         EoaCloseOnPrice = "eoa-close-on-price",
+        InstantCloseOnPrice = "instant-close-on-price",
+        EoaInstantCloseOnPrice = "eoa-instant-close-on-price",
         TrailingStopToColl = "trailing-stop-to-collateral",
         TrailingStopToDebt = "trailing-stop-to-debt",
         Rebond = "rebond",
@@ -148,8 +142,6 @@ export declare namespace Strategies {
         EoaRepayOnPrice = "eoa-repay-on-price",
         CollateralSwitch = "collateral-switch",
         EoaCollateralSwitch = "eoa-collateral-switch",
-        DebtSwitch = "debt-switch",
-        EoaDebtSwitch = "eoa-debt-switch",
         LiquidationProtection = "liquidation-protection",
         EoaLiquidationProtection = "liquidation-protection-eoa"
     }
@@ -260,7 +252,9 @@ export declare namespace Bundles {
         SPARK_EOA_REPAY_ON_PRICE = 90,
         SPARK_EOA_BOOST_ON_PRICE = 91,
         SPARK_EOA_CLOSE = 92,
-        SPARK_EOA_LIQUIDATION_PROTECTION = 93
+        SPARK_EOA_LIQUIDATION_PROTECTION = 93,
+        AAVE_V3_SW_INSTANT_CLOSE = 94,
+        AAVE_V3_EOA_INSTANT_CLOSE = 95
     }
     enum OptimismIds {
         AAVE_V3_REPAY = 0,

package/esm/types/enums.js

@@ -105,32 +105,24 @@ export var Strategies;
         MainnetIds[MainnetIds["AAVE_V4_COLLATERAL_SWITCH_EOA"] = 155] = "AAVE_V4_COLLATERAL_SWITCH_EOA";
         MainnetIds[MainnetIds["SPARK_COLLATERAL_SWITCH"] = 156] = "SPARK_COLLATERAL_SWITCH";
         MainnetIds[MainnetIds["SPARK_GENERIC_FL_COLLATERAL_SWITCH"] = 167] = "SPARK_GENERIC_FL_COLLATERAL_SWITCH";
-        MainnetIds[MainnetIds["AAVE_V3_DEBT_SWITCH"] = 168] = "AAVE_V3_DEBT_SWITCH";
-        MainnetIds[MainnetIds["AAVE_V3_DEBT_SWITCH_EOA"] = 169] = "AAVE_V3_DEBT_SWITCH_EOA";
     })(MainnetIds = Strategies.MainnetIds || (Strategies.MainnetIds = {}));
     let OptimismIds;
     (function (OptimismIds) {
         OptimismIds[OptimismIds["EXCHANGE_DCA"] = 8] = "EXCHANGE_DCA";
         OptimismIds[OptimismIds["EXCHANGE_LIMIT_ORDER"] = 9] = "EXCHANGE_LIMIT_ORDER";
         OptimismIds[OptimismIds["AAVE_V3_COLLATERAL_SWITCH"] = 24] = "AAVE_V3_COLLATERAL_SWITCH";
-        OptimismIds[OptimismIds["AAVE_V3_DEBT_SWITCH"] = 25] = "AAVE_V3_DEBT_SWITCH";
-        OptimismIds[OptimismIds["AAVE_V3_DEBT_SWITCH_EOA"] = 26] = "AAVE_V3_DEBT_SWITCH_EOA";
     })(OptimismIds = Strategies.OptimismIds || (Strategies.OptimismIds = {}));
     let BaseIds;
     (function (BaseIds) {
         BaseIds[BaseIds["EXCHANGE_DCA"] = 8] = "EXCHANGE_DCA";
         BaseIds[BaseIds["EXCHANGE_LIMIT_ORDER"] = 9] = "EXCHANGE_LIMIT_ORDER";
         BaseIds[BaseIds["AAVE_V3_COLLATERAL_SWITCH"] = 56] = "AAVE_V3_COLLATERAL_SWITCH";
-        BaseIds[BaseIds["AAVE_V3_DEBT_SWITCH"] = 61] = "AAVE_V3_DEBT_SWITCH";
-        BaseIds[BaseIds["AAVE_V3_DEBT_SWITCH_EOA"] = 62] = "AAVE_V3_DEBT_SWITCH_EOA";
     })(BaseIds = Strategies.BaseIds || (Strategies.BaseIds = {}));
     let ArbitrumIds;
     (function (ArbitrumIds) {
         ArbitrumIds[ArbitrumIds["EXCHANGE_DCA"] = 8] = "EXCHANGE_DCA";
         ArbitrumIds[ArbitrumIds["EXCHANGE_LIMIT_ORDER"] = 9] = "EXCHANGE_LIMIT_ORDER";
         ArbitrumIds[ArbitrumIds["AAVE_V3_COLLATERAL_SWITCH"] = 50] = "AAVE_V3_COLLATERAL_SWITCH";
-        ArbitrumIds[ArbitrumIds["AAVE_V3_DEBT_SWITCH"] = 55] = "AAVE_V3_DEBT_SWITCH";
-        ArbitrumIds[ArbitrumIds["AAVE_V3_DEBT_SWITCH_EOA"] = 56] = "AAVE_V3_DEBT_SWITCH_EOA";
     })(ArbitrumIds = Strategies.ArbitrumIds || (Strategies.ArbitrumIds = {}));
     let Identifiers;
     (function (Identifiers) {
@@ -149,6 +141,8 @@ export var Strategies;
         Identifiers["CloseOnPriceToColl"] = "close-on-price-to-collateral";
         Identifiers["CloseOnPrice"] = "close-on-price";
         Identifiers["EoaCloseOnPrice"] = "eoa-close-on-price";
+        Identifiers["InstantCloseOnPrice"] = "instant-close-on-price";
+        Identifiers["EoaInstantCloseOnPrice"] = "eoa-instant-close-on-price";
         Identifiers["TrailingStopToColl"] = "trailing-stop-to-collateral";
         Identifiers["TrailingStopToDebt"] = "trailing-stop-to-debt";
         Identifiers["Rebond"] = "rebond";
@@ -165,8 +159,6 @@ export var Strategies;
         Identifiers["EoaRepayOnPrice"] = "eoa-repay-on-price";
         Identifiers["CollateralSwitch"] = "collateral-switch";
         Identifiers["EoaCollateralSwitch"] = "eoa-collateral-switch";
-        Identifiers["DebtSwitch"] = "debt-switch";
-        Identifiers["EoaDebtSwitch"] = "eoa-debt-switch";
         Identifiers["LiquidationProtection"] = "liquidation-protection";
         Identifiers["EoaLiquidationProtection"] = "liquidation-protection-eoa";
     })(Identifiers = Strategies.Identifiers || (Strategies.Identifiers = {}));
@@ -281,6 +273,8 @@ export var Bundles;
         MainnetIds[MainnetIds["SPARK_EOA_BOOST_ON_PRICE"] = 91] = "SPARK_EOA_BOOST_ON_PRICE";
         MainnetIds[MainnetIds["SPARK_EOA_CLOSE"] = 92] = "SPARK_EOA_CLOSE";
         MainnetIds[MainnetIds["SPARK_EOA_LIQUIDATION_PROTECTION"] = 93] = "SPARK_EOA_LIQUIDATION_PROTECTION";
+        MainnetIds[MainnetIds["AAVE_V3_SW_INSTANT_CLOSE"] = 94] = "AAVE_V3_SW_INSTANT_CLOSE";
+        MainnetIds[MainnetIds["AAVE_V3_EOA_INSTANT_CLOSE"] = 95] = "AAVE_V3_EOA_INSTANT_CLOSE";
     })(MainnetIds = Bundles.MainnetIds || (Bundles.MainnetIds = {}));
     let OptimismIds;
     (function (OptimismIds) {