@defisaver/automation-sdk 3.3.16-liq-prot-dev → 3.3.17

package/src/services/strategySubService.ts

@@ -1,26 +1,22 @@
-import { getAssetInfo } from '@defisaver/tokens';
 import Dec from 'decimal.js';
+import { getAssetInfo } from '@defisaver/tokens';
 
-import { STRATEGY_IDS } from '../constants';
+import type { OrderType } from '../types/enums';
 import {
+  CloseToAssetType,
   Bundles,
   ChainId,
-  CloseToAssetType,
   RatioState,
   Strategies,
 } from '../types/enums';
 import type { EthereumAddress, StrategyOrBundleIds } from '../types';
 
-import type { OrderType } from '../types/enums';
+import { STRATEGY_IDS } from '../constants';
 
 import * as subDataService from './subDataService';
 import * as triggerService from './triggerService';
 import {
-  compareAddresses,
-  getBundleIdsByNetwork,
-  getCloseStrategyType,
-  requireAddress,
-  requireAddresses,
+  compareAddresses, getCloseStrategyType, requireAddress, requireAddresses,
 } from './utils';
 
 export const makerEncode = {
@@ -85,7 +81,7 @@ export const makerEncode = {
 
     return [strategyOrBundleId, isBundle, triggerData, subData];
   },
-  leverageManagement(
+  leverageManagementWithoutSubProxy(
     vaultId: number,
     triggerRatio: number,
     targetRatio: number,
@@ -97,27 +93,7 @@ export const makerEncode = {
 
     const triggerData = triggerService.makerRatioTrigger.encode(vaultId, triggerRatio, ratioState);
 
-    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);
+    const subData = subDataService.makerLeverageManagementWithoutSubProxy.encode(vaultId, targetRatio, daiAddr);
 
     return [
       bundleId,
@@ -186,7 +162,7 @@ export const liquityEncode = {
 
     return [strategyId, isBundle, triggerData, subData];
   },
-  leverageManagement(
+  leverageManagementWithoutSubProxy(
     strategyOrBundleId: number,
     user: EthereumAddress,
     ratioState: RatioState,
@@ -195,7 +171,7 @@ export const liquityEncode = {
   ) {
     const isBundle = true;
 
-    const subData = subDataService.liquityLeverageManagementSubData.encode(targetRatio, ratioState);
+    const subData = subDataService.liquityLeverageManagementSubDataWithoutSubProxy.encode(targetRatio, ratioState);
     const triggerData = triggerService.liquityRatioTrigger.encode(user, triggerRatio, ratioState);
 
     return [strategyOrBundleId, isBundle, triggerData, subData];
@@ -247,8 +223,14 @@ export const liquityEncode = {
   },
 };
 
+export const chickenBondsEncode = {
+  rebond(bondId: number) {
+    return subDataService.cBondsRebondSubData.encode(bondId);
+  },
+};
+
 export const aaveV2Encode = {
-  leverageManagement(
+  leverageManagementWithoutSubProxy(
     strategyOrBundleId: number,
     market: EthereumAddress,
     user: EthereumAddress,
@@ -258,7 +240,7 @@ export const aaveV2Encode = {
   ) {
     const isBundle = true;
 
-    const subData = subDataService.aaveV2LeverageManagementSubData.encode(market, targetRatio, ratioState);
+    const subData = subDataService.aaveV2LeverageManagementSubDataWithoutSubProxy.encode(market, targetRatio, ratioState);
     const triggerData = triggerService.aaveV2RatioTrigger.encode(user, market, triggerRatio, ratioState);
 
     return [strategyOrBundleId, isBundle, triggerData, subData];
@@ -332,7 +314,7 @@ export const aaveV3Encode = {
 
     return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
   },
-  leverageManagement(
+  leverageManagementWithoutSubProxy(
     strategyOrBundleId: number,
     market: EthereumAddress,
     user: EthereumAddress,
@@ -343,7 +325,7 @@ export const aaveV3Encode = {
   ) {
     const isBundle = true;
 
-    const subData = subDataService.aaveV3LeverageManagementSubData.encode(
+    const subData = subDataService.aaveV3LeverageManagementSubDataWithoutSubProxy.encode(
       targetRatio,
       ratioState,
       market,
@@ -355,28 +337,6 @@ 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,
@@ -448,7 +408,7 @@ export const aaveV3Encode = {
 };
 
 export const compoundV2Encode = {
-  leverageManagement(
+  leverageManagementWithoutSubProxy(
     strategyOrBundleId: number,
     user: EthereumAddress,
     ratioState: RatioState,
@@ -457,7 +417,7 @@ export const compoundV2Encode = {
   ) {
     const isBundle = true;
 
-    const subData = subDataService.compoundV2LeverageManagementSubData.encode(targetRatio, ratioState);
+    const subData = subDataService.compoundV2LeverageManagementSubDataWithoutSubProxy.encode(targetRatio, ratioState);
     const triggerData = triggerService.compoundV2RatioTrigger.encode(user, triggerRatio, ratioState);
 
     return [strategyOrBundleId, isBundle, triggerData, subData];
@@ -465,24 +425,7 @@ export const compoundV2Encode = {
 };
 
 export const compoundV3Encode = {
-  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(
+  leverageManagementWithoutSubProxy(
     strategyOrBundleId: number,
     market: EthereumAddress,
     baseToken: EthereumAddress,
@@ -493,12 +436,11 @@ export const compoundV3Encode = {
   ) {
     const isBundle = true;
 
-    const subData = subDataService.compoundV3LiquidationProtectionSubData.encode(market, baseToken, targetRatio, ratioState);
+    const subData = subDataService.compoundV3LeverageManagementSubDataWithoutSubProxy.encode(market, baseToken, targetRatio, ratioState);
     const triggerData = triggerService.compoundV3RatioTrigger.encode(user, market, triggerRatio, ratioState);
 
     return [strategyOrBundleId, isBundle, triggerData, subData];
   },
-
   leverageManagementOnPrice(
     strategyOrBundleId: number,
     market: EthereumAddress,
@@ -537,6 +479,18 @@ 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,
@@ -554,7 +508,7 @@ export const exchangeEncode = {
 
     return [strategyId, false, triggerData, subData];
   },
-  limitOrder(
+  limitOrderWithoutSubProxy(
     fromToken: EthereumAddress,
     toToken: EthereumAddress,
     amount: string,
@@ -566,7 +520,7 @@ export const exchangeEncode = {
     network: ChainId,
   ) {
     requireAddresses([fromToken, toToken]);
-    const subData = subDataService.exchangeLimitOrderSubData.encode(fromToken, toToken, amount);
+    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;
@@ -619,26 +573,7 @@ export const sparkEncode = {
 
     return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
   },
-  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(
+  leverageManagementWithoutSubProxy(
     strategyOrBundleId: number,
     market: EthereumAddress,
     user: EthereumAddress,
@@ -648,7 +583,7 @@ export const sparkEncode = {
   ) {
     const isBundle = true;
 
-    const subData = subDataService.sparkLiquidationProtectionSubData.encode(
+    const subData = subDataService.sparkLeverageManagementSubDataWithoutSubProxy.encode(
       targetRatio,
       ratioState,
     );
@@ -656,7 +591,6 @@ export const sparkEncode = {
 
     return [strategyOrBundleId, isBundle, triggerData, subData];
   },
-
   collateralSwitch(
     strategyOrBundleId: number,
     fromAsset: EthereumAddress,
@@ -718,6 +652,44 @@ 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,
@@ -739,52 +711,29 @@ export const morphoBlueEncode = {
 
     // over is boost, under is repay
     const isBoost = ratioState === RatioState.OVER;
-    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 bundleId = getMorphoBlueBundleId(network, isBoost ? 'boost' : 'repay', isEOA);
     const isBundle = true;
 
-    return [strategyOrBundleId, isBundle, triggerData, subData];
+    return [bundleId, isBundle, triggerData, subData];
   },
-
-  liquidationProtection(
-    marketId: string,
+  leverageManagementOnPrice(
+    strategyOrBundleId: number,
+    isBundle: boolean = true,
     loanToken: EthereumAddress,
     collToken: EthereumAddress,
     oracle: EthereumAddress,
     irm: EthereumAddress,
     lltv: string,
-    ratioState: RatioState,
-    targetRatio: number,
-    triggerRatio: number,
     user: EthereumAddress,
-    isEOA: boolean,
-    network: ChainId,
+    targetRatio: number,
+    price: number,
+    priceState: RatioState,
   ) {
-    const subData = subDataService.morphoBlueLiquidationProtectionSubData.encode(loanToken, collToken, oracle, irm, lltv, ratioState, targetRatio, user, isEOA);
-
-    const triggerData = triggerService.morphoBlueRatioTrigger.encode(marketId, user, triggerRatio, ratioState);
-
-
-    // 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];
+    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];
   },
-
-  leverageManagementOnPrice(
-    strategyOrBundleId: number,
-    isBundle: boolean = true,
+  leverageManagementOnPriceGeneric(
     loanToken: EthereumAddress,
     collToken: EthereumAddress,
     oracle: EthereumAddress,
@@ -794,10 +743,17 @@ export const morphoBlueEncode = {
     targetRatio: number,
     price: number,
     priceState: RatioState,
+    isBoost: boolean,
+    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);
-    return [strategyOrBundleId, isBundle, triggerData, subData];
+
+    const bundleId = getMorphoBlueBundleId(network, isBoost ? 'boostOnPrice' : 'repayOnPrice', isEOA);
+    const isBundle = true;
+
+    return [bundleId, isBundle, triggerData, subData];
   },
   closeOnPrice(
     strategyOrBundleId: number,
@@ -820,6 +776,30 @@ export const morphoBlueEncode = {
 
     return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
   },
+  closeOnPriceGeneric(
+    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,
+    isEOA: boolean,
+    network: ChainId,
+  ) {
+    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);
+
+    const bundleId = getMorphoBlueBundleId(network, 'close', isEOA);
+
+    return [bundleId, isBundle, triggerDataEncoded, subDataEncoded];
+  },
 };
 
 export const liquityV2Encode = {
@@ -910,22 +890,6 @@ 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 = {
@@ -943,22 +907,6 @@ 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,