@defisaver/automation-sdk 3.1.10 → 3.1.14-spark-dev

package/src/services/strategySubService.test.ts

@@ -1,10 +1,10 @@
 import { expect } from 'chai';
 import Dec from 'decimal.js';
 import { otherAddresses } from '@defisaver/sdk';
-import { getAssetInfo } from '@defisaver/tokens';
+import { getAssetInfo, MAXUINT } from '@defisaver/tokens';
 import * as web3Utils from 'web3-utils';
 
-import { Bundles, ChainId, OrderType, RatioState, Strategies } from '../types/enums';
+import { Bundles, ChainId, CloseToAssetType, OrderType, RatioState, Strategies } from '../types/enums';
 import type { EthereumAddress, StrategyOrBundleIds, SubData, TriggerData } from '../types';
 
 import '../configuration';
@@ -18,8 +18,11 @@ import {
   compoundV3Encode,
   morphoAaveV2Encode,
   exchangeEncode,
+  crvUSDEncode,
+  compoundV3L2Encode,
+  morphoBlueEncode,
   sparkEncode,
-  crvUSDEncode, compoundV3L2Encode, morphoBlueEncode,
+  aaveV4Encode,
 } from './strategySubService';
 
 describe('Feature: strategySubService.ts', () => {
@@ -169,6 +172,61 @@ describe('Feature: strategySubService.ts', () => {
         });
       });
     });
+
+    describe('leverageManagementWithoutSubProxy()', () => {
+      const examples: Array<[
+        [StrategyOrBundleIds, boolean, TriggerData, SubData],
+        [
+          vaultId: number, triggerRatio: number, targetRatio: number, ratioState: RatioState,
+          isBoost: boolean, daiAddr?: EthereumAddress,
+        ]
+      ]> = [
+        // Repay scenario (isBoost=false, RatioState.UNDER)
+        [
+          [
+            Bundles.MainnetIds.MAKER_REPAY,
+            true,
+            ['0x00000000000000000000000000000000000000000000000000000000000000de000000000000000000000000000000000000000000000000136dcc951d8c00000000000000000000000000000000000000000000000000000000000000000001'],
+            [
+              '0x00000000000000000000000000000000000000000000000000000000000000de', '0x00000000000000000000000000000000000000000000000018fae27693b40000',
+              '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f',
+            ],
+          ],
+          [
+            222, // vaultId
+            140, // triggerRatio
+            180, // targetRatio
+            RatioState.UNDER, // ratioState
+            false, // isBoost
+          ]
+        ],
+        // Boost scenario (isBoost=true, RatioState.OVER)
+        [
+          [
+            Bundles.MainnetIds.MAKER_BOOST,
+            true,
+            ['0x000000000000000000000000000000000000000000000000000000000000014d00000000000000000000000000000000000000000000000026db992a3b1800000000000000000000000000000000000000000000000000000000000000000000'],
+            [
+              '0x000000000000000000000000000000000000000000000000000000000000014d', '0x00000000000000000000000000000000000000000000000022b1c8c1227a0000',
+              '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f',
+            ],
+          ],
+          [
+            333, // vaultId
+            280, // triggerRatio
+            250, // targetRatio
+            RatioState.OVER, // ratioState
+            true, // isBoost
+          ]
+        ],
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(makerEncode.leverageManagementWithoutSubProxy(...actual)).to.eql(expected);
+        });
+      });
+    });
   });
 
   describe('When testing strategySubService.liquityEncode', () => {
@@ -618,264 +676,1155 @@ describe('Feature: strategySubService.ts', () => {
         });
       });
     });
-  });
 
-  describe('When testing strategySubService.compoundV2Encode', () => {
-    describe('leverageManagement()', () => {
+    describe('leverageManagementOnPriceGeneric()', () => {
       const examples: Array<[
-        [string, string, string, string, boolean],
-        [triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean],
+        [StrategyOrBundleIds, boolean, TriggerData, SubData],
+        [
+          strategyOrBundleId: number,
+          price: number,
+          ratioState: RatioState,
+          collAsset: EthereumAddress,
+          collAssetId: number,
+          debtAsset: EthereumAddress,
+          debtAssetId: number,
+          marketAddr: EthereumAddress,
+          targetRatio: number,
+          user: EthereumAddress
+        ]
       ]> = [
         [
-          [new Dec(160).mul(1e16).toString(), new Dec(220).mul(1e16).toString(), new Dec(180).mul(1e16).toString(), new Dec(190).mul(1e16).toString(), true],
-          [160, 220, 180, 190, true]
+          [
+            Bundles.MainnetIds.AAVE_V3_EOA_REPAY_ON_PRICE,
+            true,
+            ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb4800000000000000000000000000000000000000000000000000000026e1f9c6000000000000000000000000000000000000000000000000000000000000000001'],
+            [
+              '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+              '0x0000000000000000000000000000000000000000000000000000000000000000',
+              '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+              '0x0000000000000000000000000000000000000000000000000000000000000001',
+              '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
+              '0x0000000000000000000000000000000000000000000000001bc16d674ec80000',
+              '0x0000000000000000000000000000000000000000000000000000000000000000',
+            ],
+          ],
+          [
+            Bundles.MainnetIds.AAVE_V3_EOA_REPAY_ON_PRICE,
+            1670,
+            RatioState.UNDER,
+            web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+            0,
+            web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+            1,
+            web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
+            200,
+            web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
+          ]
         ],
         [
-          [new Dec(160).mul(1e16).toString(), new Dec(200).mul(1e16).toString(), new Dec(180).mul(1e16).toString(), new Dec(190).mul(1e16).toString(), false],
-          [160, 200, 180, 190, false]
+          [
+            Bundles.MainnetIds.AAVE_V3_EOA_BOOST_ON_PRICE,
+            true,
+            ['0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c599000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480000000000000000000000000000000000000000000000000000000002faf0800000000000000000000000000000000000000000000000000000000000000000'],
+            [
+              '0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c599',
+              '0x0000000000000000000000000000000000000000000000000000000000000002',
+              '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+              '0x0000000000000000000000000000000000000000000000000000000000000001',
+              '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
+              '0x0000000000000000000000000000000000000000000000001bc16d674ec80000',
+              '0x0000000000000000000000001234567890123456789012345678901234567890',
+            ],
+          ],
+          [
+            Bundles.MainnetIds.AAVE_V3_EOA_BOOST_ON_PRICE,
+            0.5,
+            RatioState.OVER,
+            web3Utils.toChecksumAddress(getAssetInfo('WBTC', ChainId.Ethereum).address),
+            2,
+            web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+            1,
+            web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
+            200,
+            web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
+          ]
         ],
       ];
 
       examples.forEach(([expected, actual]) => {
-        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(compoundV2Encode.leverageManagement(...actual)).to.eql(expected);
+        it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(aaveV3Encode.leverageManagementOnPriceGeneric(...actual)).to.eql(expected);
         });
       });
     });
-  });
 
