@wagmi/core 0.5.3 → 0.5.6

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

@@ -2,13 +2,13 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var getProvider = require('./getProvider-e2217cb6.cjs.dev.js');
+var getProvider = require('./getProvider-3a26f086.cjs.dev.js');
 var ethers = require('ethers');
 var ethers$1 = require('ethers/lib/ethers');
 var utils = require('ethers/lib/utils');
+var chains = require('./chains-4fdb21bc.cjs.dev.js');
 var shallow = require('zustand/shallow');
-var rpcs = require('./rpcs-3cf5a783.cjs.dev.js');
-var chains = require('./chains-bd8ad853.cjs.dev.js');
+var rpcs = require('./rpcs-3326627e.cjs.dev.js');
 require('zustand/middleware');
 require('zustand/vanilla');
 require('eventemitter3');
@@ -176,6 +176,22 @@ function deepEqual(a, b) {
   return a !== a && b !== b;
 }
 
+function logWarn(message) {
+  var _getClient, _getClient$config$log, _getClient$config$log2;
+
+  (_getClient = getProvider.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,
+    functionName
+  } = _ref;
+  const abi = ethers$1.Contract.getInterface(contractInterface).format(utils.FormatTypes.full);
+  const minimizedInterface = Array.isArray(abi) ? abi : [abi];
+  return minimizedInterface.filter(i => i.includes(functionName));
+}
+
 function isPlainArray(value) {
   return Array.isArray(value) && Object.keys(value).length === value.length;
 }
@@ -346,7 +362,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 getProvider.UserRejectedRequestError(error);
@@ -409,7 +425,7 @@ async function prepareWriteContract(_ref) {
     addressOrName,
     args,
     chainId,
-    contractInterface,
+    contractInterface: contractInterface_,
     functionName,
     overrides,
     signer: signer_
@@ -418,7 +434,7 @@ async function prepareWriteContract(_ref) {
   if (!signer) throw new getProvider.ConnectorNotFoundError();
   const contract = getContract({
     addressOrName,
-    contractInterface,
+    contractInterface: contractInterface_,
     signerOrProvider: signer
   });
   const populateTransactionFn = contract.populateTransaction[functionName];
@@ -430,6 +446,10 @@ async function prepareWriteContract(_ref) {
     });
   }
 
+  const contractInterface = minimizeContractInterface({
+    contractInterface: contract.interface,
+    functionName
+  });
   const params = [...(Array.isArray(args) ? args : args ? [args] : []), ...(overrides ? [overrides] : [])];
   const unsignedTransaction = await populateTransactionFn(...params);
   const gasLimit = unsignedTransaction.gasLimit || (await signer.estimateGas(unsignedTransaction));
@@ -507,7 +527,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;
 }
@@ -552,13 +572,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);
@@ -567,34 +597,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 getProvider.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 getProvider.ContractMethodNoResultError({
+      const error = new getProvider.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 getProvider.ContractResultDecodeError({
+        addressOrName,
+        args,
+        chainId: chain.id,
+        functionName,
+        errorMessage: err.message
+      });
+      if (!allowFailure) throw error;
+      logWarn(error.message);
       return null;
     }
   });
@@ -617,7 +675,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,
@@ -628,11 +687,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 getProvider.ChainDoesNotSupportMulticallError) {
-          console.warn(result.reason.message);
+          logWarn(result.reason.message);
           throw result.reason;
         }
 
@@ -640,18 +699,38 @@ async function readContracts(_ref) {
       }).flat();
     }
 
-    return (await Promise.all(promises)).flat();
+    return (await Promise.all(promises())).flat();
   } catch (err) {
+    if (err instanceof getProvider.ContractResultDecodeError) throw err;
     if (err instanceof getProvider.ContractMethodNoResultError) throw err;
-    const promises = contracts.map(contract => readContract({ ...contract,
+    if (err instanceof getProvider.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 getProvider.ContractMethodRevertedError({
+          addressOrName,
+          functionName,
+          chainId: chainId !== null && chainId !== void 0 ? chainId : chains.mainnet.id,
+          args,
+          errorMessage: result.reason
+        });
+        logWarn(error.message);
+        return null;
+      });
     }
 
-    return await Promise.all(promises);
+    return await Promise.all(promises());
   }
 }
 
