@haven-fi/solauto-sdk 1.0.582 → 1.0.583

package/src/utils/{solauto/generalUtils.ts → solautoUtils.ts}

@@ -1,11 +1,5 @@
 import { PublicKey } from "@solana/web3.js";
-import {
-  isOption,
-  isSome,
-  Program,
-  publicKey,
-  Umi,
-} from "@metaplex-foundation/umi";
+import { Program, publicKey, Umi } from "@metaplex-foundation/umi";
 import {
   AutomationSettings,
   DCASettings,
@@ -13,6 +7,7 @@ import {
   LendingPlatform,
   PositionState,
   PositionType,
+  SolautoRebalanceType,
   SolautoSettingsParameters,
   SolautoSettingsParametersInpArgs,
   TokenType,
@@ -21,32 +16,31 @@ import {
   getSolautoErrorFromName,
   getSolautoPositionAccountDataSerializer,
   getSolautoPositionSize,
-} from "../../generated";
-import { consoleLog, currentUnixSeconds } from "../generalUtils";
+} from "../generated";
+import { getReferralState } from "./accountUtils";
+import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
+import { ALL_SUPPORTED_TOKENS } from "../constants";
+import {
+  findMarginfiAccounts,
+  getAllMarginfiAccountsByAuthority,
+} from "./marginfiUtils";
+import { SolautoPositionDetails } from "../types/solauto";
+import { QuoteResponse } from "@jup-ag/api";
+import { createSolautoSettings } from "../solautoPosition";
+import {
+  SolautoClient,
+  SolautoMarginfiClient,
+  TxHandlerProps,
+} from "../services";
 import {
   calcTotalDebt,
   calcTotalSupply,
-  debtLiquidityUsdAvailable,
   fromBaseUnit,
   getLiqUtilzationRateBps,
-  supplyLiquidityUsdDepositable,
   toBaseUnit,
-} from "../numberUtils";
-import { getReferralState } from "../accountUtils";
-import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
-import {
-  ALL_SUPPORTED_TOKENS,
-  TOKEN_INFO,
-  USD_DECIMALS,
-} from "../../constants";
-import {
-  findMarginfiAccounts,
-  getAllMarginfiAccountsByAuthority,
-} from "../marginfiUtils";
-import { RebalanceAction, SolautoPositionDetails } from "../../types/solauto";
-import { fetchTokenPrices } from "../priceUtils";
-import { getRebalanceValues } from "./rebalanceUtils";
-import { QuoteResponse } from "@jup-ag/api";
+  toRoundedUsdValue,
+} from "./numberUtils";
+import { fetchTokenPrices } from "./priceUtils";
 
 export function createDynamicSolautoProgram(programId: PublicKey): Program {
   return {
@@ -112,138 +106,6 @@ export function getUpdatedValueFromAutomation(
   return newValue;
 }
 
-export function getAdjustedSettingsFromAutomation(
-  settings: SolautoSettingsParameters,
-  currentUnixTime: number
-): SolautoSettingsParameters {
-  const boostToBps =
-    settings.automation.targetPeriods > 0 &&
-    eligibleForNextAutomationPeriod(settings.automation, currentUnixTime)
-      ? getUpdatedValueFromAutomation(
-          settings.boostToBps,
-          settings.targetBoostToBps,
-          settings.automation,
-          currentUnixTime
-        )
-      : settings.boostToBps;
-
-  return {
-    ...settings,
-    boostToBps,
-  };
-}
-
-export function sufficientLiquidityToBoost(
-  positionState: PositionState,
-  positionSettings: SolautoSettingsParameters | undefined,
-  positionDca: DCASettings | undefined,
-  supplyMintPrice: number,
-  debtMintPrice: number
-) {
-  const limitsUpToDate =
-    positionState.supply.amountCanBeUsed.baseUnit > BigInt(0) ||
-    positionState.debt.amountCanBeUsed.baseUnit > BigInt(0);
-
-  if (limitsUpToDate) {
-    const values = getRebalanceValues(
-      positionState!,
-      positionSettings,
-      positionDca,
-      currentUnixSeconds(),
-      supplyMintPrice,
-      debtMintPrice
-    );
-
-    const debtAvailable = debtLiquidityUsdAvailable(positionState);
-    const supplyDepositable = supplyLiquidityUsdDepositable(positionState);
-    const sufficientLiquidity =
-      debtAvailable * 0.95 > values.debtAdjustmentUsd &&
-      supplyDepositable * 0.95 > values.debtAdjustmentUsd;
-
-    if (!sufficientLiquidity) {
-      consoleLog("Insufficient liquidity to further boost");
-    }
-    return sufficientLiquidity;
-  }
-
-  return true;
-}
-
-export function eligibleForRebalance(
-  positionState: PositionState,
-  positionSettings: SolautoSettingsParameters | undefined,
-  positionDca: DCASettings | undefined,
-  currentUnixTime: number,
-  supplyMintPrice: number,
-  debtMintPrice: number,
-  bpsDistanceThreshold = 0
-): RebalanceAction | undefined {
-  if (!positionSettings) {
-    return undefined;
-  }
-
-  if (
-    positionDca &&
-    positionDca.automation.targetPeriods > 0 &&
-    eligibleForNextAutomationPeriod(positionDca.automation, currentUnixTime)
-  ) {
-    return "dca";
-  }
-
-  if (positionState.supply.amountUsed.baseUnit === BigInt(0)) {
-    return undefined;
-  }
-
-  const boostToBps =
-    eligibleForRefresh(positionState, positionSettings, currentUnixTime) &&
-    positionSettings.automation.targetPeriods > 0
-      ? getUpdatedValueFromAutomation(
-          positionSettings.boostToBps,
-          positionSettings.targetBoostToBps,
-          positionSettings.automation,
-          currentUnixTime
-        )
-      : positionSettings.boostToBps;
-  const repayFrom = positionSettings.repayToBps + positionSettings.repayGap;
-  const boostFrom = boostToBps - positionSettings.boostGap;
-
-  if (positionState.liqUtilizationRateBps - boostFrom <= bpsDistanceThreshold) {
-    const sufficientLiquidity = sufficientLiquidityToBoost(
-      positionState,
-      positionSettings,
-      positionDca,
-      supplyMintPrice,
-      debtMintPrice
-    );
-    return sufficientLiquidity ? "boost" : undefined;
-  } else if (
-    repayFrom - positionState.liqUtilizationRateBps <=
-    bpsDistanceThreshold
-  ) {
-    return "repay";
-  }
-
-  return undefined;
-}
-
-export function eligibleForRefresh(
-  positionState: PositionState,
-  positionSettings: SolautoSettingsParameters,
-  currentUnixTime: number
-): boolean {
-  if (positionSettings.automation.targetPeriods > 0) {
-    return eligibleForNextAutomationPeriod(
-      positionSettings.automation,
-      currentUnixTime
-    );
-  } else {
-    return (
-      currentUnixSeconds() - Number(positionState.lastUpdated) >
-      60 * 60 * 24 * 7
-    );
-  }
-}
-
 export async function getSolautoManagedPositions(
   umi: Umi,
   authority?: PublicKey,
@@ -467,161 +329,43 @@ export async function positionStateWithLatestPrices(
     ),
     netWorth: {
       baseUnit: toBaseUnit(
-        supplyPrice > 0 ? (supplyUsd - debtUsd) / supplyPrice : 0,
+        supplyUsd > 0 ? (supplyUsd - debtUsd) / supplyPrice : 0,
         state.supply.decimals
       ),
-      baseAmountUsdValue: toBaseUnit(supplyUsd - debtUsd, USD_DECIMALS),
+      baseAmountUsdValue: toRoundedUsdValue(supplyUsd - debtUsd),
     },
     supply: {
       ...state.supply,
       amountCanBeUsed: {
         ...state.supply.amountCanBeUsed,
-        baseAmountUsdValue: toBaseUnit(
+        baseAmountUsdValue: toRoundedUsdValue(
           fromBaseUnit(
             state.supply.amountCanBeUsed.baseUnit,
             state.supply.decimals
-          ) * supplyPrice,
-          USD_DECIMALS
+          ) * supplyPrice
         ),
       },
       amountUsed: {
         ...state.supply.amountUsed,
-        baseAmountUsdValue: toBaseUnit(supplyUsd, USD_DECIMALS),
+        baseAmountUsdValue: toRoundedUsdValue(supplyUsd),
       },
     },
     debt: {
       ...state.debt,
       amountCanBeUsed: {
         ...state.debt.amountCanBeUsed,
-        baseAmountUsdValue: toBaseUnit(
+        baseAmountUsdValue: toRoundedUsdValue(
           fromBaseUnit(
             state.debt.amountCanBeUsed.baseUnit,
             state.debt.decimals
-          ) * debtPrice,
-          USD_DECIMALS
+          ) * debtPrice
         ),
       },
       amountUsed: {
         ...state.debt.amountUsed,
-        baseAmountUsdValue: toBaseUnit(debtUsd, USD_DECIMALS),
-      },
-    },
-  };
-}
-
-interface AssetProps {
-  mint: PublicKey;
-  price?: number;
-  amountUsed?: number;
-  amountCanBeUsed?: number;
-}
-
-export function createFakePositionState(
-  supply: AssetProps,
-  debt: AssetProps,
-  maxLtvBps: number,
-  liqThresholdBps: number
-): PositionState {
-  const supplyDecimals = TOKEN_INFO[supply.mint.toString()].decimals;
-  const debtDecimals = TOKEN_INFO[debt.mint.toString()].decimals;
-
-  const supplyUsd = (supply.amountUsed ?? 0) * (supply.price ?? 0);
-  const debtUsd = (debt.amountUsed ?? 0) * (debt.price ?? 0);
-
-  return {
-    liqUtilizationRateBps: getLiqUtilzationRateBps(
-      supplyUsd,
-      debtUsd,
-      liqThresholdBps
-    ),
-    supply: {
-      amountUsed: {
-        baseUnit: toBaseUnit(supply.amountUsed ?? 0, supplyDecimals),
-        baseAmountUsdValue: toBaseUnit(supplyUsd, USD_DECIMALS),
-      },
-      amountCanBeUsed: {
-        baseUnit: toBaseUnit(supply.amountCanBeUsed ?? 0, supplyDecimals),
-        baseAmountUsdValue: toBaseUnit(
-          (supply.amountCanBeUsed ?? 0) * (supply.price ?? 0),
-          USD_DECIMALS
-        ),
-      },
-      baseAmountMarketPriceUsd: toBaseUnit(supply.price ?? 0, USD_DECIMALS),
-      borrowFeeBps: 0,
-      decimals: supplyDecimals,
-      flashLoanFeeBps: 0,
-      mint: publicKey(supply.mint),
-      padding1: [],
-      padding2: [],
-      padding: new Uint8Array([]),
-    },
-    debt: {
-      amountUsed: {
-        baseUnit: toBaseUnit(debt.amountUsed ?? 0, debtDecimals),
-        baseAmountUsdValue: toBaseUnit(debtUsd, USD_DECIMALS),
-      },
-      amountCanBeUsed: {
-        baseUnit: toBaseUnit(debt.amountCanBeUsed ?? 0, debtDecimals),
-        baseAmountUsdValue: toBaseUnit(
-          (debt.amountCanBeUsed ?? 0) * (debt.price ?? 0),
-          USD_DECIMALS
-        ),
+        baseAmountUsdValue: toRoundedUsdValue(debtUsd),
       },
-      baseAmountMarketPriceUsd: toBaseUnit(debt.price ?? 0, USD_DECIMALS),
-      borrowFeeBps: 0,
-      decimals: debtDecimals,
-      flashLoanFeeBps: 0,
-      mint: publicKey(debt.mint),
-      padding1: [],
-      padding2: [],
-      padding: new Uint8Array([]),
     },
-    netWorth: {
-      baseUnit: supply.price
-        ? toBaseUnit((supplyUsd - debtUsd) / supply.price, supplyDecimals)
-        : BigInt(0),
-      baseAmountUsdValue: toBaseUnit(supplyUsd - debtUsd, USD_DECIMALS),
-    },
-    maxLtvBps,
-    liqThresholdBps,
-    lastUpdated: BigInt(currentUnixSeconds()),
-    padding1: [],
-    padding2: [],
-    padding: [],
-  };
-}
-
-export function createSolautoSettings(
-  settings: SolautoSettingsParametersInpArgs
-): SolautoSettingsParameters {
-  return {
-    automation:
-      isOption(settings.automation) && isSome(settings.automation)
-        ? {
-            ...settings.automation.value,
-            intervalSeconds: BigInt(settings.automation.value.intervalSeconds),
-            unixStartDate: BigInt(settings.automation.value.unixStartDate),
-            padding: new Uint8Array([]),
-            padding1: [],
-          }
-        : {
-            targetPeriods: 0,
-            periodsPassed: 0,
-            intervalSeconds: BigInt(0),
-            unixStartDate: BigInt(0),
-            padding: new Uint8Array([]),
-            padding1: [],
-          },
-    targetBoostToBps:
-      isOption(settings.targetBoostToBps) && isSome(settings.targetBoostToBps)
-        ? settings.targetBoostToBps.value
-        : 0,
-    boostGap: settings.boostGap,
-    boostToBps: settings.boostToBps,
-    repayGap: settings.repayGap,
-    repayToBps: settings.repayToBps,
-    padding: new Uint8Array([]),
-    padding1: [],
   };
 }
 
@@ -638,7 +382,7 @@ export class ContextUpdates {
   public supplyAdjustment = BigInt(0);
   public debtAdjustment = BigInt(0);
   public settings: SolautoSettingsParameters | undefined = undefined;
-  public activeDca: DCASettings | undefined = undefined;
+  public dca: DCASettings | undefined = undefined;
   public dcaInBalance?: { amount: bigint; tokenType: TokenType } = undefined;
   public cancellingDca: TokenType | undefined = undefined;
   public jupSwap: QuoteResponse | undefined = undefined;
@@ -653,7 +397,7 @@ export class ContextUpdates {
       this.settings = createSolautoSettings(settings);
     } else if (update.type === "dca") {
       const dca = update.value;
-      this.activeDca = {
+      this.dca = {
         automation: {
           ...dca.automation,
           intervalSeconds: BigInt(dca.automation.intervalSeconds),
@@ -678,7 +422,7 @@ export class ContextUpdates {
     this.supplyAdjustment = BigInt(0);
     this.debtAdjustment = BigInt(0);
     this.settings = undefined;
-    this.activeDca = undefined;
+    this.dca = undefined;
     this.dcaInBalance = undefined;
     this.cancellingDca = undefined;
   }
@@ -693,3 +437,37 @@ export class ContextUpdates {
     );
   }
 }
+
+export function getClient(
+  lendingPlatform: LendingPlatform,
+  txHandlerProps: TxHandlerProps
+) {
+  if (lendingPlatform === LendingPlatform.Marginfi) {
+    return new SolautoMarginfiClient(txHandlerProps);
+  } else {
+    // TODO: PF
+  }
+}
+
+export function isMarginfiClient(
+  client: SolautoClient
+): client is SolautoMarginfiClient {
+  return client.lendingPlatform == LendingPlatform.Marginfi;
+}
+// TODO: PF
+
+export function hasFirstRebalance(rebalanceType: SolautoRebalanceType) {
+  return [
+    SolautoRebalanceType.Regular,
+    SolautoRebalanceType.DoubleRebalanceWithFL,
+    SolautoRebalanceType.FLRebalanceThenSwap,
+  ].includes(rebalanceType);
+}
+
+export function hasLastRebalance(rebalanceType: SolautoRebalanceType) {
+  return [
+    SolautoRebalanceType.Regular,
+    SolautoRebalanceType.DoubleRebalanceWithFL,
+    SolautoRebalanceType.FLSwapThenRebalance,
+  ].includes(rebalanceType);
+}

package/tests/transactions/shared.ts

@@ -0,0 +1,135 @@
+import { Signer } from "@metaplex-foundation/umi";
+import {
+  buildIronforgeApiUrl,
+  consoleLog,
+  fetchTokenPrices,
+  getClient,
+  LendingPlatform,
+  maxBoostToBps,
+  maxRepayToBps,
+  RebalanceTxBuilder,
+  SOLAUTO_PROD_PROGRAM,
+  SOLAUTO_TEST_PROGRAM,
+  solautoAction,
+  SolautoSettingsParametersInpArgs,
+  toBaseUnit,
+  tokenInfo,
+  TransactionItem,
+  TransactionsManager,
+  USDC,
+} from "../../src";
+import { PublicKey } from "@solana/web3.js";
+import { NATIVE_MINT } from "@solana/spl-token";
+
+export async function e2eTransactionTest(
+  signer: Signer,
+  testProgram: boolean,
+  lendingPlatform: LendingPlatform,
+  withFlashLoan: boolean
+) {
+  const client = getClient(lendingPlatform, {
+    signer,
+    rpcUrl: buildIronforgeApiUrl(process.env.IRONFORGE_API_KEY!),
+    programId: testProgram ? SOLAUTO_TEST_PROGRAM : SOLAUTO_PROD_PROGRAM,
+  });
+
+  const supplyMint = new PublicKey(NATIVE_MINT);
+  const debtMint = new PublicKey(USDC);
+
+  await client.initialize({
+    positionId: 100,
+    new: true,
+    supplyMint,
+    debtMint,
+  });
+
+  const [maxLtvBps, liqThresholdBps] =
+  await client.solautoPosition.maxLtvAndLiqThresholdBps();
+  const settings: SolautoSettingsParametersInpArgs = {
+    boostToBps: maxBoostToBps(maxLtvBps, liqThresholdBps) - 200,
+    boostGap: 50,
+    repayToBps: maxRepayToBps(maxLtvBps, liqThresholdBps),
+    repayGap: 50,
+  };
+
+  const transactionItems: TransactionItem[] = [];
+
+  transactionItems.push(
+    new TransactionItem(async () => {
+      return {
+        tx: client.openPositionIx(settings),
+      };
+    }, "open position")
+  );
+
+  const [supplyPrice, debtPrice] = await fetchTokenPrices([
+    supplyMint,
+    debtMint,
+  ]);
+
+  const supplyUsd = 100;
+  transactionItems.push(
+    new TransactionItem(async () => {
+      return {
+        tx: client.protocolInteractionIx(
+          solautoAction("Deposit", [
+            toBaseUnit(supplyUsd / supplyPrice, tokenInfo(supplyMint).decimals),
+          ])
+        ),
+      };
+    }, "deposit")
+  );
+
+  const debtUsd = withFlashLoan ? 60 : 10;
+  transactionItems.push(
+    new TransactionItem(async () => {
+      return {
+        tx: client.protocolInteractionIx(
+          solautoAction("Borrow", [
+            toBaseUnit(debtUsd / debtPrice, tokenInfo(debtMint).decimals),
+          ])
+        ),
+      };
+    }, "borrow")
+  );
+
+  transactionItems.push(
+    new TransactionItem(async (attemptNum) => {
+      const rebalancer = new RebalanceTxBuilder(client, 0);
+      return await rebalancer.buildRebalanceTx(attemptNum);
+    }, "rebalance")
+  );
+
+  transactionItems.push(
+    new TransactionItem(
+      async () => ({
+        tx: client.protocolInteractionIx(
+          solautoAction("Withdraw", [{ __kind: "All" }])
+        ),
+      }),
+      "withdraw"
+    )
+  );
+
+  transactionItems.push(
+    new TransactionItem(
+      async () => ({
+        tx: client.closePositionIx(),
+      }),
+      "close position"
+    )
+  );
+
+  const txManager = new TransactionsManager(
+    client,
+    undefined,
+    "only-simulate",
+    undefined,
+    true,
+    undefined,
+    { totalRetries: 5 }
+  );
+  const statuses = await txManager.clientSend(transactionItems);
+
+  consoleLog(statuses);
+}