viem 0.0.0-main.20230814T205407 → 0.0.0-main.20230814T211804

package/src/utils/abi/decodeEventLog.ts

@@ -1,4 +1,4 @@
-import type { Abi, AbiParameter, ExtractAbiEventNames } from 'abitype'
+import type { Abi, AbiParameter, ExtractAbiEventNames, Narrow } from 'abitype'
 
 import {
   AbiDecodingDataSizeTooSmallError,
@@ -26,7 +26,7 @@ export type DecodeEventLogParameters<
   TData extends Hex | undefined = undefined,
   TStrict extends boolean = true,
 > = {
-  abi: TAbi
+  abi: Narrow<TAbi>
   data?: TData
   eventName?: InferEventName<TAbi, TEventName>
   strict?: TStrict
@@ -61,7 +61,7 @@ export type DecodeEventLogReturnType<
 const docsPath = '/docs/contract/decodeEventLog'
 
 export function decodeEventLog<
-  const TAbi extends Abi | readonly unknown[],
+  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 } from 'abitype'
+import type { Abi, ExtractAbiFunctionNames, Narrow } from 'abitype'
 
 import {
   AbiFunctionNotFoundError,
@@ -25,9 +25,11 @@ export type DecodeFunctionResultParameters<
   functionName?: _FunctionName
   data: Hex
 } & (TFunctionName extends string
-  ? { abi: TAbi } & Partial<GetFunctionArgs<TAbi, TFunctionName>>
+  ? { abi: Narrow<TAbi> } & Partial<GetFunctionArgs<TAbi, TFunctionName>>
   : _FunctionName extends string
-  ? { abi: [TAbi[number]] } & Partial<GetFunctionArgs<TAbi, _FunctionName>>
+  ? { abi: [Narrow<TAbi[number]>] } & Partial<
+      GetFunctionArgs<TAbi, _FunctionName>
+    >
   : never)
 
 export type DecodeFunctionResultReturnType<
@@ -43,7 +45,7 @@ export type DecodeFunctionResultReturnType<
   : ContractFunctionResult<TAbi, _FunctionName>
 
 export function decodeFunctionResult<
-  const TAbi extends Abi | readonly unknown[],
+  TAbi extends Abi | readonly unknown[],
   TFunctionName extends string | undefined = undefined,
 >({
   abi,

package/src/utils/abi/encodeAbiParameters.ts

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

package/src/utils/abi/encodeErrorResult.ts

@@ -1,4 +1,4 @@
-import type { Abi } from 'abitype'
+import type { Abi, Narrow } from 'abitype'
 
 import {
   AbiErrorInputsNotFoundError,
@@ -26,13 +26,13 @@ export type EncodeErrorResultParameters<
 > = {
   errorName?: _ErrorName
 } & (TErrorName extends string
-  ? { abi: TAbi } & GetErrorArgs<TAbi, TErrorName>
+  ? { abi: Narrow<TAbi> } & GetErrorArgs<TAbi, TErrorName>
   : _ErrorName extends string
-  ? { abi: [TAbi[number]] } & GetErrorArgs<TAbi, _ErrorName>
+  ? { abi: [Narrow<TAbi[number]>] } & GetErrorArgs<TAbi, _ErrorName>
   : never)
 
 export function encodeErrorResult<
-  const TAbi extends Abi | readonly unknown[],
+  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,4 +1,9 @@
-import type { Abi, AbiParameter, AbiParameterToPrimitiveType } from 'abitype'
+import type {
+  Abi,
+  AbiParameter,
+  AbiParameterToPrimitiveType,
+  Narrow,
+} from 'abitype'
 
 import { AbiEventNotFoundError } from '../../errors/abi.js'
 import { FilterTypeNotSupportedError } from '../../errors/log.js'
@@ -24,13 +29,13 @@ export type EncodeEventTopicsParameters<
 > = {
   eventName?: _EventName
 } & (TEventName extends string
-  ? { abi: TAbi; args?: GetEventArgs<TAbi, TEventName> }
+  ? { abi: Narrow<TAbi>; args?: GetEventArgs<TAbi, TEventName> }
   : _EventName extends string
-  ? { abi: [TAbi[number]]; args?: GetEventArgs<TAbi, _EventName> }
+  ? { abi: [Narrow<TAbi[number]>]; args?: GetEventArgs<TAbi, _EventName> }
   : never)
 
 export function encodeEventTopics<
-  const TAbi extends Abi | readonly unknown[],
+  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 } from 'abitype'
+import type { Abi, Narrow } from 'abitype'
 
 import { AbiFunctionNotFoundError } from '../../errors/abi.js'
 import type {
@@ -20,13 +20,13 @@ export type EncodeFunctionDataParameters<
 > = {
   functionName?: _FunctionName
 } & (TFunctionName extends string
-  ? { abi: TAbi } & GetFunctionArgs<TAbi, TFunctionName>
+  ? { abi: Narrow<TAbi> } & GetFunctionArgs<TAbi, TFunctionName>
   : _FunctionName extends string
-  ? { abi: [TAbi[number]] } & GetFunctionArgs<TAbi, _FunctionName>
+  ? { abi: [Narrow<TAbi[number]>] } & GetFunctionArgs<TAbi, _FunctionName>
   : never)
 
 export function encodeFunctionData<
-  const TAbi extends Abi | readonly unknown[],
+  TAbi extends Abi | readonly unknown[],
   TFunctionName extends string | undefined = undefined,
 >({
   abi,

package/src/utils/abi/encodeFunctionResult.ts

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

package/src/utils/abi/encodePacked.ts

@@ -2,6 +2,7 @@ import type {
   AbiParameterToPrimitiveType,
   AbiType,
   Address,
+  Narrow,
   SolidityAddress,
   SolidityArrayWithoutTuple,
   SolidityBool,
@@ -31,17 +32,18 @@ type PackedAbiType =
   | SolidityString
   | SolidityArrayWithoutTuple
 
-type EncodePackedValues<
-  TPackedAbiTypes extends readonly PackedAbiType[] | readonly unknown[],
-> = {
+type EncodePackedValues<TPackedAbiTypes extends PackedAbiType[] | unknown[]> = {
   [K in keyof TPackedAbiTypes]: TPackedAbiTypes[K] extends AbiType
     ? AbiParameterToPrimitiveType<{ type: TPackedAbiTypes[K] }>
     : unknown
 }
 
 export function encodePacked<
-  const TPackedAbiTypes extends readonly PackedAbiType[] | readonly unknown[],
->(types: TPackedAbiTypes, values: EncodePackedValues<TPackedAbiTypes>): Hex {
+  TPackedAbiTypes extends PackedAbiType[] | unknown[],
+>(
+  types: Narrow<TPackedAbiTypes>,
+  values: EncodePackedValues<TPackedAbiTypes>,
+): Hex {
   if (types.length !== values.length)
     throw new AbiEncodingLengthMismatchError({
       expectedLength: types.length as number,
@@ -57,7 +59,7 @@ export function encodePacked<
   return concat(data)
 }
 
-function encode<const TPackedAbiType extends PackedAbiType | unknown>(
+function encode<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 } from 'abitype'
+import type { Abi, AbiParameter, Address, Narrow } 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: TAbi
+  abi: Narrow<TAbi>
   name: InferItemName<TAbi, TItemName>
 } & Partial<GetFunctionArgs<TAbi, TItemName>>
 
@@ -22,7 +22,7 @@ export type GetAbiItemReturnType<
 >
 
 export function getAbiItem<
-  const TAbi extends Abi | readonly unknown[],
+  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 = undefined
+    let data: TData | void
     if (emitOnBegin) data = await fn({ unpoll: unwatch })
 
     const initialWait = (await initialWaitTime?.(data)) ?? interval

package/src/utils/signature/hashTypedData.ts

@@ -23,7 +23,7 @@ export type HashTypedDataParameters<
 export type HashTypedDataReturnType = Hex
 
 export function hashTypedData<
-  const TTypedData extends TypedData | { [key: string]: unknown },
+  TTypedData extends TypedData | { [key: string]: unknown },
   TPrimaryType extends string = string,
 >({
   domain: domain_,

package/src/utils/signature/recoverTypedDataAddress.ts

@@ -15,7 +15,7 @@ export type RecoverTypedDataAddressParameters<
 export type RecoverTypedDataAddressReturnType = Address
 
 export async function recoverTypedDataAddress<
-  const TTypedData extends TypedData | { [key: string]: unknown },
+  TTypedData extends TypedData | { [key: string]: unknown },
   TPrimaryType extends string = string,
 >({
   domain,

package/src/utils/signature/verifyTypedData.ts

@@ -35,7 +35,7 @@ export type VerifyTypedDataReturnType = boolean
  * @returns Whether or not the signature is valid. {@link VerifyTypedDataReturnType}
  */
 export async function verifyTypedData<
-  const TTypedData extends TypedData | { [key: string]: unknown },
+  TTypedData extends TypedData | { [key: string]: unknown },
   TPrimaryType extends string = string,
 >({
   address,

package/src/utils/typedData.ts

@@ -11,7 +11,7 @@ import { numberToHex } from './encoding/toHex.js'
 import { bytesRegex, integerRegex } from './regex.js'
 
 export function validateTypedData<
-  const TTypedData extends TypedData | { [key: string]: unknown },
+  TTypedData extends TypedData | { [key: string]: unknown },
   TPrimaryType extends string = string,
 >({
   domain,
@@ -63,7 +63,8 @@ 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.