@wagmi/core 0.3.5 → 0.3.6

package/connectors/walletConnect/dist/wagmi-core-connectors-walletConnect.esm.js

@@ -1,8 +1,11 @@
-import { b as Connector, _ as _classPrivateMethodInitSpec, f as _defineProperty, g as _classPrivateFieldInitSpec, n as normalizeChainId, h as _classPrivateMethodGet, U as UserRejectedRequestError, j as _classPrivateFieldGet, i as _classPrivateFieldSet, e as SwitchChainError } from '../../../dist/base-41fb6637.esm.js';
+import { b as Connector, _ as _classPrivateMethodInitSpec, f as _defineProperty, g as _classPrivateFieldInitSpec, n as normalizeChainId, j as _classPrivateMethodGet, U as UserRejectedRequestError, h as _classPrivateFieldGet, i as _classPrivateFieldSet, e as SwitchChainError } from '../../../dist/base-d69e580f.esm.js';
 import { providers } from 'ethers';
 import { getAddress, hexValue } from 'ethers/lib/utils';
+import { g as getClient } from '../../../dist/client-61f14c97.esm.js';
 import { a as allChains } from '../../../dist/chains-a0a80d94.esm.js';
 import 'eventemitter3';
+import 'zustand/vanilla';
+import 'zustand/middleware';
 import '../../../dist/rpcs-7cfbd91c.esm.js';
 
 /**
@@ -58,10 +61,24 @@ class WalletConnectConnector extends Connector {
   }
 
   async connect() {
+    let {
+      chainId
+    } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+
     try {
       var _provider$connector$p, _provider$connector, _provider$connector$p2;
 
-      const provider = await this.getProvider(true);
+      let targetChainId = chainId;
+
+      if (!targetChainId) {
+        const lastUsedChainId = getClient().lastUsedChainId;
+        if (lastUsedChainId && !this.isChainUnsupported(lastUsedChainId)) targetChainId = lastUsedChainId;
+      }
+
+      const provider = await this.getProvider({
+        chainId: targetChainId,
+        create: true
+      });
       provider.on('accountsChanged', this.onAccountsChanged);
       provider.on('chainChanged', this.onChainChanged);
       provider.on('disconnect', this.onDisconnect); // Defer message to the next tick to ensure wallet connect data (provided by `.enable()`) is available
@@ -113,11 +130,17 @@ class WalletConnectConnector extends Connector {
     return chainId;
   }
 
-  async getProvider(create) {
+  async getProvider() {
+    var _this$options;
+
+    let {
+      chainId = ((_this$options = this.options) === null || _this$options === void 0 ? void 0 : _this$options.chainId) || this.chains[0].id,
+      create = false
+    } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+
     if (!_classPrivateFieldGet(this, _provider) || create) {
-      var _this$options, _this$options2, _this$options3;
+      var _this$options2, _this$options3;
 
-      const chainId = ((_this$options = this.options) === null || _this$options === void 0 ? void 0 : _this$options.chainId) || this.chains[0].id;
       const rpc = !((_this$options2 = this.options) !== null && _this$options2 !== void 0 && _this$options2.infuraId) ? this.chains.reduce((rpc, chain) => ({ ...rpc,
         [chain.id]: chain.rpcUrls.default
       }), {}) : {};

package/dist/{base-321ac87a.cjs.dev.js → base-d45bb8f9.cjs.dev.js}

@@ -256,9 +256,11 @@ class Connector extends EventEmitter__default["default"] {
   getBlockExplorerUrls(chain) {
     var _chain$blockExplorers;
 
-    const blockExplorer = (_chain$blockExplorers = chain.blockExplorers) === null || _chain$blockExplorers === void 0 ? void 0 : _chain$blockExplorers.default;
-    if (Array.isArray(blockExplorer)) return blockExplorer.map(x => x.url);
-    if (blockExplorer !== null && blockExplorer !== void 0 && blockExplorer.url) return [blockExplorer.url];
+    const {
+      default: blockExplorer,
+      ...blockExplorers
+    } = (_chain$blockExplorers = chain.blockExplorers) !== null && _chain$blockExplorers !== void 0 ? _chain$blockExplorers : {};
+    if (blockExplorer) return [blockExplorer.url, ...Object.values(blockExplorers).map(x => x.url)];
     return [];
   }
 

package/dist/{base-41fb6637.esm.js → base-d69e580f.esm.js}

@@ -250,9 +250,11 @@ class Connector extends EventEmitter {
   getBlockExplorerUrls(chain) {
     var _chain$blockExplorers;
 
-    const blockExplorer = (_chain$blockExplorers = chain.blockExplorers) === null || _chain$blockExplorers === void 0 ? void 0 : _chain$blockExplorers.default;
-    if (Array.isArray(blockExplorer)) return blockExplorer.map(x => x.url);
-    if (blockExplorer !== null && blockExplorer !== void 0 && blockExplorer.url) return [blockExplorer.url];
+    const {
+      default: blockExplorer,
+      ...blockExplorers
+    } = (_chain$blockExplorers = chain.blockExplorers) !== null && _chain$blockExplorers !== void 0 ? _chain$blockExplorers : {};
+    if (blockExplorer) return [blockExplorer.url, ...Object.values(blockExplorers).map(x => x.url)];
     return [];
   }
 
@@ -262,4 +264,4 @@ class Connector extends EventEmitter {
 
 }
 
-export { AddChainError as A, ConnectorAlreadyConnectedError as C, ProviderRpcError as P, ResourceUnavailableError as R, SwitchChainNotSupportedError as S, UserRejectedRequestError as U, _classPrivateMethodInitSpec as _, ConnectorNotFoundError as a, Connector as b, ChainNotConfiguredError as c, RpcError as d, SwitchChainError as e, _defineProperty as f, _classPrivateFieldInitSpec as g, _classPrivateMethodGet as h, _classPrivateFieldSet as i, _classPrivateFieldGet as j, normalizeChainId as n };
+export { AddChainError as A, ConnectorAlreadyConnectedError as C, ProviderRpcError as P, ResourceUnavailableError as R, SwitchChainNotSupportedError as S, UserRejectedRequestError as U, _classPrivateMethodInitSpec as _, ConnectorNotFoundError as a, Connector as b, ChainNotConfiguredError as c, RpcError as d, SwitchChainError as e, _defineProperty as f, _classPrivateFieldInitSpec as g, _classPrivateFieldGet as h, _classPrivateFieldSet as i, _classPrivateMethodGet as j, normalizeChainId as n };

package/dist/{base-6841ebe0.cjs.prod.js → base-ffe4d8ed.cjs.prod.js}

@@ -256,9 +256,11 @@ class Connector extends EventEmitter__default["default"] {
   getBlockExplorerUrls(chain) {
     var _chain$blockExplorers;
 
-    const blockExplorer = (_chain$blockExplorers = chain.blockExplorers) === null || _chain$blockExplorers === void 0 ? void 0 : _chain$blockExplorers.default;
-    if (Array.isArray(blockExplorer)) return blockExplorer.map(x => x.url);
-    if (blockExplorer !== null && blockExplorer !== void 0 && blockExplorer.url) return [blockExplorer.url];
+    const {
+      default: blockExplorer,
+      ...blockExplorers
+    } = (_chain$blockExplorers = chain.blockExplorers) !== null && _chain$blockExplorers !== void 0 ? _chain$blockExplorers : {};
+    if (blockExplorer) return [blockExplorer.url, ...Object.values(blockExplorers).map(x => x.url)];
     return [];
   }
 

package/dist/{client-4172f963.cjs.dev.js → client-20bfac7f.cjs.dev.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var base = require('./base-321ac87a.cjs.dev.js');
+var base = require('./base-d45bb8f9.cjs.dev.js');
 var ethers = require('ethers');
 var create = require('zustand/vanilla');
 var middleware = require('zustand/middleware');
@@ -64,6 +64,8 @@ const shimKey = 'injected.shimDisconnect';
 
 var _provider = /*#__PURE__*/new WeakMap();
 
