@wagmi/core 0.5.7 → 0.5.8

package/dist/wagmi-core.esm.js

@@ -1,8 +1,8 @@
-import { g as getClient, C as ConnectorAlreadyConnectedError, a as ConnectorNotFoundError, b as ChainMismatchError, U as UserRejectedRequestError, c as ContractMethodDoesNotExistError, d as getProvider, P as ProviderChainsNotFound, e as ChainDoesNotSupportMulticallError, f as ContractMethodRevertedError, h as ContractMethodNoResultError, i as ContractResultDecodeError, n as normalizeChainId, S as SwitchChainNotSupportedError } from './getProvider-f1dfc7e3.esm.js';
-export { A as AddChainError, e as ChainDoesNotSupportMulticallError, b as ChainMismatchError, m as ChainNotConfiguredError, k as Client, l as Connector, C as ConnectorAlreadyConnectedError, a as ConnectorNotFoundError, c as ContractMethodDoesNotExistError, h as ContractMethodNoResultError, f as ContractMethodRevertedError, i as ContractResultDecodeError, I as InjectedConnector, P as ProviderChainsNotFound, o as ProviderRpcError, R as ResourceUnavailableError, p as RpcError, q as SwitchChainError, S as SwitchChainNotSupportedError, U as UserRejectedRequestError, j as createClient, r as createStorage, d as getProvider, s as noopStorage, n as normalizeChainId } from './getProvider-f1dfc7e3.esm.js';
+import { g as getClient, C as ConnectorAlreadyConnectedError, a as ConnectorNotFoundError, b as ChainMismatchError, U as UserRejectedRequestError, c as ContractResultDecodeError, d as ContractMethodDoesNotExistError, e as getProvider, P as ProviderChainsNotFound, f as ChainDoesNotSupportMulticallError, h as ContractMethodRevertedError, i as ContractMethodNoResultError, n as normalizeChainId, S as SwitchChainNotSupportedError } from './getProvider-5b4b62c3.esm.js';
+export { A as AddChainError, f as ChainDoesNotSupportMulticallError, b as ChainMismatchError, m as ChainNotConfiguredError, k as Client, l as Connector, C as ConnectorAlreadyConnectedError, a as ConnectorNotFoundError, d as ContractMethodDoesNotExistError, i as ContractMethodNoResultError, h as ContractMethodRevertedError, c as ContractResultDecodeError, I as InjectedConnector, P as ProviderChainsNotFound, o as ProviderRpcError, R as ResourceUnavailableError, p as RpcError, q as SwitchChainError, S as SwitchChainNotSupportedError, U as UserRejectedRequestError, j as createClient, r as createStorage, e as getProvider, s as noopStorage, n as normalizeChainId } from './getProvider-5b4b62c3.esm.js';
 import { providers, Contract as Contract$1 } from 'ethers';
 import { Contract, logger } from 'ethers/lib/ethers';
-import { FormatTypes, formatUnits, getAddress, isAddress, Logger } from 'ethers/lib/utils';
+import { FormatTypes, parseBytes32String, formatUnits, getAddress, isAddress, Logger } from 'ethers/lib/utils';
 import { m as mainnet } from './chains-8c76af1b.esm.js';
 export { a as allChains, c as chain, b as chainId, d as defaultChains, e as defaultL2Chains, f as etherscanBlockExplorers } from './chains-8c76af1b.esm.js';
 import shallow from 'zustand/shallow';
@@ -214,7 +214,156 @@ function parseContractResult(_ref) {
 }
 
 // https://ethereum.org/en/developers/docs/standards/tokens/erc-20