@@ -1455,6 +1534,8 @@ exports.ConnectorAlreadyConnectedError = getProvider.ConnectorAlreadyConnectedEr
 exports.ConnectorNotFoundError = getProvider.ConnectorNotFoundError;
 exports.ContractMethodDoesNotExistError = getProvider.ContractMethodDoesNotExistError;
 exports.ContractMethodNoResultError = getProvider.ContractMethodNoResultError;
+exports.ContractMethodRevertedError = getProvider.ContractMethodRevertedError;
+exports.ContractResultDecodeError = getProvider.ContractResultDecodeError;
 exports.InjectedConnector = getProvider.InjectedConnector;
 exports.ProviderChainsNotFound = getProvider.ProviderChainsNotFound;
 exports.ProviderRpcError = getProvider.ProviderRpcError;
@@ -1468,15 +1549,15 @@ exports.createStorage = getProvider.createStorage;
 exports.getProvider = getProvider.getProvider;
 exports.noopStorage = getProvider.noopStorage;
 exports.normalizeChainId = getProvider.normalizeChainId;
-exports.alchemyRpcUrls = rpcs.alchemyRpcUrls;
-exports.infuraRpcUrls = rpcs.infuraRpcUrls;
-exports.publicRpcUrls = rpcs.publicRpcUrls;
 exports.allChains = chains.allChains;
 exports.chain = chains.chain;
 exports.chainId = chains.chainId;
 exports.defaultChains = chains.defaultChains;
 exports.defaultL2Chains = chains.defaultL2Chains;
 exports.etherscanBlockExplorers = chains.etherscanBlockExplorers;
+exports.alchemyRpcUrls = rpcs.alchemyRpcUrls;
+exports.infuraRpcUrls = rpcs.infuraRpcUrls;
+exports.publicRpcUrls = rpcs.publicRpcUrls;
 exports.configureChains = configureChains;
 exports.connect = connect;
 exports.deepEqual = deepEqual;
@@ -1499,6 +1580,7 @@ exports.getAccount = getAccount;
 exports.getContract = getContract;
 exports.getNetwork = getNetwork;
 exports.getWebSocketProvider = getWebSocketProvider;
+exports.minimizeContractInterface = minimizeContractInterface;
 exports.parseContractResult = parseContractResult;
 exports.prepareSendTransaction = prepareSendTransaction;
 exports.prepareWriteContract = prepareWriteContract;

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

@@ -2,13 +2,13 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var getProvider = require('./getProvider-a1ad435d.cjs.prod.js');
+var getProvider = require('./getProvider-b220fed1.cjs.prod.js');
 var ethers = require('ethers');
 var ethers$1 = require('ethers/lib/ethers');
 var utils = require('ethers/lib/utils');
+var chains = require('./chains-868f0ac6.cjs.prod.js');
 var shallow = require('zustand/shallow');
-var rpcs = require('./rpcs-afd1cc09.cjs.prod.js');
-var chains = require('./chains-3916cd7d.cjs.prod.js');
+var rpcs = require('./rpcs-45537550.cjs.prod.js');
 require('zustand/middleware');
 require('zustand/vanilla');
 require('eventemitter3');
@@ -176,6 +176,22 @@ function deepEqual(a, b) {
   return a !== a && b !== b;
 }
 
+function logWarn(message) {
+  var _getClient, _getClient$config$log, _getClient$config$log2;
+
+  (_getClient = getProvider.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,
+    functionName
+  } = _ref;
+  const abi = ethers$1.Contract.getInterface(contractInterface).format(utils.FormatTypes.full);
+  const minimizedInterface = Array.isArray(abi) ? abi : [abi];
+  return minimizedInterface.filter(i => i.includes(functionName));
+}
+
 function isPlainArray(value) {
   return Array.isArray(value) && Object.keys(value).length === value.length;
 }
@@ -346,7 +362,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 getProvider.UserRejectedRequestError(error);
@@ -409,7 +425,7 @@ async function prepareWriteContract(_ref) {
     addressOrName,
     args,
     chainId,
-    contractInterface,
+    contractInterface: contractInterface_,
     functionName,
     overrides,
     signer: signer_
@@ -418,7 +434,7 @@ async function prepareWriteContract(_ref) {
   if (!signer) throw new getProvider.ConnectorNotFoundError();
   const contract = getContract({
     addressOrName,
-    contractInterface,
+    contractInterface: contractInterface_,
     signerOrProvider: signer
   });
   const populateTransactionFn = contract.populateTransaction[functionName];
@@ -430,6 +446,10 @@ async function prepareWriteContract(_ref) {
     });
   }
 
