@solana/web3.js 2.0.0-experimental.ba21818 → 2.0.0-experimental.ba9b4c7

package/dist/index.browser.js

@@ -1,10 +1,10 @@
 export * from '@solana/addresses';
 export * from '@solana/instructions';
 export * from '@solana/keys';
-import { getSignatureFromTransaction } from '@solana/transactions';
+import { getSignatureFromTransaction, getBase64EncodedWireTransaction } from '@solana/transactions';
 export * from '@solana/transactions';
+import { commitmentComparator, createSolanaRpcApi, createSolanaRpcSubscriptionsApi, createSolanaRpcSubscriptionsApi_UNSTABLE } from '@solana/rpc-core';
 import { pipe } from '@solana/functional';
-import { createSolanaRpcApi, createSolanaRpcSubscriptionsApi, createSolanaRpcSubscriptionsApi_UNSTABLE, commitmentComparator } from '@solana/rpc-core';
 import { createJsonRpc, createJsonSubscriptionRpc, createHttpTransport, createWebSocketTransport } from '@solana/rpc-transport';
 import fastStableStringify from 'fast-stable-stringify';
 import { base64, base58 } from '@metaplex-foundation/umi-serializers';
@@ -12,6 +12,159 @@ import { base64, base58 } from '@metaplex-foundation/umi-serializers';
 // ../build-scripts/env-shim.ts
 var __DEV__ = /* @__PURE__ */ (() => process["env"].NODE_ENV === "development")();
 
