@haven-fi/solauto-sdk 1.0.628 → 1.0.630

package/src/solautoPosition/solautoPositionEx.ts

@@ -9,6 +9,7 @@ import {
   fetchSolautoPosition,
   LendingPlatform,
   PositionState,
+  PriceType,
   SolautoPosition,
   SolautoSettingsParameters,
 } from "../generated";
@@ -27,6 +28,7 @@ import {
   fetchTokenPrices,
   getLiqUtilzationRateBps,
   maxBoostToBps,
+  maxRepayFromBps,
   maxRepayToBps,
   positionStateWithLatestPrices,
   safeGetPrice,
@@ -97,155 +99,175 @@ export abstract class SolautoPositionEx {
 
   abstract lendingPool(): Promise<PublicKey>;
 
-  exists() {
+  get exists() {
     return this._data.position !== undefined;
   }
 
-  authority() {
+  get authority() {
     return this._data.authority
       ? toWeb3JsPublicKey(this._data.authority)
-      : undefined;
+      : PublicKey.default;
   }
 
-  positionId() {
+  get positionId() {
     return this._data.positionId ? this._data.positionId[0] : undefined;
   }
 
-  strategyName() {
-    return solautoStrategyName(
-      toWeb3JsPublicKey(this.state().supply.mint),
-      toWeb3JsPublicKey(this.state().debt.mint)
+  get positionType() {
+    return this._data.positionType;
+  }
+
+  get strategyName() {
+    return solautoStrategyName(this.supplyMint, this.debtMint);
+  }
+
+  liqUtilizationRateBps(priceType?: PriceType): number {
+    return getLiqUtilzationRateBps(
+      this.supplyUsd(priceType),
+      this.debtUsd(priceType),
+      this.state.liqThresholdBps
     );
   }
 
-  data(): SolautoPositionExData {
+  protected get data(): SolautoPositionExData {
     return this._data;
   }
 
-  state(): PositionState {
-    return this.data().state;
+  get state(): PositionState {
+    return this.data.state;
   }
 
-  settings(): SolautoSettingsParameters | undefined {
-    return this.contextUpdates?.settings ?? this.data().position?.settings;
+  get settings(): SolautoSettingsParameters | undefined {
+    return this.contextUpdates?.settings ?? this.data.position?.settings;
   }
 
-  dca(): DCASettings | undefined {
-    return this.contextUpdates?.dca ?? this.data().position?.dca;
+  updateSettings(settings: SolautoSettingsParameters) {
+    this.data.position!.settings = settings;
   }
 
-  supplyMint(): PublicKey {
-    return toWeb3JsPublicKey(this.state().supply.mint);
+  get dca(): DCASettings | undefined {
+    return this.contextUpdates?.dca ?? this.data.position?.dca;
   }
 
-  supplyMintInfo(): TokenInfo {
-    return tokenInfo(this.supplyMint());
+  updateDca(dca: DCASettings) {
+    this.data.position!.dca = dca;
   }
 
-  debtMint(): PublicKey {
-    return toWeb3JsPublicKey(this.state().debt.mint);
+  get supplyMint(): PublicKey {
+    return toWeb3JsPublicKey(this.state.supply.mint);
   }
 
-  debtMintInfo(): TokenInfo {
-    return tokenInfo(this.debtMint());
+  get supplyMintInfo(): TokenInfo {
+    return tokenInfo(this.supplyMint);
   }
 
-  boostToBps() {
-    return Math.min(
-      this.settings()?.boostToBps ?? 0,
-      maxBoostToBps(this.state().maxLtvBps, this.state().liqThresholdBps)
-    );
+  get debtMint(): PublicKey {
+    return toWeb3JsPublicKey(this.state.debt.mint);
   }
 
-  boostFromBps() {
-    return this.boostToBps() - (this.settings()?.boostGap ?? 0);
+  get debtMintInfo(): TokenInfo {
+    return tokenInfo(this.debtMint);
   }
 
-  repayToBps() {
-    return Math.min(
-      this.settings()?.repayToBps ?? 0,
-      maxRepayToBps(this.state().maxLtvBps, this.state().liqThresholdBps)
-    );
+  get boostToBps() {
+    return Math.min(this.settings?.boostToBps ?? 0, this.maxBoostToBps);
   }
 
-  repayFromBps() {
-    return (
-      (this.settings()?.repayToBps ?? 0) + (this.settings()?.repayGap ?? 0)
-    );
+  get maxBoostToBps() {
+    return maxBoostToBps(this.state.maxLtvBps, this.state.liqThresholdBps);
+  }
+
+  get boostFromBps() {
+    return this.boostToBps - (this.settings?.boostGap ?? 0);
+  }
+
+  get repayToBps() {
+    return Math.min(this.settings?.repayToBps ?? 0, this.maxRepayToBps);
+  }
+
+  get maxRepayToBps() {
+    return maxRepayToBps(this.state.maxLtvBps, this.state.liqThresholdBps);
+  }
+
+  get repayFromBps() {
+    return (this.settings?.repayToBps ?? 0) + (this.settings?.repayGap ?? 0);
   }
 
-  netWorth() {
-    return calcNetWorth(this.state());
+  get maxRepayFromBps() {
+    return maxRepayFromBps(this.state.maxLtvBps, this.state.liqThresholdBps);
   }
 
-  netWorthUsd() {
-    return calcNetWorthUsd(this.state());
+  get netWorth() {
+    return calcNetWorth(this.state);
   }
 
-  totalSupply() {
-    return calcTotalSupply(this.state());
+  get netWorthUsd() {
+    return calcNetWorthUsd(this.state);
   }
 
-  supplyUsd() {
-    const supplyPrice = safeGetPrice(this.supplyMint());
+  get totalSupply() {
+    return calcTotalSupply(this.state);
+  }
+
+  supplyUsd(priceType?: PriceType) {
+    const supplyPrice = safeGetPrice(this.supplyMint, priceType);
     return supplyPrice
-      ? calcTotalSupply(this.state()) * supplyPrice
-      : calcSupplyUsd(this.state());
+      ? calcTotalSupply(this.state) * supplyPrice
+      : calcSupplyUsd(this.state);
   }
 
-  totalDebt() {
-    return calcTotalDebt(this.state());
+  get totalDebt() {
+    return calcTotalDebt(this.state);
   }
 
-  debtUsd() {
-    const debtPrice = safeGetPrice(this.debtMint());
+  debtUsd(priceType?: PriceType) {
+    const debtPrice = safeGetPrice(this.debtMint, priceType);
     return debtPrice
-      ? calcTotalDebt(this.state()) * debtPrice
-      : calcDebtUsd(this.state());
+      ? calcTotalDebt(this.state) * debtPrice
+      : calcDebtUsd(this.state);
   }
 
-  supplyLiquidityDepositable() {
-    return supplyLiquidityDepositable(this.state());
+  get supplyLiquidityDepositable() {
+    return supplyLiquidityDepositable(this.state);
   }
 
-  supplyLiquidityUsdDepositable() {
-    return supplyLiquidityUsdDepositable(this.state());
+  get supplyLiquidityUsdDepositable() {
+    return supplyLiquidityUsdDepositable(this.state);
   }
 
-  supplyLiquidityUsdAvailable() {
-    return (
-      this.supplyLiquidityAvailable() * (safeGetPrice(this.supplyMint()) ?? 0)
-    );
+  get supplyLiquidityUsdAvailable() {
+    return this.supplyLiquidityAvailable * (safeGetPrice(this.supplyMint) ?? 0);
   }
 
-  debtLiquidityAvailable() {
-    return debtLiquidityAvailable(this.state());
+  get debtLiquidityAvailable() {
+    return debtLiquidityAvailable(this.state);
   }
 
-  debtLiquidityUsdAvailable() {
-    return debtLiquidityUsdAvailable(this.state());
+  get debtLiquidityUsdAvailable() {
+    return debtLiquidityUsdAvailable(this.state);
   }
 
+  abstract get supplyLiquidityAvailable(): number;
+
   abstract maxLtvAndLiqThresholdBps(): Promise<[number, number]>;
   abstract priceOracles(): Promise<PublicKey[]>;
-  abstract supplyLiquidityAvailable(): number;
 
-  sufficientLiquidityToBoost() {
+  private sufficientLiquidityToBoost() {
     const limitsUpToDate =
-      this.debtLiquidityUsdAvailable() !== 0 ||
-      this.supplyLiquidityUsdDepositable() !== 0;
+      this.debtLiquidityUsdAvailable !== 0 ||
+      this.supplyLiquidityUsdDepositable !== 0;
 
     if (limitsUpToDate) {
       const { debtAdjustmentUsd } = getDebtAdjustment(
-        this.state().liqThresholdBps,
+        this.state.liqThresholdBps,
         { supplyUsd: this.supplyUsd(), debtUsd: this.debtUsd() },
-        this.boostToBps(),
+        this.boostToBps,
         { solauto: 50, lpBorrow: 50, flashLoan: 50 } // TODO: get true data here instead of magic numbers
       );
 
       const sufficientLiquidity =
-        this.debtLiquidityUsdAvailable() * 0.95 > debtAdjustmentUsd &&
-        this.supplyLiquidityUsdDepositable() * 0.95 > debtAdjustmentUsd;
+        this.debtLiquidityUsdAvailable * 0.95 > debtAdjustmentUsd &&
+        this.supplyLiquidityUsdDepositable * 0.95 > debtAdjustmentUsd;
 
       if (!sufficientLiquidity) {
         consoleLog("Insufficient liquidity to further boost");
@@ -257,21 +279,23 @@ export abstract class SolautoPositionEx {
   }
 
   eligibleForRebalance(bpsDistanceThreshold = 0): RebalanceAction | undefined {
-    if (!this.settings() || !this.supplyUsd()) {
+    if (!this.settings || !this.supplyUsd()) {
       return undefined;
     }
 
-    if (
-      this.state().liqUtilizationRateBps - this.boostFromBps() <=
-      bpsDistanceThreshold
+    const realtimeLiqUtilRateBps = this.liqUtilizationRateBps(
+      PriceType.Realtime
+    );
+    const emaLiqUtilRateBps = this.liqUtilizationRateBps(PriceType.Ema);
+
+    if (this.repayFromBps - realtimeLiqUtilRateBps <= bpsDistanceThreshold) {
+      return "repay";
+    } else if (
+      realtimeLiqUtilRateBps - this.boostFromBps <= bpsDistanceThreshold ||
+      emaLiqUtilRateBps - this.boostFromBps <= bpsDistanceThreshold
     ) {
       const sufficientLiquidity = this.sufficientLiquidityToBoost();
       return sufficientLiquidity ? "boost" : undefined;
-    } else if (
-      this.repayFromBps() - this.state().liqUtilizationRateBps <=
-      bpsDistanceThreshold
-    ) {
-      return "repay";
     }
 
     return undefined;
@@ -281,14 +305,13 @@ export abstract class SolautoPositionEx {
     if (this._data.selfManaged) return false;
 
     return (
-      currentUnixSeconds() - Number(this.state().lastRefreshed) >
-      60 * 60 * 24 * 7
+      currentUnixSeconds() - Number(this.state.lastRefreshed) > 60 * 60 * 24 * 7
     );
   }
 
   protected canRefreshPositionState() {
     if (
-      Number(this.state().lastRefreshed) >
+      Number(this.state.lastRefreshed) >
         currentUnixSeconds() - MIN_POSITION_STATE_FRESHNESS_SECS &&
       !this.contextUpdates?.positionUpdates()
     ) {
@@ -297,18 +320,18 @@ export abstract class SolautoPositionEx {
     return true;
   }
 
-  abstract refreshPositionState(): Promise<void>;
+  abstract refreshPositionState(priceType?: PriceType): Promise<void>;
 
   async utilizationRateBpsDrift() {
-    const supplyPrice = safeGetPrice(this.state().supply.mint) ?? 0;
-    const debtPrice = safeGetPrice(this.state().debt.mint) ?? 0;
+    const supplyPrice = safeGetPrice(this.state.supply.mint) ?? 0;
+    const debtPrice = safeGetPrice(this.state.debt.mint) ?? 0;
     const oldState = await positionStateWithLatestPrices(
       this.firstState,
       supplyPrice,
       debtPrice
     );
     const newState = await positionStateWithLatestPrices(
-      this.state(),
+      this.state,
       supplyPrice,
       debtPrice
     );
@@ -320,8 +343,8 @@ export abstract class SolautoPositionEx {
     this._data.state.supply.amountUsed.baseAmountUsdValue =
       toRoundedUsdValue(newSupplyUsd);
     this._data.state.supply.amountUsed.baseUnit = toBaseUnit(
-      newSupplyUsd / (supplyPrice ?? safeGetPrice(this.supplyMint()) ?? 0),
-      this.supplyMintInfo().decimals
+      newSupplyUsd / (supplyPrice ?? safeGetPrice(this.supplyMint) ?? 0),
+      this.supplyMintInfo.decimals
     );
   }
 
@@ -329,8 +352,8 @@ export abstract class SolautoPositionEx {
     this._data.state.debt.amountUsed.baseAmountUsdValue =
       toRoundedUsdValue(newDebtUsd);
     this._data.state.debt.amountUsed.baseUnit = toBaseUnit(
-      newDebtUsd / (debtPrice ?? safeGetPrice(this.debtMint()) ?? 0),
-      this.debtMintInfo().decimals
+      newDebtUsd / (debtPrice ?? safeGetPrice(this.debtMint) ?? 0),
+      this.debtMintInfo.decimals
     );
   }
 
@@ -339,33 +362,37 @@ export abstract class SolautoPositionEx {
     this._data.state.netWorth.baseAmountUsdValue =
       toRoundedUsdValue(netWorthUsd);
     this._data.state.netWorth.baseUnit = toBaseUnit(
-      netWorthUsd / (supplyPrice ?? safeGetPrice(this.supplyMint()) ?? 0),
-      this.supplyMintInfo().decimals
+      netWorthUsd / (supplyPrice ?? safeGetPrice(this.supplyMint) ?? 0),
+      this.supplyMintInfo.decimals
     );
   }
 
-  updateLiqUtilizationRate() {
+  updateLiqUtilizationRate(priceType?: PriceType) {
     this._data.state.liqUtilizationRateBps = getLiqUtilzationRateBps(
-      this.supplyUsd(),
-      this.debtUsd(),
-      this.state().liqThresholdBps
+      this.supplyUsd(priceType),
+      this.debtUsd(priceType),
+      this.state.liqThresholdBps
     );
   }
 
-  async updateWithLatestPrices(supplyPrice?: number, debtPrice?: number) {
-    if (!supplyPrice || !debtPrice) {
-      [supplyPrice, debtPrice] = await fetchTokenPrices([
-        this.supplyMint(),
-        this.debtMint(),
-      ]);
+  async updateWithLatestPrices(data: {
+    priceType?: PriceType;
+    supplyPrice?: number;
+    debtPrice?: number;
+  }) {
+    if (!data.supplyPrice || !data.debtPrice) {
+      [data.supplyPrice, data.debtPrice] = await fetchTokenPrices(
+        [this.supplyMint, this.debtMint],
+        data.priceType
+      );
     }
 
-    const supplyUsd = this.totalSupply() * supplyPrice;
-    const debtUsd = this.totalDebt() * debtPrice;
+    const supplyUsd = this.totalSupply * data.supplyPrice;
+    const debtUsd = this.totalDebt * data.debtPrice;
 
-    this.updateSupply(supplyUsd, supplyPrice);
-    this.updateDebt(debtUsd, debtPrice);
-    this.updateNetWorth(supplyPrice);
+    this.updateSupply(supplyUsd, data.supplyPrice);
+    this.updateDebt(debtUsd, data.debtPrice);
+    this.updateNetWorth(data.supplyPrice);
     this.updateLiqUtilizationRate();
   }
 
@@ -378,12 +405,9 @@ export abstract class SolautoPositionEx {
     this._data.state.lastRefreshed = BigInt(unixTime);
     const rebalance = getRebalanceValues(
       this,
+      PriceType.Realtime,
       targetLiqUtilizationRateBps,
-      SolautoFeesBps.create(
-        true,
-        targetLiqUtilizationRateBps,
-        this.netWorthUsd()
-      )
+      SolautoFeesBps.create(true, targetLiqUtilizationRateBps, this.netWorthUsd)
     );
     this.updateSupply(rebalance.endResult.supplyUsd, supplyPrice);
     this.updateDebt(rebalance.endResult.debtUsd, debtPrice);

package/src/types/solauto.ts

@@ -2,6 +2,7 @@ import { PublicKey } from "@solana/web3.js";
 import {
   LendingPlatform,
   PositionType,
+  PriceType,
   SolautoRebalanceType,
   TokenType,
 } from "../generated";
@@ -60,6 +61,7 @@ export interface RebalanceDetails {
   flashLoan?: FlashLoanDetails;
   swapQuote: QuoteResponse;
   targetLiqUtilizationRateBps?: number;
+  priceType: PriceType;
 }
 
 export type ProgramEnv = "Prod" | "Staging";

package/src/utils/instructionUtils.ts

@@ -139,10 +139,10 @@ export function swapThenDeposit(
 ) {
   return [
     new TransactionItem(async () => {
-      const memeSwap = tokenInfo(client.pos.supplyMint()).isMeme;
+      const memeSwap = tokenInfo(client.pos.supplyMint).isMeme;
       const swapInput: SwapInput = {
         inputMint: depositMint,
-        outputMint: client.pos.supplyMint(),
+        outputMint: client.pos.supplyMint,
         amount: depositAmountBaseUnit,
         exactIn: true,
         slippageBps: memeSwap ? 300 : 50,

package/src/utils/marginfiUtils.ts

@@ -5,7 +5,7 @@ import {
   toWeb3JsPublicKey,
 } from "@metaplex-foundation/umi-web3js-adapters";
 import { ProgramEnv, MarginfiAssetAccounts } from "../types";
-import { PositionState, PositionTokenState } from "../generated";
+import { PositionState, PositionTokenState, PriceType } from "../generated";
 import {
   ALL_SUPPORTED_TOKENS,
   getMarginfiAccounts,
@@ -407,7 +407,8 @@ async function getTokenUsage(
   bank: Bank | null,
   isAsset: boolean,
   shares: number,
-  amountUsedAdjustment?: bigint
+  amountUsedAdjustment?: bigint,
+  priceType?: PriceType
 ): Promise<PositionTokenState> {
   let amountUsed = 0;
   let amountCanBeUsed = BigInt(0);
@@ -415,7 +416,7 @@ async function getTokenUsage(
   let originationFee = 0;
 
   if (bank !== null) {
-    [marketPrice] = await fetchTokenPrices([toWeb3JsPublicKey(bank.mint)]);
+    [marketPrice] = await fetchTokenPrices([toWeb3JsPublicKey(bank.mint)], priceType);
     const [assetShareValue, liabilityShareValue] = getUpToDateShareValues(bank);
     const shareValue = isAsset ? assetShareValue : liabilityShareValue;
     amountUsed = shares * shareValue + Number(amountUsedAdjustment ?? 0);
@@ -489,7 +490,8 @@ export async function getMarginfiAccountPositionState(
   supply?: BankSelection,
   debt?: BankSelection,
   programEnv?: ProgramEnv,
-  contextUpdates?: ContextUpdates
+  contextUpdates?: ContextUpdates,
+  priceType?: PriceType
 ): Promise<
   | { supplyBank: Bank | null; debtBank: Bank | null; state: PositionState }
   | undefined
@@ -550,7 +552,8 @@ export async function getMarginfiAccountPositionState(
         supplyBank!,
         true,
         bytesToI80F48(supplyBalances[0].assetShares.value),
-        contextUpdates?.supplyAdjustment
+        contextUpdates?.supplyAdjustment,
+        priceType
       );
     }
 
@@ -567,7 +570,8 @@ export async function getMarginfiAccountPositionState(
         debtBank!,
         false,
         bytesToI80F48(debtBalances[0].liabilityShares.value),
-        contextUpdates?.debtAdjustment
+        contextUpdates?.debtAdjustment,
+        priceType
       );
     }
   }
@@ -581,7 +585,7 @@ export async function getMarginfiAccountPositionState(
       supplyBank,
       true,
       0,
-      contextUpdates?.supplyAdjustment
+      contextUpdates?.supplyAdjustment,
     );
   }
 
@@ -609,7 +613,7 @@ export async function getMarginfiAccountPositionState(
       debtBank,
       false,
       0,
-      contextUpdates?.debtAdjustment
+      contextUpdates?.debtAdjustment,
     );
   }