-  describe('When testing strategySubService.compoundV3Encode', () => {
-    describe('leverageManagement()', () => {
-      const examples: Array<[[EthereumAddress, EthereumAddress, string, string, string, string, boolean, boolean], [market: EthereumAddress, baseToken: EthereumAddress, triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean, isEOA: boolean]]> = [
+    describe('closeOnPriceGeneric()', () => {
+      const examples: Array<[
+        [StrategyOrBundleIds, boolean, TriggerData, SubData],
+        [
+          strategyOrBundleId: number,
+          collAsset: EthereumAddress,
+          collAssetId: number,
+          debtAsset: EthereumAddress,
+          debtAssetId: number,
+          marketAddr: EthereumAddress,
+          user: EthereumAddress,
+          stopLossPrice: number,
+          stopLossType: CloseToAssetType,
+          takeProfitPrice: number,
+          takeProfitType: CloseToAssetType
+        ]
+      ]> = [
+        // Stop loss only (to debt)
         [
           [
-            web3Utils.toChecksumAddress('0x1C0F620155e85491f8D35440eb17538Ca5c55212'),
-            web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
-            new Dec(160).mul(1e16).toString(),
-            new Dec(220).mul(1e16).toString(),
-            new Dec(180).mul(1e16).toString(),
-            new Dec(190).mul(1e16).toString(),
-            true, false,
+            Bundles.MainnetIds.AAVE_V3_EOA_CLOSE,
+            true,
+             ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb4800000000000000000000000000000000000000000000000000000022ecb25c000000000000000000000000000000000000000000000000000000000000000000'],
+            [
+              '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+              '0x0000000000000000000000000000000000000000000000000000000000000000',
+              '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+              '0x0000000000000000000000000000000000000000000000000000000000000001',
+              '0x0000000000000000000000000000000000000000000000000000000000000003',
+              '0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e',
+              '0x0000000000000000000000000000000000000000000000000000000000000000',
+            ],
           ],
           [
-            web3Utils.toChecksumAddress('0x1C0F620155e85491f8D35440eb17538Ca5c55212'),
+            Bundles.MainnetIds.AAVE_V3_EOA_CLOSE,
+            web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+            0,
             web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
-            160, 220, 180, 190,
-            true, false,
+            1,
+            web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'),
+            web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
+            1500, // stopLossPrice
+            CloseToAssetType.DEBT, // stopLossType
+            0, // takeProfitPrice
+            CloseToAssetType.COLLATERAL, // takeProfitType (not used since price is 0)
           ]
         ],
+        // Take profit only (to collateral)
         [
           [
-            web3Utils.toChecksumAddress('0xaC0F620155e85491f8D35440eb17538Ca5c55212'),
-            web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
-            new Dec(160).mul(1e16).toString(),
-            new Dec(210).mul(1e16).toString(),
-            new Dec(180).mul(1e16).toString(),
-            new Dec(190).mul(1e16).toString(),
-            false, true,
+            Bundles.MainnetIds.AAVE_V3_EOA_CLOSE,
+            true,
+             ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000746a528800'],
+            [
+              '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+              '0x0000000000000000000000000000000000000000000000000000000000000000',
+              '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+              '0x0000000000000000000000000000000000000000000000000000000000000001',
+              '0x0000000000000000000000000000000000000000000000000000000000000000',
+              '0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e',
+              '0x0000000000000000000000000000000000000000000000000000000000000000',
+            ],
           ],
           [
-            web3Utils.toChecksumAddress('0xaC0F620155e85491f8D35440eb17538Ca5c55212'),
+            Bundles.MainnetIds.AAVE_V3_EOA_CLOSE,
             web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
-            160, 210, 180, 190,
-            false, true,
+            0,
+            web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+            1,
+            web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'),
+            web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
+            0, // stopLossPrice
+            CloseToAssetType.DEBT, // stopLossType (not used since price is 0)
+            5000, // takeProfitPrice
+            CloseToAssetType.COLLATERAL, // takeProfitType
           ]
         ],
-      ];
-      examples.forEach(([expected, actual]) => {
-        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(compoundV3Encode.leverageManagement(...actual)).to.eql(expected);
-        });
-      });
-    });
-  });
-
-  describe('When testing strategySubService.morphoAaveV2Encode', () => {
-    describe('leverageManagement()', () => {
-      const examples: Array<[[string, string, string, string, boolean], [triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean]]> = [
-        [
-          [new Dec(160).mul(1e16).toString(), new Dec(220).mul(1e16).toString(), new Dec(180).mul(1e16).toString(), new Dec(190).mul(1e16).toString(), true],
-          [160, 220, 180, 190, true]
-        ],
-        [
-          [new Dec(160).mul(1e16).toString(), new Dec(200).mul(1e16).toString(), new Dec(180).mul(1e16).toString(), new Dec(190).mul(1e16).toString(), false],
-          [160, 200, 180, 190, false]
-        ],
-      ];
-
-      examples.forEach(([expected, actual]) => {
-        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(morphoAaveV2Encode.leverageManagement(...actual)).to.eql(expected);
-        });
-      });
-    });
-  });
-
-  describe('When testing strategySubService.exchangeEncode', () => {
-    describe('dca()', () => {
-      const examples: Array<[
-        [StrategyOrBundleIds, boolean, TriggerData, SubData],
-        [fromToken: EthereumAddress, toToken: EthereumAddress, amount: string, timestamp: number, interval: number, network: ChainId],
-      ]> = [
+        // Both stop loss and take profit with useOnBehalf
         [
           [
-            Strategies.ArbitrumIds.EXCHANGE_DCA,
-            false,
-            ['0x0000000000000000000000000000000000000000000000000000018b23bd88cd000000000000000000000000000000000000000000000000000000000012d068'],
+            Bundles.MainnetIds.AAVE_V3_EOA_CLOSE,
+            true,
+             ['0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c599000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb4800000000000000000000000000000000000000000000000000000022ecb25c000000000000000000000000000000000000000000000000000000005d21dba000'],
             [
-              '0x000000000000000000000000da10009cbd5d07dd0cecc66161fc93d7c9000da1', '0x000000000000000000000000af88d065e77c8cc2239327c5edb3a432268e5831',
-              '0x0000000000000000000000000000000000000000000000000000000000038270', '0x000000000000000000000000000000000000000000000000000000000012d068'
+              '0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c599',
+              '0x0000000000000000000000000000000000000000000000000000000000000002',
+              '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+              '0x0000000000000000000000000000000000000000000000000000000000000001',
+              '0x0000000000000000000000000000000000000000000000000000000000000004',
+              '0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e',
+              '0x0000000000000000000000001234567890123456789012345678901234567890',
             ],
           ],
-          [getAssetInfo('DAI', ChainId.Arbitrum).address, getAssetInfo('USDC', ChainId.Arbitrum).address, '230000', 1697111705805, 1233000, ChainId.Arbitrum]
+          [
+            Bundles.MainnetIds.AAVE_V3_EOA_CLOSE,
+            web3Utils.toChecksumAddress(getAssetInfo('WBTC', ChainId.Ethereum).address),
+            2,
+            web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+            1,
+            web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'),
+            web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
+            1500, // stopLossPrice
+            CloseToAssetType.COLLATERAL, // stopLossType
+            4000, // takeProfitPrice
+            CloseToAssetType.COLLATERAL, // takeProfitType
+          ]
         ],
+        // Stop loss only (to collateral) - CloseStrategyType.STOP_LOSS_IN_COLLATERAL
         [
           [
-            Strategies.MainnetIds.EXCHANGE_DCA,
-            false,
-            ['0x0000000000000000000000000000000000000000000000000000018b23bd88cd0000000000000000000000000000000000000000000000000000000000067458'],
+            Bundles.MainnetIds.AAVE_V3_EOA_CLOSE,
+            true,
+             ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb4800000000000000000000000000000000000000000000000000000022ecb25c000000000000000000000000000000000000000000000000000000000000000000'],
             [
-              '0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c599', '0x000000000000000000000000eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee',
-              '0x0000000000000000000000000000000000000000000000000000000000000015', '0x0000000000000000000000000000000000000000000000000000000000067458',
+              '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+              '0x0000000000000000000000000000000000000000000000000000000000000000',
+              '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+              '0x0000000000000000000000000000000000000000000000000000000000000001',
+              '0x0000000000000000000000000000000000000000000000000000000000000001',
+              '0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e',
+              '0x0000000000000000000000000000000000000000000000000000000000000000',
             ],
           ],
-          [getAssetInfo('WBTC').address, getAssetInfo('ETH').address, '21', 1697111705805, 423000, ChainId.Ethereum]
+          [
+            Bundles.MainnetIds.AAVE_V3_EOA_CLOSE,
+            web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+            0,
+            web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+            1,
+            web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'),
+            web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
+            1500, // stopLossPrice
+            CloseToAssetType.COLLATERAL, // stopLossType
+            0, // takeProfitPrice
+            CloseToAssetType.DEBT, // takeProfitType (not used since price is 0)
+          ]
         ],
-      ];
-
-      examples.forEach(([expected, actual]) => {
-        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(exchangeEncode.dca(...actual)).to.eql(expected);
-        });
-      });
-    });
-
-    describe('limitOrder()', () => {
-      const examples: Array<[[EthereumAddress, EthereumAddress, string, string, string, string], [fromToken: EthereumAddress, toToken: EthereumAddress, amount: string, targetPrice: string, goodUntil: string | number, orderType: OrderType]]> = [
+        // Take profit only (to debt) - CloseStrategyType.TAKE_PROFIT_IN_DEBT
         [
           [
-            web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
-            web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
-            '2131',
-            '0.53123',
-            '1696590921159',
-            `${OrderType.STOP_LOSS}`
+            Bundles.MainnetIds.AAVE_V3_EOA_CLOSE,
+            true,
+             ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000746a528800'],
+            [
+              '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+              '0x0000000000000000000000000000000000000000000000000000000000000000',
+              '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+              '0x0000000000000000000000000000000000000000000000000000000000000001',
+              '0x0000000000000000000000000000000000000000000000000000000000000002',
+              '0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e',
+              '0x0000000000000000000000000000000000000000000000000000000000000000',
+            ],
           ],
           [
+            Bundles.MainnetIds.AAVE_V3_EOA_CLOSE,
             web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
-            web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
-            '2131',
-            '0.53123',
-            1696590921159,
-            OrderType.STOP_LOSS
+            0,
+            web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+            1,
+            web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'),
+            web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
+            0, // stopLossPrice
+            CloseToAssetType.COLLATERAL, // stopLossType (not used since price is 0)
+            5000, // takeProfitPrice
+            CloseToAssetType.DEBT, // takeProfitType
           ]
         ],
+        // Take profit in collateral and stop loss in debt - CloseStrategyType.TAKE_PROFIT_IN_COLLATERAL_AND_STOP_LOSS_IN_DEBT
         [
           [
-            web3Utils.toChecksumAddress(getAssetInfo('LINK', ChainId.Arbitrum).address),
-            web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Arbitrum).address),
-            '2131',
-            '0.43123',
-            '1646590921159',
-            `${OrderType.TAKE_PROFIT}`
+            Bundles.MainnetIds.AAVE_V3_EOA_CLOSE,
+            true,
+             ['0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c599000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb4800000000000000000000000000000000000000000000000000000022ecb25c000000000000000000000000000000000000000000000000000000005d21dba000'],
+            [
+              '0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c599',
+              '0x0000000000000000000000000000000000000000000000000000000000000002',
+              '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+              '0x0000000000000000000000000000000000000000000000000000000000000001',
+              '0x0000000000000000000000000000000000000000000000000000000000000005',
+              '0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e',
+              '0x0000000000000000000000001234567890123456789012345678901234567890',
+            ],
           ],
           [
-            web3Utils.toChecksumAddress(getAssetInfo('LINK', ChainId.Arbitrum).address),
-            web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Arbitrum).address),
-            '2131',
-            '0.43123',
-            1646590921159,
-            OrderType.TAKE_PROFIT
+            Bundles.MainnetIds.AAVE_V3_EOA_CLOSE,
+            web3Utils.toChecksumAddress(getAssetInfo('WBTC', ChainId.Ethereum).address),
+            2,
+            web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+            1,
+            web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'),
+            web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
+            1500, // stopLossPrice
+            CloseToAssetType.DEBT, // stopLossType
+            4000, // takeProfitPrice
+            CloseToAssetType.COLLATERAL, // takeProfitType
           ]
         ],
