@0dotxyz/p0-ts-sdk 1.2.1 → 1.2.3

package/dist/index.cjs

@@ -44780,7 +44780,9 @@ async function computeSmartCrank({
   };
 }
 async function makeSmartCrankSwbFeedIx(params) {
+  console.log("[makeSmartCrankSwbFeedIx] Called");
   const crankResult = await computeSmartCrank(params);
+  console.log("[makeSmartCrankSwbFeedIx] Crank result:", crankResult);
   if (crankResult.uncrankableLiabilities.length > 0) {
     console.log(
       "Uncrankable liability details:",
@@ -44816,6 +44818,7 @@ async function makeSmartCrankSwbFeedIx(params) {
     );
   }
   const oraclesToCrank = crankResult.requiredOracles;
+  console.log("[makeSmartCrankSwbFeedIx] Oracles to crank:", oraclesToCrank);
   const { instructions: instructions2, luts } = await makeUpdateSwbFeedIx({
     swbPullOracles: oraclesToCrank,
     feePayer: params.marginfiAccount.authority,
@@ -44852,6 +44855,9 @@ async function makeCrankSwbFeedIx(marginfiAccount, bankMap, newBanksPk, provider
   }
 }
 async function makeUpdateSwbFeedIx(props) {
+  console.log(
+    `[makeUpdateSwbFeedIx] Called with ${props.swbPullOracles.length} oracles, feePayer: ${props.feePayer.toBase58()}`
+  );
   const seen = /* @__PURE__ */ new Set();
   const uniqueOracles = props.swbPullOracles.filter((oracle) => {
     const key = oracle.key.toBase58();
@@ -44859,42 +44865,52 @@ async function makeUpdateSwbFeedIx(props) {
     seen.add(key);
     return true;
   });
-  const swbProgram = await onDemand.AnchorUtils.loadProgramFromConnection(props.connection);
+  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,
+    signAllTransactions: async (txs) => txs
+  };
+  const swbProgram = await onDemand.AnchorUtils.loadProgramFromConnection(props.connection, dummyWallet);
   const pullFeedInstances = uniqueOracles.map((oracle) => {
     const pullFeed = new onDemand.PullFeed(swbProgram, oracle.key);
     if (oracle.price?.switchboardData) {
       const swbData = oracle.price?.switchboardData;
-      pullFeed.data = {
+      pullFeed.configs = {
         queue: new web3_js.PublicKey(swbData.queue),
-        feedHash: new Uint8Array(Buffer.from(swbData.feedHash, "hex")),
-        maxVariance: new BN11.BN(swbData.maxVariance),
-        minResponses: swbData.minResponses
+        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 gatewayUrls = await crossbarClient.fetchGateways("mainnet");
-  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 formainnet`);
-  }
-  const gateway = new onDemand.Gateway(swbProgram, gatewayUrl);
+  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,
-    gateway: gateway.gatewayUrl,
     numSignatures: 1,
-    payer: props.feePayer,
     crossbarClient
   });
+  console.log(`[makeUpdateSwbFeedIx] Got ${pullIx.length} instructions, ${luts.length} LUTs`);
   return { instructions: pullIx, luts };
 }