@haven-fi/solauto-sdk 1.0.509 → 1.0.510

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;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,CA0FzB"}
+{"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,CA6FzB"}

package/dist/utils/solauto/rebalanceUtils.js

@@ -170,12 +170,10 @@ async function getJupSwapRebalanceDetails(client, values, targetLiqUtilizationRa
     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 = 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))
-        : (0, numberUtils_1.toBaseUnit)(usdToSwap / (0, priceUtils_1.safeGetPrice)(output.mint), output.decimals);
+    const outputAmount = 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 repaying = values.rebalanceDirection === generated_1.RebalanceDirection.Repay;
     const { requiresFlashLoan, useDebtLiquidity } = rebalanceRequiresFlashLoan(client, values);
     const flashLoanRepayFromDebt = repaying && requiresFlashLoan && useDebtLiquidity;
@@ -188,6 +186,8 @@ async function getJupSwapRebalanceDetails(client, values, targetLiqUtilizationRa
         exactOut,
         amount: exactOut ? outputAmount : inputAmount,
     };
+    (0, generalUtils_2.consoleLog)(targetLiqUtilizationRateBps, rebalanceToZero);
+    (0, generalUtils_2.consoleLog)(jupSwapInput);
     let jupQuote = undefined;
     if (rebalanceToZero) {
         try {
@@ -197,9 +197,11 @@ async function getJupSwapRebalanceDetails(client, values, targetLiqUtilizationRa
             let priceImpact = 0;
             jupSwapInput.exactIn = true;
             jupSwapInput.exactOut = false;
-            jupSwapInput.amount = inputAmount + BigInt(Math.round(Number(inputAmount) * 0.001));
+            jupSwapInput.amount =
+                inputAmount + BigInt(Math.round(Number(inputAmount) * 0.001));
             do {
-                const res = await (0, priceUtils_1.getPriceImpact)(jupSwapInput.inputMint, jupSwapInput.outputMint, jupSwapInput.amount + BigInt(Math.round(Number(jupSwapInput.amount) * priceImpact)), "ExactIn");
+                const res = await (0, priceUtils_1.getPriceImpact)(jupSwapInput.inputMint, jupSwapInput.outputMint, jupSwapInput.amount +
+                    BigInt(Math.round(Number(jupSwapInput.amount) * priceImpact)), "ExactIn");
                 priceImpact = res.priceImpact;
                 jupQuote = res.quote;
                 jupSwapInput.amount =

package/package.json

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

@@ -363,16 +363,15 @@ export async function getJupSwapRebalanceDetails(
     usdToSwap / safeGetPrice(input.mint)!,
     input.decimals
   );
-  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
-        )
+  const outputAmount =
+    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 repaying = values.rebalanceDirection === RebalanceDirection.Repay;
 
@@ -393,6 +392,8 @@ export async function getJupSwapRebalanceDetails(
     exactOut,
     amount: exactOut ? outputAmount : inputAmount,
   };
+  consoleLog(targetLiqUtilizationRateBps, rebalanceToZero);
+  consoleLog(jupSwapInput);
 
   let jupQuote: QuoteResponse | undefined = undefined;
   if (rebalanceToZero) {
@@ -402,13 +403,15 @@ export async function getJupSwapRebalanceDetails(
       let priceImpact: number = 0;
       jupSwapInput.exactIn = true;
       jupSwapInput.exactOut = false;
-      jupSwapInput.amount = inputAmount + BigInt(Math.round(Number(inputAmount) * 0.001));
+      jupSwapInput.amount =
+        inputAmount + BigInt(Math.round(Number(inputAmount) * 0.001));
 
       do {
         const res = await getPriceImpact(
           jupSwapInput.inputMint,
           jupSwapInput.outputMint,
-          jupSwapInput.amount + BigInt(Math.round(Number(jupSwapInput.amount) * priceImpact)),
+          jupSwapInput.amount +
+            BigInt(Math.round(Number(jupSwapInput.amount) * priceImpact)),
           "ExactIn"
         );
         priceImpact = res.priceImpact;