-      ];
-
-      examples.forEach(([expected, actual]) => {
-        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(exchangeEncode.limitOrder(...actual)).to.eql(expected);
-        });
+        // Both stop loss and take profit in debt - CloseStrategyType.TAKE_PROFIT_AND_STOP_LOSS_IN_DEBT
+        [
+          [
+            Bundles.MainnetIds.AAVE_V3_EOA_CLOSE,
+            true,
+             ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb4800000000000000000000000000000000000000000000000000000022ecb25c000000000000000000000000000000000000000000000000000000005d21dba000'],
+            [
+              '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+              '0x0000000000000000000000000000000000000000000000000000000000000000',
+              '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+              '0x0000000000000000000000000000000000000000000000000000000000000001',
+              '0x0000000000000000000000000000000000000000000000000000000000000006',
+              '0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e',
+              '0x0000000000000000000000000000000000000000000000000000000000000000',
+            ],
+          ],
+          [
+            Bundles.MainnetIds.AAVE_V3_EOA_CLOSE,
+            web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+            0,
+            web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+            1,
+            web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'),
+            web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
+            1500, // stopLossPrice
+            CloseToAssetType.DEBT, // stopLossType
+            4000, // takeProfitPrice
+            CloseToAssetType.DEBT, // takeProfitType
+          ]
+        ],
+        // Take profit in debt and stop loss in collateral - CloseStrategyType.TAKE_PROFIT_IN_DEBT_AND_STOP_LOSS_IN_COLLATERAL
+        [
+          [
+            Bundles.MainnetIds.AAVE_V3_EOA_CLOSE,
+            true,
+             ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb4800000000000000000000000000000000000000000000000000000022ecb25c000000000000000000000000000000000000000000000000000000005d21dba000'],
+            [
+              '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+              '0x0000000000000000000000000000000000000000000000000000000000000000',
+              '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+              '0x0000000000000000000000000000000000000000000000000000000000000001',
+              '0x0000000000000000000000000000000000000000000000000000000000000007',
+              '0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e',
+              '0x0000000000000000000000009876543210987654321098765432109876543210',
+            ],
+          ],
+          [
+            Bundles.MainnetIds.AAVE_V3_EOA_CLOSE,
+            web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+            0,
+            web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+            1,
+            web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'),
+            web3Utils.toChecksumAddress('0x9876543210987654321098765432109876543210'),
+            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.closeOnPriceGeneric(...actual)).to.eql(expected);
+        });
+      });
+    });
+
+    describe('collateralSwitch()', () => {
+      const examples: Array<[
+        [StrategyOrBundleIds, boolean, TriggerData, SubData],
+        [
+          strategyOrBundleId: number,
+          fromAsset: EthereumAddress,
+          fromAssetId: number,
+          toAsset: EthereumAddress,
+          toAssetId: number,
+          marketAddr: EthereumAddress,
+          amountToSwitch: string,
+          baseTokenAddress: EthereumAddress,
+          quoteTokenAddress: EthereumAddress,
+          price: number,
+          state: RatioState,
+        ]
+      ]> = [
+        // WETH -> USDC, price 100000, state UNDER
+        [
+          [
+            Strategies.MainnetIds.AAVE_V3_COLLATERAL_SWITCH,
+            false,
+            ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48000000000000000000000000000000000000000000000000000009184e72a0000000000000000000000000000000000000000000000000000000000000000001'],
+            [
+              '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+              '0x0000000000000000000000000000000000000000000000000000000000000000',
+              '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+              '0x0000000000000000000000000000000000000000000000000000000000000001',
+              '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
+              '0x0000000000000000000000000000000000000000000000008ac7230489e80000',
+              '0x0000000000000000000000000000000000000000000000000000000000000000',
+            ],
+          ],
+          [
+            Strategies.MainnetIds.AAVE_V3_COLLATERAL_SWITCH,
+            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,
+          ]
+        ],
+        // USDC -> WETH, price 0.00001, state OVER
+        [
+          [
+            Strategies.MainnetIds.AAVE_V3_COLLATERAL_SWITCH,
+            false,
+            ['0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc200000000000000000000000000000000000000000000000000000000000003e80000000000000000000000000000000000000000000000000000000000000000'],
+            [
+              '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+              '0x0000000000000000000000000000000000000000000000000000000000000001',
+              '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+              '0x0000000000000000000000000000000000000000000000000000000000000000',
+              '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
+              '0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff',
+              '0x0000000000000000000000000000000000000000000000000000000000000000',
+            ],
+          ],
+          [
+            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(getAssetInfo('USDC', ChainId.Ethereum).address),
+            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.collateralSwitch(...actual)).to.eql(expected);
+        });
+      });
+    });
+  });
+
+  describe('When testing strategySubService.compoundV2Encode', () => {
+    describe('leverageManagement()', () => {
+      const examples: Array<[
+        [string, string, string, string, boolean],
+        [triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean],
+      ]> = [
+        [
+          [new Dec(160).mul(1e16).toString(), new Dec(220).mul(1e16).toString(), new Dec(180).mul(1e16).toString(), new Dec(190).mul(1e16).toString(), true],
+          [160, 220, 180, 190, true]
+        ],
+        [
+          [new Dec(160).mul(1e16).toString(), new Dec(200).mul(1e16).toString(), new Dec(180).mul(1e16).toString(), new Dec(190).mul(1e16).toString(), false],
+          [160, 200, 180, 190, false]
+        ],
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(compoundV2Encode.leverageManagement(...actual)).to.eql(expected);
+        });
+      });
+    });
+  });
+
+  describe('When testing strategySubService.compoundV3Encode', () => {
+    describe('leverageManagement()', () => {
+      const examples: Array<[[EthereumAddress, EthereumAddress, string, string, string, string, boolean, boolean], [market: EthereumAddress, baseToken: EthereumAddress, triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean, isEOA: boolean]]> = [
+        [
+          [
+            web3Utils.toChecksumAddress('0x1C0F620155e85491f8D35440eb17538Ca5c55212'),
+            web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+            new Dec(160).mul(1e16).toString(),
+            new Dec(220).mul(1e16).toString(),
+            new Dec(180).mul(1e16).toString(),
+            new Dec(190).mul(1e16).toString(),
+            true, false,
+          ],
+          [
+            web3Utils.toChecksumAddress('0x1C0F620155e85491f8D35440eb17538Ca5c55212'),
+            web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+            160, 220, 180, 190,
+            true, false,
+          ]
+        ],
+        [
+          [
+            web3Utils.toChecksumAddress('0xaC0F620155e85491f8D35440eb17538Ca5c55212'),
+            web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+            new Dec(160).mul(1e16).toString(),
+            new Dec(210).mul(1e16).toString(),
+            new Dec(180).mul(1e16).toString(),
+            new Dec(190).mul(1e16).toString(),
+            false, true,
+          ],
+          [
+            web3Utils.toChecksumAddress('0xaC0F620155e85491f8D35440eb17538Ca5c55212'),
+            web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+            160, 210, 180, 190,
+            false, true,
+          ]
+        ],
+      ];
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(compoundV3Encode.leverageManagement(...actual)).to.eql(expected);
+        });
+      });
+    });
+    describe('leverageManagementOnPrice()', () => {
+      const examples: Array<[
+        [StrategyOrBundleIds, boolean, TriggerData, SubData],
+        [strategyOrBundleId: number, market: EthereumAddress, collToken: EthereumAddress, baseToken: EthereumAddress, targetRatio: number, price: number, priceState: RatioState, ratioState: RatioState, user: EthereumAddress]
+      ]> = [
+        [
+          [
+            Bundles.MainnetIds.COMP_V3_SW_REPAY_ON_PRICE,
+            true,
+            ['0x000000000000000000000000c3d688b66703497daa19211eedff47f25384cdc3000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000009a959b9ee2847a66a5a3d43fd1ec38a4f07775030000000000000000000000000000000000000000000000000000002e90edd0000000000000000000000000000000000000000000000000000000000000000001'],
+            [
+              '0x000000000000000000000000c3d688b66703497daa19211eedff47f25384cdc3',
+              '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+              '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+              '0x0000000000000000000000000000000000000000000000001bc16d674ec80000',
+              '0x0000000000000000000000000000000000000000000000000000000000000001',
+              '0x0000000000000000000000009a959b9ee2847a66a5a3d43fd1ec38a4f0777503',
+            ],
+          ],
+          [
+            Bundles.MainnetIds.COMP_V3_SW_REPAY_ON_PRICE,
+            web3Utils.toChecksumAddress('0xc3d688B66703497DAA19211EEdff47f25384cdc3'),
+            web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+            web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+            200,
+            2000,
+            RatioState.UNDER,
+            RatioState.UNDER,
+            web3Utils.toChecksumAddress('0x9a959B9ee2847a66A5A3d43Fd1Ec38a4f0777503'),
+          ],
+        ],
+        [
+          [
+            Bundles.MainnetIds.COMP_V3_SW_BOOST_ON_PRICE,
+            true,
+            ['0x000000000000000000000000c3d688b66703497daa19211eedff47f25384cdc3000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000009a959b9ee2847a66a5a3d43fd1ec38a4f077750300000000000000000000000000000000000000000000000000000045d964b8000000000000000000000000000000000000000000000000000000000000000000'],
+            [
+              '0x000000000000000000000000c3d688b66703497daa19211eedff47f25384cdc3',
+              '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+              '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+              '0x0000000000000000000000000000000000000000000000001a5e27eef13e0000',
+              '0x0000000000000000000000000000000000000000000000000000000000000000',
+              '0x0000000000000000000000009a959b9ee2847a66a5a3d43fd1ec38a4f0777503',
+            ],
+          ],
+          [
+            Bundles.MainnetIds.COMP_V3_SW_BOOST_ON_PRICE,
+            web3Utils.toChecksumAddress('0xc3d688B66703497DAA19211EEdff47f25384cdc3'),
+            web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+            web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+            190,
+            3000,
+            RatioState.OVER,
+            RatioState.OVER,
+            web3Utils.toChecksumAddress('0x9a959B9ee2847a66A5A3d43Fd1Ec38a4f0777503'),
+          ],
+        ]
+      ];
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(compoundV3Encode.leverageManagementOnPrice(...actual)).to.eql(expected);
+        });
+      });
+    });
+    describe('closeOnPrice()', () => {
+      const examples: Array<[
+        [StrategyOrBundleIds, boolean, TriggerData, SubData],
+        [strategyOrBundleId: number, market: EthereumAddress, collToken: EthereumAddress, baseToken: EthereumAddress, stopLossPrice: number, stopLossType: CloseToAssetType, takeProfitPrice: number, takeProfitType: CloseToAssetType, user: EthereumAddress]
+      ]> = [
+        [
+          [
+            Bundles.MainnetIds.COMP_V3_SW_CLOSE,
+            true,
+            ['0x000000000000000000000000c3d688b66703497daa19211eedff47f25384cdc3000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc200000000000000000000000000000000000000000000000000000022ecb25c000000000000000000000000000000000000000000000000000000005d21dba000'],
+            [
+              '0x000000000000000000000000c3d688b66703497daa19211eedff47f25384cdc3',
+              '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+              '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+              '0x0000000000000000000000000000000000000000000000000000000000000006',
+              '0x0000000000000000000000009a959b9ee2847a66a5a3d43fd1ec38a4f0777503',
+            ],
+          ],
+          [
+            Bundles.MainnetIds.COMP_V3_SW_CLOSE,
+            web3Utils.toChecksumAddress('0xc3d688B66703497DAA19211EEdff47f25384cdc3'),
+            web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+            web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+            1500,
+            CloseToAssetType.DEBT,
+            4000,
+            CloseToAssetType.DEBT,
+            web3Utils.toChecksumAddress('0x9a959B9ee2847a66A5A3d43Fd1Ec38a4f0777503'),
+          ],
+        ],
+        [
+          [
+            Bundles.MainnetIds.COMP_V3_EOA_CLOSE,
+            true,
+            ['0x000000000000000000000000c3d688b66703497daa19211eedff47f25384cdc3000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000746a528800'],
+            [
+              '0x000000000000000000000000c3d688b66703497daa19211eedff47f25384cdc3',
+              '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+              '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+              '0x0000000000000000000000000000000000000000000000000000000000000000',
+              '0x0000000000000000000000009a959b9ee2847a66a5a3d43fd1ec38a4f0777503',
+            ],
+          ],
+          [
+            Bundles.MainnetIds.COMP_V3_EOA_CLOSE,
+            web3Utils.toChecksumAddress('0xc3d688B66703497DAA19211EEdff47f25384cdc3'),
+            web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+            web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+            0,
+            CloseToAssetType.DEBT,
+            5000,
+            CloseToAssetType.COLLATERAL,
+            web3Utils.toChecksumAddress('0x9a959B9ee2847a66A5A3d43Fd1Ec38a4f0777503'),
+          ],
+        ]
+      ];
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(compoundV3Encode.closeOnPrice(...actual)).to.eql(expected);
+        });
+      });
+    });
+  });
+
+  describe('When testing strategySubService.morphoAaveV2Encode', () => {
+    describe('leverageManagement()', () => {
+      const examples: Array<[[string, string, string, string, boolean], [triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean]]> = [
+        [
+          [new Dec(160).mul(1e16).toString(), new Dec(220).mul(1e16).toString(), new Dec(180).mul(1e16).toString(), new Dec(190).mul(1e16).toString(), true],
+          [160, 220, 180, 190, true]
+        ],
+        [
+          [new Dec(160).mul(1e16).toString(), new Dec(200).mul(1e16).toString(), new Dec(180).mul(1e16).toString(), new Dec(190).mul(1e16).toString(), false],
+          [160, 200, 180, 190, false]
+        ],
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(morphoAaveV2Encode.leverageManagement(...actual)).to.eql(expected);
+        });
+      });
+    });
+  });
+
+  describe('When testing strategySubService.exchangeEncode', () => {
+    describe('dca()', () => {
+      const examples: Array<[
+        [StrategyOrBundleIds, boolean, TriggerData, SubData],
+        [fromToken: EthereumAddress, toToken: EthereumAddress, amount: string, timestamp: number, interval: number, network: ChainId],
+      ]> = [
+        [
+          [
+            Strategies.ArbitrumIds.EXCHANGE_DCA,
+            false,
+            ['0x0000000000000000000000000000000000000000000000000000018b23bd88cd000000000000000000000000000000000000000000000000000000000012d068'],
+            [
+              '0x000000000000000000000000da10009cbd5d07dd0cecc66161fc93d7c9000da1', '0x000000000000000000000000af88d065e77c8cc2239327c5edb3a432268e5831',
+              '0x0000000000000000000000000000000000000000000000000000000000038270', '0x000000000000000000000000000000000000000000000000000000000012d068'
+            ],
+          ],
+          [getAssetInfo('DAI', ChainId.Arbitrum).address, getAssetInfo('USDC', ChainId.Arbitrum).address, '230000', 1697111705805, 1233000, ChainId.Arbitrum]
+        ],
+        [
+          [
+            Strategies.MainnetIds.EXCHANGE_DCA,
+            false,
+            ['0x0000000000000000000000000000000000000000000000000000018b23bd88cd0000000000000000000000000000000000000000000000000000000000067458'],
+            [
+              '0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c599', '0x000000000000000000000000eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee',
+              '0x0000000000000000000000000000000000000000000000000000000000000015', '0x0000000000000000000000000000000000000000000000000000000000067458',
+            ],
+          ],
+          [getAssetInfo('WBTC').address, getAssetInfo('ETH').address, '21', 1697111705805, 423000, ChainId.Ethereum]
+        ],
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(exchangeEncode.dca(...actual)).to.eql(expected);
+        });
+      });
+    });
+
+    describe('limitOrder()', () => {
+      const examples: Array<[[EthereumAddress, EthereumAddress, string, string, string, string], [fromToken: EthereumAddress, toToken: EthereumAddress, amount: string, targetPrice: string, goodUntil: string | number, orderType: OrderType]]> = [
+        [
+          [
+            web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+            web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
+            '2131',
+            '0.53123',
+            '1696590921159',
+            `${OrderType.STOP_LOSS}`
+          ],
+          [
+            web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+            web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
+            '2131',
+            '0.53123',
+            1696590921159,
+            OrderType.STOP_LOSS
+          ]
+        ],
+        [
+          [
+            web3Utils.toChecksumAddress(getAssetInfo('LINK', ChainId.Arbitrum).address),
+            web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Arbitrum).address),
+            '2131',
+            '0.43123',
+            '1646590921159',
+            `${OrderType.TAKE_PROFIT}`
+          ],
+          [
+            web3Utils.toChecksumAddress(getAssetInfo('LINK', ChainId.Arbitrum).address),
+            web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Arbitrum).address),
+            '2131',
+            '0.43123',
+            1646590921159,
+            OrderType.TAKE_PROFIT
+          ]
+        ],
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(exchangeEncode.limitOrder(...actual)).to.eql(expected);
+        });
+      });
+    });
+  });
+
+  describe('When testing strategySubService.crvUSDEncode', () => {
+    describe('leverageManagement()', () => {
+      const examples: Array<[
+        [StrategyOrBundleIds, boolean, TriggerData, SubData],
+        [owner: EthereumAddress, controllerAddr: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number, collTokenAddr: EthereumAddress, crvUSDAddr: EthereumAddress],
+      ]> = [
+        [
+          [
+            Bundles.MainnetIds.CRVUSD_REPAY,
+            true,
+            [
+              '0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c000000000000000000000000a920de414ea4ab66b97da1bfe9e6eca7d4219635000000000000000000000000000000000000000000000000136dcc951d8c00000000000000000000000000000000000000000000000000000000000000000001',
+            ],
+            [
+              '0x000000000000000000000000a920de414ea4ab66b97da1bfe9e6eca7d4219635',
+              '0x0000000000000000000000000000000000000000000000000000000000000001',
+              '0x0000000000000000000000000000000000000000000000001a5e27eef13e0000',
+              '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+              '0x000000000000000000000000f939e0a03fb07f59a73314e73794be0e57ac1b4e',
+            ],
+          ],
+          [
+            web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'),
+            web3Utils.toChecksumAddress('0xa920de414ea4ab66b97da1bfe9e6eca7d4219635'),
+            RatioState.UNDER,
+            190,
+            140,
+            '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
+            '0xf939E0A03FB07F59A73314E73794Be0E57ac1b4E',
+          ]
+        ],
+        [
+          [
+            Bundles.MainnetIds.CRVUSD_BOOST,
+            true,
+            [
+              '0x0000000000000000000000000043d218133afab8f2b829b106633e434ad94e2c000000000000000000000000a920de414ea4ab66b97da1bfe9e6eca7d42196350000000000000000000000000000000000000000000000001bc16d674ec800000000000000000000000000000000000000000000000000000000000000000000'
+            ],
+            [
+              '0x000000000000000000000000a920de414ea4ab66b97da1bfe9e6eca7d4219635',
+              '0x0000000000000000000000000000000000000000000000000000000000000000',
+              '0x00000000000000000000000000000000000000000000000016345785d8a00000',
+              '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+              '0x000000000000000000000000f939e0a03fb07f59a73314e73794be0e57ac1b4e',
+            ],
+          ],
+          [
+            web3Utils.toChecksumAddress('0x0043d218133AFaB8F2B829B106633E434Ad94E2c'),
+            web3Utils.toChecksumAddress('0xa920de414ea4ab66b97da1bfe9e6eca7d4219635'),
+            RatioState.OVER,
+            160,
+            200,
+            '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
+            '0xf939E0A03FB07F59A73314E73794Be0E57ac1b4E',
+          ]
+        ],
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(crvUSDEncode.leverageManagement(...actual)).to.eql(expected);
+        });
+      });
+    });
+    describe('payback()', () => {
+      const examples: Array<[
+        [StrategyOrBundleIds, boolean, TriggerData, SubData],
+        [owner: EthereumAddress, addressToPullTokensFrom: EthereumAddress, positionOwner: EthereumAddress, paybackAmount: string, crvUSDAddr: EthereumAddress, controllerAddr: EthereumAddress, minHealthRatio: number],
+      ]> = [
+        [
+          [
+            Strategies.MainnetIds.CURVEUSD_PAYBACK,
+            false,
+            [
+              '0x0000000000000000000000007a2af22ba3276108cd331c8985ef9528e10a871a000000000000000000000000a920de414ea4ab66b97da1bfe9e6eca7d421963500000000000000000000000000000000000000000000000002c68af0bb140000',
+            ],
+            [
+              '0x000000000000000000000000a920de414ea4ab66b97da1bfe9e6eca7d4219635',
+              '0x000000000000000000000000dc0ad7a48088f1aa55d26f8b36f7c1e827ddd280',
+              '0x000000000000000000000000dc0ad7a48088f1aa55d26f8b36f7c1e827ddd280',
+              '0x00000000000000000000000000000000000000000000043c33c1937564800000',
+              '0x000000000000000000000000f939e0a03fb07f59a73314e73794be0e57ac1b4e'
+            ],
+          ],
+          [
+            web3Utils.toChecksumAddress('0x7a2af22ba3276108cd331c8985ef9528e10a871a'),
+            web3Utils.toChecksumAddress('0xDc0Ad7a48088f1AA55d26f8b36F7C1E827DdD280'),
+            web3Utils.toChecksumAddress('0xDc0Ad7a48088f1AA55d26f8b36F7C1E827DdD280'),
+            '20000',
+            '0xf939E0A03FB07F59A73314E73794Be0E57ac1b4E',
+            web3Utils.toChecksumAddress('0xA920De414eA4Ab66b97dA1bFE9e6EcA7d4219635'),
+            20,
+          ]
+        ]
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(crvUSDEncode.payback(...actual)).to.eql(expected);
+        });
       });
     });
   });
 
