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

package/esm/services/strategySubService.js

@@ -1,6 +1,6 @@
 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';
@@ -30,10 +30,21 @@ export const makerEncode = {
         const isBundle = false;
         return [strategyOrBundleId, isBundle, triggerData, subData];
     },
-    leverageManagementWithoutSubProxy(vaultId, triggerRatio, targetRatio, ratioState, isBoost, daiAddr) {
+    leverageManagement(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);
-        const subData = subDataService.makerLeverageManagementWithoutSubProxy.encode(vaultId, targetRatio, daiAddr);
+        const subData = subDataService.makerLeverageManagementSubData.encode(vaultId, targetRatio, daiAddr);
+        return [
+            bundleId,
+            true,
+            triggerData,
+            subData,
+        ];
+    },
+    liquidationProtection(vaultId, triggerRatio, targetRatio, ratioState, daiAddr) {
+        const bundleId = Bundles.MainnetIds.MAKER_SW_LIQUIDATION_PROTECTION;
+        const triggerData = triggerService.makerRatioTrigger.encode(vaultId, triggerRatio, ratioState);
+        const subData = subDataService.makerLiquidationProtectionSubData.encode(vaultId, targetRatio, daiAddr);
         return [
             bundleId,
             true,
@@ -67,9 +78,9 @@ export const liquityEncode = {
         const isBundle = true;
         return [strategyId, isBundle, triggerData, subData];
     },
-    leverageManagementWithoutSubProxy(strategyOrBundleId, user, ratioState, targetRatio, triggerRatio) {
+    leverageManagement(strategyOrBundleId, user, ratioState, targetRatio, triggerRatio) {
         const isBundle = true;
-        const subData = subDataService.liquityLeverageManagementSubDataWithoutSubProxy.encode(targetRatio, ratioState);
+        const subData = subDataService.liquityLeverageManagementSubData.encode(targetRatio, ratioState);
         const triggerData = triggerService.liquityRatioTrigger.encode(user, triggerRatio, ratioState);
         return [strategyOrBundleId, isBundle, triggerData, subData];
     },
@@ -98,15 +109,10 @@ export const liquityEncode = {
         return [strategyOrBundleId, isBundle, triggerData, subData];
     },
 };
-export const chickenBondsEncode = {
-    rebond(bondId) {
-        return subDataService.cBondsRebondSubData.encode(bondId);
-    },
-};
 export const aaveV2Encode = {
-    leverageManagementWithoutSubProxy(strategyOrBundleId, market, user, ratioState, targetRatio, triggerRatio) {
+    leverageManagement(strategyOrBundleId, market, user, ratioState, targetRatio, triggerRatio) {
         const isBundle = true;
-        const subData = subDataService.aaveV2LeverageManagementSubDataWithoutSubProxy.encode(market, targetRatio, ratioState);
+        const subData = subDataService.aaveV2LeverageManagementSubData.encode(market, targetRatio, ratioState);
         const triggerData = triggerService.aaveV2RatioTrigger.encode(user, market, triggerRatio, ratioState);
         return [strategyOrBundleId, isBundle, triggerData, subData];
     },
@@ -133,9 +139,15 @@ export const aaveV3Encode = {
         const triggerDataEncoded = triggerService.aaveV3QuotePriceTrigger.encode(baseTokenAddress, quoteTokenAddress, price, state);
         return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
     },
-    leverageManagementWithoutSubProxy(strategyOrBundleId, market, user, ratioState, targetRatio, triggerRatio, isGeneric = false) {
+    leverageManagement(strategyOrBundleId, market, user, ratioState, targetRatio, triggerRatio, isGeneric = false) {
+        const isBundle = true;
+        const subData = subDataService.aaveV3LeverageManagementSubData.encode(targetRatio, ratioState, market, user, isGeneric);
+        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.aaveV3LeverageManagementSubDataWithoutSubProxy.encode(targetRatio, ratioState, market, user, isGeneric);
+        const subData = subDataService.aaveV3LiquidationProtectionSubData.encode(targetRatio, ratioState, market, user, true);
         const triggerData = triggerService.aaveV3RatioTrigger.encode(user, market, triggerRatio, ratioState);
         return [strategyOrBundleId, isBundle, triggerData, subData];
     },
@@ -160,17 +172,23 @@ export const aaveV3Encode = {
     },
 };
 export const compoundV2Encode = {
-    leverageManagementWithoutSubProxy(strategyOrBundleId, user, ratioState, targetRatio, triggerRatio) {
+    leverageManagement(strategyOrBundleId, user, ratioState, targetRatio, triggerRatio) {
         const isBundle = true;
-        const subData = subDataService.compoundV2LeverageManagementSubDataWithoutSubProxy.encode(targetRatio, ratioState);
+        const subData = subDataService.compoundV2LeverageManagementSubData.encode(targetRatio, ratioState);
         const triggerData = triggerService.compoundV2RatioTrigger.encode(user, triggerRatio, ratioState);
         return [strategyOrBundleId, isBundle, triggerData, subData];
     },
 };
 export const compoundV3Encode = {
-    leverageManagementWithoutSubProxy(strategyOrBundleId, market, baseToken, user, ratioState, targetRatio, triggerRatio) {
+    leverageManagement(strategyOrBundleId, market, baseToken, user, ratioState, targetRatio, triggerRatio) {
         const isBundle = true;
-        const subData = subDataService.compoundV3LeverageManagementSubDataWithoutSubProxy.encode(market, baseToken, targetRatio, ratioState);
+        const subData = subDataService.compoundV3LeverageManagementSubData.encode(market, baseToken, targetRatio, ratioState);
+        const triggerData = triggerService.compoundV3RatioTrigger.encode(user, market, triggerRatio, ratioState);
+        return [strategyOrBundleId, isBundle, triggerData, subData];
+    },
+    liquidationProtection(strategyOrBundleId, market, baseToken, user, ratioState, targetRatio, triggerRatio) {
+        const isBundle = true;
+        const subData = subDataService.compoundV3LiquidationProtectionSubData.encode(market, baseToken, targetRatio, ratioState);
         const triggerData = triggerService.compoundV3RatioTrigger.encode(user, market, triggerRatio, ratioState);
         return [strategyOrBundleId, isBundle, triggerData, subData];
     },
@@ -189,11 +207,6 @@ export const compoundV3Encode = {
         return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
     },
 };
-export const morphoAaveV2Encode = {
-    leverageManagement(triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled) {
-        return subDataService.morphoAaveV2LeverageManagementSubData.encode(triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled);
-    },
-};
 export const exchangeEncode = {
     dca(fromToken, toToken, amount, timestamp, interval, network) {
         requireAddresses([fromToken, toToken]);
@@ -202,9 +215,9 @@ export const exchangeEncode = {
         const strategyId = STRATEGY_IDS[network].EXCHANGE_DCA;
         return [strategyId, false, triggerData, subData];
     },
-    limitOrderWithoutSubProxy(fromToken, toToken, amount, targetPrice, goodUntil, orderType, fromTokenDecimals, toTokenDecimals, network) {
+    limitOrder(fromToken, toToken, amount, targetPrice, goodUntil, orderType, fromTokenDecimals, toTokenDecimals, network) {
         requireAddresses([fromToken, toToken]);
-        const subData = subDataService.exchangeLimitOrderSubDataWithoutSubProxy.encode(fromToken, toToken, amount);
+        const subData = subDataService.exchangeLimitOrderSubData.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];
@@ -225,18 +238,48 @@ export const sparkEncode = {
         const triggerDataEncoded = triggerService.sparkQuotePriceRangeTrigger.encode(collAsset, debtAsset, stopLossPrice, takeProfitPrice);
         return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
     },
-    leverageManagementWithoutSubProxy(strategyOrBundleId, market, user, ratioState, targetRatio, triggerRatio) {
+    leverageManagement(strategyOrBundleId, market, user, ratioState, targetRatio, triggerRatio) {
+        const isBundle = true;
+        const subData = subDataService.sparkLeverageManagementSubData.encode(targetRatio, ratioState);
+        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];
+    },
+    leverageManagementGeneric(strategyOrBundleId, market, user, ratioState, targetRatio, triggerRatio) {
         const isBundle = true;
-        const subData = subDataService.sparkLeverageManagementSubDataWithoutSubProxy.encode(targetRatio, ratioState);
+        const subData = subDataService.sparkGenericLeverageManagementSubData.encode(targetRatio, ratioState, market, user);
         const triggerData = triggerService.sparkRatioTrigger.encode(user, market, triggerRatio, ratioState);
         return [strategyOrBundleId, isBundle, triggerData, subData];
     },
+    liquidationProtectionGeneric(strategyOrBundleId, market, user, ratioState, targetRatio, triggerRatio) {
+        const isBundle = true;
+        const subData = subDataService.sparkGenericLiquidationProtectionSubData.encode(targetRatio, ratioState, market, user);
+        const triggerData = triggerService.sparkRatioTrigger.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 subData = subDataService.sparkLeverageManagementOnPriceGenericSubData.encode(collAsset, collAssetId, debtAsset, debtAssetId, marketAddr, targetRatio, user);
+        const triggerData = triggerService.sparkQuotePriceTrigger.encode(collAsset, debtAsset, price, 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);
         const triggerDataEncoded = triggerService.sparkQuotePriceTrigger.encode(baseTokenAddress, quoteTokenAddress, price, state);
         return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
     },
+    collateralSwitchGeneric(strategyOrBundleId, fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, user, baseTokenAddress, quoteTokenAddress, price, state) {
+        const isBundle = false;
+        const subDataEncoded = subDataService.sparkGenericFLCollateralSwitchSubData.encode(fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, user);
+        const triggerDataEncoded = triggerService.sparkQuotePriceTrigger.encode(baseTokenAddress, quoteTokenAddress, price, state);
+        return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
+    },
 };
 export const crvUSDEncode = {
     leverageManagement(owner, controllerAddr, ratioState, targetRatio, triggerRatio, collTokenAddr, crvUSDAddr) {
@@ -280,6 +323,8 @@ export function getMorphoBlueBundleId(network, strategy, isEOA) {
             return isEOA ? bundlesIds.MORPHO_BLUE_EOA_BOOST_ON_PRICE : bundlesIds.MORPHO_BLUE_BOOST_ON_PRICE;
         case 'close':
             return isEOA ? bundlesIds.MORPHO_BLUE_EOA_CLOSE : bundlesIds.MORPHO_BLUE_CLOSE;
+        case 'liquidationProtection':
+            return isEOA ? bundlesIds.MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION : bundlesIds.MORPHO_BLUE_SW_LIQUIDATION_PROTECTION;
         default:
             throw new Error(`Unknown Morpho Blue strategy: ${strategy}`);
     }
@@ -294,6 +339,13 @@ export const morphoBlueEncode = {
         const isBundle = true;
         return [bundleId, 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);
+        const bundleId = getMorphoBlueBundleId(network, 'liquidationProtection', isEOA);
+        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);
@@ -357,6 +409,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) {
@@ -365,6 +423,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

@@ -1,11 +1,10 @@
 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';
 import { Bundles, ChainId, CloseToAssetType, RatioState, Strategies } from '../types/enums';
 import '../configuration';
-import { chickenBondsEncode, liquityEncode, makerEncode, aaveV3Encode, compoundV3Encode, morphoAaveV2Encode, exchangeEncode, crvUSDEncode, morphoBlueEncode, sparkEncode, aaveV4Encode, } from './strategySubService';
+import { liquityEncode, makerEncode, aaveV3Encode, compoundV3Encode, 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,7 +95,7 @@ describe('Feature: strategySubService.ts', () => {
                 });
             });
         });
-        describe('leverageManagementWithoutSubProxy()', () => {
+        describe('leverageManagement()', () => {
             const examples = [
                 // Repay scenario (isBoost=false, RatioState.UNDER)
                 [
@@ -139,7 +138,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);
                 });
             });
         });
@@ -266,21 +265,6 @@ describe('Feature: strategySubService.ts', () => {
             });
         });
     });
-    describe('When testing strategySubService.chickenBondsEncode', () => {
-        describe('rebond()', () => {
-            const examples = [
-                [
-                    ['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 = [
@@ -970,25 +954,6 @@ describe('Feature: strategySubService.ts', () => {
             });
         });
     });
-    describe('When testing strategySubService.morphoAaveV2Encode', () => {
-        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(morphoAaveV2Encode.leverageManagement(...actual)).to.eql(expected);
-                });
-            });
-        });
-    });
     describe('When testing strategySubService.exchangeEncode', () => {
         describe('dca()', () => {
             const examples = [
@@ -1488,6 +1453,224 @@ describe('Feature: strategySubService.ts', () => {
                 });
             });
         });
+        describe('leverageManagementGeneric()', () => {
+            const examples = [
+                [
+                    [
+                        Bundles.MainnetIds.SPARK_EOA_REPAY,
+                        true,
+                        ['0x000000000000000000000000123456789012345678901234567890123456789000000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee000000000000000000000000000000000000000000000000136dcc951d8c00000000000000000000000000000000000000000000000000000000000000000001'],
+                        [
+                            '0x00000000000000000000000000000000000000000000000018fae27693b40000',
+                            '0x0000000000000000000000000000000000000000000000000000000000000001',
+                            '0x00000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee',
+                            '0x0000000000000000000000001234567890123456789012345678901234567890',
+                        ],
+                    ],
+                    [
+                        Bundles.MainnetIds.SPARK_EOA_REPAY,
+                        web3Utils.toChecksumAddress('0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE'),
+                        web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
+                        RatioState.UNDER,
+                        180,
+                        140,
+                    ],
+                ],
+                [
+                    [
+                        Bundles.MainnetIds.SPARK_EOA_BOOST,
+                        true,
+                        ['0x000000000000000000000000123456789012345678901234567890123456789000000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee0000000000000000000000000000000000000000000000001bc16d674ec800000000000000000000000000000000000000000000000000000000000000000000'],
+                        [
+                            '0x00000000000000000000000000000000000000000000000016345785d8a00000',
+                            '0x0000000000000000000000000000000000000000000000000000000000000000',
+                            '0x00000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee',
+                            '0x0000000000000000000000001234567890123456789012345678901234567890',
+                        ],
+                    ],
+                    [
+                        Bundles.MainnetIds.SPARK_EOA_BOOST,
+                        web3Utils.toChecksumAddress('0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE'),
+                        web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
+                        RatioState.OVER,
+                        160,
+                        200,
+                    ],
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(sparkEncode.leverageManagementGeneric(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe('liquidationProtection()', () => {
+            const examples = [
+                [
+                    [
+                        Bundles.MainnetIds.SPARK_SW_LIQUIDATION_PROTECTION,
+                        true,
+                        ['0x000000000000000000000000123456789012345678901234567890123456789000000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee000000000000000000000000000000000000000000000000136dcc951d8c00000000000000000000000000000000000000000000000000000000000000000001'],
+                        [
+                            '0x00000000000000000000000000000000000000000000000018fae27693b40000',
+                            '0x0000000000000000000000000000000000000000000000000000000000000001',
+                            '0x0000000000000000000000000000000000000000000000000000000000000001',
+                            '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        ],
+                    ],
+                    [
+                        Bundles.MainnetIds.SPARK_SW_LIQUIDATION_PROTECTION,
+                        web3Utils.toChecksumAddress('0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE'),
+                        web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
+                        RatioState.UNDER,
+                        180,
+                        140,
+                    ],
+                ],
+                [
+                    [
+                        Bundles.MainnetIds.SPARK_SW_LIQUIDATION_PROTECTION,
+                        true,
+                        ['0x000000000000000000000000123456789012345678901234567890123456789000000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee0000000000000000000000000000000000000000000000001bc16d674ec800000000000000000000000000000000000000000000000000000000000000000000'],
+                        [
+                            '0x00000000000000000000000000000000000000000000000016345785d8a00000',
+                            '0x0000000000000000000000000000000000000000000000000000000000000000',
+                            '0x0000000000000000000000000000000000000000000000000000000000000001',
+                            '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        ],
+                    ],
+                    [
+                        Bundles.MainnetIds.SPARK_SW_LIQUIDATION_PROTECTION,
+                        web3Utils.toChecksumAddress('0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE'),
+                        web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
+                        RatioState.OVER,
+                        160,
+                        200,
+                    ],
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(sparkEncode.liquidationProtection(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe('liquidationProtectionGeneric()', () => {
+            const examples = [
+                [
+                    [
+                        Bundles.MainnetIds.SPARK_EOA_LIQUIDATION_PROTECTION,
+                        true,
+                        ['0x000000000000000000000000123456789012345678901234567890123456789000000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee000000000000000000000000000000000000000000000000136dcc951d8c00000000000000000000000000000000000000000000000000000000000000000001'],
+                        [
+                            '0x00000000000000000000000000000000000000000000000018fae27693b40000',
+                            '0x0000000000000000000000000000000000000000000000000000000000000001',
+                            '0x00000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee',
+                            '0x0000000000000000000000001234567890123456789012345678901234567890',
+                        ],
+                    ],
+                    [
+                        Bundles.MainnetIds.SPARK_EOA_LIQUIDATION_PROTECTION,
+                        web3Utils.toChecksumAddress('0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE'),
+                        web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
+                        RatioState.UNDER,
+                        180,
+                        140,
+                    ],
+                ],
+                [
+                    [
+                        Bundles.MainnetIds.SPARK_EOA_LIQUIDATION_PROTECTION,
+                        true,
+                        ['0x000000000000000000000000123456789012345678901234567890123456789000000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee0000000000000000000000000000000000000000000000001bc16d674ec800000000000000000000000000000000000000000000000000000000000000000000'],
+                        [
+                            '0x00000000000000000000000000000000000000000000000016345785d8a00000',
+                            '0x0000000000000000000000000000000000000000000000000000000000000000',
+                            '0x00000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee',
+                            '0x0000000000000000000000001234567890123456789012345678901234567890',
+                        ],
+                    ],
+                    [
+                        Bundles.MainnetIds.SPARK_EOA_LIQUIDATION_PROTECTION,
+                        web3Utils.toChecksumAddress('0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE'),
+                        web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
+                        RatioState.OVER,
+                        160,
+                        200,
+                    ],
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(sparkEncode.liquidationProtectionGeneric(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe('leverageManagementOnPriceGeneric()', () => {
+            const examples = [
+                [
+                    [
+                        Bundles.MainnetIds.SPARK_EOA_REPAY_ON_PRICE,
+                        true,
+                        ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480000000000000000000000000000000000000000000000000000003a352944000000000000000000000000000000000000000000000000000000000000000001'],
+                        [
+                            '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                            '0x0000000000000000000000000000000000000000000000000000000000000000',
+                            '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                            '0x0000000000000000000000000000000000000000000000000000000000000001',
+                            '0x00000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee',
+                            '0x0000000000000000000000000000000000000000000000001bc16d674ec80000',
+                            '0x0000000000000000000000001234567890123456789012345678901234567890',
+                        ],
+                    ],
+                    [
+                        Bundles.MainnetIds.SPARK_EOA_REPAY_ON_PRICE,
+                        2500,
+                        RatioState.UNDER,
+                        web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+                        0,
+                        web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+                        1,
+                        web3Utils.toChecksumAddress('0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE'),
+                        200,
+                        web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
+                    ],
+                ],
+                [
+                    [
+                        Bundles.MainnetIds.SPARK_EOA_BOOST_ON_PRICE,
+                        true,
+                        ['0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c5990000000000000000000000006b175474e89094c44da98b954eedeac495271d0f00000000000000000000000000000000000000000000000000000417bce6c8000000000000000000000000000000000000000000000000000000000000000000'],
+                        [
+                            '0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c599',
+                            '0x0000000000000000000000000000000000000000000000000000000000000002',
+                            '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f',
+                            '0x0000000000000000000000000000000000000000000000000000000000000004',
+                            '0x00000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee',
+                            '0x00000000000000000000000000000000000000000000000022b1c8c1227a0000',
+                            '0x0000000000000000000000001234567890123456789012345678901234567890',
+                        ],
+                    ],
+                    [
+                        Bundles.MainnetIds.SPARK_EOA_BOOST_ON_PRICE,
+                        45000,
+                        RatioState.OVER,
+                        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(sparkEncode.leverageManagementOnPriceGeneric(...actual)).to.eql(expected);
+                });
+            });
+        });
         describe('closeOnPrice()', () => {
             const examples = [
                 [
@@ -1526,6 +1709,44 @@ describe('Feature: strategySubService.ts', () => {
                 });
             });
         });
+        describe('closeOnPriceGeneric()', () => {
+            const examples = [
+                [
+                    [
+                        Bundles.MainnetIds.SPARK_EOA_CLOSE,
+                        true,
+                        ['0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c5990000000000000000000000006b175474e89094c44da98b954eedeac495271d0f000000000000000000000000000000000000000000000000000003a35294400000000000000000000000000000000000000000000000000000000574fbde6000'],
+                        [
+                            '0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c599',
+                            '0x0000000000000000000000000000000000000000000000000000000000000002',
+                            '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f',
+                            '0x0000000000000000000000000000000000000000000000000000000000000004',
+                            '0x0000000000000000000000000000000000000000000000000000000000000005',
+                            '0x00000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee',
+                            '0x0000000000000000000000001234567890123456789012345678901234567890',
+                        ],
+                    ],
+                    [
+                        Bundles.MainnetIds.SPARK_EOA_CLOSE,
+                        web3Utils.toChecksumAddress(getAssetInfo('WBTC', ChainId.Ethereum).address),
+                        2,
+                        web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
+                        4,
+                        web3Utils.toChecksumAddress('0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE'),
+                        web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
+                        40000,
+                        CloseToAssetType.DEBT,
+                        60000,
+                        CloseToAssetType.COLLATERAL,
+                    ],
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(sparkEncode.closeOnPriceGeneric(...actual)).to.eql(expected);
+                });
+            });
+        });
         describe('collateralSwitch()', () => {
             const examples = [
                 // WETH -> cbBTC, price 0.025 WETH/cbBTC, state UNDER
@@ -1625,6 +1846,45 @@ describe('Feature: strategySubService.ts', () => {
                 });
             });
         });
+        describe('collateralSwitchGeneric()', () => {
+            const examples = [
+                [
+                    [
+                        Strategies.MainnetIds.SPARK_GENERIC_FL_COLLATERAL_SWITCH,
+                        false,
+                        ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000cbb7c0000ab88b473b1f5afd9ef808440eed33bf00000000000000000000000000000000000000000000000000000000002625a00000000000000000000000000000000000000000000000000000000000000001'],
+                        [
+                            '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                            '0x0000000000000000000000000000000000000000000000000000000000000000',
+                            '0x000000000000000000000000cbb7c0000ab88b473b1f5afd9ef808440eed33bf',
+                            '0x0000000000000000000000000000000000000000000000000000000000000007',
+                            '0x00000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee',
+                            '0x0000000000000000000000000000000000000000000000008ac7230489e80000',
+                            '0x0000000000000000000000001234567890123456789012345678901234567890',
+                        ],
+                    ],
+                    [
+                        Strategies.MainnetIds.SPARK_GENERIC_FL_COLLATERAL_SWITCH,
+                        web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+                        0,
+                        web3Utils.toChecksumAddress(getAssetInfo('cbBTC', ChainId.Ethereum).address),
+                        7,
+                        web3Utils.toChecksumAddress('0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE'),
+                        '10000000000000000000',
+                        web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
+                        web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+                        web3Utils.toChecksumAddress(getAssetInfo('cbBTC', ChainId.Ethereum).address),
+                        0.025,
+                        RatioState.UNDER,
+                    ],
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(sparkEncode.collateralSwitchGeneric(...actual)).to.eql(expected);
+                });
+            });
+        });
     });
     describe('When testing strategySubService.aaveV4Encode', () => {
         describe('leverageManagement()', () => {