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

package/cjs/services/subDataService.test.js

@@ -535,110 +535,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((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 = [
@@ -2385,6 +2281,76 @@ 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,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/cjs/types/enums.js

@@ -108,32 +108,24 @@ 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) {
@@ -152,6 +144,8 @@ 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";
@@ -168,8 +162,6 @@ 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 = {}));
@@ -284,6 +276,8 @@ 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) {

package/esm/constants/index.js

@@ -121,16 +121,6 @@ export const MAINNET_STRATEGIES_INFO = {
         strategyId: Strategies.Identifiers.EoaCollateralSwitch,
         protocol: PROTOCOLS.Spark,
     },
-    [Strategies.MainnetIds.AAVE_V3_DEBT_SWITCH]: {
-        strategyOrBundleId: Strategies.MainnetIds.AAVE_V3_DEBT_SWITCH,
-        strategyId: Strategies.Identifiers.DebtSwitch,
-        protocol: PROTOCOLS.AaveV3,
-    },
-    [Strategies.MainnetIds.AAVE_V3_DEBT_SWITCH_EOA]: {
-        strategyOrBundleId: Strategies.MainnetIds.AAVE_V3_DEBT_SWITCH_EOA,
-        strategyId: Strategies.Identifiers.EoaDebtSwitch,
-        protocol: PROTOCOLS.AaveV3,
-    },
 };
 export const OPTIMISM_STRATEGIES_INFO = {
     [Strategies.OptimismIds.EXCHANGE_DCA]: {
@@ -148,16 +138,6 @@ export const OPTIMISM_STRATEGIES_INFO = {
         strategyId: Strategies.Identifiers.CollateralSwitch,
         protocol: PROTOCOLS.AaveV3,
     },
-    [Strategies.OptimismIds.AAVE_V3_DEBT_SWITCH]: {
-        strategyOrBundleId: Strategies.OptimismIds.AAVE_V3_DEBT_SWITCH,
-        strategyId: Strategies.Identifiers.DebtSwitch,
-        protocol: PROTOCOLS.AaveV3,
-    },
-    [Strategies.OptimismIds.AAVE_V3_DEBT_SWITCH_EOA]: {
-        strategyOrBundleId: Strategies.OptimismIds.AAVE_V3_DEBT_SWITCH_EOA,
-        strategyId: Strategies.Identifiers.EoaDebtSwitch,
-        protocol: PROTOCOLS.AaveV3,
-    },
 };
 export const BASE_STRATEGIES_INFO = {
     [Strategies.BaseIds.EXCHANGE_DCA]: {
@@ -175,16 +155,6 @@ export const BASE_STRATEGIES_INFO = {
         strategyId: Strategies.Identifiers.CollateralSwitch,
         protocol: PROTOCOLS.AaveV3,
     },
-    [Strategies.BaseIds.AAVE_V3_DEBT_SWITCH]: {
-        strategyOrBundleId: Strategies.BaseIds.AAVE_V3_DEBT_SWITCH,
-        strategyId: Strategies.Identifiers.DebtSwitch,
-        protocol: PROTOCOLS.AaveV3,
-    },
-    [Strategies.BaseIds.AAVE_V3_DEBT_SWITCH_EOA]: {
-        strategyOrBundleId: Strategies.BaseIds.AAVE_V3_DEBT_SWITCH_EOA,
-        strategyId: Strategies.Identifiers.EoaDebtSwitch,
-        protocol: PROTOCOLS.AaveV3,
-    },
 };
 export const ARBITRUM_STRATEGIES_INFO = {
     [Strategies.ArbitrumIds.EXCHANGE_DCA]: {
@@ -202,16 +172,6 @@ export const ARBITRUM_STRATEGIES_INFO = {
         strategyId: Strategies.Identifiers.CollateralSwitch,
         protocol: PROTOCOLS.AaveV3,
     },
-    [Strategies.ArbitrumIds.AAVE_V3_DEBT_SWITCH]: {
-        strategyOrBundleId: Strategies.ArbitrumIds.AAVE_V3_DEBT_SWITCH,
-        strategyId: Strategies.Identifiers.DebtSwitch,
-        protocol: PROTOCOLS.AaveV3,
-    },
-    [Strategies.ArbitrumIds.AAVE_V3_DEBT_SWITCH_EOA]: {
-        strategyOrBundleId: Strategies.ArbitrumIds.AAVE_V3_DEBT_SWITCH_EOA,
-        strategyId: Strategies.Identifiers.EoaDebtSwitch,
-        protocol: PROTOCOLS.AaveV3,
-    },
 };
 export const STRATEGIES_INFO = {
     [ChainId.Ethereum]: MAINNET_STRATEGIES_INFO,
@@ -693,6 +653,16 @@ export const MAINNET_BUNDLES_INFO = {
         strategyId: Strategies.Identifiers.EoaLiquidationProtection,
         protocol: PROTOCOLS.Spark,
     },
+    [Bundles.MainnetIds.AAVE_V3_SW_INSTANT_CLOSE]: {
+        strategyOrBundleId: Bundles.MainnetIds.AAVE_V3_SW_INSTANT_CLOSE,
+        strategyId: Strategies.Identifiers.InstantCloseOnPrice,
+        protocol: PROTOCOLS.AaveV3,
+    },
+    [Bundles.MainnetIds.AAVE_V3_EOA_INSTANT_CLOSE]: {
+        strategyOrBundleId: Bundles.MainnetIds.AAVE_V3_EOA_INSTANT_CLOSE,
+        strategyId: Strategies.Identifiers.EoaInstantCloseOnPrice,
+        protocol: PROTOCOLS.AaveV3,
+    },
 };
 export const OPTIMISM_BUNDLES_INFO = {
     [Bundles.OptimismIds.AAVE_V3_REPAY]: {

package/esm/services/strategiesService.js

@@ -317,24 +317,36 @@ function parseAaveV3CloseOnPrice(position, parseData) {
     }
     return _position;
 }
-function parseAaveV3CollateralSwitch(position, parseData) {
+function parseAaveV3InstantCloseOnPrice(position, parseData) {
     const _position = cloneDeep(position);
     const { subStruct } = parseData.subscriptionEventData;
-    const triggerData = triggerService.aaveV3QuotePriceTrigger.decode(subStruct.triggerData);
-    const subData = subDataService.aaveV3CollateralSwitchSubData.decode(subStruct.subData);
+    const triggerData = triggerService.aaveV3QuotePriceRangeTrigger.decode(subStruct.triggerData);
+    const subData = subDataService.aaveV3InstantCloseGenericSubData.decode(subStruct.subData);
+    const { takeProfitType, stopLossType } = getStopLossAndTakeProfitTypeByCloseStrategyType(+subData.closeType);
+    _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, AAVE_V3_MARKET_ADDRESSES[_position.chainId]);
     _position.strategyData.decoded.triggerData = triggerData;
     _position.strategyData.decoded.subData = subData;
-    _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, subData.marketAddr);
+    _position.specific = {
+        collAsset: subData.collAsset,
+        collAssetId: subData.collAssetId,
+        debtAsset: subData.debtAsset,
+        debtAssetId: subData.debtAssetId,
+        baseToken: triggerData.collToken,
+        quoteToken: triggerData.debtToken,
+        stopLossPrice: triggerData.lowerPrice,
+        takeProfitPrice: triggerData.upperPrice,
+        stopLossType,
+        takeProfitType,
+    };
     return _position;
 }
-function parseAaveV3DebtSwitch(position, parseData) {
+function parseAaveV3CollateralSwitch(position, parseData) {
     const _position = cloneDeep(position);
     const { subStruct } = parseData.subscriptionEventData;
     const triggerData = triggerService.aaveV3QuotePriceTrigger.decode(subStruct.triggerData);
-    const subData = subDataService.aaveV3DebtSwitchSubData.decode(subStruct.subData);
+    const subData = subDataService.aaveV3CollateralSwitchSubData.decode(subStruct.subData);
     _position.strategyData.decoded.triggerData = triggerData;
     _position.strategyData.decoded.subData = subData;
-    // TODO -> This isn't enough for ID
     _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, subData.marketAddr);
     return _position;
 }
@@ -1227,9 +1239,9 @@ const parsingMethodsMapping = {
         [Strategies.Identifiers.EoaRepayOnPrice]: parseAaveV3LeverageManagementOnPrice,
         [Strategies.Identifiers.EoaBoostOnPrice]: parseAaveV3LeverageManagementOnPrice,
         [Strategies.Identifiers.EoaCloseOnPrice]: parseAaveV3CloseOnPrice,
+        [Strategies.Identifiers.InstantCloseOnPrice]: parseAaveV3InstantCloseOnPrice,
+        [Strategies.Identifiers.EoaInstantCloseOnPrice]: parseAaveV3InstantCloseOnPrice,
         [Strategies.Identifiers.CollateralSwitch]: parseAaveV3CollateralSwitch,
-        [Strategies.Identifiers.DebtSwitch]: parseAaveV3DebtSwitch,
-        [Strategies.Identifiers.EoaDebtSwitch]: parseAaveV3DebtSwitch,
         [Strategies.Identifiers.LiquidationProtection]: parseAaveV3LiquidationProtection,
         [Strategies.Identifiers.EoaLiquidationProtection]: parseAaveV3LiquidationProtection,
     },

package/esm/services/strategiesService.test.js

@@ -8,9 +8,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { expect } from 'chai';
-import { ProtocolIdentifiers, Strategies } from '../types/enums';
+import { Bundles, CloseStrategyType, CloseToAssetType, ProtocolIdentifiers, Strategies, } from '../types/enums';
 import '../configuration';
 import { parseStrategiesAutomatedPosition } from './strategiesService';
+import { aaveV3Encode } from './strategySubService';
 describe('Feature: strategiesService.ts', () => {
     describe('When testing strategiesService.parseStrategiesAutomatedPosition', () => __awaiter(void 0, void 0, void 0, function* () {
         // TODO: we should probably write this for every strategy?
@@ -106,4 +107,65 @@ describe('Feature: strategiesService.ts', () => {
             }));
         });
     }));
+    describe('When parsing Aave V3 instant close bundles', () => {
+        const owner = '0x1234567890123456789012345678901234567890';
+        const market = '0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e';
+        const weth = '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2';
+        const usdc = '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48';
+        const bundles = [
+            ['SW', Bundles.MainnetIds.AAVE_V3_SW_INSTANT_CLOSE, Strategies.Identifiers.InstantCloseOnPrice],
+            ['EOA', Bundles.MainnetIds.AAVE_V3_EOA_INSTANT_CLOSE, Strategies.Identifiers.EoaInstantCloseOnPrice],
+        ];
+        bundles.forEach(([walletType, expectedBundleId, expectedStrategyId]) => {
+            describe(`${walletType} bundle`, () => {
+                const [bundleId, isBundle, triggerData, subData] = aaveV3Encode.instantCloseOnPriceGeneric(expectedBundleId, weth, 0, usdc, 1, market, owner, '1000000000000000000', '10000000000000000', 1500, CloseToAssetType.DEBT, 5000, CloseToAssetType.COLLATERAL);
+                const parseData = {
+                    chainId: 1,
+                    blockNumber: 1,
+                    subscriptionEventData: {
+                        subId: '1',
+                        proxy: owner,
+                        subHash: '0xhash',
+                        subStruct: {
+                            strategyOrBundleId: String(bundleId), isBundle, triggerData, subData,
+                        },
+                    },
+                    strategiesSubsData: { userProxy: owner, isEnabled: true, strategySubHash: '0xhash' },
+                };
+                const result = parseStrategiesAutomatedPosition(parseData);
+                it('should identify the strategy as instant close on price', () => {
+                    expect(result.strategy.strategyOrBundleId).to.equal(expectedBundleId);
+                    expect(result.strategy.strategyId).to.equal(expectedStrategyId);
+                    expect(result.protocol.id).to.equal(ProtocolIdentifiers.StrategiesAutomation.AaveV3);
+                });
+                it('should decode sub data including tsi and slippage', () => {
+                    expect(result.strategyData.decoded.subData).to.eql({
+                        collAsset: weth,
+                        collAssetId: 0,
+                        debtAsset: usdc,
+                        debtAssetId: 1,
+                        closeType: CloseStrategyType.TAKE_PROFIT_IN_COLLATERAL_AND_STOP_LOSS_IN_DEBT,
+                        marketAddr: market,
+                        owner,
+                        tsi: '1000000000000000000',
+                        slippage: '10000000000000000',
+                    });
+                });
+                it('should fill specific with prices and close types', () => {
+                    expect(result.specific).to.eql({
+                        collAsset: weth,
+                        collAssetId: 0,
+                        debtAsset: usdc,
+                        debtAssetId: 1,
+                        baseToken: weth,
+                        quoteToken: usdc,
+                        stopLossPrice: '1500',
+                        takeProfitPrice: '5000',
+                        stopLossType: CloseToAssetType.DEBT,
+                        takeProfitType: CloseToAssetType.COLLATERAL,
+                    });
+                });
+            });
+        });
+    });
 });

