@haven-fi/solauto-sdk 1.0.581 → 1.0.583

package/src/utils/jupiterUtils.ts

@@ -1,42 +1,8 @@
-import {
-  Signer,
-  TransactionBuilder,
-  transactionBuilder,
-} from "@metaplex-foundation/umi";
 import { PublicKey, TransactionInstruction } from "@solana/web3.js";
-import { getWrappedInstruction } from "./solanaUtils";
-import { fromBps, toBps } from "./numberUtils";
-import {
-  createJupiterApiClient,
-  Instruction,
-  QuoteResponse,
-} from "@jup-ag/api";
-import { getTokenAccount } from "./accountUtils";
-import {
-  consoleLog,
-  retryWithExponentialBackoff,
-  tokenInfo,
-} from "./generalUtils";
+import { retryWithExponentialBackoff } from "./generalUtils";
+import { Instruction } from "@jup-ag/api";
 
-const jupApi = createJupiterApiClient();
-
-export interface JupSwapInput {
-  inputMint: PublicKey;
-  outputMint: PublicKey;
-  amount: bigint;
-  exactIn?: boolean;
-  exactOut?: boolean;
-}
-
-export interface JupSwapDetails extends JupSwapInput {
-  destinationWallet: PublicKey;
-  slippageIncFactor?: number;
-  addPadding?: boolean;
-  jupQuote?: QuoteResponse;
-  wrapAndUnwrapSol?: boolean;
-}
-
-function createTransactionInstruction(
+export function jupIxToSolanaIx(
   instruction: Instruction
 ): TransactionInstruction {
   return new TransactionInstruction({
@@ -50,133 +16,6 @@ function createTransactionInstruction(
   });
 }
 
-export async function getJupQuote(swapDetails: JupSwapInput) {
-  return await retryWithExponentialBackoff(
-    async (attemptNum: number) =>
-      await jupApi.quoteGet({
-        amount: Number(swapDetails.amount),
-        inputMint: swapDetails.inputMint.toString(),
-        outputMint: swapDetails.outputMint.toString(),
-        swapMode: swapDetails.exactOut
-          ? "ExactOut"
-          : swapDetails.exactIn
-            ? "ExactIn"
-            : undefined,
-        slippageBps: 300,
-        maxAccounts: !swapDetails.exactOut ? 15 + attemptNum * 5 : undefined,
-      }),
-    3,
-    200
-  );
-}
-
-export interface JupSwapTransaction {
-  jupQuote: QuoteResponse;
-  priceImpactBps: number;
-  lookupTableAddresses: string[];
-  setupInstructions: TransactionBuilder;
-  tokenLedgerIx?: TransactionBuilder;
-  swapIx: TransactionBuilder;
-  cleanupIx: TransactionBuilder;
-}
-
-export async function getJupSwapTransaction(
-  signer: Signer,
-  swapDetails: JupSwapDetails,
-  attemptNum?: number
-): Promise<JupSwapTransaction> {
-  const quoteResponse =
-    swapDetails.jupQuote ?? (await getJupQuote(swapDetails));
-
-  const priceImpactBps =
-    Math.round(toBps(parseFloat(quoteResponse.priceImpactPct))) + 1;
-  const finalPriceSlippageBps = Math.round(
-    Math.max(50, quoteResponse.slippageBps, priceImpactBps) *
-      (1 + (swapDetails.slippageIncFactor ?? 0))
-  );
-  quoteResponse.slippageBps = finalPriceSlippageBps;
-  consoleLog("Quote:", quoteResponse);
-
-  consoleLog("Getting jup instructions...");
-  const instructions = await retryWithExponentialBackoff(
-    async () => {
-      const res = await jupApi.swapInstructionsPost({
-        swapRequest: {
-          userPublicKey: signer.publicKey.toString(),
-          quoteResponse,
-          wrapAndUnwrapSol: swapDetails.wrapAndUnwrapSol ?? false,
-          useTokenLedger: !swapDetails.exactOut && !swapDetails.exactIn,
-          destinationTokenAccount: getTokenAccount(
-            swapDetails.destinationWallet,
-            swapDetails.outputMint
-          ).toString(),
-        },
-      });
-      if (!res) {
-        throw new Error("No instructions retrieved");
-      }
-      return res;
-    },
-    4,
-    200
-  );
-
-  if (!instructions.swapInstruction) {
-    throw new Error("No swap instruction was returned by Jupiter");
-  }
-
-  consoleLog("Raw price impact bps:", priceImpactBps);
-  const finalPriceImpactBps =
-    priceImpactBps * (1 + (swapDetails.slippageIncFactor ?? 0));
-  consoleLog("Increased price impact bps:", finalPriceImpactBps);
-
-  if (swapDetails.addPadding) {
-    consoleLog("Raw inAmount:", quoteResponse.inAmount);
-    const inc = Math.max(
-      fromBps(finalPriceImpactBps) * 1.1,
-      fromBps(finalPriceSlippageBps) * 0.05
-    );
-    consoleLog("Inc:", inc);
-    quoteResponse.inAmount = Math.round(
-      parseInt(quoteResponse.inAmount) + parseInt(quoteResponse.inAmount) * inc
-    ).toString();
-    consoleLog("Increased inAmount:", quoteResponse.inAmount);
-  }
-
-  return {
-    jupQuote: quoteResponse,
-    priceImpactBps: finalPriceImpactBps,
-    lookupTableAddresses: instructions.addressLookupTableAddresses,
-    setupInstructions: transactionBuilder().add(
-      (instructions.setupInstructions ?? []).map((ix) =>
-        getWrappedInstruction(signer, createTransactionInstruction(ix))
-      )
-    ),
-    tokenLedgerIx: instructions.tokenLedgerInstruction
-      ? transactionBuilder().add(
-          getWrappedInstruction(
-            signer,
-            createTransactionInstruction(instructions.tokenLedgerInstruction)
-          )
-        )
-      : undefined,
-    swapIx: transactionBuilder().add(
-      getWrappedInstruction(
-        signer,
-        createTransactionInstruction(instructions.swapInstruction)
-      )
-    ),
-    cleanupIx: instructions.cleanupInstruction
-      ? transactionBuilder().add(
-          getWrappedInstruction(
-            signer,
-            createTransactionInstruction(instructions.cleanupInstruction)
-          )
-        )
-      : transactionBuilder(),
-  };
-}
-
 export async function getJupPriceData(mints: PublicKey[]) {
   const data = await retryWithExponentialBackoff(async () => {
     const res = await (

package/src/utils/marginfiUtils.ts

@@ -1,8 +1,9 @@
-import { Connection, PublicKey } from "@solana/web3.js";
+import { PublicKey } from "@solana/web3.js";
 import { publicKey, Umi } from "@metaplex-foundation/umi";
 import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
 import {
   Bank,
+  deserializeMarginfiAccount,
   getMarginfiAccountSize,
   MARGINFI_PROGRAM_ID,
   MarginfiAccount,
@@ -24,9 +25,9 @@ import {
   MARGINFI_ACCOUNTS,
 } from "../constants/marginfiAccounts";
 import { MarginfiAssetAccounts } from "../types/accounts";
-import { PositionState, PositionTokenUsage } from "../generated";
+import { PositionState, PositionTokenState } from "../generated";
 import { USD_DECIMALS } from "../constants/generalAccounts";
-import { ContextUpdates } from "./solauto/generalUtils";
+import { ContextUpdates } from "./solautoUtils";
 import { ALL_SUPPORTED_TOKENS, TOKEN_INFO } from "../constants";
 import { fetchTokenPrices, safeGetPrice } from "./priceUtils";
 
@@ -143,6 +144,40 @@ export async function getMarginfiMaxLtvAndLiqThreshold(
   );
 }
 
+export async function getEmptyMarginfiAccountsByAuthority(
+  umi: Umi,
+  authority: PublicKey
+): Promise<MarginfiAccount[]> {
+  const marginfiAccounts = await umi.rpc.getProgramAccounts(
+    MARGINFI_PROGRAM_ID,
+    {
+      commitment: "confirmed",
+      filters: [
+        {
+          dataSize: getMarginfiAccountSize(),
+        },
+        {
+          memcmp: {
+            bytes: new Uint8Array(authority.toBuffer()),
+            offset: 8 + 32, // Anchor account discriminator + group pubkey
+          },
+        },
+        {
+          // First balance is not active
+          memcmp: {
+            bytes: new Uint8Array([0]),
+            offset: 8 + 32 + 32,
+          },
+        },
+      ],
+    }
+  );
+
+  return marginfiAccounts
+    .map((x) => deserializeMarginfiAccount(x))
+    .filter((x) => marginfiAccountEmpty(x));
+}
+
 export async function getAllMarginfiAccountsByAuthority(
   umi: Umi,
   authority: PublicKey,
@@ -239,10 +274,11 @@ async function getTokenUsage(
   isAsset: boolean,
   shares: number,
   amountUsedAdjustment?: bigint
-): Promise<PositionTokenUsage> {
+): Promise<PositionTokenState> {
   let amountUsed = 0;
   let amountCanBeUsed = BigInt(0);
   let marketPrice = 0;
+  let originationFee = 0;
 
   if (bank !== null) {
     [marketPrice] = await fetchTokenPrices([toWeb3JsPublicKey(bank.mint)]);
@@ -250,6 +286,9 @@ async function getTokenUsage(
     const shareValue = isAsset ? assetShareValue : liabilityShareValue;
     amountUsed = shares * shareValue + Number(amountUsedAdjustment ?? 0);
     amountCanBeUsed = getBankLiquidityAvailableBaseUnit(bank, isAsset);
+    originationFee = bytesToI80F48(
+      bank?.config.interestRateConfig.protocolOriginationFee.value
+    );
   }
 
   return {
@@ -275,8 +314,7 @@ async function getTokenUsage(
         : BigInt(0),
     },
     baseAmountMarketPriceUsd: toBaseUnit(marketPrice, USD_DECIMALS),
-    flashLoanFeeBps: 0,
-    borrowFeeBps: 0,
+    borrowFeeBps: isAsset ? 0 : toBps(originationFee),
     padding1: [],
     padding2: [],
     padding: new Uint8Array([]),
@@ -290,9 +328,29 @@ interface BankSelection {
 
 type BanksCache = { [group: string]: { [mint: string]: Bank } };
 
+async function getBank(
+  umi: Umi,
+  data: BankSelection,
+  marginfiGroup?: PublicKey
+) {
+  return data?.banksCache && data.mint && marginfiGroup
+    ? data.banksCache[marginfiGroup!.toString()][data?.mint?.toString()]
+    : data?.mint && data?.mint !== PublicKey.default
+      ? await safeFetchBank(
+          umi,
+          publicKey(
+            MARGINFI_ACCOUNTS[marginfiGroup?.toString() ?? ""][
+              data?.mint.toString()
+            ].bank
+          ),
+          { commitment: "confirmed" }
+        )
+      : null;
+}
+
 export async function getMarginfiAccountPositionState(
   umi: Umi,
-  protocolAccount: { pk: PublicKey; data?: MarginfiAccount },
+  protocolAccount: { pk?: PublicKey; data?: MarginfiAccount | null },
   marginfiGroup?: PublicKey,
   supply?: BankSelection,
   debt?: BankSelection,
@@ -303,9 +361,11 @@ export async function getMarginfiAccountPositionState(
 > {
   let marginfiAccount =
     protocolAccount.data ??
-    (await safeFetchMarginfiAccount(umi, publicKey(protocolAccount.pk), {
-      commitment: "confirmed",
-    }));
+    (protocolAccount.pk
+      ? await safeFetchMarginfiAccount(umi, publicKey(protocolAccount.pk), {
+          commitment: "confirmed",
+        })
+      : null);
 
   if (!supply) {
     supply = {};
@@ -318,37 +378,11 @@ export async function getMarginfiAccountPositionState(
     marginfiGroup = toWeb3JsPublicKey(marginfiAccount.group);
   }
 
-  let supplyBank: Bank | null =
-    supply?.banksCache && supply.mint && marginfiGroup
-      ? supply.banksCache[marginfiGroup!.toString()][supply?.mint?.toString()]
-      : supply?.mint && supply?.mint !== PublicKey.default
-        ? await safeFetchBank(
-            umi,
-            publicKey(
-              MARGINFI_ACCOUNTS[marginfiGroup?.toString() ?? ""][
-                supply?.mint.toString()
-              ].bank
-            ),
-            { commitment: "confirmed" }
-          )
-        : null;
-  let debtBank: Bank | null =
-    debt?.banksCache && debt.mint && marginfiGroup
-      ? debt.banksCache[marginfiGroup!.toString()][debt?.mint?.toString()]
-      : debt?.mint && debt?.mint !== PublicKey.default
-        ? await safeFetchBank(
-            umi,
-            publicKey(
-              MARGINFI_ACCOUNTS[marginfiGroup?.toString() ?? ""][
-                debt?.mint.toString()
-              ].bank
-            ),
-            { commitment: "confirmed" }
-          )
-        : null;
+  let supplyBank: Bank | null = await getBank(umi, supply, marginfiGroup);
+  let debtBank: Bank | null = await getBank(umi, debt, marginfiGroup);
 
-  let supplyUsage: PositionTokenUsage | undefined = undefined;
-  let debtUsage: PositionTokenUsage | undefined = undefined;
+  let supplyUsage: PositionTokenState | undefined = undefined;
+  let debtUsage: PositionTokenState | undefined = undefined;
 
   if (
     marginfiAccount !== null &&
@@ -487,7 +521,7 @@ export async function getMarginfiAccountPositionState(
       debt: debtUsage!,
       maxLtvBps: toBps(maxLtv),
       liqThresholdBps: toBps(liqThreshold),
-      lastUpdated: BigInt(currentUnixSeconds()),
+      lastRefreshed: BigInt(currentUnixSeconds()),
       padding1: [],
       padding2: [],
       padding: [],
@@ -591,8 +625,8 @@ export function marginfiAccountEmpty(marginfiAccount: MarginfiAccount) {
     marginfiAccount.lendingAccount.balances.find(
       (x) =>
         x.bankPk.toString() !== PublicKey.default.toString() &&
-        (Math.round(bytesToI80F48(x.assetShares.value)) != 0 ||
-          Math.round(bytesToI80F48(x.liabilityShares.value)) != 0)
+        (bytesToI80F48(x.assetShares.value) > 0.000001 ||
+          bytesToI80F48(x.liabilityShares.value) > 0.000001)
     ) === undefined
   );
 }

package/src/utils/numberUtils.ts

@@ -1,24 +1,19 @@
 import { BASIS_POINTS, MIN_REPAY_GAP_BPS, USD_DECIMALS } from "../constants";
-import { PositionState, RebalanceDirection } from "../generated";
+import { PositionState } from "../generated";
 
 export function calcNetWorthUsd(state?: PositionState) {
-  return fromBaseUnit(
-    state?.netWorth.baseAmountUsdValue ?? BigInt(0),
-    USD_DECIMALS
-  );
+  return fromRoundedUsdValue(state?.netWorth.baseAmountUsdValue ?? BigInt(0));
 }
 
 export function calcSupplyUsd(state?: PositionState) {
-  return fromBaseUnit(
-    state?.supply.amountUsed.baseAmountUsdValue ?? BigInt(0),
-    USD_DECIMALS
+  return fromRoundedUsdValue(
+    state?.supply.amountUsed.baseAmountUsdValue ?? BigInt(0)
   );
 }
 
 export function calcDebtUsd(state?: PositionState) {
-  return fromBaseUnit(
-    state?.debt.amountUsed.baseAmountUsdValue ?? BigInt(0),
-    USD_DECIMALS
+  return fromRoundedUsdValue(
+    state?.debt.amountUsed.baseAmountUsdValue ?? BigInt(0)
   );
 }
 
@@ -44,19 +39,25 @@ export function calcTotalDebt(state?: PositionState) {
 }
 
 export function debtLiquidityUsdAvailable(state?: PositionState) {
-  return fromBaseUnit(
-    state?.debt.amountCanBeUsed.baseAmountUsdValue ?? BigInt(0),
-    USD_DECIMALS
+  return fromRoundedUsdValue(
+    state?.debt.amountCanBeUsed.baseAmountUsdValue ?? BigInt(0)
   );
 }
 
 export function supplyLiquidityUsdDepositable(state?: PositionState) {
-  return fromBaseUnit(
-    state?.supply.amountCanBeUsed.baseAmountUsdValue ?? BigInt(0),
-    USD_DECIMALS
+  return fromRoundedUsdValue(
+    state?.supply.amountCanBeUsed.baseAmountUsdValue ?? BigInt(0)
   );
 }
 
+export function fromRoundedUsdValue(number: bigint) {
+  return fromBaseUnit(number, USD_DECIMALS);
+}
+
+export function toRoundedUsdValue(number: number) {
+  return toBaseUnit(number, USD_DECIMALS);
+}
+
 export function getLiqUtilzationRateBps(
   supplyUsd: number,
   debtUsd: number,
@@ -149,66 +150,6 @@ export function getDebtAdjustmentUsd(
   return debtAdjustmentUsd;
 }
 
-export function getSolautoFeesBps(
-  isReferred: boolean,
-  targetLiqUtilizationRateBps: number | undefined,
-  positionNetWorthUsd: number,
-  rebalanceDirection: RebalanceDirection
-): {
-  solauto: number;
-  referrer: number;
-  total: number;
-} {
-  const minSize = 10_000; // Minimum position size
-  const maxSize = 250_000; // Maximum position size
-  const maxFeeBps = 50; // Fee in basis points for minSize (0.5%)
-  const minFeeBps = 25; // Fee in basis points for maxSize (0.25%)
-  const k = 1.5;
-
-  if (
-    targetLiqUtilizationRateBps !== undefined &&
-    targetLiqUtilizationRateBps === 0
-  ) {
-    return {
-      solauto: 0,
-      referrer: 0,
-      total: 0,
-    };
-  }
-
-  let feeBps: number = 0;
-
-  if (
-    targetLiqUtilizationRateBps !== undefined ||
-    rebalanceDirection === RebalanceDirection.Repay
-  ) {
-    feeBps = 25;
-  } else if (positionNetWorthUsd <= minSize) {
-    feeBps = maxFeeBps;
-  } else if (positionNetWorthUsd >= maxSize) {
-    feeBps = minFeeBps;
-  } else {
-    const t =
-      (Math.log(positionNetWorthUsd) - Math.log(minSize)) /
-      (Math.log(maxSize) - Math.log(minSize));
-    feeBps = Math.round(
-      minFeeBps + (maxFeeBps - minFeeBps) * (1 - Math.pow(t, k))
-    );
-  }
-
-  let referrer = 0;
-  if (isReferred) {
-    feeBps *= 0.9;
-    referrer = Math.floor(feeBps * 0.15);
-  }
-
-  return {
-    solauto: feeBps - referrer,
-    referrer,
-    total: feeBps,
-  };
-}
-
 export function getMaxLiqUtilizationRateBps(
   maxLtvBps: number,
   liqThresholdBps: number,

package/src/utils/solanaUtils.ts

@@ -44,8 +44,8 @@ import {
   getLendingAccountStartFlashloanInstructionDataSerializer,
 } from "../marginfi-sdk";
 import { PriorityFeeSetting, TransactionRunType } from "../types";
-import { createDynamicSolautoProgram } from "./solauto";
 import { SOLAUTO_PROD_PROGRAM } from "../constants";
+import { createDynamicSolautoProgram } from "./solautoUtils";
 
 export function buildHeliusApiUrl(heliusApiKey: string) {
   return `https://mainnet.helius-rpc.com/?api-key=${heliusApiKey}`;