-const erc20ABI = ['event Approval(address indexed _owner, address indexed _spender, uint256 _value)', 'event Transfer(address indexed _from, address indexed _to, uint256 _value)', 'function allowance(address _owner, address _spender) public view returns (uint256 remaining)', 'function approve(address _spender, uint256 _value) public returns (bool success)', 'function balanceOf(address _owner) public view returns (uint256 balance)', 'function decimals() public view returns (uint8)', 'function name() public view returns (string)', 'function symbol() public view returns (string)', 'function totalSupply() public view returns (uint256)', 'function transfer(address _to, uint256 _value) public returns (bool success)', 'function transferFrom(address _from, address _to, uint256 _value) public returns (bool success)']; // https://ethereum.org/en/developers/docs/standards/tokens/erc-721
+const erc20ABI = ['event Approval(address indexed _owner, address indexed _spender, uint256 _value)', 'event Transfer(address indexed _from, address indexed _to, uint256 _value)', 'function allowance(address _owner, address _spender) public view returns (uint256 remaining)', 'function approve(address _spender, uint256 _value) public returns (bool success)', 'function balanceOf(address _owner) public view returns (uint256 balance)', 'function decimals() public view returns (uint8)', 'function name() public view returns (string)', 'function symbol() public view returns (string)', 'function totalSupply() public view returns (uint256)', 'function transfer(address _to, uint256 _value) public returns (bool success)', 'function transferFrom(address _from, address _to, uint256 _value) public returns (bool success)'];
+/**
+ * [bytes32-flavored ERC-20](https://docs.makerdao.com/smart-contract-modules/mkr-module#4.-gotchas-potential-source-of-user-error)
+ * for tokens (ie. Maker) that use bytes32 instead of string.
+ */
+
+const erc20ABI_bytes32 = [{
+  type: 'event',
+  name: 'Approval',
+  inputs: [{
+    indexed: true,
+    name: 'owner',
+    type: 'address'
+  }, {
+    indexed: true,
+    name: 'spender',
+    type: 'address'
+  }, {
+    indexed: false,
+    name: 'value',
+    type: 'uint256'
+  }]
+}, {
+  type: 'event',
+  name: 'Transfer',
+  inputs: [{
+    indexed: true,
+    name: 'from',
+    type: 'address'
+  }, {
+    indexed: true,
+    name: 'to',
+    type: 'address'
+  }, {
+    indexed: false,
+    name: 'value',
+    type: 'uint256'
+  }]
+}, {
+  type: 'function',
+  name: 'allowance',
+  stateMutability: 'view',
+  inputs: [{
+    name: 'owner',
+    type: 'address'
+  }, {
+    name: 'spender',
+    type: 'address'
+  }],
+  outputs: [{
+    name: '',
+    type: 'uint256'
+  }]
+}, {
+  type: 'function',
+  name: 'approve',
+  stateMutability: 'nonpayable',
+  inputs: [{
+    name: 'spender',
+    type: 'address'
+  }, {
+    name: 'amount',
+    type: 'uint256'
+  }],
+  outputs: [{
+    name: '',
+    type: 'bool'
+  }]
+}, {
+  type: 'function',
+  name: 'balanceOf',
+  stateMutability: 'view',
+  inputs: [{
+    name: 'account',
+    type: 'address'
+  }],
+  outputs: [{
+    name: '',
+    type: 'uint256'
+  }]
+}, {
+  type: 'function',
+  name: 'decimals',
+  stateMutability: 'view',
+  inputs: [],
+  outputs: [{
+    name: '',
+    type: 'uint8'
+  }]
+}, {
+  type: 'function',
+  name: 'name',
+  stateMutability: 'view',
+  inputs: [],
+  outputs: [{
+    name: '',
+    type: 'bytes32'
+  }]
+}, {
+  type: 'function',
+  name: 'symbol',
+  stateMutability: 'view',
+  inputs: [],
+  outputs: [{
+    name: '',
+    type: 'bytes32'
+  }]
+}, {
+  type: 'function',
+  name: 'totalSupply',
+  stateMutability: 'view',
+  inputs: [],
+  outputs: [{
+    name: '',
+    type: 'uint256'
+  }]
+}, {
+  type: 'function',
+  name: 'transfer',
+  stateMutability: 'nonpayable',
+  inputs: [{
+    name: 'recipient',
+    type: 'address'
+  }, {
+    name: 'amount',
+    type: 'uint256'
+  }],
+  outputs: [{
+    name: '',
+    type: 'bool'
+  }]
+}, {
+  type: 'function',
+  name: 'transferFrom',
+  stateMutability: 'nonpayable',
+  inputs: [{
+    name: 'sender',
+    type: 'address'
+  }, {
+    name: 'recipient',
+    type: 'address'
+  }, {
+    name: 'amount',
+    type: 'uint256'
+  }],
+  outputs: [{
+    name: '',
+    type: 'bool'
+  }]
+}]; // https://ethereum.org/en/developers/docs/standards/tokens/erc-721
 
 const erc721ABI = ['event Approval(address indexed _owner, address indexed _approved, uint256 indexed _tokenId)', 'event ApprovalForAll(address indexed _owner, address indexed _operator, bool _approved)', 'event Transfer(address indexed _from, address indexed _to, uint256 indexed _tokenId)', 'function approve(address _approved, uint256 _tokenId) external payable', 'function balanceOf(address _owner) external view returns (uint256)', 'function getApproved(uint256 _tokenId) external view returns (address)', 'function isApprovedForAll(address _owner, address _operator) external view returns (bool)', 'function name() view returns (string memory)', 'function ownerOf(uint256 _tokenId) external view returns (address)', 'function safeTransferFrom(address _from, address _to, uint256 _tokenId) external payable', 'function safeTransferFrom(address _from, address _to, uint256 _tokenId, bytes data) external payable', 'function setApprovalForAll(address _operator, bool _approved) external', 'function symbol() view returns (string memory)', 'function tokenByIndex(uint256 _index) view returns (uint256)', 'function tokenOfOwnerByIndex(address _owner, uint256 _index) view returns (uint256 tokenId)', 'function tokenURI(uint256 _tokenId) view returns (string memory)', 'function totalSupply() view returns (uint256)', 'function transferFrom(address _from, address _to, uint256 _tokenId) external payable'];
 
