@haven-fi/solauto-sdk 1.0.158 → 1.0.160

package/dist/clients/solautoMarginfiClient.js

@@ -336,7 +336,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
                 : undefined,
             rebalanceType,
             targetLiqUtilizationRateBps: targetLiqUtilizationRateBps ?? null,
-            targetInAmountBaseUnit: targetLiqUtilizationRateBps
+            targetInAmountBaseUnit: targetLiqUtilizationRateBps && rebalanceStep === "A"
                 ? swapDetails.amount
                 : null,
             limitGapBps: limitGapBps ?? null,

package/dist/utils/solanaUtils.js

@@ -157,7 +157,7 @@ async function sendSingleOptimizedTransaction(umi, connection, tx, txType, attem
     if (txType !== "skip-simulation") {
         // TODO: we should only retry simulation if it's not a solauto error
         const simulationResult = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => await simulateTransaction(connection, (0, umi_web3js_adapters_1.toWeb3JsTransaction)(await (await assembleFinalTransaction(umi.identity, tx, feeEstimate, 1400000).setLatestBlockhash(umi)).build(umi))), 3);
-        const computeUnitLimit = Math.round(simulationResult.value.unitsConsumed * 1.1);
+        const computeUnitLimit = Math.round(simulationResult.value.unitsConsumed * 1.2);
         console.log("Compute unit limit: ", computeUnitLimit);
     }
     if (txType !== "only-simulate") {

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;AAgJjD,MAAM,WAAW,eAAe;IAC9B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,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,CAiEjB;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,CAmE9B;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,cAAc,CAqChB"}
+{"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;AA8IjD,MAAM,WAAW,eAAe;IAC9B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,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,CAiEjB;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,CAoE9B;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,cAAc,CAsChB"}

package/dist/utils/solauto/rebalanceUtils.js

@@ -111,11 +111,12 @@ function getRebalanceValues(state, settings, dca, currentUnixTime, supplyPrice,
         debtAdjustmentUsd,
         amountToDcaIn: amountToDcaIn ?? 0,
         amountUsdToDcaIn,
-        dcaTokenType: dca?.tokenType
+        dcaTokenType: dca?.tokenType,
     };
 }
 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 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);
@@ -141,7 +142,8 @@ function getFlashLoanDetails(client, values, jupQuote, priceImpactBps) {
         flashLoanToken = client.solautoPositionState.supply;
         flashLoanTokenPrice = (0, generalUtils_2.safeGetPrice)(client.supplyMint);
     }
-    const exactAmountBaseUnit = jupQuote && jupQuote.swapMode === "ExactOut"
+    const exactAmountBaseUnit = jupQuote &&
+        (jupQuote.swapMode === "ExactOut" || jupQuote.swapMode === "ExactIn")
         ? BigInt(parseInt(jupQuote.inAmount))
         : undefined;
     return requiresFlashLoan
