@haven-fi/solauto-sdk 1.0.780 → 1.0.782

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,gBA2BvD"}
+{"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,gBAyBvD"}

package/dist/utils/jupiterUtils.js

@@ -17,7 +17,6 @@ function jupIxToSolanaIx(instruction) {
 }
 async function getJupPriceData(mints) {
     const batches = (0, generalUtils_1.getBatches)(mints, 50);
-    console.log(batches.length);
     const results = await Promise.all(batches.map((batch) => (0, generalUtils_1.retryWithExponentialBackoff)(async () => {
         const res = await (await fetch("https://lite-api.jup.ag/price/v3?ids=" +
             batch.map((x) => x.toString()).join(","))).json();
@@ -25,7 +24,7 @@ async function getJupPriceData(mints) {
             throw new Error("Failed to get token prices using Jupiter");
         }
         return res;
-    }, 4)));
+    }, 6, 250)));
     const mergedResults = Object.assign({}, ...results);
     return mergedResults;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"priceUtils.d.ts","sourceRoot":"","sources":["../../src/utils/priceUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,SAAS,IAAI,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAgBrE,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAErD,UAAU,WAAW;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAsB,gBAAgB,CACpC,KAAK,EAAE,SAAS,EAAE,EAClB,SAAS,GAAE,SAA8B,EACzC,SAAS,CAAC,EAAE,SAAS,GACpB,OAAO,CAAC,MAAM,EAAE,CAAC,CA4CnB;AAED,wBAAsB,aAAa,CACjC,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAqDtC;AAkBD,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAkDtC;AAED,wBAAsB,iBAAiB,CACrC,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAiBtC;AAED,wBAAgB,YAAY,CAC1B,IAAI,EAAE,SAAS,GAAG,YAAY,GAAG,MAAM,GAAG,SAAS,EACnD,SAAS,GAAE,SAA8B,EACzC,SAAS,CAAC,EAAE,SAAS,GACpB,MAAM,GAAG,SAAS,CAyBpB"}
+{"version":3,"file":"priceUtils.d.ts","sourceRoot":"","sources":["../../src/utils/priceUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,SAAS,IAAI,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAgBrE,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAErD,UAAU,WAAW;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAsB,gBAAgB,CACpC,KAAK,EAAE,SAAS,EAAE,EAClB,SAAS,GAAE,SAA8B,EACzC,SAAS,CAAC,EAAE,SAAS,GACpB,OAAO,CAAC,MAAM,EAAE,CAAC,CA4CnB;AAED,wBAAsB,aAAa,CACjC,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAqDtC;AAkBD,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAkDtC;AAED,wBAAsB,iBAAiB,CACrC,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAsBtC;AAED,wBAAgB,YAAY,CAC1B,IAAI,EAAE,SAAS,GAAG,YAAY,GAAG,MAAM,GAAG,SAAS,EACnD,SAAS,GAAE,SAA8B,EACzC,SAAS,CAAC,EAAE,SAAS,GACpB,MAAM,GAAG,SAAS,CAyBpB"}

package/dist/utils/priceUtils.js

@@ -151,10 +151,15 @@ async function getJupTokenPrices(mints) {
         return {};
     }
     const data = getSortedPriceData(await (0, jupiterUtils_1.getJupPriceData)(mints), mints);
-    const prices = Object.fromEntries(Object.entries(data).map(([mint, x]) => [
+    const prices = Object.fromEntries(mints.map((mint) => [
         mint,
-        x !== null && typeof x === "object" && "usdPrice" in x
-            ? { realtimePrice: parseFloat(x.usdPrice) }
+        data !== null &&
+            typeof data === "object" &&
+            typeof data[mint.toString()] === "object" &&
+            "usdPrice" in data[mint.toString()]
+            ? {
+                realtimePrice: parseFloat(data[mint.toString()].usdPrice),
+            }
             : { realtimePrice: 0 },
     ]));
     return prices;

package/local/txSandbox.ts

@@ -4,6 +4,7 @@ import { fromWeb3JsKeypair } from "@metaplex-foundation/umi-web3js-adapters";
 import {
   ClientTransactionsManager,
   consoleLog,
+  fetchTokenPrices,
   getBatches,
   getClient,
   getJupTokenPrices,
@@ -69,13 +70,12 @@ export async function main() {
   // const statuses = await txManager.send(transactionItems);
   // consoleLog(statuses);
 
-  console.log(
-    await getJupTokenPrices([
-      NATIVE_MINT,
-      new PublicKey(USDC),
-      new PublicKey(POPCAT),
-    ])
-  );
+  const mints =
+    "HMQ9EEaLkVCS2R7bRDSKDUT8hzHg2qszG7y6HTfTuT5y,bSo13r4TkiE4KumL71LsHTPpL2euBYLFx6h9HP3piy1,7GCihgDB8fe6KNjn2MYtkzZcRjQy3t9GHdC8uHYmW2hr,EkvNF86bV1SnMtpHXMZMnNnoXMEERs1LNc8jvcTX2RnK,7z2ze7zaSaRhLh6GyTC5VhRsdbHTS8RfsDfDiE7qKzhB,7vfCXTUXx5WJV5JADk17DUJ4ksgau7utNKj4b963voxs,BaLL4pwZ3J9T8NtTe7wtfHLYW6fR8RCSY9mDTowKqmXm,BAvLBcZHaZV39PL3EBpSiiuQ1Nov3sBk3QLZoJpipump,F3yxnd4LL4N7ybFzjnDRBMc4d26dTAEviTjd6he3Qppj,Eyina3Cy5auLDYNCxPmqjwPTzxmTtpM2UWz5pE8s2Rnk,BALL1o7LFnCjsw38aE4pDvhbg3nmMeBbJKh3JU51HCr9,So11111111111111111111111111111111111111112"
+      .split(",")
+      .map((x) => new PublicKey(x));
+
+  console.log(await fetchTokenPrices(mints));
 }
 
 async function refreshAll() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.780",
+  "version": "1.0.782",
   "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

@@ -19,8 +19,6 @@ export function jupIxToSolanaIx(
 export async function getJupPriceData(mints: PublicKey[]) {
   const batches = getBatches(mints, 50);
 
-  console.log(batches.length);
-
   const results = await Promise.all(
     batches.map((batch) =>
       retryWithExponentialBackoff(async () => {
@@ -36,7 +34,7 @@ export async function getJupPriceData(mints: PublicKey[]) {
         }
 
         return res;
-      }, 4)
+      }, 6, 250)
     )
   );
 

package/src/utils/priceUtils.ts

@@ -212,10 +212,15 @@ export async function getJupTokenPrices(
   const data = getSortedPriceData(await getJupPriceData(mints), mints);
 
   const prices: Record<string, PriceResult> = Object.fromEntries(
-    Object.entries(data).map(([mint, x]) => [
+    mints.map((mint) => [
       mint,
-      x !== null && typeof x === "object" && "usdPrice" in x
-        ? { realtimePrice: parseFloat(x.usdPrice as string) }
+      data !== null &&
+      typeof data === "object" &&
+      typeof data[mint.toString()] === "object" &&
+      "usdPrice" in data[mint.toString()]
+        ? {
+            realtimePrice: parseFloat(data[mint.toString()].usdPrice as string),
+          }
         : { realtimePrice: 0 },
     ])
   );