@haven-fi/solauto-sdk 1.0.528 → 1.0.530

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,0BAwB1D;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;;GA0B5E"}

package/dist/utils/jupiterUtils.js

@@ -25,7 +25,7 @@ function createTransactionInstruction(instruction) {
 async function getJupQuote(swapDetails) {
     const memecoinSwap = (0, generalUtils_1.tokenInfo)(swapDetails.inputMint).isMeme ||
         (0, generalUtils_1.tokenInfo)(swapDetails.outputMint).isMeme;
-    return await (0, generalUtils_1.retryWithExponentialBackoff)(async () => await jupApi.quoteGet({
+    return await (0, generalUtils_1.retryWithExponentialBackoff)(async (attemptNum) => await jupApi.quoteGet({
         amount: Number(swapDetails.amount),
         inputMint: swapDetails.inputMint.toString(),
         outputMint: swapDetails.outputMint.toString(),
@@ -35,10 +35,8 @@ async function getJupQuote(swapDetails) {
                 ? "ExactIn"
                 : undefined,
         slippageBps: memecoinSwap ? 500 : 200,
-        maxAccounts: !swapDetails.exactOut
-            ? 15
-            : undefined,
-    }), 2, 200);
+        maxAccounts: !swapDetails.exactOut ? 15 + attemptNum * 5 : undefined,
+    }), 3, 200);
 }
 async function getJupSwapTransaction(signer, swapDetails, attemptNum) {
     const quoteResponse = swapDetails.jupQuote ?? (await getJupQuote(swapDetails));
@@ -46,7 +44,7 @@ async function getJupSwapTransaction(signer, swapDetails, attemptNum) {
     const finalPriceSlippageBps = Math.round(Math.max(50, quoteResponse.slippageBps, priceImpactBps) *
         (1 + (swapDetails.slippageIncFactor ?? 0)));
     quoteResponse.slippageBps = finalPriceSlippageBps;
-    (0, generalUtils_1.consoleLog)(quoteResponse);
+    (0, generalUtils_1.consoleLog)("Quote:", quoteResponse);
     (0, generalUtils_1.consoleLog)("Getting jup instructions...");
     const instructions = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => {
         const res = await jupApi.swapInstructionsPost({

package/dist/utils/solauto/generalUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generalUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/solauto/generalUtils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generalUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/solauto/generalUtils.ts"],"names":[],"mappings":"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"}

package/dist/utils/solauto/rebalanceUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rebalanceUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/solauto/rebalanceUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EACL,WAAW,EACX,aAAa,EAEb,kBAAkB,EAClB,yBAAyB,EACzB,SAAS,EACV,MAAM,iBAAiB,CAAC;AAOzB,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAe,cAAc,EAAgB,MAAM,iBAAiB,CAAC;AAc5E,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAqI9C,MAAM,WAAW,eAAe;IAC9B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,qBAAqB,EAAE,OAAO,CAAC;IAC/B,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,SAAS,CAAC;IACzB,eAAe,EAAE,eAAe,CAAC;IACjC,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,yBAAyB,GAAG,SAAS,EAC/C,GAAG,EAAE,WAAW,GAAG,SAAS,EAC5B,eAAe,EAAE,MAAM,EACvB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,2BAA2B,CAAC,EAAE,MAAM,GACnC,eAAe,CA4EjB;AAWD,MAAM,WAAW,qBAAqB;IACpC,gBAAgB,EAAE,OAAO,CAAC;IAC1B,eAAe,EAAE,OAAO,CAAC;CAC1B;AAED,wBAAsB,wBAAwB,CAC5C,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAoG5C;AAED,MAAM,WAAW,gBAAiB,SAAQ,qBAAqB;IAC7D,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,aAAa,EACrB,cAAc,EAAE,qBAAqB,EACrC,MAAM,EAAE,eAAe,EACvB,QAAQ,EAAE,aAAa,GACtB,gBAAgB,GAAG,SAAS,CA2B9B;AAED,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,cAAc,CAAC,EAAE,qBAAqB,EACtC,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,cAAc,CAAC,CAqEzB"}
+{"version":3,"file":"rebalanceUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/solauto/rebalanceUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EACL,WAAW,EACX,aAAa,EAEb,kBAAkB,EAClB,yBAAyB,EACzB,SAAS,EACV,MAAM,iBAAiB,CAAC;AAOzB,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAe,cAAc,EAAgB,MAAM,iBAAiB,CAAC;AAc5E,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAqI9C,MAAM,WAAW,eAAe;IAC9B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,qBAAqB,EAAE,OAAO,CAAC;IAC/B,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,SAAS,CAAC;IACzB,eAAe,EAAE,eAAe,CAAC;IACjC,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,yBAAyB,GAAG,SAAS,EAC/C,GAAG,EAAE,WAAW,GAAG,SAAS,EAC5B,eAAe,EAAE,MAAM,EACvB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,2BAA2B,CAAC,EAAE,MAAM,GACnC,eAAe,CA4EjB;AAoDD,MAAM,WAAW,qBAAqB;IACpC,gBAAgB,EAAE,OAAO,CAAC;IAC1B,eAAe,EAAE,OAAO,CAAC;CAC1B;AAED,wBAAsB,wBAAwB,CAC5C,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAkG5C;AAED,MAAM,WAAW,gBAAiB,SAAQ,qBAAqB;IAC7D,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,aAAa,EACrB,cAAc,EAAE,qBAAqB,EACrC,MAAM,EAAE,eAAe,EACvB,QAAQ,EAAE,aAAa,GACtB,gBAAgB,GAAG,SAAS,CA2B9B;AA4CD,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,cAAc,CAAC,EAAE,qBAAqB,EACtC,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,cAAc,CAAC,CA2EzB"}

package/dist/utils/solauto/rebalanceUtils.js

@@ -125,6 +125,25 @@ function getRebalanceValues(state, settings, dca, currentUnixTime, supplyPrice,
         targetRateBps,
     };
 }
+function postRebalanceLiqUtilizationRateBps(client, values, swapOutputAmount) {
+    let supplyUsd = (0, numberUtils_1.fromBaseUnit)(client.solautoPositionState.supply.amountUsed.baseAmountUsdValue, generalAccounts_1.USD_DECIMALS) +
+        (values.dcaTokenType === generated_1.TokenType.Supply ? values.amountUsdToDcaIn : 0);
+    let debtUsd = (0, numberUtils_1.fromBaseUnit)(client.solautoPositionState.debt.amountUsed.baseAmountUsdValue, generalAccounts_1.USD_DECIMALS);
+    const boost = values.rebalanceDirection === generated_1.RebalanceDirection.Boost;
+    const outputToken = (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(boost
+        ? client.solautoPositionState.supply.mint
+        : client.solautoPositionState.debt.mint);
+    const debtAdjustmentUsdAbs = Math.abs(values.debtAdjustmentUsd);
+    const swapOutputUsd = 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;
+    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;
 }
@@ -166,7 +185,6 @@ async function getFlashLoanRequirements(client, values, attemptNum) {
             throw new Error(`Need at least ${values.debtAdjustmentUsd / debtPrice} ${(0, generalUtils_2.tokenInfo)(client.debtMint).ticker} or ${values.debtAdjustmentUsd / supplyPrice} ${(0, generalUtils_2.tokenInfo)(client.supplyMint).ticker} to perform the transaction`);
         }
     }
-    // TODO: if not sufficient signer liquidity, throw error with details on how much liquidity is needed and of what token
     (0, generalUtils_2.consoleLog)("Requires flash loan:", requiresFlashLoan);
     (0, generalUtils_2.consoleLog)("Use debt liquidity:", useDebtLiquidity);
     (0, generalUtils_2.consoleLog)("Intermediary liq utilization rate:", tempLiqUtilizationRateBps, `$${supplyUsd}`, `$${debtUsd}`, "Max:", maxLiqUtilizationRateBps);
@@ -195,6 +213,31 @@ function getFlashLoanDetails(client, flRequirements, values, jupQuote) {
         mint: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(flashLoanToken.mint),
     };
 }
+async function findSufficientQuote(client, values, jupSwapInput, criteria) {
+    let jupQuote;
+    let insufficient = false;
+    for (let i = 0; i < 5; 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);
+        insufficient = criteria.minOutputAmount
+            ? outputAmount < Number(criteria.minOutputAmount)
+            : criteria.minLiqUtilizationRateBps
+                ? postRebalanceRate < criteria.minLiqUtilizationRateBps
+                : postRebalanceRate > criteria.maxLiqUtilizationRateBps;
+        if (insufficient) {
+            jupSwapInput.amount =
+                jupSwapInput.amount +
+                    BigInt(Math.round(Number(jupSwapInput.amount) * 0.005));
+            (0, generalUtils_2.consoleLog)(jupQuote);
+        }
+        else {
+            break;
+        }
+    }
+    return jupQuote;
+}
 async function getJupSwapRebalanceDetails(client, values, flRequirements, targetLiqUtilizationRateBps, attemptNum) {
     const input = values.rebalanceDirection === generated_1.RebalanceDirection.Boost
         ? client.solautoPositionState.debt
@@ -217,6 +260,9 @@ async function getJupSwapRebalanceDetails(client, values, flRequirements, target
     const exactOut = flashLoanRepayFromDebt && !rebalanceToZero;
     // || rebalanceToZero
     const exactIn = !exactOut;
+    if (exactIn && rebalanceToZero) {
+        inputAmount = inputAmount + BigInt(Math.round(Number(inputAmount) * 0.005));
+    }
     const jupSwapInput = {
         inputMint: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(input.mint),
         outputMint: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(output.mint),
@@ -226,13 +272,13 @@ async function getJupSwapRebalanceDetails(client, values, flRequirements, target
     };
     (0, generalUtils_2.consoleLog)(jupSwapInput);
     let jupQuote = undefined;
-    if (rebalanceToZero) {
-        do {
-            jupSwapInput.amount =
-                jupSwapInput.amount +
-                    BigInt(Math.round(Number(jupSwapInput.amount) * 0.01));
-            jupQuote = await (0, jupiterUtils_1.getJupQuote)(jupSwapInput);
-        } while (parseInt(jupQuote.outAmount) < outputAmount);
+    if (exactIn && (rebalanceToZero || values.repayingCloseToMaxLtv)) {
+        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)
+                : undefined,
+        });
     }
     const addPadding = exactOut;
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.528",
+  "version": "1.0.530",
   "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

@@ -55,7 +55,7 @@ export async function getJupQuote(swapDetails: JupSwapInput) {
     tokenInfo(swapDetails.outputMint).isMeme;
 
   return await retryWithExponentialBackoff(
-    async () =>
+    async (attemptNum: number) =>
       await jupApi.quoteGet({
         amount: Number(swapDetails.amount),
         inputMint: swapDetails.inputMint.toString(),
@@ -66,11 +66,9 @@ export async function getJupQuote(swapDetails: JupSwapInput) {
             ? "ExactIn"
             : undefined,
         slippageBps: memecoinSwap ? 500 : 200,
-        maxAccounts: !swapDetails.exactOut
-          ? 15
-          : undefined,
+        maxAccounts: !swapDetails.exactOut ? 15 + attemptNum * 5 : undefined,
       }),
-    2,
+    3,
     200
   );
 }
@@ -99,7 +97,7 @@ export async function getJupSwapTransaction(
       (1 + (swapDetails.slippageIncFactor ?? 0))
   );
   quoteResponse.slippageBps = finalPriceSlippageBps;
-  consoleLog(quoteResponse);
+  consoleLog("Quote:", quoteResponse);
 
   consoleLog("Getting jup instructions...");
   const instructions = await retryWithExponentialBackoff(

package/src/utils/solauto/generalUtils.ts

@@ -27,7 +27,6 @@ import {
   fromBaseUnit,
   getLiqUtilzationRateBps,
   toBaseUnit,
-  toBps,
 } from "../numberUtils";
 import { getReferralState } from "../accountUtils";
 import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
@@ -39,7 +38,6 @@ import {
 import {
   findMarginfiAccounts,
   getAllMarginfiAccountsByAuthority,
-  getMarginfiMaxLtvAndLiqThreshold,
 } from "../marginfiUtils";
 import { RebalanceAction, SolautoPositionDetails } from "../../types/solauto";
 import { fetchTokenPrices } from "../priceUtils";

package/src/utils/solauto/rebalanceUtils.ts

@@ -260,6 +260,47 @@ export function getRebalanceValues(
   };
 }
 
+function postRebalanceLiqUtilizationRateBps(
+  client: SolautoClient,
+  values: RebalanceValues,
+  swapOutputAmount?: bigint
+) {
+  let supplyUsd =
+    fromBaseUnit(
+      client.solautoPositionState!.supply.amountUsed.baseAmountUsdValue,
+      USD_DECIMALS
+    ) +
+    (values.dcaTokenType === TokenType.Supply ? values.amountUsdToDcaIn : 0);
+  let debtUsd = fromBaseUnit(
+    client.solautoPositionState!.debt.amountUsed.baseAmountUsdValue,
+    USD_DECIMALS
+  );
+
+  const boost = values.rebalanceDirection === RebalanceDirection.Boost;
+
+  const outputToken = toWeb3JsPublicKey(
+    boost
+      ? client.solautoPositionState!.supply.mint
+      : client.solautoPositionState!.debt.mint
+  );
+  const debtAdjustmentUsdAbs = Math.abs(values.debtAdjustmentUsd);
+  const swapOutputUsd = swapOutputAmount
+    ? fromBaseUnit(swapOutputAmount, tokenInfo(outputToken).decimals) *
+      (safeGetPrice(outputToken) ?? 0)
+    : debtAdjustmentUsdAbs;
+
+  supplyUsd = !boost
+    ? supplyUsd - debtAdjustmentUsdAbs
+    : supplyUsd + swapOutputUsd;
+  debtUsd = boost ? debtUsd + debtAdjustmentUsdAbs : debtUsd - swapOutputUsd;
+
+  return getLiqUtilzationRateBps(
+    supplyUsd,
+    debtUsd,
+    client.solautoPositionState?.liqThresholdBps ?? 0
+  );
+}
+
 function insufficientLiquidity(
   amountNeeded: number,
   liquidity: bigint,
@@ -316,7 +357,7 @@ export async function getFlashLoanRequirements(
   const supplyPrice = safeGetPrice(client.supplyMint) ?? 0;
   const debtPrice = safeGetPrice(client.debtMint) ?? 0;
   const debtAdjustmentUsd = Math.abs(values.debtAdjustmentUsd);
-  
+
   const insufficientSupplyLiquidity = insufficientLiquidity(
     debtAdjustmentUsd,
     client.supplyLiquidityAvailable(),
@@ -364,8 +405,6 @@ export async function getFlashLoanRequirements(
     }
   }
 
-  // TODO: if not sufficient signer liquidity, throw error with details on how much liquidity is needed and of what token
-
   consoleLog("Requires flash loan:", requiresFlashLoan);
   consoleLog("Use debt liquidity:", useDebtLiquidity);
   consoleLog(
@@ -419,6 +458,48 @@ export function getFlashLoanDetails(
   };
 }
 
+async function findSufficientQuote(
+  client: SolautoClient,
+  values: RebalanceValues,
+  jupSwapInput: JupSwapInput,
+  criteria: {
+    minOutputAmount?: bigint;
+    minLiqUtilizationRateBps?: number;
+    maxLiqUtilizationRateBps?: number;
+  }
+): Promise<QuoteResponse> {
+  let jupQuote: QuoteResponse;
+  let insufficient: boolean = false;
+
+  for (let i = 0; i < 5; i++) {
+    consoleLog("Finding sufficient quote...");
+    jupQuote = await getJupQuote(jupSwapInput);
+
+    const outputAmount = parseInt(jupQuote.outAmount);
+    const postRebalanceRate = postRebalanceLiqUtilizationRateBps(
+      client,
+      values
+    );
+    insufficient = criteria.minOutputAmount
+      ? outputAmount < Number(criteria.minOutputAmount)
+      : criteria.minLiqUtilizationRateBps
+        ? postRebalanceRate < criteria.minLiqUtilizationRateBps
+        : postRebalanceRate > criteria.maxLiqUtilizationRateBps!;
+
+    if (insufficient) {
+      jupSwapInput.amount =
+        jupSwapInput.amount +
+        BigInt(Math.round(Number(jupSwapInput.amount) * 0.005));
+
+      consoleLog(jupQuote);
+    } else {
+      break;
+    }
+  }
+
+  return jupQuote!;
+}
+
 export async function getJupSwapRebalanceDetails(
   client: SolautoClient,
   values: RebalanceValues,
@@ -464,6 +545,9 @@ export async function getJupSwapRebalanceDetails(
   // || rebalanceToZero
   const exactIn = !exactOut;
 
+  if (exactIn && rebalanceToZero) {
+    inputAmount = inputAmount + BigInt(Math.round(Number(inputAmount) * 0.005));
+  }
   const jupSwapInput: JupSwapInput = {
     inputMint: toWeb3JsPublicKey(input.mint),
     outputMint: toWeb3JsPublicKey(output.mint),
@@ -474,13 +558,16 @@ export async function getJupSwapRebalanceDetails(
   consoleLog(jupSwapInput);
 
   let jupQuote: QuoteResponse | undefined = undefined;
-  if (rebalanceToZero) {
-    do {
-      jupSwapInput.amount =
-        jupSwapInput.amount +
-        BigInt(Math.round(Number(jupSwapInput.amount) * 0.01));
-      jupQuote = await getJupQuote(jupSwapInput);
-    } while (parseInt(jupQuote.outAmount) < outputAmount);
+  if (exactIn && (rebalanceToZero || values.repayingCloseToMaxLtv)) {
+    jupQuote = await findSufficientQuote(client, values, jupSwapInput, {
+      minOutputAmount: rebalanceToZero ? outputAmount : undefined,
+      maxLiqUtilizationRateBps: values.repayingCloseToMaxLtv
+        ? maxRepayToBps(
+            client.solautoPositionState?.maxLtvBps ?? 0,
+            client.solautoPositionState?.liqThresholdBps ?? 0
+          )
+        : undefined,
+    });
   }
 
   const addPadding = exactOut;

package/tests/transactions/solautoMarginfi.ts

@@ -66,7 +66,7 @@ describe("Solauto Marginfi tests", async () => {
     await client.initialize({
       signer,
       positionId,
-      authority: new PublicKey("7F6v4HWZsyFP6yVFq92HQWygUgoYm5khUX8pXWGLoqUN"),
+      authority: new PublicKey("EBhRj7jbF2EVE21i19JSuCX1BAbnZFYhoKW64HnaZ3kf"),
       // new: true,
       // marginfiAccount: new PublicKey(
       //   ""
@@ -76,10 +76,6 @@ describe("Solauto Marginfi tests", async () => {
       // debtMint: new PublicKey(USDC),
     });
 
-    await client.getFreshPositionState();
-    console.log(fromBaseUnit(client.supplyLiquidityAvailable(), tokenInfo(client.supplyMint).decimals));
-    console.log(fromBaseUnit(client.debtLiquidityAvailable(), tokenInfo(client.debtMint).decimals));
-
     const transactionItems: TransactionItem[] = [];
     // const settingParams: SolautoSettingsParametersInpArgs = {
     //   boostToBps: maxBoostToBps(