@solana/web3.js 1.43.1 → 1.43.4

package/lib/index.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 declare module '@solana/web3.js' {
   import {Buffer} from 'buffer';
-  import crossFetch from 'cross-fetch';
+  import * as nodeFetch from 'node-fetch';
 
   export class Struct {
     constructor(properties: any);
@@ -179,6 +179,11 @@ declare module '@solana/web3.js' {
     getSlotsInEpoch(epoch: number): number;
   }
 
+  export function export_default(
+    input: nodeFetch.RequestInfo,
+    init?: nodeFetch.RequestInit,
+  ): Promise<nodeFetch.Response>;
+
   /**
    * Calculator for transaction fees.
    */
@@ -1444,13 +1449,17 @@ declare module '@solana/web3.js' {
   export type HttpHeaders = {
     [header: string]: string;
   };
+  /**
+   * The type of the JavaScript `fetch()` API
+   */
+  export type FetchFn = typeof export_default;
   /**
    * A callback used to augment the outgoing HTTP request
    */
   export type FetchMiddleware = (
-    url: string,
-    options: any,
-    fetch: (modifiedUrl: string, modifiedOptions: any) => void,
+    info: Parameters<FetchFn>[0],
+    init: Parameters<FetchFn>[1],
+    fetch: (...a: Parameters<FetchFn>) => void,
   ) => void;
   /**
    * Configuration for instantiating a Connection
@@ -1463,7 +1472,7 @@ declare module '@solana/web3.js' {
     /** Optional HTTP headers object */
     httpHeaders?: HttpHeaders;
     /** Optional custom fetch function */
-    fetch?: typeof crossFetch;
+    fetch?: FetchFn;
     /** Optional fetch middleware callback */
     fetchMiddleware?: FetchMiddleware;
     /** Optional Disable retrying calls when server responds with HTTP 429 (Too Many Requests) */

package/lib/index.esm.js

@@ -6,12 +6,12 @@ import { serialize, deserialize, deserializeUnchecked } from 'borsh';
 import * as BufferLayout from '@solana/buffer-layout';
 import { blob } from '@solana/buffer-layout';
 import { toBigIntLE, toBufferLE } from 'bigint-buffer';
-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';
 import http from 'http';
 import https from 'https';
+import * as nodeFetch from 'node-fetch';
 import secp256k1 from 'secp256k1';
 import sha3 from 'js-sha3';
 
@@ -45,43 +45,52 @@ var inherits$1 = {exports: {}};
 
 var inherits_browser = {exports: {}};
 
-if (typeof Object.create === 'function') {
-  // implementation from standard node.js 'util' module
-  inherits_browser.exports = function inherits(ctor, superCtor) {
-    if (superCtor) {
-      ctor.super_ = superCtor;
-      ctor.prototype = Object.create(superCtor.prototype, {
-        constructor: {
-          value: ctor,
-          enumerable: false,
-          writable: true,
-          configurable: true
-        }
-      });
-    }
-  };
-} else {
-  // old school shim for old browsers
-  inherits_browser.exports = function inherits(ctor, superCtor) {
-    if (superCtor) {
-      ctor.super_ = superCtor;
-      var TempCtor = function () {};
-      TempCtor.prototype = superCtor.prototype;
-      ctor.prototype = new TempCtor();
-      ctor.prototype.constructor = ctor;
-    }
-  };
+var hasRequiredInherits_browser;
+
+function requireInherits_browser () {
+	if (hasRequiredInherits_browser) return inherits_browser.exports;
+	hasRequiredInherits_browser = 1;
+	if (typeof Object.create === 'function') {
+	  // implementation from standard node.js 'util' module
+	  inherits_browser.exports = function inherits(ctor, superCtor) {
+	    if (superCtor) {
+	      ctor.super_ = superCtor;
+	      ctor.prototype = Object.create(superCtor.prototype, {
+	        constructor: {
+	          value: ctor,
+	          enumerable: false,
+	          writable: true,
+	          configurable: true
+	        }
+	      });
+	    }
+	  };
+	} else {
+	  // old school shim for old browsers
+	  inherits_browser.exports = function inherits(ctor, superCtor) {
+	    if (superCtor) {
+	      ctor.super_ = superCtor;
+	      var TempCtor = function () {};
+	      TempCtor.prototype = superCtor.prototype;
+	      ctor.prototype = new TempCtor();
+	      ctor.prototype.constructor = ctor;
+	    }
+	  };
+	}
+	return inherits_browser.exports;
 }
 
-try {
-  var util = require('util');
-  /* istanbul ignore next */
-  if (typeof util.inherits !== 'function') throw '';
-  inherits$1.exports = util.inherits;
-} catch (e) {
-  /* istanbul ignore next */
-  inherits$1.exports = inherits_browser.exports;
-}
+(function (module) {
+	try {
+	  var util = require('util');
+	  /* istanbul ignore next */
+	  if (typeof util.inherits !== 'function') throw '';
+	  module.exports = util.inherits;
+	} catch (e) {
+	  /* istanbul ignore next */
+	  module.exports = requireInherits_browser();
+	}
+} (inherits$1));
 
 var assert$5 = minimalisticAssert;
 var inherits = inherits$1.exports;
@@ -1273,22 +1282,22 @@ Hmac.prototype.digest = function digest(enc) {
 };
 
 (function (exports) {
-var hash = exports;
-
-hash.utils = utils$9;
-hash.common = common$5;
-hash.sha = sha;
-hash.ripemd = ripemd;
-hash.hmac = hmac;
-
-// Proxy hash functions to the main object
-hash.sha1 = hash.sha.sha1;
-hash.sha256 = hash.sha.sha256;
-hash.sha224 = hash.sha.sha224;
-hash.sha384 = hash.sha.sha384;
-hash.sha512 = hash.sha.sha512;
-hash.ripemd160 = hash.ripemd.ripemd160;
-}(hash$1));
+	var hash = exports;
+
+	hash.utils = utils$9;
+	hash.common = common$5;
+	hash.sha = sha;
+	hash.ripemd = ripemd;
+	hash.hmac = hmac;
+
+	// Proxy hash functions to the main object
+	hash.sha1 = hash.sha.sha1;
+	hash.sha256 = hash.sha.sha256;
+	hash.sha224 = hash.sha.sha224;
+	hash.sha384 = hash.sha.sha384;
+	hash.sha512 = hash.sha.sha512;
+	hash.ripemd160 = hash.ripemd.ripemd160;
+} (hash$1));
 
 var hash = hash$1;
 
@@ -2583,13 +2592,6 @@ class Transaction {
         isSigner: false,
         isWritable: false
       });
-    }); // Sort. Prioritizing first by signer, then by writable
-
-    accountMetas.sort(function (x, y) {
-      const pubkeySorting = x.pubkey.toBase58().localeCompare(y.pubkey.toBase58());
-      const checkSigner = x.isSigner === y.isSigner ? 0 : x.isSigner ? -1 : 1;
-      const checkWritable = x.isWritable === y.isWritable ? pubkeySorting : x.isWritable ? -1 : 1;
-      return checkSigner || checkWritable;
     }); // Cull duplicate account metas
 
     const uniqueMetas = [];
