@wagmi/core 0.2.0 → 0.2.3

package/dist/wagmi-core.cjs.prod.js

@@ -2,19 +2,16 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var classPrivateMethodGet = require('./classPrivateMethodGet-656c08a7.cjs.prod.js');
-var base = require('./base-30d4fad4.cjs.prod.js');
-var ethers = require('ethers');
-var create = require('zustand/vanilla');
-var middleware = require('zustand/middleware');
+var client = require('./client-4d8337e7.cjs.prod.js');
+var base = require('./base-59f3457e.cjs.prod.js');
+var ethers = require('ethers/lib/ethers');
 var utils = require('ethers/lib/utils');
-var ethers$1 = require('ethers/lib/ethers');
+var ethers$1 = require('ethers');
+require('./classPrivateMethodGet-d7330ed7.cjs.prod.js');
+require('zustand/vanilla');
+require('zustand/middleware');
 require('eventemitter3');
 
-function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
-
-var create__default = /*#__PURE__*/_interopDefault(create);
-
 // https://ethereum.org/en/developers/docs/standards/tokens/erc-20
 const erc20ABI = ['event Approval(address indexed _owner, address indexed _spender, uint256 _value)', 'event Transfer(address indexed _from, address indexed _to, uint256 _value)', 'function allowance(address _owner, address _spender) public view returns (uint256 remaining)', 'function approve(address _spender, uint256 _value) public returns (bool success)', 'function balanceOf(address _owner) public view returns (uint256 balance)', 'function decimals() public view returns (uint8)', 'function name() public view returns (string)', 'function symbol() public view returns (string)', 'function totalSupply() public view returns (uint256)', 'function transfer(address _to, uint256 _value) public returns (bool success)', 'function transferFrom(address _from, address _to, uint256 _value) public returns (bool success)']; // https://ethereum.org/en/developers/docs/standards/tokens/erc-721
 
