@defisaver/automation-sdk 3.1.4 → 3.1.6-fluid-dev

package/src/services/triggerService.ts

@@ -447,3 +447,128 @@ export const morphoBlueRatioTrigger = {
     };
   },
 };
+
+export const liquityV2RatioTrigger = {
+  encode(
+    market: EthereumAddress,
+    troveId: string,
+    ratioPercentage: number,
+    ratioState: RatioState,
+  ) {
+    const ratioWei = ratioPercentageToWei(ratioPercentage);
+    return [AbiCoder.encodeParameters(['address', 'uint256', 'uint256', 'uint8'], [market, troveId, ratioWei, ratioState])];
+  },
+  decode(
+    triggerData: TriggerData,
+  ) {
+    const decodedData = AbiCoder.decodeParameters(['address', 'uint256', 'uint256', 'uint8'], triggerData[0]);
+    return {
+      market: decodedData[0] as EthereumAddress,
+      troveId: decodedData[1] as string,
+      ratio: weiToRatioPercentage(decodedData[2] as string),
+      ratioState: Number(decodedData[3]),
+    };
+  },
+};
+
+export const liquityV2QuotePriceTrigger = {
+  encode(
+    market: EthereumAddress,
+    price: number,
+    ratioState: RatioState,
+  ) {
+    // Price is always in 18 decimals
+    const _price = new Dec(price.toString()).mul(10 ** 18).floor().toString();
+    return [AbiCoder.encodeParameters(['address', 'uint256', 'uint8'], [market, _price, ratioState])];
+  },
+  decode(
+    triggerData: TriggerData,
+  ) {
+    const decodedData = AbiCoder.decodeParameters(['address', 'uint256', 'uint8'], triggerData[0]);
+    const price = new Dec(decodedData[1] as string).div(10 ** 18).toDP(18).toString();
+    return {
+      market: decodedData[0] as EthereumAddress,
+      price,
+      ratioState: Number(decodedData[2]),
+    };
+  },
+};
+
+export const closePriceTrigger = {
+  encode(
+    tokenAddr: EthereumAddress,
+    lowerPrice: number,
+    upperPrice: number,
+  ) {
+    const lowerPriceFormatted = new Dec(lowerPrice).mul(1e8).floor().toString();
+    const upperPriceFormatted = new Dec(upperPrice).mul(1e8).floor().toString();
+
+    return [
+      AbiCoder.encodeParameters(
+        ['address', 'uint256', 'uint256'],
+        [tokenAddr, lowerPriceFormatted, upperPriceFormatted],
+      ),
+    ];
+  },
+  decode(triggerData: TriggerData): {
+    tokenAddr: EthereumAddress,
+    lowerPrice: string,
+    upperPrice: string,
+  } {
+    const decodedData = AbiCoder.decodeParameters(['address', 'uint256', 'uint256'], triggerData[0]);
+    return {
+      tokenAddr: decodedData[0] as EthereumAddress,
+      lowerPrice: new Dec(decodedData[1] as string).div(1e8).toString(),
+      upperPrice: new Dec(decodedData[2] as string).div(1e8).toString(),
+    };
+  },
+};
+export const morphoBluePriceTrigger = {
+  encode(
+    oracle: EthereumAddress,
+    collateralToken: EthereumAddress,
+    loanToken: EthereumAddress,
+    price: number,
+    priceState: RatioState,
+  ) {
+    const _price = new Dec(price.toString()).mul(1e8).floor().toString();
+    return [
+      AbiCoder.encodeParameters(
+        ['address', 'address', 'address', 'uint256', 'uint8'],
+        [oracle, collateralToken, loanToken, _price, priceState]),
+    ];
+  },
+  decode(
+    triggerData: TriggerData,
+  ) {
+    const decodedData = AbiCoder.decodeParameters(['address', 'address', 'address', 'uint256', 'uint8'], triggerData[0]);
+    return {
+      oracle: decodedData[0] as EthereumAddress,
+      collateralToken: decodedData[1] as EthereumAddress,
+      loanToken: decodedData[2] as EthereumAddress,
+      price: new Dec(decodedData[3] as string).div(1e8).toString(),
+      priceState: Number(decodedData[4]),
+    };
+  },
+};
+
+export const fluidRatioTrigger = {
+  encode(
+    nftId: string,
+    ratioPercentage: number,
+    ratioState: RatioState,
+  ) {
+    const ratioWei = ratioPercentageToWei(ratioPercentage);
+    return [AbiCoder.encodeParameters(['uint256', 'uint256', 'uint8'], [nftId, ratioWei, ratioState])];
+  },
+  decode(
+    triggerData: TriggerData,
+  ) {
+    const decodedData = AbiCoder.decodeParameters(['uint256', 'uint256', 'uint8'], triggerData[0]);
+    return {
+      nftId: decodedData[0] as string,
+      ratio: weiToRatioPercentage(decodedData[1] as string),
+      ratioState: Number(decodedData[2]),
+    };
+  },
+};