@@ -161,7 +163,8 @@ function getJupSwapRebalanceDetails(client, values, targetLiqUtilizationRateBps,
     const output = values.increasingLeverage
         ? client.solautoPositionState.supply
         : client.solautoPositionState.debt;
-    const usdToSwap = Math.abs(values.debtAdjustmentUsd) + (values.dcaTokenType === generated_1.TokenType.Debt ? values.amountUsdToDcaIn : 0);
+    const usdToSwap = Math.abs(values.debtAdjustmentUsd) +
+        (values.dcaTokenType === generated_1.TokenType.Debt ? values.amountUsdToDcaIn : 0);
     const inputPrice = values.increasingLeverage
         ? (0, generalUtils_2.safeGetPrice)(client.debtMint)
         : (0, generalUtils_2.safeGetPrice)(client.supplyMint);

package/package.json

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

@@ -517,7 +517,7 @@ export class SolautoMarginfiClient extends SolautoClient {
         : undefined,
       rebalanceType,
       targetLiqUtilizationRateBps: targetLiqUtilizationRateBps ?? null,
-      targetInAmountBaseUnit: targetLiqUtilizationRateBps
+      targetInAmountBaseUnit: targetLiqUtilizationRateBps && rebalanceStep === "A"
         ? swapDetails.amount
         : null,
       limitGapBps: limitGapBps ?? null,

package/src/utils/solanaUtils.ts

@@ -309,7 +309,7 @@ export async function sendSingleOptimizedTransaction(
     );
 
     const computeUnitLimit = Math.round(
-      simulationResult.value.unitsConsumed! * 1.1
+      simulationResult.value.unitsConsumed! * 1.2
     );
     console.log("Compute unit limit: ", computeUnitLimit);
   }

package/src/utils/solauto/rebalanceUtils.ts

@@ -26,9 +26,7 @@ import {
   toBaseUnit,
 } from "../numberUtils";
 import { USD_DECIMALS } from "../../constants/generalAccounts";
-import {
-  DEFAULT_LIMIT_GAP_BPS,
-} from "../../constants/solautoConstants";
+import { DEFAULT_LIMIT_GAP_BPS } from "../../constants/solautoConstants";
 
 function getAdditionalAmountToDcaIn(dca: DCASettings): number {
   if (dca.dcaInBaseUnit === BigInt(0)) {
@@ -125,7 +123,7 @@ function getTargetRateAndDcaAmount(
   dca: DCASettings | undefined,
   currentUnixTime: number,
   targetLiqUtilizationRateBps?: number
-): { targetRateBps: number; amountToDcaIn?: number; } {
+): { targetRateBps: number; amountToDcaIn?: number } {
   if (targetLiqUtilizationRateBps !== undefined) {
     return {
       targetRateBps: targetLiqUtilizationRateBps,
@@ -238,7 +236,7 @@ export function getRebalanceValues(
     debtAdjustmentUsd,
     amountToDcaIn: amountToDcaIn ?? 0,
     amountUsdToDcaIn,
-    dcaTokenType: dca?.tokenType
+    dcaTokenType: dca?.tokenType,
   };
 }
 
@@ -253,10 +251,12 @@ export function getFlashLoanDetails(
   jupQuote: QuoteResponse,
   priceImpactBps: number
 ): FlashLoanDetails | undefined {
-  let supplyUsd = fromBaseUnit(
-    client.solautoPositionState!.supply.amountUsed.baseAmountUsdValue,
-    USD_DECIMALS
-  ) + (values.dcaTokenType === TokenType.Supply ? values.amountUsdToDcaIn : 0);
+  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
@@ -299,7 +299,8 @@ export function getFlashLoanDetails(
   }
 
   const exactAmountBaseUnit =
-    jupQuote && jupQuote.swapMode === "ExactOut"
+    jupQuote &&
+    (jupQuote.swapMode === "ExactOut" || jupQuote.swapMode === "ExactIn")
       ? BigInt(parseInt(jupQuote.inAmount))
       : undefined;
 
@@ -308,9 +309,7 @@ export function getFlashLoanDetails(
         baseUnitAmount: exactAmountBaseUnit
           ? exactAmountBaseUnit +
             BigInt(
-              Math.round(
-                Number(exactAmountBaseUnit) * fromBps(priceImpactBps)
-              )
+              Math.round(Number(exactAmountBaseUnit) * fromBps(priceImpactBps))
             )
           : toBaseUnit(
               debtAdjustmentWithSlippage / flashLoanTokenPrice,
@@ -335,7 +334,8 @@ export function getJupSwapRebalanceDetails(
     : client.solautoPositionState!.debt;
 
   const usdToSwap =
-    Math.abs(values.debtAdjustmentUsd) + (values.dcaTokenType === TokenType.Debt ? values.amountUsdToDcaIn : 0);
+    Math.abs(values.debtAdjustmentUsd) +
+    (values.dcaTokenType === TokenType.Debt ? values.amountUsdToDcaIn : 0);
 
   const inputPrice = values.increasingLeverage
     ? safeGetPrice(client.debtMint)