@defisaver/automation-sdk 3.3.22-instant-twap-close-dev → 3.3.23

package/cjs/services/strategySubService.test.js

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

package/cjs/services/subDataService.d.ts

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

package/cjs/services/subDataService.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sparkCloseGenericSubData = exports.sparkGenericLiquidationProtectionSubData = exports.sparkGenericLeverageManagementSubData = exports.sparkLiquidationProtectionSubData = exports.sparkLeverageManagementSubData = exports.legacySparkLeverageManagementSubData = exports.exchangeLimitOrderSubData = exports.legacyExchangeLimitOrderSubData = exports.exchangeDcaSubData = exports.compoundV3CloseSubData = exports.compoundV3LeverageManagementOnPriceSubData = exports.compoundV3LiquidationProtectionSubData = exports.compoundV3LeverageManagementSubData = exports.compoundV2LeverageManagementSubData = exports.legacyCompoundV2LeverageManagementSubData = exports.aaveV4CollateralSwitchSubData = exports.aaveV4CloseSubData = exports.aaveV4LeverageManagementOnPriceSubData = exports.aaveV4LiquidationProtectionSubData = exports.aaveV4LeverageManagementSubData = exports.aaveV3LeverageManagementOnPriceSubData = exports.aaveV3QuotePriceSubData = exports.aaveV3CollateralSwitchSubData = exports.aaveV3InstantCloseGenericSubData = exports.aaveV3CloseGenericSubData = exports.aaveV3LeverageManagementOnPriceGeneric = exports.aaveV3LiquidationProtectionSubData = exports.aaveV3LeverageManagementSubData = exports.legacyAaveV3LeverageManagementSubData = exports.aaveV2LeverageManagementSubData = exports.legacyAaveV2LeverageManagementSubData = exports.liquityV2PaybackSubData = exports.liquityV2LeverageManagementOnPriceSubData = exports.liquityV2CloseSubData = exports.liquityV2LeverageManagementSubData = exports.liquityDebtInFrontRepaySubData = exports.liquityDsrSupplySubData = exports.liquityDsrPaybackSubData = exports.liquityCloseSubData = exports.liquityLeverageManagementSubData = exports.legacyLiquityLeverageManagementSubData = exports.liquityRepayFromSavingsSubData = exports.makerLiquidationProtectionSubData = exports.makerLeverageManagementSubData = exports.legacyMakerLeverageManagementSubData = exports.makerCloseSubData = exports.makerRepayFromSavingsSubData = exports.liquityPaybackUsingChickenBondSubData = exports.cBondsRebondSubData = exports.morphoAaveV2LeverageManagementSubData = void 0;
+exports.sparkCloseGenericSubData = exports.sparkGenericLiquidationProtectionSubData = exports.sparkGenericLeverageManagementSubData = exports.sparkLiquidationProtectionSubData = exports.sparkLeverageManagementSubData = exports.legacySparkLeverageManagementSubData = exports.exchangeLimitOrderSubData = exports.legacyExchangeLimitOrderSubData = exports.exchangeDcaSubData = exports.compoundV3CloseSubData = exports.compoundV3LeverageManagementOnPriceSubData = exports.compoundV3LiquidationProtectionSubData = exports.compoundV3LeverageManagementSubData = exports.compoundV2LeverageManagementSubData = exports.legacyCompoundV2LeverageManagementSubData = exports.aaveV4CollateralSwitchSubData = exports.aaveV4CloseSubData = exports.aaveV4LeverageManagementOnPriceSubData = exports.aaveV4LiquidationProtectionSubData = exports.aaveV4LeverageManagementSubData = exports.aaveV3LeverageManagementOnPriceSubData = exports.aaveV3QuotePriceSubData = exports.aaveV3DebtSwitchSubData = exports.aaveV3CollateralSwitchSubData = exports.aaveV3CloseGenericSubData = exports.aaveV3LeverageManagementOnPriceGeneric = exports.aaveV3LiquidationProtectionSubData = exports.aaveV3LeverageManagementSubData = exports.legacyAaveV3LeverageManagementSubData = exports.aaveV2LeverageManagementSubData = exports.legacyAaveV2LeverageManagementSubData = exports.liquityV2PaybackSubData = exports.liquityV2LeverageManagementOnPriceSubData = exports.liquityV2CloseSubData = exports.liquityV2LeverageManagementSubData = exports.liquityDebtInFrontRepaySubData = exports.liquityDsrSupplySubData = exports.liquityDsrPaybackSubData = exports.liquityCloseSubData = exports.liquityLeverageManagementSubData = exports.legacyLiquityLeverageManagementSubData = exports.liquityRepayFromSavingsSubData = exports.makerLiquidationProtectionSubData = exports.makerLeverageManagementSubData = exports.legacyMakerLeverageManagementSubData = 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 = exports.crvUSDLeverageManagementSubData = exports.sparkGenericFLCollateralSwitchSubData = exports.sparkCollateralSwitchSubData = exports.sparkLeverageManagementOnPriceGenericSubData = exports.sparkLeverageManagementOnPriceSubData = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const web3_eth_abi_1 = __importDefault(require("web3-eth-abi"));
@@ -518,53 +518,46 @@ exports.aaveV3CloseGenericSubData = {
         };
     },
 };
