@haven-fi/solauto-sdk 1.0.781 → 1.0.783

package/dist/utils/jupiterUtils.js

@@ -24,7 +24,7 @@ async function getJupPriceData(mints) {
             throw new Error("Failed to get token prices using Jupiter");
         }
         return res;
-    }, 4)));
+    }, 6, 250)));
     const mergedResults = Object.assign({}, ...results);
     return mergedResults;
 }

package/dist/utils/switchboardUtils.d.ts

@@ -2,7 +2,7 @@ import { Connection, PublicKey } from "@solana/web3.js";
 import { Signer } from "@metaplex-foundation/umi";
 import * as OnDemand from "@switchboard-xyz/on-demand";
 import { TransactionItemInputs } from "../types";
-export declare function getPullFeed(conn: Connection, mint: PublicKey, wallet?: PublicKey): OnDemand.PullFeed;
+export declare function getPullFeed(conn: Connection, mint: PublicKey, wallet?: PublicKey): Promise<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":"AAAA,OAAO,EACL,UAAU,EACV,SAAS,EAGV,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,MAAM,EAAsB,MAAM,0BAA0B,CAAC;AAGtE,OAAO,KAAK,QAAQ,MAAM,4BAA4B,CAAC;AAIvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAOjD,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,CAoC5C;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;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,SAAS,GAAG,MAAM,WAEzD"}
+{"version":3,"file":"switchboardUtils.d.ts","sourceRoot":"","sources":["../../src/utils/switchboardUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,SAAS,EAGV,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,MAAM,EAAsB,MAAM,0BAA0B,CAAC;AAGtE,OAAO,KAAK,QAAQ,MAAM,4BAA4B,CAAC;AAIvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAOjD,wBAAsB,WAAW,CAC/B,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,SAAS,EACf,MAAM,CAAC,EAAE,SAAS,8BAuBnB;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAwC5C;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;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,SAAS,GAAG,MAAM,WAEzD"}

package/dist/utils/switchboardUtils.js

@@ -22,9 +22,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPullFeed = getPullFeed;
 exports.buildSwbSubmitResponseTx = buildSwbSubmitResponseTx;
@@ -35,34 +32,37 @@ const umi_1 = require("@metaplex-foundation/umi");
 const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
 const anchor_1 = require("@coral-xyz/anchor");
 const OnDemand = __importStar(require("@switchboard-xyz/on-demand"));
-const switchboard_json_1 = __importDefault(require("../idls/switchboard.json"));
+const SwbCommon = __importStar(require("@switchboard-xyz/common"));
 const constants_1 = require("../constants");
 const generalUtils_1 = require("./generalUtils");
 const solanaUtils_1 = require("./solanaUtils");
-function getPullFeed(conn, mint, wallet) {
+async function getPullFeed(conn, mint, wallet) {
     const dummyWallet = {
         publicKey: wallet ?? new web3_js_1.PublicKey("11111111111111111111111111111111"),
         signTransaction: async (tx) => tx,
         signAllTransactions: async (txs) => txs,
     };
     const provider = new anchor_1.AnchorProvider(conn, dummyWallet, anchor_1.AnchorProvider.defaultOptions());
-    const program = new anchor_1.Program(switchboard_json_1.default, provider);
-    const { PullFeed } = OnDemand;
-    return new PullFeed(program, new web3_js_1.PublicKey(constants_1.SWITCHBOARD_PRICE_FEED_IDS[mint.toString()].feedId));
+    const { PullFeed, ON_DEMAND_MAINNET_PID } = OnDemand;
+    const sbProgram = await anchor_1.Program.at(ON_DEMAND_MAINNET_PID, provider);
+    return new PullFeed(sbProgram, new web3_js_1.PublicKey(constants_1.SWITCHBOARD_PRICE_FEED_IDS[mint.toString()].feedId));
 }
 async function buildSwbSubmitResponseTx(conn, signer, mint) {
-    const feed = getPullFeed(conn, mint, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(signer.publicKey));
-    const [pullIx, responses] = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => {
+    const { CrossbarClient } = SwbCommon;
+    const crossbar = CrossbarClient.default();
+    const feed = await getPullFeed(conn, mint, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(signer.publicKey));
+    const [pullIxs, responses] = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => {
         const res = await feed.fetchUpdateIx({
+            gateway: crossbar.crossbarUrl,
             chain: "solana",
-            network: "mainnet-beta",
+            network: "mainnet",
         });
         if (!res[1] || !res[1][0].value) {
             throw new Error("Unable to fetch Switchboard pull IX");
         }
         return res;
     }, 3, 200);
-    if (!pullIx) {
+    if (!pullIxs || !pullIxs.length) {
         throw new Error("Unable to fetch SWB crank IX");
     }
     const price = responses[0].value.toNumber();
@@ -74,7 +74,7 @@ async function buildSwbSubmitResponseTx(conn, signer, mint) {
         time: (0, generalUtils_1.currentUnixSeconds)(),
     };
     return {
-        tx: (0, umi_1.transactionBuilder)([(0, solanaUtils_1.getWrappedInstruction)(signer, pullIx)]),
+        tx: (0, umi_1.transactionBuilder)([(0, solanaUtils_1.getWrappedInstruction)(signer, pullIxs[0])]),
         lookupTableAddresses: responses
             .filter((x) => Boolean(x.oracle.lut?.key))
             .map((x) => x.oracle.lut.key.toString()),
@@ -86,7 +86,7 @@ async function getSwitchboardFeedData(conn, mints) {
     }
     const currSlot = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => await conn.getSlot("confirmed"), 5);
     const results = await Promise.all(mints.map(async (mint) => {
-        const feed = getPullFeed(conn, mint);
+        const feed = await getPullFeed(conn, mint);
         const result = await feed.loadData();
         const price = Number(result.result.value) / Math.pow(10, 18);
         const stale = currSlot > result.result.slot.toNumber() + result.maxStaleness;

package/local/txSandbox.ts

@@ -4,16 +4,13 @@ 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,
@@ -22,10 +19,8 @@ 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;
@@ -43,39 +38,32 @@ 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 mints =
-    "HMQ9EEaLkVCS2R7bRDSKDUT8hzHg2qszG7y6HTfTuT5y,bSo13r4TkiE4KumL71LsHTPpL2euBYLFx6h9HP3piy1,7GCihgDB8fe6KNjn2MYtkzZcRjQy3t9GHdC8uHYmW2hr,EkvNF86bV1SnMtpHXMZMnNnoXMEERs1LNc8jvcTX2RnK,7z2ze7zaSaRhLh6GyTC5VhRsdbHTS8RfsDfDiE7qKzhB,7vfCXTUXx5WJV5JADk17DUJ4ksgau7utNKj4b963voxs,BaLL4pwZ3J9T8NtTe7wtfHLYW6fR8RCSY9mDTowKqmXm,BAvLBcZHaZV39PL3EBpSiiuQ1Nov3sBk3QLZoJpipump,F3yxnd4LL4N7ybFzjnDRBMc4d26dTAEviTjd6he3Qppj,Eyina3Cy5auLDYNCxPmqjwPTzxmTtpM2UWz5pE8s2Rnk,BALL1o7LFnCjsw38aE4pDvhbg3nmMeBbJKh3JU51HCr9,So11111111111111111111111111111111111111112"
-      .split(",")
-      .map((x) => new PublicKey(x));
-
-  console.log(await fetchTokenPrices(mints));
+  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("HLdUMx3kdM2QDQfHFaDw1QUwLXtRytyaBYm7C1DPG9uX"),
+    // 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);
 }
 
 async function refreshAll() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.781",
+  "version": "1.0.783",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "description": "Typescript SDK for the Solauto program on the Solana blockchain",
@@ -21,7 +21,7 @@
     "@solana/spl-token": "^0.4.0",
     "@solana/web3.js": "=1.95.8",
     "@switchboard-xyz/common": "=3.0.12",
-    "@switchboard-xyz/on-demand": "=1.2.51",
+    "@switchboard-xyz/on-demand": "=2.4.1",
     "axios": "^1.7.8",
     "big.js": "^6.2.2",
     "bs58": "^5.0.0",

package/src/utils/jupiterUtils.ts

@@ -34,7 +34,7 @@ export async function getJupPriceData(mints: PublicKey[]) {
         }
 
         return res;
-      }, 4)
+      }, 6, 250)
     )
   );
 

