@haven-fi/solauto-sdk 1.0.386 → 1.0.387

package/dist/utils/jupiterUtils.d.ts

@@ -19,7 +19,4 @@ 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<{
-    [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;AAOrB,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,SAAS,CAAC;IACtB,iBAAiB,EAAE,SAAS,CAAC;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAgBD,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,CAsF7B;AAED,wBAAsB,eAAe,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,SAAS,CAAC,EAAE,OAAO;;GAY5E"}
+{"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;AAOrB,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,SAAS,CAAC;IACtB,iBAAiB,EAAE,SAAS,CAAC;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAgBD,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,CAsF7B"}

package/dist/utils/jupiterUtils.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getJupSwapTransaction = getJupSwapTransaction;
-exports.getJupPriceData = getJupPriceData;
 const umi_1 = require("@metaplex-foundation/umi");
 const web3_js_1 = require("@solana/web3.js");
 const solanaUtils_1 = require("./solanaUtils");
@@ -71,11 +70,3 @@ 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) {
-    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();
-        return res;
-    }, 6);
-    return data.data;
-}

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;AAcrE,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,CA+CnB;AAED,wBAAsB,iBAAiB,CAAC,KAAK,EAAE,SAAS,EAAE,qBAYzD;AAED,wBAAgB,YAAY,CAC1B,IAAI,EAAE,SAAS,GAAG,YAAY,GAAG,SAAS,GACzC,MAAM,GAAG,SAAS,CAKpB"}
+{"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,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,CA6CnB;AAED,wBAAsB,iBAAiB,CAAC,KAAK,EAAE,SAAS,EAAE,qBAoBzD;AAED,wBAAgB,YAAY,CAC1B,IAAI,EAAE,SAAS,GAAG,YAAY,GAAG,SAAS,GACzC,MAAM,GAAG,SAAS,CAKpB"}

package/dist/utils/priceUtils.js

@@ -11,7 +11,6 @@ const solautoConstants_1 = require("../constants/solautoConstants");
 const switchboardConstants_1 = require("../constants/switchboardConstants");
 const generalUtils_1 = require("./generalUtils");
 const on_demand_1 = require("@switchboard-xyz/on-demand");
-const jupiterUtils_1 = require("./jupiterUtils");
 async function fetchTokenPrices(mints) {
     const currentTime = (0, generalUtils_1.currentUnixSeconds)();
     if (!mints.some((mint) => !(mint.toString() in solautoConstants_1.PRICES) ||
@@ -95,8 +94,12 @@ async function getJupTokenPrices(mints) {
     if (mints.length == 0) {
         return [];
     }
-    const data = await (0, jupiterUtils_1.getJupPriceData)(mints);
-    const prices = Object.values(data).map((x) => parseFloat(x.price));
+    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(","))).json();
+        return res;
+    }, 6);
+    const prices = Object.values(data.data).map((x) => parseFloat(x.price));
     return prices;
 }
 function safeGetPrice(mint) {

package/package.json

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

@@ -140,18 +140,4 @@ export async function getJupSwapTransaction(
       )
     ),
   };
-}
-
-export async function getJupPriceData(mints: PublicKey[], extraInfo?: 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" : "")
-      )
-    ).json();
-    return res;
-  }, 6);
-
-  return data.data as { [key: string]: any };
-}
+}

package/src/utils/priceUtils.ts

@@ -11,7 +11,6 @@ import {
   zip,
 } from "./generalUtils";
 import { CrossbarClient } from "@switchboard-xyz/on-demand";
-import { getJupPriceData } from "./jupiterUtils";
 
 export async function fetchTokenPrices(mints: PublicKey[]): Promise<number[]> {
   const currentTime = currentUnixSeconds();
@@ -111,12 +110,12 @@ export async function getSwitchboardPrices(
           "mainnet",
           mints.map((x) => SWITCHBOARD_PRICE_FEED_IDS[x.toString()])
         );
-
+  
         const p = res.flatMap((x) => x.results[0]);
         if (p.filter((x) => !x || isNaN(Number(x))).length > 0) {
           throw new Error("Unable to fetch Switchboard prices");
         }
-
+  
         return p;
       },
       2,
@@ -130,9 +129,7 @@ export async function getSwitchboardPrices(
     prices = Array(mints.length).fill(0);
   }
 
-  const missingPrices = zip(mints, prices).filter(
-    (x) => !x[1] || isNaN(Number(x))
-  );
+  const missingPrices = zip(mints, prices).filter((x) => !x[1] || isNaN(Number(x)));
   const jupPrices = zip(
     missingPrices.map((x) => x[0]),
     await getJupTokenPrices(missingPrices.map((x) => x[0]))
@@ -150,9 +147,17 @@ export async function getJupTokenPrices(mints: PublicKey[]) {
     return [];
   }
 
-  const data = await getJupPriceData(mints);
-
-  const prices = Object.values(data).map(
+  const data = await retryWithExponentialBackoff(async () => {
+    const res = await (
+      await fetch(
+        "https://api.jup.ag/price/v2?ids=" +
+          mints.map((x) => x.toString()).join(",")
+      )
+    ).json();
+    return res;
+  }, 6);
+
+  const prices = Object.values(data.data as { [key: string]: any }).map(
     (x) => parseFloat(x.price as string) as number
   );
 

package/tests/transactions/solautoMarginfi.ts

@@ -94,9 +94,12 @@ describe("Solauto Marginfi tests", async () => {
     // console.log(JSON.stringify(await getJupPriceData([new PublicKey("7JhmUcZrrfhyt5nTSu3AfsrUq2L9992a7AhwdSDxdoL2")], true), null, 2));
     // console.log(JSON.stringify(await getJupPriceData([new PublicKey(POPCAT)], true), null, 2));
 
-    // const accounts = MARGINFI_ACCOUNTS["DESG67cExEcw7d6MmENLEzaocR8pLrhfiw9VrNtGWUKD"];
+    // const tokenMint = NATIVE_MINT.toString();
+    // await fetchTokenPrices([new PublicKey(tokenMint)]);
+
+    // // const accounts = MARGINFI_ACCOUNTS["DESG67cExEcw7d6MmENLEzaocR8pLrhfiw9VrNtGWUKD"];
     // const accounts = MARGINFI_ACCOUNTS[DEFAULT_MARGINFI_GROUP];
-    // const [supplyBank, debtBank] = await safeFetchAllBank(client.umi, [publicKey(accounts[USDC].bank), publicKey(accounts[tokenMint].bank)]);
+    // const [supplyBank, debtBank] = await safeFetchAllBank(client.umi, [publicKey(accounts[tokenMint].bank), publicKey(accounts[USDC].bank)]);
 
     // console.log(supplyBank, debtBank);
     // const [maxLtv, liqThreshold] = calcMarginfiMaxLtvAndLiqThreshold(
@@ -116,7 +119,7 @@ describe("Solauto Marginfi tests", async () => {
     //   // getMaxLiqUtilizationRateBps(toBps(maxLtv), toBps(liqThreshold), 0.005)
     // );
     // const maxLeverage = getLeverageFactor(
-    //   "Short",
+    //   "Long",
     //   supplyUsd + debtAdjustmentUsd,
     //   debtAdjustmentUsd
     // );