package/esm/services/strategySubService.d.ts

@@ -61,8 +61,8 @@ export declare const aaveV3Encode: {
     liquidationProtection(strategyOrBundleId: number, market: EthereumAddress, user: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number): (number | boolean | string[])[];
     leverageManagementOnPriceGeneric(strategyOrBundleId: number, price: number, ratioState: RatioState, collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, marketAddr: EthereumAddress, targetRatio: number, user: EthereumAddress): (number | boolean | string[])[];
     closeOnPriceGeneric(strategyOrBundleId: number, collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, marketAddr: EthereumAddress, user: EthereumAddress, stopLossPrice?: number, stopLossType?: CloseToAssetType, takeProfitPrice?: number, takeProfitType?: CloseToAssetType): (number | boolean | string[])[];
+    instantCloseOnPriceGeneric(strategyOrBundleId: number, collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, marketAddr: EthereumAddress, user: EthereumAddress, tsi: string, slippage: string, stopLossPrice?: number, stopLossType?: CloseToAssetType, takeProfitPrice?: number, takeProfitType?: CloseToAssetType): (number | boolean | string[])[];
     collateralSwitch(strategyOrBundleId: number, fromAsset: EthereumAddress, fromAssetId: number, toAsset: EthereumAddress, toAssetId: number, marketAddr: EthereumAddress, amountToSwitch: string, baseTokenAddress: EthereumAddress, quoteTokenAddress: EthereumAddress, price: number, state: RatioState): (number | boolean | string[])[];
-    debtSwitch(strategyOrBundleId: number, fromAsset: EthereumAddress, fromAssetId: number, toAsset: EthereumAddress, toAssetId: number, marketAddr: EthereumAddress, amountToSwitch: string, user: EthereumAddress, baseTokenAddress: EthereumAddress, quoteTokenAddress: EthereumAddress, price: number, state: RatioState): (number | boolean | string[])[];
 };
 export declare const compoundV2Encode: {
     leverageManagement(strategyOrBundleId: number, user: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number): (number | boolean | string[])[];

package/esm/services/strategySubService.js

@@ -164,15 +164,16 @@ export const aaveV3Encode = {
         const triggerDataEncoded = triggerService.aaveV3QuotePriceRangeTrigger.encode(collAsset, debtAsset, stopLossPrice, takeProfitPrice);
         return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
     },
-    collateralSwitch(strategyOrBundleId, fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, baseTokenAddress, quoteTokenAddress, price, state) {
-        const isBundle = false;
-        const subDataEncoded = subDataService.aaveV3CollateralSwitchSubData.encode(fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch);
-        const triggerDataEncoded = triggerService.aaveV3QuotePriceTrigger.encode(baseTokenAddress, quoteTokenAddress, price, state);
+    instantCloseOnPriceGeneric(strategyOrBundleId, collAsset, collAssetId, debtAsset, debtAssetId, marketAddr, user, tsi, slippage, stopLossPrice = 0, stopLossType = CloseToAssetType.DEBT, takeProfitPrice = 0, takeProfitType = CloseToAssetType.COLLATERAL) {
+        const isBundle = true;
+        const closeType = getCloseStrategyType(stopLossPrice, stopLossType, takeProfitPrice, takeProfitType);
+        const subDataEncoded = subDataService.aaveV3InstantCloseGenericSubData.encode(collAsset, collAssetId, debtAsset, debtAssetId, closeType, marketAddr, user, tsi, slippage);
+        const triggerDataEncoded = triggerService.aaveV3QuotePriceRangeTrigger.encode(collAsset, debtAsset, stopLossPrice, takeProfitPrice);
         return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
     },
-    debtSwitch(strategyOrBundleId, fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, user, baseTokenAddress, quoteTokenAddress, price, state) {
+    collateralSwitch(strategyOrBundleId, fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, baseTokenAddress, quoteTokenAddress, price, state) {
         const isBundle = false;
-        const subDataEncoded = subDataService.aaveV3DebtSwitchSubData.encode(fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, user);
+        const subDataEncoded = subDataService.aaveV3CollateralSwitchSubData.encode(fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch);
         const triggerDataEncoded = triggerService.aaveV3QuotePriceTrigger.encode(baseTokenAddress, quoteTokenAddress, price, state);
         return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
     },