viem 0.4.0-main.20230430T213120 → 1.0.1

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<
@@ -20,11 +22,17 @@ export type CreateContractEventFilterParameters<
   TArgs extends
     | MaybeExtractEventArgsFromAbi<TAbi, TEventName>
     | undefined = undefined,
+  TStrict extends boolean | undefined = undefined,
 > = {
   address?: Address | Address[]
   abi: Narrow<TAbi>
   eventName?: InferEventName<TAbi, TEventName>
   fromBlock?: BlockNumber | BlockTag
+  /**
+   * Whether or not the logs must match the indexed/non-indexed arguments in the event ABI item.
+   * @default false
+   */
+  strict?: TStrict
   toBlock?: BlockNumber | BlockTag
 } & (undefined extends TEventName
   ? {
@@ -47,10 +55,11 @@ export type CreateContractEventFilterReturnType<
   TArgs extends
     | MaybeExtractEventArgsFromAbi<TAbi, TEventName>
     | undefined = undefined,
-> = Filter<'event', TAbi, TEventName, TArgs>
+  TStrict extends boolean | undefined = undefined,
+> = Filter<'event', TAbi, TEventName, TArgs, TStrict>
 
 /**
- * Creates a Filter to retrieve event logs that can be used with [`getFilterChanges`](https://viem.sh/docs/actions/public/getFilterChanges) or [`getFilterLogs`](https://viem.sh/docs/actions/public/getFilterLogs).
+ * Creates a Filter to retrieve event logs that can be used with [`getFilterChanges`](https://viem.sh/docs/actions/public/getFilterChanges.html) or [`getFilterLogs`](https://viem.sh/docs/actions/public/getFilterLogs.html).
  *
  * - Docs: https://viem.sh/docs/contract/createContractEventFilter.html
  *
@@ -76,6 +85,7 @@ export async function createContractEventFilter<
   TAbi extends Abi | readonly unknown[],
   TEventName extends string | undefined,
   TArgs extends MaybeExtractEventArgsFromAbi<TAbi, TEventName> | undefined,
+  TStrict extends boolean | undefined = undefined,
 >(
   client: PublicClient<Transport, TChain>,
   {
@@ -84,9 +94,12 @@ export async function createContractEventFilter<
     args,
     eventName,
     fromBlock,
+    strict,
     toBlock,
-  }: CreateContractEventFilterParameters<TAbi, TEventName, TArgs>,
-): Promise<CreateContractEventFilterReturnType<TAbi, TEventName, TArgs>> {
+  }: CreateContractEventFilterParameters<TAbi, TEventName, TArgs, TStrict>,
+): Promise<
+  CreateContractEventFilterReturnType<TAbi, TEventName, TArgs, TStrict>
+> {
   const getRequest = createFilterRequestScope(client, {
     method: 'eth_newFilter',
   })
@@ -117,6 +130,12 @@ export async function createContractEventFilter<
     eventName,
     id,
     request: getRequest(id),
+    strict,
     type: 'event',
-  } as unknown as CreateContractEventFilterReturnType<TAbi, TEventName, TArgs>
+  } as unknown as CreateContractEventFilterReturnType<
+    TAbi,
+    TEventName,
+    TArgs,
+    TStrict
+  >
 }

package/src/actions/public/createEventFilter.ts

@@ -1,67 +1,83 @@
-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<
   TAbiEvent extends AbiEvent | undefined = undefined,
-  TAbi extends Abi | readonly unknown[] = [TAbiEvent],
-  TEventName extends string | undefined = MaybeAbiEventName<TAbiEvent>,
-  TArgs extends
-    | MaybeExtractEventArgsFromAbi<TAbi, TEventName>
+  TStrict extends boolean | undefined = undefined,
+  _Abi extends Abi | readonly unknown[] = [TAbiEvent],
+  _EventName extends string | undefined = MaybeAbiEventName<TAbiEvent>,
+  _Args extends
+    | MaybeExtractEventArgsFromAbi<_Abi, _EventName>
     | undefined = undefined,
 > = {
   address?: Address | Address[]
   fromBlock?: BlockNumber | BlockTag
   toBlock?: BlockNumber | BlockTag
 } & (MaybeExtractEventArgsFromAbi<
-  TAbi,
-  TEventName
+  _Abi,
+  _EventName
 > extends infer TEventFilterArgs
   ?
       | {
           args:
             | TEventFilterArgs
-            | (TArgs extends TEventFilterArgs ? TArgs : never)
+            | (_Args extends TEventFilterArgs ? _Args : never)
           event: Narrow<TAbiEvent>
+          /**
+           * Whether or not the logs must match the indexed/non-indexed arguments on `event`.
+           * @default false
+           */
+          strict?: TStrict
         }
       | {
           args?: never
           event?: Narrow<TAbiEvent>
+          /**
+           * Whether or not the logs must match the indexed/non-indexed arguments on `event`.
+           * @default false
+           */
+          strict?: TStrict
         }
       | {
           args?: never
           event?: never
+          strict?: never
         }
   : {
       args?: never
       event?: never
+      strict?: never
     })
 
 export type CreateEventFilterReturnType<
   TAbiEvent extends AbiEvent | undefined = undefined,
