@defisaver/automation-sdk 3.3.22-coll-switch-generic-dev → 3.3.22-instant-twap-close-dev

package/cjs/services/subDataService.test.js

@@ -535,145 +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.aaveV3GenericFLCollateralSwitchSubData', () => {
-        const fromAsset = web3Utils.toChecksumAddress((0, tokens_1.getAssetInfo)('WETH', enums_1.ChainId.Ethereum).address);
-        const toAsset = web3Utils.toChecksumAddress((0, tokens_1.getAssetInfo)('USDC', enums_1.ChainId.Ethereum).address);
-        const marketAddr = web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39');
-        const user = web3Utils.toChecksumAddress('0x1234567890abcdef1234567890abcdef12345678');
-        const examples = [
-            ['10000000000000000000', '0x0000000000000000000000000000000000000000000000008ac7230489e80000'],
-            [tokens_2.MAXUINT, '0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff'],
-        ];
-        examples.forEach(([amountToSwitch, encodedAmount]) => {
-            const subData = [
-                '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-                '0x0000000000000000000000000000000000000000000000000000000000000100',
-                '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-                '0x000000000000000000000000000000000000000000000000000000000000ffff',
-                '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
-                encodedAmount,
-                '0x0000000000000000000000001234567890abcdef1234567890abcdef12345678',
-            ];
-            it(`encode() preserves uint16 asset IDs and user when switching ${amountToSwitch}`, () => {
-                (0, chai_1.expect)(subDataService.aaveV3GenericFLCollateralSwitchSubData.encode(fromAsset, 256, toAsset, 65535, marketAddr, amountToSwitch, user)).to.eql(subData);
-            });
-            it(`decode() preserves uint16 asset IDs and user when switching ${amountToSwitch}`, () => {
-                (0, chai_1.expect)(subDataService.aaveV3GenericFLCollateralSwitchSubData.decode(subData)).to.eql({
-                    fromAsset,
-                    fromAssetId: 256,
-                    toAsset,
-                    toAssetId: 65535,
-                    marketAddr,
-                    amountToSwitch,
-                    user,
-                });
-            });
-        });
-    });
     describe('When testing subDataService.sparkCollateralSwitchSubData', () => {
         describe('encode()', () => {
             const examples = [
@@ -2420,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,34 +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,
-        AAVE_V3_COLLATERAL_SWITCH_EOA = 170
+        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_EOA = 27
+        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_EOA = 63
+        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_EOA = 57
+        AAVE_V3_COLLATERAL_SWITCH = 50
     }
     enum Identifiers {
         SavingsLiqProtection = "smart-savings-liquidation-protection",
@@ -136,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",
@@ -152,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"
     }
@@ -264,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,
@@ -279,7 +269,9 @@ 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_EOA_LIQUIDATION_PROTECTION = 12,
+        AAVE_V3_SW_INSTANT_CLOSE = 13,
+        AAVE_V3_EOA_INSTANT_CLOSE = 14
     }
     enum BaseIds {
         AAVE_V3_REPAY = 0,
@@ -321,7 +313,9 @@ 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
+        MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION = 42,
+        AAVE_V3_SW_INSTANT_CLOSE = 43,
+        AAVE_V3_EOA_INSTANT_CLOSE = 44
     }
     enum ArbitrumIds {
         AAVE_V3_REPAY = 0,
@@ -363,6 +357,8 @@ 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
+        MORPHO_BLUE_EOA_CLOSE = 39,
+        AAVE_V3_SW_INSTANT_CLOSE = 40,
+        AAVE_V3_EOA_INSTANT_CLOSE = 41
     }
 }

package/cjs/types/enums.js

@@ -108,36 +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[MainnetIds["AAVE_V3_COLLATERAL_SWITCH_EOA"] = 170] = "AAVE_V3_COLLATERAL_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[OptimismIds["AAVE_V3_COLLATERAL_SWITCH_EOA"] = 27] = "AAVE_V3_COLLATERAL_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[BaseIds["AAVE_V3_COLLATERAL_SWITCH_EOA"] = 63] = "AAVE_V3_COLLATERAL_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[ArbitrumIds["AAVE_V3_COLLATERAL_SWITCH_EOA"] = 57] = "AAVE_V3_COLLATERAL_SWITCH_EOA";
     })(ArbitrumIds = Strategies.ArbitrumIds || (Strategies.ArbitrumIds = {}));
     let Identifiers;
     (function (Identifiers) {
@@ -156,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";
@@ -172,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 = {}));
@@ -288,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) {
@@ -304,6 +294,9 @@ var Bundles;
         OptimismIds[OptimismIds["AAVE_V3_EOA_CLOSE"] = 10] = "AAVE_V3_EOA_CLOSE";
         OptimismIds[OptimismIds["AAVE_V3_SW_LIQUIDATION_PROTECTION"] = 11] = "AAVE_V3_SW_LIQUIDATION_PROTECTION";
         OptimismIds[OptimismIds["AAVE_V3_EOA_LIQUIDATION_PROTECTION"] = 12] = "AAVE_V3_EOA_LIQUIDATION_PROTECTION";
+        // TODO -> Fix ids
+        OptimismIds[OptimismIds["AAVE_V3_SW_INSTANT_CLOSE"] = 13] = "AAVE_V3_SW_INSTANT_CLOSE";
+        OptimismIds[OptimismIds["AAVE_V3_EOA_INSTANT_CLOSE"] = 14] = "AAVE_V3_EOA_INSTANT_CLOSE";
     })(OptimismIds = Bundles.OptimismIds || (Bundles.OptimismIds = {}));
     let BaseIds;
     (function (BaseIds) {
@@ -347,6 +340,8 @@ var Bundles;
         BaseIds[BaseIds["MORPHO_BLUE_EOA_REPAY_ON_PRICE"] = 40] = "MORPHO_BLUE_EOA_REPAY_ON_PRICE";
         BaseIds[BaseIds["MORPHO_BLUE_EOA_CLOSE"] = 41] = "MORPHO_BLUE_EOA_CLOSE";
         BaseIds[BaseIds["MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION"] = 42] = "MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION";
+        BaseIds[BaseIds["AAVE_V3_SW_INSTANT_CLOSE"] = 43] = "AAVE_V3_SW_INSTANT_CLOSE";
+        BaseIds[BaseIds["AAVE_V3_EOA_INSTANT_CLOSE"] = 44] = "AAVE_V3_EOA_INSTANT_CLOSE";
     })(BaseIds = Bundles.BaseIds || (Bundles.BaseIds = {}));
     let ArbitrumIds;
     (function (ArbitrumIds) {
@@ -390,5 +385,7 @@ var Bundles;
         ArbitrumIds[ArbitrumIds["MORPHO_BLUE_EOA_BOOST_ON_PRICE"] = 37] = "MORPHO_BLUE_EOA_BOOST_ON_PRICE";
         ArbitrumIds[ArbitrumIds["MORPHO_BLUE_EOA_REPAY_ON_PRICE"] = 38] = "MORPHO_BLUE_EOA_REPAY_ON_PRICE";
         ArbitrumIds[ArbitrumIds["MORPHO_BLUE_EOA_CLOSE"] = 39] = "MORPHO_BLUE_EOA_CLOSE";
+        ArbitrumIds[ArbitrumIds["AAVE_V3_SW_INSTANT_CLOSE"] = 40] = "AAVE_V3_SW_INSTANT_CLOSE";
+        ArbitrumIds[ArbitrumIds["AAVE_V3_EOA_INSTANT_CLOSE"] = 41] = "AAVE_V3_EOA_INSTANT_CLOSE";
     })(ArbitrumIds = Bundles.ArbitrumIds || (Bundles.ArbitrumIds = {}));
 })(Bundles = exports.Bundles || (exports.Bundles = {}));

