@wagmi/core 0.5.8 → 0.6.1

package/dist/{getProvider-5b4b62c3.esm.js → getProvider-24ec6544.esm.js}

@@ -3,7 +3,7 @@ import create from 'zustand/vanilla';
 import { providers } from 'ethers';
 import { getAddress, hexValue } from 'ethers/lib/utils';
 import EventEmitter from 'eventemitter3';
-import { d as defaultChains } from './chains-8c76af1b.esm.js';
+import { d as defaultChains } from './chains-2970e5fa.esm.js';
 
 function _checkPrivateRedeclaration(obj, privateCollection) {
   if (privateCollection.has(obj)) {
@@ -156,7 +156,7 @@ class ChainDoesNotSupportMulticallError extends Error {
       blockNumber,
       chain
     } = _ref;
-    super("Chain \"".concat(chain.name, "\" does not support multicall").concat(blockNumber ? " on block ".concat(blockNumber) : '', "."));
+    super(`Chain "${chain.name}" does not support multicall${blockNumber ? ` on block ${blockNumber}` : ''}.`);
 
     _defineProperty(this, "name", 'ChainDoesNotSupportMulticall');
   }
@@ -168,7 +168,7 @@ class ChainMismatchError extends Error {
       activeChain,
       targetChain
     } = _ref2;
-    super("Chain mismatch: Expected \"".concat(targetChain, "\", received \"").concat(activeChain, "\"."));
+    super(`Chain mismatch: Expected "${targetChain}", received "${activeChain}".`);
 
     _defineProperty(this, "name", 'ChainMismatchError');
   }
@@ -209,7 +209,7 @@ class ContractMethodDoesNotExistError extends Error {
     var _chain$blockExplorers;
 
     let {
-      addressOrName,
+      address,
       chainId,
       functionName
     } = _ref3;
@@ -224,7 +224,7 @@ class ContractMethodDoesNotExistError extends Error {
       return id === (chainId || network.chainId);
     });
     const blockExplorer = chain === null || chain === void 0 ? void 0 : (_chain$blockExplorers = chain.blockExplorers) === null || _chain$blockExplorers === void 0 ? void 0 : _chain$blockExplorers.default;
-    super(["Function \"".concat(functionName, "\" on contract \"").concat(addressOrName, "\" does not exist."), ...(blockExplorer ? ['', "".concat(blockExplorer === null || blockExplorer === void 0 ? void 0 : blockExplorer.name, ": ").concat(blockExplorer === null || blockExplorer === void 0 ? void 0 : blockExplorer.url, "/address/").concat(addressOrName, "#readContract")] : [])].join('\n'));
+    super([`Function "${functionName}" on contract "${address}" does not exist.`, ...(blockExplorer ? ['', `${blockExplorer === null || blockExplorer === void 0 ? void 0 : blockExplorer.name}: ${blockExplorer === null || blockExplorer === void 0 ? void 0 : blockExplorer.url}/address/${address}#readContract`] : [])].join('\n'));
 
     _defineProperty(this, "name", 'ContractMethodDoesNotExistError');
   }
