@haven-fi/solauto-sdk 1.0.437 → 1.0.439

package/dist/clients/solautoMarginfiClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"solautoMarginfiClient.d.ts","sourceRoot":"","sources":["../../src/clients/solautoMarginfiClient.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,MAAM,EACN,kBAAkB,EAMnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAM1D,OAAO,EACL,kBAAkB,EAElB,aAAa,EAGb,iBAAiB,EACjB,wBAAwB,EACxB,gCAAgC,EAKjC,MAAM,cAAc,CAAC;AAEtB,OAAO,EAEL,eAAe,EAUhB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,gBAAgB,EAChB,eAAe,EAChB,MAAM,iCAAiC,CAAC;AASzC,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAG5C,MAAM,WAAW,yBAA0B,SAAQ,iBAAiB;IAClE,eAAe,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;IACrC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,aAAa,CAAC,EAAE,SAAS,CAAC;CAC3B;AAED,qBAAa,qBAAsB,SAAQ,aAAa;IACtD,OAAO,CAAC,cAAc,CAAC,CAAY;IAE5B,eAAe,EAAG,SAAS,CAAC;IAE5B,sBAAsB,EAAE,MAAM,CAAa;IAC3C,eAAe,EAAG,SAAS,GAAG,MAAM,CAAC;IACrC,iBAAiB,EAAG,SAAS,CAAC;IAC9B,aAAa,EAAG,SAAS,CAAC;IAE1B,sBAAsB,EAAG,qBAAqB,CAAC;IAC/C,oBAAoB,EAAG,qBAAqB,CAAC;IAE7C,iBAAiB,EAAG,SAAS,CAAC;IAC9B,eAAe,EAAG,SAAS,CAAC;IAG5B,iCAAiC,CAAC,EAAE,MAAM,CAAC;IAC3C,6BAA6B,EAAG,SAAS,CAAC;IAC1C,2BAA2B,CAAC,EAAE,eAAe,CAAC;IAE/C,UAAU,CAAC,IAAI,EAAE,yBAAyB;IA2F1C,8BAA8B;IAwCpC,eAAe,IAAI,SAAS;IAI5B,mBAAmB,IAAI,MAAM,EAAE;IAI/B,gBAAgB,IAAI,SAAS,EAAE;IAUzB,wBAAwB,IAAI,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,CAAC;IA0BvE,yBAAyB,CAAC,eAAe,EAAE,MAAM,GAAG,kBAAkB;IAStE,YAAY,CACV,aAAa,CAAC,EAAE,gCAAgC,EAChD,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IAMrB,OAAO,CAAC,sBAAsB;IA6C9B,OAAO,IAAI,kBAAkB;IAc7B,mBAAmB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAUhE,OAAO,CAAC,6BAA6B;IAmErC,OAAO,CAAC,oCAAoC;IA0D5C,SAAS,CACP,aAAa,EAAE,GAAG,GAAG,GAAG,EACxB,QAAQ,EAAE,aAAa,EACvB,aAAa,EAAE,wBAAwB,EACvC,eAAe,EAAE,eAAe,EAChC,SAAS,CAAC,EAAE,gBAAgB,EAC5B,2BAA2B,CAAC,EAAE,MAAM,GACnC,kBAAkB;IAgFrB,WAAW,CACT,gBAAgB,EAAE,gBAAgB,EAClC,uBAAuB,EAAE,SAAS,GACjC,kBAAkB;IA2BrB,UAAU,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,kBAAkB;IAoF5D,qBAAqB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;CA8ClE"}
+{"version":3,"file":"solautoMarginfiClient.d.ts","sourceRoot":"","sources":["../../src/clients/solautoMarginfiClient.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,MAAM,EACN,kBAAkB,EAMnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAM1D,OAAO,EACL,kBAAkB,EAElB,aAAa,EAGb,iBAAiB,EACjB,wBAAwB,EACxB,gCAAgC,EAKjC,MAAM,cAAc,CAAC;AAEtB,OAAO,EAEL,eAAe,EAUhB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,gBAAgB,EAChB,eAAe,EAChB,MAAM,iCAAiC,CAAC;AASzC,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAG5C,MAAM,WAAW,yBAA0B,SAAQ,iBAAiB;IAClE,eAAe,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;IACrC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,aAAa,CAAC,EAAE,SAAS,CAAC;CAC3B;AAED,qBAAa,qBAAsB,SAAQ,aAAa;IACtD,OAAO,CAAC,cAAc,CAAC,CAAY;IAE5B,eAAe,EAAG,SAAS,CAAC;IAE5B,sBAAsB,EAAE,MAAM,CAAa;IAC3C,eAAe,EAAG,SAAS,GAAG,MAAM,CAAC;IACrC,iBAAiB,EAAG,SAAS,CAAC;IAC9B,aAAa,EAAG,SAAS,CAAC;IAE1B,sBAAsB,EAAG,qBAAqB,CAAC;IAC/C,oBAAoB,EAAG,qBAAqB,CAAC;IAE7C,iBAAiB,EAAG,SAAS,CAAC;IAC9B,eAAe,EAAG,SAAS,CAAC;IAG5B,iCAAiC,CAAC,EAAE,MAAM,CAAC;IAC3C,6BAA6B,EAAG,SAAS,CAAC;IAC1C,2BAA2B,CAAC,EAAE,eAAe,CAAC;IAE/C,UAAU,CAAC,IAAI,EAAE,yBAAyB;IA2F1C,8BAA8B;IAwCpC,eAAe,IAAI,SAAS;IAI5B,mBAAmB,IAAI,MAAM,EAAE;IAI/B,gBAAgB,IAAI,SAAS,EAAE;IAUzB,wBAAwB,IAAI,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,CAAC;IA0BvE,yBAAyB,CAAC,eAAe,EAAE,MAAM,GAAG,kBAAkB;IAStE,YAAY,CACV,aAAa,CAAC,EAAE,gCAAgC,EAChD,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IAMrB,OAAO,CAAC,sBAAsB;IA6C9B,OAAO,IAAI,kBAAkB;IAc7B,mBAAmB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAUhE,OAAO,CAAC,6BAA6B;IAmErC,OAAO,CAAC,oCAAoC;IA0D5C,SAAS,CACP,aAAa,EAAE,GAAG,GAAG,GAAG,EACxB,QAAQ,EAAE,aAAa,EACvB,aAAa,EAAE,wBAAwB,EACvC,eAAe,EAAE,eAAe,EAChC,SAAS,CAAC,EAAE,gBAAgB,EAC5B,2BAA2B,CAAC,EAAE,MAAM,GACnC,kBAAkB;IA+ErB,WAAW,CACT,gBAAgB,EAAE,gBAAgB,EAClC,uBAAuB,EAAE,SAAS,GACjC,kBAAkB;IA2BrB,UAAU,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,kBAAkB;IAoF5D,qBAAqB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;CA8ClE"}

package/dist/clients/solautoMarginfiClient.js

@@ -358,7 +358,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
                 : undefined,
             rebalanceType,
             targetLiqUtilizationRateBps: targetLiqUtilizationRateBps ?? null,
-            targetInAmountBaseUnit: rebalanceStep === "A" ? parseInt(jupQuote.inAmount) : null,
+            targetInAmountBaseUnit: parseInt(jupQuote.inAmount),
         });
     }
     flashBorrow(flashLoanDetails, destinationTokenAccount) {

package/dist/transactions/transactionUtils.js

@@ -375,7 +375,7 @@ async function buildSolautoRebalanceTransaction(client, targetLiqUtilizationRate
     client.log("Rebalance values: ", values);
     const swapDetails = (0, rebalanceUtils_1.getJupSwapRebalanceDetails)(client, values, targetLiqUtilizationRateBps, attemptNum);
     const { jupQuote, lookupTableAddresses, setupInstructions, tokenLedgerIx, swapIx, } = await (0, jupiterUtils_1.getJupSwapTransaction)(client.signer, swapDetails, attemptNum);
-    const flashLoan = (0, rebalanceUtils_1.getFlashLoanDetails)(client, values, jupQuote);
+    const flashLoan = (0, rebalanceUtils_1.getFlashLoanDetails)(client, values, swapDetails, jupQuote);
     let tx = (0, umi_1.transactionBuilder)();
     if (await requiresRefreshBeforeRebalance(client)) {
         tx = tx.add(client.refresh());

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

@@ -15,11 +15,15 @@ export interface RebalanceValues {
     feesUsd: number;
 }
 export declare function getRebalanceValues(state: PositionState, settings: SolautoSettingsParameters | undefined, dca: DCASettings | undefined, currentUnixTime: number, supplyPrice: number, debtPrice: number, targetLiqUtilizationRateBps?: number): RebalanceValues;
+export declare function rebalanceRequiresFlashLoan(client: SolautoClient, values: RebalanceValues): {
+    requiresFlashLoan: boolean;
+    useDebtLiquidity: boolean;
+};
 export interface FlashLoanDetails {
     baseUnitAmount: bigint;
     mint: PublicKey;
     useDebtLiquidity: boolean;
 }
-export declare function getFlashLoanDetails(client: SolautoClient, values: RebalanceValues, jupQuote: QuoteResponse): FlashLoanDetails | undefined;
+export declare function getFlashLoanDetails(client: SolautoClient, values: RebalanceValues, swapDetails: JupSwapDetails, jupQuote: QuoteResponse): FlashLoanDetails | undefined;
 export declare function getJupSwapRebalanceDetails(client: SolautoClient, values: RebalanceValues, targetLiqUtilizationRateBps?: number, attemptNum?: number): JupSwapDetails;
 //# sourceMappingURL=rebalanceUtils.d.ts.map

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,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,CAqF9B;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,cAAc,CA6ChB"}
+{"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,WAAW,EAAE,cAAc,EAC3B,QAAQ,EAAE,aAAa,GACtB,gBAAgB,GAAG,SAAS,CAmC9B;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,cAAc,CAwDhB"}

package/dist/utils/solauto/rebalanceUtils.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRebalanceValues = getRebalanceValues;
+exports.rebalanceRequiresFlashLoan = rebalanceRequiresFlashLoan;
 exports.getFlashLoanDetails = getFlashLoanDetails;
 exports.getJupSwapRebalanceDetails = getJupSwapRebalanceDetails;
 const generated_1 = require("../../generated");
@@ -108,7 +109,7 @@ function getRebalanceValues(state, settings, dca, currentUnixTime, supplyPrice,
         feesUsd: Math.abs(debtAdjustmentUsd * (0, numberUtils_1.fromBps)(adjustmentFeeBps)),
     };
 }
-function getFlashLoanDetails(client, values, jupQuote) {
+function rebalanceRequiresFlashLoan(client, values) {
     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);
@@ -126,15 +127,19 @@ function getFlashLoanDetails(client, values, jupQuote) {
     const requiresFlashLoan = supplyUsd <= 0 || tempLiqUtilizationRateBps > maxLiqUtilizationRateBps;
     (0, generalUtils_2.consoleLog)("Requires flash loan:", requiresFlashLoan);
     (0, generalUtils_2.consoleLog)("Intermediary liq utilization rate:", tempLiqUtilizationRateBps, `$${supplyUsd}`, `$${debtUsd}`, "Max:", maxLiqUtilizationRateBps);
+    const useDebtLiquidity = Math.abs(values.debtAdjustmentUsd) * 1.1 <=
+        (0, numberUtils_1.fromBaseUnit)(client.solautoPositionState?.debt.amountCanBeUsed.baseAmountUsdValue ??
+            BigInt(0), generalAccounts_1.USD_DECIMALS);
+    return { requiresFlashLoan, useDebtLiquidity };
+}
+function getFlashLoanDetails(client, values, swapDetails, jupQuote) {
+    const { requiresFlashLoan, useDebtLiquidity } = rebalanceRequiresFlashLoan(client, values);
     let flashLoanToken = undefined;
     let flashLoanTokenPrice = 0;
     const inAmount = BigInt(parseInt(jupQuote.inAmount));
     const outAmount = BigInt(parseInt(jupQuote.outAmount));
-    const sufficientDebtLiquidity = debtAdjustmentUsdAbs * 1.1 <=
-        (0, numberUtils_1.fromBaseUnit)(client.solautoPositionState?.debt.amountCanBeUsed.baseAmountUsdValue ??
-            BigInt(0), generalAccounts_1.USD_DECIMALS);
     const boosting = values.rebalanceDirection === generated_1.RebalanceDirection.Boost;
-    if (boosting || sufficientDebtLiquidity) {
+    if (boosting || useDebtLiquidity) {
         flashLoanToken = client.solautoPositionState.debt;
         flashLoanTokenPrice = (0, priceUtils_1.safeGetPrice)(client.debtMint);
     }
@@ -145,7 +150,6 @@ function getFlashLoanDetails(client, values, jupQuote) {
     if (jupQuote.swapMode !== "ExactOut" && jupQuote.swapMode !== "ExactIn") {
         throw new Error("Token ledger swap not currently supported");
     }
-    const useDebtLiquidity = (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(flashLoanToken.mint).equals(client.debtMint);
     const baseUnitAmount = boosting || (!boosting && !useDebtLiquidity) ? inAmount : outAmount;
     return requiresFlashLoan
         ? {
@@ -171,13 +175,20 @@ function getJupSwapRebalanceDetails(client, values, targetLiqUtilizationRateBps,
                 // Add this small percentage to account for the APR on the debt between now and the transaction
                 0.0001))
         : (0, numberUtils_1.toBaseUnit)(usdToSwap / (0, priceUtils_1.safeGetPrice)(output.mint), output.decimals);
-    const exactOut = values.rebalanceDirection === generated_1.RebalanceDirection.Repay;
+    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 exactIn = !exactOut;
     const addPadding = targetLiqUtilizationRateBps === 0;
     return {
         inputMint: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(input.mint),
         outputMint: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(output.mint),
-        destinationWallet: client.solautoPosition,
+        destinationWallet: flashLoanRepayFromDebt
+            ? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(client.signer.publicKey)
+            : client.solautoPosition,
         slippageIncFactor: 0.5 + (attemptNum ?? 0) * 0.25,
         amount: exactOut ? outputAmount : inputAmount,
         exactIn: exactIn,

package/package.json

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

package/src/clients/solautoMarginfiClient.ts

@@ -558,8 +558,7 @@ export class SolautoMarginfiClient extends SolautoClient {
         : undefined,
       rebalanceType,
       targetLiqUtilizationRateBps: targetLiqUtilizationRateBps ?? null,
-      targetInAmountBaseUnit:
-        rebalanceStep === "A" ? parseInt(jupQuote.inAmount) : null,
+      targetInAmountBaseUnit: parseInt(jupQuote.inAmount),
     });
   }
 

package/src/transactions/transactionUtils.ts

@@ -703,7 +703,7 @@ export async function buildSolautoRebalanceTransaction(
     tokenLedgerIx,
     swapIx,
   } = await getJupSwapTransaction(client.signer, swapDetails, attemptNum);
-  const flashLoan = getFlashLoanDetails(client, values, jupQuote);
+  const flashLoan = getFlashLoanDetails(client, values, swapDetails, jupQuote);
 
   let tx = transactionBuilder();
 

package/src/utils/solauto/rebalanceUtils.ts

@@ -237,17 +237,10 @@ export function getRebalanceValues(
   };
 }
 
-export interface FlashLoanDetails {
-  baseUnitAmount: bigint;
-  mint: PublicKey;
-  useDebtLiquidity: boolean;
-}
-
-export function getFlashLoanDetails(
+export function rebalanceRequiresFlashLoan(
   client: SolautoClient,
-  values: RebalanceValues,
-  jupQuote: QuoteResponse
-): FlashLoanDetails | undefined {
+  values: RebalanceValues
+) {
   let supplyUsd =
     fromBaseUnit(
       client.solautoPositionState!.supply.amountUsed.baseAmountUsdValue,
@@ -292,22 +285,41 @@ export function getFlashLoanDetails(
     maxLiqUtilizationRateBps
   );
 
-  let flashLoanToken: PositionTokenUsage | undefined = undefined;
-  let flashLoanTokenPrice = 0;
-
-  const inAmount = BigInt(parseInt(jupQuote.inAmount));
-  const outAmount = BigInt(parseInt(jupQuote.outAmount));
-
-  const sufficientDebtLiquidity =
-    debtAdjustmentUsdAbs * 1.1 <=
+  const useDebtLiquidity =
+    Math.abs(values.debtAdjustmentUsd) * 1.1 <=
     fromBaseUnit(
       client.solautoPositionState?.debt.amountCanBeUsed.baseAmountUsdValue ??
         BigInt(0),
       USD_DECIMALS
     );
+  return { requiresFlashLoan, useDebtLiquidity };
+}
+
+export interface FlashLoanDetails {
+  baseUnitAmount: bigint;
+  mint: PublicKey;
+  useDebtLiquidity: boolean;
+}
+
+export function getFlashLoanDetails(
+  client: SolautoClient,
+  values: RebalanceValues,
+  swapDetails: JupSwapDetails,
+  jupQuote: QuoteResponse
+): FlashLoanDetails | undefined {
+  const { requiresFlashLoan, useDebtLiquidity } = rebalanceRequiresFlashLoan(
+    client,
+    values
+  );
+
+  let flashLoanToken: PositionTokenUsage | undefined = undefined;
+  let flashLoanTokenPrice = 0;
+
+  const inAmount = BigInt(parseInt(jupQuote.inAmount));
+  const outAmount = BigInt(parseInt(jupQuote.outAmount));
 
   const boosting = values.rebalanceDirection === RebalanceDirection.Boost;
-  if (boosting || sufficientDebtLiquidity) {
+  if (boosting || useDebtLiquidity) {
     flashLoanToken = client.solautoPositionState!.debt;
     flashLoanTokenPrice = safeGetPrice(client.debtMint)!;
   } else {
@@ -319,9 +331,6 @@ export function getFlashLoanDetails(
     throw new Error("Token ledger swap not currently supported");
   }
 
-  const useDebtLiquidity = toWeb3JsPublicKey(flashLoanToken.mint).equals(
-    client.debtMint
-  );
   const baseUnitAmount =
     boosting || (!boosting && !useDebtLiquidity) ? inAmount : outAmount;
 
@@ -369,7 +378,16 @@ export function getJupSwapRebalanceDetails(
         )
       : toBaseUnit(usdToSwap / safeGetPrice(output.mint)!, output.decimals);
 
-  const exactOut = values.rebalanceDirection === RebalanceDirection.Repay;
+  const repaying = values.rebalanceDirection === RebalanceDirection.Repay;
+
+  const { requiresFlashLoan, useDebtLiquidity } = rebalanceRequiresFlashLoan(client, values);
+  const flashLoanRepayFromDebt =
+    repaying && requiresFlashLoan && useDebtLiquidity;
+
+  const exactOut =
+    targetLiqUtilizationRateBps === 0 ||
+    values.repayingCloseToMaxLtv ||
+    flashLoanRepayFromDebt;
   const exactIn = !exactOut;
 
   const addPadding = targetLiqUtilizationRateBps === 0;
@@ -377,7 +395,9 @@ export function getJupSwapRebalanceDetails(
   return {
     inputMint: toWeb3JsPublicKey(input.mint),
     outputMint: toWeb3JsPublicKey(output.mint),
-    destinationWallet: client.solautoPosition,
+    destinationWallet: flashLoanRepayFromDebt
+      ? toWeb3JsPublicKey(client.signer.publicKey)
+      : client.solautoPosition,
     slippageIncFactor: 0.5 + (attemptNum ?? 0) * 0.25,
     amount: exactOut ? outputAmount : inputAmount,
     exactIn: exactIn,