package/esm/constants/index.js

@@ -101,11 +101,6 @@ export const MAINNET_STRATEGIES_INFO = {
         strategyId: Strategies.Identifiers.CollateralSwitch,
         protocol: PROTOCOLS.AaveV3,
     },
-    [Strategies.MainnetIds.AAVE_V3_COLLATERAL_SWITCH_EOA]: {
-        strategyOrBundleId: Strategies.MainnetIds.AAVE_V3_COLLATERAL_SWITCH_EOA,
-        strategyId: Strategies.Identifiers.EoaCollateralSwitch,
-        protocol: PROTOCOLS.AaveV3,
-    },
     [Strategies.MainnetIds.AAVE_V4_COLLATERAL_SWITCH]: {
         strategyOrBundleId: Strategies.MainnetIds.AAVE_V4_COLLATERAL_SWITCH,
         strategyId: Strategies.Identifiers.CollateralSwitch,
@@ -126,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]: {
@@ -153,21 +138,6 @@ export const OPTIMISM_STRATEGIES_INFO = {
         strategyId: Strategies.Identifiers.CollateralSwitch,
         protocol: PROTOCOLS.AaveV3,
     },
-    [Strategies.OptimismIds.AAVE_V3_COLLATERAL_SWITCH_EOA]: {
-        strategyOrBundleId: Strategies.OptimismIds.AAVE_V3_COLLATERAL_SWITCH_EOA,
-        strategyId: Strategies.Identifiers.EoaCollateralSwitch,
-        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]: {
@@ -185,21 +155,6 @@ export const BASE_STRATEGIES_INFO = {
         strategyId: Strategies.Identifiers.CollateralSwitch,
         protocol: PROTOCOLS.AaveV3,
     },
-    [Strategies.BaseIds.AAVE_V3_COLLATERAL_SWITCH_EOA]: {
-        strategyOrBundleId: Strategies.BaseIds.AAVE_V3_COLLATERAL_SWITCH_EOA,
-        strategyId: Strategies.Identifiers.EoaCollateralSwitch,
-        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]: {
@@ -217,21 +172,6 @@ export const ARBITRUM_STRATEGIES_INFO = {
         strategyId: Strategies.Identifiers.CollateralSwitch,
         protocol: PROTOCOLS.AaveV3,
     },
-    [Strategies.ArbitrumIds.AAVE_V3_COLLATERAL_SWITCH_EOA]: {
-        strategyOrBundleId: Strategies.ArbitrumIds.AAVE_V3_COLLATERAL_SWITCH_EOA,
-        strategyId: Strategies.Identifiers.EoaCollateralSwitch,
-        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,
@@ -713,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]: {
@@ -780,6 +730,16 @@ export const OPTIMISM_BUNDLES_INFO = {
         strategyId: Strategies.Identifiers.EoaLiquidationProtection,
         protocol: PROTOCOLS.AaveV3,
     },
+    [Bundles.OptimismIds.AAVE_V3_SW_INSTANT_CLOSE]: {
+        strategyOrBundleId: Bundles.OptimismIds.AAVE_V3_SW_INSTANT_CLOSE,
+        strategyId: Strategies.Identifiers.InstantCloseOnPrice,
+        protocol: PROTOCOLS.AaveV3,
+    },
+    [Bundles.OptimismIds.AAVE_V3_EOA_INSTANT_CLOSE]: {
+        strategyOrBundleId: Bundles.OptimismIds.AAVE_V3_EOA_INSTANT_CLOSE,
+        strategyId: Strategies.Identifiers.EoaInstantCloseOnPrice,
+        protocol: PROTOCOLS.AaveV3,
+    },
 };
 export const BASE_BUNDLES_INFO = {
     [Bundles.BaseIds.AAVE_V3_REPAY]: {
@@ -982,6 +942,16 @@ export const BASE_BUNDLES_INFO = {
         strategyId: Strategies.Identifiers.EoaCloseOnPrice,
         protocol: PROTOCOLS.MorphoBlue,
     },
+    [Bundles.BaseIds.AAVE_V3_SW_INSTANT_CLOSE]: {
+        strategyOrBundleId: Bundles.BaseIds.AAVE_V3_SW_INSTANT_CLOSE,
+        strategyId: Strategies.Identifiers.InstantCloseOnPrice,
+        protocol: PROTOCOLS.AaveV3,
+    },
+    [Bundles.BaseIds.AAVE_V3_EOA_INSTANT_CLOSE]: {
+        strategyOrBundleId: Bundles.BaseIds.AAVE_V3_EOA_INSTANT_CLOSE,
+        strategyId: Strategies.Identifiers.EoaInstantCloseOnPrice,
+        protocol: PROTOCOLS.AaveV3,
+    },
 };
 export const ARBITRUM_BUNDLES_INFO = {
     [Bundles.ArbitrumIds.AAVE_V3_REPAY]: {
@@ -1184,6 +1154,16 @@ export const ARBITRUM_BUNDLES_INFO = {
         strategyId: Strategies.Identifiers.EoaCloseOnPrice,
         protocol: PROTOCOLS.MorphoBlue,
     },
+    [Bundles.ArbitrumIds.AAVE_V3_SW_INSTANT_CLOSE]: {
+        strategyOrBundleId: Bundles.ArbitrumIds.AAVE_V3_SW_INSTANT_CLOSE,
+        strategyId: Strategies.Identifiers.InstantCloseOnPrice,
+        protocol: PROTOCOLS.AaveV3,
+    },
+    [Bundles.ArbitrumIds.AAVE_V3_EOA_INSTANT_CLOSE]: {
+        strategyOrBundleId: Bundles.ArbitrumIds.AAVE_V3_EOA_INSTANT_CLOSE,
+        strategyId: Strategies.Identifiers.EoaInstantCloseOnPrice,
+        protocol: PROTOCOLS.AaveV3,
+    },
 };
 export const BUNDLES_INFO = {
     [ChainId.Ethereum]: MAINNET_BUNDLES_INFO,

package/esm/services/strategiesService.js

@@ -317,30 +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 isEOA = _position.strategy.strategyId.includes('eoa');
-    const triggerData = triggerService.aaveV3QuotePriceTrigger.decode(subStruct.triggerData);
-    const subData = isEOA
-        ? subDataService.aaveV3GenericFLCollateralSwitchSubData.decode(subStruct.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.strategy.strategyId = isEOA
-        ? Strategies.Identifiers.EoaCollateralSwitch
-        : Strategies.Identifiers.CollateralSwitch;
+    _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;
 }
@@ -1233,10 +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.EoaCollateralSwitch]: parseAaveV3CollateralSwitch,
-        [Strategies.Identifiers.DebtSwitch]: parseAaveV3DebtSwitch,
-        [Strategies.Identifiers.EoaDebtSwitch]: parseAaveV3DebtSwitch,
         [Strategies.Identifiers.LiquidationProtection]: parseAaveV3LiquidationProtection,
         [Strategies.Identifiers.EoaLiquidationProtection]: parseAaveV3LiquidationProtection,
     },