viem 2.17.2 → 2.17.4

package/utils/signature/hashMessage.ts

@@ -5,15 +5,15 @@ import { toPrefixedMessage } from './toPrefixedMessage.js'
 
 type To = 'hex' | 'bytes'
 
-export type HashMessage<TTo extends To> =
-  | (TTo extends 'bytes' ? ByteArray : never)
-  | (TTo extends 'hex' ? Hex : never)
+export type HashMessage<to extends To> =
+  | (to extends 'bytes' ? ByteArray : never)
+  | (to extends 'hex' ? Hex : never)
 
 export type HashMessageErrorType = Keccak256ErrorType | ErrorType
 
-export function hashMessage<TTo extends To = 'hex'>(
+export function hashMessage<to extends To = 'hex'>(
   message: SignableMessage,
-  to_?: TTo | undefined,
-): HashMessage<TTo> {
+  to_?: to | undefined,
+): HashMessage<to> {
   return keccak256(toPrefixedMessage(message), to_)
 }

package/utils/transaction/parseTransaction.ts

@@ -59,14 +59,14 @@ import {
 } from './getSerializedTransactionType.js'
 
 export type ParseTransactionReturnType<
-  TSerialized extends TransactionSerializedGeneric = TransactionSerialized,
-  TType extends TransactionType = GetSerializedTransactionType<TSerialized>,
-> = IsNarrowable<TSerialized, Hex> extends true
+  serialized extends TransactionSerializedGeneric = TransactionSerialized,
+  type extends TransactionType = GetSerializedTransactionType<serialized>,
+> = IsNarrowable<serialized, Hex> extends true
   ?
-      | (TType extends 'eip1559' ? TransactionSerializableEIP1559 : never)
-      | (TType extends 'eip2930' ? TransactionSerializableEIP2930 : never)
-      | (TType extends 'eip4844' ? TransactionSerializableEIP4844 : never)
-      | (TType extends 'legacy' ? TransactionSerializableLegacy : never)
+      | (type extends 'eip1559' ? TransactionSerializableEIP1559 : never)
+      | (type extends 'eip2930' ? TransactionSerializableEIP2930 : never)
+      | (type extends 'eip4844' ? TransactionSerializableEIP4844 : never)
+      | (type extends 'legacy' ? TransactionSerializableLegacy : never)
   : TransactionSerializable
 
 export type ParseTransactionErrorType =
@@ -77,28 +77,28 @@ export type ParseTransactionErrorType =
   | ParseTransactionLegacyErrorType
 
 export function parseTransaction<
-  const TSerialized extends TransactionSerializedGeneric,
->(serializedTransaction: TSerialized): ParseTransactionReturnType<TSerialized> {
+  const serialized extends TransactionSerializedGeneric,
+>(serializedTransaction: serialized): ParseTransactionReturnType<serialized> {
   const type = getSerializedTransactionType(serializedTransaction)
 
   if (type === 'eip1559')
     return parseTransactionEIP1559(
       serializedTransaction as TransactionSerializedEIP1559,
-    ) as ParseTransactionReturnType<TSerialized>
+    ) as ParseTransactionReturnType<serialized>
 
   if (type === 'eip2930')
     return parseTransactionEIP2930(
       serializedTransaction as TransactionSerializedEIP2930,
-    ) as ParseTransactionReturnType<TSerialized>
+    ) as ParseTransactionReturnType<serialized>
 
   if (type === 'eip4844')
     return parseTransactionEIP4844(
       serializedTransaction as TransactionSerializedEIP4844,
-    ) as ParseTransactionReturnType<TSerialized>
+    ) as ParseTransactionReturnType<serialized>
 
   return parseTransactionLegacy(
     serializedTransaction,
-  ) as ParseTransactionReturnType<TSerialized>
+  ) as ParseTransactionReturnType<serialized>
 }
 
 type ParseTransactionEIP4844ErrorType =

package/zksync/actions/getAllBalances.ts

@@ -8,17 +8,17 @@ import { hexToBigInt } from '../../utils/encoding/fromHex.js'
 import type { PublicZkSyncRpcSchema } from '../types/eip1193.js'
 
 export type GetAllBalancesParameters<
