@solana/web3.js 1.37.2 → 1.39.1

package/lib/index.cjs.js

@@ -8,7 +8,7 @@ var BN = require('bn.js');
 var bs58 = require('bs58');
 var borsh = require('borsh');
 var BufferLayout = require('@solana/buffer-layout');
-var fetch = require('cross-fetch');
+var crossFetch = require('cross-fetch');
 var superstruct = require('superstruct');
 var rpcWebsockets = require('rpc-websockets');
 var RpcClient = require('jayson/lib/client/browser');
@@ -41,7 +41,7 @@ var nacl__default = /*#__PURE__*/_interopDefaultLegacy(nacl);
 var BN__default = /*#__PURE__*/_interopDefaultLegacy(BN);
 var bs58__default = /*#__PURE__*/_interopDefaultLegacy(bs58);
 var BufferLayout__namespace = /*#__PURE__*/_interopNamespace(BufferLayout);
-var fetch__default = /*#__PURE__*/_interopDefaultLegacy(fetch);
+var crossFetch__default = /*#__PURE__*/_interopDefaultLegacy(crossFetch);
 var RpcClient__default = /*#__PURE__*/_interopDefaultLegacy(RpcClient);
 var http__default = /*#__PURE__*/_interopDefaultLegacy(http);
 var https__default = /*#__PURE__*/_interopDefaultLegacy(https);
@@ -2403,6 +2403,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]
+    };
+  }
 
 }
 /**
@@ -2442,8 +2462,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
    */
@@ -2471,6 +2516,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;
@@ -2992,6 +3045,8 @@ class Transaction {
         data: bs58__default["default"].decode(instruction.data)
       }));
     });
+    transaction._message = message;
+    transaction._json = transaction.toJSON();
     return transaction;
   }
 
@@ -4426,7 +4481,8 @@ const BlockProductionResponseStruct = jsonRpcResultAndContext(superstruct.type({
  * A performance sample
  */
 
-function createRpcClient(url, useHttps, httpHeaders, fetchMiddleware, disableRetryOnRateLimit) {
+function createRpcClient(url, useHttps, httpHeaders, customFetch, fetchMiddleware, disableRetryOnRateLimit) {
+  const fetch = customFetch ? customFetch : crossFetch__default["default"];
   let agentManager;
 
   {
@@ -4444,7 +4500,7 @@ function createRpcClient(url, useHttps, httpHeaders, fetchMiddleware, disableRet
           reject(error);
         }
       });
-      return await fetch__default["default"](...modifiedFetchArgs);
+      return await fetch(...modifiedFetchArgs);
     };
   }
 
@@ -4468,7 +4524,7 @@ function createRpcClient(url, useHttps, httpHeaders, fetchMiddleware, disableRet
         if (fetchWithMiddleware) {
           res = await fetchWithMiddleware(url, options);
         } else {
-          res = await fetch__default["default"](url, options);
+          res = await fetch(url, options);
         }
 
         if (res.status !== 429
@@ -5234,6 +5290,7 @@ class Connection {
     const useHttps = url.protocol === 'https:';
     let wsEndpoint;
     let httpHeaders;
+    let fetch;
     let fetchMiddleware;
     let disableRetryOnRateLimit;
 
@@ -5244,13 +5301,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 rpcWebsockets.Client(this._rpcWsEndpoint, {
@@ -6765,7 +6823,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) {