@haven-fi/solauto-sdk 1.0.505 → 1.0.508

package/dist/utils/jupiterUtils.d.ts

@@ -1,17 +1,20 @@
 import { Signer, TransactionBuilder } from "@metaplex-foundation/umi";
 import { PublicKey } from "@solana/web3.js";
 import { QuoteResponse } from "@jup-ag/api";
-export interface JupSwapDetails {
+export interface JupSwapInput {
     inputMint: PublicKey;
     outputMint: PublicKey;
-    destinationWallet: PublicKey;
     amount: bigint;
-    slippageIncFactor?: number;
-    exactOut?: boolean;
     exactIn?: boolean;
+    exactOut?: boolean;
+}
+export interface JupSwapDetails extends JupSwapInput {
+    destinationWallet: PublicKey;
+    slippageIncFactor?: number;
     addPadding?: boolean;
     jupQuote?: QuoteResponse;
 }
+export declare function getJupQuote(swapDetails: JupSwapInput): Promise<QuoteResponse>;
 export interface JupSwapTransaction {
     jupQuote: QuoteResponse;
     priceImpactBps: number;

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;AAOrB,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,SAAS,CAAC;IACtB,iBAAiB,EAAE,SAAS,CAAC;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,QAAQ,CAAC,EAAE,aAAa,CAAC;CAC1B;AAgBD,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,CAwG7B;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,EAIL,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

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getJupQuote = getJupQuote;
 exports.getJupSwapTransaction = getJupSwapTransaction;
 exports.getJupPriceData = getJupPriceData;
 const umi_1 = require("@metaplex-foundation/umi");
@@ -9,7 +10,6 @@ const numberUtils_1 = require("./numberUtils");
 const api_1 = require("@jup-ag/api");
 const accountUtils_1 = require("./accountUtils");
 const generalUtils_1 = require("./generalUtils");
-const constants_1 = require("../constants");
 const jupApi = (0, api_1.createJupiterApiClient)();
 function createTransactionInstruction(instruction) {
     return new web3_js_1.TransactionInstruction({
@@ -22,22 +22,24 @@ function createTransactionInstruction(instruction) {
         data: Buffer.from(instruction.data, "base64"),
     });
 }
+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({
+        amount: Number(swapDetails.amount),
+        inputMint: swapDetails.inputMint.toString(),
+        outputMint: swapDetails.outputMint.toString(),
+        swapMode: swapDetails.exactIn
+            ? "ExactOut"
+            : swapDetails.exactIn
+                ? "ExactIn"
+                : undefined,
+        slippageBps: memecoinSwap ? 500 : 200,
+        maxAccounts: !swapDetails.exactOut ? 40 : undefined,
+    }), 4, 200);
+}
 async function getJupSwapTransaction(signer, swapDetails, attemptNum) {
-    const memecoinSwap = constants_1.TOKEN_INFO[swapDetails.inputMint.toString()].isMeme ||
-        constants_1.TOKEN_INFO[swapDetails.outputMint.toString()].isMeme;
-    const quoteResponse = swapDetails.jupQuote ??
-        (await (0, generalUtils_1.retryWithExponentialBackoff)(async () => await jupApi.quoteGet({
-            amount: Number(swapDetails.amount),
-            inputMint: swapDetails.inputMint.toString(),
-            outputMint: swapDetails.outputMint.toString(),
-            swapMode: swapDetails.exactOut
-                ? "ExactOut"
-                : swapDetails.exactIn
-                    ? "ExactIn"
-                    : undefined,
-            slippageBps: memecoinSwap ? 500 : 200,
-            maxAccounts: !swapDetails.exactOut ? 40 : undefined,
-        }), 4, 200));
+    const quoteResponse = swapDetails.jupQuote ?? (await getJupQuote(swapDetails));
     const priceImpactBps = Math.round((0, numberUtils_1.toBps)(parseFloat(quoteResponse.priceImpactPct))) + 1;
     const finalPriceSlippageBps = Math.round(Math.max(50, quoteResponse.slippageBps, priceImpactBps) *
         (1 + (swapDetails.slippageIncFactor ?? 0)));

package/dist/utils/priceUtils.d.ts

@@ -1,11 +1,12 @@
 import { PublicKey } from "@solana/web3.js";
 import { PublicKey as UmiPublicKey } from "@metaplex-foundation/umi";
+import { QuoteGetSwapModeEnum } from "@jup-ag/api";
 export declare function fetchTokenPrices(mints: PublicKey[]): Promise<number[]>;
 export declare function getPythPrices(mints: PublicKey[]): Promise<number[]>;
 export declare function getSwitchboardPrices(mints: PublicKey[]): Promise<number[]>;
 export declare function getJupTokenPrices(mints: PublicKey[]): Promise<number[]>;
 export declare function safeGetPrice(mint: PublicKey | UmiPublicKey | undefined): number | undefined;
-export declare function getPriceImpact(inputMint: PublicKey, inputAmount: bigint, outputMint: PublicKey): Promise<{
+export declare function getPriceImpact(inputMint: PublicKey, outputMint: PublicKey, amount: bigint, swapMode: QuoteGetSwapModeEnum): Promise<{
     priceImpact: number;
     quote: import("@jup-ag/api").QuoteResponse;
 }>;

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

@@ -1 +1 @@
-{"version":3,"file":"priceUtils.d.ts","sourceRoot":"","sources":["../../src/utils/priceUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,SAAS,IAAI,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAgBrE,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAqC5E;AAED,wBAAsB,aAAa,CAAC,KAAK,EAAE,SAAS,EAAE,qBAwCrD;AAED,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,MAAM,EAAE,CAAC,CAgDnB;AAED,wBAAsB,iBAAiB,CAAC,KAAK,EAAE,SAAS,EAAE,qBAQzD;AAED,wBAAgB,YAAY,CAC1B,IAAI,EAAE,SAAS,GAAG,YAAY,GAAG,SAAS,GACzC,MAAM,GAAG,SAAS,CAKpB;AAED,wBAAsB,cAAc,CAClC,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,SAAS;;;GAoBtB"}
+{"version":3,"file":"priceUtils.d.ts","sourceRoot":"","sources":["../../src/utils/priceUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,SAAS,IAAI,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAcrE,OAAO,EAA0B,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAE3E,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAqC5E;AAED,wBAAsB,aAAa,CAAC,KAAK,EAAE,SAAS,EAAE,qBAwCrD;AAED,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,MAAM,EAAE,CAAC,CAgDnB;AAED,wBAAsB,iBAAiB,CAAC,KAAK,EAAE,SAAS,EAAE,qBAQzD;AAED,wBAAgB,YAAY,CAC1B,IAAI,EAAE,SAAS,GAAG,YAAY,GAAG,SAAS,GACzC,MAAM,GAAG,SAAS,CAKpB;AAED,wBAAsB,cAAc,CAClC,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,SAAS,EACrB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,oBAAoB;;;GAc/B"}

package/dist/utils/priceUtils.js

@@ -36,7 +36,6 @@ const switchboardConstants_1 = require("../constants/switchboardConstants");
 const generalUtils_1 = require("./generalUtils");
 const OnDemand = __importStar(require("@switchboard-xyz/on-demand"));
 const jupiterUtils_1 = require("./jupiterUtils");
-const api_1 = require("@jup-ag/api");
 async function fetchTokenPrices(mints) {
     const currentTime = (0, generalUtils_1.currentUnixSeconds)();
     if (!mints.some((mint) => !(mint.toString() in solautoConstants_1.PRICES) ||
@@ -130,14 +129,14 @@ function safeGetPrice(mint) {
     }
     return undefined;
 }
-async function getPriceImpact(inputMint, inputAmount, outputMint) {
-    const jupApi = (0, api_1.createJupiterApiClient)();
-    const quoteResponse = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => await jupApi.quoteGet({
-        amount: Number(inputAmount),
-        inputMint: inputMint.toString(),
-        outputMint: outputMint.toString(),
-        swapMode: "ExactIn",
-    }), 4, 200);
+async function getPriceImpact(inputMint, outputMint, amount, swapMode) {
+    const quoteResponse = await (0, jupiterUtils_1.getJupQuote)({
+        inputMint,
+        outputMint,
+        amount,
+        exactIn: swapMode === "ExactIn",
+        exactOut: swapMode === "ExactOut",
+    });
     return {
         priceImpact: parseFloat(quoteResponse.priceImpactPct),
         quote: quoteResponse,

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,EAAE,MAAM,iBAAiB,CAAC;AAajD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAoI9C,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;CACjB;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,CAwDjB;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe;;;EAsDxB;AAED,MAAM,WAAW,gBAAgB;IAC/B,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,SAAS,CAAC;IAChB,gBAAgB,EAAE,OAAO,CAAC;CAC3B;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,QAAQ,EAAE,aAAa,GACtB,gBAAgB,GAAG,SAAS,CAgC9B;AAED,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,cAAc,CAAC,CA6EzB"}
+{"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;AAa5E,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAoI9C,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;CACjB;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,CAwDjB;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe;;;EAsDxB;AAED,MAAM,WAAW,gBAAgB;IAC/B,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,SAAS,CAAC;IAChB,gBAAgB,EAAE,OAAO,CAAC;CAC3B;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,QAAQ,EAAE,aAAa,GACtB,gBAAgB,GAAG,SAAS,CAgC9B;AAED,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,cAAc,CAAC,CAwFzB"}

package/dist/utils/solauto/rebalanceUtils.js

@@ -7,6 +7,7 @@ exports.getJupSwapRebalanceDetails = getJupSwapRebalanceDetails;
 const generated_1 = require("../../generated");
 const generalUtils_1 = require("./generalUtils");
 const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
+const jupiterUtils_1 = require("../jupiterUtils");
 const generalUtils_2 = require("../generalUtils");
 const numberUtils_1 = require("../numberUtils");
 const generalAccounts_1 = require("../../constants/generalAccounts");
@@ -165,10 +166,11 @@ async function getJupSwapRebalanceDetails(client, values, targetLiqUtilizationRa
     const output = values.rebalanceDirection === generated_1.RebalanceDirection.Boost
         ? client.solautoPositionState.supply
         : client.solautoPositionState.debt;
+    const rebalanceToZero = targetLiqUtilizationRateBps === 0;
     const usdToSwap = Math.abs(values.debtAdjustmentUsd) +
         (values.dcaTokenType === generated_1.TokenType.Debt ? values.amountUsdToDcaIn : 0);
     let inputAmount = (0, numberUtils_1.toBaseUnit)(usdToSwap / (0, priceUtils_1.safeGetPrice)(input.mint), input.decimals);
-    const outputAmount = targetLiqUtilizationRateBps === 0
+    const outputAmount = rebalanceToZero
         ? output.amountUsed.baseUnit +
             BigInt(Math.round(Number(output.amountUsed.baseUnit) *
                 // Add this small percentage to account for the APR on the debt between now and the transaction
@@ -177,33 +179,41 @@ async function getJupSwapRebalanceDetails(client, values, targetLiqUtilizationRa
     const repaying = values.rebalanceDirection === generated_1.RebalanceDirection.Repay;
     const { requiresFlashLoan, useDebtLiquidity } = rebalanceRequiresFlashLoan(client, values);
     const flashLoanRepayFromDebt = repaying && requiresFlashLoan && useDebtLiquidity;
-    const exactOut = 
-    // targetLiqUtilizationRateBps === 0 ||
-    // values.repayingCloseToMaxLtv ||
-    flashLoanRepayFromDebt;
+    const exactOut = rebalanceToZero || flashLoanRepayFromDebt;
     const exactIn = !exactOut;
+    const jupSwapInput = {
+        inputMint: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(input.mint),
+        outputMint: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(output.mint),
+        exactIn,
+        exactOut,
+        amount: exactOut ? outputAmount : inputAmount,
+    };
     let jupQuote = undefined;
-    if (targetLiqUtilizationRateBps === 0) {
-        let priceImpact = 0;
-        inputAmount += BigInt(Math.round(Number(inputAmount) * 0.001));
-        do {
-            const res = await (0, priceUtils_1.getPriceImpact)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(input.mint), inputAmount + BigInt(Math.round(Number(inputAmount) * priceImpact)), (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(output.mint));
-            priceImpact = res.priceImpact;
-            jupQuote = res.quote;
-            inputAmount = BigInt(parseInt(res.quote.inAmount)) + BigInt(Math.round(Number(inputAmount) * 0.001));
-        } while (parseInt(jupQuote.outAmount) < outputAmount && priceImpact > 0.001);
+    if (rebalanceToZero) {
+        try {
+            jupQuote = await (0, jupiterUtils_1.getJupQuote)(jupSwapInput);
+        }
+        catch {
+            let priceImpact = 0;
+            inputAmount += BigInt(Math.round(Number(inputAmount) * 0.001));
+            do {
+                const res = await (0, priceUtils_1.getPriceImpact)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(input.mint), (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(output.mint), inputAmount + BigInt(Math.round(Number(inputAmount) * priceImpact)), "ExactIn");
+                priceImpact = res.priceImpact;
+                jupQuote = res.quote;
+                inputAmount =
+                    BigInt(parseInt(res.quote.inAmount)) +
+                        BigInt(Math.round(Number(inputAmount) * 0.001));
+            } while (parseInt(jupQuote.outAmount) < outputAmount &&
+                priceImpact > 0.001);
+        }
     }
     const addPadding = exactOut;
     return {
-        inputMint: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(input.mint),
-        outputMint: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(output.mint),
+        ...jupSwapInput,
         destinationWallet: flashLoanRepayFromDebt
             ? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(client.signer.publicKey)
             : client.solautoPosition,
         slippageIncFactor: 0.2 + (attemptNum ?? 0) * 0.25,
-        amount: exactOut ? outputAmount : inputAmount,
-        exactIn,
-        exactOut,
         addPadding,
         jupQuote,
     };

package/package.json

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

@@ -9,22 +9,29 @@ import { fromBps, toBps } from "./numberUtils";
 import {
   createJupiterApiClient,
   Instruction,
+  QuoteGetSwapModeEnum,
   QuoteResponse,
 } from "@jup-ag/api";
 import { getTokenAccount } from "./accountUtils";
-import { consoleLog, retryWithExponentialBackoff } from "./generalUtils";
-import { TOKEN_INFO } from "../constants";
+import {
+  consoleLog,
+  retryWithExponentialBackoff,
+  tokenInfo,
+} from "./generalUtils";
 
 const jupApi = createJupiterApiClient();
 
-export interface JupSwapDetails {
+export interface JupSwapInput {
   inputMint: PublicKey;
   outputMint: PublicKey;
-  destinationWallet: PublicKey;
   amount: bigint;
-  slippageIncFactor?: number;
-  exactOut?: boolean;
   exactIn?: boolean;
+  exactOut?: boolean;
+}
+
+export interface JupSwapDetails extends JupSwapInput {
+  destinationWallet: PublicKey;
+  slippageIncFactor?: number;
   addPadding?: boolean;
   jupQuote?: QuoteResponse;
 }
@@ -43,6 +50,30 @@ function createTransactionInstruction(
   });
 }
 
+export async function getJupQuote(swapDetails: JupSwapInput) {
+  const memecoinSwap =
+    tokenInfo(swapDetails.inputMint).isMeme ||
+    tokenInfo(swapDetails.outputMint).isMeme;
+
+  return await retryWithExponentialBackoff(
+    async () =>
+      await jupApi.quoteGet({
+        amount: Number(swapDetails.amount),
+        inputMint: swapDetails.inputMint.toString(),
+        outputMint: swapDetails.outputMint.toString(),
+        swapMode: swapDetails.exactIn
+          ? "ExactOut"
+          : swapDetails.exactIn
+            ? "ExactIn"
+            : undefined,
+        slippageBps: memecoinSwap ? 500 : 200,
+        maxAccounts: !swapDetails.exactOut ? 40 : undefined,
+      }),
+    4,
+    200
+  );
+}
+
 export interface JupSwapTransaction {
   jupQuote: QuoteResponse;
   priceImpactBps: number;
@@ -57,29 +88,8 @@ export async function getJupSwapTransaction(
   swapDetails: JupSwapDetails,
   attemptNum?: number
 ): Promise<JupSwapTransaction> {
-  const memecoinSwap =
-    TOKEN_INFO[swapDetails.inputMint.toString()].isMeme ||
-    TOKEN_INFO[swapDetails.outputMint.toString()].isMeme;
-
   const quoteResponse =
-    swapDetails.jupQuote ??
-    (await retryWithExponentialBackoff(
-      async () =>
-        await jupApi.quoteGet({
-          amount: Number(swapDetails.amount),
-          inputMint: swapDetails.inputMint.toString(),
-          outputMint: swapDetails.outputMint.toString(),
-          swapMode: swapDetails.exactOut
-            ? "ExactOut"
-            : swapDetails.exactIn
-              ? "ExactIn"
-              : undefined,
-          slippageBps: memecoinSwap ? 500 : 200,
-          maxAccounts: !swapDetails.exactOut ? 40 : undefined,
-        }),
-      4,
-      200
-    ));
+    swapDetails.jupQuote ?? (await getJupQuote(swapDetails));
 
   const priceImpactBps =
     Math.round(toBps(parseFloat(quoteResponse.priceImpactPct))) + 1;

package/src/utils/priceUtils.ts

@@ -12,8 +12,8 @@ import {
   zip,
 } from "./generalUtils";
 import * as OnDemand from "@switchboard-xyz/on-demand";
-import { getJupPriceData } from "./jupiterUtils";
-import { createJupiterApiClient } from "@jup-ag/api";
+import { getJupPriceData, getJupQuote } from "./jupiterUtils";
+import { createJupiterApiClient, QuoteGetSwapModeEnum } from "@jup-ag/api";
 
 export async function fetchTokenPrices(mints: PublicKey[]): Promise<number[]> {
   const currentTime = currentUnixSeconds();
@@ -169,22 +169,17 @@ export function safeGetPrice(
 
 export async function getPriceImpact(
   inputMint: PublicKey,
-  inputAmount: bigint,
-  outputMint: PublicKey
+  outputMint: PublicKey,
+  amount: bigint,
+  swapMode: QuoteGetSwapModeEnum
 ) {
-  const jupApi = createJupiterApiClient();
-
-  const quoteResponse = await retryWithExponentialBackoff(
-    async () =>
-      await jupApi.quoteGet({
-        amount: Number(inputAmount),
-        inputMint: inputMint.toString(),
-        outputMint: outputMint.toString(),
-        swapMode: "ExactIn",
-      }),
-    4,
-    200
-  );
+  const quoteResponse = await getJupQuote({
+    inputMint,
+    outputMint,
+    amount,
+    exactIn: swapMode === "ExactIn",
+    exactOut: swapMode === "ExactOut",
+  });
 
   return {
     priceImpact: parseFloat(quoteResponse.priceImpactPct),

package/src/utils/solauto/rebalanceUtils.ts

@@ -15,7 +15,7 @@ import {
 } from "./generalUtils";
 import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
 import { QuoteResponse } from "@jup-ag/api";
-import { JupSwapDetails } from "../jupiterUtils";
+import { getJupQuote, JupSwapDetails, JupSwapInput } from "../jupiterUtils";
 import { consoleLog, currentUnixSeconds } from "../generalUtils";
 import {
   fromBaseUnit,
@@ -354,6 +354,7 @@ export async function getJupSwapRebalanceDetails(
       ? client.solautoPositionState!.supply
       : client.solautoPositionState!.debt;
 
+  const rebalanceToZero = targetLiqUtilizationRateBps === 0;
   const usdToSwap =
     Math.abs(values.debtAdjustmentUsd) +
     (values.dcaTokenType === TokenType.Debt ? values.amountUsdToDcaIn : 0);
@@ -362,17 +363,16 @@ export async function getJupSwapRebalanceDetails(
     usdToSwap / safeGetPrice(input.mint)!,
     input.decimals
   );
-  const outputAmount =
-    targetLiqUtilizationRateBps === 0
-      ? output.amountUsed.baseUnit +
-        BigInt(
-          Math.round(
-            Number(output.amountUsed.baseUnit) *
-              // Add this small percentage to account for the APR on the debt between now and the transaction
-              0.0001
-          )
+  const outputAmount = rebalanceToZero
+    ? output.amountUsed.baseUnit +
+      BigInt(
+        Math.round(
+          Number(output.amountUsed.baseUnit) *
+            // Add this small percentage to account for the APR on the debt between now and the transaction
+            0.0001
         )
-      : toBaseUnit(usdToSwap / safeGetPrice(output.mint)!, output.decimals);
+      )
+    : toBaseUnit(usdToSwap / safeGetPrice(output.mint)!, output.decimals);
 
   const repaying = values.rebalanceDirection === RebalanceDirection.Repay;
 
@@ -383,41 +383,52 @@ export async function getJupSwapRebalanceDetails(
   const flashLoanRepayFromDebt =
     repaying && requiresFlashLoan && useDebtLiquidity;
 
-  const exactOut =
-    // targetLiqUtilizationRateBps === 0 ||
-    // values.repayingCloseToMaxLtv ||
-    flashLoanRepayFromDebt;
+  const exactOut = rebalanceToZero || flashLoanRepayFromDebt;
   const exactIn = !exactOut;
 
+  const jupSwapInput: JupSwapInput = {
+    inputMint: toWeb3JsPublicKey(input.mint),
+    outputMint: toWeb3JsPublicKey(output.mint),
+    exactIn,
+    exactOut,
+    amount: exactOut ? outputAmount : inputAmount,
+  };
+
   let jupQuote: QuoteResponse | undefined = undefined;
-  if (targetLiqUtilizationRateBps === 0) {
-    let priceImpact: number = 0;
-    inputAmount += BigInt(Math.round(Number(inputAmount) * 0.001));
-
-    do {
-      const res = await getPriceImpact(
-        toWeb3JsPublicKey(input.mint),
-        inputAmount + BigInt(Math.round(Number(inputAmount) * priceImpact)),
-        toWeb3JsPublicKey(output.mint)
+  if (rebalanceToZero) {
+    try {
+      jupQuote = await getJupQuote(jupSwapInput);
+    } catch {
+      let priceImpact: number = 0;
+      inputAmount += BigInt(Math.round(Number(inputAmount) * 0.001));
+
+      do {
+        const res = await getPriceImpact(
+          toWeb3JsPublicKey(input.mint),
+          toWeb3JsPublicKey(output.mint),
+          inputAmount + BigInt(Math.round(Number(inputAmount) * priceImpact)),
+          "ExactIn"
+        );
+        priceImpact = res.priceImpact;
+        jupQuote = res.quote;
+        inputAmount =
+          BigInt(parseInt(res.quote.inAmount)) +
+          BigInt(Math.round(Number(inputAmount) * 0.001));
+      } while (
+        parseInt(jupQuote.outAmount) < outputAmount &&
+        priceImpact > 0.001
       );
-      priceImpact = res.priceImpact;
-      jupQuote = res.quote;
-      inputAmount = BigInt(parseInt(res.quote.inAmount)) + BigInt(Math.round(Number(inputAmount) * 0.001));
-    } while (parseInt(jupQuote.outAmount) < outputAmount && priceImpact > 0.001);
+    }
   }
 
   const addPadding = exactOut;
 
   return {
-    inputMint: toWeb3JsPublicKey(input.mint),
-    outputMint: toWeb3JsPublicKey(output.mint),
+    ...jupSwapInput,
     destinationWallet: flashLoanRepayFromDebt
       ? toWeb3JsPublicKey(client.signer.publicKey)
       : client.solautoPosition,
     slippageIncFactor: 0.2 + (attemptNum ?? 0) * 0.25,
-    amount: exactOut ? outputAmount : inputAmount,
-    exactIn,
-    exactOut,
     addPadding,
     jupQuote,
   };

package/tests/transactions/solautoMarginfi.ts

@@ -21,15 +21,12 @@ import {
 } from "../../src/transactions/transactionsManager";
 import { PublicKey } from "@solana/web3.js";
 import {
-  INF,
   SOLAUTO_PROD_PROGRAM,
   SOLAUTO_TEST_PROGRAM,
   USDC,
 } from "../../src/constants";
 import {
   buildHeliusApiUrl,
-  fetchTokenPrices,
-  getJupPriceData,
   getQnComputeUnitPriceEstimate,
   getSolautoManagedPositions,
 } from "../../src/utils";
@@ -56,23 +53,18 @@ describe("Solauto Marginfi tests", async () => {
     const supplyDecimals = 6;
     const debtDecimals = 6;
 
-    // await client.initialize({
-    //   signer,
-    //   positionId,
-    //   authority: new PublicKey("He4ka5Q3N1UvZikZvykdi47xyk5PoVP2tcQL5sVp31Sz"),
-    //   // new: true,
-    //   // marginfiAccount: new PublicKey(
-    //   //   ""
-    //   // ),
-    //   // marginfiGroup: new PublicKey(""),
-    //   // supplyMint: new PublicKey(""),
-    //   // debtMint: new PublicKey(USDC),
-    // });
-
-    console.log(
-      JSON.stringify(await getJupPriceData([new PublicKey(INF)], true), null, 2)
-    );
-    return;
+    await client.initialize({
+      signer,
+      positionId,
+      authority: new PublicKey("He4ka5Q3N1UvZikZvykdi47xyk5PoVP2tcQL5sVp31Sz"),
+      // new: true,
+      // marginfiAccount: new PublicKey(
+      //   ""
+      // ),
+      // marginfiGroup: new PublicKey(""),
+      // supplyMint: new PublicKey(""),
+      // debtMint: new PublicKey(USDC),
+    });
 
     // console.log(
     //   JSON.stringify(