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

package/dist/index.cjs

@@ -44854,6 +44854,54 @@ async function makeCrankSwbFeedIx(marginfiAccount, bankMap, newBanksPk, provider
     return { instructions: [], luts: [] };
   }
 }
+function patchSwbFeedHashMismatch(pullIx, expectedFeedPubkeys) {
+  const DEFAULT_KEY = web3_js.PublicKey.default.toBase58();
+  const expectedSet = new Set(expectedFeedPubkeys.map((pk) => pk.toBase58()));
+  const numExpectedFeeds = expectedFeedPubkeys.length;
+  for (const ix of pullIx) {
+    let feedSectionStart = -1;
+    for (let i = 0; i < ix.keys.length; i++) {
+      if (expectedSet.has(ix.keys[i].pubkey.toBase58())) {
+        feedSectionStart = i;
+        break;
+      }
+    }
+    if (feedSectionStart === -1) {
+      for (let i = 0; i < ix.keys.length; i++) {
+        if (ix.keys[i].pubkey.toBase58() === DEFAULT_KEY && ix.keys[i].isWritable) {
+          feedSectionStart = i;
+          break;
+        }
+      }
+    }
+    if (feedSectionStart === -1) continue;
+    const feedSectionEnd = Math.min(feedSectionStart + numExpectedFeeds, ix.keys.length);
+    const presentFeeds = /* @__PURE__ */ new Set();
+    for (let i = feedSectionStart; i < feedSectionEnd; i++) {
+      const key = ix.keys[i].pubkey.toBase58();
+      if (expectedSet.has(key)) {
+        presentFeeds.add(key);
+      }
+    }
+    const missingFeeds = expectedFeedPubkeys.filter((pk) => !presentFeeds.has(pk.toBase58()));
+    if (missingFeeds.length === 0) continue;
+    let missingIdx = 0;
+    for (let i = feedSectionStart; i < feedSectionEnd; i++) {
+      if (ix.keys[i].pubkey.toBase58() === DEFAULT_KEY && missingIdx < missingFeeds.length) {
+        console.log(
+          `[patchSwbFeedHashMismatch] ix.keys[${i}]: replacing PublicKey.default \u2192 ${missingFeeds[missingIdx].toBase58()}`
+        );
+        ix.keys[i].pubkey = missingFeeds[missingIdx];
+        missingIdx++;
+      }
+    }
+    if (missingIdx > 0) {
+      console.log(
+        `[patchSwbFeedHashMismatch] Patched ${missingIdx}/${numExpectedFeeds} feed key(s)`
+      );
+    }
+  }
+}
 async function makeUpdateSwbFeedIx(props) {
   console.log(
     `[makeUpdateSwbFeedIx] Called with ${props.swbPullOracles.length} oracles, feePayer: ${props.feePayer.toBase58()}`
@@ -44868,11 +44916,6 @@ async function makeUpdateSwbFeedIx(props) {
   console.log(
     `[makeUpdateSwbFeedIx] ${uniqueOracles.length} unique oracles after dedup (removed ${props.swbPullOracles.length - uniqueOracles.length})`
   );
-  uniqueOracles.forEach(
-    (o) => console.log(
-      `[makeUpdateSwbFeedIx]   - ${o.key.toBase58()} (hasSwitchboardData: ${!!o.price?.switchboardData})`
-    )
-  );
   const dummyWallet = {
     publicKey: props.feePayer,
     signTransaction: async (tx) => tx,
@@ -44894,27 +44937,11 @@ async function makeUpdateSwbFeedIx(props) {
     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 onChainDatas = await onDemand.PullFeed.loadMany(swbProgram, pullFeedInstances);
-  for (let i = 0; i < pullFeedInstances.length; i++) {
-    const feed = pullFeedInstances[i];
-    const onChainData = onChainDatas[i];
-    const configHash = feed.configs?.feedHash ? Buffer.from(feed.configs.feedHash).toString("hex") : "none";
-    const onChainHash = onChainData?.feedHash ? Buffer.from(onChainData.feedHash).toString("hex") : "none";
-    console.log(
-      `[makeUpdateSwbFeedIx] Feed ${feed.pubkey.toBase58()} | configs.feedHash: ${configHash} | onChain.feedHash: ${onChainHash} | loaded: ${!!onChainData}`
-    );
-  }
-  console.log(`[makeUpdateSwbFeedIx] Fetching update ix for ${pullFeedInstances.length} feeds`);
-  console.log(
-    `[makeUpdateSwbFeedIx] pullFeedInstances:`,
-    pullFeedInstances.map((f) => ({ key: f.pubkey.toBase58(), hasConfigs: !!f.configs }))
-  );
   const [pullIx, luts] = await onDemand.PullFeed.fetchUpdateManyIx(swbProgram, {
     feeds: pullFeedInstances,
     numSignatures: 1,
@@ -44922,25 +44949,8 @@ async function makeUpdateSwbFeedIx(props) {
     payer: props.feePayer
   });
   console.log(`[makeUpdateSwbFeedIx] Got ${pullIx.length} instructions, ${luts.length} LUTs`);
-  const feedPubkeySet = new Set(pullFeedInstances.map((f) => f.pubkey.toBase58()));
-  if (pullIx.length >= 2) {
-    const submitIx = pullIx[1];
-    const defaultKey = web3_js.PublicKey.default.toBase58();
-    const presentFeedKeys = new Set(
-      submitIx.keys.filter((k) => feedPubkeySet.has(k.pubkey.toBase58())).map((k) => k.pubkey.toBase58())
-    );
-    const missingFeedKeys = pullFeedInstances.map((f) => f.pubkey).filter((pk) => !presentFeedKeys.has(pk.toBase58()));
-    let missingIdx = 0;
-    for (const key of submitIx.keys) {
-      if (key.pubkey.toBase58() === defaultKey && missingIdx < missingFeedKeys.length) {
-        console.log(
-          `[makeUpdateSwbFeedIx] Replacing PublicKey.default with ${missingFeedKeys[missingIdx].toBase58()}`
-        );
-        key.pubkey = missingFeedKeys[missingIdx];
-        missingIdx++;
-      }
-    }
-  }
+  const expectedFeedPubkeys = pullFeedInstances.map((f) => f.pubkey);
+  patchSwbFeedHashMismatch(pullIx, expectedFeedPubkeys);
   return { instructions: pullIx, luts };
 }