@solana/web3.js 1.37.2 → 1.39.1

package/lib/index.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="node" />
 declare module '@solana/web3.js' {
   import {Buffer} from 'buffer';
+  import crossFetch from 'cross-fetch';
 
   export class Struct {
     constructor(properties: any);
@@ -1418,6 +1419,8 @@ declare module '@solana/web3.js' {
     wsEndpoint?: string;
     /** Optional HTTP headers object */
     httpHeaders?: HttpHeaders;
+    /** Optional custom fetch function */
+    fetch?: typeof crossFetch;
     /** Optional fetch middleware callback */
     fetchMiddleware?: FetchMiddleware;
     /** Optional Disable retrying calls when server responds with HTTP 429 (Too Many Requests) */

package/lib/index.esm.js

@@ -4,7 +4,7 @@ import BN from 'bn.js';
 import bs58 from 'bs58';
 import { serialize, deserialize, deserializeUnchecked } from 'borsh';
 import * as BufferLayout from '@solana/buffer-layout';
-import fetch from 'cross-fetch';
+import crossFetch from 'cross-fetch';
 import { coerce, instance, string, tuple, literal, unknown, union, type, optional, any, number, array, nullable, create, boolean, record, assert as assert$7 } from 'superstruct';
 import { Client } from 'rpc-websockets';
 import RpcClient from 'jayson/lib/client/browser';
@@ -2368,6 +2368,26 @@ class TransactionInstruction {
       this.data = opts.data;
     }
   }
+  /**
+   * @internal
+   */
+
+
+  toJSON() {
+    return {
+      keys: this.keys.map(({
+        pubkey,
+        isSigner,
+        isWritable
+      }) => ({
+        pubkey: pubkey.toJSON(),
+        isSigner,
+        isWritable
+      })),
+      programId: this.programId.toJSON(),
+      data: [...this.data]
+    };
+  }
 
 }
 /**
@@ -2407,8 +2427,33 @@ class Transaction {
     this.instructions = [];
     this.recentBlockhash = void 0;
     this.nonceInfo = void 0;
+    this._message = void 0;
+    this._json = void 0;
     opts && Object.assign(this, opts);
   }
+  /**
+   * @internal
+   */
+
+
+  toJSON() {
+    return {
+      recentBlockhash: this.recentBlockhash || null,
+      feePayer: this.feePayer ? this.feePayer.toJSON() : null,
+      nonceInfo: this.nonceInfo ? {
+        nonce: this.nonceInfo.nonce,
+        nonceInstruction: this.nonceInfo.nonceInstruction.toJSON()
+      } : null,
+      instructions: this.instructions.map(instruction => instruction.toJSON()),
+      signatures: this.signatures.map(({
+        publicKey,
+        signature
+      }) => ({
+        publicKey: publicKey.toJSON(),
+        signature: signature ? [...signature] : null
+      }))
+    };
+  }
   /**
    * Add one or more instructions to this Transaction
    */
@@ -2436,6 +2481,14 @@ class Transaction {
 
 
   compileMessage() {
+    if (this._message) {
+      if (JSON.stringify(this.toJSON()) !== JSON.stringify(this._json)) {
+        throw new Error('Transaction mutated after being populated from Message');
+      }
+
+      return this._message;
+    }
+
     const {
       nonceInfo
     } = this;
@@ -2957,6 +3010,8 @@ class Transaction {
         data: bs58.decode(instruction.data)
       }));
     });
+    transaction._message = message;
+    transaction._json = transaction.toJSON();
     return transaction;
   }
 
@@ -4391,7 +4446,8 @@ const BlockProductionResponseStruct = jsonRpcResultAndContext(type({
  * A performance sample
  */
 
-function createRpcClient(url, useHttps, httpHeaders, fetchMiddleware, disableRetryOnRateLimit) {
+function createRpcClient(url, useHttps, httpHeaders, customFetch, fetchMiddleware, disableRetryOnRateLimit) {
+  const fetch = customFetch ? customFetch : crossFetch;
   let agentManager;
 
   {
@@ -5199,6 +5255,7 @@ class Connection {
     const useHttps = url.protocol === 'https:';
     let wsEndpoint;
     let httpHeaders;
+    let fetch;
     let fetchMiddleware;
     let disableRetryOnRateLimit;
 
@@ -5209,13 +5266,14 @@ class Connection {
       this._confirmTransactionInitialTimeout = commitmentOrConfig.confirmTransactionInitialTimeout;
       wsEndpoint = commitmentOrConfig.wsEndpoint;
       httpHeaders = commitmentOrConfig.httpHeaders;
+      fetch = commitmentOrConfig.fetch;
       fetchMiddleware = commitmentOrConfig.fetchMiddleware;
       disableRetryOnRateLimit = commitmentOrConfig.disableRetryOnRateLimit;
     }
 
     this._rpcEndpoint = endpoint;
     this._rpcWsEndpoint = wsEndpoint || makeWebsocketUrl(endpoint);
-    this._rpcClient = createRpcClient(url.toString(), useHttps, httpHeaders, fetchMiddleware, disableRetryOnRateLimit);
+    this._rpcClient = createRpcClient(url.toString(), useHttps, httpHeaders, fetch, fetchMiddleware, disableRetryOnRateLimit);
     this._rpcRequest = createRpcRequest(this._rpcClient);
     this._rpcBatchRequest = createRpcBatchRequest(this._rpcClient);
     this._rpcWebSocket = new Client(this._rpcWsEndpoint, {
@@ -6730,7 +6788,9 @@ class Connection {
       });
       transaction.instructions = transactionOrMessage.instructions;
     } else {
-      transaction = Transaction.populate(transactionOrMessage);
+      transaction = Transaction.populate(transactionOrMessage); // HACK: this function relies on mutating the populated transaction
+
+      transaction._message = transaction._json = undefined;
     }
 
     if (transaction.nonceInfo && signers) {