@solana/web3.js 1.70.1 → 1.70.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solana/web3.js",
-  "version": "1.70.1",
+  "version": "1.70.3",
   "description": "Solana Javascript API",
   "keywords": [
     "api",
@@ -62,6 +62,7 @@
     "@noble/hashes": "^1.1.2",
     "@noble/secp256k1": "^1.6.3",
     "@solana/buffer-layout": "^4.0.0",
+    "agentkeepalive": "^4.2.1",
     "bigint-buffer": "^1.1.5",
     "bn.js": "^5.0.0",
     "borsh": "^0.7.0",

package/src/connection.ts

@@ -1,9 +1,12 @@
+import HttpKeepAliveAgent, {
+  HttpsAgent as HttpsKeepAliveAgent,
+} from 'agentkeepalive';
 import bs58 from 'bs58';
 import {Buffer} from 'buffer';
 // @ts-ignore
 import fastStableStringify from 'fast-stable-stringify';
-import type {Agent as HttpAgent} from 'http';
-import {Agent as HttpsAgent} from 'https';
+import type {Agent as NodeHttpAgent} from 'http';
+import {Agent as NodeHttpsAgent} from 'https';
 import {
   type as pick,
   number,
@@ -27,7 +30,6 @@ import {Client as RpcWebSocketClient} from 'rpc-websockets';
 import RpcClient from 'jayson/lib/client/browser';
 import {JSONRPCError} from 'jayson';
 
-import {AgentManager} from './agent-manager';
 import {EpochSchedule} from './epoch-schedule';
 import {SendTransactionError, SolanaJSONRPCError} from './errors';
 import fetchImpl, {Response} from './fetch-impl';
@@ -347,6 +349,13 @@ export type BaseTransactionConfirmationStrategy = Readonly<{
   signature: TransactionSignature;
 }>;
 
+/**
+ * This type represents all transaction confirmation strategies
+ */
+export type TransactionConfirmationStrategy =
+  | BlockheightBasedTransactionConfirmationStrategy
+  | DurableNonceTransactionConfirmationStrategy;
+
 /* @internal */
 function assertEndpointUrl(putativeUrl: string) {
   if (/^https?:/.test(putativeUrl) === false) {
@@ -1452,12 +1461,10 @@ function createRpcClient(
   customFetch?: FetchFn,
   fetchMiddleware?: FetchMiddleware,
   disableRetryOnRateLimit?: boolean,
-  httpAgent?: HttpAgent | HttpsAgent | false,
+  httpAgent?: NodeHttpAgent | NodeHttpsAgent | false,
 ): RpcClient {
   const fetch = customFetch ? customFetch : fetchImpl;
-  let agentManager:
-    | {requestEnd(): void; requestStart(): HttpAgent | HttpsAgent}
-    | undefined;
+  let agent: NodeHttpAgent | NodeHttpsAgent | undefined;
   if (process.env.BROWSER) {
     if (httpAgent != null) {
       console.warn(
@@ -1468,21 +1475,30 @@ function createRpcClient(
   } else {
     if (httpAgent == null) {
       if (process.env.NODE_ENV !== 'test') {
-        agentManager = new AgentManager(
-          url.startsWith('https:') /* useHttps */,
-        );
+        const agentOptions = {
+          // One second fewer than the Solana RPC's keepalive timeout.
+          // Read more: https://github.com/solana-labs/solana/issues/27859#issuecomment-1340097889
+          freeSocketTimeout: 19000,
+          keepAlive: true,
+          maxSockets: 25,
+        };
+        if (url.startsWith('https:')) {
+          agent = new HttpsKeepAliveAgent(agentOptions);
+        } else {
+          agent = new HttpKeepAliveAgent(agentOptions);
+        }
       }
     } else {
       if (httpAgent !== false) {
         const isHttps = url.startsWith('https:');
-        if (isHttps && !(httpAgent instanceof HttpsAgent)) {
+        if (isHttps && !(httpAgent instanceof NodeHttpsAgent)) {
           throw new Error(
             'The endpoint `' +
               url +
               '` can only be paired with an `https.Agent`. You have, instead, supplied an ' +
               '`http.Agent` through `httpAgent`.',
           );
-        } else if (!isHttps && httpAgent instanceof HttpsAgent) {
+        } else if (!isHttps && httpAgent instanceof NodeHttpsAgent) {
           throw new Error(
             'The endpoint `' +
               url +
@@ -1490,7 +1506,7 @@ function createRpcClient(
               '`https.Agent` through `httpAgent`.',
           );
         }
-        agentManager = {requestEnd() {}, requestStart: () => httpAgent};
+        agent = httpAgent;
       }
     }
   }
@@ -1515,7 +1531,6 @@ function createRpcClient(
   }
 
   const clientBrowser = new RpcClient(async (request, callback) => {
-    const agent = agentManager ? agentManager.requestStart() : undefined;
     const options = {
       method: 'POST',
       body: request,
@@ -1565,8 +1580,6 @@ function createRpcClient(
       }
     } catch (err) {
       if (err instanceof Error) callback(err);
-    } finally {
-      agentManager && agentManager.requestEnd();
     }
   }, {});
 
@@ -2898,7 +2911,7 @@ export type ConnectionConfig = {
    * persistence). Set this to `false` to create a connection that uses no agent. This applies to
    * Node environments only.
    */
-  httpAgent?: HttpAgent | HttpsAgent | false;
+  httpAgent?: NodeHttpAgent | NodeHttpsAgent | false;
   /** Optional commitment level */
   commitment?: Commitment;
   /** Optional endpoint URL to the fullnode JSON RPC PubSub WebSocket Endpoint */
@@ -3597,13 +3610,11 @@ export class Connection {
   }
 
   confirmTransaction(
-    strategy:
-      | BlockheightBasedTransactionConfirmationStrategy
-      | DurableNonceTransactionConfirmationStrategy,
+    strategy: TransactionConfirmationStrategy,
     commitment?: Commitment,
   ): Promise<RpcResponseAndContext<SignatureResult>>;
 
-  /** @deprecated Instead, call `confirmTransaction` using a `TransactionConfirmationConfig` */
+  /** @deprecated Instead, call `confirmTransaction` and pass in {@link TransactionConfirmationStrategy} */
   // eslint-disable-next-line no-dupe-class-members
   confirmTransaction(
     strategy: TransactionSignature,
@@ -3612,10 +3623,7 @@ export class Connection {
 
   // eslint-disable-next-line no-dupe-class-members
   async confirmTransaction(
-    strategy:
-      | BlockheightBasedTransactionConfirmationStrategy
-      | DurableNonceTransactionConfirmationStrategy
-      | TransactionSignature,
+    strategy: TransactionConfirmationStrategy | TransactionSignature,
     commitment?: Commitment,
   ): Promise<RpcResponseAndContext<SignatureResult>> {
     let rawSignature: string;
@@ -3623,9 +3631,8 @@ export class Connection {
     if (typeof strategy == 'string') {
       rawSignature = strategy;
     } else {
-      const config = strategy as
-        | BlockheightBasedTransactionConfirmationStrategy
-        | DurableNonceTransactionConfirmationStrategy;
+      const config = strategy as TransactionConfirmationStrategy;
+
       if (config.abortSignal?.aborted) {
         return Promise.reject(config.abortSignal.reason);
       }

package/src/publickey.ts

@@ -109,14 +109,15 @@ export class PublicKey extends Struct {
   }
 
   /**
-   * Return the byte array representation of the public key
+   * Return the byte array representation of the public key in big endian
    */
   toBytes(): Uint8Array {
-    return this.toBuffer();
+    const buf = this.toBuffer();
+    return new Uint8Array(buf.buffer, buf.byteOffset, buf.byteLength);
   }
 
   /**
-   * Return the Buffer representation of the public key
+   * Return the Buffer representation of the public key in big endian
    */
   toBuffer(): Buffer {
     const b = this._bn.toArrayLike(Buffer);

package/src/utils/send-and-confirm-raw-transaction.ts

@@ -4,6 +4,7 @@ import {
   BlockheightBasedTransactionConfirmationStrategy,
   Connection,
   DurableNonceTransactionConfirmationStrategy,
+  TransactionConfirmationStrategy,
 } from '../connection';
 import type {TransactionSignature} from '../transaction';
 import type {ConfirmOptions} from '../connection';
@@ -15,14 +16,14 @@ import type {ConfirmOptions} from '../connection';
  *
  * @param {Connection} connection
  * @param {Buffer} rawTransaction
- * @param {BlockheightBasedTransactionConfirmationStrategy} confirmationStrategy
+ * @param {TransactionConfirmationStrategy} confirmationStrategy
  * @param {ConfirmOptions} [options]
  * @returns {Promise<TransactionSignature>}
  */
 export async function sendAndConfirmRawTransaction(
   connection: Connection,
   rawTransaction: Buffer,
-  confirmationStrategy: BlockheightBasedTransactionConfirmationStrategy,
+  confirmationStrategy: TransactionConfirmationStrategy,
   options?: ConfirmOptions,
 ): Promise<TransactionSignature>;
 
@@ -42,16 +43,12 @@ export async function sendAndConfirmRawTransaction(
   connection: Connection,
   rawTransaction: Buffer,
   confirmationStrategyOrConfirmOptions:
-    | BlockheightBasedTransactionConfirmationStrategy
-    | DurableNonceTransactionConfirmationStrategy
+    | TransactionConfirmationStrategy
     | ConfirmOptions
     | undefined,
   maybeConfirmOptions?: ConfirmOptions,
 ): Promise<TransactionSignature> {
-  let confirmationStrategy:
-    | BlockheightBasedTransactionConfirmationStrategy
-    | DurableNonceTransactionConfirmationStrategy
-    | undefined;
+  let confirmationStrategy: TransactionConfirmationStrategy | undefined;
   let options: ConfirmOptions | undefined;
   if (
     confirmationStrategyOrConfirmOptions &&

package/src/agent-manager.ts

@@ -1,44 +0,0 @@
-import http from 'http';
-import https from 'https';
-
-export const DESTROY_TIMEOUT_MS = 5000;
-
-export class AgentManager {
-  _agent: http.Agent | https.Agent;
-  _activeRequests = 0;
-  _destroyTimeout: ReturnType<typeof setTimeout> | null = null;
-  _useHttps: boolean;
-
-  static _newAgent(useHttps: boolean): http.Agent | https.Agent {
-    const options = {keepAlive: true, maxSockets: 25};
-    if (useHttps) {
-      return new https.Agent(options);
-    } else {
-      return new http.Agent(options);
-    }
-  }
-
-  constructor(useHttps?: boolean) {
-    this._useHttps = useHttps === true;
-    this._agent = AgentManager._newAgent(this._useHttps);
-  }
-
-  requestStart(): http.Agent | https.Agent {
-    this._activeRequests++;
-    if (this._destroyTimeout !== null) {
-      clearTimeout(this._destroyTimeout);
-      this._destroyTimeout = null;
-    }
-    return this._agent;
-  }
-
-  requestEnd() {
-    this._activeRequests--;
-    if (this._activeRequests === 0 && this._destroyTimeout === null) {
-      this._destroyTimeout = setTimeout(() => {
-        this._agent.destroy();
-        this._agent = AgentManager._newAgent(this._useHttps);
-      }, DESTROY_TIMEOUT_MS);
-    }
-  }
-}