@haven-fi/solauto-sdk 1.0.778 → 1.0.780

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

package/dist/utils/jupiterUtils.js

@@ -16,18 +16,16 @@ function jupIxToSolanaIx(instruction) {
     });
 }
 async function getJupPriceData(mints) {
-    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(",") +
-            "&showExtraInfo=true")).json();
-        const result = res.data;
-        if (!result || result === null || typeof result !== "object") {
+    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();
+        if (!res || typeof res !== "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;
+        return res;
+    }, 4)));
+    const mergedResults = Object.assign({}, ...results);
+    return mergedResults;
 }

package/dist/utils/priceUtils.js

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

package/local/txSandbox.ts

@@ -6,11 +6,13 @@ import {
   consoleLog,
   getBatches,
   getClient,
+  getJupTokenPrices,
   getPositionExBulk,
   getSolanaRpcConnection,
   getSolautoManagedPositions,
   LendingPlatform,
   LOCAL_IRONFORGE_API_URL,
+  POPCAT,
   PriceType,
   PriorityFeeSetting,
   ProgramEnv,
@@ -19,8 +21,10 @@ import {
   SOLAUTO_TEST_PROGRAM,
   SolautoClient,
   TransactionItem,
+  USDC,
 } from "../src";
 import { getSecretKey } from "./shared";
+import { NATIVE_MINT } from "@solana/spl-token";
 
 const payForTransaction = true;
 const testProgram = false;
@@ -38,32 +42,40 @@ const signer = createSignerFromKeypair(
 );
 
 export async function main() {
-  const client = getClient(LendingPlatform.Marginfi, {
-    signer,
-    showLogs: true,
-    rpcUrl: LOCAL_IRONFORGE_API_URL,
-    programId: testProgram ? SOLAUTO_TEST_PROGRAM : SOLAUTO_PROD_PROGRAM,
-    lpEnv,
-  });
+  // const client = getClient(LendingPlatform.Marginfi, {
+  //   signer,
+  //   showLogs: true,
+  //   rpcUrl: LOCAL_IRONFORGE_API_URL,
+  //   programId: testProgram ? SOLAUTO_TEST_PROGRAM : SOLAUTO_PROD_PROGRAM,
+  //   lpEnv,
+  // });
 
-  await client.initializeExistingSolautoPosition({
-    positionId: 1,
-    authority: new PublicKey("61rtn5tzVkesapo6Cz83SPoShUfAePSxJsqniuF2wRKC"),
-    // lpUserAccount: new PublicKey(
-    //   "GEokw9jqbh6d1xUNA3qaeYFFetbSR5Y1nt7C3chwwgSz"
-    // ),
-  });
+  // await client.initializeExistingSolautoPosition({
+  //   positionId: 1,
+  //   authority: new PublicKey("61rtn5tzVkesapo6Cz83SPoShUfAePSxJsqniuF2wRKC"),
+  //   // lpUserAccount: new PublicKey(
+  //   //   "GEokw9jqbh6d1xUNA3qaeYFFetbSR5Y1nt7C3chwwgSz"
+  //   // ),
+  // });
 
-  const transactionItems = [rebalance(client)];
+  // const transactionItems = [rebalance(client)];
 
-  const txManager = new ClientTransactionsManager({
-    txHandler: client,
-    txRunType: payForTransaction ? "normal" : "only-simulate",
-    priorityFeeSetting: PriorityFeeSetting.Default,
-    retryConfig: { totalRetries: 2 },
-  });
-  const statuses = await txManager.send(transactionItems);
-  consoleLog(statuses);
+  // const txManager = new ClientTransactionsManager({
+  //   txHandler: client,
+  //   txRunType: payForTransaction ? "normal" : "only-simulate",
+  //   priorityFeeSetting: PriorityFeeSetting.Default,
+  //   retryConfig: { totalRetries: 2 },
+  // });
+  // const statuses = await txManager.send(transactionItems);
+  // consoleLog(statuses);
+
+  console.log(
+    await getJupTokenPrices([
+      NATIVE_MINT,
+      new PublicKey(USDC),
+      new PublicKey(POPCAT),
+    ])
+  );
 }
 
 async function refreshAll() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.778",
+  "version": "1.0.780",
   "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,30 @@ 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, 50);
+
+  console.log(batches.length);
+
+  const results = await Promise.all(
+    batches.map((batch) =>
+      retryWithExponentialBackoff(async () => {
+        const res = await (
+          await fetch(
+            "https://lite-api.jup.ag/price/v3?ids=" +
+              batch.map((x) => x.toString()).join(",")
+          )
+        ).json();
+
+        if (!res || typeof res !== "object") {
+          throw new Error("Failed to get token prices using Jupiter");
+        }
+
+        return res;
+      }, 4)
+    )
+  );
+
+  const mergedResults = Object.assign({}, ...results);
+
+  return mergedResults;
 }

package/src/utils/priceUtils.ts

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