@wagmi/core 0.3.5 → 0.3.8

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

@@ -1,11 +1,11 @@
 'use strict';
 
-var base = require('./base-6841ebe0.cjs.prod.js');
+var base = require('./base-b7c3f31e.cjs.prod.js');
 var ethers = require('ethers');
 var create = require('zustand/vanilla');
 var middleware = require('zustand/middleware');
 var utils = require('ethers/lib/utils');
-var chains = require('./chains-0dd661ab.cjs.prod.js');
+var chains = require('./chains-7204b2dd.cjs.prod.js');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
 
@@ -29,6 +29,8 @@ function getInjectedName(ethereum) {
 
 
   if ((_ethereum$providers = ethereum.providers) !== null && _ethereum$providers !== void 0 && _ethereum$providers.length) {
+    var _names$;
+
     // Deduplicate names using Set
     // Coinbase Wallet puts multiple providers in `ethereum.providers`
     const nameSet = new Set();
@@ -46,7 +48,8 @@ function getInjectedName(ethereum) {
     }
 
     const names = [...nameSet];
-    return names.length ? names : names[0];
+    if (names.length) return names;
+    return (_names$ = names[0]) !== null && _names$ !== void 0 ? _names$ : 'Injected';
   }
 
   return (_getName = getName(ethereum)) !== null && _getName !== void 0 ? _getName : 'Injected';
@@ -64,6 +67,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 +97,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 +120,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 +148,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 +167,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 +195,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 +235,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 +251,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 +372,8 @@ function createStorage(_ref) {
 
 const storeKey = 'store';
 
+var _isAutoConnecting = /*#__PURE__*/new WeakMap();
+
 var _lastUsedConnector = /*#__PURE__*/new WeakMap();
 
 var _addEffects = /*#__PURE__*/new WeakSet();
@@ -368,6 +404,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 +498,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 +539,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 +576,9 @@ class Client {
       data: undefined,
       status: 'disconnected'
     }));
+
+    base._classPrivateFieldSet(this, _isAutoConnecting, false);
+
     return this.data;
   }
 

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

@@ -1,11 +1,11 @@
 'use strict';
 
-var base = require('./base-321ac87a.cjs.dev.js');
+var base = require('./base-9fa7951e.cjs.dev.js');
 var ethers = require('ethers');
 var create = require('zustand/vanilla');
 var middleware = require('zustand/middleware');
 var utils = require('ethers/lib/utils');
-var chains = require('./chains-98e2e613.cjs.dev.js');
+var chains = require('./chains-b4a51a84.cjs.dev.js');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
 
@@ -29,6 +29,8 @@ function getInjectedName(ethereum) {
 
 
   if ((_ethereum$providers = ethereum.providers) !== null && _ethereum$providers !== void 0 && _ethereum$providers.length) {
+    var _names$;
+
     // Deduplicate names using Set
     // Coinbase Wallet puts multiple providers in `ethereum.providers`
     const nameSet = new Set();
@@ -46,7 +48,8 @@ function getInjectedName(ethereum) {
     }
 
     const names = [...nameSet];
-    return names.length ? names : names[0];
+    if (names.length) return names;
+    return (_names$ = names[0]) !== null && _names$ !== void 0 ? _names$ : 'Injected';
   }
 
   return (_getName = getName(ethereum)) !== null && _getName !== void 0 ? _getName : 'Injected';
@@ -64,6 +67,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 +97,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 +120,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 +148,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 +167,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 +195,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 +235,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 +251,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 +372,8 @@ function createStorage(_ref) {
 
 const storeKey = 'store';
 
+var _isAutoConnecting = /*#__PURE__*/new WeakMap();
+
 var _lastUsedConnector = /*#__PURE__*/new WeakMap();
 
 var _addEffects = /*#__PURE__*/new WeakSet();
@@ -368,6 +404,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 +498,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 +539,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 +576,9 @@ class Client {
       data: undefined,
       status: 'disconnected'
     }));
