@haven-fi/solauto-sdk 1.0.310 → 1.0.312

package/src/utils/priceUtils.ts

@@ -1,4 +1,4 @@
-import { Connection, PublicKey } from "@solana/web3.js";
+import { 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";
@@ -9,7 +9,7 @@ import {
   retryWithExponentialBackoff,
   zip,
 } from "./generalUtils";
-import { getPullFeed } from "./switchboardUtils";
+import { getSwitchboardPrices } from "./switchboardUtils";
 
 export async function fetchTokenPrices(
   mints: PublicKey[]
@@ -32,7 +32,7 @@ export async function fetchTokenPrices(
 
   const [pythData, switchboardData] = await Promise.all([
     zip(pythMints, await getPythPrices(pythMints)),
-    zip(switchboardMints, await getJupTokenPrices(switchboardMints)),
+    zip(switchboardMints, await getSwitchboardPrices(switchboardMints)),
   ]);
 
   const prices = mints.map((mint) => {
@@ -94,34 +94,6 @@ export async function getPythPrices(mints: PublicKey[]) {
   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 {
@@ -131,6 +103,7 @@ export function safeGetPrice(
   return undefined;
 }
 
+// LEGACY, NOT USED
 export async function getJupTokenPrices(mints: PublicKey[]) {
   if (mints.length == 0) {
     return [];
@@ -140,7 +113,7 @@ export async function getJupTokenPrices(mints: PublicKey[]) {
     const res = (
       await fetch(
         "https://api.jup.ag/price/v2?ids=" +
-          mints.map((x) => x.toString()).join(",")
+          mints.map((x) => x.toString()).join(",") + "&showExtraInfo=true"
       )
     ).json();
     return res;

package/src/utils/solauto/generalUtils.ts

@@ -41,6 +41,7 @@ import {
 } from "../marginfiUtils";
 import { RebalanceAction, SolautoPositionDetails } from "../../types/solauto";
 import { fetchTokenPrices } from "../priceUtils";
+import { getRebalanceValues } from "./rebalanceUtils";
 
 export function createDynamicSolautoProgram(programId: PublicKey): Program {
   return {
@@ -132,6 +133,8 @@ export function eligibleForRebalance(
   positionSettings: SolautoSettingsParameters | undefined,
   positionDca: DCASettings | undefined,
   currentUnixTime: number,
+  supplyMintPrice: number,
+  debtMintPrice: number,
   bpsDistanceThreshold = 0
 ): RebalanceAction | undefined {
   if (!positionSettings) {
@@ -167,7 +170,26 @@ export function eligibleForRebalance(
     Math.max(0, positionState.liqUtilizationRateBps - boostFrom) <=
     bpsDistanceThreshold
   ) {
-    return "boost";
+    const values = getRebalanceValues(
+      positionState!,
+      positionSettings,
+      positionDca,
+      currentUnixSeconds(),
+      supplyMintPrice,
+      debtMintPrice
+    );
+    const sufficientLiquidity =
+      fromBaseUnit(
+        positionState.debt.amountCanBeUsed.baseAmountUsdValue,
+        USD_DECIMALS
+      ) *
+        0.95 >
+      values.debtAdjustmentUsd;
+    if (!sufficientLiquidity) {
+      console.log("Insufficient debt liquidity to further boost");
+    }
+
+    return sufficientLiquidity ? "boost" : undefined;
   } else if (
     Math.max(0, repayFrom - positionState.liqUtilizationRateBps) <=
     bpsDistanceThreshold

package/src/utils/switchboardUtils.ts

@@ -14,6 +14,7 @@ import {
   fromWeb3JsInstruction,
   toWeb3JsPublicKey,
 } from "@metaplex-foundation/umi-web3js-adapters";
+import { retryWithExponentialBackoff } from "./generalUtils";
 
 export function getPullFeed(
   conn: Connection,
@@ -49,9 +50,14 @@ export async function buildSwbSubmitResponseTx(
 ): 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,
-  });
+  const [pullIx, responses] = await retryWithExponentialBackoff(
+    async () =>
+      await feed.fetchUpdateIx({
+        crossbarClient: crossbar,
+      }),
+    8,
+    200
+  );
 
   return {
     tx: transactionBuilder().add({
@@ -64,3 +70,52 @@ export async function buildSwbSubmitResponseTx(
       .map((x) => x.oracle.lut!.key.toString()),
   };
 }
+
+export async function getSwitchboardFeedData(
+  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 async function getSwitchboardPrices(
+  mints: PublicKey[]
+): Promise<number[]> {
+  if (mints.length === 0) {
+    return [];
+  }
+
+  const crossbar = new CrossbarClient("https://crossbar.switchboard.xyz");
+  const results = await retryWithExponentialBackoff(
+    async () =>
+      await crossbar.simulateSolanaFeeds(
+        "mainnet",
+        mints.map((x) => SWITCHBOARD_PRICE_FEED_IDS[x.toString()])
+      ),
+    8,
+    200
+  );
+
+  return results.flatMap((x) => x.results[0]);
+}

package/tests/transactions/solautoMarginfi.ts

@@ -27,7 +27,7 @@ import {
   SOLAUTO_TEST_PROGRAM,
   USDC,
 } from "../../src/constants";
-import { buildHeliusApiUrl, getSolautoManagedPositions, positionStateWithLatestPrices } from "../../src/utils";
+import { buildHeliusApiUrl } from "../../src/utils";
 import { PriorityFeeSetting } from "../../src/types";
 
 describe("Solauto Marginfi tests", async () => {
@@ -41,8 +41,8 @@ describe("Solauto Marginfi tests", async () => {
   it("open - deposit - borrow - rebalance to 0 - withdraw - close", async () => {
     const client = new SolautoMarginfiClient(
       buildHeliusApiUrl(process.env.HELIUS_API_KEY!),
-      true
-      // testProgram ? SOLAUTO_TEST_PROGRAM : SOLAUTO_PROD_PROGRAM
+      true,
+      testProgram ? SOLAUTO_TEST_PROGRAM : SOLAUTO_PROD_PROGRAM
     );
 
     const supply = NATIVE_MINT;
@@ -52,7 +52,7 @@ describe("Solauto Marginfi tests", async () => {
     await client.initialize({
       signer,
       positionId,
-      authority: new PublicKey("rC5dMP5dmSsfQ66rynzfFzuc122Eex9h1RJHVDkeH6D"),
+      authority: new PublicKey("rC5dMP5dmSsfQ66rynzfFzuc122Eex9h1RJHVDkeH6D"), // positions 1 & 3 are taken
       // new: true,
       // marginfiAccount: new PublicKey(
       //   "4nNvUXF5YqHFcH2nGweSiuvy1ct7V5FXfoCLKFYUN36z"
@@ -63,20 +63,20 @@ describe("Solauto Marginfi tests", async () => {
     });
 
     const transactionItems: TransactionItem[] = [];
-    const settingParams: SolautoSettingsParametersInpArgs = {
-      boostToBps: maxBoostToBps(
-        client.solautoPositionState?.maxLtvBps ?? 0,
-        client.solautoPositionState?.liqThresholdBps ?? 0
-      ),
-      boostGap: 50,
-      repayToBps: maxRepayToBps(
-        client.solautoPositionState?.maxLtvBps ?? 0,
-        client.solautoPositionState?.liqThresholdBps ?? 0
-      ),
-      repayGap: 50,
-      automation: none(),
-      targetBoostToBps: none(),
-    };
+    // const settingParams: SolautoSettingsParametersInpArgs = {
+    //   boostToBps: maxBoostToBps(
+    //     client.solautoPositionState?.maxLtvBps ?? 0,
+    //     client.solautoPositionState?.liqThresholdBps ?? 0
+    //   ),
+    //   boostGap: 50,
+    //   repayToBps: maxRepayToBps(
+    //     client.solautoPositionState?.maxLtvBps ?? 0,
+    //     client.solautoPositionState?.liqThresholdBps ?? 0
+    //   ),
+    //   repayGap: 50,
+    //   automation: none(),
+    //   targetBoostToBps: none(),
+    // };
 
     // if (client.solautoPositionData === null) {
     //   transactionItems.push(
@@ -123,7 +123,7 @@ describe("Solauto Marginfi tests", async () => {
     transactionItems.push(
       new TransactionItem(
         async (attemptNum) =>
-          await buildSolautoRebalanceTransaction(client, 3000, attemptNum),
+          await buildSolautoRebalanceTransaction(client, 5000, attemptNum),
         "rebalance"
       )
     );
@@ -156,13 +156,14 @@ describe("Solauto Marginfi tests", async () => {
     //   )
     // );
 
-    // const statuses = await new TransactionsManager(
-    //   client,
-    //   undefined,
-    //   !payForTransactions ? "only-simulate" : "normal",
-    //   PriorityFeeSetting.Low
-    // ).clientSend(transactionItems);
+    const statuses = await new TransactionsManager(
+      client,
+      undefined,
+      !payForTransactions ? "only-simulate" : "normal",
+      PriorityFeeSetting.Low,
+      true
+    ).clientSend(transactionItems);
 
-    // console.log(statuses);
+    console.log(statuses);
   });
 });