@haven-fi/solauto-sdk 1.0.778 → 1.0.779

package/dist/utils/jupiterUtils.d.ts

@@ -1,7 +1,5 @@
 import { PublicKey, TransactionInstruction } from "@solana/web3.js";
 import { Instruction } from "@jup-ag/api";
 export declare function jupIxToSolanaIx(instruction: Instruction): TransactionInstruction;
-export declare function getJupPriceData(mints: PublicKey[]): Promise<{
-    [key: string]: any;
-}>;
+export declare function getJupPriceData(mints: PublicKey[]): Promise<any>;
 //# sourceMappingURL=jupiterUtils.d.ts.map

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,EAAE,SAAS,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AACpE,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAG1C,wBAAgB,eAAe,CAC7B,WAAW,EAAE,WAAW,GACvB,sBAAsB,CAUxB;AAED,wBAAsB,eAAe,CAAC,KAAK,EAAE,SAAS,EAAE;;GA4BvD"}
+{"version":3,"file":"jupiterUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jupiterUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AACpE,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAG1C,wBAAgB,eAAe,CAC7B,WAAW,EAAE,WAAW,GACvB,sBAAsB,CAUxB;AAED,wBAAsB,eAAe,CAAC,KAAK,EAAE,SAAS,EAAE,gBAsCvD"}

package/dist/utils/jupiterUtils.js

@@ -16,18 +16,21 @@ function jupIxToSolanaIx(instruction) {
     });
 }
 async function getJupPriceData(mints) {
-    const data = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => {
+    const batches = (0, generalUtils_1.getBatches)(mints, 5); // batches is now PublicKey[][]
+    const results = await Promise.all(batches.map((batch) => (0, generalUtils_1.retryWithExponentialBackoff)(async () => {
         const res = await (await fetch("https://api.jup.ag/price/v2?ids=" +
-            mints.map((x) => x.toString()).join(",") +
+            batch.map((x) => x.toString()).join(",") +
             "&showExtraInfo=true")).json();
         const result = res.data;
-        if (!result || result === null || typeof result !== "object") {
+        if (!result || typeof result !== "object") {
             throw new Error("Failed to get token prices using Jupiter");
         }
         const trueData = Object.entries(result).reduce((acc, [key, val]) => !val?.extraInfo?.quotedPrice?.sellAt
             ? { ...acc, [key]: { ...val, price: "0" } }
             : { ...acc, [key]: val }, {});
         return trueData;
-    }, 3);
-    return data;
+    }, 3)));
+    // Merge all batch results into one object
+    const mergedResults = Object.assign({}, ...results);
+    return mergedResults;
 }

package/package.json

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

package/src/utils/jupiterUtils.ts

@@ -1,6 +1,6 @@
 import { PublicKey, TransactionInstruction } from "@solana/web3.js";
 import { Instruction } from "@jup-ag/api";
-import { retryWithExponentialBackoff } from "./generalUtils";
+import { getBatches, retryWithExponentialBackoff } from "./generalUtils";
 
 export function jupIxToSolanaIx(
   instruction: Instruction
@@ -17,31 +17,41 @@ export function jupIxToSolanaIx(
 }
 
 export async function getJupPriceData(mints: PublicKey[]) {
-  const data = await retryWithExponentialBackoff(async () => {
-    const res = await (
-      await fetch(
-        "https://api.jup.ag/price/v2?ids=" +
-          mints.map((x) => x.toString()).join(",") +
-          "&showExtraInfo=true"
-      )
-    ).json();
-    const result = res.data;
-    if (!result || result === null || typeof result !== "object") {
-      throw new Error("Failed to get token prices using Jupiter");
-    }
-
-    const trueData: { [key: string]: any } = Object.entries(
-      result as { [key: string]: any }
-    ).reduce(
-      (acc, [key, val]) =>
-        !val?.extraInfo?.quotedPrice?.sellAt
-          ? { ...acc, [key]: { ...val, price: "0" } }
-          : { ...acc, [key]: val },
-      {}
-    );
-
-    return trueData;
-  }, 3);
-
-  return data;
+  const batches = getBatches(mints, 5); // batches is now PublicKey[][]
+
+  const results = await Promise.all(
+    batches.map((batch) =>
+      retryWithExponentialBackoff(async () => {
+        const res = await (
+          await fetch(
+            "https://api.jup.ag/price/v2?ids=" +
+              batch.map((x) => x.toString()).join(",") +
+              "&showExtraInfo=true"
+          )
+        ).json();
+
+        const result = res.data;
+        if (!result || typeof result !== "object") {
+          throw new Error("Failed to get token prices using Jupiter");
+        }
+
+        const trueData: { [key: string]: any } = Object.entries(
+          result as { [key: string]: any }
+        ).reduce(
+          (acc, [key, val]) =>
+            !val?.extraInfo?.quotedPrice?.sellAt
+              ? { ...acc, [key]: { ...val, price: "0" } }
+              : { ...acc, [key]: val },
+          {}
+        );
+
+        return trueData;
+      }, 3)
+    )
+  );
+
+  // Merge all batch results into one object
+  const mergedResults = Object.assign({}, ...results);
+
+  return mergedResults;
 }