@0dotxyz/p0-ts-sdk 1.2.4-alpha.3 → 1.2.4-alpha.4

package/dist/index.cjs

@@ -44868,63 +44868,33 @@ async function makeUpdateSwbFeedIx(props) {
   console.log(
     `[makeUpdateSwbFeedIx] ${uniqueOracles.length} unique oracles after dedup (removed ${props.swbPullOracles.length - uniqueOracles.length})`
   );
-  const dummyWallet = {
-    publicKey: props.feePayer,
-    signTransaction: async (tx) => tx,
-    signAllTransactions: async (txs) => txs
-  };
-  const swbProgram = await onDemand.AnchorUtils.loadProgramFromConnection(props.connection, dummyWallet);
+  uniqueOracles.forEach(
+    (o) => console.log(
+      `[makeUpdateSwbFeedIx]   - ${o.key.toBase58()} (hasSwitchboardData: ${!!o.price?.switchboardData})`
+    )
+  );
+  const swbProgram = await onDemand.AnchorUtils.loadProgramFromConnection(props.connection);
   const pullFeedInstances = uniqueOracles.map((oracle) => {
     const pullFeed = new onDemand.PullFeed(swbProgram, oracle.key);
-    if (oracle.price?.switchboardData) {
-      const swbData = oracle.price?.switchboardData;
-      pullFeed.configs = {
-        queue: new web3_js.PublicKey(swbData.queue),
-        feedHash: Buffer.from(swbData.feedHash, "hex"),
-        maxVariance: Number(swbData.maxVariance),
-        minResponses: swbData.minResponses,
-        minSampleSize: swbData.minResponses
-      };
-    }
     return pullFeed;
   });
   if (pullFeedInstances.length === 0) {
+    console.log(`[makeUpdateSwbFeedIx] No pull feed instances, returning early`);
     return { instructions: [], luts: [] };
   }
   const crossbarClient = new common.CrossbarClient(
     process.env.NEXT_PUBLIC_SWITCHBOARD_CROSSSBAR_API || "https://integrator-crossbar.prod.mrgn.app"
   );
-  const allIxs = [];
-  const allLuts = [];
-  for (const feed of pullFeedInstances) {
-    try {
-      const [ixs, _responses, numSuccesses, luts] = await feed.fetchUpdateIx({
-        numSignatures: 1,
-        crossbarClient,
-        payer: props.feePayer
-      });
-      if (ixs && ixs.length > 0) {
-        console.log(
-          `[makeUpdateSwbFeedIx] Feed ${feed.pubkey.toBase58().slice(0, 8)}... got ${ixs.length} ix, ${numSuccesses} successes`
-        );
-        allIxs.push(...ixs);
-        allLuts.push(...luts);
-      } else {
-        console.warn(
-          `[makeUpdateSwbFeedIx] Feed ${feed.pubkey.toBase58().slice(0, 8)}... returned no instructions`
-        );
-      }
-    } catch (err) {
-      console.warn(
-        `[makeUpdateSwbFeedIx] Feed ${feed.pubkey.toBase58().slice(0, 8)}... fetchUpdateIx failed:`,
-        err
-      );
-    }
-  }
-  console.log(
-    `[makeUpdateSwbFeedIx] Got ${allIxs.length} instructions, ${allLuts.length} LUTs total`
-  );
-  return { instructions: allIxs, luts: allLuts };
+  const gateway = await pullFeedInstances[0].fetchGatewayUrl(crossbarClient);
+  const [pullIx, luts] = await onDemand.PullFeed.fetchUpdateManyIx(swbProgram, {
+    feeds: pullFeedInstances,
+    gateway,
+    numSignatures: 1,
+    payer: props.feePayer,
+    crossbarClient
+  });
+  console.log(`[makeUpdateSwbFeedIx] Got ${pullIx.length} instructions, ${luts.length} LUTs`);
+  return { instructions: pullIx, luts };
 }
 
 // src/services/price/actions/klend-reserve-refresh.ts