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

package/esm/services/subDataService.test.js

@@ -2,9 +2,10 @@ import Dec from 'decimal.js';
 import { expect } from 'chai';
 import { getAssetInfo } from '@defisaver/tokens';
 import * as web3Utils from 'web3-utils';
-import { ChainId, OrderType, RatioState } from '../types/enums';
+import { MAXUINT } from '@defisaver/tokens';
+import { ChainId, CloseStrategyType, OrderType, RatioState } from '../types/enums';
 import '../configuration';
-import { aaveV2LeverageManagementSubData, aaveV3LeverageManagementSubData, aaveV3QuotePriceSubData, cBondsRebondSubData, compoundV2LeverageManagementSubData, compoundV3LeverageManagementSubData, exchangeDcaSubData, exchangeLimitOrderSubData, liquityCloseSubData, liquityDebtInFrontRepaySubData, liquityDsrPaybackSubData, liquityDsrSupplySubData, liquityLeverageManagementSubData, liquityPaybackUsingChickenBondSubData, liquityRepayFromSavingsSubData, makerCloseSubData, makerLeverageManagementSubData, makerRepayFromSavingsSubData, morphoAaveV2LeverageManagementSubData, sparkLeverageManagementSubData, sparkQuotePriceSubData, crvUSDLeverageManagementSubData, compoundV3L2LeverageManagementSubData, morphoBlueLeverageManagementSubData, crvUSDPaybackSubData, aaveV3LeverageManagementOnPriceSubData, } from './subDataService';
+import * as subDataService from './subDataService';
 describe('Feature: subDataService.ts', () => {
     describe('When testing subDataService.makerRepayFromSavingsSubData', () => {
         describe('encode()', () => {
@@ -19,7 +20,7 @@ describe('Feature: subDataService.ts', () => {
             ];
             examples.forEach(([expected, actual]) => {
                 it(`Given ${actual} should return expected value: ${expected}`, () => {
-                    expect(makerRepayFromSavingsSubData.encode(...actual)).to.eql(expected);
+                    expect(subDataService.makerRepayFromSavingsSubData.encode(...actual)).to.eql(expected);
                 });
             });
         });
@@ -40,7 +41,7 @@ describe('Feature: subDataService.ts', () => {
             ];
             examples.forEach(([expected, actual]) => {
                 it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    expect(makerRepayFromSavingsSubData.decode(actual)).to.eql(expected);
+                    expect(subDataService.makerRepayFromSavingsSubData.decode(actual)).to.eql(expected);
                 });
             });
         });
@@ -58,7 +59,7 @@ describe('Feature: subDataService.ts', () => {
             ];
             examples.forEach(([expected, actual]) => {
                 it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    expect(liquityRepayFromSavingsSubData.decode(actual)).to.eql(expected);
+                    expect(subDataService.liquityRepayFromSavingsSubData.decode(actual)).to.eql(expected);
                 });
             });
         });
@@ -83,7 +84,7 @@ describe('Feature: subDataService.ts', () => {
             ];
             examples.forEach(([expected, actual]) => {
                 it(`Given ${actual} should return expected value: ${expected}`, () => {
-                    expect(makerCloseSubData.encode(...actual)).to.eql(expected);
+                    expect(subDataService.makerCloseSubData.encode(...actual)).to.eql(expected);
                 });
             });
         });
@@ -112,7 +113,7 @@ describe('Feature: subDataService.ts', () => {
             ];
             examples.forEach(([expected, actual]) => {
                 it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    expect(makerCloseSubData.decode(actual)).to.eql(expected);
+                    expect(subDataService.makerCloseSubData.decode(actual)).to.eql(expected);
                 });
             });
         });