-  describe('When testing strategySubService.sparkEncode', () => {
+  describe('When testing strategySubService.morphoBlueEncode', () => {
     describe('leverageManagement()', () => {
       const examples: Array<[
-        string,
-        [triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean],
+        [StrategyOrBundleIds, boolean, TriggerData, SubData],
+        [
+          marketId: string,
+          loanToken: EthereumAddress,
+          collToken: EthereumAddress,
+          oracle: EthereumAddress,
+          irm: EthereumAddress,
+          lltv: string,
+          ratioState: RatioState,
+          targetRatio: number,
+          triggerRatio: number,
+          user: EthereumAddress,
+          isEoa: boolean,
+          network: ChainId
+        ],
       ]> = [
         [
-          '0x000000000000000016345785d8a0000000000000000000001e87f85809dc0000000000000000000018fae27693b4000000000000000000001a5e27eef13e000001',
-          [160, 220, 180, 190, true]
+          [
+            Bundles.MainnetIds.MORPHO_BLUE_REPAY,
+            true,
+            [
+              '0xc54d7acf14de29e0e5527cabd7a576506870346a78a11a6762e2cca66322ec410000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c00000000000000000000000000000000000000000000000010a741a4627800000000000000000000000000000000000000000000000000000000000000000001',
+            ],
+            [
+              '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+              '0x0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0',
+              '0x0000000000000000000000002a01eb9496094da03c4e364def50f5ad1280ad72',
+              '0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc',
+              '0x0000000000000000000000000000000000000000000000000d1d507e40be8000',
+              '0x0000000000000000000000000000000000000000000000000000000000000001',
+              '0x000000000000000000000000000000000000000000000000136dcc951d8c0000',
+              '0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c',
+              '0x0000000000000000000000000000000000000000000000000000000000000000',
+            ],
+          ],
+          [
+            '0xc54d7acf14de29e0e5527cabd7a576506870346a78a11a6762e2cca66322ec41',
+            web3Utils.toChecksumAddress('0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2'),
+            web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'),
+            web3Utils.toChecksumAddress('0x2a01eb9496094da03c4e364def50f5ad1280ad72'),
+            web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'),
+            '945000000000000000',
+            RatioState.UNDER,
+            140,
+            120,
+            web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'),
+            false,
+            ChainId.Ethereum,
+          ]
         ],
         [
-          '0x000000000000000016345785d8a0000000000000000000001bc16d674ec80000000000000000000018fae27693b4000000000000000000001a5e27eef13e000000',
-          [160, 200, 180, 190, false]
+          [
+            Bundles.MainnetIds.MORPHO_BLUE_BOOST,
+            true,
+            [
+              '0xc54d7acf14de29e0e5527cabd7a576506870346a78a11a6762e2cca66322ec410000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c0000000000000000000000000000000000000000000000001bc16d674ec800000000000000000000000000000000000000000000000000000000000000000000'
+            ],
+            [
+              '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+              '0x0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0',
+              '0x0000000000000000000000002a01eb9496094da03c4e364def50f5ad1280ad72',
+              '0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc',
+              '0x0000000000000000000000000000000000000000000000000d1d507e40be8000',
+              '0x0000000000000000000000000000000000000000000000000000000000000000',
+              '0x00000000000000000000000000000000000000000000000016345785d8a00000',
+              '0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c',
+              '0x0000000000000000000000000000000000000000000000000000000000000000',
+            ],
+          ],
+          [
+            '0xc54d7acf14de29e0e5527cabd7a576506870346a78a11a6762e2cca66322ec41',
+            web3Utils.toChecksumAddress('0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2'),
+            web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'),
+            web3Utils.toChecksumAddress('0x2a01eb9496094da03c4e364def50f5ad1280ad72'),
+            web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'),
+            '945000000000000000',
+            RatioState.OVER,
+            160,
+            200,
+            web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'),
+            false,
+            ChainId.Ethereum,
+          ]
         ],
       ];
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(sparkEncode.leverageManagement(...actual)).to.eql(expected);
+          expect(morphoBlueEncode.leverageManagement(...actual)).to.eql(expected);
         });
       });
     });
 
