@haven-fi/solauto-sdk 1.0.325 → 1.0.327

package/dist/utils/jitoUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jitoUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jitoUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAwB,MAAM,iBAAiB,CAAC;AAGlE,OAAO,EACL,MAAM,EACN,kBAAkB,EAClB,GAAG,EAEJ,MAAM,0BAA0B,CAAC;AAQlC,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAK9C,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,SAAS,CAAC,CAa9D;AA8GD,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,kBAAkB,EAAE,EACzB,YAAY,CAAC,EAAE,OAAO,EACtB,kBAAkB,GAAE,kBAA2C,GAC9D,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,CA8C/B"}
+{"version":3,"file":"jitoUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jitoUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAwB,MAAM,iBAAiB,CAAC;AAGlE,OAAO,EACL,MAAM,EACN,kBAAkB,EAClB,GAAG,EAEJ,MAAM,0BAA0B,CAAC;AAQlC,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAK9C,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,SAAS,CAAC,CAa9D;AAuHD,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,kBAAkB,EAAE,EACzB,YAAY,CAAC,EAAE,OAAO,EACtB,kBAAkB,GAAE,kBAA2C,GAC9D,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,CA8C/B"}

package/dist/utils/jitoUtils.js

@@ -85,12 +85,22 @@ async function pollBundleStatus(bundleId, interval = 1000, timeout = 40000) {
     return [];
 }
 async function sendJitoBundle(transactions) {
-    const resp = await axios_1.default.post(`${solautoConstants_1.JITO_BLOCK_ENGINE}/api/v1/bundles`, {
-        jsonrpc: "2.0",
-        id: 1,
-        method: "sendBundle",
-        params: [transactions],
-    });
+    let resp;
+    try {
+        resp = await axios_1.default.post(`${solautoConstants_1.JITO_BLOCK_ENGINE}/api/v1/bundles`, {
+            jsonrpc: "2.0",
+            id: 1,
+            method: "sendBundle",
+            params: [transactions],
+        });
+    }
+    catch (e) {
+        if (e.response) {
+            console.error("Jito send bundle error:", e.response.data);
+            console.error("Jito send bundle error:", e.response.data.error);
+            throw e;
+        }
+    }
     const bundleId = resp.data.result;
     (0, generalUtils_1.consoleLog)("Bundle ID:", bundleId);
     return bundleId ? await pollBundleStatus(bundleId) : [];

package/dist/utils/switchboardUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"switchboardUtils.d.ts","sourceRoot":"","sources":["../../src/utils/switchboardUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,UAAU,EACV,SAAS,EAGV,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAkB,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAEtE,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AACjD,OAAO,EAAE,MAAM,EAAsB,MAAM,0BAA0B,CAAC;AAOtE,wBAAgB,WAAW,CACzB,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,SAAS,EACf,MAAM,CAAC,EAAE,SAAS,YAsBnB;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAsB5C;AAED,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,UAAU,EAChB,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,EAAE,CAAC,CAuB/D;AAED,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,MAAM,EAAE,CAAC,CAiBnB"}
+{"version":3,"file":"switchboardUtils.d.ts","sourceRoot":"","sources":["../../src/utils/switchboardUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,UAAU,EACV,SAAS,EAGV,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAkB,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAEtE,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AACjD,OAAO,EAAE,MAAM,EAAsB,MAAM,0BAA0B,CAAC;AAOtE,wBAAgB,WAAW,CACzB,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,SAAS,EACf,MAAM,CAAC,EAAE,SAAS,YAsBnB;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAsB5C;AAED,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,UAAU,EAChB,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,EAAE,CAAC,CAuB/D;AAED,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,MAAM,EAAE,CAAC,CAyBnB"}

package/dist/utils/switchboardUtils.js

@@ -61,6 +61,13 @@ async function getSwitchboardPrices(mints) {
         return [];
     }
     const crossbar = new on_demand_1.CrossbarClient("https://crossbar.switchboard.xyz");
-    const results = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => await crossbar.simulateSolanaFeeds("mainnet", mints.map((x) => switchboardConstants_1.SWITCHBOARD_PRICE_FEED_IDS[x.toString()])), 8, 200);
-    return results.flatMap((x) => x.results[0]);
+    const results = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => {
+        const res = await crossbar.simulateSolanaFeeds("mainnet", mints.map((x) => switchboardConstants_1.SWITCHBOARD_PRICE_FEED_IDS[x.toString()]));
+        const prices = res.flatMap((x) => x.results[0]);
+        if (prices.find((x) => x === -Infinity || !Number.isFinite(x))) {
+            throw new Error("Unable to fetch Switchboard prices");
+        }
+        return prices;
+    }, 8, 250);
+    return results;
 }