-  TAccount extends Account | undefined = Account | undefined,
-> = GetAccountParameter<TAccount>
+  account extends Account | undefined = Account | undefined,
+> = GetAccountParameter<account>
 
 export type GetAllBalancesReturnType = { [key: Address]: bigint }
 
 export async function getAllBalances<
-  TChain extends Chain | undefined,
-  TAccount extends Account | undefined,
+  chain extends Chain | undefined,
+  account extends Account | undefined,
 >(
-  client: Client<Transport, TChain, TAccount, PublicZkSyncRpcSchema>,
-  parameters: GetAllBalancesParameters<TAccount>,
+  client: Client<Transport, chain, account, PublicZkSyncRpcSchema>,
+  parameters: GetAllBalancesParameters<account>,
 ): Promise<GetAllBalancesReturnType> {
   const { account: account_ } = parameters
   const account = account_ ? parseAccount(account_) : client.account

package/zksync/actions/getBaseTokenL1Address.ts

@@ -8,10 +8,10 @@ import type { PublicZkSyncRpcSchema } from '../types/eip1193.js'
 export type GetBaseTokenL1AddressReturnType = Address
 
 export async function getBaseTokenL1Address<
-  TChain extends Chain | undefined,
-  TAccount extends Account | undefined,
+  chain extends Chain | undefined,
+  account extends Account | undefined,
 >(
-  client: Client<Transport, TChain, TAccount, PublicZkSyncRpcSchema>,
+  client: Client<Transport, chain, account, PublicZkSyncRpcSchema>,
 ): Promise<GetBaseTokenL1AddressReturnType> {
   const result = await client.request({ method: 'zks_getBaseTokenL1Address' })
   return result

package/zksync/actions/getBlockDetails.ts

@@ -13,10 +13,10 @@ export type GetBlockDetailsParameters = ZkSyncNumberParameter
 export type GetBlockDetailsReturnType = ZkSyncBlockDetails
 
 export async function getBlockDetails<
-  TChain extends Chain | undefined,
-  TAccount extends Account | undefined,
+  chain extends Chain | undefined,
+  account extends Account | undefined,
 >(
-  client: Client<Transport, TChain, TAccount, PublicZkSyncRpcSchema>,
+  client: Client<Transport, chain, account, PublicZkSyncRpcSchema>,
   parameters: GetBlockDetailsParameters,
 ): Promise<GetBlockDetailsReturnType> {
   const result = await client.request({

package/zksync/actions/getBridgehubContractAddress.ts

@@ -8,10 +8,10 @@ import type { PublicZkSyncRpcSchema } from '../types/eip1193.js'
 export type GetBridgehubContractAddressReturnType = Address
 
 export async function getBridgehubContractAddress<
-  TChain extends Chain | undefined,
-  TAccount extends Account | undefined,
+  chain extends Chain | undefined,
+  account extends Account | undefined,
 >(
-  client: Client<Transport, TChain, TAccount, PublicZkSyncRpcSchema>,
+  client: Client<Transport, chain, account, PublicZkSyncRpcSchema>,
 ): Promise<GetBridgehubContractAddressReturnType> {
   const result = await client.request({ method: 'zks_getBridgehubContract' })
   return result

package/zksync/actions/getDefaultBridgeAddresses.ts

@@ -8,10 +8,10 @@ import type { PublicZkSyncRpcSchema } from '../types/eip1193.js'
 export type GetDefaultBridgeAddressesReturnType = BridgeContractAddresses
 
 export async function getDefaultBridgeAddresses<
-  TChain extends Chain | undefined,
-  TAccount extends Account | undefined,
+  chain extends Chain | undefined,
+  account extends Account | undefined,
 >(
-  client: Client<Transport, TChain, TAccount, PublicZkSyncRpcSchema>,
+  client: Client<Transport, chain, account, PublicZkSyncRpcSchema>,
 ): Promise<GetDefaultBridgeAddressesReturnType> {
   const addresses = await client.request({ method: 'zks_getBridgeContracts' })
   return {

package/zksync/actions/getL1Allowance.ts

@@ -11,8 +11,8 @@ import type { BlockTag } from '../../types/block.js'
 import type { Chain } from '../../types/chain.js'
 
 export type GetL1AllowanceParameters<
-  TAccount extends Account | undefined = Account | undefined,
-> = GetAccountParameter<TAccount> & {
+  account extends Account | undefined = Account | undefined,
+> = GetAccountParameter<account> & {
   bridgeAddress: Address
   blockTag?: BlockTag
   token: Address
@@ -23,11 +23,11 @@ export type GetL1AllowanceReturnType = bigint
 export type GetL1AllowanceErrorType = AccountNotFoundError | BaseError
 
 export async function getL1Allowance<
-  TChain extends Chain | undefined,
-  TAccount extends Account | undefined,
+  chain extends Chain | undefined,
+  account extends Account | undefined,
 >(
-  client: Client<Transport, TChain, TAccount>,
-  parameters: GetL1AllowanceParameters<TAccount>,
+  client: Client<Transport, chain, account>,
+  parameters: GetL1AllowanceParameters<account>,
 ): Promise<GetL1AllowanceReturnType> {
   const { token, bridgeAddress, blockTag, account: account_ } = parameters
 

package/zksync/actions/getL1Balance.ts

@@ -19,8 +19,8 @@ import {
 } from './getL1TokenBalance.js'
 
 export type GetL1BalanceParameters<
-  TAccount extends Account | undefined = Account | undefined,
-> = GetAccountParameter<TAccount> & { token?: Address | undefined } & (
+  account extends Account | undefined = Account | undefined,
+> = GetAccountParameter<account> & { token?: Address | undefined } & (
     | {
         /** The balance of the account at a block number. */
         blockNumber?: bigint | undefined
@@ -38,13 +38,13 @@ export type GetL1BalanceReturnType = bigint
 export type GetL1BalanceErrorType = AccountNotFoundError | BaseError
 
 export async function getL1Balance<
-  TChain extends Chain | undefined,
-  TAccount extends Account | undefined,
+  chain extends Chain | undefined,
+  account extends Account | undefined,
 >(
-  client: Client<Transport, TChain, TAccount>,
-  ...[parameters = {}]: TAccount extends undefined
-    ? [GetL1BalanceParameters<TAccount>]
-    : [GetL1BalanceParameters<TAccount>] | []
+  client: Client<Transport, chain, account>,
+  ...[parameters = {}]: account extends undefined
+    ? [GetL1BalanceParameters<account>]
+    : [GetL1BalanceParameters<account>] | []
 ): Promise<GetL1BalanceReturnType> {
   const {
     account: account_ = client.account,
@@ -63,6 +63,6 @@ export async function getL1Balance<
     } as GetBalanceParameters)
 
   return await getL1TokenBalance(client, {
-    ...(parameters as GetL1TokenBalanceParameters<TAccount>),
+    ...(parameters as GetL1TokenBalanceParameters<account>),
   })
 }

package/zksync/actions/getL1BatchBlockRange.ts

@@ -12,10 +12,10 @@ export type GetL1BatchBlockRangeParameters = {
 export type GetL1BatchBlockRangeReturnParameters = [number, number]
 
 export async function getL1BatchBlockRange<
-  TChain extends Chain | undefined,
-  TAccount extends Account | undefined,
+  chain extends Chain | undefined,
+  account extends Account | undefined,
 >(
-  client: Client<Transport, TChain, TAccount, PublicZkSyncRpcSchema>,
+  client: Client<Transport, chain, account, PublicZkSyncRpcSchema>,
   parameters: GetL1BatchBlockRangeParameters,
 ): Promise<GetL1BatchBlockRangeReturnParameters> {
   const [number_1, number_2] = await client.request({

package/zksync/actions/getL1BatchDetails.ts

@@ -13,10 +13,10 @@ export type GetL1BatchDetailsParameters = ZkSyncNumberParameter
 export type GetL1BatchDetailsReturnType = ZkSyncBatchDetails
 
 export async function getL1BatchDetails<
-  TChain extends Chain | undefined,
-  TAccount extends Account | undefined,
+  chain extends Chain | undefined,
+  account extends Account | undefined,
 >(
-  client: Client<Transport, TChain, TAccount, PublicZkSyncRpcSchema>,
+  client: Client<Transport, chain, account, PublicZkSyncRpcSchema>,
   parameters: GetL1BatchDetailsParameters,
 ): Promise<GetL1BatchDetailsReturnType> {
   const result = await client.request({

package/zksync/actions/getL1BatchNumber.ts

@@ -8,10 +8,10 @@ import type { PublicZkSyncRpcSchema } from '../types/eip1193.js'
 export type GetL1BatchNumberReturnType = Hex
 
 export async function getL1BatchNumber<
-  TChain extends Chain | undefined,
-  TAccount extends Account | undefined,
+  chain extends Chain | undefined,
+  account extends Account | undefined,
 >(
-  client: Client<Transport, TChain, TAccount, PublicZkSyncRpcSchema>,
+  client: Client<Transport, chain, account, PublicZkSyncRpcSchema>,
 ): Promise<GetL1BatchNumberReturnType> {
   const result = await client.request({ method: 'zks_L1BatchNumber' })
   return result

package/zksync/actions/getL1ChainId.ts

@@ -8,10 +8,10 @@ import type { PublicZkSyncRpcSchema } from '../types/eip1193.js'
 export type GetL1ChainIdReturnType = Hex
 
 export async function getL1ChainId<
-  TChain extends Chain | undefined,
-  TAccount extends Account | undefined,
+  chain extends Chain | undefined,
+  account extends Account | undefined,
 >(
-  client: Client<Transport, TChain, TAccount, PublicZkSyncRpcSchema>,
+  client: Client<Transport, chain, account, PublicZkSyncRpcSchema>,
 ): Promise<GetL1ChainIdReturnType> {
   const result = await client.request({ method: 'zks_L1ChainId' })
   return result

package/zksync/actions/getL1TokenBalance.ts

@@ -16,8 +16,8 @@ import {
 import { isEth } from '../utils/isEth.js'
 
 export type GetL1TokenBalanceParameters<
-  TAccount extends Account | undefined = Account | undefined,
-> = GetAccountParameter<TAccount> & { token: Address } & (
+  account extends Account | undefined = Account | undefined,
+> = GetAccountParameter<account> & { token: Address } & (
     | {
         /** The balance of the account at a block number. */
         blockNumber?: bigint | undefined
@@ -38,11 +38,11 @@ export type GetL1TokenBalanceErrorType =
   | BaseErrorType
 
 export async function getL1TokenBalance<
-  TChain extends Chain | undefined,
-  TAccount extends Account | undefined,
+  chain extends Chain | undefined,
+  account extends Account | undefined,
 >(
-  client: Client<Transport, TChain, TAccount>,
-  parameters: GetL1TokenBalanceParameters<TAccount>,
+  client: Client<Transport, chain, account>,
+  parameters: GetL1TokenBalanceParameters<account>,
 ): Promise<GetL1TokenBalanceReturnType> {
   const {
     account: account_ = client.account,

package/zksync/actions/getLogProof.ts

@@ -14,10 +14,10 @@ export type GetLogProofParameters = {
 export type GetLogProofReturnType = MessageProof | null
 
 export async function getLogProof<
-  TChain extends Chain | undefined,
-  TAccount extends Account | undefined,
+  chain extends Chain | undefined,
+  account extends Account | undefined,
 >(
-  client: Client<Transport, TChain, TAccount, PublicZkSyncRpcSchema>,
+  client: Client<Transport, chain, account, PublicZkSyncRpcSchema>,
   parameters: GetLogProofParameters,
 ): Promise<MessageProof | null> {
   const result = await client.request({

package/zksync/actions/getMainContractAddress.ts

@@ -8,10 +8,10 @@ import type { PublicZkSyncRpcSchema } from '../types/eip1193.js'
 export type GetMainContractAddressReturnType = Address
 
 export async function getMainContractAddress<
-  TChain extends Chain | undefined,
-  TAccount extends Account | undefined,
+  chain extends Chain | undefined,
+  account extends Account | undefined,
 >(
-  client: Client<Transport, TChain, TAccount, PublicZkSyncRpcSchema>,
+  client: Client<Transport, chain, account, PublicZkSyncRpcSchema>,
 ): Promise<GetMainContractAddressReturnType> {
   const address = await client.request({ method: 'zks_getMainContract' })
   return address

package/zksync/actions/getRawBlockTransactions.ts

@@ -12,10 +12,10 @@ export type GetRawBlockTransactionsParameters = ZkSyncNumberParameter
 export type GetRawBlockTransactionsReturnType = ZkSyncRawBlockTransactions
 
 export async function getRawBlockTransactions<
-  TChain extends Chain | undefined,
-  TAccount extends Account | undefined,
+  chain extends Chain | undefined,
+  account extends Account | undefined,
 >(
-  client: Client<Transport, TChain, TAccount, PublicZkSyncRpcSchema>,
+  client: Client<Transport, chain, account, PublicZkSyncRpcSchema>,
   parameters: GetRawBlockTransactionsParameters,
 ): Promise<GetRawBlockTransactionsReturnType> {
   const result = await client.request({

package/zksync/actions/getTestnetPaymasterAddress.ts

@@ -8,10 +8,10 @@ import type { PublicZkSyncRpcSchema } from '../types/eip1193.js'
 export type GetTestnetPaymasterAddressReturnType = Address | null
 
 export async function getTestnetPaymasterAddress<
-  TChain extends Chain | undefined,
-  TAccount extends Account | undefined,
+  chain extends Chain | undefined,
+  account extends Account | undefined,
 >(
-  client: Client<Transport, TChain, TAccount, PublicZkSyncRpcSchema>,
+  client: Client<Transport, chain, account, PublicZkSyncRpcSchema>,
 ): Promise<GetTestnetPaymasterAddressReturnType> {
   const result = await client.request({ method: 'zks_getTestnetPaymaster' })
   return result

package/zksync/actions/getTransactionDetails.ts

@@ -13,10 +13,10 @@ export type GetTransactionDetailsParameters = {
 export type GetTransactionDetailsReturnType = ZkSyncTransactionDetails
 
 export async function getTransactionDetails<
-  TChain extends Chain | undefined,
-  TAccount extends Account | undefined,
+  chain extends Chain | undefined,
+  account extends Account | undefined,
 >(
-  client: Client<Transport, TChain, TAccount, PublicZkSyncRpcSchema>,
+  client: Client<Transport, chain, account, PublicZkSyncRpcSchema>,
   parameters: GetTransactionDetailsParameters,
 ): Promise<GetTransactionDetailsReturnType> {
   const result = await client.request({

package/zksync/actions/signEip712Transaction.ts

@@ -26,25 +26,25 @@ import {
 } from '../utils/assertEip712Request.js'
 
 type FormattedTransactionRequest<
-  TChain extends ChainEIP712 | undefined = ChainEIP712 | undefined,
+  chain extends ChainEIP712 | undefined = ChainEIP712 | undefined,
 > = ExtractChainFormatterParameters<
-  TChain,
+  chain,
   'transactionRequest',
   TransactionRequestEIP712
 >
 
 export type SignEip712TransactionParameters<
-  TChain extends ChainEIP712 | undefined = ChainEIP712 | undefined,
-  TAccount extends Account | undefined = Account | undefined,
-  TChainOverride extends ChainEIP712 | undefined = ChainEIP712 | undefined,
+  chain extends ChainEIP712 | undefined = ChainEIP712 | undefined,
+  account extends Account | undefined = Account | undefined,
+  chainOverride extends ChainEIP712 | undefined = ChainEIP712 | undefined,
 > = UnionOmit<
   FormattedTransactionRequest<
-    TChainOverride extends ChainEIP712 ? TChainOverride : TChain
+    chainOverride extends ChainEIP712 ? chainOverride : chain
   >,
   'from'
 > &
-  GetAccountParameter<TAccount> &
-  GetChainParameter<TChain, TChainOverride>
+  GetAccountParameter<account> &
+  GetChainParameter<chain, chainOverride>
 
 export type SignEip712TransactionReturnType = SignTransactionReturnType
 
@@ -89,12 +89,12 @@ export type SignEip712TransactionErrorType = SignTransactionErrorType
  * })
  */
 export async function signEip712Transaction<
-  TChain extends ChainEIP712 | undefined,
-  TAccount extends Account | undefined,
-  TChainOverride extends ChainEIP712 | undefined,
+  chain extends ChainEIP712 | undefined,
+  account extends Account | undefined,
+  chainOverride extends ChainEIP712 | undefined,
 >(
-  client: Client<Transport, TChain, TAccount>,
-  args: SignEip712TransactionParameters<TChain, TAccount, TChainOverride>,
+  client: Client<Transport, chain, account>,
+  args: SignEip712TransactionParameters<chain, account, chainOverride>,
 ): Promise<SignEip712TransactionReturnType> {
   const {
     account: account_ = client.account,

package/zksync/actions/signTransaction.ts

@@ -18,25 +18,25 @@ import { isEIP712Transaction } from '../utils/isEip712Transaction.js'
 import { signEip712Transaction } from './signEip712Transaction.js'
 
 type FormattedTransactionRequest<
-  TChain extends ChainEIP712 | undefined = ChainEIP712 | undefined,
+  chain extends ChainEIP712 | undefined = ChainEIP712 | undefined,
 > = ExtractChainFormatterParameters<
-  TChain,
+  chain,
   'transactionRequest',
   TransactionRequestEIP712
 >
 
 export type SignTransactionParameters<
-  TChain extends ChainEIP712 | undefined = ChainEIP712 | undefined,
-  TAccount extends Account | undefined = Account | undefined,
-  TChainOverride extends ChainEIP712 | undefined = ChainEIP712 | undefined,
+  chain extends ChainEIP712 | undefined = ChainEIP712 | undefined,
+  account extends Account | undefined = Account | undefined,
+  chainOverride extends ChainEIP712 | undefined = ChainEIP712 | undefined,
 > = UnionOmit<
   FormattedTransactionRequest<
-    TChainOverride extends ChainEIP712 ? TChainOverride : TChain
+    chainOverride extends ChainEIP712 ? chainOverride : chain
   >,
   'from'
 > &
-  GetAccountParameter<TAccount> &
-  GetChainParameter<TChain, TChainOverride>
+  GetAccountParameter<account> &
+  GetChainParameter<chain, chainOverride>
 
 export type SignTransactionReturnType = SignTransactionReturnType_
 
@@ -83,12 +83,12 @@ export type SignTransactionErrorType = SignTransactionErrorType_
  * })
  */
 export async function signTransaction<
-  TChain extends ChainEIP712 | undefined,
-  TAccount extends Account | undefined,
-  TChainOverride extends ChainEIP712 | undefined,
+  chain extends ChainEIP712 | undefined,
+  account extends Account | undefined,
+  chainOverride extends ChainEIP712 | undefined,
 >(
-  client: Client<Transport, TChain, TAccount>,
-  args: SignTransactionParameters<TChain, TAccount, TChainOverride>,
+  client: Client<Transport, chain, account>,
+  args: SignTransactionParameters<chain, account, chainOverride>,
 ): Promise<SignTransactionReturnType> {
   if (isEIP712Transaction(args)) return signEip712Transaction(client, args)
   return await signTransaction_(client, args as any)

package/zksync/decorators/publicL1.ts

@@ -19,7 +19,7 @@ import {
 } from '../actions/getL1TokenBalance.js'
 
 export type PublicActionsL1<
-  TAccount extends Account | undefined = Account | undefined,
+  account extends Account | undefined = Account | undefined,
 > = {
   /**
    * Returns the amount of approved tokens for a specific L1 bridge.
@@ -65,7 +65,7 @@ export type PublicActionsL1<
    * })
    */
   getL1Allowance: (
-    parameters: GetL1AllowanceParameters<TAccount>,
+    parameters: GetL1AllowanceParameters<account>,
   ) => Promise<GetL1AllowanceReturnType>
   /**
    * Returns the amount of the ERC20 token the client has on specific address.
@@ -109,7 +109,7 @@ export type PublicActionsL1<
    * })
    */
   getL1TokenBalance: (
-    parameters: GetL1TokenBalanceParameters<TAccount>,
+    parameters: GetL1TokenBalanceParameters<account>,
   ) => Promise<GetL1TokenBalanceReturnType>
   /**
    * Returns the amount of the token held by the account on the L1 network.
@@ -159,19 +159,19 @@ export type PublicActionsL1<
    * })
    */
   getL1Balance: (
-    ...parameters: TAccount extends undefined
-      ? [GetL1BalanceParameters<TAccount>]
-      : [GetL1BalanceParameters<TAccount>] | []
+    ...parameters: account extends undefined
+      ? [GetL1BalanceParameters<account>]
+      : [GetL1BalanceParameters<account>] | []
   ) => Promise<GetL1BalanceReturnType>
 }
 
 export function publicActionsL1() {
   return <
-    TChain extends Chain | undefined = Chain | undefined,
-    TAccount extends Account | undefined = Account | undefined,
+    chain extends Chain | undefined = Chain | undefined,
+    account extends Account | undefined = Account | undefined,
   >(
-    client: Client<Transport, TChain, TAccount>,
-  ): PublicActionsL1<TAccount> => ({
+    client: Client<Transport, chain, account>,
+  ): PublicActionsL1<account> => ({
     getL1Allowance: (args) => getL1Allowance(client, args),
     getL1TokenBalance: (args) => getL1TokenBalance(client, args),
     // @ts-expect-error

package/zksync/decorators/publicL2.ts

@@ -78,8 +78,8 @@ import {
 import type { ChainEIP712 } from '../types/chain.js'
 
 export type PublicActionsL2<
-  TChain extends ChainEIP712 | undefined = ChainEIP712 | undefined,
-  TAccount extends Account | undefined = Account | undefined,
+  chain extends ChainEIP712 | undefined = ChainEIP712 | undefined,
+  account extends Account | undefined = Account | undefined,
 > = {
   /**
    * Returns the addresses of the default zkSync Era bridge contracts on both L1 and L2.
@@ -347,7 +347,7 @@ export type PublicActionsL2<
    * const details = await client.estimateFee({transactionRequest: {...}}});
    */
   estimateFee: (
-    args: EstimateFeeParameters<TChain, TAccount>,
+    args: EstimateFeeParameters<chain, account>,
   ) => Promise<EstimateFeeReturnType>
 
   /**
@@ -369,7 +369,7 @@ export type PublicActionsL2<
    * const details = await client.estimateGasL1ToL2({transactionRequest: {...}}});
    */
   estimateGasL1ToL2: (
-    args: EstimateGasL1ToL2Parameters<TChain, TAccount>,
+    args: EstimateGasL1ToL2Parameters<chain, account>,
   ) => Promise<EstimateGasL1ToL2ReturnType>
 
   /**
@@ -415,12 +415,12 @@ export type PublicActionsL2<
 
 export function publicActionsL2() {
   return <
-    TTransport extends Transport = Transport,
-    TChain extends ChainEIP712 | undefined = ChainEIP712 | undefined,
-    TAccount extends Account | undefined = Account | undefined,
+    transport extends Transport = Transport,
+    chain extends ChainEIP712 | undefined = ChainEIP712 | undefined,
+    account extends Account | undefined = Account | undefined,
   >(
-    client: Client<TTransport, TChain, TAccount>,
-  ): PublicActionsL2<TChain, TAccount> => {
+    client: Client<transport, chain, account>,
+  ): PublicActionsL2<chain, account> => {
     return {
       estimateGasL1ToL2: (args) => estimateGasL1ToL2(client, args),
       getDefaultBridgeAddresses: () => getDefaultBridgeAddresses(client),

package/zksync/types/block.ts

@@ -14,14 +14,14 @@ export type ZkSyncBatchDetails = Omit<
 }
 
 export type ZkSyncBlock<
-  TIncludeTransactions extends boolean = boolean,
-  TBlockTag extends BlockTag = BlockTag,
+  includeTransactions extends boolean = boolean,
+  blockTag extends BlockTag = BlockTag,
 > = Assign<
   Block<
     bigint,
-    TIncludeTransactions,
-    TBlockTag,
-    ZkSyncTransaction<TBlockTag extends 'pending' ? true : false>
+    includeTransactions,
+    blockTag,
+    ZkSyncTransaction<blockTag extends 'pending' ? true : false>
   >,
   {
     l1BatchNumber: bigint | null
@@ -52,13 +52,13 @@ export type ZkSyncBlockDetails = {
 }
 
 export type ZkSyncRpcBlock<
-  TBlockTag extends BlockTag = BlockTag,
-  TIncludeTransactions extends boolean = boolean,
+  blockTag extends BlockTag = BlockTag,
+  includeTransactions extends boolean = boolean,
 > = Assign<
   RpcBlock<
-    TBlockTag,
-    TIncludeTransactions,
-    ZkSyncRpcTransaction<TBlockTag extends 'pending' ? true : false>
+    blockTag,
+    includeTransactions,
+    ZkSyncRpcTransaction<blockTag extends 'pending' ? true : false>
   >,
   {
     l1BatchNumber: Hex | null