@haven-fi/solauto-sdk 1.0.779 → 1.0.781

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

@@ -16,21 +16,15 @@ function jupIxToSolanaIx(instruction) {
     });
 }
 async function getJupPriceData(mints) {
-    const batches = (0, generalUtils_1.getBatches)(mints, 5); // batches is now PublicKey[][]
+    const batches = (0, generalUtils_1.getBatches)(mints, 50);
     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=" +
-            batch.map((x) => x.toString()).join(",") +
-            "&showExtraInfo=true")).json();
-        const result = res.data;
-        if (!result || typeof result !== "object") {
+        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)));
-    // Merge all batch results into one object
+        return res;
+    }, 4)));
     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" && "price" in x
-            ? { realtimePrice: parseFloat(x.price) }
+        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,13 +4,16 @@ import { fromWeb3JsKeypair } from "@metaplex-foundation/umi-web3js-adapters";
 import {
   ClientTransactionsManager,
   consoleLog,
+  fetchTokenPrices,
   getBatches,
   getClient,
+  getJupTokenPrices,
   getPositionExBulk,
   getSolanaRpcConnection,
   getSolautoManagedPositions,
   LendingPlatform,
   LOCAL_IRONFORGE_API_URL,
+  POPCAT,
   PriceType,
   PriorityFeeSetting,
   ProgramEnv,
@@ -19,8 +22,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 +43,39 @@ 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,
-  });
-
-  await client.initializeExistingSolautoPosition({
-    positionId: 1,
-    authority: new PublicKey("61rtn5tzVkesapo6Cz83SPoShUfAePSxJsqniuF2wRKC"),
-    // lpUserAccount: new PublicKey(
-    //   "GEokw9jqbh6d1xUNA3qaeYFFetbSR5Y1nt7C3chwwgSz"
-    // ),
-  });
-
-  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 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"
+  //   // ),
+  // });
+
+  // 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 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.779",
+  "version": "1.0.781",
   "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

@@ -17,40 +17,27 @@ export function jupIxToSolanaIx(
 }
 
 export async function getJupPriceData(mints: PublicKey[]) {
-  const batches = getBatches(mints, 5); // batches is now PublicKey[][]
+  const batches = getBatches(mints, 50);
 
   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"
+            "https://lite-api.jup.ag/price/v3?ids=" +
+              batch.map((x) => x.toString()).join(",")
           )
         ).json();
 
-        const result = res.data;
-        if (!result || typeof result !== "object") {
+        if (!res || typeof res !== "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 res;
+      }, 4)
     )
   );
 
-  // Merge all batch results into one object
   const mergedResults = Object.assign({}, ...results);
 
   return mergedResults;

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" && "price" in x
-        ? { realtimePrice: parseFloat(x.price 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 },
     ])
   );