@haven-fi/solauto-sdk 1.0.825 → 1.0.828

package/dist/constants/generalConstants.d.ts

@@ -4,4 +4,5 @@ export declare const SOLAUTO_FEES_WALLET: PublicKey;
 export declare const SOLAUTO_MANAGER: PublicKey;
 export declare const LOCAL_IRONFORGE_API_URL: string;
 export declare const BASIS_POINTS = 10000;
+export declare const CROSSBAR_URL = "https://crossbar.0.xyz/";
 //# sourceMappingURL=generalConstants.d.ts.map

package/dist/constants/generalConstants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generalConstants.d.ts","sourceRoot":"","sources":["../../src/constants/generalConstants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,eAAO,MAAM,YAAY,IAAI,CAAC;AAC9B,eAAO,MAAM,mBAAmB,WAAgE,CAAC;AACjG,eAAO,MAAM,eAAe,WAA+D,CAAC;AAE5F,eAAO,MAAM,uBAAuB,QAAuD,CAAC;AAE5F,eAAO,MAAM,YAAY,QAAQ,CAAC"}
+{"version":3,"file":"generalConstants.d.ts","sourceRoot":"","sources":["../../src/constants/generalConstants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,eAAO,MAAM,YAAY,IAAI,CAAC;AAC9B,eAAO,MAAM,mBAAmB,WAAgE,CAAC;AACjG,eAAO,MAAM,eAAe,WAA+D,CAAC;AAE5F,eAAO,MAAM,uBAAuB,QAAuD,CAAC;AAE5F,eAAO,MAAM,YAAY,QAAQ,CAAC;AAElC,eAAO,MAAM,YAAY,4BAA4B,CAAC"}

package/dist/constants/generalConstants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BASIS_POINTS = exports.LOCAL_IRONFORGE_API_URL = exports.SOLAUTO_MANAGER = exports.SOLAUTO_FEES_WALLET = exports.USD_DECIMALS = void 0;
+exports.CROSSBAR_URL = exports.BASIS_POINTS = exports.LOCAL_IRONFORGE_API_URL = exports.SOLAUTO_MANAGER = exports.SOLAUTO_FEES_WALLET = exports.USD_DECIMALS = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const utils_1 = require("../utils");
 exports.USD_DECIMALS = 9;
@@ -8,3 +8,4 @@ exports.SOLAUTO_FEES_WALLET = new web3_js_1.PublicKey("AprYCPiVeKMCgjQ2ZufwChMzv
 exports.SOLAUTO_MANAGER = new web3_js_1.PublicKey("MNGRcX4nc7quPdzBbNKJ4ScK5EE73JnwJVGxuJXhHCY");
 exports.LOCAL_IRONFORGE_API_URL = (0, utils_1.buildIronforgeApiUrl)(process.env.IRONFORGE_API_KEY);
 exports.BASIS_POINTS = 10000;
+exports.CROSSBAR_URL = "https://crossbar.0.xyz/";

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

@@ -1 +1 @@
-{"version":3,"file":"jitoUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jitoUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,SAAS,EAIV,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,MAAM,EACN,kBAAkB,EAClB,GAAG,EAEH,kBAAkB,EACnB,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAiBlE,wBAAgB,mBAAmB,IAAI,SAAS,CAG/C;AAiGD,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,kBAAkB;;;;IAkB/D;AAqHD,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EAAE,EACtB,YAAY,EAAE,kBAAkB,EAAE,EAClC,MAAM,CAAC,EAAE,kBAAkB,EAC3B,kBAAkB,GAAE,kBAA2C,EAC/D,cAAc,CAAC,EAAE,MAAM,IAAI,EAC3B,eAAe,CAAC,EAAE,eAAe,GAChC,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,CA6G/B"}
+{"version":3,"file":"jitoUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jitoUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,SAAS,EAIV,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,MAAM,EACN,kBAAkB,EAClB,GAAG,EAEH,kBAAkB,EACnB,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAiBlE,wBAAgB,mBAAmB,IAAI,SAAS,CAG/C;AAiGD,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,kBAAkB;;;;IAkB/D;AAyHD,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EAAE,EACtB,YAAY,EAAE,kBAAkB,EAAE,EAClC,MAAM,CAAC,EAAE,kBAAkB,EAC3B,kBAAkB,GAAE,kBAA2C,EAC/D,cAAc,CAAC,EAAE,MAAM,IAAI,EAC3B,eAAe,CAAC,EAAE,eAAe,GAChC,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,CA6G/B"}

package/dist/utils/jitoUtils.js

@@ -142,13 +142,14 @@ async function pollBundleStatus(umi, bundleId, interval = 1000, timeout = 40000)
         if (statuses?.value?.length > 0) {
             (0, generalUtils_1.consoleLog)("Statuses:", statuses);
             const status = statuses.value[0].confirmation_status;
-            if (status === "confirmed") {
+            if (status === "confirmed" || status === "finalized") {
                 return statuses.value[0].transactions;
             }
             const err = statuses.value[0].err;
-            if (err) {
+            // Jito reports a successful bundle as err: { Ok: null }
+            if (err && !("Ok" in err && err.Ok === null)) {
                 (0, generalUtils_1.consoleLog)("Jito bundle err:", JSON.stringify(err, null, 2));
-                throw new Error(err);
+                throw new Error(JSON.stringify(err));
             }
         }
     }
@@ -168,11 +169,12 @@ async function sendJitoBundle(umi, transactions) {
             throw e;
         }
     }
-    if (resp.error?.message === "All providers failed") {
-        throw new Error(resp.error.responses[0].response.error.message);
+    if (resp.error?.responses?.length) {
+        const inner = resp.error.responses[0].response?.error;
+        throw new Error(`${resp.error.message}: ${inner ? (inner.message ?? JSON.stringify(inner)) : "unknown"}`);
     }
     else if (resp.error) {
-        throw new Error(resp.error);
+        throw new Error(resp.error.message ?? JSON.stringify(resp.error));
     }
     const bundleId = resp;
     (0, generalUtils_1.consoleLog)("Bundle ID:", bundleId);

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;AAgBrE,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAErD,UAAU,WAAW;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAsB,gBAAgB,CACpC,KAAK,EAAE,SAAS,EAAE,EAClB,SAAS,GAAE,SAA8B,EACzC,SAAS,CAAC,EAAE,SAAS,GACpB,OAAO,CAAC,MAAM,EAAE,CAAC,CA8CnB;AAED,wBAAsB,aAAa,CACjC,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAuDtC;AAkBD,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAkDtC;AAED,wBAAsB,iBAAiB,CACrC,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAsBtC;AAED,wBAAgB,YAAY,CAC1B,IAAI,EAAE,SAAS,GAAG,YAAY,GAAG,MAAM,GAAG,SAAS,EACnD,SAAS,GAAE,SAA8B,EACzC,SAAS,CAAC,EAAE,SAAS,GACpB,MAAM,GAAG,SAAS,CAyBpB"}
+{"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;AAiBrE,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAErD,UAAU,WAAW;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAsB,gBAAgB,CACpC,KAAK,EAAE,SAAS,EAAE,EAClB,SAAS,GAAE,SAA8B,EACzC,SAAS,CAAC,EAAE,SAAS,GACpB,OAAO,CAAC,MAAM,EAAE,CAAC,CA8CnB;AAED,wBAAsB,aAAa,CACjC,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAuDtC;AAkBD,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAsDtC;AAED,wBAAsB,iBAAiB,CACrC,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAsBtC;AAED,wBAAgB,YAAY,CAC1B,IAAI,EAAE,SAAS,GAAG,YAAY,GAAG,MAAM,GAAG,SAAS,EACnD,SAAS,GAAE,SAA8B,EACzC,SAAS,CAAC,EAAE,SAAS,GACpB,MAAM,GAAG,SAAS,CAyBpB"}

package/dist/utils/priceUtils.js

@@ -128,26 +128,29 @@ async function getSwitchboardPrices(mints) {
         return {};
     }
     const { CrossbarClient } = SwbCommon;
-    const crossbar = new CrossbarClient("https://crossbar.0.xyz/");
+    const crossbar = new CrossbarClient(constants_1.CROSSBAR_URL);
     let prices = {};
     try {
         prices = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => {
-            const resp = await crossbar.simulateFeeds(mints.map((x) => constants_1.SWITCHBOARD_PRICE_FEED_IDS[x.toString()].feedHash));
-            const data = resp.flatMap((x) => x.results[0]);
-            if (data.filter((x) => !x || isNaN(Number(x)) || Number(x) <= 0).length >
-                0) {
-                throw new Error("Unable to fetch Switchboard prices");
-            }
+            const mintByFeed = new Map(mints.map((mint) => [
+                constants_1.SWITCHBOARD_PRICE_FEED_IDS[mint.toString()].feedId,
+                mint.toString(),
+            ]));
+            const resp = await crossbar.simulateSolanaFeeds("mainnet", Array.from(mintByFeed.keys()));
             const finalMap = {};
             for (const item of resp) {
-                for (const [k, v] of Object.entries(constants_1.SWITCHBOARD_PRICE_FEED_IDS)) {
-                    if (item.feedHash === v.feedHash) {
-                        const price = Number(item.results[0]);
-                        finalMap[k] = {
-                            realtimePrice: price,
-                        };
-                    }
+                const mint = mintByFeed.get(item.feed);
+                // Crossbar currently returns the aggregate as `result`; retain `results[0]` for
+                // compatibility with the published SDK response type.
+                const result = "result" in item ? item.result : item.results[0];
+                const price = Number(result);
+                if (!mint || !Number.isFinite(price) || price <= 0) {
+                    throw new Error("Unable to fetch Switchboard prices");
                 }
+                finalMap[mint] = { realtimePrice: price };
+            }
+            if (Object.keys(finalMap).length !== mintByFeed.size) {
+                throw new Error("Unable to fetch all Switchboard prices");
             }
             return finalMap;
         }, 2, 350);

package/dist/utils/switchboardUtils.d.ts

@@ -2,9 +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";
+import { CrossbarClient } from "@switchboard-xyz/common";
 import { SolautoClient, TransactionItem } from "../services";
 export declare function getPullFeed(conn: Connection, mint: PublicKey, wallet?: PublicKey): Promise<{
-    gateway: OnDemand.Gateway;
+    crossbar: CrossbarClient;
     feed: OnDemand.PullFeed;
 }>;
 export declare function buildSwbSubmitResponseTx(conn: Connection, signer: Signer, mint: PublicKey): Promise<TransactionItemInputs | undefined>;

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;AAOvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAQjD,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE7D,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,CAsE5C;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;AAED,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,aAAa,EACrB,GAAG,EAAE,eAAe,EAAE,iBAkCvB"}
+{"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;AAQvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAOjD,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE7D,wBAAsB,WAAW,CAC/B,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,SAAS,EACf,MAAM,CAAC,EAAE,SAAS;;;GAgCnB;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAyE5C;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;AAED,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,aAAa,EACrB,GAAG,EAAE,eAAe,EAAE,iBAkCvB"}

package/dist/utils/switchboardUtils.js

@@ -56,26 +56,22 @@ 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, Queue, ON_DEMAND_MAINNET_PID } = OnDemand;
+    const { PullFeed, 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);
+    const crossbar = new common_1.CrossbarClient(constants_1.CROSSBAR_URL);
     (0, generalUtils_1.consoleLog)("Pulled SWB program!");
     (0, generalUtils_1.consoleLog)("Feed id:", constants_1.SWITCHBOARD_PRICE_FEED_IDS[mint.toString()].feedId);
     return {
-        gateway,
+        crossbar,
         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, gateway } = await getPullFeed(conn, mint, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(signer.publicKey));
+    const { feed, crossbar } = await getPullFeed(conn, mint, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(signer.publicKey));
     (0, generalUtils_1.consoleLog)("Fetching crank IX...");
-    const [pullIxs, responses] = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => {
+    const [pullIxs, responses, , luts] = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => {
         const res = await feed.fetchUpdateIx({
-            gateway: gateway.endpoint(),
-            chain: "solana",
-            network: "mainnet-beta",
+            crossbarClient: crossbar,
         });
         if (!res[1] || !res[1][0].value) {
             throw new Error("Unable to fetch Switchboard pull IX");
@@ -113,9 +109,12 @@ async function buildSwbSubmitResponseTx(conn, signer, mint) {
     (0, generalUtils_1.consoleLog)("Returning SWB transaction data...");
     return {
         tx: (0, umi_1.transactionBuilder)(pullIxs.map((x) => (0, solanaUtils_1.getWrappedInstruction)(signer, x))),
-        lookupTableAddresses: responses
-            .filter((x) => Boolean(x.oracle.lut?.key))
-            .map((x) => x.oracle.lut.key.toString()),
+        lookupTableAddresses: Array.from(new Set([
+            ...luts.map((x) => x.key.toString()),
+            ...responses
+                .filter((x) => Boolean(x.oracle.lut?.key))
+                .map((x) => x.oracle.lut.key.toString()),
+        ])),
         orderPrio: -2,
     };
 }

package/local/txSandbox.ts

@@ -1,4 +1,5 @@
 import { Keypair, PublicKey } from "@solana/web3.js";
+import { NATIVE_MINT } from "@solana/spl-token";
 import { createSignerFromKeypair, publicKey, signerIdentity } from "@metaplex-foundation/umi";
 import { fromWeb3JsKeypair } from "@metaplex-foundation/umi-web3js-adapters";
 import {
@@ -118,6 +119,20 @@ async function refreshAll() {
   }
 }
 
+// Crank a Switchboard pull feed for a single mint, as one standalone tx (no bundle).
+// Usage: npx ts-node local/txSandbox.ts [mint]
+//   mint defaults to SOL; accepts a raw mint address or a shorthand below.
+const MINT_SHORTHANDS: Record<string, string> = {
+  sol: NATIVE_MINT.toString(),
+  jitosol: JITO_SOL,
+};
+
+function resolveMint(arg?: string): PublicKey {
+  if (!arg) return NATIVE_MINT;
+  const shorthand = MINT_SHORTHANDS[arg.toLowerCase()];
+  return new PublicKey(shorthand ?? arg);
+}
+
 async function testSwbOracleUpdate() {
   (globalThis as any).SHOW_LOGS = true;
 
@@ -128,8 +143,8 @@ async function testSwbOracleUpdate() {
   );
   umiLocal = umiLocal.use(signerIdentity(signer));
 
-  const mint = new PublicKey(JITO_SOL);
-  console.log("Building SWB oracle update tx for JitoSOL...");
+  const mint = resolveMint(process.argv[2]);
+  console.log("Building SWB oracle update tx for mint:", mint.toString());
 
   const result = await buildSwbSubmitResponseTx(conn, signer, mint);
   if (!result) {
@@ -139,6 +154,7 @@ async function testSwbOracleUpdate() {
 
   console.log("Instructions count:", result.tx.getInstructions().length);
   console.log("Lookup tables:", result.lookupTableAddresses);
+  console.log("Transaction size:", result.tx.getTransactionSize(umiLocal));
 
   console.log("Sending transaction...");
   const sig = await sendSingleOptimizedTransaction(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.825",
+  "version": "1.0.828",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "description": "Typescript SDK for the Solauto program on the Solana blockchain",
@@ -20,8 +20,8 @@
     "@metaplex-foundation/umi-web3js-adapters": "^0.9.1",
     "@solana/spl-token": "^0.4.0",
     "@solana/web3.js": "=1.98.2",
-    "@switchboard-xyz/common": "=3.4.1",
-    "@switchboard-xyz/on-demand": "=2.17.4",
+    "@switchboard-xyz/common": "=5.8.5",
+    "@switchboard-xyz/on-demand": "=3.10.6",
     "axios": "^1.7.8",
     "big.js": "^6.2.2",
     "bs58": "^5.0.0",

package/src/constants/generalConstants.ts

@@ -8,3 +8,5 @@ export const SOLAUTO_MANAGER = new PublicKey("MNGRcX4nc7quPdzBbNKJ4ScK5EE73JnwJV
 export const LOCAL_IRONFORGE_API_URL = buildIronforgeApiUrl(process.env.IRONFORGE_API_KEY!);
 
 export const BASIS_POINTS = 10000;
+
+export const CROSSBAR_URL = "https://crossbar.0.xyz/";

package/src/utils/jitoUtils.ts

@@ -224,13 +224,14 @@ async function pollBundleStatus(
     if (statuses?.value?.length > 0) {
       consoleLog("Statuses:", statuses);
       const status = statuses.value[0].confirmation_status;
-      if (status === "confirmed") {
+      if (status === "confirmed" || status === "finalized") {
         return statuses.value[0].transactions as string[];
       }
       const err = statuses.value[0].err;
-      if (err) {
+      // Jito reports a successful bundle as err: { Ok: null }
+      if (err && !("Ok" in err && err.Ok === null)) {
         consoleLog("Jito bundle err:", JSON.stringify(err, null, 2));
-        throw new Error(err);
+        throw new Error(JSON.stringify(err));
       }
     }
   }
@@ -255,10 +256,13 @@ async function sendJitoBundle(
     }
   }
 
-  if (resp.error?.message === "All providers failed") {
-    throw new Error(resp.error.responses[0].response.error.message);
+  if (resp.error?.responses?.length) {
+    const inner = resp.error.responses[0].response?.error;
+    throw new Error(
+      `${resp.error.message}: ${inner ? (inner.message ?? JSON.stringify(inner)) : "unknown"}`
+    );
   } else if (resp.error) {
-    throw new Error(resp.error);
+    throw new Error(resp.error.message ?? JSON.stringify(resp.error));
   }
 
   const bundleId = resp as string;

package/src/utils/priceUtils.ts

@@ -2,6 +2,7 @@ import { PublicKey } from "@solana/web3.js";
 import { PublicKey as UmiPublicKey } from "@metaplex-foundation/umi";
 import * as SwbCommon from "@switchboard-xyz/common";
 import {
+  CROSSBAR_URL,
   PYTH_PRICE_FEED_IDS,
   PRICES,
   SWITCHBOARD_PRICE_FEED_IDS,
@@ -160,34 +161,38 @@ export async function getSwitchboardPrices(
   }
 
   const { CrossbarClient } = SwbCommon;
-  const crossbar = new CrossbarClient("https://crossbar.0.xyz/");
+  const crossbar = new CrossbarClient(CROSSBAR_URL);
 
   let prices: Record<string, PriceResult> = {};
   try {
     prices = await retryWithExponentialBackoff(
       async () => {
-        const resp = await crossbar.simulateFeeds(
-          mints.map((x) => SWITCHBOARD_PRICE_FEED_IDS[x.toString()].feedHash)
+        const mintByFeed = new Map(
+          mints.map((mint) => [
+            SWITCHBOARD_PRICE_FEED_IDS[mint.toString()].feedId,
+            mint.toString(),
+          ])
+        );
+        const resp = await crossbar.simulateSolanaFeeds(
+          "mainnet",
+          Array.from(mintByFeed.keys())
         );
-
-        const data = resp.flatMap((x) => x.results[0]);
-        if (
-          data.filter((x) => !x || isNaN(Number(x)) || Number(x) <= 0).length >
-          0
-        ) {
-          throw new Error("Unable to fetch Switchboard prices");
-        }
 
         const finalMap: Record<string, PriceResult> = {};
         for (const item of resp) {
-          for (const [k, v] of Object.entries(SWITCHBOARD_PRICE_FEED_IDS)) {
-            if (item.feedHash === v.feedHash) {
-              const price = Number(item.results[0]);
-              finalMap[k] = {
-                realtimePrice: price,
-              };
-            }
+          const mint = mintByFeed.get(item.feed);
+          // Crossbar currently returns the aggregate as `result`; retain `results[0]` for
+          // compatibility with the published SDK response type.
+          const result = "result" in item ? item.result : item.results[0];
+          const price = Number(result);
+          if (!mint || !Number.isFinite(price) || price <= 0) {
+            throw new Error("Unable to fetch Switchboard prices");
           }
+          finalMap[mint] = { realtimePrice: price };
+        }
+
+        if (Object.keys(finalMap).length !== mintByFeed.size) {
+          throw new Error("Unable to fetch all Switchboard prices");
         }
         return finalMap;
       },

package/src/utils/switchboardUtils.ts

@@ -10,6 +10,7 @@ import { AnchorProvider, Idl, Program } from "@coral-xyz/anchor";
 import * as OnDemand from "@switchboard-xyz/on-demand";
 import Big from "big.js";
 import {
+  CROSSBAR_URL,
   PRICES,
   SWITCHBOARD_PRICE_FEED_IDS,
   UPDATE_ORACLE_TX_NAME,
@@ -45,17 +46,15 @@ export async function getPullFeed(
   );
 
   consoleLog("Pulling SWB program...");
-  const { PullFeed, Queue, ON_DEMAND_MAINNET_PID } = OnDemand;
+  const { PullFeed, 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);
+  const crossbar = new CrossbarClient(CROSSBAR_URL);
 
   consoleLog("Pulled SWB program!");
   consoleLog("Feed id:", SWITCHBOARD_PRICE_FEED_IDS[mint.toString()].feedId);
   return {
-    gateway,
+    crossbar,
     feed: new PullFeed(
       sbProgram,
       new PublicKey(SWITCHBOARD_PRICE_FEED_IDS[mint.toString()].feedId)
@@ -68,19 +67,17 @@ export async function buildSwbSubmitResponseTx(
   signer: Signer,
   mint: PublicKey
 ): Promise<TransactionItemInputs | undefined> {
-  const { feed, gateway } = await getPullFeed(
+  const { feed, crossbar } = await getPullFeed(
     conn,
     mint,
     toWeb3JsPublicKey(signer.publicKey)
   );
 
   consoleLog("Fetching crank IX...");
-  const [pullIxs, responses] = await retryWithExponentialBackoff(
+  const [pullIxs, responses, , luts] = await retryWithExponentialBackoff(
     async () => {
       const res = await feed.fetchUpdateIx({
-        gateway: gateway.endpoint(),
-        chain: "solana",
-        network: "mainnet-beta",
+        crossbarClient: crossbar,
       });
       if (!res[1] || !res[1][0].value) {
         throw new Error("Unable to fetch Switchboard pull IX");
@@ -132,9 +129,14 @@ export async function buildSwbSubmitResponseTx(
     tx: transactionBuilder(
       pullIxs.map((x) => getWrappedInstruction(signer, x))
     ),
-    lookupTableAddresses: responses
-      .filter((x) => Boolean(x.oracle.lut?.key))
-      .map((x) => x.oracle.lut!.key.toString()),
+    lookupTableAddresses: Array.from(
+      new Set([
+        ...luts.map((x) => x.key.toString()),
+        ...responses
+          .filter((x) => Boolean(x.oracle.lut?.key))
+          .map((x) => x.oracle.lut!.key.toString()),
+      ])
+    ),
     orderPrio: -2,
   };
 }