@wagmi/core 0.7.6 → 0.7.8

package/dist/{base-5bd9b5ed.d.ts → base-a32d0b91.d.ts}

@@ -1,8 +1,8 @@
 import { Address } from 'abitype';
 import EventEmitter from 'eventemitter3';
-import { C as Chain } from './index-bacc1c49.js';
+import { C as Chain } from './index-58cffc47.js';
 
-declare type ConnectorData<Provider = any> = {
+type ConnectorData<Provider = any> = {
     account?: Address;
     chain?: {
         id: number;

package/dist/chains.d.ts

@@ -1,3 +1,3 @@
-export { k as arbitrum, l as arbitrumGoerli, m as foundry, n as goerli, o as hardhat, q as localhost, r as mainnet, t as optimism, v as optimismGoerli, w as polygon, x as polygonMumbai, s as sepolia } from './index-bacc1c49.js';
+export { k as arbitrum, l as arbitrumGoerli, m as foundry, n as goerli, o as hardhat, q as localhost, r as mainnet, t as optimism, v as optimismGoerli, w as polygon, x as polygonMumbai, s as sepolia } from './index-58cffc47.js';
 import 'abitype';
 import 'ethers';

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

@@ -59,7 +59,7 @@ function configureChains(defaultChains2, providers3, {
           `Could not find valid provider configuration for chain "${chain2.name}".
 `,
           "You may need to add `jsonRpcProvider` to `configureChains` with the chain's RPC URLs.",
-          "Read more: https://wagmi.sh/docs/providers/jsonRpc"
+          "Read more: https://wagmi.sh/react/providers/jsonRpc"
         ].join("\n")
       );
     }
@@ -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";
 
@@ -1717,10 +1806,10 @@ var InjectedConnector = class extends Connector {
     const options = {
       shimDisconnect: true,
       shimChainChangedDisconnect: true,
+      getProvider: () => typeof window !== "undefined" ? window.ethereum : void 0,
       ...options_
     };
     super({ chains, options });
-    this.ready = typeof window != "undefined" && !!window.ethereum;
     __privateAdd(this, _provider, void 0);
     __privateAdd(this, _switchingChains, void 0);
     this.shimDisconnectKey = "injected.shimDisconnect";
@@ -1738,27 +1827,31 @@ var InjectedConnector = class extends Connector {
       this.emit("change", { chain: { id, unsupported } });
     };
     this.onDisconnect = () => {
-      if (this.options?.shimChainChangedDisconnect && __privateGet(this, _switchingChains)) {
+      if (this.options.shimChainChangedDisconnect && __privateGet(this, _switchingChains)) {
         __privateSet(this, _switchingChains, false);
         return;
       }
       this.emit("disconnect");
-      if (this.options?.shimDisconnect)
+      if (this.options.shimDisconnect)
         getClient().storage?.removeItem(this.shimDisconnectKey);
     };
-    let name = "Injected";
-    const overrideName = options.name;
-    if (typeof overrideName === "string")
-      name = overrideName;
-    else if (typeof window !== "undefined") {
-      const detectedName = getInjectedName(window.ethereum);
-      if (overrideName)
-        name = overrideName(detectedName);
-      else
-        name = typeof detectedName === "string" ? detectedName : detectedName[0];
-    }
+    const provider = options.getProvider();
+    if (typeof options.name === "string")
+      this.name = options.name;
+    else if (provider) {
+      const detectedName = getInjectedName(provider);
+      if (options.name)
+        this.name = options.name(detectedName);
+      else {
+        if (typeof detectedName === "string")
+          this.name = detectedName;
+        else
+          this.name = detectedName[0];
+      }
+    } else
+      this.name = "Injected";
     this.id = "injected";
-    this.name = name;
+    this.ready = !!provider;
   }
   async connect({ chainId: chainId2 } = {}) {
     try {
@@ -1782,7 +1875,7 @@ var InjectedConnector = class extends Connector {
         id = chain2.id;
         unsupported = this.isChainUnsupported(id);
       }
-      if (this.options?.shimDisconnect)
+      if (this.options.shimDisconnect)
         getClient().storage?.setItem(this.shimDisconnectKey, true);
       return { account, chain: { id, unsupported }, provider };
     } catch (error) {
@@ -1800,7 +1893,7 @@ var InjectedConnector = class extends Connector {
     provider.removeListener("accountsChanged", this.onAccountsChanged);
     provider.removeListener("chainChanged", this.onChainChanged);
     provider.removeListener("disconnect", this.onDisconnect);
-    if (this.options?.shimDisconnect)
+    if (this.options.shimDisconnect)
       getClient().storage?.removeItem(this.shimDisconnectKey);
   }
   async getAccount() {
@@ -1819,8 +1912,9 @@ var InjectedConnector = class extends Connector {
     return provider.request({ method: "eth_chainId" }).then(normalizeChainId);
   }
   async getProvider() {
-    if (typeof window !== "undefined" && !!window.ethereum)
-      __privateSet(this, _provider, window.ethereum);
+    const provider = this.options.getProvider();
+    if (provider)
+      __privateSet(this, _provider, provider);
     return __privateGet(this, _provider);
   }
   async getSigner({ chainId: chainId2 } = {}) {
@@ -1835,7 +1929,7 @@ var InjectedConnector = class extends Connector {
   }
   async isAuthorized() {
     try {
-      if (this.options?.shimDisconnect && !getClient().storage?.getItem(this.shimDisconnectKey))
+      if (this.options.shimDisconnect && !getClient().storage?.getItem(this.shimDisconnectKey))
         return false;
       const provider = await this.getProvider();
       if (!provider)
@@ -1847,7 +1941,7 @@ var InjectedConnector = class extends Connector {
     }
   }
   async switchChain(chainId2) {
-    if (this.options?.shimChainChangedDisconnect)
+    if (this.options.shimChainChangedDisconnect)
       __privateSet(this, _switchingChains, true);
     const provider = await this.getProvider();
     if (!provider)
@@ -1930,15 +2024,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 +2045,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 +2105,7 @@ var Client = class {
             webSocketProvider: this.getWebSocketProvider({ chainId: chainId2 })
           }),
           {
+            deserialize: (state) => state,
             name: storeKey,
             getStorage: () => storage,
             partialize: (state) => ({
@@ -2020,7 +2117,8 @@ var Client = class {
               },
               chains: state?.chains
             }),
-            version: 1
+            serialize: (state) => state,
+            version: 2
           }
         )
       )
@@ -2202,7 +2300,7 @@ function createClient(config) {
 function getClient() {
   if (!client) {
     throw new Error(
-      "No wagmi client found. Ensure you have set up a client: https://wagmi.sh/docs/client"
+      "No wagmi client found. Ensure you have set up a client: https://wagmi.sh/react/client"
     );
   }
   return client;
@@ -2215,7 +2313,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 +3538,11 @@ export {
   configureChains,
   debounce,
   deepEqual,
+  deserialize,
   minimizeContractInterface,
   normalizeChainId,
   parseContractResult,
+  serialize,
   erc20ABI,
   erc721ABI,
   erc4626ABI,

package/dist/connectors/coinbaseWallet.d.ts

@@ -1,12 +1,12 @@
 import { CoinbaseWalletProvider } from '@coinbase/wallet-sdk';
 import { CoinbaseWalletSDKOptions } from '@coinbase/wallet-sdk/dist/CoinbaseWalletSDK';
 import { providers } from 'ethers';
-import { C as Chain } from '../index-bacc1c49.js';
-import { C as Connector } from '../base-5bd9b5ed.js';
+import { C as Chain } from '../index-58cffc47.js';
+import { C as Connector } from '../base-a32d0b91.js';
 import 'abitype';
 import 'eventemitter3';
 
-declare type Options = CoinbaseWalletSDKOptions & {
+type Options = CoinbaseWalletSDKOptions & {
     /**
      * Fallback Ethereum JSON RPC URL
      * @default ""

package/dist/connectors/coinbaseWallet.js

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

package/dist/connectors/metaMask.d.ts

@@ -1,11 +1,11 @@
-import { C as Chain, E as Ethereum } from '../index-bacc1c49.js';
-import { a as InjectedConnectorOptions, I as InjectedConnector } from '../injected-6980e5c3.js';
+import { C as Chain, E as Ethereum } from '../index-58cffc47.js';
+import { a as InjectedConnectorOptions, I as InjectedConnector } from '../injected-82510902.js';
 import 'abitype';
 import 'ethers';
-import '../base-5bd9b5ed.js';
+import '../base-a32d0b91.js';
 import 'eventemitter3';
 
-declare type MetaMaskConnectorOptions = Pick<InjectedConnectorOptions, 'shimChainChangedDisconnect' | 'shimDisconnect'> & {
+type MetaMaskConnectorOptions = Pick<InjectedConnectorOptions, 'shimChainChangedDisconnect' | 'shimDisconnect'> & {
     /**
      * While "disconnected" with `shimDisconnect`, allows user to select a different MetaMask account (than the currently connected account) when trying to connect.
      */
@@ -14,7 +14,6 @@ declare type MetaMaskConnectorOptions = Pick<InjectedConnectorOptions, 'shimChai
 declare class MetaMaskConnector extends InjectedConnector {
     #private;
     readonly id = "metaMask";
-    readonly ready: boolean;
     constructor({ chains, options: options_, }?: {
         chains?: Chain[];
         options?: MetaMaskConnectorOptions;
@@ -29,7 +28,6 @@ declare class MetaMaskConnector extends InjectedConnector {
         };
         provider: Ethereum;
     }>;
-    getProvider(): Promise<Ethereum | undefined>;
 }
 
 export { MetaMaskConnector, MetaMaskConnectorOptions };

package/dist/connectors/metaMask.js

@@ -4,18 +4,17 @@ import {
   ResourceUnavailableError,
   UserRejectedRequestError,
   getClient
-} from "../chunk-MS4CUBFJ.js";
+} from "../chunk-HEIMP7HQ.js";
 import "../chunk-4DNFSL2K.js";
 import {
   __privateAdd,
   __privateGet,
-  __privateMethod,
   __privateSet
 } from "../chunk-MQXBDTVK.js";
 
 // src/connectors/metaMask.ts
 import { getAddress } from "ethers/lib/utils.js";
-var _provider, _UNSTABLE_shimOnConnectSelectAccount, _getReady, getReady_fn, _findProvider, findProvider_fn;
+var _UNSTABLE_shimOnConnectSelectAccount;
 var MetaMaskConnector = class extends InjectedConnector {
   constructor({
     chains,
@@ -25,14 +24,35 @@ var MetaMaskConnector = class extends InjectedConnector {
       name: "MetaMask",
       shimDisconnect: true,
       shimChainChangedDisconnect: true,
+      getProvider() {
+        function getReady(ethereum) {
+          const isMetaMask = !!ethereum?.isMetaMask;
+          if (!isMetaMask)
+            return;
+          if (ethereum.isBraveWallet && !ethereum._events && !ethereum._state)
+            return;
+          if (ethereum.isAvalanche)
+            return;
+          if (ethereum.isKuCoinWallet)
+            return;
+          if (ethereum.isPortal)
+            return;
+          if (ethereum.isTokenPocket)
+            return;
+          if (ethereum.isTokenary)
+            return;
+          return ethereum;
+        }
+        if (typeof window === "undefined")
+          return;
+        if (window.ethereum?.providers)
+          return window.ethereum.providers.find(getReady);
+        return getReady(window.ethereum);
+      },
       ...options_
     };
     super({ chains, options });
-    __privateAdd(this, _getReady);
-    __privateAdd(this, _findProvider);
     this.id = "metaMask";
-    this.ready = typeof window != "undefined" && !!__privateMethod(this, _findProvider, findProvider_fn).call(this, window.ethereum);
-    __privateAdd(this, _provider, void 0);
     __privateAdd(this, _UNSTABLE_shimOnConnectSelectAccount, void 0);
     __privateSet(this, _UNSTABLE_shimOnConnectSelectAccount, options.UNSTABLE_shimOnConnectSelectAccount);
   }
@@ -52,10 +72,15 @@ var MetaMaskConnector = class extends InjectedConnector {
         account = await this.getAccount().catch(() => null);
         const isConnected = !!account;
         if (isConnected)
-          await provider.request({
-            method: "wallet_requestPermissions",
-            params: [{ eth_accounts: {} }]
-          }).catch(() => null);
+          try {
+            await provider.request({
+              method: "wallet_requestPermissions",
+              params: [{ eth_accounts: {} }]
+            });
+          } catch (error) {
+            if (this.isUserRejectedRequestError(error))
+              throw new UserRejectedRequestError(error);
+          }
       }
       if (!account) {
         const accounts = await provider.request({
@@ -81,40 +106,8 @@ var MetaMaskConnector = class extends InjectedConnector {
       throw error;
     }
   }
-  async getProvider() {
-    if (typeof window !== "undefined") {
-      __privateSet(this, _provider, __privateMethod(this, _findProvider, findProvider_fn).call(this, window.ethereum));
-    }
-    return __privateGet(this, _provider);
-  }
 };
-_provider = new WeakMap();
 _UNSTABLE_shimOnConnectSelectAccount = new WeakMap();
-_getReady = new WeakSet();
-getReady_fn = function(ethereum) {
-  const isMetaMask = !!ethereum?.isMetaMask;
-  if (!isMetaMask)
-    return;
-  if (ethereum.isBraveWallet && !ethereum._events && !ethereum._state)
-    return;
-  if (ethereum.isAvalanche)
-    return;
-  if (ethereum.isKuCoinWallet)
-    return;
-  if (ethereum.isPortal)
-    return;
-  if (ethereum.isTokenPocket)
-    return;
-  if (ethereum.isTokenary)
-    return;
-  return ethereum;
-};
-_findProvider = new WeakSet();
-findProvider_fn = function(ethereum) {
-  if (ethereum?.providers)
-    return ethereum.providers.find(__privateMethod(this, _getReady, getReady_fn));
-  return __privateMethod(this, _getReady, getReady_fn).call(this, ethereum);
-};
 export {
   MetaMaskConnector
 };

package/dist/connectors/mock/index.d.ts

@@ -1,11 +1,11 @@
 import * as ethers from 'ethers';
 import { providers } from 'ethers';
-import { S as Signer, C as Chain } from '../../index-bacc1c49.js';
-import { C as Connector, a as ConnectorData } from '../../base-5bd9b5ed.js';
+import { S as Signer, C as Chain } from '../../index-58cffc47.js';
+import { C as Connector, a as ConnectorData } from '../../base-a32d0b91.js';
 import EventEmitter from 'eventemitter3';
 import 'abitype';
 
-declare type MockProviderOptions = {
+type MockProviderOptions = {
     chainId?: number;
     flags?: {
         isAuthorized?: boolean;
@@ -15,12 +15,12 @@ declare type MockProviderOptions = {
     };
     signer: Signer;
 };
-declare type Events = {
+type Events = {
     accountsChanged(accounts: string[]): void;
     chainChanged(chainId: number | string): void;
     disconnect(): void;
 };
-declare type Event = keyof Events;
+type Event = keyof Events;
 declare class MockProvider extends providers.BaseProvider {
     #private;
     events: EventEmitter<Events, any>;

package/dist/connectors/mock/index.js

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

package/dist/connectors/walletConnect.d.ts

@@ -1,12 +1,12 @@
 import WalletConnectProvider from '@walletconnect/ethereum-provider';
 import { providers } from 'ethers';
-import { C as Chain } from '../index-bacc1c49.js';
-import { C as Connector } from '../base-5bd9b5ed.js';
+import { C as Chain } from '../index-58cffc47.js';
+import { C as Connector } from '../base-a32d0b91.js';
 import 'abitype';
 import 'eventemitter3';
 
-declare type WalletConnectOptions = ConstructorParameters<typeof WalletConnectProvider>[0];
-declare type WalletConnectSigner = providers.JsonRpcSigner;
+type WalletConnectOptions = ConstructorParameters<typeof WalletConnectProvider>[0];
+type WalletConnectSigner = providers.JsonRpcSigner;
 declare class WalletConnectConnector extends Connector<WalletConnectProvider, WalletConnectOptions, WalletConnectSigner> {
     #private;
     readonly id = "walletConnect";

package/dist/connectors/walletConnect.js

@@ -4,7 +4,7 @@ import {
   UserRejectedRequestError,
   getClient,
   normalizeChainId
-} from "../chunk-MS4CUBFJ.js";
+} from "../chunk-HEIMP7HQ.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}`,