package/src/utils/switchboardUtils.ts

@@ -6,10 +6,10 @@ import {
 } from "@solana/web3.js";
 import { Signer, transactionBuilder } from "@metaplex-foundation/umi";
 import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
-import { AnchorProvider, Idl, Program } from "@coral-xyz/anchor";
+import { AnchorProvider, Program } from "@coral-xyz/anchor";
 import * as OnDemand from "@switchboard-xyz/on-demand";
+import * as SwbCommon from "@switchboard-xyz/common";
 import Big from "big.js";
-import switchboardIdl from "../idls/switchboard.json";
 import { PRICES, SWITCHBOARD_PRICE_FEED_IDS } from "../constants";
 import { TransactionItemInputs } from "../types";
 import {
@@ -18,7 +18,7 @@ import {
 } from "./generalUtils";
 import { getWrappedInstruction } from "./solanaUtils";
 
-export function getPullFeed(
+export async function getPullFeed(
   conn: Connection,
   mint: PublicKey,
   wallet?: PublicKey
@@ -37,11 +37,11 @@ export function getPullFeed(
     dummyWallet,
     AnchorProvider.defaultOptions()
   );
-  const program = new Program(switchboardIdl as Idl, provider);
+  const { PullFeed, ON_DEMAND_MAINNET_PID } = OnDemand;
+  const sbProgram = await Program.at(ON_DEMAND_MAINNET_PID, provider);
 
-  const { PullFeed } = OnDemand;
   return new PullFeed(
-    program,
+    sbProgram,
     new PublicKey(SWITCHBOARD_PRICE_FEED_IDS[mint.toString()].feedId)
   );
 }
@@ -51,12 +51,16 @@ export async function buildSwbSubmitResponseTx(
   signer: Signer,
   mint: PublicKey
 ): Promise<TransactionItemInputs | undefined> {
-  const feed = getPullFeed(conn, mint, toWeb3JsPublicKey(signer.publicKey));
-  const [pullIx, responses] = await retryWithExponentialBackoff(
+    const { CrossbarClient } = SwbCommon;
+    const crossbar = CrossbarClient.default();
+
+  const feed = await getPullFeed(conn, mint, toWeb3JsPublicKey(signer.publicKey));
+  const [pullIxs, responses] = await retryWithExponentialBackoff(
     async () => {
       const res = await feed.fetchUpdateIx({
+        gateway: crossbar.crossbarUrl,
         chain: "solana",
-        network: "mainnet-beta",
+        network: "mainnet",
       });
       if (!res[1] || !res[1][0].value) {
         throw new Error("Unable to fetch Switchboard pull IX");
@@ -67,7 +71,7 @@ export async function buildSwbSubmitResponseTx(
     200
   );
 
-  if (!pullIx) {
+  if (!pullIxs || !pullIxs.length) {
     throw new Error("Unable to fetch SWB crank IX");
   }
 
@@ -81,7 +85,7 @@ export async function buildSwbSubmitResponseTx(
   };
 
   return {
-    tx: transactionBuilder([getWrappedInstruction(signer, pullIx!)]),
+    tx: transactionBuilder([getWrappedInstruction(signer, pullIxs[0])]),
     lookupTableAddresses: responses
       .filter((x) => Boolean(x.oracle.lut?.key))
       .map((x) => x.oracle.lut!.key.toString()),
@@ -103,7 +107,7 @@ export async function getSwitchboardFeedData(
 
   const results = await Promise.all(
     mints.map(async (mint) => {
-      const feed = getPullFeed(conn, mint);
+      const feed = await getPullFeed(conn, mint);
       const result = await feed.loadData();
       const price = Number(result.result.value) / Math.pow(10, 18);
       const stale =