@defisaver/automation-sdk 3.3.15-liq-prot-1-dev → 3.3.15-liq-prot-3-dev

package/esm/services/subDataService.test.js

@@ -1,9 +1,8 @@
-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 '../configuration';
 import * as subDataService from './subDataService';
 describe('Feature: subDataService.ts', () => {
@@ -118,7 +117,7 @@ describe('Feature: subDataService.ts', () => {
             });
         });
     });
-    describe('When testing subDataService.makerLeverageManagementSubData', () => {
+    describe('When testing subDataService.legacyMakerLeverageManagementSubData', () => {
         describe('decode()', () => {
             const examples = [
                 [
@@ -131,12 +130,12 @@ 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 = [
                 [
@@ -156,7 +155,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);
                 });
             });
         });
@@ -187,12 +186,12 @@ 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 = [
                 [
@@ -205,7 +204,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);
                 });
             });
         });
@@ -260,24 +259,7 @@ describe('Feature: subDataService.ts', () => {
             });
         });
     });
-    describe('When testing subDataService.aaveV2LeverageManagementSubData', () => {
-        describe('encode()', () => {
-            const examples = [
-                [
-                    [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 = [
                 [
@@ -291,12 +273,12 @@ 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 = [
                 [
@@ -310,7 +292,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);
                 });
             });
         });
@@ -649,24 +631,7 @@ describe('Feature: subDataService.ts', () => {
             });
         });
     });
