wagmi 3.3.0 → 3.3.2

package/src/hooks/useEstimateGas.ts

@@ -1,5 +1,4 @@
 'use client'
-
 import type {
   Config,
   EstimateGasErrorType,
@@ -8,29 +7,19 @@ import type {
 import {
   type EstimateGasData,
   type EstimateGasOptions,
-  type EstimateGasQueryFnData,
-  type EstimateGasQueryKey,
   estimateGasQueryOptions,
 } from '@wagmi/core/query'
-
-import type { ConfigParameter, QueryParameter } from '../types/properties.js'
+import type { ConfigParameter } from '../types/properties.js'
 import { type UseQueryReturnType, useQuery } from '../utils/query.js'
 import { useChainId } from './useChainId.js'
 import { useConfig } from './useConfig.js'
-import { useConnectorClient } from './useConnectorClient.js'
+import { useConnection } from './useConnection.js'
 
 export type UseEstimateGasParameters<
   config extends Config = Config,
   chainId extends config['chains'][number]['id'] | undefined = undefined,
   selectData = EstimateGasData,
-> = EstimateGasOptions<config, chainId> &
-  ConfigParameter<config> &
-  QueryParameter<
-    EstimateGasQueryFnData,
-    EstimateGasErrorType,
-    selectData,
-    EstimateGasQueryKey<config, chainId>
-  >
+> = EstimateGasOptions<config, chainId, selectData> & ConfigParameter<config>
 
 export type UseEstimateGasReturnType<selectData = EstimateGasData> =
   UseQueryReturnType<selectData, EstimateGasErrorType>
@@ -47,24 +36,15 @@ export function useEstimateGas<
 export function useEstimateGas(
   parameters: UseEstimateGasParameters = {},
 ): UseEstimateGasReturnType {
-  const { connector, query = {} } = parameters
-
   const config = useConfig(parameters)
-  const { data: connectorClient } = useConnectorClient({
-    config,
-    connector,
-    query: { enabled: parameters.account === undefined },
-  })
-  const account = parameters.account ?? connectorClient?.account
+  const { address, connector } = useConnection()
   const chainId = useChainId({ config })
-
   const options = estimateGasQueryOptions(config, {
     ...parameters,
-    account,
+    account: parameters.account ?? address,
     chainId: parameters.chainId ?? chainId,
-    connector,
+    connector: parameters.connector ?? connector,
+    query: parameters.query,
   })
-  const enabled = Boolean((account || connector) && (query.enabled ?? true))
-
-  return useQuery({ ...query, ...options, enabled })
+  return useQuery(options)
 }

package/src/hooks/useEstimateMaxPriorityFeePerGas.ts

@@ -1,5 +1,4 @@
 'use client'
-
 import type {
   Config,
   EstimateMaxPriorityFeePerGasErrorType,
@@ -9,12 +8,9 @@ import type { Compute } from '@wagmi/core/internal'
 import {
   type EstimateMaxPriorityFeePerGasData,
   type EstimateMaxPriorityFeePerGasOptions,
-  type EstimateMaxPriorityFeePerGasQueryFnData,
-  type EstimateMaxPriorityFeePerGasQueryKey,
   estimateMaxPriorityFeePerGasQueryOptions,
 } from '@wagmi/core/query'
-
-import type { ConfigParameter, QueryParameter } from '../types/properties.js'
+import type { ConfigParameter } from '../types/properties.js'
 import { type UseQueryReturnType, useQuery } from '../utils/query.js'
 import { useChainId } from './useChainId.js'
 import { useConfig } from './useConfig.js'
@@ -23,14 +19,8 @@ export type UseEstimateMaxPriorityFeePerGasParameters<
   config extends Config = Config,
   selectData = EstimateMaxPriorityFeePerGasData,
 > = Compute<
-  EstimateMaxPriorityFeePerGasOptions<config> &
-    ConfigParameter<config> &
-    QueryParameter<
-      EstimateMaxPriorityFeePerGasQueryFnData,
-      EstimateMaxPriorityFeePerGasErrorType,
-      selectData,
-      EstimateMaxPriorityFeePerGasQueryKey<config>
-    >
+  EstimateMaxPriorityFeePerGasOptions<config, selectData> &
+    ConfigParameter<config>
 >
 
 export type UseEstimateMaxPriorityFeePerGasReturnType<
@@ -47,15 +37,12 @@ export function useEstimateMaxPriorityFeePerGas<
     selectData
   > = {},
 ): UseEstimateMaxPriorityFeePerGasReturnType<selectData> {
-  const { query = {} } = parameters
-
   const config = useConfig(parameters)
   const chainId = useChainId({ config })
-
   const options = estimateMaxPriorityFeePerGasQueryOptions(config, {
     ...parameters,
     chainId: parameters.chainId ?? chainId,
+    query: parameters.query,
   })
-
-  return useQuery({ ...query, ...options })
+  return useQuery(options)
 }

package/src/hooks/useFeeHistory.ts

@@ -1,5 +1,4 @@
 'use client'
-
 import type {
   Config,
   GetFeeHistoryErrorType,
@@ -9,12 +8,9 @@ import type { Compute } from '@wagmi/core/internal'
 import {
   type GetFeeHistoryData,
   type GetFeeHistoryOptions,
-  type GetFeeHistoryQueryFnData,
-  type GetFeeHistoryQueryKey,
   getFeeHistoryQueryOptions,
 } from '@wagmi/core/query'
-
-import type { ConfigParameter, QueryParameter } from '../types/properties.js'
+import type { ConfigParameter } from '../types/properties.js'
 import { type UseQueryReturnType, useQuery } from '../utils/query.js'
 import { useChainId } from './useChainId.js'
 import { useConfig } from './useConfig.js'
@@ -25,14 +21,7 @@ export type UseFeeHistoryParameters<
     config['chains'][number]['id'] = config['chains'][number]['id'],
   selectData = GetFeeHistoryData,
 > = Compute<
-  GetFeeHistoryOptions<config, chainId> &
-    ConfigParameter<config> &
-    QueryParameter<
-      GetFeeHistoryQueryFnData,
-      GetFeeHistoryErrorType,
-      selectData,
-      GetFeeHistoryQueryKey<config, chainId>
-    >
+  GetFeeHistoryOptions<config, chainId, selectData> & ConfigParameter<config>
 >
 
 export type UseFeeHistoryReturnType<selectData = GetFeeHistoryData> =
@@ -47,18 +36,12 @@ export function useFeeHistory<
 >(
   parameters: UseFeeHistoryParameters<config, chainId, selectData> = {},
 ): UseFeeHistoryReturnType<selectData> {
-  const { blockCount, rewardPercentiles, query = {} } = parameters
-
   const config = useConfig(parameters)
   const chainId = useChainId({ config })
-
   const options = getFeeHistoryQueryOptions(config, {
     ...parameters,
     chainId: parameters.chainId ?? chainId,
+    query: parameters.query,
   })
-  const enabled = Boolean(
-    blockCount && rewardPercentiles && (query.enabled ?? true),
-  )
-
-  return useQuery({ ...query, ...options, enabled })
+  return useQuery(options)
 }

package/src/hooks/useGasPrice.ts

@@ -1,5 +1,4 @@
 'use client'
-
 import type {
   Config,
   GetGasPriceErrorType,
@@ -9,12 +8,9 @@ import type { Compute } from '@wagmi/core/internal'
 import {
   type GetGasPriceData,
   type GetGasPriceOptions,
-  type GetGasPriceQueryFnData,
-  type GetGasPriceQueryKey,
   getGasPriceQueryOptions,
 } from '@wagmi/core/query'
-
-import type { ConfigParameter, QueryParameter } from '../types/properties.js'
+import type { ConfigParameter } from '../types/properties.js'
 import { type UseQueryReturnType, useQuery } from '../utils/query.js'
 import { useChainId } from './useChainId.js'
 import { useConfig } from './useConfig.js'
@@ -25,14 +21,7 @@ export type UseGasPriceParameters<
     config['chains'][number]['id'] = config['chains'][number]['id'],
   selectData = GetGasPriceData,
 > = Compute<
-  GetGasPriceOptions<config, chainId> &
-    ConfigParameter<config> &
-    QueryParameter<
-      GetGasPriceQueryFnData,
-      GetGasPriceErrorType,
-      selectData,
-      GetGasPriceQueryKey<config, chainId>
-    >
+  GetGasPriceOptions<config, chainId, selectData> & ConfigParameter<config>
 >
 
 export type UseGasPriceReturnType<selectData = GetGasPriceData> =
@@ -47,16 +36,12 @@ export function useGasPrice<
 >(
   parameters: UseGasPriceParameters<config, chainId, selectData> = {},
 ): UseGasPriceReturnType<selectData> {
-  const { query = {} } = parameters
-
   const config = useConfig(parameters)
-  const configChainId = useChainId({ config })
-  const chainId = parameters.chainId ?? configChainId
-
+  const chainId = useChainId({ config })
   const options = getGasPriceQueryOptions(config, {
     ...parameters,
-    chainId,
+    chainId: parameters.chainId ?? chainId,
+    query: parameters.query,
   })
-
-  return useQuery({ ...query, ...options })
+  return useQuery(options)
 }

package/src/hooks/usePrepareTransactionRequest.ts

@@ -1,21 +1,17 @@
 'use client'
-
 import type {
   Config,
   PrepareTransactionRequestErrorType,
   ResolvedRegister,
   SelectChains,
 } from '@wagmi/core'
-import type { PrepareTransactionRequestQueryFnData } from '@wagmi/core/query'
 import {
   type PrepareTransactionRequestData,
   type PrepareTransactionRequestOptions,
-  type PrepareTransactionRequestQueryKey,
   prepareTransactionRequestQueryOptions,
 } from '@wagmi/core/query'
 import type { PrepareTransactionRequestRequest as viem_PrepareTransactionRequestRequest } from 'viem'
-
-import type { ConfigParameter, QueryParameter } from '../types/properties.js'
+import type { ConfigParameter } from '../types/properties.js'
 import { type UseQueryReturnType, useQuery } from '../utils/query.js'
 import { useChainId } from './useChainId.js'
 import { useConfig } from './useConfig.js'
@@ -31,14 +27,8 @@ export type UsePrepareTransactionRequestParameters<
     SelectChains<config, chainId>[0]
   >,
   selectData = PrepareTransactionRequestData<config, chainId, request>,
-> = PrepareTransactionRequestOptions<config, chainId, request> &
-  ConfigParameter<config> &
-  QueryParameter<
-    PrepareTransactionRequestQueryFnData<config, chainId, request>,
-    PrepareTransactionRequestErrorType,
-    selectData,
-    PrepareTransactionRequestQueryKey<config, chainId, request>
-  >
+> = PrepareTransactionRequestOptions<config, chainId, request, selectData> &
+  ConfigParameter<config>
 
 export type UsePrepareTransactionRequestReturnType<
   config extends Config = Config,
@@ -78,25 +68,12 @@ export function usePrepareTransactionRequest<
   request,
   selectData
 > {
-  const { to, query = {} } = parameters
-
   const config = useConfig(parameters)
   const chainId = useChainId({ config })
-
   const options = prepareTransactionRequestQueryOptions(config, {
     ...parameters,
     chainId: parameters.chainId ?? chainId,
+    query: parameters.query,
   } as PrepareTransactionRequestOptions<config, chainId, request>)
-  const enabled = Boolean(to && (query.enabled ?? true))
-
-  return useQuery({
-    ...(query as any),
-    ...options,
-    enabled,
-  }) as UsePrepareTransactionRequestReturnType<
-    config,
-    chainId,
-    request,
-    selectData
-  >
+  return useQuery(options) as any
 }

package/src/hooks/useProof.ts

@@ -1,16 +1,12 @@
 'use client'
-
 import type { Config, GetProofErrorType, ResolvedRegister } from '@wagmi/core'
 import type { Compute } from '@wagmi/core/internal'
-import type { GetProofQueryFnData } from '@wagmi/core/query'
 import {
   type GetProofData,
   type GetProofOptions,
-  type GetProofQueryKey,
   getProofQueryOptions,
 } from '@wagmi/core/query'
-
-import type { ConfigParameter, QueryParameter } from '../types/properties.js'
+import type { ConfigParameter } from '../types/properties.js'
 import { type UseQueryReturnType, useQuery } from '../utils/query.js'
 import { useChainId } from './useChainId.js'
 import { useConfig } from './useConfig.js'
@@ -18,16 +14,7 @@ import { useConfig } from './useConfig.js'
 export type UseProofParameters<
   config extends Config = Config,
   selectData = GetProofData,
-> = Compute<
-  GetProofOptions<config> &
-    ConfigParameter<config> &
-    QueryParameter<
-      GetProofQueryFnData,
-      GetProofErrorType,
-      selectData,
-      GetProofQueryKey<config>
-    >
->
+> = Compute<GetProofOptions<config, selectData> & ConfigParameter<config>>
 
 export type UseProofReturnType<selectData = GetProofData> = UseQueryReturnType<
   selectData,
@@ -41,16 +28,12 @@ export function useProof<
 >(
   parameters: UseProofParameters<config, selectData> = {},
 ): UseProofReturnType<selectData> {
-  const { address, storageKeys, query = {} } = parameters
-
   const config = useConfig(parameters)
   const chainId = useChainId({ config })
-
   const options = getProofQueryOptions(config, {
     ...parameters,
     chainId: parameters.chainId ?? chainId,
+    query: parameters.query,
   })
-  const enabled = Boolean(address && storageKeys && (query.enabled ?? true))
-
-  return useQuery({ ...query, ...options, enabled })
+  return useQuery(options)
 }

package/src/hooks/useReadContract.ts

@@ -1,5 +1,4 @@
 'use client'
-
 import type {
   Config,
   ReadContractErrorType,
@@ -9,14 +8,10 @@ import type { UnionCompute } from '@wagmi/core/internal'
 import {
   type ReadContractData,
   type ReadContractOptions,
-  type ReadContractQueryFnData,
-  type ReadContractQueryKey,
   readContractQueryOptions,
-  structuralSharing,
 } from '@wagmi/core/query'
-import type { Abi, ContractFunctionArgs, ContractFunctionName, Hex } from 'viem'
-
-import type { ConfigParameter, QueryParameter } from '../types/properties.js'
+import type { Abi, ContractFunctionArgs, ContractFunctionName } from 'viem'
+import type { ConfigParameter } from '../types/properties.js'
 import { type UseQueryReturnType, useQuery } from '../utils/query.js'
 import { useChainId } from './useChainId.js'
 import { useConfig } from './useConfig.js'
@@ -35,14 +30,8 @@ export type UseReadContractParameters<
   config extends Config = Config,
   selectData = ReadContractData<abi, functionName, args>,
 > = UnionCompute<
-  ReadContractOptions<abi, functionName, args, config> &
-    ConfigParameter<config> &
-    QueryParameter<
-      ReadContractQueryFnData<abi, functionName, args>,
-      ReadContractErrorType,
-      selectData,
-      ReadContractQueryKey<abi, functionName, args, config>
-    >
+  ReadContractOptions<abi, functionName, args, config, selectData> &
+    ConfigParameter<config>
 >
 
 export type UseReadContractReturnType<
@@ -75,25 +64,12 @@ export function useReadContract<
     selectData
   > = {} as any,
 ): UseReadContractReturnType<abi, functionName, args, selectData> {
-  const { abi, address, functionName, query = {} } = parameters
-  // @ts-ignore
-  const code = parameters.code as Hex | undefined
-
   const config = useConfig(parameters)
   const chainId = useChainId({ config })
-
-  const options = readContractQueryOptions<config, abi, functionName, args>(
-    config,
-    { ...(parameters as any), chainId: parameters.chainId ?? chainId },
-  )
-  const enabled = Boolean(
-    (address || code) && abi && functionName && (query.enabled ?? true),
-  )
-
-  return useQuery({
-    ...query,
-    ...options,
-    enabled,
-    structuralSharing: query.structuralSharing ?? structuralSharing,
+  const options = readContractQueryOptions(config, {
+    ...(parameters as any),
+    chainId: parameters.chainId ?? chainId,
+    query: parameters.query,
   })
+  return useQuery(options) as any
 }

package/src/hooks/useReadContracts.ts

@@ -1,5 +1,4 @@
 'use client'
-
 import type {
   Config,
   ReadContractsErrorType,
@@ -9,15 +8,11 @@ import type { Compute } from '@wagmi/core/internal'
 import {
   type ReadContractsData,
   type ReadContractsOptions,
-  type ReadContractsQueryFnData,
-  type ReadContractsQueryKey,
   readContractsQueryOptions,
-  structuralSharing,
 } from '@wagmi/core/query'
 import { useMemo } from 'react'
 import type { ContractFunctionParameters } from 'viem'
-
-import type { ConfigParameter, QueryParameter } from '../types/properties.js'
+import type { ConfigParameter } from '../types/properties.js'
 import { type UseQueryReturnType, useQuery } from '../utils/query.js'
 import { useChainId } from './useChainId.js'
 import { useConfig } from './useConfig.js'
@@ -28,14 +23,8 @@ export type UseReadContractsParameters<
   config extends Config = Config,
   selectData = ReadContractsData<contracts, allowFailure>,
 > = Compute<
-  ReadContractsOptions<contracts, allowFailure, config> &
-    ConfigParameter<config> &
-    QueryParameter<
-      ReadContractsQueryFnData<contracts, allowFailure>,
-      ReadContractsErrorType,
-      selectData,
-      ReadContractsQueryKey<contracts, allowFailure, config>
-    >
+  ReadContractsOptions<contracts, allowFailure, config, selectData> &
+    ConfigParameter<config>
 >
 
 export type UseReadContractsReturnType<
@@ -58,45 +47,24 @@ export function useReadContracts<
     selectData
   > = {},
 ): UseReadContractsReturnType<contracts, allowFailure, selectData> {
-  const { contracts = [], query = {} } = parameters
-
   const config = useConfig(parameters)
   const chainId = useChainId({ config })
   const contractsChainId = useMemo(() => {
-    const firstChainId = (contracts[0] as { chainId?: number } | undefined)
-      ?.chainId
+    const firstChainId = (
+      parameters.contracts?.[0] as { chainId?: number } | undefined
+    )?.chainId
     if (
-      (contracts as { chainId?: number }[]).every(
+      ((parameters.contracts ?? []) as { chainId?: number }[]).every(
         (contract) => contract.chainId === firstChainId,
       )
     )
       return firstChainId
     return undefined
-  }, [contracts])
-
-  const options = readContractsQueryOptions<config, contracts, allowFailure>(
-    config,
-    { ...parameters, chainId: contractsChainId ?? chainId },
-  )
-
-  const enabled = useMemo(() => {
-    let isContractsValid = false
-    for (const contract of contracts) {
-      const { abi, address, functionName } =
-        contract as ContractFunctionParameters
-      if (!abi || !address || !functionName) {
-        isContractsValid = false
-        break
-      }
-      isContractsValid = true
-    }
-    return Boolean(isContractsValid && (query.enabled ?? true))
-  }, [contracts, query.enabled])
-
-  return useQuery({
-    ...options,
-    ...query,
-    enabled,
-    structuralSharing: query.structuralSharing ?? structuralSharing,
+  }, [parameters.contracts])
+  const options = readContractsQueryOptions(config, {
+    ...parameters,
+    chainId: contractsChainId ?? chainId,
+    query: parameters.query,
   })
+  return useQuery(options) as any
 }

package/src/hooks/useSimulateContract.ts

@@ -1,5 +1,4 @@
 'use client'
-
 import type {
   Config,
   ResolvedRegister,
@@ -8,17 +7,14 @@ import type {
 import {
   type SimulateContractData,
   type SimulateContractOptions,
-  type SimulateContractQueryFnData,
-  type SimulateContractQueryKey,
   simulateContractQueryOptions,
 } from '@wagmi/core/query'
 import type { Abi, ContractFunctionArgs, ContractFunctionName } from 'viem'
-
-import type { ConfigParameter, QueryParameter } from '../types/properties.js'
+import type { ConfigParameter } from '../types/properties.js'
 import { type UseQueryReturnType, useQuery } from '../utils/query.js'
 import { useChainId } from './useChainId.js'
 import { useConfig } from './useConfig.js'
-import { useConnectorClient } from './useConnectorClient.js'
+import { useConnection } from './useConnection.js'
 
 export type UseSimulateContractParameters<
   abi extends Abi | readonly unknown[] = Abi,
@@ -34,14 +30,15 @@ export type UseSimulateContractParameters<
   config extends Config = Config,
   chainId extends config['chains'][number]['id'] | undefined = undefined,
   selectData = SimulateContractData<abi, functionName, args, config, chainId>,
-> = SimulateContractOptions<abi, functionName, args, config, chainId> &
-  ConfigParameter<config> &
-  QueryParameter<
-    SimulateContractQueryFnData<abi, functionName, args, config, chainId>,
-    SimulateContractErrorType,
-    selectData,
-    SimulateContractQueryKey<abi, functionName, args, config, chainId>
-  >
+> = SimulateContractOptions<
+  abi,
+  functionName,
+  args,
+  config,
+  chainId,
+  selectData
+> &
+  ConfigParameter<config>
 
 export type UseSimulateContractReturnType<
   abi extends Abi | readonly unknown[] = Abi,
@@ -63,7 +60,7 @@ export type UseSimulateContractReturnType<
 export function useSimulateContract<
   const abi extends Abi | readonly unknown[],
   functionName extends ContractFunctionName<abi, 'nonpayable' | 'payable'>,
-  args extends ContractFunctionArgs<
+  const args extends ContractFunctionArgs<
     abi,
     'nonpayable' | 'payable',
     functionName
@@ -88,30 +85,15 @@ export function useSimulateContract<
   chainId,
   selectData
 > {
-  const { abi, address, connector, functionName, query = {} } = parameters
-
   const config = useConfig(parameters)
-  const { data: connectorClient } = useConnectorClient({
-    config,
-    connector,
-    query: { enabled: parameters.account === undefined },
-  })
+  const { address, connector } = useConnection()
   const chainId = useChainId({ config })
-
-  const options = simulateContractQueryOptions<
-    config,
-    abi,
-    functionName,
-    args,
-    chainId
-  >(config, {
-    ...parameters,
-    account: parameters.account ?? connectorClient?.account,
+  const options = simulateContractQueryOptions(config, {
+    ...(parameters as any),
+    account: parameters.account ?? address,
     chainId: parameters.chainId ?? chainId,
+    connector: parameters.connector ?? connector,
+    query: parameters.query,
   })
-  const enabled = Boolean(
-    abi && address && functionName && (query.enabled ?? true),
-  )
-
-  return useQuery({ ...query, ...options, enabled })
+  return useQuery(options) as any
 }

package/src/hooks/useStorageAt.ts

@@ -1,19 +1,16 @@
 'use client'
-
 import type {
   Config,
   GetStorageAtErrorType,
   ResolvedRegister,
 } from '@wagmi/core'
 import type { Compute } from '@wagmi/core/internal'
-import type { GetStorageAtQueryFnData } from '@wagmi/core/query'
 import {
   type GetStorageAtData,
   type GetStorageAtOptions,
-  type GetStorageAtQueryKey,
   getStorageAtQueryOptions,
 } from '@wagmi/core/query'
-import type { ConfigParameter, QueryParameter } from '../types/properties.js'
+import type { ConfigParameter } from '../types/properties.js'
 import { type UseQueryReturnType, useQuery } from '../utils/query.js'
 import { useChainId } from './useChainId.js'
 import { useConfig } from './useConfig.js'
@@ -21,16 +18,7 @@ import { useConfig } from './useConfig.js'
 export type UseStorageAtParameters<
   config extends Config = Config,
   selectData = GetStorageAtData,
-> = Compute<
-  GetStorageAtOptions<config> &
-    ConfigParameter<config> &
-    QueryParameter<
-      GetStorageAtQueryFnData,
-      GetStorageAtErrorType,
-      selectData,
-      GetStorageAtQueryKey<config>
-    >
->
+> = Compute<GetStorageAtOptions<config, selectData> & ConfigParameter<config>>
 
 export type UseStorageAtReturnType<selectData = GetStorageAtData> =
   UseQueryReturnType<selectData, GetStorageAtErrorType>
@@ -42,16 +30,12 @@ export function useStorageAt<
 >(
   parameters: UseStorageAtParameters<config, selectData> = {},
 ): UseStorageAtReturnType<selectData> {
-  const { address, slot, query = {} } = parameters
-
   const config = useConfig(parameters)
   const chainId = useChainId({ config })
-
   const options = getStorageAtQueryOptions(config, {
     ...parameters,
     chainId: parameters.chainId ?? chainId,
+    query: parameters.query,
   })
-  const enabled = Boolean(address && slot && (query.enabled ?? true))
-
-  return useQuery({ ...query, ...options, enabled })
+  return useQuery(options)
 }