@solana/web3.js 1.68.0 → 1.69.0

package/lib/index.iife.js

@@ -12697,6 +12697,7 @@ var solanaWeb3 = (function (exports) {
 
 	  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
@@ -12707,12 +12708,17 @@ var solanaWeb3 = (function (exports) {
 	    } = 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;
 	  }
 
@@ -17041,7 +17047,7 @@ var solanaWeb3 = (function (exports) {
 	/**
 	 * 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
 	 */
 
 
@@ -17313,13 +17319,10 @@ var solanaWeb3 = (function (exports) {
 	  };
 	}
 	/**
-	 * A strategy for confirming durable nonce transactions.
+	 * @internal
 	 */
 
 
-	/**
-	 * @internal
-	 */
 	function createRpcResult(result) {
 	  return union([type({
 	    jsonrpc: literal('2.0'),
@@ -18926,7 +18929,14 @@ var solanaWeb3 = (function (exports) {
 	    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;
 	    }
 
@@ -18958,6 +18968,22 @@ var solanaWeb3 = (function (exports) {
 	    }
 	  }
 
+	  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
@@ -19061,7 +19087,7 @@ var solanaWeb3 = (function (exports) {
 	        disposeSignatureSubscriptionStateChangeObserver = undefined;
 	      }
 
-	      if (signatureSubscriptionId) {
+	      if (signatureSubscriptionId != null) {
 	        this.removeSignatureListener(signatureSubscriptionId);
 	        signatureSubscriptionId = undefined;
 	      }
@@ -19076,6 +19102,7 @@ var solanaWeb3 = (function (exports) {
 	  async confirmTransactionUsingBlockHeightExceedanceStrategy({
 	    commitment,
 	    strategy: {
+	      abortSignal,
 	      lastValidBlockHeight,
 	      signature
 	    }
@@ -19114,10 +19141,11 @@ var solanaWeb3 = (function (exports) {
 	      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;
@@ -19135,6 +19163,7 @@ var solanaWeb3 = (function (exports) {
 	  async confirmTransactionUsingDurableNonceStrategy({
 	    commitment,
 	    strategy: {
+	      abortSignal,
 	      minContextSlot,
 	      nonceAccountPubkey,
 	      nonceValue,
@@ -19192,10 +19221,11 @@ var solanaWeb3 = (function (exports) {
 	      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;