@haven-fi/solauto-sdk 1.0.302 → 1.0.304

package/src/utils/generalUtils.ts

@@ -1,27 +1,5 @@
-import {
-  Connection,
-  Keypair,
-  PublicKey,
-  Transaction,
-  VersionedTransaction,
-} from "@solana/web3.js";
-import {
-  MaybeRpcAccount,
-  publicKey,
-  Umi,
-  PublicKey as UmiPublicKey,
-} from "@metaplex-foundation/umi";
-import { PYTH_PRICE_FEED_IDS } from "../constants/pythConstants";
-import { fromBaseUnit, toBaseUnit } from "./numberUtils";
-import { PRICES } from "../constants/solautoConstants";
-import {
-  getProgramId,
-  PullFeed,
-  SwitchboardPermission,
-} from "@switchboard-xyz/on-demand";
-import { AnchorProvider, Idl, Program, Wallet } from "@coral-xyz/anchor";
-import switchboardIdl from "../idls/switchboard.json";
-import { SWITCHBOARD_PRICE_FEED_IDS } from "../constants/switchboardConstants";
+import { PublicKey } from "@solana/web3.js";
+import { MaybeRpcAccount, publicKey, Umi } from "@metaplex-foundation/umi";
 
 export function consoleLog(...args: any[]): void {
   if ((globalThis as any).LOCAL_TEST) {
@@ -82,129 +60,6 @@ export function zip<T, U>(list1: T[], list2: U[]): [T, U][] {
   return result;
 }
 
-export async function fetchTokenPrices(
-  conn: Connection,
-  mints: PublicKey[]
-): Promise<number[]> {
-  const currentTime = currentUnixSeconds();
-  if (
-    !mints.some(
-      (mint) =>
-        !(mint.toString() in PRICES) ||
-        currentTime - PRICES[mint.toString()].time > 3
-    )
-  ) {
-    return mints.map((mint) => PRICES[mint.toString()].price);
-  }
-
-  const pythMints = mints.filter((x) => x.toString() in PYTH_PRICE_FEED_IDS);
-  const switchboardMints = mints.filter(
-    (x) => x.toString() in SWITCHBOARD_PRICE_FEED_IDS
-  );
-
-  const [pythData, switchboardData] = await Promise.all([
-    zip(pythMints, await getPythPrices(pythMints)),
-    zip(switchboardMints, await getSwitchboardPrices(conn, switchboardMints)),
-  ]);
-
-  const prices = mints.map((mint) => {
-    const item = [...pythData, ...switchboardData].find((data) =>
-      data[0].equals(mint)
-    );
-    return item ? item[1] : 0;
-  });
-
-  for (var i = 0; i < mints.length; i++) {
-    PRICES[mints[i].toString()] = {
-      price: prices[i],
-      time: currentUnixSeconds(),
-    };
-  }
-
-  return prices;
-}
-
-export async function getPythPrices(mints: PublicKey[]) {
-  const priceFeedIds = mints.map(
-    (mint) => PYTH_PRICE_FEED_IDS[mint.toString()]
-  );
-
-  const getReq = async () =>
-    await fetch(
-      `https://hermes.pyth.network/v2/updates/price/latest?${priceFeedIds.map((x) => `ids%5B%5D=${x}`).join("&")}`
-    );
-
-  const prices: number[] = await retryWithExponentialBackoff(
-    async () => {
-      let resp = await getReq();
-      let status = resp.status;
-      if (status !== 200) {
-        throw new Error(JSON.stringify(resp));
-      }
-
-      const json = await resp.json();
-      const prices = json.parsed.map((x: any) => {
-        if (x.price.expo > 0) {
-          return Number(toBaseUnit(Number(x.price.price), x.price.expo));
-        } else if (x.price.expo < 0) {
-          return fromBaseUnit(BigInt(x.price.price), Math.abs(x.price.expo));
-        } else {
-          return Number(x.price.price);
-        }
-      });
-
-      return prices;
-    },
-    5,
-    200
-  );
-
-  return prices;
-}
-
-export async function getSwitchboardPrices(
-  conn: Connection,
-  mints: PublicKey[]
-) {
-  const dummyWallet = {
-    publicKey: new PublicKey("11111111111111111111111111111111"),
-    signTransaction: async <T extends Transaction | VersionedTransaction>(
-      tx: T
-    ): Promise<T> => tx,
-    signAllTransactions: async <T extends Transaction | VersionedTransaction>(
-      txs: T[]
-    ): Promise<T[]> => txs,
-  };
-  const provider = new AnchorProvider(
-    conn,
-    dummyWallet,
-    AnchorProvider.defaultOptions()
-  );
-  const program = new Program(switchboardIdl as Idl, provider);
-
-  const results = await Promise.all(
-    mints.map(async (mint) => {
-      const feed = new PullFeed(
-        program,
-        new PublicKey(SWITCHBOARD_PRICE_FEED_IDS[mint.toString()])
-      );
-      const result = await feed.loadData();
-      return Number(result.result.value) / Math.pow(10, 18);
-    })
-  );
-
-  return results;
-}
-
-export function safeGetPrice(
-  mint: PublicKey | UmiPublicKey | undefined
-): number | undefined {
-  if (mint && mint?.toString() in PRICES) {
-    return PRICES[mint!.toString()].price;
-  }
-  return undefined;
-}
-
 export type ErrorsToThrow = Array<new (...args: any[]) => Error>;
 
 export function retryWithExponentialBackoff<T>(

package/src/utils/index.ts

@@ -4,4 +4,6 @@ export * from './generalUtils';
 export * from './jupiterUtils';
 export * from './marginfiUtils';
 export * from './numberUtils';
-export * from './solanaUtils';
+export * from './solanaUtils';
+export * from './priceUtils';
+export * from './switchboardUtils';

package/src/utils/jupiterUtils.ts

@@ -13,6 +13,7 @@ import {
 } from "@jup-ag/api";
 import { getTokenAccount } from "./accountUtils";
 import { consoleLog, retryWithExponentialBackoff } from "./generalUtils";
+import { TOKEN_INFO } from "../constants";
 
 const jupApi = createJupiterApiClient();
 
@@ -54,7 +55,10 @@ export async function getJupSwapTransaction(
   swapDetails: JupSwapDetails,
   attemptNum?: number
 ): Promise<JupSwapTransaction> {
-  consoleLog("Getting jup quote...");
+  const memecoinSwap =
+    TOKEN_INFO[swapDetails.inputMint.toString()].isMeme ||
+    TOKEN_INFO[swapDetails.outputMint.toString()].isMeme;
+
   const quoteResponse = await retryWithExponentialBackoff(
     async () =>
       await jupApi.quoteGet({
@@ -66,7 +70,7 @@ export async function getJupSwapTransaction(
           : swapDetails.exactIn
             ? "ExactIn"
             : undefined,
-        slippageBps: 50,
+        slippageBps: memecoinSwap ? 150 : 50,
         maxAccounts: !swapDetails.exactOut ? 60 : undefined,
       }),
     4,
@@ -90,6 +94,12 @@ export async function getJupSwapTransaction(
       )
     ).toString();
   }
+  // else {
+  //   quoteResponse.inAmount = (
+  //     parseInt(quoteResponse.inAmount) +
+  //     Math.ceil(parseInt(quoteResponse.inAmount) * fromBps(priceImpactBps))
+  //   ).toString();
+  // }
 
   consoleLog("Getting jup instructions...");
   const instructions = await retryWithExponentialBackoff(
@@ -143,4 +153,4 @@ export async function getJupSwapTransaction(
       )
     ),
   };
-}
+}

package/src/utils/marginfiUtils.ts

@@ -9,11 +9,7 @@ import {
   safeFetchBank,
   safeFetchMarginfiAccount,
 } from "../marginfi-sdk";
-import {
-  currentUnixSeconds,
-  fetchTokenPrices,
-  safeGetPrice,
-} from "./generalUtils";
+import { currentUnixSeconds } from "./generalUtils";
 import {
   bytesToI80F48,
   fromBaseUnit,
@@ -30,6 +26,7 @@ import { PositionState, PositionTokenUsage } from "../generated";
 import { USD_DECIMALS } from "../constants/generalAccounts";
 import { LivePositionUpdates } from "./solauto/generalUtils";
 import { TOKEN_INFO } from "../constants";
+import { fetchTokenPrices, safeGetPrice } from "./priceUtils";
 
 interface AllMarginfiAssetAccounts extends MarginfiAssetAccounts {
   mint: PublicKey;
@@ -87,7 +84,6 @@ export function calcMaxLtvAndLiqThreshold(
 }
 
 export async function getMaxLtvAndLiqThreshold(
-  conn: Connection,
   umi: Umi,
   marginfiGroup: PublicKey,
   supply: {
@@ -128,7 +124,7 @@ export async function getMaxLtvAndLiqThreshold(
   }
 
   if (!supplyPrice) {
-    const [price] = await fetchTokenPrices(conn, [
+    const [price] = await fetchTokenPrices([
       toWeb3JsPublicKey(supply.bank!.mint),
     ]);
     supplyPrice = price;
@@ -175,7 +171,7 @@ export async function getAllMarginfiAccountsByAuthority(
     const positionStates = await Promise.all(
       marginfiAccounts.map(async (x) => ({
         publicKey: x.publicKey,
-        state: await getMarginfiAccountPositionState(conn, umi, {
+        state: await getMarginfiAccountPositionState(umi, {
           pk: toWeb3JsPublicKey(x.publicKey),
         }),
       }))
@@ -206,7 +202,6 @@ export async function getAllMarginfiAccountsByAuthority(
 }
 
 async function getTokenUsage(
-  conn: Connection,
   bank: Bank | null,
   isAsset: boolean,
   shares: number,
@@ -217,7 +212,7 @@ async function getTokenUsage(
   let marketPrice = 0;
 
   if (bank !== null) {
-    [marketPrice] = await fetchTokenPrices(conn, [
+    [marketPrice] = await fetchTokenPrices([
       toWeb3JsPublicKey(bank.mint),
     ]);
     const [assetShareValue, liabilityShareValue] =
@@ -275,7 +270,6 @@ interface BankSelection {
 type BanksCache = { [group: string]: { [mint: string]: Bank } };
 
 export async function getMarginfiAccountPositionState(
-  conn: Connection,
   umi: Umi,
   protocolAccount: { pk: PublicKey; data?: MarginfiAccount },
   marginfiGroup?: PublicKey,
@@ -360,7 +354,6 @@ export async function getMarginfiAccountPositionState(
         supply.mint = toWeb3JsPublicKey(supplyBank!.mint);
       }
       supplyUsage = await getTokenUsage(
-        conn,
         supplyBank!,
         true,
         bytesToI80F48(supplyBalances[0].assetShares.value),
@@ -378,7 +371,6 @@ export async function getMarginfiAccountPositionState(
         debt.mint = toWeb3JsPublicKey(debtBank!.mint);
       }
       debtUsage = await getTokenUsage(
-        conn,
         debtBank!,
         false,
         bytesToI80F48(debtBalances[0].liabilityShares.value),
@@ -391,18 +383,8 @@ export async function getMarginfiAccountPositionState(
     return undefined;
   }
 
-  if (
-    !toWeb3JsPublicKey(supplyBank.group).equals(
-      new PublicKey(DEFAULT_MARGINFI_GROUP)
-    )
-  ) {
-    // Temporarily disabled for now
-    return undefined;
-  }
-
   if (!supplyUsage) {
     supplyUsage = await getTokenUsage(
-      conn,
       supplyBank,
       true,
       0,
@@ -419,7 +401,6 @@ export async function getMarginfiAccountPositionState(
 
   if (!debtUsage) {
     debtUsage = await getTokenUsage(
-      conn,
       debtBank,
       false,
       0,
@@ -429,7 +410,6 @@ export async function getMarginfiAccountPositionState(
 
   const supplyPrice = safeGetPrice(supply.mint!)!;
   let [maxLtv, liqThreshold] = await getMaxLtvAndLiqThreshold(
-    conn,
     umi,
     marginfiGroup ?? new PublicKey(DEFAULT_MARGINFI_GROUP),
     {

package/src/utils/priceUtils.ts

@@ -0,0 +1,154 @@
+import { Connection, PublicKey } from "@solana/web3.js";
+import { PublicKey as UmiPublicKey } from "@metaplex-foundation/umi";
+import { PYTH_PRICE_FEED_IDS } from "../constants/pythConstants";
+import { fromBaseUnit, toBaseUnit } from "./numberUtils";
+import { PRICES } from "../constants/solautoConstants";
+import { SWITCHBOARD_PRICE_FEED_IDS } from "../constants/switchboardConstants";
+import {
+  currentUnixSeconds,
+  retryWithExponentialBackoff,
+  zip,
+} from "./generalUtils";
+import { getPullFeed } from "./switchboardUtils";
+
+export async function fetchTokenPrices(
+  mints: PublicKey[]
+): Promise<number[]> {
+  const currentTime = currentUnixSeconds();
+  if (
+    !mints.some(
+      (mint) =>
+        !(mint.toString() in PRICES) ||
+        currentTime - PRICES[mint.toString()].time > 3
+    )
+  ) {
+    return mints.map((mint) => PRICES[mint.toString()].price);
+  }
+
+  const pythMints = mints.filter((x) => x.toString() in PYTH_PRICE_FEED_IDS);
+  const switchboardMints = mints.filter(
+    (x) => x.toString() in SWITCHBOARD_PRICE_FEED_IDS
+  );
+
+  const [pythData, switchboardData] = await Promise.all([
+    zip(pythMints, await getPythPrices(pythMints)),
+    zip(switchboardMints, await getJupTokenPrices(switchboardMints)),
+  ]);
+
+  const prices = mints.map((mint) => {
+    const item = [...pythData, ...switchboardData].find((data) =>
+      data[0].equals(mint)
+    );
+    return item ? item[1] : 0;
+  });
+
+  for (var i = 0; i < mints.length; i++) {
+    PRICES[mints[i].toString()] = {
+      price: prices[i],
+      time: currentUnixSeconds(),
+    };
+  }
+
+  return prices;
+}
+
+export async function getPythPrices(mints: PublicKey[]) {
+  if (mints.length === 0) {
+    return [];
+  }
+
+  const priceFeedIds = mints.map(
+    (mint) => PYTH_PRICE_FEED_IDS[mint.toString()]
+  );
+
+  const getReq = async () =>
+    await fetch(
+      `https://hermes.pyth.network/v2/updates/price/latest?${priceFeedIds.map((x) => `ids%5B%5D=${x}`).join("&")}`
+    );
+
+  const prices: number[] = await retryWithExponentialBackoff(
+    async () => {
+      let resp = await getReq();
+      let status = resp.status;
+      if (status !== 200) {
+        throw new Error(JSON.stringify(resp));
+      }
+
+      const json = await resp.json();
+      const prices = json.parsed.map((x: any) => {
+        if (x.price.expo > 0) {
+          return Number(toBaseUnit(Number(x.price.price), x.price.expo));
+        } else if (x.price.expo < 0) {
+          return fromBaseUnit(BigInt(x.price.price), Math.abs(x.price.expo));
+        } else {
+          return Number(x.price.price);
+        }
+      });
+
+      return prices;
+    },
+    5,
+    200
+  );
+
+  return prices;
+}
+
+export async function getSwitchboardPrices(
+  conn: Connection,
+  mints: PublicKey[]
+): Promise<{ mint: PublicKey; price: number; stale: boolean }[]> {
+  if (mints.length === 0) {
+    return [];
+  }
+
+  const currSlot = await retryWithExponentialBackoff(
+    async () => await conn.getSlot("confirmed"),
+    5
+  );
+
+  const results = await Promise.all(
+    mints.map(async (mint) => {
+      const feed = getPullFeed(conn, mint);
+      const result = await feed.loadData();
+      const price = Number(result.result.value) / Math.pow(10, 18);
+      const stale =
+        currSlot > result.result.slot.toNumber() + result.maxStaleness;
+
+      return { mint, price, stale };
+    })
+  );
+
+  return results;
+}
+
+export function safeGetPrice(
+  mint: PublicKey | UmiPublicKey | undefined
+): number | undefined {
+  if (mint && mint?.toString() in PRICES) {
+    return PRICES[mint!.toString()].price;
+  }
+  return undefined;
+}
+
+export async function getJupTokenPrices(mints: PublicKey[]) {
+  if (mints.length == 0) {
+    return [];
+  }
+
+  const data = await retryWithExponentialBackoff(async () => {
+    const res = (
+      await fetch(
+        "https://api.jup.ag/price/v2?ids=" +
+          mints.map((x) => x.toString()).join(",")
+      )
+    ).json();
+    return res;
+  }, 6);
+
+  const prices = Object.values(data.data as { [key: string]: any }).map(
+    (x) => parseFloat(x.price as string) as number
+  );
+
+  return prices;
+}

package/src/utils/solanaUtils.ts

@@ -16,7 +16,6 @@ import {
 import { createUmi } from "@metaplex-foundation/umi-bundle-defaults";
 import {
   AddressLookupTableAccount,
-  Blockhash,
   BlockhashWithExpiryBlockHeight,
   ComputeBudgetProgram,
   Connection,
@@ -318,7 +317,7 @@ async function spamSendTransactionUntilConfirmed(
   connection: Connection,
   transaction: Transaction | VersionedTransaction,
   blockhash: BlockhashWithExpiryBlockHeight,
-  spamInterval: number = 1000
+  spamInterval: number = 3000
 ): Promise<string> {
   let transactionSignature: string | null = null;
 

package/src/utils/solauto/generalUtils.ts

@@ -22,7 +22,7 @@ import {
   getSolautoPositionAccountDataSerializer,
   getSolautoPositionSize,
 } from "../../generated";
-import { currentUnixSeconds, fetchTokenPrices } from "../generalUtils";
+import { currentUnixSeconds } from "../generalUtils";
 import {
   fromBaseUnit,
   getLiqUtilzationRateBps,
@@ -40,6 +40,7 @@ import {
   getAllMarginfiAccountsByAuthority,
 } from "../marginfiUtils";
 import { RebalanceAction, SolautoPositionDetails } from "../../types/solauto";
+import { fetchTokenPrices } from "../priceUtils";
 
 export function createDynamicSolautoProgram(programId: PublicKey): Program {
   return {
@@ -403,7 +404,7 @@ export async function positionStateWithLatestPrices(
   debtPrice?: number
 ): Promise<PositionState> {
   if (!supplyPrice || !debtPrice) {
-    [supplyPrice, debtPrice] = await fetchTokenPrices(conn, [
+    [supplyPrice, debtPrice] = await fetchTokenPrices([
       toWeb3JsPublicKey(state.supply.mint),
       toWeb3JsPublicKey(state.debt.mint),
     ]);

package/src/utils/solauto/rebalanceUtils.ts

@@ -16,7 +16,7 @@ import {
 import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
 import { QuoteResponse } from "@jup-ag/api";
 import { JupSwapDetails } from "../jupiterUtils";
-import { currentUnixSeconds, safeGetPrice } from "../generalUtils";
+import { currentUnixSeconds } from "../generalUtils";
 import {
   fromBaseUnit,
   fromBps,
@@ -29,6 +29,7 @@ import {
 } from "../numberUtils";
 import { USD_DECIMALS } from "../../constants/generalAccounts";
 import { RebalanceAction } from "../../types";
+import { safeGetPrice } from "../priceUtils";
 
 function getAdditionalAmountToDcaIn(dca: DCASettings): number {
   if (dca.dcaInBaseUnit === BigInt(0)) {

package/src/utils/switchboardUtils.ts

@@ -0,0 +1,66 @@
+import { AnchorProvider, Idl, Program } from "@coral-xyz/anchor";
+import switchboardIdl from "../idls/switchboard.json";
+import {
+  Connection,
+  PublicKey,
+  Transaction,
+  VersionedTransaction,
+} from "@solana/web3.js";
+import { CrossbarClient, PullFeed } from "@switchboard-xyz/on-demand";
+import { SWITCHBOARD_PRICE_FEED_IDS } from "../constants/switchboardConstants";
+import { TransactionItemInputs } from "../types";
+import { Signer, transactionBuilder } from "@metaplex-foundation/umi";
+import {
+  fromWeb3JsInstruction,
+  toWeb3JsPublicKey,
+} from "@metaplex-foundation/umi-web3js-adapters";
+
+export function getPullFeed(
+  conn: Connection,
+  mint: PublicKey,
+  wallet?: PublicKey
+) {
+  const dummyWallet = {
+    publicKey: wallet ?? new PublicKey("11111111111111111111111111111111"),
+    signTransaction: async <T extends Transaction | VersionedTransaction>(
+      tx: T
+    ): Promise<T> => tx,
+    signAllTransactions: async <T extends Transaction | VersionedTransaction>(
+      txs: T[]
+    ): Promise<T[]> => txs,
+  };
+  const provider = new AnchorProvider(
+    conn,
+    dummyWallet,
+    AnchorProvider.defaultOptions()
+  );
+  const program = new Program(switchboardIdl as Idl, provider);
+
+  return new PullFeed(
+    program,
+    new PublicKey(SWITCHBOARD_PRICE_FEED_IDS[mint.toString()])
+  );
+}
+
+export async function buildSwbSubmitResponseTx(
+  conn: Connection,
+  signer: Signer,
+  mint: PublicKey
+): Promise<TransactionItemInputs | undefined> {
+  const crossbar = new CrossbarClient("https://crossbar.switchboard.xyz");
+  const feed = getPullFeed(conn, mint, toWeb3JsPublicKey(signer.publicKey));
+  const [pullIx, responses] = await feed.fetchUpdateIx({
+    crossbarClient: crossbar,
+  });
+
+  return {
+    tx: transactionBuilder().add({
+      bytesCreatedOnChain: 0,
+      instruction: fromWeb3JsInstruction(pullIx!),
+      signers: [signer],
+    }),
+    lookupTableAddresses: responses
+      .filter((x) => Boolean(x.oracle.lut?.key))
+      .map((x) => x.oracle.lut!.key.toString()),
+  };
+}