-    describe('closeToAsset()', () => {
+    describe('closeOnPrice()', () => {
       const examples: Array<[
         [StrategyOrBundleIds, boolean, TriggerData, SubData],
         [
           strategyOrBundleId: number,
-          isBundle: boolean,
-          triggerData: {
-            baseTokenAddress: EthereumAddress, quoteTokenAddress: EthereumAddress, price: number, ratioState: RatioState
-          },
-          subData: {
-            collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number,
-          },
+          loanToken: EthereumAddress,
+          collToken: EthereumAddress,
+          oracle: EthereumAddress,
+          irm: EthereumAddress,
+          lltv: string,
+          user: EthereumAddress,
+          stopLossPrice: number,
+          stopLossType: CloseToAssetType,
+          takeProfitPrice: number,
+          takeProfitType: CloseToAssetType,
         ]
       ]> = [
         [
           [
-            Bundles.MainnetIds.SPARK_CLOSE_TO_COLLATERAL,
+            Bundles.MainnetIds.MORPHO_BLUE_CLOSE,
             true,
-            ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000006b175474e89094c44da98b954eedeac495271d0f00000000000000000000000000000000000000000000000000000026e1f9c6000000000000000000000000000000000000000000000000000000000000000000'],
+             ['0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc200000000000000000000000000000000000000000000000000000022ecb25c000000000000000000000000000000000000000000000000000000005d21dba000'],
             [
-              '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2', '0x0000000000000000000000000000000000000000000000000000000000000015',
-              '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f', '0x0000000000000000000000000000000000000000000000000000000000000020',
+              '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+              '0x0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0',
+              '0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc',
               '0x0000000000000000000000000000000000000000000000000000000000000000',
+              '0x0000000000000000000000000000000000000000000000000d1d507e40be8000',
+              '0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c',
+              '0x0000000000000000000000000000000000000000000000000000000000000005',
+            ],
+          ],
+          [
+            Bundles.MainnetIds.MORPHO_BLUE_CLOSE,
+            web3Utils.toChecksumAddress('0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2'),
+            web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'),
+            web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'),
+            web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
+            '945000000000000000',
+            web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'),
+            1500,
+            CloseToAssetType.DEBT,
+            4000,
+            CloseToAssetType.COLLATERAL
+          ]
+        ],
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(morphoBlueEncode.closeOnPrice(...actual)).to.eql(expected);
+        });
+      });
+    });
+  });
+
+  describe('When testing strategySubService.compoundV3L2Encode', () => {
+    describe('leverageManagement()', () => {
+      const examples: Array<[string, [EthereumAddress, EthereumAddress, number, number, number, number, boolean, boolean]]> = [
+        [
+          '0x0313D212133AFab8F2b829B1066c7e43caD94e2c0213D212133AfaB8F2b829B1066C7E43cAD94E2c000000000000000016345785d8a0000000000000000000001e87f85809dc0000000000000000000018fae27693b4000000000000000000001a5e27eef13e00000100',
+          [
+            web3Utils.toChecksumAddress('0x0313d212133AFaB8F2B829B1066c7E43cAd94E2c'),
+            web3Utils.toChecksumAddress('0x0213d212133AFaB8F2B829B1066c7E43cAd94E2c'),
+            160, 220, 180, 190,
+            true,
+            false,
+          ],
+        ],
+        [
+          '0x0313D212133AFab8F2b829B1066c7e43caD94e2c0413d212133afAb8F2B829b1066C7e43cAd94e2c000000000000000016345785d8a0000000000000000000001e87f85809dc0000000000000000000018fae27693b4000000000000000000000f43fc2c04ee00000000',
+          [
+            web3Utils.toChecksumAddress('0x0313d212133AFaB8F2B829B1066c7E43cAd94E2c'),
+            web3Utils.toChecksumAddress('0x0413d212133AFaB8F2B829B1066c7E43cAd94E2c'),
+            160, 220, 180, 110,
+            false,
+            false,
+          ],
+        ],
+      ];
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(compoundV3L2Encode.leverageManagement(...actual)).to.eql(expected);
+        });
+      });
+    });
+  });
+
+  describe('When testing strategySubService.sparkEncode', () => {
+    describe('leverageManagement()', () => {
+      const examples: Array<[string, [number, number, number, number, boolean]]> = [
+        [
+          '0x0000000000000000136dcc951d8c00000000000000000000214e8348c4f0000000000000000000001d24b2dfac52000000000000000000001a5e27eef13e000001',
+          [140,240,210,190,true]
+        ],
+        [
+          '0x0000000000000000130337bdce49000000000000000000001988fe4052b800000000000000000000281b57b028e1000000000000000000002223acf76376000000',
+          [137, 184, 289, 246, false]
+        ]
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(sparkEncode.leverageManagement(...actual)).to.eql(expected);
+        });
+      });
+    });
+
+    describe('leverageManagementOnPrice()', () => {
+      const examples: Array<[[StrategyOrBundleIds, boolean, TriggerData, SubData], 
+      [
+        strategyOrBundleId: number, 
+        isBundle: boolean, 
+        triggerData: { baseTokenAddr: EthereumAddress, quoteTokenAddr: EthereumAddress, price: number, ratioState: RatioState }, 
+        subData: { collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, marketAddr: EthereumAddress, targetRatio: number }
+      ]]> = [
+        [
+          [
+            Bundles.MainnetIds.SPARK_REPAY_ON_PRICE,
+            true,
+            ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480000000000000000000000000000000000000000000000000000003a352944000000000000000000000000000000000000000000000000000000000000000001'],
+            ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+             '0x0000000000000000000000000000000000000000000000000000000000000000',
+             '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+             '0x0000000000000000000000000000000000000000000000000000000000000001',
+             '0x00000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee',
+             '0x0000000000000000000000000000000000000000000000001bc16d674ec80000',
+             '0x0000000000000000000000000000000000000000000000000000000000000000',
             ],
           ],
           [
-            Bundles.MainnetIds.SPARK_CLOSE_TO_COLLATERAL,
+            59,
             true,
             {
-              baseTokenAddress: getAssetInfo('WETH').address, quoteTokenAddress: getAssetInfo('DAI').address, price: 1670, ratioState: RatioState.OVER
+              baseTokenAddr: web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+              quoteTokenAddr: web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+              price: 2500,
+              ratioState: RatioState.UNDER,
             },
             {
-              collAsset: getAssetInfo('WETH').address, collAssetId: 21, debtAsset: getAssetInfo('DAI').address, debtAssetId: 32,
+              collAsset: web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+              collAssetId: 0,
+              debtAsset: web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+              debtAssetId: 1,
+              marketAddr: web3Utils.toChecksumAddress('0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE'),
+              targetRatio: 200,
             },
           ]
         ],
         [
           [
-            Bundles.MainnetIds.SPARK_CLOSE_TO_DEBT,
+            Bundles.MainnetIds.SPARK_BOOST_ON_PRICE,
             true,
-            ['0x000000000000000000000000514910771af9ca656af840dff83e8264ecf986ca0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f0000000000000000000000000000000000000000000000000000000000084d000000000000000000000000000000000000000000000000000000000000000001'],
+            ['0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c5990000000000000000000000006b175474e89094c44da98b954eedeac495271d0f00000000000000000000000000000000000000000000000000000417bce6c8000000000000000000000000000000000000000000000000000000000000000000'],
             [
-              '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f', '0x0000000000000000000000000000000000000000000000000000000000000015',
-              '0x000000000000000000000000514910771af9ca656af840dff83e8264ecf986ca', '0x0000000000000000000000000000000000000000000000000000000000000020',
+              '0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c599',
+              '0x0000000000000000000000000000000000000000000000000000000000000002',
+              '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f',
+              '0x0000000000000000000000000000000000000000000000000000000000000004',
+              '0x00000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee',
+              '0x00000000000000000000000000000000000000000000000022b1c8c1227a0000',
               '0x0000000000000000000000000000000000000000000000000000000000000000',
-            ],
+            ]
           ],
           [
-            Bundles.MainnetIds.SPARK_CLOSE_TO_DEBT,
+            60,
             true,
             {
-              baseTokenAddress: getAssetInfo('LINK').address, quoteTokenAddress: getAssetInfo('DAI').address, price: 0.00544, ratioState: RatioState.UNDER
+              baseTokenAddr: web3Utils.toChecksumAddress(getAssetInfo('WBTC', ChainId.Ethereum).address),
+              quoteTokenAddr: web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
+              price: 45000,
+              ratioState: RatioState.OVER,
             },
             {
-              collAsset: getAssetInfo('DAI').address, collAssetId: 21, debtAsset: getAssetInfo('LINK').address, debtAssetId: 32,
+              collAsset: web3Utils.toChecksumAddress(getAssetInfo('WBTC', ChainId.Ethereum).address),
+              collAssetId: 2,
+              debtAsset: web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
+              debtAssetId: 4,
+              marketAddr: web3Utils.toChecksumAddress('0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE'),
+              targetRatio: 250,
             },
           ]
         ]
@@ -883,240 +1832,305 @@ describe('Feature: strategySubService.ts', () => {
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(sparkEncode.closeToAsset(...actual)).to.eql(expected);
+          expect(sparkEncode.leverageManagementOnPrice(...actual)).to.eql(expected);
         });
       });
     });
