@wagmi/core 0.5.5 → 0.5.6

package/dist/wagmi-core.esm.js

@@ -1,11 +1,12 @@
-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 ContractMethodNoResultError, n as normalizeChainId, S as SwitchChainNotSupportedError } from './getProvider-a6708613.esm.js';
-export { A as AddChainError, e as ChainDoesNotSupportMulticallError, b as ChainMismatchError, k as ChainNotConfiguredError, i as Client, j as Connector, C as ConnectorAlreadyConnectedError, a as ConnectorNotFoundError, c as ContractMethodDoesNotExistError, f as ContractMethodNoResultError, I as InjectedConnector, P as ProviderChainsNotFound, l as ProviderRpcError, R as ResourceUnavailableError, m as RpcError, o as SwitchChainError, S as SwitchChainNotSupportedError, U as UserRejectedRequestError, h as createClient, p as createStorage, d as getProvider, q as noopStorage, n as normalizeChainId } from './getProvider-a6708613.esm.js';
+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-a3c8cf52.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-a3c8cf52.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 { m as mainnet } from './chains-a22bcfea.esm.js';
+export { a as allChains, c as chain, b as chainId, d as defaultChains, e as defaultL2Chains, f as etherscanBlockExplorers } from './chains-a22bcfea.esm.js';
 import shallow from 'zustand/shallow';
 export { a as alchemyRpcUrls, i as infuraRpcUrls, p as publicRpcUrls } from './rpcs-6e1b1718.esm.js';
-export { a as allChains, c as chain, b as chainId, d as defaultChains, e as defaultL2Chains, f as etherscanBlockExplorers } from './chains-5ceae8b1.esm.js';
 import 'zustand/middleware';
 import 'zustand/vanilla';
 import 'eventemitter3';
@@ -169,6 +170,12 @@ function deepEqual(a, b) {
   return a !== a && b !== b;
 }
 
+function logWarn(message) {
+  var _getClient, _getClient$config$log, _getClient$config$log2;
+
+  (_getClient = getClient()) === null || _getClient === void 0 ? void 0 : (_getClient$config$log = _getClient.config.logger) === null || _getClient$config$log === void 0 ? void 0 : (_getClient$config$log2 = _getClient$config$log.warn) === null || _getClient$config$log2 === void 0 ? void 0 : _getClient$config$log2.call(_getClient$config$log, message);
+}
+
 function minimizeContractInterface(_ref) {
   let {
     contractInterface,
@@ -349,7 +356,7 @@ async function deprecatedWriteContract(_ref) {
     });
     const contractWithSigner = contract.connect(signer);
     const contractFunction = contractWithSigner[functionName];
-    if (!contractFunction) console.warn("\"".concat(functionName, "\" does not exist in interface for contract \"").concat(addressOrName, "\""));
+    if (!contractFunction) logWarn("\"".concat(functionName, "\" does not exist in interface for contract \"").concat(addressOrName, "\""));
     return await contractFunction(...params);
   } catch (error) {
     if (error.code === 4001) throw new UserRejectedRequestError(error);
@@ -514,7 +521,7 @@ async function readContract(_ref) {
   });
   const params = [...(Array.isArray(args) ? args : args ? [args] : []), ...(overrides ? [overrides] : [])];
   const contractFunction = contract[functionName];
-  if (!contractFunction) console.warn("\"".concat(functionName, "\" is not in the interface for contract \"").concat(addressOrName, "\""));
+  if (!contractFunction) logWarn("\"".concat(functionName, "\" is not in the interface for contract \"").concat(addressOrName, "\""));
   const response = await (contractFunction === null || contractFunction === void 0 ? void 0 : contractFunction(...params));
   return response;
 }
@@ -559,13 +566,23 @@ async function multicall(_ref) {
       contractInterface
     });
     const params = Array.isArray(args) ? args : args ? [args] : [];
-    const callData = contract.interface.encodeFunctionData(functionName, params);
-    if (!contract[functionName]) console.warn("\"".concat(functionName, "\" is not in the interface for contract \"").concat(addressOrName, "\""));
-    return {
-      target: addressOrName,
-      allowFailure,
-      callData
-    };
+
+    try {
+      const callData = contract.interface.encodeFunctionData(functionName, params);
+      if (!contract[functionName]) logWarn("\"".concat(functionName, "\" is not in the interface for contract \"").concat(addressOrName, "\""));
+      return {
+        target: addressOrName,
+        allowFailure,
+        callData
+      };
+    } catch (err) {
+      if (!allowFailure) throw err;
+      return {
+        target: addressOrName,
+        allowFailure,
+        callData: '0x'
+      };
+    }
   });
   const params = [...[calls], ...(overrides ? [overrides] : [])];
   const results = await multicallContract.aggregate3(...params);