package/src/services/utils.ts

@@ -4,7 +4,9 @@ import AbiCoder from 'web3-eth-abi';
 import { getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
 
 import type { EthereumAddress } from '../types';
-import { ChainId, RatioState } from '../types/enums';
+import {
+  ChainId, CloseStrategyType, CloseToAssetType, RatioState,
+} from '../types/enums';
 
 export function isDefined<T>(value: T): value is NonNullable<T> {
   return value !== undefined && value !== null;
@@ -101,4 +103,61 @@ export function getRatioStateInfoForAaveCloseStrategy(
 
 export function getPositionId(...args: (number | string)[]) {
   return args.map(arg => arg.toString().toLowerCase().split(' ').join('_')).join('-');
+}
+
+export function getCloseStrategyType(
+  stopLossPrice: number,
+  stopLossType: CloseToAssetType,
+  takeProfitPrice: number,
+  takeProfitType: CloseToAssetType,
+): CloseStrategyType {
+  const isStopLoss = stopLossPrice > 0;
+  const isTakeProfit = takeProfitPrice > 0;
+
+  if (!isStopLoss && !isTakeProfit) {
+    throw new Error('CloseOnPrice: At least one price must be defined');
+  }
+
+  if (isStopLoss && isTakeProfit) {
+    if (stopLossType === CloseToAssetType.COLLATERAL && takeProfitType === CloseToAssetType.COLLATERAL) {
+      return CloseStrategyType.TAKE_PROFIT_AND_STOP_LOSS_IN_COLLATERAL;
+    } if (stopLossType === CloseToAssetType.COLLATERAL) {
+      return CloseStrategyType.TAKE_PROFIT_IN_DEBT_AND_STOP_LOSS_IN_COLLATERAL;
+    } if (takeProfitType === CloseToAssetType.COLLATERAL) {
+      return CloseStrategyType.TAKE_PROFIT_IN_COLLATERAL_AND_STOP_LOSS_IN_DEBT;
+    }
+    return CloseStrategyType.TAKE_PROFIT_AND_STOP_LOSS_IN_DEBT;
+  } if (isStopLoss) {
+    return stopLossType === CloseToAssetType.COLLATERAL
+      ? CloseStrategyType.STOP_LOSS_IN_COLLATERAL
+      : CloseStrategyType.STOP_LOSS_IN_DEBT;
+  }
+  return takeProfitType === CloseToAssetType.COLLATERAL
+    ? CloseStrategyType.TAKE_PROFIT_IN_COLLATERAL
+    : CloseStrategyType.TAKE_PROFIT_IN_DEBT;
+}
+
+export function getStopLossAndTakeProfitTypeByCloseStrategyType(
+  closeStrategyType: CloseStrategyType,
+): { stopLossType: CloseToAssetType | undefined, takeProfitType: CloseToAssetType | undefined } {
+  switch (closeStrategyType) {
+    case CloseStrategyType.STOP_LOSS_IN_COLLATERAL:
+      return { stopLossType: CloseToAssetType.COLLATERAL, takeProfitType: undefined };
+    case CloseStrategyType.STOP_LOSS_IN_DEBT:
+      return { stopLossType: CloseToAssetType.DEBT, takeProfitType: undefined };
+    case CloseStrategyType.TAKE_PROFIT_IN_COLLATERAL:
+      return { stopLossType: undefined, takeProfitType: CloseToAssetType.COLLATERAL };
+    case CloseStrategyType.TAKE_PROFIT_IN_DEBT:
+      return { stopLossType: undefined, takeProfitType: CloseToAssetType.DEBT };
+    case CloseStrategyType.TAKE_PROFIT_IN_COLLATERAL_AND_STOP_LOSS_IN_DEBT:
+      return { stopLossType: CloseToAssetType.DEBT, takeProfitType: CloseToAssetType.COLLATERAL };
+    case CloseStrategyType.TAKE_PROFIT_IN_DEBT_AND_STOP_LOSS_IN_COLLATERAL:
+      return { stopLossType: CloseToAssetType.COLLATERAL, takeProfitType: CloseToAssetType.DEBT };
+    case CloseStrategyType.TAKE_PROFIT_AND_STOP_LOSS_IN_DEBT:
+      return { stopLossType: CloseToAssetType.DEBT, takeProfitType: CloseToAssetType.DEBT };
+    case CloseStrategyType.TAKE_PROFIT_AND_STOP_LOSS_IN_COLLATERAL:
+      return { stopLossType: CloseToAssetType.COLLATERAL, takeProfitType: CloseToAssetType.COLLATERAL };
+    default:
+      throw new Error('CloseStrategyType not supported');
+  }
 }

package/src/types/enums.ts

@@ -21,6 +21,32 @@ export enum BundleProtocols {
   Rari = 'rari',
 }
 
+export enum CollActionType {
+  SUPPLY = 0,
+  WITHDRAW = 1,
+}
+
+export enum DebtActionType {
+  PAYBACK = 0,
+  BORROW = 1,
+}
+
+export enum CloseStrategyType {
+  TAKE_PROFIT_IN_COLLATERAL = 0,
+  STOP_LOSS_IN_COLLATERAL = 1,
+  TAKE_PROFIT_IN_DEBT = 2,
+  STOP_LOSS_IN_DEBT = 3,
+  TAKE_PROFIT_AND_STOP_LOSS_IN_COLLATERAL = 4,
+  TAKE_PROFIT_IN_COLLATERAL_AND_STOP_LOSS_IN_DEBT = 5,
+  TAKE_PROFIT_AND_STOP_LOSS_IN_DEBT = 6,
+  TAKE_PROFIT_IN_DEBT_AND_STOP_LOSS_IN_COLLATERAL = 7,
+}
+
+export enum CloseToAssetType {
+  COLLATERAL = 0,
+  DEBT = 1,
+}
+
 /**
  * @dev Follow the naming convention:
  *      - Enum name consists of two parts, name and version
@@ -32,6 +58,7 @@ export namespace ProtocolIdentifiers {
   export enum StrategiesAutomation {
     MakerDAO = 'MakerDAO',
     Liquity = 'Liquity',
+    LiquityV2 = 'Liquity__V2',
     ChickenBonds = 'Chicken Bonds',
     CompoundV2 = 'Compound__V2',
     CompoundV3 = 'Compound__V3',
@@ -42,6 +69,7 @@ export namespace ProtocolIdentifiers {
     Spark = 'Spark',
     CrvUSD = 'CurveUSD',
     MorphoBlue = 'MorphoBlue',
+    FluidT1 = 'FluidT1',
   }
 
   export enum LegacyAutomation {
@@ -98,6 +126,7 @@ export namespace Strategies {
     CloseToCollateralWithGasPrice = 'close-to-collateral-with-gas-price',
     CloseOnPriceToDebt = 'close-on-price-to-debt',
     CloseOnPriceToColl = 'close-on-price-to-collateral',
+    CloseOnPrice = 'close-on-price',
     TrailingStopToColl = 'trailing-stop-to-collateral',
     TrailingStopToDebt = 'trailing-stop-to-debt',
     Rebond = 'rebond',
@@ -108,6 +137,7 @@ export namespace Strategies {
     DebtInFrontRepay = 'debt-in-front-repay',
     OpenOrderFromCollateral = 'open-order-from-collateral',
     OpenOrderFromDebt = 'open-order-from-debt',
+    BoostOnPrice = 'boost-on-price',
     RepayOnPrice = 'repay-on-price',
   }
   export enum IdOverrides {
@@ -163,6 +193,14 @@ export namespace Bundles {
     MORPHO_BLUE_EOA_BOOST = 35,
     AAVE_V3_OPEN_ORDER_FROM_COLLATERAL = 36,
     AAVE_V3_REPAY_ON_PRICE = 37,
+    MORPHO_BLUE_BOOST_ON_PRICE = 38,
+    LIQUITY_V2_REPAY = 39,
+    LIQUITY_V2_BOOST = 40,
+    LIQUITY_V2_CLOSE = 41,
+    LIQUITY_V2_REPAY_ON_PRICE = 42,
+    LIQUITY_V2_BOOST_ON_PRICE = 43,
+    FLUID_T1_REPAY = 44,
+    FLUID_T2_BOOST = 45,
   }
 
   export enum OptimismIds {
@@ -185,6 +223,7 @@ export namespace Bundles {
     MORPHO_BLUE_BOOST = 9,
     AAVE_V3_OPEN_ORDER_FROM_COLLATERAL = 10,
     AAVE_V3_REPAY_ON_PRICE = 11,
+    MORPHO_BLUE_BOOST_ON_PRICE = 12,
   }
 
   export enum ArbitrumIds {

package/src/types/index.ts

@@ -5,6 +5,7 @@ import type { Subscribe, StrategyModel } from './contracts/generated/SubStorage'
 import type {
   ChainId, Strategies, Bundles, ProtocolIdentifiers,
   RatioState,
+  CloseToAssetType,
 } from './enums';
 
 export type PlaceholderType = any; // TODO - fix any types
@@ -90,7 +91,7 @@ export declare namespace Interfaces {
 
   interface Automation {
     provider: Web3,
-    providerFork: Web3,
+    providerFork?: Web3,
   }
   interface LegacyAutomation<T extends BaseContract> {
     provider: Web3,
@@ -149,6 +150,11 @@ export declare namespace Position {
       ratio: number,
     }
 
+    interface BoostOnPriceMorpho extends Base {
+      marketId: string;
+      subHash: string;
+    }
+
     interface CloseOnPriceWithMaximumGasPriceAave extends Base {
       collAsset: EthereumAddress,
       collAssetId: number,
@@ -161,6 +167,16 @@ export declare namespace Position {
       ratioState: RatioState,
     }
 
+    interface CloseOnPriceLiquityV2 extends Base {
+      market: EthereumAddress,
+      troveId: string,
+      stopLossPrice: string,
+      takeProfitPrice: string,
+      closeToAssetAddr: EthereumAddress,
+      stopLossType: CloseToAssetType | undefined,
+      takeProfitType: CloseToAssetType | undefined,
+    }
+
     interface TrailingStop extends Base {
       roundId: number,
       triggerPercentage: number,
@@ -186,7 +202,9 @@ export declare namespace Position {
     | Specific.BoostOnPriceAave
     | Specific.CloseOnPriceWithMaximumGasPriceAave
     | Specific.DebtInFrontRepay
-    | Specific.LeverageManagementCrvUSD;
+    | Specific.LeverageManagementCrvUSD
+    | Specific.CloseOnPriceLiquityV2
+    | Specific.BoostOnPriceMorpho;
 
   export interface Automated {
     chainId: ChainId,