viem 1.1.8 → 1.2.1

package/src/actions/public/createBlockFilter.ts

@@ -1,4 +1,4 @@
-import type { PublicClient } from '../../clients/createPublicClient.js'
+import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
 import type { Chain } from '../../types/chain.js'
 import type { Filter } from '../../types/filter.js'
@@ -28,7 +28,7 @@ export type CreateBlockFilterReturnType = Filter<'block'>
  * // { id: "0x345a6572337856574a76364e457a4366", type: 'block' }
  */
 export async function createBlockFilter<TChain extends Chain | undefined>(
-  client: PublicClient<Transport, TChain>,
+  client: Client<Transport, TChain>,
 ): Promise<CreateBlockFilterReturnType> {
   const getRequest = createFilterRequestScope(client, {
     method: 'eth_newBlockFilter',

package/src/actions/public/createContractEventFilter.ts

@@ -1,6 +1,6 @@
 import type { Abi, Address, Narrow } from 'abitype'
 
-import type { PublicClient } from '../../clients/createPublicClient.js'
+import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
 import type { BlockNumber, BlockTag } from '../../types/block.js'
 import type { Chain } from '../../types/chain.js'
@@ -87,7 +87,7 @@ export async function createContractEventFilter<
   TArgs extends MaybeExtractEventArgsFromAbi<TAbi, TEventName> | undefined,
   TStrict extends boolean | undefined = undefined,
 >(
-  client: PublicClient<Transport, TChain>,
+  client: Client<Transport, TChain>,
   {
     address,
     abi,

package/src/actions/public/createEventFilter.ts

@@ -1,6 +1,6 @@
 import type { Abi, AbiEvent, Address, Narrow } from 'abitype'
 
-import type { PublicClient } from '../../clients/createPublicClient.js'
+import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
 import type { BlockNumber, BlockTag } from '../../types/block.js'
 import type { Chain } from '../../types/chain.js'
@@ -109,7 +109,7 @@ export async function createEventFilter<
     | MaybeExtractEventArgsFromAbi<_Abi, _EventName>
     | undefined = undefined,
 >(
-  client: PublicClient<Transport, TChain>,
+  client: Client<Transport, TChain>,
   {
     address,
     args,

package/src/actions/public/createPendingTransactionFilter.ts

@@ -1,4 +1,4 @@
-import type { PublicClient } from '../../clients/createPublicClient.js'
+import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
 import type { Chain } from '../../types/chain.js'
 import type { Filter } from '../../types/filter.js'
@@ -31,7 +31,7 @@ export async function createPendingTransactionFilter<
   TTransport extends Transport,
   TChain extends Chain | undefined,
 >(
-  client: PublicClient<TTransport, TChain>,
+  client: Client<TTransport, TChain>,
 ): Promise<CreatePendingTransactionFilterReturnType> {
   const getRequest = createFilterRequestScope(client, {
     method: 'eth_newPendingTransactionFilter',

package/src/actions/public/estimateContractGas.ts

@@ -2,7 +2,7 @@ import type { Abi } from 'abitype'
 
 import type { Account } from '../../accounts/types.js'
 import { parseAccount } from '../../accounts/utils/parseAccount.js'
-import type { PublicClient } from '../../clients/createPublicClient.js'
+import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
 import type { BaseError } from '../../errors/base.js'
 import type { Chain } from '../../types/chain.js'
@@ -12,8 +12,6 @@ import {
   encodeFunctionData,
 } from '../../utils/abi/encodeFunctionData.js'
 import { getContractError } from '../../utils/errors/getContractError.js'
-
-import type { WalletClient } from '../../clients/createWalletClient.js'
 import { type EstimateGasParameters, estimateGas } from './estimateGas.js'
 
 export type EstimateContractGasParameters<
@@ -66,9 +64,7 @@ export async function estimateContractGas<
   TChain extends Chain | undefined,
   TAccount extends Account | undefined = undefined,
 >(
-  client:
-    | PublicClient<Transport, TChain>
-    | WalletClient<Transport, TChain, TAccount>,
+  client: Client<Transport, TChain, TAccount>,
   {
     abi,
     address,

package/src/actions/public/estimateGas.ts

@@ -1,7 +1,6 @@
 import type { Account } from '../../accounts/types.js'
 import { parseAccount } from '../../accounts/utils/parseAccount.js'
-import type { PublicClient } from '../../clients/createPublicClient.js'
-import type { WalletClient } from '../../clients/createWalletClient.js'
+import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
 import { AccountNotFoundError } from '../../errors/account.js'
 import type { BaseError } from '../../errors/base.js'
@@ -75,12 +74,10 @@ export async function estimateGas<
   TChain extends Chain | undefined,
   TAccount extends Account | undefined = undefined,
 >(
-  client:
-    | PublicClient<Transport, TChain>
-    | WalletClient<Transport, TChain, TAccount>,
+  client: Client<Transport, TChain, TAccount>,
   args: EstimateGasParameters<TChain, TAccount>,
 ): Promise<EstimateGasReturnType> {
-  const account_ = args.account ?? (client as unknown as WalletClient).account
+  const account_ = args.account ?? client.account
   if (!account_)
     throw new AccountNotFoundError({
       docsPath: '/docs/actions/public/estimateGas',
@@ -126,7 +123,7 @@ export async function estimateGas<
       value,
     } as TransactionRequest)
 
-    const balance = await (client as PublicClient).request({
+    const balance = await client.request({
       method: 'eth_estimateGas',
       params: block ? [request, block] : [request],
     })

package/src/actions/public/getBalance.ts

@@ -1,6 +1,6 @@
 import type { Address } from 'abitype'
 
-import type { PublicClient } from '../../clients/createPublicClient.js'
+import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
 import type { BlockTag } from '../../types/block.js'
 import type { Chain } from '../../types/chain.js'
@@ -60,7 +60,7 @@ export type GetBalanceReturnType = bigint
  * // 10000000000000000000000n (wei)
  */
 export async function getBalance<TChain extends Chain | undefined>(
-  client: PublicClient<Transport, TChain>,
+  client: Client<Transport, TChain>,
   { address, blockNumber, blockTag = 'latest' }: GetBalanceParameters,
 ): Promise<GetBalanceReturnType> {
   const blockNumberHex = blockNumber ? numberToHex(blockNumber) : undefined

package/src/actions/public/getBlock.ts

@@ -1,6 +1,5 @@
 import type { Account } from '../../accounts/types.js'
-import type { PublicClient } from '../../clients/createPublicClient.js'
-import type { WalletClient } from '../../clients/createWalletClient.js'
+import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
 import { BlockNotFoundError } from '../../errors/block.js'
 import type { BlockTag } from '../../types/block.js'
@@ -72,9 +71,7 @@ export async function getBlock<
   TChain extends Chain | undefined,
   TAccount extends Account | undefined,
 >(
-  client:
-    | PublicClient<Transport, TChain>
-    | WalletClient<Transport, TChain, TAccount>,
+  client: Client<Transport, TChain, TAccount>,
   {
     blockHash,
     blockNumber,
@@ -87,12 +84,12 @@ export async function getBlock<
 
   let block: RpcBlock | null = null
   if (blockHash) {
-    block = await (client as PublicClient).request({
+    block = await client.request({
       method: 'eth_getBlockByHash',
       params: [blockHash, includeTransactions],
     })
   } else {
-    block = await (client as PublicClient).request({
+    block = await client.request({
       method: 'eth_getBlockByNumber',
       params: [blockNumberHex || blockTag, includeTransactions],
     })

package/src/actions/public/getBlockNumber.ts

@@ -1,4 +1,4 @@
-import type { PublicClient } from '../../clients/createPublicClient.js'
+import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
 import type { Chain } from '../../types/chain.js'
 import { getCache, withCache } from '../../utils/promise/withCache.js'
@@ -40,7 +40,7 @@ export function getBlockNumberCache(id: string) {
  * // 69420n
  */
 export async function getBlockNumber<TChain extends Chain | undefined>(
-  client: PublicClient<Transport, TChain>,
+  client: Client<Transport, TChain>,
   { maxAge = client.pollingInterval }: GetBlockNumberParameters = {},
 ): Promise<GetBlockNumberReturnType> {
   const blockNumberHex = await withCache(

package/src/actions/public/getBlockTransactionCount.ts

@@ -1,4 +1,4 @@
-import type { PublicClient } from '../../clients/createPublicClient.js'
+import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
 import type { BlockTag } from '../../types/block.js'
 import type { Chain } from '../../types/chain.js'
@@ -55,7 +55,7 @@ export type GetBlockTransactionCountReturnType = number
 export async function getBlockTransactionCount<
   TChain extends Chain | undefined,
 >(
-  client: PublicClient<Transport, TChain>,
+  client: Client<Transport, TChain>,
   {
     blockHash,
     blockNumber,

package/src/actions/public/getBytecode.ts

@@ -1,6 +1,6 @@
 import type { Address } from 'abitype'
 
-import type { PublicClient } from '../../clients/createPublicClient.js'
+import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
 import type { BlockTag } from '../../types/block.js'
 import type { Chain } from '../../types/chain.js'
@@ -46,7 +46,7 @@ export type GetBytecodeReturnType = Hex | undefined
  * })
  */
 export async function getBytecode<TChain extends Chain | undefined>(
-  client: PublicClient<Transport, TChain>,
+  client: Client<Transport, TChain>,
   { address, blockNumber, blockTag = 'latest' }: GetBytecodeParameters,
 ): Promise<GetBytecodeReturnType> {
   const blockNumberHex =

package/src/actions/public/getChainId.ts

@@ -1,6 +1,5 @@
 import type { Account } from '../../accounts/types.js'
-import type { PublicClient } from '../../clients/createPublicClient.js'
-import type { WalletClient } from '../../clients/createWalletClient.js'
+import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
 import type { Chain } from '../../types/chain.js'
 import { hexToNumber } from '../../utils/encoding/fromHex.js'
@@ -31,12 +30,8 @@ export type GetChainIdReturnType = number
 export async function getChainId<
   TChain extends Chain | undefined,
   TAccount extends Account | undefined,
->(
-  client:
-    | PublicClient<Transport, TChain>
-    | WalletClient<Transport, TChain, TAccount>,
-): Promise<GetChainIdReturnType> {
-  const chainIdHex = await (client as PublicClient).request({
+>(client: Client<Transport, TChain, TAccount>): Promise<GetChainIdReturnType> {
+  const chainIdHex = await client.request({
     method: 'eth_chainId',
   })
   return hexToNumber(chainIdHex)

package/src/actions/public/getFeeHistory.ts

@@ -1,4 +1,4 @@
-import type { PublicClient } from '../../clients/createPublicClient.js'
+import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
 import type { BlockTag } from '../../types/block.js'
 import type { Chain } from '../../types/chain.js'
@@ -57,7 +57,7 @@ export type GetFeeHistoryReturnType = FeeHistory
  * })
  */
 export async function getFeeHistory<TChain extends Chain | undefined>(
-  client: PublicClient<Transport, TChain>,
+  client: Client<Transport, TChain>,
   {
     blockCount,
     blockNumber,

package/src/actions/public/getFilterChanges.ts

@@ -1,6 +1,6 @@
 import type { Abi, AbiEvent, ExtractAbiEvent } from 'abitype'
 
-import type { PublicClient } from '../../clients/createPublicClient.js'
+import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
 import {
   DecodeLogDataMismatch,
@@ -126,7 +126,7 @@ export async function getFilterChanges<
   TEventName extends string | undefined,
   TStrict extends boolean | undefined = undefined,
 >(
-  _client: PublicClient<TTransport, TChain>,
+  _client: Client<TTransport, TChain>,
   {
     filter,
   }: GetFilterChangesParameters<TFilterType, TAbi, TEventName, TStrict>,

package/src/actions/public/getFilterLogs.ts

@@ -1,6 +1,6 @@
 import type { Abi, AbiEvent, ExtractAbiEvent } from 'abitype'
 
-import type { PublicClient } from '../../clients/createPublicClient.js'
+import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
 import {
   DecodeLogDataMismatch,
@@ -63,7 +63,7 @@ export async function getFilterLogs<
   TEventName extends string | undefined,
   TStrict extends boolean | undefined = undefined,
 >(
-  _client: PublicClient<Transport, TChain>,
+  _client: Client<Transport, TChain>,
   { filter }: GetFilterLogsParameters<TAbi, TEventName, TStrict>,
 ): Promise<GetFilterLogsReturnType<TAbi, TEventName, TStrict>> {
   const strict = filter.strict ?? false

package/src/actions/public/getGasPrice.ts

@@ -1,6 +1,5 @@
 import type { Account } from '../../accounts/types.js'
-import type { PublicClient } from '../../clients/createPublicClient.js'
-import type { WalletClient } from '../../clients/createWalletClient.js'
+import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
 import type { Chain } from '../../types/chain.js'
 
@@ -29,12 +28,8 @@ export type GetGasPriceReturnType = bigint
 export async function getGasPrice<
   TChain extends Chain | undefined,
   TAccount extends Account | undefined,
->(
-  client:
-    | PublicClient<Transport, TChain>
-    | WalletClient<Transport, TChain, TAccount>,
-): Promise<GetGasPriceReturnType> {
-  const gasPrice = await (client as PublicClient).request({
+>(client: Client<Transport, TChain, TAccount>): Promise<GetGasPriceReturnType> {
+  const gasPrice = await client.request({
     method: 'eth_gasPrice',
   })
   return BigInt(gasPrice)

package/src/actions/public/getLogs.ts

@@ -1,6 +1,6 @@
 import type { AbiEvent, Address, Narrow } from 'abitype'
 
-import type { PublicClient } from '../../clients/createPublicClient.js'
+import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
 import {
   DecodeLogDataMismatch,
@@ -95,7 +95,7 @@ export async function getLogs<
   TAbiEvent extends AbiEvent | undefined,
   TStrict extends boolean | undefined = undefined,
 >(
-  client: PublicClient<Transport, TChain>,
+  client: Client<Transport, TChain>,
   {
     address,
     blockHash,

package/src/actions/public/getStorageAt.ts

@@ -1,6 +1,6 @@
 import type { Address } from 'abitype'
 
-import type { PublicClient } from '../../clients/createPublicClient.js'
+import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
 import type { BlockTag } from '../../types/block.js'
 import type { Chain } from '../../types/chain.js'
@@ -48,7 +48,7 @@ export type GetStorageAtReturnType = Hex | undefined
  * })
  */
 export async function getStorageAt<TChain extends Chain | undefined>(
-  client: PublicClient<Transport, TChain>,
+  client: Client<Transport, TChain>,
   { address, blockNumber, blockTag = 'latest', slot }: GetStorageAtParameters,
 ): Promise<GetStorageAtReturnType> {
   const blockNumberHex =

package/src/actions/public/getTransaction.ts

@@ -1,4 +1,4 @@
-import type { PublicClient } from '../../clients/createPublicClient.js'
+import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
 import { TransactionNotFoundError } from '../../errors/transaction.js'
 import type { BlockTag } from '../../types/block.js'
@@ -76,7 +76,7 @@ export type GetTransactionReturnType<TChain extends Chain | undefined = Chain> =
  * })
  */
 export async function getTransaction<TChain extends Chain | undefined>(
-  client: PublicClient<Transport, TChain>,
+  client: Client<Transport, TChain>,
   {
     blockHash,
     blockNumber,

package/src/actions/public/getTransactionConfirmations.ts

@@ -1,4 +1,4 @@
-import type { PublicClient } from '../../clients/createPublicClient.js'
+import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
 import type { Chain } from '../../types/chain.js'
 import type { Hash } from '../../types/misc.js'
@@ -50,7 +50,7 @@ export type GetTransactionConfirmationsReturnType = bigint
 export async function getTransactionConfirmations<
   TChain extends Chain | undefined,
 >(
-  client: PublicClient<Transport, TChain>,
+  client: Client<Transport, TChain>,
   { hash, transactionReceipt }: GetTransactionConfirmationsParameters<TChain>,
 ): Promise<GetTransactionConfirmationsReturnType> {
   const [blockNumber, transaction] = await Promise.all([

package/src/actions/public/getTransactionCount.ts

@@ -1,8 +1,7 @@
 import type { Address } from 'abitype'
 
 import type { Account } from '../../accounts/types.js'
-import type { PublicClient } from '../../clients/createPublicClient.js'
-import type { WalletClient } from '../../clients/createWalletClient.js'
+import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
 import type { BlockTag } from '../../types/block.js'
 import type { Chain } from '../../types/chain.js'
@@ -53,12 +52,10 @@ export async function getTransactionCount<
   TChain extends Chain | undefined,
   TAccount extends Account | undefined,
 >(
-  client:
-    | PublicClient<Transport, TChain>
-    | WalletClient<Transport, TChain, TAccount>,
+  client: Client<Transport, TChain, TAccount>,
   { address, blockTag = 'latest', blockNumber }: GetTransactionCountParameters,
 ): Promise<GetTransactionCountReturnType> {
-  const count = await (client as PublicClient).request({
+  const count = await client.request({
     method: 'eth_getTransactionCount',
     params: [address, blockNumber ? numberToHex(blockNumber) : blockTag],
   })

package/src/actions/public/getTransactionReceipt.ts

@@ -1,4 +1,4 @@
-import type { PublicClient } from '../../clients/createPublicClient.js'
+import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
 import { TransactionReceiptNotFoundError } from '../../errors/transaction.js'
 import type { Chain } from '../../types/chain.js'
@@ -42,7 +42,7 @@ export type GetTransactionReceiptReturnType<
  * })
  */
 export async function getTransactionReceipt<TChain extends Chain | undefined>(
-  client: PublicClient<Transport, TChain>,
+  client: Client<Transport, TChain>,
   { hash }: GetTransactionReceiptParameters,
 ) {
   const receipt = await client.request({

package/src/actions/public/multicall.ts

@@ -1,6 +1,6 @@
 import type { Address, Narrow } from 'abitype'
 
-import type { PublicClient } from '../../clients/createPublicClient.js'
+import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
 import { multicall3Abi } from '../../constants/abis.js'
 import { AbiDecodingZeroDataError } from '../../errors/abi.js'
@@ -84,7 +84,7 @@ export async function multicall<
   TContracts extends ContractFunctionConfig[],
   TAllowFailure extends boolean = true,
 >(
-  client: PublicClient<Transport, TChain>,
+  client: Client<Transport, TChain>,
   args: MulticallParameters<TContracts, TAllowFailure>,
 ): Promise<MulticallReturnType<TContracts, TAllowFailure>> {
   const {
@@ -194,6 +194,7 @@ export async function multicall<
       if (!success) throw new RawContractError({ data: returnData })
       const result = decodeFunctionResult({
         abi,
+        args,
         data: returnData,
         functionName: functionName,
       })

package/src/actions/public/readContract.ts

@@ -1,6 +1,6 @@
 import type { Abi } from 'abitype'
 
-import type { PublicClient } from '../../clients/createPublicClient.js'
+import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
 import type { BaseError } from '../../errors/base.js'
 import type { Chain } from '../../types/chain.js'
@@ -67,7 +67,7 @@ export async function readContract<
   TAbi extends Abi | readonly unknown[],
   TFunctionName extends string,
 >(
-  client: PublicClient<Transport, TChain>,
+  client: Client<Transport, TChain>,
   {
     abi,
     address,

package/src/actions/public/simulateContract.ts

@@ -1,7 +1,7 @@
 import type { Abi } from 'abitype'
 
 import { parseAccount } from '../../accounts/utils/parseAccount.js'
-import type { PublicClient } from '../../clients/createPublicClient.js'
+import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
 import type { BaseError } from '../../errors/base.js'
 import type { Chain } from '../../types/chain.js'
@@ -105,7 +105,7 @@ export async function simulateContract<
   TFunctionName extends string,
   TChainOverride extends Chain | undefined,
 >(
-  client: PublicClient<Transport, TChain>,
+  client: Client<Transport, TChain>,
   {
     abi,
     address,

package/src/actions/public/uninstallFilter.ts

@@ -1,4 +1,4 @@
-import type { PublicClient } from '../../clients/createPublicClient.js'
+import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
 import type { Chain } from '../../types/chain.js'
 import type { Filter } from '../../types/filter.js'
@@ -36,7 +36,7 @@ export async function uninstallFilter<
   TTransport extends Transport,
   TChain extends Chain | undefined,
 >(
-  _client: PublicClient<TTransport, TChain>,
+  _client: Client<TTransport, TChain>,
   { filter }: UninstallFilterParameters,
 ): Promise<UninstallFilterReturnType> {
   return filter.request({

package/src/actions/public/verifyHash.ts

@@ -1,7 +1,7 @@
 import type { Address } from 'abitype'
 
 import type { Chain } from '../../chains/index.js'
-import type { PublicClient } from '../../clients/createPublicClient.js'
+import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
 import { universalSignatureValidatorAbi } from '../../constants/abis.js'
 import { universalSignatureValidatorByteCode } from '../../constants/contracts.js'
@@ -33,7 +33,7 @@ export type VerifyHashReturnType = boolean
  * @returns Whether or not the signature is valid. {@link VerifyHashReturnType}
  */
 export async function verifyHash<TChain extends Chain | undefined,>(
-  client: PublicClient<Transport, TChain>,
+  client: Client<Transport, TChain>,
   { address, hash, signature, ...callRequest }: VerifyHashParameters,
 ): Promise<VerifyHashReturnType> {
   const signatureHex = isHex(signature) ? signature : toHex(signature)

package/src/actions/public/verifyMessage.ts

@@ -1,5 +1,5 @@
 import type { Chain } from '../../chains/index.js'
-import type { PublicClient } from '../../clients/createPublicClient.js'
+import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
 import type { ByteArray, Hex, SignableMessage } from '../../types/misc.js'
 import { hashMessage } from '../../utils/index.js'
@@ -29,7 +29,7 @@ export type VerifyMessageReturnType = boolean
  * @returns Whether or not the signature is valid. {@link VerifyMessageReturnType}
  */
 export async function verifyMessage<TChain extends Chain | undefined,>(
-  client: PublicClient<Transport, TChain>,
+  client: Client<Transport, TChain>,
   { address, message, signature, ...callRequest }: VerifyMessageParameters,
 ): Promise<VerifyMessageReturnType> {
   const hash = hashMessage(message)

package/src/actions/public/verifyTypedData.ts

@@ -1,9 +1,9 @@
 import type { Chain } from '../../chains/index.js'
-import type { PublicClient } from '../../clients/createPublicClient.js'
+import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
 import type { ByteArray, Hex } from '../../types/misc.js'
 import type { TypedDataDefinition } from '../../types/typedData.js'
-import { hashTypedData } from '../../utils/index.js'
+import { hashTypedData } from '../../utils/signature/hashTypedData.js'
 import { type VerifyHashParameters, verifyHash } from './verifyHash.js'
 import type { Address, TypedData } from 'abitype'
 
@@ -30,7 +30,7 @@ export type VerifyTypedDataReturnType = boolean
  * @returns Whether or not the signature is valid. {@link VerifyTypedDataReturnType}
  */
 export async function verifyTypedData<TChain extends Chain | undefined,>(
-  client: PublicClient<Transport, TChain>,
+  client: Client<Transport, TChain>,
   {
     address,
     signature,

package/src/actions/public/waitForTransactionReceipt.ts

@@ -1,4 +1,4 @@
-import type { PublicClient } from '../../clients/createPublicClient.js'
+import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
 import {
   TransactionNotFoundError,
@@ -99,7 +99,7 @@ export type WaitForTransactionReceiptParameters<
 export async function waitForTransactionReceipt<
   TChain extends Chain | undefined,
 >(
-  client: PublicClient<Transport, TChain>,
+  client: Client<Transport, TChain>,
   {
     confirmations = 1,
     hash,

package/src/actions/public/watchBlockNumber.ts

@@ -1,4 +1,4 @@
-import type { PublicClient } from '../../clients/createPublicClient.js'
+import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
 import type { Chain } from '../../types/chain.js'
 import type { GetTransportConfig } from '../../types/transport.js'
@@ -77,7 +77,7 @@ export function watchBlockNumber<
   TChain extends Chain | undefined,
   TTransport extends Transport,
 >(
-  client: PublicClient<TTransport, TChain>,
+  client: Client<TTransport, TChain>,
   {
     emitOnBegin = false,
     emitMissed = false,

package/src/actions/public/watchBlocks.ts

@@ -1,4 +1,4 @@
-import type { PublicClient } from '../../clients/createPublicClient.js'
+import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
 import type { BlockTag } from '../../types/block.js'
 import type { Chain } from '../../types/chain.js'
@@ -84,7 +84,7 @@ export function watchBlocks<
   TTransport extends Transport,
   TChain extends Chain | undefined,
 >(
-  client: PublicClient<TTransport, TChain>,
+  client: Client<TTransport, TChain>,
   {
     blockTag = 'latest',
     emitMissed = false,

package/src/actions/public/watchContractEvent.ts

@@ -1,6 +1,6 @@
 import type { Abi, Address, ExtractAbiEvent, Narrow } from 'abitype'
 
-import type { PublicClient } from '../../clients/createPublicClient.js'
+import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
 import type { Chain } from '../../types/chain.js'
 import type { GetEventArgs, InferEventName } from '../../types/contract.js'
@@ -101,7 +101,7 @@ export function watchContractEvent<
   TEventName extends string,
   TStrict extends boolean | undefined = undefined,
 >(
-  client: PublicClient<Transport, TChain>,
+  client: Client<Transport, TChain>,
   {
     abi,
     address,