@defisaver/automation-sdk 3.3.17 → 3.3.18-spark-eoa-dev

package/src/services/subDataService.test.ts

@@ -1,10 +1,9 @@
-import Dec from 'decimal.js';
 import { expect } from 'chai';
 import { getAssetInfo } from '@defisaver/tokens';
 import * as web3Utils from 'web3-utils';
 import { MAXUINT } from '@defisaver/tokens';
 
-import { ChainId, CloseStrategyType, OrderType, RatioState } from '../types/enums';
+import { ChainId, CloseStrategyType, RatioState } from '../types/enums';
 import type { EthereumAddress, SubData } from '../types';
 
 import '../configuration';
@@ -133,7 +132,7 @@ describe('Feature: subDataService.ts', () => {
     });
   });
 
-  describe('When testing subDataService.makerLeverageManagementSubData', () => {
+  describe('When testing subDataService.legacyMakerLeverageManagementSubData', () => {
     describe('decode()', () => {
       const examples: Array<[{ vaultId: number, targetRatio: number }, SubData]> = [
         [
@@ -147,13 +146,13 @@ describe('Feature: subDataService.ts', () => {
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(subDataService.makerLeverageManagementSubData.decode(actual)).to.eql(expected);
+          expect(subDataService.legacyMakerLeverageManagementSubData.decode(actual)).to.eql(expected);
         });
       });
     });
   });
 
-  describe('When testing subDataService.makerLeverageManagementWithoutSubProxy', () => {
+  describe('When testing subDataService.makerLeverageManagementSubData', () => {
     describe('encode()', () => {
       const examples: Array<[SubData, [vaultId: number, targetRatio: number, daiAddr?: EthereumAddress]]> = [
         [
@@ -174,7 +173,7 @@ describe('Feature: subDataService.ts', () => {
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${expected}`, () => {
-          expect(subDataService.makerLeverageManagementWithoutSubProxy.encode(...actual)).to.eql(expected);
+          expect(subDataService.makerLeverageManagementSubData.encode(...actual)).to.eql(expected);
         });
       });
     });
@@ -207,13 +206,13 @@ describe('Feature: subDataService.ts', () => {
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(subDataService.makerLeverageManagementWithoutSubProxy.decode(actual)).to.eql(expected);
+          expect(subDataService.makerLeverageManagementSubData.decode(actual)).to.eql(expected);
         });
       });
     });
   });
 
-  describe('When testing subDataService.liquityLeverageManagementSubData', () => {
+  describe('When testing subDataService.legacyLiquityLeverageManagementSubData', () => {
     describe('decode()', () => {
       const examples: Array<[{ targetRatio: number }, SubData]> = [
         [
@@ -227,7 +226,7 @@ describe('Feature: subDataService.ts', () => {
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(subDataService.liquityLeverageManagementSubData.decode(actual)).to.eql(expected);
+          expect(subDataService.legacyLiquityLeverageManagementSubData.decode(actual)).to.eql(expected);
         });
       });
     });
@@ -287,26 +286,7 @@ describe('Feature: subDataService.ts', () => {
     });
   });
 
-  describe('When testing subDataService.aaveV2LeverageManagementSubData', () => {
-    describe('encode()', () => {
-      const examples: Array<[[string, string, string, string, boolean], [triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean]]> = [
-        [
-          [new Dec(160).mul(1e16).toString(), new Dec(220).mul(1e16).toString(), new Dec(180).mul(1e16).toString(), new Dec(190).mul(1e16).toString(), true],
-          [160, 220, 180, 190, true]
-        ],
-        [
-          [new Dec(160).mul(1e16).toString(), new Dec(200).mul(1e16).toString(), new Dec(180).mul(1e16).toString(), new Dec(190).mul(1e16).toString(), false],
-          [160, 200, 180, 190, false]
-        ],
-      ];
-
-      examples.forEach(([expected, actual]) => {
-        it(`Given ${actual} should return expected value: ${expected}`, () => {
-          expect(subDataService.aaveV2LeverageManagementSubData.encode(...actual)).to.eql(expected);
-        });
-      });
-    });
-
+  describe('When testing subDataService.legacyAaveV2LeverageManagementSubData', () => {
     describe('decode()', () => {
       const examples: Array<[{ targetRatio: number }, SubData]> = [
         [
@@ -321,13 +301,13 @@ describe('Feature: subDataService.ts', () => {
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(subDataService.aaveV2LeverageManagementSubData.decode(actual)).to.eql(expected);
+          expect(subDataService.legacyAaveV2LeverageManagementSubData.decode(actual)).to.eql(expected);
         });
       });
     });
   });
 
-  describe('When testing subDataService.aaveV3LeverageManagementSubData', () => {
+  describe('When testing subDataService.legacyAaveV3LeverageManagementSubData', () => {
     describe('decode()', () => {
       const examples: Array<[{ targetRatio: number }, SubData]> = [
         [
@@ -342,7 +322,7 @@ describe('Feature: subDataService.ts', () => {
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(subDataService.aaveV3LeverageManagementSubData.decode(actual)).to.eql(expected);
+          expect(subDataService.legacyAaveV3LeverageManagementSubData.decode(actual)).to.eql(expected);
         });
       });
     });
@@ -694,138 +674,142 @@ describe('Feature: subDataService.ts', () => {
     });
   });
 
-  describe('When testing subDataService.compoundV2LeverageManagementSubData', () => {
+  describe('When testing subDataService.sparkGenericFLCollateralSwitchSubData', () => {
     describe('encode()', () => {
-      const examples: Array<[[string, string, string, string, boolean], [triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean]]> = [
+      const examples: Array<[
+        SubData,
         [
-          [new Dec(160).mul(1e16).toString(), new Dec(220).mul(1e16).toString(), new Dec(180).mul(1e16).toString(), new Dec(190).mul(1e16).toString(), true],
-          [160, 220, 180, 190, true]
-        ],
+          fromAsset: EthereumAddress,
+          fromAssetId: number,
+          toAsset: EthereumAddress,
+          toAssetId: number,
+          marketAddr: EthereumAddress,
+          amountToSwitch: string,
+          user: EthereumAddress,
+        ]
+      ]> = [
         [
-          [new Dec(160).mul(1e16).toString(), new Dec(200).mul(1e16).toString(), new Dec(180).mul(1e16).toString(), new Dec(190).mul(1e16).toString(), false],
-          [160, 200, 180, 190, false]
+          [
+            '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+            '0x0000000000000000000000000000000000000000000000000000000000000000',
+            '0x000000000000000000000000cbb7c0000ab88b473b1f5afd9ef808440eed33bf',
+            '0x0000000000000000000000000000000000000000000000000000000000000007',
+            '0x00000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee',
+            '0x0000000000000000000000000000000000000000000000008ac7230489e80000',
+            '0x0000000000000000000000001234567890123456789012345678901234567890',
+          ],
+          [
+            web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+            0,
+            web3Utils.toChecksumAddress(getAssetInfo('cbBTC', ChainId.Ethereum).address),
+            7,
+            web3Utils.toChecksumAddress('0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE'),
+            '10000000000000000000',
+            web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
+          ],
         ],
       ];
 
       examples.forEach(([expected, actual]) => {
-        it(`Given ${actual} should return expected value: ${expected}`, () => {
-          expect(subDataService.compoundV2LeverageManagementSubData.encode(...actual)).to.eql(expected);
+        it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(subDataService.sparkGenericFLCollateralSwitchSubData.encode(...actual)).to.eql(expected);
         });
       });
     });
 
     describe('decode()', () => {
-      const examples: Array<[{ targetRatio: number }, SubData]> = [
-        [
-          { targetRatio: 200 },
-          ['0x0000000000000000000000000000000000000000000000001bc16d674ec80000'],
-        ],
+      const examples: Array<[
+        {
+          fromAsset: EthereumAddress,
+          fromAssetId: number,
+          toAsset: EthereumAddress,
+          toAssetId: number,
+          marketAddr: EthereumAddress,
+          amountToSwitch: string,
+          user: EthereumAddress,
+        },
+        SubData,
+      ]> = [
         [
-          { targetRatio: 123 },
-          ['0x0000000000000000000000000000000000000000000000001111d67bb1bb0000'],
+          {
+            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',
+            user: web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
+          },
+          [
+            '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+            '0x0000000000000000000000000000000000000000000000000000000000000000',
+            '0x000000000000000000000000cbb7c0000ab88b473b1f5afd9ef808440eed33bf',
+            '0x0000000000000000000000000000000000000000000000000000000000000007',
+            '0x00000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee',
+            '0x0000000000000000000000000000000000000000000000008ac7230489e80000',
+            '0x0000000000000000000000001234567890123456789012345678901234567890',
+          ],
         ],
       ];
 
       examples.forEach(([expected, actual]) => {
-        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(subDataService.compoundV2LeverageManagementSubData.decode(actual)).to.eql(expected);
+        it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(subDataService.sparkGenericFLCollateralSwitchSubData.decode(actual)).to.eql(expected);
         });
       });
     });
   });
 
-  describe('When testing subDataService.compoundV3LeverageManagementSubData', () => {
+  describe('When testing subDataService.compoundV2LeverageManagementSubData', () => {
     describe('encode()', () => {
-      const examples: Array<[[EthereumAddress, EthereumAddress, string, string, string, string, boolean, boolean], [market: EthereumAddress, baseToken: EthereumAddress, triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean, isEOA: boolean]]> = [
+      const examples: Array<[SubData, [targetRatio: number, ratioState: RatioState]]> = [
         [
           [
-            web3Utils.toChecksumAddress('0x1C0F620155e85491f8D35440eb17538Ca5c55212'),
-            web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
-            new Dec(160).mul(1e16).toString(),
-            new Dec(220).mul(1e16).toString(),
-            new Dec(180).mul(1e16).toString(),
-            new Dec(190).mul(1e16).toString(),
-            true, false,
+            '0x00000000000000000000000000000000000000000000000018fae27693b40000',
+            '0x0000000000000000000000000000000000000000000000000000000000000001',
           ],
-          [
-            web3Utils.toChecksumAddress('0x1C0F620155e85491f8D35440eb17538Ca5c55212'),
-            web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
-            160, 220, 180, 190,
-            true, false,
-          ]
+          [180, RatioState.UNDER],
         ],
         [
           [
-            web3Utils.toChecksumAddress('0xaC0F620155e85491f8D35440eb17538Ca5c55212'),
-            web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
-            new Dec(160).mul(1e16).toString(),
-            new Dec(210).mul(1e16).toString(),
-            new Dec(180).mul(1e16).toString(),
-            new Dec(190).mul(1e16).toString(),
-            false, true,
+            '0x00000000000000000000000000000000000000000000000016345785d8a00000',
+            '0x0000000000000000000000000000000000000000000000000000000000000000',
+            '0x0000000000000000000000000000000000000000000000000000000000000001',
           ],
-          [
-            web3Utils.toChecksumAddress('0xaC0F620155e85491f8D35440eb17538Ca5c55212'),
-            web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
-            160, 210, 180, 190,
-            false, true,
-          ]
+          [160, RatioState.OVER],
         ],
       ];
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${expected}`, () => {
-          expect(subDataService.compoundV3LeverageManagementSubData.encode(...actual)).to.eql(expected);
+          expect(subDataService.compoundV2LeverageManagementSubData.encode(...actual)).to.eql(expected);
         });
       });
     });
+  });
 
+  describe('When testing subDataService.legacyCompoundV2LeverageManagementSubData', () => {
     describe('decode()', () => {
       const examples: Array<[{ targetRatio: number }, SubData]> = [
         [
-          { targetRatio: 123 },
-          [
-            '0x0000000000000000000000000000000000000000000000000000000000000000', '0x0000000000000000000000000000000000000000000000000000000000000000',
-            '0x0000000000000000000000000000000000000000000000000000000000000000', '0x0000000000000000000000000000000000000000000000001111d67bb1bb0000',
-          ],
+          { targetRatio: 200 },
+          ['0x0000000000000000000000000000000000000000000000001bc16d674ec80000'],
         ],
         [
-          { targetRatio: 200 },
-          [
-            '0x0000000000000000000000000000000000000000000000000000000000000000', '0x0000000000000000000000000000000000000000000000000000000000000000',
-            '0x0000000000000000000000000000000000000000000000000000000000000000', '0x0000000000000000000000000000000000000000000000001bc16d674ec80000',
-          ],
+          { targetRatio: 123 },
+          ['0x0000000000000000000000000000000000000000000000001111d67bb1bb0000'],
         ],
       ];
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(subDataService.compoundV3LeverageManagementSubData.decode(actual)).to.eql(expected);
+          expect(subDataService.legacyCompoundV2LeverageManagementSubData.decode(actual)).to.eql(expected);
         });
       });
     });
   });
 
   describe('When testing subDataService.morphoAaveV2LeverageManagementSubData', () => {
-    describe('encode()', () => {
-      const examples: Array<[[string, string, string, string, boolean], [triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean]]> = [
-        [
-          [new Dec(160).mul(1e16).toString(), new Dec(220).mul(1e16).toString(), new Dec(180).mul(1e16).toString(), new Dec(190).mul(1e16).toString(), true],
-          [160, 220, 180, 190, true]
-        ],
-        [
-          [new Dec(160).mul(1e16).toString(), new Dec(200).mul(1e16).toString(), new Dec(180).mul(1e16).toString(), new Dec(190).mul(1e16).toString(), false],
-          [160, 200, 180, 190, false]
-        ],
-      ];
-
-      examples.forEach(([expected, actual]) => {
-        it(`Given ${actual} should return expected value: ${expected}`, () => {
-          expect(subDataService.morphoAaveV2LeverageManagementSubData.encode(...actual)).to.eql(expected);
-        });
-      });
-    });
-
     describe('decode()', () => {
       const examples: Array<[{ targetRatio: number }, SubData]> = [
         [
@@ -847,25 +831,6 @@ describe('Feature: subDataService.ts', () => {
   });
 
   describe('When testing subDataService.cBondsRebondSubData', () => {
-    describe('encode()', () => {
-      const examples: Array<[SubData, [bondId: number | string]]> = [
-        [
-          ['0x00000000000000000000000000000000000000000000000000000000000000c8'],
-          [200]
-        ],
-        [
-          ['0x000000000000000000000000000000000000000000000000000000000000a119'],
-          [41241]
-        ],
-      ];
-
-      examples.forEach(([expected, actual]) => {
-        it(`Given ${actual} should return expected value: ${expected}`, () => {
-          expect(subDataService.cBondsRebondSubData.encode(...actual)).to.eql(expected);
-        });
-      });
-    });
-
     describe('decode()', () => {
       const examples: Array<[{ bondId: string }, SubData]> = [
         [
@@ -1016,54 +981,7 @@ describe('Feature: subDataService.ts', () => {
     });
   });
 
-  describe('When testing subDataService.exchangeLimitOrderSubData', () => {
-    describe('encode()', () => {
-      const examples: Array<[[EthereumAddress, EthereumAddress, string, string, string, string], [fromToken: EthereumAddress, toToken: EthereumAddress, amount: string, targetPrice: string, goodUntil: string | number, orderType: OrderType]]> = [
-        [
-          [
-            web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
-            web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
-            '2131',
-            '0.53123',
-            '1696590921159',
-            `${OrderType.STOP_LOSS}`
-          ],
-          [
-            web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
-            web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
-            '2131',
-            '0.53123',
-            1696590921159,
-            OrderType.STOP_LOSS
-          ]
-        ],
-        [
-          [
-            web3Utils.toChecksumAddress(getAssetInfo('LINK', ChainId.Arbitrum).address),
-            web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Arbitrum).address),
-            '2131',
-            '0.43123',
-            '1646590921159',
-            `${OrderType.TAKE_PROFIT}`
-          ],
-          [
-            web3Utils.toChecksumAddress(getAssetInfo('LINK', ChainId.Arbitrum).address),
-            web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Arbitrum).address),
-            '2131',
-            '0.43123',
-            1646590921159,
-            OrderType.TAKE_PROFIT
-          ]
-        ],
-      ];
-
-      examples.forEach(([expected, actual]) => {
-        it(`Given ${actual} should return expected value: ${expected}`, () => {
-          expect(subDataService.exchangeLimitOrderSubData.encode(...actual)).to.eql(expected);
-        });
-      });
-    });
-
+  describe('When testing subDataService.legacyExchangeLimitOrderSubData', () => {
     describe('decode()', () => {
       const examples: Array<[{ fromToken: EthereumAddress, toToken: EthereumAddress, amount: string }, [SubData, ChainId]]> = [
         [
@@ -1098,127 +1016,254 @@ describe('Feature: subDataService.ts', () => {
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(subDataService.exchangeLimitOrderSubData.decode(...actual)).to.eql(expected);
+          expect(subDataService.legacyExchangeLimitOrderSubData.decode(...actual)).to.eql(expected);
         });
       });
     });
   });
 
+
   describe('When testing subDataService.sparkLeverageManagementSubData', () => {
-    describe('decode()', () => {
-      const examples: Array<[{ targetRatio: number }, SubData]> = [
+    describe('encode()', () => {
+      const examples: Array<[
+        SubData,
+        [targetRatio: number, ratioState: RatioState]
+      ]> = [
         [
-          { targetRatio: 200 },
-          ['0x0000000000000000000000000000000000000000000000001bc16d674ec80000'],
+          [
+            '0x00000000000000000000000000000000000000000000000018fae27693b40000',
+            '0x0000000000000000000000000000000000000000000000000000000000000001',
+            '0x0000000000000000000000000000000000000000000000000000000000000001',
+            '0x0000000000000000000000000000000000000000000000000000000000000000',
+          ],
+          [180, RatioState.UNDER],
         ],
         [
-          { targetRatio: 123 },
-          ['0x0000000000000000000000000000000000000000000000001111d67bb1bb0000'],
+          [
+            '0x00000000000000000000000000000000000000000000000016345785d8a00000',
+            '0x0000000000000000000000000000000000000000000000000000000000000000',
+            '0x0000000000000000000000000000000000000000000000000000000000000001',
+            '0x0000000000000000000000000000000000000000000000000000000000000000',
+          ],
+          [160, RatioState.OVER],
         ],
       ];
 
       examples.forEach(([expected, actual]) => {
-        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(subDataService.sparkLeverageManagementSubData.decode(actual)).to.eql(expected);
+        it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(subDataService.sparkLeverageManagementSubData.encode(...actual)).to.eql(expected);
         });
       });
     });
-  });
 
-  describe('When testing subDataService.liquityDsrPaybackSubData', () => {
-    describe('encode()', () => {
-      const examples: Array<[SubData, [targetRatio: number]]> = [
+    describe('decode()', () => {
+      const examples: Array<[{ targetRatio: number, ratioState: string }, SubData]> = [
         [
+          { targetRatio: 180, ratioState: '1' },
           [
-            '0x0000000000000000000000000000000000000000000000000000000000000001', '0x0000000000000000000000000000000000000000000000001111d67bb1bb0000',
-            '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f', '0x0000000000000000000000005f98805a4e8be255a32880fdec7f6728c6568ba0',
+            '0x00000000000000000000000000000000000000000000000018fae27693b40000',
+            '0x0000000000000000000000000000000000000000000000000000000000000001',
+            '0x0000000000000000000000000000000000000000000000000000000000000001',
+            '0x0000000000000000000000000000000000000000000000000000000000000000',
           ],
-          [123]
         ],
         [
+          { targetRatio: 160, ratioState: '0' },
           [
-            '0x0000000000000000000000000000000000000000000000000000000000000001', '0x0000000000000000000000000000000000000000000000003a4965bf58a40000',
-            '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f', '0x0000000000000000000000005f98805a4e8be255a32880fdec7f6728c6568ba0',
+            '0x00000000000000000000000000000000000000000000000016345785d8a00000',
+            '0x0000000000000000000000000000000000000000000000000000000000000000',
+            '0x0000000000000000000000000000000000000000000000000000000000000001',
+            '0x0000000000000000000000000000000000000000000000000000000000000000',
           ],
-          [420]
         ],
       ];
 
       examples.forEach(([expected, actual]) => {
-        it(`Given ${actual} should return expected value: ${expected}`, () => {
-          expect(subDataService.liquityDsrPaybackSubData.encode(...actual)).to.eql(expected);
+        it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(subDataService.sparkLeverageManagementSubData.decode(actual)).to.eql(expected);
         });
       });
     });
+  });
 
+  describe('When testing subDataService.legacySparkLeverageManagementSubData', () => {
     describe('decode()', () => {
       const examples: Array<[{ targetRatio: number }, SubData]> = [
         [
-          {
-            targetRatio: 123,
-          },
-          [
-            '0x0000000000000000000000000000000000000000000000000000000000000001', '0x0000000000000000000000000000000000000000000000001111d67bb1bb0000',
-            '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f', '0x0000000000000000000000005f98805a4e8be255a32880fdec7f6728c6568ba0',
-          ],
+          { targetRatio: 180 },
+          ['0x00000000000000000000000000000000000000000000000018fae27693b40000'],
         ],
         [
-          {
-            targetRatio: 420,
-          },
-          [
-            '0x0000000000000000000000000000000000000000000000000000000000000001', '0x0000000000000000000000000000000000000000000000003a4965bf58a40000',
-            '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f', '0x0000000000000000000000005f98805a4e8be255a32880fdec7f6728c6568ba0',
-          ],
+          { targetRatio: 160 },
+          ['0x00000000000000000000000000000000000000000000000016345785d8a00000'],
         ],
       ];
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(subDataService.liquityDsrPaybackSubData.decode(actual)).to.eql(expected);
+          expect(subDataService.legacySparkLeverageManagementSubData.decode(actual)).to.eql(expected);
         });
       });
     });
   });
 
-  describe('When testing subDataService.liquityDsrSupplySubData', () => {
+  describe('When testing subDataService.sparkLiquidationProtectionSubData', () => {
     describe('encode()', () => {
-      const examples: Array<[SubData, [targetRatio: number]]> = [
+      const examples: Array<[
+        SubData,
+        [targetRatio: number, ratioState: RatioState]
+      ]> = [
         [
           [
-            '0x0000000000000000000000000000000000000000000000000000000000000001', '0x0000000000000000000000000000000000000000000000002c68af0bb1400000',
-            '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f', '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+            '0x00000000000000000000000000000000000000000000000018fae27693b40000',
+            '0x0000000000000000000000000000000000000000000000000000000000000001',
+            '0x0000000000000000000000000000000000000000000000000000000000000001',
+            '0x0000000000000000000000000000000000000000000000000000000000000000',
           ],
-          [320]
+          [180, RatioState.UNDER],
         ],
         [
           [
-            '0x0000000000000000000000000000000000000000000000000000000000000001', '0x0000000000000000000000000000000000000000000000001eab7f4a799d0000',
-            '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f', '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+            '0x00000000000000000000000000000000000000000000000016345785d8a00000',
+            '0x0000000000000000000000000000000000000000000000000000000000000000',
+            '0x0000000000000000000000000000000000000000000000000000000000000001',
+            '0x0000000000000000000000000000000000000000000000000000000000000000',
           ],
-          [221]
+          [160, RatioState.OVER],
         ],
       ];
 
       examples.forEach(([expected, actual]) => {
-        it(`Given ${actual} should return expected value: ${expected}`, () => {
-          expect(subDataService.liquityDsrSupplySubData.encode(...actual)).to.eql(expected);
+        it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(subDataService.sparkLiquidationProtectionSubData.encode(...actual)).to.eql(expected);
         });
       });
     });
 
     describe('decode()', () => {
-      const examples: Array<[{ targetRatio: number }, SubData]> = [
+      const examples: Array<[{ targetRatio: number, ratioState: string }, SubData]> = [
         [
-          {
-            targetRatio: 320,
-          },
+          { targetRatio: 180, ratioState: '1' },
           [
-            '0x0000000000000000000000000000000000000000000000000000000000000001', '0x0000000000000000000000000000000000000000000000002c68af0bb1400000',
-            '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f', '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-          ],
-        ],
-        [
+            '0x00000000000000000000000000000000000000000000000018fae27693b40000',
+            '0x0000000000000000000000000000000000000000000000000000000000000001',
+            '0x0000000000000000000000000000000000000000000000000000000000000001',
+            '0x0000000000000000000000000000000000000000000000000000000000000000',
+          ],
+        ],
+        [
+          { targetRatio: 160, ratioState: '0' },
+          [
+            '0x00000000000000000000000000000000000000000000000016345785d8a00000',
+            '0x0000000000000000000000000000000000000000000000000000000000000000',
+            '0x0000000000000000000000000000000000000000000000000000000000000001',
+            '0x0000000000000000000000000000000000000000000000000000000000000000',
+          ],
+        ],
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(subDataService.sparkLiquidationProtectionSubData.decode(actual)).to.eql(expected);
+        });
+      });
+    });
+  });
+
+  describe('When testing subDataService.liquityDsrPaybackSubData', () => {
+    describe('encode()', () => {
+      const examples: Array<[SubData, [targetRatio: number]]> = [
+        [
+          [
+            '0x0000000000000000000000000000000000000000000000000000000000000001', '0x0000000000000000000000000000000000000000000000001111d67bb1bb0000',
+            '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f', '0x0000000000000000000000005f98805a4e8be255a32880fdec7f6728c6568ba0',
+          ],
+          [123]
+        ],
+        [
+          [
+            '0x0000000000000000000000000000000000000000000000000000000000000001', '0x0000000000000000000000000000000000000000000000003a4965bf58a40000',
+            '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f', '0x0000000000000000000000005f98805a4e8be255a32880fdec7f6728c6568ba0',
+          ],
+          [420]
+        ],
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${actual} should return expected value: ${expected}`, () => {
+          expect(subDataService.liquityDsrPaybackSubData.encode(...actual)).to.eql(expected);
+        });
+      });
+    });
+
+    describe('decode()', () => {
+      const examples: Array<[{ targetRatio: number }, SubData]> = [
+        [
+          {
+            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(subDataService.liquityDsrPaybackSubData.decode(actual)).to.eql(expected);
+        });
+      });
+    });
+  });
+
+  describe('When testing subDataService.liquityDsrSupplySubData', () => {
+    describe('encode()', () => {
+      const examples: Array<[SubData, [targetRatio: number]]> = [
+        [
+          [
+            '0x0000000000000000000000000000000000000000000000000000000000000001', '0x0000000000000000000000000000000000000000000000002c68af0bb1400000',
+            '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f', '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+          ],
+          [320]
+        ],
+        [
+          [
+            '0x0000000000000000000000000000000000000000000000000000000000000001', '0x0000000000000000000000000000000000000000000000001eab7f4a799d0000',
+            '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f', '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+          ],
+          [221]
+        ],
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${actual} should return expected value: ${expected}`, () => {
+          expect(subDataService.liquityDsrSupplySubData.encode(...actual)).to.eql(expected);
+        });
+      });
+    });
+
+    describe('decode()', () => {
+      const examples: Array<[{ targetRatio: number }, SubData]> = [
+        [
+          {
+            targetRatio: 320,
+          },
+          [
+            '0x0000000000000000000000000000000000000000000000000000000000000001', '0x0000000000000000000000000000000000000000000000002c68af0bb1400000',
+            '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f', '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+          ],
+        ],
+        [
           {
             targetRatio: 221,
           },
@@ -2517,6 +2562,369 @@ describe('Feature: subDataService.ts', () => {
       });
     });
   });
+  describe('When testing subDataService.sparkCloseGenericSubData', () => {
+    describe('encode()', () => {
+      const examples: Array<[
+        SubData,
+        [
+          collAsset: EthereumAddress,
+          collAssetId: number,
+          debtAsset: EthereumAddress,
+          debtAssetId: number,
+          closeType: CloseStrategyType,
+          marketAddr: EthereumAddress,
+          user: EthereumAddress,
+        ]
+      ]> = [
+        [
+          [
+            '0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c599',
+            '0x0000000000000000000000000000000000000000000000000000000000000002',
+            '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f',
+            '0x0000000000000000000000000000000000000000000000000000000000000004',
+            '0x0000000000000000000000000000000000000000000000000000000000000005',
+            '0x00000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee',
+            '0x0000000000000000000000001234567890123456789012345678901234567890',
+          ],
+          [
+            web3Utils.toChecksumAddress(getAssetInfo('WBTC', ChainId.Ethereum).address),
+            2,
+            web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
+            4,
+            CloseStrategyType.TAKE_PROFIT_IN_COLLATERAL_AND_STOP_LOSS_IN_DEBT,
+            web3Utils.toChecksumAddress('0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE'),
+            web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
+          ],
+        ],
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(subDataService.sparkCloseGenericSubData.encode(...actual)).to.eql(expected);
+        });
+      });
+    });
+
+    describe('decode()', () => {
+      const examples: Array<[
+        {
+          collAsset: EthereumAddress,
+          collAssetId: number,
+          debtAsset: EthereumAddress,
+          debtAssetId: number,
+          closeType: CloseStrategyType,
+          marketAddr: EthereumAddress,
+          owner: EthereumAddress,
+        },
+        SubData,
+      ]> = [
+        [
+          {
+            collAsset: web3Utils.toChecksumAddress(getAssetInfo('WBTC', ChainId.Ethereum).address),
+            collAssetId: 2,
+            debtAsset: web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
+            debtAssetId: 4,
+            closeType: CloseStrategyType.TAKE_PROFIT_IN_COLLATERAL_AND_STOP_LOSS_IN_DEBT,
+            marketAddr: web3Utils.toChecksumAddress('0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE'),
+            owner: web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
+          },
+          [
+            '0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c599',
+            '0x0000000000000000000000000000000000000000000000000000000000000002',
+            '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f',
+            '0x0000000000000000000000000000000000000000000000000000000000000004',
+            '0x0000000000000000000000000000000000000000000000000000000000000005',
+            '0x00000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee',
+            '0x0000000000000000000000001234567890123456789012345678901234567890',
+          ],
+        ],
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(subDataService.sparkCloseGenericSubData.decode(actual)).to.eql(expected);
+        });
+      });
+    });
+  });
+
+  describe('When testing subDataService.sparkGenericLeverageManagementSubData', () => {
+    describe('encode()', () => {
+      const examples: Array<[
+        SubData,
+        [targetRatio: number, ratioState: RatioState, market: EthereumAddress, user: EthereumAddress]
+      ]> = [
+        [
+          [
+            '0x00000000000000000000000000000000000000000000000018fae27693b40000',
+            '0x0000000000000000000000000000000000000000000000000000000000000001',
+            '0x00000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee',
+            '0x0000000000000000000000001234567890123456789012345678901234567890',
+          ],
+          [
+            180,
+            RatioState.UNDER,
+            web3Utils.toChecksumAddress('0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE'),
+            web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
+          ],
+        ],
+        [
+          [
+            '0x00000000000000000000000000000000000000000000000016345785d8a00000',
+            '0x0000000000000000000000000000000000000000000000000000000000000000',
+            '0x00000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee',
+            '0x0000000000000000000000001234567890123456789012345678901234567890',
+          ],
+          [
+            160,
+            RatioState.OVER,
+            web3Utils.toChecksumAddress('0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE'),
+            web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
+          ],
+        ],
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(subDataService.sparkGenericLeverageManagementSubData.encode(...actual)).to.eql(expected);
+        });
+      });
+    });
+
+    describe('decode()', () => {
+      const examples: Array<[
+        { targetRatio: number, ratioState: RatioState },
+        SubData,
+      ]> = [
+        [
+          { targetRatio: 180, ratioState: RatioState.UNDER },
+          [
+            '0x00000000000000000000000000000000000000000000000018fae27693b40000',
+            '0x0000000000000000000000000000000000000000000000000000000000000001',
+            '0x00000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee',
+            '0x0000000000000000000000001234567890123456789012345678901234567890',
+          ],
+        ],
+        [
+          { targetRatio: 160, ratioState: RatioState.OVER },
+          [
+            '0x00000000000000000000000000000000000000000000000016345785d8a00000',
+            '0x0000000000000000000000000000000000000000000000000000000000000000',
+            '0x00000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee',
+            '0x0000000000000000000000001234567890123456789012345678901234567890',
+          ],
+        ],
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(subDataService.sparkGenericLeverageManagementSubData.decode(actual)).to.eql(expected);
+        });
+      });
+    });
+  });
+
+  describe('When testing subDataService.sparkGenericLiquidationProtectionSubData', () => {
+    describe('encode()', () => {
+      const examples: Array<[
+        SubData,
+        [targetRatio: number, ratioState: RatioState, market: EthereumAddress, user: EthereumAddress]
+      ]> = [
+        [
+          [
+            '0x00000000000000000000000000000000000000000000000018fae27693b40000',
+            '0x0000000000000000000000000000000000000000000000000000000000000001',
+            '0x00000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee',
+            '0x0000000000000000000000001234567890123456789012345678901234567890',
+          ],
+          [
+            180,
+            RatioState.UNDER,
+            web3Utils.toChecksumAddress('0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE'),
+            web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
+          ],
+        ],
+        [
+          [
+            '0x00000000000000000000000000000000000000000000000016345785d8a00000',
+            '0x0000000000000000000000000000000000000000000000000000000000000000',
+            '0x00000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee',
+            '0x0000000000000000000000001234567890123456789012345678901234567890',
+          ],
+          [
+            160,
+            RatioState.OVER,
+            web3Utils.toChecksumAddress('0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE'),
+            web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
+          ],
+        ],
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(subDataService.sparkGenericLiquidationProtectionSubData.encode(...actual)).to.eql(expected);
+        });
+      });
+    });
+
+    describe('decode()', () => {
+      const examples: Array<[
+        { targetRatio: number, ratioState: RatioState },
+        SubData,
+      ]> = [
+        [
+          { targetRatio: 180, ratioState: RatioState.UNDER },
+          [
+            '0x00000000000000000000000000000000000000000000000018fae27693b40000',
+            '0x0000000000000000000000000000000000000000000000000000000000000001',
+            '0x00000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee',
+            '0x0000000000000000000000001234567890123456789012345678901234567890',
+          ],
+        ],
+        [
+          { targetRatio: 160, ratioState: RatioState.OVER },
+          [
+            '0x00000000000000000000000000000000000000000000000016345785d8a00000',
+            '0x0000000000000000000000000000000000000000000000000000000000000000',
+            '0x00000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee',
+            '0x0000000000000000000000001234567890123456789012345678901234567890',
+          ],
+        ],
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(subDataService.sparkGenericLiquidationProtectionSubData.decode(actual)).to.eql(expected);
+        });
+      });
+    });
+  });
+
+  describe('When testing subDataService.sparkLeverageManagementOnPriceGenericSubData', () => {
+    describe('encode()', () => {
+      const examples: Array<[
+        SubData,
+        [
+          collAsset: EthereumAddress,
+          collAssetId: number,
+          debtAsset: EthereumAddress,
+          debtAssetId: number,
+          marketAddr: EthereumAddress,
+          targetRatio: number,
+          user: EthereumAddress,
+        ]
+      ]> = [
+        [
+          [
+            '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+            '0x0000000000000000000000000000000000000000000000000000000000000000',
+            '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+            '0x0000000000000000000000000000000000000000000000000000000000000001',
+            '0x00000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee',
+            '0x0000000000000000000000000000000000000000000000001bc16d674ec80000',
+            '0x0000000000000000000000001234567890123456789012345678901234567890',
+          ],
+          [
+            web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+            0,
+            web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+            1,
+            web3Utils.toChecksumAddress('0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE'),
+            200,
+            web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
+          ],
+        ],
+        [
+          [
+            '0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c599',
+            '0x0000000000000000000000000000000000000000000000000000000000000002',
+            '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f',
+            '0x0000000000000000000000000000000000000000000000000000000000000004',
+            '0x00000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee',
+            '0x00000000000000000000000000000000000000000000000022b1c8c1227a0000',
+            '0x0000000000000000000000001234567890123456789012345678901234567890',
+          ],
+          [
+            web3Utils.toChecksumAddress(getAssetInfo('WBTC', ChainId.Ethereum).address),
+            2,
+            web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
+            4,
+            web3Utils.toChecksumAddress('0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE'),
+            250,
+            web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
+          ],
+        ],
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(subDataService.sparkLeverageManagementOnPriceGenericSubData.encode(...actual)).to.eql(expected);
+        });
+      });
+    });
+
+    describe('decode()', () => {
+      const examples: Array<[
+        {
+          collAsset: EthereumAddress,
+          collAssetId: number,
+          debtAsset: EthereumAddress,
+          debtAssetId: number,
+          marketAddr: EthereumAddress,
+          targetRatio: number,
+          user: EthereumAddress,
+        },
+        SubData,
+      ]> = [
+        [
+          {
+            collAsset: web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+            collAssetId: 0,
+            debtAsset: web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+            debtAssetId: 1,
+            marketAddr: web3Utils.toChecksumAddress('0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE'),
+            targetRatio: 200,
+            user: web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
+          },
+          [
+            '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+            '0x0000000000000000000000000000000000000000000000000000000000000000',
+            '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+            '0x0000000000000000000000000000000000000000000000000000000000000001',
+            '0x00000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee',
+            '0x0000000000000000000000000000000000000000000000001bc16d674ec80000',
+            '0x0000000000000000000000001234567890123456789012345678901234567890',
+          ],
+        ],
+        [
+          {
+            collAsset: web3Utils.toChecksumAddress(getAssetInfo('WBTC', ChainId.Ethereum).address),
+            collAssetId: 2,
+            debtAsset: web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
+            debtAssetId: 4,
+            marketAddr: web3Utils.toChecksumAddress('0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE'),
+            targetRatio: 250,
+            user: web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
+          },
+          [
+            '0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c599',
+            '0x0000000000000000000000000000000000000000000000000000000000000002',
+            '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f',
+            '0x0000000000000000000000000000000000000000000000000000000000000004',
+            '0x00000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee',
+            '0x00000000000000000000000000000000000000000000000022b1c8c1227a0000',
+            '0x0000000000000000000000001234567890123456789012345678901234567890',
+          ],
+        ],
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(subDataService.sparkLeverageManagementOnPriceGenericSubData.decode(actual)).to.eql(expected);
+        });
+      });
+    });
+  });
   describe('When testing subDataService.aaveV4LeverageManagementSubData', () => {
     describe('encode()', () => {
       const examples: Array<[SubData, [spoke: EthereumAddress, owner: EthereumAddress, ratioState: RatioState, targetRatio: number]]> = [