@haven-fi/solauto-sdk 1.0.529 → 1.0.531

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,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;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,CAsEzB"}
+{"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 + swapOutputUsd
+        : supplyUsd - debtAdjustmentUsdAbs;
+    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;
 }
@@ -152,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);
@@ -194,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 < 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, 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.01));
+        }
+        else {
+            break;
+        }
+    }
+    return jupQuote;
+}
 async function getJupSwapRebalanceDetails(client, values, flRequirements, targetLiqUtilizationRateBps, attemptNum) {
     const input = values.rebalanceDirection === generated_1.RebalanceDirection.Boost
         ? client.solautoPositionState.debt
@@ -216,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),
@@ -225,15 +272,14 @@ 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) - 15
+                : undefined,
+        });
     }
-    (0, generalUtils_2.consoleLog)("Quote:", jupQuote);
     const addPadding = exactOut;
     return {
         ...jupSwapInput,

package/package.json

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

@@ -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 + swapOutputUsd
+    : supplyUsd - debtAdjustmentUsdAbs;
+  debtUsd = boost ? debtUsd + debtAdjustmentUsdAbs : debtUsd - swapOutputUsd;
+
+  return getLiqUtilzationRateBps(
+    supplyUsd,
+    debtUsd,
+    client.solautoPositionState?.liqThresholdBps ?? 0
+  );
+}
+
 function insufficientLiquidity(
   amountNeeded: number,
   liquidity: bigint,
@@ -336,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();
@@ -417,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 < 10; i++) {
+    consoleLog("Finding sufficient quote...");
+    jupQuote = await getJupQuote(jupSwapInput);
+
+    const outputAmount = parseInt(jupQuote.outAmount);
+    const postRebalanceRate = postRebalanceLiqUtilizationRateBps(
+      client,
+      values,
+      BigInt(outputAmount)
+    );
+    insufficient = criteria.minOutputAmount
+      ? outputAmount < Number(criteria.minOutputAmount)
+      : criteria.minLiqUtilizationRateBps
+        ? postRebalanceRate < criteria.minLiqUtilizationRateBps
+        : postRebalanceRate > criteria.maxLiqUtilizationRateBps!;
+
+    if (insufficient) {
+      consoleLog(jupQuote);
+      jupSwapInput.amount =
+        jupSwapInput.amount +
+        BigInt(Math.round(Number(jupSwapInput.amount) * 0.01));
+    } else {
+      break;
+    }
+  }
+
+  return jupQuote!;
+}
+
 export async function getJupSwapRebalanceDetails(
   client: SolautoClient,
   values: RebalanceValues,
@@ -462,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),
@@ -472,15 +558,17 @@ 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
+          ) - 15
+        : undefined,
+    });
   }
-  consoleLog("Quote:", jupQuote);
 
   const addPadding = exactOut;