@haven-fi/solauto-sdk 1.0.434 → 1.0.436

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;AAmI9C,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,CA2E9B;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,cAAc,CA8ChB"}
+{"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,CA8ChB"}

package/dist/utils/solauto/rebalanceUtils.js

@@ -128,10 +128,13 @@ function getFlashLoanDetails(client, values, jupQuote) {
     (0, generalUtils_2.consoleLog)("Intermediary liq utilization rate:", tempLiqUtilizationRateBps, `$${supplyUsd}`, `$${debtUsd}`, "Max:", maxLiqUtilizationRateBps);
     let flashLoanToken = undefined;
     let flashLoanTokenPrice = 0;
-    const baseUnitAmount = BigInt(parseInt(jupQuote.inAmount));
-    if (values.rebalanceDirection === generated_1.RebalanceDirection.Boost ||
-        baseUnitAmount <=
-            (client.solautoPositionState?.debt.amountCanBeUsed.baseUnit ?? BigInt(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) {
         flashLoanToken = client.solautoPositionState.debt;
         flashLoanTokenPrice = (0, priceUtils_1.safeGetPrice)(client.debtMint);
     }
@@ -142,11 +145,13 @@ 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
         ? {
             baseUnitAmount,
             mint: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(flashLoanToken.mint),
-            useDebtLiquidity: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(flashLoanToken.mint).equals(client.debtMint),
+            useDebtLiquidity,
         }
         : undefined;
 }

package/package.json

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

@@ -30,6 +30,7 @@ import {
 import { USD_DECIMALS } from "../../constants/generalAccounts";
 import { RebalanceAction } from "../../types";
 import { safeGetPrice } from "../priceUtils";
+import { TOKEN_INFO } from "../../constants";
 
 function getAdditionalAmountToDcaIn(dca: DCASettings): number {
   if (dca.dcaInBaseUnit === BigInt(0)) {
@@ -294,13 +295,19 @@ export function getFlashLoanDetails(
   let flashLoanToken: PositionTokenUsage | undefined = undefined;
   let flashLoanTokenPrice = 0;
 
-  const baseUnitAmount = BigInt(parseInt(jupQuote.inAmount));
+  const inAmount = BigInt(parseInt(jupQuote.inAmount));
+  const outAmount = BigInt(parseInt(jupQuote.outAmount));
 
-  if (
-    values.rebalanceDirection === RebalanceDirection.Boost ||
-    baseUnitAmount <=
-      (client.solautoPositionState?.debt.amountCanBeUsed.baseUnit ?? BigInt(0))
-  ) {
+  const sufficientDebtLiquidity =
+    debtAdjustmentUsdAbs * 1.1 <=
+    fromBaseUnit(
+      client.solautoPositionState?.debt.amountCanBeUsed.baseAmountUsdValue ??
+        BigInt(0),
+      USD_DECIMALS
+    );
+
+  const boosting = values.rebalanceDirection === RebalanceDirection.Boost;
+  if (boosting || sufficientDebtLiquidity) {
     flashLoanToken = client.solautoPositionState!.debt;
     flashLoanTokenPrice = safeGetPrice(client.debtMint)!;
   } else {
@@ -312,13 +319,17 @@ 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;
+
   return requiresFlashLoan
     ? {
         baseUnitAmount,
         mint: toWeb3JsPublicKey(flashLoanToken.mint),
-        useDebtLiquidity: toWeb3JsPublicKey(flashLoanToken.mint).equals(
-          client.debtMint
-        ),
+        useDebtLiquidity,
       }
     : undefined;
 }