-exports.aaveV3InstantCloseGenericSubData = {
-    encode(collAsset, collAssetId, debtAsset, debtAssetId, closeType, marketAddr, user, tsi, slippage) {
-        const encodedColl = web3_eth_abi_1.default.encodeParameter('address', collAsset);
-        const encodedCollId = web3_eth_abi_1.default.encodeParameter('uint16', collAssetId);
-        const encodedDebt = web3_eth_abi_1.default.encodeParameter('address', debtAsset);
-        const encodedDebtId = web3_eth_abi_1.default.encodeParameter('uint16', debtAssetId);
-        const encodedCloseType = web3_eth_abi_1.default.encodeParameter('uint8', closeType);
-        const encodedMarket = web3_eth_abi_1.default.encodeParameter('address', marketAddr);
-        const encodedUser = web3_eth_abi_1.default.encodeParameter('address', user);
-        const encodedTsi = web3_eth_abi_1.default.encodeParameter('uint256', tsi);
-        const encodedSlippage = web3_eth_abi_1.default.encodeParameter('uint256', slippage);
+exports.aaveV3CollateralSwitchSubData = {
+    encode(fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, useOnBehalf = false) {
+        const encodedFromAsset = web3_eth_abi_1.default.encodeParameter('address', fromAsset);
+        const encodedFromAssetId = web3_eth_abi_1.default.encodeParameter('uint8', fromAssetId);
+        const encodedToAsset = web3_eth_abi_1.default.encodeParameter('address', toAsset);
+        const encodedToAssetId = web3_eth_abi_1.default.encodeParameter('uint8', toAssetId);
+        const encodedMarketAddr = web3_eth_abi_1.default.encodeParameter('address', marketAddr);
+        const encodedAmountToSwitch = web3_eth_abi_1.default.encodeParameter('uint256', amountToSwitch);
+        const encodedUseOnBehalf = web3_eth_abi_1.default.encodeParameter('bool', useOnBehalf);
         return [
-            encodedColl,
-            encodedCollId,
-            encodedDebt,
-            encodedDebtId,
-            encodedCloseType,
-            encodedMarket,
-            encodedUser,
-            encodedTsi,
-            encodedSlippage,
+            encodedFromAsset,
+            encodedFromAssetId,
+            encodedToAsset,
+            encodedToAssetId,
+            encodedMarketAddr,
+            encodedAmountToSwitch,
+            encodedUseOnBehalf,
         ];
     },
     decode(subData) {
-        const collAsset = web3_eth_abi_1.default.decodeParameter('address', subData[0]);
-        const collAssetId = Number(web3_eth_abi_1.default.decodeParameter('uint16', subData[1]));
-        const debtAsset = web3_eth_abi_1.default.decodeParameter('address', subData[2]);
-        const debtAssetId = Number(web3_eth_abi_1.default.decodeParameter('uint16', subData[3]));
-        const closeType = Number(web3_eth_abi_1.default.decodeParameter('uint8', subData[4]));
-        const marketAddr = web3_eth_abi_1.default.decodeParameter('address', subData[5]);
-        const owner = web3_eth_abi_1.default.decodeParameter('address', subData[6]);
-        const tsi = web3_eth_abi_1.default.decodeParameter('uint256', subData[7]);
-        const slippage = web3_eth_abi_1.default.decodeParameter('uint256', subData[8]);
+        const fromAsset = web3_eth_abi_1.default.decodeParameter('address', subData[0]);
+        const fromAssetId = Number(web3_eth_abi_1.default.decodeParameter('uint8', subData[1]));
+        const toAsset = web3_eth_abi_1.default.decodeParameter('address', subData[2]);
+        const toAssetId = Number(web3_eth_abi_1.default.decodeParameter('uint8', subData[3]));
+        const marketAddr = web3_eth_abi_1.default.decodeParameter('address', subData[4]);
+        const amountToSwitch = web3_eth_abi_1.default.decodeParameter('uint256', subData[5]);
         return {
-            collAsset, collAssetId, debtAsset, debtAssetId, closeType, marketAddr, owner, tsi, slippage,
+            fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch,
         };
     },
 };
-exports.aaveV3CollateralSwitchSubData = {
-    encode(fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, useOnBehalf = false) {
+exports.aaveV3DebtSwitchSubData = {
+    encode(fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, user) {
         const encodedFromAsset = web3_eth_abi_1.default.encodeParameter('address', fromAsset);
         const encodedFromAssetId = web3_eth_abi_1.default.encodeParameter('uint8', fromAssetId);
         const encodedToAsset = web3_eth_abi_1.default.encodeParameter('address', toAsset);
         const encodedToAssetId = web3_eth_abi_1.default.encodeParameter('uint8', toAssetId);
         const encodedMarketAddr = web3_eth_abi_1.default.encodeParameter('address', marketAddr);
         const encodedAmountToSwitch = web3_eth_abi_1.default.encodeParameter('uint256', amountToSwitch);
-        const encodedUseOnBehalf = web3_eth_abi_1.default.encodeParameter('bool', useOnBehalf);
+        const encodedUser = web3_eth_abi_1.default.encodeParameter('address', user);
         return [
             encodedFromAsset,
             encodedFromAssetId,
@@ -572,7 +565,7 @@ exports.aaveV3CollateralSwitchSubData = {
             encodedToAssetId,
             encodedMarketAddr,
             encodedAmountToSwitch,
-            encodedUseOnBehalf,
+            encodedUser,
         ];
     },
     decode(subData) {
@@ -582,8 +575,9 @@ exports.aaveV3CollateralSwitchSubData = {
         const toAssetId = Number(web3_eth_abi_1.default.decodeParameter('uint8', subData[3]));
         const marketAddr = web3_eth_abi_1.default.decodeParameter('address', subData[4]);
         const amountToSwitch = web3_eth_abi_1.default.decodeParameter('uint256', subData[5]);
+        const user = web3_eth_abi_1.default.decodeParameter('address', subData[6]);
         return {
-            fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch,
+            fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, user,
         };
     },
 };

package/cjs/services/subDataService.test.js

@@ -535,6 +535,110 @@ describe('Feature: subDataService.ts', () => {
             });
         });
     });
+    describe('When testing subDataService.aaveV3DebtSwitchSubData', () => {
+        describe('encode()', () => {
+            const examples = [
+                // USDC -> DAI
+                [
+                    [
+                        '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                        '0x0000000000000000000000000000000000000000000000000000000000000001',
+                        '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f',
+                        '0x0000000000000000000000000000000000000000000000000000000000000003',
+                        '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
+                        '0x0000000000000000000000000000000000000000000000008ac7230489e80000',
+                        '0x000000000000000000000000dd6ecd6c9b9f7e29e0f14bb9d5f0d0a3c6cb6c6a',
+                    ],
+                    [
+                        web3Utils.toChecksumAddress((0, tokens_1.getAssetInfo)('USDC', enums_1.ChainId.Ethereum).address),
+                        1,
+                        web3Utils.toChecksumAddress((0, tokens_1.getAssetInfo)('DAI', enums_1.ChainId.Ethereum).address),
+                        3,
+                        web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
+                        '10000000000000000000',
+                        web3Utils.toChecksumAddress('0xDd6ecD6c9b9F7e29E0f14bb9D5F0D0A3C6cB6c6A'),
+                    ]
+                ],
+                // DAI -> USDC (MaxUint256)
+                [
+                    [
+                        '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f',
+                        '0x0000000000000000000000000000000000000000000000000000000000000003',
+                        '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                        '0x0000000000000000000000000000000000000000000000000000000000000001',
+                        '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
+                        '0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff',
+                        '0x000000000000000000000000dd6ecd6c9b9f7e29e0f14bb9d5f0d0a3c6cb6c6a',
+                    ],
+                    [
+                        web3Utils.toChecksumAddress((0, tokens_1.getAssetInfo)('DAI', enums_1.ChainId.Ethereum).address),
+                        3,
+                        web3Utils.toChecksumAddress((0, tokens_1.getAssetInfo)('USDC', enums_1.ChainId.Ethereum).address),
+                        1,
+                        web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
+                        tokens_2.MAXUINT,
+                        web3Utils.toChecksumAddress('0xDd6ecD6c9b9F7e29E0f14bb9D5F0D0A3C6cB6c6A'),
+                    ]
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    (0, chai_1.expect)(subDataService.aaveV3DebtSwitchSubData.encode(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe('decode()', () => {
+            const examples = [
+                // USDC -> DAI
+                [
+                    {
+                        fromAsset: web3Utils.toChecksumAddress((0, tokens_1.getAssetInfo)('USDC', enums_1.ChainId.Ethereum).address),
+                        fromAssetId: 1,
+                        toAsset: web3Utils.toChecksumAddress((0, tokens_1.getAssetInfo)('DAI', enums_1.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((0, tokens_1.getAssetInfo)('DAI', enums_1.ChainId.Ethereum).address),
+                        fromAssetId: 3,
+                        toAsset: web3Utils.toChecksumAddress((0, tokens_1.getAssetInfo)('USDC', enums_1.ChainId.Ethereum).address),
+                        toAssetId: 1,
+                        marketAddr: web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
+                        amountToSwitch: tokens_2.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)}`, () => {
+                    (0, chai_1.expect)(subDataService.aaveV3DebtSwitchSubData.decode(actual)).to.eql(expected);
+                });
+            });
+        });
+    });
     describe('When testing subDataService.sparkCollateralSwitchSubData', () => {
         describe('encode()', () => {
             const examples = [
@@ -2281,76 +2385,6 @@ describe('Feature: subDataService.ts', () => {
             });
         });
     });
-    describe("When testing subDataService.aaveV3InstantCloseGenericSubData", () => {
-        const WETH = web3Utils.toChecksumAddress((0, tokens_1.getAssetInfo)('WETH', enums_1.ChainId.Ethereum).address);
-        const USDC = web3Utils.toChecksumAddress((0, tokens_1.getAssetInfo)('USDC', enums_1.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, enums_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, enums_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, enums_1.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)}`, () => {
-                    (0, chai_1.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)}`, () => {
-                    (0, chai_1.expect)(subDataService.aaveV3InstantCloseGenericSubData.decode(encoded)).to.eql(expected);
-                });
-            });
-        });
-    });
     describe('When testing subDataService.sparkLeverageManagementOnPriceSubData', () => {
         describe('encode()', () => {
             const examples = [

package/cjs/types/enums.d.ts

@@ -91,22 +91,30 @@ 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
+        SPARK_GENERIC_FL_COLLATERAL_SWITCH = 167,
+        AAVE_V3_DEBT_SWITCH = 168,
+        AAVE_V3_DEBT_SWITCH_EOA = 169
     }
     enum OptimismIds {
         EXCHANGE_DCA = 8,
         EXCHANGE_LIMIT_ORDER = 9,
-        AAVE_V3_COLLATERAL_SWITCH = 24
+        AAVE_V3_COLLATERAL_SWITCH = 24,
+        AAVE_V3_DEBT_SWITCH = 25,
+        AAVE_V3_DEBT_SWITCH_EOA = 26
     }
     enum BaseIds {
         EXCHANGE_DCA = 8,
         EXCHANGE_LIMIT_ORDER = 9,
-        AAVE_V3_COLLATERAL_SWITCH = 56
+        AAVE_V3_COLLATERAL_SWITCH = 56,
+        AAVE_V3_DEBT_SWITCH = 61,
+        AAVE_V3_DEBT_SWITCH_EOA = 62
     }
     enum ArbitrumIds {
         EXCHANGE_DCA = 8,
         EXCHANGE_LIMIT_ORDER = 9,
-        AAVE_V3_COLLATERAL_SWITCH = 50
+        AAVE_V3_COLLATERAL_SWITCH = 50,
+        AAVE_V3_DEBT_SWITCH = 55,
+        AAVE_V3_DEBT_SWITCH_EOA = 56
     }
     enum Identifiers {
         SavingsLiqProtection = "smart-savings-liquidation-protection",
@@ -124,8 +132,6 @@ 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",
@@ -142,6 +148,8 @@ 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"
     }
@@ -252,9 +260,7 @@ 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,
-        AAVE_V3_SW_INSTANT_CLOSE = 94,
-        AAVE_V3_EOA_INSTANT_CLOSE = 95
+        SPARK_EOA_LIQUIDATION_PROTECTION = 93
     }
     enum OptimismIds {
         AAVE_V3_REPAY = 0,
@@ -269,9 +275,7 @@ export declare namespace Bundles {
         AAVE_V3_EOA_BOOST_ON_PRICE = 9,
         AAVE_V3_EOA_CLOSE = 10,
         AAVE_V3_SW_LIQUIDATION_PROTECTION = 11,
-        AAVE_V3_EOA_LIQUIDATION_PROTECTION = 12,
-        AAVE_V3_SW_INSTANT_CLOSE = 13,
-        AAVE_V3_EOA_INSTANT_CLOSE = 14
+        AAVE_V3_EOA_LIQUIDATION_PROTECTION = 12
     }
     enum BaseIds {
         AAVE_V3_REPAY = 0,
@@ -313,9 +317,7 @@ export declare namespace Bundles {
         MORPHO_BLUE_EOA_BOOST_ON_PRICE = 39,
         MORPHO_BLUE_EOA_REPAY_ON_PRICE = 40,
         MORPHO_BLUE_EOA_CLOSE = 41,
-        MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION = 42,
-        AAVE_V3_SW_INSTANT_CLOSE = 43,
-        AAVE_V3_EOA_INSTANT_CLOSE = 44
+        MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION = 42
     }
     enum ArbitrumIds {
         AAVE_V3_REPAY = 0,
@@ -357,8 +359,6 @@ export declare namespace Bundles {
         MORPHO_BLUE_REPAY_ON_PRICE = 36,
         MORPHO_BLUE_EOA_BOOST_ON_PRICE = 37,
         MORPHO_BLUE_EOA_REPAY_ON_PRICE = 38,
-        MORPHO_BLUE_EOA_CLOSE = 39,
-        AAVE_V3_SW_INSTANT_CLOSE = 40,
-        AAVE_V3_EOA_INSTANT_CLOSE = 41
+        MORPHO_BLUE_EOA_CLOSE = 39
     }
 }