@0dotxyz/p0-ts-sdk 1.2.5 → 1.2.7-alpha.1

package/dist/index.js

@@ -11,7 +11,7 @@ import { deserialize } from 'borsh';
 import * as borsh from '@coral-xyz/borsh';
 import { struct as struct$1, bool, publicKey as publicKey$1, array as array$1, u64 as u64$1, u8 as u8$1, u32 as u32$1, u128 } from '@coral-xyz/borsh';
 import { SwapApi, Configuration, createJupiterApiClient } from '@jup-ag/api';
-import { AnchorUtils, PullFeed } from '@switchboard-xyz/on-demand';
+import { AnchorUtils, PullFeed, Gateway } from '@switchboard-xyz/on-demand';
 import { CrossbarClient } from '@switchboard-xyz/common';
 
 // src/config.ts
@@ -44848,16 +44848,22 @@ async function makeUpdateSwbFeedIx(props) {
       `[makeUpdateSwbFeedIx]   - ${o.key.toBase58()} (hasSwitchboardData: ${!!o.price?.switchboardData})`
     )
   );
-  const dummyWallet = {
-    publicKey: props.feePayer,
-    signTransaction: async (tx) => tx,
-    signAllTransactions: async (txs) => txs
-  };
-  const swbProgram = await AnchorUtils.loadProgramFromConnection(props.connection, dummyWallet);
+  console.log(`[makeUpdateSwbFeedIx] Loading SWB program from connection...`);
+  const swbProgram = await AnchorUtils.loadProgramFromConnection(props.connection);
+  console.log(
+    `[makeUpdateSwbFeedIx] SWB program loaded - programId: ${swbProgram.programId.toBase58()}`
+  );
   const pullFeedInstances = uniqueOracles.map((oracle) => {
     const pullFeed = new PullFeed(swbProgram, oracle.key);
+    console.log(
+      `[makeUpdateSwbFeedIx] Created PullFeed for ${oracle.key.toBase58()} - no switchboardData set (commented out)`
+    );
     return pullFeed;
   });
+  console.log(
+    `[makeUpdateSwbFeedIx] pullFeedInstances:`,
+    pullFeedInstances.map((f) => ({ key: f.pubkey.toBase58(), hasConfigs: !!f.configs }))
+  );
   if (pullFeedInstances.length === 0) {
     console.log(`[makeUpdateSwbFeedIx] No pull feed instances, returning early`);
     return { instructions: [], luts: [] };
@@ -44865,19 +44871,66 @@ async function makeUpdateSwbFeedIx(props) {
   const crossbarClient = new CrossbarClient(
     process.env.NEXT_PUBLIC_SWITCHBOARD_CROSSSBAR_API || "https://integrator-crossbar.prod.mrgn.app"
   );
-  console.log(`[makeUpdateSwbFeedIx] Fetching update ix for ${pullFeedInstances.length} feeds`);
   console.log(
-    `[makeUpdateSwbFeedIx] pullFeedInstances:`,
-    pullFeedInstances.map((f) => ({ key: f.pubkey.toBase58(), hasConfigs: !!f.configs }))
+    `[makeUpdateSwbFeedIx] crossbarClient URL: ${process.env.NEXT_PUBLIC_SWITCHBOARD_CROSSSBAR_API || "https://integrator-crossbar.prod.mrgn.app"}`
   );
-  const [pullIx, luts] = await PullFeed.fetchUpdateManyIx(swbProgram, {
-    feeds: pullFeedInstances,
-    numSignatures: 1,
-    crossbarClient,
-    payer: props.feePayer
-  });
-  console.log(`[makeUpdateSwbFeedIx] Got ${pullIx.length} instructions, ${luts.length} LUTs`);
-  return { instructions: pullIx, luts };
+  console.log(
+    `[makeUpdateSwbFeedIx] SWB on-demand version: 2.14.4, common version: 4.1.0 (alpha.1)`
+  );
+  console.log(`[makeUpdateSwbFeedIx] Fetching gateways for mainnet...`);
+  const gatewayUrls = await crossbarClient.fetchGateways("mainnet");
+  console.log(`[makeUpdateSwbFeedIx] Gateway URLs received:`, gatewayUrls);
+  if (!gatewayUrls || gatewayUrls.length === 0) {
+    throw new Error(`No gateways available for mainnet`);
+  }
+  const gatewayUrl = gatewayUrls[0];
+  if (!gatewayUrl) {
+    throw new Error(`Invalid gateway URL received for mainnet`);
+  }
+  console.log(`[makeUpdateSwbFeedIx] Using gateway: ${gatewayUrl}`);
+  const gateway = new Gateway(swbProgram, gatewayUrl);
+  console.log(`[makeUpdateSwbFeedIx] Gateway gatewayUrl: ${gateway.gatewayUrl}`);
+  try {
+    for (const feed of pullFeedInstances) {
+      try {
+        const accountInfo = await props.connection.getAccountInfo(feed.pubkey);
+        console.log(
+          `[makeUpdateSwbFeedIx] Feed account ${feed.pubkey.toBase58()}: exists=${!!accountInfo}, owner=${accountInfo?.owner?.toBase58() ?? "N/A"}, dataLen=${accountInfo?.data?.length ?? 0}`
+        );
+        if (accountInfo?.data) {
+          const discriminator = accountInfo.data.slice(0, 8);
+          console.log(
+            `[makeUpdateSwbFeedIx] Feed account ${feed.pubkey.toBase58()} discriminator: [${Array.from(discriminator).join(", ")}]`
+          );
+        }
+      } catch (accErr) {
+        console.error(
+          `[makeUpdateSwbFeedIx] Failed to fetch account info for ${feed.pubkey.toBase58()}:`,
+          accErr
+        );
+      }
+    }
+    console.log(`[makeUpdateSwbFeedIx] Calling PullFeed.fetchUpdateManyIx...`);
+    const [pullIx, luts] = await PullFeed.fetchUpdateManyIx(swbProgram, {
+      feeds: pullFeedInstances,
+      gateway: gateway.gatewayUrl,
+      numSignatures: 1,
+      payer: props.feePayer,
+      crossbarClient
+    });
+    console.log(`[makeUpdateSwbFeedIx] Got ${pullIx.length} instructions, ${luts.length} LUTs`);
+    return { instructions: pullIx, luts };
+  } catch (err) {
+    console.error(`[makeUpdateSwbFeedIx] fetchUpdateManyIx FAILED:`, err?.message || err);
+    console.error(`[makeUpdateSwbFeedIx] Error name: ${err?.name}, code: ${err?.code}`);
+    if (err?.logs) {
+      console.error(`[makeUpdateSwbFeedIx] Error logs:`, err.logs);
+    }
+    if (err?.stack) {
+      console.error(`[makeUpdateSwbFeedIx] Stack:`, err.stack);
+    }
+    throw err;
+  }
 }
 
 // src/services/price/actions/klend-reserve-refresh.ts