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

package/src/actions/wallet/sendTransaction.ts

@@ -147,8 +147,8 @@ export async function sendTransaction<
 
       if (!chainId) chainId = await getChainId(client)
       const signedRequest = (await account.signTransaction({
-        chainId,
         ...request,
+        chainId,
       } as TransactionSerializable)) as Hash
       return await client.request({
         method: 'eth_sendRawTransaction',

package/src/actions/wallet/signMessage.ts

@@ -5,13 +5,13 @@ import type { Transport } from '../../clients/transports/createTransport.js'
 import { AccountNotFoundError } from '../../errors/account.js'
 import type { GetAccountParameter } from '../../types/account.js'
 import type { Chain } from '../../types/chain.js'
-import type { Hex } from '../../types/misc.js'
-import { toHex } from '../../utils/encoding/toHex.js'
+import type { Hex, SignableMessage } from '../../types/misc.js'
+import { stringToHex, toHex } from '../../utils/encoding/toHex.js'
 
 export type SignMessageParameters<
   TAccount extends Account | undefined = Account | undefined,
 > = GetAccountParameter<TAccount> & {
-  message: string
+  message: SignableMessage
 }
 
 export type SignMessageReturnType = Hex
@@ -78,8 +78,15 @@ export async function signMessage<
     })
   const account = parseAccount(account_)
   if (account.type === 'local') return account.signMessage({ message })
+
+  const message_ = (() => {
+    if (typeof message === 'string') return stringToHex(message)
+    if (message.raw instanceof Uint8Array) return toHex(message.raw)
+    return message.raw
+  })()
+
   return client.request({
     method: 'personal_sign',
-    params: [toHex(message), account.address],
+    params: [message_, account.address],
   })
 }

package/src/actions/wallet/signTypedData.ts

@@ -14,8 +14,8 @@ import { stringify } from '../../utils/stringify.js'
 import { validateTypedData } from '../../utils/typedData.js'
 
 export type SignTypedDataParameters<
-  TTypedData extends TypedData | { [key: string]: unknown } = TypedData,
-  TPrimaryType extends string = string,
+  TTypedData extends TypedData | Record<string, unknown> = TypedData,
+  TPrimaryType extends keyof TTypedData = keyof TTypedData,
   TAccount extends Account | undefined = undefined,
 > = GetAccountParameter<TAccount> &
   TypedDataDefinition<TTypedData, TPrimaryType>
@@ -23,7 +23,7 @@ export type SignTypedDataParameters<
 export type SignTypedDataReturnType = Hex
 
 /**
- * Signs typed data and calculates an Ethereum-specific signature in [EIP-191 format](https://eips.ethereum.org/EIPS/eip-191): `keccak256("\x19Ethereum Signed Message:\n" + len(message) + message))`.
+ * Signs typed data and calculates an Ethereum-specific signature in [https://eips.ethereum.org/EIPS/eip-712](https://eips.ethereum.org/EIPS/eip-712): `sign(keccak256("\x19\x01" ‖ domainSeparator ‖ hashStruct(message)))`
  *
  * - Docs: https://viem.sh/docs/actions/wallet/signTypedData.html
  * - JSON-RPC Methods:
@@ -121,8 +121,8 @@ export type SignTypedDataReturnType = Hex
  * })
  */
 export async function signTypedData<
