viem 0.0.0-w-20230810183250 → 0.0.0-w-20230816150015

package/src/types/multicall.ts

@@ -1,105 +1,114 @@
-import type { Abi } from 'abitype'
+import type { Abi, AbiStateMutability, ExtractAbiFunctionNames } from 'abitype'
 
-import type {
-  ContractFunctionConfig,
-  ContractFunctionResult,
-} from './contract.js'
+import type { ContractParameters, ContractReturnType } from './contract.js'
 
+// Avoid TS depth-limit error in case of large array literal
 type MAXIMUM_DEPTH = 20
 
-type Contract<
-  TAbi extends Abi | readonly unknown[] = Abi | readonly unknown[],
-  TFunctionName extends string = string,
-> = { abi: TAbi; functionName: TFunctionName }
+export type MulticallContract<
+  abi extends Abi | readonly unknown[] = Abi | readonly unknown[],
+  stateMutability extends AbiStateMutability = AbiStateMutability,
+  functionName extends ExtractAbiFunctionNames<
+    abi extends Abi ? abi : Abi,
+    stateMutability
+  > = string,
+> = { abi: abi; functionName: functionName }
 
 export type MulticallContracts<
-  TContracts extends Contract[],
-  TProperties extends Record<string, any> = object,
-  Result extends any[] = [],
-  Depth extends readonly number[] = [],
-> = Depth['length'] extends MAXIMUM_DEPTH
-  ? (ContractFunctionConfig & TProperties)[]
-  : TContracts extends []
+  contracts extends readonly MulticallContract[],
+  properties extends Record<string, any> = object,
+  ///
+  result extends any[] = [],
+  depth extends readonly number[] = [],
+> = depth['length'] extends MAXIMUM_DEPTH
+  ? (ContractParameters & properties)[]
+  : contracts extends []
   ? []
-  : TContracts extends [infer Head extends Contract]
+  : contracts extends [infer head extends MulticallContract]
   ? [
-      ...Result,
-      ContractFunctionConfig<Head['abi'], Head['functionName']> & TProperties,
+      ...result,
+      ContractParameters<head['abi'], 'pure' | 'view', head['functionName']> &
+        properties,
     ]
