viem 0.3.16 → 0.3.18

package/src/actions/getContract.ts

@@ -10,42 +10,54 @@ import type {
   ExtractAbiFunctionNames,
   Narrow,
 } from 'abitype'
-import type { PublicClient, Transport, WalletClient } from '../clients/index.js'
+
+import type { Account } from '../accounts/types.js'
+import type { PublicClient } from '../clients/createPublicClient.js'
+import type { WalletClient } from '../clients/createWalletClient.js'
+import type { Transport } from '../clients/transports/createTransport.js'
+import type { Chain } from '../types/chain.js'
 import type {
   AbiEventParametersToPrimitiveTypes,
-  Account,
-  Chain,
+  MaybeExtractEventArgsFromAbi,
+} from '../types/contract.js'
+import type {
   IsNarrowable,
   IsNever,
   IsUndefined,
-  MaybeExtractEventArgsFromAbi,
   Or,
   Prettify,
-} from '../types/index.js'
+} from '../types/utils.js'
+
 import {
+  type CreateContractEventFilterParameters,
+  type CreateContractEventFilterReturnType,
   createContractEventFilter,
+} from './public/createContractEventFilter.js'
+import {
+  type EstimateContractGasParameters,
+  type EstimateContractGasReturnType,
+  estimateContractGas,
+} from './public/estimateContractGas.js'
+import {
+  type ReadContractParameters,
+  type ReadContractReturnType,
   readContract,
+} from './public/readContract.js'
+import {
+  type SimulateContractParameters,
+  type SimulateContractReturnType,
   simulateContract,
-  estimateContractGas,
+} from './public/simulateContract.js'
+import {
+  type WatchContractEventParameters,
+  type WatchContractEventReturnType,
   watchContractEvent,
-} from './public/index.js'
-import type {
-  WatchContractEventParameters,
-  WatchContractEventReturnType,
-  ReadContractParameters,
-  ReadContractReturnType,
-  SimulateContractParameters,
-  EstimateContractGasParameters,
-  CreateContractEventFilterParameters,
-  CreateContractEventFilterReturnType,
-  EstimateContractGasReturnType,
-  SimulateContractReturnType,
-} from './public/index.js'
-import { writeContract } from './wallet/index.js'
-import type {
-  WriteContractParameters,
-  WriteContractReturnType,
-} from './wallet/index.js'
+} from './public/watchContractEvent.js'
+import {
+  type WriteContractParameters,
+  type WriteContractReturnType,
+  writeContract,
+} from './wallet/writeContract.js'
 
 export type GetContractParameters<
   TTransport extends Transport = Transport,

package/src/actions/public/call.ts