-  });
 
-  describe('When testing strategySubService.crvUSDEncode', () => {
-    describe('leverageManagement()', () => {
+    describe('closeOnPrice()', () => {
       const examples: Array<[
         [StrategyOrBundleIds, boolean, TriggerData, SubData],
-        [owner: EthereumAddress, controllerAddr: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number, collTokenAddr: EthereumAddress, crvUSDAddr: EthereumAddress],
-      ]> = [
+        [
+          strategyOrBundleId: number,
+          collAsset: EthereumAddress,
+          collAssetId: number,
+          debtAsset: EthereumAddress,
+          debtAssetId: number,
+          marketAddr: EthereumAddress,
+          user: EthereumAddress,
+          stopLossPrice: number,
+          stopLossType: CloseToAssetType,
+          takeProfitPrice: number,
+          takeProfitType: CloseToAssetType,
+        ]
+      ] > = 
+      [
         [
           [
-            Bundles.MainnetIds.CRVUSD_REPAY,
+            Bundles.MainnetIds.SPARK_CLOSE,
             true,
+            ['0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c5990000000000000000000000006b175474e89094c44da98b954eedeac495271d0f000000000000000000000000000000000000000000000000000003a35294400000000000000000000000000000000000000000000000000000000574fbde6000'],
             [
-              '0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c000000000000000000000000a920de414ea4ab66b97da1bfe9e6eca7d4219635000000000000000000000000000000000000000000000000136dcc951d8c00000000000000000000000000000000000000000000000000000000000000000001',
-            ],
+              '0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c599',
+              '0x0000000000000000000000000000000000000000000000000000000000000002',
+              '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f',
+              '0x0000000000000000000000000000000000000000000000000000000000000004',
+              '0x0000000000000000000000000000000000000000000000000000000000000005',
+              '0x00000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee',
+              '0x0000000000000000000000001234567890123456789012345678901234567890',
+            ]
+          ],
+          [
+            57,
+            web3Utils.toChecksumAddress(getAssetInfo('WBTC', ChainId.Ethereum).address),
+            2,
+            web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
+            4,
+            web3Utils.toChecksumAddress('0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE'),
+            web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
+            40000,
+            CloseToAssetType.DEBT,
+            60000,
+            CloseToAssetType.COLLATERAL,
+          ]
+        ],
+      ]
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(sparkEncode.closeOnPriceGeneric(...actual)).to.eql(expected);
+        });
+      });
+    });
+
+    describe('collateralSwitch()', () => {
+      const examples: Array<[
+        [StrategyOrBundleIds, boolean, TriggerData, SubData],
+        [
+          strategyOrBundleId: number,
+          fromAsset: EthereumAddress,
+          fromAssetId: number,
+          toAsset: EthereumAddress,
+          toAssetId: number,
+          marketAddr: EthereumAddress,
+          amountToSwitch: string,
+          baseTokenAddress: EthereumAddress,
+          quoteTokenAddress: EthereumAddress,
+          price: number,
+          state: RatioState,
+        ]
+      ]> = [
+        // WETH -> cbBTC, price 0.025 WETH/cbBTC, state UNDER
+        [
+          [
+            Strategies.MainnetIds.SPARK_COLLATERAL_SWITCH,
+            false,
+            ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000cbb7c0000ab88b473b1f5afd9ef808440eed33bf00000000000000000000000000000000000000000000000000000000002625a00000000000000000000000000000000000000000000000000000000000000001'],
             [
-              '0x000000000000000000000000a920de414ea4ab66b97da1bfe9e6eca7d4219635',
-              '0x0000000000000000000000000000000000000000000000000000000000000001',
-              '0x0000000000000000000000000000000000000000000000001a5e27eef13e0000',
               '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-              '0x000000000000000000000000f939e0a03fb07f59a73314e73794be0e57ac1b4e',
+              '0x0000000000000000000000000000000000000000000000000000000000000000',
+              '0x000000000000000000000000cbb7c0000ab88b473b1f5afd9ef808440eed33bf',
+              '0x0000000000000000000000000000000000000000000000000000000000000007',
+              '0x00000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee',
+              '0x0000000000000000000000000000000000000000000000008ac7230489e80000',
+              '0x0000000000000000000000000000000000000000000000000000000000000000',
             ],
           ],
           [
-            web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'),
-            web3Utils.toChecksumAddress('0xa920de414ea4ab66b97da1bfe9e6eca7d4219635'),
+            Strategies.MainnetIds.SPARK_COLLATERAL_SWITCH,
+            web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+            0,
+            web3Utils.toChecksumAddress(getAssetInfo('cbBTC', ChainId.Ethereum).address),
+            7,
+            web3Utils.toChecksumAddress('0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE'),
+            '10000000000000000000', // 10 WETH
+            web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+            web3Utils.toChecksumAddress(getAssetInfo('cbBTC', ChainId.Ethereum).address),
+            0.025,
             RatioState.UNDER,
-            190,
-            140,
-            '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
-            '0xf939E0A03FB07F59A73314E73794Be0E57ac1b4E',
           ]
         ],
+        // cbBTC -> WETH, price 25 cbBTC/WETH, state UNDER
         [
           [
-            Bundles.MainnetIds.CRVUSD_BOOST,
-            true,
+            Strategies.MainnetIds.SPARK_COLLATERAL_SWITCH,
+            false,
+            ['0x000000000000000000000000cbb7c0000ab88b473b1f5afd9ef808440eed33bf000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000000000000000000000000000000000009502f9000000000000000000000000000000000000000000000000000000000000000001'],
             [
-              '0x0000000000000000000000000043d218133afab8f2b829b106633e434ad94e2c000000000000000000000000a920de414ea4ab66b97da1bfe9e6eca7d42196350000000000000000000000000000000000000000000000001bc16d674ec800000000000000000000000000000000000000000000000000000000000000000000'
+              '0x000000000000000000000000cbb7c0000ab88b473b1f5afd9ef808440eed33bf',
+              '0x0000000000000000000000000000000000000000000000000000000000000007',
+              '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+              '0x0000000000000000000000000000000000000000000000000000000000000000',
+              '0x00000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee',
+              '0x0000000000000000000000000000000000000000000000000000000005f5e100',
+              '0x0000000000000000000000000000000000000000000000000000000000000000',
             ],
+          ],
+          [
+            Strategies.MainnetIds.SPARK_COLLATERAL_SWITCH,
+            web3Utils.toChecksumAddress(getAssetInfo('cbBTC', ChainId.Ethereum).address),
+            7,
+            web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+            0,
+            web3Utils.toChecksumAddress('0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE'),
+            '100000000', // 1 cbBTC (8 decimals)
+            web3Utils.toChecksumAddress(getAssetInfo('cbBTC', ChainId.Ethereum).address),
+            web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+            25,
+            RatioState.UNDER,
+          ]
+        ],
+        // cbBTC -> WETH, price 40 cbBTC/WETH, state OVER
+        [
+          [
+            Strategies.MainnetIds.SPARK_COLLATERAL_SWITCH,
+            false,
+            ['0x000000000000000000000000cbb7c0000ab88b473b1f5afd9ef808440eed33bf000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc200000000000000000000000000000000000000000000000000000000ee6b28000000000000000000000000000000000000000000000000000000000000000000'],
             [
-              '0x000000000000000000000000a920de414ea4ab66b97da1bfe9e6eca7d4219635',
-              '0x0000000000000000000000000000000000000000000000000000000000000000',
-              '0x00000000000000000000000000000000000000000000000016345785d8a00000',
+              '0x000000000000000000000000cbb7c0000ab88b473b1f5afd9ef808440eed33bf',
+              '0x0000000000000000000000000000000000000000000000000000000000000007',
               '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-              '0x000000000000000000000000f939e0a03fb07f59a73314e73794be0e57ac1b4e',
+              '0x0000000000000000000000000000000000000000000000000000000000000000',
+              '0x00000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee',
+              '0x0000000000000000000000000000000000000000000000000000000005f5e100',
+              '0x0000000000000000000000000000000000000000000000000000000000000000',
             ],
           ],
           [
-            web3Utils.toChecksumAddress('0x0043d218133AFaB8F2B829B106633E434Ad94E2c'),
-            web3Utils.toChecksumAddress('0xa920de414ea4ab66b97da1bfe9e6eca7d4219635'),
+            Strategies.MainnetIds.SPARK_COLLATERAL_SWITCH,
+            web3Utils.toChecksumAddress(getAssetInfo('cbBTC', ChainId.Ethereum).address),
+            7,
+            web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+            0,
+            web3Utils.toChecksumAddress('0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE'),
+            '100000000', // 1 cbBTC (8 decimals)
+            web3Utils.toChecksumAddress(getAssetInfo('cbBTC', ChainId.Ethereum).address),
+            web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+            40,
             RatioState.OVER,
-            160,
-            200,
-            '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
-            '0xf939E0A03FB07F59A73314E73794Be0E57ac1b4E',
           ]
         ],
       ];
 
       examples.forEach(([expected, actual]) => {
-        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(crvUSDEncode.leverageManagement(...actual)).to.eql(expected);
+        it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(sparkEncode.collateralSwitch(...actual)).to.eql(expected);
         });
       });
     });
