viem 0.0.0-portable-types-20230523145621 → 0.0.0-tmm-sign-typed-data-types.20230619T221425

package/src/actions/getContract.ts

@@ -68,11 +68,12 @@ export type GetContractParameters<
   TWalletClient extends
     | WalletClient<TTransport, TChain, TAccount>
     | unknown = unknown,
+  TAddress extends Address = Address,
 > = {
   /** Contract ABI */
   abi: Narrow<TAbi>
   /** Contract address */
-  address: Address
+  address: TAddress
   /**
    * Public client
    *
@@ -90,6 +91,7 @@ export type GetContractParameters<
    *
    * If you pass in a [`walletClient`](https://viem.sh/docs/clients/wallet.html), the following methods are available:
    *
+   * - [`estimateGas`](https://viem.sh/docs/contract/estimateContractGas.html)
    * - [`write`](https://viem.sh/docs/contract/writeContract.html)
    */
   walletClient?: TWalletClient
@@ -99,6 +101,7 @@ export type GetContractReturnType<
   TAbi extends Abi | readonly unknown[] = Abi,
   TPublicClient extends PublicClient | unknown = unknown,
   TWalletClient extends WalletClient | unknown = unknown,
+  TAddress extends Address = Address,
   _EventNames extends string = TAbi extends Abi
     ? Abi extends TAbi
       ? string
@@ -163,7 +166,7 @@ export type GetContractReturnType<
                * import { createPublicClient, getContract, http, parseAbi } from 'viem'
                * import { mainnet } from 'viem/chains'
                *
-               * const client = createPublicClient({
+               * const publicClient = createPublicClient({
                *   chain: mainnet,
                *   transport: http(),
                * })
@@ -179,9 +182,8 @@ export type GetContractReturnType<
               estimateGas: {
                 [FunctionName in _WriteFunctionNames]: GetEstimateFunction<
                   _Narrowable,
-                  TPublicClient extends PublicClient
-                    ? TPublicClient['chain']
-                    : undefined,
+                  TPublicClient['chain'],
+                  undefined,
                   TAbi,
                   FunctionName
                 >
@@ -197,7 +199,7 @@ export type GetContractReturnType<
                * import { createPublicClient, getContract, http, parseAbi } from 'viem'
                * import { mainnet } from 'viem/chains'
                *
-               * const client = createPublicClient({
+               * const publicClient = createPublicClient({
                *   chain: mainnet,
                *   transport: http(),
                * })
@@ -213,9 +215,7 @@ export type GetContractReturnType<
               simulate: {
                 [FunctionName in _WriteFunctionNames]: GetSimulateFunction<
                   _Narrowable,
-                  TPublicClient extends PublicClient
-                    ? TPublicClient['chain']
-                    : undefined,
+                  TPublicClient['chain'],
                   TAbi,
                   FunctionName
                 >
@@ -231,7 +231,7 @@ export type GetContractReturnType<
                * import { createPublicClient, getContract, http, parseAbi } from 'viem'
                * import { mainnet } from 'viem/chains'
                *
-               * const client = createPublicClient({
+               * const publicClient = createPublicClient({
                *   chain: mainnet,
                *   transport: http(),
                * })
@@ -260,7 +260,7 @@ export type GetContractReturnType<
                * import { createPublicClient, getContract, http, parseAbi } from 'viem'
                * import { mainnet } from 'viem/chains'
                *
-               * const client = createPublicClient({
+               * const publicClient = createPublicClient({
                *   chain: mainnet,
                *   transport: http(),
                * })
@@ -288,6 +288,35 @@ export type GetContractReturnType<
       ? IsNever<_WriteFunctionNames> extends true
         ? unknown
         : {
+            /**
+             * Estimates the gas necessary to complete a transaction without submitting it to the network.
+             *
+             * @example
+             * import { createWalletClient, getContract, http, parseAbi } from 'viem'
+             * import { mainnet } from 'viem/chains'
+             *
+             * const walletClient = createWalletClient({
+             *   chain: mainnet,
+             *   transport: http(),
+             * })
+             * const contract = getContract({
+             *   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
+             *   abi: parseAbi(['function mint() public']),
+             *   walletClient,
+             * })
+             * const gas = await contract.estimateGas.mint({
+             *   account: '0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266',
+             * })
+             */
+            estimateGas: {
+              [FunctionName in _WriteFunctionNames]: GetEstimateFunction<
+                _Narrowable,
+                TWalletClient['chain'],
+                TWalletClient['account'],
+                TAbi,
+                FunctionName
+              >
+            }
             /**
              * Executes a write function on a contract.
              *
@@ -301,14 +330,14 @@ export type GetContractReturnType<
              * import { createWalletClient, getContract, http, parseAbi } from 'viem'
              * import { mainnet } from 'viem/chains'
              *
-             * const client = createWalletClient({
+             * const walletClient = createWalletClient({
              *   chain: mainnet,
              *   transport: http(),
              * })
              * const contract = getContract({
              *   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
              *   abi: parseAbi(['function mint(uint32 tokenId) nonpayable']),
-             *   publicClient,
+             *   walletClient,
              * })
              * const hash = await contract.write.min([69420], {
              *   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
@@ -317,19 +346,15 @@ export type GetContractReturnType<
             write: {
               [FunctionName in _WriteFunctionNames]: GetWriteFunction<
                 _Narrowable,
-                TWalletClient extends WalletClient
-                  ? TWalletClient['chain']
-                  : undefined,
-                TWalletClient extends WalletClient
-                  ? TWalletClient['account']
-                  : undefined,
+                TWalletClient['chain'],
+                TWalletClient['account'],
                 TAbi,
                 FunctionName
               >
             }
           }
       : unknown)
->
+> & { address: TAddress; abi: TAbi }
 
 /**
  * Gets type-safe interface for performing contract-related actions with a specific `abi` and `address`.
@@ -358,6 +383,7 @@ export type GetContractReturnType<
  */
 export function getContract<
   TTransport extends Transport,
+  TAddress extends Address,
   TAbi extends Abi | readonly unknown[],
   TChain extends Chain | undefined = Chain | undefined,
   TAccount extends Account | undefined = Account | undefined,
@@ -378,13 +404,16 @@ export function getContract<
   TAccount,
   TAbi,
   TPublicClient,
-  TWalletClient
->): GetContractReturnType<TAbi, TPublicClient, TWalletClient> {
+  TWalletClient,
+  TAddress
+>): GetContractReturnType<TAbi, TPublicClient, TWalletClient, TAddress> {
   const hasPublicClient = publicClient !== undefined && publicClient !== null
   const hasWalletClient = walletClient !== undefined && walletClient !== null
 
   const contract: {
     [_ in
+      | 'abi'
+      | 'address'
       | 'createEventFilter'
       | 'estimateGas'
       | 'read'
@@ -434,32 +463,7 @@ export function getContract<
         },
       )
 
-    if (hasWriteFunction) {
-      contract.estimateGas = new Proxy(
-        {},
-        {
-          get(_, functionName: string) {
-            return (
-              ...parameters: [
-                args?: readonly unknown[],
-                options?: Omit<
-                  EstimateContractGasParameters,
-                  'abi' | 'address' | 'functionName' | 'args'
-                >,
-              ]
-            ) => {
-              const { args, options } = getFunctionParameters(parameters)
-              return estimateContractGas(publicClient, {
-                abi,
-                address,
-                functionName,
-                args,
-                ...options,
-              } as EstimateContractGasParameters)
-            }
-          },
-        },
-      )
+    if (hasWriteFunction)
       contract.simulate = new Proxy(
         {},
         {
@@ -485,7 +489,6 @@ export function getContract<
           },
         },
       )
-    }
 
     if (hasEvent) {
       contract.createEventFilter = new Proxy(
@@ -545,7 +548,7 @@ export function getContract<
                 eventName,
                 args,
                 ...options,
-              } as WatchContractEventParameters)
+              } as unknown as WatchContractEventParameters)
             }
           },
         },
@@ -587,10 +590,45 @@ export function getContract<
       )
   }
 
+  if (hasPublicClient || hasWalletClient)
+    if (hasWriteFunction)
+      contract.estimateGas = new Proxy(
+        {},
+        {
+          get(_, functionName: string) {
+            return (
+              ...parameters: [
+                args?: readonly unknown[],
+                options?: Omit<
+                  EstimateContractGasParameters,
+                  'abi' | 'address' | 'functionName' | 'args'
+                >,
+              ]
+            ) => {
+              const { args, options } = getFunctionParameters(parameters)
+              const client = (publicClient ?? walletClient)!
+              return estimateContractGas(client, {
+                abi,
+                address,
+                functionName,
+                args,
+                ...options,
+                account:
+                  (options as EstimateContractGasParameters).account ??
+                  (walletClient as WalletClient).account,
+              } as EstimateContractGasParameters)
+            }
+          },
+        },
+      )
+  contract.address = address
+  contract.abi = abi
+
   return contract as unknown as GetContractReturnType<
     TAbi,
     TPublicClient,
-    TWalletClient
+    TWalletClient,
+    TAddress
   >
 }
 
@@ -659,6 +697,7 @@ type GetReadFunction<
 type GetEstimateFunction<
   Narrowable extends boolean,
   TChain extends Chain | undefined,
+  TAccount extends Account | undefined,
   TAbi extends Abi | readonly unknown[],
   TFunctionName extends string,
   TAbiFunction extends AbiFunction = TAbi extends Abi
@@ -667,20 +706,36 @@ type GetEstimateFunction<
   Args = AbiParametersToPrimitiveTypes<TAbiFunction['inputs']>,
   Options = Prettify<
     Omit<
-      EstimateContractGasParameters<TAbi, TFunctionName, TChain>,
+      EstimateContractGasParameters<TAbi, TFunctionName, TChain, TAccount>,
       'abi' | 'address' | 'args' | 'functionName'
     >
   >,
+  // For making `options` parameter required if `TAccount`
+  IsOptionsRequired = IsUndefined<TAccount>,
 > = Narrowable extends true
   ? (
       ...parameters: Args extends readonly []
-        ? [options?: Options]
-        : [args: Args, options?: Options]
+        ? IsOptionsRequired extends true
+          ? [options: Options]
+          : [options?: Options]
+        : [
+            args: Args,
+            ...parameters: IsOptionsRequired extends true
+              ? [options: Options]
+              : [options?: Options],
+          ]
     ) => Promise<EstimateContractGasReturnType>
   : (
       ...parameters:
-        | [options?: Options]
-        | [args: readonly unknown[], options?: Options]
+        | (IsOptionsRequired extends true
+            ? [options: Options]
+            : [options?: Options])
+        | [
+            args: readonly unknown[],
+            ...parameters: IsOptionsRequired extends true
+              ? [options: Options]
+              : [options?: Options],
+          ]
     ) => Promise<EstimateContractGasReturnType>
 
 type GetSimulateFunction<
@@ -759,13 +814,17 @@ type GetWriteFunction<
           'abi' | 'address' | 'args' | 'functionName'
         >
       >,
-      Rest extends IsOptionsRequired extends true
-        ? [options: Options]
-        : [options?: Options],
     >(
       ...parameters: Args extends readonly []
-        ? Rest
-        : [args: Args, ...parameters: Rest]
+        ? IsOptionsRequired extends true
+          ? [options: Options]
+          : [options?: Options]
+        : [
+            args: Args,
+            ...parameters: IsOptionsRequired extends true
+              ? [options: Options]
+              : [options?: Options],
+          ]
     ) => Promise<WriteContractReturnType>
   : <
       TChainOverride extends Chain | undefined,
@@ -799,25 +858,30 @@ type GetEventFilter<
   Options = Prettify<
     Omit<
       CreateContractEventFilterParameters<TAbi, TEventName>,
-      'abi' | 'address' | 'args' | 'eventName'
+      'abi' | 'address' | 'args' | 'eventName' | 'strict'
     >
   >,
   IndexedInputs = Extract<TAbiEvent['inputs'][number], { indexed: true }>,
 > = Narrowable extends true
-  ? <TArgs extends MaybeExtractEventArgsFromAbi<TAbi, TEventName> | undefined>(
+  ? <
+      TArgs extends MaybeExtractEventArgsFromAbi<TAbi, TEventName> | undefined,
+      TStrict extends boolean | undefined = undefined,
+    >(
       ...parameters: IsNever<IndexedInputs> extends true
-        ? [options?: Options]
+        ? [options?: Options & { strict?: TStrict }]
         : [
             args: Args | (Args extends Narrow<TArgs> ? Narrow<TArgs> : never),
-            options?: Options,
+            options?: Options & { strict?: TStrict },
           ]
-    ) => Promise<CreateContractEventFilterReturnType<TAbi, TEventName, TArgs>>
-  : (
+    ) => Promise<
+      CreateContractEventFilterReturnType<TAbi, TEventName, TArgs, TStrict>
+    >
+  : <TStrict extends boolean | undefined = undefined>(
       ...parameters:
-        | [options?: Options]
+        | [options?: Options & { strict?: TStrict }]
         | [
             args: readonly unknown[] | CreateContractFilterOptions,
-            options?: Options,
+            options?: Options & { strict?: TStrict },
           ]
     ) => Promise<CreateContractEventFilterReturnType>
 

package/src/actions/public/call.ts

@@ -208,7 +208,7 @@ async function scheduleMulticall<TChain extends Chain | undefined>(
   args: ScheduleMulticallParameters<TChain>,
 ) {
   const { batchSize = 1024, wait = 0 } =
-    typeof client.batch?.multicall === 'object' ? client.batch?.multicall : {}
+    typeof client.batch?.multicall === 'object' ? client.batch.multicall : {}
   const {
     blockNumber,
     blockTag = 'latest',

package/src/actions/public/createContractEventFilter.ts

@@ -22,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
   ? {
@@ -49,7 +55,8 @@ 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.html) or [`getFilterLogs`](https://viem.sh/docs/actions/public/getFilterLogs.html).
@@ -78,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>,
   {
@@ -86,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',
   })
@@ -119,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

@@ -20,47 +20,61 @@ import { createFilterRequestScope } from '../../utils/filters/createFilterReques
 
 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.html).
@@ -88,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
@@ -100,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',
   })
@@ -139,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/estimateContractGas.ts

@@ -1,5 +1,6 @@
 import type { Abi } 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'
@@ -12,14 +13,16 @@ import {
 } 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
@@ -55,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,
@@ -79,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

@@ -135,7 +135,7 @@ export async function estimateGas<
       },
     )
 
-    const balance = await client.request({
+    const balance = await (client as PublicClient).request({
       method: 'eth_estimateGas',
       params: block ? [request, block] : [request],
     })

package/src/actions/public/getBlock.ts

@@ -89,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/getBlockTransactionCount.ts

@@ -65,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/getChainId.ts

@@ -36,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)
 }