@haven-fi/solauto-sdk 1.0.539 → 1.0.540

package/dist/utils/jupiterUtils.d.ts

@@ -24,7 +24,7 @@ export interface JupSwapTransaction {
     swapIx: TransactionBuilder;
 }
 export declare function getJupSwapTransaction(signer: Signer, swapDetails: JupSwapDetails, attemptNum?: number): Promise<JupSwapTransaction>;
-export declare function getJupPriceData(mints: PublicKey[], extraInfo?: boolean, mayIncludeSpamTokens?: boolean): Promise<{
+export declare function getJupPriceData(mints: PublicKey[], mayIncludeSpamTokens?: boolean): Promise<{
     [key: string]: 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,EACL,MAAM,EACN,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAA0B,MAAM,iBAAiB,CAAC;AAGpE,OAAO,EAGL,aAAa,EACd,MAAM,aAAa,CAAC;AAUrB,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,SAAS,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,cAAe,SAAQ,YAAY;IAClD,iBAAiB,EAAE,SAAS,CAAC;IAC7B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,QAAQ,CAAC,EAAE,aAAa,CAAC;CAC1B;AAgBD,wBAAsB,WAAW,CAAC,WAAW,EAAE,YAAY,0BAsB1D;AAED,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,CAmF7B;AAED,wBAAsB,eAAe,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,SAAS,CAAC,EAAE,OAAO,EAAE,oBAAoB,CAAC,EAAE,OAAO;;GA6B5G"}
+{"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;AAUrB,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,SAAS,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,cAAe,SAAQ,YAAY;IAClD,iBAAiB,EAAE,SAAS,CAAC;IAC7B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,QAAQ,CAAC,EAAE,aAAa,CAAC;CAC1B;AAgBD,wBAAsB,WAAW,CAAC,WAAW,EAAE,YAAY,0BAsB1D;AAED,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,CAmF7B;AAED,wBAAsB,eAAe,CACnC,KAAK,EAAE,SAAS,EAAE,EAClB,oBAAoB,CAAC,EAAE,OAAO;;GAwC/B"}

package/dist/utils/jupiterUtils.js

@@ -85,11 +85,11 @@ async function getJupSwapTransaction(signer, swapDetails, attemptNum) {
         swapIx: (0, umi_1.transactionBuilder)().add((0, solanaUtils_1.getWrappedInstruction)(signer, createTransactionInstruction(instructions.swapInstruction))),
     };
 }
-async function getJupPriceData(mints, extraInfo, mayIncludeSpamTokens) {
+async function getJupPriceData(mints, mayIncludeSpamTokens) {
     const data = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => {
         const res = await (await fetch("https://api.jup.ag/price/v2?ids=" +
             mints.map((x) => x.toString()).join(",") +
-            (extraInfo ? "&showExtraInfo=true" : ""))).json();
+            "&showExtraInfo=true")).json();
         const result = res.data;
         if (!result || result === null || typeof result !== "object") {
             throw new Error("Failed to get token prices using Jupiter");
@@ -101,7 +101,10 @@ async function getJupPriceData(mints, extraInfo, mayIncludeSpamTokens) {
         if (invalidValues && !mayIncludeSpamTokens) {
             throw new Error("Invalid price values");
         }
-        return result;
+        const trueData = Object.entries(result).reduce((acc, [key, val]) => val.extraInfo?.quotedPrice?.sellAt === null
+            ? { ...acc, [key]: { ...val, price: "0" } }
+            : { ...acc, [key]: val }, {});
+        return trueData;
     }, 8);
     return data;
 }

package/dist/utils/priceUtils.js

@@ -122,7 +122,7 @@ async function getJupTokenPrices(mints, mayIncludeSpamTokens) {
     if (mints.length == 0) {
         return [];
     }
-    const data = await (0, jupiterUtils_1.getJupPriceData)(mints, false, mayIncludeSpamTokens);
+    const data = await (0, jupiterUtils_1.getJupPriceData)(mints, mayIncludeSpamTokens);
     const sortedData = {};
     for (const mint of mints) {
         const key = mint.toString();

package/package.json

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

@@ -171,13 +171,16 @@ export async function getJupSwapTransaction(
   };
 }
 
-export async function getJupPriceData(mints: PublicKey[], extraInfo?: boolean, mayIncludeSpamTokens?: boolean) {
+export async function getJupPriceData(
+  mints: PublicKey[],
+  mayIncludeSpamTokens?: boolean
+) {
   const data = await retryWithExponentialBackoff(async () => {
     const res = await (
       await fetch(
         "https://api.jup.ag/price/v2?ids=" +
           mints.map((x) => x.toString()).join(",") +
-          (extraInfo ? "&showExtraInfo=true" : "")
+          "&showExtraInfo=true"
       )
     ).json();
     const result = res.data;
@@ -185,7 +188,7 @@ export async function getJupPriceData(mints: PublicKey[], extraInfo?: boolean, m
       throw new Error("Failed to get token prices using Jupiter");
     }
 
-    const invalidValues = 
+    const invalidValues =
       Boolean(Object.values(result).filter((x) => x === null).length) ||
       Boolean(
         Object.values(result)
@@ -196,8 +199,18 @@ export async function getJupPriceData(mints: PublicKey[], extraInfo?: boolean, m
       throw new Error("Invalid price values");
     }
 
-    return result;
+    const trueData: { [key: string]: any } = Object.entries(
+      result as { [key: string]: any }
+    ).reduce(
+      (acc, [key, val]) =>
+        val.extraInfo?.quotedPrice?.sellAt === null
+          ? { ...acc, [key]: { ...val, price: "0" } }
+          : { ...acc, [key]: val },
+      {}
+    );
+
+    return trueData;
   }, 8);
 
-  return data as { [key: string]: any };
+  return data;
 }

package/src/utils/priceUtils.ts

@@ -163,7 +163,7 @@ export async function getJupTokenPrices(
     return [];
   }
 
-  const data = await getJupPriceData(mints, false, mayIncludeSpamTokens);
+  const data = await getJupPriceData(mints, mayIncludeSpamTokens);
 
   const sortedData: { [key: string]: any } = {};
   for (const mint of mints) {