-  TAbi extends Abi | readonly unknown[] = [TAbiEvent],
-  TEventName extends string | undefined = MaybeAbiEventName<TAbiEvent>,
-  TArgs extends
-    | MaybeExtractEventArgsFromAbi<TAbi, TEventName>
+  TStrict extends boolean | undefined = undefined,
+  _Abi extends Abi | readonly unknown[] = [TAbiEvent],
+  _EventName extends string | undefined = MaybeAbiEventName<TAbiEvent>,
+  _Args extends
+    | MaybeExtractEventArgsFromAbi<_Abi, _EventName>
     | undefined = undefined,
-> = Prettify<Filter<'event', TAbi, TEventName, TArgs>>
+> = Prettify<Filter<'event', _Abi, _EventName, _Args, TStrict>>
 
 /**
- * Creates a [`Filter`](https://viem.sh/docs/glossary/types.html#filter) to listen for new events that can be used with [`getFilterChanges`](https://viem.sh/docs/actions/public/getFilterChanges).
+ * Creates a [`Filter`](https://viem.sh/docs/glossary/types.html#filter) to listen for new events that can be used with [`getFilterChanges`](https://viem.sh/docs/actions/public/getFilterChanges.html).
  *
  * - Docs: https://viem.sh/docs/actions/public/createEventFilter.html
  * - JSON-RPC Methods: [`eth_newFilter`](https://ethereum.org/en/developers/docs/apis/json-rpc/#eth_newfilter)
@@ -86,6 +102,7 @@ export type CreateEventFilterReturnType<
 export async function createEventFilter<
   TChain extends Chain | undefined,
   TAbiEvent extends AbiEvent | undefined,
+  TStrict extends boolean | undefined = undefined,
   _Abi extends Abi | readonly unknown[] = [TAbiEvent],
   _EventName extends string | undefined = MaybeAbiEventName<TAbiEvent>,
   _Args extends
@@ -98,14 +115,18 @@ export async function createEventFilter<
     args,
     event,
     fromBlock,
+    strict,
     toBlock,
   }: CreateEventFilterParameters<
     TAbiEvent,
+    TStrict,
     _Abi,
     _EventName,
     _Args
   > = {} as any,
-): Promise<CreateEventFilterReturnType<TAbiEvent, _Abi, _EventName, _Args>> {
+): Promise<
+  CreateEventFilterReturnType<TAbiEvent, TStrict, _Abi, _EventName, _Args>
+> {
   const getRequest = createFilterRequestScope(client, {
     method: 'eth_newFilter',
   })
@@ -137,9 +158,11 @@ export async function createEventFilter<
     eventName: event ? (event as AbiEvent).name : undefined,
     id,
     request: getRequest(id),
+    strict,
     type: 'event',
   } as unknown as CreateEventFilterReturnType<
     TAbiEvent,
+    TStrict,
     _Abi,
     _EventName,
     _Args

package/src/actions/public/createPendingTransactionFilter.ts

@@ -1,11 +1,13 @@
-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'>
 
 /**
- * Creates a Filter to listen for new pending transaction hashes that can be used with [`getFilterChanges`](https://viem.sh/docs/actions/public/getFilterChanges).
+ * Creates a Filter to listen for new pending transaction hashes that can be used with [`getFilterChanges`](https://viem.sh/docs/actions/public/getFilterChanges.html).
  *
  * - Docs: https://viem.sh/docs/actions/public/createPendingTransactionFilter.html
  * - JSON-RPC Methods: [`eth_newPendingTransactionFilter`](https://ethereum.org/en/developers/docs/apis/json-rpc/#eth_newpendingtransactionfilter)

package/src/actions/public/estimateContractGas.ts

@@ -1,27 +1,28 @@
 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 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 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 { WalletClient } from '../../clients/createWalletClient.js'
+import { type EstimateGasParameters, estimateGas } from './estimateGas.js'
 
 export type EstimateContractGasParameters<
   TAbi extends Abi | readonly unknown[] = Abi,
   TFunctionName extends string = string,
   TChain extends Chain | undefined = Chain | undefined,
+  TAccount extends Account | undefined = undefined,
 > = ContractFunctionConfig<TAbi, TFunctionName, 'payable' | 'nonpayable'> &
-  Omit<EstimateGasParameters<TChain>, 'data' | 'to' | 'value'> &
+  Omit<EstimateGasParameters<TChain, TAccount>, 'data' | 'to' | 'value'> &
   GetValue<TAbi, TFunctionName, EstimateGasParameters<TChain>['value']>
 
 export type EstimateContractGasReturnType = bigint
@@ -31,7 +32,7 @@ export type EstimateContractGasReturnType = bigint
  *
  * - Docs: https://viem.sh/docs/contract/estimateContractGas.html
  *
- * Internally, uses a [Public Client](https://viem.sh/docs/clients/public) to call the [`estimateGas` action](https://viem.sh/docs/actions/public/estimateGas) with [ABI-encoded `data`](https://viem.sh/docs/contract/encodeFunctionData).
+ * Internally, uses a [Public Client](https://viem.sh/docs/clients/public.html) to call the [`estimateGas` action](https://viem.sh/docs/actions/public/estimateGas.html) with [ABI-encoded `data`](https://viem.sh/docs/contract/encodeFunctionData.html).
  *
  * @param client - Client to use
  * @param parameters - {@link EstimateContractGasParameters}
@@ -57,17 +58,19 @@ export async function estimateContractGas<
   TAbi extends Abi | readonly unknown[],
   TFunctionName extends string,
   TChain extends Chain | undefined,
+  TAccount extends Account | undefined = undefined,
 >(
-  client: PublicClient<Transport, TChain>,
+  client:
+    | PublicClient<Transport, TChain>
+    | WalletClient<Transport, TChain, TAccount>,
   {
     abi,
     address,
     args,
     functionName,
     ...request
-  }: EstimateContractGasParameters<TAbi, TFunctionName, TChain>,
+  }: EstimateContractGasParameters<TAbi, TFunctionName, TChain, TAccount>,
 ): Promise<EstimateContractGasReturnType> {
-  const account = parseAccount(request.account)
   const data = encodeFunctionData({
     abi,
     args,
@@ -81,6 +84,7 @@ export async function estimateContractGas<
     } as unknown as EstimateGasParameters<TChain>)
     return gas
   } catch (err) {
+    const account = request.account ? parseAccount(request.account) : undefined
     throw getContractError(err as BaseError, {
       abi: abi as Abi,
       address,

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,
@@ -93,17 +86,18 @@ export async function estimateGas<
     | WalletClient<Transport, TChain, TAccount>,
   args: EstimateGasParameters<TChain, TAccount>,
 ): Promise<EstimateGasReturnType> {
-  if (!args.account)
+  const account_ = args.account ?? (client as WalletClient).account
+  if (!account_)
     throw new AccountNotFoundError({
       docsPath: '/docs/actions/public/estimateGas',
     })
-  const account = parseAccount(args.account)
+  const account = parseAccount(account_)
 
   try {
     const {
       accessList,
       blockNumber,
-      blockTag = 'latest',
+      blockTag,
       data,
       gas,
       gasPrice,
@@ -116,6 +110,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)
 
@@ -140,9 +135,9 @@ export async function estimateGas<
       },
     )
 
-    const balance = await client.request({
+    const balance = await (client as PublicClient).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. */
@@ -88,12 +89,12 @@ export async function getBlock<
 
   let block: RpcBlock | null = null
   if (blockHash) {
-    block = await client.request({
+    block = await (client as PublicClient).request({
       method: 'eth_getBlockByHash',
       params: [blockHash, includeTransactions],
     })
   } else {
-    block = await client.request({
+    block = await (client as PublicClient).request({
       method: 'eth_getBlockByNumber',
       params: [blockNumberHex || blockTag, includeTransactions],
     })

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 =
   | {
@@ -60,7 +65,7 @@ export async function getBlockTransactionCount<
   const blockNumberHex =
     blockNumber !== undefined ? numberToHex(blockNumber) : undefined
 
-  let count: Quantity | null = null
+  let count: Quantity
   if (blockHash) {
     count = await client.request({
       method: 'eth_getBlockTransactionCountByHash',

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
 
@@ -37,6 +36,8 @@ export async function getChainId<
     | PublicClient<Transport, TChain>
     | WalletClient<Transport, TChain, TAccount>,
 ): Promise<GetChainIdReturnType> {
-  const chainIdHex = await client.request({ method: 'eth_chainId' })
+  const chainIdHex = await (client as PublicClient).request({
+    method: 'eth_chainId',
+  })
   return hexToNumber(chainIdHex)
 }

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 = {
   /**