@defisaver/automation-sdk 3.3.14 → 3.3.15-liq-prot-dev

package/esm/services/strategySubService.js

@@ -1,10 +1,9 @@
-import Dec from 'decimal.js';
 import { getAssetInfo } from '@defisaver/tokens';
-import { CloseToAssetType, Bundles, ChainId, RatioState, Strategies, } from '../types/enums';
 import { STRATEGY_IDS } from '../constants';
+import { Bundles, ChainId, CloseToAssetType, RatioState, Strategies, } from '../types/enums';
 import * as subDataService from './subDataService';
 import * as triggerService from './triggerService';
-import { compareAddresses, getCloseStrategyType, requireAddress, requireAddresses, } from './utils';
+import { compareAddresses, getBundleIdsByNetwork, getCloseStrategyType, requireAddress, requireAddresses, } from './utils';
 export const makerEncode = {
     repayFromSavings(bundleId, vaultId, triggerRepayRatio, targetRepayRatio, isBundle = true, chainId = ChainId.Ethereum, daiAddr, mcdCdpManagerAddr) {
         const subData = subDataService.makerRepayFromSavingsSubData.encode(vaultId, targetRepayRatio, chainId, daiAddr, mcdCdpManagerAddr);
@@ -31,16 +30,6 @@ export const makerEncode = {
         const isBundle = false;
         return [strategyOrBundleId, isBundle, triggerData, subData];
     },
-    leverageManagement(vaultId, triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled) {
-        return [
-            vaultId,
-            new Dec(triggerRepayRatio).mul(1e16).toString(),
-            new Dec(triggerBoostRatio).mul(1e16).toString(),
-            new Dec(targetBoostRatio).mul(1e16).toString(),
-            new Dec(targetRepayRatio).mul(1e16).toString(),
-            boostEnabled,
-        ];
-    },
     leverageManagementWithoutSubProxy(vaultId, triggerRatio, targetRatio, ratioState, isBoost, daiAddr) {
         const bundleId = isBoost ? Bundles.MainnetIds.MAKER_BOOST : Bundles.MainnetIds.MAKER_REPAY;
         const triggerData = triggerService.makerRatioTrigger.encode(vaultId, triggerRatio, ratioState);
@@ -52,6 +41,17 @@ export const makerEncode = {
             subData,
         ];
     },
+    liquidationProtection(vaultId, triggerRatio, targetRatio, ratioState, daiAddr) {
+        const bundleId = Bundles.MainnetIds.MAKER_LIQUIDATION_PROTECTION;
+        const triggerData = triggerService.makerRatioTrigger.encode(vaultId, triggerRatio, ratioState);
+        const subData = subDataService.makerLiquidationProtectionSubData.encode(vaultId, targetRatio, daiAddr);
+        return [
+            bundleId,
+            true,
+            triggerData,
+            subData,
+        ];
+    },
 };
 export const liquityEncode = {
     closeOnPrice(priceOverOrUnder, price, closeToAssetAddr, chainlinkCollAddress, chainId = ChainId.Ethereum, collAddr, debtAddr) {
@@ -78,14 +78,11 @@ export const liquityEncode = {
         const isBundle = true;
         return [strategyId, isBundle, triggerData, subData];
     },
-    leverageManagement(triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled) {
-        return [
-            new Dec(triggerRepayRatio).mul(1e16).toString(),
-            new Dec(triggerBoostRatio).mul(1e16).toString(),
-            new Dec(targetBoostRatio).mul(1e16).toString(),
-            new Dec(targetRepayRatio).mul(1e16).toString(),
-            boostEnabled,
-        ];
+    leverageManagementWithoutSubProxy(strategyOrBundleId, user, ratioState, targetRatio, triggerRatio) {
+        const isBundle = true;
+        const subData = subDataService.liquityLeverageManagementSubDataWithoutSubProxy.encode(targetRatio, ratioState);
+        const triggerData = triggerService.liquityRatioTrigger.encode(user, triggerRatio, ratioState);
+        return [strategyOrBundleId, isBundle, triggerData, subData];
     },
     dsrPayback(proxyAddress, triggerRatio, targetRatio) {
         requireAddress(proxyAddress);
@@ -118,24 +115,14 @@ export const chickenBondsEncode = {
     },
 };
 export const aaveV2Encode = {
-    leverageManagement(triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled) {
-        return subDataService.aaveV2LeverageManagementSubData.encode(triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled);
+    leverageManagementWithoutSubProxy(strategyOrBundleId, market, user, ratioState, targetRatio, triggerRatio) {
+        const isBundle = true;
+        const subData = subDataService.aaveV2LeverageManagementSubDataWithoutSubProxy.encode(market, targetRatio, ratioState);
+        const triggerData = triggerService.aaveV2RatioTrigger.encode(user, market, triggerRatio, ratioState);
+        return [strategyOrBundleId, isBundle, triggerData, subData];
     },
 };
 export const aaveV3Encode = {
-    leverageManagement(triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled) {
-        let subInput = '0x';
-        subInput = subInput.concat(new Dec(triggerRepayRatio).mul(1e16).toHex().slice(2)
-            .padStart(32, '0'));
-        subInput = subInput.concat(new Dec(triggerBoostRatio).mul(1e16).toHex().slice(2)
-            .padStart(32, '0'));
-        subInput = subInput.concat(new Dec(targetBoostRatio).mul(1e16).toHex().slice(2)
-            .padStart(32, '0'));
-        subInput = subInput.concat(new Dec(targetRepayRatio).mul(1e16).toHex().slice(2)
-            .padStart(32, '0'));
-        subInput = subInput.concat(boostEnabled ? '01' : '00');
-        return subInput;
-    },
     closeToAsset(strategyOrBundleId, isBundle = true, triggerData, subData) {
         const { collAsset, collAssetId, debtAsset, debtAssetId, } = subData;
         const subDataEncoded = subDataService.aaveV3QuotePriceSubData.encode(collAsset, collAssetId, debtAsset, debtAssetId);
@@ -163,6 +150,12 @@ export const aaveV3Encode = {
         const triggerData = triggerService.aaveV3RatioTrigger.encode(user, market, triggerRatio, ratioState);
         return [strategyOrBundleId, isBundle, triggerData, subData];
     },
+    liquidationProtection(strategyOrBundleId, market, user, ratioState, targetRatio, triggerRatio) {
+        const isBundle = true;
+        const subData = subDataService.aaveV3LiquidationProtectionSubData.encode(targetRatio, ratioState, market, user);
+        const triggerData = triggerService.aaveV3RatioTrigger.encode(user, market, triggerRatio, ratioState);
+        return [strategyOrBundleId, isBundle, triggerData, subData];
+    },
     leverageManagementOnPriceGeneric(strategyOrBundleId, price, ratioState, collAsset, collAssetId, debtAsset, debtAssetId, marketAddr, targetRatio, user) {
         const isBundle = true;
         const subDataEncoded = subDataService.aaveV3LeverageManagementOnPriceGeneric.encode(collAsset, collAssetId, debtAsset, debtAssetId, marketAddr, targetRatio, user);
@@ -184,13 +177,22 @@ export const aaveV3Encode = {
     },
 };
 export const compoundV2Encode = {
-    leverageManagement(triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled) {
-        return subDataService.compoundV2LeverageManagementSubData.encode(triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled);
+    leverageManagementWithoutSubProxy(strategyOrBundleId, user, ratioState, targetRatio, triggerRatio) {
+        const isBundle = true;
+        const subData = subDataService.compoundV2LeverageManagementSubDataWithoutSubProxy.encode(targetRatio, ratioState);
+        const triggerData = triggerService.compoundV2RatioTrigger.encode(user, triggerRatio, ratioState);
+        return [strategyOrBundleId, isBundle, triggerData, subData];
     },
 };
 export const compoundV3Encode = {
-    leverageManagement(market, baseToken, triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled, isEOA) {
-        return subDataService.compoundV3LeverageManagementSubData.encode(market, baseToken, triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled, isEOA);
+    leverageManagementWithoutSubProxy(strategyOrBundleId, market, baseToken, user, ratioState, targetRatio, triggerRatio) {
+        const isBundle = true;
+        const subData = subDataService.compoundV3LeverageManagementSubDataWithoutSubProxy.encode(market, baseToken, targetRatio, ratioState);
+        const triggerData = triggerService.compoundV3RatioTrigger.encode(user, market, triggerRatio, ratioState);
+        return [strategyOrBundleId, isBundle, triggerData, subData];
+    },
+    liquidationProtection(market, baseToken, triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled, isEOA) {
+        return subDataService.compoundV3LiquidationProtectionSubData.encode(market, baseToken, triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled, isEOA);
     },
     leverageManagementOnPrice(strategyOrBundleId, market, collToken, baseToken, targetRatio, price, priceState, ratioState, // REPAY for repay on price, BOOST for boost on price
     user) {
@@ -207,11 +209,6 @@ export const compoundV3Encode = {
         return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
     },
 };
-export const compoundV3L2Encode = {
-    leverageManagement(market, baseToken, triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled, isEOA = false) {
-        return subDataService.compoundV3L2LeverageManagementSubData.encode(market, baseToken, triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled, isEOA);
-    },
-};
 export const morphoAaveV2Encode = {
     leverageManagement(triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled) {
         return subDataService.morphoAaveV2LeverageManagementSubData.encode(triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled);
@@ -225,24 +222,15 @@ export const exchangeEncode = {
         const strategyId = STRATEGY_IDS[network].EXCHANGE_DCA;
         return [strategyId, false, triggerData, subData];
     },
-    limitOrder(fromToken, toToken, amount, targetPrice, goodUntil, orderType) {
-        return subDataService.exchangeLimitOrderSubData.encode(fromToken, toToken, amount, targetPrice, goodUntil, orderType);
+    limitOrderWithoutSubProxy(fromToken, toToken, amount, targetPrice, goodUntil, orderType, fromTokenDecimals, toTokenDecimals, network) {
+        requireAddresses([fromToken, toToken]);
+        const subData = subDataService.exchangeLimitOrderSubDataWithoutSubProxy.encode(fromToken, toToken, amount);
+        const triggerData = triggerService.exchangeOffchainPriceTrigger.encode(targetPrice, Number(goodUntil), orderType, fromTokenDecimals, toTokenDecimals);
+        const strategyId = STRATEGY_IDS[network].EXCHANGE_LIMIT_ORDER;
+        return [strategyId, false, triggerData, subData];
     },
 };
 export const sparkEncode = {
-    leverageManagement(triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled) {
-        let subInput = '0x';
-        subInput = subInput.concat(new Dec(triggerRepayRatio).mul(1e16).toHex().slice(2)
-            .padStart(32, '0'));
-        subInput = subInput.concat(new Dec(triggerBoostRatio).mul(1e16).toHex().slice(2)
-            .padStart(32, '0'));
-        subInput = subInput.concat(new Dec(targetBoostRatio).mul(1e16).toHex().slice(2)
-            .padStart(32, '0'));
-        subInput = subInput.concat(new Dec(targetRepayRatio).mul(1e16).toHex().slice(2)
-            .padStart(32, '0'));
-        subInput = subInput.concat(boostEnabled ? '01' : '00');
-        return subInput;
-    },
     leverageManagementOnPrice(strategyOrBundleId, isBundle = true, triggerData, subData) {
         const { collAsset, collAssetId, debtAsset, debtAssetId, marketAddr, targetRatio, } = subData;
         const subDataEncoded = subDataService.sparkLeverageManagementOnPriceSubData.encode(collAsset, collAssetId, debtAsset, debtAssetId, marketAddr, targetRatio);
@@ -263,6 +251,12 @@ export const sparkEncode = {
         const triggerData = triggerService.sparkRatioTrigger.encode(user, market, triggerRatio, ratioState);
         return [strategyOrBundleId, isBundle, triggerData, subData];
     },
+    liquidationProtection(strategyOrBundleId, market, user, ratioState, targetRatio, triggerRatio) {
+        const isBundle = true;
+        const subData = subDataService.sparkLiquidationProtectionSubData.encode(targetRatio, ratioState);
+        const triggerData = triggerService.sparkRatioTrigger.encode(user, market, triggerRatio, ratioState);
+        return [strategyOrBundleId, isBundle, triggerData, subData];
+    },
     collateralSwitch(strategyOrBundleId, fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, baseTokenAddress, quoteTokenAddress, price, state) {
         const isBundle = false;
         const subDataEncoded = subDataService.sparkCollateralSwitchSubData.encode(fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch);
@@ -305,6 +299,14 @@ export const morphoBlueEncode = {
         const isBundle = true;
         return [strategyOrBundleId, isBundle, triggerData, subData];
     },
+    liquidationProtection(marketId, loanToken, collToken, oracle, irm, lltv, ratioState, targetRatio, triggerRatio, user, isEOA, network) {
+        const subData = subDataService.morphoBlueLiquidationProtectionSubData.encode(loanToken, collToken, oracle, irm, lltv, ratioState, targetRatio, user, isEOA);
+        const triggerData = triggerService.morphoBlueRatioTrigger.encode(marketId, user, triggerRatio, ratioState);
+        // TODO -> Check if need to deploy separate bundles for EOA, or can reuse this for EOA. Logic above is different for EOA and SW on arbi and mainnet. Base uses same for both, not sure if because of lack of EOA support or because it is using same bundle for both.
+        const bundleId = getBundleIdsByNetwork(network).MORPHO_BLUE_LIQUIDATION_PROTECTION;
+        const isBundle = true;
+        return [bundleId, isBundle, triggerData, subData];
+    },
     leverageManagementOnPrice(strategyOrBundleId, isBundle = true, loanToken, collToken, oracle, irm, lltv, user, targetRatio, price, priceState) {
         const subData = subDataService.morphoBlueLeverageManagementOnPriceSubData.encode(loanToken, collToken, oracle, irm, lltv, targetRatio, user);
         const triggerData = triggerService.morphoBluePriceTrigger.encode(oracle, collToken, loanToken, price, priceState);
@@ -353,6 +355,12 @@ export const fluidEncode = {
         const triggerData = triggerService.fluidRatioTrigger.encode(nftId, triggerRatio, ratioState);
         return [strategyOrBundleId, isBundle, triggerData, subData];
     },
+    liquidationProtection(nftId, vault, ratioState, targetRatio, triggerRatio, strategyOrBundleId) {
+        const isBundle = true;
+        const subData = subDataService.fluidLiquidationProtectionSubData.encode(nftId, vault, ratioState, targetRatio);
+        const triggerData = triggerService.fluidRatioTrigger.encode(nftId, triggerRatio, ratioState);
+        return [strategyOrBundleId, isBundle, triggerData, subData];
+    },
 };
 export const aaveV4Encode = {
     leverageManagement(strategyOrBundleId, owner, spoke, ratioState, targetRatio, triggerRatio) {
@@ -361,6 +369,12 @@ export const aaveV4Encode = {
         const triggerData = triggerService.aaveV4RatioTrigger.encode(owner, spoke, triggerRatio, ratioState);
         return [strategyOrBundleId, isBundle, triggerData, subData];
     },
+    liquidationProtection(strategyOrBundleId, owner, spoke, ratioState, targetRatio, triggerRatio) {
+        const isBundle = true;
+        const subData = subDataService.aaveV4LiquidationProtectionSubData.encode(spoke, owner, ratioState, targetRatio);
+        const triggerData = triggerService.aaveV4RatioTrigger.encode(owner, spoke, triggerRatio, ratioState);
+        return [strategyOrBundleId, isBundle, triggerData, subData];
+    },
     leverageManagementOnPrice(strategyOrBundleId, owner, spoke, collAsset, collAssetId, debtAsset, debtAssetId, targetRatio, price, priceState, ratioState) {
         const isBundle = true;
         const subData = subDataService.aaveV4LeverageManagementOnPriceSubData.encode(spoke, owner, collAsset, collAssetId, debtAsset, debtAssetId, ratioState, targetRatio);

package/esm/services/strategySubService.test.js

@@ -3,9 +3,9 @@ import Dec from 'decimal.js';
 import { otherAddresses } from '@defisaver/sdk';
 import { getAssetInfo, MAXUINT } from '@defisaver/tokens';
 import * as web3Utils from 'web3-utils';
-import { Bundles, ChainId, CloseToAssetType, OrderType, RatioState, Strategies } from '../types/enums';
+import { Bundles, ChainId, CloseToAssetType, RatioState, Strategies } from '../types/enums';
 import '../configuration';
-import { aaveV2Encode, chickenBondsEncode, liquityEncode, makerEncode, aaveV3Encode, compoundV2Encode, compoundV3Encode, morphoAaveV2Encode, exchangeEncode, crvUSDEncode, compoundV3L2Encode, morphoBlueEncode, sparkEncode, aaveV4Encode, } from './strategySubService';
+import { chickenBondsEncode, liquityEncode, makerEncode, aaveV3Encode, compoundV3Encode, morphoAaveV2Encode, exchangeEncode, crvUSDEncode, morphoBlueEncode, sparkEncode, aaveV4Encode, } from './strategySubService';
 describe('Feature: strategySubService.ts', () => {
     describe('When testing strategySubService.makerEncode', () => {
         // @ts-ignore // TODO - this requires change in @defisaver/tokens
@@ -96,28 +96,6 @@ describe('Feature: strategySubService.ts', () => {
                 });
             });
         });
-        describe('leverageManagement()', () => {
-            const examples = [
-                [
-                    [
-                        5791,
-                        new Dec('210').mul(1e16).toString(),
-                        new Dec('290').mul(1e16).toString(),
-                        new Dec('240').mul(1e16).toString(),
-                        new Dec('240').mul(1e16).toString(),
-                        true,
-                    ],
-                    [
-                        5791, '210', '290', '240', '240', true,
-                    ]
-                ]
-            ];
-            examples.forEach(([expected, actual]) => {
-                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    expect(makerEncode.leverageManagement(...actual)).to.eql(expected);
-                });
-            });
-        });
         describe('leverageManagementWithoutSubProxy()', () => {
             const examples = [
                 // Repay scenario (isBoost=false, RatioState.UNDER)
@@ -217,27 +195,6 @@ describe('Feature: strategySubService.ts', () => {
                 });
             });
         });
-        describe('leverageManagement()', () => {
-            const examples = [
-                [
-                    [
-                        new Dec('210').mul(1e16).toString(),
-                        new Dec('290').mul(1e16).toString(),
-                        new Dec('240').mul(1e16).toString(),
-                        new Dec('240').mul(1e16).toString(),
-                        false,
-                    ],
-                    [
-                        '210', '290', '240', '240', false,
-                    ]
-                ]
-            ];
-            examples.forEach(([expected, actual]) => {
-                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    expect(liquityEncode.leverageManagement(...actual)).to.eql(expected);
-                });
-            });
-        });
         describe('paybackFromChickenBondStrategySub()', () => {
             const examples = [
                 [
@@ -324,43 +281,7 @@ describe('Feature: strategySubService.ts', () => {
             });
         });
     });
-    describe('When testing strategySubService.aaveV2Encode', () => {
-        describe('leverageManagement()', () => {
-            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: ${JSON.stringify(expected)}`, () => {
-                    expect(aaveV2Encode.leverageManagement(...actual)).to.eql(expected);
-                });
-            });
-        });
-    });
     describe('When testing strategySubService.aaveV3Encode', () => {
-        describe('leverageManagement()', () => {
-            const examples = [
-                [
-                    '0x000000000000000016345785d8a0000000000000000000001e87f85809dc0000000000000000000018fae27693b4000000000000000000001a5e27eef13e000001',
-                    [160, 220, 180, 190, true]
-                ],
-                [
-                    '0x000000000000000016345785d8a0000000000000000000001bc16d674ec80000000000000000000018fae27693b4000000000000000000001a5e27eef13e000000',
-                    [160, 200, 180, 190, false]
-                ],
-            ];
-            examples.forEach(([expected, actual]) => {
-                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    expect(aaveV3Encode.leverageManagement(...actual)).to.eql(expected);
-                });
-            });
-        });
         describe('closeToAsset()', () => {
             const examples = [
                 [
@@ -927,69 +848,7 @@ describe('Feature: strategySubService.ts', () => {
             });
         });
     });
-    describe('When testing strategySubService.compoundV2Encode', () => {
-        describe('leverageManagement()', () => {
-            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: ${JSON.stringify(expected)}`, () => {
-                    expect(compoundV2Encode.leverageManagement(...actual)).to.eql(expected);
-                });
-            });
-        });
-    });
     describe('When testing strategySubService.compoundV3Encode', () => {
-        describe('leverageManagement()', () => {
-            const examples = [
-                [
-                    [
-                        web3Utils.toChecksumAddress('0x1C0F620155e85491f8D35440eb17538Ca5c55212'),
-                        web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
-                        new Dec(160).mul(1e16).toString(),
-                        new Dec(220).mul(1e16).toString(),
-                        new Dec(180).mul(1e16).toString(),
-                        new Dec(190).mul(1e16).toString(),
-                        true, false,
-                    ],
-                    [
-                        web3Utils.toChecksumAddress('0x1C0F620155e85491f8D35440eb17538Ca5c55212'),
-                        web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
-                        160, 220, 180, 190,
-                        true, false,
-                    ]
-                ],
-                [
-                    [
-                        web3Utils.toChecksumAddress('0xaC0F620155e85491f8D35440eb17538Ca5c55212'),
-                        web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
-                        new Dec(160).mul(1e16).toString(),
-                        new Dec(210).mul(1e16).toString(),
-                        new Dec(180).mul(1e16).toString(),
-                        new Dec(190).mul(1e16).toString(),
-                        false, true,
-                    ],
-                    [
-                        web3Utils.toChecksumAddress('0xaC0F620155e85491f8D35440eb17538Ca5c55212'),
-                        web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
-                        160, 210, 180, 190,
-                        false, true,
-                    ]
-                ],
-            ];
-            examples.forEach(([expected, actual]) => {
-                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    expect(compoundV3Encode.leverageManagement(...actual)).to.eql(expected);
-                });
-            });
-        });
         describe('leverageManagementOnPrice()', () => {
             const examples = [
                 [
@@ -1164,51 +1023,6 @@ describe('Feature: strategySubService.ts', () => {
                 });
             });
         });
-        describe('limitOrder()', () => {
-            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: ${JSON.stringify(expected)}`, () => {
-                    expect(exchangeEncode.limitOrder(...actual)).to.eql(expected);
-                });
-            });
-        });
     });
     describe('When testing strategySubService.crvUSDEncode', () => {
         describe('leverageManagement()', () => {
@@ -1422,55 +1236,7 @@ describe('Feature: strategySubService.ts', () => {
             });
         });
     });
-    describe('When testing strategySubService.compoundV3L2Encode', () => {
-        describe('leverageManagement()', () => {
-            const examples = [
-                [
-                    '0x0313D212133AFab8F2b829B1066c7e43caD94e2c0213D212133AfaB8F2b829B1066C7E43cAD94E2c000000000000000016345785d8a0000000000000000000001e87f85809dc0000000000000000000018fae27693b4000000000000000000001a5e27eef13e00000100',
-                    [
-                        web3Utils.toChecksumAddress('0x0313d212133AFaB8F2B829B1066c7E43cAd94E2c'),
-                        web3Utils.toChecksumAddress('0x0213d212133AFaB8F2B829B1066c7E43cAd94E2c'),
-                        160, 220, 180, 190,
-                        true,
-                        false,
-                    ],
-                ],
-                [
-                    '0x0313D212133AFab8F2b829B1066c7e43caD94e2c0413d212133afAb8F2B829b1066C7e43cAd94e2c000000000000000016345785d8a0000000000000000000001e87f85809dc0000000000000000000018fae27693b4000000000000000000000f43fc2c04ee00000000',
-                    [
-                        web3Utils.toChecksumAddress('0x0313d212133AFaB8F2B829B1066c7E43cAd94E2c'),
-                        web3Utils.toChecksumAddress('0x0413d212133AFaB8F2B829B1066c7E43cAd94E2c'),
-                        160, 220, 180, 110,
-                        false,
-                        false,
-                    ],
-                ],
-            ];
-            examples.forEach(([expected, actual]) => {
-                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    expect(compoundV3L2Encode.leverageManagement(...actual)).to.eql(expected);
-                });
-            });
-        });
-    });
     describe('When testing strategySubService.sparkEncode', () => {
-        describe('leverageManagement()', () => {
-            const examples = [
-                [
-                    '0x0000000000000000136dcc951d8c00000000000000000000214e8348c4f0000000000000000000001d24b2dfac52000000000000000000001a5e27eef13e000001',
-                    [140, 240, 210, 190, true]
-                ],
-                [
-                    '0x0000000000000000130337bdce49000000000000000000001988fe4052b800000000000000000000281b57b028e1000000000000000000002223acf76376000000',
-                    [137, 184, 289, 246, false]
-                ]
-            ];
-            examples.forEach(([expected, actual]) => {
-                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    expect(sparkEncode.leverageManagement(...actual)).to.eql(expected);
-                });
-            });
-        });
         describe('leverageManagementOnPrice()', () => {
             const examples = [
                 [