@@ -2601,9 +2603,25 @@ class Transaction {
 
       if (uniqueIndex > -1) {
         uniqueMetas[uniqueIndex].isWritable = uniqueMetas[uniqueIndex].isWritable || accountMeta.isWritable;
+        uniqueMetas[uniqueIndex].isSigner = uniqueMetas[uniqueIndex].isSigner || accountMeta.isSigner;
       } else {
         uniqueMetas.push(accountMeta);
       }
+    }); // Sort. Prioritizing first by signer, then by writable
+
+    uniqueMetas.sort(function (x, y) {
+      if (x.isSigner !== y.isSigner) {
+        // Signers always come before non-signers
+        return x.isSigner ? -1 : 1;
+      }
+
+      if (x.isWritable !== y.isWritable) {
+        // Writable accounts always come before read-only accounts
+        return x.isWritable ? -1 : 1;
+      } // Otherwise, sort by pubkey.
+
+
+      return x.pubkey._bn.cmp(y.pubkey._bn);
     }); // Move fee payer to the front
 
     const feePayerIndex = uniqueMetas.findIndex(x => {
@@ -4550,6 +4568,11 @@ class SendTransactionError extends Error {
 
 }
 
+async function fetchImpl (input, init) {
+  const processedInput = typeof input === 'string' && input.slice(0, 2) === '//' ? 'https:' + input : input;
+  return await nodeFetch.default(processedInput, init);
+}
+
 // TODO: These constants should be removed in favor of reading them out of a
 // Syscall account
 
@@ -4799,7 +4822,7 @@ const BlockProductionResponseStruct = jsonRpcResultAndContext(type({
  */
 
 function createRpcClient(url, useHttps, httpHeaders, customFetch, fetchMiddleware, disableRetryOnRateLimit) {
-  const fetch = customFetch ? customFetch : crossFetch;
+  const fetch = customFetch ? customFetch : fetchImpl;
   let agentManager;
 
   {
@@ -4809,10 +4832,10 @@ function createRpcClient(url, useHttps, httpHeaders, customFetch, fetchMiddlewar
   let fetchWithMiddleware;
 
   if (fetchMiddleware) {
-    fetchWithMiddleware = async (url, options) => {
+    fetchWithMiddleware = async (info, init) => {
       const modifiedFetchArgs = await new Promise((resolve, reject) => {
         try {
-          fetchMiddleware(url, options, (modifiedUrl, modifiedOptions) => resolve([modifiedUrl, modifiedOptions]));
+          fetchMiddleware(info, init, (modifiedInfo, modifiedInit) => resolve([modifiedInfo, modifiedInit]));
         } catch (error) {
           reject(error);
         }