@@ -1,38 +1,37 @@
-import type { PublicClient, Transport } from '../../clients/index.js'
-import { aggregate3Signature, multicall3Abi } from '../../constants/index.js'
+import type { Address } from 'abitype'
+
+import type { Account } from '../../accounts/types.js'
+import { parseAccount } from '../../accounts/utils/parseAccount.js'
+import type { PublicClient } from '../../clients/createPublicClient.js'
+import type { Transport } from '../../clients/transports/createTransport.js'
+import { multicall3Abi } from '../../constants/abis.js'
+import { aggregate3Signature } from '../../constants/contract.js'
+import { BaseError } from '../../errors/base.js'
 import {
-  BaseError,
   ChainDoesNotSupportContract,
   ClientChainNotConfiguredError,
-  RawContractError,
-} from '../../errors/index.js'
-import type {
-  Account,
-  Address,
-  BlockTag,
-  Chain,
-  Formatter,
-  Hex,
-  MergeIntersectionProperties,
-  TransactionRequest,
-} from '../../types/index.js'
-import type {
-  Formatted,
-  TransactionRequestFormatter,
-} from '../../utils/index.js'
+} from '../../errors/chain.js'
+import { RawContractError } from '../../errors/contract.js'
+import type { BlockTag } from '../../types/block.js'
+import type { Chain } from '../../types/chain.js'
+import type { Formatter } from '../../types/formatter.js'
+import type { Hex } from '../../types/misc.js'
+import type { RpcTransactionRequest } from '../../types/rpc.js'
+import type { TransactionRequest } from '../../types/transaction.js'
+import type { MergeIntersectionProperties } from '../../types/utils.js'
+import { decodeFunctionResult } from '../../utils/abi/decodeFunctionResult.js'
+import { encodeFunctionData } from '../../utils/abi/encodeFunctionData.js'
+import { getChainContractAddress } from '../../utils/chain.js'
+import { numberToHex } from '../../utils/encoding/toHex.js'
+import { getCallError } from '../../utils/errors/getCallError.js'
+import { extract } from '../../utils/formatters/extract.js'
+import { type Formatted, format } from '../../utils/formatters/format.js'
 import {
-  assertRequest,
-  decodeFunctionResult,
-  encodeFunctionData,
-  extract,
-  format,
+  type TransactionRequestFormatter,
   formatTransactionRequest,
-  getCallError,
-  getChainContractAddress,
-  numberToHex,
-  parseAccount,
-} from '../../utils/index.js'
+} from '../../utils/formatters/transactionRequest.js'
 import { createBatchScheduler } from '../../utils/promise/createBatchScheduler.js'
+import { assertRequest } from '../../utils/transaction/assertRequest.js'
 
 export type FormattedCall<
   TFormatter extends Formatter | undefined = Formatter,
