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

package/cjs/constants/index.js

@@ -107,11 +107,6 @@ exports.MAINNET_STRATEGIES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.CollateralSwitch,
         protocol: exports.PROTOCOLS.AaveV3,
     },
-    [enums_1.Strategies.MainnetIds.AAVE_V3_COLLATERAL_SWITCH_EOA]: {
-        strategyOrBundleId: enums_1.Strategies.MainnetIds.AAVE_V3_COLLATERAL_SWITCH_EOA,
-        strategyId: enums_1.Strategies.Identifiers.EoaCollateralSwitch,
-        protocol: exports.PROTOCOLS.AaveV3,
-    },
     [enums_1.Strategies.MainnetIds.AAVE_V4_COLLATERAL_SWITCH]: {
         strategyOrBundleId: enums_1.Strategies.MainnetIds.AAVE_V4_COLLATERAL_SWITCH,
         strategyId: enums_1.Strategies.Identifiers.CollateralSwitch,
@@ -132,16 +127,6 @@ exports.MAINNET_STRATEGIES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.EoaCollateralSwitch,
         protocol: exports.PROTOCOLS.Spark,
     },
-    [enums_1.Strategies.MainnetIds.AAVE_V3_DEBT_SWITCH]: {
-        strategyOrBundleId: enums_1.Strategies.MainnetIds.AAVE_V3_DEBT_SWITCH,
-        strategyId: enums_1.Strategies.Identifiers.DebtSwitch,
-        protocol: exports.PROTOCOLS.AaveV3,
-    },
-    [enums_1.Strategies.MainnetIds.AAVE_V3_DEBT_SWITCH_EOA]: {
-        strategyOrBundleId: enums_1.Strategies.MainnetIds.AAVE_V3_DEBT_SWITCH_EOA,
-        strategyId: enums_1.Strategies.Identifiers.EoaDebtSwitch,
-        protocol: exports.PROTOCOLS.AaveV3,
-    },
 };
 exports.OPTIMISM_STRATEGIES_INFO = {
     [enums_1.Strategies.OptimismIds.EXCHANGE_DCA]: {
@@ -159,21 +144,6 @@ exports.OPTIMISM_STRATEGIES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.CollateralSwitch,
         protocol: exports.PROTOCOLS.AaveV3,
     },
-    [enums_1.Strategies.OptimismIds.AAVE_V3_COLLATERAL_SWITCH_EOA]: {
-        strategyOrBundleId: enums_1.Strategies.OptimismIds.AAVE_V3_COLLATERAL_SWITCH_EOA,
-        strategyId: enums_1.Strategies.Identifiers.EoaCollateralSwitch,
-        protocol: exports.PROTOCOLS.AaveV3,
-    },
-    [enums_1.Strategies.OptimismIds.AAVE_V3_DEBT_SWITCH]: {
-        strategyOrBundleId: enums_1.Strategies.OptimismIds.AAVE_V3_DEBT_SWITCH,
-        strategyId: enums_1.Strategies.Identifiers.DebtSwitch,
-        protocol: exports.PROTOCOLS.AaveV3,
-    },
-    [enums_1.Strategies.OptimismIds.AAVE_V3_DEBT_SWITCH_EOA]: {
-        strategyOrBundleId: enums_1.Strategies.OptimismIds.AAVE_V3_DEBT_SWITCH_EOA,
-        strategyId: enums_1.Strategies.Identifiers.EoaDebtSwitch,
-        protocol: exports.PROTOCOLS.AaveV3,
-    },
 };
 exports.BASE_STRATEGIES_INFO = {
     [enums_1.Strategies.BaseIds.EXCHANGE_DCA]: {
@@ -191,21 +161,6 @@ exports.BASE_STRATEGIES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.CollateralSwitch,
         protocol: exports.PROTOCOLS.AaveV3,
     },
-    [enums_1.Strategies.BaseIds.AAVE_V3_COLLATERAL_SWITCH_EOA]: {
-        strategyOrBundleId: enums_1.Strategies.BaseIds.AAVE_V3_COLLATERAL_SWITCH_EOA,
-        strategyId: enums_1.Strategies.Identifiers.EoaCollateralSwitch,
-        protocol: exports.PROTOCOLS.AaveV3,
-    },
-    [enums_1.Strategies.BaseIds.AAVE_V3_DEBT_SWITCH]: {
-        strategyOrBundleId: enums_1.Strategies.BaseIds.AAVE_V3_DEBT_SWITCH,
-        strategyId: enums_1.Strategies.Identifiers.DebtSwitch,
-        protocol: exports.PROTOCOLS.AaveV3,
-    },
-    [enums_1.Strategies.BaseIds.AAVE_V3_DEBT_SWITCH_EOA]: {
-        strategyOrBundleId: enums_1.Strategies.BaseIds.AAVE_V3_DEBT_SWITCH_EOA,
-        strategyId: enums_1.Strategies.Identifiers.EoaDebtSwitch,
-        protocol: exports.PROTOCOLS.AaveV3,
-    },
 };
 exports.ARBITRUM_STRATEGIES_INFO = {
     [enums_1.Strategies.ArbitrumIds.EXCHANGE_DCA]: {
@@ -223,21 +178,6 @@ exports.ARBITRUM_STRATEGIES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.CollateralSwitch,
         protocol: exports.PROTOCOLS.AaveV3,
     },
-    [enums_1.Strategies.ArbitrumIds.AAVE_V3_COLLATERAL_SWITCH_EOA]: {
-        strategyOrBundleId: enums_1.Strategies.ArbitrumIds.AAVE_V3_COLLATERAL_SWITCH_EOA,
-        strategyId: enums_1.Strategies.Identifiers.EoaCollateralSwitch,
-        protocol: exports.PROTOCOLS.AaveV3,
-    },
-    [enums_1.Strategies.ArbitrumIds.AAVE_V3_DEBT_SWITCH]: {
-        strategyOrBundleId: enums_1.Strategies.ArbitrumIds.AAVE_V3_DEBT_SWITCH,
-        strategyId: enums_1.Strategies.Identifiers.DebtSwitch,
-        protocol: exports.PROTOCOLS.AaveV3,
-    },
-    [enums_1.Strategies.ArbitrumIds.AAVE_V3_DEBT_SWITCH_EOA]: {
-        strategyOrBundleId: enums_1.Strategies.ArbitrumIds.AAVE_V3_DEBT_SWITCH_EOA,
-        strategyId: enums_1.Strategies.Identifiers.EoaDebtSwitch,
-        protocol: exports.PROTOCOLS.AaveV3,
-    },
 };
 exports.STRATEGIES_INFO = {
     [enums_1.ChainId.Ethereum]: exports.MAINNET_STRATEGIES_INFO,
@@ -719,6 +659,16 @@ exports.MAINNET_BUNDLES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.EoaLiquidationProtection,
         protocol: exports.PROTOCOLS.Spark,
     },
