@wagmi/core 0.3.5 → 0.3.6

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

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var base = require('../../../dist/base-321ac87a.cjs.dev.js');
+var base = require('../../../dist/base-d45bb8f9.cjs.dev.js');
 var ethers = require('ethers');
 var utils = require('ethers/lib/utils');
 var chains = require('../../../dist/chains-98e2e613.cjs.dev.js');
@@ -34,8 +34,15 @@ var _provider = /*#__PURE__*/new WeakMap();
 var _isUserRejectedRequestError = /*#__PURE__*/new WeakSet();
 
 class CoinbaseWalletConnector extends base.Connector {
-  constructor(config) {
-    super(config);
+  constructor(_ref) {
+    let {
+      chains,
+      options
+    } = _ref;
+    super({
+      chains,
+      options
+    });
 
     base._classPrivateMethodInitSpec(this, _isUserRejectedRequestError);
 
@@ -77,7 +84,11 @@ class CoinbaseWalletConnector extends base.Connector {
     });
   }
 
-  async connect() {
+  async connect(_ref2) {
+    let {
+      chainId
+    } = _ref2;
+
     try {
       const provider = await this.getProvider();
       provider.on('accountsChanged', this.onAccountsChanged);
@@ -87,9 +98,17 @@ class CoinbaseWalletConnector extends base.Connector {
         type: 'connecting'
       });
       const accounts = await provider.enable();
-      const account = utils.getAddress(accounts[0]);
-      const id = await this.getChainId();
-      const unsupported = this.isChainUnsupported(id);
+      const account = utils.getAddress(accounts[0]); // 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);
+      }
+
       return {
         account,
         chain: {
@@ -211,13 +230,13 @@ class CoinbaseWalletConnector extends base.Connector {
     }
   }
 
-  async watchAsset(_ref) {
+  async watchAsset(_ref3) {
     let {
       address,
       decimals = 18,
       image,
       symbol
-    } = _ref;
+    } = _ref3;
     const provider = await this.getProvider();
     return await provider.request({
       method: 'wallet_watchAsset',

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

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var base = require('../../../dist/base-6841ebe0.cjs.prod.js');
+var base = require('../../../dist/base-ffe4d8ed.cjs.prod.js');
 var ethers = require('ethers');
 var utils = require('ethers/lib/utils');
 var chains = require('../../../dist/chains-0dd661ab.cjs.prod.js');
@@ -34,8 +34,15 @@ var _provider = /*#__PURE__*/new WeakMap();
 var _isUserRejectedRequestError = /*#__PURE__*/new WeakSet();
 
 class CoinbaseWalletConnector extends base.Connector {
-  constructor(config) {
-    super(config);
+  constructor(_ref) {
+    let {
+      chains,
+      options
+    } = _ref;
+    super({
+      chains,
+      options
+    });
 
     base._classPrivateMethodInitSpec(this, _isUserRejectedRequestError);
 
@@ -77,7 +84,11 @@ class CoinbaseWalletConnector extends base.Connector {
     });
   }
 
-  async connect() {
+  async connect(_ref2) {
+    let {
+      chainId
+    } = _ref2;
+
     try {
       const provider = await this.getProvider();
       provider.on('accountsChanged', this.onAccountsChanged);
@@ -87,9 +98,17 @@ class CoinbaseWalletConnector extends base.Connector {
         type: 'connecting'
       });
       const accounts = await provider.enable();
-      const account = utils.getAddress(accounts[0]);
-      const id = await this.getChainId();
-      const unsupported = this.isChainUnsupported(id);
+      const account = utils.getAddress(accounts[0]); // 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);
+      }
+
       return {
         account,
         chain: {
@@ -211,13 +230,13 @@ class CoinbaseWalletConnector extends base.Connector {
     }
   }
 
-  async watchAsset(_ref) {
+  async watchAsset(_ref3) {
     let {
       address,
       decimals = 18,
       image,
       symbol
-    } = _ref;
+    } = _ref3;
     const provider = await this.getProvider();
     return await provider.request({
       method: 'wallet_watchAsset',

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

@@ -1,4 +1,4 @@
-import { b as Connector, _ as _classPrivateMethodInitSpec, f as _defineProperty, g as _classPrivateFieldInitSpec, n as normalizeChainId, U as UserRejectedRequestError, j as _classPrivateFieldGet, i as _classPrivateFieldSet, c as ChainNotConfiguredError, h as _classPrivateMethodGet, A as AddChainError, e as SwitchChainError } from '../../../dist/base-41fb6637.esm.js';
+import { b as Connector, _ as _classPrivateMethodInitSpec, f as _defineProperty, g as _classPrivateFieldInitSpec, n as normalizeChainId, U as UserRejectedRequestError, h as _classPrivateFieldGet, i as _classPrivateFieldSet, c as ChainNotConfiguredError, j as _classPrivateMethodGet, A as AddChainError, e as SwitchChainError } from '../../../dist/base-d69e580f.esm.js';
 import { providers } from 'ethers';
 import { getAddress, hexValue } from 'ethers/lib/utils';
 import { a as allChains } from '../../../dist/chains-a0a80d94.esm.js';
@@ -12,8 +12,15 @@ var _provider = /*#__PURE__*/new WeakMap();
 var _isUserRejectedRequestError = /*#__PURE__*/new WeakSet();
 
 class CoinbaseWalletConnector extends Connector {
-  constructor(config) {
-    super(config);
+  constructor(_ref) {
+    let {
+      chains,
+      options
+    } = _ref;
+    super({
+      chains,
+      options
+    });
 
     _classPrivateMethodInitSpec(this, _isUserRejectedRequestError);
 
@@ -55,7 +62,11 @@ class CoinbaseWalletConnector extends Connector {
     });
   }
 
-  async connect() {
+  async connect(_ref2) {
+    let {
+      chainId
+    } = _ref2;
+
     try {
       const provider = await this.getProvider();
       provider.on('accountsChanged', this.onAccountsChanged);
@@ -65,9 +76,17 @@ class CoinbaseWalletConnector extends Connector {
         type: 'connecting'
       });
       const accounts = await provider.enable();
-      const account = getAddress(accounts[0]);
-      const id = await this.getChainId();
-      const unsupported = this.isChainUnsupported(id);
+      const account = getAddress(accounts[0]); // 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);
+      }
+
       return {
         account,
         chain: {
@@ -189,13 +208,13 @@ class CoinbaseWalletConnector extends Connector {
     }
   }
 
-  async watchAsset(_ref) {
+  async watchAsset(_ref3) {
     let {
       address,
       decimals = 18,
       image,
       symbol
-    } = _ref;
+    } = _ref3;
     const provider = await this.getProvider();
     return await provider.request({
       method: 'wallet_watchAsset',

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

@@ -2,8 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var base = require('../../../dist/base-321ac87a.cjs.dev.js');
-var client = require('../../../dist/client-4172f963.cjs.dev.js');
+var base = require('../../../dist/base-d45bb8f9.cjs.dev.js');
+var client = require('../../../dist/client-20bfac7f.cjs.dev.js');
 require('eventemitter3');
 require('../../../dist/chains-98e2e613.cjs.dev.js');
 require('../../../dist/rpcs-9c4eb960.cjs.dev.js');
@@ -22,15 +22,17 @@ class MetaMaskConnector extends client.InjectedConnector {
   constructor() {
     let {
       chains,
-      options
+      options: options_
     } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    const options = {
+      name: 'MetaMask',
+      shimDisconnect: true,
+      shimChainChangedDisconnect: true,
+      ...options_
+    };
     super({
       chains,
-      options: {
-        name: 'MetaMask',
-        shimDisconnect: true,
-        ...options
-      }
+      options
     });
 
     base._classPrivateMethodInitSpec(this, _findProvider);

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

@@ -2,8 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var base = require('../../../dist/base-6841ebe0.cjs.prod.js');
-var client = require('../../../dist/client-a06c45f3.cjs.prod.js');
+var base = require('../../../dist/base-ffe4d8ed.cjs.prod.js');
+var client = require('../../../dist/client-8b124969.cjs.prod.js');
 require('eventemitter3');
 require('../../../dist/chains-0dd661ab.cjs.prod.js');
 require('../../../dist/rpcs-b3c52116.cjs.prod.js');
@@ -22,15 +22,17 @@ class MetaMaskConnector extends client.InjectedConnector {
   constructor() {
     let {
       chains,
-      options
+      options: options_
     } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    const options = {
+      name: 'MetaMask',
+      shimDisconnect: true,
+      shimChainChangedDisconnect: true,
+      ...options_
+    };
     super({
       chains,
-      options: {
-        name: 'MetaMask',
-        shimDisconnect: true,
-        ...options
-      }
+      options
     });
 
     base._classPrivateMethodInitSpec(this, _findProvider);

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

@@ -1,5 +1,5 @@
-import { _ as _classPrivateMethodInitSpec, f as _defineProperty, h as _classPrivateMethodGet, g as _classPrivateFieldInitSpec, i as _classPrivateFieldSet, j as _classPrivateFieldGet } from '../../../dist/base-41fb6637.esm.js';
-import { I as InjectedConnector } from '../../../dist/client-87c1ff8b.esm.js';
+import { _ as _classPrivateMethodInitSpec, f as _defineProperty, j as _classPrivateMethodGet, g as _classPrivateFieldInitSpec, i as _classPrivateFieldSet, h as _classPrivateFieldGet } from '../../../dist/base-d69e580f.esm.js';
+import { I as InjectedConnector } from '../../../dist/client-61f14c97.esm.js';
 import 'eventemitter3';
 import '../../../dist/chains-a0a80d94.esm.js';
 import '../../../dist/rpcs-7cfbd91c.esm.js';
@@ -18,15 +18,17 @@ class MetaMaskConnector extends InjectedConnector {
   constructor() {
     let {
       chains,
-      options
+      options: options_
     } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    const options = {
+      name: 'MetaMask',
+      shimDisconnect: true,
+      shimChainChangedDisconnect: true,
+      ...options_
+    };
     super({
       chains,
-      options: {
-        name: 'MetaMask',
-        shimDisconnect: true,
-        ...options
-      }
+      options
     });
 
     _classPrivateMethodInitSpec(this, _findProvider);

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

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var base = require('../../../dist/base-321ac87a.cjs.dev.js');
+var base = require('../../../dist/base-d45bb8f9.cjs.dev.js');
 var utils = require('ethers/lib/utils');
 var EventEmitter = require('eventemitter3');
 var ethers = require('ethers');
@@ -19,9 +19,12 @@ var _signer = /*#__PURE__*/new WeakMap();
 
 class MockProvider extends ethers.providers.BaseProvider {
   constructor(options) {
-    var _options$network;
+    var _options$chainId;
 
-    super((_options$network = options.network) !== null && _options$network !== void 0 ? _options$network : 1);
+    super({
+      name: 'Network',
+      chainId: (_options$chainId = options.chainId) !== null && _options$chainId !== void 0 ? _options$chainId : 1
+    });
 
     base._defineProperty(this, "events", new EventEmitter__default["default"]());
 
@@ -73,7 +76,7 @@ class MockProvider extends ethers.providers.BaseProvider {
     var _classPrivateFieldGet4;
 
     if ((_classPrivateFieldGet4 = base._classPrivateFieldGet(this, _options).flags) !== null && _classPrivateFieldGet4 !== void 0 && _classPrivateFieldGet4.failSwitchChain) throw new base.UserRejectedRequestError(new Error('Failed to switch chain'));
-    base._classPrivateFieldGet(this, _options).network = chainId;
+    base._classPrivateFieldGet(this, _options).chainId = chainId;
     this.network.chainId = chainId;
     this.events.emit('chainChanged', chainId);
   }
@@ -154,7 +157,12 @@ class MockConnector extends base.Connector {
   async connect() {
     var _this$options$flags;
 
-    const provider = await this.getProvider();
+    let {
+      chainId
+    } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    const provider = await this.getProvider({
+      chainId
+    });
     provider.on('accountsChanged', this.onAccountsChanged);
     provider.on('chainChanged', this.onChainChanged);
     provider.on('disconnect', this.onDisconnect);
@@ -200,7 +208,12 @@ class MockConnector extends base.Connector {
   }
 
   async getProvider() {
-    if (!base._classPrivateFieldGet(this, _provider)) base._classPrivateFieldSet(this, _provider, new MockProvider(this.options));
+    let {
+      chainId
+    } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    if (!base._classPrivateFieldGet(this, _provider) || chainId) base._classPrivateFieldSet(this, _provider, new MockProvider({ ...this.options,
+      chainId
+    }));
     return base._classPrivateFieldGet(this, _provider);
   }
 

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

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var base = require('../../../dist/base-6841ebe0.cjs.prod.js');
+var base = require('../../../dist/base-ffe4d8ed.cjs.prod.js');
 var utils = require('ethers/lib/utils');
 var EventEmitter = require('eventemitter3');
 var ethers = require('ethers');
@@ -19,9 +19,12 @@ var _signer = /*#__PURE__*/new WeakMap();
 
 class MockProvider extends ethers.providers.BaseProvider {
   constructor(options) {
-    var _options$network;
+    var _options$chainId;
 
-    super((_options$network = options.network) !== null && _options$network !== void 0 ? _options$network : 1);
+    super({
+      name: 'Network',
+      chainId: (_options$chainId = options.chainId) !== null && _options$chainId !== void 0 ? _options$chainId : 1
+    });
 
     base._defineProperty(this, "events", new EventEmitter__default["default"]());
 
@@ -73,7 +76,7 @@ class MockProvider extends ethers.providers.BaseProvider {
     var _classPrivateFieldGet4;
 
     if ((_classPrivateFieldGet4 = base._classPrivateFieldGet(this, _options).flags) !== null && _classPrivateFieldGet4 !== void 0 && _classPrivateFieldGet4.failSwitchChain) throw new base.UserRejectedRequestError(new Error('Failed to switch chain'));
-    base._classPrivateFieldGet(this, _options).network = chainId;
+    base._classPrivateFieldGet(this, _options).chainId = chainId;
     this.network.chainId = chainId;
     this.events.emit('chainChanged', chainId);
   }
@@ -154,7 +157,12 @@ class MockConnector extends base.Connector {
   async connect() {
     var _this$options$flags;
 
-    const provider = await this.getProvider();
+    let {
+      chainId
+    } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    const provider = await this.getProvider({
+      chainId
+    });
     provider.on('accountsChanged', this.onAccountsChanged);
     provider.on('chainChanged', this.onChainChanged);
     provider.on('disconnect', this.onDisconnect);
@@ -200,7 +208,12 @@ class MockConnector extends base.Connector {
   }
 
   async getProvider() {
-    if (!base._classPrivateFieldGet(this, _provider)) base._classPrivateFieldSet(this, _provider, new MockProvider(this.options));
+    let {
+      chainId
+    } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    if (!base._classPrivateFieldGet(this, _provider) || chainId) base._classPrivateFieldSet(this, _provider, new MockProvider({ ...this.options,
+      chainId
+    }));
     return base._classPrivateFieldGet(this, _provider);
   }
 

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

@@ -1,4 +1,4 @@
-import { f as _defineProperty, g as _classPrivateFieldInitSpec, i as _classPrivateFieldSet, j as _classPrivateFieldGet, U as UserRejectedRequestError, b as Connector, _ as _classPrivateMethodInitSpec, n as normalizeChainId, h as _classPrivateMethodGet } from '../../../dist/base-41fb6637.esm.js';
+import { f as _defineProperty, g as _classPrivateFieldInitSpec, i as _classPrivateFieldSet, h as _classPrivateFieldGet, U as UserRejectedRequestError, b as Connector, _ as _classPrivateMethodInitSpec, n as normalizeChainId, j as _classPrivateMethodGet } from '../../../dist/base-d69e580f.esm.js';
 import { getAddress } from 'ethers/lib/utils';
 import EventEmitter from 'eventemitter3';
 import { providers } from 'ethers';
@@ -11,9 +11,12 @@ var _signer = /*#__PURE__*/new WeakMap();
 
 class MockProvider extends providers.BaseProvider {
   constructor(options) {
-    var _options$network;
+    var _options$chainId;
 
-    super((_options$network = options.network) !== null && _options$network !== void 0 ? _options$network : 1);
+    super({
+      name: 'Network',
+      chainId: (_options$chainId = options.chainId) !== null && _options$chainId !== void 0 ? _options$chainId : 1
+    });
 
     _defineProperty(this, "events", new EventEmitter());
 
@@ -65,7 +68,7 @@ class MockProvider extends providers.BaseProvider {
     var _classPrivateFieldGet4;
 
     if ((_classPrivateFieldGet4 = _classPrivateFieldGet(this, _options).flags) !== null && _classPrivateFieldGet4 !== void 0 && _classPrivateFieldGet4.failSwitchChain) throw new UserRejectedRequestError(new Error('Failed to switch chain'));
-    _classPrivateFieldGet(this, _options).network = chainId;
+    _classPrivateFieldGet(this, _options).chainId = chainId;
     this.network.chainId = chainId;
     this.events.emit('chainChanged', chainId);
   }
@@ -146,7 +149,12 @@ class MockConnector extends Connector {
   async connect() {
     var _this$options$flags;
 
-    const provider = await this.getProvider();
+    let {
+      chainId
+    } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    const provider = await this.getProvider({
+      chainId
+    });
     provider.on('accountsChanged', this.onAccountsChanged);
     provider.on('chainChanged', this.onChainChanged);
     provider.on('disconnect', this.onDisconnect);
@@ -192,7 +200,12 @@ class MockConnector extends Connector {
   }
 
   async getProvider() {
-    if (!_classPrivateFieldGet(this, _provider)) _classPrivateFieldSet(this, _provider, new MockProvider(this.options));
+    let {
+      chainId
+    } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    if (!_classPrivateFieldGet(this, _provider) || chainId) _classPrivateFieldSet(this, _provider, new MockProvider({ ...this.options,
+      chainId
+    }));
     return _classPrivateFieldGet(this, _provider);
   }
 

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

@@ -2,11 +2,14 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var base = require('../../../dist/base-321ac87a.cjs.dev.js');
+var base = require('../../../dist/base-d45bb8f9.cjs.dev.js');
 var ethers = require('ethers');
 var utils = require('ethers/lib/utils');
+var client = require('../../../dist/client-20bfac7f.cjs.dev.js');
 var chains = require('../../../dist/chains-98e2e613.cjs.dev.js');
 require('eventemitter3');
+require('zustand/vanilla');
+require('zustand/middleware');
 require('../../../dist/rpcs-9c4eb960.cjs.dev.js');
 
 function _interopNamespace(e) {
@@ -80,10 +83,24 @@ class WalletConnectConnector extends base.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 = client.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
@@ -135,11 +152,17 @@ class WalletConnectConnector extends base.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 (!base._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/connectors/walletConnect/dist/wagmi-core-connectors-walletConnect.cjs.prod.js

@@ -2,11 +2,14 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var base = require('../../../dist/base-6841ebe0.cjs.prod.js');
+var base = require('../../../dist/base-ffe4d8ed.cjs.prod.js');
 var ethers = require('ethers');
 var utils = require('ethers/lib/utils');
+var client = require('../../../dist/client-8b124969.cjs.prod.js');
 var chains = require('../../../dist/chains-0dd661ab.cjs.prod.js');
 require('eventemitter3');
+require('zustand/vanilla');
+require('zustand/middleware');
 require('../../../dist/rpcs-b3c52116.cjs.prod.js');
 
 function _interopNamespace(e) {
@@ -80,10 +83,24 @@ class WalletConnectConnector extends base.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 = client.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
@@ -135,11 +152,17 @@ class WalletConnectConnector extends base.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 (!base._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
       }), {}) : {};