viem 2.0.0-beta.0 → 2.0.0-beta.10

package/actions/ens/getEnsName.ts

@@ -45,7 +45,7 @@ export type GetEnsNameErrorType =
  * Gets primary name for specified address.
  *
  * - Docs: https://viem.sh/docs/ens/actions/getEnsName.html
- * - Examples: https://stackblitz.com/github/wagmi-dev/viem/tree/main/examples/ens
+ * - Examples: https://stackblitz.com/github/wevm/viem/tree/main/examples/ens
  *
  * Calls `reverse(bytes)` on ENS Universal Resolver Contract to "reverse resolve" the address to the primary ENS name.
  *
@@ -65,7 +65,7 @@ export type GetEnsNameErrorType =
  * const ensName = await getEnsName(client, {
  *   address: '0xd2135CfB216b74109775236E36d4b433F1DF507B',
  * })
- * // 'wagmi-dev.eth'
+ * // 'wevm.eth'
  */
 export async function getEnsName<TChain extends Chain | undefined>(
   client: Client<Transport, TChain>,
@@ -95,6 +95,7 @@ export async function getEnsName<TChain extends Chain | undefined>(
     const res = await getAction(
       client,
       readContract,
+      'readContract',
     )({
       address: universalResolverAddress,
       abi: universalResolverReverseAbi,

package/actions/ens/getEnsResolver.ts

@@ -41,7 +41,7 @@ export type GetEnsResolverErrorType =
  * Gets resolver for ENS name.
  *
  * - Docs: https://viem.sh/docs/ens/actions/getEnsResolver.html
- * - Examples: https://stackblitz.com/github/wagmi-dev/viem/tree/main/examples/ens
+ * - Examples: https://stackblitz.com/github/wevm/viem/tree/main/examples/ens
  *
  * Calls `findResolver(bytes)` on ENS Universal Resolver Contract to retrieve the resolver of an ENS name.
  *
@@ -61,7 +61,7 @@ export type GetEnsResolverErrorType =
  *   transport: http(),
  * })
  * const resolverAddress = await getEnsResolver(client, {
- *   name: normalize('wagmi-dev.eth'),
+ *   name: normalize('wevm.eth'),
  * })
  * // '0x4976fb03C32e5B8cfe2b6cCB31c09Ba78EBaBa41'
  */
@@ -91,6 +91,7 @@ export async function getEnsResolver<TChain extends Chain | undefined>(
   const [resolverAddress] = await getAction(
     client,
     readContract,
+    'readContract',
   )({
     address: universalResolverAddress,
     abi: [

package/actions/ens/getEnsText.ts

@@ -60,7 +60,7 @@ export type GetEnsTextErrorType =
  * Gets a text record for specified ENS name.
  *
  * - Docs: https://viem.sh/docs/ens/actions/getEnsResolver.html
- * - Examples: https://stackblitz.com/github/wagmi-dev/viem/tree/main/examples/ens
+ * - Examples: https://stackblitz.com/github/wevm/viem/tree/main/examples/ens
  *
  * Calls `resolve(bytes, bytes)` on ENS Universal Resolver Contract.
  *
@@ -80,7 +80,7 @@ export type GetEnsTextErrorType =
  *   transport: http(),
  * })
  * const twitterRecord = await getEnsText(client, {
- *   name: normalize('wagmi-dev.eth'),
+ *   name: normalize('wevm.eth'),
  *   key: 'com.twitter',
  * })
  * // 'wagmi_sh'
@@ -113,6 +113,7 @@ export async function getEnsText<TChain extends Chain | undefined>(
     const res = await getAction(
       client,
       readContract,
+      'readContract',
     )({
       address: universalResolverAddress,
       abi: universalResolverResolveAbi,

package/actions/getContract.ts

@@ -555,6 +555,7 @@ export function getContract<
               return getAction(
                 publicClient,
                 readContract,
+                'readContract',
               )({
                 abi,
                 address,
@@ -585,6 +586,7 @@ export function getContract<
               return getAction(
                 publicClient,
                 simulateContract,
+                'simulateContract',
               )({
                 abi,
                 address,
@@ -621,6 +623,7 @@ export function getContract<
               return getAction(
                 publicClient,
                 createContractEventFilter,
+                'createContractEventFilter',
               )({
                 abi,
                 address,
@@ -655,6 +658,7 @@ export function getContract<
               return getAction(
                 publicClient,
                 getContractEvents,
+                'getContractEvents',
               )({
                 abi,
                 address,
@@ -689,6 +693,7 @@ export function getContract<
               return getAction(
                 publicClient,
                 watchContractEvent,
+                'watchContractEvent',
               )({
                 abi,
                 address,
@@ -722,6 +727,7 @@ export function getContract<
               return getAction(
                 walletClient,
                 writeContract,
+                'writeContract',
               )({
                 abi,
                 address,
@@ -755,6 +761,7 @@ export function getContract<
               return getAction(
                 client,
                 estimateContractGas,
+                'estimateContractGas',
               )({
                 abi,
                 address,
@@ -859,13 +866,7 @@ type GetEstimateFunction<
   Args = AbiParametersToPrimitiveTypes<TAbiFunction['inputs']>,
   Options = Prettify<
     UnionOmit<
-      EstimateContractGasParameters<
-        TAbi,
-        TFunctionName,
-        TArgs,
-        TChain,
-        TAccount
-      >,
+      EstimateContractGasParameters<TAbi, TFunctionName, TArgs, TChain>,
       'abi' | 'address' | 'args' | 'functionName'
     >
   >,
@@ -919,7 +920,7 @@ type GetSimulateFunction<
     >(
       ...parameters: Args extends readonly []
         ? [
-            options?: UnionOmit<
+            options?: Omit<
               SimulateContractParameters<
                 TAbi,
                 TFunctionName,
@@ -933,7 +934,7 @@ type GetSimulateFunction<
           ]
         : [
             args: Args,
-            options?: UnionOmit<
+            options?: Omit<
               SimulateContractParameters<
                 TAbi,
                 TFunctionName,
@@ -962,7 +963,7 @@ type GetSimulateFunction<
     >(
       ...parameters:
         | [
-            options?: UnionOmit<
+            options?: Omit<
               SimulateContractParameters<
                 TAbi,
                 TFunctionName,
@@ -976,7 +977,7 @@ type GetSimulateFunction<
           ]
         | [
             args: readonly unknown[],
-            options?: UnionOmit<
+            options?: Omit<
               SimulateContractParameters<
                 TAbi,
                 TFunctionName,

package/actions/index.ts

@@ -213,11 +213,7 @@ export {
 } from './public/watchBlockNumber.js'
 export {
   type WatchEventOnLogsFn,
-  /** @deprecated - use `WatchEventOnLogsFn` instead. */
-  type WatchEventOnLogsFn as OnLogsFn,
   type WatchEventOnLogsParameter,
-  /** @deprecated - use `WatchEventOnLogsParameter` instead. */
-  type WatchEventOnLogsParameter as OnLogsParameter,
   type WatchEventParameters,
   type WatchEventReturnType,
   watchEvent,

package/actions/public/createContractEventFilter.ts

@@ -48,12 +48,12 @@ export type CreateContractEventFilterParameters<
       args?: never
     }
   : MaybeExtractEventArgsFromAbi<abi, eventName> extends infer TEventFilterArgs
-  ? {
-      args?: TEventFilterArgs | (args extends TEventFilterArgs ? args : never)
-    }
-  : {
-      args?: never
-    })
+    ? {
+        args?: TEventFilterArgs | (args extends TEventFilterArgs ? args : never)
+      }
+    : {
+        args?: never
+      })
 
 export type CreateContractEventFilterReturnType<
   abi extends Abi | readonly unknown[] = Abi,
@@ -155,7 +155,7 @@ export async function createContractEventFilter<
     eventName,
     id,
     request: getRequest(id),
-    strict,
+    strict: Boolean(strict),
     type: 'event',
   } as unknown as CreateContractEventFilterReturnType<
     abi,

package/actions/public/createEventFilter.ts

@@ -221,7 +221,7 @@ export async function createEventFilter<
     fromBlock,
     id,
     request: getRequest(id),
-    strict,
+    strict: Boolean(strict),
     toBlock,
     type: 'event',
   } as unknown as CreateEventFilterReturnType<

package/actions/public/estimateContractGas.ts

@@ -44,14 +44,13 @@ export type EstimateContractGasParameters<
     functionName
   > = ContractFunctionArgs<abi, 'nonpayable' | 'payable', functionName>,
   chain extends Chain | undefined = Chain | undefined,
-  account extends Account | undefined = undefined,
 > = ContractFunctionParameters<
   abi,
   'nonpayable' | 'payable',
   functionName,
   args
 > &
-  UnionOmit<EstimateGasParameters<chain, account>, 'data' | 'to' | 'value'> &
+  UnionOmit<EstimateGasParameters<chain>, 'data' | 'to' | 'value'> &
   GetValue<
     abi,
     functionName,
@@ -101,13 +100,7 @@ export async function estimateContractGas<
   account extends Account | undefined = undefined,
 >(
   client: Client<Transport, chain, account>,
-  parameters: EstimateContractGasParameters<
-    abi,
-    functionName,
-    args,
-    chain,
-    account
-  >,
+  parameters: EstimateContractGasParameters<abi, functionName, args, chain>,
 ): Promise<EstimateContractGasReturnType> {
   const { abi, address, args, functionName, ...request } =
     parameters as EstimateContractGasParameters
@@ -120,6 +113,7 @@ export async function estimateContractGas<
     const gas = await getAction(
       client,
       estimateGas,
+      'estimateGas',
     )({
       data,
       to: address,

package/actions/public/estimateFeesPerGas.ts

@@ -13,7 +13,7 @@ import type {
   ChainEstimateFeesPerGasFnParameters,
   ChainFeesFnParameters,
 } from '../../types/chain.js'
-import type { GetChain } from '../../types/chain.js'
+import type { GetChainParameter } from '../../types/chain.js'
 import type {
   FeeValuesEIP1559,
   FeeValuesLegacy,
@@ -42,7 +42,7 @@ export type EstimateFeesPerGasParameters<
    * @default 'eip1559'
    */
   type?: type | FeeValuesType
-} & GetChain<chain, chainOverride>
+} & GetChainParameter<chain, chainOverride>
 
 export type EstimateFeesPerGasReturnType<
   type extends FeeValuesType = FeeValuesType,
@@ -126,7 +126,9 @@ export async function internal_estimateFeesPerGas<
     (base * BigInt(Math.ceil(baseFeeMultiplier * denominator))) /
     BigInt(denominator)
 
-  const block = block_ ? block_ : await getAction(client, getBlock)({})
+  const block = block_
+    ? block_
+    : await getAction(client, getBlock, 'getBlock')({})
 
   if (typeof chain?.fees?.estimateFeesPerGas === 'function')
     return chain.fees.estimateFeesPerGas({
@@ -146,7 +148,7 @@ export async function internal_estimateFeesPerGas<
       : await internal_estimateMaxPriorityFeePerGas(
           client as Client<Transport, Chain>,
           {
-            block,
+            block: block as Block,
             chain,
             request,
           },
@@ -163,7 +165,8 @@ export async function internal_estimateFeesPerGas<
   }
 
   const gasPrice =
-    request?.gasPrice ?? multiply(await getAction(client, getGasPrice)({}))
+    request?.gasPrice ??
+    multiply(await getAction(client, getGasPrice, 'getGasPrice')({}))
   return {
     gasPrice,
   } as EstimateFeesPerGasReturnType<type>

package/actions/public/estimateGas.ts

@@ -1,3 +1,4 @@
+import type { Address } from 'abitype'
 import type { Account } from '../../accounts/types.js'
 import {
   type ParseAccountErrorType,
@@ -5,9 +6,7 @@ import {
 } from '../../accounts/utils/parseAccount.js'
 import type { Client } from '../../clients/createClient.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 { TransactionRequest } from '../../types/transaction.js'
@@ -42,10 +41,9 @@ export type FormattedEstimateGas<
 
 export type EstimateGasParameters<
   TChain extends Chain | undefined = Chain | undefined,
-  TAccount extends Account | undefined = undefined,
-> = UnionOmit<FormattedEstimateGas<TChain>, 'from'> &
-  GetAccountParameter<TAccount> &
-  (
+> = UnionOmit<FormattedEstimateGas<TChain>, 'from'> & {
+  account?: Account | Address
+} & (
     | {
         /** The balance of the account at a block number. */
         blockNumber?: bigint
@@ -100,14 +98,10 @@ export async function estimateGas<
   TAccount extends Account | undefined = undefined,
 >(
   client: Client<Transport, TChain, TAccount>,
-  args: EstimateGasParameters<TChain, TAccount>,
+  args: EstimateGasParameters<TChain>,
 ): Promise<EstimateGasReturnType> {
   const account_ = args.account ?? client.account
-  if (!account_)
-    throw new AccountNotFoundError({
-      docsPath: '/docs/actions/public/estimateGas',
-    })
-  const account = parseAccount(account_)
+  const account = account_ ? parseAccount(account_) : undefined
 
   try {
     const {
@@ -124,7 +118,7 @@ export async function estimateGas<
       value,
       ...rest
     } =
-      account.type === 'local'
+      account?.type === 'local'
         ? ((await prepareTransactionRequest(
             client,
             args as PrepareTransactionRequestParameters,
@@ -142,7 +136,7 @@ export async function estimateGas<
     const request = format({
       // Pick out extra data that might exist on the chain's transaction request type.
       ...extract(rest, { format: chainFormat }),
-      from: account.address,
+      from: account?.address,
       accessList,
       data,
       gas,

package/actions/public/estimateMaxPriorityFeePerGas.ts

@@ -8,7 +8,7 @@ import type { ErrorType } from '../../errors/utils.js'
 import type { Account } from '../../types/account.js'
 import type { Block } from '../../types/block.js'
 import type { Chain, ChainFeesFnParameters } from '../../types/chain.js'
-import type { GetChain } from '../../types/chain.js'
+import type { GetChainParameter } from '../../types/chain.js'
 import type { RequestErrorType } from '../../utils/buildRequest.js'
 import {
   type HexToBigIntErrorType,
@@ -22,7 +22,7 @@ import { type GetGasPriceErrorType, getGasPrice } from './getGasPrice.js'
 export type EstimateMaxPriorityFeePerGasParameters<
   chain extends Chain | undefined = Chain | undefined,
   chainOverride extends Chain | undefined = Chain | undefined,
-> = GetChain<chain, chainOverride>
+> = GetChainParameter<chain, chainOverride>
 
 export type EstimateMaxPriorityFeePerGasReturnType = bigint
 
@@ -83,13 +83,15 @@ export async function internal_estimateMaxPriorityFeePerGas<
 ): Promise<EstimateMaxPriorityFeePerGasReturnType> {
   const { block: block_, chain = client.chain, request } = args || {}
   if (typeof chain?.fees?.defaultPriorityFee === 'function') {
-    const block = block_ || (await getAction(client, getBlock)({}))
+    const block = block_ || (await getAction(client, getBlock, 'getBlock')({}))
     return chain.fees.defaultPriorityFee({
       block,
       client,
       request,
     } as ChainFeesFnParameters)
-  } else if (typeof chain?.fees?.defaultPriorityFee !== 'undefined')
+  }
+
+  if (typeof chain?.fees?.defaultPriorityFee !== 'undefined')
     return chain?.fees?.defaultPriorityFee
 
   try {
@@ -102,8 +104,10 @@ export async function internal_estimateMaxPriorityFeePerGas<
     // fall back to calculating it manually via `gasPrice - baseFeePerGas`.
     // See: https://github.com/ethereum/pm/issues/328#:~:text=eth_maxPriorityFeePerGas%20after%20London%20will%20effectively%20return%20eth_gasPrice%20%2D%20baseFee
     const [block, gasPrice] = await Promise.all([
-      block_ ? Promise.resolve(block_) : getAction(client, getBlock)({}),
-      getAction(client, getGasPrice)({}),
+      block_
+        ? Promise.resolve(block_)
+        : getAction(client, getBlock, 'getBlock')({}),
+      getAction(client, getGasPrice, 'getGasPrice')({}),
     ])
 
     if (typeof block.baseFeePerGas !== 'bigint')

package/actions/public/getBlock.ts

@@ -51,7 +51,7 @@ export type GetBlockParameters<
 )
 
 export type GetBlockReturnType<
-  TChain extends Chain | undefined = Chain | undefined,
+  TChain extends Chain | undefined = undefined,
   TIncludeTransactions extends boolean = false,
   TBlockTag extends BlockTag = 'latest',
 > = FormattedBlock<TChain, TIncludeTransactions, TBlockTag>
@@ -66,7 +66,7 @@ export type GetBlockErrorType =
  * Returns information about a block at a block number, hash, or tag.
  *
  * - Docs: https://viem.sh/docs/actions/public/getBlock.html
- * - Examples: https://stackblitz.com/github/wagmi-dev/viem/tree/main/examples/blocks/fetching-blocks
+ * - Examples: https://stackblitz.com/github/wevm/viem/tree/main/examples/blocks/fetching-blocks
  * - JSON-RPC Methods:
  *   - Calls [`eth_getBlockByNumber`](https://ethereum.org/en/developers/docs/apis/json-rpc/#eth_getblockbynumber) for `blockNumber` & `blockTag`.
  *   - Calls [`eth_getBlockByHash`](https://ethereum.org/en/developers/docs/apis/json-rpc/#eth_getblockbyhash) for `blockHash`.

package/actions/public/getBlockNumber.ts

@@ -8,8 +8,6 @@ import { getCache, withCache } from '../../utils/promise/withCache.js'
 export type GetBlockNumberParameters = {
   /** Time (in ms) that cached block number will remain in memory. */
   cacheTime?: number
-  /** @deprecated use `cacheTime` instead. */
-  maxAge?: number
 }
 
 export type GetBlockNumberReturnType = bigint
@@ -26,7 +24,7 @@ export function getBlockNumberCache(id: string) {
  * Returns the number of the most recent block seen.
  *
  * - Docs: https://viem.sh/docs/actions/public/getBlockNumber.html
- * - Examples: https://stackblitz.com/github/wagmi-dev/viem/tree/main/examples/blocks/fetching-blocks
+ * - Examples: https://stackblitz.com/github/wevm/viem/tree/main/examples/blocks/fetching-blocks
  * - JSON-RPC Methods: [`eth_blockNumber`](https://ethereum.org/en/developers/docs/apis/json-rpc/#eth_blocknumber)
  *
  * @param client - Client to use
@@ -47,14 +45,14 @@ export function getBlockNumberCache(id: string) {
  */
 export async function getBlockNumber<TChain extends Chain | undefined>(
   client: Client<Transport, TChain>,
-  { cacheTime = client.cacheTime, maxAge }: GetBlockNumberParameters = {},
+  { cacheTime = client.cacheTime }: GetBlockNumberParameters = {},
 ): Promise<GetBlockNumberReturnType> {
   const blockNumberHex = await withCache(
     () =>
       client.request({
         method: 'eth_blockNumber',
       }),
-    { cacheKey: cacheKey(client.uid), cacheTime: maxAge ?? cacheTime },
+    { cacheKey: cacheKey(client.uid), cacheTime },
   )
   return BigInt(blockNumberHex)
 }

package/actions/public/getContractEvents.ts

@@ -150,6 +150,7 @@ export async function getContractEvents<
   return getAction(
     client,
     getLogs,
+    'getLogs',
   )({
     address,
     args,

package/actions/public/getFilterChanges.ts

@@ -2,20 +2,15 @@ import type { Abi, AbiEvent, ExtractAbiEvent } from 'abitype'
 
 import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
-import {
-  DecodeLogDataMismatch,
-  DecodeLogTopicsMismatch,
-} from '../../errors/abi.js'
 import type { ErrorType } from '../../errors/utils.js'
+import type { RpcLog } from '../../index.js'
 import type { BlockNumber, BlockTag } from '../../types/block.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 {
-  type DecodeEventLogErrorType,
-  decodeEventLog,
-} from '../../utils/abi/decodeEventLog.js'
+import { type DecodeEventLogErrorType } from '../../utils/abi/decodeEventLog.js'
+import { parseEventLogs } from '../../utils/abi/parseEventLogs.js'
 import type { RequestErrorType } from '../../utils/buildRequest.js'
 import {
   type FormatLogErrorType,
@@ -185,38 +180,34 @@ export async function getFilterChanges<
     method: 'eth_getFilterChanges',
     params: [filter.id],
   })
-  return logs
-    .map((log) => {
-      if (typeof log === 'string') return log
-      try {
-        const { eventName, args } =
-          'abi' in filter && filter.abi
-            ? decodeEventLog({
-                abi: filter.abi,
-                data: log.data,
-                topics: log.topics as any,
-                strict,
-              })
-            : { eventName: undefined, args: undefined }
-        return formatLog(log, { args, eventName })
-      } catch (err) {
-        let eventName
-        let isUnnamed
-        if (
-          err instanceof DecodeLogDataMismatch ||
-          err instanceof DecodeLogTopicsMismatch
-        ) {
-          // If strict mode is on, and log data/topics do not match event definition, skip.
-          if ('strict' in filter && filter.strict) return
-          eventName = err.abiItem.name
-          isUnnamed = err.abiItem.inputs?.some((x) => !('name' in x && x.name))
-        }
 
-        // Set args undefined if there is an error decoding (e.g. indexed/non-indexed params mismatch).
-        return formatLog(log, { args: isUnnamed ? [] : {}, eventName })
-      }
-    })
-    .filter(Boolean) as GetFilterChangesReturnType<
+  if (typeof logs[0] === 'string')
+    return logs as GetFilterChangesReturnType<
+      TFilterType,
+      TAbi,
+      TEventName,
+      TStrict,
+      TFromBlock,
+      TToBlock
+    >
+
+  if (!('abi' in filter) || !filter.abi)
+    return logs.map((log) =>
+      formatLog(log as RpcLog),
+    ) as GetFilterChangesReturnType<
+      TFilterType,
+      TAbi,
+      TEventName,
+      TStrict,
+      TFromBlock,
+      TToBlock
+    >
+
+  return parseEventLogs({
+    abi: filter.abi,
+    logs: logs as RpcLog[],
+    strict,
+  }) as unknown as GetFilterChangesReturnType<
     TFilterType,
     TAbi,
     TEventName,

package/actions/public/getFilterLogs.ts

@@ -2,19 +2,14 @@ import type { Abi, AbiEvent, ExtractAbiEvent } from 'abitype'
 
 import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
-import {
-  DecodeLogDataMismatch,
-  DecodeLogTopicsMismatch,
-} from '../../errors/abi.js'
+
 import type { ErrorType } from '../../errors/utils.js'
 import type { BlockNumber, BlockTag } from '../../types/block.js'
 import type { Chain } from '../../types/chain.js'
 import type { Filter } from '../../types/filter.js'
 import type { Log } from '../../types/log.js'
-import {
-  type DecodeEventLogErrorType,
-  decodeEventLog,
-} from '../../utils/abi/decodeEventLog.js'
+import { type DecodeEventLogErrorType } from '../../utils/abi/decodeEventLog.js'
+import { parseEventLogs } from '../../utils/abi/parseEventLogs.js'
 import type { RequestErrorType } from '../../utils/buildRequest.js'
 import {
   type FormatLogErrorType,
@@ -100,37 +95,21 @@ export async function getFilterLogs<
     method: 'eth_getFilterLogs',
     params: [filter.id],
   })
-  return logs
-    .map((log) => {
-      try {
-        const { eventName, args } =
-          'abi' in filter && filter.abi
-            ? decodeEventLog({
-                abi: filter.abi,
-                data: log.data,
-                topics: log.topics as any,
-                strict,
-              })
-            : { eventName: undefined, args: undefined }
-        return formatLog(log, { args, eventName })
-      } catch (err) {
-        let eventName
-        let isUnnamed
-        if (
-          err instanceof DecodeLogDataMismatch ||
-          err instanceof DecodeLogTopicsMismatch
-        ) {
-          // If strict mode is on, and log data/topics do not match event definition, skip.
-          if ('strict' in filter && filter.strict) return
-          eventName = err.abiItem.name
-          isUnnamed = err.abiItem.inputs?.some((x) => !('name' in x && x.name))
-        }
 
-        // Set args to empty if there is an error decoding (e.g. indexed/non-indexed params mismatch).
-        return formatLog(log, { args: isUnnamed ? [] : {}, eventName })
-      }
-    })
-    .filter(Boolean) as unknown as GetFilterLogsReturnType<
+  if (!filter.abi)
+    return logs.map((log) => formatLog(log)) as GetFilterLogsReturnType<
+      TAbi,
+      TEventName,
+      TStrict,
+      TFromBlock,
+      TToBlock
+    >
+
+  return parseEventLogs({
+    abi: filter.abi,
+    logs,
+    strict,
+  }) as unknown as GetFilterLogsReturnType<
     TAbi,
     TEventName,
     TStrict,