+  const contractInterface = minimizeContractInterface({
+    contractInterface: contract.interface,
+    functionName
+  });
   const params = [...(Array.isArray(args) ? args : args ? [args] : []), ...(overrides ? [overrides] : [])];
   const unsignedTransaction = await populateTransactionFn(...params);
   const gasLimit = unsignedTransaction.gasLimit || (await signer.estimateGas(unsignedTransaction));
@@ -507,7 +527,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;
 }
@@ -552,13 +572,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);
@@ -567,34 +597,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 getProvider.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 getProvider.ContractMethodNoResultError({
+      const error = new getProvider.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 getProvider.ContractResultDecodeError({
+        addressOrName,
+        args,
+        chainId: chain.id,
+        functionName,
+        errorMessage: err.message
+      });
+      if (!allowFailure) throw error;
+      logWarn(error.message);
       return null;
     }
   });
@@ -617,7 +675,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,
@@ -628,11 +687,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 getProvider.ChainDoesNotSupportMulticallError) {
-          console.warn(result.reason.message);
+          logWarn(result.reason.message);
           throw result.reason;
         }
 
@@ -640,18 +699,38 @@ async function readContracts(_ref) {
       }).flat();
     }
 
-    return (await Promise.all(promises)).flat();
+    return (await Promise.all(promises())).flat();
   } catch (err) {
+    if (err instanceof getProvider.ContractResultDecodeError) throw err;
     if (err instanceof getProvider.ContractMethodNoResultError) throw err;
-    const promises = contracts.map(contract => readContract({ ...contract,
+    if (err instanceof getProvider.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 getProvider.ContractMethodRevertedError({
+          addressOrName,
+          functionName,
+          chainId: chainId !== null && chainId !== void 0 ? chainId : chains.mainnet.id,
+          args,
+          errorMessage: result.reason
+        });
+        logWarn(error.message);
+        return null;
+      });
     }
 
-    return await Promise.all(promises);
+    return await Promise.all(promises());
   }
 }
 
@@ -1455,6 +1534,8 @@ exports.ConnectorAlreadyConnectedError = getProvider.ConnectorAlreadyConnectedEr
 exports.ConnectorNotFoundError = getProvider.ConnectorNotFoundError;
 exports.ContractMethodDoesNotExistError = getProvider.ContractMethodDoesNotExistError;
 exports.ContractMethodNoResultError = getProvider.ContractMethodNoResultError;
+exports.ContractMethodRevertedError = getProvider.ContractMethodRevertedError;
+exports.ContractResultDecodeError = getProvider.ContractResultDecodeError;
 exports.InjectedConnector = getProvider.InjectedConnector;
 exports.ProviderChainsNotFound = getProvider.ProviderChainsNotFound;
 exports.ProviderRpcError = getProvider.ProviderRpcError;
@@ -1468,15 +1549,15 @@ exports.createStorage = getProvider.createStorage;
 exports.getProvider = getProvider.getProvider;
 exports.noopStorage = getProvider.noopStorage;
 exports.normalizeChainId = getProvider.normalizeChainId;
-exports.alchemyRpcUrls = rpcs.alchemyRpcUrls;
-exports.infuraRpcUrls = rpcs.infuraRpcUrls;
-exports.publicRpcUrls = rpcs.publicRpcUrls;
 exports.allChains = chains.allChains;
 exports.chain = chains.chain;
 exports.chainId = chains.chainId;
 exports.defaultChains = chains.defaultChains;
 exports.defaultL2Chains = chains.defaultL2Chains;
 exports.etherscanBlockExplorers = chains.etherscanBlockExplorers;
+exports.alchemyRpcUrls = rpcs.alchemyRpcUrls;
+exports.infuraRpcUrls = rpcs.infuraRpcUrls;
+exports.publicRpcUrls = rpcs.publicRpcUrls;
 exports.configureChains = configureChains;
 exports.connect = connect;
 exports.deepEqual = deepEqual;
@@ -1499,6 +1580,7 @@ exports.getAccount = getAccount;
 exports.getContract = getContract;
 exports.getNetwork = getNetwork;
 exports.getWebSocketProvider = getWebSocketProvider;
+exports.minimizeContractInterface = minimizeContractInterface;
 exports.parseContractResult = parseContractResult;
 exports.prepareSendTransaction = prepareSendTransaction;
 exports.prepareWriteContract = prepareWriteContract;