@wagmi/core 0.2.0-next.7 → 0.2.0

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

@@ -2,8 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var base = require('./base-09a653f3.cjs.dev.js');
-var classPrivateMethodGet = require('./classPrivateMethodGet-38b54c7a.cjs.dev.js');
+var classPrivateMethodGet = require('./classPrivateMethodGet-9b9cd39b.cjs.dev.js');
+var base = require('./base-a0d63eb0.cjs.dev.js');
 var ethers = require('ethers');
 var create = require('zustand/vanilla');
 var middleware = require('zustand/middleware');
@@ -15,292 +15,45 @@ function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e };
 
 var create__default = /*#__PURE__*/_interopDefault(create);
 
-function ownKeys(object, enumerableOnly) {
-  var keys = Object.keys(object);
+// 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
 
-  if (Object.getOwnPropertySymbols) {
-    var symbols = Object.getOwnPropertySymbols(object);
-    enumerableOnly && (symbols = symbols.filter(function (sym) {
-      return Object.getOwnPropertyDescriptor(object, sym).enumerable;
-    })), keys.push.apply(keys, symbols);
-  }
-
-  return keys;
-}
-
-function _objectSpread2(target) {
-  for (var i = 1; i < arguments.length; i++) {
-    var source = null != arguments[i] ? arguments[i] : {};
-    i % 2 ? ownKeys(Object(source), !0).forEach(function (key) {
-      base._defineProperty(target, key, source[key]);
-    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) {
-      Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
-    });
-  }
-
-  return target;
-}
-
-var erc1155ABI = [{
-  constant: true,
-  inputs: [{
-    internalType: 'address',
-    name: '_owner',
-    type: 'address'
-  }, {
-    internalType: 'uint256',
-    name: '_id',
-    type: 'uint256'
-  }],
-  name: 'balanceOf',
-  outputs: [{
-    internalType: 'uint256',
-    name: '',
-    type: 'uint256'
-  }],
-  payable: false,
-  stateMutability: 'view',
-  type: 'function'
-}, {
-  constant: true,
-  inputs: [{
-    internalType: 'uint256',
-    name: '_id',
-    type: 'uint256'
-  }],
-  name: 'uri',
-  outputs: [{
-    internalType: 'string',
-    name: '',
-    type: 'string'
-  }],
-  payable: false,
-  stateMutability: 'view',
-  type: 'function'
-}];
-
-var erc20ABI = [{
-  constant: true,
-  inputs: [],
-  name: 'name',
-  outputs: [{
-    name: '',
-    type: 'string'
-  }],
-  payable: false,
-  stateMutability: 'view',
-  type: 'function'
-}, {
-  constant: false,
-  inputs: [{
-    name: '_spender',
-    type: 'address'
-  }, {
-    name: '_value',
-    type: 'uint256'
-  }],
-  name: 'approve',
-  outputs: [{
-    name: '',
-    type: 'bool'
-  }],
-  payable: false,
-  stateMutability: 'nonpayable',
-  type: 'function'
-}, {
-  constant: true,
-  inputs: [],
-  name: 'totalSupply',
-  outputs: [{
-    name: '',
-    type: 'uint256'
-  }],
-  payable: false,
-  stateMutability: 'view',
-  type: 'function'
-}, {
-  constant: false,
-  inputs: [{
-    name: '_from',
-    type: 'address'
-  }, {
-    name: '_to',
-    type: 'address'
-  }, {
-    name: '_value',
-    type: 'uint256'
-  }],
-  name: 'transferFrom',
-  outputs: [{
-    name: '',
-    type: 'bool'
-  }],
-  payable: false,
-  stateMutability: 'nonpayable',
-  type: 'function'
-}, {
-  constant: true,
-  inputs: [],
-  name: 'decimals',
-  outputs: [{
-    name: '',
-    type: 'uint8'
-  }],
-  payable: false,
-  stateMutability: 'view',
-  type: 'function'
-}, {
-  constant: true,
-  inputs: [{
-    name: '_owner',
-    type: 'address'
-  }],
-  name: 'balanceOf',
-  outputs: [{
-    name: 'balance',
-    type: 'uint256'
-  }],
-  payable: false,
-  stateMutability: 'view',
-  type: 'function'
-}, {
-  constant: true,
-  inputs: [],
-  name: 'symbol',
-  outputs: [{
-    name: '',
-    type: 'string'
-  }],
-  payable: false,
-  stateMutability: 'view',
-  type: 'function'
-}, {
-  constant: false,
-  inputs: [{
-    name: '_to',
-    type: 'address'
-  }, {
-    name: '_value',
-    type: 'uint256'
-  }],
-  name: 'transfer',
-  outputs: [{
-    name: '',
-    type: 'bool'
-  }],
-  payable: false,
-  stateMutability: 'nonpayable',
-  type: 'function'
-}, {
-  constant: true,
-  inputs: [{
-    name: '_owner',
-    type: 'address'
-  }, {
-    name: '_spender',
-    type: 'address'
-  }],
-  name: 'allowance',
-  outputs: [{
-    name: '',
-    type: 'uint256'
-  }],
-  payable: false,
-  stateMutability: 'view',
-  type: 'function'
-}, {
-  payable: true,
-  stateMutability: 'payable',
-  type: 'fallback'
-}, {
-  anonymous: false,
-  inputs: [{
-    indexed: true,
-    name: 'owner',
-    type: 'address'
-  }, {
-    indexed: true,
-    name: 'spender',
-    type: 'address'
-  }, {
-    indexed: false,
-    name: 'value',
-    type: 'uint256'
-  }],
-  name: 'Approval',
-  type: 'event'
-}, {
-  anonymous: false,
-  inputs: [{
-    indexed: true,
-    name: 'from',
-    type: 'address'
-  }, {
-    indexed: true,
-    name: 'to',
-    type: 'address'
-  }, {
-    indexed: false,
-    name: 'value',
-    type: 'uint256'
-  }],
-  name: 'Transfer',
-  type: 'event'
-}];
-
-var erc721ABI = [{
-  inputs: [{
-    internalType: 'uint256',
-    name: 'tokenId',
-    type: 'uint256'
-  }],
-  name: 'ownerOf',
-  outputs: [{
-    internalType: 'address',
-    name: '',
-    type: 'address'
-  }],
-  stateMutability: 'view',
-  type: 'function'
-}, {
-  inputs: [{
-    internalType: 'uint256',
-    name: 'tokenId',
-    type: 'uint256'
-  }],
-  name: 'tokenURI',
-  outputs: [{
-    internalType: 'string',
-    name: '',
-    type: 'string'
-  }],
-  stateMutability: 'view',
-  type: 'function'
-}];
+const erc721ABI = ['event Approval(address indexed _owner, address indexed _approved, uint256 indexed _tokenId);', 'event ApprovalForAll(address indexed _owner, address indexed _operator, bool _approved);', 'event Transfer(address indexed _from, address indexed _to, uint256 indexed _tokenId);', 'function approve(address _approved, uint256 _tokenId) external payable;', 'function balanceOf(address _owner) external view returns (uint256);', 'function getApproved(uint256 _tokenId) external view returns (address);', 'function isApprovedForAll(address _owner, address _operator) external view returns (bool);', 'function name() view returns (string memory)', 'function ownerOf(uint256 _tokenId) external view returns (address);', 'function safeTransferFrom(address _from, address _to, uint256 _tokenId) external payable;', 'function safeTransferFrom(address _from, address _to, uint256 _tokenId, bytes data) external payable;', 'function setApprovalForAll(address _operator, bool _approved) external;', 'function symbol() view returns (string memory)', 'function tokenByIndex(uint256 _index) view returns (uint256)', 'function tokenOfOwnerByIndex(address _owner, uint256 _index) view returns (uint256 tokenId)', 'function tokenURI(uint256 _tokenId) view returns (string memory)', 'function totalSupply() view returns (uint256)', 'function transferFrom(address _from, address _to, uint256 _tokenId) external payable;'];
 
 // https://github.com/ethers-io/ethers.js/blob/master/packages/units/src.ts/index.ts#L10-L18