+// src/transaction-confirmation-strategy-racer.ts
+async function raceStrategies(signature, config, getSpecificStrategiesForRace) {
+  const { abortSignal: callerAbortSignal, commitment, getRecentSignatureConfirmationPromise } = config;
+  callerAbortSignal.throwIfAborted();
+  const abortController = new AbortController();
+  function handleAbort() {
+    abortController.abort();
+  }
+  callerAbortSignal.addEventListener("abort", handleAbort, { signal: abortController.signal });
+  try {
+    const specificStrategies = getSpecificStrategiesForRace({
+      ...config,
+      abortSignal: abortController.signal
+    });
+    return await Promise.race([
+      getRecentSignatureConfirmationPromise({
+        abortSignal: abortController.signal,
+        commitment,
+        signature
+      }),
+      ...specificStrategies
+    ]);
+  } finally {
+    abortController.abort();
+  }
+}
+function createRecentSignatureConfirmationPromiseFactory(rpc, rpcSubscriptions) {
+  return async function getRecentSignatureConfirmationPromise({
+    abortSignal: callerAbortSignal,
+    commitment,
+    signature
+  }) {
+    const abortController = new AbortController();
+    function handleAbort() {
+      abortController.abort();
+    }
+    callerAbortSignal.addEventListener("abort", handleAbort, { signal: abortController.signal });
+    const signatureStatusNotifications = await rpcSubscriptions.signatureNotifications(signature, { commitment }).subscribe({ abortSignal: abortController.signal });
+    const signatureDidCommitPromise = (async () => {
+      for await (const signatureStatusNotification of signatureStatusNotifications) {
+        if (signatureStatusNotification.value.err) {
+          throw new Error(`The transaction with signature \`${signature}\` failed.`, {
+            cause: signatureStatusNotification.value.err
+          });
+        } else {
+          return;
+        }
+      }
+    })();
+    const signatureStatusLookupPromise = (async () => {
+      const { value: signatureStatusResults } = await rpc.getSignatureStatuses([signature]).send({ abortSignal: abortController.signal });
+      const signatureStatus = signatureStatusResults[0];
+      if (signatureStatus && signatureStatus.confirmationStatus && commitmentComparator(signatureStatus.confirmationStatus, commitment) >= 0) {
+        return;
+      } else {
+        await new Promise(() => {
+        });
+      }
+    })();
+    try {
+      return await Promise.race([signatureDidCommitPromise, signatureStatusLookupPromise]);
+    } finally {
+      abortController.abort();
+    }
+  };
+}
+
+// src/transaction-confirmation-strategy-timeout.ts
+async function getTimeoutPromise({ abortSignal: callerAbortSignal, commitment }) {
+  return await new Promise((_, reject) => {
+    const handleAbort = (e) => {
+      clearTimeout(timeoutId);
+      const abortError = new DOMException(e.target.reason, "AbortError");
+      reject(abortError);
+    };
+    callerAbortSignal.addEventListener("abort", handleAbort);
+    const timeoutMs = commitment === "processed" ? 3e4 : 6e4;
+    const startMs = performance.now();
+    const timeoutId = (
+      // We use `setTimeout` instead of `AbortSignal.timeout()` because we want to measure
+      // elapsed time instead of active time.
+      // See https://developer.mozilla.org/en-US/docs/Web/API/AbortSignal/timeout_static
+      setTimeout(() => {
+        const elapsedMs = performance.now() - startMs;
+        reject(new DOMException(`Timeout elapsed after ${elapsedMs} ms`, "TimeoutError"));
+      }, timeoutMs)
+    );
+  });
+}
+
+// src/airdrop-confirmer.ts
+function createDefaultSignatureOnlyRecentTransactionConfirmer({
+  rpc,
+  rpcSubscriptions
+}) {
+  const getRecentSignatureConfirmationPromise = createRecentSignatureConfirmationPromiseFactory(
+    rpc,
+    rpcSubscriptions
+  );
+  return async function confirmSignatureOnlyRecentTransaction(config) {
+    await waitForRecentTransactionConfirmationUntilTimeout({
+      ...config,
+      getRecentSignatureConfirmationPromise,
+      getTimeoutPromise
+    });
+  };
+}
+async function waitForRecentTransactionConfirmationUntilTimeout(config) {
+  await raceStrategies(
+    config.signature,
+    config,
+    function getSpecificStrategiesForRace({ abortSignal, commitment, getTimeoutPromise: getTimeoutPromise2 }) {
+      return [
+        getTimeoutPromise2({
+          abortSignal,
+          commitment
+        })
+      ];
+    }
+  );
+}
+
+// src/airdrop.ts
+function createDefaultAirdropRequester({ rpc, rpcSubscriptions }) {
+  const confirmSignatureOnlyTransaction = createDefaultSignatureOnlyRecentTransactionConfirmer({
+    rpc,
+    rpcSubscriptions
+  });
+  return async function requestAirdrop(config) {
+    return await requestAndConfirmAirdrop({
+      ...config,
+      confirmSignatureOnlyTransaction,
+      rpc
+    });
+  };
+}
+async function requestAndConfirmAirdrop({
+  abortSignal,
+  commitment,
+  confirmSignatureOnlyTransaction,
+  lamports,
+  recipientAddress,
+  rpc
+}) {
+  const airdropTransactionSignature = await rpc.requestAirdrop(recipientAddress, lamports, { commitment }).send({ abortSignal });
+  await confirmSignatureOnlyTransaction({
+    abortSignal,
+    commitment,
+    signature: airdropTransactionSignature
+  });
+  return airdropTransactionSignature;
+}
+
 // src/rpc-integer-overflow-error.ts
 var SolanaJsonRpcIntegerOverflowError = class extends Error {
   constructor(methodName, keyPath, value) {
@@ -531,97 +684,45 @@ function createNonceInvalidationPromiseFactory(rpc, rpcSubscriptions) {
     }
   };
 }
-function createSignatureConfirmationPromiseFactory(rpc, rpcSubscriptions) {
-  return async function getSignatureConfirmationPromise({ abortSignal: callerAbortSignal, commitment, signature }) {
-    const abortController = new AbortController();
-    function handleAbort() {
-      abortController.abort();
-    }
-    callerAbortSignal.addEventListener("abort", handleAbort, { signal: abortController.signal });
-    const signatureStatusNotifications = await rpcSubscriptions.signatureNotifications(signature, { commitment }).subscribe({ abortSignal: abortController.signal });
-    const signatureDidCommitPromise = (async () => {
-      for await (const signatureStatusNotification of signatureStatusNotifications) {
-        if (signatureStatusNotification.value.err) {
-          throw new Error(`The transaction with signature \`${signature}\` failed.`, {
-            cause: signatureStatusNotification.value.err
-          });
-        } else {
-          return;
-        }
-      }
-    })();
-    const signatureStatusLookupPromise = (async () => {
-      const { value: signatureStatusResults } = await rpc.getSignatureStatuses([signature]).send({ abortSignal: abortController.signal });
-      const signatureStatus = signatureStatusResults[0];
-      if (signatureStatus && signatureStatus.confirmationStatus && commitmentComparator(signatureStatus.confirmationStatus, commitment) >= 0) {
-        return;
-      } else {
-        await new Promise(() => {
-        });
-      }
-    })();
-    try {
-      return await Promise.race([signatureDidCommitPromise, signatureStatusLookupPromise]);
-    } finally {
-      abortController.abort();
-    }
-  };
-}
 
 // src/transaction-confirmation.ts
