@haven-fi/solauto-sdk 1.0.46 → 1.0.47

package/dist/utils/numberUtils.js

@@ -62,7 +62,7 @@ function getDebtAdjustmentUsd(liqThresholdBps, supplyUsd, debtUsd, targetLiqUtil
 }
 exports.getDebtAdjustmentUsd = getDebtAdjustmentUsd;
 function getMaxLiqUtilizationRate(maxLtvBps, liqThresholdBps) {
-    return toBps((fromBps(maxLtvBps) - 0.01) / fromBps(liqThresholdBps)) - 1;
+    return toBps((fromBps(maxLtvBps) - 0.02) / fromBps(liqThresholdBps)) - 1; // -1 to account for any rounding issues
 }
 exports.getMaxLiqUtilizationRate = getMaxLiqUtilizationRate;
 function maxRepayFrom(maxLtvBps, liqThresholdBps) {

package/dist/utils/solanaUtils.js

@@ -159,26 +159,9 @@ async function sendSingleOptimizedTransaction(umi, connection, tx, simulateOnly,
     console.log("Serialized transaction size: ", tx.getTransactionSize(umi));
     const feeEstimate = await getComputeUnitPriceEstimate(umi, tx, attemptNum);
     console.log("Compute unit price: ", feeEstimate);
-    // const simulationResult = await retryWithExponentialBackoff(
-    //   async () =>
-    //     await simulateTransaction(
-    //       connection,
-    //       toWeb3JsTransaction(
-    //         await (
-    //           await assembleFinalTransaction(
-    //             umi.identity,
-    //             tx,
-    //             feeEstimate,
-    //             1_400_000
-    //           ).setLatestBlockhash(umi)
-    //         ).build(umi)
-    //       )
-    //     )
-    // );
-    // const computeUnitLimit = Math.round(
-    //   simulationResult.value.unitsConsumed! * 1.1
-    // );
-    // console.log("Compute unit limit: ", computeUnitLimit);
+    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))));
+    const computeUnitLimit = Math.round(simulationResult.value.unitsConsumed * 1.1);
+    console.log("Compute unit limit: ", computeUnitLimit);
     if (!simulateOnly) {
         const result = await assembleFinalTransaction(umi.identity, tx, feeEstimate, 800000).sendAndConfirm(umi, {
             send: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.46",
+  "version": "1.0.47",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "description": "Typescript SDK for the Solauto program on the Solana blockchain",

package/src/utils/numberUtils.ts

@@ -81,7 +81,7 @@ export function getMaxLiqUtilizationRate(
   maxLtvBps: number,
   liqThresholdBps: number
 ): number {
-  return toBps((fromBps(maxLtvBps) - 0.01) / fromBps(liqThresholdBps)) - 1;
+  return toBps((fromBps(maxLtvBps) - 0.02) / fromBps(liqThresholdBps)) - 1; // -1 to account for any rounding issues
 }
 
 export function maxRepayFrom(maxLtvBps: number, liqThresholdBps: number) {

package/src/utils/solanaUtils.ts

@@ -288,27 +288,27 @@ export async function sendSingleOptimizedTransaction(
   const feeEstimate = await getComputeUnitPriceEstimate(umi, tx, attemptNum);
   console.log("Compute unit price: ", feeEstimate);
 
-  // const simulationResult = await retryWithExponentialBackoff(
-  //   async () =>
-  //     await simulateTransaction(
-  //       connection,
-  //       toWeb3JsTransaction(
-  //         await (
-  //           await assembleFinalTransaction(
-  //             umi.identity,
-  //             tx,
-  //             feeEstimate,
-  //             1_400_000
-  //           ).setLatestBlockhash(umi)
-  //         ).build(umi)
-  //       )
-  //     )
-  // );
+  const simulationResult = await retryWithExponentialBackoff(
+    async () =>
+      await simulateTransaction(
+        connection,
+        toWeb3JsTransaction(
+          await (
+            await assembleFinalTransaction(
+              umi.identity,
+              tx,
+              feeEstimate,
+              1_400_000
+            ).setLatestBlockhash(umi)
+          ).build(umi)
+        )
+      )
+  );
 
-  // const computeUnitLimit = Math.round(
-  //   simulationResult.value.unitsConsumed! * 1.1
-  // );
-  // console.log("Compute unit limit: ", computeUnitLimit);
+  const computeUnitLimit = Math.round(
+    simulationResult.value.unitsConsumed! * 1.1
+  );
+  console.log("Compute unit limit: ", computeUnitLimit);
 
   if (!simulateOnly) {
     const result = await assembleFinalTransaction(

package/tests/transactions/solautoMarginfi.ts

@@ -9,7 +9,7 @@ import {
   SolautoSettingsParametersInpArgs,
 } from "../../src/generated";
 import { buildSolautoRebalanceTransaction } from "../../src/transactions/transactionUtils";
-import { toBaseUnit } from "../../src/utils/numberUtils";
+import { getMaxLiqUtilizationRate, toBaseUnit } from "../../src/utils/numberUtils";
 import { NATIVE_MINT } from "@solana/spl-token";
 import { getTokenPrices } from "../../src/utils/generalUtils";
 import {
@@ -81,6 +81,7 @@ describe("Solauto Marginfi tests", async () => {
     //   );
     // }
 
+    // const maxLiqRate = getMaxLiqUtilizationRate(client.solautoPositionState!.maxLtvBps, client.solautoPositionState!.liqThresholdBps);
     // transactionItems.push(
     //   new TransactionItem(
     //     async () => ({