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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/automation-sdk",
-  "version": "3.3.21-debt-switch-dev-dev",
+  "version": "3.3.21-instant-twap-close-dev",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",

package/src/constants/index.ts

@@ -145,16 +145,6 @@ export const MAINNET_STRATEGIES_INFO: MainnetStrategiesInfo = {
     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: OptimismStrategiesInfo = {
@@ -173,16 +163,6 @@ export const OPTIMISM_STRATEGIES_INFO: OptimismStrategiesInfo = {
     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: BaseStrategiesInfo = {
@@ -201,16 +181,6 @@ export const BASE_STRATEGIES_INFO: BaseStrategiesInfo = {
     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: ArbitrumStrategiesInfo = {
@@ -229,16 +199,6 @@ export const ARBITRUM_STRATEGIES_INFO: ArbitrumStrategiesInfo = {
     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: StrategiesInfo = {
@@ -724,6 +684,16 @@ export const MAINNET_BUNDLES_INFO: MainnetBundleInfo = {
     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: OptimismBundleInfo = {

package/src/services/strategiesService.test.ts

@@ -1,10 +1,13 @@
 import { expect } from 'chai';
 
-import { ProtocolIdentifiers, Strategies } from '../types/enums';
+import {
+  Bundles, CloseStrategyType, CloseToAssetType, ProtocolIdentifiers, Strategies,
+} from '../types/enums';
 import type { ParseData, Position } from '../types';
 
 import '../configuration';
 import { parseStrategiesAutomatedPosition } from './strategiesService';
+import { aaveV3Encode } from './strategySubService';
 
 describe('Feature: strategiesService.ts', () => {
   describe('When testing strategiesService.parseStrategiesAutomatedPosition', async () => {
@@ -103,4 +106,78 @@ 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: Array<[string, Bundles.MainnetIds, Strategies.Identifiers]> = [
+      ['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' },
+        } as unknown as ParseData;
+
+        const result = parseStrategiesAutomatedPosition(parseData) as Position.Automated;
+
+        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/src/services/strategiesService.ts

@@ -433,26 +433,44 @@ function parseAaveV3CloseOnPrice(position: Position.Automated, parseData: ParseD
   return _position;
 }
 
-function parseAaveV3CollateralSwitch(position: Position.Automated, parseData: ParseData): Position.Automated {
+function parseAaveV3InstantCloseOnPrice(position: Position.Automated, parseData: ParseData): Position.Automated {
   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: Position.Automated, parseData: ParseData): Position.Automated {
+function parseAaveV3CollateralSwitch(position: Position.Automated, parseData: ParseData): Position.Automated {
   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;
@@ -1609,9 +1627,9 @@ const parsingMethodsMapping: StrategiesToProtocolVersionMapping = {
     [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/src/services/strategySubService.test.ts

@@ -887,123 +887,137 @@ describe('Feature: strategySubService.ts', () => {
       });
     });
 
-    describe('collateralSwitch()', () => {
+    describe('instantCloseOnPriceGeneric()', () => {
       const examples: Array<[
         [StrategyOrBundleIds, boolean, TriggerData, SubData],
         [
           strategyOrBundleId: number,
-          fromAsset: EthereumAddress,
-          fromAssetId: number,
-          toAsset: EthereumAddress,
-          toAssetId: number,
+          collAsset: EthereumAddress,
+          collAssetId: number,
+          debtAsset: EthereumAddress,
+          debtAssetId: number,
           marketAddr: EthereumAddress,
-          amountToSwitch: string,
-          baseTokenAddress: EthereumAddress,
-          quoteTokenAddress: EthereumAddress,
-          price: number,
-          state: RatioState,
+          user: EthereumAddress,
+          tsi: string,
+          slippage: string,
+          stopLossPrice: number,
+          stopLossType: CloseToAssetType,
+          takeProfitPrice: number,
+          takeProfitType: CloseToAssetType
         ]
       ]> = [
-        // WETH -> USDC, price 100000, state UNDER
+        // Stop loss only (to debt)
         [
           [
-            Strategies.MainnetIds.AAVE_V3_COLLATERAL_SWITCH,
-            false,
-            ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48000000000000000000000000000000000000000000000000000009184e72a0000000000000000000000000000000000000000000000000000000000000000001'],
+            Bundles.MainnetIds.AAVE_V3_EOA_INSTANT_CLOSE,
+            true,
+            ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb4800000000000000000000000000000000000000000000000000000022ecb25c000000000000000000000000000000000000000000000000000000000000000000'],
             [
               '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
               '0x0000000000000000000000000000000000000000000000000000000000000000',
               '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
               '0x0000000000000000000000000000000000000000000000000000000000000001',
-              '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
-              '0x0000000000000000000000000000000000000000000000008ac7230489e80000',
-              '0x0000000000000000000000000000000000000000000000000000000000000000',
+              '0x0000000000000000000000000000000000000000000000000000000000000003',
+              '0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e',
+              '0x0000000000000000000000001234567890123456789012345678901234567890',
+              '0x0000000000000000000000000000000000000000000000000de0b6b3a7640000',
+              '0x000000000000000000000000000000000000000000000000002386f26fc10000',
             ],
           ],
           [
-            Strategies.MainnetIds.AAVE_V3_COLLATERAL_SWITCH,
+            Bundles.MainnetIds.AAVE_V3_EOA_INSTANT_CLOSE,
             web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
             0,
             web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
             1,
-            web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
-            '10000000000000000000', // 10 WETH
-            web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
-            web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
-            100000,
-            RatioState.UNDER,
+            web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'),
+            web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
+            '1000000000000000000', // tsi
+            '10000000000000000', // slippage
+            1500, // stopLossPrice
+            CloseToAssetType.DEBT, // stopLossType
+            0, // takeProfitPrice
+            CloseToAssetType.COLLATERAL, // takeProfitType (not used since price is 0)
           ]
         ],
-        // USDC -> WETH, price 0.00001, state OVER
+        // Take profit only (to collateral), zero tsi and slippage
         [
           [
-            Strategies.MainnetIds.AAVE_V3_COLLATERAL_SWITCH,
-            false,
-            ['0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc200000000000000000000000000000000000000000000000000000000000003e80000000000000000000000000000000000000000000000000000000000000000'],
+            Bundles.MainnetIds.AAVE_V3_EOA_INSTANT_CLOSE,
+            true,
+            ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000746a528800'],
             [
+              '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+              '0x0000000000000000000000000000000000000000000000000000000000000000',
               '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
               '0x0000000000000000000000000000000000000000000000000000000000000001',
-              '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
               '0x0000000000000000000000000000000000000000000000000000000000000000',
-              '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
-              '0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff',
+              '0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e',
+              '0x0000000000000000000000001234567890123456789012345678901234567890',
+              '0x0000000000000000000000000000000000000000000000000000000000000000',
               '0x0000000000000000000000000000000000000000000000000000000000000000',
             ],
           ],
           [
-            Strategies.MainnetIds.AAVE_V3_COLLATERAL_SWITCH,
-            web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
-            1,
+            Bundles.MainnetIds.AAVE_V3_EOA_INSTANT_CLOSE,
             web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
             0,
-            web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
-            MAXUINT, // MaxUint256
             web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
-            web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
-            0.00001,
-            RatioState.OVER,
+            1,
+            web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'),
+            web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
+            '0', // tsi
+            '0', // slippage
+            0, // stopLossPrice
+            CloseToAssetType.DEBT, // stopLossType (not used since price is 0)
+            5000, // takeProfitPrice
+            CloseToAssetType.COLLATERAL, // takeProfitType
           ]
         ],
-        // WETH -> WBTC, price 1, state UNDER
+        // Take profit (to debt) and stop loss (to collateral)
         [
           [
-            Strategies.MainnetIds.AAVE_V3_COLLATERAL_SWITCH,
-            false,
-            ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c5990000000000000000000000000000000000000000000000000000000005f5e1000000000000000000000000000000000000000000000000000000000000000001'],
+            Bundles.MainnetIds.AAVE_V3_EOA_INSTANT_CLOSE,
+            true,
+            ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb4800000000000000000000000000000000000000000000000000000022ecb25c000000000000000000000000000000000000000000000000000000005d21dba000'],
             [
               '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
               '0x0000000000000000000000000000000000000000000000000000000000000000',
-              '0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c599',
-              '0x0000000000000000000000000000000000000000000000000000000000000002',
-              '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
-              '0x0000000000000000000000000000000000000000000000004563918244f40000',
-              '0x0000000000000000000000000000000000000000000000000000000000000000',
+              '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+              '0x0000000000000000000000000000000000000000000000000000000000000001',
+              '0x0000000000000000000000000000000000000000000000000000000000000007',
+              '0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e',
+              '0x0000000000000000000000001234567890123456789012345678901234567890',
+              '0x00000000000000000000000000000000000000000000000000b1a2bc2ec50000',
+              '0x0000000000000000000000000000000000000000000000000011c37937e08000',
             ],
           ],
           [
-            Strategies.MainnetIds.AAVE_V3_COLLATERAL_SWITCH,
+            Bundles.MainnetIds.AAVE_V3_EOA_INSTANT_CLOSE,
             web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
             0,
-            web3Utils.toChecksumAddress(getAssetInfo('WBTC', ChainId.Ethereum).address),
-            2,
-            web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
-            '5000000000000000000', // 5 WETH
-            web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
-            web3Utils.toChecksumAddress(getAssetInfo('WBTC', ChainId.Ethereum).address),
+            web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
             1,
-            RatioState.UNDER,
+            web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'),
+            web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
+            '50000000000000000', // tsi
+            '5000000000000000', // slippage
+            1500, // stopLossPrice
+            CloseToAssetType.COLLATERAL, // stopLossType
+            4000, // takeProfitPrice
+            CloseToAssetType.DEBT, // takeProfitType
           ]
         ],
       ];
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(aaveV3Encode.collateralSwitch(...actual)).to.eql(expected);
+          expect(aaveV3Encode.instantCloseOnPriceGeneric(...actual)).to.eql(expected);
         });
       });
     });
 
-    describe('debtSwitch()', () => {
+    describe('collateralSwitch()', () => {
       const examples: Array<[
         [StrategyOrBundleIds, boolean, TriggerData, SubData],
         [
@@ -1014,80 +1028,107 @@ describe('Feature: strategySubService.ts', () => {
           toAssetId: number,
           marketAddr: EthereumAddress,
           amountToSwitch: string,
-          user: EthereumAddress,
           baseTokenAddress: EthereumAddress,
           quoteTokenAddress: EthereumAddress,
           price: number,
           state: RatioState,
         ]
       ]> = [
-        // USDC -> DAI, price 100000, state UNDER
+        // WETH -> USDC, price 100000, state UNDER
         [
           [
-            Strategies.MainnetIds.AAVE_V3_DEBT_SWITCH,
+            Strategies.MainnetIds.AAVE_V3_COLLATERAL_SWITCH,
             false,
-            ['0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480000000000000000000000006b175474e89094c44da98b954eedeac495271d0f000000000000000000000000000000000000000000000000000009184e72a0000000000000000000000000000000000000000000000000000000000000000001'],
+            ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48000000000000000000000000000000000000000000000000000009184e72a0000000000000000000000000000000000000000000000000000000000000000001'],
             [
+              '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+              '0x0000000000000000000000000000000000000000000000000000000000000000',
               '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
               '0x0000000000000000000000000000000000000000000000000000000000000001',
-              '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f',
-              '0x0000000000000000000000000000000000000000000000000000000000000003',
               '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
               '0x0000000000000000000000000000000000000000000000008ac7230489e80000',
-              '0x000000000000000000000000dd6ecd6c9b9f7e29e0f14bb9d5f0d0a3c6cb6c6a',
+              '0x0000000000000000000000000000000000000000000000000000000000000000',
             ],
           ],
           [
-            Strategies.MainnetIds.AAVE_V3_DEBT_SWITCH,
+            Strategies.MainnetIds.AAVE_V3_COLLATERAL_SWITCH,
+            web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+            0,
             web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
             1,
-            web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
-            3,
             web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
-            '10000000000000000000', // 10 tokens
-            web3Utils.toChecksumAddress('0xDd6ecD6c9b9F7e29E0f14bb9D5F0D0A3C6cB6c6A'),
+            '10000000000000000000', // 10 WETH
+            web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
             web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
-            web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
             100000,
             RatioState.UNDER,
           ]
         ],
-        // DAI -> USDC (MaxUint256), price 1, state OVER
+        // USDC -> WETH, price 0.00001, state OVER
         [
           [
-            Strategies.MainnetIds.AAVE_V3_DEBT_SWITCH,
+            Strategies.MainnetIds.AAVE_V3_COLLATERAL_SWITCH,
             false,
-            ['0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480000000000000000000000000000000000000000000000000000000005f5e1000000000000000000000000000000000000000000000000000000000000000000'],
+            ['0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc200000000000000000000000000000000000000000000000000000000000003e80000000000000000000000000000000000000000000000000000000000000000'],
             [
-              '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f',
-              '0x0000000000000000000000000000000000000000000000000000000000000003',
               '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
               '0x0000000000000000000000000000000000000000000000000000000000000001',
+              '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+              '0x0000000000000000000000000000000000000000000000000000000000000000',
               '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
               '0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff',
-              '0x000000000000000000000000dd6ecd6c9b9f7e29e0f14bb9d5f0d0a3c6cb6c6a',
+              '0x0000000000000000000000000000000000000000000000000000000000000000',
             ],
           ],
           [
-            Strategies.MainnetIds.AAVE_V3_DEBT_SWITCH,
-            web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
-            3,
+            Strategies.MainnetIds.AAVE_V3_COLLATERAL_SWITCH,
             web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
             1,
+            web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+            0,
             web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
             MAXUINT, // MaxUint256
-            web3Utils.toChecksumAddress('0xDd6ecD6c9b9F7e29E0f14bb9D5F0D0A3C6cB6c6A'),
-            web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
             web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
-            1,
+            web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+            0.00001,
             RatioState.OVER,
           ]
         ],
+        // WETH -> WBTC, price 1, state UNDER
+        [
+          [
+            Strategies.MainnetIds.AAVE_V3_COLLATERAL_SWITCH,
+            false,
+            ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c5990000000000000000000000000000000000000000000000000000000005f5e1000000000000000000000000000000000000000000000000000000000000000001'],
+            [
+              '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+              '0x0000000000000000000000000000000000000000000000000000000000000000',
+              '0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c599',
+              '0x0000000000000000000000000000000000000000000000000000000000000002',
+              '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
+              '0x0000000000000000000000000000000000000000000000004563918244f40000',
+              '0x0000000000000000000000000000000000000000000000000000000000000000',
+            ],
+          ],
+          [
+            Strategies.MainnetIds.AAVE_V3_COLLATERAL_SWITCH,
+            web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+            0,
+            web3Utils.toChecksumAddress(getAssetInfo('WBTC', ChainId.Ethereum).address),
+            2,
+            web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
+            '5000000000000000000', // 5 WETH
+            web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+            web3Utils.toChecksumAddress(getAssetInfo('WBTC', ChainId.Ethereum).address),
+            1,
+            RatioState.UNDER,
+          ]
+        ],
       ];
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(aaveV3Encode.debtSwitch(...actual)).to.eql(expected);
+          expect(aaveV3Encode.collateralSwitch(...actual)).to.eql(expected);
         });
       });
     });

package/src/services/strategySubService.ts

@@ -424,28 +424,33 @@ export const aaveV3Encode = {
     return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
   },
 
-  collateralSwitch(
+  instantCloseOnPriceGeneric(
     strategyOrBundleId: number,
-    fromAsset: EthereumAddress,
-    fromAssetId: number,
-    toAsset: EthereumAddress,
-    toAssetId: number,
+    collAsset: EthereumAddress,
+    collAssetId: number,
+    debtAsset: EthereumAddress,
+    debtAssetId: number,
     marketAddr: EthereumAddress,
-    amountToSwitch: string,
-    baseTokenAddress: EthereumAddress,
-    quoteTokenAddress: EthereumAddress,
-    price: number,
-    state: RatioState,
+    user: EthereumAddress,
+    tsi: string,
+    slippage: string,
+    stopLossPrice: number = 0,
+    stopLossType: CloseToAssetType = CloseToAssetType.DEBT,
+    takeProfitPrice: number = 0,
+    takeProfitType: CloseToAssetType = CloseToAssetType.COLLATERAL,
   ) {
-    const isBundle = false;
+    const isBundle = true;
+    const closeType = getCloseStrategyType(stopLossPrice, stopLossType, takeProfitPrice, takeProfitType);
 
-    const subDataEncoded = subDataService.aaveV3CollateralSwitchSubData.encode(fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch);
-    const triggerDataEncoded = triggerService.aaveV3QuotePriceTrigger.encode(baseTokenAddress, quoteTokenAddress, price, state);
+    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(
+  collateralSwitch(
     strategyOrBundleId: number,
     fromAsset: EthereumAddress,
     fromAssetId: number,
@@ -453,7 +458,6 @@ export const aaveV3Encode = {
     toAssetId: number,
     marketAddr: EthereumAddress,
     amountToSwitch: string,
-    user: EthereumAddress,
     baseTokenAddress: EthereumAddress,
     quoteTokenAddress: EthereumAddress,
     price: number,
@@ -461,7 +465,7 @@ export const aaveV3Encode = {
   ) {
     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];