@haven-fi/solauto-sdk 1.0.341 → 1.0.343

package/dist/utils/jitoUtils.js

@@ -135,7 +135,7 @@ async function sendJitoBundledTransactions(umi, connection, signer, txs, txType,
         // );
         const serializedTxs = builtTxs.map((x) => x.serialize());
         if (serializedTxs.find(x => x.length > 1232)) {
-            throw new Error("A transaction too large");
+            throw new Error("A transaction is too large");
         }
         onAwaitingSign?.();
         const txSigs = await sendJitoBundle(serializedTxs.map((x) => bs58_1.default.encode(x)));

package/dist/utils/solauto/generalUtils.js

@@ -25,7 +25,6 @@ const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters"
 const constants_1 = require("../../constants");
 const marginfiUtils_1 = require("../marginfiUtils");
 const priceUtils_1 = require("../priceUtils");
-const rebalanceUtils_1 = require("./rebalanceUtils");
 function createDynamicSolautoProgram(programId) {
     return {
         name: "solauto",
@@ -92,16 +91,27 @@ function eligibleForRebalance(positionState, positionSettings, positionDca, curr
     const repayFrom = positionSettings.repayToBps + positionSettings.repayGap;
     const boostFrom = boostToBps - positionSettings.boostGap;
     if (positionState.liqUtilizationRateBps - boostFrom <= bpsDistanceThreshold) {
-        if (positionState.liqUtilizationRateBps < boostFrom) {
-            const values = (0, rebalanceUtils_1.getRebalanceValues)(positionState, positionSettings, positionDca, (0, generalUtils_1.currentUnixSeconds)(), supplyMintPrice, debtMintPrice);
-            const sufficientLiquidity = (0, numberUtils_1.fromBaseUnit)(positionState.debt.amountCanBeUsed.baseAmountUsdValue, constants_1.USD_DECIMALS) *
-                0.95 >
-                values.debtAdjustmentUsd;
-            if (!sufficientLiquidity) {
-                (0, generalUtils_1.consoleLog)("Insufficient debt liquidity to further boost");
-            }
-            return sufficientLiquidity ? "boost" : undefined;
-        }
+        // if (positionState.liqUtilizationRateBps < boostFrom) {
+        //   const values = getRebalanceValues(
+        //     positionState!,
+        //     positionSettings,
+        //     positionDca,
+        //     currentUnixSeconds(),
+        //     supplyMintPrice,
+        //     debtMintPrice
+        //   );
+        //   const sufficientLiquidity =
+        //     fromBaseUnit(
+        //       positionState.debt.amountCanBeUsed.baseAmountUsdValue,
+        //       USD_DECIMALS
+        //     ) *
+        //       0.95 >
+        //     values.debtAdjustmentUsd;
+        //   if (!sufficientLiquidity) {
+        //     consoleLog("Insufficient debt liquidity to further boost");
+        //   }
+        //   return sufficientLiquidity ? "boost" : undefined;
+        // }
         return "boost";
     }
     else if (repayFrom - positionState.liqUtilizationRateBps <=

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,EAAE,MAAM,iBAAiB,CAAC;AAajD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAmI9C,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,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,GACtB,gBAAgB,GAAG,SAAS,CA8D9B;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,cAAc,CA2ChB"}
+{"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,EAAE,MAAM,iBAAiB,CAAC;AAajD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAmI9C,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,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,GACtB,gBAAgB,GAAG,SAAS,CAuE9B;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,cAAc,CA2ChB"}

package/dist/utils/solauto/rebalanceUtils.js

@@ -122,9 +122,10 @@ function getFlashLoanDetails(client, values, jupQuote) {
             ? debtUsd + debtAdjustmentUsdAbs
             : debtUsd;
     const tempLiqUtilizationRateBps = (0, numberUtils_1.getLiqUtilzationRateBps)(supplyUsd, debtUsd, client.solautoPositionState.liqThresholdBps);
-    const requiresFlashLoan = supplyUsd <= 0 ||
-        tempLiqUtilizationRateBps >
-            (0, numberUtils_1.getMaxLiqUtilizationRateBps)(client.solautoPositionState.maxLtvBps, client.solautoPositionState.liqThresholdBps, 0.015);
+    const maxLiqUtilizationRateBps = (0, numberUtils_1.getMaxLiqUtilizationRateBps)(client.solautoPositionState.maxLtvBps, client.solautoPositionState.liqThresholdBps, 0.015);
+    const requiresFlashLoan = supplyUsd <= 0 || tempLiqUtilizationRateBps > maxLiqUtilizationRateBps;
+    (0, generalUtils_2.consoleLog)("Requires flash loan:", requiresFlashLoan);
+    (0, generalUtils_2.consoleLog)("Intermediary liq utilization rate:", tempLiqUtilizationRateBps, `$${supplyUsd}`, `$${debtUsd}`, "Max:", maxLiqUtilizationRateBps);
     let flashLoanToken = undefined;
     let flashLoanTokenPrice = 0;
     if (values.rebalanceDirection === generated_1.RebalanceDirection.Boost) {

package/package.json

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

package/src/utils/jitoUtils.ts

@@ -214,7 +214,7 @@ export async function sendJitoBundledTransactions(
 
     const serializedTxs = builtTxs.map((x) => x.serialize());
     if (serializedTxs.find(x => x.length > 1232)) {
-      throw new Error("A transaction too large");
+      throw new Error("A transaction is too large");
     }
 
     onAwaitingSign?.();

package/src/utils/solauto/generalUtils.ts

@@ -167,27 +167,27 @@ export function eligibleForRebalance(
   const boostFrom = boostToBps - positionSettings.boostGap;
 
   if (positionState.liqUtilizationRateBps - boostFrom <= bpsDistanceThreshold) {
-    if (positionState.liqUtilizationRateBps < boostFrom) {
-      const values = getRebalanceValues(
-        positionState!,
-        positionSettings,
-        positionDca,
-        currentUnixSeconds(),
-        supplyMintPrice,
-        debtMintPrice
-      );
-      const sufficientLiquidity =
-        fromBaseUnit(
-          positionState.debt.amountCanBeUsed.baseAmountUsdValue,
-          USD_DECIMALS
-        ) *
-          0.95 >
-        values.debtAdjustmentUsd;
-      if (!sufficientLiquidity) {
-        consoleLog("Insufficient debt liquidity to further boost");
-      }
-      return sufficientLiquidity ? "boost" : undefined;
-    }
+    // if (positionState.liqUtilizationRateBps < boostFrom) {
+    //   const values = getRebalanceValues(
+    //     positionState!,
+    //     positionSettings,
+    //     positionDca,
+    //     currentUnixSeconds(),
+    //     supplyMintPrice,
+    //     debtMintPrice
+    //   );
+    //   const sufficientLiquidity =
+    //     fromBaseUnit(
+    //       positionState.debt.amountCanBeUsed.baseAmountUsdValue,
+    //       USD_DECIMALS
+    //     ) *
+    //       0.95 >
+    //     values.debtAdjustmentUsd;
+    //   if (!sufficientLiquidity) {
+    //     consoleLog("Insufficient debt liquidity to further boost");
+    //   }
+    //   return sufficientLiquidity ? "boost" : undefined;
+    // }
 
     return "boost";
   } else if (

package/src/utils/solauto/rebalanceUtils.ts

@@ -16,7 +16,7 @@ import {
 import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
 import { QuoteResponse } from "@jup-ag/api";
 import { JupSwapDetails } from "../jupiterUtils";
-import { currentUnixSeconds } from "../generalUtils";
+import { consoleLog, currentUnixSeconds } from "../generalUtils";
 import {
   fromBaseUnit,
   fromBps,
@@ -272,14 +272,23 @@ export function getFlashLoanDetails(
     debtUsd,
     client.solautoPositionState!.liqThresholdBps
   );
+  const maxLiqUtilizationRateBps = getMaxLiqUtilizationRateBps(
+    client.solautoPositionState!.maxLtvBps,
+    client.solautoPositionState!.liqThresholdBps,
+    0.015
+  );
   const requiresFlashLoan =
-    supplyUsd <= 0 ||
-    tempLiqUtilizationRateBps >
-      getMaxLiqUtilizationRateBps(
-        client.solautoPositionState!.maxLtvBps,
-        client.solautoPositionState!.liqThresholdBps,
-        0.015
-      );
+    supplyUsd <= 0 || tempLiqUtilizationRateBps > maxLiqUtilizationRateBps;
+
+  consoleLog("Requires flash loan:", requiresFlashLoan);
+  consoleLog(
+    "Intermediary liq utilization rate:",
+    tempLiqUtilizationRateBps,
+    `$${supplyUsd}`,
+    `$${debtUsd}`,
+    "Max:",
+    maxLiqUtilizationRateBps
+  );
 
   let flashLoanToken: PositionTokenUsage | undefined = undefined;
   let flashLoanTokenPrice = 0;

package/tests/transactions/solautoMarginfi.ts

@@ -26,15 +26,18 @@ import {
   SOLAUTO_TEST_PROGRAM,
   USDC,
 } from "../../src/constants";
-import { buildHeliusApiUrl } from "../../src/utils";
+import {
+  buildHeliusApiUrl,
+  positionStateWithLatestPrices,
+} from "../../src/utils";
 import { PriorityFeeSetting } from "../../src/types";
 
 describe("Solauto Marginfi tests", async () => {
-  const signer = setupTest();
-  // const signer = setupTest("solauto-manager");
+  // const signer = setupTest();
+  const signer = setupTest("solauto-manager");
 
-  const payForTransactions = false;
-  const testProgram = true;
+  const payForTransactions = true;
+  const testProgram = false;
   const positionId = 1;
 
   it("open - deposit - borrow - rebalance to 0 - withdraw - close", async () => {
@@ -51,7 +54,7 @@ describe("Solauto Marginfi tests", async () => {
     await client.initialize({
       signer,
       positionId,
-      authority: new PublicKey("rC5dMP5dmSsfQ66rynzfFzuc122Eex9h1RJHVDkeH6D"),
+      authority: new PublicKey("5UqsR2PGzbP8pGPbXEeXx86Gjz2N2UFBAuFZUSVydAEe"),
       // new: true,
       // marginfiAccount: new PublicKey(
       //   "4nNvUXF5YqHFcH2nGweSiuvy1ct7V5FXfoCLKFYUN36z"
@@ -61,6 +64,13 @@ describe("Solauto Marginfi tests", async () => {
       // debtMint: new PublicKey(USDC),
     });
 
+    const data = client.solautoPositionData;
+    console.log(data);
+    console.log(data?.state.supply.amountCanBeUsed);
+    console.log(data?.state.debt.amountCanBeUsed);
+
+    console.log(await positionStateWithLatestPrices(data!.state));
+
     const transactionItems: TransactionItem[] = [];
     // const settingParams: SolautoSettingsParametersInpArgs = {
     //   boostToBps: maxBoostToBps(
@@ -119,13 +129,13 @@ describe("Solauto Marginfi tests", async () => {
     //   )
     // );
 
-    transactionItems.push(
-      new TransactionItem(
-        async (attemptNum) =>
-          await buildSolautoRebalanceTransaction(client, undefined, attemptNum),
-        "rebalance"
-      )
-    );
+    // transactionItems.push(
+    //   new TransactionItem(
+    //     async (attemptNum) =>
+    //       await buildSolautoRebalanceTransaction(client, undefined, attemptNum),
+    //     "rebalance"
+    //   )
+    // );
 
     // transactionItems.push(
     //   new TransactionItem(
@@ -155,14 +165,14 @@ describe("Solauto Marginfi tests", async () => {
     //   )
     // );
 
-    const statuses = await new TransactionsManager(
-      client,
-      undefined,
-      !payForTransactions ? "only-simulate" : "normal",
-      PriorityFeeSetting.Low,
-      true
-    ).clientSend(transactionItems);
+    // const statuses = await new TransactionsManager(
+    //   client,
+    //   undefined,
+    //   !payForTransactions ? "only-simulate" : "normal",
+    //   PriorityFeeSetting.Low,
+    //   true
+    // ).clientSend(transactionItems);
 
-    console.log(statuses);
+    // console.log(statuses);
   });
 });