@solana/web3.js 1.43.1 → 1.43.4

package/lib/index.cjs.js

@@ -9,12 +9,12 @@ var bs58 = require('bs58');
 var borsh = require('borsh');
 var BufferLayout = require('@solana/buffer-layout');
 var bigintBuffer = require('bigint-buffer');
-var crossFetch = require('cross-fetch');
 var superstruct = require('superstruct');
 var rpcWebsockets = require('rpc-websockets');
 var RpcClient = require('jayson/lib/client/browser');
 var http = require('http');
 var https = require('https');
+var nodeFetch = require('node-fetch');
 var secp256k1 = require('secp256k1');
 var sha3 = require('js-sha3');
 
@@ -42,10 +42,10 @@ 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 crossFetch__default = /*#__PURE__*/_interopDefaultLegacy(crossFetch);
 var RpcClient__default = /*#__PURE__*/_interopDefaultLegacy(RpcClient);
 var http__default = /*#__PURE__*/_interopDefaultLegacy(http);
 var https__default = /*#__PURE__*/_interopDefaultLegacy(https);
+var nodeFetch__namespace = /*#__PURE__*/_interopNamespace(nodeFetch);
 var secp256k1__default = /*#__PURE__*/_interopDefaultLegacy(secp256k1);
 var sha3__default = /*#__PURE__*/_interopDefaultLegacy(sha3);
 
@@ -79,43 +79,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;
@@ -1307,22 +1316,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;
 
@@ -2617,13 +2626,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 = [];
@@ -2635,9 +2637,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 => {
@@ -4584,6 +4602,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__namespace.default(processedInput, init);
+}
+
 // TODO: These constants should be removed in favor of reading them out of a
 // Syscall account
 
@@ -4833,7 +4856,7 @@ const BlockProductionResponseStruct = jsonRpcResultAndContext(superstruct.type({
  */
 
 function createRpcClient(url, useHttps, httpHeaders, customFetch, fetchMiddleware, disableRetryOnRateLimit) {
-  const fetch = customFetch ? customFetch : crossFetch__default["default"];
+  const fetch = customFetch ? customFetch : fetchImpl;
   let agentManager;
 
   {
@@ -4843,10 +4866,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);
         }