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

package/dist/index.js

@@ -1,7 +1,7 @@
 import { PublicKey, SolanaJSONRPCError, ComputeBudgetProgram, SystemProgram, TransactionMessage, VersionedTransaction, Transaction, AddressLookupTableAccount, SYSVAR_RENT_PUBKEY, StakeProgram, TransactionInstruction, LAMPORTS_PER_SOL, SYSVAR_INSTRUCTIONS_PUBKEY } from '@solana/web3.js';
 import { object, string, enums, array, assert } from 'superstruct';
 import BigNumber10, { BigNumber } from 'bignumber.js';
-import BN11, { BN } from 'bn.js';
+import BN11 from 'bn.js';
 import { Decimal } from 'decimal.js';
 import { BorshCoder, BorshAccountsCoder, BorshInstructionCoder, AnchorProvider, Program } from '@coral-xyz/anchor';
 import { struct, u32, u8 } from '@solana/buffer-layout';
@@ -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, Gateway } from '@switchboard-xyz/on-demand';
+import { AnchorUtils, PullFeed } 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 swbProgram = await AnchorUtils.loadProgramFromConnection(props.connection);
+  const dummyWallet = {
+    publicKey: props.feePayer,
+    signTransaction: async (tx) => tx,
+    signAllTransactions: async (txs) => txs
+  };
+  const swbProgram = await AnchorUtils.loadProgramFromConnection(props.connection, dummyWallet);
   const pullFeedInstances = uniqueOracles.map((oracle) => {
     const pullFeed = new PullFeed(swbProgram, oracle.key);
     if (oracle.price?.switchboardData) {
       const swbData = oracle.price?.switchboardData;
-      pullFeed.data = {
+      pullFeed.configs = {
         queue: new PublicKey(swbData.queue),
-        feedHash: new Uint8Array(Buffer.from(swbData.feedHash, "hex")),
-        maxVariance: new BN(swbData.maxVariance),
-        minResponses: swbData.minResponses
+        feedHash: Buffer.from(swbData.feedHash, "hex"),
+        maxVariance: Number(swbData.maxVariance),
+        minResponses: swbData.minResponses,
+        minSampleSize: swbData.minResponses
       };
     }
     return pullFeed;
@@ -44869,31 +44875,47 @@ async function makeUpdateSwbFeedIx(props) {
   const crossbarClient = new 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`);
-  }
-  console.log(`[makeUpdateSwbFeedIx] Fetched ${gatewayUrls.length} gateways`);
-  const gatewayUrl = gatewayUrls[0];
-  if (!gatewayUrl) {
-    throw new Error(`Invalid gateway URL received formainnet`);
+  const onChainDatas = await 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}`
+    );
   }
-  const gateway = new Gateway(swbProgram, gatewayUrl);
-  console.log(
-    `[makeUpdateSwbFeedIx] Fetching update ix for ${pullFeedInstances.length} feeds via gateway: ${gateway.gatewayUrl}`
-  );
+  console.log(`[makeUpdateSwbFeedIx] Fetching update ix for ${pullFeedInstances.length} feeds`);
   console.log(
     `[makeUpdateSwbFeedIx] pullFeedInstances:`,
-    pullFeedInstances.map((f) => ({ key: f.pubkey.toBase58(), hasData: !!f.data }))
+    pullFeedInstances.map((f) => ({ key: f.pubkey.toBase58(), hasConfigs: !!f.configs }))
   );
   const [pullIx, luts] = await PullFeed.fetchUpdateManyIx(swbProgram, {
     feeds: pullFeedInstances,
-    gateway: gateway.gatewayUrl,
     numSignatures: 1,
-    payer: props.feePayer,
-    crossbarClient
+    crossbarClient,
+    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 = 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++;
+      }
+    }
+  }
   return { instructions: pullIx, luts };
 }