veilix-sdk 0.0.6 → 0.0.8

package/dist/index.js

@@ -348,18 +348,6 @@ var veilix_devnet_default = {
             ]
           }
         },
-        {
-          name: "queue",
-          address: "A43DyUGA7s8eXPxqEjJY6EBu1KKbNgfxF8h17VAHn13w"
-        },
-        {
-          name: "slot_hashes",
-          address: "SysvarS1otHashes111111111111111111111111111"
-        },
-        {
-          name: "instructions",
-          address: "Sysvar1nstructions1111111111111111111111111"
-        },
         {
           name: "system_program",
           address: "11111111111111111111111111111111"
@@ -716,18 +704,6 @@ var veilix_devnet_default = {
             ]
           }
         },
-        {
-          name: "queue",
-          address: "A43DyUGA7s8eXPxqEjJY6EBu1KKbNgfxF8h17VAHn13w"
-        },
-        {
-          name: "slot_hashes",
-          address: "SysvarS1otHashes111111111111111111111111111"
-        },
-        {
-          name: "instructions",
-          address: "Sysvar1nstructions1111111111111111111111111"
-        },
         {
           name: "mint"
         },
@@ -2117,18 +2093,6 @@ var veilix_default = {
             ]
           }
         },
-        {
-          name: "queue",
-          address: "A43DyUGA7s8eXPxqEjJY6EBu1KKbNgfxF8h17VAHn13w"
-        },
-        {
-          name: "slot_hashes",
-          address: "SysvarS1otHashes111111111111111111111111111"
-        },
-        {
-          name: "instructions",
-          address: "Sysvar1nstructions1111111111111111111111111"
-        },
         {
           name: "system_program",
           address: "11111111111111111111111111111111"
@@ -2485,18 +2449,6 @@ var veilix_default = {
             ]
           }
         },
-        {
-          name: "queue",
-          address: "A43DyUGA7s8eXPxqEjJY6EBu1KKbNgfxF8h17VAHn13w"
-        },
-        {
-          name: "slot_hashes",
-          address: "SysvarS1otHashes111111111111111111111111111"
-        },
-        {
-          name: "instructions",
-          address: "Sysvar1nstructions1111111111111111111111111"
-        },
         {
           name: "mint"
         },
@@ -12573,52 +12525,6 @@ function formatNoteForDisplay(note, segmentLen = 8) {
     (p) => p.length > segmentLen * 2 ? p.slice(0, segmentLen) + "\u2026" + p.slice(-segmentLen) : p
   ).join("-");
 }
