@haven-fi/solauto-sdk 1.0.535 → 1.0.536

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): Promise<{
+export declare function getJupPriceData(mints: PublicKey[], extraInfo?: boolean, 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;;GA6B5E"}
+{"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"}

package/dist/utils/jupiterUtils.js

@@ -85,7 +85,7 @@ 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) {
+async function getJupPriceData(mints, extraInfo, 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(",") +
@@ -98,7 +98,7 @@ async function getJupPriceData(mints, extraInfo) {
             Boolean(Object.values(result)
                 .map((x) => parseFloat(x.price))
                 .filter((x) => x <= 0).length);
-        if (invalidValues) {
+        if (invalidValues && !mayIncludeSpamTokens) {
             throw new Error("Invalid price values");
         }
         return result;

package/dist/utils/priceUtils.d.ts

@@ -4,7 +4,7 @@ import { QuoteGetSwapModeEnum } from "@jup-ag/api";
 export declare function fetchTokenPrices(mints: PublicKey[]): Promise<number[]>;
 export declare function getPythPrices(mints: PublicKey[]): Promise<number[]>;
 export declare function getSwitchboardPrices(mints: PublicKey[]): Promise<number[]>;
-export declare function getJupTokenPrices(mints: PublicKey[]): Promise<number[]>;
+export declare function getJupTokenPrices(mints: PublicKey[], mayIncludeSpamTokens?: boolean): Promise<number[]>;
 export declare function safeGetPrice(mint: PublicKey | UmiPublicKey | undefined): number | undefined;
 export declare function getPriceImpact(inputMint: PublicKey, outputMint: PublicKey, amount: bigint, swapMode: QuoteGetSwapModeEnum): Promise<{
     priceImpact: number;

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;AAarE,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAEnD,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAqC5E;AAED,wBAAsB,aAAa,CAAC,KAAK,EAAE,SAAS,EAAE,qBAwCrD;AAED,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,MAAM,EAAE,CAAC,CAgDnB;AAED,wBAAsB,iBAAiB,CAAC,KAAK,EAAE,SAAS,EAAE,qBAQzD;AAED,wBAAgB,YAAY,CAC1B,IAAI,EAAE,SAAS,GAAG,YAAY,GAAG,SAAS,GACzC,MAAM,GAAG,SAAS,CAKpB;AAED,wBAAsB,cAAc,CAClC,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,SAAS,EACrB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,oBAAoB;;;GAc/B"}
+{"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;AAarE,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAEnD,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CA0C5E;AAED,wBAAsB,aAAa,CAAC,KAAK,EAAE,SAAS,EAAE,qBAwCrD;AAED,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,MAAM,EAAE,CAAC,CAoDnB;AAED,wBAAsB,iBAAiB,CACrC,KAAK,EAAE,SAAS,EAAE,EAClB,oBAAoB,CAAC,EAAE,OAAO,qBAa/B;AAED,wBAAgB,YAAY,CAC1B,IAAI,EAAE,SAAS,GAAG,YAAY,GAAG,SAAS,GACzC,MAAM,GAAG,SAAS,CAKpB;AAED,wBAAsB,cAAc,CAClC,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,SAAS,EACrB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,oBAAoB;;;GAc/B"}

package/dist/utils/priceUtils.js

@@ -44,12 +44,15 @@ async function fetchTokenPrices(mints) {
     }
     const pythMints = mints.filter((x) => x.toString() in pythConstants_1.PYTH_PRICE_FEED_IDS);
     const switchboardMints = mints.filter((x) => x.toString() in switchboardConstants_1.SWITCHBOARD_PRICE_FEED_IDS);
-    const [pythData, switchboardData] = await Promise.all([
+    const otherMints = mints.filter((x) => !pythMints.includes(x) && !switchboardMints.includes(x));
+    console.log(mints.length, otherMints.length);
+    const [pythData, switchboardData, jupData] = await Promise.all([
         (0, generalUtils_1.zip)(pythMints, await getPythPrices(pythMints)),
         (0, generalUtils_1.zip)(switchboardMints, await getSwitchboardPrices(switchboardMints)),
+        (0, generalUtils_1.zip)(otherMints, await getJupTokenPrices(otherMints, true)),
     ]);
     const prices = mints.map((mint) => {
-        const item = [...pythData, ...switchboardData].find((data) => data[0].equals(mint));
+        const item = [...pythData, ...switchboardData, ...jupData].find((data) => data[0].equals(mint));
         return item ? item[1] : 0;
     });
     for (var i = 0; i < mints.length; i++) {
@@ -102,7 +105,7 @@ async function getSwitchboardPrices(mints) {
             if (p.filter((x) => !x || isNaN(Number(x)) || Number(x) < 0).length > 0) {
                 throw new Error("Unable to fetch Switchboard prices");
             }
-            return p;
+            return p.map((x) => typeof x === "string" ? parseFloat(x) : Number(x));
         }, 2, 350);
     }
     catch {
@@ -111,17 +114,19 @@ async function getSwitchboardPrices(mints) {
     if (prices.length === 0) {
         prices = Array(mints.length).fill(0);
     }
-    const missingPrices = (0, generalUtils_1.zip)(mints, prices).filter((x) => !x[1] || isNaN(Number(x)));
+    const missingPrices = (0, generalUtils_1.zip)(mints, prices).filter((x) => !x[1] || isNaN(Number(x[1])));
     const jupPrices = (0, generalUtils_1.zip)(missingPrices.map((x) => x[0]), await getJupTokenPrices(missingPrices.map((x) => x[0])));
     prices = prices.map((x, i) => x ? x : jupPrices.find((y) => y[0].toString() === mints[i].toString())[1]);
     return prices;
 }
-async function getJupTokenPrices(mints) {
+async function getJupTokenPrices(mints, mayIncludeSpamTokens) {
     if (mints.length == 0) {
         return [];
     }
-    const data = await (0, jupiterUtils_1.getJupPriceData)(mints);
-    return Object.values(data).map((x) => parseFloat(x.price));
+    const data = await (0, jupiterUtils_1.getJupPriceData)(mints, false, mayIncludeSpamTokens);
+    return Object.values(data).map((x) => x !== null && typeof x === "object" && "price" in x
+        ? parseFloat(x.price)
+        : 0);
 }
 function safeGetPrice(mint) {
     if (mint && mint?.toString() in solautoConstants_1.PRICES) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.535",
+  "version": "1.0.536",
   "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,7 +171,7 @@ export async function getJupSwapTransaction(
   };
 }
 
-export async function getJupPriceData(mints: PublicKey[], extraInfo?: boolean) {
+export async function getJupPriceData(mints: PublicKey[], extraInfo?: boolean, mayIncludeSpamTokens?: boolean) {
   const data = await retryWithExponentialBackoff(async () => {
     const res = await (
       await fetch(
@@ -185,14 +185,14 @@ export async function getJupPriceData(mints: PublicKey[], extraInfo?: boolean) {
       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)
           .map((x) => parseFloat((x as any).price))
           .filter((x) => x <= 0).length
       );
-    if (invalidValues) {
+    if (invalidValues && !mayIncludeSpamTokens) {
       throw new Error("Invalid price values");
     }
 

package/src/utils/priceUtils.ts

@@ -30,14 +30,19 @@ export async function fetchTokenPrices(mints: PublicKey[]): Promise<number[]> {
   const switchboardMints = mints.filter(
     (x) => x.toString() in SWITCHBOARD_PRICE_FEED_IDS
   );
+  const otherMints = mints.filter(
+    (x) => !pythMints.includes(x) && !switchboardMints.includes(x)
+  );
+  console.log(mints.length, otherMints.length);
 
-  const [pythData, switchboardData] = await Promise.all([
+  const [pythData, switchboardData, jupData] = await Promise.all([
     zip(pythMints, await getPythPrices(pythMints)),
     zip(switchboardMints, await getSwitchboardPrices(switchboardMints)),
+    zip(otherMints, await getJupTokenPrices(otherMints, true)),
   ]);
 
   const prices = mints.map((mint) => {
-    const item = [...pythData, ...switchboardData].find((data) =>
+    const item = [...pythData, ...switchboardData, ...jupData].find((data) =>
       data[0].equals(mint)
     );
     return item ? item[1] : 0;
@@ -115,11 +120,15 @@ export async function getSwitchboardPrices(
         );
 
         const p = res.flatMap((x) => x.results[0]);
-        if (p.filter((x) => !x || isNaN(Number(x)) || Number(x) < 0).length > 0) {
+        if (
+          p.filter((x) => !x || isNaN(Number(x)) || Number(x) < 0).length > 0
+        ) {
           throw new Error("Unable to fetch Switchboard prices");
         }
 
-        return p;
+        return p.map((x) =>
+          typeof x === "string" ? parseFloat(x) : Number(x)
+        );
       },
       2,
       350
@@ -133,7 +142,7 @@ export async function getSwitchboardPrices(
   }
 
   const missingPrices = zip(mints, prices).filter(
-    (x) => !x[1] || isNaN(Number(x))
+    (x) => !x[1] || isNaN(Number(x[1]))
   );
   const jupPrices = zip(
     missingPrices.map((x) => x[0]),
@@ -147,14 +156,21 @@ export async function getSwitchboardPrices(
   return prices;
 }
 
-export async function getJupTokenPrices(mints: PublicKey[]) {
+export async function getJupTokenPrices(
+  mints: PublicKey[],
+  mayIncludeSpamTokens?: boolean
+) {
   if (mints.length == 0) {
     return [];
   }
 
-  const data = await getJupPriceData(mints);
+  const data = await getJupPriceData(mints, false, mayIncludeSpamTokens);
 
-  return Object.values(data).map((x) => parseFloat(x.price as string));
+  return Object.values(data).map((x) =>
+    x !== null && typeof x === "object" && "price" in x
+      ? parseFloat(x.price as string)
+      : 0
+  );
 }
 
 export function safeGetPrice(

package/tests/transactions/solautoMarginfi.ts

@@ -18,7 +18,7 @@ import {
   maxRepayToBps,
   toBaseUnit,
 } from "../../src/utils/numberUtils";
-import { NATIVE_MINT } from "@solana/spl-token";
+import { NATIVE_MINT, TOKEN_PROGRAM_ID } from "@solana/spl-token";
 import {
   TransactionItem,
   TransactionsManager,
@@ -34,14 +34,26 @@ import {
 } from "../../src/constants";
 import {
   buildHeliusApiUrl,
+  fetchTokenPrices,
   getAllPositionsByAuthority,
   getQnComputeUnitPriceEstimate,
   getSolautoManagedPositions,
   getSolautoPositionAccount,
+  getTokenAccount,
   retryWithExponentialBackoff,
 } from "../../src/utils";
 import { PriorityFeeSetting } from "../../src/types";
-import { buildIronforgeApiUrl, fromBaseUnit, tokenInfo, USD_DECIMALS } from "../../dist";
+import {
+  ALL_SUPPORTED_TOKENS,
+  buildIronforgeApiUrl,
+  fromBaseUnit,
+  tokenInfo,
+  USD_DECIMALS,
+} from "../../dist";
+import {
+  RawAccount as TokenAccountData,
+  AccountLayout as SplTokenAccountLayout,
+} from "@solana/spl-token";
 
 describe("Solauto Marginfi tests", async () => {
   const signer = setupTest();
@@ -62,18 +74,38 @@ describe("Solauto Marginfi tests", async () => {
     const supplyDecimals = 6;
     const debtDecimals = 6;
 
-    await client.initialize({
-      signer,
-      positionId,
-      // authority: new PublicKey("FKYQs7KgRvaKQHxXwb8HKfoBcFdSxLL3JvHWpPdVQ16v"),
-      // new: true,
-      // marginfiAccount: new PublicKey(
-      //   ""
-      // ),
-      // marginfiGroup: new PublicKey(""),
-      // supplyMint: new PublicKey(""),
-      // debtMint: new PublicKey(USDC),
-    });
+    // await client.initialize({
+    //   signer,
+    //   positionId,
+    //   // authority: new PublicKey("FKYQs7KgRvaKQHxXwb8HKfoBcFdSxLL3JvHWpPdVQ16v"),
+    //   // new: true,
+    //   // marginfiAccount: new PublicKey(
+    //   //   ""
+    //   // ),
+    //   // marginfiGroup: new PublicKey(""),
+    //   // supplyMint: new PublicKey(""),
+    //   // debtMint: new PublicKey(USDC),
+    // });
+
+    const tokenAccounts = (
+      await client.connection.getTokenAccountsByOwner(
+        new PublicKey("He4ka5Q3N1UvZikZvykdi47xyk5PoVP2tcQL5sVp31Sz"),
+        { programId: TOKEN_PROGRAM_ID },
+        { commitment: "confirmed" }
+      )
+    ).value;
+
+    const tokenAccountsData = tokenAccounts
+      .map(
+        (x) => SplTokenAccountLayout.decode(x.account.data) as TokenAccountData
+      )
+      .filter((x) => Boolean(x));
+
+    console.log(tokenAccountsData);
+    console.log(tokenAccountsData.length);
+
+    console.log(await fetchTokenPrices(tokenAccountsData.map((x) => x.mint)));
+    return;
 
     const transactionItems: TransactionItem[] = [];
     // const settingParams: SolautoSettingsParametersInpArgs = {