@defisaver/automation-sdk 3.3.16-dev-13082-morpho-eoa-dev → 3.3.16-liq-prot-dev

package/src/services/strategySubService.ts

@@ -1,22 +1,26 @@
-import Dec from 'decimal.js';
 import { getAssetInfo } from '@defisaver/tokens';
+import Dec from 'decimal.js';
 
-import type { OrderType } from '../types/enums';
+import { STRATEGY_IDS } from '../constants';
 import {
-  CloseToAssetType,
   Bundles,
   ChainId,
+  CloseToAssetType,
   RatioState,
   Strategies,
 } from '../types/enums';
 import type { EthereumAddress, StrategyOrBundleIds } from '../types';
 
-import { STRATEGY_IDS } from '../constants';
+import type { OrderType } from '../types/enums';
 
 import * as subDataService from './subDataService';
 import * as triggerService from './triggerService';
 import {
-  compareAddresses, getCloseStrategyType, requireAddress, requireAddresses,
+  compareAddresses,
+  getBundleIdsByNetwork,
+  getCloseStrategyType,
+  requireAddress,
+  requireAddresses,
 } from './utils';
 
 export const makerEncode = {
@@ -81,7 +85,7 @@ export const makerEncode = {
 
     return [strategyOrBundleId, isBundle, triggerData, subData];
   },
-  leverageManagementWithoutSubProxy(
+  leverageManagement(
     vaultId: number,
     triggerRatio: number,
     targetRatio: number,
@@ -93,7 +97,27 @@ export const makerEncode = {
 
     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: number,
+    triggerRatio: number,
+    targetRatio: number,
+    ratioState: RatioState,
+    daiAddr?: EthereumAddress,
+  ) {
+    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,
@@ -162,7 +186,7 @@ export const liquityEncode = {
 
     return [strategyId, isBundle, triggerData, subData];
   },
-  leverageManagementWithoutSubProxy(
+  leverageManagement(
     strategyOrBundleId: number,
     user: EthereumAddress,
     ratioState: RatioState,
@@ -171,7 +195,7 @@ export const liquityEncode = {
   ) {
     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];
@@ -223,14 +247,8 @@ export const liquityEncode = {
   },
 };
 
-export const chickenBondsEncode = {
-  rebond(bondId: number) {
-    return subDataService.cBondsRebondSubData.encode(bondId);
-  },
-};
-
 export const aaveV2Encode = {
-  leverageManagementWithoutSubProxy(
+  leverageManagement(
     strategyOrBundleId: number,
     market: EthereumAddress,
     user: EthereumAddress,
@@ -240,7 +258,7 @@ export const aaveV2Encode = {
   ) {
     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];
@@ -314,7 +332,7 @@ export const aaveV3Encode = {
 
     return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
   },
-  leverageManagementWithoutSubProxy(
+  leverageManagement(
     strategyOrBundleId: number,
     market: EthereumAddress,
     user: EthereumAddress,
@@ -325,7 +343,7 @@ export const aaveV3Encode = {
   ) {
     const isBundle = true;
 
-    const subData = subDataService.aaveV3LeverageManagementSubDataWithoutSubProxy.encode(
+    const subData = subDataService.aaveV3LeverageManagementSubData.encode(
       targetRatio,
       ratioState,
       market,
@@ -337,6 +355,28 @@ export const aaveV3Encode = {
     return [strategyOrBundleId, isBundle, triggerData, subData];
   },
 
+  liquidationProtection(
+    strategyOrBundleId: number,
+    market: EthereumAddress,
+    user: EthereumAddress,
+    ratioState: RatioState,
+    targetRatio: number,
+    triggerRatio: number,
+  ) {
+    const isBundle = true;
+
+    const subData = subDataService.aaveV3LiquidationProtectionSubData.encode(
+      targetRatio,
+      ratioState,
+      market,
+      user,
+      true, // isGeneric
+    );
+    const triggerData = triggerService.aaveV3RatioTrigger.encode(user, market, triggerRatio, ratioState);
+
+    return [strategyOrBundleId, isBundle, triggerData, subData];
+  },
+
   leverageManagementOnPriceGeneric(
     strategyOrBundleId: number,
     price: number,
@@ -408,7 +448,7 @@ export const aaveV3Encode = {
 };
 
 export const compoundV2Encode = {
-  leverageManagementWithoutSubProxy(
+  leverageManagement(
     strategyOrBundleId: number,
     user: EthereumAddress,
     ratioState: RatioState,
@@ -417,7 +457,7 @@ export const compoundV2Encode = {
   ) {
     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];
@@ -425,7 +465,24 @@ export const compoundV2Encode = {
 };
 
 export const compoundV3Encode = {
-  leverageManagementWithoutSubProxy(
+  leverageManagement(
+    strategyOrBundleId: number,
+    market: EthereumAddress,
+    baseToken: EthereumAddress,
+    user: EthereumAddress,
+    ratioState: RatioState,
+    targetRatio: number,
+    triggerRatio: number,
+  ) {
+    const isBundle = true;
+
+    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: number,
     market: EthereumAddress,
     baseToken: EthereumAddress,
@@ -436,11 +493,12 @@ export const compoundV3Encode = {
   ) {
     const isBundle = true;
 
-    const subData = subDataService.compoundV3LeverageManagementSubDataWithoutSubProxy.encode(market, baseToken, targetRatio, ratioState);
+    const subData = subDataService.compoundV3LiquidationProtectionSubData.encode(market, baseToken, targetRatio, ratioState);
     const triggerData = triggerService.compoundV3RatioTrigger.encode(user, market, triggerRatio, ratioState);
 
     return [strategyOrBundleId, isBundle, triggerData, subData];
   },
+
   leverageManagementOnPrice(
     strategyOrBundleId: number,
     market: EthereumAddress,
@@ -479,18 +537,6 @@ export const compoundV3Encode = {
   },
 };
 
-export const morphoAaveV2Encode = {
-  leverageManagement(
-    triggerRepayRatio: number,
-    triggerBoostRatio: number,
-    targetBoostRatio: number,
-    targetRepayRatio: number,
-    boostEnabled: boolean,
-  ) {
-    return subDataService.morphoAaveV2LeverageManagementSubData.encode(triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled);
-  },
-};
-
 export const exchangeEncode = {
   dca(
     fromToken: EthereumAddress,
@@ -508,7 +554,7 @@ export const exchangeEncode = {
 
     return [strategyId, false, triggerData, subData];
   },
-  limitOrderWithoutSubProxy(
+  limitOrder(
     fromToken: EthereumAddress,
     toToken: EthereumAddress,
     amount: string,
@@ -520,7 +566,7 @@ export const exchangeEncode = {
     network: ChainId,
   ) {
     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;
@@ -573,7 +619,26 @@ export const sparkEncode = {
 
     return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
   },
-  leverageManagementWithoutSubProxy(
+  leverageManagement(
+    strategyOrBundleId: number,
+    market: EthereumAddress,
+    user: EthereumAddress,
+    ratioState: RatioState,
+    targetRatio: number,
+    triggerRatio: number,
+  ) {
+    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: number,
     market: EthereumAddress,
     user: EthereumAddress,
@@ -583,7 +648,7 @@ export const sparkEncode = {
   ) {
     const isBundle = true;
 
-    const subData = subDataService.sparkLeverageManagementSubDataWithoutSubProxy.encode(
+    const subData = subDataService.sparkLiquidationProtectionSubData.encode(
       targetRatio,
       ratioState,
     );
@@ -591,6 +656,7 @@ export const sparkEncode = {
 
     return [strategyOrBundleId, isBundle, triggerData, subData];
   },
+
   collateralSwitch(
     strategyOrBundleId: number,
     fromAsset: EthereumAddress,
@@ -652,44 +718,6 @@ export const crvUSDEncode = {
   },
 };
 
-export type MorphoBlueBundleStrategy = 'repay' | 'boost' | 'repayOnPrice' | 'boostOnPrice' | 'close';
-
-function getMorphoBlueBundlesIds(network: ChainId) {
-  switch (network) {
-    case ChainId.Ethereum:
-      return Bundles.MainnetIds;
-    case ChainId.Base:
-      return Bundles.BaseIds;
-    case ChainId.Arbitrum:
-      return Bundles.ArbitrumIds;
-    default:
-      throw new Error(`Morpho Blue strategies are not supported on chain ${network}`);
-  }
-}
-
-export function getMorphoBlueBundleId(
-  network: ChainId,
-  strategy: MorphoBlueBundleStrategy,
-  isEOA: boolean,
-): number {
-  const bundlesIds = getMorphoBlueBundlesIds(network);
-
-  switch (strategy) {
-    case 'repay':
-      return isEOA ? bundlesIds.MORPHO_BLUE_EOA_REPAY : bundlesIds.MORPHO_BLUE_REPAY;
-    case 'boost':
-      return isEOA ? bundlesIds.MORPHO_BLUE_EOA_BOOST : bundlesIds.MORPHO_BLUE_BOOST;
-    case 'repayOnPrice':
-      return isEOA ? bundlesIds.MORPHO_BLUE_EOA_REPAY_ON_PRICE : bundlesIds.MORPHO_BLUE_REPAY_ON_PRICE;
-    case 'boostOnPrice':
-      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;
-    default:
-      throw new Error(`Unknown Morpho Blue strategy: ${strategy}`);
-  }
-}
-
 export const morphoBlueEncode = {
   leverageManagement(
     marketId: string,
@@ -711,72 +739,68 @@ export const morphoBlueEncode = {
 
     // over is boost, under is repay
     const isBoost = ratioState === RatioState.OVER;
-    const bundleId = getMorphoBlueBundleId(network, isBoost ? 'boost' : 'repay', isEOA);
+    let strategyOrBundleId;
+
+    if (network === ChainId.Base) {
+      return [isBoost ? Bundles.BaseIds.MORPHO_BLUE_BOOST : Bundles.BaseIds.MORPHO_BLUE_REPAY, true, triggerData, subData];
+    }
+
+    const bundlesIds = network === ChainId.Arbitrum ? Bundles.ArbitrumIds : Bundles.MainnetIds;
+
+    if (isBoost) strategyOrBundleId = isEOA ? bundlesIds.MORPHO_BLUE_EOA_BOOST : bundlesIds.MORPHO_BLUE_BOOST;
+    else strategyOrBundleId = isEOA ? bundlesIds.MORPHO_BLUE_EOA_REPAY : bundlesIds.MORPHO_BLUE_REPAY;
     const isBundle = true;
 
-    return [bundleId, isBundle, triggerData, subData];
-  },
-  leverageManagementOnPrice(
-    strategyOrBundleId: number,
-    isBundle: boolean = true,
-    loanToken: EthereumAddress,
-    collToken: EthereumAddress,
-    oracle: EthereumAddress,
-    irm: EthereumAddress,
-    lltv: string,
-    user: EthereumAddress,
-    targetRatio: number,
-    price: number,
-    priceState: RatioState,
-  ) {
-    const subData = subDataService.morphoBlueLeverageManagementOnPriceSubData.encode(loanToken, collToken, oracle, irm, lltv, targetRatio, user);
-    const triggerData = triggerService.morphoBluePriceTrigger.encode(oracle, collToken, loanToken, price, priceState);
     return [strategyOrBundleId, isBundle, triggerData, subData];
   },
-  leverageManagementOnPriceGeneric(
+
+  liquidationProtection(
+    marketId: string,
     loanToken: EthereumAddress,
     collToken: EthereumAddress,
     oracle: EthereumAddress,
     irm: EthereumAddress,
     lltv: string,
-    user: EthereumAddress,
+    ratioState: RatioState,
     targetRatio: number,
-    price: number,
-    priceState: RatioState,
-    isBoost: boolean,
+    triggerRatio: number,
+    user: EthereumAddress,
     isEOA: boolean,
     network: ChainId,
   ) {
-    const subData = subDataService.morphoBlueLeverageManagementOnPriceSubData.encode(loanToken, collToken, oracle, irm, lltv, targetRatio, user);
-    const triggerData = triggerService.morphoBluePriceTrigger.encode(oracle, collToken, loanToken, price, priceState);
+    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, isBoost ? 'boostOnPrice' : 'repayOnPrice', isEOA);
+
+    // Type casting because there is no MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION for Base chain.
+    // That is fine because we will just always send isEOA == false for Base chain.
+    const bundleNetwork = getBundleIdsByNetwork(network) as typeof Bundles.MainnetIds;
+    const bundleId = isEOA ? bundleNetwork.MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION : bundleNetwork.MORPHO_BLUE_SW_LIQUIDATION_PROTECTION;
     const isBundle = true;
 
     return [bundleId, isBundle, triggerData, subData];
   },
-  closeOnPrice(
+
+  leverageManagementOnPrice(
     strategyOrBundleId: number,
+    isBundle: boolean = true,
     loanToken: EthereumAddress,
     collToken: EthereumAddress,
     oracle: EthereumAddress,
     irm: EthereumAddress,
     lltv: string,
     user: EthereumAddress,
-    stopLossPrice: number = 0,
-    stopLossType: CloseToAssetType = CloseToAssetType.DEBT,
-    takeProfitPrice: number = 0,
-    takeProfitType: CloseToAssetType = CloseToAssetType.COLLATERAL,
+    targetRatio: number,
+    price: number,
+    priceState: RatioState,
   ) {
-    const isBundle = true;
-    const closeType = getCloseStrategyType(stopLossPrice, stopLossType, takeProfitPrice, takeProfitType);
-
-    const subDataEncoded = subDataService.morphoBlueCloseOnPriceSubData.encode(loanToken, collToken, oracle, irm, lltv, user, closeType);
-    const triggerDataEncoded = triggerService.morphoBluePriceRangeTrigger.encode(oracle, collToken, loanToken, stopLossPrice, takeProfitPrice);
-
-    return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
+    const subData = subDataService.morphoBlueLeverageManagementOnPriceSubData.encode(loanToken, collToken, oracle, irm, lltv, targetRatio, user);
+    const triggerData = triggerService.morphoBluePriceTrigger.encode(oracle, collToken, loanToken, price, priceState);
+    return [strategyOrBundleId, isBundle, triggerData, subData];
   },
-  closeOnPriceGeneric(
+  closeOnPrice(
+    strategyOrBundleId: number,
     loanToken: EthereumAddress,
     collToken: EthereumAddress,
     oracle: EthereumAddress,
@@ -787,8 +811,6 @@ export const morphoBlueEncode = {
     stopLossType: CloseToAssetType = CloseToAssetType.DEBT,
     takeProfitPrice: number = 0,
     takeProfitType: CloseToAssetType = CloseToAssetType.COLLATERAL,
-    isEOA: boolean,
-    network: ChainId,
   ) {
     const isBundle = true;
     const closeType = getCloseStrategyType(stopLossPrice, stopLossType, takeProfitPrice, takeProfitType);
@@ -796,9 +818,7 @@ export const morphoBlueEncode = {
     const subDataEncoded = subDataService.morphoBlueCloseOnPriceSubData.encode(loanToken, collToken, oracle, irm, lltv, user, closeType);
     const triggerDataEncoded = triggerService.morphoBluePriceRangeTrigger.encode(oracle, collToken, loanToken, stopLossPrice, takeProfitPrice);
 
-    const bundleId = getMorphoBlueBundleId(network, 'close', isEOA);
-
-    return [bundleId, isBundle, triggerDataEncoded, subDataEncoded];
+    return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
   },
 };
 
@@ -890,6 +910,22 @@ export const fluidEncode = {
 
     return [strategyOrBundleId, isBundle, triggerData, subData];
   },
+
+  liquidationProtection(
+    nftId: string,
+    vault: EthereumAddress,
+    ratioState: RatioState,
+    targetRatio: number,
+    triggerRatio: number,
+    strategyOrBundleId: number,
+  ) {
+    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 = {
@@ -907,6 +943,22 @@ export const aaveV4Encode = {
 
     return [strategyOrBundleId, isBundle, triggerData, subData];
   },
+
+  liquidationProtection(
+    strategyOrBundleId: number,
+    owner: EthereumAddress,
+    spoke: EthereumAddress,
+    ratioState: RatioState,
+    targetRatio: number,
+    triggerRatio: number,
+  ) {
+    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: number,
     owner: EthereumAddress,