@solana/web3.js 1.73.1-pr-29195.6 → 1.73.1

package/lib/index.browser.cjs.js

@@ -12,9 +12,8 @@ var borsh = require('borsh');
 var BufferLayout = require('@solana/buffer-layout');
 var bigintBuffer = require('bigint-buffer');
 var superstruct = require('superstruct');
+var rpcWebsockets = require('rpc-websockets');
 var RpcClient = require('jayson/lib/client/browser');
-var RpcWebSocketCommonClient = require('rpc-websockets/dist/lib/client');
-var createRpc = require('rpc-websockets/dist/lib/client/websocket.browser');
 var sha3 = require('@noble/hashes/sha3');
 var hmac = require('@noble/hashes/hmac');
 var secp256k1 = require('@noble/secp256k1');
@@ -44,8 +43,6 @@ var BN__default = /*#__PURE__*/_interopDefaultLegacy(BN);
 var bs58__default = /*#__PURE__*/_interopDefaultLegacy(bs58);
 var BufferLayout__namespace = /*#__PURE__*/_interopNamespace(BufferLayout);
 var RpcClient__default = /*#__PURE__*/_interopDefaultLegacy(RpcClient);
-var RpcWebSocketCommonClient__default = /*#__PURE__*/_interopDefaultLegacy(RpcWebSocketCommonClient);
-var createRpc__default = /*#__PURE__*/_interopDefaultLegacy(createRpc);
 var secp256k1__namespace = /*#__PURE__*/_interopNamespace(secp256k1);
 
 /**
@@ -2251,7 +2248,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,
+      abortSignal: options?.abortSignal,
       signature: signature,
       blockhash: transaction.recentBlockhash,
       lastValidBlockHeight: transaction.lastValidBlockHeight
@@ -2262,14 +2259,14 @@ 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,
+      abortSignal: 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) {
+    if (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.');
     }
 
@@ -3550,60 +3547,6 @@ class SolanaJSONRPCError extends Error {
 
 var fetchImpl = globalThis.fetch;
 
-class RpcWebSocketClient extends RpcWebSocketCommonClient__default["default"] {
-  constructor(address, options, generate_request_id) {
-    const webSocketFactory = url => {
-      const rpc = createRpc__default["default"](url, {
-        autoconnect: true,
-        max_reconnects: 5,
-        reconnect: true,
-        reconnect_interval: 1000,
-        ...options
-      });
-
-      if ('socket' in rpc) {
-        this.underlyingSocket = rpc.socket;
-      } else {
-        this.underlyingSocket = rpc;
-      }
-
-      return rpc;
-    };
-
-    super(webSocketFactory, address, options, generate_request_id);
-    this.underlyingSocket = void 0;
-  }
-
-  call(...args) {
-    var _this$underlyingSocke;
-
-    const readyState = (_this$underlyingSocke = this.underlyingSocket) === null || _this$underlyingSocke === void 0 ? void 0 : _this$underlyingSocke.readyState;
-
-    if (readyState === 1
-    /* WebSocket.OPEN */
-    ) {
-      return super.call(...args);
-    }
-
-    return Promise.reject(new Error('Tried to call a JSON-RPC method `' + args[0] + '` but the socket was not `CONNECTING` or `OPEN` (`readyState` was ' + readyState + ')'));
-  }
-
-  notify(...args) {
-    var _this$underlyingSocke2;
-
-    const readyState = (_this$underlyingSocke2 = this.underlyingSocket) === null || _this$underlyingSocke2 === void 0 ? void 0 : _this$underlyingSocke2.readyState;
-
-    if (readyState === 1
-    /* WebSocket.OPEN */
-    ) {
-      return super.notify(...args);
-    }
-
-    return Promise.reject(new Error('Tried to send a JSON-RPC notification `' + args[0] + '` but the socket was not `CONNECTING` or `OPEN` (`readyState` was ' + readyState + ')'));
-  }
-
-}
-
 // TODO: These constants should be removed in favor of reading them out of a
 // Syscall account
 
@@ -3713,7 +3656,6 @@ function makeWebsocketUrl(endpoint) {
   return `${protocol}//${hostish}${websocketPort}${rest}`;
 }
 
-var _process$env$npm_pack;
 const PublicKeyFromString = superstruct.coerce(superstruct.instance(PublicKey), superstruct.string(), value => new PublicKey(value));
 const RawAccountDataResult = superstruct.tuple([superstruct.string(), superstruct.literal('base64')]);
 const BufferFromRawAccountData = superstruct.coerce(superstruct.instance(buffer.Buffer), RawAccountDataResult, value => buffer.Buffer.from(value[0], 'base64'));