@@ -574,34 +591,62 @@ async function multicall(_ref) {
       returnData,
       success
     } = _ref3;
-    if (!success) return null;
     const {
       addressOrName,
       contractInterface,
-      functionName
+      functionName,
+      args
     } = contracts[i];
+    const contract = getContract({
+      addressOrName,
+      contractInterface
+    });
+
+    if (!success) {
+      let error;
+
+      try {
+        contract.interface.decodeFunctionResult(functionName, returnData);
+      } catch (err) {
+        error = new ContractMethodRevertedError({
+          addressOrName,
+          args,
+          chainId: chain.id,
+          functionName,
+          errorMessage: err.message
+        });
+        if (!allowFailure) throw error;
+        logWarn(error.message);
+      }
+
+      return null;
+    }
 
     if (returnData === '0x') {
-      const err = new ContractMethodNoResultError({
+      const error = new ContractMethodNoResultError({
         addressOrName,
+        args,
         chainId: chain.id,
         functionName
       });
-      if (!allowFailure) throw err;
-      console.warn(err.message);
+      if (!allowFailure) throw error;
+      logWarn(error.message);
       return null;
     }
 
-    const contract = getContract({
-      addressOrName,
-      contractInterface
-    });
-
     try {
       const result = contract.interface.decodeFunctionResult(functionName, returnData);
       return Array.isArray(result) && result.length === 1 ? result[0] : result;
     } catch (err) {
-      if (!allowFailure) throw err;
+      const error = new ContractResultDecodeError({
+        addressOrName,
+        args,
+        chainId: chain.id,
+        functionName,
+        errorMessage: err.message
+      });
+      if (!allowFailure) throw error;
+      logWarn(error.message);
       return null;
     }
   });
@@ -624,7 +669,8 @@ async function readContracts(_ref) {
         [chainId]: [...(contracts[chainId] || []), contract]
       };
     }, {});
-    const promises = Object.entries(contractsByChainId).map(_ref2 => {
+
+    const promises = () => Object.entries(contractsByChainId).map(_ref2 => {
       let [chainId, contracts] = _ref2;
       return multicall({
         allowFailure,
@@ -635,11 +681,11 @@ async function readContracts(_ref) {
     });
 
     if (allowFailure) {
-      return (await Promise.allSettled(promises)).map(result => {
+      return (await Promise.allSettled(promises())).map(result => {
         if (result.status === 'fulfilled') return result.value;
 
         if (result.reason instanceof ChainDoesNotSupportMulticallError) {
-          console.warn(result.reason.message);
+          logWarn(result.reason.message);
           throw result.reason;
         }
 
@@ -647,18 +693,38 @@ async function readContracts(_ref) {
       }).flat();
     }
 
-    return (await Promise.all(promises)).flat();
+    return (await Promise.all(promises())).flat();
   } catch (err) {
+    if (err instanceof ContractResultDecodeError) throw err;
     if (err instanceof ContractMethodNoResultError) throw err;
-    const promises = contracts.map(contract => readContract({ ...contract,
+    if (err instanceof ContractMethodRevertedError) throw err;
+
+    const promises = () => contracts.map(contract => readContract({ ...contract,
       overrides
     }));
 
     if (allowFailure) {
-      return (await Promise.allSettled(promises)).map(result => result.status === 'fulfilled' ? result.value : null);
+      return (await Promise.allSettled(promises())).map((result, i) => {
+        if (result.status === 'fulfilled') return result.value;
+        const {
+          addressOrName,
+          functionName,
+          chainId,
+          args
+        } = contracts[i];
+        const error = new ContractMethodRevertedError({
+          addressOrName,
+          functionName,
+          chainId: chainId !== null && chainId !== void 0 ? chainId : mainnet.id,
+          args,
+          errorMessage: result.reason
+        });
+        logWarn(error.message);
+        return null;
+      });
     }
 
-    return await Promise.all(promises);
+    return await Promise.all(promises());
   }
 }
 

package/package.json

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

package/dist/declarations/src/utils/warn.d.ts

@@ -1 +0,0 @@
-export declare function warn(message: string, id?: string): void;