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

package/src/services/strategiesService.test.ts

@@ -1,113 +1,15 @@
 import { expect } from 'chai';
 
-import { ChainId, ProtocolIdentifiers, RatioState, 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 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: number, isGeneric: boolean, chainId = ChainId.Ethereum): ParseData {
-      const subData = [
-        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-        isGeneric
-          ? '0x0000000000000000000000000000000000000000000000000000000000000100'
-          : '0x0000000000000000000000000000000000000000000000000000000000000000',
-        '0x000000000000000000000000cbb7c0000ab88b473b1f5afd9ef808440eed33bf',
-        isGeneric
-          ? '0x000000000000000000000000000000000000000000000000000000000000ffff'
-          : '0x0000000000000000000000000000000000000000000000000000000000000007',
-        '0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e',
-        '0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff',
-        isGeneric
-          ? '0x0000000000000000000000001234567890123456789012345678901234567890'
-          : '0x0000000000000000000000000000000000000000000000000000000000000000',
-      ];
-      const subStruct = Object.assign(
-        [String(strategyId), false, triggerData, subData] as [string, boolean, string[], string[]],
-        { 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: Array<[ChainId, number]> = [
-      [ChainId.Ethereum, Strategies.MainnetIds.AAVE_V3_COLLATERAL_SWITCH_EOA],
-      [ChainId.Optimism, Strategies.OptimismIds.AAVE_V3_COLLATERAL_SWITCH_EOA],
-      [ChainId.Arbitrum, Strategies.ArbitrumIds.AAVE_V3_COLLATERAL_SWITCH_EOA],
-      [ChainId.Base, 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 = parseStrategiesAutomatedPosition(parseData)!;
-
-        expect(position).not.to.equal(null);
-        expect(position.protocol.id).to.equal(ProtocolIdentifiers.StrategiesAutomation.AaveV3);
-        expect(position.strategy.strategyId).to.equal(Strategies.Identifiers.EoaCollateralSwitch);
-        expect(position.strategy.isBundle).to.equal(false);
-        expect(position.strategyData.encoded).to.eql({
-          triggerData,
-          subData: parseData.subscriptionEventData.subStruct.subData,
-        });
-        expect(position.strategyData.decoded.triggerData).to.eql({
-          baseTokenAddress: fromAsset,
-          quoteTokenAddress: toAsset,
-          price: '0.1',
-          ratioState: RatioState.UNDER,
-        });
-        expect(position.strategyData.decoded.subData).to.eql({
-          fromAsset, fromAssetId: 256, toAsset, toAssetId: 65535, marketAddr, amountToSwitch, user,
-        });
-        expect(position.owner).to.equal(proxy.toLowerCase());
-        expect(position.positionId).to.equal(`${chainId}-aave__v3-${proxy.toLowerCase()}-${marketAddr.toLowerCase()}`);
-      });
-    });
-
-    const legacyStrategies: Array<[ChainId, number]> = [
-      [ChainId.Ethereum, Strategies.MainnetIds.AAVE_V3_COLLATERAL_SWITCH],
-      [ChainId.Optimism, Strategies.OptimismIds.AAVE_V3_COLLATERAL_SWITCH],
-      [ChainId.Arbitrum, Strategies.ArbitrumIds.AAVE_V3_COLLATERAL_SWITCH],
-      [ChainId.Base, Strategies.BaseIds.AAVE_V3_COLLATERAL_SWITCH],
-    ];
-    legacyStrategies.forEach(([chainId, strategyId]) => {
-      it(`continues to decode legacy collateral switches on chain ${chainId}`, () => {
-        const position = parseStrategiesAutomatedPosition(getParseData(strategyId, false, chainId))!;
-
-        expect(position).not.to.equal(null);
-        expect(position.strategy.strategyId).to.equal(Strategies.Identifiers.CollateralSwitch);
-        expect(position.strategyData.decoded.subData).to.eql({
-          fromAsset, fromAssetId: 0, toAsset, toAssetId: 7, marketAddr, amountToSwitch,
-        });
-        expect(position.positionId).to.equal(`${chainId}-aave__v3-${proxy.toLowerCase()}-${marketAddr.toLowerCase()}`);
-      });
-    });
-  });
-
   describe('When testing strategiesService.parseStrategiesAutomatedPosition', async () => {
     // TODO: we should probably write this for every strategy?
     const examples: Array<[Position.Automated | null, ParseData]> = [
@@ -204,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,32 +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 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: 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;
@@ -1615,10 +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.EoaCollateralSwitch]: parseAaveV3CollateralSwitch,
-    [Strategies.Identifiers.DebtSwitch]: parseAaveV3DebtSwitch,
-    [Strategies.Identifiers.EoaDebtSwitch]: parseAaveV3DebtSwitch,
     [Strategies.Identifiers.LiquidationProtection]: parseAaveV3LiquidationProtection,
     [Strategies.Identifiers.EoaLiquidationProtection]: parseAaveV3LiquidationProtection,
   },

package/src/services/strategySubService.test.ts

@@ -887,165 +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);
-        });
-      });
-    });
-
-    describe('collateralSwitchGeneric()', () => {
-      const strategyId = 12345;
-      const fromAsset = web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address);
-      const toAsset = web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address);
-      const marketAddr = web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39');
-      const user = web3Utils.toChecksumAddress('0x1234567890abcdef1234567890abcdef12345678');
-      const examples: Array<[RatioState, string, string, string]> = [
-        [
-          RatioState.UNDER,
-          '10000000000000000000',
-          '0x0000000000000000000000000000000000000000000000008ac7230489e80000',
-          '0000000000000000000000000000000000000000000000000000000000000001',
-        ],
-        [
-          RatioState.OVER,
-          MAXUINT,
-          '0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff',
-          '0000000000000000000000000000000000000000000000000000000000000000',
-        ],
-      ];
-
-      examples.forEach(([state, amountToSwitch, encodedAmount, encodedState]) => {
-        it(`encodes a generic collateral switch with the supplied quote pair and state ${state}`, () => {
-          const expectedTrigger = `0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc200000000000000000000000000000000000000000000000000000000000003e8${encodedState}`;
-          const expectedSubData: SubData = [
-            '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-            '0x0000000000000000000000000000000000000000000000000000000000000100',
-            '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-            '0x000000000000000000000000000000000000000000000000000000000000ffff',
-            '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
-            encodedAmount,
-            '0x0000000000000000000000001234567890abcdef1234567890abcdef12345678',
-          ];
-
-          expect(aaveV3Encode.collateralSwitchGeneric(
-            strategyId, fromAsset, 256, toAsset, 65535, marketAddr, amountToSwitch, user,
-            toAsset, fromAsset, 0.00001, state,
-          )).to.eql([strategyId, false, [expectedTrigger], expectedSubData]);
+          expect(aaveV3Encode.instantCloseOnPriceGeneric(...actual)).to.eql(expected);
         });
       });
     });
 
-    describe('debtSwitch()', () => {
+    describe('collateralSwitch()', () => {
       const examples: Array<[
         [StrategyOrBundleIds, boolean, TriggerData, SubData],
         [
@@ -1056,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);
         });
       });
     });