@haven-fi/solauto-sdk 1.0.544 → 1.0.546

package/dist/utils/jupiterUtils.js

@@ -101,7 +101,7 @@ async function getJupPriceData(mints, mayIncludeSpamTokens) {
         if (invalidValues && !mayIncludeSpamTokens) {
             throw new Error("Invalid price values");
         }
-        const trueData = Object.entries(result).reduce((acc, [key, val]) => val.extraInfo?.quotedPrice?.sellAt === null
+        const trueData = Object.entries(result).reduce((acc, [key, val]) => !val?.extraInfo?.quotedPrice?.sellAt
             ? { ...acc, [key]: { ...val, price: "0" } }
             : { ...acc, [key]: val }, {});
         return trueData;

package/dist/utils/priceUtils.d.ts

@@ -1,13 +1,8 @@
 import { PublicKey } from "@solana/web3.js";
 import { PublicKey as UmiPublicKey } from "@metaplex-foundation/umi";
-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[], 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;
-    quote: import("@jup-ag/api").QuoteResponse;
-}>;
+export declare function safeGetPrice(mint: PublicKey | UmiPublicKey | string | undefined): number | undefined;
 //# sourceMappingURL=priceUtils.d.ts.map

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,CAyC5E;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,qBAqB/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"}
+{"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;AAerE,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAyC5E;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,qBAqB/B;AAED,wBAAgB,YAAY,CAC1B,IAAI,EAAE,SAAS,GAAG,YAAY,GAAG,MAAM,GAAG,SAAS,GAClD,MAAM,GAAG,SAAS,CAKpB"}

package/dist/utils/priceUtils.js

@@ -28,7 +28,6 @@ exports.getPythPrices = getPythPrices;
 exports.getSwitchboardPrices = getSwitchboardPrices;
 exports.getJupTokenPrices = getJupTokenPrices;
 exports.safeGetPrice = safeGetPrice;
-exports.getPriceImpact = getPriceImpact;
 const pythConstants_1 = require("../constants/pythConstants");
 const numberUtils_1 = require("./numberUtils");
 const solautoConstants_1 = require("../constants/solautoConstants");
@@ -140,16 +139,3 @@ function safeGetPrice(mint) {
     }
     return undefined;
 }
-async function getPriceImpact(inputMint, outputMint, amount, swapMode) {
-    const quoteResponse = await (0, jupiterUtils_1.getJupQuote)({
-        inputMint,
-        outputMint,
-        amount,
-        exactIn: swapMode === "ExactIn",
-        exactOut: swapMode === "ExactOut",
-    });
-    return {
-        priceImpact: parseFloat(quoteResponse.priceImpactPct),
-        quote: quoteResponse,
-    };
-}

package/package.json

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

@@ -204,7 +204,7 @@ export async function getJupPriceData(
       result as { [key: string]: any }
     ).reduce(
       (acc, [key, val]) =>
-        val.extraInfo?.quotedPrice?.sellAt === null
+        !val?.extraInfo?.quotedPrice?.sellAt
           ? { ...acc, [key]: { ...val, price: "0" } }
           : { ...acc, [key]: val },
       {}

package/src/utils/priceUtils.ts

@@ -181,30 +181,10 @@ export async function getJupTokenPrices(
 }
 
 export function safeGetPrice(
-  mint: PublicKey | UmiPublicKey | undefined
+  mint: PublicKey | UmiPublicKey | string | undefined
 ): number | undefined {
   if (mint && mint?.toString() in PRICES) {
     return PRICES[mint!.toString()].price;
   }
   return undefined;
-}
-
-export async function getPriceImpact(
-  inputMint: PublicKey,
-  outputMint: PublicKey,
-  amount: bigint,
-  swapMode: QuoteGetSwapModeEnum
-) {
-  const quoteResponse = await getJupQuote({
-    inputMint,
-    outputMint,
-    amount,
-    exactIn: swapMode === "ExactIn",
-    exactOut: swapMode === "ExactOut",
-  });
-
-  return {
-    priceImpact: parseFloat(quoteResponse.priceImpactPct),
-    quote: quoteResponse,
-  };
-}
+}

package/tests/transactions/solautoMarginfi.ts

@@ -1,5 +1,5 @@
 import { describe, it } from "mocha";
-import { none, publicKey, some } from "@metaplex-foundation/umi";
+import { none, publicKey, some, Umi } from "@metaplex-foundation/umi";
 import { setupTest } from "../shared";
 import { SolautoMarginfiClient } from "../../src/clients/solautoMarginfiClient";
 import {
@@ -43,6 +43,29 @@ import {
 import { PriorityFeeSetting } from "../../src/types";
 import { buildIronforgeApiUrl, fromBaseUnit, tokenInfo, USD_DECIMALS } from "../../dist";
 
+async function getAssets(
+  umi: Umi,
+  mints: PublicKey[]
+) {
+  const response = await fetch(umi.rpc.getEndpoint(), {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    body: JSON.stringify({
+      jsonrpc: '2.0',
+      id: 'get-assets',
+      method: 'getAssetBatch',
+      params: {
+        ids: mints.map((x) => x.toString()),
+      },
+    }),
+  });
+  const res = await response.json();
+  return res;
+}
+
+
 describe("Solauto Marginfi tests", async () => {
   // const signer = setupTest();
   const signer = setupTest("solauto-manager");
@@ -62,18 +85,21 @@ 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),
+    // });
+
+    console.log(await getAssets(client.umi, [NATIVE_MINT, new PublicKey(USDC)]));
+    return;
 
     const transactionItems: TransactionItem[] = [];
     // const settingParams: SolautoSettingsParametersInpArgs = {