@@ -130,7 +131,63 @@ describe('Feature: subDataService.ts', () => {
             ];
             examples.forEach(([expected, actual]) => {
                 it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    expect(makerLeverageManagementSubData.decode(actual)).to.eql(expected);
+                    expect(subDataService.makerLeverageManagementSubData.decode(actual)).to.eql(expected);
+                });
+            });
+        });
+    });
+    describe('When testing subDataService.makerLeverageManagementWithoutSubProxy', () => {
+        describe('encode()', () => {
+            const examples = [
+                [
+                    [
+                        '0x00000000000000000000000000000000000000000000000000000000000000de', '0x00000000000000000000000000000000000000000000000018fae27693b40000',
+                        '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f',
+                    ],
+                    [222, 180], // Uses default DAI address
+                ],
+                [
+                    [
+                        '0x000000000000000000000000000000000000000000000000000000000000014d', '0x0000000000000000000000000000000000000000000000001bc16d674ec80000',
+                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                    ],
+                    [333, 200, web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address)], // Custom address
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${expected}`, () => {
+                    expect(subDataService.makerLeverageManagementWithoutSubProxy.encode(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe('decode()', () => {
+            const examples = [
+                [
+                    {
+                        vaultId: 222,
+                        targetRatio: 180,
+                        daiAddr: web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
+                    },
+                    [
+                        '0x00000000000000000000000000000000000000000000000000000000000000de', '0x00000000000000000000000000000000000000000000000018fae27693b40000',
+                        '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f',
+                    ],
+                ],
+                [
+                    {
+                        vaultId: 333,
+                        targetRatio: 200,
+                        daiAddr: web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+                    },
+                    [
+                        '0x000000000000000000000000000000000000000000000000000000000000014d', '0x0000000000000000000000000000000000000000000000001bc16d674ec80000',
+                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                    ],
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(subDataService.makerLeverageManagementWithoutSubProxy.decode(actual)).to.eql(expected);
                 });
             });
         });
@@ -148,7 +205,7 @@ describe('Feature: subDataService.ts', () => {
             ];
             examples.forEach(([expected, actual]) => {
                 it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    expect(liquityLeverageManagementSubData.decode(actual)).to.eql(expected);
+                    expect(subDataService.liquityLeverageManagementSubData.decode(actual)).to.eql(expected);
                 });
             });
         });
@@ -171,7 +228,7 @@ describe('Feature: subDataService.ts', () => {
             ];
             examples.forEach(([expected, actual]) => {
                 it(`Given ${actual} should return expected value: ${expected}`, () => {
-                    expect(liquityCloseSubData.encode(...actual)).to.eql(expected);
+                    expect(subDataService.liquityCloseSubData.encode(...actual)).to.eql(expected);
                 });
             });
         });
@@ -198,7 +255,7 @@ describe('Feature: subDataService.ts', () => {
             ];
             examples.forEach(([expected, actual]) => {
                 it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    expect(liquityCloseSubData.decode(actual)).to.eql(expected);
+                    expect(subDataService.liquityCloseSubData.decode(actual)).to.eql(expected);
                 });
             });
         });
@@ -217,7 +274,7 @@ describe('Feature: subDataService.ts', () => {
             ];
             examples.forEach(([expected, actual]) => {
                 it(`Given ${actual} should return expected value: ${expected}`, () => {
-                    expect(aaveV2LeverageManagementSubData.encode(...actual)).to.eql(expected);
+                    expect(subDataService.aaveV2LeverageManagementSubData.encode(...actual)).to.eql(expected);
                 });
             });
         });
@@ -234,7 +291,7 @@ describe('Feature: subDataService.ts', () => {
             ];
             examples.forEach(([expected, actual]) => {
                 it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    expect(aaveV2LeverageManagementSubData.decode(actual)).to.eql(expected);
+                    expect(subDataService.aaveV2LeverageManagementSubData.decode(actual)).to.eql(expected);
                 });
             });
         });
@@ -253,7 +310,7 @@ describe('Feature: subDataService.ts', () => {
             ];
             examples.forEach(([expected, actual]) => {
                 it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    expect(aaveV3LeverageManagementSubData.decode(actual)).to.eql(expected);
+                    expect(subDataService.aaveV3LeverageManagementSubData.decode(actual)).to.eql(expected);
                 });
             });
         });
@@ -290,7 +347,7 @@ describe('Feature: subDataService.ts', () => {
             ];
             examples.forEach(([expected, actual]) => {
                 it(`Given ${actual} should return expected value: ${expected}`, () => {
-                    expect(aaveV3QuotePriceSubData.encode(...actual)).to.eql(expected);
+                    expect(subDataService.aaveV3QuotePriceSubData.encode(...actual)).to.eql(expected);
                 });
             });
         });
@@ -325,7 +382,269 @@ describe('Feature: subDataService.ts', () => {
             ];
             examples.forEach(([expected, actual]) => {
                 it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    expect(aaveV3QuotePriceSubData.decode(actual)).to.eql(expected);
+                    expect(subDataService.aaveV3QuotePriceSubData.decode(actual)).to.eql(expected);
+                });
+            });
+        });
+    });
+    describe('When testing subDataService.aaveV3CollateralSwitchSubData', () => {
+        describe('encode()', () => {
+            const examples = [
+                // WETH -> USDC
+                [
+                    [
+                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                        '0x0000000000000000000000000000000000000000000000000000000000000001',
+                        '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
+                        '0x0000000000000000000000000000000000000000000000008ac7230489e80000',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                    ],
+                    [
+                        web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+                        0,
+                        web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+                        1,
+                        web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
+                        '10000000000000000000',
+                        false,
+                    ]
+                ],
+                // USDC -> WETH (MaxUint256)
+                [
+                    [
+                        '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                        '0x0000000000000000000000000000000000000000000000000000000000000001',
+                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
+                        '0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                    ],
+                    [
+                        web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+                        1,
+                        web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+                        0,
+                        web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
+                        MAXUINT, // MaxUint256
+                    ]
+                ],
+                // WETH -> WBTC
+                [
+                    [
+                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        '0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c599',
+                        '0x0000000000000000000000000000000000000000000000000000000000000002',
+                        '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
+                        '0x0000000000000000000000000000000000000000000000004563918244f40000',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                    ],
+                    [
+                        web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+                        0,
+                        web3Utils.toChecksumAddress(getAssetInfo('WBTC', ChainId.Ethereum).address),
+                        2,
+                        web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
+                        '5000000000000000000', // 5 WETH
+                    ]
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(subDataService.aaveV3CollateralSwitchSubData.encode(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe('decode()', () => {
+            const examples = [
+                // WETH -> USDC
+                [
+                    {
+                        fromAsset: web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+                        fromAssetId: 0,
+                        toAsset: web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+                        toAssetId: 1,
+                        marketAddr: web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
+                        amountToSwitch: '10000000000000000000',
+                    },
+                    [
+                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                        '0x0000000000000000000000000000000000000000000000000000000000000001',
+                        '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
+                        '0x0000000000000000000000000000000000000000000000008ac7230489e80000',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                    ],
+                ],
+                // USDC -> WETH (MaxUint256)
+                [
+                    {
+                        fromAsset: web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+                        fromAssetId: 1,
+                        toAsset: web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+                        toAssetId: 0,
+                        marketAddr: web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
+                        amountToSwitch: MAXUINT,
+                    },
+                    [
+                        '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                        '0x0000000000000000000000000000000000000000000000000000000000000001',
+                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
+                        '0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                    ],
+                ],
+                // WETH -> WBTC
+                [
+                    {
+                        fromAsset: web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+                        fromAssetId: 0,
+                        toAsset: web3Utils.toChecksumAddress(getAssetInfo('WBTC', ChainId.Ethereum).address),
+                        toAssetId: 2,
+                        marketAddr: web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
+                        amountToSwitch: '5000000000000000000',
+                    },
+                    [
+                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        '0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c599',
+                        '0x0000000000000000000000000000000000000000000000000000000000000002',
+                        '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
+                        '0x0000000000000000000000000000000000000000000000004563918244f40000',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                    ],
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(subDataService.aaveV3CollateralSwitchSubData.decode(actual)).to.eql(expected);
+                });
+            });
+        });
+    });
+    describe('When testing subDataService.sparkCollateralSwitchSubData', () => {
+        describe('encode()', () => {
+            const examples = [
+                // WETH -> cbBTC
+                [
+                    [
+                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        '0x000000000000000000000000cbb7c0000ab88b473b1f5afd9ef808440eed33bf',
+                        '0x0000000000000000000000000000000000000000000000000000000000000007',
+                        '0x00000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee',
+                        '0x0000000000000000000000000000000000000000000000008ac7230489e80000',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                    ],
+                    [
+                        web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+                        0,
+                        web3Utils.toChecksumAddress(getAssetInfo('cbBTC', ChainId.Ethereum).address),
+                        7,
+                        web3Utils.toChecksumAddress('0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE'),
+                        '10000000000000000000',
+                        false,
+                    ]
+                ],
+                // cbBTC -> WETH (MaxUint256)
+                [
+                    [
+                        '0x000000000000000000000000cbb7c0000ab88b473b1f5afd9ef808440eed33bf',
+                        '0x0000000000000000000000000000000000000000000000000000000000000007',
+                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        '0x00000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee',
+                        '0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                    ],
+                    [
+                        web3Utils.toChecksumAddress(getAssetInfo('cbBTC', ChainId.Ethereum).address),
+                        7,
+                        web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+                        0,
+                        web3Utils.toChecksumAddress('0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE'),
+                        MAXUINT,
+                    ]
+                ],
+                // WETH -> cbBTC (5 WETH)
+                [
+                    [
+                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        '0x000000000000000000000000cbb7c0000ab88b473b1f5afd9ef808440eed33bf',
+                        '0x0000000000000000000000000000000000000000000000000000000000000007',
+                        '0x00000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee',
+                        '0x0000000000000000000000000000000000000000000000004563918244f40000',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                    ],
+                    [
+                        web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+                        0,
+                        web3Utils.toChecksumAddress(getAssetInfo('cbBTC', ChainId.Ethereum).address),
+                        7,
+                        web3Utils.toChecksumAddress('0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE'),
+                        '5000000000000000000', // 5 WETH
+                    ]
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(subDataService.sparkCollateralSwitchSubData.encode(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe('decode()', () => {
+            const examples = [
+                // WETH -> cbBTC
+                [
+                    {
+                        fromAsset: web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+                        fromAssetId: 0,
+                        toAsset: web3Utils.toChecksumAddress(getAssetInfo('cbBTC', ChainId.Ethereum).address),
+                        toAssetId: 7,
+                        marketAddr: web3Utils.toChecksumAddress('0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE'),
+                        amountToSwitch: '10000000000000000000',
+                    },
+                    [
+                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        '0x000000000000000000000000cbb7c0000ab88b473b1f5afd9ef808440eed33bf',
+                        '0x0000000000000000000000000000000000000000000000000000000000000007',
+                        '0x00000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee',
+                        '0x0000000000000000000000000000000000000000000000008ac7230489e80000',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                    ],
+                ],
+                // cbBTC -> WETH (MaxUint256)
+                [
+                    {
+                        fromAsset: web3Utils.toChecksumAddress(getAssetInfo('cbBTC', ChainId.Ethereum).address),
+                        fromAssetId: 7,
+                        toAsset: web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+                        toAssetId: 0,
+                        marketAddr: web3Utils.toChecksumAddress('0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE'),
+                        amountToSwitch: MAXUINT,
+                    },
+                    [
+                        '0x000000000000000000000000cbb7c0000ab88b473b1f5afd9ef808440eed33bf',
+                        '0x0000000000000000000000000000000000000000000000000000000000000007',
+                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        '0x00000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee',
+                        '0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                    ],
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(subDataService.sparkCollateralSwitchSubData.decode(actual)).to.eql(expected);
                 });
             });
         });
@@ -344,7 +663,7 @@ describe('Feature: subDataService.ts', () => {
             ];
             examples.forEach(([expected, actual]) => {
                 it(`Given ${actual} should return expected value: ${expected}`, () => {
-                    expect(compoundV2LeverageManagementSubData.encode(...actual)).to.eql(expected);
+                    expect(subDataService.compoundV2LeverageManagementSubData.encode(...actual)).to.eql(expected);
                 });
             });
         });
@@ -361,7 +680,7 @@ describe('Feature: subDataService.ts', () => {
             ];
             examples.forEach(([expected, actual]) => {
                 it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    expect(compoundV2LeverageManagementSubData.decode(actual)).to.eql(expected);
+                    expect(subDataService.compoundV2LeverageManagementSubData.decode(actual)).to.eql(expected);
                 });
             });
         });
@@ -406,7 +725,7 @@ describe('Feature: subDataService.ts', () => {
             ];
             examples.forEach(([expected, actual]) => {
                 it(`Given ${actual} should return expected value: ${expected}`, () => {
-                    expect(compoundV3LeverageManagementSubData.encode(...actual)).to.eql(expected);
+                    expect(subDataService.compoundV3LeverageManagementSubData.encode(...actual)).to.eql(expected);
                 });
             });
         });
@@ -429,7 +748,7 @@ describe('Feature: subDataService.ts', () => {
             ];
             examples.forEach(([expected, actual]) => {
                 it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    expect(compoundV3LeverageManagementSubData.decode(actual)).to.eql(expected);
+                    expect(subDataService.compoundV3LeverageManagementSubData.decode(actual)).to.eql(expected);
                 });
             });
         });
@@ -448,7 +767,7 @@ describe('Feature: subDataService.ts', () => {
             ];
             examples.forEach(([expected, actual]) => {
                 it(`Given ${actual} should return expected value: ${expected}`, () => {
-                    expect(morphoAaveV2LeverageManagementSubData.encode(...actual)).to.eql(expected);
+                    expect(subDataService.morphoAaveV2LeverageManagementSubData.encode(...actual)).to.eql(expected);
                 });
             });
         });
@@ -465,7 +784,7 @@ describe('Feature: subDataService.ts', () => {
             ];
             examples.forEach(([expected, actual]) => {
                 it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    expect(morphoAaveV2LeverageManagementSubData.decode(actual)).to.eql(expected);
+                    expect(subDataService.morphoAaveV2LeverageManagementSubData.decode(actual)).to.eql(expected);
                 });
             });
         });
@@ -484,7 +803,7 @@ describe('Feature: subDataService.ts', () => {
             ];
             examples.forEach(([expected, actual]) => {
                 it(`Given ${actual} should return expected value: ${expected}`, () => {
-                    expect(cBondsRebondSubData.encode(...actual)).to.eql(expected);
+                    expect(subDataService.cBondsRebondSubData.encode(...actual)).to.eql(expected);
                 });
             });
         });
@@ -501,7 +820,7 @@ describe('Feature: subDataService.ts', () => {
             ];
             examples.forEach(([expected, actual]) => {
                 it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    expect(cBondsRebondSubData.decode(actual)).to.eql(expected);
+                    expect(subDataService.cBondsRebondSubData.decode(actual)).to.eql(expected);
                 });
             });
         });
@@ -526,7 +845,7 @@ describe('Feature: subDataService.ts', () => {
             ];
             examples.forEach(([expected, actual]) => {
                 it(`Given ${actual} should return expected value: ${expected}`, () => {
-                    expect(liquityPaybackUsingChickenBondSubData.encode(...actual)).to.eql(expected);
+                    expect(subDataService.liquityPaybackUsingChickenBondSubData.encode(...actual)).to.eql(expected);
                 });
             });
         });
@@ -549,7 +868,7 @@ describe('Feature: subDataService.ts', () => {
             ];
             examples.forEach(([expected, actual]) => {
                 it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    expect(liquityPaybackUsingChickenBondSubData.decode(actual)).to.eql(expected);
+                    expect(subDataService.liquityPaybackUsingChickenBondSubData.decode(actual)).to.eql(expected);
                 });
             });
         });
@@ -584,7 +903,7 @@ describe('Feature: subDataService.ts', () => {
             ];
             examples.forEach(([expected, actual]) => {
                 it(`Given ${actual} should return expected value: ${expected}`, () => {
-                    expect(exchangeDcaSubData.encode(...actual)).to.eql(expected);
+                    expect(subDataService.exchangeDcaSubData.encode(...actual)).to.eql(expected);
                 });
             });
         });
@@ -623,7 +942,7 @@ describe('Feature: subDataService.ts', () => {
             ];
             examples.forEach(([expected, actual]) => {
                 it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    expect(exchangeDcaSubData.decode(...actual)).to.eql(expected);
+                    expect(subDataService.exchangeDcaSubData.decode(...actual)).to.eql(expected);
                 });
             });
         });
@@ -670,7 +989,7 @@ describe('Feature: subDataService.ts', () => {
             ];
             examples.forEach(([expected, actual]) => {
                 it(`Given ${actual} should return expected value: ${expected}`, () => {
-                    expect(exchangeLimitOrderSubData.encode(...actual)).to.eql(expected);
+                    expect(subDataService.exchangeLimitOrderSubData.encode(...actual)).to.eql(expected);
                 });
             });
         });
@@ -707,7 +1026,7 @@ describe('Feature: subDataService.ts', () => {
             ];
             examples.forEach(([expected, actual]) => {
                 it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    expect(exchangeLimitOrderSubData.decode(...actual)).to.eql(expected);
+                    expect(subDataService.exchangeLimitOrderSubData.decode(...actual)).to.eql(expected);
                 });
             });
         });
@@ -726,44 +1045,32 @@ describe('Feature: subDataService.ts', () => {
             ];
             examples.forEach(([expected, actual]) => {
                 it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    expect(sparkLeverageManagementSubData.decode(actual)).to.eql(expected);
+                    expect(subDataService.sparkLeverageManagementSubData.decode(actual)).to.eql(expected);
                 });
             });
         });
     });
-    describe('When testing subDataService.sparkQuotePriceSubData', () => {
+    describe('When testing subDataService.liquityDsrPaybackSubData', () => {
         describe('encode()', () => {
             const examples = [
                 [
                     [
-                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2', '0x0000000000000000000000000000000000000000000000000000000000000002',
-                        '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f', '0x0000000000000000000000000000000000000000000000000000000000000004',
-                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        '0x0000000000000000000000000000000000000000000000000000000000000001', '0x0000000000000000000000000000000000000000000000001111d67bb1bb0000',
+                        '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f', '0x0000000000000000000000005f98805a4e8be255a32880fdec7f6728c6568ba0',
                     ],
-                    [
-                        web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
-                        2,
-                        web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
-                        4,
-                    ]
+                    [123]
                 ],
                 [
                     [
-                        '0x0000000000000000000000005979d7b546e38e414f7e9822514be443a4800529', '0x0000000000000000000000000000000000000000000000000000000000000006',
-                        '0x000000000000000000000000af88d065e77c8cc2239327c5edb3a432268e5831', '0x0000000000000000000000000000000000000000000000000000000000000002',
-                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        '0x0000000000000000000000000000000000000000000000000000000000000001', '0x0000000000000000000000000000000000000000000000003a4965bf58a40000',
+                        '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f', '0x0000000000000000000000005f98805a4e8be255a32880fdec7f6728c6568ba0',
                     ],
-                    [
-                        web3Utils.toChecksumAddress(getAssetInfo('wstETH', ChainId.Arbitrum).address),
-                        6,
-                        web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Arbitrum).address),
-                        2,
-                    ]
+                    [420]
                 ],
             ];
             examples.forEach(([expected, actual]) => {
                 it(`Given ${actual} should return expected value: ${expected}`, () => {
-                    expect(sparkQuotePriceSubData.encode(...actual)).to.eql(expected);
+                    expect(subDataService.liquityDsrPaybackSubData.encode(...actual)).to.eql(expected);
                 });
             });
         });
@@ -771,111 +1078,51 @@ describe('Feature: subDataService.ts', () => {
             const examples = [
                 [
                     {
-                        collAsset: web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
-                        collAssetId: 2,
-                        debtAsset: web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
-                        debtAssetId: 4,
+                        targetRatio: 123,
                     },
                     [
-                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2', '0x0000000000000000000000000000000000000000000000000000000000000002',
-                        '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f', '0x0000000000000000000000000000000000000000000000000000000000000004',
-                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        '0x0000000000000000000000000000000000000000000000000000000000000001', '0x0000000000000000000000000000000000000000000000001111d67bb1bb0000',
+                        '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f', '0x0000000000000000000000005f98805a4e8be255a32880fdec7f6728c6568ba0',
                     ],
                 ],
                 [
                     {
-                        collAsset: web3Utils.toChecksumAddress(getAssetInfo('wstETH', ChainId.Arbitrum).address),
-                        collAssetId: 6,
-                        debtAsset: web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Arbitrum).address),
-                        debtAssetId: 2,
+                        targetRatio: 420,
                     },
                     [
-                        '0x0000000000000000000000005979d7b546e38e414f7e9822514be443a4800529', '0x0000000000000000000000000000000000000000000000000000000000000006',
-                        '0x000000000000000000000000af88d065e77c8cc2239327c5edb3a432268e5831', '0x0000000000000000000000000000000000000000000000000000000000000002',
-                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        '0x0000000000000000000000000000000000000000000000000000000000000001', '0x0000000000000000000000000000000000000000000000003a4965bf58a40000',
+                        '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f', '0x0000000000000000000000005f98805a4e8be255a32880fdec7f6728c6568ba0',
                     ],
                 ],
             ];
             examples.forEach(([expected, actual]) => {
                 it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    expect(sparkQuotePriceSubData.decode(actual)).to.eql(expected);
+                    expect(subDataService.liquityDsrPaybackSubData.decode(actual)).to.eql(expected);
                 });
             });
         });
     });
-    describe('When testing subDataService.liquityDsrPaybackSubData', () => {
+    describe('When testing subDataService.liquityDsrSupplySubData', () => {
         describe('encode()', () => {
             const examples = [
                 [
                     [
-                        '0x0000000000000000000000000000000000000000000000000000000000000001', '0x0000000000000000000000000000000000000000000000001111d67bb1bb0000',
-                        '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f', '0x0000000000000000000000005f98805a4e8be255a32880fdec7f6728c6568ba0',
+                        '0x0000000000000000000000000000000000000000000000000000000000000001', '0x0000000000000000000000000000000000000000000000002c68af0bb1400000',
+                        '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f', '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
                     ],
-                    [123]
+                    [320]
                 ],
                 [
                     [
-                        '0x0000000000000000000000000000000000000000000000000000000000000001', '0x0000000000000000000000000000000000000000000000003a4965bf58a40000',
-                        '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f', '0x0000000000000000000000005f98805a4e8be255a32880fdec7f6728c6568ba0',
+                        '0x0000000000000000000000000000000000000000000000000000000000000001', '0x0000000000000000000000000000000000000000000000001eab7f4a799d0000',
+                        '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f', '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
                     ],
-                    [420]
+                    [221]
                 ],
             ];
             examples.forEach(([expected, actual]) => {
                 it(`Given ${actual} should return expected value: ${expected}`, () => {
-                    expect(liquityDsrPaybackSubData.encode(...actual)).to.eql(expected);
-                });
-            });
-        });
-        describe('decode()', () => {
-            const examples = [
-                [
-                    {
-                        targetRatio: 123,
-                    },
-                    [
-                        '0x0000000000000000000000000000000000000000000000000000000000000001', '0x0000000000000000000000000000000000000000000000001111d67bb1bb0000',
-                        '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f', '0x0000000000000000000000005f98805a4e8be255a32880fdec7f6728c6568ba0',
-                    ],
-                ],
-                [
-                    {
-                        targetRatio: 420,
-                    },
-                    [
-                        '0x0000000000000000000000000000000000000000000000000000000000000001', '0x0000000000000000000000000000000000000000000000003a4965bf58a40000',
-                        '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f', '0x0000000000000000000000005f98805a4e8be255a32880fdec7f6728c6568ba0',
-                    ],
-                ],
-            ];
-            examples.forEach(([expected, actual]) => {
-                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    expect(liquityDsrPaybackSubData.decode(actual)).to.eql(expected);
-                });
-            });
-        });
-    });
-    describe('When testing subDataService.liquityDsrSupplySubData', () => {
-        describe('encode()', () => {
-            const examples = [
-                [
-                    [
-                        '0x0000000000000000000000000000000000000000000000000000000000000001', '0x0000000000000000000000000000000000000000000000002c68af0bb1400000',
-                        '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f', '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-                    ],
-                    [320]
-                ],
-                [
-                    [
-                        '0x0000000000000000000000000000000000000000000000000000000000000001', '0x0000000000000000000000000000000000000000000000001eab7f4a799d0000',
-                        '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f', '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-                    ],
-                    [221]
-                ],
-            ];
-            examples.forEach(([expected, actual]) => {
-                it(`Given ${actual} should return expected value: ${expected}`, () => {
-                    expect(liquityDsrSupplySubData.encode(...actual)).to.eql(expected);
+                    expect(subDataService.liquityDsrSupplySubData.encode(...actual)).to.eql(expected);
                 });
             });
         });
@@ -902,7 +1149,7 @@ describe('Feature: subDataService.ts', () => {
             ];
             examples.forEach(([expected, actual]) => {
                 it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    expect(liquityDsrSupplySubData.decode(actual)).to.eql(expected);
+                    expect(subDataService.liquityDsrSupplySubData.decode(actual)).to.eql(expected);
                 });
             });
         });
@@ -929,7 +1176,7 @@ describe('Feature: subDataService.ts', () => {
             ];
             examples.forEach(([expected, actual]) => {
                 it(`Given ${actual} should return expected value: ${expected}`, () => {
-                    expect(liquityDebtInFrontRepaySubData.encode(...actual)).to.eql(expected);
+                    expect(subDataService.liquityDebtInFrontRepaySubData.encode(...actual)).to.eql(expected);
                 });
             });
         });
@@ -958,7 +1205,7 @@ describe('Feature: subDataService.ts', () => {
             ];
             examples.forEach(([expected, actual]) => {
                 it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    expect(liquityDebtInFrontRepaySubData.decode(actual)).to.eql(expected);
+                    expect(subDataService.liquityDebtInFrontRepaySubData.decode(actual)).to.eql(expected);
                 });
             });
         });
@@ -989,7 +1236,7 @@ describe('Feature: subDataService.ts', () => {
             ];
             examples.forEach(([expected, actual]) => {
                 it(`Given ${actual} should return expected value: ${expected}`, () => {
-                    expect(crvUSDLeverageManagementSubData.encode(...actual)).to.eql(expected);
+                    expect(subDataService.crvUSDLeverageManagementSubData.encode(...actual)).to.eql(expected);
                 });
             });
         });
@@ -1012,7 +1259,7 @@ describe('Feature: subDataService.ts', () => {
             ];
             examples.forEach(([expected, actual]) => {
                 it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    expect(crvUSDLeverageManagementSubData.decode(actual)).to.eql(expected);
+                    expect(subDataService.crvUSDLeverageManagementSubData.decode(actual)).to.eql(expected);
                 });
             });
         });
@@ -1033,7 +1280,7 @@ describe('Feature: subDataService.ts', () => {
             ];
             examples.forEach(([expected, actual]) => {
                 it(`Given ${actual} should return expected value: ${expected}`, () => {
-                    expect(crvUSDPaybackSubData.encode(...actual)).to.eql(expected);
+                    expect(subDataService.crvUSDPaybackSubData.encode(...actual)).to.eql(expected);
                 });
             });
         });
@@ -1057,7 +1304,7 @@ describe('Feature: subDataService.ts', () => {
             ];
             examples.forEach(([expected, actual]) => {
                 it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    expect(crvUSDPaybackSubData.decode(actual)).to.eql(expected);
+                    expect(subDataService.crvUSDPaybackSubData.decode(actual)).to.eql(expected);
                 });
             });
         });
@@ -1066,17 +1313,17 @@ describe('Feature: subDataService.ts', () => {
         describe('encode()', () => {
             const examples = [
                 [
-                    '0x0313D212133AFab8F2b829B1066c7e43caD94e2c0213D212133AfaB8F2b829B1066C7E43cAD94E2c000000000000000016345785d8a0000000000000000000001e87f85809dc0000000000000000000018fae27693b4000000000000000000001a5e27eef13e000001',
-                    [web3Utils.toChecksumAddress('0x0313d212133AFaB8F2B829B1066c7E43cAd94E2c'), web3Utils.toChecksumAddress('0x0213d212133AFaB8F2B829B1066c7E43cAd94E2c'), 160, 220, 180, 190, true]
+                    '0x0313D212133AFab8F2b829B1066c7e43caD94e2c0213D212133AfaB8F2b829B1066C7E43cAD94E2c000000000000000016345785d8a0000000000000000000001e87f85809dc0000000000000000000018fae27693b4000000000000000000001a5e27eef13e00000100',
+                    [web3Utils.toChecksumAddress('0x0313d212133AFaB8F2B829B1066c7E43cAd94E2c'), web3Utils.toChecksumAddress('0x0213d212133AFaB8F2B829B1066c7E43cAd94E2c'), 160, 220, 180, 190, true, false]
                 ],
                 [
-                    '0x0313D212133AFab8F2b829B1066c7e43caD94e2c0413d212133afAb8F2B829b1066C7e43cAd94e2c000000000000000016345785d8a0000000000000000000001e87f85809dc0000000000000000000018fae27693b4000000000000000000000f43fc2c04ee000000',
-                    [web3Utils.toChecksumAddress('0x0313d212133AFaB8F2B829B1066c7E43cAd94E2c'), web3Utils.toChecksumAddress('0x0413d212133AFaB8F2B829B1066c7E43cAd94E2c'), 160, 220, 180, 110, 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: ${expected}`, () => {
-                    expect(compoundV3L2LeverageManagementSubData.encode(...actual)).to.eql(expected);
+                    expect(subDataService.compoundV3L2LeverageManagementSubData.encode(...actual)).to.eql(expected);
                 });
             });
         });