-  : TContracts extends [
-      infer Head extends Contract,
-      ...infer Tail extends Contract[],
+  : contracts extends [
+      infer head extends MulticallContract,
+      ...infer tail extends readonly MulticallContract[],
     ]
   ? MulticallContracts<
-      [...Tail],
-      TProperties,
+      [...tail],
+      properties,
       [
-        ...Result,
-        ContractFunctionConfig<Head['abi'], Head['functionName']> & TProperties,
+        ...result,
+        ContractParameters<head['abi'], 'pure' | 'view', head['functionName']> &
+          properties,
       ],
-      [...Depth, 1]
+      [...depth, 1]
     >
-  : unknown[] extends TContracts
-  ? TContracts
-  : // If `TContracts` is *some* array but we couldn't assign `unknown[]` to it, then it must hold some known/homogenous type!
+  : unknown[] extends contracts
+  ? contracts
+  : // If `contracts` is *some* array but we couldn't assign `unknown[]` to it, then it must hold some known/homogenous type!
   // use this to infer the param types in the case of Array.map() argument
-  TContracts extends ContractFunctionConfig<infer TAbi, infer TFunctionName>[]
-  ? (ContractFunctionConfig<TAbi, TFunctionName> & TProperties)[]
-  : (ContractFunctionConfig & TProperties)[]
-
-export type MulticallResult<
-  Result,
-  TAllowFailure extends boolean = true,
-> = TAllowFailure extends true
-  ?
-      | {
-          error?: undefined
-          result: Result
-          status: 'success'
-        }
-      | {
-          error: Error
-          result?: undefined
-          status: 'failure'
-        }
-  : Result
+  contracts extends ContractParameters<infer abi, infer _, infer functionName>[]
+  ? (ContractParameters<abi, 'pure' | 'view', functionName> & properties)[]
+  : // Fallback
+    (ContractParameters & properties)[]
 
 export type MulticallResults<
-  TContracts extends Contract[],
-  TAllowFailure extends boolean = true,
-  Result extends any[] = [],
-  Depth extends readonly number[] = [],
-> = Depth['length'] extends MAXIMUM_DEPTH
-  ? MulticallResult<ContractFunctionResult, TAllowFailure>[]
-  : TContracts extends []
+  contracts extends readonly MulticallContract[],
+  allowFailure extends boolean = true,
+  ///
+  result extends any[] = [],
+  depth extends readonly number[] = [],
+> = depth['length'] extends MAXIMUM_DEPTH
+  ? MulticallResult<ContractReturnType, allowFailure>[]
+  : contracts extends []
   ? []
-  : TContracts extends [infer Head extends Contract]
+  : contracts extends [infer head extends MulticallContract]
   ? [
-      ...Result,
+      ...result,
       MulticallResult<
-        ContractFunctionResult<Head['abi'], Head['functionName']>,
-        TAllowFailure
+        ContractReturnType<head['abi'], 'pure' | 'view', head['functionName']>,
+        allowFailure
       >,
     ]
-  : TContracts extends [
-      infer Head extends Contract,
-      ...infer Tail extends Contract[],
+  : contracts extends [
+      infer head extends MulticallContract,
+      ...infer tail extends readonly MulticallContract[],
     ]
   ? MulticallResults<
-      [...Tail],
-      TAllowFailure,
+      [...tail],
+      allowFailure,
       [
-        ...Result,
+        ...result,
         MulticallResult<
-          ContractFunctionResult<Head['abi'], Head['functionName']>,
-          TAllowFailure
+          ContractReturnType<
+            head['abi'],
+            'pure' | 'view',
+            head['functionName']
+          >,
+          allowFailure
         >,
       ],
-      [...Depth, 1]
+      [...depth, 1]
     >
-  : TContracts extends ContractFunctionConfig<infer TAbi, infer TFunctionName>[]
-  ? MulticallResult<
-      ContractFunctionResult<TAbi, TFunctionName>,
-      TAllowFailure
+  : contracts extends ContractParameters<
+      infer abi,
+      infer _,
+      infer functionName
+    >[]
+  ? // Dynamic-size (homogenous) UseQueryOptions array: map directly to array of results
+    MulticallResult<
+      ContractReturnType<abi, 'pure' | 'view', functionName>,
+      allowFailure
     >[]
-  : MulticallResult<ContractFunctionResult, TAllowFailure>[]
+  : // Fallback
+    MulticallResult<ContractReturnType, allowFailure>[]
+
+export type MulticallResult<
+  result,
+  allowFailure extends boolean = true,
+> = allowFailure extends true
+  ?
+      | { error?: undefined; result: result; status: 'success' }
+      | { error: Error; result?: undefined; status: 'failure' }
+  : result

package/src/types/typedData.ts

@@ -1,10 +1,11 @@
-import type { Prettify } from './utils.js'
 import type {
   TypedData,
   TypedDataDomain,
   TypedDataToPrimitiveTypes,
 } from 'abitype'
 
+import type { Prettify } from './utils.js'
+
 export type TypedDataDefinition<
   typedData extends TypedData | Record<string, unknown> = TypedData,
   primaryType extends keyof typedData | 'EIP712Domain' = keyof typedData,

package/src/utils/abi/decodeAbiParameters.ts

@@ -2,7 +2,6 @@ import type {
   AbiParameter,
   AbiParameterToPrimitiveType,
   AbiParametersToPrimitiveTypes,
-  Narrow,
 } from 'abitype'
 
 import {
@@ -33,8 +32,8 @@ export type DecodeAbiParametersReturnType<
 >
 
 export function decodeAbiParameters<
-  TParams extends readonly AbiParameter[] | readonly unknown[],
->(params: Narrow<TParams>, data: Hex): DecodeAbiParametersReturnType<TParams> {
+  const TParams extends readonly AbiParameter[] | readonly unknown[],
+>(params: TParams, data: Hex): DecodeAbiParametersReturnType<TParams> {
   if (data === '0x' && (params as unknown[]).length > 0)
     throw new AbiDecodingZeroDataError()
   if (size(data) && size(data) < 32)
@@ -53,7 +52,7 @@ export function decodeAbiParameters<
 
 type TupleAbiParameter = AbiParameter & { components: readonly AbiParameter[] }
 
-function decodeParams<TParams extends readonly AbiParameter[]>({
+function decodeParams<const TParams extends readonly AbiParameter[]>({
   data,
   params,
 }: { data: Hex; params: TParams }) {
@@ -126,7 +125,7 @@ function decodeAddress(value: Hex) {
   return { consumed: 32, value: checksumAddress(slice(value, -20)) }
 }
 
-function decodeArray<TParam extends AbiParameter>(
+function decodeArray<const TParam extends AbiParameter>(
   data: Hex,
   {
     param,
@@ -211,7 +210,7 @@ function decodeBool(value: Hex) {
   return { consumed: 32, value: hexToBool(value) }
 }
 
-function decodeBytes<TParam extends AbiParameter>(
+function decodeBytes<const TParam extends AbiParameter>(
   data: Hex,
   { param, position }: { param: TParam; position: number },
 ) {
@@ -239,7 +238,7 @@ function decodeBytes<TParam extends AbiParameter>(
   return { consumed: 32, value }
 }
 
-function decodeNumber<TParam extends AbiParameter>(
+function decodeNumber<const TParam extends AbiParameter>(
   value: Hex,
   { param }: { param: TParam },
 ) {
@@ -268,7 +267,7 @@ function decodeString(data: Hex, { position }: { position: number }) {
 }
 
 function decodeTuple<
-  TParam extends AbiParameter & { components: readonly AbiParameter[] },
+  const TParam extends AbiParameter & { components: readonly AbiParameter[] },
 >(data: Hex, { param, position }: { param: TParam; position: number }) {
   // Tuples can have unnamed components (i.e. they are arrays), so we must
   // determine whether the tuple is named or unnamed. In the case of a named

package/src/utils/abi/decodeDeployData.ts

@@ -1,4 +1,4 @@
-import type { Abi, Narrow } from 'abitype'
+import type { Abi } from 'abitype'
 
 import {
   AbiConstructorNotFoundError,
@@ -14,7 +14,7 @@ const docsPath = '/docs/contract/decodeDeployData'
 export type DecodeDeployDataParameters<
   TAbi extends Abi | readonly unknown[] = Abi,
 > = {
-  abi: Narrow<TAbi>
+  abi: TAbi
   bytecode: Hex
   data: Hex
 }
@@ -24,7 +24,7 @@ export type DecodeDeployDataReturnType<
   bytecode: Hex
 } & GetConstructorArgs<TAbi>
 
-export function decodeDeployData<TAbi extends Abi | readonly unknown[]>({
+export function decodeDeployData<const TAbi extends Abi | readonly unknown[]>({
   abi,
   bytecode,
   data,

package/src/utils/abi/decodeErrorResult.ts

@@ -1,9 +1,4 @@
-import type {
-  Abi,
-  ExtractAbiError,
-  ExtractAbiErrorNames,
-  Narrow,
-} from 'abitype'
+import type { Abi, ExtractAbiError, ExtractAbiErrorNames } from 'abitype'
 
 import { solidityError, solidityPanic } from '../../constants/solidity.js'
 import {
@@ -20,7 +15,7 @@ import { formatAbiItem } from './formatAbiItem.js'
 
 export type DecodeErrorResultParameters<
   TAbi extends Abi | readonly unknown[] = Abi,
-> = { abi?: Narrow<TAbi>; data: Hex }
+> = { abi?: TAbi; data: Hex }
 
 export type DecodeErrorResultReturnType<
   TAbi extends Abi | readonly unknown[] = Abi,
@@ -37,7 +32,7 @@ export type DecodeErrorResultReturnType<
   }
 }[_ErrorNames]
 
-export function decodeErrorResult<TAbi extends Abi | readonly unknown[]>({
+export function decodeErrorResult<const TAbi extends Abi | readonly unknown[]>({
   abi,
   data,
 }: DecodeErrorResultParameters<TAbi>): DecodeErrorResultReturnType<TAbi> {

package/src/utils/abi/decodeEventLog.ts

@@ -1,4 +1,4 @@
-import type { Abi, AbiParameter, ExtractAbiEventNames, Narrow } from 'abitype'
+import type { Abi, AbiParameter, ExtractAbiEventNames } from 'abitype'
 
 import {
   AbiDecodingDataSizeTooSmallError,
@@ -26,7 +26,7 @@ export type DecodeEventLogParameters<
   TData extends Hex | undefined = undefined,
   TStrict extends boolean = true,
 > = {
-  abi: Narrow<TAbi>
+  abi: TAbi
   data?: TData
   eventName?: InferEventName<TAbi, TEventName>
   strict?: TStrict
@@ -61,7 +61,7 @@ export type DecodeEventLogReturnType<
 const docsPath = '/docs/contract/decodeEventLog'
 
 export function decodeEventLog<
-  TAbi extends Abi | readonly unknown[],
+  const TAbi extends Abi | readonly unknown[],
   TEventName extends string | undefined = undefined,
   TTopics extends Hex[] = Hex[],
   TData extends Hex | undefined = undefined,

package/src/utils/abi/decodeFunctionResult.ts

@@ -1,4 +1,4 @@
-import type { Abi, ExtractAbiFunctionNames, Narrow } from 'abitype'
+import type { Abi, ExtractAbiFunctionNames } from 'abitype'
 
 import {
   AbiFunctionNotFoundError,
@@ -25,11 +25,9 @@ export type DecodeFunctionResultParameters<
   functionName?: _FunctionName
   data: Hex
 } & (TFunctionName extends string
-  ? { abi: Narrow<TAbi> } & Partial<GetFunctionArgs<TAbi, TFunctionName>>
+  ? { abi: TAbi } & Partial<GetFunctionArgs<TAbi, TFunctionName>>
   : _FunctionName extends string
-  ? { abi: [Narrow<TAbi[number]>] } & Partial<
-      GetFunctionArgs<TAbi, _FunctionName>
-    >
+  ? { abi: [TAbi[number]] } & Partial<GetFunctionArgs<TAbi, _FunctionName>>
   : never)
 
 export type DecodeFunctionResultReturnType<
@@ -45,7 +43,7 @@ export type DecodeFunctionResultReturnType<
   : ContractFunctionResult<TAbi, _FunctionName>
 
 export function decodeFunctionResult<
-  TAbi extends Abi | readonly unknown[],
+  const TAbi extends Abi | readonly unknown[],
   TFunctionName extends string | undefined = undefined,
 >({
   abi,

package/src/utils/abi/encodeAbiParameters.ts

@@ -2,7 +2,6 @@ import type {
   AbiParameter,
   AbiParameterToPrimitiveType,
   AbiParametersToPrimitiveTypes,
-  Narrow,
 } from 'abitype'
 
 import {
@@ -27,9 +26,9 @@ export type EncodeAbiParametersReturnType = Hex
  * @description Encodes a list of primitive values into an ABI-encoded hex value.
  */
 export function encodeAbiParameters<
-  TParams extends readonly AbiParameter[] | readonly unknown[],
+  const TParams extends readonly AbiParameter[] | readonly unknown[],
 >(
-  params: Narrow<TParams>,
+  params: TParams,
   values: TParams extends readonly AbiParameter[]
     ? AbiParametersToPrimitiveTypes<TParams>
     : never,
@@ -56,11 +55,11 @@ type PreparedParam = { dynamic: boolean; encoded: Hex }
 type TupleAbiParameter = AbiParameter & { components: readonly AbiParameter[] }
 type Tuple = AbiParameterToPrimitiveType<TupleAbiParameter>
 
-function prepareParams<TParams extends readonly AbiParameter[]>({
+function prepareParams<const TParams extends readonly AbiParameter[]>({
   params,
   values,
 }: {
-  params: Narrow<TParams>
+  params: TParams
   values: AbiParametersToPrimitiveTypes<TParams>
 }) {
   const preparedParams: PreparedParam[] = []
@@ -70,7 +69,7 @@ function prepareParams<TParams extends readonly AbiParameter[]>({
   return preparedParams
 }
 
-function prepareParam<TParam extends AbiParameter>({
+function prepareParam<const TParam extends AbiParameter>({
   param,
   value,
 }: {
@@ -145,7 +144,7 @@ function encodeAddress(value: Hex): PreparedParam {
   return { dynamic: false, encoded: padHex(value.toLowerCase() as Hex) }
 }
 
-function encodeArray<TParam extends AbiParameter>(
+function encodeArray<const TParam extends AbiParameter>(
   value: AbiParameterToPrimitiveType<TParam>,
   {
     length,
@@ -190,7 +189,7 @@ function encodeArray<TParam extends AbiParameter>(
   }
 }
 
-function encodeBytes<TParam extends AbiParameter>(
+function encodeBytes<const TParam extends AbiParameter>(
   value: Hex,
   { param }: { param: TParam },
 ): PreparedParam {
@@ -256,7 +255,7 @@ function encodeString(value: string): PreparedParam {
 }
 
 function encodeTuple<
-  TParam extends AbiParameter & { components: readonly AbiParameter[] },
+  const TParam extends AbiParameter & { components: readonly AbiParameter[] },
 >(
   value: AbiParameterToPrimitiveType<TParam>,
   { param }: { param: TParam },

package/src/utils/abi/encodeDeployData.ts

@@ -1,4 +1,4 @@
-import type { Abi, Narrow } from 'abitype'
+import type { Abi } from 'abitype'
 
 import {
   AbiConstructorNotFoundError,
@@ -15,11 +15,11 @@ const docsPath = '/docs/contract/encodeDeployData'
 export type EncodeDeployDataParameters<
   TAbi extends Abi | readonly unknown[] = Abi,
 > = {
-  abi: Narrow<TAbi>
+  abi: TAbi
   bytecode: Hex
 } & GetConstructorArgs<TAbi>
 
-export function encodeDeployData<TAbi extends Abi | readonly unknown[]>({
+export function encodeDeployData<const TAbi extends Abi | readonly unknown[]>({
   abi,
   args,
   bytecode,

package/src/utils/abi/encodeErrorResult.ts

@@ -1,4 +1,4 @@
-import type { Abi, Narrow } from 'abitype'
+import type { Abi } from 'abitype'
 
 import {
   AbiErrorInputsNotFoundError,
@@ -26,13 +26,13 @@ export type EncodeErrorResultParameters<
 > = {
   errorName?: _ErrorName
 } & (TErrorName extends string
-  ? { abi: Narrow<TAbi> } & GetErrorArgs<TAbi, TErrorName>
+  ? { abi: TAbi } & GetErrorArgs<TAbi, TErrorName>
   : _ErrorName extends string
-  ? { abi: [Narrow<TAbi[number]>] } & GetErrorArgs<TAbi, _ErrorName>
+  ? { abi: [TAbi[number]] } & GetErrorArgs<TAbi, _ErrorName>
   : never)
 
 export function encodeErrorResult<
-  TAbi extends Abi | readonly unknown[],
+  const TAbi extends Abi | readonly unknown[],
   TErrorName extends string | undefined = undefined,
 >({ abi, errorName, args }: EncodeErrorResultParameters<TAbi, TErrorName>) {
   let abiItem = abi[0] as AbiItem

package/src/utils/abi/encodeEventTopics.ts

@@ -1,9 +1,4 @@
-import type {
-  Abi,
-  AbiParameter,
-  AbiParameterToPrimitiveType,
-  Narrow,
-} from 'abitype'
+import type { Abi, AbiParameter, AbiParameterToPrimitiveType } from 'abitype'
 
 import { AbiEventNotFoundError } from '../../errors/abi.js'
 import { FilterTypeNotSupportedError } from '../../errors/log.js'
@@ -29,13 +24,13 @@ export type EncodeEventTopicsParameters<
 > = {
   eventName?: _EventName
 } & (TEventName extends string
-  ? { abi: Narrow<TAbi>; args?: GetEventArgs<TAbi, TEventName> }
+  ? { abi: TAbi; args?: GetEventArgs<TAbi, TEventName> }
   : _EventName extends string
-  ? { abi: [Narrow<TAbi[number]>]; args?: GetEventArgs<TAbi, _EventName> }
+  ? { abi: [TAbi[number]]; args?: GetEventArgs<TAbi, _EventName> }
   : never)
 
 export function encodeEventTopics<
-  TAbi extends Abi | readonly unknown[],
+  const TAbi extends Abi | readonly unknown[],
   TEventName extends string | undefined = undefined,
 >({ abi, eventName, args }: EncodeEventTopicsParameters<TAbi, TEventName>) {
   let abiItem = abi[0] as AbiItem

package/src/utils/abi/encodeFunctionData.ts

@@ -1,4 +1,4 @@
-import type { Abi, Narrow } from 'abitype'
+import type { Abi } from 'abitype'
 
 import { AbiFunctionNotFoundError } from '../../errors/abi.js'
 import type {
@@ -20,13 +20,13 @@ export type EncodeFunctionDataParameters<
 > = {
   functionName?: _FunctionName
 } & (TFunctionName extends string
-  ? { abi: Narrow<TAbi> } & GetFunctionArgs<TAbi, TFunctionName>
+  ? { abi: TAbi } & GetFunctionArgs<TAbi, TFunctionName>
   : _FunctionName extends string
-  ? { abi: [Narrow<TAbi[number]>] } & GetFunctionArgs<TAbi, _FunctionName>
+  ? { abi: [TAbi[number]] } & GetFunctionArgs<TAbi, _FunctionName>
   : never)
 
 export function encodeFunctionData<
-  TAbi extends Abi | readonly unknown[],
+  const TAbi extends Abi | readonly unknown[],
   TFunctionName extends string | undefined = undefined,
 >({
   abi,

package/src/utils/abi/encodeFunctionResult.ts

@@ -1,4 +1,4 @@
-import type { Abi, Narrow } from 'abitype'
+import type { Abi } from 'abitype'
 
 import {
   AbiFunctionNotFoundError,
@@ -22,16 +22,16 @@ export type EncodeFunctionResultParameters<
 > = {
   functionName?: _FunctionName
 } & (TFunctionName extends string
-  ? { abi: Narrow<TAbi>; result?: ContractFunctionResult<TAbi, TFunctionName> }
+  ? { abi: TAbi; result?: ContractFunctionResult<TAbi, TFunctionName> }
   : _FunctionName extends string
   ? {
-      abi: [Narrow<TAbi[number]>]
+      abi: [TAbi[number]]
       result?: ContractFunctionResult<TAbi, _FunctionName>
     }
   : never)
 
 export function encodeFunctionResult<
-  TAbi extends Abi | readonly unknown[],
+  const TAbi extends Abi | readonly unknown[],
   TFunctionName extends string | undefined = undefined,
 >({
   abi,

package/src/utils/abi/encodePacked.ts

@@ -2,7 +2,6 @@ import type {
   AbiParameterToPrimitiveType,
   AbiType,
   Address,
-  Narrow,
   SolidityAddress,
   SolidityArrayWithoutTuple,
   SolidityBool,
@@ -32,18 +31,17 @@ type PackedAbiType =
   | SolidityString
   | SolidityArrayWithoutTuple
 
-type EncodePackedValues<TPackedAbiTypes extends PackedAbiType[] | unknown[]> = {
+type EncodePackedValues<
+  TPackedAbiTypes extends readonly PackedAbiType[] | readonly unknown[],
+> = {
   [K in keyof TPackedAbiTypes]: TPackedAbiTypes[K] extends AbiType
     ? AbiParameterToPrimitiveType<{ type: TPackedAbiTypes[K] }>
     : unknown
 }
 
 export function encodePacked<
-  TPackedAbiTypes extends PackedAbiType[] | unknown[],
->(
-  types: Narrow<TPackedAbiTypes>,
-  values: EncodePackedValues<TPackedAbiTypes>,
-): Hex {
+  const TPackedAbiTypes extends readonly PackedAbiType[] | readonly unknown[],
+>(types: TPackedAbiTypes, values: EncodePackedValues<TPackedAbiTypes>): Hex {
   if (types.length !== values.length)
     throw new AbiEncodingLengthMismatchError({
       expectedLength: types.length as number,
@@ -59,7 +57,7 @@ export function encodePacked<
   return concat(data)
 }
 
-function encode<TPackedAbiType extends PackedAbiType | unknown>(
+function encode<const TPackedAbiType extends PackedAbiType | unknown>(
   type: TPackedAbiType,
   value: EncodePackedValues<[TPackedAbiType]>[0],
   isArray = false,

package/src/utils/abi/getAbiItem.ts

@@ -1,4 +1,4 @@
-import type { Abi, AbiParameter, Address, Narrow } from 'abitype'
+import type { Abi, AbiParameter, Address } from 'abitype'
 
 import type { GetFunctionArgs, InferItemName } from '../../types/contract.js'
 import { isAddress } from '../address/isAddress.js'
@@ -7,7 +7,7 @@ export type GetAbiItemParameters<
   TAbi extends Abi | readonly unknown[] = Abi,
   TItemName extends string = string,
 > = {
-  abi: Narrow<TAbi>
+  abi: TAbi
   name: InferItemName<TAbi, TItemName>
 } & Partial<GetFunctionArgs<TAbi, TItemName>>
 
@@ -22,7 +22,7 @@ export type GetAbiItemReturnType<
 >
 
 export function getAbiItem<
-  TAbi extends Abi | readonly unknown[],
+  const TAbi extends Abi | readonly unknown[],
   TItemName extends string,
 >({
   abi,

package/src/utils/poll.ts

@@ -21,7 +21,7 @@ export function poll<TData>(
   const unwatch = () => (active = false)
 
   const watch = async () => {
-    let data: TData | void
+    let data: TData | void = undefined
     if (emitOnBegin) data = await fn({ unpoll: unwatch })
 
     const initialWait = (await initialWaitTime?.(data)) ?? interval

package/src/utils/typedData.ts

@@ -58,8 +58,7 @@ export function validateTypedData<
   }
 
   // Validate domain types.
-  if (types['EIP712Domain'] && domain)
-    validateData(types['EIP712Domain'], domain)
+  if (types.EIP712Domain && domain) validateData(types.EIP712Domain, domain)
 
   if (primaryType !== 'EIP712Domain') {
     // Validate message types.

package/src/version.ts

@@ -1 +1 @@
-export const version = '1.5.4'
+export const version = '1.6.1'