-    describe('payback()', () => {
+  });
+
+  describe('When testing strategySubService.aaveV4Encode', () => {
+    describe('leverageManagement()', () => {
       const examples: Array<[
         [StrategyOrBundleIds, boolean, TriggerData, SubData],
-        [owner: EthereumAddress, addressToPullTokensFrom: EthereumAddress, positionOwner: EthereumAddress, paybackAmount: string, crvUSDAddr: EthereumAddress, controllerAddr: EthereumAddress, minHealthRatio: number],
+        [
+          strategyOrBundleId: number, owner: EthereumAddress, spoke: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number
+        ]
       ]> = [
         [
+          [1,true,["0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e00000000000000000000000000000000000000000000000010a741a4627800000000000000000000000000000000000000000000000000000000000000000001"],["0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e","0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c","0x0000000000000000000000000000000000000000000000000000000000000001","0x00000000000000000000000000000000000000000000000014d1120d7b160000","0x0000000000000000000000000000000000000000000000000000000000000000","0x0000000000000000000000000000000000000000000000000000000000000000"]],
           [
-            Strategies.MainnetIds.CURVEUSD_PAYBACK,
-            false,
-            [
-              '0x0000000000000000000000007a2af22ba3276108cd331c8985ef9528e10a871a000000000000000000000000a920de414ea4ab66b97da1bfe9e6eca7d421963500000000000000000000000000000000000000000000000002c68af0bb140000',
-            ],
-            [
-              '0x000000000000000000000000a920de414ea4ab66b97da1bfe9e6eca7d4219635',
-              '0x000000000000000000000000dc0ad7a48088f1aa55d26f8b36f7c1e827ddd280',
-              '0x000000000000000000000000dc0ad7a48088f1aa55d26f8b36f7c1e827ddd280',
-              '0x00000000000000000000000000000000000000000000043c33c1937564800000',
-              '0x000000000000000000000000f939e0a03fb07f59a73314e73794be0e57ac1b4e'
-            ],
-          ],
-          [
-            web3Utils.toChecksumAddress('0x7a2af22ba3276108cd331c8985ef9528e10a871a'),
-            web3Utils.toChecksumAddress('0xDc0Ad7a48088f1AA55d26f8b36F7C1E827DdD280'),
-            web3Utils.toChecksumAddress('0xDc0Ad7a48088f1AA55d26f8b36F7C1E827DdD280'),
-            '20000',
-            '0xf939E0A03FB07F59A73314E73794Be0E57ac1b4E',
-            web3Utils.toChecksumAddress('0xA920De414eA4Ab66b97dA1bFE9e6EcA7d4219635'),
-            20,
+            1,
+            web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'),
+            web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'),
+            RatioState.UNDER,
+            150,
+            120,
           ]
         ]
       ];
 
       examples.forEach(([expected, actual]) => {
-        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(crvUSDEncode.payback(...actual)).to.eql(expected);
+        it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(aaveV4Encode.leverageManagement(...actual)).to.eql(expected);
         });
       });
     });
