viem 2.17.2 → 2.17.4

package/clients/transports/createTransport.ts

@@ -6,15 +6,15 @@ import { uid as uid_ } from '../../utils/uid.js'
 import type { ClientConfig } from '../createClient.js'
 
 export type TransportConfig<
-  TType extends string = string,
-  TEIP1193RequestFn extends EIP1193RequestFn = EIP1193RequestFn,
+  type extends string = string,
+  eip1193RequestFn extends EIP1193RequestFn = EIP1193RequestFn,
 > = {
   /** The name of the transport. */
   name: string
   /** The key of the transport. */
   key: string
   /** The JSON-RPC request function that matches the EIP-1193 request spec. */
-  request: TEIP1193RequestFn
+  request: eip1193RequestFn
   /** The base delay (in ms) between retries. */
   retryDelay?: number | undefined
   /** The max number of times to retry. */
@@ -22,24 +22,24 @@ export type TransportConfig<
   /** The timeout (in ms) for requests. */
   timeout?: number | undefined
   /** The type of the transport. */
-  type: TType
+  type: type
 }
 
 export type Transport<
-  TType extends string = string,
-  TRpcAttributes = Record<string, any>,
-  TEIP1193RequestFn extends EIP1193RequestFn = EIP1193RequestFn,
-> = <TChain extends Chain | undefined = Chain>({
+  type extends string = string,
+  rpcAttributes = Record<string, any>,
+  eip1193RequestFn extends EIP1193RequestFn = EIP1193RequestFn,
+> = <chain extends Chain | undefined = Chain>({
   chain,
 }: {
-  chain?: TChain | undefined
+  chain?: chain | undefined
   pollingInterval?: ClientConfig['pollingInterval'] | undefined
   retryCount?: TransportConfig['retryCount'] | undefined
   timeout?: TransportConfig['timeout'] | undefined
 }) => {
-  config: TransportConfig<TType>
-  request: TEIP1193RequestFn
-  value?: TRpcAttributes | undefined
+  config: TransportConfig<type>
+  request: eip1193RequestFn
+  value?: rpcAttributes | undefined
 }
 
 export type CreateTransportErrorType = ErrorType
@@ -48,8 +48,8 @@ export type CreateTransportErrorType = ErrorType
  * @description Creates an transport intended to be used with a client.
  */
 export function createTransport<
-  TType extends string,
-  TRpcAttributes extends Record<string, any>,
+  type extends string,
+  rpcAttributes extends Record<string, any>,
 >(
   {
     key,
@@ -59,9 +59,9 @@ export function createTransport<
     retryDelay = 150,
     timeout,
     type,
-  }: TransportConfig<TType>,
-  value?: TRpcAttributes | undefined,
-): ReturnType<Transport<TType, TRpcAttributes>> {
+  }: TransportConfig<type>,
+  value?: rpcAttributes | undefined,
+): ReturnType<Transport<type, rpcAttributes>> {
   const uid = uid_()
   return {
     config: {

package/clients/transports/custom.ts

@@ -30,8 +30,8 @@ export type CustomTransportErrorType = CreateTransportErrorType | ErrorType
 /**
  * @description Creates a custom transport given an EIP-1193 compliant `request` attribute.
  */
-export function custom<TProvider extends EthereumProvider>(
-  provider: TProvider,
+export function custom<provider extends EthereumProvider>(
+  provider: provider,
   config: CustomTransportConfig = {},
 ): CustomTransport {
   const { key = 'custom', name = 'Custom Provider', retryDelay } = config

package/errors/rpc.ts

@@ -20,8 +20,8 @@ export type RpcErrorCode =
   | -32006 // JSON-RPC version not supported
   | -32042 // Method not found
 
-type RpcErrorOptions<TCode extends number = RpcErrorCode> = {
-  code?: TCode | (number & {}) | undefined
+type RpcErrorOptions<code extends number = RpcErrorCode> = {
+  code?: code | (number & {}) | undefined
   docsPath?: string | undefined
   metaMessages?: string[] | undefined
   shortMessage: string
@@ -33,14 +33,14 @@ type RpcErrorOptions<TCode extends number = RpcErrorCode> = {
  * - EIP https://eips.ethereum.org/EIPS/eip-1474
  */
 export type RpcErrorType = RpcError & { name: 'RpcError' }
-export class RpcError<TCode extends number = RpcErrorCode> extends BaseError {
+export class RpcError<code_ extends number = RpcErrorCode> extends BaseError {
   override name = 'RpcError'
 
-  code: TCode | (number & {})
+  code: code_ | (number & {})
 
   constructor(
     cause: Error,
-    { code, docsPath, metaMessages, shortMessage }: RpcErrorOptions<TCode>,
+    { code, docsPath, metaMessages, shortMessage }: RpcErrorOptions<code_>,
   ) {
     super(shortMessage, {
       cause,
@@ -51,7 +51,7 @@ export class RpcError<TCode extends number = RpcErrorCode> extends BaseError {
     this.name = cause.name
     this.code = (
       cause instanceof RpcRequestError ? cause.code : code ?? unknownErrorCode
-    ) as TCode
+    ) as code_
   }
 }
 

package/errors/version.ts

@@ -1 +1 @@
-export const version = '2.17.2'
+export const version = '2.17.4'

package/op-stack/actions/estimateL1Gas.ts

@@ -34,12 +34,12 @@ import { gasPriceOracleAbi } from '../abis.js'
 import { contracts } from '../contracts.js'
 
 export type EstimateL1GasParameters<
-  TChain extends Chain | undefined = Chain | undefined,
-  TAccount extends Account | undefined = Account | undefined,
-  TChainOverride extends Chain | undefined = Chain | undefined,
+  chain extends Chain | undefined = Chain | undefined,
+  account extends Account | undefined = Account | undefined,
+  chainOverride extends Chain | undefined = Chain | undefined,
 > = Omit<TransactionRequestEIP1559, 'from'> &
-  GetAccountParameter<TAccount> &
-  GetChainParameter<TChain, TChainOverride> & {
+  GetAccountParameter<account> &
+  GetChainParameter<chain, chainOverride> & {
     /** Gas price oracle address. */
     gasPriceOracleAddress?: Address | undefined
   }
@@ -78,12 +78,12 @@ export type EstimateL1GasErrorType =
  * })
  */
 export async function estimateL1Gas<
-  TChain extends Chain | undefined,
-  TAccount extends Account | undefined,
-  TChainOverride extends Chain | undefined = undefined,
+  chain extends Chain | undefined,
+  account extends Account | undefined,
+  chainOverride extends Chain | undefined = undefined,
 >(
-  client: Client<Transport, TChain, TAccount>,
-  args: EstimateL1GasParameters<TChain, TAccount, TChainOverride>,
+  client: Client<Transport, chain, account>,
+  args: EstimateL1GasParameters<chain, account, chainOverride>,
 ): Promise<EstimateL1GasReturnType> {
   const {
     chain = client.chain,

package/op-stack/actions/estimateTotalFee.ts

@@ -25,10 +25,10 @@ import {
 } from './estimateL1Fee.js'
 
 export type EstimateTotalFeeParameters<
-  TChain extends Chain | undefined = Chain | undefined,
-  TAccount extends Account | undefined = Account | undefined,
-  TChainOverride extends Chain | undefined = Chain | undefined,
-> = EstimateL1FeeParameters<TChain, TAccount, TChainOverride>
+  chain extends Chain | undefined = Chain | undefined,
+  account extends Account | undefined = Account | undefined,
+  chainOverride extends Chain | undefined = Chain | undefined,
+> = EstimateL1FeeParameters<chain, account, chainOverride>
 
 export type EstimateTotalFeeReturnType = bigint
 
@@ -63,12 +63,12 @@ export type EstimateTotalFeeErrorType =
  * })
  */
 export async function estimateTotalFee<
-  TChain extends Chain | undefined,
-  TAccount extends Account | undefined,
-  TChainOverride extends Chain | undefined = undefined,
+  chain extends Chain | undefined,
+  account extends Account | undefined,
+  chainOverride extends Chain | undefined = undefined,
 >(
-  client: Client<Transport, TChain, TAccount>,
-  args: EstimateTotalFeeParameters<TChain, TAccount, TChainOverride>,
+  client: Client<Transport, chain, account>,
+  args: EstimateTotalFeeParameters<chain, account, chainOverride>,
 ): Promise<EstimateTotalFeeReturnType> {
   // Populate transaction with required fields to accurately estimate gas.
   const request = await prepareTransactionRequest(

package/op-stack/actions/estimateTotalGas.ts

@@ -21,10 +21,10 @@ import {
 } from './estimateL1Gas.js'
 
 export type EstimateTotalGasParameters<
-  TChain extends Chain | undefined = Chain | undefined,
-  TAccount extends Account | undefined = Account | undefined,
-  TChainOverride extends Chain | undefined = Chain | undefined,
-> = EstimateL1GasParameters<TChain, TAccount, TChainOverride>
+  chain extends Chain | undefined = Chain | undefined,
+  account extends Account | undefined = Account | undefined,
+  chainOverride extends Chain | undefined = Chain | undefined,
+> = EstimateL1GasParameters<chain, account, chainOverride>
 
 export type EstimateTotalGasReturnType = bigint
 
@@ -58,12 +58,12 @@ export type EstimateTotalGasErrorType =
  * })
  */
 export async function estimateTotalGas<
-  TChain extends Chain | undefined,
-  TAccount extends Account | undefined,
-  TChainOverride extends Chain | undefined = undefined,
+  chain extends Chain | undefined,
+  account extends Account | undefined,
+  chainOverride extends Chain | undefined = undefined,
 >(
-  client: Client<Transport, TChain, TAccount>,
-  args: EstimateTotalGasParameters<TChain, TAccount, TChainOverride>,
+  client: Client<Transport, chain, account>,
+  args: EstimateTotalGasParameters<chain, account, chainOverride>,
 ): Promise<EstimateTotalGasReturnType> {
   // Populate transaction with required fields to accurately estimate gas.
   const request = await prepareTransactionRequest(

package/op-stack/actions/getL1BaseFee.ts

@@ -17,9 +17,9 @@ import { gasPriceOracleAbi } from '../abis.js'
 import { contracts } from '../contracts.js'
 
 export type GetL1BaseFeeParameters<
-  TChain extends Chain | undefined = Chain | undefined,
-  TChainOverride extends Chain | undefined = undefined,
-> = GetChainParameter<TChain, TChainOverride> & {
+  chain extends Chain | undefined = Chain | undefined,
+  chainOverride extends Chain | undefined = undefined,
+> = GetChainParameter<chain, chainOverride> & {
   /** Gas price oracle address. */
   gasPriceOracleAddress?: Address | undefined
 }
@@ -52,11 +52,11 @@ export type GetL1BaseFeeErrorType =
  * const l1BaseFee = await getL1BaseFee(client)
  */
 export async function getL1BaseFee<
-  TChain extends Chain | undefined,
-  TChainOverride extends Chain | undefined = undefined,
+  chain extends Chain | undefined,
+  chainOverride extends Chain | undefined = undefined,
 >(
-  client: Client<Transport, TChain>,
-  args?: GetL1BaseFeeParameters<TChain, TChainOverride> | undefined,
+  client: Client<Transport, chain>,
+  args?: GetL1BaseFeeParameters<chain, chainOverride> | undefined,
 ): Promise<GetL1BaseFeeReturnType> {
   const {
     chain = client.chain,

package/op-stack/decorators/publicL1.ts

@@ -661,12 +661,12 @@ export type PublicActionsL1<
  */
 export function publicActionsL1() {
   return <
-    TTransport extends Transport,
-    TChain extends Chain | undefined = Chain | undefined,
-    TAccount extends Account | undefined = Account | undefined,
+    transport extends Transport,
+    chain extends Chain | undefined = Chain | undefined,
+    account extends Account | undefined = Account | undefined,
   >(
-    client: Client<TTransport, TChain, TAccount>,
-  ): PublicActionsL1<TChain, TAccount> => {
+    client: Client<transport, chain, account>,
+  ): PublicActionsL1<chain, account> => {
     return {
       buildInitiateWithdrawal: (args) => buildInitiateWithdrawal(client, args),
       estimateDepositTransactionGas: (args) =>

package/op-stack/decorators/publicL2.ts

@@ -489,12 +489,12 @@ export type PublicActionsL2<
  */
 export function publicActionsL2() {
   return <
-    TTransport extends Transport,
-    TChain extends Chain | undefined = Chain | undefined,
-    TAccount extends Account | undefined = Account | undefined,
+    transport extends Transport,
+    chain extends Chain | undefined = Chain | undefined,
+    account extends Account | undefined = Account | undefined,
   >(
-    client: Client<TTransport, TChain, TAccount>,
-  ): PublicActionsL2<TChain, TAccount> => {
+    client: Client<transport, chain, account>,
+  ): PublicActionsL2<chain, account> => {
     return {
       buildDepositTransaction: (args) => buildDepositTransaction(client, args),
       buildProveWithdrawal: (args) => buildProveWithdrawal(client, args),

package/op-stack/decorators/walletL1.ts

@@ -157,12 +157,12 @@ export type WalletActionsL1<
  */
 export function walletActionsL1() {
   return <
-    TTransport extends Transport,
-    TChain extends Chain | undefined = Chain | undefined,
-    TAccount extends Account | undefined = Account | undefined,
+    transport extends Transport,
+    chain extends Chain | undefined = Chain | undefined,
+    account extends Account | undefined = Account | undefined,
   >(
-    client: Client<TTransport, TChain, TAccount>,
-  ): WalletActionsL1<TChain, TAccount> => {
+    client: Client<transport, chain, account>,
+  ): WalletActionsL1<chain, account> => {
     return {
       depositTransaction: (args) => depositTransaction(client, args),
       finalizeWithdrawal: (args) => finalizeWithdrawal(client, args),

package/op-stack/decorators/walletL2.ts

@@ -88,12 +88,12 @@ export type WalletActionsL2<
  */
 export function walletActionsL2() {
   return <
-    TTransport extends Transport,
-    TChain extends Chain | undefined = Chain | undefined,
-    TAccount extends Account | undefined = Account | undefined,
+    transport extends Transport,
+    chain extends Chain | undefined = Chain | undefined,
+    account extends Account | undefined = Account | undefined,
   >(
-    client: Client<TTransport, TChain, TAccount>,
-  ): WalletActionsL2<TChain, TAccount> => {
+    client: Client<transport, chain, account>,
+  ): WalletActionsL2<chain, account> => {
     return {
       initiateWithdrawal: (args) => initiateWithdrawal(client, args),
     }

package/op-stack/parsers.ts

@@ -19,29 +19,29 @@ import type {
 } from './types/transaction.js'
 
 export type ParseTransactionReturnType<
-  TSerialized extends
+  serialized extends
     OpStackTransactionSerialized = OpStackTransactionSerialized,
-  TType extends
-    OpStackTransactionType = GetSerializedTransactionType<TSerialized>,
-> = TSerialized extends TransactionSerializedDeposit
+  type extends
+    OpStackTransactionType = GetSerializedTransactionType<serialized>,
+> = serialized extends TransactionSerializedDeposit
   ? TransactionSerializableDeposit
-  : ParseTransactionReturnType_<TSerialized, TType>
+  : ParseTransactionReturnType_<serialized, type>
 
 export type ParseTransactionErrorType = ParseTransactionErrorType_ | ErrorType
 
 export function parseTransaction<
-  TSerialized extends OpStackTransactionSerialized,
->(serializedTransaction: TSerialized): ParseTransactionReturnType<TSerialized> {
+  serialized extends OpStackTransactionSerialized,
+>(serializedTransaction: serialized): ParseTransactionReturnType<serialized> {
   const serializedType = sliceHex(serializedTransaction, 0, 1)
 
   if (serializedType === '0x7e')
     return parseTransactionDeposit(
       serializedTransaction as TransactionSerializedDeposit,
-    ) as ParseTransactionReturnType<TSerialized>
+    ) as ParseTransactionReturnType<serialized>
 
   return parseTransaction_(
     serializedTransaction,
-  ) as ParseTransactionReturnType<TSerialized>
+  ) as ParseTransactionReturnType<serialized>
 }
 
 function parseTransactionDeposit(

package/op-stack/types/block.ts

@@ -10,13 +10,13 @@ export type OpStackBlockOverrides = {
   stateRoot: Hash
 }
 export type OpStackBlock<
-  TIncludeTransactions extends boolean = boolean,
-  TBlockTag extends BlockTag = BlockTag,
+  includeTransactions extends boolean = boolean,
+  blockTag extends BlockTag = BlockTag,
 > = Block<
   bigint,
-  TIncludeTransactions,
-  TBlockTag,
-  OpStackTransaction<TBlockTag extends 'pending' ? true : false>
+  includeTransactions,
+  blockTag,
+  OpStackTransaction<blockTag extends 'pending' ? true : false>
 > &
   OpStackBlockOverrides
 
@@ -24,11 +24,11 @@ export type OpStackRpcBlockOverrides = {
   stateRoot: Hash
 }
 export type OpStackRpcBlock<
-  TBlockTag extends BlockTag = BlockTag,
-  TIncludeTransactions extends boolean = boolean,
+  blockTag extends BlockTag = BlockTag,
+  includeTransactions extends boolean = boolean,
 > = RpcBlock<
-  TBlockTag,
-  TIncludeTransactions,
-  OpStackRpcTransaction<TBlockTag extends 'pending' ? true : false>
+  blockTag,
+  includeTransactions,
+  OpStackRpcTransaction<blockTag extends 'pending' ? true : false>
 > &
   OpStackRpcBlockOverrides

package/op-stack/types/transaction.ts

@@ -17,23 +17,23 @@ import type {
 } from '../../types/transaction.js'
 import type { OneOf } from '../../types/utils.js'
 
-type RpcTransaction<TPending extends boolean = boolean> =
-  RpcTransaction_<TPending> & {
+type RpcTransaction<pending extends boolean = boolean> =
+  RpcTransaction_<pending> & {
     isSystemTx?: undefined
     mint?: undefined
     sourceHash?: undefined
   }
 
-export type OpStackRpcDepositTransaction<TPending extends boolean = boolean> =
-  Omit<TransactionBase<Quantity, Index, TPending>, 'typeHex'> &
+export type OpStackRpcDepositTransaction<pending extends boolean = boolean> =
+  Omit<TransactionBase<Quantity, Index, pending>, 'typeHex'> &
     FeeValuesEIP1559<Quantity> & {
       isSystemTx?: boolean | undefined
       mint?: Hex | undefined
       sourceHash: Hex
       type: '0x7e'
     }
-export type OpStackRpcTransaction<TPending extends boolean = boolean> = OneOf<
-  RpcTransaction<TPending> | OpStackRpcDepositTransaction<TPending>
+export type OpStackRpcTransaction<pending extends boolean = boolean> = OneOf<
+  RpcTransaction<pending> | OpStackRpcDepositTransaction<pending>
 >
 
 export type OpStackRpcTransactionReceiptOverrides = {
@@ -45,18 +45,18 @@ export type OpStackRpcTransactionReceiptOverrides = {
 export type OpStackRpcTransactionReceipt = RpcTransactionReceipt &
   OpStackRpcTransactionReceiptOverrides
 
-type Transaction<TPending extends boolean = boolean> = Transaction_<
+type Transaction<pending extends boolean = boolean> = Transaction_<
   bigint,
   number,
-  TPending
+  pending
 > & {
   isSystemTx?: undefined
   mint?: undefined
   sourceHash?: undefined
 }
 
-export type OpStackDepositTransaction<TPending extends boolean = boolean> =
-  TransactionBase<bigint, number, TPending> &
+export type OpStackDepositTransaction<pending extends boolean = boolean> =
+  TransactionBase<bigint, number, pending> &
     FeeValuesEIP1559 & {
       isSystemTx?: boolean
       mint?: bigint | undefined
@@ -64,9 +64,9 @@ export type OpStackDepositTransaction<TPending extends boolean = boolean> =
       type: 'deposit'
     }
 
-export type OpStackTransaction<TPending extends boolean = boolean> =
-  | Transaction<TPending>
-  | OpStackDepositTransaction<TPending>
+export type OpStackTransaction<pending extends boolean = boolean> =
+  | Transaction<pending>
+  | OpStackDepositTransaction<pending>
 
 export type OpStackTransactionReceiptOverrides = {
   l1GasPrice: bigint | null
@@ -82,18 +82,18 @@ export type OpStackTransactionSerializable = OneOf<
 >
 
 export type OpStackTransactionSerialized<
-  TType extends OpStackTransactionType = OpStackTransactionType,
-> = TType extends 'deposit'
+  type extends OpStackTransactionType = OpStackTransactionType,
+> = type extends 'deposit'
   ? TransactionSerializedDeposit
-  : TransactionSerialized<TType>
+  : TransactionSerialized<type>
 
 export type OpStackTransactionType = TransactionType | 'deposit'
 
 export type TransactionSerializableDeposit<
-  TQuantity = bigint,
-  TIndex = number,
+  quantity = bigint,
+  index = number,
 > = Omit<
-  TransactionSerializableBase<TQuantity, TIndex>,
+  TransactionSerializableBase<quantity, index>,
   'nonce' | 'r' | 's' | 'v'
 > & {
   from: Hex

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "viem",
   "description": "TypeScript Interface for Ethereum",
-  "version": "2.17.2",
+  "version": "2.17.4",
   "main": "./_cjs/index.js",
   "module": "./_esm/index.js",
   "types": "./_types/index.d.ts",

package/types/account.ts

@@ -9,23 +9,23 @@ export type DeriveAccount<
 > = accountOverride extends Account | Address ? accountOverride : account
 
 export type GetAccountParameter<
-  TAccount extends Account | undefined = Account | undefined,
-  TAccountOverride extends Account | Address | undefined = Account | Address,
-  TRequired extends boolean = true,
-> = IsUndefined<TAccount> extends true
-  ? TRequired extends true
-    ? { account: TAccountOverride | Account | Address }
-    : { account?: TAccountOverride | Account | Address | undefined }
-  : { account?: TAccountOverride | Account | Address | undefined }
+  account extends Account | undefined = Account | undefined,
+  accountOverride extends Account | Address | undefined = Account | Address,
+  required extends boolean = true,
+> = IsUndefined<account> extends true
+  ? required extends true
+    ? { account: accountOverride | Account | Address }
+    : { account?: accountOverride | Account | Address | undefined }
+  : { account?: accountOverride | Account | Address | undefined }
 
 export type ParseAccount<
-  TAccountOrAddress extends Account | Address | undefined =
+  accountOrAddress extends Account | Address | undefined =
     | Account
     | Address
     | undefined,
-> = TAccountOrAddress extends Address
-  ? Prettify<JsonRpcAccount<TAccountOrAddress>>
-  : TAccountOrAddress
+> = accountOrAddress extends Address
+  ? Prettify<JsonRpcAccount<accountOrAddress>>
+  : accountOrAddress
 
 export type { Account } from '../accounts/types.js'
 export type { HDKey } from '@scure/bip32'

package/types/block.ts

@@ -6,12 +6,12 @@ import type { Withdrawal } from './withdrawal.js'
 
 export type Block<
   quantity = bigint,
-  TIncludeTransactions extends boolean = boolean,
-  TBlockTag extends BlockTag = BlockTag,
-  TTransaction = Transaction<
+  includeTransactions extends boolean = boolean,
+  blockTag extends BlockTag = BlockTag,
+  transaction = Transaction<
     bigint,
     number,
-    TBlockTag extends 'pending' ? true : false
+    blockTag extends 'pending' ? true : false
   >,
 > = {
   /** Base fee per gas */
@@ -29,17 +29,17 @@ export type Block<
   /** Total used gas by all transactions in this block */
   gasUsed: quantity
   /** Block hash or `null` if pending */
-  hash: TBlockTag extends 'pending' ? null : Hash
+  hash: blockTag extends 'pending' ? null : Hash
   /** Logs bloom filter or `null` if pending */
-  logsBloom: TBlockTag extends 'pending' ? null : Hex
+  logsBloom: blockTag extends 'pending' ? null : Hex
   /** Address that received this block’s mining rewards */
   miner: Address
   /** Unique identifier for the block. */
   mixHash: Hash
   /** Proof-of-work hash or `null` if pending */
-  nonce: TBlockTag extends 'pending' ? null : Hex
+  nonce: blockTag extends 'pending' ? null : Hex
   /** Block number or `null` if pending */
-  number: TBlockTag extends 'pending' ? null : quantity
+  number: blockTag extends 'pending' ? null : quantity
   /** Parent block hash */
   parentHash: Hash
   /** Root of the this block’s receipts trie */
@@ -56,7 +56,7 @@ export type Block<
   /** Total difficulty of the chain until this block */
   totalDifficulty: quantity | null
   /** List of transaction objects or hashes */
-  transactions: TIncludeTransactions extends true ? TTransaction[] : Hash[]
+  transactions: includeTransactions extends true ? transaction[] : Hash[]
   /** Root of this block’s transaction trie */
   transactionsRoot: Hash
   /** List of uncle hashes */
@@ -87,11 +87,11 @@ export type BlockTag = 'latest' | 'earliest' | 'pending' | 'safe' | 'finalized'
 
 export type Uncle<
   quantity = bigint,
-  TIncludeTransactions extends boolean = boolean,
-  TBlockTag extends BlockTag = BlockTag,
-  TTransaction = Transaction<
+  includeTransactions extends boolean = boolean,
+  blockTag extends BlockTag = BlockTag,
+  transaction = Transaction<
     bigint,
     number,
-    TBlockTag extends 'pending' ? true : false
+    blockTag extends 'pending' ? true : false
   >,
-> = Block<quantity, TIncludeTransactions, TBlockTag, TTransaction>
+> = Block<quantity, includeTransactions, blockTag, transaction>