@haven-fi/solauto-sdk 1.0.804 → 1.0.806

package/dist/utils/switchboardUtils.d.ts

@@ -2,7 +2,10 @@ 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): Promise<OnDemand.PullFeed>;
+export declare function getPullFeed(conn: Connection, mint: PublicKey, wallet?: PublicKey): Promise<{
+    gateway: OnDemand.Gateway;
+    feed: 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;AAQjD,wBAAsB,WAAW,CAC/B,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,SAAS,EACf,MAAM,CAAC,EAAE,SAAS,8BA2BnB;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CA8C5C;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;AAGvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AASjD,wBAAsB,WAAW,CAC/B,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,SAAS,EACf,MAAM,CAAC,EAAE,SAAS;;;GAkCnB;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAmD5C;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

@@ -45,6 +45,7 @@ const OnDemand = __importStar(require("@switchboard-xyz/on-demand"));
 const constants_1 = require("../constants");
 const generalUtils_1 = require("./generalUtils");
 const solanaUtils_1 = require("./solanaUtils");
+const common_1 = require("@switchboard-xyz/common");
 async function getPullFeed(conn, mint, wallet) {
     const dummyWallet = {
         publicKey: wallet ?? new web3_js_1.PublicKey("11111111111111111111111111111111"),
@@ -53,19 +54,25 @@ async function getPullFeed(conn, mint, wallet) {
     };
     const provider = new anchor_1.AnchorProvider(conn, dummyWallet, anchor_1.AnchorProvider.defaultOptions());
     (0, generalUtils_1.consoleLog)("Pulling SWB program...");
-    const { PullFeed, ON_DEMAND_MAINNET_PID } = OnDemand;
+    const { PullFeed, Queue, ON_DEMAND_MAINNET_PID } = OnDemand;
     const sbProgram = await anchor_1.Program.at(ON_DEMAND_MAINNET_PID, provider);
+    const crossbar = new common_1.CrossbarClient("https://integrator-crossbar.mrgn.app/");
+    const queue = await Queue.loadDefault(sbProgram);
+    const gateway = await queue.fetchGatewayFromCrossbar(crossbar);
     (0, generalUtils_1.consoleLog)("Pulled SWB program!");
     (0, generalUtils_1.consoleLog)("Feed id:", constants_1.SWITCHBOARD_PRICE_FEED_IDS[mint.toString()].feedId);
-    return new PullFeed(sbProgram, new web3_js_1.PublicKey(constants_1.SWITCHBOARD_PRICE_FEED_IDS[mint.toString()].feedId));
+    return {
+        gateway,
+        feed: 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 = await getPullFeed(conn, mint, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(signer.publicKey));
-    const gateway = await feed.fetchGatewayUrl();
+    const { feed, gateway } = await getPullFeed(conn, mint, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(signer.publicKey));
+    // Try to replicate locally in the lambda docker container
     (0, generalUtils_1.consoleLog)("Fetching crank IX...");
     const [pullIxs, responses] = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => {
         const res = await feed.fetchUpdateIx({
-            gateway,
+            gateway: gateway.endpoint(),
             chain: "solana",
             network: "mainnet-beta",
         });
@@ -93,7 +100,7 @@ async function buildSwbSubmitResponseTx(conn, signer, mint) {
         lookupTableAddresses: responses
             .filter((x) => Boolean(x.oracle.lut?.key))
             .map((x) => x.oracle.lut.key.toString()),
-        orderPrio: -1,
+        orderPrio: -2,
     };
 }
 async function getSwitchboardFeedData(conn, mints) {
@@ -102,7 +109,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 = await 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

@@ -12,7 +12,9 @@ import {
   getPositionExBulk,
   getSolanaRpcConnection,
   getSolautoManagedPositions,
+  H_SOL,
   JITO_SOL,
+  JUP_SOL,
   LendingPlatform,
   LOCAL_IRONFORGE_API_URL,
   openSolautoPosition,
@@ -67,7 +69,10 @@ export async function main() {
   ];
   // const transactionItems = [
   //   new TransactionItem(
-  //     async () => await buildSwbSubmitResponseTx(conn, signer, new PublicKey(NATIVE_MINT))
+  //     async () => await buildSwbSubmitResponseTx(conn, signer, new PublicKey(NATIVE_MINT)),
+  //     // async () => await buildSwbSubmitResponseTx(conn, signer, new PublicKey(JUP_SOL)),
+  //     // async () => await buildSwbSubmitResponseTx(conn, signer, new PublicKey(JITO_SOL))
+  //     // async () => await buildSwbSubmitResponseTx(conn, signer, new PublicKey(H_SOL))
   //   ),
   // ];
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.804",
+  "version": "1.0.806",
   "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.98.2",
     "@switchboard-xyz/common": "=3.4.1",
-    "@switchboard-xyz/on-demand": "=2.16.3",
+    "@switchboard-xyz/on-demand": "=2.17.4",
     "axios": "^1.7.8",
     "big.js": "^6.2.2",
     "bs58": "^5.0.0",

package/src/utils/switchboardUtils.ts

@@ -9,7 +9,6 @@ import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
 import { AnchorProvider, Idl, Program } from "@coral-xyz/anchor";
 import * as OnDemand from "@switchboard-xyz/on-demand";
 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,6 +17,7 @@ import {
   retryWithExponentialBackoff,
 } from "./generalUtils";
 import { getWrappedInstruction } from "./solanaUtils";
+import { CrossbarClient } from "@switchboard-xyz/common";
 
 export async function getPullFeed(
   conn: Connection,
@@ -40,15 +40,22 @@ export async function getPullFeed(
   );
 
   consoleLog("Pulling SWB program...");
-  const { PullFeed, ON_DEMAND_MAINNET_PID } = OnDemand;
+  const { PullFeed, Queue, ON_DEMAND_MAINNET_PID } = OnDemand;
   const sbProgram = await Program.at(ON_DEMAND_MAINNET_PID, provider);
 
+  const crossbar = new CrossbarClient("https://integrator-crossbar.mrgn.app/");
+  const queue = await Queue.loadDefault(sbProgram);
+  const gateway = await queue.fetchGatewayFromCrossbar(crossbar as any);
+
   consoleLog("Pulled SWB program!");
   consoleLog("Feed id:", SWITCHBOARD_PRICE_FEED_IDS[mint.toString()].feedId);
-  return new PullFeed(
-    sbProgram,
-    new PublicKey(SWITCHBOARD_PRICE_FEED_IDS[mint.toString()].feedId)
-  );
+  return {
+    gateway,
+    feed: new PullFeed(
+      sbProgram,
+      new PublicKey(SWITCHBOARD_PRICE_FEED_IDS[mint.toString()].feedId)
+    ),
+  };
 }
 
 export async function buildSwbSubmitResponseTx(
@@ -56,14 +63,19 @@ export async function buildSwbSubmitResponseTx(
   signer: Signer,
   mint: PublicKey
 ): Promise<TransactionItemInputs | undefined> {
-  const feed = await getPullFeed(conn, mint, toWeb3JsPublicKey(signer.publicKey));
+  const { feed, gateway } = await getPullFeed(
+    conn,
+    mint,
+    toWeb3JsPublicKey(signer.publicKey)
+  );
+
+  // Try to replicate locally in the lambda docker container
 
-  const gateway = await feed.fetchGatewayUrl();
   consoleLog("Fetching crank IX...");
   const [pullIxs, responses] = await retryWithExponentialBackoff(
     async () => {
       const res = await feed.fetchUpdateIx({
-        gateway,
+        gateway: gateway.endpoint(),
         chain: "solana",
         network: "mainnet-beta",
       });
@@ -99,7 +111,7 @@ export async function buildSwbSubmitResponseTx(
     lookupTableAddresses: responses
       .filter((x) => Boolean(x.oracle.lut?.key))
       .map((x) => x.oracle.lut!.key.toString()),
-    orderPrio: -1,
+    orderPrio: -2,
   };
 }
 
@@ -118,7 +130,7 @@ export async function getSwitchboardFeedData(
 
   const results = await Promise.all(
     mints.map(async (mint) => {
-      const feed = await 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 =