+var _switchingChains = /*#__PURE__*/new WeakMap();
+
 var _isUserRejectedRequestError = /*#__PURE__*/new WeakSet();
 
 class InjectedConnector extends base.Connector {
@@ -92,6 +94,11 @@ class InjectedConnector extends base.Connector {
       value: void 0
     });
 
+    base._classPrivateFieldInitSpec(this, _switchingChains, {
+      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])
@@ -110,10 +117,19 @@ class InjectedConnector extends base.Connector {
     });
 
     base._defineProperty(this, "onDisconnect", () => {
-      var _this$options, _getClient$storage;
+      var _this$options, _this$options2, _getClient$storage;
+
+      // We need this as MetaMask can emit the "disconnect" event
+      // upon switching chains. This workaround ensures that the
+      // user currently isn't in the process of switching chains.
+      if ((_this$options = this.options) !== null && _this$options !== void 0 && _this$options.shimChainChangedDisconnect && base._classPrivateFieldGet(this, _switchingChains)) {
+        base._classPrivateFieldSet(this, _switchingChains, false);
+
+        return;
+      }
 
       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);
+      if ((_this$options2 = this.options) !== null && _this$options2 !== void 0 && _this$options2.shimDisconnect) (_getClient$storage = getClient().storage) === null || _getClient$storage === void 0 ? void 0 : _getClient$storage.removeItem(shimKey);
     });
 
     let name = 'Injected';
