viem 0.0.0-portable-types-20230522163654 → 0.0.0-tmm-sign-typed-data-types.20230619T221425

package/src/actions/public/estimateGas.ts

@@ -86,11 +86,12 @@ export async function estimateGas<
     | WalletClient<Transport, TChain, TAccount>,
   args: EstimateGasParameters<TChain, TAccount>,
 ): Promise<EstimateGasReturnType> {
-  if (!args.account)
+  const account_ = args.account ?? (client as WalletClient).account
+  if (!account_)
     throw new AccountNotFoundError({
       docsPath: '/docs/actions/public/estimateGas',
     })
-  const account = parseAccount(args.account)
+  const account = parseAccount(account_)
 
   try {
     const {
@@ -134,7 +135,7 @@ export async function estimateGas<
       },
     )
 
-    const balance = await client.request({
+    const balance = await (client as PublicClient).request({
       method: 'eth_estimateGas',
       params: block ? [request, block] : [request],
     })

package/src/actions/public/getBlock.ts

@@ -89,12 +89,12 @@ export async function getBlock<
 
   let block: RpcBlock | null = null
   if (blockHash) {
-    block = await client.request({
+    block = await (client as PublicClient).request({
       method: 'eth_getBlockByHash',
       params: [blockHash, includeTransactions],
     })
   } else {
-    block = await client.request({
+    block = await (client as PublicClient).request({
       method: 'eth_getBlockByNumber',
       params: [blockNumberHex || blockTag, includeTransactions],
     })

package/src/actions/public/getBlockTransactionCount.ts

@@ -65,7 +65,7 @@ export async function getBlockTransactionCount<
   const blockNumberHex =
     blockNumber !== undefined ? numberToHex(blockNumber) : undefined
 
-  let count: Quantity | null = null
+  let count: Quantity
   if (blockHash) {
     count = await client.request({
       method: 'eth_getBlockTransactionCountByHash',

package/src/actions/public/getChainId.ts

@@ -36,6 +36,8 @@ export async function getChainId<
     | PublicClient<Transport, TChain>
     | WalletClient<Transport, TChain, TAccount>,
 ): Promise<GetChainIdReturnType> {
-  const chainIdHex = await client.request({ method: 'eth_chainId' })
+  const chainIdHex = await (client as PublicClient).request({
+    method: 'eth_chainId',
+  })
   return hexToNumber(chainIdHex)
 }

package/src/actions/public/getFilterChanges.ts

@@ -2,6 +2,10 @@ import type { Abi, AbiEvent, ExtractAbiEvent } from 'abitype'
 
 import type { PublicClient } from '../../clients/createPublicClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
+import {
+  DecodeLogDataMismatch,
+  DecodeLogTopicsMismatch,
+} from '../../errors/abi.js'
 import type { Chain } from '../../types/chain.js'
 import type { Filter, FilterType } from '../../types/filter.js'
 import type { Log } from '../../types/log.js'
@@ -13,21 +17,23 @@ export type GetFilterChangesParameters<
   TFilterType extends FilterType = FilterType,
   TAbi extends Abi | readonly unknown[] = Abi,
   TEventName extends string | undefined = string,
+  TStrict extends boolean | undefined = undefined,
 > = {
-  filter: Filter<TFilterType, TAbi, TEventName, any>
+  filter: Filter<TFilterType, TAbi, TEventName, any, TStrict>
 }
 
 export type GetFilterChangesReturnType<
   TFilterType extends FilterType = FilterType,
   TAbi extends Abi | readonly unknown[] = Abi,
   TEventName extends string | undefined = string,
+  TStrict extends boolean | undefined = undefined,
   _AbiEvent extends AbiEvent | undefined = TAbi extends Abi
     ? TEventName extends string
       ? ExtractAbiEvent<TAbi, TEventName>
       : undefined
     : undefined,
 > = TFilterType extends 'event'
-  ? Log<bigint, number, _AbiEvent, TAbi, TEventName>[]
+  ? Log<bigint, number, _AbiEvent, TStrict, TAbi, TEventName>[]
   : Hash[]
 
 /**
@@ -38,10 +44,10 @@ export type GetFilterChangesReturnType<
  *
  * A Filter can be created from the following actions:
  *
- * - [`createBlockFilter`](https://viem.sh/docs/actions/public/createBlockFilter)
- * - [`createContractEventFilter`](https://viem.sh/docs/contract/createContractEventFilter)
- * - [`createEventFilter`](https://viem.sh/docs/actions/public/createEventFilter)
- * - [`createPendingTransactionFilter`](https://viem.sh/docs/actions/public/createPendingTransactionFilter)
+ * - [`createBlockFilter`](https://viem.sh/docs/actions/public/createBlockFilter.html)
+ * - [`createContractEventFilter`](https://viem.sh/docs/contract/createContractEventFilter.html)
+ * - [`createEventFilter`](https://viem.sh/docs/actions/public/createEventFilter.html)
+ * - [`createPendingTransactionFilter`](https://viem.sh/docs/actions/public/createPendingTransactionFilter.html)
  *
  * Depending on the type of filter, the return value will be different:
  *
@@ -118,10 +124,15 @@ export async function getFilterChanges<
   TFilterType extends FilterType,
   TAbi extends Abi | readonly unknown[],
   TEventName extends string | undefined,
+  TStrict extends boolean | undefined = undefined,
 >(
   _client: PublicClient<TTransport, TChain>,
-  { filter }: GetFilterChangesParameters<TFilterType, TAbi, TEventName>,
+  {
+    filter,
+  }: GetFilterChangesParameters<TFilterType, TAbi, TEventName, TStrict>,
 ) {
+  const strict = 'strict' in filter && filter.strict
+
   const logs = await filter.request({
     method: 'eth_getFilterChanges',
     params: [filter.id],
@@ -136,17 +147,31 @@ export async function getFilterChanges<
                 abi: filter.abi,
                 data: log.data,
                 topics: log.topics as any,
+                strict,
               })
             : { eventName: undefined, args: undefined }
         return formatLog(log, { args, eventName })
-      } catch {
-        // Skip log if there is an error decoding (e.g. indexed/non-indexed params mismatch).
-        return
+      } catch (err) {
+        let eventName
+        let isUnnamed
+        if (
+          err instanceof DecodeLogDataMismatch ||
+          err instanceof DecodeLogTopicsMismatch
+        ) {
+          // If strict mode is on, and log data/topics do not match event definition, skip.
+          if ('strict' in filter && filter.strict) return
+          eventName = err.abiItem.name
+          isUnnamed = err.abiItem.inputs?.some((x) => !('name' in x && x.name))
+        }
+
+        // Set args undefined if there is an error decoding (e.g. indexed/non-indexed params mismatch).
+        return formatLog(log, { args: isUnnamed ? [] : {}, eventName })
       }
     })
     .filter(Boolean) as GetFilterChangesReturnType<
     TFilterType,
     TAbi,
-    TEventName
+    TEventName,
+    TStrict
   >
 }

package/src/actions/public/getFilterLogs.ts

@@ -2,6 +2,10 @@ import type { Abi, AbiEvent, ExtractAbiEvent } from 'abitype'
 
 import type { PublicClient } from '../../clients/createPublicClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
+import {
+  DecodeLogDataMismatch,
+  DecodeLogTopicsMismatch,
+} from '../../errors/abi.js'
 import type { Chain } from '../../types/chain.js'
 import type { Filter } from '../../types/filter.js'
 import type { Log } from '../../types/log.js'
@@ -11,18 +15,20 @@ import { formatLog } from '../../utils/formatters/log.js'
 export type GetFilterLogsParameters<
   TAbi extends Abi | readonly unknown[] = Abi,
   TEventName extends string | undefined = string,
+  TStrict extends boolean | undefined = undefined,
 > = {
-  filter: Filter<'event', TAbi, TEventName, any>
+  filter: Filter<'event', TAbi, TEventName, any, TStrict>
 }
 export type GetFilterLogsReturnType<
   TAbi extends Abi | readonly unknown[] = Abi,
   TEventName extends string | undefined = string,
+  TStrict extends boolean | undefined = undefined,
   _AbiEvent extends AbiEvent | undefined = TAbi extends Abi
     ? TEventName extends string
       ? ExtractAbiEvent<TAbi, TEventName>
       : undefined
     : undefined,
-> = Log<bigint, number, _AbiEvent, TAbi, TEventName>[]
+> = Log<bigint, number, _AbiEvent, TStrict, TAbi, TEventName>[]
 
 /**
  * Returns a list of event logs since the filter was created.
@@ -55,10 +61,13 @@ export async function getFilterLogs<
   TChain extends Chain | undefined,
   TAbi extends Abi | readonly unknown[],
   TEventName extends string | undefined,
+  TStrict extends boolean | undefined = undefined,
 >(
   _client: PublicClient<Transport, TChain>,
-  { filter }: GetFilterLogsParameters<TAbi, TEventName>,
-): Promise<GetFilterLogsReturnType<TAbi, TEventName>> {
+  { filter }: GetFilterLogsParameters<TAbi, TEventName, TStrict>,
+): Promise<GetFilterLogsReturnType<TAbi, TEventName, TStrict>> {
+  const strict = filter.strict ?? false
+
   const logs = await filter.request({
     method: 'eth_getFilterLogs',
     params: [filter.id],
@@ -72,13 +81,30 @@ export async function getFilterLogs<
                 abi: filter.abi,
                 data: log.data,
                 topics: log.topics as any,
+                strict,
               })
             : { eventName: undefined, args: undefined }
         return formatLog(log, { args, eventName })
-      } catch {
-        // Skip log if there is an error decoding (e.g. indexed/non-indexed params mismatch).
-        return
+      } catch (err) {
+        let eventName
+        let isUnnamed
+        if (
+          err instanceof DecodeLogDataMismatch ||
+          err instanceof DecodeLogTopicsMismatch
+        ) {
+          // If strict mode is on, and log data/topics do not match event definition, skip.
+          if ('strict' in filter && filter.strict) return
+          eventName = err.abiItem.name
+          isUnnamed = err.abiItem.inputs?.some((x) => !('name' in x && x.name))
+        }
+
+        // Set args to empty if there is an error decoding (e.g. indexed/non-indexed params mismatch).
+        return formatLog(log, { args: isUnnamed ? [] : {}, eventName })
       }
     })
-    .filter(Boolean) as unknown as GetFilterLogsReturnType<TAbi, TEventName>
+    .filter(Boolean) as unknown as GetFilterLogsReturnType<
+    TAbi,
+    TEventName,
+    TStrict
+  >
 }

package/src/actions/public/getGasPrice.ts

@@ -34,7 +34,7 @@ export async function getGasPrice<
     | PublicClient<Transport, TChain>
     | WalletClient<Transport, TChain, TAccount>,
 ): Promise<GetGasPriceReturnType> {
-  const gasPrice = await client.request({
+  const gasPrice = await (client as PublicClient).request({
     method: 'eth_gasPrice',
   })
   return BigInt(gasPrice)

package/src/actions/public/getLogs.ts

@@ -2,6 +2,10 @@ import type { AbiEvent, Address, Narrow } from 'abitype'
 
 import type { PublicClient } from '../../clients/createPublicClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
+import {
+  DecodeLogDataMismatch,
+  DecodeLogTopicsMismatch,
+} from '../../errors/abi.js'
 import type { BlockNumber, BlockTag } from '../../types/block.js'
 import type { Chain } from '../../types/chain.js'
 import type {
@@ -21,18 +25,25 @@ import { formatLog } from '../../utils/formatters/log.js'
 
 export type GetLogsParameters<
   TAbiEvent extends AbiEvent | undefined = undefined,
-  TEventName extends string | undefined = MaybeAbiEventName<TAbiEvent>,
+  TStrict extends boolean | undefined = undefined,
+  _EventName extends string | undefined = MaybeAbiEventName<TAbiEvent>,
 > = {
   /** Address or list of addresses from which logs originated */
   address?: Address | Address[]
 } & (
   | {
       event: Narrow<TAbiEvent>
-      args?: MaybeExtractEventArgsFromAbi<[TAbiEvent], TEventName>
+      args?: MaybeExtractEventArgsFromAbi<[TAbiEvent], _EventName>
+      /**
+       * Whether or not the logs must match the indexed/non-indexed arguments on `event`.
+       * @default false
+       */
+      strict?: TStrict
     }
   | {
       event?: never
       args?: never
+      strict?: never
     }
 ) &
   (
@@ -53,8 +64,9 @@ export type GetLogsParameters<
 
 export type GetLogsReturnType<
   TAbiEvent extends AbiEvent | undefined = undefined,
-  TEventName extends string | undefined = MaybeAbiEventName<TAbiEvent>,
-> = Log<bigint, number, TAbiEvent, [TAbiEvent], TEventName>[]
+  TStrict extends boolean | undefined = undefined,
+  _EventName extends string | undefined = MaybeAbiEventName<TAbiEvent>,
+> = Log<bigint, number, TAbiEvent, TStrict, [TAbiEvent], _EventName>[]
 
 /**
  * Returns a list of event logs matching the provided parameters.
@@ -81,6 +93,7 @@ export type GetLogsReturnType<
 export async function getLogs<
   TChain extends Chain | undefined,
   TAbiEvent extends AbiEvent | undefined,
+  TStrict extends boolean | undefined = undefined,
 >(
   client: PublicClient<Transport, TChain>,
   {
@@ -90,8 +103,11 @@ export async function getLogs<
     toBlock,
     event,
     args,
-  }: GetLogsParameters<TAbiEvent> = {},
-): Promise<GetLogsReturnType<TAbiEvent>> {
+    strict: strict_,
+  }: GetLogsParameters<TAbiEvent, TStrict> = {},
+): Promise<GetLogsReturnType<TAbiEvent, TStrict>> {
+  const strict = strict_ ?? false
+
   let topics: LogTopic[] = []
   if (event)
     topics = encodeEventTopics({
@@ -129,13 +145,26 @@ export async function getLogs<
               abi: [event] as [AbiEvent],
               data: log.data,
               topics: log.topics as any,
+              strict,
             })
           : { eventName: undefined, args: undefined }
         return formatLog(log, { args, eventName })
-      } catch {
-        // Skip log if there is an error decoding (e.g. indexed/non-indexed params mismatch).
-        return
+      } catch (err) {
+        let eventName
+        let isUnnamed
+        if (
+          err instanceof DecodeLogDataMismatch ||
+          err instanceof DecodeLogTopicsMismatch
+        ) {
+          // If strict mode is on, and log data/topics do not match event definition, skip.
+          if (strict) return
+          eventName = err.abiItem.name
+          isUnnamed = err.abiItem.inputs?.some((x) => !('name' in x && x.name))
+        }
+
+        // Set args to empty if there is an error decoding (e.g. indexed/non-indexed params mismatch).
+        return formatLog(log, { args: isUnnamed ? [] : {}, eventName })
       }
     })
-    .filter(Boolean) as unknown as GetLogsReturnType<TAbiEvent>
+    .filter(Boolean) as unknown as GetLogsReturnType<TAbiEvent, TStrict>
 }

package/src/actions/public/getTransaction.ts

@@ -54,7 +54,7 @@ export type GetTransactionReturnType<TChain extends Chain | undefined = Chain> =
   FormattedTransaction<TransactionFormatter<TChain>>
 
 /**
- * Returns information about a [Transaction](https://viem.sh/docs/glossary/terms#transaction) given a hash or block identifier.
+ * Returns information about a [Transaction](https://viem.sh/docs/glossary/terms.html#transaction) given a hash or block identifier.
  *
  * - Docs: https://viem.sh/docs/actions/public/getTransaction.html
  * - Example: https://stackblitz.com/github/wagmi-dev/viem/tree/main/examples/transactions/fetching-transactions

package/src/actions/public/getTransactionCount.ts

@@ -27,7 +27,7 @@ export type GetTransactionCountParameters = {
 export type GetTransactionCountReturnType = number
 
 /**
- * Returns the number of [Transactions](https://viem.sh/docs/glossary/terms#transaction) an Account has broadcast / sent.
+ * Returns the number of [Transactions](https://viem.sh/docs/glossary/terms.html#transaction) an Account has broadcast / sent.
  *
  * - Docs: https://viem.sh/docs/actions/public/getTransactionCount.html
  * - JSON-RPC Methods: [`eth_getTransactionCount`](https://ethereum.org/en/developers/docs/apis/json-rpc/#eth_gettransactioncount)
@@ -58,7 +58,7 @@ export async function getTransactionCount<
     | WalletClient<Transport, TChain, TAccount>,
   { address, blockTag = 'latest', blockNumber }: GetTransactionCountParameters,
 ): Promise<GetTransactionCountReturnType> {
-  const count = await client.request({
+  const count = await (client as PublicClient).request({
     method: 'eth_getTransactionCount',
     params: [address, blockNumber ? numberToHex(blockNumber) : blockTag],
   })

package/src/actions/public/getTransactionReceipt.ts

@@ -20,7 +20,7 @@ export type GetTransactionReceiptReturnType<
 > = FormattedTransactionReceipt<TransactionReceiptFormatter<TChain>>
 
 /**
- * Returns the [Transaction Receipt](https://viem.sh/docs/glossary/terms#transaction-receipt) given a [Transaction](https://viem.sh/docs/glossary/terms#transaction) hash.
+ * Returns the [Transaction Receipt](https://viem.sh/docs/glossary/terms.html#transaction-receipt) given a [Transaction](https://viem.sh/docs/glossary/terms.html#transaction) hash.
  *
  * - Docs: https://viem.sh/docs/actions/public/getTransactionReceipt.html
  * - Example: https://stackblitz.com/github/wagmi-dev/viem/tree/main/examples/transactions/fetching-transactions

package/src/actions/public/multicall.ts

@@ -41,7 +41,7 @@ export type MulticallReturnType<
 > = MulticallResults<TContracts, TAllowFailure>
 
 /**
- * Similar to [`readContract`](https://viem.sh/docs/contract/readContract), but batches up multiple functions on a contract in a single RPC call via the [`multicall3` contract](https://github.com/mds1/multicall).
+ * Similar to [`readContract`](https://viem.sh/docs/contract/readContract.html), but batches up multiple functions on a contract in a single RPC call via the [`multicall3` contract](https://github.com/mds1/multicall).
  *
  * - Docs: https://viem.sh/docs/contract/multicall.html
  *

package/src/actions/public/readContract.ts

@@ -23,7 +23,7 @@ import { type CallParameters, call } from './call.js'
 export type ReadContractParameters<
   TAbi extends Abi | readonly unknown[] = Abi,
   TFunctionName extends string = string,
-> = Pick<CallParameters, 'blockNumber' | 'blockTag'> &
+> = Pick<CallParameters, 'account' | 'blockNumber' | 'blockTag'> &
   ContractFunctionConfig<TAbi, TFunctionName, 'view' | 'pure'>
 
 export type ReadContractReturnType<
@@ -39,7 +39,7 @@ export type ReadContractReturnType<
  *
  * A "read-only" function (constant function) on a Solidity contract is denoted by a `view` or `pure` keyword. They can only read the state of the contract, and cannot make any changes to it. Since read-only methods do not change the state of the contract, they do not require any gas to be executed, and can be called by any user without the need to pay for gas.
  *
- * Internally, uses a [Public Client](https://viem.sh/docs/clients/public) to call the [`call` action](https://viem.sh/docs/actions/public/call) with [ABI-encoded `data`](https://viem.sh/docs/contract/encodeFunctionData).
+ * Internally, uses a [Public Client](https://viem.sh/docs/clients/public.html) to call the [`call` action](https://viem.sh/docs/actions/public/call.html) with [ABI-encoded `data`](https://viem.sh/docs/contract/encodeFunctionData.html).
  *
  * @param client - Client to use
  * @param parameters - {@link ReadContractParameters}

package/src/actions/public/simulateContract.ts

@@ -68,9 +68,9 @@ export type SimulateContractReturnType<
  * - Docs: https://viem.sh/docs/contract/simulateContract.html
  * - Examples: https://stackblitz.com/github/wagmi-dev/viem/tree/main/examples/contracts/writing-to-contracts
  *
- * This function does not require gas to execute and _**does not**_ change the state of the blockchain. It is almost identical to [`readContract`](https://viem.sh/docs/contract/readContract), but also supports contract write functions.
+ * This function does not require gas to execute and _**does not**_ change the state of the blockchain. It is almost identical to [`readContract`](https://viem.sh/docs/contract/readContract.html), but also supports contract write functions.
  *
- * Internally, uses a [Public Client](https://viem.sh/docs/clients/public) to call the [`call` action](https://viem.sh/docs/actions/public/call) with [ABI-encoded `data`](https://viem.sh/docs/contract/encodeFunctionData).
+ * Internally, uses a [Public Client](https://viem.sh/docs/clients/public.html) to call the [`call` action](https://viem.sh/docs/actions/public/call.html) with [ABI-encoded `data`](https://viem.sh/docs/contract/encodeFunctionData.html).
  *
  * @param client - Client to use
  * @param parameters - {@link SimulateContractParameters}

package/src/actions/public/uninstallFilter.ts

@@ -15,9 +15,9 @@ export type UninstallFilterReturnType = boolean
  * - JSON-RPC Methods: [`eth_uninstallFilter`](https://ethereum.org/en/developers/docs/apis/json-rpc/#eth_uninstallFilter)
  *
  * Destroys a Filter that was created from one of the following Actions:
- * - [`createBlockFilter`](https://viem.sh/docs/actions/public/createBlockFilter)
- * - [`createEventFilter`](https://viem.sh/docs/actions/public/createEventFilter)
- * - [`createPendingTransactionFilter`](https://viem.sh/docs/actions/public/createPendingTransactionFilter)
+ * - [`createBlockFilter`](https://viem.sh/docs/actions/public/createBlockFilter.html)
+ * - [`createEventFilter`](https://viem.sh/docs/actions/public/createEventFilter.html)
+ * - [`createPendingTransactionFilter`](https://viem.sh/docs/actions/public/createPendingTransactionFilter.html)
  *
  * @param client - Client to use
  * @param parameters - {@link UninstallFilterParameters}

package/src/actions/public/verifyMessage.ts

@@ -1,7 +1,7 @@
 import type { Chain } from '../../chains.js'
 import type { PublicClient } from '../../clients/createPublicClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
-import type { ByteArray, Hex } from '../../types/misc.js'
+import type { ByteArray, Hex, SignableMessage } from '../../types/misc.js'
 import { hashMessage } from '../../utils/index.js'
 import { type VerifyHashParameters, verifyHash } from './verifyHash.js'
 import type { Address } from 'abitype'
@@ -10,7 +10,7 @@ export type VerifyMessageParameters = Omit<VerifyHashParameters, 'hash'> & {
   /** The address that signed the original message. */
   address: Address
   /** The message to be verified. */
-  message: string
+  message: SignableMessage
   /** The signature that was generated by signing the message with the address's private key. */
   signature: Hex | ByteArray
 }

package/src/actions/public/verifyTypedData.ts

@@ -3,13 +3,16 @@ import type { PublicClient } from '../../clients/createPublicClient.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 {
+  type HashTypedDataParameters,
+  hashTypedData,
+} from '../../utils/index.js'
 import { type VerifyHashParameters, verifyHash } from './verifyHash.js'
 import type { Address, TypedData } from 'abitype'
 
 export type VerifyTypedDataParameters<
-  TTypedData extends TypedData | { [key: string]: unknown } = TypedData,
-  TPrimaryType extends string = string,
+  TTypedData extends TypedData | Record<string, unknown> = TypedData,
+  TPrimaryType extends keyof TTypedData = keyof TTypedData,
 > = Omit<VerifyHashParameters, 'hash'> &
   TypedDataDefinition<TTypedData, TPrimaryType> & {
     /** The address to verify the typed data for. */
@@ -29,7 +32,11 @@ export type VerifyTypedDataReturnType = boolean
  * @param parameters - {@link VerifyTypedDataParameters}
  * @returns Whether or not the signature is valid. {@link VerifyTypedDataReturnType}
  */
-export async function verifyTypedData<TChain extends Chain | undefined,>(
+export async function verifyTypedData<
+  const TTypedData extends TypedData | Record<string, unknown>, // `Record<string, unknown>` allows for non-const asserted types
+  TPrimaryType extends keyof TTypedData,
+  TChain extends Chain | undefined,
+>(
   client: PublicClient<Transport, TChain>,
   {
     address,
@@ -39,9 +46,14 @@ export async function verifyTypedData<TChain extends Chain | undefined,>(
     types,
     domain,
     ...callRequest
-  }: VerifyTypedDataParameters,
+  }: VerifyTypedDataParameters<TTypedData, TPrimaryType>,
 ): Promise<VerifyTypedDataReturnType> {
-  const hash = hashTypedData({ message, primaryType, types, domain })
+  const hash = hashTypedData({
+    message,
+    primaryType,
+    types,
+    domain,
+  } as HashTypedDataParameters)
   return verifyHash(client, {
     address,
     hash,

package/src/actions/public/watchContractEvent.ts

@@ -26,17 +26,20 @@ import { uninstallFilter } from './uninstallFilter.js'
 export type OnLogsParameter<
   TAbi extends Abi | readonly unknown[] = readonly unknown[],
   TEventName extends string = string,
+  TStrict extends boolean | undefined = undefined,
 > = TAbi extends Abi
-  ? Log<bigint, number, ExtractAbiEvent<TAbi, TEventName>>[]
+  ? Log<bigint, number, ExtractAbiEvent<TAbi, TEventName>, TStrict>[]
   : Log[]
 export type OnLogsFn<
   TAbi extends Abi | readonly unknown[] = readonly unknown[],
   TEventName extends string = string,
-> = (logs: OnLogsParameter<TAbi, TEventName>) => void
+  TStrict extends boolean | undefined = undefined,
+> = (logs: OnLogsParameter<TAbi, TEventName, TStrict>) => void
 
 export type WatchContractEventParameters<
   TAbi extends Abi | readonly unknown[] = readonly unknown[],
   TEventName extends string = string,
+  TStrict extends boolean | undefined = undefined,
 > = {
   /** The address of the contract. */
   address?: Address | Address[]
@@ -50,9 +53,14 @@ export type WatchContractEventParameters<
   /** The callback to call when an error occurred when trying to get for a new block. */
   onError?: (error: Error) => void
   /** The callback to call when new event logs are received. */
-  onLogs: OnLogsFn<TAbi, TEventName>
+  onLogs: OnLogsFn<TAbi, TEventName, TStrict>
   /** Polling frequency (in ms). Defaults to Client's pollingInterval config. */
   pollingInterval?: number
+  /**
+   * Whether or not the logs must match the indexed/non-indexed arguments on `event`.
+   * @default false
+   */
+  strict?: TStrict
 }
 
 export type WatchContractEventReturnType = () => void
@@ -64,7 +72,7 @@ export type WatchContractEventReturnType = () => void
  *
  * This Action will batch up all the event logs found within the [`pollingInterval`](https://viem.sh/docs/contract/watchContractEvent.html#pollinginterval-optional), and invoke them via [`onLogs`](https://viem.sh/docs/contract/watchContractEvent.html#onLogs).
  *
- * `watchContractEvent` will attempt to create an [Event Filter](https://viem.sh/docs/contract/createContractEventFilter) and listen to changes to the Filter per polling interval, however, if the RPC Provider does not support Filters (e.g. `eth_newFilter`), then `watchContractEvent` will fall back to using [`getLogs`](https://viem.sh/docs/actions/public/getLogs) instead.
+ * `watchContractEvent` will attempt to create an [Event Filter](https://viem.sh/docs/contract/createContractEventFilter.html) and listen to changes to the Filter per polling interval, however, if the RPC Provider does not support Filters (e.g. `eth_newFilter`), then `watchContractEvent` will fall back to using [`getLogs`](https://viem.sh/docs/actions/public/getLogs) instead.
  *
  * @param client - Client to use
  * @param parameters - {@link WatchContractEventParameters}
@@ -91,6 +99,7 @@ export function watchContractEvent<
   TChain extends Chain | undefined,
   TAbi extends Abi | readonly unknown[],
   TEventName extends string,
+  TStrict extends boolean | undefined = undefined,
 >(
   client: PublicClient<Transport, TChain>,
   {
@@ -102,7 +111,8 @@ export function watchContractEvent<
     onError,
     onLogs,
     pollingInterval = client.pollingInterval,
-  }: WatchContractEventParameters<TAbi, TEventName>,
+    strict: strict_,
+  }: WatchContractEventParameters<TAbi, TEventName, TStrict>,
 ): WatchContractEventReturnType {
   const observerId = stringify([
     'watchContractEvent',
@@ -113,6 +123,7 @@ export function watchContractEvent<
     eventName,
     pollingInterval,
   ])
+  const strict = strict_ ?? false
 
   return observe(observerId, { onLogs, onError }, (emit) => {
     let previousBlockNumber: bigint
@@ -128,6 +139,7 @@ export function watchContractEvent<
               address,
               args,
               eventName,
+              strict,
             } as unknown as CreateContractEventFilterParameters)) as Filter<
               'event',
               TAbi,