-    describe('When testing subDataService.compoundV2LeverageManagementSubData', () => {
-        describe('encode()', () => {
-            const examples = [
-                [
-                    [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.compoundV2LeverageManagementSubData.encode(...actual)).to.eql(expected);
-                });
-            });
-        });
+    describe('When testing subDataService.legacyCompoundV2LeverageManagementSubData', () => {
         describe('decode()', () => {
             const examples = [
                 [
@@ -680,29 +645,12 @@ describe('Feature: subDataService.ts', () => {
             ];
             examples.forEach(([expected, actual]) => {
                 it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    expect(subDataService.compoundV2LeverageManagementSubData.decode(actual)).to.eql(expected);
+                    expect(subDataService.legacyCompoundV2LeverageManagementSubData.decode(actual)).to.eql(expected);
                 });
             });
         });
     });
     describe('When testing subDataService.morphoAaveV2LeverageManagementSubData', () => {
-        describe('encode()', () => {
-            const examples = [
-                [
-                    [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 = [
                 [
@@ -722,23 +670,6 @@ describe('Feature: subDataService.ts', () => {
         });
     });
     describe('When testing subDataService.cBondsRebondSubData', () => {
-        describe('encode()', () => {
-            const examples = [
-                [
-                    ['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 = [
                 [
@@ -879,52 +810,7 @@ describe('Feature: subDataService.ts', () => {
             });
         });
     });
-    describe('When testing subDataService.exchangeLimitOrderSubData', () => {
-        describe('encode()', () => {
-            const examples = [
-                [
-                    [
-                        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 = [
                 [
@@ -958,12 +844,12 @@ 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('When testing subDataService.legacySparkLeverageManagementSubData', () => {
         describe('decode()', () => {
             const examples = [
                 [
@@ -977,7 +863,7 @@ describe('Feature: subDataService.ts', () => {
             ];
             examples.forEach(([expected, actual]) => {
                 it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    expect(subDataService.sparkLeverageManagementSubData.decode(actual)).to.eql(expected);
+                    expect(subDataService.legacySparkLeverageManagementSubData.decode(actual)).to.eql(expected);
                 });
             });
         });

package/esm/services/utils.d.ts

@@ -29,4 +29,3 @@ export declare function getStopLossAndTakeProfitTypeByCloseStrategyType(closeStr
     takeProfitType: CloseToAssetType | undefined;
 };
 export declare function getBundleIdsByNetwork(network: ChainId): typeof Bundles.MainnetIds | typeof Bundles.ArbitrumIds | typeof Bundles.BaseIds;
-export declare function getCompoundV3LeverageManagementBundleId(network: ChainId, isEOA: boolean, isBoost: boolean): number;

package/esm/services/utils.js

@@ -149,22 +149,3 @@ export function getBundleIdsByNetwork(network) {
             throw new Error(`Unsupported network ${network}`);
     }
 }
-// Mainnet uses the V2 bundle ids; L2s use the original bundle ids.
-export function getCompoundV3LeverageManagementBundleId(network, isEOA, isBoost) {
-    switch (Number(network)) {
-        case ChainId.Ethereum:
-            if (isEOA)
-                return isBoost ? Bundles.MainnetIds.COMP_V3_EOA_BOOST_V2_BUNDLE : Bundles.MainnetIds.COMP_V3_EOA_REPAY_V2_BUNDLE;
-            return isBoost ? Bundles.MainnetIds.COMP_V3_SW_BOOST_V2_BUNDLE : Bundles.MainnetIds.COMP_V3_SW_REPAY_V2_BUNDLE;
-        case ChainId.Base:
-            if (isEOA)
-                return isBoost ? Bundles.BaseIds.COMP_V3_EOA_BOOST : Bundles.BaseIds.COMP_V3_EOA_REPAY;
-            return isBoost ? Bundles.BaseIds.COMP_V3_SW_BOOST_BUNDLE : Bundles.BaseIds.COMP_V3_SW_REPAY_BUNDLE;
-        case ChainId.Arbitrum:
-            if (isEOA)
-                return isBoost ? Bundles.ArbitrumIds.COMP_V3_EOA_BOOST : Bundles.ArbitrumIds.COMP_V3_EOA_REPAY;
-            return isBoost ? Bundles.ArbitrumIds.COMP_V3_SW_BOOST_BUNDLE : Bundles.ArbitrumIds.COMP_V3_SW_REPAY_BUNDLE;
-        default:
-            throw new Error(`Compound V3 leverage management is not supported on network ${network}`);
-    }
-}

package/esm/services/utils.test.js

@@ -1,8 +1,8 @@
 import { expect } from 'chai';
 import { getAssetInfo } from '@defisaver/tokens';
-import { Bundles, ChainId, ProtocolIdentifiers, RatioState } from '../types/enums';
+import { ChainId, ProtocolIdentifiers, RatioState } from '../types/enums';
 import '../configuration';
-import { addToArrayIf, addToObjectIf, compareAddresses, encodeSubId, ethToWeth, getCompoundV3LeverageManagementBundleId, getRatioStateInfoForAaveCloseStrategy, isAddress, isDefined, isEmptyBytes, isRatioStateOver, isRatioStateUnder, isUndefined, ratioPercentageToWei, requireAddress, requireAddresses, weiToRatioPercentage, wethToEth, wethToEthByAddress, getPositionId, } from './utils';
+import { addToArrayIf, addToObjectIf, compareAddresses, encodeSubId, ethToWeth, getRatioStateInfoForAaveCloseStrategy, isAddress, isDefined, isEmptyBytes, isRatioStateOver, isRatioStateUnder, isUndefined, ratioPercentageToWei, requireAddress, requireAddresses, weiToRatioPercentage, wethToEth, wethToEthByAddress, getPositionId, } from './utils';
 describe('Feature: utils.ts', () => {
     describe('When testing utils.isDefined()', () => {
         const examples = [
@@ -294,29 +294,4 @@ describe('Feature: utils.ts', () => {
             });
         });
     });
-    describe('When testing utils.getCompoundV3LeverageManagementBundleId()', () => {
-        // Mainnet uses the V2 bundle ids; L2s use the original bundle ids.
-        const examples = [
-            [Bundles.MainnetIds.COMP_V3_SW_REPAY_V2_BUNDLE, [ChainId.Ethereum, false, false]],
-            [Bundles.MainnetIds.COMP_V3_SW_BOOST_V2_BUNDLE, [ChainId.Ethereum, false, true]],
-            [Bundles.MainnetIds.COMP_V3_EOA_REPAY_V2_BUNDLE, [ChainId.Ethereum, true, false]],
-            [Bundles.MainnetIds.COMP_V3_EOA_BOOST_V2_BUNDLE, [ChainId.Ethereum, true, true]],
-            [Bundles.BaseIds.COMP_V3_SW_REPAY_BUNDLE, [ChainId.Base, false, false]],
-            [Bundles.BaseIds.COMP_V3_SW_BOOST_BUNDLE, [ChainId.Base, false, true]],
-            [Bundles.BaseIds.COMP_V3_EOA_REPAY, [ChainId.Base, true, false]],
-            [Bundles.BaseIds.COMP_V3_EOA_BOOST, [ChainId.Base, true, true]],
-            [Bundles.ArbitrumIds.COMP_V3_SW_REPAY_BUNDLE, [ChainId.Arbitrum, false, false]],
-            [Bundles.ArbitrumIds.COMP_V3_SW_BOOST_BUNDLE, [ChainId.Arbitrum, false, true]],
-            [Bundles.ArbitrumIds.COMP_V3_EOA_REPAY, [ChainId.Arbitrum, true, false]],
-            [Bundles.ArbitrumIds.COMP_V3_EOA_BOOST, [ChainId.Arbitrum, true, true]],
-        ];
-        examples.forEach(([expected, actual]) => {
-            it(`Given ${actual} should return expected value: ${expected}`, () => {
-                expect(getCompoundV3LeverageManagementBundleId(...actual)).to.equal(expected);
-            });
-        });
-        it(`Given ${ChainId.Optimism} (unsupported) should throw an error`, () => {
-            expect(() => getCompoundV3LeverageManagementBundleId(ChainId.Optimism, false, false)).to.throw(Error);
-        });
-    });
 });

package/esm/types/enums.d.ts

@@ -140,7 +140,7 @@ export declare namespace Strategies {
         CollateralSwitch = "collateral-switch",
         EoaCollateralSwitch = "eoa-collateral-switch",
         LiquidationProtection = "liquidation-protection",
-        EoaLiquidationProtection = "eoa-liquidation-protection"
+        EoaLiquidationProtection = "liquidation-protection-eoa"
     }
     enum IdOverrides {
         TakeProfit = "take-profit",

package/esm/types/enums.js

@@ -157,7 +157,7 @@ export var Strategies;
         Identifiers["CollateralSwitch"] = "collateral-switch";
         Identifiers["EoaCollateralSwitch"] = "eoa-collateral-switch";
         Identifiers["LiquidationProtection"] = "liquidation-protection";
-        Identifiers["EoaLiquidationProtection"] = "eoa-liquidation-protection";
+        Identifiers["EoaLiquidationProtection"] = "liquidation-protection-eoa";
     })(Identifiers = Strategies.Identifiers || (Strategies.Identifiers = {}));
     let IdOverrides;
     (function (IdOverrides) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/automation-sdk",
-  "version": "3.3.15-liq-prot-1-dev",
+  "version": "3.3.15-liq-prot-3-dev",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",

package/src/index.ts

@@ -28,14 +28,12 @@ import {
   compareSubHashes,
   encodeSubId,
   getCloseStrategyType,
-  getCompoundV3LeverageManagementBundleId,
 } from './services/utils';
 
 const utils = {
   compareSubHashes,
   encodeSubId,
   getCloseStrategyType,
-  getCompoundV3LeverageManagementBundleId,
   getRatioStateInfoForAaveCloseStrategy,
 };
 

package/src/services/strategiesService.ts

@@ -106,7 +106,7 @@ function parseMakerLeverageManagement(position: Position.Automated, parseData: P
   const { isEnabled } = parseData.strategiesSubsData;
 
   const triggerData = triggerService.makerRatioTrigger.decode(subStruct.triggerData);
-  const subData = subDataService.makerLeverageManagementSubData.decode(subStruct.subData);
+  const subData = subDataService.legacyMakerLeverageManagementSubData.decode(subStruct.subData);
 
   _position.strategyData.decoded.triggerData = triggerData;
   _position.strategyData.decoded.subData = subData;
@@ -223,7 +223,7 @@ function parseAaveV2LeverageManagement(position: Position.Automated, parseData:
   const { isEnabled } = parseData.strategiesSubsData;
 
   const triggerData = triggerService.aaveV2RatioTrigger.decode(subStruct.triggerData);
-  const subData = subDataService.aaveV2LeverageManagementSubData.decode(subStruct.subData);
+  const subData = subDataService.legacyAaveV2LeverageManagementSubData.decode(subStruct.subData);
 
   _position.strategyData.decoded.triggerData = triggerData;
   _position.strategyData.decoded.subData = subData;
@@ -267,9 +267,9 @@ function parseAaveV3LeverageManagement(position: Position.Automated, parseData:
   const isEOA = _position.strategy.strategyId.includes('eoa');
   let subData;
   if (isEOA) {
-    subData = subDataService.aaveV3LeverageManagementSubDataWithoutSubProxy.decode(subStruct.subData);
-  } else {
     subData = subDataService.aaveV3LeverageManagementSubData.decode(subStruct.subData);
+  } else {
+    subData = subDataService.legacyAaveV3LeverageManagementSubData.decode(subStruct.subData);
   }
 
   _position.strategyData.decoded.triggerData = triggerData;
@@ -670,7 +670,7 @@ function parseCompoundV2LeverageManagement(position: Position.Automated, parseDa
   const { isEnabled } = parseData.strategiesSubsData;
 
   const triggerData = triggerService.compoundV2RatioTrigger.decode(subStruct.triggerData);
-  const subData = subDataService.compoundV2LeverageManagementSubData.decode(subStruct.subData);
+  const subData = subDataService.legacyCompoundV2LeverageManagementSubData.decode(subStruct.subData);
 
   _position.strategyData.decoded.triggerData = triggerData;
   _position.strategyData.decoded.subData = subData;
@@ -712,7 +712,7 @@ function parseCompoundV3LeverageManagement(position: Position.Automated, parseDa
   const { subStruct, subId, subHash } = parseData.subscriptionEventData;
   const { isEnabled } = parseData.strategiesSubsData;
 
-  const subDataDecoder = subDataService.compoundV3LeverageManagementSubDataWithoutSubProxy;
+  const subDataDecoder = subDataService.compoundV3LeverageManagementSubData;
 
   const triggerData = triggerService.compoundV3RatioTrigger.decode(subStruct.triggerData);
   const subData = subDataDecoder.decode(subStruct.subData);
@@ -758,7 +758,7 @@ function parseCompoundV3LiquidationProtection(position: Position.Automated, pars
   const { subStruct, subId, subHash } = parseData.subscriptionEventData;
   const { isEnabled } = parseData.strategiesSubsData;
 
-  const subDataDecoder = subDataService.compoundV3LiquidationProtectionSubDataWithoutSubProxy;
+  const subDataDecoder = subDataService.compoundV3LiquidationProtectionSubData;
 
   const triggerData = triggerService.compoundV3RatioTrigger.decode(subStruct.triggerData);
   const subData = subDataDecoder.decode(subStruct.subData);
@@ -888,7 +888,7 @@ function parseExchangeLimitOrder(position: Position.Automated, parseData: ParseD
 
   const { subStruct } = parseData.subscriptionEventData;
 
-  _position.strategyData.decoded.subData = subDataService.exchangeLimitOrderSubData.decode(subStruct.subData, chainId);
+  _position.strategyData.decoded.subData = subDataService.legacyExchangeLimitOrderSubData.decode(subStruct.subData, chainId);
   const fromTokenDecimals = getAssetInfoByAddress(_position.strategyData.decoded.subData.fromToken, chainId).decimals;
   const toTokenDecimals = getAssetInfoByAddress(_position.strategyData.decoded.subData.toToken, chainId).decimals;
   _position.strategyData.decoded.triggerData = triggerService.exchangeOffchainPriceTrigger.decode(subStruct.triggerData, fromTokenDecimals, toTokenDecimals);
@@ -905,7 +905,7 @@ function parseLiquityLeverageManagement(position: Position.Automated, parseData:
   const { isEnabled } = parseData.strategiesSubsData;
 
   const triggerData = triggerService.liquityRatioTrigger.decode(subStruct.triggerData);
-  const subData = subDataService.liquityLeverageManagementSubData.decode(subStruct.subData);
+  const subData = subDataService.legacyLiquityLeverageManagementSubData.decode(subStruct.subData);
 
   _position.strategyData.decoded.triggerData = triggerData;
   _position.strategyData.decoded.subData = subData;
@@ -989,7 +989,7 @@ function parseSparkLeverageManagement(position: Position.Automated, parseData: P
   const { isEnabled } = parseData.strategiesSubsData;
 
   const triggerData = triggerService.sparkRatioTrigger.decode(subStruct.triggerData);
-  const subData = subDataService.sparkLeverageManagementSubData.decode(subStruct.subData);
+  const subData = subDataService.legacySparkLeverageManagementSubData.decode(subStruct.subData);
 
   _position.strategyData.decoded.triggerData = triggerData;
   _position.strategyData.decoded.subData = subData;

package/src/services/strategySubService.test.ts

@@ -1,5 +1,4 @@
 import { expect } from 'chai';
-import Dec from 'decimal.js';
 import { otherAddresses } from '@defisaver/sdk';
 import { getAssetInfo, MAXUINT } from '@defisaver/tokens';
 import * as web3Utils from 'web3-utils';
@@ -9,12 +8,10 @@ import type { EthereumAddress, StrategyOrBundleIds, SubData, TriggerData } from
 
 import '../configuration';
 import {
-  chickenBondsEncode,
   liquityEncode,
   makerEncode,
   aaveV3Encode,
   compoundV3Encode,
-  morphoAaveV2Encode,
   exchangeEncode,
   crvUSDEncode,
   morphoBlueEncode,
@@ -137,7 +134,7 @@ describe('Feature: strategySubService.ts', () => {
       });
     });
 
-    describe('leverageManagementWithoutSubProxy()', () => {
+    describe('leverageManagement()', () => {
       const examples: Array<[
         [StrategyOrBundleIds, boolean, TriggerData, SubData],
         [
@@ -187,7 +184,7 @@ describe('Feature: strategySubService.ts', () => {
 
       examples.forEach(([expected, actual]) => {
         it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(makerEncode.leverageManagementWithoutSubProxy(...actual)).to.eql(expected);
+          expect(makerEncode.leverageManagement(...actual)).to.eql(expected);
         });
       });
     });
@@ -348,26 +345,6 @@ describe('Feature: strategySubService.ts', () => {
     });
   });
 
-  describe('When testing strategySubService.chickenBondsEncode', () => {
-    describe('rebond()', () => {
-      const examples: Array<[
-        SubData,
-        [bondId: number],
-      ]> = [
-        [
-          ['0x00000000000000000000000000000000000000000000000000000000000005e3'],
-          [1507]
-        ]
-      ];
-
-      examples.forEach(([expected, actual]) => {
-        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(chickenBondsEncode.rebond(...actual)).to.eql(expected);
-        });
-      });
-    });
-  });
-
   describe('When testing strategySubService.aaveV3Encode', () => {
     describe('closeToAsset()', () => {
       const examples: Array<[
@@ -1156,27 +1133,6 @@ describe('Feature: strategySubService.ts', () => {
     });
   });
 
-  describe('When testing strategySubService.morphoAaveV2Encode', () => {
-    describe('leverageManagement()', () => {
-      const examples: Array<[[string, string, string, string, boolean], [triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean]]> = [
-        [
-          [new Dec(160).mul(1e16).toString(), new Dec(220).mul(1e16).toString(), new Dec(180).mul(1e16).toString(), new Dec(190).mul(1e16).toString(), true],
-          [160, 220, 180, 190, true]
-        ],
-        [
-          [new Dec(160).mul(1e16).toString(), new Dec(200).mul(1e16).toString(), new Dec(180).mul(1e16).toString(), new Dec(190).mul(1e16).toString(), false],
-          [160, 200, 180, 190, false]
-        ],
-      ];
-
-      examples.forEach(([expected, actual]) => {
-        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-          expect(morphoAaveV2Encode.leverageManagement(...actual)).to.eql(expected);
-        });
-      });
-    });
-  });
-
   describe('When testing strategySubService.exchangeEncode', () => {
     describe('dca()', () => {
       const examples: Array<[