@solana/web3.js 1.68.1 → 1.69.0

package/lib/index.cjs.js

@@ -2245,6 +2245,7 @@ async function sendAndConfirmTransaction(connection, transaction, signers, optio
 
   if (transaction.recentBlockhash != null && transaction.lastValidBlockHeight != null) {
     status = (await connection.confirmTransaction({
+      abortSignal: options === null || options === void 0 ? void 0 : options.abortSignal,
       signature: signature,
       blockhash: transaction.recentBlockhash,
       lastValidBlockHeight: transaction.lastValidBlockHeight
@@ -2255,12 +2256,17 @@ async function sendAndConfirmTransaction(connection, transaction, signers, optio
     } = transaction.nonceInfo;
     const nonceAccountPubkey = nonceInstruction.keys[0].pubkey;
     status = (await connection.confirmTransaction({
+      abortSignal: options === null || options === void 0 ? void 0 : options.abortSignal,
       minContextSlot: transaction.minNonceContextSlot,
       nonceAccountPubkey,
       nonceValue: transaction.nonceInfo.nonce,
       signature
     }, options && options.commitment)).value;
   } else {
+    if ((options === null || options === void 0 ? void 0 : options.abortSignal) != null) {
+      console.warn('sendAndConfirmTransaction(): A transaction with a deprecated confirmation strategy was ' + 'supplied along with an `abortSignal`. Only transactions having `lastValidBlockHeight` ' + 'or a combination of `nonceInfo` and `minNonceContextSlot` are abortable.');
+    }
+
     status = (await connection.confirmTransaction(signature, options && options.commitment)).value;
   }
 
@@ -3473,7 +3479,7 @@ function nextPowerOfTwo(n) {
 /**
  * Epoch schedule
  * (see https://docs.solana.com/terminology#epoch)
- * Can be retrieved with the {@link connection.getEpochSchedule} method
+ * Can be retrieved with the {@link Connection.getEpochSchedule} method
  */
 
 
@@ -3748,13 +3754,10 @@ function extractCommitmentFromConfig(commitmentOrConfig) {
   };
 }
 /**
- * A strategy for confirming durable nonce transactions.
+ * @internal
  */
 
 
-/**
- * @internal
- */
 function createRpcResult(result) {
   return superstruct.union([superstruct.type({
     jsonrpc: superstruct.literal('2.0'),
@@ -5369,7 +5372,14 @@ class Connection {
     if (typeof strategy == 'string') {
       rawSignature = strategy;
     } else {
+      var _config$abortSignal;
+
       const config = strategy;
+
+      if ((_config$abortSignal = config.abortSignal) !== null && _config$abortSignal !== void 0 && _config$abortSignal.aborted) {
+        return Promise.reject(config.abortSignal.reason);
+      }
+
       rawSignature = config.signature;
     }
 
@@ -5401,6 +5411,22 @@ class Connection {
     }
   }
 
+  getCancellationPromise(signal) {
+    return new Promise((_, reject) => {
+      if (signal == null) {
+        return;
+      }
+
+      if (signal.aborted) {
+        reject(signal.reason);
+      } else {
+        signal.addEventListener('abort', () => {
+          reject(signal.reason);
+        });
+      }
+    });
+  }
+
   getTransactionConfirmationPromise({
     commitment,
     signature
@@ -5519,6 +5545,7 @@ class Connection {
   async confirmTransactionUsingBlockHeightExceedanceStrategy({
     commitment,
     strategy: {
+      abortSignal,
       lastValidBlockHeight,
       signature
     }
@@ -5557,10 +5584,11 @@ class Connection {
       commitment,
       signature
     });
+    const cancellationPromise = this.getCancellationPromise(abortSignal);
     let result;
 
     try {
-      const outcome = await Promise.race([confirmationPromise, expiryPromise]);
+      const outcome = await Promise.race([cancellationPromise, confirmationPromise, expiryPromise]);
 
       if (outcome.__type === exports.TransactionStatus.PROCESSED) {
         result = outcome.response;
@@ -5578,6 +5606,7 @@ class Connection {
   async confirmTransactionUsingDurableNonceStrategy({
     commitment,
     strategy: {
+      abortSignal,
       minContextSlot,
       nonceAccountPubkey,
       nonceValue,
@@ -5635,10 +5664,11 @@ class Connection {
       commitment,
       signature
     });
+    const cancellationPromise = this.getCancellationPromise(abortSignal);
     let result;
 
     try {
-      const outcome = await Promise.race([confirmationPromise, expiryPromise]);
+      const outcome = await Promise.race([cancellationPromise, confirmationPromise, expiryPromise]);
 
       if (outcome.__type === exports.TransactionStatus.PROCESSED) {
         result = outcome.response;