@wagmi/core 0.7.6 → 0.7.7

package/dist/{chunk-MS4CUBFJ.js → chunk-TYXJCTXO.js}

@@ -217,8 +217,43 @@ function deepEqual(a, b) {
   return a !== a && b !== b;
 }
 
-// src/utils/normalizeFunctionName.ts
+// src/utils/deserialize.ts
 import { BigNumber } from "ethers";
+var findAndReplace = (cacheRef, {
+  find,
+  replace
+}) => {
+  if (cacheRef && find(cacheRef)) {
+    return replace(cacheRef);
+  }
+  if (typeof cacheRef !== "object") {
+    return cacheRef;
+  }
+  if (Array.isArray(cacheRef)) {
+    return cacheRef.map((item) => findAndReplace(item, { find, replace }));
+  }
+  if (cacheRef instanceof Object) {
+    return Object.entries(cacheRef).reduce(
+      (curr, [key, value]) => ({
+        ...curr,
+        [key]: findAndReplace(value, { find, replace })
+      }),
+      {}
+    );
+  }
+  return cacheRef;
+};
+function deserialize(cachedString) {
+  const cache = JSON.parse(cachedString);
+  const deserializedCacheWithBigNumbers = findAndReplace(cache, {
+    find: (data) => data.type === "BigNumber",
+    replace: (data) => BigNumber.from(data.hex)
+  });
+  return deserializedCacheWithBigNumbers;
+}
+
+// src/utils/normalizeFunctionName.ts
+import { BigNumber as BigNumber2 } from "ethers";
 import { FunctionFragment, isAddress } from "ethers/lib/utils.js";
 function normalizeFunctionName({
   contract,
@@ -264,7 +299,7 @@ function isArgOfType(arg, abiParameter) {
       if (/^u?int(8|16|24|32|40|48|56|64|72|80|88|96|104|112|120|128|136|144|152|160|168|176|184|192|200|208|216|224|232|240|248|256)?$/.test(
         abiParameterType
       ))
-        return argType === "number" || argType === "bigint" || BigNumber.isBigNumber(arg);
+        return argType === "number" || argType === "bigint" || BigNumber2.isBigNumber(arg);
       if (/^bytes([1-9]|1[0-9]|2[0-9]|3[0-2])?$/.test(abiParameterType))
         return argType === "string" || arg instanceof Uint8Array;
       if (/[a-z]+[1-9]{0,3}(\[[0-9]{0,}\])+$/.test(abiParameterType)) {
@@ -399,6 +434,60 @@ function parseContractResult({
   return data;
 }
 
+// src/utils/serialize.ts
+function getReferenceKey(keys, cutoff) {
+  return keys.slice(0, cutoff).join(".") || ".";
+}
+function getCutoff(array, value) {
+  const { length } = array;
+  for (let index = 0; index < length; ++index) {
+    if (array[index] === value) {
+      return index + 1;
+    }
+  }
+  return 0;
+}
+function createReplacer(replacer, circularReplacer) {
+  const hasReplacer = typeof replacer === "function";
+  const hasCircularReplacer = typeof circularReplacer === "function";
+  const cache = [];
+  const keys = [];
+  return function replace(key, value) {
+    if (typeof value === "object") {
+      if (cache.length) {
+        const thisCutoff = getCutoff(cache, this);
+        if (thisCutoff === 0) {
+          cache[cache.length] = this;
+        } else {
+          cache.splice(thisCutoff);
+          keys.splice(thisCutoff);
+        }
+        keys[keys.length] = key;
+        const valueCutoff = getCutoff(cache, value);
+        if (valueCutoff !== 0) {
+          return hasCircularReplacer ? circularReplacer.call(
+            this,
+            key,
+            value,
+            getReferenceKey(keys, valueCutoff)
+          ) : `[ref=${getReferenceKey(keys, valueCutoff)}]`;
+        }
+      } else {
+        cache[0] = value;
+        keys[0] = key;
+      }
+    }
+    return hasReplacer ? replacer.call(this, key, value) : value;
+  };
+}
+function serialize(value, replacer, indent, circularReplacer) {
+  return JSON.stringify(
+    value,
+    createReplacer(replacer, circularReplacer),
+    indent ?? void 0
+  );
+}
+
 // src/connectors/base.ts
 import { default as EventEmitter } from "eventemitter3";
 
@@ -1930,15 +2019,17 @@ var noopStorage = {
   removeItem: (_key) => null
 };
 function createStorage({
-  storage,
-  key: prefix = "wagmi"
+  deserialize: deserialize2 = deserialize,
+  key: prefix = "wagmi",
+  serialize: serialize2 = serialize,
+  storage
 }) {
   return {
     ...storage,
     getItem: (key, defaultState = null) => {
       const value = storage.getItem(`${prefix}.${key}`);
       try {
-        return value ? JSON.parse(value) : defaultState;
+        return value ? deserialize2(value) : defaultState;
       } catch (error) {
         console.warn(error);
         return defaultState;
@@ -1949,7 +2040,7 @@ function createStorage({
         storage.removeItem(`${prefix}.${key}`);
       } else {
         try {
-          storage.setItem(`${prefix}.${key}`, JSON.stringify(value));
+          storage.setItem(`${prefix}.${key}`, serialize2(value));
         } catch (err) {
           console.error(err);
         }
@@ -2009,6 +2100,7 @@ var Client = class {
             webSocketProvider: this.getWebSocketProvider({ chainId: chainId2 })
           }),
           {
+            deserialize: (state) => state,
             name: storeKey,
             getStorage: () => storage,
             partialize: (state) => ({
@@ -2020,7 +2112,8 @@ var Client = class {
               },
               chains: state?.chains
             }),
-            version: 1
+            serialize: (state) => state,
+            version: 2
           }
         )
       )
@@ -2215,7 +2308,7 @@ async function connect({
 }) {
   const client2 = getClient();
   const activeConnector = client2.connector;
-  if (connector.id === activeConnector?.id)
+  if (activeConnector && connector.id === activeConnector.id)
     throw new ConnectorAlreadyConnectedError();
   try {
     client2.setState((x) => ({ ...x, status: "connecting" }));
@@ -3440,9 +3533,11 @@ export {
   configureChains,
   debounce,
   deepEqual,
+  deserialize,
   minimizeContractInterface,
   normalizeChainId,
   parseContractResult,
+  serialize,
   erc20ABI,
   erc721ABI,
   erc4626ABI,

package/dist/connectors/coinbaseWallet.js

@@ -5,7 +5,7 @@ import {
   SwitchChainError,
   UserRejectedRequestError,
   normalizeChainId
-} from "../chunk-MS4CUBFJ.js";
+} from "../chunk-TYXJCTXO.js";
 import "../chunk-4DNFSL2K.js";
 import {
   __privateAdd,

package/dist/connectors/metaMask.js

@@ -4,7 +4,7 @@ import {
   ResourceUnavailableError,
   UserRejectedRequestError,
   getClient
-} from "../chunk-MS4CUBFJ.js";
+} from "../chunk-TYXJCTXO.js";
 import "../chunk-4DNFSL2K.js";
 import {
   __privateAdd,

package/dist/connectors/mock/index.js

@@ -2,7 +2,7 @@ import {
   Connector,
   UserRejectedRequestError,
   normalizeChainId
-} from "../../chunk-MS4CUBFJ.js";
+} from "../../chunk-TYXJCTXO.js";
 import "../../chunk-4DNFSL2K.js";
 import {
   __privateAdd,

package/dist/connectors/walletConnect.js

@@ -4,7 +4,7 @@ import {
   UserRejectedRequestError,
   getClient,
   normalizeChainId
-} from "../chunk-MS4CUBFJ.js";
+} from "../chunk-TYXJCTXO.js";
 import "../chunk-4DNFSL2K.js";
 import {
   __privateAdd,
@@ -138,10 +138,18 @@ switchChain_fn = async function(chainId) {
   const provider = await this.getProvider();
   const id = hexValue(chainId);
   try {
-    await provider.request({
-      method: "wallet_switchEthereumChain",
-      params: [{ chainId: id }]
-    });
+    await Promise.race([
+      provider.request({
+        method: "wallet_switchEthereumChain",
+        params: [{ chainId: id }]
+      }),
+      new Promise(
+        (res) => this.on("change", ({ chain }) => {
+          if (chain?.id === chainId)
+            res(chainId);
+        })
+      )
+    ]);
     return this.chains.find((x) => x.id === chainId) ?? {
       id: chainId,
       name: `Chain ${id}`,

package/dist/index.d.ts

@@ -779,9 +779,11 @@ declare type ClientStorage = {
     removeItem(key: string): void;
 };
 declare const noopStorage: BaseStorage;
-declare function createStorage({ storage, key: prefix, }: {
-    storage: BaseStorage;
+declare function createStorage({ deserialize, key: prefix, serialize, storage, }: {
+    deserialize?: <T>(value: string) => T;
     key?: string;
+    serialize?: <T>(value: T) => string;
+    storage: BaseStorage;
 }): ClientStorage;
 
 declare type ClientConfig<TProvider extends Provider = Provider, TWebSocketProvider extends WebSocketProvider = WebSocketProvider> = {
@@ -1724,6 +1726,8 @@ declare function configureChains<TProvider extends Provider = Provider, TWebSock
 /** Forked from https://github.com/epoberezkin/fast-deep-equal */
 declare function deepEqual(a: any, b: any): boolean;
 
+declare function deserialize(cachedString: string): any;
+
 declare function minimizeContractInterface<TAbi extends Abi | readonly unknown[]>(config: {
     abi: TAbi;
     functionName: TAbi extends Abi ? ExtractAbiFunctionNames<TAbi> : string;
@@ -1737,4 +1741,21 @@ declare function parseContractResult({ abi, data, functionName, }: {
     functionName: string;
 }): any;
 
-export { AddChainError, ChainDoesNotSupportMulticallError, ChainMismatchError, ChainNotConfiguredError, Client, ClientConfig, ConfigureChainsConfig, ConnectArgs, ConnectResult, ConnectorAlreadyConnectedError, ConnectorNotFoundError, ContractMethodDoesNotExistError, ContractMethodNoResultError, ContractMethodRevertedError, ContractResultDecodeError, FetchBalanceArgs, FetchBalanceResult, FetchBlockNumberArgs, FetchBlockNumberResult, FetchEnsAddressArgs, FetchEnsAddressResult, FetchEnsAvatarArgs, FetchEnsAvatarResult, FetchEnsNameArgs, FetchEnsNameResult, FetchEnsResolverArgs, FetchEnsResolverResult, FetchFeeDataArgs, FetchFeeDataResult, FetchSignerArgs, FetchSignerResult, FetchTokenArgs, FetchTokenResult, FetchTransactionArgs, FetchTransactionResult, GetAccountResult, GetContractArgs, GetContractResult, GetNetworkResult, GetProviderArgs, GetProviderResult, GetWebSocketProviderArgs, GetWebSocketProviderResult, MulticallConfig, MulticallResult, PrepareSendTransactionArgs, PrepareSendTransactionResult, PrepareWriteContractConfig, PrepareWriteContractResult, ProviderChainsNotFound, ProviderRpcError, ReadContractConfig, ReadContractResult, ReadContractsConfig, ReadContractsResult, ResourceUnavailableError, RpcError, SendTransactionArgs, SendTransactionPreparedRequest, SendTransactionResult, SendTransactionUnpreparedRequest, SignMessageArgs, SignMessageResult, SignTypedDataArgs, SignTypedDataResult, ClientStorage as Storage, SwitchChainError, SwitchChainNotSupportedError, SwitchNetworkArgs, SwitchNetworkResult, UserRejectedRequestError, WaitForTransactionArgs, WaitForTransactionResult, WatchAccountCallback, WatchBlockNumberArgs, WatchBlockNumberCallback, WatchMulticallCallback, WatchMulticallConfig, WatchNetworkCallback, WatchProviderCallback, WatchReadContractCallback, WatchReadContractConfig, WatchReadContractsCallback, WatchReadContractsConfig, WatchSignerCallback, WatchWebSocketProviderCallback, WriteContractArgs, WriteContractPreparedArgs, WriteContractResult, WriteContractUnpreparedArgs, configureChains, connect, createClient, createStorage, deepEqual, disconnect, erc20ABI, erc4626ABI, erc721ABI, fetchBalance, fetchBlockNumber, fetchEnsAddress, fetchEnsAvatar, fetchEnsName, fetchEnsResolver, fetchFeeData, fetchSigner, fetchToken, fetchTransaction, getAccount, getContract, getNetwork, getProvider, getWebSocketProvider, minimizeContractInterface, multicall, noopStorage, normalizeChainId, parseContractResult, prepareSendTransaction, prepareWriteContract, readContract, readContracts, sendTransaction, signMessage, signTypedData, switchNetwork, waitForTransaction, watchAccount, watchBlockNumber, watchContractEvent, watchMulticall, watchNetwork, watchProvider, watchReadContract, watchReadContracts, watchSigner, watchWebSocketProvider, writeContract };
+declare type StandardReplacer = (key: string, value: any) => any;
+declare type CircularReplacer = (key: string, value: any, referenceKey: string) => any;
+/**
+ * @function stringify
+ *
+ * @description
+ * stringifier that handles circular values
+ * Forked from https://github.com/planttheidea/fast-stringify
+ *
+ * @param value to stringify
+ * @param [replacer] a custom replacer function for handling standard values
+ * @param [indent] the number of spaces to indent the output by
+ * @param [circularReplacer] a custom replacer function for handling circular values
+ * @returns the stringified output
+ */
+declare function serialize(value: any, replacer?: StandardReplacer | null | undefined, indent?: number | null | undefined, circularReplacer?: CircularReplacer | null | undefined): string;
+
+export { AddChainError, ChainDoesNotSupportMulticallError, ChainMismatchError, ChainNotConfiguredError, Client, ClientConfig, ConfigureChainsConfig, ConnectArgs, ConnectResult, ConnectorAlreadyConnectedError, ConnectorNotFoundError, ContractMethodDoesNotExistError, ContractMethodNoResultError, ContractMethodRevertedError, ContractResultDecodeError, FetchBalanceArgs, FetchBalanceResult, FetchBlockNumberArgs, FetchBlockNumberResult, FetchEnsAddressArgs, FetchEnsAddressResult, FetchEnsAvatarArgs, FetchEnsAvatarResult, FetchEnsNameArgs, FetchEnsNameResult, FetchEnsResolverArgs, FetchEnsResolverResult, FetchFeeDataArgs, FetchFeeDataResult, FetchSignerArgs, FetchSignerResult, FetchTokenArgs, FetchTokenResult, FetchTransactionArgs, FetchTransactionResult, GetAccountResult, GetContractArgs, GetContractResult, GetNetworkResult, GetProviderArgs, GetProviderResult, GetWebSocketProviderArgs, GetWebSocketProviderResult, MulticallConfig, MulticallResult, PrepareSendTransactionArgs, PrepareSendTransactionResult, PrepareWriteContractConfig, PrepareWriteContractResult, ProviderChainsNotFound, ProviderRpcError, ReadContractConfig, ReadContractResult, ReadContractsConfig, ReadContractsResult, ResourceUnavailableError, RpcError, SendTransactionArgs, SendTransactionPreparedRequest, SendTransactionResult, SendTransactionUnpreparedRequest, SignMessageArgs, SignMessageResult, SignTypedDataArgs, SignTypedDataResult, ClientStorage as Storage, SwitchChainError, SwitchChainNotSupportedError, SwitchNetworkArgs, SwitchNetworkResult, UserRejectedRequestError, WaitForTransactionArgs, WaitForTransactionResult, WatchAccountCallback, WatchBlockNumberArgs, WatchBlockNumberCallback, WatchMulticallCallback, WatchMulticallConfig, WatchNetworkCallback, WatchProviderCallback, WatchReadContractCallback, WatchReadContractConfig, WatchReadContractsCallback, WatchReadContractsConfig, WatchSignerCallback, WatchWebSocketProviderCallback, WriteContractArgs, WriteContractPreparedArgs, WriteContractResult, WriteContractUnpreparedArgs, configureChains, connect, createClient, createStorage, deepEqual, deserialize, disconnect, erc20ABI, erc4626ABI, erc721ABI, fetchBalance, fetchBlockNumber, fetchEnsAddress, fetchEnsAvatar, fetchEnsName, fetchEnsResolver, fetchFeeData, fetchSigner, fetchToken, fetchTransaction, getAccount, getContract, getNetwork, getProvider, getWebSocketProvider, minimizeContractInterface, multicall, noopStorage, normalizeChainId, parseContractResult, prepareSendTransaction, prepareWriteContract, readContract, readContracts, sendTransaction, serialize, signMessage, signTypedData, switchNetwork, waitForTransaction, watchAccount, watchBlockNumber, watchContractEvent, watchMulticall, watchNetwork, watchProvider, watchReadContract, watchReadContracts, watchSigner, watchWebSocketProvider, writeContract };

package/dist/index.js

@@ -24,6 +24,7 @@ import {
   createClient,
   createStorage,
   deepEqual,
+  deserialize,
   disconnect,
   erc20ABI,
   erc4626ABI,
@@ -53,6 +54,7 @@ import {
   readContract,
   readContracts,
   sendTransaction,
+  serialize,
   signMessage,
   signTypedData,
   switchNetwork,
@@ -69,7 +71,7 @@ import {
   watchSigner,
   watchWebSocketProvider,
   writeContract
-} from "./chunk-MS4CUBFJ.js";
+} from "./chunk-TYXJCTXO.js";
 import {
   alchemyRpcUrls,
   allChains,
@@ -114,6 +116,7 @@ export {
   deepEqual,
   defaultChains,
   defaultL2Chains,
+  deserialize,
   disconnect,
   erc20ABI,
   erc4626ABI,
@@ -146,6 +149,7 @@ export {
   readContract,
   readContracts,
   sendTransaction,
+  serialize,
   signMessage,
   signTypedData,
   switchNetwork,

package/dist/internal.js

@@ -1,6 +1,6 @@
 import {
   debounce
-} from "./chunk-MS4CUBFJ.js";
+} from "./chunk-TYXJCTXO.js";
 import "./chunk-4DNFSL2K.js";
 import "./chunk-MQXBDTVK.js";
 export {

package/package.json

@@ -2,7 +2,7 @@
   "name": "@wagmi/core",
   "description": "Vanilla JS library for Ethereum",
   "license": "MIT",
-  "version": "0.7.6",
+  "version": "0.7.7",
   "repository": {
     "type": "git",
     "url": "https://github.com/wagmi-dev/wagmi.git",