@haven-fi/solauto-sdk 1.0.171 → 1.0.172

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,yBAAyB,EACzB,SAAS,EACV,MAAM,iBAAiB,CAAC;AAOzB,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AA+IjD,MAAM,WAAW,eAAe;IAC9B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,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;CAC1B;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,EACpC,WAAW,CAAC,EAAE,MAAM,GACnB,eAAe,CAmEjB;AAED,MAAM,WAAW,gBAAgB;IAC/B,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,QAAQ,EAAE,aAAa,EACvB,cAAc,EAAE,MAAM,GACrB,gBAAgB,GAAG,SAAS,CAgE9B;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,cAAc,CA4ChB"}
+{"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,yBAAyB,EACzB,SAAS,EACV,MAAM,iBAAiB,CAAC;AAOzB,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AA+IjD,MAAM,WAAW,eAAe;IAC9B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,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;CAC1B;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,EACpC,WAAW,CAAC,EAAE,MAAM,GACnB,eAAe,CAoEjB;AAED,MAAM,WAAW,gBAAgB;IAC/B,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,QAAQ,EAAE,aAAa,EACvB,cAAc,EAAE,MAAM,GACrB,gBAAgB,GAAG,SAAS,CA0D9B;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,cAAc,CAyChB"}

package/dist/utils/solauto/rebalanceUtils.js

