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

package/README.md

@@ -102,19 +102,6 @@ This library requires a JavaScript runtime that supports [`BigInt`](https://deve
 - React Native:
   - \>=0.7.0 using the [Hermes](https://reactnative.dev/blog/2022/07/08/hermes-as-the-default) engine ([integration guide](https://solanacookbook.com/integrations/react-native.html#how-to-use-solana-web3-js-in-a-react-native-app)):
 
-## Flow Support (Discontinued)
-
-Flow types are no longer supported in new releases. The last release with Flow support is v1.37.2 and its
-[Flow library definition](https://flow.org/en/docs/libdefs/) is provided at
-https://unpkg.com/@solana/web3.js@v1.37.2/module.flow.js.
-Download the file and add the following line under the [libs] section of your project's `.flowconfig` to
-activate it:
-
-```ini
-[libs]
-node_modules/@solana/web3.js/module.flow.js
-```
-
 ## Releases
 
 Releases are available on [Github](https://github.com/solana-labs/solana-web3.js/releases)

package/lib/index.browser.cjs.js

@@ -2239,6 +2239,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
@@ -2249,12 +2250,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;
   }
 
@@ -3418,7 +3424,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
  */
 
 
@@ -3690,13 +3696,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'),
@@ -3888,8 +3891,15 @@ const BlockProductionResponseStruct = jsonRpcResultAndContext(superstruct.type({
  * 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;
 
@@ -3907,7 +3917,6 @@ function createRpcClient(url, httpHeaders, customFetch, fetchMiddleware, disable
   }
 
   const clientBrowser = new RpcClient__default["default"](async (request, callback) => {
-    const agent = undefined;
     const options = {
       method: 'POST',
       body: request,
@@ -3959,7 +3968,6 @@ function createRpcClient(url, httpHeaders, customFetch, fetchMiddleware, disable
       }
     } catch (err) {
       if (err instanceof Error) callback(err);
-    } finally {
     }
   }, {});
   return clientBrowser;
@@ -4797,6 +4805,7 @@ class Connection {
     let fetch;
     let fetchMiddleware;
     let disableRetryOnRateLimit;
+    let httpAgent;
 
     if (commitmentOrConfig && typeof commitmentOrConfig === 'string') {
       this._commitment = commitmentOrConfig;
@@ -4808,11 +4817,12 @@ class Connection {
       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 rpcWebsockets.Client(this._rpcWsEndpoint, {
@@ -5303,7 +5313,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;
     }
 
@@ -5335,6 +5352,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
@@ -5453,6 +5486,7 @@ class Connection {
   async confirmTransactionUsingBlockHeightExceedanceStrategy({
     commitment,
     strategy: {
+      abortSignal,
       lastValidBlockHeight,
       signature
     }
@@ -5491,10 +5525,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;
@@ -5512,6 +5547,7 @@ class Connection {
   async confirmTransactionUsingDurableNonceStrategy({
     commitment,
     strategy: {
+      abortSignal,
       minContextSlot,
       nonceAccountPubkey,
       nonceValue,
@@ -5569,10 +5605,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;