@@ -115,6 +114,8 @@ export async function call<TChain extends Chain | undefined>(
     assertRequest(args)
 
     const blockNumberHex = blockNumber ? numberToHex(blockNumber) : undefined
+    const block = blockNumberHex || blockTag
+
     const formatter = client.chain?.formatters?.transactionRequest
     const request = format(
       {
@@ -154,7 +155,9 @@ export async function call<TChain extends Chain | undefined>(
 
     const response = await client.request({
       method: 'eth_call',
-      params: [request as any, blockNumberHex || blockTag],
+      params: block
+        ? [request as Partial<RpcTransactionRequest>, block]
+        : [request as Partial<RpcTransactionRequest>],
     })
     if (response === '0x') return { data: undefined }
     return { data: response }

package/src/actions/public/createBlockFilter.ts

@@ -1,5 +1,7 @@
-import type { PublicClient, Transport } from '../../clients/index.js'
-import type { Chain, Filter } from '../../types/index.js'
+import type { PublicClient } from '../../clients/createPublicClient.js'
+import type { Transport } from '../../clients/transports/createTransport.js'
+import type { Chain } from '../../types/chain.js'
+import type { Filter } from '../../types/filter.js'
 import { createFilterRequestScope } from '../../utils/filters/createFilterRequestScope.js'
 
 export type CreateBlockFilterReturnType = Filter<'block'>

package/src/actions/public/createContractEventFilter.ts

@@ -1,17 +1,19 @@
-import type { Abi, Narrow } from 'abitype'
-import type { PublicClient, Transport } from '../../clients/index.js'
+import type { Abi, Address, Narrow } from 'abitype'
 
+import type { PublicClient } from '../../clients/createPublicClient.js'
+import type { Transport } from '../../clients/transports/createTransport.js'
+import type { BlockNumber, BlockTag } from '../../types/block.js'
+import type { Chain } from '../../types/chain.js'
 import type {
-  Address,
-  BlockNumber,
-  BlockTag,
-  Chain,
   InferEventName,
-  Filter,
   MaybeExtractEventArgsFromAbi,
-} from '../../types/index.js'
-import { encodeEventTopics, numberToHex } from '../../utils/index.js'
-import type { EncodeEventTopicsParameters } from '../../utils/index.js'
+} from '../../types/contract.js'
+import type { Filter } from '../../types/filter.js'
+import {
+  type EncodeEventTopicsParameters,
+  encodeEventTopics,
+} from '../../utils/abi/encodeEventTopics.js'
+import { numberToHex } from '../../utils/encoding/toHex.js'
 import { createFilterRequestScope } from '../../utils/filters/createFilterRequestScope.js'
 
 export type CreateContractEventFilterParameters<

package/src/actions/public/createEventFilter.ts

@@ -1,19 +1,21 @@
-import type { Abi, AbiEvent, Narrow } from 'abitype'
-import type { PublicClient, Transport } from '../../clients/index.js'
+import type { Abi, AbiEvent, Address, Narrow } from 'abitype'
 
+import type { PublicClient } from '../../clients/createPublicClient.js'
+import type { Transport } from '../../clients/transports/createTransport.js'
+import type { BlockNumber, BlockTag } from '../../types/block.js'
+import type { Chain } from '../../types/chain.js'
 import type {
-  Address,
-  BlockNumber,
-  BlockTag,
-  Chain,
-  Filter,
-  LogTopic,
   MaybeAbiEventName,
   MaybeExtractEventArgsFromAbi,
-  Prettify,
-} from '../../types/index.js'
-import { encodeEventTopics, numberToHex } from '../../utils/index.js'
-import type { EncodeEventTopicsParameters } from '../../utils/index.js'
+} from '../../types/contract.js'
+import type { Filter } from '../../types/filter.js'
+import type { LogTopic } from '../../types/misc.js'
+import type { Prettify } from '../../types/utils.js'
+import {
+  type EncodeEventTopicsParameters,
+  encodeEventTopics,
+} from '../../utils/abi/encodeEventTopics.js'
+import { numberToHex } from '../../utils/encoding/toHex.js'
 import { createFilterRequestScope } from '../../utils/filters/createFilterRequestScope.js'
 
 export type CreateEventFilterParameters<

package/src/actions/public/createPendingTransactionFilter.ts

@@ -1,5 +1,7 @@
-import type { PublicClient, Transport } from '../../clients/index.js'
-import type { Chain, Filter } from '../../types/index.js'
+import type { PublicClient } from '../../clients/createPublicClient.js'
+import type { Transport } from '../../clients/transports/createTransport.js'
+import type { Chain } from '../../types/chain.js'
+import type { Filter } from '../../types/filter.js'
 import { createFilterRequestScope } from '../../utils/filters/createFilterRequestScope.js'
 
 export type CreatePendingTransactionFilterReturnType = Filter<'transaction'>

package/src/actions/public/estimateContractGas.ts

@@ -1,20 +1,18 @@
 import type { Abi } from 'abitype'
 
-import type { PublicClient, Transport } from '../../clients/index.js'
-import type { BaseError } from '../../errors/index.js'
-import type {
-  Chain,
-  ContractFunctionConfig,
-  GetValue,
-} from '../../types/index.js'
+import { parseAccount } from '../../accounts/utils/parseAccount.js'
+import type { PublicClient } from '../../clients/createPublicClient.js'
+import type { Transport } from '../../clients/transports/createTransport.js'
+import type { BaseError } from '../../errors/base.js'
+import type { Chain } from '../../types/chain.js'
+import type { ContractFunctionConfig, GetValue } from '../../types/contract.js'
 import {
+  type EncodeFunctionDataParameters,
   encodeFunctionData,
-  getContractError,
-  parseAccount,
-} from '../../utils/index.js'
-import type { EncodeFunctionDataParameters } from '../../utils/index.js'
-import { estimateGas } from './estimateGas.js'
-import type { EstimateGasParameters } from './estimateGas.js'
+} from '../../utils/abi/encodeFunctionData.js'
+import { getContractError } from '../../utils/errors/getContractError.js'
+
+import { type EstimateGasParameters, estimateGas } from './estimateGas.js'
 
 export type EstimateContractGasParameters<
   TAbi extends Abi | readonly unknown[] = Abi,

package/src/actions/public/estimateGas.ts

@@ -1,33 +1,26 @@
-import type {
-  PublicClient,
-  WalletClient,
-  Transport,
-} from '../../clients/index.js'
-import type { BaseError } from '../../errors/index.js'
-import { AccountNotFoundError } from '../../errors/index.js'
-import type {
-  Account,
-  BlockTag,
-  Chain,
-  Formatter,
-  MergeIntersectionProperties,
-  TransactionRequest,
-} from '../../types/index.js'
+import type { Account } from '../../accounts/types.js'
+import { parseAccount } from '../../accounts/utils/parseAccount.js'
+import type { PublicClient } from '../../clients/createPublicClient.js'
+import type { WalletClient } from '../../clients/createWalletClient.js'
+import type { Transport } from '../../clients/transports/createTransport.js'
+import { AccountNotFoundError } from '../../errors/account.js'
+import type { BaseError } from '../../errors/base.js'
 import type { GetAccountParameter } from '../../types/account.js'
+import type { BlockTag } from '../../types/block.js'
+import type { Chain } from '../../types/chain.js'
+import type { Formatter } from '../../types/formatter.js'
+import type { TransactionRequest } from '../../types/transaction.js'
+import type { MergeIntersectionProperties } from '../../types/utils.js'
+import { numberToHex } from '../../utils/encoding/toHex.js'
+import { getEstimateGasError } from '../../utils/errors/getEstimateGasError.js'
+import { extract } from '../../utils/formatters/extract.js'
+import { type Formatted, format } from '../../utils/formatters/format.js'
 import {
-  assertRequest,
-  extract,
-  format,
+  type TransactionRequestFormatter,
   formatTransactionRequest,
-  getEstimateGasError,
-  numberToHex,
-  parseAccount,
-  prepareRequest,
-} from '../../utils/index.js'
-import type {
-  Formatted,
-  TransactionRequestFormatter,
-} from '../../utils/index.js'
+} from '../../utils/formatters/transactionRequest.js'
+import { assertRequest } from '../../utils/transaction/assertRequest.js'
+import { prepareRequest } from '../../utils/transaction/prepareRequest.js'
 
 export type FormattedEstimateGas<
   TFormatter extends Formatter | undefined = Formatter,
