@solana/web3.js 1.68.1 → 1.70.0-pr-29130

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'),
@@ -17511,8 +17514,15 @@ var solanaWeb3 = (function (exports) {
 	 * A performance sample
 	 */
 
-	function createRpcClient(url, httpHeaders, customFetch, fetchMiddleware, disableRetryOnRateLimit) {
+	function createRpcClient(url, httpHeaders, customFetch, fetchMiddleware, disableRetryOnRateLimit, httpAgent) {
 	  const fetch = customFetch ? customFetch : fetchImpl;
+	  let agent;
+
+	  {
+	    if (httpAgent != null) {
+	      console.warn('You have supplied an `httpAgent` when creating a `Connection` in a browser environment.' + 'It has been ignored; `httpAgent` is only used in Node environments.');
+	    }
+	  }
 
 	  let fetchWithMiddleware;
 
@@ -17530,7 +17540,6 @@ var solanaWeb3 = (function (exports) {
 	  }
 
 	  const clientBrowser = new RpcClient(async (request, callback) => {
-	    const agent = undefined;
 	    const options = {
 	      method: 'POST',
 	      body: request,
@@ -17582,7 +17591,6 @@ var solanaWeb3 = (function (exports) {
 	      }
 	    } catch (err) {
 	      if (err instanceof Error) callback(err);
-	    } finally {
 	    }
 	  }, {});
 	  return clientBrowser;
@@ -18420,6 +18428,7 @@ var solanaWeb3 = (function (exports) {
 	    let fetch;
 	    let fetchMiddleware;
 	    let disableRetryOnRateLimit;
+	    let httpAgent;
 
 	    if (commitmentOrConfig && typeof commitmentOrConfig === 'string') {
 	      this._commitment = commitmentOrConfig;
@@ -18431,11 +18440,12 @@ var solanaWeb3 = (function (exports) {
 	      fetch = commitmentOrConfig.fetch;
 	      fetchMiddleware = commitmentOrConfig.fetchMiddleware;
 	      disableRetryOnRateLimit = commitmentOrConfig.disableRetryOnRateLimit;
+	      httpAgent = commitmentOrConfig.httpAgent;
 	    }
 
 	    this._rpcEndpoint = assertEndpointUrl(endpoint);
 	    this._rpcWsEndpoint = wsEndpoint || makeWebsocketUrl(endpoint);
-	    this._rpcClient = createRpcClient(endpoint, httpHeaders, fetch, fetchMiddleware, disableRetryOnRateLimit);
+	    this._rpcClient = createRpcClient(endpoint, httpHeaders, fetch, fetchMiddleware, disableRetryOnRateLimit, httpAgent);
 	    this._rpcRequest = createRpcRequest(this._rpcClient);
 	    this._rpcBatchRequest = createRpcBatchRequest(this._rpcClient);
 	    this._rpcWebSocket = new Client_1(this._rpcWsEndpoint, {
@@ -18926,7 +18936,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 +18975,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
@@ -19076,6 +19109,7 @@ var solanaWeb3 = (function (exports) {
 	  async confirmTransactionUsingBlockHeightExceedanceStrategy({
 	    commitment,
 	    strategy: {
+	      abortSignal,
 	      lastValidBlockHeight,
 	      signature
 	    }
@@ -19114,10 +19148,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 +19170,7 @@ var solanaWeb3 = (function (exports) {
 	  async confirmTransactionUsingDurableNonceStrategy({
 	    commitment,
 	    strategy: {
+	      abortSignal,
 	      minContextSlot,
 	      nonceAccountPubkey,
 	      nonceValue,
@@ -19192,10 +19228,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;