@haven-fi/solauto-sdk 1.0.447 → 1.0.449

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/jupiterUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jupiterUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jupiterUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAA0B,MAAM,iBAAiB,CAAC;AAGpE,OAAO,EAGL,aAAa,EACd,MAAM,aAAa,CAAC;AAOrB,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,SAAS,CAAC;IACtB,iBAAiB,EAAE,SAAS,CAAC;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAgBD,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,aAAa,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;IACvB,oBAAoB,EAAE,MAAM,EAAE,CAAC;IAC/B,iBAAiB,EAAE,kBAAkB,CAAC;IACtC,aAAa,EAAE,kBAAkB,CAAC;IAClC,MAAM,EAAE,kBAAkB,CAAC;CAC5B;AAED,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,cAAc,EAC3B,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,kBAAkB,CAAC,CAiG7B;AAED,wBAAsB,eAAe,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,SAAS,CAAC,EAAE,OAAO;;GAiB5E"}
+{"version":3,"file":"jupiterUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jupiterUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAA0B,MAAM,iBAAiB,CAAC;AAGpE,OAAO,EAGL,aAAa,EACd,MAAM,aAAa,CAAC;AAOrB,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,SAAS,CAAC;IACtB,iBAAiB,EAAE,SAAS,CAAC;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAgBD,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,aAAa,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;IACvB,oBAAoB,EAAE,MAAM,EAAE,CAAC;IAC/B,iBAAiB,EAAE,kBAAkB,CAAC;IACtC,aAAa,EAAE,kBAAkB,CAAC;IAClC,MAAM,EAAE,kBAAkB,CAAC;CAC5B;AAED,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,cAAc,EAC3B,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,kBAAkB,CAAC,CAiG7B;AAED,wBAAsB,eAAe,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,SAAS,CAAC,EAAE,OAAO;;GAsB5E"}

package/dist/utils/jupiterUtils.js

@@ -35,7 +35,7 @@ async function getJupSwapTransaction(signer, swapDetails, attemptNum) {
                 ? "ExactIn"
                 : undefined,
         slippageBps: memecoinSwap ? 500 : 300,
-        maxAccounts: !swapDetails.exactOut ? 45 : undefined,
+        maxAccounts: !swapDetails.exactOut ? 40 : undefined,
     }), 4, 200);
     const priceImpactBps = Math.round((0, numberUtils_1.toBps)(parseFloat(quoteResponse.priceImpactPct))) + 1;
     const finalPriceSlippageBps = Math.round(Math.max(50, quoteResponse.slippageBps, priceImpactBps) *
@@ -82,7 +82,10 @@ async function getJupPriceData(mints, extraInfo) {
             mints.map((x) => x.toString()).join(",") +
             (extraInfo ? "&showExtraInfo=true" : ""))).json();
         const result = res.data;
-        if (!result) {
+        if (!result ||
+            result === null ||
+            (typeof result === "object" &&
+                Object.values(result).find((x) => !x || x === null))) {
             throw new Error("Failed to get token prices using Jupiter");
         }
         return result;

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.447",
+  "version": "1.0.449",
   "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/jupiterUtils.ts

@@ -72,7 +72,7 @@ export async function getJupSwapTransaction(
             ? "ExactIn"
             : undefined,
         slippageBps: memecoinSwap ? 500 : 300,
-        maxAccounts: !swapDetails.exactOut ? 45 : undefined,
+        maxAccounts: !swapDetails.exactOut ? 40 : undefined,
       }),
     4,
     200
@@ -164,7 +164,12 @@ export async function getJupPriceData(mints: PublicKey[], extraInfo?: boolean) {
       )
     ).json();
     const result = res.data;
-    if (!result) {
+    if (
+      !result ||
+      result === null ||
+      (typeof result === "object" &&
+        Object.values(result).find((x) => !x || x === null))
+    ) {
       throw new Error("Failed to get token prices using Jupiter");
     }
     return result;

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);