viem 1.5.4 → 1.6.2

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/chain.ts

@@ -3,8 +3,13 @@ import {
   ChainMismatchError,
   ChainNotFoundError,
 } from '../errors/chain.js'
-import type { Chain, ChainContract } from '../types/chain.js'
-import type { Formatters } from '../types/formatter.js'
+import type {
+  Chain,
+  ChainConfig,
+  ChainContract,
+  ChainFormatters,
+} from '../types/chain.js'
+import type { Assign } from '../types/utils.js'
 
 export type AssertCurrentChainParameters = {
   chain?: Chain
@@ -21,17 +26,23 @@ export function assertCurrentChain({
 }
 
 export function defineChain<
-  TChain extends Chain,
-  TFormatters extends Formatters,
+  chain extends Chain,
+  formatters extends ChainFormatters,
 >(
-  chain: TChain,
-  config?: Pick<Chain<TFormatters>, 'formatters' | 'serializers'>,
-) {
+  chain: chain,
+  config: ChainConfig<formatters> = {},
+): Assign<chain, ChainConfig<formatters>> {
+  const {
+    fees = chain.fees,
+    formatters = chain.formatters,
+    serializers = chain.serializers,
+  } = config
   return {
     ...chain,
-    formatters: config?.formatters,
-    serializers: config?.serializers,
-  }
+    fees,
+    formatters,
+    serializers,
+  } as unknown as Assign<chain, ChainConfig<formatters>>
 }
 
 export function getChainContractAddress({

package/src/utils/formatters/block.ts

@@ -1,9 +1,9 @@
 import type { Block, BlockTag } from '../../types/block.js'
 import type { Chain } from '../../types/chain.js'
 import type {
-  ExtractFormatterExclude,
-  ExtractFormatterReturnType,
-} from '../../types/formatter.js'
+  ExtractChainFormatterExclude,
+  ExtractChainFormatterReturnType,
+} from '../../types/chain.js'
 import type { Hash } from '../../types/misc.js'
 import type { RpcBlock } from '../../types/rpc.js'
 import type { Prettify } from '../../types/utils.js'
@@ -14,16 +14,18 @@ import { type FormattedTransaction, formatTransaction } from './transaction.js'
 type BlockPendingDependencies = 'hash' | 'logsBloom' | 'nonce' | 'number'
 
 export type FormattedBlock<
-  TChain extends Chain | undefined = Chain | undefined,
+  TChain extends { formatters?: Chain['formatters'] } | undefined =
+    | { formatters?: Chain['formatters'] }
+    | undefined,
   TIncludeTransactions extends boolean = boolean,
   TBlockTag extends BlockTag = BlockTag,
-  _FormatterReturnType = ExtractFormatterReturnType<
+  _FormatterReturnType = ExtractChainFormatterReturnType<
     TChain,
     'block',
     Block<bigint, TIncludeTransactions>
   >,
   _ExcludedPendingDependencies extends string = BlockPendingDependencies &
-    ExtractFormatterExclude<TChain, 'block'>,
+    ExtractChainFormatterExclude<TChain, 'block'>,
   _Formatted = Omit<_FormatterReturnType, BlockPendingDependencies> & {
     [K in _ExcludedPendingDependencies]: never
   } & Pick<

package/src/utils/formatters/extract.ts

@@ -1,11 +1,11 @@
-import type { Formatter } from '../../types/formatter.js'
+import type { ChainFormatter } from '../../types/chain.js'
 
 /**
  * @description Picks out the keys from `value` that exist in the formatter.
  */
 export function extract(
   value: Record<string, unknown>,
-  { format }: { format?: Formatter['format'] },
+  { format }: { format?: ChainFormatter['format'] },
 ) {
   if (!format) return {}
   const keys = Object.keys(format({}))

package/src/utils/formatters/formatter.ts

@@ -17,8 +17,8 @@ export function defineFormatter<TType extends string, TParameters, TReturnType>(
   }) => {
     return {
       exclude,
-      format: (args: TParameters & TOverrideParameters) => {
-        const formatted = format(args)
+      format: (args: Assign<TParameters, TOverrideParameters>) => {
+        const formatted = format(args as any)
         if (exclude) {
           for (const key of exclude) {
             delete (formatted as any)[key]

package/src/utils/formatters/transaction.ts

@@ -1,9 +1,9 @@
 import type { BlockTag } from '../../types/block.js'
 import type { Chain } from '../../types/chain.js'
 import type {
-  ExtractFormatterExclude,
-  ExtractFormatterReturnType,
-} from '../../types/formatter.js'
+  ExtractChainFormatterExclude,
+  ExtractChainFormatterReturnType,
+} from '../../types/chain.js'
 import type { RpcTransaction } from '../../types/rpc.js'
 import type { Transaction } from '../../types/transaction.js'
 import type { UnionOmit } from '../../types/utils.js'
@@ -16,15 +16,17 @@ type TransactionPendingDependencies =
   | 'transactionIndex'
 
 export type FormattedTransaction<
-  TChain extends Chain | undefined = Chain | undefined,
+  TChain extends { formatters?: Chain['formatters'] } | undefined =
+    | { formatters?: Chain['formatters'] }
+    | undefined,
   TBlockTag extends BlockTag = BlockTag,
-  _FormatterReturnType = ExtractFormatterReturnType<
+  _FormatterReturnType = ExtractChainFormatterReturnType<
     TChain,
     'transaction',
     Transaction
   >,
   _ExcludedPendingDependencies extends string = TransactionPendingDependencies &
-    ExtractFormatterExclude<TChain, 'transaction'>,
+    ExtractChainFormatterExclude<TChain, 'transaction'>,
 > = UnionOmit<_FormatterReturnType, TransactionPendingDependencies> & {
   [K in _ExcludedPendingDependencies]: never
 } & Pick<

package/src/utils/formatters/transactionReceipt.ts

@@ -1,5 +1,7 @@
-import type { Chain } from '../../types/chain.js'
-import type { ExtractFormatterReturnType } from '../../types/formatter.js'
+import type {
+  Chain,
+  ExtractChainFormatterReturnType,
+} from '../../types/chain.js'
 import type { RpcTransactionReceipt } from '../../types/rpc.js'
 import type { TransactionReceipt } from '../../types/transaction.js'
 import { hexToNumber } from '../encoding/fromHex.js'
@@ -10,7 +12,11 @@ import { transactionType } from './transaction.js'
 
 export type FormattedTransactionReceipt<
   TChain extends Chain | undefined = Chain | undefined,
-> = ExtractFormatterReturnType<TChain, 'transactionReceipt', TransactionReceipt>
+> = ExtractChainFormatterReturnType<
+  TChain,
+  'transactionReceipt',
+  TransactionReceipt
+>
 
 const statuses = {
   '0x0': 'reverted',

package/src/utils/formatters/transactionRequest.ts

@@ -1,5 +1,7 @@
-import type { Chain } from '../../types/chain.js'
-import type { ExtractFormatterParameters } from '../../types/formatter.js'
+import type {
+  Chain,
+  ExtractChainFormatterParameters,
+} from '../../types/chain.js'
 import type { RpcTransactionRequest } from '../../types/rpc.js'
 import type { TransactionRequest } from '../../types/transaction.js'
 import { numberToHex } from '../encoding/toHex.js'
@@ -7,7 +9,11 @@ import { defineFormatter } from './formatter.js'
 
 export type FormattedTransactionRequest<
   TChain extends Chain | undefined = Chain | undefined,
-> = ExtractFormatterParameters<TChain, 'transactionRequest', TransactionRequest>
+> = ExtractChainFormatterParameters<
+  TChain,
+  'transactionRequest',
+  TransactionRequest
+>
 
 export function formatTransactionRequest(
   transactionRequest: Partial<TransactionRequest>,

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/signature/hashTypedData.ts

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

package/src/utils/transaction/prepareRequest.ts

@@ -15,24 +15,34 @@ import type { Transport } from '../../clients/transports/createTransport.js'
 import { AccountNotFoundError } from '../../errors/account.js'
 import { BaseError } from '../../errors/base.js'
 import type { GetAccountParameter } from '../../types/account.js'
-import type { Chain } from '../../types/chain.js'
-
+import type { Chain, GetChain } from '../../types/chain.js'
+import type { UnionOmit } from '../../types/utils.js'
+import type { FormattedTransactionRequest } from '../index.js'
 import { type AssertRequestParameters, assertRequest } from './assertRequest.js'
 
 export type PrepareRequestParameters<
-  TAccount extends Account | undefined = undefined,
-> = GetAccountParameter<TAccount> & {
-  gas?: SendTransactionParameters['gas']
-  gasPrice?: SendTransactionParameters['gasPrice']
-  maxFeePerGas?: SendTransactionParameters['maxFeePerGas']
-  maxPriorityFeePerGas?: SendTransactionParameters['maxPriorityFeePerGas']
-  nonce?: SendTransactionParameters['nonce']
-}
+  TChain extends Chain | undefined = Chain | undefined,
+  TAccount extends Account | undefined = Account | undefined,
+  TChainOverride extends Chain | undefined = Chain | undefined,
+> = UnionOmit<
+  FormattedTransactionRequest<
+    TChainOverride extends Chain ? TChainOverride : TChain
+  >,
+  'from'
+> &
+  GetAccountParameter<TAccount> &
+  GetChain<TChain, TChainOverride>
 
 export type PrepareRequestReturnType<
-  TAccount extends Account | undefined = undefined,
-  TParameters extends PrepareRequestParameters<TAccount> = PrepareRequestParameters<TAccount>,
-> = TParameters & {
+  TChain extends Chain | undefined = Chain | undefined,
+  TAccount extends Account | undefined = Account | undefined,
+  TChainOverride extends Chain | undefined = Chain | undefined,
+  TArgs extends PrepareRequestParameters<
+    TChain,
+    TAccount,
+    TChainOverride
+  > = PrepareRequestParameters<TChain, TAccount, TChainOverride>,
+> = TArgs & {
   from: Address
   gas: SendTransactionParameters['gas']
   gasPrice?: SendTransactionParameters['gasPrice']
@@ -41,18 +51,18 @@ export type PrepareRequestReturnType<
   nonce: SendTransactionParameters['nonce']
 }
 
-export const defaultTip = 1_500_000_000n // 1.5 gwei
-
 export async function prepareRequest<
   TChain extends Chain | undefined,
   TAccount extends Account | undefined,
-  TParameters extends PrepareRequestParameters<TAccount>,
+  TChainOverride extends Chain | undefined,
+  TArgs extends PrepareRequestParameters<TChain, TAccount, TChainOverride>,
 >(
   client: Client<Transport, TChain, TAccount>,
-  args: TParameters,
-): Promise<PrepareRequestReturnType<TAccount, TParameters>> {
+  args: TArgs,
+): Promise<PrepareRequestReturnType<TChain, TAccount, TChainOverride, TArgs>> {
   const {
     account: account_,
+    chain = client.chain,
     gas,
     gasPrice,
     maxFeePerGas,
@@ -76,22 +86,33 @@ export async function prepareRequest<
     typeof block.baseFeePerGas === 'bigint' &&
     typeof gasPrice === 'undefined'
   ) {
+    let defaultPriorityFee = 1_500_000_000n // 1.5 gwei
+    if (typeof chain?.fees?.defaultPriorityFee !== 'undefined') {
+      defaultPriorityFee =
+        typeof chain.fees.defaultPriorityFee === 'bigint'
+          ? chain.fees.defaultPriorityFee
+          : await chain.fees.defaultPriorityFee({
+              block,
+              request: request as PrepareRequestParameters,
+            })
+    }
+
     // EIP-1559 fees
     if (typeof maxFeePerGas === 'undefined') {
       // Set a buffer of 1.2x on top of the base fee to account for fluctuations.
-      request.maxPriorityFeePerGas = maxPriorityFeePerGas ?? defaultTip
+      request.maxPriorityFeePerGas = maxPriorityFeePerGas ?? defaultPriorityFee
       request.maxFeePerGas =
         (block.baseFeePerGas * 120n) / 100n + request.maxPriorityFeePerGas
     } else {
       if (
         typeof maxPriorityFeePerGas === 'undefined' &&
-        maxFeePerGas < defaultTip
+        maxFeePerGas < defaultPriorityFee
       )
         throw new BaseError(
           '`maxFeePerGas` cannot be less than the default `maxPriorityFeePerGas` (1.5 gwei).',
         )
       request.maxFeePerGas = maxFeePerGas
-      request.maxPriorityFeePerGas = maxPriorityFeePerGas ?? defaultTip
+      request.maxPriorityFeePerGas = maxPriorityFeePerGas ?? defaultPriorityFee
     }
   } else if (typeof gasPrice === 'undefined') {
     // Legacy fees
@@ -113,5 +134,10 @@ export async function prepareRequest<
 
   assertRequest(request as AssertRequestParameters)
 
-  return request as PrepareRequestReturnType<TAccount, TParameters>
+  return request as PrepareRequestReturnType<
+    TChain,
+    TAccount,
+    TChainOverride,
+    TArgs
+  >
 }

package/src/utils/typedData.ts

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