@@ -23,606 +20,60 @@ const erc721ABI = ['event Approval(address indexed _owner, address indexed _appr
 // https://github.com/ethers-io/ethers.js/blob/master/packages/units/src.ts/index.ts#L10-L18
 const units = ['wei', 'kwei', 'mwei', 'gwei', 'szabo', 'finney', 'ether'];
 
-const injectedProvidersLookup = {
-  isMetaMask: 'MetaMask',
-  // Place other options below in alphabetical order
-  isBraveWallet: 'Brave Wallet',
-  isCoinbaseWallet: 'Coinbase Wallet',
-  isFrame: 'Frame',
-  isTally: 'Tally'
-};
-const injectedOptions = Object.entries(injectedProvidersLookup);
-function getInjectedName(ethereum) {
-  if (!ethereum) return 'Injected';
-
-  for (const [key, val] of injectedOptions) {
-    if (ethereum[key]) return val;
-  }
-
-  return 'Injected';
-}
-
-const shimKey = 'injected.shimDisconnect';
-
-var _provider = /*#__PURE__*/new WeakMap();
-
-class InjectedConnector extends base.Connector {
-  constructor(config) {
-    super({ ...config,
-      options: {
-        shimDisconnect: true,
-        ...(config === null || config === void 0 ? void 0 : config.options)
-      }
-    });
-
-    base._defineProperty(this, "id", 'injected');
-
-    base._defineProperty(this, "name", void 0);
-
-    base._defineProperty(this, "ready", typeof window != 'undefined' && !!window.ethereum);
-
-    base._classPrivateFieldInitSpec(this, _provider, {
-      writable: true,
-      value: void 0
-    });
-
-    base._defineProperty(this, "onAccountsChanged", accounts => {
-      if (accounts.length === 0) this.emit('disconnect');else this.emit('change', {
-        account: utils.getAddress(accounts[0])
-      });
-    });
-
-    base._defineProperty(this, "onChainChanged", chainId => {
-      const id = base.normalizeChainId(chainId);
-      const unsupported = this.isChainUnsupported(id);
-      this.emit('change', {
-        chain: {
-          id,
-          unsupported
-        }
-      });
-    });
-
-    base._defineProperty(this, "onDisconnect", () => {
-      var _this$options, _getClient$storage;
-
-      this.emit('disconnect');
-      if ((_this$options = this.options) !== null && _this$options !== void 0 && _this$options.shimDisconnect) (_getClient$storage = getClient().storage) === null || _getClient$storage === void 0 ? void 0 : _getClient$storage.removeItem(shimKey);
-    });
-
-    let name = 'Injected';
-    if (typeof window !== 'undefined') name = getInjectedName(window.ethereum);
-    this.name = name;
-  }
-
-  async connect() {
-    try {
-      var _this$options2, _getClient$storage2;
-
-      const provider = await this.getProvider();
-      if (!provider) throw new base.ConnectorNotFoundError();
-
-      if (provider.on) {
-        provider.on('accountsChanged', this.onAccountsChanged);
-        provider.on('chainChanged', this.onChainChanged);
-        provider.on('disconnect', this.onDisconnect);
-      }
-
-      this.emit('message', {
-        type: 'connecting'
-      });
-      const account = await this.getAccount();
-      const id = await this.getChainId();
-      const unsupported = this.isChainUnsupported(id);
-      if ((_this$options2 = this.options) !== null && _this$options2 !== void 0 && _this$options2.shimDisconnect) (_getClient$storage2 = getClient().storage) === null || _getClient$storage2 === void 0 ? void 0 : _getClient$storage2.setItem(shimKey, true);
-      return {
-        account,
-        chain: {
-          id,
-          unsupported
-        },
-        provider
-      };
-    } catch (error) {
-      if (error.code === 4001) throw new base.UserRejectedRequestError();
-      throw error;
-    }
-  }
-
-  async disconnect() {
-    var _this$options3, _getClient$storage3;
-
-    const provider = await this.getProvider();
-    if (!(provider !== null && provider !== void 0 && provider.removeListener)) return;
-    provider.removeListener('accountsChanged', this.onAccountsChanged);
-    provider.removeListener('chainChanged', this.onChainChanged);
-    provider.removeListener('disconnect', this.onDisconnect);
-    if ((_this$options3 = this.options) !== null && _this$options3 !== void 0 && _this$options3.shimDisconnect) (_getClient$storage3 = getClient().storage) === null || _getClient$storage3 === void 0 ? void 0 : _getClient$storage3.removeItem(shimKey);
-  }
-
-  async getAccount() {
-    const provider = await this.getProvider();
-    if (!provider) throw new base.ConnectorNotFoundError();
-    const accounts = await provider.request({
-      method: 'eth_requestAccounts'
-    }); // return checksum address
-
-    return utils.getAddress(accounts[0]);
-  }
-
-  async getChainId() {
-    const provider = await this.getProvider();
-    if (!provider) throw new base.ConnectorNotFoundError();
-    return await provider.request({
-      method: 'eth_chainId'
-    }).then(base.normalizeChainId);
-  }
-
-  async getProvider() {
-    if (typeof window !== 'undefined' && !!window.ethereum) base._classPrivateFieldSet(this, _provider, window.ethereum);
-    return base._classPrivateFieldGet(this, _provider);
-  }
-
-  async getSigner() {
-    const [provider, account] = await Promise.all([this.getProvider(), this.getAccount()]);
-    return new ethers.providers.Web3Provider(provider).getSigner(account);
-  }
-
-  async isAuthorized() {
-    try {
-      var _this$options4, _getClient$storage4;
-
-      if ((_this$options4 = this.options) !== null && _this$options4 !== void 0 && _this$options4.shimDisconnect && !((_getClient$storage4 = getClient().storage) !== null && _getClient$storage4 !== void 0 && _getClient$storage4.getItem(shimKey))) return false;
-      const provider = await this.getProvider();
-      if (!provider) throw new base.ConnectorNotFoundError();
-      const accounts = await provider.request({
-        method: 'eth_accounts'
-      });
-      const account = accounts[0];
-      return !!account;
-    } catch {
-      return false;
-    }
-  }
-
-  async switchChain(chainId) {
-    const provider = await this.getProvider();
-    if (!provider) throw new base.ConnectorNotFoundError();
-    const id = utils.hexValue(chainId);
-
-    try {
-      var _chains$find;
-
-      await provider.request({
-        method: 'wallet_switchEthereumChain',
-        params: [{
-          chainId: id
-        }]
-      });
-      const chains = [...this.chains, ...base.allChains];
-      return (_chains$find = chains.find(x => x.id === chainId)) !== null && _chains$find !== void 0 ? _chains$find : {
-        id: chainId,
-        name: "Chain ".concat(id),
-        rpcUrls: {
-          default: ''
-        }
-      };
-    } catch (error) {
-      // Indicates chain is not added to provider
-      if (error.code === 4902) {
-        try {
-          const chain = this.chains.find(x => x.id === chainId);
-          if (!chain) throw new base.ChainNotConfiguredError();
-          await provider.request({
-            method: 'wallet_addEthereumChain',
-            params: [{
-              chainId: id,
-              chainName: chain.name,
-              nativeCurrency: chain.nativeCurrency,
-              rpcUrls: this.getRpcUrls(chain),
-              blockExplorerUrls: this.getBlockExplorerUrls(chain)
-            }]
-          });
-          return chain;
-        } catch (addError) {
-          throw new base.AddChainError();
-        }
-      } else if (error.code === 4001) throw new base.UserRejectedRequestError();else throw new base.SwitchChainError();
-    }
-  }
-
-  async watchAsset(_ref) {
-    let {
-      address,
-      decimals = 18,
-      image,
-      symbol
-    } = _ref;
-    const provider = await this.getProvider();
-    if (!provider) throw new base.ConnectorNotFoundError();
-    return await provider.request({
-      method: 'wallet_watchAsset',
-      params: {
-        type: 'ERC20',
-        options: {
-          address,
-          decimals,
-          image,
-          symbol
-        }
-      }
-    });
-  }
-
-}
-
-const noopStorage = {
-  getItem: _key => '',
-  setItem: (_key, _value) => null,
-  removeItem: _key => null
-};
-function createStorage(_ref) {
-  let {
-    storage,
-    key: prefix = 'wagmi'
-  } = _ref;
-  return { ...storage,
-    getItem: function (key) {
-      let defaultState = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
-      const value = storage.getItem("".concat(prefix, ".").concat(key));
-
-      try {
-        return value ? JSON.parse(value) : defaultState;
-      } catch (error) {
-        console.warn(error);
-        return defaultState;
-      }
-    },
-    setItem: (key, value) => {
-      if (value === null) {
-        storage.removeItem("".concat(prefix, ".").concat(key));
-      } else {
-        try {
-          storage.setItem("".concat(prefix, ".").concat(key), JSON.stringify(value));
-        } catch (err) {
-          console.error(err);
-        }
-      }
-    },
-    removeItem: key => storage.removeItem("".concat(prefix, ".").concat(key))
-  };
-}
-
-const storeKey = 'store';
-
-var _lastUsedConnector = /*#__PURE__*/new WeakMap();
-
-var _addEffects = /*#__PURE__*/new WeakSet();
-
-class Client {
-  constructor() {
-    var _config$autoConnect, _config$connectors, _config$provider, _config$storage;
-
-    let config = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-
-    classPrivateMethodGet._classPrivateMethodInitSpec(this, _addEffects);
-
-    base._defineProperty(this, "config", void 0);
-
-    base._defineProperty(this, "storage", void 0);
-
-    base._defineProperty(this, "store", void 0);
-
-    base._classPrivateFieldInitSpec(this, _lastUsedConnector, {
-      writable: true,
-      value: void 0
-    });
-
-    // Set default values for config
-    const autoConnect = (_config$autoConnect = config.autoConnect) !== null && _config$autoConnect !== void 0 ? _config$autoConnect : false;
-
-    const _connectors = (_config$connectors = config.connectors) !== null && _config$connectors !== void 0 ? _config$connectors : [new InjectedConnector()];
-
-    const _provider = (_config$provider = config.provider) !== null && _config$provider !== void 0 ? _config$provider : config => {
-      try {
-        return ethers.getDefaultProvider(config.chainId);
-      } catch {
-        return ethers.getDefaultProvider();
-      }
-    };
-
-    const storage = (_config$storage = config.storage) !== null && _config$storage !== void 0 ? _config$storage : createStorage({
-      storage: typeof window !== 'undefined' ? window.localStorage : noopStorage
-    });
-    const _webSocketProvider = config.webSocketProvider; // Check status for autoConnect flag
-
-    let status = 'disconnected';
-
-    let _chainId;
-
-    if (autoConnect) {
-      try {
-        var _JSON$parse, _JSON$parse$state, _data$chain;
-
-        const rawState = storage.getItem(storeKey, '');
-        const data = (_JSON$parse = JSON.parse(rawState || '{}')) === null || _JSON$parse === void 0 ? void 0 : (_JSON$parse$state = _JSON$parse.state) === null || _JSON$parse$state === void 0 ? void 0 : _JSON$parse$state.data; // If account exists in localStorage, set status to reconnecting
-
-        status = data !== null && data !== void 0 && data.account ? 'reconnecting' : 'connecting';
-        _chainId = data === null || data === void 0 ? void 0 : (_data$chain = data.chain) === null || _data$chain === void 0 ? void 0 : _data$chain.id; // eslint-disable-next-line no-empty
-      } catch (_error) {}
-    } // Evaluate initial store values
-
-
-    const connectors_ = typeof _connectors === 'function' ? _connectors({
-      chainId: _chainId
-    }) : _connectors;
-    const provider_ = typeof _provider === 'function' ? _provider({
-      chainId: _chainId
-    }) : _provider;
-    const webSocketProvider_ = typeof _webSocketProvider === 'function' ? _webSocketProvider({
-      chainId: _chainId
-    }) : _webSocketProvider; // Create store
-
-    this.store = create__default["default"](middleware.subscribeWithSelector(middleware.persist(() => ({
-      connectors: connectors_,
-      provider: provider_,
-      status,
-      webSocketProvider: webSocketProvider_
-    }), {
-      name: storeKey,
-      getStorage: () => storage,
-      partialize: state => {
-        var _state$data, _state$data2;
-
-        return { ...(autoConnect && {
-            data: {
-              account: state === null || state === void 0 ? void 0 : (_state$data = state.data) === null || _state$data === void 0 ? void 0 : _state$data.account,
-              chain: state === null || state === void 0 ? void 0 : (_state$data2 = state.data) === null || _state$data2 === void 0 ? void 0 : _state$data2.chain
-            }
-          }),
-          chains: state === null || state === void 0 ? void 0 : state.chains
-        };
-      },
-      version: 1
-    })));
-    this.config = {
-      autoConnect,
-      connectors: _connectors,
-      provider: _provider,
-      storage,
-      webSocketProvider: _webSocketProvider
-    };
-    this.storage = storage;
-
-    base._classPrivateFieldSet(this, _lastUsedConnector, storage === null || storage === void 0 ? void 0 : storage.getItem('wallet'));
-
-    classPrivateMethodGet._classPrivateMethodGet(this, _addEffects, _addEffects2).call(this);
-  }
-
-  get chains() {
-    return this.store.getState().chains;
-  }
-
-  get connectors() {
-    return this.store.getState().connectors;
-  }
-
-  get connector() {
-    return this.store.getState().connector;
-  }
-
-  get data() {
-    return this.store.getState().data;
-  }
-
-  get error() {
-    return this.store.getState().error;
-  }
-
-  get provider() {
-    return this.store.getState().provider;
-  }
-
-  get status() {
-    return this.store.getState().status;
-  }
-
-  get subscribe() {
-    return this.store.subscribe;
-  }
-
-  get webSocketProvider() {
-    return this.store.getState().webSocketProvider;
-  }
-
-  setState(updater) {
-    const newState = typeof updater === 'function' ? updater(this.store.getState()) : updater;
-    this.store.setState(newState, true);
-  }
-
-  clearState() {
-    this.setState(x => ({ ...x,
-      connector: undefined,
-      data: undefined,
-      error: undefined,
-      status: 'disconnected'
-    }));
-  }
-
-  async destroy() {
-    var _this$connector$disco, _this$connector;
-
-    if (this.connector) await ((_this$connector$disco = (_this$connector = this.connector).disconnect) === null || _this$connector$disco === void 0 ? void 0 : _this$connector$disco.call(_this$connector));
-    this.clearState();
-    this.store.destroy();
-  }
-
-  async autoConnect() {
-    if (!this.connectors.length) return; // Try last used connector first
-
-    const sorted = base._classPrivateFieldGet(this, _lastUsedConnector) ? [...this.connectors].sort(x => x.id === base._classPrivateFieldGet(this, _lastUsedConnector) ? -1 : 1) : this.connectors;
-    let connected = false;
-
-    for (const connector of sorted) {
-      if (!connector.ready || !connector.isAuthorized) continue;
-      const isAuthorized = await connector.isAuthorized();
-      if (!isAuthorized) continue;
-      const data = await connector.connect();
-      this.setState(x => ({ ...x,
-        connector,
-        chains: connector === null || connector === void 0 ? void 0 : connector.chains,
-        data,
-        status: 'connected'
-      }));
-      connected = true;
-      break;
-    } // If connecting didn't succeed, set to disconnected
-
-
-    if (!connected) this.setState(x => ({ ...x,
-      status: 'disconnected'
-    }));
-    return this.data;
-  }
-
-  setLastUsedConnector() {
-    var _this$storage;
-
-    let lastUsedConnector = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
-    (_this$storage = this.storage) === null || _this$storage === void 0 ? void 0 : _this$storage.setItem('wallet', lastUsedConnector);
-  }
-
-}
-
-function _addEffects2() {
-  const onChange = data => {
-    this.setState(x => ({ ...x,
-      data: { ...x.data,
-        ...data
-      }
-    }));
-  };
-
-  const onDisconnect = () => {
-    this.clearState();
-  };
-
-  const onError = error => {
-    this.setState(x => ({ ...x,
-      error
-    }));
-  };
-
-  this.store.subscribe(_ref => {
-    let {
-      connector
-    } = _ref;
-    return connector;
-  }, (connector, prevConnector) => {
-    var _prevConnector$off, _prevConnector$off2, _prevConnector$off3, _connector$on, _connector$on2, _connector$on3;
-
-    prevConnector === null || prevConnector === void 0 ? void 0 : (_prevConnector$off = prevConnector.off) === null || _prevConnector$off === void 0 ? void 0 : _prevConnector$off.call(prevConnector, 'change', onChange);
-    prevConnector === null || prevConnector === void 0 ? void 0 : (_prevConnector$off2 = prevConnector.off) === null || _prevConnector$off2 === void 0 ? void 0 : _prevConnector$off2.call(prevConnector, 'disconnect', onDisconnect);
-    prevConnector === null || prevConnector === void 0 ? void 0 : (_prevConnector$off3 = prevConnector.off) === null || _prevConnector$off3 === void 0 ? void 0 : _prevConnector$off3.call(prevConnector, 'error', onError);
-    if (!connector) return;
-    (_connector$on = connector.on) === null || _connector$on === void 0 ? void 0 : _connector$on.call(connector, 'change', onChange);
-    (_connector$on2 = connector.on) === null || _connector$on2 === void 0 ? void 0 : _connector$on2.call(connector, 'disconnect', onDisconnect);
-    (_connector$on3 = connector.on) === null || _connector$on3 === void 0 ? void 0 : _connector$on3.call(connector, 'error', onError);
-  });
-  const {
-    connectors,
-    provider,
-    webSocketProvider
-  } = this.config;
-  const subscribeConnectors = typeof connectors === 'function';
-  const subscribeProvider = typeof provider === 'function';
-  const subscribeWebSocketProvider = typeof webSocketProvider === 'function';
-  if (subscribeConnectors || subscribeProvider || subscribeWebSocketProvider) this.store.subscribe(_ref2 => {
-    var _data$chain2;
-
-    let {
-      data
-    } = _ref2;
-    return data === null || data === void 0 ? void 0 : (_data$chain2 = data.chain) === null || _data$chain2 === void 0 ? void 0 : _data$chain2.id;
-  }, chainId => {
-    this.setState(x => ({ ...x,
-      connectors: subscribeConnectors ? connectors({
-        chainId
-      }) : x.connectors,
-      provider: subscribeProvider ? provider({
-        chainId
-      }) : x.provider,
-      webSocketProvider: subscribeWebSocketProvider ? webSocketProvider({
-        chainId
-      }) : x.webSocketProvider
-    }));
-  });
-}
-
-let client;
-function createClient(config) {
-  const client_ = new Client(config);
-  client = client_;
-  return client_;
-}
-function getClient() {
-  return client;
-}
-
 async function connect(_ref) {
   let {
     connector
   } = _ref;
-  const activeConnector = client.connector;
+  const activeConnector = client.client.connector;
   if (connector.id === (activeConnector === null || activeConnector === void 0 ? void 0 : activeConnector.id)) throw new base.ConnectorAlreadyConnectedError();
   const data = await connector.connect();
-  client.setLastUsedConnector(connector.id);
-  client.setState(x => ({ ...x,
+  client.client.setLastUsedConnector(connector.id);
+  client.client.setState(x => ({ ...x,
     connector,
     chains: connector === null || connector === void 0 ? void 0 : connector.chains,
     data
   }));
-  client.storage.setItem('connected', true);
+  client.client.storage.setItem('connected', true);
   return { ...data,
     connector
   };
 }
 
 async function disconnect() {
-  const client = getClient();
-  if (client.connector) await client.connector.disconnect();
-  client.clearState();
-  client.storage.removeItem('connected');
+  const client$1 = client.getClient();
+  if (client$1.connector) await client$1.connector.disconnect();
+  client$1.clearState();
+  client$1.storage.removeItem('connected');
 }
 
 function getProvider() {
   let {
     chainId
   } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  const client = getClient();
-  if (chainId && typeof client.config.provider === 'function') return client.config.provider({
+  const client$1 = client.getClient();
+  if (chainId && typeof client$1.config.provider === 'function') return client$1.config.provider({
     chainId
   });
-  return client.provider;
+  return client$1.provider;
 }
 
 function getWebSocketProvider() {
   let {
     chainId
   } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  const client = getClient();
-  if (chainId && typeof client.config.webSocketProvider === 'function') return client.config.webSocketProvider({
+  const client$1 = client.getClient();
+  if (chainId && typeof client$1.config.webSocketProvider === 'function') return client$1.config.webSocketProvider({
     chainId
   });
-  return client.webSocketProvider;
+  return client$1.webSocketProvider;
 }
 
 function watchProvider(args, callback) {
-  const client = getClient();
+  const client$1 = client.getClient();
 
   const handleChange = async () => callback(getProvider(args));
 
-  const unsubscribe = client.subscribe(_ref => {
+  const unsubscribe = client$1.subscribe(_ref => {
     let {
       provider
     } = _ref;
@@ -632,11 +83,11 @@ function watchProvider(args, callback) {
 }
 
 function watchWebSocketProvider(args, callback) {
-  const client = getClient();
+  const client$1 = client.getClient();
 
   const handleChange = async () => callback(getWebSocketProvider(args));
 
-  const unsubscribe = client.subscribe(_ref => {
+  const unsubscribe = client$1.subscribe(_ref => {
     let {
       webSocketProvider
     } = _ref;
@@ -654,13 +105,13 @@ async function fetchBalance(_ref) {
     formatUnits: unit = 'ether',
     token
   } = _ref;
-  const client = getClient();
+  const client$1 = client.getClient();
   const provider = getProvider({
     chainId
   });
 
   if (token) {
-    const contract = new ethers$1.Contract(token, erc20ABI, provider);
+    const contract = new ethers.Contract(token, erc20ABI, provider);
     const [value, decimals, symbol] = await Promise.all([contract.balanceOf(addressOrName), contract.decimals(), contract.symbol()]);
     return {
       decimals,
@@ -671,7 +122,7 @@ async function fetchBalance(_ref) {
     };
   }
 
-  const chains = [...((_client$connector$cha = (_client$connector = client.connector) === null || _client$connector === void 0 ? void 0 : _client$connector.chains) !== null && _client$connector$cha !== void 0 ? _client$connector$cha : []), ...base.allChains];
+  const chains = [...((_client$connector$cha = (_client$connector = client$1.connector) === null || _client$connector === void 0 ? void 0 : _client$connector.chains) !== null && _client$connector$cha !== void 0 ? _client$connector$cha : []), ...base.allChains];
   const value = await provider.getBalance(addressOrName);
   const chain = chains.find(x => x.id === provider.network.chainId);
   return {
@@ -686,8 +137,8 @@ async function fetchBalance(_ref) {
 async function fetchSigner() {
   var _client$connector, _client$connector$get;
 
-  const client = getClient();
-  const signer = (await ((_client$connector = client.connector) === null || _client$connector === void 0 ? void 0 : (_client$connector$get = _client$connector.getSigner) === null || _client$connector$get === void 0 ? void 0 : _client$connector$get.call(_client$connector))) || null;
+  const client$1 = client.getClient();
+  const signer = (await ((_client$connector = client$1.connector) === null || _client$connector === void 0 ? void 0 : (_client$connector$get = _client$connector.getSigner) === null || _client$connector$get === void 0 ? void 0 : _client$connector$get.call(_client$connector))) || null;
   return signer;
 }
 
@@ -695,7 +146,7 @@ function getAccount() {
   const {
     data,
     connector
-  } = getClient();
+  } = client.getClient();
   return {
     address: data === null || data === void 0 ? void 0 : data.account,
     connector
@@ -705,9 +156,9 @@ function getAccount() {
 function getNetwork() {
   var _client$data, _client$data$chain, _client$chains, _find, _client$data2;
 
-  const client = getClient();
-  const chainId = (_client$data = client.data) === null || _client$data === void 0 ? void 0 : (_client$data$chain = _client$data.chain) === null || _client$data$chain === void 0 ? void 0 : _client$data$chain.id;
-  const activeChains = (_client$chains = client.chains) !== null && _client$chains !== void 0 ? _client$chains : [];
+  const client$1 = client.getClient();
+  const chainId = (_client$data = client$1.data) === null || _client$data === void 0 ? void 0 : (_client$data$chain = _client$data.chain) === null || _client$data$chain === void 0 ? void 0 : _client$data$chain.id;
+  const activeChains = (_client$chains = client$1.chains) !== null && _client$chains !== void 0 ? _client$chains : [];
   const activeChain = (_find = [...activeChains, ...base.allChains].find(x => x.id === chainId)) !== null && _find !== void 0 ? _find : {
     id: chainId,
     name: "Chain ".concat(chainId),
@@ -717,7 +168,7 @@ function getNetwork() {
   };
   return {
     chain: chainId ? { ...activeChain,
-      ...((_client$data2 = client.data) === null || _client$data2 === void 0 ? void 0 : _client$data2.chain),
+      ...((_client$data2 = client$1.data) === null || _client$data2 === void 0 ? void 0 : _client$data2.chain),
       id: chainId
     } : undefined,
     chains: activeChains
@@ -755,18 +206,18 @@ async function switchNetwork(_ref) {
   let {
     chainId
   } = _ref;
-  const client = getClient();
-  if (!((_client$connector = client.connector) !== null && _client$connector !== void 0 && _client$connector.switchChain)) throw new base.SwitchChainNotSupportedError();
-  const chain = await client.connector.switchChain(chainId);
+  const client$1 = client.getClient();
+  if (!((_client$connector = client$1.connector) !== null && _client$connector !== void 0 && _client$connector.switchChain)) throw new base.SwitchChainNotSupportedError();
+  const chain = await client$1.connector.switchChain(chainId);
   return chain;
 }
 
 function watchAccount(callback) {
-  const client = getClient();
+  const client$1 = client.getClient();
 
   const handleChange = () => callback(getAccount());
 
-  const unsubscribe = client.subscribe(_ref => {
+  const unsubscribe = client$1.subscribe(_ref => {
     let {
       data,
       connector
@@ -782,11 +233,11 @@ function watchAccount(callback) {
 }
 
 function watchNetwork(callback) {
-  const client = getClient();
+  const client$1 = client.getClient();
 
   const handleChange = () => callback(getNetwork());
 
-  const unsubscribe = client.subscribe(_ref => {
+  const unsubscribe = client$1.subscribe(_ref => {
     var _data$chain;
 
     let {
@@ -804,11 +255,11 @@ function watchNetwork(callback) {
 }
 
 function watchSigner(callback) {
-  const client = getClient();
+  const client$1 = client.getClient();
 
   const handleChange = async () => callback(await fetchSigner());
 
-  const unsubscribe = client.subscribe(_ref => {
+  const unsubscribe = client$1.subscribe(_ref => {
     var _data$chain;
 
     let {
@@ -885,8 +336,8 @@ eventName, callback) {
   };
 
   watchEvent();
-  const client = getClient();
-  const unsubscribe = client.subscribe(_ref => {
+  const client$1 = client.getClient();
+  const unsubscribe = client$1.subscribe(_ref => {
     let {
       provider,
       webSocketProvider
@@ -933,10 +384,10 @@ function watchBlockNumber(args, callback) {
     prevProvider = provider;
   };
 
-  const client = getClient();
-  const provider_ = (_client$webSocketProv = client.webSocketProvider) !== null && _client$webSocketProv !== void 0 ? _client$webSocketProv : client.provider;
+  const client$1 = client.getClient();
+  const provider_ = (_client$webSocketProv = client$1.webSocketProvider) !== null && _client$webSocketProv !== void 0 ? _client$webSocketProv : client$1.provider;
   if (args.listen) createListener(provider_);
-  const unsubscribe = client.subscribe(_ref => {
+  const unsubscribe = client$1.subscribe(_ref => {
     let {
       provider,
       webSocketProvider
@@ -967,18 +418,16 @@ function watchBlockNumber(args, callback) {
 }
 
 function watchReadContract(contractConfig, functionName) {
-  var _config$listenToBlock;
-
   let config = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   let callback = arguments.length > 3 ? arguments[3] : undefined;
-  const client = getClient();
+  const client$1 = client.getClient();
 
   const handleChange = async () => callback(await readContract(contractConfig, functionName, config));
 
-  const unwatch = ((_config$listenToBlock = config.listenToBlock) !== null && _config$listenToBlock !== void 0 ? _config$listenToBlock : true) ? watchBlockNumber({
+  const unwatch = config.listenToBlock ? watchBlockNumber({
     listen: true
   }, handleChange) : undefined;
-  const unsubscribe = client.subscribe(_ref => {
+  const unsubscribe = client$1.subscribe(_ref => {
     let {
       provider
     } = _ref;
@@ -995,12 +444,12 @@ async function writeContract(contractConfig, functionName) {
     args,
     overrides
   } = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-  const client = getClient();
-  if (!client.connector) throw new base.ConnectorNotFoundError();
+  const client$1 = client.getClient();
+  if (!client$1.connector) throw new base.ConnectorNotFoundError();
   const params = [...(Array.isArray(args) ? args : args ? [args] : []), ...(overrides ? [overrides] : [])];
 
   try {
-    const signer = await client.connector.getSigner();
+    const signer = await client$1.connector.getSigner();
     const contract = getContract(contractConfig);
     const contractWithSigner = contract.connect(signer);
     const contractFunction = contractWithSigner[functionName];
@@ -1096,7 +545,7 @@ async function fetchToken(_ref) {
   const provider = getProvider({
     chainId
   });
-  const contract = new ethers$1.Contract(address, erc20ABI, provider);
+  const contract = new ethers.Contract(address, erc20ABI, provider);
   const [symbol, decimals, totalSupply] = await Promise.all([contract.symbol(), contract.decimals(), contract.totalSupply()]);
   const token = {
     address,
@@ -1143,6 +592,14 @@ async function waitForTransaction(_ref) {
   return await promise;
 }
 
+exports.Client = client.Client;
+exports.InjectedConnector = client.InjectedConnector;
+exports.WagmiClient = client.Client;
+exports.createClient = client.createClient;
+exports.createStorage = client.createStorage;
+exports.createWagmiClient = client.createClient;
+exports.createWagmiStorage = client.createStorage;
+exports.noopStorage = client.noopStorage;
 exports.AddChainError = base.AddChainError;
 exports.ChainNotConfiguredError = base.ChainNotConfiguredError;
 exports.Connector = base.Connector;
@@ -1160,14 +617,7 @@ exports.defaultL2Chains = base.defaultL2Chains;
 exports.etherscanBlockExplorers = base.etherscanBlockExplorers;
 exports.infuraRpcUrls = base.infuraRpcUrls;
 exports.normalizeChainId = base.normalizeChainId;
-exports.Client = Client;
-exports.InjectedConnector = InjectedConnector;
-exports.WagmiClient = Client;
 exports.connect = connect;
-exports.createClient = createClient;
-exports.createStorage = createStorage;
-exports.createWagmiClient = createClient;
-exports.createWagmiStorage = createStorage;
 exports.disconnect = disconnect;
 exports.erc20ABI = erc20ABI;
 exports.erc721ABI = erc721ABI;
@@ -1185,7 +635,6 @@ exports.getContract = getContract;
 exports.getNetwork = getNetwork;
 exports.getProvider = getProvider;
 exports.getWebSocketProvider = getWebSocketProvider;
-exports.noopStorage = noopStorage;
 exports.readContract = readContract;
 exports.sendTransaction = sendTransaction;
 exports.signMessage = signMessage;