wagmi 3.3.1 → 3.3.2

package/src/hooks/useTransaction.ts

@@ -1,5 +1,4 @@
 'use client'
-
 import type {
   Config,
   GetTransactionErrorType,
@@ -9,12 +8,9 @@ import type { Compute } from '@wagmi/core/internal'
 import {
   type GetTransactionData,
   type GetTransactionOptions,
-  type GetTransactionQueryFnData,
-  type GetTransactionQueryKey,
   getTransactionQueryOptions,
 } 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 UseTransactionParameters<
     config['chains'][number]['id'] = config['chains'][number]['id'],
   selectData = GetTransactionData<config, chainId>,
 > = Compute<
-  GetTransactionOptions<config, chainId> &
-    ConfigParameter<config> &
-    QueryParameter<
-      GetTransactionQueryFnData<config, chainId>,
-      GetTransactionErrorType,
-      selectData,
-      GetTransactionQueryKey<config, chainId>
-    >
+  GetTransactionOptions<config, chainId, selectData> & ConfigParameter<config>
 >
 
 export type UseTransactionReturnType<
@@ -51,22 +40,12 @@ export function useTransaction<
 >(
   parameters: UseTransactionParameters<config, chainId, selectData> = {},
 ): UseTransactionReturnType<config, chainId, selectData> {
-  const { blockHash, blockNumber, blockTag, hash, query = {} } = parameters
-
   const config = useConfig(parameters)
   const chainId = useChainId({ config })
-
   const options = getTransactionQueryOptions(config, {
     ...parameters,
     chainId: parameters.chainId ?? chainId,
+    query: parameters.query,
   })
-  const enabled = Boolean(
-    !(blockHash && blockNumber && blockTag && hash) && (query.enabled ?? true),
-  )
-
-  return useQuery({
-    ...(query as any),
-    ...options,
-    enabled,
-  }) as UseTransactionReturnType<config, chainId, selectData>
+  return useQuery(options) as any
 }

package/src/hooks/useTransactionConfirmations.ts

@@ -1,5 +1,4 @@
 'use client'
-
 import type {
   Config,
   GetTransactionConfirmationsErrorType,
@@ -8,12 +7,9 @@ import type {
 import {
   type GetTransactionConfirmationsData,
   type GetTransactionConfirmationsOptions,
-  type GetTransactionConfirmationsQueryFnData,
-  type GetTransactionConfirmationsQueryKey,
   getTransactionConfirmationsQueryOptions,
 } 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'
@@ -22,14 +18,8 @@ export type UseTransactionConfirmationsParameters<
   config extends Config = Config,
   chainId extends config['chains'][number]['id'] | undefined = undefined,
   selectData = GetTransactionConfirmationsData,
-> = GetTransactionConfirmationsOptions<config, chainId> &
-  ConfigParameter<config> &
-  QueryParameter<
-    GetTransactionConfirmationsQueryFnData,
-    GetTransactionConfirmationsErrorType,
-    selectData,
-    GetTransactionConfirmationsQueryKey<config, chainId>
-  >
+> = GetTransactionConfirmationsOptions<config, chainId, selectData> &
+  ConfigParameter<config>
 
 export type UseTransactionConfirmationsReturnType<
   selectData = GetTransactionConfirmationsData,
@@ -47,20 +37,12 @@ export function useTransactionConfirmations<
     selectData
   > = {} as any,
 ): UseTransactionConfirmationsReturnType<selectData> {
-  const { hash, transactionReceipt, query = {} } = parameters
-
   const config = useConfig(parameters)
   const chainId = useChainId({ config })
-
   const options = getTransactionConfirmationsQueryOptions(config, {
     ...parameters,
     chainId: parameters.chainId ?? chainId,
+    query: parameters.query,
   })
-  const enabled = Boolean(
-    !(hash && transactionReceipt) &&
-      (hash || transactionReceipt) &&
-      (query.enabled ?? true),
-  )
-
-  return useQuery({ ...query, ...options, enabled })
+  return useQuery(options) as any
 }

package/src/hooks/useTransactionCount.ts

@@ -1,20 +1,16 @@
 'use client'
-
 import type {
   Config,
   GetTransactionCountErrorType,
   ResolvedRegister,
 } from '@wagmi/core'
 import type { Compute } from '@wagmi/core/internal'
-import type { GetTransactionCountQueryFnData } from '@wagmi/core/query'
 import {
   type GetTransactionCountData,
   type GetTransactionCountOptions,
-  type GetTransactionCountQueryKey,
   getTransactionCountQueryOptions,
 } 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,7 @@ export type UseTransactionCountParameters<
   config extends Config = Config,
   selectData = GetTransactionCountData,
 > = Compute<
-  GetTransactionCountOptions<config> &
-    ConfigParameter<config> &
-    QueryParameter<
-      GetTransactionCountQueryFnData,
-      GetTransactionCountErrorType,
-      selectData,
-      GetTransactionCountQueryKey<config>
-    >
+  GetTransactionCountOptions<config, selectData> & ConfigParameter<config>
 >
 
 export type UseTransactionCountReturnType<
@@ -44,16 +33,12 @@ export function useTransactionCount<
 >(
   parameters: UseTransactionCountParameters<config, selectData> = {},
 ): UseTransactionCountReturnType<selectData> {
-  const { address, query = {} } = parameters
-
   const config = useConfig(parameters)
   const chainId = useChainId({ config })
-
   const options = getTransactionCountQueryOptions(config, {
     ...parameters,
     chainId: parameters.chainId ?? chainId,
+    query: parameters.query,
   })
-  const enabled = Boolean(address && (query.enabled ?? true))
-
-  return useQuery({ ...query, ...options, enabled })
+  return useQuery(options)
 }

package/src/hooks/useTransactionReceipt.ts

@@ -1,19 +1,16 @@
 'use client'
-
 import type {
   Config,
   GetTransactionReceiptErrorType,
   ResolvedRegister,
 } from '@wagmi/core'
 import type { Compute } from '@wagmi/core/internal'
-import type { GetTransactionReceiptQueryFnData } from '@wagmi/core/query'
 import {
   type GetTransactionReceiptData,
   type GetTransactionReceiptOptions,
-  type GetTransactionReceiptQueryKey,
   getTransactionReceiptQueryOptions,
 } 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'
@@ -24,14 +21,8 @@ export type UseTransactionReceiptParameters<
     config['chains'][number]['id'] = config['chains'][number]['id'],
   selectData = GetTransactionReceiptData<config, chainId>,
 > = Compute<
-  GetTransactionReceiptOptions<config, chainId> &
-    ConfigParameter<config> &
-    QueryParameter<
-      GetTransactionReceiptQueryFnData<config, chainId>,
-      GetTransactionReceiptErrorType,
-      selectData,
-      GetTransactionReceiptQueryKey<config, chainId>
-    >
+  GetTransactionReceiptOptions<config, chainId, selectData> &
+    ConfigParameter<config>
 >
 
 export type UseTransactionReceiptReturnType<
@@ -50,20 +41,12 @@ export function useTransactionReceipt<
 >(
   parameters: UseTransactionReceiptParameters<config, chainId, selectData> = {},
 ): UseTransactionReceiptReturnType<config, chainId, selectData> {
-  const { hash, query = {} } = parameters
-
   const config = useConfig(parameters)
   const chainId = useChainId({ config })
-
   const options = getTransactionReceiptQueryOptions(config, {
     ...parameters,
     chainId: parameters.chainId ?? chainId,
+    query: parameters.query,
   })
-  const enabled = Boolean(hash && (query.enabled ?? true))
-
-  return useQuery({
-    ...(query as any),
-    ...options,
-    enabled,
-  }) as UseTransactionReceiptReturnType<config, chainId, selectData>
+  return useQuery(options) as any
 }

package/src/hooks/useVerifyMessage.ts

@@ -1,19 +1,16 @@
 'use client'
-
 import type {
   Config,
   ResolvedRegister,
   VerifyMessageErrorType,
 } from '@wagmi/core'
 import type { Compute } from '@wagmi/core/internal'
-import type { VerifyMessageQueryFnData } from '@wagmi/core/query'
 import {
   type VerifyMessageData,
   type VerifyMessageOptions,
-  type VerifyMessageQueryKey,
   verifyMessageQueryOptions,
 } 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 UseVerifyMessageParameters<
   config extends Config = Config,
   selectData = VerifyMessageData,
-> = Compute<
-  VerifyMessageOptions<config> &
-    ConfigParameter<config> &
-    QueryParameter<
-      VerifyMessageQueryFnData,
-      VerifyMessageErrorType,
-      selectData,
-      VerifyMessageQueryKey<config>
-    >
->
+> = Compute<VerifyMessageOptions<config, selectData> & ConfigParameter<config>>
 
 export type UseVerifyMessageReturnType<selectData = VerifyMessageData> =
   UseQueryReturnType<selectData, VerifyMessageErrorType>
@@ -42,18 +30,12 @@ export function useVerifyMessage<
 >(
   parameters: UseVerifyMessageParameters<config, selectData> = {},
 ): UseVerifyMessageReturnType<selectData> {
-  const { address, message, signature, query = {} } = parameters
-
   const config = useConfig(parameters)
   const chainId = useChainId({ config })
-
   const options = verifyMessageQueryOptions(config, {
     ...parameters,
     chainId: parameters.chainId ?? chainId,
+    query: parameters.query,
   })
-  const enabled = Boolean(
-    address && message && signature && (query.enabled ?? true),
-  )
-
-  return useQuery({ ...query, ...options, enabled })
+  return useQuery(options)
 }

package/src/hooks/useVerifyTypedData.ts

@@ -1,19 +1,16 @@
 'use client'
-
 import type {
   Config,
   ResolvedRegister,
   VerifyTypedDataErrorType,
 } from '@wagmi/core'
-import type { VerifyTypedDataQueryFnData } from '@wagmi/core/query'
 import {
   type VerifyTypedDataData,
   type VerifyTypedDataOptions,
-  type VerifyTypedDataQueryKey,
   verifyTypedDataQueryOptions,
 } from '@wagmi/core/query'
 import type { TypedData } 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'
@@ -23,14 +20,8 @@ export type UseVerifyTypedDataParameters<
   primaryType extends keyof typedData | 'EIP712Domain' = keyof typedData,
   config extends Config = Config,
   selectData = VerifyTypedDataData,
-> = VerifyTypedDataOptions<typedData, primaryType, config> &
-  ConfigParameter<config> &
-  QueryParameter<
-    VerifyTypedDataQueryFnData,
-    VerifyTypedDataErrorType,
-    selectData,
-    VerifyTypedDataQueryKey<typedData, primaryType, config>
-  >
+> = VerifyTypedDataOptions<typedData, primaryType, config, selectData> &
+  ConfigParameter<config>
 
 export type UseVerifyTypedDataReturnType<selectData = VerifyTypedDataData> =
   UseQueryReturnType<selectData, VerifyTypedDataErrorType>
@@ -49,33 +40,12 @@ export function useVerifyTypedData<
     selectData
   > = {} as any,
 ): UseVerifyTypedDataReturnType<selectData> {
-  const {
-    address,
-    message,
-    primaryType,
-    signature,
-    types,
-    query = {},
-  } = parameters
-
   const config = useConfig(parameters)
   const chainId = useChainId({ config })
-
-  const options = verifyTypedDataQueryOptions<config, typedData, primaryType>(
-    config,
-    {
-      ...parameters,
-      chainId: parameters.chainId ?? chainId,
-    },
-  )
-  const enabled = Boolean(
-    address &&
-      message &&
-      primaryType &&
-      signature &&
-      types &&
-      (query.enabled ?? true),
-  )
-
-  return useQuery({ ...query, ...options, enabled })
+  const options = verifyTypedDataQueryOptions(config, {
+    ...(parameters as any),
+    chainId: parameters.chainId ?? chainId,
+    query: parameters.query,
+  })
+  return useQuery(options) as any
 }

package/src/hooks/useWaitForCallsStatus.ts

@@ -1,5 +1,4 @@
 'use client'
-
 import type {
   Config,
   ResolvedRegister,
@@ -9,28 +8,17 @@ import type { Compute } from '@wagmi/core/internal'
 import {
   type WaitForCallsStatusData,
   type WaitForCallsStatusOptions,
-  type WaitForCallsStatusQueryFnData,
-  type WaitForCallsStatusQueryKey,
   waitForCallsStatusQueryOptions,
 } 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 { useConfig } from './useConfig.js'
+import { useConnection } from './useConnection.js'
 
 export type UseWaitForCallsStatusParameters<
   config extends Config = Config,
   selectData = WaitForCallsStatusData,
-> = Compute<
-  WaitForCallsStatusOptions &
-    ConfigParameter<config> &
-    QueryParameter<
-      WaitForCallsStatusQueryFnData,
-      WaitForCallsStatusErrorType,
-      selectData,
-      WaitForCallsStatusQueryKey
-    >
->
+> = Compute<WaitForCallsStatusOptions<selectData> & ConfigParameter<config>>
 
 export type UseWaitForCallsStatusReturnType<
   selectData = WaitForCallsStatusData,
@@ -43,12 +31,12 @@ export function useWaitForCallsStatus<
 >(
   parameters: UseWaitForCallsStatusParameters<config, selectData>,
 ): UseWaitForCallsStatusReturnType<selectData> {
-  const { id, query = {} } = parameters
-
   const config = useConfig(parameters)
-
-  const options = waitForCallsStatusQueryOptions(config, parameters)
-  const enabled = Boolean(id && (query.enabled ?? true))
-
-  return useQuery({ ...query, ...options, enabled })
+  const { connector } = useConnection({ config })
+  const options = waitForCallsStatusQueryOptions(config, {
+    ...parameters,
+    connector: parameters.connector ?? connector,
+    query: parameters.query,
+  })
+  return useQuery(options)
 }

package/src/hooks/useWaitForTransactionReceipt.ts

@@ -1,5 +1,4 @@
 'use client'
-
 import type {
   Config,
   ResolvedRegister,
@@ -9,12 +8,9 @@ import type { Compute } from '@wagmi/core/internal'
 import {
   type WaitForTransactionReceiptData,
   type WaitForTransactionReceiptOptions,
-  type WaitForTransactionReceiptQueryFnData,
-  type WaitForTransactionReceiptQueryKey,
   waitForTransactionReceiptQueryOptions,
 } 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,8 @@ export type UseWaitForTransactionReceiptParameters<
     config['chains'][number]['id'] = config['chains'][number]['id'],
   selectData = WaitForTransactionReceiptData<config, chainId>,
 > = Compute<
-  WaitForTransactionReceiptOptions<config, chainId> &
-    ConfigParameter<config> &
-    QueryParameter<
-      WaitForTransactionReceiptQueryFnData<config, chainId>,
-      WaitForTransactionReceiptErrorType,
-      selectData,
-      WaitForTransactionReceiptQueryKey<config, chainId>
-    >
+  WaitForTransactionReceiptOptions<config, chainId, selectData> &
+    ConfigParameter<config>
 >
 
 export type UseWaitForTransactionReceiptReturnType<
@@ -55,20 +45,12 @@ export function useWaitForTransactionReceipt<
     selectData
   > = {},
 ): UseWaitForTransactionReceiptReturnType<config, chainId, selectData> {
-  const { hash, query = {} } = parameters
-
   const config = useConfig(parameters)
   const chainId = useChainId({ config })
-
   const options = waitForTransactionReceiptQueryOptions(config, {
     ...parameters,
     chainId: parameters.chainId ?? chainId,
+    query: parameters.query,
   })
-  const enabled = Boolean(hash && (query.enabled ?? true))
-
-  return useQuery({
-    ...(query as any),
-    ...options,
-    enabled,
-  }) as UseWaitForTransactionReceiptReturnType<config, chainId, selectData>
+  return useQuery(options) as any
 }

package/src/hooks/useWalletClient.ts

@@ -1,30 +1,21 @@
 'use client'
-
 // Almost identical implementation to `useConnectorClient` (except for return type)
 // Should update both in tandem
-
 import { useQueryClient } from '@tanstack/react-query'
 import type {
   Config,
   GetWalletClientErrorType,
   ResolvedRegister,
 } from '@wagmi/core'
-import type { Compute, Omit } from '@wagmi/core/internal'
+import type { Compute } from '@wagmi/core/internal'
 import {
   type GetWalletClientData,
   type GetWalletClientOptions,
-  type GetWalletClientQueryFnData,
-  type GetWalletClientQueryKey,
   getWalletClientQueryOptions,
 } from '@wagmi/core/query'
 import { useEffect, useRef } from 'react'
-
 import type { ConfigParameter } from '../types/properties.js'
-import {
-  type UseQueryParameters,
-  type UseQueryReturnType,
-  useQuery,
-} from '../utils/query.js'
+import { type UseQueryReturnType, useQuery } from '../utils/query.js'
 import { useChainId } from './useChainId.js'
 import { useConfig } from './useConfig.js'
 import { useConnection } from './useConnection.js'
@@ -35,22 +26,7 @@ export type UseWalletClientParameters<
     config['chains'][number]['id'] = config['chains'][number]['id'],
   selectData = GetWalletClientData<config, chainId>,
 > = Compute<
-  GetWalletClientOptions<config, chainId> &
-    ConfigParameter<config> & {
-      query?:
-        | Compute<
-            Omit<
-              UseQueryParameters<
-                GetWalletClientQueryFnData<config, chainId>,
-                GetWalletClientErrorType,
-                selectData,
-                GetWalletClientQueryKey<config, chainId>
-              >,
-              'gcTime' | 'staleTime'
-            >
-          >
-        | undefined
-    }
+  GetWalletClientOptions<config, chainId, selectData> & ConfigParameter<config>
 >
 
 export type UseWalletClientReturnType<
@@ -69,48 +45,31 @@ export function useWalletClient<
 >(
   parameters: UseWalletClientParameters<config, chainId, selectData> = {},
 ): UseWalletClientReturnType<config, chainId, selectData> {
-  const { query = {}, ...rest } = parameters
-
-  const config = useConfig(rest)
-  const queryClient = useQueryClient()
-  const { address, connector, status } = useConnection({ config })
+  const config = useConfig(parameters)
   const chainId = useChainId({ config })
-  const activeConnector = parameters.connector ?? connector
-
-  const { queryKey, ...options } = getWalletClientQueryOptions<config, chainId>(
-    config,
-    {
-      ...parameters,
-      chainId: parameters.chainId ?? chainId,
-      connector: parameters.connector ?? connector,
-    },
-  )
-  const enabled = Boolean(
-    (status === 'connected' ||
-      (status === 'reconnecting' && activeConnector?.getProvider)) &&
-      (query.enabled ?? true),
-  )
+  const { address, connector } = useConnection({ config })
+  const options = getWalletClientQueryOptions(config, {
+    ...parameters,
+    chainId: parameters.chainId ?? chainId,
+    connector: parameters.connector ?? connector,
+    query: parameters.query as any,
+  })
 
   const addressRef = useRef(address)
+  const queryClient = useQueryClient()
   // biome-ignore lint/correctness/useExhaustiveDependencies: `queryKey` not required
   useEffect(() => {
     const previousAddress = addressRef.current
     if (!address && previousAddress) {
       // remove when account is disconnected
-      queryClient.removeQueries({ queryKey })
+      queryClient.removeQueries({ queryKey: options.queryKey })
       addressRef.current = undefined
     } else if (address !== previousAddress) {
       // invalidate when address changes
-      queryClient.invalidateQueries({ queryKey })
+      queryClient.invalidateQueries({ queryKey: options.queryKey })
       addressRef.current = address
     }
   }, [address, queryClient])
 
-  return useQuery({
-    ...query,
-    ...options,
-    queryKey,
-    enabled,
-    staleTime: Number.POSITIVE_INFINITY,
-  } as any) as UseWalletClientReturnType<config, chainId, selectData>
+  return useQuery(options) as any
 }

package/src/tempo/hooks/amm.ts

@@ -6,7 +6,7 @@ import { useEffect } from 'react'
 
 import { useChainId } from '../../hooks/useChainId.js'
 import { useConfig } from '../../hooks/useConfig.js'
-import type { ConfigParameter, QueryParameter } from '../../types/properties.js'
+import type { ConfigParameter } from '../../types/properties.js'
 import {
   type UseMutationParameters,
   type UseQueryReturnType,
@@ -60,17 +60,8 @@ export declare namespace usePool {
     config extends Config = ResolvedRegister['config'],
     selectData = Actions.amm.getPool.ReturnValue,
   > = ConfigParameter<config> &
-    QueryParameter<
-      Actions.amm.getPool.ReturnValue,
-      Actions.amm.getPool.ErrorType,
-      selectData,
-      Actions.amm.getPool.QueryKey<config>
-    > &
     ExactPartial<
-      Omit<
-        Actions.amm.getPool.queryOptions.Parameters<config, selectData>,
-        'query'
-      >
+      Actions.amm.getPool.queryOptions.Parameters<config, selectData>
     >
 
   export type ReturnValue<selectData = Actions.amm.getPool.ReturnValue> =
@@ -123,19 +114,10 @@ export declare namespace useLiquidityBalance {
     config extends Config = ResolvedRegister['config'],
     selectData = Actions.amm.getLiquidityBalance.ReturnValue,
   > = ConfigParameter<config> &
-    QueryParameter<
-      Actions.amm.getLiquidityBalance.ReturnValue,
-      Actions.amm.getLiquidityBalance.ErrorType,
-      selectData,
-      Actions.amm.getLiquidityBalance.QueryKey<config>
-    > &
     ExactPartial<
-      Omit<
-        Actions.amm.getLiquidityBalance.queryOptions.Parameters<
-          config,
-          selectData
-        >,
-        'query'
+      Actions.amm.getLiquidityBalance.queryOptions.Parameters<
+        config,
+        selectData
       >
     >