+    [enums_1.Bundles.MainnetIds.AAVE_V3_SW_INSTANT_CLOSE]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.AAVE_V3_SW_INSTANT_CLOSE,
+        strategyId: enums_1.Strategies.Identifiers.InstantCloseOnPrice,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
+    [enums_1.Bundles.MainnetIds.AAVE_V3_EOA_INSTANT_CLOSE]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.AAVE_V3_EOA_INSTANT_CLOSE,
+        strategyId: enums_1.Strategies.Identifiers.EoaInstantCloseOnPrice,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
 };
 exports.OPTIMISM_BUNDLES_INFO = {
     [enums_1.Bundles.OptimismIds.AAVE_V3_REPAY]: {
@@ -786,6 +736,16 @@ exports.OPTIMISM_BUNDLES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.EoaLiquidationProtection,
         protocol: exports.PROTOCOLS.AaveV3,
     },
+    [enums_1.Bundles.OptimismIds.AAVE_V3_SW_INSTANT_CLOSE]: {
+        strategyOrBundleId: enums_1.Bundles.OptimismIds.AAVE_V3_SW_INSTANT_CLOSE,
+        strategyId: enums_1.Strategies.Identifiers.InstantCloseOnPrice,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
+    [enums_1.Bundles.OptimismIds.AAVE_V3_EOA_INSTANT_CLOSE]: {
+        strategyOrBundleId: enums_1.Bundles.OptimismIds.AAVE_V3_EOA_INSTANT_CLOSE,
+        strategyId: enums_1.Strategies.Identifiers.EoaInstantCloseOnPrice,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
 };
 exports.BASE_BUNDLES_INFO = {
     [enums_1.Bundles.BaseIds.AAVE_V3_REPAY]: {
@@ -988,6 +948,16 @@ exports.BASE_BUNDLES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.EoaCloseOnPrice,
         protocol: exports.PROTOCOLS.MorphoBlue,
     },
+    [enums_1.Bundles.BaseIds.AAVE_V3_SW_INSTANT_CLOSE]: {
+        strategyOrBundleId: enums_1.Bundles.BaseIds.AAVE_V3_SW_INSTANT_CLOSE,
+        strategyId: enums_1.Strategies.Identifiers.InstantCloseOnPrice,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
+    [enums_1.Bundles.BaseIds.AAVE_V3_EOA_INSTANT_CLOSE]: {
+        strategyOrBundleId: enums_1.Bundles.BaseIds.AAVE_V3_EOA_INSTANT_CLOSE,
+        strategyId: enums_1.Strategies.Identifiers.EoaInstantCloseOnPrice,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
 };
 exports.ARBITRUM_BUNDLES_INFO = {
     [enums_1.Bundles.ArbitrumIds.AAVE_V3_REPAY]: {
@@ -1190,6 +1160,16 @@ exports.ARBITRUM_BUNDLES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.EoaCloseOnPrice,
         protocol: exports.PROTOCOLS.MorphoBlue,
     },
+    [enums_1.Bundles.ArbitrumIds.AAVE_V3_SW_INSTANT_CLOSE]: {
+        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.AAVE_V3_SW_INSTANT_CLOSE,
+        strategyId: enums_1.Strategies.Identifiers.InstantCloseOnPrice,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
+    [enums_1.Bundles.ArbitrumIds.AAVE_V3_EOA_INSTANT_CLOSE]: {
+        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.AAVE_V3_EOA_INSTANT_CLOSE,
+        strategyId: enums_1.Strategies.Identifiers.EoaInstantCloseOnPrice,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
 };
 exports.BUNDLES_INFO = {
     [enums_1.ChainId.Ethereum]: exports.MAINNET_BUNDLES_INFO,

package/cjs/services/strategiesService.js

@@ -346,30 +346,36 @@ function parseAaveV3CloseOnPrice(position, parseData) {
     }
     return _position;
 }
-function parseAaveV3CollateralSwitch(position, parseData) {
+function parseAaveV3InstantCloseOnPrice(position, parseData) {
     const _position = (0, lodash_1.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 } = (0, utils_1.getStopLossAndTakeProfitTypeByCloseStrategyType)(+subData.closeType);
+    _position.positionId = (0, utils_1.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 = (0, utils_1.getPositionId)(_position.chainId, _position.protocol.id, _position.owner, subData.marketAddr);
-    _position.strategy.strategyId = isEOA
-        ? enums_1.Strategies.Identifiers.EoaCollateralSwitch
-        : enums_1.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 = (0, lodash_1.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 = (0, utils_1.getPositionId)(_position.chainId, _position.protocol.id, _position.owner, subData.marketAddr);
     return _position;
 }
@@ -1262,10 +1268,9 @@ const parsingMethodsMapping = {
         [enums_1.Strategies.Identifiers.EoaRepayOnPrice]: parseAaveV3LeverageManagementOnPrice,
         [enums_1.Strategies.Identifiers.EoaBoostOnPrice]: parseAaveV3LeverageManagementOnPrice,
         [enums_1.Strategies.Identifiers.EoaCloseOnPrice]: parseAaveV3CloseOnPrice,
+        [enums_1.Strategies.Identifiers.InstantCloseOnPrice]: parseAaveV3InstantCloseOnPrice,
+        [enums_1.Strategies.Identifiers.EoaInstantCloseOnPrice]: parseAaveV3InstantCloseOnPrice,
         [enums_1.Strategies.Identifiers.CollateralSwitch]: parseAaveV3CollateralSwitch,
-        [enums_1.Strategies.Identifiers.EoaCollateralSwitch]: parseAaveV3CollateralSwitch,
-        [enums_1.Strategies.Identifiers.DebtSwitch]: parseAaveV3DebtSwitch,
-        [enums_1.Strategies.Identifiers.EoaDebtSwitch]: parseAaveV3DebtSwitch,
         [enums_1.Strategies.Identifiers.LiquidationProtection]: parseAaveV3LiquidationProtection,
         [enums_1.Strategies.Identifiers.EoaLiquidationProtection]: parseAaveV3LiquidationProtection,
     },

package/cjs/services/strategiesService.test.js

@@ -13,99 +13,8 @@ const chai_1 = require("chai");
 const enums_1 = require("../types/enums");
 require("../configuration");
 const strategiesService_1 = require("./strategiesService");
+const strategySubService_1 = require("./strategySubService");
 describe('Feature: strategiesService.ts', () => {
-    describe('When parsing Aave V3 collateral switch subscriptions', () => {
-        const proxy = '0x9cB7E19861665366011899d74E75d4F2A419aEeD';
-        const user = '0x1234567890123456789012345678901234567890';
-        const fromAsset = '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2';
-        const toAsset = '0xcbB7C0000aB88B473b1f5aFd9ef808440eed33Bf';
-        const marketAddr = '0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e';
-        const amountToSwitch = '115792089237316195423570985008687907853269984665640564039457584007913129639935';
-        const subHash = `0x${'ab'.repeat(32)}`;
-        const triggerData = [
-            '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2'
-                + '000000000000000000000000cbb7c0000ab88b473b1f5afd9ef808440eed33bf'
-                + '0000000000000000000000000000000000000000000000000000000000989680'
-                + '0000000000000000000000000000000000000000000000000000000000000001',
-        ];
-        function getParseData(strategyId, isGeneric, chainId = enums_1.ChainId.Ethereum) {
-            const subData = [
-                '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-                isGeneric
-                    ? '0x0000000000000000000000000000000000000000000000000000000000000100'
-                    : '0x0000000000000000000000000000000000000000000000000000000000000000',
-                '0x000000000000000000000000cbb7c0000ab88b473b1f5afd9ef808440eed33bf',
-                isGeneric
-                    ? '0x000000000000000000000000000000000000000000000000000000000000ffff'
-                    : '0x0000000000000000000000000000000000000000000000000000000000000007',
-                '0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e',
-                '0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff',
-                isGeneric
-                    ? '0x0000000000000000000000001234567890123456789012345678901234567890'
-                    : '0x0000000000000000000000000000000000000000000000000000000000000000',
-            ];
-            const subStruct = Object.assign([String(strategyId), false, triggerData, subData], { strategyOrBundleId: String(strategyId), isBundle: false, triggerData, subData });
-            return {
-                chainId,
-                blockNumber: 18015756,
-                subscriptionEventData: {
-                    subId: '379', proxy, subHash, subStruct,
-                    0: '379', 1: proxy, 2: subHash, 3: subStruct,
-                },
-                strategiesSubsData: {
-                    userProxy: proxy, isEnabled: true, strategySubHash: subHash,
-                },
-            };
-        }
-        const genericStrategies = [
-            [enums_1.ChainId.Ethereum, enums_1.Strategies.MainnetIds.AAVE_V3_COLLATERAL_SWITCH_EOA],
-            [enums_1.ChainId.Optimism, enums_1.Strategies.OptimismIds.AAVE_V3_COLLATERAL_SWITCH_EOA],
-            [enums_1.ChainId.Arbitrum, enums_1.Strategies.ArbitrumIds.AAVE_V3_COLLATERAL_SWITCH_EOA],
-            [enums_1.ChainId.Base, enums_1.Strategies.BaseIds.AAVE_V3_COLLATERAL_SWITCH_EOA],
-        ];
-        genericStrategies.forEach(([chainId, strategyId]) => {
-            it(`decodes generic collateral switches with the user and uint16 reserve IDs on chain ${chainId}`, () => {
-                const parseData = getParseData(strategyId, true, chainId);
-                const position = (0, strategiesService_1.parseStrategiesAutomatedPosition)(parseData);
-                (0, chai_1.expect)(position).not.to.equal(null);
-                (0, chai_1.expect)(position.protocol.id).to.equal(enums_1.ProtocolIdentifiers.StrategiesAutomation.AaveV3);
-                (0, chai_1.expect)(position.strategy.strategyId).to.equal(enums_1.Strategies.Identifiers.EoaCollateralSwitch);
-                (0, chai_1.expect)(position.strategy.isBundle).to.equal(false);
-                (0, chai_1.expect)(position.strategyData.encoded).to.eql({
-                    triggerData,
-                    subData: parseData.subscriptionEventData.subStruct.subData,
-                });
-                (0, chai_1.expect)(position.strategyData.decoded.triggerData).to.eql({
-                    baseTokenAddress: fromAsset,
-                    quoteTokenAddress: toAsset,
-                    price: '0.1',
-                    ratioState: enums_1.RatioState.UNDER,
-                });
-                (0, chai_1.expect)(position.strategyData.decoded.subData).to.eql({
-                    fromAsset, fromAssetId: 256, toAsset, toAssetId: 65535, marketAddr, amountToSwitch, user,
-                });
-                (0, chai_1.expect)(position.owner).to.equal(proxy.toLowerCase());
-                (0, chai_1.expect)(position.positionId).to.equal(`${chainId}-aave__v3-${proxy.toLowerCase()}-${marketAddr.toLowerCase()}`);
-            });
-        });
-        const legacyStrategies = [
-            [enums_1.ChainId.Ethereum, enums_1.Strategies.MainnetIds.AAVE_V3_COLLATERAL_SWITCH],
-            [enums_1.ChainId.Optimism, enums_1.Strategies.OptimismIds.AAVE_V3_COLLATERAL_SWITCH],
-            [enums_1.ChainId.Arbitrum, enums_1.Strategies.ArbitrumIds.AAVE_V3_COLLATERAL_SWITCH],
-            [enums_1.ChainId.Base, enums_1.Strategies.BaseIds.AAVE_V3_COLLATERAL_SWITCH],
-        ];
-        legacyStrategies.forEach(([chainId, strategyId]) => {
-            it(`continues to decode legacy collateral switches on chain ${chainId}`, () => {
-                const position = (0, strategiesService_1.parseStrategiesAutomatedPosition)(getParseData(strategyId, false, chainId));
-                (0, chai_1.expect)(position).not.to.equal(null);
-                (0, chai_1.expect)(position.strategy.strategyId).to.equal(enums_1.Strategies.Identifiers.CollateralSwitch);
-                (0, chai_1.expect)(position.strategyData.decoded.subData).to.eql({
-                    fromAsset, fromAssetId: 0, toAsset, toAssetId: 7, marketAddr, amountToSwitch,
-                });
-                (0, chai_1.expect)(position.positionId).to.equal(`${chainId}-aave__v3-${proxy.toLowerCase()}-${marketAddr.toLowerCase()}`);
-            });
-        });
-    });
     describe('When testing strategiesService.parseStrategiesAutomatedPosition', () => __awaiter(void 0, void 0, void 0, function* () {
         // TODO: we should probably write this for every strategy?
         const examples = [
@@ -200,4 +109,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', enums_1.Bundles.MainnetIds.AAVE_V3_SW_INSTANT_CLOSE, enums_1.Strategies.Identifiers.InstantCloseOnPrice],
+            ['EOA', enums_1.Bundles.MainnetIds.AAVE_V3_EOA_INSTANT_CLOSE, enums_1.Strategies.Identifiers.EoaInstantCloseOnPrice],
+        ];
+        bundles.forEach(([walletType, expectedBundleId, expectedStrategyId]) => {
+            describe(`${walletType} bundle`, () => {
+                const [bundleId, isBundle, triggerData, subData] = strategySubService_1.aaveV3Encode.instantCloseOnPriceGeneric(expectedBundleId, weth, 0, usdc, 1, market, owner, '1000000000000000000', '10000000000000000', 1500, enums_1.CloseToAssetType.DEBT, 5000, enums_1.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 = (0, strategiesService_1.parseStrategiesAutomatedPosition)(parseData);
+                it('should identify the strategy as instant close on price', () => {
+                    (0, chai_1.expect)(result.strategy.strategyOrBundleId).to.equal(expectedBundleId);
+                    (0, chai_1.expect)(result.strategy.strategyId).to.equal(expectedStrategyId);
+                    (0, chai_1.expect)(result.protocol.id).to.equal(enums_1.ProtocolIdentifiers.StrategiesAutomation.AaveV3);
+                });
+                it('should decode sub data including tsi and slippage', () => {
+                    (0, chai_1.expect)(result.strategyData.decoded.subData).to.eql({
+                        collAsset: weth,
+                        collAssetId: 0,
+                        debtAsset: usdc,
+                        debtAssetId: 1,
+                        closeType: enums_1.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', () => {
+                    (0, chai_1.expect)(result.specific).to.eql({
+                        collAsset: weth,
+                        collAssetId: 0,
+                        debtAsset: usdc,
+                        debtAssetId: 1,
+                        baseToken: weth,
+                        quoteToken: usdc,
+                        stopLossPrice: '1500',
+                        takeProfitPrice: '5000',
+                        stopLossType: enums_1.CloseToAssetType.DEBT,
+                        takeProfitType: enums_1.CloseToAssetType.COLLATERAL,
+                    });
+                });
+            });
+        });
+    });
 });

package/cjs/services/strategySubService.d.ts

@@ -61,9 +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[])[];
-    collateralSwitchGeneric(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[])[];
-    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/cjs/services/strategySubService.js

@@ -190,21 +190,16 @@ exports.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);
-        return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
-    },
-    collateralSwitchGeneric(strategyOrBundleId, fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, user, baseTokenAddress, quoteTokenAddress, price, state) {
-        const isBundle = false;
-        const subDataEncoded = subDataService.aaveV3GenericFLCollateralSwitchSubData.encode(fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, user);
-        const triggerDataEncoded = triggerService.aaveV3QuotePriceTrigger.encode(baseTokenAddress, quoteTokenAddress, price, state);
+    instantCloseOnPriceGeneric(strategyOrBundleId, collAsset, collAssetId, debtAsset, debtAssetId, marketAddr, user, tsi, slippage, stopLossPrice = 0, stopLossType = enums_1.CloseToAssetType.DEBT, takeProfitPrice = 0, takeProfitType = enums_1.CloseToAssetType.COLLATERAL) {
+        const isBundle = true;
+        const closeType = (0, utils_1.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];
     },