@@ -1099,7 +1346,7 @@ describe('Feature: subDataService.ts', () => {
             ];
             examples.forEach(([expected, actual]) => {
                 it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    expect(compoundV3L2LeverageManagementSubData.decode(actual)).to.eql(expected);
+                    expect(subDataService.compoundV3L2LeverageManagementSubData.decode(actual)).to.eql(expected);
                 });
             });
         });
@@ -1138,7 +1385,7 @@ describe('Feature: subDataService.ts', () => {
             ];
             examples.forEach(([expected, actual]) => {
                 it(`Given ${actual} should return expected value: ${expected}`, () => {
-                    expect(morphoBlueLeverageManagementSubData.encode(...actual)).to.eql(expected);
+                    expect(subDataService.morphoBlueLeverageManagementSubData.encode(...actual)).to.eql(expected);
                 });
             });
         });
@@ -1189,7 +1436,59 @@ describe('Feature: subDataService.ts', () => {
             ];
             examples.forEach(([expected, actual]) => {
                 it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    expect(morphoBlueLeverageManagementSubData.decode(actual)).to.eql(expected);
+                    expect(subDataService.morphoBlueLeverageManagementSubData.decode(actual)).to.eql(expected);
+                });
+            });
+        });
+    });
+    describe('When testing subDataService.morphoBlueCloseOnPriceSubData', () => {
+        describe('encode()', () => {
+            const examples = [
+                [
+                    [
+                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                        '0x0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0',
+                        '0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        '0x0000000000000000000000000000000000000000000000000d1d507e40be8000',
+                        '0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c',
+                        '0x0000000000000000000000000000000000000000000000000000000000000006',
+                    ],
+                    [web3Utils.toChecksumAddress('0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2'), web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'), web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'), web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'), '945000000000000000', web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'), CloseStrategyType.TAKE_PROFIT_AND_STOP_LOSS_IN_DEBT]
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${expected}`, () => {
+                    expect(subDataService.morphoBlueCloseOnPriceSubData.encode(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe('decode()', () => {
+            const examples = [
+                [
+                    {
+                        loanToken: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
+                        collToken: '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0',
+                        oracle: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
+                        irm: '0x0000000000000000000000000000000000000000',
+                        lltv: '945000000000000000',
+                        user: '0x1031d218133AFaB8C2B819B1366c7e434Ad91e9c',
+                        closeType: CloseStrategyType.TAKE_PROFIT_AND_STOP_LOSS_IN_DEBT,
+                    },
+                    [
+                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                        '0x0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0',
+                        '0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        '0x0000000000000000000000000000000000000000000000000d1d507e40be8000',
+                        '0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c',
+                        '0x0000000000000000000000000000000000000000000000000000000000000006',
+                    ],
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(subDataService.morphoBlueCloseOnPriceSubData.decode(actual)).to.eql(expected);
                 });
             });
         });
@@ -1219,7 +1518,7 @@ describe('Feature: subDataService.ts', () => {
             ];
             examples.forEach(([expected, actual]) => {
                 it(`Given ${actual} should return expected value: ${expected}`, () => {
-                    expect(aaveV3LeverageManagementOnPriceSubData.encode(...actual)).to.eql(expected);
+                    expect(subDataService.aaveV3LeverageManagementOnPriceSubData.encode(...actual)).to.eql(expected);
                 });
             });
         });
@@ -1246,7 +1545,853 @@ describe('Feature: subDataService.ts', () => {
             ];
             examples.forEach(([expected, actual]) => {
                 it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    expect(aaveV3LeverageManagementOnPriceSubData.decode(actual)).to.eql(expected);
+                    expect(subDataService.aaveV3LeverageManagementOnPriceSubData.decode(actual)).to.eql(expected);
+                });
+            });
+        });
+    });
+    describe('When testing subDataService.compoundV3LeverageManagementOnPriceSubData', () => {
+        describe('encode()', () => {
+            const examples = [
+                [
+                    [
+                        '0x000000000000000000000000c3d688b66703497daa19211eedff47f25384cdc3',
+                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                        '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                        '0x0000000000000000000000000000000000000000000000001bc16d674ec80000',
+                        '0x0000000000000000000000000000000000000000000000000000000000000001',
+                        '0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c'
+                    ],
+                    [
+                        web3Utils.toChecksumAddress('0xc3d688B66703497DAA19211EEdff47f25384cdc3'),
+                        web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'),
+                        web3Utils.toChecksumAddress('0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48'),
+                        200,
+                        RatioState.UNDER,
+                        web3Utils.toChecksumAddress('0x1031d218133afab8c2b819b1366c7e434ad91e9c')
+                    ]
+                ],
+                [
+                    [
+                        '0x000000000000000000000000c3d688b66703497daa19211eedff47f25384cdc3',
+                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                        '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                        '0x0000000000000000000000000000000000000000000000001a5e27eef13e0000',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        '0x0000000000000000000000000043d218133afab8f2b829b106633e434ad94e2c'
+                    ],
+                    [
+                        web3Utils.toChecksumAddress('0xc3d688B66703497DAA19211EEdff47f25384cdc3'),
+                        web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'),
+                        web3Utils.toChecksumAddress('0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48'),
+                        190,
+                        RatioState.OVER,
+                        web3Utils.toChecksumAddress('0x0043d218133afab8f2b829b106633e434ad94e2c')
+                    ]
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(subDataService.compoundV3LeverageManagementOnPriceSubData.encode(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe('decode()', () => {
+            const examples = [
+                [
+                    {
+                        market: web3Utils.toChecksumAddress('0xc3d688B66703497DAA19211EEdff47f25384cdc3'),
+                        collToken: web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'),
+                        baseToken: web3Utils.toChecksumAddress('0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48'),
+                        targetRatio: 200,
+                        ratioState: RatioState.UNDER,
+                        owner: web3Utils.toChecksumAddress('0x1031d218133afab8c2b819b1366c7e434ad91e9c')
+                    },
+                    [
+                        '0x000000000000000000000000c3d688b66703497daa19211eedff47f25384cdc3',
+                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                        '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                        '0x0000000000000000000000000000000000000000000000001bc16d674ec80000',
+                        '0x0000000000000000000000000000000000000000000000000000000000000001',
+                        '0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c'
+                    ]
+                ],
+                [
+                    {
+                        market: web3Utils.toChecksumAddress('0xc3d688B66703497DAA19211EEdff47f25384cdc3'),
+                        collToken: web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'),
+                        baseToken: web3Utils.toChecksumAddress('0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48'),
+                        targetRatio: 190,
+                        ratioState: RatioState.OVER,
+                        owner: web3Utils.toChecksumAddress('0x0043d218133afab8f2b829b106633e434ad94e2c')
+                    },
+                    [
+                        '0x000000000000000000000000c3d688b66703497daa19211eedff47f25384cdc3',
+                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                        '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                        '0x0000000000000000000000000000000000000000000000001a5e27eef13e0000',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        '0x0000000000000000000000000043d218133afab8f2b829b106633e434ad94e2c'
+                    ]
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(subDataService.compoundV3LeverageManagementOnPriceSubData.decode(actual)).to.eql(expected);
+                });
+            });
+        });
+    });
+    describe('When testing subDataService.compoundV3CloseSubData', () => {
+        describe('encode()', () => {
+            const examples = [
+                [
+                    [
+                        '0x000000000000000000000000c3d688b66703497daa19211eedff47f25384cdc3',
+                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                        '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                        '0x0000000000000000000000000000000000000000000000000000000000000006',
+                        '0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c',
+                    ],
+                    [
+                        web3Utils.toChecksumAddress('0xc3d688B66703497DAA19211EEdff47f25384cdc3'),
+                        web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+                        web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+                        CloseStrategyType.TAKE_PROFIT_AND_STOP_LOSS_IN_DEBT,
+                        web3Utils.toChecksumAddress('0x1031d218133afab8c2b819b1366c7e434ad91e9c'),
+                    ]
+                ],
+                [
+                    [
+                        '0x000000000000000000000000c3d688b66703497daa19211eedff47f25384cdc3',
+                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                        '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        '0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c',
+                    ],
+                    [
+                        web3Utils.toChecksumAddress('0xc3d688B66703497DAA19211EEdff47f25384cdc3'),
+                        web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+                        web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+                        CloseStrategyType.TAKE_PROFIT_IN_COLLATERAL,
+                        web3Utils.toChecksumAddress('0x1031d218133afab8c2b819b1366c7e434ad91e9c'),
+                    ]
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(subDataService.compoundV3CloseSubData.encode(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe('decode()', () => {
+            const examples = [
+                [
+                    {
+                        market: web3Utils.toChecksumAddress('0xc3d688B66703497DAA19211EEdff47f25384cdc3'),
+                        collToken: web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'),
+                        baseToken: web3Utils.toChecksumAddress('0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48'),
+                        closeType: CloseStrategyType.TAKE_PROFIT_AND_STOP_LOSS_IN_DEBT,
+                        owner: web3Utils.toChecksumAddress('0x1031d218133afab8c2b819b1366c7e434ad91e9c')
+                    },
+                    [
+                        '0x000000000000000000000000c3d688b66703497daa19211eedff47f25384cdc3',
+                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                        '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                        '0x0000000000000000000000000000000000000000000000000000000000000006',
+                        '0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c'
+                    ]
+                ],
+                [
+                    {
+                        market: web3Utils.toChecksumAddress('0xc3d688B66703497DAA19211EEdff47f25384cdc3'),
+                        collToken: web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'),
+                        baseToken: web3Utils.toChecksumAddress('0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48'),
+                        closeType: CloseStrategyType.TAKE_PROFIT_IN_COLLATERAL,
+                        owner: web3Utils.toChecksumAddress('0x1031d218133afab8c2b819b1366c7e434ad91e9c')
+                    },
+                    [
+                        '0x000000000000000000000000c3d688b66703497daa19211eedff47f25384cdc3',
+                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                        '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        '0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c'
+                    ]
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(subDataService.compoundV3CloseSubData.decode(actual)).to.eql(expected);
+                });
+            });
+        });
+    });
+    describe("When testing subDataService.aaveV3LeverageManagementOnPriceGeneric", () => {
+        describe("encode()", () => {
+            const examples = [
+                [
+                    [
+                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                        '0x0000000000000000000000000000000000000000000000000000000000000001',
+                        '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
+                        '0x0000000000000000000000000000000000000000000000001bc16d674ec80000',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                    ],
+                    [
+                        web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+                        0,
+                        web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+                        1,
+                        web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
+                        200,
+                        web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
+                    ]
+                ],
+                [
+                    [
+                        '0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c599',
+                        '0x0000000000000000000000000000000000000000000000000000000000000002',
+                        '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                        '0x0000000000000000000000000000000000000000000000000000000000000001',
+                        '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
+                        '0x0000000000000000000000000000000000000000000000001bc16d674ec80000',
+                        '0x0000000000000000000000001234567890123456789012345678901234567890',
+                    ],
+                    [
+                        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 ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(subDataService.aaveV3LeverageManagementOnPriceGeneric.encode(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe("decode()", () => {
+            const examples = [
+                [
+                    {
+                        collAsset: web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+                        collAssetId: 0,
+                        debtAsset: web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+                        debtAssetId: 1,
+                        marketAddr: web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
+                        targetRatio: 200,
+                        owner: web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
+                    },
+                    [
+                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                        '0x0000000000000000000000000000000000000000000000000000000000000001',
+                        '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
+                        '0x0000000000000000000000000000000000000000000000001bc16d674ec80000',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                    ]
+                ],
+                [
+                    {
+                        collAsset: web3Utils.toChecksumAddress(getAssetInfo('WBTC', ChainId.Ethereum).address),
+                        collAssetId: 2,
+                        debtAsset: web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+                        debtAssetId: 1,
+                        marketAddr: web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
+                        targetRatio: 200,
+                        owner: web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
+                    },
+                    [
+                        '0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c599',
+                        '0x0000000000000000000000000000000000000000000000000000000000000002',
+                        '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                        '0x0000000000000000000000000000000000000000000000000000000000000001',
+                        '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
+                        '0x0000000000000000000000000000000000000000000000001bc16d674ec80000',
+                        '0x0000000000000000000000001234567890123456789012345678901234567890',
+                    ]
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(subDataService.aaveV3LeverageManagementOnPriceGeneric.decode(actual)).to.eql(expected);
+                });
+            });
+        });
+    });
+    describe("When testing subDataService.aaveV3CloseGenericSubData", () => {
+        describe("encode()", () => {
+            const examples = [
+                // TAKE_PROFIT_IN_COLLATERAL
+                [
+                    [
+                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                        '0x0000000000000000000000000000000000000000000000000000000000000001',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                    ],
+                    [
+                        web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+                        0,
+                        web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+                        1,
+                        CloseStrategyType.TAKE_PROFIT_IN_COLLATERAL,
+                        web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
+                        web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
+                    ]
+                ],
+                // STOP_LOSS_IN_COLLATERAL
+                [
+                    [
+                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                        '0x0000000000000000000000000000000000000000000000000000000000000001',
+                        '0x0000000000000000000000000000000000000000000000000000000000000001',
+                        '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                    ],
+                    [
+                        web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+                        0,
+                        web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+                        1,
+                        CloseStrategyType.STOP_LOSS_IN_COLLATERAL,
+                        web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
+                        web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
+                    ]
+                ],
+                // TAKE_PROFIT_IN_DEBT
+                [
+                    [
+                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                        '0x0000000000000000000000000000000000000000000000000000000000000001',
+                        '0x0000000000000000000000000000000000000000000000000000000000000002',
+                        '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                    ],
+                    [
+                        web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+                        0,
+                        web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+                        1,
+                        CloseStrategyType.TAKE_PROFIT_IN_DEBT,
+                        web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
+                        web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
+                    ]
+                ],
+                // STOP_LOSS_IN_DEBT
+                [
+                    [
+                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                        '0x0000000000000000000000000000000000000000000000000000000000000001',
+                        '0x0000000000000000000000000000000000000000000000000000000000000003',
+                        '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                    ],
+                    [
+                        web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+                        0,
+                        web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+                        1,
+                        CloseStrategyType.STOP_LOSS_IN_DEBT,
+                        web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
+                        web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
+                    ]
+                ],
+                // TAKE_PROFIT_AND_STOP_LOSS_IN_COLLATERAL
+                [
+                    [
+                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                        '0x0000000000000000000000000000000000000000000000000000000000000001',
+                        '0x0000000000000000000000000000000000000000000000000000000000000004',
+                        '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
+                        '0x0000000000000000000000001234567890123456789012345678901234567890',
+                    ],
+                    [
+                        web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+                        0,
+                        web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+                        1,
+                        CloseStrategyType.TAKE_PROFIT_AND_STOP_LOSS_IN_COLLATERAL,
+                        web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
+                        web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
+                    ]
+                ],
+                // TAKE_PROFIT_IN_COLLATERAL_AND_STOP_LOSS_IN_DEBT
+                [
+                    [
+                        '0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c599',
+                        '0x0000000000000000000000000000000000000000000000000000000000000002',
+                        '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                        '0x0000000000000000000000000000000000000000000000000000000000000001',
+                        '0x0000000000000000000000000000000000000000000000000000000000000005',
+                        '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                    ],
+                    [
+                        web3Utils.toChecksumAddress(getAssetInfo('WBTC', ChainId.Ethereum).address),
+                        2,
+                        web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+                        1,
+                        CloseStrategyType.TAKE_PROFIT_IN_COLLATERAL_AND_STOP_LOSS_IN_DEBT,
+                        web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
+                        web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
+                    ]
+                ],
+                // TAKE_PROFIT_AND_STOP_LOSS_IN_DEBT
+                [
+                    [
+                        '0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c599',
+                        '0x0000000000000000000000000000000000000000000000000000000000000002',
+                        '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                        '0x0000000000000000000000000000000000000000000000000000000000000001',
+                        '0x0000000000000000000000000000000000000000000000000000000000000006',
+                        '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                    ],
+                    [
+                        web3Utils.toChecksumAddress(getAssetInfo('WBTC', ChainId.Ethereum).address),
+                        2,
+                        web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+                        1,
+                        CloseStrategyType.TAKE_PROFIT_AND_STOP_LOSS_IN_DEBT,
+                        web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
+                        web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
+                    ]
+                ],
+                // TAKE_PROFIT_IN_DEBT_AND_STOP_LOSS_IN_COLLATERAL
+                [
+                    [
+                        '0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c599',
+                        '0x0000000000000000000000000000000000000000000000000000000000000002',
+                        '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                        '0x0000000000000000000000000000000000000000000000000000000000000001',
+                        '0x0000000000000000000000000000000000000000000000000000000000000007',
+                        '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                    ],
+                    [
+                        web3Utils.toChecksumAddress(getAssetInfo('WBTC', ChainId.Ethereum).address),
+                        2,
+                        web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+                        1,
+                        CloseStrategyType.TAKE_PROFIT_IN_DEBT_AND_STOP_LOSS_IN_COLLATERAL,
+                        web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
+                        web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
+                    ]
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(subDataService.aaveV3CloseGenericSubData.encode(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe("decode()", () => {
+            const examples = [
+                // TAKE_PROFIT_IN_COLLATERAL
+                [
+                    {
+                        collAsset: web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+                        collAssetId: 0,
+                        debtAsset: web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+                        debtAssetId: 1,
+                        closeType: CloseStrategyType.TAKE_PROFIT_IN_COLLATERAL,
+                        marketAddr: web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
+                        owner: web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
+                    },
+                    [
+                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                        '0x0000000000000000000000000000000000000000000000000000000000000001',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                    ]
+                ],
+                // STOP_LOSS_IN_COLLATERAL
+                [
+                    {
+                        collAsset: web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+                        collAssetId: 0,
+                        debtAsset: web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+                        debtAssetId: 1,
+                        closeType: CloseStrategyType.STOP_LOSS_IN_COLLATERAL,
+                        marketAddr: web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
+                        owner: web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
+                    },
+                    [
+                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                        '0x0000000000000000000000000000000000000000000000000000000000000001',
+                        '0x0000000000000000000000000000000000000000000000000000000000000001',
+                        '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                    ]
+                ],
+                // TAKE_PROFIT_IN_DEBT
+                [
+                    {
+                        collAsset: web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+                        collAssetId: 0,
+                        debtAsset: web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+                        debtAssetId: 1,
+                        closeType: CloseStrategyType.TAKE_PROFIT_IN_DEBT,
+                        marketAddr: web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
+                        owner: web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
+                    },
+                    [
+                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                        '0x0000000000000000000000000000000000000000000000000000000000000001',
+                        '0x0000000000000000000000000000000000000000000000000000000000000002',
+                        '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                    ]
+                ],
+                // STOP_LOSS_IN_DEBT
+                [
+                    {
+                        collAsset: web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+                        collAssetId: 0,
+                        debtAsset: web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+                        debtAssetId: 1,
+                        closeType: CloseStrategyType.STOP_LOSS_IN_DEBT,
+                        marketAddr: web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
+                        owner: web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
+                    },
+                    [
+                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                        '0x0000000000000000000000000000000000000000000000000000000000000001',
+                        '0x0000000000000000000000000000000000000000000000000000000000000003',
+                        '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                    ]
+                ],
+                // TAKE_PROFIT_AND_STOP_LOSS_IN_COLLATERAL
+                [
+                    {
+                        collAsset: web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+                        collAssetId: 0,
+                        debtAsset: web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+                        debtAssetId: 1,
+                        closeType: CloseStrategyType.TAKE_PROFIT_AND_STOP_LOSS_IN_COLLATERAL,
+                        marketAddr: web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
+                        owner: web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
+                    },
+                    [
+                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                        '0x0000000000000000000000000000000000000000000000000000000000000001',
+                        '0x0000000000000000000000000000000000000000000000000000000000000004',
+                        '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
+                        '0x0000000000000000000000001234567890123456789012345678901234567890',
+                    ]
+                ],
+                // TAKE_PROFIT_IN_COLLATERAL_AND_STOP_LOSS_IN_DEBT
+                [
+                    {
+                        collAsset: web3Utils.toChecksumAddress(getAssetInfo('WBTC', ChainId.Ethereum).address),
+                        collAssetId: 2,
+                        debtAsset: web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+                        debtAssetId: 1,
+                        closeType: CloseStrategyType.TAKE_PROFIT_IN_COLLATERAL_AND_STOP_LOSS_IN_DEBT,
+                        marketAddr: web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
+                        owner: web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
+                    },
+                    [
+                        '0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c599',
+                        '0x0000000000000000000000000000000000000000000000000000000000000002',
+                        '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                        '0x0000000000000000000000000000000000000000000000000000000000000001',
+                        '0x0000000000000000000000000000000000000000000000000000000000000005',
+                        '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                    ]
+                ],
+                // TAKE_PROFIT_AND_STOP_LOSS_IN_DEBT
+                [
+                    {
+                        collAsset: web3Utils.toChecksumAddress(getAssetInfo('WBTC', ChainId.Ethereum).address),
+                        collAssetId: 2,
+                        debtAsset: web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+                        debtAssetId: 1,
+                        closeType: CloseStrategyType.TAKE_PROFIT_AND_STOP_LOSS_IN_DEBT,
+                        marketAddr: web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
+                        owner: web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
+                    },
+                    [
+                        '0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c599',
+                        '0x0000000000000000000000000000000000000000000000000000000000000002',
+                        '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                        '0x0000000000000000000000000000000000000000000000000000000000000001',
+                        '0x0000000000000000000000000000000000000000000000000000000000000006',
+                        '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                    ]
+                ],
+                // TAKE_PROFIT_IN_DEBT_AND_STOP_LOSS_IN_COLLATERAL
+                [
+                    {
+                        collAsset: web3Utils.toChecksumAddress(getAssetInfo('WBTC', ChainId.Ethereum).address),
+                        collAssetId: 2,
+                        debtAsset: web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+                        debtAssetId: 1,
+                        closeType: CloseStrategyType.TAKE_PROFIT_IN_DEBT_AND_STOP_LOSS_IN_COLLATERAL,
+                        marketAddr: web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
+                        owner: web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
+                    },
+                    [
+                        '0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c599',
+                        '0x0000000000000000000000000000000000000000000000000000000000000002',
+                        '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                        '0x0000000000000000000000000000000000000000000000000000000000000001',
+                        '0x0000000000000000000000000000000000000000000000000000000000000007',
+                        '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                    ]
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(subDataService.aaveV3CloseGenericSubData.decode(actual)).to.eql(expected);
+                });
+            });
+        });
+    });
+    describe('When testing subDataService.sparkLeverageManagementOnPriceSubData', () => {
+        describe('encode()', () => {
+            const examples = [
+                [
+                    [
+                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                        '0x0000000000000000000000000000000000000000000000000000000000000001',
+                        '0x00000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee',
+                        '0x0000000000000000000000000000000000000000000000001bc16d674ec80000',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                    ],
+                    [
+                        web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+                        0,
+                        web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+                        1,
+                        web3Utils.toChecksumAddress('0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE'),
+                        200,
+                    ]
+                ]
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(subDataService.sparkLeverageManagementOnPriceSubData.encode(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe('decode()', () => {
+            const examples = [
+                [
+                    {
+                        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: 175
+                    },
+                    [
+                        '0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c599',
+                        '0x0000000000000000000000000000000000000000000000000000000000000002',
+                        '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f',
+                        '0x0000000000000000000000000000000000000000000000000000000000000004',
+                        '0x00000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee',
+                        '0x00000000000000000000000000000000000000000000000018493fba64ef0000'
+                    ]
+                ]
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(subDataService.sparkLeverageManagementOnPriceSubData.decode(actual)).to.eql(expected);
+                });
+            });
+        });
+    });
+    describe('When testing subDataService.aaveV4LeverageManagementSubData', () => {
+        describe('encode()', () => {
+            const examples = [
+                [
+                    ["0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e", "0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c", "0x0000000000000000000000000000000000000000000000000000000000000001", "0x00000000000000000000000000000000000000000000000014d1120d7b160000", "0x0000000000000000000000000000000000000000000000000000000000000000", "0x0000000000000000000000000000000000000000000000000000000000000000"],
+                    [web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'), web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'), RatioState.UNDER, 150]
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${expected}`, () => {
+                    expect(subDataService.aaveV4LeverageManagementSubData.encode(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe('decode()', () => {
+            const examples = [
+                [
+                    {
+                        spoke: web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'),
+                        owner: web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'),
+                        ratioState: RatioState.UNDER,
+                        targetRatio: 150,
+                    },
+                    ["0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e", "0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c", "0x0000000000000000000000000000000000000000000000000000000000000001", "0x00000000000000000000000000000000000000000000000014d1120d7b160000", "0x0000000000000000000000000000000000000000000000000000000000000000", "0x0000000000000000000000000000000000000000000000000000000000000000"],
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(subDataService.aaveV4LeverageManagementSubData.decode(actual)).to.eql(expected);
+                });
+            });
+        });
+    });
+    describe('When testing subDataService.aaveV4LeverageManagementOnPriceSubData', () => {
+        describe('encode()', () => {
+            const examples = [
+                [
+                    ["0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e", "0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c", "0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2", "0x000000000000000000000000000000000000000000000000000000000000000a", "0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48", "0x0000000000000000000000000000000000000000000000000000000000000014", "0x0000000000000000000000000000000000000000000000000000000000000000", "0x00000000000000000000000000000000000000000000000016345785d8a00000", "0x0000000000000000000000000000000000000000000000000000000000000000", "0x0000000000000000000000000000000000000000000000000000000000000000"],
+                    [
+                        web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'), web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'),
+                        web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'), 10,
+                        web3Utils.toChecksumAddress('0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48'), 20,
+                        RatioState.OVER, 160
+                    ]
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${expected}`, () => {
+                    expect(subDataService.aaveV4LeverageManagementOnPriceSubData.encode(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe('decode()', () => {
+            const examples = [
+                [
+                    {
+                        spoke: web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'),
+                        owner: web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'),
+                        collAsset: web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'),
+                        collAssetId: 10,
+                        debtAsset: web3Utils.toChecksumAddress('0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48'),
+                        debtAssetId: 20,
+                        ratioState: RatioState.OVER,
+                        targetRatio: 160,
+                    },
+                    ["0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e", "0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c", "0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2", "0x000000000000000000000000000000000000000000000000000000000000000a", "0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48", "0x0000000000000000000000000000000000000000000000000000000000000014", "0x0000000000000000000000000000000000000000000000000000000000000000", "0x00000000000000000000000000000000000000000000000016345785d8a00000", "0x0000000000000000000000000000000000000000000000000000000000000000", "0x0000000000000000000000000000000000000000000000000000000000000000"],
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(subDataService.aaveV4LeverageManagementOnPriceSubData.decode(actual)).to.eql(expected);
+                });
+            });
+        });
+    });
+    describe('When testing subDataService.aaveV4CloseSubData', () => {
+        describe('encode()', () => {
+            const examples = [
+                [
+                    ["0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e", "0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c", "0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2", "0x000000000000000000000000000000000000000000000000000000000000000a", "0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48", "0x0000000000000000000000000000000000000000000000000000000000000014", "0x0000000000000000000000000000000000000000000000000000000000000001", "0x0000000000000000000000000000000000000000000000000000000000000000", "0x0000000000000000000000000000000000000000000000000000000000000000"],
+                    [
+                        web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'), web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'),
+                        web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'), 10,
+                        web3Utils.toChecksumAddress('0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48'), 20,
+                        CloseStrategyType.STOP_LOSS_IN_COLLATERAL
+                    ]
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${expected}`, () => {
+                    expect(subDataService.aaveV4CloseSubData.encode(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe('decode()', () => {
+            const examples = [
+                [
+                    {
+                        spoke: web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'),
+                        owner: web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'),
+                        collAsset: web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'),
+                        collAssetId: 10,
+                        debtAsset: web3Utils.toChecksumAddress('0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48'),
+                        debtAssetId: 20,
+                        closeType: CloseStrategyType.STOP_LOSS_IN_COLLATERAL,
+                    },
+                    ["0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e", "0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c", "0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2", "0x000000000000000000000000000000000000000000000000000000000000000a", "0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48", "0x0000000000000000000000000000000000000000000000000000000000000014", "0x0000000000000000000000000000000000000000000000000000000000000001", "0x0000000000000000000000000000000000000000000000000000000000000000", "0x0000000000000000000000000000000000000000000000000000000000000000"],
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(subDataService.aaveV4CloseSubData.decode(actual)).to.eql(expected);
+                });
+            });
+        });
+    });
+    describe('When testing subDataService.aaveV4CollateralSwitchSubData', () => {
+        describe('encode()', () => {
+            const examples = [
+                [
+                    ["0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e", "0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c", "0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2", "0x000000000000000000000000000000000000000000000000000000000000000a", "0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48", "0x0000000000000000000000000000000000000000000000000000000000000014", "0x0000000000000000000000000000000000000000000000000de0b6b3a7640000", "0x0000000000000000000000000000000000000000000000000000000000000000", "0x0000000000000000000000000000000000000000000000000000000000000000"],
+                    [
+                        web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'), web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'),
+                        web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'), 10,
+                        web3Utils.toChecksumAddress('0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48'), 20,
+                        '1000000000000000000'
+                    ]
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${expected}`, () => {
+                    expect(subDataService.aaveV4CollateralSwitchSubData.encode(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe('decode()', () => {
+            const examples = [
+                [
+                    {
+                        spoke: web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'),
+                        owner: web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'),
+                        fromAsset: web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'),
+                        fromAssetId: 10,
+                        toAsset: web3Utils.toChecksumAddress('0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48'),
+                        toAssetId: 20,
+                        amountToSwitch: '1000000000000000000'
+                    },
+                    ["0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e", "0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c", "0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2", "0x000000000000000000000000000000000000000000000000000000000000000a", "0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48", "0x0000000000000000000000000000000000000000000000000000000000000014", "0x0000000000000000000000000000000000000000000000000de0b6b3a7640000", "0x0000000000000000000000000000000000000000000000000000000000000000", "0x0000000000000000000000000000000000000000000000000000000000000000"],
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(subDataService.aaveV4CollateralSwitchSubData.decode(actual)).to.eql(expected);
                 });
             });
         });