@@ -103,7 +96,7 @@ export async function estimateGas<
     const {
       accessList,
       blockNumber,
-      blockTag = 'latest',
+      blockTag,
       data,
       gas,
       gasPrice,
@@ -116,6 +109,7 @@ export async function estimateGas<
     } = account.type === 'local' ? await prepareRequest(client, args) : args
 
     const blockNumberHex = blockNumber ? numberToHex(blockNumber) : undefined
+    const block = blockNumberHex || blockTag
 
     assertRequest(args)
 
@@ -142,7 +136,7 @@ export async function estimateGas<
 
     const balance = await client.request({
       method: 'eth_estimateGas',
-      params: [request, blockNumberHex || blockTag],
+      params: block ? [request, block] : [request],
     })
     return BigInt(balance)
   } catch (err) {

package/src/actions/public/getBalance.ts

@@ -1,6 +1,10 @@
-import type { PublicClient, Transport } from '../../clients/index.js'
-import type { Address, BlockTag, Chain } from '../../types/index.js'
-import { numberToHex } from '../../utils/index.js'
+import type { Address } from 'abitype'
+
+import type { PublicClient } from '../../clients/createPublicClient.js'
+import type { Transport } from '../../clients/transports/createTransport.js'
+import type { BlockTag } from '../../types/block.js'
+import type { Chain } from '../../types/chain.js'
+import { numberToHex } from '../../utils/encoding/toHex.js'
 
 export type GetBalanceParameters = {
   /** The address of the account. */

package/src/actions/public/getBlock.ts

@@ -1,18 +1,19 @@
-import type {
-  PublicClient,
-  WalletClient,
-  Transport,
-} from '../../clients/index.js'
-import { BlockNotFoundError } from '../../errors/index.js'
-import type {
-  Account,
-  BlockTag,
-  Chain,
-  Hash,
-  RpcBlock,
-} from '../../types/index.js'
-import type { BlockFormatter, FormattedBlock } from '../../utils/index.js'
-import { format, formatBlock, numberToHex } from '../../utils/index.js'
+import type { Account } from '../../accounts/types.js'
+import type { PublicClient } from '../../clients/createPublicClient.js'
+import type { WalletClient } from '../../clients/createWalletClient.js'
+import type { Transport } from '../../clients/transports/createTransport.js'
+import { BlockNotFoundError } from '../../errors/block.js'
+import type { BlockTag } from '../../types/block.js'
+import type { Chain } from '../../types/chain.js'
+import type { Hash } from '../../types/misc.js'
+import type { RpcBlock } from '../../types/rpc.js'
+import { numberToHex } from '../../utils/encoding/toHex.js'
+import {
+  type BlockFormatter,
+  type FormattedBlock,
+  formatBlock,
+} from '../../utils/formatters/block.js'
+import { format } from '../../utils/formatters/format.js'
 
 export type GetBlockParameters = {
   /** Whether or not to include transaction data in the response. */

package/src/actions/public/getBlockNumber.ts

@@ -1,6 +1,7 @@
-import type { PublicClient, Transport } from '../../clients/index.js'
-import type { Chain } from '../../types/index.js'
-import { getCache, withCache } from '../../utils/promise/index.js'
+import type { PublicClient } from '../../clients/createPublicClient.js'
+import type { Transport } from '../../clients/transports/createTransport.js'
+import type { Chain } from '../../types/chain.js'
+import { getCache, withCache } from '../../utils/promise/withCache.js'
 
 export type GetBlockNumberParameters = {
   /** The maximum age (in ms) of the cached value. */

package/src/actions/public/getBlockTransactionCount.ts

@@ -1,6 +1,11 @@
-import type { PublicClient, Transport } from '../../clients/index.js'
-import type { BlockTag, Chain, Hash, Quantity } from '../../types/index.js'
-import { hexToNumber, numberToHex } from '../../utils/index.js'
+import type { PublicClient } from '../../clients/createPublicClient.js'
+import type { Transport } from '../../clients/transports/createTransport.js'
+import type { BlockTag } from '../../types/block.js'
+import type { Chain } from '../../types/chain.js'
+import type { Hash } from '../../types/misc.js'
+import type { Quantity } from '../../types/rpc.js'
+import { hexToNumber } from '../../utils/encoding/fromHex.js'
+import { numberToHex } from '../../utils/encoding/toHex.js'
 
 export type GetBlockTransactionCountParameters =
   | {

package/src/actions/public/getBytecode.ts

@@ -1,6 +1,11 @@
-import type { PublicClient, Transport } from '../../clients/index.js'
-import type { Address, BlockTag, Chain, Hex } from '../../types/index.js'
-import { numberToHex } from '../../utils/index.js'
+import type { Address } from 'abitype'
+
+import type { PublicClient } from '../../clients/createPublicClient.js'
+import type { Transport } from '../../clients/transports/createTransport.js'
+import type { BlockTag } from '../../types/block.js'
+import type { Chain } from '../../types/chain.js'
+import type { Hex } from '../../types/misc.js'
+import { numberToHex } from '../../utils/encoding/toHex.js'
 
 export type GetBytecodeParameters = {
   address: Address

package/src/actions/public/getChainId.ts

@@ -1,10 +1,9 @@
-import type {
-  PublicClient,
-  Transport,
-  WalletClient,
-} from '../../clients/index.js'
-import type { Account, Chain } from '../../types/index.js'
-import { hexToNumber } from '../../utils/index.js'
+import type { Account } from '../../accounts/types.js'
+import type { PublicClient } from '../../clients/createPublicClient.js'
+import type { WalletClient } from '../../clients/createWalletClient.js'
+import type { Transport } from '../../clients/transports/createTransport.js'
+import type { Chain } from '../../types/chain.js'
+import { hexToNumber } from '../../utils/encoding/fromHex.js'
 
 export type GetChainIdReturnType = number
 

package/src/actions/public/getFeeHistory.ts

@@ -1,8 +1,10 @@
-import type { PublicClient, Transport } from '../../clients/index.js'
-import type { BlockTag, Chain, FeeHistory } from '../../types/index.js'
-
-import { numberToHex } from '../../utils/index.js'
-import { formatFeeHistory } from '../../utils/formatters/index.js'
+import type { PublicClient } from '../../clients/createPublicClient.js'
+import type { Transport } from '../../clients/transports/createTransport.js'
+import type { BlockTag } from '../../types/block.js'
+import type { Chain } from '../../types/chain.js'
+import type { FeeHistory } from '../../types/fee.js'
+import { numberToHex } from '../../utils/encoding/toHex.js'
+import { formatFeeHistory } from '../../utils/formatters/feeHistory.js'
 
 export type GetFeeHistoryParameters = {
   /**

package/src/actions/public/getFilterChanges.ts

@@ -1,33 +1,33 @@
-import type { Abi, AbiEvent } from 'abitype'
-import type { PublicClient, Transport } from '../../clients/index.js'
-import type {
-  Chain,
-  Filter,
-  FilterType,
-  Hash,
-  Log,
-  MaybeAbiEventName,
-} from '../../types/index.js'
-import { decodeEventLog } from '../../utils/index.js'
+import type { Abi, AbiEvent, ExtractAbiEvent } from 'abitype'
 
+import type { PublicClient } from '../../clients/createPublicClient.js'
+import type { Transport } from '../../clients/transports/createTransport.js'
+import type { Chain } from '../../types/chain.js'
+import type { Filter, FilterType } from '../../types/filter.js'
+import type { Log } from '../../types/log.js'
+import type { Hash } from '../../types/misc.js'
+import { decodeEventLog } from '../../utils/abi/decodeEventLog.js'
 import { formatLog } from '../../utils/formatters/log.js'
 
 export type GetFilterChangesParameters<
   TFilterType extends FilterType = FilterType,
-  TAbiEvent extends AbiEvent | undefined = undefined,
-  TAbi extends Abi | readonly unknown[] = [TAbiEvent],
-  TEventName extends string | undefined = MaybeAbiEventName<TAbiEvent>,
+  TAbi extends Abi | readonly unknown[] = Abi,
+  TEventName extends string | undefined = string,
 > = {
   filter: Filter<TFilterType, TAbi, TEventName, any>
 }
 
 export type GetFilterChangesReturnType<
   TFilterType extends FilterType = FilterType,
-  TAbiEvent extends AbiEvent | undefined = undefined,
-  TAbi extends Abi | readonly unknown[] = [TAbiEvent],
-  TEventName extends string | undefined = MaybeAbiEventName<TAbiEvent>,
+  TAbi extends Abi | readonly unknown[] = Abi,
+  TEventName extends string | undefined = string,
+  _AbiEvent extends AbiEvent | undefined = TAbi extends Abi
+    ? TEventName extends string
+      ? ExtractAbiEvent<TAbi, TEventName>
+      : undefined
+    : undefined,
 > = TFilterType extends 'event'
-  ? Log<bigint, number, TAbiEvent, TAbi, TEventName>[]
+  ? Log<bigint, number, _AbiEvent, TAbi, TEventName>[]
   : Hash[]
 
 /**
@@ -116,14 +116,11 @@ export async function getFilterChanges<
   TTransport extends Transport,
   TChain extends Chain | undefined,
   TFilterType extends FilterType,
-  TAbiEvent extends AbiEvent | undefined,
   TAbi extends Abi | readonly unknown[],
   TEventName extends string | undefined,
 >(
   _client: PublicClient<TTransport, TChain>,
-  {
-    filter,
-  }: GetFilterChangesParameters<TFilterType, TAbiEvent, TAbi, TEventName>,
+  { filter }: GetFilterChangesParameters<TFilterType, TAbi, TEventName>,
 ) {
   const logs = await filter.request({
     method: 'eth_getFilterChanges',
@@ -149,7 +146,6 @@ export async function getFilterChanges<
     })
     .filter(Boolean) as GetFilterChangesReturnType<
     TFilterType,
-    TAbiEvent,
     TAbi,
     TEventName
   >

package/src/actions/public/getFilterLogs.ts

@@ -1,27 +1,28 @@
-import type { Abi, AbiEvent } from 'abitype'
-import type { PublicClient, Transport } from '../../clients/index.js'
-import type {
-  Chain,
-  Filter,
-  Log,
-  MaybeAbiEventName,
-} from '../../types/index.js'
-import { decodeEventLog } from '../../utils/index.js'
+import type { Abi, AbiEvent, ExtractAbiEvent } from 'abitype'
 
+import type { PublicClient } from '../../clients/createPublicClient.js'
+import type { Transport } from '../../clients/transports/createTransport.js'
+import type { Chain } from '../../types/chain.js'
+import type { Filter } from '../../types/filter.js'
+import type { Log } from '../../types/log.js'
+import { decodeEventLog } from '../../utils/abi/decodeEventLog.js'
 import { formatLog } from '../../utils/formatters/log.js'
 
 export type GetFilterLogsParameters<
-  TAbiEvent extends AbiEvent | undefined = undefined,
-  TAbi extends Abi | readonly unknown[] = [TAbiEvent],
-  TEventName extends string | undefined = MaybeAbiEventName<TAbiEvent>,
+  TAbi extends Abi | readonly unknown[] = Abi,
+  TEventName extends string | undefined = string,
 > = {
   filter: Filter<'event', TAbi, TEventName, any>
 }
 export type GetFilterLogsReturnType<
-  TAbiEvent extends AbiEvent | undefined = undefined,
-  TAbi extends Abi | readonly unknown[] = [TAbiEvent],
-  TEventName extends string | undefined = MaybeAbiEventName<TAbiEvent>,
-> = Log<bigint, number, TAbiEvent, TAbi, TEventName>[]
+  TAbi extends Abi | readonly unknown[] = Abi,
+  TEventName extends string | undefined = string,
+  _AbiEvent extends AbiEvent | undefined = TAbi extends Abi
+    ? TEventName extends string
+      ? ExtractAbiEvent<TAbi, TEventName>
+      : undefined
+    : undefined,
+> = Log<bigint, number, _AbiEvent, TAbi, TEventName>[]
 
 /**
  * Returns a list of event logs since the filter was created.
@@ -52,13 +53,12 @@ export type GetFilterLogsReturnType<
  */
 export async function getFilterLogs<
   TChain extends Chain | undefined,
-  TAbiEvent extends AbiEvent | undefined,
   TAbi extends Abi | readonly unknown[],
   TEventName extends string | undefined,
 >(
   _client: PublicClient<Transport, TChain>,
-  { filter }: GetFilterLogsParameters<TAbiEvent, TAbi, TEventName>,
-): Promise<GetFilterLogsReturnType<TAbiEvent, TAbi, TEventName>> {
+  { filter }: GetFilterLogsParameters<TAbi, TEventName>,
+): Promise<GetFilterLogsReturnType<TAbi, TEventName>> {
   const logs = await filter.request({
     method: 'eth_getFilterLogs',
     params: [filter.id],
@@ -80,9 +80,5 @@ export async function getFilterLogs<
         return
       }
     })
-    .filter(Boolean) as unknown as GetFilterLogsReturnType<
-    TAbiEvent,
-    TAbi,
-    TEventName
-  >
+    .filter(Boolean) as unknown as GetFilterLogsReturnType<TAbi, TEventName>
 }