-var units = ['wei', 'kwei', 'mwei', 'gwei', 'szabo', 'finney', 'ether'];
-
+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';
-  if (ethereum.isMetaMask) return 'MetaMask';
-  if (ethereum.isCoinbaseWallet) return 'Coinbase Wallet';
-  if (ethereum.isFrame) return 'Frame';
-  if (ethereum.isTally) return 'Tally';
+
+  for (const [key, val] of injectedOptions) {
+    if (ethereum[key]) return val;
+  }
+
   return 'Injected';
 }
 
-var shimKey = 'injected.shimDisconnect';
+const shimKey = 'injected.shimDisconnect';
 
 var _provider = /*#__PURE__*/new WeakMap();
 
 class InjectedConnector extends base.Connector {
   constructor(config) {
-    super(_objectSpread2(_objectSpread2({}, config), {}, {
-      options: _objectSpread2({
-        shimDisconnect: true
-      }, config === null || config === void 0 ? void 0 : config.options)
-    }));
+    super({ ...config,
+      options: {
+        shimDisconnect: true,
+        ...(config === null || config === void 0 ? void 0 : config.options)
+      }
+    });
 
     base._defineProperty(this, "id", 'injected');
 
@@ -320,8 +73,8 @@ class InjectedConnector extends base.Connector {
     });
 
     base._defineProperty(this, "onChainChanged", chainId => {
-      var id = base.normalizeChainId(chainId);
-      var unsupported = this.isChainUnsupported(id);
+      const id = base.normalizeChainId(chainId);
+      const unsupported = this.isChainUnsupported(id);
       this.emit('change', {
         chain: {
           id,
@@ -331,232 +84,192 @@ class InjectedConnector extends base.Connector {
     });
 
     base._defineProperty(this, "onDisconnect", () => {
-      var _this$options, _client$storage;
+      var _this$options, _getClient$storage;
 
       this.emit('disconnect');
-      if ((_this$options = this.options) !== null && _this$options !== void 0 && _this$options.shimDisconnect) (_client$storage = client.storage) === null || _client$storage === void 0 ? void 0 : _client$storage.removeItem(shimKey);
+      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);
     });
 
-    var name = 'Injected';
+    let name = 'Injected';
     if (typeof window !== 'undefined') name = getInjectedName(window.ethereum);
     this.name = name;
   }
 
-  connect() {
-    var _this = this;
-
-    return base._asyncToGenerator(function* () {
-      try {
-        var _this$options2, _client$storage2;
-
-        var provider = yield _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'
-        });
-
-        var account = yield _this.getAccount();
-        var id = yield _this.getChainId();
+  async connect() {
+    try {
+      var _this$options2, _getClient$storage2;
 
-        var unsupported = _this.isChainUnsupported(id);
+      const provider = await this.getProvider();
+      if (!provider) throw new base.ConnectorNotFoundError();
 
-        if ((_this$options2 = _this.options) !== null && _this$options2 !== void 0 && _this$options2.shimDisconnect) (_client$storage2 = client.storage) === null || _client$storage2 === void 0 ? void 0 : _client$storage2.setItem(shimKey, true);
-        return {
-          account,
-          chain: {
-            id,
-            unsupported
-          },
-          provider
-        };
-      } catch (error) {
-        if (error.code === 4001) throw new base.UserRejectedRequestError();
-        throw error;
+      if (provider.on) {
+        provider.on('accountsChanged', this.onAccountsChanged);
+        provider.on('chainChanged', this.onChainChanged);
+        provider.on('disconnect', this.onDisconnect);
       }
-    })();
-  }
 
-  disconnect() {
-    var _this2 = this;
-
-    return base._asyncToGenerator(function* () {
-      var _this2$options, _client$storage3;
-
-      var provider = yield _this2.getProvider();
-      if (!(provider !== null && provider !== void 0 && provider.removeListener)) return;
-      provider.removeListener('accountsChanged', _this2.onAccountsChanged);
-      provider.removeListener('chainChanged', _this2.onChainChanged);
-      provider.removeListener('disconnect', _this2.onDisconnect);
-      if ((_this2$options = _this2.options) !== null && _this2$options !== void 0 && _this2$options.shimDisconnect) (_client$storage3 = client.storage) === null || _client$storage3 === void 0 ? void 0 : _client$storage3.removeItem(shimKey);
-    })();
+      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;
+    }
   }
 
-  getAccount() {
-    var _this3 = this;
+  async disconnect() {
+    var _this$options3, _getClient$storage3;
 
-    return base._asyncToGenerator(function* () {
-      var provider = yield _this3.getProvider();
-      if (!provider) throw new base.ConnectorNotFoundError();
-      var accounts = yield provider.request({
-        method: 'eth_requestAccounts'
-      }); // return checksum address
-
-      return utils.getAddress(accounts[0]);
-    })();
+    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);
   }
 
-  getChainId() {
-    var _this4 = this;
+  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 base._asyncToGenerator(function* () {
-      var provider = yield _this4.getProvider();
-      if (!provider) throw new base.ConnectorNotFoundError();
-      return yield provider.request({
-        method: 'eth_chainId'
-      }).then(base.normalizeChainId);
-    })();
+    return utils.getAddress(accounts[0]);
   }
 
-  getProvider() {
-    var _this5 = this;
-
-    return base._asyncToGenerator(function* () {
-      if (typeof window !== 'undefined' && !!window.ethereum) base._classPrivateFieldSet(_this5, _provider, window.ethereum);
-      return base._classPrivateFieldGet(_this5, _provider);
-    })();
+  async getChainId() {
+    const provider = await this.getProvider();
+    if (!provider) throw new base.ConnectorNotFoundError();
+    return await provider.request({
+      method: 'eth_chainId'
+    }).then(base.normalizeChainId);
   }
 
-  getSigner() {
-    var _this6 = this;
+  async getProvider() {
+    if (typeof window !== 'undefined' && !!window.ethereum) base._classPrivateFieldSet(this, _provider, window.ethereum);
+    return base._classPrivateFieldGet(this, _provider);
+  }
 
-    return base._asyncToGenerator(function* () {
-      var [provider, account] = yield Promise.all([_this6.getProvider(), _this6.getAccount()]);
-      return new ethers.providers.Web3Provider(provider).getSigner(account);
-    })();
+  async getSigner() {
+    const [provider, account] = await Promise.all([this.getProvider(), this.getAccount()]);
+    return new ethers.providers.Web3Provider(provider).getSigner(account);
   }
 
-  isAuthorized() {
-    var _this7 = this;
+  async isAuthorized() {
+    try {
+      var _this$options4, _getClient$storage4;
 
-    return base._asyncToGenerator(function* () {
-      try {
-        var _this7$options, _client$storage4;
-
-        if ((_this7$options = _this7.options) !== null && _this7$options !== void 0 && _this7$options.shimDisconnect && !((_client$storage4 = client.storage) !== null && _client$storage4 !== void 0 && _client$storage4.getItem(shimKey))) return false;
-        var provider = yield _this7.getProvider();
-        if (!provider) throw new base.ConnectorNotFoundError();
-        var accounts = yield provider.request({
-          method: 'eth_accounts'
-        });
-        var account = accounts[0];
-        return !!account;
-      } catch (_unused) {
-        return false;
-      }
-    })();
+      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;
+    }
   }
 
-  switchChain(chainId) {
-    var _this8 = this;
+  async switchChain(chainId) {
+    const provider = await this.getProvider();
+    if (!provider) throw new base.ConnectorNotFoundError();
+    const id = utils.hexValue(chainId);
 
-    return base._asyncToGenerator(function* () {
-      var provider = yield _this8.getProvider();
-      if (!provider) throw new base.ConnectorNotFoundError();
-      var id = utils.hexValue(chainId);
+    try {
+      var _chains$find;
 
-      try {
-        var _chains$find;
-
-        yield provider.request({
-          method: 'wallet_switchEthereumChain',
-          params: [{
-            chainId: id
-          }]
-        });
-        var chains = [..._this8.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: []
-        };
-      } catch (error) {
-        // Indicates chain is not added to MetaMask
-        if (error.code === 4902) {
-          try {
-            var _chain$blockExplorers;
-
-            var chain = _this8.chains.find(x => x.id === chainId);
-
-            if (!chain) throw new base.ChainNotConfiguredError();
-            yield provider.request({
-              method: 'wallet_addEthereumChain',
-              params: [{
-                chainId: id,
-                chainName: chain.name,
-                nativeCurrency: chain.nativeCurrency,
-                rpcUrls: chain.rpcUrls,
-                blockExplorerUrls: (_chain$blockExplorers = chain.blockExplorers) === null || _chain$blockExplorers === void 0 ? void 0 : _chain$blockExplorers.map(x => x.url)
-              }]
-            });
-            return chain;
-          } catch (addError) {
-            throw new base.AddChainError();
-          }
-        } else if (error.code === 4001) throw new base.UserRejectedRequestError();else throw new base.SwitchChainError();
-      }
-    })();
+      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();
+    }
   }
 
-  watchAsset(_ref) {
-    var _this9 = this;
-
-    return base._asyncToGenerator(function* () {
-      var {
-        address,
-        decimals = 18,
-        image,
-        symbol
-      } = _ref;
-      var provider = yield _this9.getProvider();
-      if (!provider) throw new base.ConnectorNotFoundError();
-      return yield provider.request({
-        method: 'wallet_watchAsset',
-        params: {
-          type: 'ERC20',
-          options: {
-            address,
-            decimals,
-            image,
-            symbol
-          }
+  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
         }
-      });
-    })();
+      }
+    });
   }
 
 }
 
-var noopStorage = {
+const noopStorage = {
   getItem: _key => '',
   setItem: (_key, _value) => null,
   removeItem: _key => null
 };
 function createStorage(_ref) {
-  var {
+  let {
     storage,
     key: prefix = 'wagmi'
   } = _ref;
-  return _objectSpread2(_objectSpread2({}, storage), {}, {
-    getItem: function getItem(key) {
-      var defaultState = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
-      var value = storage.getItem("".concat(prefix, ".").concat(key));
+  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;
@@ -577,26 +290,10 @@ function createStorage(_ref) {
       }
     },
     removeItem: key => storage.removeItem("".concat(prefix, ".").concat(key))
-  });
+  };
 }
 
-var defaultConfig = {
-  connectors: [new InjectedConnector()],
-  provider: _ref => {
-    var {
-      chainId
-    } = _ref;
-
-    try {
-      return ethers.getDefaultProvider(chainId);
-    } catch (error) {
-      return ethers.getDefaultProvider();
-    }
-  },
-  storage: createStorage({
-    storage: typeof window !== 'undefined' ? window.localStorage : noopStorage
-  })
-};
+const storeKey = 'store';
 
 var _lastUsedConnector = /*#__PURE__*/new WeakMap();
 
@@ -604,13 +301,9 @@ var _addEffects = /*#__PURE__*/new WeakSet();
 
 class Client {
   constructor() {
-    var {
-      autoConnect,
-      connectors: _connectors = defaultConfig.connectors,
-      provider: _provider = defaultConfig.provider,
-      storage = defaultConfig.storage,
-      webSocketProvider: _webSocketProvider
-    } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultConfig;
+    var _config$autoConnect, _config$connectors, _config$provider, _config$storage;
+
+    let config = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
 
     classPrivateMethodGet._classPrivateMethodInitSpec(this, _addEffects);
 
@@ -625,55 +318,80 @@ class Client {
       value: void 0
     });
 
-    this.config = {
-      autoConnect,
-      connectors: _connectors,
-      provider: _provider,
-      webSocketProvider: _webSocketProvider
+    // 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();
+      }
     };
-    var status = 'disconnected';
 
-    var _chainId;
+    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;
 
-        var rawState = storage.getItem('state', '');
-        var 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
+        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) {}
-    }
-
-    this.store = create__default["default"](middleware.subscribeWithSelector(middleware.persist((_set, _get) => ({
-      connectors: typeof _connectors === 'function' ? _connectors({
-        chainId: _chainId
-      }) : _connectors,
-      provider: typeof _provider === 'function' ? _provider({
-        chainId: _chainId
-      }) : _provider,
+    } // 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: typeof _webSocketProvider === 'function' ? _webSocketProvider({
-        chainId: _chainId
-      }) : _webSocketProvider
+      webSocketProvider: webSocketProvider_
     }), {
-      name: 'state',
+      name: storeKey,
       getStorage: () => storage,
       partialize: state => {
         var _state$data, _state$data2;
 
-        return _objectSpread2(_objectSpread2({}, this.config.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
-          }
-        }), {}, {
+        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'));
@@ -718,12 +436,12 @@ class Client {
   }
 
   setState(updater) {
-    var newState = typeof updater === 'function' ? updater(this.store.getState()) : updater;
+    const newState = typeof updater === 'function' ? updater(this.store.getState()) : updater;
     this.store.setState(newState, true);
   }
 
   clearState() {
-    this.setState(x => _objectSpread2(_objectSpread2({}, x), {}, {
+    this.setState(x => ({ ...x,
       connector: undefined,
       data: undefined,
       error: undefined,
@@ -731,85 +449,74 @@ class Client {
     }));
   }
 
-  destroy() {
-    var _this = this;
+  async destroy() {
+    var _this$connector$disco, _this$connector;
 
-    return base._asyncToGenerator(function* () {
-      var _this$connector$disco, _this$connector;
-
-      if (_this.connector) yield (_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();
-    })();
+    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();
   }
 
-  autoConnect() {
-    var _this2 = this;
-
-    return base._asyncToGenerator(function* () {
-      if (!_this2.connectors.length) return; // Try last used connector first
-
-      var sorted = base._classPrivateFieldGet(_this2, _lastUsedConnector) ? [..._this2.connectors].sort(x => x.id === base._classPrivateFieldGet(_this2, _lastUsedConnector) ? -1 : 1) : _this2.connectors;
-      var connected = false;
-
-      var _loop = function* _loop(connector) {
-        if (!connector.ready || !connector.isAuthorized) return "continue";
-        var isAuthorized = yield connector.isAuthorized();
-        if (!isAuthorized) return "continue";
-        var data = yield connector.connect();
-
-        _this2.setState(x => _objectSpread2(_objectSpread2({}, x), {}, {
-          connector,
-          chains: connector === null || connector === void 0 ? void 0 : connector.chains,
-          data,
-          status: 'connected'
-        }));
-
-        connected = true;
-        return "break";
-      };
-
-      for (var connector of sorted) {
-        var _ret = yield* _loop(connector);
-
-        if (_ret === "continue") continue;
-        if (_ret === "break") break;
-      } // If connecting didn't succeed, set to disconnected
+  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) _this2.setState(x => _objectSpread2(_objectSpread2({}, x), {}, {
-        status: 'disconnected'
-      }));
-      return _this2.data;
-    })();
+    if (!connected) this.setState(x => ({ ...x,
+      status: 'disconnected'
+    }));
+    return this.data;
   }
 
   setLastUsedConnector() {
     var _this$storage;
 
-    var lastUsedConnector = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
+    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() {
-  var onChange = data => this.setState(x => _objectSpread2(_objectSpread2({}, x), {}, {
-    data: _objectSpread2(_objectSpread2({}, x.data), data)
-  }));
+  const onChange = data => {
+    this.setState(x => ({ ...x,
+      data: { ...x.data,
+        ...data
+      }
+    }));
+  };
 
-  var onDisconnect = () => this.clearState();
+  const onDisconnect = () => {
+    this.clearState();
+  };
 
-  var onError = error => this.setState(x => _objectSpread2(_objectSpread2({}, x), {}, {
-    error
-  }));
+  const onError = error => {
+    this.setState(x => ({ ...x,
+      error
+    }));
+  };
 
-  this.store.subscribe(_ref2 => {
-    var {
+  this.store.subscribe(_ref => {
+    let {
       connector
-    } = _ref2;
+    } = _ref;
     return connector;
   }, (connector, prevConnector) => {
     var _prevConnector$off, _prevConnector$off2, _prevConnector$off3, _connector$on, _connector$on2, _connector$on3;
@@ -822,23 +529,23 @@ function _addEffects2() {
     (_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);
   });
-  var {
+  const {
     connectors,
     provider,
     webSocketProvider
   } = this.config;
-  var subscribeConnectors = typeof connectors === 'function';
-  var subscribeProvider = typeof provider === 'function';
-  var subscribeWebSocketProvider = typeof webSocketProvider === 'function';
-  if (subscribeConnectors || subscribeProvider || subscribeWebSocketProvider) this.store.subscribe(_ref3 => {
+  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;
 
-    var {
+    let {
       data
-    } = _ref3;
+    } = _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 => _objectSpread2(_objectSpread2({}, x), {}, {
+    this.setState(x => ({ ...x,
       connectors: subscribeConnectors ? connectors({
         chainId
       }) : x.connectors,
@@ -852,109 +559,143 @@ function _addEffects2() {
   });
 }
 
-var client;
+let client;
 function createClient(config) {
-  var client_ = new Client(config);
+  const client_ = new Client(config);
   client = client_;
   return client_;
 }
+function getClient() {
+  return client;
+}
 
-function connect(_x) {
-  return _connect.apply(this, arguments);
+async function connect(_ref) {
+  let {
+    connector
+  } = _ref;
+  const activeConnector = 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,
+    connector,
+    chains: connector === null || connector === void 0 ? void 0 : connector.chains,
+    data
+  }));
+  client.storage.setItem('connected', true);
+  return { ...data,
+    connector
+  };
 }
 
-function _connect() {
-  _connect = base._asyncToGenerator(function* (connector) {
-    var activeConnector = client.connector;
-    if (connector.id === (activeConnector === null || activeConnector === void 0 ? void 0 : activeConnector.id)) throw new base.ConnectorAlreadyConnectedError();
-    var data = yield connector.connect();
-    client.setLastUsedConnector(connector.id);
-    client.setState(x => _objectSpread2(_objectSpread2({}, x), {}, {
-      connector,
-      chains: connector === null || connector === void 0 ? void 0 : connector.chains,
-      data
-    }));
-    client.storage.setItem('connected', true);
-    return {
-      data,
-      connector
-    };
-  });
-  return _connect.apply(this, arguments);
+async function disconnect() {
+  const client = getClient();
+  if (client.connector) await client.connector.disconnect();
+  client.clearState();
+  client.storage.removeItem('connected');
 }
 
-function disconnect() {
-  return _disconnect.apply(this, arguments);
+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({
+    chainId
+  });
+  return client.provider;
 }
 
-function _disconnect() {
-  _disconnect = base._asyncToGenerator(function* () {
-    if (client.connector) yield client.connector.disconnect();
-    client.storage.removeItem('connected');
-    client.clearState();
+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({
+    chainId
   });
-  return _disconnect.apply(this, arguments);
+  return client.webSocketProvider;
 }
 
-function fetchBalance(_x) {
-  return _fetchBalance.apply(this, arguments);
+function watchProvider(args, callback) {
+  const client = getClient();
+
+  const handleChange = async () => callback(getProvider(args));
+
+  const unsubscribe = client.subscribe(_ref => {
+    let {
+      provider
+    } = _ref;
+    return provider;
+  }, handleChange);
+  return unsubscribe;
 }
 
-function _fetchBalance() {
-  _fetchBalance = base._asyncToGenerator(function* (_ref) {
-    var _client$connector$cha, _client$connector, _chain$nativeCurrency, _chain$nativeCurrency2, _chain$nativeCurrency3, _chain$nativeCurrency4;
+function watchWebSocketProvider(args, callback) {
+  const client = getClient();
+
+  const handleChange = async () => callback(getWebSocketProvider(args));
 
-    var {
-      addressOrName,
-      formatUnits: unit = 'ether',
-      token
+  const unsubscribe = client.subscribe(_ref => {
+    let {
+      webSocketProvider
     } = _ref;
+    return webSocketProvider;
+  }, handleChange);
+  return unsubscribe;
+}
 
-    if (token) {
-      var contract = new ethers$1.Contract(token, erc20ABI, client.provider);
-      var [_value, decimals, symbol] = yield Promise.all([contract.balanceOf(addressOrName), contract.decimals(), contract.symbol()]);
-      return {
-        decimals,
-        formatted: utils.formatUnits(_value, unit),
-        symbol,
-        unit,
-        value: _value
-      };
-    }
+async function fetchBalance(_ref) {
+  var _client$connector$cha, _client$connector, _chain$nativeCurrency, _chain$nativeCurrency2, _chain$nativeCurrency3, _chain$nativeCurrency4;
+
+  let {
+    addressOrName,
+    chainId,
+    formatUnits: unit = 'ether',
+    token
+  } = _ref;
+  const client = getClient();
+  const provider = getProvider({
+    chainId
+  });
 
-    var 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];
-    var value = yield client.provider.getBalance(addressOrName);
-    var chain = chains.find(x => x.id === client.provider.network.chainId);
+  if (token) {
+    const contract = new ethers$1.Contract(token, erc20ABI, provider);
+    const [value, decimals, symbol] = await Promise.all([contract.balanceOf(addressOrName), contract.decimals(), contract.symbol()]);
     return {
-      decimals: (_chain$nativeCurrency = chain === null || chain === void 0 ? void 0 : (_chain$nativeCurrency2 = chain.nativeCurrency) === null || _chain$nativeCurrency2 === void 0 ? void 0 : _chain$nativeCurrency2.decimals) !== null && _chain$nativeCurrency !== void 0 ? _chain$nativeCurrency : 18,
+      decimals,
       formatted: utils.formatUnits(value, unit),
-      symbol: (_chain$nativeCurrency3 = chain === null || chain === void 0 ? void 0 : (_chain$nativeCurrency4 = chain.nativeCurrency) === null || _chain$nativeCurrency4 === void 0 ? void 0 : _chain$nativeCurrency4.symbol) !== null && _chain$nativeCurrency3 !== void 0 ? _chain$nativeCurrency3 : 'ETH',
+      symbol,
       unit,
       value
     };
-  });
-  return _fetchBalance.apply(this, arguments);
-}
+  }
 
-function fetchSigner() {
-  return _fetchSigner.apply(this, arguments);
+  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 value = await provider.getBalance(addressOrName);
+  const chain = chains.find(x => x.id === provider.network.chainId);
+  return {
+    decimals: (_chain$nativeCurrency = chain === null || chain === void 0 ? void 0 : (_chain$nativeCurrency2 = chain.nativeCurrency) === null || _chain$nativeCurrency2 === void 0 ? void 0 : _chain$nativeCurrency2.decimals) !== null && _chain$nativeCurrency !== void 0 ? _chain$nativeCurrency : 18,
+    formatted: utils.formatUnits(value, unit),
+    symbol: (_chain$nativeCurrency3 = chain === null || chain === void 0 ? void 0 : (_chain$nativeCurrency4 = chain.nativeCurrency) === null || _chain$nativeCurrency4 === void 0 ? void 0 : _chain$nativeCurrency4.symbol) !== null && _chain$nativeCurrency3 !== void 0 ? _chain$nativeCurrency3 : 'ETH',
+    unit,
+    value
+  };
 }
 
-function _fetchSigner() {
-  _fetchSigner = base._asyncToGenerator(function* () {
-    var _client$connector, _client$connector$get;
+async function fetchSigner() {
+  var _client$connector, _client$connector$get;
 
-    var signer = yield (_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);
-    return signer;
-  });
-  return _fetchSigner.apply(this, arguments);
+  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;
+  return signer;
 }
 
 function getAccount() {
-  var {
+  const {
     data,
     connector
-  } = client;
+  } = getClient();
   return {
     address: data === null || data === void 0 ? void 0 : data.account,
     connector
@@ -962,88 +703,71 @@ function getAccount() {
 }
 
 function getNetwork() {
-  var _data$chain, _data$chain2, _find;
+  var _client$data, _client$data$chain, _client$chains, _find, _client$data2;
 
-  var {
-    chains,
-    data
-  } = client;
-  var chainId = data === null || data === void 0 ? void 0 : (_data$chain = data.chain) === null || _data$chain === void 0 ? void 0 : _data$chain.id;
-  var unsupported = data === null || data === void 0 ? void 0 : (_data$chain2 = data.chain) === null || _data$chain2 === void 0 ? void 0 : _data$chain2.unsupported;
-  var activeChains = chains !== null && chains !== void 0 ? chains : [];
-  var activeChain = (_find = [...activeChains, ...base.allChains].find(x => x.id === chainId)) !== null && _find !== void 0 ? _find : {
+  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 activeChain = (_find = [...activeChains, ...base.allChains].find(x => x.id === chainId)) !== null && _find !== void 0 ? _find : {
     id: chainId,
     name: "Chain ".concat(chainId),
-    rpcUrls: []
+    rpcUrls: {
+      default: ''
+    }
   };
   return {
-    chain: chainId ? _objectSpread2(_objectSpread2({}, activeChain), {}, {
-      id: chainId,
-      unsupported
-    }) : undefined,
+    chain: chainId ? { ...activeChain,
+      ...((_client$data2 = client.data) === null || _client$data2 === void 0 ? void 0 : _client$data2.chain),
+      id: chainId
+    } : undefined,
     chains: activeChains
   };
 }
 
-function signMessage(_x) {
-  return _signMessage.apply(this, arguments);
-}
-
-function _signMessage() {
-  _signMessage = base._asyncToGenerator(function* (args) {
-    try {
-      var signer = yield fetchSigner();
-      if (!signer) throw new base.ConnectorNotFoundError();
-      return yield signer.signMessage(args.message);
-    } catch (error_) {
-      var error = error_;
-      if (error_.code === 4001) error = new base.UserRejectedRequestError();
-      throw error;
-    }
-  });
-  return _signMessage.apply(this, arguments);
-}
-
-function signTypedData(_x) {
-  return _signTypedData.apply(this, arguments);
+async function signMessage(args) {
+  try {
+    const signer = await fetchSigner();
+    if (!signer) throw new base.ConnectorNotFoundError();
+    return await signer.signMessage(args.message);
+  } catch (error_) {
+    let error = error_;
+    if (error_.code === 4001) error = new base.UserRejectedRequestError();
+    throw error;
+  }
 }
 
-function _signTypedData() {
-  _signTypedData = base._asyncToGenerator(function* (args) {
-    try {
-      var signer = yield fetchSigner();
-      if (!signer) throw new base.ConnectorNotFoundError(); // Method name may be changed in the future, see https://docs.ethers.io/v5/api/signer/#Signer-signTypedData
+async function signTypedData(args) {
+  try {
+    const signer = await fetchSigner();
+    if (!signer) throw new base.ConnectorNotFoundError(); // Method name may be changed in the future, see https://docs.ethers.io/v5/api/signer/#Signer-signTypedData
 
-      return yield signer._signTypedData(args.domain, args.types, args.value);
-    } catch (error_) {
-      var error = error_;
-      if (error_.code === 4001) error = new base.UserRejectedRequestError();
-      throw error;
-    }
-  });
-  return _signTypedData.apply(this, arguments);
-}
-
-function switchNetwork(_x) {
-  return _switchNetwork.apply(this, arguments);
+    return await signer._signTypedData(args.domain, args.types, args.value);
+  } catch (error_) {
+    let error = error_;
+    if (error_.code === 4001) error = new base.UserRejectedRequestError();
+    throw error;
+  }
 }
 
-function _switchNetwork() {
-  _switchNetwork = base._asyncToGenerator(function* (args) {
-    var _client$connector;
+async function switchNetwork(_ref) {
+  var _client$connector;
 
-    if (!((_client$connector = client.connector) !== null && _client$connector !== void 0 && _client$connector.switchChain)) throw new base.SwitchChainNotSupportedError();
-    var chain = yield client.connector.switchChain(args.chainId);
-    return chain;
-  });
-  return _switchNetwork.apply(this, arguments);
+  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);
+  return chain;
 }
 
 function watchAccount(callback) {
-  var handleChange = () => callback(getAccount());
+  const client = getClient();
+
+  const handleChange = () => callback(getAccount());
 
-  var unsubscribe = client.subscribe(_ref => {
-    var {
+  const unsubscribe = client.subscribe(_ref => {
+    let {
       data,
       connector
     } = _ref;
@@ -1057,40 +781,15 @@ function watchAccount(callback) {
   return unsubscribe;
 }
 
-function watchBalance(args, callback) {
-  var handleChange = /*#__PURE__*/function () {
-    var _ref = base._asyncToGenerator(function* () {
-      return callback(yield fetchBalance(args));
-    });
-
-    return function handleChange() {
-      return _ref.apply(this, arguments);
-    };
-  }();
-
-  var unsubscribe = client.subscribe(_ref2 => {
-    var _data$chain;
-
-    var {
-      data
-    } = _ref2;
-    return {
-      account: data === null || data === void 0 ? void 0 : data.account,
-      chainId: data === null || data === void 0 ? void 0 : (_data$chain = data.chain) === null || _data$chain === void 0 ? void 0 : _data$chain.id
-    };
-  }, handleChange, {
-    equalityFn: (selected, previous) => selected.account === previous.account && selected.chainId === previous.chainId
-  });
-  return unsubscribe;
-}
-
 function watchNetwork(callback) {
-  var handleChange = () => callback(getNetwork());
+  const client = getClient();
 
-  var unsubscribe = client.subscribe(_ref => {
+  const handleChange = () => callback(getNetwork());
+
+  const unsubscribe = client.subscribe(_ref => {
     var _data$chain;
 
-    var {
+    let {
       data,
       chains
     } = _ref;
@@ -1105,23 +804,17 @@ function watchNetwork(callback) {
 }
 
 function watchSigner(callback) {
-  var handleChange = /*#__PURE__*/function () {
-    var _ref = base._asyncToGenerator(function* () {
-      return callback(yield fetchSigner());
-    });
+  const client = getClient();
 
-    return function handleChange() {
-      return _ref.apply(this, arguments);
-    };
-  }();
+  const handleChange = async () => callback(await fetchSigner());
 
-  var unsubscribe = client.subscribe(_ref2 => {
+  const unsubscribe = client.subscribe(_ref => {
     var _data$chain;
 
-    var {
+    let {
       data,
       connector
-    } = _ref2;
+    } = _ref;
     return {
       account: data === null || data === void 0 ? void 0 : data.account,
       chainId: data === null || data === void 0 ? void 0 : (_data$chain = data.chain) === null || _data$chain === void 0 ? void 0 : _data$chain.id,
@@ -1134,7 +827,7 @@ function watchSigner(callback) {
 }
 
 function getContract(_ref) {
-  var {
+  let {
     addressOrName,
     contractInterface,
     signerOrProvider
@@ -1142,27 +835,24 @@ function getContract(_ref) {
   return new ethers$1.Contract(addressOrName, contractInterface, signerOrProvider);
 }
 
-function readContract(_x, _x2) {
-  return _readContract.apply(this, arguments);
-}
-
-function _readContract() {
-  _readContract = base._asyncToGenerator(function* (contractConfig, functionName) {
-    var {
-      args,
-      overrides
-    } = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-    var {
-      provider
-    } = client;
-    var contract = getContract(_objectSpread2({
-      signerOrProvider: provider
-    }, contractConfig));
-    var params = [...(Array.isArray(args) ? args : args ? [args] : []), ...(overrides ? [overrides] : [])];
-    var response = yield contract[functionName](...params);
-    return response;
+async function readContract(contractConfig, functionName) {
+  let {
+    args,
+    chainId,
+    overrides
+  } = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+  const provider = getProvider({
+    chainId
+  });
+  const contract = getContract({
+    signerOrProvider: provider,
+    ...contractConfig
   });
-  return _readContract.apply(this, arguments);
+  const params = [...(Array.isArray(args) ? args : args ? [args] : []), ...(overrides ? [overrides] : [])];
+  const contractFunction = contract[functionName];
+  if (!contractFunction) console.warn("\"".concat(functionName, "\" does not in interface for contract \"").concat(contractConfig.addressOrName, "\""));
+  const response = await (contractFunction === null || contractFunction === void 0 ? void 0 : contractFunction(...params));
+  return response;
 }
 
 function watchContractEvent(
@@ -1170,36 +860,37 @@ function watchContractEvent(
 contractArgs,
 /** Event name to listen to */
 eventName, callback) {
-  var {
+  let {
+    chainId,
     once
   } = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
-  var contract;
+  let contract;
 
-  var watchEvent = /*#__PURE__*/function () {
-    var _ref = base._asyncToGenerator(function* () {
-      if (contract) {
-        var _contract;
+  const watchEvent = async () => {
+    if (contract) {
+      var _contract;
 
-        (_contract = contract) === null || _contract === void 0 ? void 0 : _contract.off(eventName, callback);
-      }
+      (_contract = contract) === null || _contract === void 0 ? void 0 : _contract.off(eventName, callback);
+    }
 
-      contract = getContract(_objectSpread2({
-        signerOrProvider: client.webSocketProvider || client.provider
-      }, contractArgs));
-      if (once) contract.once(eventName, callback);else contract.on(eventName, callback);
+    contract = getContract({
+      signerOrProvider: getWebSocketProvider({
+        chainId
+      }) || getProvider({
+        chainId
+      }),
+      ...contractArgs
     });
-
-    return function watchEvent() {
-      return _ref.apply(this, arguments);
-    };
-  }();
+    if (once) contract.once(eventName, callback);else contract.on(eventName, callback);
+  };
 
   watchEvent();
-  var unsubscribe = client.subscribe(_ref2 => {
-    var {
+  const client = getClient();
+  const unsubscribe = client.subscribe(_ref => {
+    let {
       provider,
       webSocketProvider
-    } = _ref2;
+    } = _ref;
     return {
       provider,
       webSocketProvider
@@ -1215,44 +906,38 @@ eventName, callback) {
   };
 }
 
-function fetchBlockNumber() {
-  return _fetchBlockNumber.apply(this, arguments);
-}
-
-function _fetchBlockNumber() {
-  _fetchBlockNumber = base._asyncToGenerator(function* () {
-    var blockNumber = yield client.provider.getBlockNumber();
-    return blockNumber;
+async function fetchBlockNumber() {
+  let {
+    chainId
+  } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  const provider = getProvider({
+    chainId
   });
-  return _fetchBlockNumber.apply(this, arguments);
+  const blockNumber = await provider.getBlockNumber();
+  return blockNumber;
 }
 
 function watchBlockNumber(args, callback) {
-  var prevProvider;
+  var _client$webSocketProv;
 
-  var createListener = provider => {
-    var listener = blockNumber => {
-      callback(blockNumber);
-    };
+  let prevProvider;
 
+  const createListener = provider => {
     if (prevProvider) {
       var _prevProvider;
 
-      (_prevProvider = prevProvider) === null || _prevProvider === void 0 ? void 0 : _prevProvider.off('block', listener);
+      (_prevProvider = prevProvider) === null || _prevProvider === void 0 ? void 0 : _prevProvider.off('block', callback);
     }
 
-    provider.on('block', listener);
+    provider.on('block', callback);
     prevProvider = provider;
   };
 
-  var {
-    provider,
-    webSocketProvider
-  } = client;
-  var provider_ = webSocketProvider !== null && webSocketProvider !== void 0 ? webSocketProvider : provider;
+  const client = getClient();
+  const provider_ = (_client$webSocketProv = client.webSocketProvider) !== null && _client$webSocketProv !== void 0 ? _client$webSocketProv : client.provider;
   if (args.listen) createListener(provider_);
-  var unsubscribe = client.subscribe(_ref => {
-    var {
+  const unsubscribe = client.subscribe(_ref => {
+    let {
       provider,
       webSocketProvider
     } = _ref;
@@ -1260,53 +945,43 @@ function watchBlockNumber(args, callback) {
       provider,
       webSocketProvider
     };
-  }, /*#__PURE__*/function () {
-    var _ref3 = base._asyncToGenerator(function* (_ref2) {
-      var {
-        provider,
-        webSocketProvider
-      } = _ref2;
-      var provider_ = webSocketProvider !== null && webSocketProvider !== void 0 ? webSocketProvider : provider;
-
-      if (args.listen && provider_) {
-        createListener(provider_);
-      }
+  }, async _ref2 => {
+    let {
+      provider,
+      webSocketProvider
+    } = _ref2;
+    const provider_ = webSocketProvider !== null && webSocketProvider !== void 0 ? webSocketProvider : provider;
 
-      callback(yield fetchBlockNumber());
-    });
+    if (args.listen && provider_) {
+      createListener(provider_);
+    }
 
-    return function (_x) {
-      return _ref3.apply(this, arguments);
-    };
-  }(), {
+    callback(await fetchBlockNumber());
+  }, {
     equalityFn: (selected, previous) => selected.provider === previous.provider && selected.webSocketProvider === previous.webSocketProvider
   });
-  return unsubscribe;
+  return () => {
+    unsubscribe();
+    provider_ === null || provider_ === void 0 ? void 0 : provider_.off('block', callback);
+  };
 }
 
 function watchReadContract(contractConfig, functionName) {
   var _config$listenToBlock;
 
-  var config = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-  var callback = arguments.length > 3 ? arguments[3] : undefined;
-
-  var handleChange = /*#__PURE__*/function () {
-    var _ref = base._asyncToGenerator(function* () {
-      return callback(yield readContract(contractConfig, functionName, config));
-    });
+  let config = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+  let callback = arguments.length > 3 ? arguments[3] : undefined;
+  const client = getClient();
 
-    return function handleChange() {
-      return _ref.apply(this, arguments);
-    };
-  }();
+  const handleChange = async () => callback(await readContract(contractConfig, functionName, config));
 
-  var unwatch = ((_config$listenToBlock = config.listenToBlock) !== null && _config$listenToBlock !== void 0 ? _config$listenToBlock : true) ? watchBlockNumber({
+  const unwatch = ((_config$listenToBlock = config.listenToBlock) !== null && _config$listenToBlock !== void 0 ? _config$listenToBlock : true) ? watchBlockNumber({
     listen: true
   }, handleChange) : undefined;
-  var unsubscribe = client.subscribe(_ref2 => {
-    var {
+  const unsubscribe = client.subscribe(_ref => {
+    let {
       provider
-    } = _ref2;
+    } = _ref;
     return provider;
   }, handleChange);
   return () => {
@@ -1315,326 +990,157 @@ function watchReadContract(contractConfig, functionName) {
   };
 }
 
-function writeContract(_x, _x2) {
-  return _writeContract.apply(this, arguments);
+async function writeContract(contractConfig, functionName) {
+  let {
+    args,
+    overrides
+  } = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+  const client = getClient();
+  if (!client.connector) throw new base.ConnectorNotFoundError();
+  const params = [...(Array.isArray(args) ? args : args ? [args] : []), ...(overrides ? [overrides] : [])];
+
+  try {
+    const signer = await client.connector.getSigner();
+    const contract = getContract(contractConfig);
+    const contractWithSigner = contract.connect(signer);
+    const contractFunction = contractWithSigner[functionName];
+    if (!contractFunction) console.warn("\"".concat(functionName, "\" does not in interface for contract \"").concat(contractConfig.addressOrName, "\""));
+    const response = await contractFunction(...params);
+    return response;
+  } catch (error_) {
+    let error = error_;
+    if (error_.code === 4001) error = new base.UserRejectedRequestError();
+    throw error;
+  }
 }
 
-function _writeContract() {
-  _writeContract = base._asyncToGenerator(function* (contractConfig, functionName) {
-    var {
-      args,
-      overrides
-    } = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-    var {
-      connector
-    } = client;
-    var contract = getContract(contractConfig);
-    if (!connector) throw new base.ConnectorNotFoundError();
-    var params = [...(Array.isArray(args) ? args : args ? [args] : []), ...(overrides ? [overrides] : [])];
-
-    try {
-      var signer = yield connector.getSigner();
-      var contract_ = contract.connect(signer);
-      var response = yield contract_[functionName](...params);
-      return response;
-    } catch (error_) {
-      var error = error_;
-      if (error_.code === 4001) error = new base.UserRejectedRequestError();
-      throw error;
-    }
+async function fetchEnsAddress(_ref) {
+  let {
+    chainId,
+    name
+  } = _ref;
+  const provider = getProvider({
+    chainId
   });
-  return _writeContract.apply(this, arguments);
-}
+  const address = await provider.resolveName(name);
 
-function fetchEnsAddress(_x) {
-  return _fetchEnsAddress.apply(this, arguments);
+  try {
+    return address ? utils.getAddress(address) : null;
+  } catch (_error) {
+    return null;
+  }
 }
 
-function _fetchEnsAddress() {
-  _fetchEnsAddress = base._asyncToGenerator(function* (_ref) {
-    var {
-      name
-    } = _ref;
-    var address = yield client.provider.resolveName(name);
-
-    try {
-      return address ? utils.getAddress(address) : null;
-    } catch (_error) {
-      return null;
-    }
-  });
-  return _fetchEnsAddress.apply(this, arguments);
-}
+async function fetchEnsAvatar(_ref) {
+  let {
+    addressOrName,
+    chainId
+  } = _ref;
+  const provider = getProvider({
+    chainId
+  }); // TODO: Update with more advanced logic
+  // https://github.com/ensdomains/ens-avatar
 
-function fetchEnsAvatar(_x) {
-  return _fetchEnsAvatar.apply(this, arguments);
+  const avatar = await provider.getAvatar(addressOrName);
+  return avatar;
 }
 
-function _fetchEnsAvatar() {
-  _fetchEnsAvatar = base._asyncToGenerator(function* (_ref) {
-    var {
-      addressOrName
-    } = _ref;
-    // TODO: Update with more advanced logic
-    // https://github.com/ensdomains/ens-avatar
-    var avatar = yield client.provider.getAvatar(addressOrName);
-    return avatar;
+async function fetchEnsName(_ref) {
+  let {
+    address,
+    chainId
+  } = _ref;
+  const provider = getProvider({
+    chainId
   });
-  return _fetchEnsAvatar.apply(this, arguments);
-}
-
-function fetchEnsName(_x) {
-  return _fetchEnsName.apply(this, arguments);
+  return await provider.lookupAddress(address);
 }
 
-function _fetchEnsName() {
-  _fetchEnsName = base._asyncToGenerator(function* (_ref) {
-    var {
-      address
-    } = _ref;
-    var ensName = yield client.provider.lookupAddress(address);
-    return ensName;
+async function fetchEnsResolver(_ref) {
+  let {
+    chainId,
+    name
+  } = _ref;
+  const provider = getProvider({
+    chainId
   });
-  return _fetchEnsName.apply(this, arguments);
+  const resolver = await provider.getResolver(name);
+  return resolver;
 }
 
-function fetchEnsResolver(_x) {
-  return _fetchEnsResolver.apply(this, arguments);
-}
-
-function _fetchEnsResolver() {
-  _fetchEnsResolver = base._asyncToGenerator(function* (_ref) {
-    var {
-      name
-    } = _ref;
-    var resolver = yield client.provider.getResolver(name);
-    return resolver;
+async function fetchFeeData() {
+  let {
+    chainId,
+    formatUnits: units = 'wei'
+  } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  const provider = getProvider({
+    chainId
   });
-  return _fetchEnsResolver.apply(this, arguments);
-}
-
-function watchEnsAddress(args, callback) {
-  var handleChange = /*#__PURE__*/function () {
-    var _ref = base._asyncToGenerator(function* () {
-      return callback(yield fetchEnsAddress(args));
-    });
-
-    return function handleChange() {
-      return _ref.apply(this, arguments);
-    };
-  }();
-
-  var unsubscribe = client.subscribe(_ref2 => {
-    var {
-      provider
-    } = _ref2;
-    return provider;
-  }, handleChange);
-  return unsubscribe;
-}
-
-function watchEnsAvatar(args, callback) {
-  var handleChange = /*#__PURE__*/function () {
-    var _ref = base._asyncToGenerator(function* () {
-      return callback(yield fetchEnsAvatar(args));
-    });
-
-    return function handleChange() {
-      return _ref.apply(this, arguments);
-    };
-  }();
-
-  var unsubscribe = client.subscribe(_ref2 => {
-    var {
-      provider
-    } = _ref2;
-    return provider;
-  }, handleChange);
-  return unsubscribe;
-}
-
-function watchEnsName(args, callback) {
-  var handleChange = /*#__PURE__*/function () {
-    var _ref = base._asyncToGenerator(function* () {
-      return callback(yield fetchEnsName(args));
-    });
-
-    return function handleChange() {
-      return _ref.apply(this, arguments);
-    };
-  }();
-
-  var unsubscribe = client.subscribe(_ref2 => {
-    var {
-      provider
-    } = _ref2;
-    return provider;
-  }, handleChange);
-  return unsubscribe;
-}
-
-function watchEnsResolver(args, callback) {
-  var handleChange = /*#__PURE__*/function () {
-    var _ref = base._asyncToGenerator(function* () {
-      return callback(yield fetchEnsResolver(args));
-    });
-
-    return function handleChange() {
-      return _ref.apply(this, arguments);
-    };
-  }();
-
-  var unsubscribe = client.subscribe(_ref2 => {
-    var {
-      provider
-    } = _ref2;
-    return provider;
-  }, handleChange);
-  return unsubscribe;
-}
-
-function fetchFeeData() {
-  return _fetchFeeData.apply(this, arguments);
+  const feeData = await provider.getFeeData();
+  const formatted = {
+    gasPrice: utils.formatUnits(feeData.gasPrice, units),
+    maxFeePerGas: utils.formatUnits(feeData.maxFeePerGas, units),
+    maxPriorityFeePerGas: utils.formatUnits(feeData.maxPriorityFeePerGas, units)
+  };
+  return { ...feeData,
+    formatted
+  };
 }
 
-function _fetchFeeData() {
-  _fetchFeeData = base._asyncToGenerator(function* () {
-    var {
-      formatUnits: units = 'wei'
-    } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    var feeData = yield client.provider.getFeeData();
-    var formatted = {
-      gasPrice: utils.formatUnits(feeData.gasPrice, units),
-      maxFeePerGas: utils.formatUnits(feeData.maxFeePerGas, units),
-      maxPriorityFeePerGas: utils.formatUnits(feeData.maxPriorityFeePerGas, units)
-    };
-    return _objectSpread2(_objectSpread2({}, feeData), {}, {
-      formatted
-    });
+async function fetchToken(_ref) {
+  let {
+    address,
+    chainId,
+    formatUnits: units = 'ether'
+  } = _ref;
+  const provider = getProvider({
+    chainId
   });
-  return _fetchFeeData.apply(this, arguments);
-}
-
-function watchFeeData(args, callback) {
-  var handleChange = /*#__PURE__*/function () {
-    var _ref = base._asyncToGenerator(function* () {
-      return callback(yield fetchFeeData(args));
-    });
-
-    return function handleChange() {
-      return _ref.apply(this, arguments);
-    };
-  }();
-
-  var unwatch = args.listenToBlock ? watchBlockNumber({
-    listen: true
-  }, handleChange) : undefined;
-  var unsubscribe = client.subscribe(_ref2 => {
-    var {
-      provider
-    } = _ref2;
-    return provider;
-  }, handleChange);
-  return () => {
-    unsubscribe();
-    unwatch === null || unwatch === void 0 ? void 0 : unwatch();
+  const contract = new ethers$1.Contract(address, erc20ABI, provider);
+  const [symbol, decimals, totalSupply] = await Promise.all([contract.symbol(), contract.decimals(), contract.totalSupply()]);
+  const token = {
+    address,
+    decimals,
+    symbol,
+    totalSupply: {
+      formatted: utils.formatUnits(totalSupply, units),
+      value: totalSupply
+    }
   };
+  return token;
 }
 
-function getProvider() {
-  return client.provider;
-}
-
-function getWebSocketProvider() {
-  return client.webSocketProvider;
-}
-
-function fetchToken(_x) {
-  return _fetchToken.apply(this, arguments);
+async function sendTransaction(args) {
+  try {
+    const signer = await fetchSigner();
+    if (!signer) throw new base.ConnectorNotFoundError();
+    const transaction = await signer.sendTransaction(args.request);
+    return transaction;
+  } catch (error_) {
+    let error = error_;
+    if (error_.code === 4001) error = new base.UserRejectedRequestError();
+    throw error;
+  }
 }
 
-function _fetchToken() {
-  _fetchToken = base._asyncToGenerator(function* (_ref) {
-    var {
-      address,
-      formatUnits: units = 'ether'
-    } = _ref;
-    if (!address) throw new Error('address is required');
-    var {
-      provider
-    } = client;
-    var contract = new ethers$1.Contract(address, erc20ABI, provider);
-    var [symbol, decimals, totalSupply] = yield Promise.all([contract.symbol(), contract.decimals(), contract.totalSupply()]);
-    var token = {
-      address,
-      decimals,
-      symbol,
-      totalSupply: {
-        formatted: utils.formatUnits(totalSupply, units),
-        value: totalSupply
-      }
-    };
-    return token;
-  });
-  return _fetchToken.apply(this, arguments);
-}
+async function waitForTransaction(_ref) {
+  let {
+    chainId,
+    confirmations,
+    hash,
+    timeout,
+    wait: wait_
+  } = _ref;
+  let promise;
 
-function watchToken(args, callback) {
-  var handleChange = /*#__PURE__*/function () {
-    var _ref = base._asyncToGenerator(function* () {
-      return callback(yield fetchToken(args));
+  if (hash) {
+    const provider = getProvider({
+      chainId
     });
+    promise = provider.waitForTransaction(hash, confirmations, timeout);
+  } else if (wait_) promise = wait_(confirmations);else throw new Error('hash or wait is required');
 
-    return function handleChange() {
-      return _ref.apply(this, arguments);
-    };
-  }();
-
-  var unsubscribe = client.subscribe(_ref2 => {
-    var {
-      provider
-    } = _ref2;
-    return provider;
-  }, handleChange);
-  return unsubscribe;
-}
-
-function sendTransaction(_x) {
-  return _sendTransaction.apply(this, arguments);
-}
-
-function _sendTransaction() {
-  _sendTransaction = base._asyncToGenerator(function* (args) {
-    try {
-      var signer = yield fetchSigner();
-      if (!signer) throw new base.ConnectorNotFoundError();
-      var transaction = yield signer.sendTransaction(args.request);
-      return transaction;
-    } catch (error_) {
-      var error = error_;
-      if (error_.code === 4001) error = new base.UserRejectedRequestError();
-      throw error;
-    }
-  });
-  return _sendTransaction.apply(this, arguments);
-}
-
-function waitForTransaction(_x) {
-  return _waitForTransaction.apply(this, arguments);
-}
-
-function _waitForTransaction() {
-  _waitForTransaction = base._asyncToGenerator(function* (args) {
-    var {
-      provider
-    } = client;
-    var promise; // eslint-disable-next-line testing-library/await-async-utils
-
-    if (args.wait) promise = args.wait(args.confirmations);else if (args.hash) promise = provider.waitForTransaction(args.hash, args.confirmations, args.timeout);else throw new Error('hash or wait is required');
-    var receipt = yield promise;
-    return receipt;
-  });
-  return _waitForTransaction.apply(this, arguments);
+  return await promise;
 }
 
 exports.AddChainError = base.AddChainError;
@@ -1645,9 +1151,14 @@ exports.ConnectorNotFoundError = base.ConnectorNotFoundError;
 exports.SwitchChainError = base.SwitchChainError;
 exports.SwitchChainNotSupportedError = base.SwitchChainNotSupportedError;
 exports.UserRejectedRequestError = base.UserRejectedRequestError;
+exports.alchemyRpcUrls = base.alchemyRpcUrls;
 exports.allChains = base.allChains;
 exports.chain = base.chain;
+exports.chainId = base.chainId;
 exports.defaultChains = base.defaultChains;
+exports.defaultL2Chains = base.defaultL2Chains;
+exports.etherscanBlockExplorers = base.etherscanBlockExplorers;
+exports.infuraRpcUrls = base.infuraRpcUrls;
 exports.normalizeChainId = base.normalizeChainId;
 exports.Client = Client;
 exports.InjectedConnector = InjectedConnector;
@@ -1658,7 +1169,6 @@ exports.createStorage = createStorage;
 exports.createWagmiClient = createClient;
 exports.createWagmiStorage = createStorage;
 exports.disconnect = disconnect;
-exports.erc1155ABI = erc1155ABI;
 exports.erc20ABI = erc20ABI;
 exports.erc721ABI = erc721ABI;
 exports.fetchBalance = fetchBalance;
@@ -1684,16 +1194,11 @@ exports.switchNetwork = switchNetwork;
 exports.units = units;
 exports.waitForTransaction = waitForTransaction;
 exports.watchAccount = watchAccount;
-exports.watchBalance = watchBalance;
 exports.watchBlockNumber = watchBlockNumber;
 exports.watchContractEvent = watchContractEvent;
-exports.watchEnsAddress = watchEnsAddress;
-exports.watchEnsAvatar = watchEnsAvatar;
-exports.watchEnsName = watchEnsName;
-exports.watchEnsResolver = watchEnsResolver;
-exports.watchFeeData = watchFeeData;
 exports.watchNetwork = watchNetwork;
+exports.watchProvider = watchProvider;
 exports.watchReadContract = watchReadContract;
 exports.watchSigner = watchSigner;
-exports.watchToken = watchToken;
+exports.watchWebSocketProvider = watchWebSocketProvider;
 exports.writeContract = writeContract;