@haven-fi/solauto-sdk 1.0.530 → 1.0.531

package/dist/utils/solauto/rebalanceUtils.js

@@ -138,9 +138,9 @@ 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);
 }
@@ -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.531",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "description": "Typescript SDK for the Solauto program on the Solana blockchain",

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(
@@ -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,
     });
   }