-  TTypedData extends TypedData | { [key: string]: unknown },
-  TPrimaryType extends string,
+  const TTypedData extends TypedData | Record<string, unknown>, // `Record<string, unknown>` allows for non-const asserted types
+  TPrimaryType extends keyof TTypedData,
   TChain extends Chain | undefined,
   TAccount extends Account | undefined,
 >(

package/src/chains.ts

@@ -11,7 +11,7 @@ import { defineTransactionReceipt } from './utils/formatters/transactionReceipt.
 import { defineTransactionRequest } from './utils/formatters/transactionRequest.js'
 
 const celoFormatters = {
-  block: defineBlock({
+  block: /*#__PURE__*/ defineBlock({
     exclude: ['difficulty', 'gasLimit', 'mixHash', 'nonce', 'uncles'],
     format: (block) => ({
       randomness: block.randomness as {
@@ -20,7 +20,7 @@ const celoFormatters = {
       },
     }),
   }),
-  transaction: defineTransaction({
+  transaction: /*#__PURE__*/ defineTransaction({
     format: (transaction) => ({
       feeCurrency: transaction.feeCurrency as Address | null,
       gatewayFee: transaction.gatewayFee
@@ -29,7 +29,7 @@ const celoFormatters = {
       gatewayFeeRecipient: transaction.gatewayFeeRecipient as Address | null,
     }),
   }),
-  transactionReceipt: defineTransactionReceipt({
+  transactionReceipt: /*#__PURE__*/ defineTransactionReceipt({
     format: (transaction) => ({
       feeCurrency: transaction.feeCurrency as Address | null,
       gatewayFee: transaction.gatewayFee
@@ -38,7 +38,7 @@ const celoFormatters = {
       gatewayFeeRecipient: transaction.gatewayFeeRecipient as Address | null,
     }),
   }),
-  transactionRequest: defineTransactionRequest({
+  transactionRequest: /*#__PURE__*/ defineTransactionRequest({
     format: (transactionRequest) => ({
       feeCurrency: transactionRequest.feeCurrency as Address | undefined,
       gatewayFee: transactionRequest.gatewayFee as Quantity | undefined,
@@ -48,95 +48,130 @@ const celoFormatters = {
     }),
   }),
 }
-
-export const arbitrum = defineChain(chains.arbitrum)
-export const arbitrumGoerli = defineChain(chains.arbitrumGoerli)
-export const aurora = defineChain(chains.aurora)
-export const auroraTestnet = defineChain(chains.auroraTestnet)
-export const avalanche = defineChain(chains.avalanche)
-export const avalancheFuji = defineChain(chains.avalancheFuji)
-export const baseGoerli = defineChain(chains.baseGoerli)
-export const boba = defineChain(chains.boba)
-export const bronos = defineChain(chains.bronos)
-export const bronosTestnet = defineChain(chains.bronosTestnet)
-export const bsc = defineChain(chains.bsc)
-export const bscTestnet = defineChain(chains.bscTestnet)
-export const canto = defineChain(chains.canto)
-export const celo = defineChain({
+export const arbitrum = /*#__PURE__*/ defineChain(chains.arbitrum)
+export const arbitrumGoerli = /*#__PURE__*/ defineChain(chains.arbitrumGoerli)
+export const aurora = /*#__PURE__*/ defineChain(chains.aurora)
+export const auroraTestnet = /*#__PURE__*/ defineChain(chains.auroraTestnet)
+export const avalanche = /*#__PURE__*/ defineChain(chains.avalanche)
+export const avalancheFuji = /*#__PURE__*/ defineChain(chains.avalancheFuji)
+export const baseGoerli = /*#__PURE__*/ defineChain(chains.baseGoerli)
+export const boba = /*#__PURE__*/ defineChain(chains.boba)
+export const bronos = /*#__PURE__*/ defineChain(chains.bronos)
+export const bronosTestnet = /*#__PURE__*/ defineChain(chains.bronosTestnet)
+export const bsc = /*#__PURE__*/ defineChain(chains.bsc)
+export const bscTestnet = /*#__PURE__*/ defineChain(chains.bscTestnet)
+export const canto = /*#__PURE__*/ defineChain(chains.canto)
+export const celo = /*#__PURE__*/ defineChain({
   ...chains.celo,
   formatters: celoFormatters,
 })
-export const celoAlfajores = defineChain({
+export const celoAlfajores = /*#__PURE__*/ defineChain({
   ...chains.celoAlfajores,
   formatters: celoFormatters,
 })
-export const cronos = defineChain(chains.cronos)
-export const crossbell = defineChain(chains.crossbell)
-export const dfk = defineChain(chains.dfk)
-export const dogechain = defineChain(chains.dogechain)
-export const evmos = defineChain(chains.evmos)
-export const evmosTestnet = defineChain(chains.evmosTestnet)
-export const fantom = defineChain(chains.fantom)
-export const fantomTestnet = defineChain(chains.fantomTestnet)
-export const filecoin = defineChain(chains.filecoin)
-export const filecoinCalibration = defineChain(chains.filecoinCalibration)
-export const filecoinHyperspace = defineChain(chains.filecoinHyperspace)
-export const flare = defineChain(chains.flare)
-export const flareTestnet = defineChain(chains.flareTestnet)
-export const foundry = defineChain(chains.foundry)
-export const iotex = defineChain(chains.iotex)
-export const iotexTestnet = defineChain(chains.iotexTestnet)
-export const goerli = defineChain(chains.goerli)
-export const gnosis = defineChain(chains.gnosis)
-export const gnosisChiado = defineChain(chains.gnosisChiado)
-export const hardhat = defineChain(chains.hardhat)
-export const harmonyOne = defineChain(chains.harmonyOne)
-export const klaytn = defineChain(chains.klaytn)
-export const localhost = defineChain(chains.localhost)
-export const mainnet = defineChain(chains.mainnet)
-export const metis = defineChain(chains.metis)
-export const metisGoerli = defineChain(chains.metisGoerli)
-export const moonbaseAlpha = defineChain(chains.moonbaseAlpha)
-export const moonbeam = defineChain(chains.moonbeam)
-export const moonriver = defineChain(chains.moonriver)
-export const nexi = defineChain(chains.nexi)
-export const okc = defineChain(chains.okc)
-export const optimism = defineChain(chains.optimism)
-export const optimismGoerli = defineChain(chains.optimismGoerli)
-export const polygon = defineChain(chains.polygon)
-export const polygonMumbai = defineChain(chains.polygonMumbai)
-export const polygonZkEvm = defineChain(chains.polygonZkEvm)
-export const polygonZkEvmTestnet = defineChain(chains.polygonZkEvmTestnet)
-export const scrollTestnet = defineChain(chains.scrollTestnet)
-export const sepolia = defineChain(chains.sepolia)
-export const skaleBlockBrawlers = defineChain(chains.skaleBlockBrawlers)
-export const skaleCalypso = defineChain(chains.skaleCalypso)
-export const skaleCalypsoTestnet = defineChain(chains.skaleCalypsoTestnet)
-export const skaleChaosTestnet = defineChain(chains.skaleChaosTestnet)
-export const skaleCryptoBlades = defineChain(chains.skaleCryptoBlades)
-export const skaleCryptoColosseum = defineChain(chains.skaleCryptoColosseum)
-export const skaleEuropa = defineChain(chains.skaleEuropa)
-export const skaleEuropaTestnet = defineChain(chains.skaleEuropaTestnet)
-export const skaleExorde = defineChain(chains.skaleExorde)
-export const skaleHumanProtocol = defineChain(chains.skaleHumanProtocol)
-export const skaleNebula = defineChain(chains.skaleNebula)
-export const skaleNebulaTestnet = defineChain(chains.skaleNebulaTestnet)
-export const skaleRazor = defineChain(chains.skaleRazor)
-export const skaleTitan = defineChain(chains.skaleTitan)
-export const skaleTitanTestnet = defineChain(chains.skaleTitanTestnet)
-export const songbird = defineChain(chains.songbird)
-export const songbirdTestnet = defineChain(chains.songbirdTestnet)
-export const shardeumSphinx = defineChain(chains.shardeumSphinx)
-export const taraxa = defineChain(chains.taraxa)
-export const taraxaTestnet = defineChain(chains.taraxaTestnet)
-export const telos = defineChain(chains.telos)
-export const telosTestnet = defineChain(chains.telosTestnet)
-export const wanchain = defineChain(chains.wanchain)
-export const wanchainTestnet = defineChain(chains.wanchainTestnet)
-export const xdc = defineChain(chains.xdc)
-export const xdcTestnet = defineChain(chains.xdcTestnet)
-export const zhejiang = defineChain(chains.zhejiang)
-export const zkSync = defineChain(chains.zkSync)
-export const zkSyncTestnet = defineChain(chains.zkSyncTestnet)
+export const celoCannoli = /*#__PURE__*/ defineChain({
+  ...chains.celoCannoli,
+  formatters: celoFormatters,
+})
+export const cronos = /*#__PURE__*/ defineChain(chains.cronos)
+export const crossbell = /*#__PURE__*/ defineChain(chains.crossbell)
+export const dfk = /*#__PURE__*/ defineChain(chains.dfk)
+export const dogechain = /*#__PURE__*/ defineChain(chains.dogechain)
+export const evmos = /*#__PURE__*/ defineChain(chains.evmos)
+export const evmosTestnet = /*#__PURE__*/ defineChain(chains.evmosTestnet)
+export const fantom = /*#__PURE__*/ defineChain(chains.fantom)
+export const fantomTestnet = /*#__PURE__*/ defineChain(chains.fantomTestnet)
+export const filecoin = /*#__PURE__*/ defineChain(chains.filecoin)
+export const filecoinCalibration = /*#__PURE__*/ defineChain(
+  chains.filecoinCalibration,
+)
+export const filecoinHyperspace = /*#__PURE__*/ defineChain(
+  chains.filecoinHyperspace,
+)
+export const flare = /*#__PURE__*/ defineChain(chains.flare)
+export const flareTestnet = /*#__PURE__*/ defineChain(chains.flareTestnet)
+export const foundry = /*#__PURE__*/ defineChain(chains.foundry)
+export const iotex = /*#__PURE__*/ defineChain(chains.iotex)
+export const iotexTestnet = /*#__PURE__*/ defineChain(chains.iotexTestnet)
+export const goerli = /*#__PURE__*/ defineChain(chains.goerli)
+export const gnosis = /*#__PURE__*/ defineChain(chains.gnosis)
+export const gnosisChiado = /*#__PURE__*/ defineChain(chains.gnosisChiado)
+export const haqqMainnet = /*#__PURE__*/ defineChain(chains.haqqMainnet)
+export const haqqTestedge2 = /*#__PURE__*/ defineChain(chains.haqqTestedge2)
+export const hardhat = /*#__PURE__*/ defineChain(chains.hardhat)
+export const harmonyOne = /*#__PURE__*/ defineChain(chains.harmonyOne)
+export const klaytn = /*#__PURE__*/ defineChain(chains.klaytn)
+export const lineaTestnet = /*#__PURE__*/ defineChain(chains.lineaTestnet)
+export const localhost = /*#__PURE__*/ defineChain(chains.localhost)
+export const mainnet = /*#__PURE__*/ defineChain(chains.mainnet)
+export const metis = /*#__PURE__*/ defineChain(chains.metis)
+export const metisGoerli = /*#__PURE__*/ defineChain(chains.metisGoerli)
+export const moonbaseAlpha = /*#__PURE__*/ defineChain(chains.moonbaseAlpha)
+export const moonbeam = /*#__PURE__*/ defineChain(chains.moonbeam)
+export const moonriver = /*#__PURE__*/ defineChain(chains.moonriver)
+export const nexi = /*#__PURE__*/ defineChain(chains.nexi)
+export const okc = /*#__PURE__*/ defineChain(chains.okc)
+export const optimism = /*#__PURE__*/ defineChain(chains.optimism)
+export const optimismGoerli = /*#__PURE__*/ defineChain(chains.optimismGoerli)
+export const polygon = /*#__PURE__*/ defineChain(chains.polygon)
+export const polygonMumbai = /*#__PURE__*/ defineChain(chains.polygonMumbai)
+export const polygonZkEvm = /*#__PURE__*/ defineChain(chains.polygonZkEvm)
+export const polygonZkEvmTestnet = /*#__PURE__*/ defineChain(
+  chains.polygonZkEvmTestnet,
+)
+export const pulsechain = /*#__PURE__*/ defineChain(chains.pulsechain)
+export const pulsechainV4 = /*#__PURE__*/ defineChain(chains.pulsechainV4)
+export const scrollTestnet = /*#__PURE__*/ defineChain(chains.scrollTestnet)
+export const sepolia = /*#__PURE__*/ defineChain(chains.sepolia)
+export const skaleBlockBrawlers = /*#__PURE__*/ defineChain(
+  chains.skaleBlockBrawlers,
+)
+export const skaleCalypso = /*#__PURE__*/ defineChain(chains.skaleCalypso)
+export const skaleCalypsoTestnet = /*#__PURE__*/ defineChain(
+  chains.skaleCalypsoTestnet,
+)
+export const skaleChaosTestnet = /*#__PURE__*/ defineChain(
+  chains.skaleChaosTestnet,
+)
+export const skaleCryptoBlades = /*#__PURE__*/ defineChain(
+  chains.skaleCryptoBlades,
+)
+export const skaleCryptoColosseum = /*#__PURE__*/ defineChain(
+  chains.skaleCryptoColosseum,
+)
+export const skaleEuropa = /*#__PURE__*/ defineChain(chains.skaleEuropa)
+export const skaleEuropaTestnet = /*#__PURE__*/ defineChain(
+  chains.skaleEuropaTestnet,
+)
+export const skaleExorde = /*#__PURE__*/ defineChain(chains.skaleExorde)
+export const skaleHumanProtocol = /*#__PURE__*/ defineChain(
+  chains.skaleHumanProtocol,
+)
+export const skaleNebula = /*#__PURE__*/ defineChain(chains.skaleNebula)
+export const skaleNebulaTestnet = /*#__PURE__*/ defineChain(
+  chains.skaleNebulaTestnet,
+)
+export const skaleRazor = /*#__PURE__*/ defineChain(chains.skaleRazor)
+export const skaleTitan = /*#__PURE__*/ defineChain(chains.skaleTitan)
+export const skaleTitanTestnet = /*#__PURE__*/ defineChain(
+  chains.skaleTitanTestnet,
+)
+export const songbird = /*#__PURE__*/ defineChain(chains.songbird)
+export const songbirdTestnet = /*#__PURE__*/ defineChain(chains.songbirdTestnet)
+export const shardeumSphinx = /*#__PURE__*/ defineChain(chains.shardeumSphinx)
+export const syscoin = /*#__PURE__*/ defineChain(chains.syscoin)
+export const taraxa = /*#__PURE__*/ defineChain(chains.taraxa)
+export const taraxaTestnet = /*#__PURE__*/ defineChain(chains.taraxaTestnet)
+export const telos = /*#__PURE__*/ defineChain(chains.telos)
+export const telosTestnet = /*#__PURE__*/ defineChain(chains.telosTestnet)
+export const thunderTestnet = /*#__PURE__*/ defineChain(chains.thunderTestnet)
+export const wanchain = /*#__PURE__*/ defineChain(chains.wanchain)
+export const wanchainTestnet = /*#__PURE__*/ defineChain(chains.wanchainTestnet)
+export const xdc = /*#__PURE__*/ defineChain(chains.xdc)
+export const xdcTestnet = /*#__PURE__*/ defineChain(chains.xdcTestnet)
+export const zhejiang = /*#__PURE__*/ defineChain(chains.zhejiang)
+export const zkSync = /*#__PURE__*/ defineChain(chains.zkSync)
+export const zkSyncTestnet = /*#__PURE__*/ defineChain(chains.zkSyncTestnet)
+export const zoraTestnet = /*#__PURE__*/ defineChain(chains.zoraTestnet)
 
 export type { Chain } from './types/chain.js'

package/src/clients/createClient.ts

@@ -1,11 +1,11 @@
 import type { Chain } from '../types/chain.js'
-import type { Requests } from '../types/eip1193.js'
-import { uid } from '../utils/uid.js'
-
 import type {
-  BaseRpcRequests,
-  Transport,
-} from './transports/createTransport.js'
+  EIP1193RequestFn,
+  EIP1474Methods,
+  RpcSchema,
+} from '../types/eip1193.js'
+import { uid } from '../utils/uid.js'
+import type { Transport } from './transports/createTransport.js'
 
 export type ClientConfig<
   TTransport extends Transport = Transport,
@@ -30,7 +30,7 @@ export type ClientConfig<
 
 export type Client<
   TTransport extends Transport = Transport,
-  TRequests extends BaseRpcRequests = Requests,
+  TRpcSchema extends RpcSchema | undefined = undefined,
   TChain extends Chain | undefined = Chain | undefined,
 > = {
   /** Chain for the client. */
@@ -42,7 +42,9 @@ export type Client<
   /** Frequency (in ms) for polling enabled actions & events. Defaults to 4_000 milliseconds. */
   pollingInterval: number
   /** Request function wrapped with friendly error handling */
-  request: TRequests['request']
+  request: TRpcSchema extends undefined
+    ? EIP1193RequestFn<EIP1474Methods>
+    : EIP1193RequestFn<TRpcSchema>
   /** The RPC transport */
   transport: ReturnType<TTransport>['config'] & ReturnType<TTransport>['value']
   /** The type of client. */
@@ -56,7 +58,7 @@ export type Client<
  */
 export function createClient<
   TTransport extends Transport,
-  TRequests extends BaseRpcRequests,
+  TRpcSchema extends RpcSchema | undefined = undefined,
   TChain extends Chain | undefined = undefined,
 >({
   chain,
@@ -65,14 +67,14 @@ export function createClient<
   pollingInterval = 4_000,
   transport,
   type = 'base',
-}: ClientConfig<TTransport, TChain>): Client<TTransport, TRequests, TChain> {
+}: ClientConfig<TTransport, TChain>): Client<TTransport, TRpcSchema, TChain> {
   const { config, request, value } = transport({ chain, pollingInterval })
   return {
     chain: chain as TChain,
     key,
     name,
     pollingInterval,
-    request,
+    request: request as any,
     transport: { ...config, ...value },
     type,
     uid: uid(),

package/src/clients/createPublicClient.ts

@@ -1,7 +1,6 @@
 import type { Chain } from '../types/chain.js'
-import type { PublicRequests } from '../types/eip1193.js'
+import type { PublicRpcSchema } from '../types/eip1193.js'
 import type { Prettify } from '../types/utils.js'
-
 import { type Client, type ClientConfig, createClient } from './createClient.js'
 import { type PublicActions, publicActions } from './decorators/public.js'
 import type { Transport } from './transports/createTransport.js'
@@ -9,7 +8,7 @@ import type { Transport } from './transports/createTransport.js'
 export type MulticallBatchOptions = {
   /** The maximum size (in bytes) for each calldata chunk. @default 1_024 */
   batchSize?: number
-  /** The maximum number of milliseconds to wait before sending a batch. @default 16 */
+  /** The maximum number of milliseconds to wait before sending a batch. @default 0 */
   wait?: number
 }
 
@@ -32,7 +31,7 @@ export type PublicClient<
   TChain extends Chain | undefined = Chain | undefined,
   TIncludeActions extends boolean = true,
 > = Prettify<
-  Client<TTransport, PublicRequests, TChain> &
+  Client<TTransport, PublicRpcSchema, TChain> &
     Pick<PublicClientConfig, 'batch'> &
     (TIncludeActions extends true ? PublicActions<TTransport, TChain> : unknown)
 >

package/src/clients/createTestClient.ts

@@ -1,6 +1,5 @@
 import type { Chain } from '../types/chain.js'
-import type { TestRequests } from '../types/eip1193.js'
-
+import type { TestRpcSchema } from '../types/eip1193.js'
 import { type Client, type ClientConfig, createClient } from './createClient.js'
 import { type TestActions, testActions } from './decorators/test.js'
 import type { Transport } from './transports/createTransport.js'
@@ -24,7 +23,7 @@ export type TestClient<
   TTransport extends Transport = Transport,
   TChain extends Chain | undefined = Chain | undefined,
   TIncludeActions extends boolean = true,
-> = Client<TTransport, TestRequests<TMode>, TChain> &
+> = Client<TTransport, TestRpcSchema<TMode>, TChain> &
   (TIncludeActions extends true ? TestActions : unknown) & {
     mode: TMode
   }

package/src/clients/createWalletClient.ts

@@ -3,9 +3,8 @@ import type { Address } from 'abitype'
 import type { Account, JsonRpcAccount } from '../accounts/types.js'
 import { parseAccount } from '../accounts/utils/parseAccount.js'
 import type { Chain } from '../types/chain.js'
-import type { Requests } from '../types/eip1193.js'
+import type { WalletRpcSchema } from '../types/eip1193.js'
 import type { Prettify } from '../types/utils.js'
-
 import { type Client, type ClientConfig, createClient } from './createClient.js'
 import { type WalletActions, walletActions } from './decorators/wallet.js'
 import type { Transport } from './transports/createTransport.js'
@@ -31,7 +30,7 @@ export type WalletClient<
   TAccount extends Account | undefined = Account | undefined,
   TIncludeActions extends boolean = true,
 > = Prettify<
-  Client<TTransport, Requests, TChain> &
+  Client<TTransport, WalletRpcSchema, TChain> &
     (TIncludeActions extends true
       ? WalletActions<TChain, TAccount>
       : unknown) & {

package/src/clients/decorators/public.ts

@@ -199,6 +199,7 @@ import {
 import type { Chain } from '../../types/chain.js'
 import type {
   ContractFunctionConfig,
+  MaybeAbiEventName,
   MaybeExtractEventArgsFromAbi,
 } from '../../types/contract.js'
 import type { FilterType } from '../../types/filter.js'
@@ -277,9 +278,12 @@ export type PublicActions<
     TAbi extends Abi | readonly unknown[],
     TEventName extends string | undefined,
     TArgs extends MaybeExtractEventArgsFromAbi<TAbi, TEventName> | undefined,
+    TStrict extends boolean | undefined = undefined,
   >(
-    args: CreateContractEventFilterParameters<TAbi, TEventName, TArgs>,
-  ) => Promise<CreateContractEventFilterReturnType<TAbi, TEventName, TArgs>>
+    args: CreateContractEventFilterParameters<TAbi, TEventName, TArgs, TStrict>,
+  ) => Promise<
+    CreateContractEventFilterReturnType<TAbi, TEventName, TArgs, TStrict>
+  >
   /**
    * Creates a [`Filter`](https://viem.sh/docs/glossary/types.html#filter) to listen for new events that can be used with [`getFilterChanges`](https://viem.sh/docs/actions/public/getFilterChanges.html).
    *
@@ -303,12 +307,23 @@ export type PublicActions<
    */
   createEventFilter: <
     TAbiEvent extends AbiEvent | undefined,
-    TAbi extends Abi | readonly unknown[],
-    TEventName extends string | undefined,
-    TArgs extends MaybeExtractEventArgsFromAbi<TAbi, TEventName> | undefined,
+    TStrict extends boolean | undefined = undefined,
+    _Abi extends Abi | readonly unknown[] = [TAbiEvent],
+    _EventName extends string | undefined = MaybeAbiEventName<TAbiEvent>,
+    _Args extends
+      | MaybeExtractEventArgsFromAbi<_Abi, _EventName>
+      | undefined = undefined,
   >(
-    args?: CreateEventFilterParameters<TAbiEvent, TAbi, TEventName, TArgs>,
-  ) => Promise<CreateEventFilterReturnType<TAbiEvent, TAbi, TEventName, TArgs>>
+    args?: CreateEventFilterParameters<
+      TAbiEvent,
+      TStrict,
+      _Abi,
+      _EventName,
+      _Args
+    >,
+  ) => Promise<
+    CreateEventFilterReturnType<TAbiEvent, TStrict, _Abi, _EventName, _Args>
+  >
   /**
    * Creates a Filter to listen for new pending transaction hashes that can be used with [`getFilterChanges`](https://viem.sh/docs/actions/public/getFilterChanges.html).
    *
@@ -792,9 +807,12 @@ export type PublicActions<
     TFilterType extends FilterType,
     TAbi extends Abi | readonly unknown[],
     TEventName extends string | undefined,
+    TStrict extends boolean | undefined = undefined,
   >(
-    args: GetFilterChangesParameters<TFilterType, TAbi, TEventName>,
-  ) => Promise<GetFilterChangesReturnType<TFilterType, TAbi, TEventName>>
+    args: GetFilterChangesParameters<TFilterType, TAbi, TEventName, TStrict>,
+  ) => Promise<
+    GetFilterChangesReturnType<TFilterType, TAbi, TEventName, TStrict>
+  >
   /**
    * Returns a list of event logs since the filter was created.
    *
@@ -824,9 +842,10 @@ export type PublicActions<
   getFilterLogs: <
     TAbi extends Abi | readonly unknown[],
     TEventName extends string | undefined,
+    TStrict extends boolean | undefined = undefined,
   >(
-    args: GetFilterLogsParameters<TAbi, TEventName>,
-  ) => Promise<GetFilterLogsReturnType<TAbi, TEventName>>
+    args: GetFilterLogsParameters<TAbi, TEventName, TStrict>,
+  ) => Promise<GetFilterLogsReturnType<TAbi, TEventName, TStrict>>
   /**
    * Returns the current price of gas (in wei).
    *
@@ -866,9 +885,12 @@ export type PublicActions<
    * })
    * const logs = await client.getLogs()
    */
-  getLogs: <TAbiEvent extends AbiEvent | undefined>(
-    args?: GetLogsParameters<TAbiEvent>,
-  ) => Promise<GetLogsReturnType<TAbiEvent>>
+  getLogs: <
+    TAbiEvent extends AbiEvent | undefined,
+    TStrict extends boolean | undefined = undefined,
+  >(
+    args?: GetLogsParameters<TAbiEvent, TStrict>,
+  ) => Promise<GetLogsReturnType<TAbiEvent, TStrict>>
   /**
    * Returns the value from a storage slot at a given address.
    *
@@ -1276,8 +1298,9 @@ export type PublicActions<
   watchContractEvent: <
     TAbi extends Abi | readonly unknown[],
     TEventName extends string,
+    TStrict extends boolean | undefined = undefined,
   >(
-    args: WatchContractEventParameters<TAbi, TEventName>,
+    args: WatchContractEventParameters<TAbi, TEventName, TStrict>,
   ) => WatchContractEventReturnType
   /**
    * Watches and returns emitted [Event Logs](https://viem.sh/docs/glossary/terms.html#event-log).
@@ -1310,8 +1333,11 @@ export type PublicActions<
    *   onLogs: (logs) => console.log(logs),
    * })
    */
-  watchEvent: <TAbiEvent extends AbiEvent | undefined>(
-    args: WatchEventParameters<TAbiEvent>,
+  watchEvent: <
+    TAbiEvent extends AbiEvent | undefined,
+    TStrict extends boolean | undefined = undefined,
+  >(
+    args: WatchEventParameters<TAbiEvent, TStrict>,
   ) => WatchEventReturnType
   /**
    * Watches and returns pending transaction hashes.

package/src/clients/decorators/test.ts

@@ -328,8 +328,8 @@ export type TestActions = {
    *   value: 1000000000000000000n,
    * })
    */
-  sendUnsignedTransaction: (
-    args: SendUnsignedTransactionParameters,
+  sendUnsignedTransaction: <TChain extends Chain | undefined>(
+    args: SendUnsignedTransactionParameters<TChain>,
   ) => Promise<SendUnsignedTransactionReturnType>
   /**
    * Enables or disables the automatic mining of new blocks with each new transaction submitted to the network.
@@ -681,7 +681,8 @@ export function testActions<TChain extends Chain | undefined>(
     removeBlockTimestampInterval: () => removeBlockTimestampInterval(client),
     reset: (args) => reset(client, args),
     revert: (args) => revert(client, args),
-    sendUnsignedTransaction: (args) => sendUnsignedTransaction(client, args),
+    sendUnsignedTransaction: (args) =>
+      sendUnsignedTransaction(client, args as any),
     setAutomine: (args) => setAutomine(client, args),
     setBalance: (args) => setBalance(client, args),
     setBlockGasLimit: (args) => setBlockGasLimit(client, args),

package/src/clients/decorators/wallet.ts

@@ -410,8 +410,8 @@ export type WalletActions<
    * })
    */
   signTypedData: <
-    TTypedData extends TypedData | { [key: string]: unknown },
-    TPrimaryType extends string,
+    const TTypedData extends TypedData | Record<string, unknown>,
+    TPrimaryType extends keyof TTypedData,
   >(
     args: SignTypedDataParameters<TTypedData, TPrimaryType, TAccount>,
   ) => Promise<SignTypedDataReturnType>