@@ -371,33 +520,65 @@ async function fetchToken(_ref) {
     chainId,
     formatUnits: units = 'ether'
   } = _ref;
-  const erc20Config = {
-    addressOrName: address,
-    contractInterface: erc20ABI,
-    chainId
-  };
-  const [decimals, name, symbol, totalSupply] = await readContracts({
-    allowFailure: false,
-    contracts: [{ ...erc20Config,
-      functionName: 'decimals'
-    }, { ...erc20Config,
-      functionName: 'name'
-    }, { ...erc20Config,
-      functionName: 'symbol'
-    }, { ...erc20Config,
-      functionName: 'totalSupply'
-    }]
-  });
-  return {
-    address,
-    decimals,
-    name,
-    symbol,
-    totalSupply: {
-      formatted: formatUnits(totalSupply, units),
-      value: totalSupply
+
+  async function fetchToken_(_ref2) {
+    let {
+      contractInterface
+    } = _ref2;
+    const erc20Config = {
+      addressOrName: address,
+      contractInterface,
+      chainId
+    };
+    const [decimals, name, symbol, totalSupply] = await readContracts({
+      allowFailure: false,
+      contracts: [{ ...erc20Config,
+        functionName: 'decimals'
+      }, { ...erc20Config,
+        functionName: 'name'
+      }, { ...erc20Config,
+        functionName: 'symbol'
+      }, { ...erc20Config,
+        functionName: 'totalSupply'
+      }]
+    });
+    return {
+      address,
+      decimals,
+      name,
+      symbol,
+      totalSupply: {
+        formatted: formatUnits(totalSupply, units),
+        value: totalSupply
+      }
+    };
+  }
+
+  try {
+    return await fetchToken_({
+      contractInterface: erc20ABI
+    });
+  } catch (err) {
+    // In the chance that there is an error upon decoding the contract result,
+    // it could be likely that the contract data is represented as bytes32 instead
+    // of a string.
+    if (err instanceof ContractResultDecodeError) {
+      const {
+        name,
+        symbol,
+        ...rest
+      } = await fetchToken_({
+        contractInterface: erc20ABI_bytes32
+      });
+      return {
+        name: parseBytes32String(name),
+        symbol: parseBytes32String(symbol),
+        ...rest
+      };
     }
-  };
+
+    throw err;
+  }
 }
 
 /**
@@ -792,18 +973,17 @@ async function fetchBlockNumber() {
 }
 
 function watchBlockNumber(args, callback) {
-  var _client$webSocketProv;
-
+  var _getWebSocketProvider;
+
+  // We need to debounce the listener as we want to opt-out
+  // of the behavior where ethers emits a "block" event for
+  // every block that was missed in between the `pollingInterval`.
+  // We are setting a wait time of 1 as emitting an event in
+  // ethers takes ~0.1ms.
+  const debouncedCallback = debounce(callback, 1);
   let previousProvider;
 
   const createListener = provider => {
-    // We need to debounce the listener as we want to opt-out
-    // of the behavior where ethers emits a "block" event for
-    // every block that was missed in between the `pollingInterval`.
-    // We are setting a wait time of 1 as emitting an event in
-    // ethers takes ~0.1ms.
-    const debouncedCallback = debounce(callback, 1);
-
     if (previousProvider) {
       var _previousProvider;
 
@@ -814,9 +994,14 @@ function watchBlockNumber(args, callback) {
     previousProvider = provider;
   };
 
-  const client = getClient();
-  const provider_ = (_client$webSocketProv = client.webSocketProvider) !== null && _client$webSocketProv !== void 0 ? _client$webSocketProv : client.provider;
+  const provider_ = (_getWebSocketProvider = getWebSocketProvider({
+    chainId: args.chainId
+  })) !== null && _getWebSocketProvider !== void 0 ? _getWebSocketProvider : getProvider({
+    chainId: args.chainId
+  });
   if (args.listen) createListener(provider_);
+  let active = true;
+  const client = getClient();
   const unsubscribe = client.subscribe(_ref => {
     let {
       provider,
@@ -833,17 +1018,25 @@ function watchBlockNumber(args, callback) {
     } = _ref2;
     const provider_ = webSocketProvider !== null && webSocketProvider !== void 0 ? webSocketProvider : provider;
 
-    if (args.listen && provider_) {
+    if (args.listen && !args.chainId && provider_) {
       createListener(provider_);
     }
 
-    callback(await fetchBlockNumber());
+    const blockNumber = await fetchBlockNumber({
+      chainId: args.chainId
+    });
+    if (!active) return;
+    callback(blockNumber);
   }, {
     equalityFn: shallow
   });
   return () => {
+    var _previousProvider2;
+
+    active = false;
     unsubscribe();
-    provider_ === null || provider_ === void 0 ? void 0 : provider_.off('block', callback);
+    provider_ === null || provider_ === void 0 ? void 0 : provider_.off('block', debouncedCallback);
+    (_previousProvider2 = previousProvider) === null || _previousProvider2 === void 0 ? void 0 : _previousProvider2.off('block', debouncedCallback);
   };
 }
 
@@ -1245,12 +1438,7 @@ async function fetchBalance(_ref) {
   });
 
   if (token) {
-    const erc20Config = {
-      addressOrName: token,
-      contractInterface: erc20ABI,
-      chainId
-    }; // Convert ENS name to address if required
-
+    // Convert ENS name to address if required
     let resolvedAddress;
     if (isAddress(addressOrName)) resolvedAddress = addressOrName;else {
       const address = await provider.resolveName(addressOrName); // Same error `provider.getBalance` throws for invalid ENS name
@@ -1260,23 +1448,58 @@ async function fetchBalance(_ref) {
       });
       resolvedAddress = address;
     }
-    const [value, decimals, symbol] = await readContracts({
-      allowFailure: false,
-      contracts: [{ ...erc20Config,
-        functionName: 'balanceOf',
-        args: resolvedAddress
-      }, { ...erc20Config,
-        functionName: 'decimals'
-      }, { ...erc20Config,
-        functionName: 'symbol'
-      }]
-    });
-    return {
-      decimals,
-      formatted: formatUnits(value !== null && value !== void 0 ? value : '0', unit !== null && unit !== void 0 ? unit : decimals),
-      symbol,
-      value
+
+    const fetchContractBalance = async _ref2 => {
+      let {
+        contractInterface
+      } = _ref2;
+      const erc20Config = {
+        addressOrName: token,
+        contractInterface,
+        chainId
+      };
+      const [value, decimals, symbol] = await readContracts({
+        allowFailure: false,
+        contracts: [{ ...erc20Config,
+          functionName: 'balanceOf',
+          args: resolvedAddress
+        }, { ...erc20Config,
+          functionName: 'decimals'
+        }, { ...erc20Config,
+          functionName: 'symbol'
+        }]
+      });
+      return {
+        decimals,
+        formatted: formatUnits(value !== null && value !== void 0 ? value : '0', unit !== null && unit !== void 0 ? unit : decimals),
+        symbol,
+        value
+      };
     };
+
+    try {
+      return await fetchContractBalance({
+        contractInterface: erc20ABI
+      });
+    } catch (err) {
+      // In the chance that there is an error upon decoding the contract result,
+      // it could be likely that the contract data is represented as bytes32 instead
+      // of a string.
+      if (err instanceof ContractResultDecodeError) {
+        const {
+          symbol,
+          ...rest
+        } = await fetchContractBalance({
+          contractInterface: erc20ABI_bytes32
+        });
+        return {
+          symbol: parseBytes32String(symbol),
+          ...rest
+        };
+      }
+
+      throw err;
+    }
   }
 
   const chains = [...(client.provider.chains || []), ...((_client$chains = client.chains) !== null && _client$chains !== void 0 ? _client$chains : [])];

package/package.json

@@ -2,7 +2,7 @@
   "name": "@wagmi/core",
   "description": "Vanilla JS library for Ethereum",
   "license": "WAGMIT",
-  "version": "0.5.7",
+  "version": "0.5.8",
   "repository": {
     "type": "git",
     "url": "https://github.com/wagmi-dev/wagmi.git",