@@ -4778,7 +4720,7 @@ const LogsNotificationResult = superstruct.type({
 
 /** @internal */
 const COMMON_HTTP_HEADERS = {
-  'solana-client': `js/${(_process$env$npm_pack = "0.0.0-development") !== null && _process$env$npm_pack !== void 0 ? _process$env$npm_pack : 'UNKNOWN'}`
+  'solana-client': `js/${"0.0.0-development" }`
 };
 /**
  * A connection to a fullnode JSON RPC endpoint
@@ -4908,7 +4850,7 @@ class Connection {
     this._rpcClient = createRpcClient(endpoint, httpHeaders, fetch, fetchMiddleware, disableRetryOnRateLimit, httpAgent);
     this._rpcRequest = createRpcRequest(this._rpcClient);
     this._rpcBatchRequest = createRpcBatchRequest(this._rpcClient);
-    this._rpcWebSocket = new RpcWebSocketClient(this._rpcWsEndpoint, {
+    this._rpcWebSocket = new rpcWebsockets.Client(this._rpcWsEndpoint, {
       autoconnect: false,
       max_reconnects: Infinity
     });
@@ -5324,7 +5266,7 @@ class Connection {
     const args = this._buildArgs([publicKey.toBase58()], commitment, undefined
     /* encoding */
     , { ...config,
-      epoch: epoch != null ? epoch : config === null || config === void 0 ? void 0 : config.epoch
+      epoch: epoch != null ? epoch : config?.epoch
     });
 
     const unsafeRes = await this._rpcRequest('getStakeActivation', args);
@@ -5396,11 +5338,9 @@ 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) {
+      if (config.abortSignal?.aborted) {
         return Promise.reject(config.abortSignal.reason);
       }
 
@@ -5502,7 +5442,7 @@ class Connection {
             return;
           }
 
-          if (value !== null && value !== void 0 && value.err) {
+          if (value?.err) {
             reject(value.err);
           } else {
             switch (commitment) {
@@ -5652,7 +5592,7 @@ class Connection {
             minContextSlot
           });
           lastCheckedSlot = context.slot;
-          return nonceAccount === null || nonceAccount === void 0 ? void 0 : nonceAccount.nonce;
+          return nonceAccount?.nonce;
         } catch (e) {
           // If for whatever reason we can't reach/read the nonce
           // account, just keep using the last-known value.
@@ -5697,22 +5637,18 @@ class Connection {
       if (outcome.__type === exports.TransactionStatus.PROCESSED) {
         result = outcome.response;
       } else {
-        var _signatureStatus;
-
         // Double check that the transaction is indeed unconfirmed.
         let signatureStatus;
 
         while (true // eslint-disable-line no-constant-condition
         ) {
-          var _outcome$slotInWhichN;
-
           const status = await this.getSignatureStatus(signature);
 
           if (status == null) {
             break;
           }
 
-          if (status.context.slot < ((_outcome$slotInWhichN = outcome.slotInWhichNonceDidAdvance) !== null && _outcome$slotInWhichN !== void 0 ? _outcome$slotInWhichN : minContextSlot)) {
+          if (status.context.slot < (outcome.slotInWhichNonceDidAdvance ?? minContextSlot)) {
             await sleep(400);
             continue;
           }
@@ -5721,7 +5657,7 @@ class Connection {
           break;
         }
 
-        if ((_signatureStatus = signatureStatus) !== null && _signatureStatus !== void 0 && _signatureStatus.value) {
+        if (signatureStatus?.value) {
           const commitmentForStatus = commitment || 'finalized';
           const {
             confirmationStatus
@@ -6034,7 +5970,7 @@ class Connection {
     const args = this._buildArgs([addresses.map(pubkey => pubkey.toBase58())], commitment, undefined
     /* encoding */
     , { ...config,
-      epoch: epoch != null ? epoch : config === null || config === void 0 ? void 0 : config.epoch
+      epoch: epoch != null ? epoch : config?.epoch
     });
 
     const unsafeRes = await this._rpcRequest('getInflationReward', args);
@@ -6331,7 +6267,7 @@ class Connection {
     const unsafeRes = await this._rpcRequest('getBlock', args);
 
     try {
-      switch (config === null || config === void 0 ? void 0 : config.transactionDetails) {
+      switch (config?.transactionDetails) {
         case 'accounts':
           {
             const res = superstruct.create(unsafeRes, GetAccountsModeBlockRpcResult);
@@ -6401,7 +6337,7 @@ class Connection {
     const unsafeRes = await this._rpcRequest('getBlock', args);
 
     try {
-      switch (config === null || config === void 0 ? void 0 : config.transactionDetails) {
+      switch (config?.transactionDetails) {
         case 'accounts':
           {
             const res = superstruct.create(unsafeRes, GetParsedAccountsModeBlockRpcResult);
@@ -7362,11 +7298,7 @@ class Connection {
     this._rpcWebSocketConnected = true;
     this._rpcWebSocketHeartbeat = setInterval(() => {
       // Ping server every 5s to prevent idle timeouts
-      (async () => {
-        try {
-          await this._rpcWebSocket.notify('ping'); // eslint-disable-next-line no-empty
-        } catch {}
-      })();
+      this._rpcWebSocket.notify('ping').catch(() => {});
     }, 5000);
 
     this._updateSubscriptions();
@@ -7420,9 +7352,7 @@ class Connection {
 
 
   _setSubscription(hash, nextSubscription) {
-    var _this$_subscriptionsB;
-
-    const prevState = (_this$_subscriptionsB = this._subscriptionsByHash[hash]) === null || _this$_subscriptionsB === void 0 ? void 0 : _this$_subscriptionsB.state;
+    const prevState = this._subscriptionsByHash[hash]?.state;
     this._subscriptionsByHash[hash] = nextSubscription;
 
     if (prevState !== nextSubscription.state) {
@@ -8180,7 +8110,7 @@ class Keypair {
    */
   constructor(keypair) {
     this._keypair = void 0;
-    this._keypair = keypair !== null && keypair !== void 0 ? keypair : generateKeypair();
+    this._keypair = keypair ?? generateKeypair();
   }
   /**
    * Generate a new random keypair