+
+    base._classPrivateFieldSet(this, _isAutoConnecting, false);
+
     return this.data;
   }
 

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

@@ -1,9 +1,9 @@
-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-4c248b82.esm.js';
 import { providers, getDefaultProvider } from 'ethers';
 import create from 'zustand/vanilla';
 import { subscribeWithSelector, persist } from 'zustand/middleware';
 import { getAddress, hexValue } from 'ethers/lib/utils';
-import { a as allChains } from './chains-a0a80d94.esm.js';
+import { a as allChains } from './chains-42648bc5.esm.js';
 
 function getInjectedName(ethereum) {
   var _ethereum$providers, _getName;
@@ -23,6 +23,8 @@ function getInjectedName(ethereum) {
 
 
   if ((_ethereum$providers = ethereum.providers) !== null && _ethereum$providers !== void 0 && _ethereum$providers.length) {
+    var _names$;
+
     // Deduplicate names using Set
     // Coinbase Wallet puts multiple providers in `ethereum.providers`
     const nameSet = new Set();
@@ -40,7 +42,8 @@ function getInjectedName(ethereum) {
     }
 
     const names = [...nameSet];
-    return names.length ? names : names[0];
+    if (names.length) return names;
+    return (_names$ = names[0]) !== null && _names$ !== void 0 ? _names$ : 'Injected';
   }
 
   return (_getName = getName(ethereum)) !== null && _getName !== void 0 ? _getName : 'Injected';
@@ -58,6 +61,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 +91,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 +114,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 +142,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 +161,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 +189,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 +229,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 +245,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 +366,8 @@ function createStorage(_ref) {
 
 const storeKey = 'store';
 
+var _isAutoConnecting = /*#__PURE__*/new WeakMap();
+
 var _lastUsedConnector = /*#__PURE__*/new WeakMap();
 
 var _addEffects = /*#__PURE__*/new WeakSet();
@@ -362,6 +398,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 +492,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 +533,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 +570,9 @@ class Client {
       data: undefined,
       status: 'disconnected'
     }));
+
+    _classPrivateFieldSet(this, _isAutoConnecting, false);
+
     return this.data;
   }
 

package/dist/declarations/src/actions/accounts/connect.d.ts

@@ -2,6 +2,8 @@ import { Client } from '../../client';
 import { Connector, ConnectorData } from '../../connectors';
 import { Provider } from '../../types';
 export declare type ConnectArgs = {
+    /** Chain ID to connect to */
+    chainId?: number;
     /** Connector to connect */
     connector: Connector;
 };
@@ -12,5 +14,5 @@ export declare type ConnectResult<TProvider extends Provider = Provider> = {
     connector: Client<TProvider>['connector'];
     provider: Data<TProvider>['provider'];
 };
-export declare function connect<TProvider extends Provider = Provider>({ connector, }: ConnectArgs): Promise<ConnectResult<TProvider>>;
+export declare function connect<TProvider extends Provider = Provider>({ chainId, connector, }: ConnectArgs): Promise<ConnectResult<TProvider>>;
 export {};

package/dist/declarations/src/chains.d.ts

@@ -1 +1 @@
-export { arbitrum, arbitrumRinkeby, goerli, hardhat, kovan, localhost, mainnet, optimism, optimismKovan, polygon, polygonMumbai, rinkeby, ropsten, } from './constants/chains';
+export { arbitrum, arbitrumRinkeby, foundry, goerli, hardhat, kovan, localhost, mainnet, optimism, optimismKovan, polygon, polygonMumbai, rinkeby, ropsten, } from './constants/chains';

package/dist/declarations/src/client.d.ts

@@ -60,6 +60,7 @@ export declare class Client<TProvider extends Provider = Provider, TWebSocketPro
     get connector(): Connector<any, any> | undefined;
     get data(): Data<TProvider> | undefined;
     get error(): Error | undefined;
+    get lastUsedChainId(): number | undefined;
     get provider(): TProvider;
     get status(): "connecting" | "connected" | "reconnecting" | "disconnected";
     get subscribe(): {