@wagmi/core 0.2.0-next.11 → 0.2.0-next.12

package/dist/wagmi-core.esm.js

@@ -16,13 +16,22 @@ const erc721ABI = ['event Approval(address indexed _owner, address indexed _appr
 // https://github.com/ethers-io/ethers.js/blob/master/packages/units/src.ts/index.ts#L10-L18
 const units = ['wei', 'kwei', 'mwei', 'gwei', 'szabo', 'finney', 'ether'];
 
+const injectedProvidersLookup = {
+  isMetaMask: 'MetaMask',
+  // Place other options below in alphabetical order
+  isBraveWallet: 'Brave Wallet',
+  isCoinbaseWallet: 'Coinbase Wallet',
+  isFrame: 'Frame',
+  isTally: 'Tally'
+};
+const injectedOptions = Object.entries(injectedProvidersLookup);
 function getInjectedName(ethereum) {
   if (!ethereum) return 'Injected';
-  if (ethereum.isMetaMask) return 'MetaMask';
-  if (ethereum.isBraveWallet) return 'Brave Wallet';
-  if (ethereum.isCoinbaseWallet) return 'Coinbase Wallet';
-  if (ethereum.isFrame) return 'Frame';
-  if (ethereum.isTally) return 'Tally';
+
+  for (const [key, val] of injectedOptions) {
+    if (ethereum[key]) return val;
+  }
+
   return 'Injected';
 }
 
@@ -68,10 +77,10 @@ class InjectedConnector extends Connector {
     });
 
     _defineProperty(this, "onDisconnect", () => {
-      var _this$options, _client$storage;
+      var _this$options, _getClient$storage;
 
       this.emit('disconnect');
-      if ((_this$options = this.options) !== null && _this$options !== void 0 && _this$options.shimDisconnect) (_client$storage = client.storage) === null || _client$storage === void 0 ? void 0 : _client$storage.removeItem(shimKey);
+      if ((_this$options = this.options) !== null && _this$options !== void 0 && _this$options.shimDisconnect) (_getClient$storage = getClient().storage) === null || _getClient$storage === void 0 ? void 0 : _getClient$storage.removeItem(shimKey);
     });
 
     let name = 'Injected';
