@haven-fi/solauto-sdk 1.0.530 → 1.0.532

package/dist/utils/jupiterUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jupiterUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jupiterUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAA0B,MAAM,iBAAiB,CAAC;AAGpE,OAAO,EAGL,aAAa,EACd,MAAM,aAAa,CAAC;AAUrB,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,SAAS,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,cAAe,SAAQ,YAAY;IAClD,iBAAiB,EAAE,SAAS,CAAC;IAC7B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,QAAQ,CAAC,EAAE,aAAa,CAAC;CAC1B;AAgBD,wBAAsB,WAAW,CAAC,WAAW,EAAE,YAAY,0BAsB1D;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,aAAa,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;IACvB,oBAAoB,EAAE,MAAM,EAAE,CAAC;IAC/B,iBAAiB,EAAE,kBAAkB,CAAC;IACtC,aAAa,EAAE,kBAAkB,CAAC;IAClC,MAAM,EAAE,kBAAkB,CAAC;CAC5B;AAED,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,cAAc,EAC3B,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,kBAAkB,CAAC,CAmF7B;AAED,wBAAsB,eAAe,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,SAAS,CAAC,EAAE,OAAO;;GA0B5E"}
+{"version":3,"file":"jupiterUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jupiterUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAA0B,MAAM,iBAAiB,CAAC;AAGpE,OAAO,EAGL,aAAa,EACd,MAAM,aAAa,CAAC;AAUrB,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,SAAS,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,cAAe,SAAQ,YAAY;IAClD,iBAAiB,EAAE,SAAS,CAAC;IAC7B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,QAAQ,CAAC,EAAE,aAAa,CAAC;CAC1B;AAgBD,wBAAsB,WAAW,CAAC,WAAW,EAAE,YAAY,0BAsB1D;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,aAAa,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;IACvB,oBAAoB,EAAE,MAAM,EAAE,CAAC;IAC/B,iBAAiB,EAAE,kBAAkB,CAAC;IACtC,aAAa,EAAE,kBAAkB,CAAC;IAClC,MAAM,EAAE,kBAAkB,CAAC;CAC5B;AAED,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,cAAc,EAC3B,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,kBAAkB,CAAC,CAmF7B;AAED,wBAAsB,eAAe,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,SAAS,CAAC,EAAE,OAAO;;GA6B5E"}

package/dist/utils/jupiterUtils.js

@@ -91,16 +91,16 @@ async function getJupPriceData(mints, extraInfo) {
             mints.map((x) => x.toString()).join(",") +
             (extraInfo ? "&showExtraInfo=true" : ""))).json();
         const result = res.data;
-        if (!result ||
-            result === null ||
-            (typeof result === "object" &&
-                Boolean(Object.values(result).filter((x) => x === null).length)) ||
-            (typeof result === "object" &&
-                Object.values(result)
-                    .map((x) => parseFloat(x.price))
-                    .includes(0))) {
+        if (!result || result === null || typeof result !== "object") {
             throw new Error("Failed to get token prices using Jupiter");
         }
+        const invalidValues = Boolean(Object.values(result).filter((x) => x === null).length) ||
+            Boolean(Object.values(result)
+                .map((x) => parseFloat(x.price))
+                .filter((x) => x <= 0).length);
+        if (invalidValues) {
+            throw new Error("Invalid price values");
+        }
         return result;
     }, 8);
     return data;

package/dist/utils/priceUtils.js