package/local/{createFeeAccounts.ts → createTokenAccounts.ts}

@@ -1,5 +1,9 @@
 import { PublicKey } from "@solana/web3.js";
-import { ALL_SUPPORTED_TOKENS, SOLAUTO_FEES_WALLET } from "../src/constants";
+import {
+  ALL_SUPPORTED_TOKENS,
+  SOLAUTO_FEES_WALLET,
+  SOLAUTO_MANAGER,
+} from "../src/constants";
 import {
   buildHeliusApiUrl,
   createAssociatedTokenAccountUmiIx,
@@ -16,12 +20,12 @@ import {
   transactionBuilder,
 } from "@metaplex-foundation/umi";
 
-async function create() {
+async function createTokenAccounts(wallet: PublicKey) {
   let [connection, umi] = getSolanaRpcConnection(
     buildHeliusApiUrl(process.env.HELIUS_API_KEY!)
   );
 
-  const secretKey = getSecretKey("solauto-auth");
+  const secretKey = getSecretKey();
   const signerKeypair = umi.eddsa.createKeypairFromSecretKey(secretKey);
   const signer = createSignerFromKeypair(umi, signerKeypair);
 
@@ -29,7 +33,7 @@ async function create() {
 
   const tokenAccounts = await umi.rpc.getAccounts(
     ALL_SUPPORTED_TOKENS.map((x) =>
-      publicKey(getTokenAccount(SOLAUTO_FEES_WALLET, new PublicKey(x)))
+      publicKey(getTokenAccount(wallet, new PublicKey(x)))
     )
   );
 
@@ -37,7 +41,7 @@ async function create() {
     if (!accounts[0].exists) {
       const tx = createAssociatedTokenAccountUmiIx(
         signer,
-        SOLAUTO_FEES_WALLET,
+        wallet,
         new PublicKey(accounts[1])
       );
       await sendSingleOptimizedTransaction(
@@ -49,4 +53,4 @@ async function create() {
   }
 }
 
-create();
+createTokenAccounts(SOLAUTO_FEES_WALLET);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.325",
+  "version": "1.0.327",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "description": "Typescript SDK for the Solauto program on the Solana blockchain",
@@ -14,7 +14,7 @@
     "update-lut:solauto": "npx ts-node local/updateSolautoLUT.ts",
     "update-lut:marginfi": "npx ts-node local/updateMarginfiLUT.ts",
     "create-ism-accounts": "npx ts-node local/createISMAccounts.ts",
-    "create-fee-accounts": "npx ts-node local/createFeeAccounts.ts"
+    "create-token-accounts": "npx ts-node local/createTokenAccounts.ts"
   },
   "dependencies": {
     "@coral-xyz/anchor": "^0.30.1",

package/src/utils/jitoUtils.ts

@@ -127,15 +127,24 @@ async function pollBundleStatus(
 }
 
 async function sendJitoBundle(transactions: string[]): Promise<string[]> {
-  const resp = await axios.post<{ result: string }>(
-    `${JITO_BLOCK_ENGINE}/api/v1/bundles`,
-    {
-      jsonrpc: "2.0",
-      id: 1,
-      method: "sendBundle",
-      params: [transactions],
+  let resp: any;
+  try {
+    resp = await axios.post<{ result: string }>(
+      `${JITO_BLOCK_ENGINE}/api/v1/bundles`,
+      {
+        jsonrpc: "2.0",
+        id: 1,
+        method: "sendBundle",
+        params: [transactions],
+      }
+    );
+  } catch (e: any) {
+    if (e.response) {
+      console.error("Jito send bundle error:", e.response.data);
+      console.error("Jito send bundle error:", e.response.data.error);
+      throw e;
     }
-  );
+  }
 
   const bundleId = resp.data.result;
   consoleLog("Bundle ID:", bundleId);

package/src/utils/switchboardUtils.ts

@@ -14,7 +14,7 @@ import {
   fromWeb3JsInstruction,
   toWeb3JsPublicKey,
 } from "@metaplex-foundation/umi-web3js-adapters";
-import { retryWithExponentialBackoff } from "./generalUtils";
+import { retryWithExponentialBackoff, zip } from "./generalUtils";
 
 export function getPullFeed(
   conn: Connection,
@@ -108,14 +108,22 @@ export async function getSwitchboardPrices(
 
   const crossbar = new CrossbarClient("https://crossbar.switchboard.xyz");
   const results = await retryWithExponentialBackoff(
-    async () =>
-      await crossbar.simulateSolanaFeeds(
+    async () => {
+      const res = await crossbar.simulateSolanaFeeds(
         "mainnet",
         mints.map((x) => SWITCHBOARD_PRICE_FEED_IDS[x.toString()])
-      ),
+      );
+
+      const prices = res.flatMap((x) => x.results[0]);
+      if (prices.find((x) => x === -Infinity || !Number.isFinite(x))) {
+        throw new Error("Unable to fetch Switchboard prices");
+      }
+
+      return prices;
+    },
     8,
-    200
+    250
   );
 
-  return results.flatMap((x) => x.results[0]);
+  return results;
 }

package/tests/unit/accounts.ts

@@ -9,42 +9,69 @@ import {
 } from "../../src/utils/solanaUtils";
 import { publicKey } from "@metaplex-foundation/umi";
 import { assert } from "chai";
-import { getAllMarginfiAccountsByAuthority, getTokenAccount } from "../../src/utils";
-import { SOLAUTO_FEES_WALLET, SOLAUTO_MANAGER } from "../../src/constants";
+import {
+  getAllMarginfiAccountsByAuthority,
+  getTokenAccount,
+} from "../../src/utils";
+import {
+  MARGINFI_ACCOUNTS,
+  SOLAUTO_FEES_WALLET,
+  SOLAUTO_MANAGER,
+} from "../../src/constants";
 import { PublicKey } from "@solana/web3.js";
 import { safeFetchAllMarginfiAccount } from "../../src/marginfi-sdk";
+import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
 
-describe("Assert Solauto fee token accounts are created", async () => {
-  it("all Solauto fee token accounts created", async () => {
-    let [_, umi] = getSolanaRpcConnection(
-      buildHeliusApiUrl(process.env.HELIUS_API_KEY!)
-    );
+async function hasTokenAccounts(wallet: PublicKey) {
+  let [_, umi] = getSolanaRpcConnection(
+    buildHeliusApiUrl(process.env.HELIUS_API_KEY!)
+  );
 
-    const tokenAccounts = await umi.rpc.getAccounts(
-      ALL_SUPPORTED_TOKENS.map((x) =>
-        publicKey(getTokenAccount(SOLAUTO_FEES_WALLET, new PublicKey(x)))
-      )
-    );
-    for (let i = 0; i < tokenAccounts.length; i++) {
-      console.log(tokenAccounts[i].publicKey.toString());
-      if (!tokenAccounts[i].exists) {
-        console.log(
-          "Missing Solauto fees TA for ",
-          TOKEN_INFO[ALL_SUPPORTED_TOKENS[i].toString()].ticker
-        );
-      }
+  const tokenAccounts = await umi.rpc.getAccounts(
+    ALL_SUPPORTED_TOKENS.map((x) =>
+      publicKey(getTokenAccount(wallet, new PublicKey(x)))
+    )
+  );
+  for (let i = 0; i < tokenAccounts.length; i++) {
+    console.log(tokenAccounts[i].publicKey.toString());
+    if (!tokenAccounts[i].exists) {
+      console.log(
+        `Missing ${wallet.toString()} TA for `,
+        TOKEN_INFO[ALL_SUPPORTED_TOKENS[i].toString()].ticker
+      );
     }
-    assert(tokenAccounts.filter((x) => !x.exists).length === 0);
+  }
+  assert(tokenAccounts.filter((x) => !x.exists).length === 0);
+}
+
+describe("Assert Solauto fee token accounts are created", async () => {
+  it("all Solauto fee token accounts created", async () => {
+    await hasTokenAccounts(SOLAUTO_FEES_WALLET);
   });
 
   it("ISM accounts for every supported Marginfi group", async () => {
-    let [conn, umi] = getSolanaRpcConnection(
+    let [_, umi] = getSolanaRpcConnection(
       buildHeliusApiUrl(process.env.HELIUS_API_KEY!)
     );
 
-    const ism = await getAllMarginfiAccountsByAuthority(umi, SOLAUTO_MANAGER, undefined, false);
-
-    const ismData = safeFetchAllMarginfiAccount(umi, ism.map(x => publicKey(x.marginfiAccount)));
+    const ismAccounts = await getAllMarginfiAccountsByAuthority(
+      umi,
+      SOLAUTO_MANAGER,
+      undefined,
+      false
+    );
+    const ismData = await safeFetchAllMarginfiAccount(
+      umi,
+      ismAccounts.map((x) => publicKey(x.marginfiAccount))
+    );
+    const supportedMarginfiGroups = Object.keys(MARGINFI_ACCOUNTS).map(
+      (x) => new PublicKey(x)
+    );
+    const missingIsmAccounts = supportedMarginfiGroups.filter(
+      (group) => !ismData.find((x) => group.equals(toWeb3JsPublicKey(x.group)))
+    );
 
+    console.log("Missing ISM accounts", missingIsmAccounts);
+    assert(missingIsmAccounts.length === 0);
   });
 });