@@ -233,14 +233,14 @@ class ContractMethodDoesNotExistError extends Error {
 class ContractMethodNoResultError extends Error {
   constructor(_ref5) {
     let {
-      addressOrName,
+      address,
       args,
       chainId,
       functionName
     } = _ref5;
-    super(['Contract read returned an empty response. This could be due to any of the following:', "- The contract does not have the function \"".concat(functionName, "\","), '- The parameters passed to the contract function may be invalid, or', '- The address is not a contract.', '', "Config:", JSON.stringify({
-      addressOrName,
-      contractInterface: '...',
+    super(['Contract read returned an empty response. This could be due to any of the following:', `- The contract does not have the function "${functionName}",`, '- The parameters passed to the contract function may be invalid, or', '- The address is not a contract.', '', `Config:`, JSON.stringify({
+      address,
+      abi: '...',
       functionName,
       chainId,
       args
@@ -253,19 +253,19 @@ class ContractMethodNoResultError extends Error {
 class ContractMethodRevertedError extends Error {
   constructor(_ref6) {
     let {
-      addressOrName,
+      address,
       args,
       chainId,
       functionName,
       errorMessage
     } = _ref6;
-    super(['Contract method reverted with an error.', '', "Config:", JSON.stringify({
-      addressOrName,
-      contractInterface: '...',
+    super(['Contract method reverted with an error.', '', `Config:`, JSON.stringify({
+      address,
+      abi: '...',
       functionName,
       chainId,
       args
-    }, null, 2), '', "Details: ".concat(errorMessage)].join('\n'));
+    }, null, 2), '', `Details: ${errorMessage}`].join('\n'));
 
     _defineProperty(this, "name", 'ContractMethodRevertedError');
   }
@@ -274,19 +274,19 @@ class ContractMethodRevertedError extends Error {
 class ContractResultDecodeError extends Error {
   constructor(_ref7) {
     let {
-      addressOrName,
+      address,
       args,
       chainId,
       functionName,
       errorMessage
     } = _ref7;
-    super(['Failed to decode contract function result.', '', "Config:", JSON.stringify({
-      addressOrName,
-      contractInterface: '...',
+    super(['Failed to decode contract function result.', '', `Config:`, JSON.stringify({
+      address,
+      abi: '...',
       functionName,
       chainId,
       args
-    }, null, 2), '', "Details: ".concat(errorMessage)].join('\n'));
+    }, null, 2), '', `Details: ${errorMessage}`].join('\n'));
 
     _defineProperty(this, "name", 'ContractResultDecodeError');
   }
@@ -323,7 +323,7 @@ class SwitchChainNotSupportedError extends Error {
     let {
       connector
     } = _ref8;
-    super("\"".concat(connector.name, "\" does not support programmatic chain switching."));
+    super(`"${connector.name}" does not support programmatic chain switching.`);
 
     _defineProperty(this, "name", 'SwitchChainNotSupportedError');
   }
@@ -339,11 +339,12 @@ class UserRejectedRequestError extends ProviderRpcError {
 }
 
 function getInjectedName(ethereum) {
-  var _ethereum$providers, _getName;
+  var _ethereum$providers;
 
   if (!ethereum) return 'Injected';
 
   const getName = provider => {
+    if (provider.isAvalanche) return 'Core Wallet';
     if (provider.isBitKeep) return 'BitKeep';
     if (provider.isBraveWallet) return 'Brave Wallet';
     if (provider.isCoinbaseWallet) return 'Coinbase Wallet';
@@ -361,8 +362,6 @@ 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();
@@ -372,7 +371,7 @@ function getInjectedName(ethereum) {
       let name = getName(provider);
 
       if (!name) {
-        name = "Unknown Wallet #".concat(unknownCount);
+        name = `Unknown Wallet #${unknownCount}`;
         unknownCount += 1;
       }
 
@@ -381,10 +380,10 @@ function getInjectedName(ethereum) {
 
     const names = [...nameSet];
     if (names.length) return names;
-    return (_names$ = names[0]) !== null && _names$ !== void 0 ? _names$ : 'Injected';
+    return names[0] ?? 'Injected';
   }
 
-  return (_getName = getName(ethereum)) !== null && _getName !== void 0 ? _getName : 'Injected';
+  return getName(ethereum) ?? 'Injected';
 }
 
 function normalizeChainId(chainId) {
@@ -425,12 +424,10 @@ class Connector extends EventEmitter {
   }
 
   getBlockExplorerUrls(chain) {
-    var _chain$blockExplorers;
-
     const {
       default: blockExplorer,
       ...blockExplorers
-    } = (_chain$blockExplorers = chain.blockExplorers) !== null && _chain$blockExplorers !== void 0 ? _chain$blockExplorers : {};
+    } = chain.blockExplorers ?? {};
     if (blockExplorer) return [blockExplorer.url, ...Object.values(blockExplorers).map(x => x.url)];
     return [];
   }
@@ -449,10 +446,13 @@ class InjectedConnector extends Connector {
   constructor() {
     let {
       chains,
-      options = {
-        shimDisconnect: true
-      }
+      options: options_
     } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    const options = {
+      shimDisconnect: true,
+      shimChainChangedDisconnect: true,
+      ...options_
+    };
     super({
       chains,
       options
@@ -604,8 +604,11 @@ class InjectedConnector extends Connector {
   }
 
   async getSigner() {
+    let {
+      chainId
+    } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     const [provider, account] = await Promise.all([this.getProvider(), this.getAccount()]);
-    return new providers.Web3Provider(provider).getSigner(account);
+    return new providers.Web3Provider(provider, chainId).getSigner(account);
   }
 
   async isAuthorized() {
@@ -635,18 +638,16 @@ class InjectedConnector extends Connector {
     const id = hexValue(chainId);
 
     try {
-      var _this$chains$find;
-
       await provider.request({
         method: 'wallet_switchEthereumChain',
         params: [{
           chainId: id
         }]
       });
-      return (_this$chains$find = this.chains.find(x => x.id === chainId)) !== null && _this$chains$find !== void 0 ? _this$chains$find : {
+      return this.chains.find(x => x.id === chainId) ?? {
         id: chainId,
-        name: "Chain ".concat(id),
-        network: "".concat(id),
+        name: `Chain ${id}`,
+        network: `${id}`,
         rpcUrls: {
           default: ''
         }
@@ -661,15 +662,13 @@ class InjectedConnector extends Connector {
       // https://github.com/MetaMask/metamask-mobile/issues/2944#issuecomment-976988719
       (error === null || error === void 0 ? void 0 : (_data = error.data) === null || _data === void 0 ? void 0 : (_data$originalError = _data.originalError) === null || _data$originalError === void 0 ? void 0 : _data$originalError.code) === 4902) {
         try {
-          var _chain$rpcUrls$public;
-
           await provider.request({
             method: 'wallet_addEthereumChain',
             params: [{
               chainId: id,
               chainName: chain.name,
               nativeCurrency: chain.nativeCurrency,
-              rpcUrls: [(_chain$rpcUrls$public = chain.rpcUrls.public) !== null && _chain$rpcUrls$public !== void 0 ? _chain$rpcUrls$public : chain.rpcUrls.default],
+              rpcUrls: [chain.rpcUrls.public ?? chain.rpcUrls.default],
               blockExplorerUrls: this.getBlockExplorerUrls(chain)
             }]
           });
@@ -727,7 +726,7 @@ function createStorage(_ref) {
   return { ...storage,
     getItem: function (key) {
       let defaultState = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
-      const value = storage.getItem("".concat(prefix, ".").concat(key));
+      const value = storage.getItem(`${prefix}.${key}`);
 
       try {
         return value ? JSON.parse(value) : defaultState;
@@ -738,16 +737,16 @@ function createStorage(_ref) {
     },
     setItem: (key, value) => {
       if (value === null) {
-        storage.removeItem("".concat(prefix, ".").concat(key));
+        storage.removeItem(`${prefix}.${key}`);
       } else {
         try {
-          storage.setItem("".concat(prefix, ".").concat(key), JSON.stringify(value));
+          storage.setItem(`${prefix}.${key}`, JSON.stringify(value));
         } catch (err) {
           console.error(err);
         }
       }
     },
-    removeItem: key => storage.removeItem("".concat(prefix, ".").concat(key))
+    removeItem: key => storage.removeItem(`${prefix}.${key}`)
   };
 }
 
@@ -971,7 +970,7 @@ class Client {
       bust,
       chainId
     } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    let provider_ = this.providers.get(chainId !== null && chainId !== void 0 ? chainId : -1);
+    let provider_ = this.providers.get(chainId ?? -1);
     if (provider_ && !bust) return provider_;
     const {
       provider
@@ -979,7 +978,7 @@ class Client {
     provider_ = typeof provider === 'function' ? provider({
       chainId
     }) : provider;
-    this.providers.set(chainId !== null && chainId !== void 0 ? chainId : -1, provider_);
+    this.providers.set(chainId ?? -1, provider_);
     return provider_;
   }
 
@@ -988,7 +987,7 @@ class Client {
       bust,
       chainId
     } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    let webSocketProvider_ = this.webSocketProviders.get(chainId !== null && chainId !== void 0 ? chainId : -1);
+    let webSocketProvider_ = this.webSocketProviders.get(chainId ?? -1);
     if (webSocketProvider_ && !bust) return webSocketProvider_;
     const {
       webSocketProvider
@@ -996,7 +995,7 @@ class Client {
     webSocketProvider_ = typeof webSocketProvider === 'function' ? webSocketProvider({
       chainId
     }) : webSocketProvider;
-    if (webSocketProvider_) this.webSocketProviders.set(chainId !== null && chainId !== void 0 ? chainId : -1, webSocketProvider_);
+    if (webSocketProvider_) this.webSocketProviders.set(chainId ?? -1, webSocketProvider_);
     return webSocketProvider_;
   }
 
@@ -1096,4 +1095,4 @@ function getProvider() {
   return client.provider;
 }
 
-export { AddChainError as A, ConnectorAlreadyConnectedError as C, InjectedConnector as I, ProviderChainsNotFound as P, ResourceUnavailableError as R, SwitchChainNotSupportedError as S, UserRejectedRequestError as U, _classPrivateMethodInitSpec as _, ConnectorNotFoundError as a, ChainMismatchError as b, ContractResultDecodeError as c, ContractMethodDoesNotExistError as d, getProvider as e, ChainDoesNotSupportMulticallError as f, getClient as g, ContractMethodRevertedError as h, ContractMethodNoResultError as i, createClient as j, Client as k, Connector as l, ChainNotConfiguredError as m, normalizeChainId as n, ProviderRpcError as o, RpcError as p, SwitchChainError as q, createStorage as r, noopStorage as s, _defineProperty as t, _classPrivateFieldInitSpec as u, _classPrivateFieldGet as v, _classPrivateFieldSet as w, _classPrivateMethodGet as x };
+export { AddChainError as A, ChainMismatchError as C, InjectedConnector as I, ProviderChainsNotFound as P, ResourceUnavailableError as R, SwitchChainNotSupportedError as S, UserRejectedRequestError as U, _classPrivateMethodInitSpec as _, ConnectorAlreadyConnectedError as a, ContractResultDecodeError as b, ConnectorNotFoundError as c, ContractMethodDoesNotExistError as d, getProvider as e, ChainDoesNotSupportMulticallError as f, getClient as g, ContractMethodRevertedError as h, ContractMethodNoResultError as i, createClient as j, Client as k, Connector as l, ChainNotConfiguredError as m, normalizeChainId as n, ProviderRpcError as o, RpcError as p, SwitchChainError as q, createStorage as r, noopStorage as s, _defineProperty as t, _classPrivateMethodGet as u, _classPrivateFieldInitSpec as v, _classPrivateFieldSet as w, _classPrivateFieldGet as x };

package/dist/{getProvider-1b3eeda8.cjs.dev.js → getProvider-ed469b94.cjs.prod.js}

@@ -5,7 +5,7 @@ var create = require('zustand/vanilla');
 var ethers = require('ethers');
 var utils = require('ethers/lib/utils');
 var EventEmitter = require('eventemitter3');
-var chains = require('./chains-ec1de502.cjs.dev.js');
+var chains = require('./chains-45d5aa86.cjs.prod.js');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
 
@@ -163,7 +163,7 @@ class ChainDoesNotSupportMulticallError extends Error {
       blockNumber,
       chain
     } = _ref;
-    super("Chain \"".concat(chain.name, "\" does not support multicall").concat(blockNumber ? " on block ".concat(blockNumber) : '', "."));
+    super(`Chain "${chain.name}" does not support multicall${blockNumber ? ` on block ${blockNumber}` : ''}.`);
 
     _defineProperty(this, "name", 'ChainDoesNotSupportMulticall');
   }
@@ -175,7 +175,7 @@ class ChainMismatchError extends Error {
       activeChain,
       targetChain
     } = _ref2;
-    super("Chain mismatch: Expected \"".concat(targetChain, "\", received \"").concat(activeChain, "\"."));
+    super(`Chain mismatch: Expected "${targetChain}", received "${activeChain}".`);
 
     _defineProperty(this, "name", 'ChainMismatchError');
   }
@@ -216,7 +216,7 @@ class ContractMethodDoesNotExistError extends Error {
     var _chain$blockExplorers;
 
     let {
-      addressOrName,
+      address,
       chainId,
       functionName
     } = _ref3;
@@ -231,7 +231,7 @@ class ContractMethodDoesNotExistError extends Error {
       return id === (chainId || network.chainId);
     });
     const blockExplorer = chain === null || chain === void 0 ? void 0 : (_chain$blockExplorers = chain.blockExplorers) === null || _chain$blockExplorers === void 0 ? void 0 : _chain$blockExplorers.default;
-    super(["Function \"".concat(functionName, "\" on contract \"").concat(addressOrName, "\" does not exist."), ...(blockExplorer ? ['', "".concat(blockExplorer === null || blockExplorer === void 0 ? void 0 : blockExplorer.name, ": ").concat(blockExplorer === null || blockExplorer === void 0 ? void 0 : blockExplorer.url, "/address/").concat(addressOrName, "#readContract")] : [])].join('\n'));
+    super([`Function "${functionName}" on contract "${address}" does not exist.`, ...(blockExplorer ? ['', `${blockExplorer === null || blockExplorer === void 0 ? void 0 : blockExplorer.name}: ${blockExplorer === null || blockExplorer === void 0 ? void 0 : blockExplorer.url}/address/${address}#readContract`] : [])].join('\n'));
 
     _defineProperty(this, "name", 'ContractMethodDoesNotExistError');
   }
@@ -240,14 +240,14 @@ class ContractMethodDoesNotExistError extends Error {
 class ContractMethodNoResultError extends Error {
   constructor(_ref5) {
     let {
-      addressOrName,
+      address,
       args,
       chainId,
       functionName
     } = _ref5;
-    super(['Contract read returned an empty response. This could be due to any of the following:', "- The contract does not have the function \"".concat(functionName, "\","), '- The parameters passed to the contract function may be invalid, or', '- The address is not a contract.', '', "Config:", JSON.stringify({
-      addressOrName,
-      contractInterface: '...',
+    super(['Contract read returned an empty response. This could be due to any of the following:', `- The contract does not have the function "${functionName}",`, '- The parameters passed to the contract function may be invalid, or', '- The address is not a contract.', '', `Config:`, JSON.stringify({
+      address,
+      abi: '...',
       functionName,
       chainId,
       args
@@ -260,19 +260,19 @@ class ContractMethodNoResultError extends Error {
 class ContractMethodRevertedError extends Error {
   constructor(_ref6) {
     let {
-      addressOrName,
+      address,
       args,
       chainId,
       functionName,
       errorMessage
     } = _ref6;
-    super(['Contract method reverted with an error.', '', "Config:", JSON.stringify({
-      addressOrName,
-      contractInterface: '...',
+    super(['Contract method reverted with an error.', '', `Config:`, JSON.stringify({
+      address,
+      abi: '...',
       functionName,
       chainId,
       args
-    }, null, 2), '', "Details: ".concat(errorMessage)].join('\n'));
+    }, null, 2), '', `Details: ${errorMessage}`].join('\n'));
 
     _defineProperty(this, "name", 'ContractMethodRevertedError');
   }
@@ -281,19 +281,19 @@ class ContractMethodRevertedError extends Error {
 class ContractResultDecodeError extends Error {
   constructor(_ref7) {
     let {
-      addressOrName,
+      address,
       args,
       chainId,
       functionName,
       errorMessage
     } = _ref7;
-    super(['Failed to decode contract function result.', '', "Config:", JSON.stringify({
-      addressOrName,
-      contractInterface: '...',
+    super(['Failed to decode contract function result.', '', `Config:`, JSON.stringify({
+      address,
+      abi: '...',
       functionName,
       chainId,
       args
-    }, null, 2), '', "Details: ".concat(errorMessage)].join('\n'));
+    }, null, 2), '', `Details: ${errorMessage}`].join('\n'));
 
     _defineProperty(this, "name", 'ContractResultDecodeError');
   }
@@ -330,7 +330,7 @@ class SwitchChainNotSupportedError extends Error {
     let {
       connector
     } = _ref8;
-    super("\"".concat(connector.name, "\" does not support programmatic chain switching."));
+    super(`"${connector.name}" does not support programmatic chain switching.`);
 
     _defineProperty(this, "name", 'SwitchChainNotSupportedError');
   }
@@ -346,11 +346,12 @@ class UserRejectedRequestError extends ProviderRpcError {
 }
 
 function getInjectedName(ethereum) {
-  var _ethereum$providers, _getName;
+  var _ethereum$providers;
 
   if (!ethereum) return 'Injected';
 
   const getName = provider => {
+    if (provider.isAvalanche) return 'Core Wallet';
     if (provider.isBitKeep) return 'BitKeep';
     if (provider.isBraveWallet) return 'Brave Wallet';
     if (provider.isCoinbaseWallet) return 'Coinbase Wallet';
@@ -368,8 +369,6 @@ 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();
@@ -379,7 +378,7 @@ function getInjectedName(ethereum) {
       let name = getName(provider);
 
       if (!name) {
-        name = "Unknown Wallet #".concat(unknownCount);
+        name = `Unknown Wallet #${unknownCount}`;
         unknownCount += 1;
       }
 
@@ -388,10 +387,10 @@ function getInjectedName(ethereum) {
 
     const names = [...nameSet];
     if (names.length) return names;
-    return (_names$ = names[0]) !== null && _names$ !== void 0 ? _names$ : 'Injected';
+    return names[0] ?? 'Injected';
   }
 
-  return (_getName = getName(ethereum)) !== null && _getName !== void 0 ? _getName : 'Injected';
+  return getName(ethereum) ?? 'Injected';
 }
 
 function normalizeChainId(chainId) {
@@ -432,12 +431,10 @@ class Connector extends EventEmitter__default["default"] {
   }
 
   getBlockExplorerUrls(chain) {
-    var _chain$blockExplorers;
-
     const {
       default: blockExplorer,
       ...blockExplorers
-    } = (_chain$blockExplorers = chain.blockExplorers) !== null && _chain$blockExplorers !== void 0 ? _chain$blockExplorers : {};
+    } = chain.blockExplorers ?? {};
     if (blockExplorer) return [blockExplorer.url, ...Object.values(blockExplorers).map(x => x.url)];
     return [];
   }
@@ -456,10 +453,13 @@ class InjectedConnector extends Connector {
   constructor() {
     let {
       chains,
-      options = {
-        shimDisconnect: true
-      }
+      options: options_
     } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    const options = {
+      shimDisconnect: true,
+      shimChainChangedDisconnect: true,
+      ...options_
+    };
     super({
       chains,
       options
@@ -611,8 +611,11 @@ class InjectedConnector extends Connector {
   }
 
   async getSigner() {
+    let {
+      chainId
+    } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     const [provider, account] = await Promise.all([this.getProvider(), this.getAccount()]);
-    return new ethers.providers.Web3Provider(provider).getSigner(account);
+    return new ethers.providers.Web3Provider(provider, chainId).getSigner(account);
   }
 
   async isAuthorized() {
@@ -642,18 +645,16 @@ class InjectedConnector extends Connector {
     const id = utils.hexValue(chainId);
 
     try {
-      var _this$chains$find;
-
       await provider.request({
         method: 'wallet_switchEthereumChain',
         params: [{
           chainId: id
         }]
       });
-      return (_this$chains$find = this.chains.find(x => x.id === chainId)) !== null && _this$chains$find !== void 0 ? _this$chains$find : {
+      return this.chains.find(x => x.id === chainId) ?? {
         id: chainId,
-        name: "Chain ".concat(id),
-        network: "".concat(id),
+        name: `Chain ${id}`,
+        network: `${id}`,
         rpcUrls: {
           default: ''
         }
@@ -668,15 +669,13 @@ class InjectedConnector extends Connector {
       // https://github.com/MetaMask/metamask-mobile/issues/2944#issuecomment-976988719
       (error === null || error === void 0 ? void 0 : (_data = error.data) === null || _data === void 0 ? void 0 : (_data$originalError = _data.originalError) === null || _data$originalError === void 0 ? void 0 : _data$originalError.code) === 4902) {
         try {
-          var _chain$rpcUrls$public;
-
           await provider.request({
             method: 'wallet_addEthereumChain',
             params: [{
               chainId: id,
               chainName: chain.name,
               nativeCurrency: chain.nativeCurrency,
-              rpcUrls: [(_chain$rpcUrls$public = chain.rpcUrls.public) !== null && _chain$rpcUrls$public !== void 0 ? _chain$rpcUrls$public : chain.rpcUrls.default],
+              rpcUrls: [chain.rpcUrls.public ?? chain.rpcUrls.default],
               blockExplorerUrls: this.getBlockExplorerUrls(chain)
             }]
           });
@@ -734,7 +733,7 @@ function createStorage(_ref) {
   return { ...storage,
     getItem: function (key) {
       let defaultState = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
-      const value = storage.getItem("".concat(prefix, ".").concat(key));
+      const value = storage.getItem(`${prefix}.${key}`);
 
       try {
         return value ? JSON.parse(value) : defaultState;
@@ -745,16 +744,16 @@ function createStorage(_ref) {
     },
     setItem: (key, value) => {
       if (value === null) {
-        storage.removeItem("".concat(prefix, ".").concat(key));
+        storage.removeItem(`${prefix}.${key}`);
       } else {
         try {
-          storage.setItem("".concat(prefix, ".").concat(key), JSON.stringify(value));
+          storage.setItem(`${prefix}.${key}`, JSON.stringify(value));
         } catch (err) {
           console.error(err);
         }
       }
     },
-    removeItem: key => storage.removeItem("".concat(prefix, ".").concat(key))
+    removeItem: key => storage.removeItem(`${prefix}.${key}`)
   };
 }
 
@@ -978,7 +977,7 @@ class Client {
       bust,
       chainId
     } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    let provider_ = this.providers.get(chainId !== null && chainId !== void 0 ? chainId : -1);
+    let provider_ = this.providers.get(chainId ?? -1);
     if (provider_ && !bust) return provider_;
     const {
       provider
@@ -986,7 +985,7 @@ class Client {
     provider_ = typeof provider === 'function' ? provider({
       chainId
     }) : provider;
-    this.providers.set(chainId !== null && chainId !== void 0 ? chainId : -1, provider_);
+    this.providers.set(chainId ?? -1, provider_);
     return provider_;
   }
 
@@ -995,7 +994,7 @@ class Client {
       bust,
       chainId
     } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    let webSocketProvider_ = this.webSocketProviders.get(chainId !== null && chainId !== void 0 ? chainId : -1);
+    let webSocketProvider_ = this.webSocketProviders.get(chainId ?? -1);
     if (webSocketProvider_ && !bust) return webSocketProvider_;
     const {
       webSocketProvider
@@ -1003,7 +1002,7 @@ class Client {
     webSocketProvider_ = typeof webSocketProvider === 'function' ? webSocketProvider({
       chainId
     }) : webSocketProvider;
-    if (webSocketProvider_) this.webSocketProviders.set(chainId !== null && chainId !== void 0 ? chainId : -1, webSocketProvider_);
+    if (webSocketProvider_) this.webSocketProviders.set(chainId ?? -1, webSocketProvider_);
     return webSocketProvider_;
   }