@haven-fi/solauto-sdk 1.0.446 → 1.0.448

package/dist/transactions/transactionUtils.js

@@ -451,7 +451,7 @@ function getErrorInfo(umi, txs, error, simulationSuccessful) {
     let canBeIgnored = false;
     let errorName = undefined;
     let errorInfo = undefined;
-    let errTxIdx;
+    let errTxIdx = 0;
     let errIxIdx;
     let errCode;
     let errName;

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;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;;;EAuDxB;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,CAmC9B;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,cAAc,CAyDhB"}
+{"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;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,CAmC9B;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,cAAc,CA4DhB"}

package/dist/utils/solauto/rebalanceUtils.js

@@ -127,14 +127,9 @@ function rebalanceRequiresFlashLoan(client, values) {
     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);
-    // const useDebtLiquidity =
-    //   Math.abs(values.debtAdjustmentUsd) * 1.1 <=
-    //   fromBaseUnit(
-    //     client.solautoPositionState?.debt.amountCanBeUsed.baseAmountUsdValue ??
-    //       BigInt(0),
-    //     USD_DECIMALS
-    //   );
-    const useDebtLiquidity = false;
+    const useDebtLiquidity = Math.abs(values.debtAdjustmentUsd) * 1.1 <=
+        (0, numberUtils_1.fromBaseUnit)(client.solautoPositionState?.debt.amountCanBeUsed.baseAmountUsdValue ??
+            BigInt(0), generalAccounts_1.USD_DECIMALS);
     return { requiresFlashLoan, useDebtLiquidity };
 }
 function getFlashLoanDetails(client, values, jupQuote) {

package/local/logPositions.ts

@@ -19,7 +19,6 @@ import { NATIVE_MINT } from "@solana/spl-token";
 import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
 import path from "path";
 import { config } from "dotenv";
-import { safeFetchMarginfiAccount } from "../src/marginfi-sdk";
 
 config({ path: path.join(__dirname, ".env") });
 
@@ -203,16 +202,17 @@ async function main(filterWhitelist: boolean) {
     );
 
     const repayFrom = pos.position.settingParams.repayToBps + pos.position.settingParams.repayGap;
-    const unhealthy = pos.state.liqUtilizationRateBps > repayFrom;
-    const healthText = unhealthy ? `(Unhealthy: ${pos.state.liqUtilizationRateBps - repayFrom}` : "";
+    const unhealthy = latestState.liqUtilizationRateBps > repayFrom;
+    const healthText = unhealthy ? `(Unhealthy: ${latestState.liqUtilizationRateBps - repayFrom}bps)` : "";
     if (unhealthy) {
       unhealthyPositions += 1;
     }
 
-    console.log(pos.publicKey.toString(), `(${pos.authority.toString()})`);
+    console.log(pos.publicKey.toString(), `(${pos.authority.toString()} ${pos.positionId})`);
     console.log(
       `${strategy}: $${formatNumber(fromBaseUnit(latestState.netWorth.baseAmountUsdValue, USD_DECIMALS), 2, 10000, 2)} ${healthText}`
     );
+    // console.log(latestState.liqUtilizationRateBps, repayFrom);
   }
 
   console.log("\nTotal positions:", solautoPositionsData.length, unhealthyPositions ? ` (unhealthy: ${unhealthyPositions})` : "");

package/package.json

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

package/src/transactions/transactionUtils.ts

@@ -845,7 +845,7 @@ export function getErrorInfo(
   let errorName: string | undefined = undefined;
   let errorInfo: string | undefined = undefined;
 
-  let errTxIdx: number | undefined;
+  let errTxIdx: number = 0;
   let errIxIdx: number | undefined;
   let errCode: number | undefined;
   let errName: string | undefined;

package/src/utils/solauto/rebalanceUtils.ts

@@ -285,14 +285,13 @@ export function rebalanceRequiresFlashLoan(
     maxLiqUtilizationRateBps
   );
 
-  // const useDebtLiquidity =
-  //   Math.abs(values.debtAdjustmentUsd) * 1.1 <=
-  //   fromBaseUnit(
-  //     client.solautoPositionState?.debt.amountCanBeUsed.baseAmountUsdValue ??
-  //       BigInt(0),
-  //     USD_DECIMALS
-  //   );
-  const useDebtLiquidity = false;
+  const useDebtLiquidity =
+    Math.abs(values.debtAdjustmentUsd) * 1.1 <=
+    fromBaseUnit(
+      client.solautoPositionState?.debt.amountCanBeUsed.baseAmountUsdValue ??
+        BigInt(0),
+      USD_DECIMALS
+    );
   return { requiresFlashLoan, useDebtLiquidity };
 }
 
@@ -380,7 +379,10 @@ export function getJupSwapRebalanceDetails(
 
   const repaying = values.rebalanceDirection === RebalanceDirection.Repay;
 
-  const { requiresFlashLoan, useDebtLiquidity } = rebalanceRequiresFlashLoan(client, values);
+  const { requiresFlashLoan, useDebtLiquidity } = rebalanceRequiresFlashLoan(
+    client,
+    values
+  );
   const flashLoanRepayFromDebt =
     repaying && requiresFlashLoan && useDebtLiquidity;
 

package/tests/transactions/solautoMarginfi.ts

@@ -34,19 +34,19 @@ import {
   getSolautoManagedPositions,
 } from "../../src/utils";
 import { PriorityFeeSetting } from "../../src/types";
+import { buildIronforgeApiUrl } from "../../dist";
 
 describe("Solauto Marginfi tests", async () => {
   // const signer = setupTest();
   const signer = setupTest("solauto-manager");
 
-  const payForTransactions = true;
+  const payForTransactions = false;
   const testProgram = false;
   const positionId = 1;
 
   it("open - deposit - borrow - rebalance to 0 - withdraw - close", async () => {
     const client = new SolautoMarginfiClient(
-      // buildHeliusApiUrl(process.env.HELIUS_API_KEY!),
-      "https://staked.helius-rpc.com?api-key=6a7423cf-35ef-44ce-b02b-02567f57d181",
+      buildIronforgeApiUrl(process.env.IRONFORGE_API_KEY!),
       true,
       testProgram ? SOLAUTO_TEST_PROGRAM : SOLAUTO_PROD_PROGRAM
     );
@@ -58,13 +58,13 @@ describe("Solauto Marginfi tests", async () => {
     await client.initialize({
       signer,
       positionId,
-      authority: new PublicKey("5bFfSCsGUgEzYH8kwwRtFnWkKZ1by8uD8RHvKQPnQReB"),
+      authority: new PublicKey("He4ka5Q3N1UvZikZvykdi47xyk5PoVP2tcQL5sVp31Sz"),
       // new: true,
       // marginfiAccount: new PublicKey(
-      //   "4nNvUXF5YqHFcH2nGweSiuvy1ct7V5FXfoCLKFYUN36z"
+      //   ""
       // ),
-      // marginfiGroup: new PublicKey("G1rt3EpQ43K3bY457rhukQGRAo2QxydFAGRKqnjKzyr5"),
-      // supplyMint: new PublicKey("3B5wuUrMEi5yATD7on46hKfej3pfmd7t1RKgrsN3pump"),
+      // marginfiGroup: new PublicKey(""),
+      // supplyMint: new PublicKey(""),
       // debtMint: new PublicKey(USDC),
     });
 
@@ -168,7 +168,7 @@ describe("Solauto Marginfi tests", async () => {
       client,
       undefined,
       !payForTransactions ? "only-simulate" : "normal",
-      PriorityFeeSetting.High,
+      PriorityFeeSetting.Min,
       true
     ).clientSend(transactionItems);