@solana/web3.js 1.95.3 → 1.95.5

package/lib/index.native.js

@@ -3394,81 +3394,90 @@ function getDefaultExportFromCjs (x) {
 	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
 }
 
-var objToString = Object.prototype.toString;
-var objKeys = Object.keys || function(obj) {
-		var keys = [];
-		for (var name in obj) {
-			keys.push(name);
-		}
-		return keys;
-	};
+var fastStableStringify$1;
+var hasRequiredFastStableStringify;
+
+function requireFastStableStringify () {
+	if (hasRequiredFastStableStringify) return fastStableStringify$1;
+	hasRequiredFastStableStringify = 1;
+	var objToString = Object.prototype.toString;
+	var objKeys = Object.keys || function(obj) {
+			var keys = [];
+			for (var name in obj) {
+				keys.push(name);
+			}
+			return keys;
+		};
 
-function stringify(val, isArrayProp) {
-	var i, max, str, keys, key, propVal, toStr;
-	if (val === true) {
-		return "true";
-	}
-	if (val === false) {
-		return "false";
-	}
-	switch (typeof val) {
-		case "object":
-			if (val === null) {
-				return null;
-			} else if (val.toJSON && typeof val.toJSON === "function") {
-				return stringify(val.toJSON(), isArrayProp);
-			} else {
-				toStr = objToString.call(val);
-				if (toStr === "[object Array]") {
-					str = '[';
-					max = val.length - 1;
-					for(i = 0; i < max; i++) {
-						str += stringify(val[i], true) + ',';
-					}
-					if (max > -1) {
-						str += stringify(val[i], true);
-					}
-					return str + ']';
-				} else if (toStr === "[object Object]") {
-					// only object is left
-					keys = objKeys(val).sort();
-					max = keys.length;
-					str = "";
-					i = 0;
-					while (i < max) {
-						key = keys[i];
-						propVal = stringify(val[key], false);
-						if (propVal !== undefined) {
-							if (str) {
-								str += ',';
+	function stringify(val, isArrayProp) {
+		var i, max, str, keys, key, propVal, toStr;
+		if (val === true) {
+			return "true";
+		}
+		if (val === false) {
+			return "false";
+		}
+		switch (typeof val) {
+			case "object":
+				if (val === null) {
+					return null;
+				} else if (val.toJSON && typeof val.toJSON === "function") {
+					return stringify(val.toJSON(), isArrayProp);
+				} else {
+					toStr = objToString.call(val);
+					if (toStr === "[object Array]") {
+						str = '[';
+						max = val.length - 1;
+						for(i = 0; i < max; i++) {
+							str += stringify(val[i], true) + ',';
+						}
+						if (max > -1) {
+							str += stringify(val[i], true);
+						}
+						return str + ']';
+					} else if (toStr === "[object Object]") {
+						// only object is left
+						keys = objKeys(val).sort();
+						max = keys.length;
+						str = "";
+						i = 0;
+						while (i < max) {
+							key = keys[i];
+							propVal = stringify(val[key], false);
+							if (propVal !== undefined) {
+								if (str) {
+									str += ',';
+								}
+								str += JSON.stringify(key) + ':' + propVal;
 							}
-							str += JSON.stringify(key) + ':' + propVal;
+							i++;
 						}
-						i++;
+						return '{' + str + '}';
+					} else {
+						return JSON.stringify(val);
 					}
-					return '{' + str + '}';
-				} else {
-					return JSON.stringify(val);
 				}
-			}
-		case "function":
-		case "undefined":
-			return isArrayProp ? null : undefined;
-		case "string":
-			return JSON.stringify(val);
-		default:
-			return isFinite(val) ? val : null;
+			case "function":
+			case "undefined":
+				return isArrayProp ? null : undefined;
+			case "string":
+				return JSON.stringify(val);
+			default:
+				return isFinite(val) ? val : null;
+		}
 	}
-}
 
-var fastStableStringify = function(val) {
-	var returnVal = stringify(val, false);
-	if (returnVal !== undefined) {
-		return ''+ returnVal;
-	}
-};
+	fastStableStringify$1 = function(val) {
+		var returnVal = stringify(val, false);
+		if (returnVal !== undefined) {
+			return ''+ returnVal;
+		}
+	};
+	return fastStableStringify$1;
+}
 
-var fastStableStringify$1 = /*@__PURE__*/getDefaultExportFromCjs(fastStableStringify);
+var fastStableStringifyExports = /*@__PURE__*/ requireFastStableStringify();
+var fastStableStringify = /*@__PURE__*/getDefaultExportFromCjs(fastStableStringifyExports);
 
 const MINIMUM_SLOT_PER_EPOCH = 32;
 
@@ -4794,6 +4803,7 @@ const TokenBalanceResult = superstruct.type({
   accountIndex: superstruct.number(),
   mint: superstruct.string(),
   owner: superstruct.optional(superstruct.string()),
+  programId: superstruct.optional(superstruct.string()),
   uiTokenAmount: TokenAmountResult
 });
 const LoadedAddressesResult = superstruct.type({
@@ -5323,7 +5333,7 @@ class Connection {
           config
         } = extractCommitmentFromConfig(commitmentOrConfig);
         const args = this._buildArgs([], commitment, undefined /* encoding */, config);
-        const requestHash = fastStableStringify$1(args);
+        const requestHash = fastStableStringify(args);
         requestPromises[requestHash] = requestPromises[requestHash] ?? (async () => {
           try {
             const unsafeRes = await this._rpcRequest('getBlockHeight', args);
@@ -7642,9 +7652,10 @@ class Connection {
               this._subscriptionCallbacksByServerSubscriptionId[serverSubscriptionId] = subscription.callbacks;
               await this._updateSubscriptions();
             } catch (e) {
-              if (e instanceof Error) {
-                console.error(`${method} error for argument`, args, e.message);
-              }
+              console.error(`Received ${e instanceof Error ? '' : 'JSON-RPC '}error calling \`${method}\``, {
+                args,
+                error: e
+              });
               if (!isCurrentConnectionStillActive()) {
                 return;
               }
@@ -7780,7 +7791,7 @@ class Connection {
    */
   args) {
     const clientSubscriptionId = this._nextClientSubscriptionId++;
-    const hash = fastStableStringify$1([subscriptionConfig.method, args]);
+    const hash = fastStableStringify([subscriptionConfig.method, args]);
     const existingSubscription = this._subscriptionsByHash[hash];
     if (existingSubscription === undefined) {
       this._subscriptionsByHash[hash] = {