@@ -129,8 +145,12 @@ class InjectedConnector extends base.Connector {
   }
 
   async connect() {
+    let {
+      chainId
+    } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+
     try {
-      var _this$options2, _getClient$storage2;
+      var _this$options3, _getClient$storage2;
 
       const provider = await this.getProvider();
       if (!provider) throw new base.ConnectorNotFoundError();
@@ -144,10 +164,18 @@ class InjectedConnector extends base.Connector {
       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);
+      const account = await this.getAccount(); // Switch to chain if provided
+
+      let id = await this.getChainId();
+      let unsupported = this.isChainUnsupported(id);
+
+      if (chainId && id !== chainId) {
+        const chain = await this.switchChain(chainId);
+        id = chain.id;
+        unsupported = this.isChainUnsupported(id);
+      }
+
+      if ((_this$options3 = this.options) !== null && _this$options3 !== void 0 && _this$options3.shimDisconnect) (_getClient$storage2 = getClient().storage) === null || _getClient$storage2 === void 0 ? void 0 : _getClient$storage2.setItem(shimKey, true);
       return {
         account,
         chain: {
@@ -164,14 +192,14 @@ class InjectedConnector extends base.Connector {
   }
 
   async disconnect() {
-    var _this$options3, _getClient$storage3;
+    var _this$options4, _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);
+    if ((_this$options4 = this.options) !== null && _this$options4 !== void 0 && _this$options4.shimDisconnect) (_getClient$storage3 = getClient().storage) === null || _getClient$storage3 === void 0 ? void 0 : _getClient$storage3.removeItem(shimKey);
   }
 
   async getAccount() {
@@ -204,9 +232,9 @@ class InjectedConnector extends base.Connector {
 
   async isAuthorized() {
     try {
-      var _this$options4, _getClient$storage4;
+      var _this$options5, _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;
+      if ((_this$options5 = this.options) !== null && _this$options5 !== void 0 && _this$options5.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({
@@ -220,6 +248,9 @@ class InjectedConnector extends base.Connector {
   }
 
   async switchChain(chainId) {
+    var _this$options6;
+
+    if ((_this$options6 = this.options) !== null && _this$options6 !== void 0 && _this$options6.shimChainChangedDisconnect) base._classPrivateFieldSet(this, _switchingChains, true);
     const provider = await this.getProvider();
     if (!provider) throw new base.ConnectorNotFoundError();
     const id = utils.hexValue(chainId);
@@ -338,6 +369,8 @@ function createStorage(_ref) {
 
 const storeKey = 'store';
 
+var _isAutoConnecting = /*#__PURE__*/new WeakMap();
+
 var _lastUsedConnector = /*#__PURE__*/new WeakMap();
 
 var _addEffects = /*#__PURE__*/new WeakSet();
@@ -368,6 +401,11 @@ class Client {
 
     base._defineProperty(this, "store", void 0);
 
+    base._classPrivateFieldInitSpec(this, _isAutoConnecting, {
+      writable: true,
+      value: void 0
+    });
+
     base._classPrivateFieldInitSpec(this, _lastUsedConnector, {
       writable: true,
       value: void 0
@@ -457,6 +495,12 @@ class Client {
     return this.store.getState().error;
   }
 
+  get lastUsedChainId() {
+    var _this$data, _this$data$chain;
+
+    return (_this$data = this.data) === null || _this$data === void 0 ? void 0 : (_this$data$chain = _this$data.chain) === null || _this$data$chain === void 0 ? void 0 : _this$data$chain.id;
+  }
+
   get provider() {
     return this.store.getState().provider;
   }
@@ -492,11 +536,18 @@ class Client {
     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));
+
+    base._classPrivateFieldSet(this, _isAutoConnecting, false);
+
     this.clearState();
     this.store.destroy();
   }
 
   async autoConnect() {
+    if (base._classPrivateFieldGet(this, _isAutoConnecting)) return;
+
+    base._classPrivateFieldSet(this, _isAutoConnecting, true);
+
     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;
@@ -522,6 +573,9 @@ class Client {
       data: undefined,
       status: 'disconnected'
     }));
+
+    base._classPrivateFieldSet(this, _isAutoConnecting, false);
+
     return this.data;
   }
 

package/dist/{client-87c1ff8b.esm.js → client-61f14c97.esm.js}

@@ -1,4 +1,4 @@
-import { b as Connector, _ as _classPrivateMethodInitSpec, f as _defineProperty, g as _classPrivateFieldInitSpec, n as normalizeChainId, a as ConnectorNotFoundError, h as _classPrivateMethodGet, U as UserRejectedRequestError, R as ResourceUnavailableError, i as _classPrivateFieldSet, j as _classPrivateFieldGet, c as ChainNotConfiguredError, A as AddChainError, e as SwitchChainError } from './base-41fb6637.esm.js';
+import { b as Connector, _ as _classPrivateMethodInitSpec, f as _defineProperty, g as _classPrivateFieldInitSpec, n as normalizeChainId, h as _classPrivateFieldGet, i as _classPrivateFieldSet, a as ConnectorNotFoundError, j as _classPrivateMethodGet, U as UserRejectedRequestError, R as ResourceUnavailableError, c as ChainNotConfiguredError, A as AddChainError, e as SwitchChainError } from './base-d69e580f.esm.js';
 import { providers, getDefaultProvider } from 'ethers';
 import create from 'zustand/vanilla';
 import { subscribeWithSelector, persist } from 'zustand/middleware';
@@ -58,6 +58,8 @@ const shimKey = 'injected.shimDisconnect';
 
 var _provider = /*#__PURE__*/new WeakMap();
 
+var _switchingChains = /*#__PURE__*/new WeakMap();
+
 var _isUserRejectedRequestError = /*#__PURE__*/new WeakSet();
 
 class InjectedConnector extends Connector {
@@ -86,6 +88,11 @@ class InjectedConnector extends Connector {
       value: void 0
     });
 
+    _classPrivateFieldInitSpec(this, _switchingChains, {
+      writable: true,
+      value: void 0
+    });
+
     _defineProperty(this, "onAccountsChanged", accounts => {
       if (accounts.length === 0) this.emit('disconnect');else this.emit('change', {
         account: getAddress(accounts[0])
@@ -104,10 +111,19 @@ class InjectedConnector extends Connector {
     });
 
     _defineProperty(this, "onDisconnect", () => {
-      var _this$options, _getClient$storage;
+      var _this$options, _this$options2, _getClient$storage;
+
+      // We need this as MetaMask can emit the "disconnect" event
+      // upon switching chains. This workaround ensures that the
+      // user currently isn't in the process of switching chains.
+      if ((_this$options = this.options) !== null && _this$options !== void 0 && _this$options.shimChainChangedDisconnect && _classPrivateFieldGet(this, _switchingChains)) {
+        _classPrivateFieldSet(this, _switchingChains, false);
+
+        return;
+      }
 
       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);
+      if ((_this$options2 = this.options) !== null && _this$options2 !== void 0 && _this$options2.shimDisconnect) (_getClient$storage = getClient().storage) === null || _getClient$storage === void 0 ? void 0 : _getClient$storage.removeItem(shimKey);
     });
 
     let name = 'Injected';
@@ -123,8 +139,12 @@ class InjectedConnector extends Connector {
   }
 
   async connect() {
+    let {
+      chainId
+    } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+
     try {
-      var _this$options2, _getClient$storage2;
+      var _this$options3, _getClient$storage2;
 
       const provider = await this.getProvider();
       if (!provider) throw new ConnectorNotFoundError();
@@ -138,10 +158,18 @@ class InjectedConnector extends Connector {
       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);
+      const account = await this.getAccount(); // Switch to chain if provided
+
+      let id = await this.getChainId();
+      let unsupported = this.isChainUnsupported(id);
+
+      if (chainId && id !== chainId) {
+        const chain = await this.switchChain(chainId);
+        id = chain.id;
+        unsupported = this.isChainUnsupported(id);
+      }
+
+      if ((_this$options3 = this.options) !== null && _this$options3 !== void 0 && _this$options3.shimDisconnect) (_getClient$storage2 = getClient().storage) === null || _getClient$storage2 === void 0 ? void 0 : _getClient$storage2.setItem(shimKey, true);
       return {
         account,
         chain: {
@@ -158,14 +186,14 @@ class InjectedConnector extends Connector {
   }
 
   async disconnect() {
-    var _this$options3, _getClient$storage3;
+    var _this$options4, _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);
+    if ((_this$options4 = this.options) !== null && _this$options4 !== void 0 && _this$options4.shimDisconnect) (_getClient$storage3 = getClient().storage) === null || _getClient$storage3 === void 0 ? void 0 : _getClient$storage3.removeItem(shimKey);
   }
 
   async getAccount() {
@@ -198,9 +226,9 @@ class InjectedConnector extends Connector {
 
   async isAuthorized() {
     try {
-      var _this$options4, _getClient$storage4;
+      var _this$options5, _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;
+      if ((_this$options5 = this.options) !== null && _this$options5 !== void 0 && _this$options5.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 ConnectorNotFoundError();
       const accounts = await provider.request({
@@ -214,6 +242,9 @@ class InjectedConnector extends Connector {
   }
 
   async switchChain(chainId) {
+    var _this$options6;
+
+    if ((_this$options6 = this.options) !== null && _this$options6 !== void 0 && _this$options6.shimChainChangedDisconnect) _classPrivateFieldSet(this, _switchingChains, true);
     const provider = await this.getProvider();
     if (!provider) throw new ConnectorNotFoundError();
     const id = hexValue(chainId);
@@ -332,6 +363,8 @@ function createStorage(_ref) {
 
 const storeKey = 'store';
 
+var _isAutoConnecting = /*#__PURE__*/new WeakMap();
+
 var _lastUsedConnector = /*#__PURE__*/new WeakMap();
 
 var _addEffects = /*#__PURE__*/new WeakSet();
@@ -362,6 +395,11 @@ class Client {
 
     _defineProperty(this, "store", void 0);
 
+    _classPrivateFieldInitSpec(this, _isAutoConnecting, {
+      writable: true,
+      value: void 0
+    });
+
     _classPrivateFieldInitSpec(this, _lastUsedConnector, {
       writable: true,
       value: void 0
@@ -451,6 +489,12 @@ class Client {
     return this.store.getState().error;
   }
 
+  get lastUsedChainId() {
+    var _this$data, _this$data$chain;
+
+    return (_this$data = this.data) === null || _this$data === void 0 ? void 0 : (_this$data$chain = _this$data.chain) === null || _this$data$chain === void 0 ? void 0 : _this$data$chain.id;
+  }
+
   get provider() {
     return this.store.getState().provider;
   }
@@ -486,11 +530,18 @@ class Client {
     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));
+
+    _classPrivateFieldSet(this, _isAutoConnecting, false);
+
     this.clearState();
     this.store.destroy();
   }
 
   async autoConnect() {
+    if (_classPrivateFieldGet(this, _isAutoConnecting)) return;
+
+    _classPrivateFieldSet(this, _isAutoConnecting, true);
+
     if (!this.connectors.length) return; // Try last used connector first
 
     const sorted = _classPrivateFieldGet(this, _lastUsedConnector) ? [...this.connectors].sort(x => x.id === _classPrivateFieldGet(this, _lastUsedConnector) ? -1 : 1) : this.connectors;
@@ -516,6 +567,9 @@ class Client {
       data: undefined,
       status: 'disconnected'
     }));
+
+    _classPrivateFieldSet(this, _isAutoConnecting, false);
+
     return this.data;
   }
 

package/dist/{client-a06c45f3.cjs.prod.js → client-8b124969.cjs.prod.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var base = require('./base-6841ebe0.cjs.prod.js');
+var base = require('./base-ffe4d8ed.cjs.prod.js');
 var ethers = require('ethers');
 var create = require('zustand/vanilla');
 var middleware = require('zustand/middleware');
@@ -64,6 +64,8 @@ const shimKey = 'injected.shimDisconnect';
 
 var _provider = /*#__PURE__*/new WeakMap();
 
+var _switchingChains = /*#__PURE__*/new WeakMap();
+
 var _isUserRejectedRequestError = /*#__PURE__*/new WeakSet();
 
 class InjectedConnector extends base.Connector {
@@ -92,6 +94,11 @@ class InjectedConnector extends base.Connector {
       value: void 0
     });
 
+    base._classPrivateFieldInitSpec(this, _switchingChains, {
+      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])
@@ -110,10 +117,19 @@ class InjectedConnector extends base.Connector {
     });
 
     base._defineProperty(this, "onDisconnect", () => {
-      var _this$options, _getClient$storage;
+      var _this$options, _this$options2, _getClient$storage;
+
+      // We need this as MetaMask can emit the "disconnect" event
+      // upon switching chains. This workaround ensures that the
+      // user currently isn't in the process of switching chains.
+      if ((_this$options = this.options) !== null && _this$options !== void 0 && _this$options.shimChainChangedDisconnect && base._classPrivateFieldGet(this, _switchingChains)) {
+        base._classPrivateFieldSet(this, _switchingChains, false);
+
+        return;
+      }
 
       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);
+      if ((_this$options2 = this.options) !== null && _this$options2 !== void 0 && _this$options2.shimDisconnect) (_getClient$storage = getClient().storage) === null || _getClient$storage === void 0 ? void 0 : _getClient$storage.removeItem(shimKey);
     });
 
     let name = 'Injected';
@@ -129,8 +145,12 @@ class InjectedConnector extends base.Connector {
   }
 
   async connect() {
+    let {
+      chainId
+    } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+
     try {
-      var _this$options2, _getClient$storage2;
+      var _this$options3, _getClient$storage2;
 
       const provider = await this.getProvider();
       if (!provider) throw new base.ConnectorNotFoundError();
@@ -144,10 +164,18 @@ class InjectedConnector extends base.Connector {
       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);
+      const account = await this.getAccount(); // Switch to chain if provided
+
+      let id = await this.getChainId();
+      let unsupported = this.isChainUnsupported(id);
+
+      if (chainId && id !== chainId) {
+        const chain = await this.switchChain(chainId);
+        id = chain.id;
+        unsupported = this.isChainUnsupported(id);
+      }
+
+      if ((_this$options3 = this.options) !== null && _this$options3 !== void 0 && _this$options3.shimDisconnect) (_getClient$storage2 = getClient().storage) === null || _getClient$storage2 === void 0 ? void 0 : _getClient$storage2.setItem(shimKey, true);
       return {
         account,
         chain: {
@@ -164,14 +192,14 @@ class InjectedConnector extends base.Connector {
   }
 
   async disconnect() {
-    var _this$options3, _getClient$storage3;
+    var _this$options4, _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);
+    if ((_this$options4 = this.options) !== null && _this$options4 !== void 0 && _this$options4.shimDisconnect) (_getClient$storage3 = getClient().storage) === null || _getClient$storage3 === void 0 ? void 0 : _getClient$storage3.removeItem(shimKey);
   }
 
   async getAccount() {
@@ -204,9 +232,9 @@ class InjectedConnector extends base.Connector {
 
   async isAuthorized() {
     try {
-      var _this$options4, _getClient$storage4;
+      var _this$options5, _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;
+      if ((_this$options5 = this.options) !== null && _this$options5 !== void 0 && _this$options5.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({
@@ -220,6 +248,9 @@ class InjectedConnector extends base.Connector {
   }
 
   async switchChain(chainId) {
+    var _this$options6;
+
+    if ((_this$options6 = this.options) !== null && _this$options6 !== void 0 && _this$options6.shimChainChangedDisconnect) base._classPrivateFieldSet(this, _switchingChains, true);
     const provider = await this.getProvider();
     if (!provider) throw new base.ConnectorNotFoundError();
     const id = utils.hexValue(chainId);
@@ -338,6 +369,8 @@ function createStorage(_ref) {
 
 const storeKey = 'store';
 
+var _isAutoConnecting = /*#__PURE__*/new WeakMap();
+
 var _lastUsedConnector = /*#__PURE__*/new WeakMap();
 
 var _addEffects = /*#__PURE__*/new WeakSet();
@@ -368,6 +401,11 @@ class Client {
 
     base._defineProperty(this, "store", void 0);
 
+    base._classPrivateFieldInitSpec(this, _isAutoConnecting, {
+      writable: true,
+      value: void 0
+    });
+
     base._classPrivateFieldInitSpec(this, _lastUsedConnector, {
       writable: true,
       value: void 0
@@ -457,6 +495,12 @@ class Client {
     return this.store.getState().error;
   }
 
+  get lastUsedChainId() {
+    var _this$data, _this$data$chain;
+
+    return (_this$data = this.data) === null || _this$data === void 0 ? void 0 : (_this$data$chain = _this$data.chain) === null || _this$data$chain === void 0 ? void 0 : _this$data$chain.id;
+  }
+
   get provider() {
     return this.store.getState().provider;
   }
@@ -492,11 +536,18 @@ class Client {
     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));
+
+    base._classPrivateFieldSet(this, _isAutoConnecting, false);
+
     this.clearState();
     this.store.destroy();
   }
 
   async autoConnect() {
+    if (base._classPrivateFieldGet(this, _isAutoConnecting)) return;
+
+    base._classPrivateFieldSet(this, _isAutoConnecting, true);
+
     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;
@@ -522,6 +573,9 @@ class Client {
       data: undefined,
       status: 'disconnected'
     }));
+
+    base._classPrivateFieldSet(this, _isAutoConnecting, false);
+
     return this.data;
   }