@haven-fi/solauto-sdk 1.0.389 → 1.0.392

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,CA6CnB;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;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,CA8CnB;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"}

package/dist/utils/priceUtils.js

@@ -1,4 +1,7 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchTokenPrices = fetchTokenPrices;
 exports.getPythPrices = getPythPrices;
@@ -10,7 +13,7 @@ const numberUtils_1 = require("./numberUtils");
 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 on_demand_1 = __importDefault(require("@switchboard-xyz/on-demand"));
 const jupiterUtils_1 = require("./jupiterUtils");
 async function fetchTokenPrices(mints) {
     const currentTime = (0, generalUtils_1.currentUnixSeconds)();
@@ -68,7 +71,8 @@ async function getSwitchboardPrices(mints) {
     if (mints.length === 0) {
         return [];
     }
-    const crossbar = new on_demand_1.CrossbarClient("https://crossbar.switchboard.xyz");
+    const { CrossbarClient } = on_demand_1.default;
+    const crossbar = CrossbarClient.default();
     let prices = [];
     try {
         prices = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => {

package/dist/utils/switchboardUtils.d.ts

@@ -1,8 +1,8 @@
 import { Connection, PublicKey } from "@solana/web3.js";
-import { PullFeed } from "@switchboard-xyz/on-demand";
+import OnDemand from "@switchboard-xyz/on-demand";
 import { TransactionItemInputs } from "../types";
 import { Signer } from "@metaplex-foundation/umi";
-export declare function getPullFeed(conn: Connection, mint: PublicKey, wallet?: PublicKey): PullFeed;
+export declare function getPullFeed(conn: Connection, mint: PublicKey, wallet?: PublicKey): OnDemand.PullFeed;
 export declare function buildSwbSubmitResponseTx(conn: Connection, signer: Signer, mint: PublicKey): Promise<TransactionItemInputs | undefined>;
 export declare function getSwitchboardFeedData(conn: Connection, mints: PublicKey[]): Promise<{
     mint: PublicKey;

package/dist/utils/switchboardUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"switchboardUtils.d.ts","sourceRoot":"","sources":["../../src/utils/switchboardUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,UAAU,EACV,SAAS,EAGV,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAkB,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAEtE,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AACjD,OAAO,EAAE,MAAM,EAAsB,MAAM,0BAA0B,CAAC;AAOtE,wBAAgB,WAAW,CACzB,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,SAAS,EACf,MAAM,CAAC,EAAE,SAAS,YAsBnB;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAsB5C;AAED,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,UAAU,EAChB,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,EAAE,CAAC,CAuB/D"}
+{"version":3,"file":"switchboardUtils.d.ts","sourceRoot":"","sources":["../../src/utils/switchboardUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,UAAU,EACV,SAAS,EAGV,MAAM,iBAAiB,CAAC;AACzB,OAAO,QAAQ,MAAM,4BAA4B,CAAC;AAElD,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AACjD,OAAO,EAAE,MAAM,EAAsB,MAAM,0BAA0B,CAAC;AAOtE,wBAAgB,WAAW,CACzB,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,SAAS,EACf,MAAM,CAAC,EAAE,SAAS,qBAuBnB;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAwB5C;AAED,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,UAAU,EAChB,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,EAAE,CAAC,CAuB/D"}

package/dist/utils/switchboardUtils.js

@@ -9,7 +9,7 @@ exports.getSwitchboardFeedData = getSwitchboardFeedData;
 const anchor_1 = require("@coral-xyz/anchor");
 const switchboard_json_1 = __importDefault(require("../idls/switchboard.json"));
 const web3_js_1 = require("@solana/web3.js");
-const on_demand_1 = require("@switchboard-xyz/on-demand");
+const on_demand_1 = __importDefault(require("@switchboard-xyz/on-demand"));
 const switchboardConstants_1 = require("../constants/switchboardConstants");
 const umi_1 = require("@metaplex-foundation/umi");
 const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
@@ -22,10 +22,12 @@ function getPullFeed(conn, mint, wallet) {
     };
     const provider = new anchor_1.AnchorProvider(conn, dummyWallet, anchor_1.AnchorProvider.defaultOptions());
     const program = new anchor_1.Program(switchboard_json_1.default, provider);
-    return new on_demand_1.PullFeed(program, new web3_js_1.PublicKey(switchboardConstants_1.SWITCHBOARD_PRICE_FEED_IDS[mint.toString()]));
+    const { PullFeed } = on_demand_1.default;
+    return new PullFeed(program, new web3_js_1.PublicKey(switchboardConstants_1.SWITCHBOARD_PRICE_FEED_IDS[mint.toString()]));
 }
 async function buildSwbSubmitResponseTx(conn, signer, mint) {
-    const crossbar = new on_demand_1.CrossbarClient("https://crossbar.switchboard.xyz");
+    const { CrossbarClient } = on_demand_1.default;
+    const crossbar = CrossbarClient.default();
     const feed = getPullFeed(conn, mint, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(signer.publicKey));
     const [pullIx, responses] = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => await feed.fetchUpdateIx({
         crossbarClient: crossbar,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.389",
+  "version": "1.0.392",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "description": "Typescript SDK for the Solauto program on the Solana blockchain",
@@ -23,7 +23,7 @@
     "@mrgnlabs/mrgn-common": "^1.8.0",
     "@solana/spl-token": "^0.4.0",
     "@solana/web3.js": "=1.95.8",
-    "@switchboard-xyz/on-demand": "^1.2.51",
+    "@switchboard-xyz/on-demand": "=1.2.51",
     "axios": "^1.7.8",
     "bs58": "^5.0.0",
     "cross-fetch": "^4.0.0",

package/src/utils/priceUtils.ts

@@ -10,7 +10,7 @@ import {
   retryWithExponentialBackoff,
   zip,
 } from "./generalUtils";
-import { CrossbarClient } from "@switchboard-xyz/on-demand";
+import OnDemand from "@switchboard-xyz/on-demand";
 import { getJupPriceData } from "./jupiterUtils";
 
 export async function fetchTokenPrices(mints: PublicKey[]): Promise<number[]> {
@@ -101,7 +101,8 @@ export async function getSwitchboardPrices(
     return [];
   }
 
-  const crossbar = new CrossbarClient("https://crossbar.switchboard.xyz");
+  const { CrossbarClient } = OnDemand;
+  const crossbar = CrossbarClient.default();
 
   let prices: number[] = [];
   try {

package/src/utils/switchboardUtils.ts

@@ -6,7 +6,7 @@ import {
   Transaction,
   VersionedTransaction,
 } from "@solana/web3.js";
-import { CrossbarClient, PullFeed } from "@switchboard-xyz/on-demand";
+import OnDemand from "@switchboard-xyz/on-demand";
 import { SWITCHBOARD_PRICE_FEED_IDS } from "../constants/switchboardConstants";
 import { TransactionItemInputs } from "../types";
 import { Signer, transactionBuilder } from "@metaplex-foundation/umi";
@@ -37,6 +37,7 @@ export function getPullFeed(
   );
   const program = new Program(switchboardIdl as Idl, provider);
 
+  const { PullFeed } = OnDemand;
   return new PullFeed(
     program,
     new PublicKey(SWITCHBOARD_PRICE_FEED_IDS[mint.toString()])
@@ -48,7 +49,9 @@ export async function buildSwbSubmitResponseTx(
   signer: Signer,
   mint: PublicKey
 ): Promise<TransactionItemInputs | undefined> {
-  const crossbar = new CrossbarClient("https://crossbar.switchboard.xyz");
+  const { CrossbarClient } = OnDemand;
+
+  const crossbar = CrossbarClient.default();
   const feed = getPullFeed(conn, mint, toWeb3JsPublicKey(signer.publicKey));
   const [pullIx, responses] = await retryWithExponentialBackoff(
     async () =>

package/tests/transactions/solautoMarginfi.ts

@@ -133,7 +133,7 @@ describe("Solauto Marginfi tests", async () => {
     // );
     // console.log(stateKeverage);
 
-    // console.log(await getJupTokenPrices([new PublicKey(HMTR)]));
+    console.log(await fetchTokenPrices([new PublicKey(HMTR)]));
 
     const transactionItems: TransactionItem[] = [];
     // const settingParams: SolautoSettingsParametersInpArgs = {