-async function readOracleGatewayUrls(queue) {
-  const oracleKeys = await queue.fetchOracleKeys();
-  if (oracleKeys.length === 0) return [];
-  const rows = await sb.Oracle.loadMany(queue.program, oracleKeys);
-  return rows.map(
-    (row) => row ? Buffer.from(row.gatewayUri).toString("utf8").replace(/\0+$/, "").trim() : ""
-  ).filter((url) => url.length > 0);
-}
-async function firstHealthyGatewayUrl(urls) {
-  try {
-    return await Promise.any(
-      urls.map(async (url) => {
-        const response = await fetch(`${url.replace(/\/$/, "")}/gateway/api/v1/test`, {
-          signal: AbortSignal.timeout(8e3)
-        });
-        if (!response.ok) {
-          throw new Error(`gateway ${url} returned ${response.status}`);
-        }
-        return url;
-      })
-    );
-  } catch (error) {
-    const reason = error instanceof Error ? error.message : "unknown error";
-    throw new Error(`veilix-sdk: no healthy Switchboard gateway (${reason})`);
-  }
-}
-function crossbarForQueue(queue) {
-  const client = new CrossbarClient("https://crossbar.switchboard.xyz");
-  const fetchGateway = client.fetchGateway.bind(client);
-  client.fetchGateway = async (network) => {
-    try {
-      return await fetchGateway(network);
-    } catch (error) {
-      const message = error instanceof Error ? error.message : "";
-      if (!message.includes("No gateways available")) {
-        throw error;
-      }
-      const urls = await readOracleGatewayUrls(queue);
-      if (urls.length === 0) {
-        throw error;
-      }
-      return new sb.Gateway(await firstHealthyGatewayUrl(urls));
-    }
-  };
-  return client;
-}
 function getRangeRiskScoreJob(address) {
   return OracleJob.fromObject({
     tasks: [
@@ -12647,7 +12553,7 @@ async function getOracleQuote(payer, addressToCheck) {
     solanaRPCUrl: rpcUrl,
     queueAddress: getDepositQueueAddress()
   });
-  const crossbarClient = crossbarForQueue(queue);
+  const crossbarClient = CrossbarClient.default();
   const feed = {
     name: "Risk Score",
     jobs: [getRangeRiskScoreJob(addressToCheck)],
@@ -12720,7 +12626,6 @@ async function buildDepositIx(senderPubkey, commitmentBytes, denominationLamport
     [Buffer.from("commitment"), commitmentBuf],
     getProgramId()
   );
-  const queueAccount = new PublicKey(getDepositQueueAddress());
   const remainingAccounts = [];
   if (tempSigner) {
     remainingAccounts.push({
@@ -12736,9 +12641,9 @@ async function buildDepositIx(senderPubkey, commitmentBytes, denominationLamport
       pool: poolPDA,
       treasury: treasuryPDA,
       commitmentAccount: commitmentPDA,
-      queue: queueAccount,
-      slotHashes: anchor.web3.SYSVAR_SLOT_HASHES_PUBKEY,
-      instructions: anchor.web3.SYSVAR_INSTRUCTIONS_PUBKEY,
+      // queue: queueAccount,
+      // slotHashes: anchor.web3.SYSVAR_SLOT_HASHES_PUBKEY,
+      // instructions: anchor.web3.SYSVAR_INSTRUCTIONS_PUBKEY,
       systemProgram: anchor.web3.SystemProgram.programId
     }).remainingAccounts(remainingAccounts).instruction();
   } else {
@@ -12845,8 +12750,6 @@ async function buildDepositTx({
       }).instruction()
     );
   }
-  const { sigVerifyIx } = await getOracleQuote(sender, sender.toBase58());
-  ixs.unshift(sigVerifyIx);
   const { blockhash } = await connection.getLatestBlockhash();
   const depositMessage = new TransactionMessage({
     payerKey: sender,
@@ -13750,11 +13653,14 @@ async function executeVeilixTransfer(items, tempKeypair) {
   const circuitArtifacts = await prepareWithdrawCircuitArtifacts();
   try {
     const extendBackupPdaNeeded = await isExtendBackupPdaNeeded2(senderPublicKey, allNotes.length);
-    const [{ sigVerifyIx }, depositInstructions, initNotesIx] = await Promise.all([
-      getOracleQuote(senderPublicKey, senderPublicKey.toBase58()),
-      buildDepositInstructionsForNotes2(senderPublicKey, allNotes, tempKeypair.publicKey),
-      buildInitNotesInstructionIfNeeded2(senderPublicKey)
-    ]);
+    const [depositInstructions, initNotesIx] = (
+      //{ sigVerifyIx },
+      await Promise.all([
+        // getOracleQuote(senderPublicKey, senderPublicKey.toBase58()),
+        buildDepositInstructionsForNotes2(senderPublicKey, allNotes, tempKeypair.publicKey),
+        buildInitNotesInstructionIfNeeded2(senderPublicKey)
+      ])
+    );
     const indexedDeposits = prepared.map((item, index) => ({
       item,
       depositIx: depositInstructions[index]
@@ -13765,7 +13671,7 @@ async function executeVeilixTransfer(items, tempKeypair) {
       Promise.all(
         depositChunks.map(async (batch, batchIndex) => {
           const instructions = [
-            sigVerifyIx,
+            // sigVerifyIx,
             ...batch.map((entry) => entry.depositIx)
           ];
           instructions.map((ix) => {