-async function raceStrategies(config, getSpecificStrategiesForRace) {
-  const { abortSignal: callerAbortSignal, commitment, getSignatureConfirmationPromise, transaction } = config;
-  callerAbortSignal.throwIfAborted();
-  const signature = getSignatureFromTransaction(transaction);
-  const abortController = new AbortController();
-  function handleAbort() {
-    abortController.abort();
-  }
-  callerAbortSignal.addEventListener("abort", handleAbort, { signal: abortController.signal });
-  try {
-    const specificStrategies = getSpecificStrategiesForRace({
-      ...config,
-      abortSignal: abortController.signal
-    });
-    return await Promise.race([
-      getSignatureConfirmationPromise({
-        abortSignal: abortController.signal,
-        commitment,
-        signature
-      }),
-      ...specificStrategies
-    ]);
-  } finally {
-    abortController.abort();
-  }
-}
 function createDefaultDurableNonceTransactionConfirmer({
   rpc,
   rpcSubscriptions
 }) {
   const getNonceInvalidationPromise = createNonceInvalidationPromiseFactory(rpc, rpcSubscriptions);
-  const getSignatureConfirmationPromise = createSignatureConfirmationPromiseFactory(rpc, rpcSubscriptions);
-  return async function confirmTransaction(config) {
+  const getRecentSignatureConfirmationPromise = createRecentSignatureConfirmationPromiseFactory(
+    rpc,
+    rpcSubscriptions
+  );
+  return async function confirmDurableNonceTransaction(config) {
     await waitForDurableNonceTransactionConfirmation({
       ...config,
       getNonceInvalidationPromise,
-      getSignatureConfirmationPromise
+      getRecentSignatureConfirmationPromise
     });
   };
 }
-function createDefaultTransactionConfirmer({ rpc, rpcSubscriptions }) {
+function createDefaultRecentTransactionConfirmer({
+  rpc,
+  rpcSubscriptions
+}) {
   const getBlockHeightExceedencePromise = createBlockHeightExceedencePromiseFactory(rpcSubscriptions);
-  const getSignatureConfirmationPromise = createSignatureConfirmationPromiseFactory(rpc, rpcSubscriptions);
-  return async function confirmTransaction(config) {
-    await waitForTransactionConfirmation({
+  const getRecentSignatureConfirmationPromise = createRecentSignatureConfirmationPromiseFactory(
+    rpc,
+    rpcSubscriptions
+  );
+  return async function confirmRecentTransaction(config) {
+    await waitForRecentTransactionConfirmation({
       ...config,
       getBlockHeightExceedencePromise,
-      getSignatureConfirmationPromise
+      getRecentSignatureConfirmationPromise
     });
   };
 }
 async function waitForDurableNonceTransactionConfirmation(config) {
   await raceStrategies(
+    getSignatureFromTransaction(config.transaction),
     config,
     function getSpecificStrategiesForRace({ abortSignal, commitment, getNonceInvalidationPromise, transaction }) {
       return [
@@ -635,8 +736,9 @@ async function waitForDurableNonceTransactionConfirmation(config) {
     }
   );
 }
-async function waitForTransactionConfirmation(config) {
+async function waitForRecentTransactionConfirmation(config) {
   await raceStrategies(
+    getSignatureFromTransaction(config.transaction),
     config,
     function getSpecificStrategiesForRace({ abortSignal, getBlockHeightExceedencePromise, transaction }) {
       return [
@@ -649,4 +751,117 @@ async function waitForTransactionConfirmation(config) {
   );
 }
 
-export { createBlockHeightExceedencePromiseFactory, createDefaultDurableNonceTransactionConfirmer, createDefaultRpcSubscriptionsTransport, createDefaultRpcTransport, createDefaultTransactionConfirmer, createNonceInvalidationPromiseFactory, createSignatureConfirmationPromiseFactory, createSolanaRpc, createSolanaRpcSubscriptions, createSolanaRpcSubscriptions_UNSTABLE, waitForDurableNonceTransactionConfirmation, waitForTransactionConfirmation };
+// src/send-transaction.ts
+function getSendTransactionConfigWithAdjustedPreflightCommitment(commitment, config) {
+  if (
+    // The developer has supplied no value for `preflightCommitment`.
+    !config?.preflightCommitment && // The value of `commitment` is lower than the server default of `preflightCommitment`.
+    commitmentComparator(
+      commitment,
+      "finalized"
+      /* default value of `preflightCommitment` */
+    ) < 0
+  ) {
+    return {
+      ...config,
+      // In the common case, it is unlikely that you want to simulate a transaction at
+      // `finalized` commitment when your standard of commitment for confirming the
+      // transaction is lower. Cap the simulation commitment level to the level of the
+      // confirmation commitment.
+      preflightCommitment: commitment
+    };
+  }
+  return config;
+}
+async function sendTransaction_INTERNAL({
+  abortSignal,
+  commitment,
+  rpc,
+  transaction,
+  sendTransactionConfig
+}) {
+  const base64EncodedWireTransaction = getBase64EncodedWireTransaction(transaction);
+  return await rpc.sendTransaction(base64EncodedWireTransaction, {
+    ...getSendTransactionConfigWithAdjustedPreflightCommitment(commitment, sendTransactionConfig),
+    encoding: "base64"
+  }).send({ abortSignal });
+}
+function createDefaultDurableNonceTransactionSender({
+  rpc,
+  rpcSubscriptions
+}) {
+  const confirmDurableNonceTransaction = createDefaultDurableNonceTransactionConfirmer({
+    rpc,
+    rpcSubscriptions
+  });
+  return async function sendDurableNonceTransaction(transaction, config) {
+    await sendAndConfirmDurableNonceTransaction({
+      ...config,
+      confirmDurableNonceTransaction,
+      rpc,
+      transaction
+    });
+  };
+}
+function createDefaultTransactionSender({ rpc, rpcSubscriptions }) {
+  const confirmRecentTransaction = createDefaultRecentTransactionConfirmer({
+    rpc,
+    rpcSubscriptions
+  });
+  return async function sendTransaction(transaction, config) {
+    await sendAndConfirmTransaction({
+      ...config,
+      confirmRecentTransaction,
+      rpc,
+      transaction
+    });
+  };
+}
+async function sendAndConfirmDurableNonceTransaction({
+  abortSignal,
+  commitment,
+  confirmDurableNonceTransaction,
+  rpc,
+  transaction,
+  ...sendTransactionConfig
+}) {
+  const transactionSignature = await sendTransaction_INTERNAL({
+    abortSignal,
+    commitment,
+    rpc,
+    sendTransactionConfig,
+    transaction
+  });
+  await confirmDurableNonceTransaction({
+    abortSignal,
+    commitment,
+    transaction
+  });
+  return transactionSignature;
+}
+async function sendAndConfirmTransaction({
+  abortSignal,
+  commitment,
+  confirmRecentTransaction,
+  rpc,
+  transaction,
+  ...sendTransactionConfig
+}) {
+  const transactionSignature = await sendTransaction_INTERNAL({
+    abortSignal,
+    commitment,
+    rpc,
+    sendTransactionConfig,
+    transaction
+  });
+  await confirmRecentTransaction({
+    abortSignal,
+    commitment,
+    transaction
+  });
+  return transactionSignature;
+}
+
+export { createBlockHeightExceedencePromiseFactory, createDefaultAirdropRequester, createDefaultDurableNonceTransactionConfirmer, createDefaultDurableNonceTransactionSender, createDefaultRecentTransactionConfirmer, createDefaultRpcSubscriptionsTransport, createDefaultRpcTransport, createDefaultTransactionSender, createNonceInvalidationPromiseFactory, createRecentSignatureConfirmationPromiseFactory, createSolanaRpc, createSolanaRpcSubscriptions, createSolanaRpcSubscriptions_UNSTABLE, requestAndConfirmAirdrop, sendAndConfirmDurableNonceTransaction, sendAndConfirmTransaction, waitForDurableNonceTransactionConfirmation, waitForRecentTransactionConfirmation };
+//# sourceMappingURL=out.js.map
+//# sourceMappingURL=index.browser.js.map