@@ -120,16 +120,11 @@ function getFlashLoanDetails(client, values, jupQuote, priceImpactBps) {
     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 debtAdjustmentWithSlippage = Math.abs(values.debtAdjustmentUsd) +
-        Math.abs(values.debtAdjustmentUsd) * (0, numberUtils_1.fromBps)(priceImpactBps);
+    const debtAdjustmentUsd = Math.abs(values.debtAdjustmentUsd);
     supplyUsd =
-        values.debtAdjustmentUsd < 0
-            ? supplyUsd - debtAdjustmentWithSlippage
-            : supplyUsd;
+        values.debtAdjustmentUsd < 0 ? supplyUsd - debtAdjustmentUsd : supplyUsd;
     debtUsd =
-        values.debtAdjustmentUsd > 0
-            ? debtUsd + debtAdjustmentWithSlippage
-            : debtUsd;
+        values.debtAdjustmentUsd > 0 ? debtUsd + debtAdjustmentUsd : debtUsd;
     const tempLiqUtilizationRateBps = (0, numberUtils_1.getLiqUtilzationRateBps)(supplyUsd, debtUsd, client.solautoPositionState.liqThresholdBps);
     const requiresFlashLoan = supplyUsd <= 0 ||
         tempLiqUtilizationRateBps >
@@ -151,7 +146,7 @@ function getFlashLoanDetails(client, values, jupQuote, priceImpactBps) {
         ? {
             baseUnitAmount: exactAmountBaseUnit
                 ? exactAmountBaseUnit
-                : (0, numberUtils_1.toBaseUnit)(debtAdjustmentWithSlippage / flashLoanTokenPrice, flashLoanToken.decimals),
+                : (0, numberUtils_1.toBaseUnit)(debtAdjustmentUsd / flashLoanTokenPrice, flashLoanToken.decimals),
             mint: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(flashLoanToken.mint),
         }
         : undefined;
@@ -166,7 +161,12 @@ function getJupSwapRebalanceDetails(client, values, targetLiqUtilizationRateBps,
     const usdToSwap = Math.abs(values.debtAdjustmentUsd) +
         (values.dcaTokenType === generated_1.TokenType.Debt ? values.amountUsdToDcaIn : 0);
     const inputAmount = (0, numberUtils_1.toBaseUnit)(usdToSwap / (0, generalUtils_2.safeGetPrice)(input.mint), input.decimals);
-    const outputAmount = (0, numberUtils_1.toBaseUnit)(usdToSwap / (0, generalUtils_2.safeGetPrice)(output.mint), output.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))
+        : (0, numberUtils_1.toBaseUnit)(usdToSwap / (0, generalUtils_2.safeGetPrice)(output.mint), output.decimals);
     const exactOut = targetLiqUtilizationRateBps === 0 || values.repayingCloseToMaxLtv;
     const exactIn = !exactOut;
     return {
@@ -174,14 +174,7 @@ function getJupSwapRebalanceDetails(client, values, targetLiqUtilizationRateBps,
         outputMint: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(output.mint),
         destinationWallet: client.solautoPosition,
         slippageIncFactor: 0.5 + (attemptNum ?? 0) * 0.2,
-        amount: exactOut
-            ? outputAmount +
-                (targetLiqUtilizationRateBps === 0
-                    ? BigInt(Math.round(Number(outputAmount) *
-                        // Add this small percentage to account for the APR on the debt between now and the transaction
-                        0.0001))
-                    : BigInt(0))
-            : inputAmount,
+        amount: exactOut ? outputAmount : inputAmount,
         exactIn: exactIn,
         exactOut: exactOut,
     };

package/package.json

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

@@ -237,7 +237,8 @@ export function getRebalanceValues(
   return {
     increasingLeverage,
     debtAdjustmentUsd,
-    repayingCloseToMaxLtv: state.liqUtilizationRateBps > maxRepayTo && targetRateBps >= maxRepayTo,
+    repayingCloseToMaxLtv:
+      state.liqUtilizationRateBps > maxRepayTo && targetRateBps >= maxRepayTo,
     amountToDcaIn: amountToDcaIn ?? 0,
     amountUsdToDcaIn,
     dcaTokenType: dca?.tokenType,
@@ -266,17 +267,11 @@ export function getFlashLoanDetails(
     USD_DECIMALS
   );
 
-  const debtAdjustmentWithSlippage =
-    Math.abs(values.debtAdjustmentUsd) +
-    Math.abs(values.debtAdjustmentUsd) * fromBps(priceImpactBps);
+  const debtAdjustmentUsd = Math.abs(values.debtAdjustmentUsd);
   supplyUsd =
-    values.debtAdjustmentUsd < 0
-      ? supplyUsd - debtAdjustmentWithSlippage
-      : supplyUsd;
+    values.debtAdjustmentUsd < 0 ? supplyUsd - debtAdjustmentUsd : supplyUsd;
   debtUsd =
-    values.debtAdjustmentUsd > 0
-      ? debtUsd + debtAdjustmentWithSlippage
-      : debtUsd;
+    values.debtAdjustmentUsd > 0 ? debtUsd + debtAdjustmentUsd : debtUsd;
 
   const tempLiqUtilizationRateBps = getLiqUtilzationRateBps(
     supplyUsd,
@@ -312,7 +307,7 @@ export function getFlashLoanDetails(
         baseUnitAmount: exactAmountBaseUnit
           ? exactAmountBaseUnit
           : toBaseUnit(
-              debtAdjustmentWithSlippage / flashLoanTokenPrice,
+              debtAdjustmentUsd / flashLoanTokenPrice,
               flashLoanToken.decimals
             ),
         mint: toWeb3JsPublicKey(flashLoanToken.mint),
@@ -341,12 +336,20 @@ export function getJupSwapRebalanceDetails(
     usdToSwap / safeGetPrice(input.mint)!,
     input.decimals
   );
-  const outputAmount = toBaseUnit(
-    usdToSwap / safeGetPrice(output.mint)!,
-    output.decimals
-  );
-
-  const exactOut = targetLiqUtilizationRateBps === 0 || values.repayingCloseToMaxLtv;
+  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
+          )
+        )
+      : toBaseUnit(usdToSwap / safeGetPrice(output.mint)!, output.decimals);
+
+  const exactOut =
+    targetLiqUtilizationRateBps === 0 || values.repayingCloseToMaxLtv;
   const exactIn = !exactOut;
 
   return {
@@ -354,18 +357,7 @@ export function getJupSwapRebalanceDetails(
     outputMint: toWeb3JsPublicKey(output.mint),
     destinationWallet: client.solautoPosition,
     slippageIncFactor: 0.5 + (attemptNum ?? 0) * 0.2,
-    amount: exactOut
-      ? outputAmount +
-        (targetLiqUtilizationRateBps === 0
-          ? BigInt(
-              Math.round(
-                Number(outputAmount) *
-                  // Add this small percentage to account for the APR on the debt between now and the transaction
-                  0.0001
-              )
-            )
-          : BigInt(0))
-      : inputAmount,
+    amount: exactOut ? outputAmount : inputAmount,
     exactIn: exactIn,
     exactOut: exactOut,
   };