@@ -99,7 +99,7 @@ async function getSwitchboardPrices(mints) {
         prices = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => {
             const res = await crossbar.simulateSolanaFeeds("mainnet", mints.map((x) => switchboardConstants_1.SWITCHBOARD_PRICE_FEED_IDS[x.toString()]));
             const p = res.flatMap((x) => x.results[0]);
-            if (p.filter((x) => !x || isNaN(Number(x))).length > 0) {
+            if (p.filter((x) => !x || isNaN(Number(x)) || Number(x) < 0).length > 0) {
                 throw new Error("Unable to fetch Switchboard prices");
             }
             return p;

package/dist/utils/solauto/rebalanceUtils.js

@@ -138,14 +138,14 @@ function postRebalanceLiqUtilizationRateBps(client, values, swapOutputAmount) {
         ? (0, numberUtils_1.fromBaseUnit)(swapOutputAmount, (0, generalUtils_2.tokenInfo)(outputToken).decimals) *
             ((0, priceUtils_1.safeGetPrice)(outputToken) ?? 0)
         : debtAdjustmentUsdAbs;
-    supplyUsd = !boost
-        ? supplyUsd - debtAdjustmentUsdAbs
-        : supplyUsd + swapOutputUsd;
+    supplyUsd = boost
+        ? supplyUsd + swapOutputUsd
+        : supplyUsd - debtAdjustmentUsdAbs;
     debtUsd = boost ? debtUsd + debtAdjustmentUsdAbs : debtUsd - swapOutputUsd;
     return (0, numberUtils_1.getLiqUtilzationRateBps)(supplyUsd, debtUsd, client.solautoPositionState?.liqThresholdBps ?? 0);
 }
-function insufficientLiquidity(amountNeeded, liquidity, tokenDecimals, tokenPrice) {
-    return amountNeeded > (0, numberUtils_1.fromBaseUnit)(liquidity, tokenDecimals) * tokenPrice;
+function insufficientLiquidity(amountNeededUsd, liquidity, tokenDecimals, tokenPrice) {
+    return amountNeededUsd > (0, numberUtils_1.fromBaseUnit)(liquidity, tokenDecimals) * tokenPrice;
 }
 async function getFlashLoanRequirements(client, values, attemptNum) {
     let supplyUsd = (0, numberUtils_1.fromBaseUnit)(client.solautoPositionState.supply.amountUsed.baseAmountUsdValue, generalAccounts_1.USD_DECIMALS) +
@@ -171,7 +171,7 @@ async function getFlashLoanRequirements(client, values, attemptNum) {
     let useDebtLiquidity = values.rebalanceDirection === generated_1.RebalanceDirection.Boost ||
         insufficientSupplyLiquidity;
     let signerFlashLoan = false;
-    if ((attemptNum ?? 0) > 3 ||
+    if ((attemptNum ?? 0) >= 3 ||
         (insufficientSupplyLiquidity && insufficientDebtLiquidity)) {
         const { supplyBalance, debtBalance } = await client.signerBalances();
         const sufficientSignerSupplyLiquidity = !insufficientLiquidity(debtAdjustmentUsd, supplyBalance, (0, generalUtils_2.tokenInfo)(client.supplyMint).decimals, supplyPrice);
@@ -216,21 +216,21 @@ function getFlashLoanDetails(client, flRequirements, values, jupQuote) {
 async function findSufficientQuote(client, values, jupSwapInput, criteria) {
     let jupQuote;
     let insufficient = false;
-    for (let i = 0; i < 5; i++) {
+    for (let i = 0; i < 10; i++) {
         (0, generalUtils_2.consoleLog)("Finding sufficient quote...");
         jupQuote = await (0, jupiterUtils_1.getJupQuote)(jupSwapInput);
         const outputAmount = parseInt(jupQuote.outAmount);
-        const postRebalanceRate = postRebalanceLiqUtilizationRateBps(client, values);
+        const postRebalanceRate = postRebalanceLiqUtilizationRateBps(client, values, BigInt(outputAmount));
         insufficient = criteria.minOutputAmount
             ? outputAmount < Number(criteria.minOutputAmount)
             : criteria.minLiqUtilizationRateBps
                 ? postRebalanceRate < criteria.minLiqUtilizationRateBps
                 : postRebalanceRate > criteria.maxLiqUtilizationRateBps;
         if (insufficient) {
+            (0, generalUtils_2.consoleLog)(jupQuote);
             jupSwapInput.amount =
                 jupSwapInput.amount +
-                    BigInt(Math.round(Number(jupSwapInput.amount) * 0.005));
-            (0, generalUtils_2.consoleLog)(jupQuote);
+                    BigInt(Math.round(Number(jupSwapInput.amount) * 0.01));
         }
         else {
             break;
@@ -276,7 +276,7 @@ async function getJupSwapRebalanceDetails(client, values, flRequirements, target
         jupQuote = await findSufficientQuote(client, values, jupSwapInput, {
             minOutputAmount: rebalanceToZero ? outputAmount : undefined,
             maxLiqUtilizationRateBps: values.repayingCloseToMaxLtv
-                ? (0, numberUtils_1.maxRepayToBps)(client.solautoPositionState?.maxLtvBps ?? 0, client.solautoPositionState?.liqThresholdBps ?? 0)
+                ? (0, numberUtils_1.maxRepayToBps)(client.solautoPositionState?.maxLtvBps ?? 0, client.solautoPositionState?.liqThresholdBps ?? 0) - 15
                 : undefined,
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.530",
+  "version": "1.0.532",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "description": "Typescript SDK for the Solauto program on the Solana blockchain",

package/src/utils/jupiterUtils.ts

@@ -181,18 +181,21 @@ export async function getJupPriceData(mints: PublicKey[], extraInfo?: boolean) {
       )
     ).json();
     const result = res.data;
-    if (
-      !result ||
-      result === null ||
-      (typeof result === "object" &&
-        Boolean(Object.values(result).filter((x) => x === null).length)) ||
-      (typeof result === "object" &&
+    if (!result || result === null || typeof result !== "object") {
+      throw new Error("Failed to get token prices using Jupiter");
+    }
+
+    const invalidValues =
+      Boolean(Object.values(result).filter((x) => x === null).length) ||
+      Boolean(
         Object.values(result)
           .map((x) => parseFloat((x as any).price))
-          .includes(0))
-    ) {
-      throw new Error("Failed to get token prices using Jupiter");
+          .filter((x) => x <= 0).length
+      );
+    if (invalidValues) {
+      throw new Error("Invalid price values");
     }
+
     return result;
   }, 8);
 

package/src/utils/priceUtils.ts

@@ -115,7 +115,7 @@ export async function getSwitchboardPrices(
         );
 
         const p = res.flatMap((x) => x.results[0]);
-        if (p.filter((x) => !x || isNaN(Number(x))).length > 0) {
+        if (p.filter((x) => !x || isNaN(Number(x)) || Number(x) < 0).length > 0) {
           throw new Error("Unable to fetch Switchboard prices");
         }
 

package/src/utils/solauto/rebalanceUtils.ts

@@ -289,9 +289,9 @@ function postRebalanceLiqUtilizationRateBps(
       (safeGetPrice(outputToken) ?? 0)
     : debtAdjustmentUsdAbs;
 
-  supplyUsd = !boost
-    ? supplyUsd - debtAdjustmentUsdAbs
-    : supplyUsd + swapOutputUsd;
+  supplyUsd = boost
+    ? supplyUsd + swapOutputUsd
+    : supplyUsd - debtAdjustmentUsdAbs;
   debtUsd = boost ? debtUsd + debtAdjustmentUsdAbs : debtUsd - swapOutputUsd;
 
   return getLiqUtilzationRateBps(
@@ -302,12 +302,12 @@ function postRebalanceLiqUtilizationRateBps(
 }
 
 function insufficientLiquidity(
-  amountNeeded: number,
+  amountNeededUsd: number,
   liquidity: bigint,
   tokenDecimals: number,
   tokenPrice: number
 ) {
-  return amountNeeded > fromBaseUnit(liquidity, tokenDecimals) * tokenPrice;
+  return amountNeededUsd > fromBaseUnit(liquidity, tokenDecimals) * tokenPrice;
 }
 
 export interface FlashLoanRequirements {
@@ -377,7 +377,7 @@ export async function getFlashLoanRequirements(
 
   let signerFlashLoan = false;
   if (
-    (attemptNum ?? 0) > 3 ||
+    (attemptNum ?? 0) >= 3 ||
     (insufficientSupplyLiquidity && insufficientDebtLiquidity)
   ) {
     const { supplyBalance, debtBalance } = await client.signerBalances();
@@ -471,14 +471,15 @@ async function findSufficientQuote(
   let jupQuote: QuoteResponse;
   let insufficient: boolean = false;
 
-  for (let i = 0; i < 5; i++) {
+  for (let i = 0; i < 10; i++) {
     consoleLog("Finding sufficient quote...");
     jupQuote = await getJupQuote(jupSwapInput);
 
     const outputAmount = parseInt(jupQuote.outAmount);
     const postRebalanceRate = postRebalanceLiqUtilizationRateBps(
       client,
-      values
+      values,
+      BigInt(outputAmount)
     );
     insufficient = criteria.minOutputAmount
       ? outputAmount < Number(criteria.minOutputAmount)
@@ -487,11 +488,10 @@ async function findSufficientQuote(
         : postRebalanceRate > criteria.maxLiqUtilizationRateBps!;
 
     if (insufficient) {
+      consoleLog(jupQuote);
       jupSwapInput.amount =
         jupSwapInput.amount +
-        BigInt(Math.round(Number(jupSwapInput.amount) * 0.005));
-
-      consoleLog(jupQuote);
+        BigInt(Math.round(Number(jupSwapInput.amount) * 0.01));
     } else {
       break;
     }
@@ -565,7 +565,7 @@ export async function getJupSwapRebalanceDetails(
         ? maxRepayToBps(
             client.solautoPositionState?.maxLtvBps ?? 0,
             client.solautoPositionState?.liqThresholdBps ?? 0
-          )
+          ) - 15
         : undefined,
     });
   }

package/tests/transactions/solautoMarginfi.ts

@@ -42,7 +42,6 @@ import {
 } from "../../src/utils";
 import { PriorityFeeSetting } from "../../src/types";
 import { buildIronforgeApiUrl, fromBaseUnit, tokenInfo, USD_DECIMALS } from "../../dist";
-import { JUPITER_PROGRAM_ID } from "../../src/jupiter-sdk";
 
 describe("Solauto Marginfi tests", async () => {
   // const signer = setupTest();
@@ -50,7 +49,7 @@ describe("Solauto Marginfi tests", async () => {
 
   const payForTransactions = true;
   const testProgram = false;
-  const positionId = 1;
+  const positionId = 3;
 
   it("open - deposit - borrow - rebalance to 0 - withdraw - close", async () => {
     const client = new SolautoMarginfiClient(
@@ -66,7 +65,7 @@ describe("Solauto Marginfi tests", async () => {
     await client.initialize({
       signer,
       positionId,
-      authority: new PublicKey("EBhRj7jbF2EVE21i19JSuCX1BAbnZFYhoKW64HnaZ3kf"),
+      authority: new PublicKey("FKYQs7KgRvaKQHxXwb8HKfoBcFdSxLL3JvHWpPdVQ16v"),
       // new: true,
       // marginfiAccount: new PublicKey(
       //   ""