-  });
-  describe('When testing strategySubService.morphoBlueEncode', () => {
-    describe('leverageManagement()', () => {
+
+    describe('leverageManagementOnPrice()', () => {
       const examples: Array<[
         [StrategyOrBundleIds, boolean, TriggerData, SubData],
         [
-          marketId: string,
-          loanToken: EthereumAddress,
-          collToken: EthereumAddress,
-          oracle: EthereumAddress,
-          irm: EthereumAddress,
-          lltv: string,
-          ratioState: RatioState,
-          targetRatio: number,
-          triggerRatio: number,
-          user: EthereumAddress,
-          isEoa: boolean,
-          network: ChainId
-        ],
+          strategyOrBundleId: number, owner: EthereumAddress, spoke: EthereumAddress, collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, targetRatio: number, price: string, priceState: RatioState, ratioState: RatioState
+        ]
       ]> = [
         [
+          [2,true,["0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000005150ae84a8cdf000000000000000000000000000000000000000000000000000000000000000000000"],["0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e","0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c","0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2","0x000000000000000000000000000000000000000000000000000000000000000a","0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48","0x0000000000000000000000000000000000000000000000000000000000000014","0x0000000000000000000000000000000000000000000000000000000000000000","0x00000000000000000000000000000000000000000000000016345785d8a00000","0x0000000000000000000000000000000000000000000000000000000000000000","0x0000000000000000000000000000000000000000000000000000000000000000"]],
           [
-            Bundles.MainnetIds.MORPHO_BLUE_REPAY,
-            true,
-            [
-              '0xc54d7acf14de29e0e5527cabd7a576506870346a78a11a6762e2cca66322ec410000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c00000000000000000000000000000000000000000000000010a741a4627800000000000000000000000000000000000000000000000000000000000000000001',
-            ],
-            [
-              '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-              '0x0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0',
-              '0x0000000000000000000000002a01eb9496094da03c4e364def50f5ad1280ad72',
-              '0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc',
-              '0x0000000000000000000000000000000000000000000000000d1d507e40be8000',
-              '0x0000000000000000000000000000000000000000000000000000000000000001',
-              '0x000000000000000000000000000000000000000000000000136dcc951d8c0000',
-              '0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c',
-              '0x0000000000000000000000000000000000000000000000000000000000000000',
-            ],
-          ],
-          [
-            '0xc54d7acf14de29e0e5527cabd7a576506870346a78a11a6762e2cca66322ec41',
-            web3Utils.toChecksumAddress('0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2'),
-            web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'),
-            web3Utils.toChecksumAddress('0x2a01eb9496094da03c4e364def50f5ad1280ad72'),
-            web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'),
-            '945000000000000000',
-            RatioState.UNDER,
-            140,
-            120,
+            2,
             web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'),
-            false,
-            ChainId.Ethereum,
+            web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'),
+            web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'),
+            10,
+            web3Utils.toChecksumAddress('0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48'),
+            20,
+            160,
+            '1500',
+            RatioState.OVER, // priceState - goes to trigger
+            RatioState.OVER, // ratioState - UNDER for repay, OVER for boost
           ]
-        ],
+        ]
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(aaveV4Encode.leverageManagementOnPrice(...actual)).to.eql(expected);
+        });
+      });
+    });
+
+    describe('closeOnPrice()', () => {
+      const examples: Array<[
+        [StrategyOrBundleIds, boolean, TriggerData, SubData],
         [
+          strategyOrBundleId: number, owner: EthereumAddress, spoke: EthereumAddress, collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, stopLossPrice: string, stopLossType: CloseToAssetType, takeProfitPrice: string, takeProfitType: CloseToAssetType
+        ]
+      ]> = [
+        [
+          [3,true,["0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000004be4e7267b6ae000000000000000000000000000000000000000000000000000000000000000000000"],["0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e","0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c","0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2","0x000000000000000000000000000000000000000000000000000000000000000a","0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48","0x0000000000000000000000000000000000000000000000000000000000000014","0x0000000000000000000000000000000000000000000000000000000000000003","0x0000000000000000000000000000000000000000000000000000000000000000","0x0000000000000000000000000000000000000000000000000000000000000000"]],
           [
-            Bundles.MainnetIds.MORPHO_BLUE_BOOST,
-            true,
-            [
-              '0xc54d7acf14de29e0e5527cabd7a576506870346a78a11a6762e2cca66322ec410000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c0000000000000000000000000000000000000000000000001bc16d674ec800000000000000000000000000000000000000000000000000000000000000000000'
-            ],
-            [
-              '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-              '0x0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0',
-              '0x0000000000000000000000002a01eb9496094da03c4e364def50f5ad1280ad72',
-              '0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc',
-              '0x0000000000000000000000000000000000000000000000000d1d507e40be8000',
-              '0x0000000000000000000000000000000000000000000000000000000000000000',
-              '0x00000000000000000000000000000000000000000000000016345785d8a00000',
-              '0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c',
-              '0x0000000000000000000000000000000000000000000000000000000000000000',
-            ],
-          ],
-          [
-            '0xc54d7acf14de29e0e5527cabd7a576506870346a78a11a6762e2cca66322ec41',
-            web3Utils.toChecksumAddress('0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2'),
-            web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'),
-            web3Utils.toChecksumAddress('0x2a01eb9496094da03c4e364def50f5ad1280ad72'),
-            web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'),
-            '945000000000000000',
-            RatioState.OVER,
-            160,
-            200,
+            3,
             web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'),
-            false,
-            ChainId.Ethereum,
+            web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'),
+            web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'),
+            10,
+            web3Utils.toChecksumAddress('0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48'),
+            20,
+            '1400',
+            CloseToAssetType.DEBT,
+            '0',
+            CloseToAssetType.COLLATERAL
           ]
-        ],
+        ]
       ];
 
       examples.forEach(([expected, actual]) => {
-        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(morphoBlueEncode.leverageManagement(...actual)).to.eql(expected);
+        it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(aaveV4Encode.closeOnPrice(...actual)).to.eql(expected);
         });
       });
     });
-  });
 
-  describe('When testing strategySubService.compoundV3L2Encode', () => {
-    describe('leverageManagement()', () => {
-      const examples: Array<[string, [EthereumAddress, EthereumAddress, number, number, number, number, boolean]]> = [
+    describe('collateralSwitch()', () => {
+      const examples: Array<[
+        [StrategyOrBundleIds, boolean, TriggerData, SubData],
         [
-          '0x0313D212133AFab8F2b829B1066c7e43caD94e2c0213D212133AfaB8F2b829B1066C7E43cAD94E2c000000000000000016345785d8a0000000000000000000001e87f85809dc0000000000000000000018fae27693b4000000000000000000001a5e27eef13e000001',
-          [
-            web3Utils.toChecksumAddress('0x0313d212133AFaB8F2B829B1066c7E43cAd94E2c'),
-            web3Utils.toChecksumAddress('0x0213d212133AFaB8F2B829B1066c7E43cAd94E2c'),
-            160, 220, 180, 190,
-            true
-          ],
-        ],
+          strategyOrBundleId: number, owner: EthereumAddress, spoke: EthereumAddress, fromAsset: EthereumAddress, fromAssetId: number, toAsset: EthereumAddress, toAssetId: number, amountToSwitch: string, price: string, ratioState: RatioState
+        ]
+      ]> = [
         [
-          '0x0313D212133AFab8F2b829B1066c7e43caD94e2c0413d212133afAb8F2B829b1066C7e43cAd94e2c000000000000000016345785d8a0000000000000000000001e87f85809dc0000000000000000000018fae27693b4000000000000000000000f43fc2c04ee000000',
+          [4,false,["0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000005150ae84a8cdf000000000000000000000000000000000000000000000000000000000000000000001"],["0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e","0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c","0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2","0x000000000000000000000000000000000000000000000000000000000000000a","0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48","0x0000000000000000000000000000000000000000000000000000000000000014","0x0000000000000000000000000000000000000000000000000de0b6b3a7640000","0x0000000000000000000000000000000000000000000000000000000000000000","0x0000000000000000000000000000000000000000000000000000000000000000"]],
           [
-            web3Utils.toChecksumAddress('0x0313d212133AFaB8F2B829B1066c7E43cAd94E2c'),
-            web3Utils.toChecksumAddress('0x0413d212133AFaB8F2B829B1066c7E43cAd94E2c'),
-            160, 220, 180, 110,
-            false
-          ],
-        ],
+            4,
+            web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'),
+            web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'),
+            web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'),
+            10,
+            web3Utils.toChecksumAddress('0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48'),
+            20,
+            '1000000000000000000',
+            '1500',
+            RatioState.UNDER,
+          ]
+        ]
       ];
+
       examples.forEach(([expected, actual]) => {
-        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(compoundV3L2Encode.leverageManagement(...actual)).to.eql(expected);
+        it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(aaveV4Encode.collateralSwitch(...actual)).to.eql(expected);
         });
       });
     });
   });
-
 });