@@ -81,7 +90,7 @@ class InjectedConnector extends Connector {
 
   async connect() {
     try {
-      var _this$options2, _client$storage2;
+      var _this$options2, _getClient$storage2;
 
       const provider = await this.getProvider();
       if (!provider) throw new ConnectorNotFoundError();
@@ -98,7 +107,7 @@ class InjectedConnector extends Connector {
       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) (_client$storage2 = client.storage) === null || _client$storage2 === void 0 ? void 0 : _client$storage2.setItem(shimKey, true);
+      if ((_this$options2 = this.options) !== null && _this$options2 !== void 0 && _this$options2.shimDisconnect) (_getClient$storage2 = getClient().storage) === null || _getClient$storage2 === void 0 ? void 0 : _getClient$storage2.setItem(shimKey, true);
       return {
         account,
         chain: {
@@ -114,14 +123,14 @@ class InjectedConnector extends Connector {
   }
 
   async disconnect() {
-    var _this$options3, _client$storage3;
+    var _this$options3, _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) (_client$storage3 = client.storage) === null || _client$storage3 === void 0 ? void 0 : _client$storage3.removeItem(shimKey);
+    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);
   }
 
   async getAccount() {
@@ -154,9 +163,9 @@ class InjectedConnector extends Connector {
 
   async isAuthorized() {
     try {
-      var _this$options4, _client$storage4;
+      var _this$options4, _getClient$storage4;
 
-      if ((_this$options4 = this.options) !== null && _this$options4 !== void 0 && _this$options4.shimDisconnect && !((_client$storage4 = client.storage) !== null && _client$storage4 !== void 0 && _client$storage4.getItem(shimKey))) return false;
+      if ((_this$options4 = this.options) !== null && _this$options4 !== void 0 && _this$options4.shimDisconnect && !((_getClient$storage4 = getClient().storage) !== null && _getClient$storage4 !== void 0 && _getClient$storage4.getItem(shimKey))) return false;
       const provider = await this.getProvider();
       if (!provider) throw new ConnectorNotFoundError();
       const accounts = await provider.request({
@@ -570,22 +579,50 @@ async function connect(_ref) {
 }
 
 async function disconnect() {
+  const client = getClient();
   if (client.connector) await client.connector.disconnect();
   client.clearState();
   client.storage.removeItem('connected');
 }
 
+function getProvider() {
+  let {
+    chainId
+  } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  const client = getClient();
+  if (chainId && typeof client.config.provider === 'function') return client.config.provider({
+    chainId
+  });
+  return client.provider;
+}
+
+function getWebSocketProvider() {
+  let {
+    chainId
+  } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  const client = getClient();
+  if (chainId && typeof client.config.webSocketProvider === 'function') return client.config.webSocketProvider({
+    chainId
+  });
+  return client.webSocketProvider;
+}
+
 async function fetchBalance(_ref) {
   var _client$connector$cha, _client$connector, _chain$nativeCurrency, _chain$nativeCurrency2, _chain$nativeCurrency3, _chain$nativeCurrency4;
 
   let {
     addressOrName,
+    chainId,
     formatUnits: unit = 'ether',
     token
   } = _ref;
+  const client = getClient();
+  const provider = getProvider({
+    chainId
+  });
 
   if (token) {
-    const contract = new Contract(token, erc20ABI, client.provider);
+    const contract = new Contract(token, erc20ABI, provider);
     const [value, decimals, symbol] = await Promise.all([contract.balanceOf(addressOrName), contract.decimals(), contract.symbol()]);
     return {
       decimals,
@@ -597,8 +634,8 @@ async function fetchBalance(_ref) {
   }
 
   const chains = [...((_client$connector$cha = (_client$connector = client.connector) === null || _client$connector === void 0 ? void 0 : _client$connector.chains) !== null && _client$connector$cha !== void 0 ? _client$connector$cha : []), ...allChains];
-  const value = await client.provider.getBalance(addressOrName);
-  const chain = chains.find(x => x.id === client.provider.network.chainId);
+  const value = await provider.getBalance(addressOrName);
+  const chain = chains.find(x => x.id === provider.network.chainId);
   return {
     decimals: (_chain$nativeCurrency = chain === null || chain === void 0 ? void 0 : (_chain$nativeCurrency2 = chain.nativeCurrency) === null || _chain$nativeCurrency2 === void 0 ? void 0 : _chain$nativeCurrency2.decimals) !== null && _chain$nativeCurrency !== void 0 ? _chain$nativeCurrency : 18,
     formatted: formatUnits(value, unit),
@@ -611,6 +648,7 @@ async function fetchBalance(_ref) {
 async function fetchSigner() {
   var _client$connector, _client$connector$get;
 
+  const client = getClient();
   const signer = await ((_client$connector = client.connector) === null || _client$connector === void 0 ? void 0 : (_client$connector$get = _client$connector.getSigner) === null || _client$connector$get === void 0 ? void 0 : _client$connector$get.call(_client$connector));
   return signer;
 }
@@ -619,7 +657,7 @@ function getAccount() {
   const {
     data,
     connector
-  } = client;
+  } = getClient();
   return {
     address: data === null || data === void 0 ? void 0 : data.account,
     connector
@@ -627,15 +665,11 @@ function getAccount() {
 }
 
 function getNetwork() {
-  var _data$chain, _data$chain2, _find;
+  var _client$data, _client$data$chain, _client$chains, _find, _client$data2;
 
-  const {
-    chains,
-    data
-  } = client;
-  const chainId = data === null || data === void 0 ? void 0 : (_data$chain = data.chain) === null || _data$chain === void 0 ? void 0 : _data$chain.id;
-  const unsupported = data === null || data === void 0 ? void 0 : (_data$chain2 = data.chain) === null || _data$chain2 === void 0 ? void 0 : _data$chain2.unsupported;
-  const activeChains = chains !== null && chains !== void 0 ? chains : [];
+  const client = getClient();
+  const chainId = (_client$data = client.data) === null || _client$data === void 0 ? void 0 : (_client$data$chain = _client$data.chain) === null || _client$data$chain === void 0 ? void 0 : _client$data$chain.id;
+  const activeChains = (_client$chains = client.chains) !== null && _client$chains !== void 0 ? _client$chains : [];
   const activeChain = (_find = [...activeChains, ...allChains].find(x => x.id === chainId)) !== null && _find !== void 0 ? _find : {
     id: chainId,
     name: "Chain ".concat(chainId),
@@ -645,8 +679,8 @@ function getNetwork() {
   };
   return {
     chain: chainId ? { ...activeChain,
-      id: chainId,
-      unsupported
+      ...((_client$data2 = client.data) === null || _client$data2 === void 0 ? void 0 : _client$data2.chain),
+      id: chainId
     } : undefined,
     chains: activeChains
   };
@@ -683,12 +717,15 @@ async function switchNetwork(_ref) {
   let {
     chainId
   } = _ref;
+  const client = getClient();
   if (!((_client$connector = client.connector) !== null && _client$connector !== void 0 && _client$connector.switchChain)) throw new SwitchChainNotSupportedError();
   const chain = await client.connector.switchChain(chainId);
   return chain;
 }
 
 function watchAccount(callback) {
+  const client = getClient();
+
   const handleChange = () => callback(getAccount());
 
   const unsubscribe = client.subscribe(_ref => {
@@ -707,6 +744,8 @@ function watchAccount(callback) {
 }
 
 function watchBalance(args, callback) {
+  const client = getClient();
+
   const handleChange = async () => callback(await fetchBalance(args));
 
   const unsubscribe = client.subscribe(_ref => {
@@ -726,6 +765,8 @@ function watchBalance(args, callback) {
 }
 
 function watchNetwork(callback) {
+  const client = getClient();
+
   const handleChange = () => callback(getNetwork());
 
   const unsubscribe = client.subscribe(_ref => {
@@ -746,6 +787,8 @@ function watchNetwork(callback) {
 }
 
 function watchSigner(callback) {
+  const client = getClient();
+
   const handleChange = async () => callback(await fetchSigner());
 
   const unsubscribe = client.subscribe(_ref => {
@@ -778,17 +821,20 @@ function getContract(_ref) {
 async function readContract(contractConfig, functionName) {
   let {
     args,
+    chainId,
     overrides
   } = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-  const {
-    provider
-  } = client;
+  const provider = getProvider({
+    chainId
+  });
   const contract = getContract({
     signerOrProvider: provider,
     ...contractConfig
   });
   const params = [...(Array.isArray(args) ? args : args ? [args] : []), ...(overrides ? [overrides] : [])];
-  const response = await contract[functionName](...params);
+  const contractFunction = contract[functionName];
+  if (!contractFunction) console.warn("\"".concat(functionName, "\" does not in interface for contract \"").concat(contractConfig.addressOrName, "\""));
+  const response = await (contractFunction === null || contractFunction === void 0 ? void 0 : contractFunction(...params));
   return response;
 }
 
@@ -798,6 +844,7 @@ contractArgs,
 /** Event name to listen to */
 eventName, callback) {
   let {
+    chainId,
     once
   } = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
   let contract;
@@ -810,13 +857,18 @@ eventName, callback) {
     }
 
     contract = getContract({
-      signerOrProvider: client.webSocketProvider || client.provider,
+      signerOrProvider: getWebSocketProvider({
+        chainId
+      }) || getProvider({
+        chainId
+      }),
       ...contractArgs
     });
     if (once) contract.once(eventName, callback);else contract.on(eventName, callback);
   };
 
   watchEvent();
+  const client = getClient();
   const unsubscribe = client.subscribe(_ref => {
     let {
       provider,
@@ -838,11 +890,19 @@ eventName, callback) {
 }
 
 async function fetchBlockNumber() {
-  const blockNumber = await client.provider.getBlockNumber();
+  let {
+    chainId
+  } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  const provider = getProvider({
+    chainId
+  });
+  const blockNumber = await provider.getBlockNumber();
   return blockNumber;
 }
 
 function watchBlockNumber(args, callback) {
+  var _client$webSocketProv;
+
   let prevProvider;
 
   const createListener = provider => {
@@ -860,11 +920,8 @@ function watchBlockNumber(args, callback) {
     prevProvider = provider;
   };
 
-  const {
-    provider,
-    webSocketProvider
-  } = client;
-  const provider_ = webSocketProvider !== null && webSocketProvider !== void 0 ? webSocketProvider : provider;
+  const client = getClient();
+  const provider_ = (_client$webSocketProv = client.webSocketProvider) !== null && _client$webSocketProv !== void 0 ? _client$webSocketProv : client.provider;
   if (args.listen) createListener(provider_);
   const unsubscribe = client.subscribe(_ref => {
     let {
@@ -898,6 +955,7 @@ function watchReadContract(contractConfig, functionName) {
 
   let config = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   let callback = arguments.length > 3 ? arguments[3] : undefined;
+  const client = getClient();
 
   const handleChange = async () => callback(await readContract(contractConfig, functionName, config));
 
@@ -921,17 +979,17 @@ async function writeContract(contractConfig, functionName) {
     args,
     overrides
   } = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-  const {
-    connector
-  } = client;
-  const contract = getContract(contractConfig);
-  if (!connector) throw new ConnectorNotFoundError();
+  const client = getClient();
+  if (!client.connector) throw new ConnectorNotFoundError();
   const params = [...(Array.isArray(args) ? args : args ? [args] : []), ...(overrides ? [overrides] : [])];
 
   try {
-    const signer = await connector.getSigner();
-    const contract_ = contract.connect(signer);
-    const response = await contract_[functionName](...params);
+    const signer = await client.connector.getSigner();
+    const contract = getContract(contractConfig);
+    const contractWithSigner = contract.connect(signer);
+    const contractFunction = contractWithSigner[functionName];
+    if (!contractFunction) console.warn("\"".concat(functionName, "\" does not in interface for contract \"").concat(contractConfig.addressOrName, "\""));
+    const response = await contractFunction(...params);
     return response;
   } catch (error_) {
     let error = error_;
@@ -942,9 +1000,13 @@ async function writeContract(contractConfig, functionName) {
 
 async function fetchEnsAddress(_ref) {
   let {
+    chainId,
     name
   } = _ref;
-  const address = await client.provider.resolveName(name);
+  const provider = getProvider({
+    chainId
+  });
+  const address = await provider.resolveName(name);
 
   try {
     return address ? getAddress(address) : null;
@@ -955,31 +1017,45 @@ async function fetchEnsAddress(_ref) {
 
 async function fetchEnsAvatar(_ref) {
   let {
-    addressOrName
+    addressOrName,
+    chainId
   } = _ref;
-  // TODO: Update with more advanced logic
+  const provider = getProvider({
+    chainId
+  }); // TODO: Update with more advanced logic
   // https://github.com/ensdomains/ens-avatar
-  const avatar = await client.provider.getAvatar(addressOrName);
+
+  const avatar = await provider.getAvatar(addressOrName);
   return avatar;
 }
 
 async function fetchEnsName(_ref) {
   let {
-    address
+    address,
+    chainId
   } = _ref;
-  const ensName = await client.provider.lookupAddress(address);
+  const provider = getProvider({
+    chainId
+  });
+  const ensName = await provider.lookupAddress(address);
   return ensName;
 }
 
 async function fetchEnsResolver(_ref) {
   let {
+    chainId,
     name
   } = _ref;
-  const resolver = await client.provider.getResolver(name);
+  const provider = getProvider({
+    chainId
+  });
+  const resolver = await provider.getResolver(name);
   return resolver;
 }
 
 function watchEnsAddress(args, callback) {
+  const client = getClient();
+
   const handleChange = async () => callback(await fetchEnsAddress(args));
 
   const unsubscribe = client.subscribe(_ref => {
@@ -992,6 +1068,8 @@ function watchEnsAddress(args, callback) {
 }
 
 function watchEnsAvatar(args, callback) {
+  const client = getClient();
+
   const handleChange = async () => callback(await fetchEnsAvatar(args));
 
   const unsubscribe = client.subscribe(_ref => {
@@ -1004,6 +1082,8 @@ function watchEnsAvatar(args, callback) {
 }
 
 function watchEnsName(args, callback) {
+  const client = getClient();
+
   const handleChange = async () => callback(await fetchEnsName(args));
 
   const unsubscribe = client.subscribe(_ref => {
@@ -1016,6 +1096,8 @@ function watchEnsName(args, callback) {
 }
 
 function watchEnsResolver(args, callback) {
+  const client = getClient();
+
   const handleChange = async () => callback(await fetchEnsResolver(args));
 
   const unsubscribe = client.subscribe(_ref => {
@@ -1029,9 +1111,13 @@ function watchEnsResolver(args, callback) {
 
 async function fetchFeeData() {
   let {
+    chainId,
     formatUnits: units = 'wei'
   } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  const feeData = await client.provider.getFeeData();
+  const provider = getProvider({
+    chainId
+  });
+  const feeData = await provider.getFeeData();
   const formatted = {
     gasPrice: formatUnits(feeData.gasPrice, units),
     maxFeePerGas: formatUnits(feeData.maxFeePerGas, units),
@@ -1043,6 +1129,8 @@ async function fetchFeeData() {
 }
 
 function watchFeeData(args, callback) {
+  const client = getClient();
+
   const handleChange = async () => callback(await fetchFeeData(args));
 
   const unwatch = args.listenToBlock ? watchBlockNumber({
@@ -1060,23 +1148,15 @@ function watchFeeData(args, callback) {
   };
 }
 
-function getProvider() {
-  return getClient().provider;
-}
-
-function getWebSocketProvider() {
-  return getClient().webSocketProvider;
-}
-
 async function fetchToken(_ref) {
   let {
     address,
+    chainId,
     formatUnits: units = 'ether'
   } = _ref;
-  if (!address) throw new Error('address is required');
-  const {
-    provider
-  } = client;
+  const provider = getProvider({
+    chainId
+  });
   const contract = new Contract(address, erc20ABI, provider);
   const [symbol, decimals, totalSupply] = await Promise.all([contract.symbol(), contract.decimals(), contract.totalSupply()]);
   const token = {
@@ -1092,6 +1172,8 @@ async function fetchToken(_ref) {
 }
 
 function watchToken(args, callback) {
+  const client = getClient();
+
   const handleChange = async () => callback(await fetchToken(args));
 
   const unsubscribe = client.subscribe(_ref => {
@@ -1117,9 +1199,7 @@ async function sendTransaction(args) {
 }
 
 async function waitForTransaction(args) {
-  const {
-    provider
-  } = client;
+  const provider = getProvider();
   let promise; // eslint-disable-next-line testing-library/await-async-utils
 
   if (args.wait) promise = args.wait(args.confirmations);else if (args.hash) promise = provider.waitForTransaction(args.hash, args.confirmations, args.timeout);else throw new Error('hash or wait is required');

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@wagmi/core",
   "description": "Vanilla JS Client for Ethereum",
-  "license": "MIT",
-  "version": "0.2.0-next.11",
+  "license": "WAGMIT",
+  "version": "0.2.0-next.12",
   "ethereum": "awkweb.eth",
   "repository": "tmm/wagmi",
   "sideEffects": false,