viem 0.4.0-main.20230430T213120 → 1.0.0

package/src/actions/test/snapshot.ts

@@ -1,9 +1,9 @@
 import type {
   TestClient,
   TestClientMode,
-  Transport,
-} from '../../clients/index.js'
-import type { Chain } from '../../types/index.js'
+} from '../../clients/createTestClient.js'
+import type { Transport } from '../../clients/transports/createTransport.js'
+import type { Chain } from '../../types/chain.js'
 
 /**
  * Snapshot the state of the blockchain at the current block.

package/src/actions/test/stopImpersonatingAccount.ts

@@ -1,9 +1,11 @@
+import type { Address } from 'abitype'
+
 import type {
   TestClient,
   TestClientMode,
-  Transport,
-} from '../../clients/index.js'
-import type { Address, Chain } from '../../types/index.js'
+} from '../../clients/createTestClient.js'
+import type { Transport } from '../../clients/transports/createTransport.js'
+import type { Chain } from '../../types/chain.js'
 
 export type StopImpersonatingAccountParameters = {
   /** The account to impersonate. */
@@ -11,7 +13,7 @@ export type StopImpersonatingAccountParameters = {
 }
 
 /**
- * Stop impersonating an account after having previously used [`impersonateAccount`](https://viem.sh/docs/actions/test/impersonateAccount).
+ * Stop impersonating an account after having previously used [`impersonateAccount`](https://viem.sh/docs/actions/test/impersonateAccount.html).
  *
  * - Docs: https://viem.sh/docs/actions/test/stopImpersonatingAccount.html
  *

package/src/actions/wallet/addChain.ts

@@ -1,6 +1,8 @@
-import type { Transport, WalletClient } from '../../clients/index.js'
-import type { Account, Chain } from '../../types/index.js'
-import { numberToHex } from '../../utils/index.js'
+import type { Account } from '../../accounts/types.js'
+import type { WalletClient } from '../../clients/createWalletClient.js'
+import type { Transport } from '../../clients/transports/createTransport.js'
+import type { Chain } from '../../types/chain.js'
+import { numberToHex } from '../../utils/encoding/toHex.js'
 
 export type AddChainParameters = {
   /** The chain to add to the wallet. */

package/src/actions/wallet/deployContract.ts

@@ -1,18 +1,18 @@
 import type { Abi, Narrow } from 'abitype'
-import type { WalletClient, Transport } from '../../clients/index.js'
-import type {
-  Account,
-  Chain,
-  GetConstructorArgs,
-  GetChain,
-  Hex,
-} from '../../types/index.js'
-import { encodeDeployData } from '../../utils/index.js'
-import { sendTransaction } from './index.js'
-import type {
-  SendTransactionParameters,
-  SendTransactionReturnType,
-} from './index.js'
+
+import type { Account } from '../../accounts/types.js'
+import type { WalletClient } from '../../clients/createWalletClient.js'
+import type { Transport } from '../../clients/transports/createTransport.js'
+import type { Chain, GetChain } from '../../types/chain.js'
+import type { GetConstructorArgs } from '../../types/contract.js'
+import type { Hex } from '../../types/misc.js'
+import { encodeDeployData } from '../../utils/abi/encodeDeployData.js'
+
+import {
+  type SendTransactionParameters,
+  type SendTransactionReturnType,
+  sendTransaction,
+} from './sendTransaction.js'
 
 export type DeployContractParameters<
   TAbi extends Abi | readonly unknown[] = Abi,
@@ -38,7 +38,7 @@ export type DeployContractReturnType = SendTransactionReturnType
  *
  * @param client - Client to use
  * @param parameters - {@link DeployContractParameters}
- * @returns The [Transaction](https://viem.sh/docs/glossary/terms#transaction) hash. {@link DeployContractReturnType}
+ * @returns The [Transaction](https://viem.sh/docs/glossary/terms.html#transaction) hash. {@link DeployContractReturnType}
  *
  * @example
  * import { createWalletClient, http } from 'viem'

package/src/actions/wallet/getAddresses.ts

@@ -1,8 +1,10 @@
 import type { Address } from 'abitype'
 
-import type { Transport, WalletClient } from '../../clients/index.js'
-import type { Account, Chain } from '../../types/index.js'
-import { checksumAddress } from '../../utils/address/index.js'
+import type { Account } from '../../accounts/types.js'
+import type { WalletClient } from '../../clients/createWalletClient.js'
+import type { Transport } from '../../clients/transports/createTransport.js'
+import type { Chain } from '../../types/chain.js'
+import { checksumAddress } from '../../utils/address/getAddress.js'
 
 export type GetAddressesReturnType = Address[]
 

package/src/actions/wallet/getPermissions.ts

@@ -1,5 +1,7 @@
-import type { Transport, WalletClient } from '../../clients/index.js'
-import type { Account, Chain } from '../../types/index.js'
+import type { Account } from '../../accounts/types.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 { WalletPermission } from '../../types/eip1193.js'
 
 export type GetPermissionsReturnType = WalletPermission[]

package/src/actions/wallet/requestAddresses.ts

@@ -1,8 +1,10 @@
 import type { Address } from 'abitype'
 
-import type { Transport, WalletClient } from '../../clients/index.js'
-import type { Account, Chain } from '../../types/index.js'
-import { getAddress } from '../../utils/index.js'
+import type { Account } from '../../accounts/types.js'
+import type { WalletClient } from '../../clients/createWalletClient.js'
+import type { Transport } from '../../clients/transports/createTransport.js'
+import type { Chain } from '../../types/chain.js'
+import { getAddress } from '../../utils/address/getAddress.js'
 
 export type RequestAddressesReturnType = Address[]
 

package/src/actions/wallet/requestPermissions.ts

@@ -1,6 +1,9 @@
-import type { Transport, WalletClient } from '../../clients/index.js'
-import type { Account, Chain, Prettify } from '../../types/index.js'
+import type { Account } from '../../accounts/types.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 { WalletPermission } from '../../types/eip1193.js'
+import type { Prettify } from '../../types/utils.js'
 
 export type RequestPermissionsParameters = Prettify<
   {

package/src/actions/wallet/sendTransaction.ts

@@ -1,35 +1,29 @@
-import type { Transport, WalletClient } from '../../clients/index.js'
-import type { BaseError } from '../../errors/index.js'
-import {
-  AccountNotFoundError,
-  ChainMismatchError,
-  ChainNotFoundError,
-} from '../../errors/index.js'
+import type { Account } from '../../accounts/types.js'
+import { parseAccount } from '../../accounts/utils/parseAccount.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 { Chain, GetChain } from '../../types/chain.js'
+import type { Formatter } from '../../types/formatter.js'
+import type { Hash } from '../../types/misc.js'
 import type {
-  Account,
-  GetAccountParameter,
-  Chain,
-  Formatter,
-  GetChain,
-  Hash,
-  MergeIntersectionProperties,
   TransactionRequest,
   TransactionSerializable,
-} from '../../types/index.js'
+} from '../../types/transaction.js'
+import type { MergeIntersectionProperties } from '../../types/utils.js'
+import { assertCurrentChain } from '../../utils/chain.js'
+import { getTransactionError } from '../../utils/errors/getTransactionError.js'
+import { extract } from '../../utils/formatters/extract.js'
+import { type Formatted, format } from '../../utils/formatters/format.js'
 import {
-  assertRequest,
-  extract,
-  format,
+  type TransactionRequestFormatter,
   formatTransactionRequest,
-  getTransactionError,
-  parseAccount,
-  prepareRequest,
-} from '../../utils/index.js'
-import type {
-  Formatted,
-  TransactionRequestFormatter,
-} from '../../utils/index.js'
-import { getChainId } from '../public/index.js'
+} from '../../utils/formatters/transactionRequest.js'
+import { assertRequest } from '../../utils/transaction/assertRequest.js'
+import { prepareRequest } from '../../utils/transaction/prepareRequest.js'
+import { getChainId } from '../public/getChainId.js'
 
 export type FormattedTransactionRequest<
   TFormatter extends Formatter | undefined = Formatter,
@@ -125,10 +119,13 @@ export async function sendTransaction<
   try {
     assertRequest(args)
 
-    const chainId = await getChainId(client)
-    if (chain !== null && chainId !== chain?.id) {
-      if (!chain) throw new ChainNotFoundError()
-      throw new ChainMismatchError({ chain, currentChainId: chainId })
+    let chainId
+    if (chain !== null) {
+      chainId = await getChainId(client)
+      assertCurrentChain({
+        currentChainId: chainId,
+        chain,
+      })
     }
 
     if (account.type === 'local') {
@@ -148,6 +145,7 @@ export async function sendTransaction<
         ...rest,
       })
 
+      if (!chainId) chainId = await getChainId(client)
       const signedRequest = (await account.signTransaction({
         chainId,
         ...request,

package/src/actions/wallet/signMessage.ts

@@ -1,17 +1,17 @@
-import type { Transport, WalletClient } from '../../clients/index.js'
-import { AccountNotFoundError } from '../../errors/index.js'
-import type {
-  Account,
-  Chain,
-  GetAccountParameter,
-  Hex,
-} from '../../types/index.js'
-import { parseAccount, toHex } from '../../utils/index.js'
+import type { Account } from '../../accounts/types.js'
+import { parseAccount } from '../../accounts/utils/parseAccount.js'
+import type { WalletClient } from '../../clients/createWalletClient.js'
+import type { Transport } from '../../clients/transports/createTransport.js'
+import { AccountNotFoundError } from '../../errors/account.js'
+import type { GetAccountParameter } from '../../types/account.js'
+import type { Chain } from '../../types/chain.js'
+import type { Hex, SignableMessage } from '../../types/misc.js'
+import { stringToHex, toHex } from '../../utils/encoding/toHex.js'
 
 export type SignMessageParameters<
   TAccount extends Account | undefined = Account | undefined,
 > = GetAccountParameter<TAccount> & {
-  message: string
+  message: SignableMessage
 }
 
 export type SignMessageReturnType = Hex
@@ -25,8 +25,8 @@ export type SignMessageReturnType = Hex
  *   - Local Accounts: Signs locally. No JSON-RPC request.
  *
  * With the calculated signature, you can:
- * - use [`verifyMessage`](https://viem.sh/docs/utilities/verifyMessage) to verify the signature,
- * - use [`recoverMessageAddress`](https://viem.sh/docs/utilities/recoverMessageAddress) to recover the signing address from a signature.
+ * - use [`verifyMessage`](https://viem.sh/docs/utilities/verifyMessage.html) to verify the signature,
+ * - use [`recoverMessageAddress`](https://viem.sh/docs/utilities/recoverMessageAddress.html) to recover the signing address from a signature.
  *
  * @param client - Client to use
  * @param parameters - {@link SignMessageParameters}
@@ -78,8 +78,15 @@ export async function signMessage<
     })
   const account = parseAccount(account_)
   if (account.type === 'local') return account.signMessage({ message })
+
+  const message_ = (() => {
+    if (typeof message === 'string') return stringToHex(message)
+    if (message.raw instanceof Uint8Array) return toHex(message.raw)
+    return message.raw
+  })()
+
   return client.request({
     method: 'personal_sign',
-    params: [toHex(message), account.address],
+    params: [message_, account.address],
   })
 }

package/src/actions/wallet/signTypedData.ts

@@ -1,19 +1,17 @@
 import type { TypedData } from 'abitype'
-import type { Transport, WalletClient } from '../../clients/index.js'
-import { AccountNotFoundError } from '../../errors/index.js'
-import type {
-  Account,
-  Chain,
-  GetAccountParameter,
-  Hex,
-  TypedDataDefinition,
-} from '../../types/index.js'
-import {
-  isHex,
-  parseAccount,
-  stringify,
-  validateTypedData,
-} from '../../utils/index.js'
+
+import type { Account } from '../../accounts/types.js'
+import { parseAccount } from '../../accounts/utils/parseAccount.js'
+import type { WalletClient } from '../../clients/createWalletClient.js'
+import type { Transport } from '../../clients/transports/createTransport.js'
+import { AccountNotFoundError } from '../../errors/account.js'
+import type { GetAccountParameter } from '../../types/account.js'
+import type { Chain } from '../../types/chain.js'
+import type { Hex } from '../../types/misc.js'
+import type { TypedDataDefinition } from '../../types/typedData.js'
+import { isHex } from '../../utils/data/isHex.js'
+import { stringify } from '../../utils/stringify.js'
+import { validateTypedData } from '../../utils/typedData.js'
 
 export type SignTypedDataParameters<
   TTypedData extends TypedData | { [key: string]: unknown } = TypedData,
@@ -25,7 +23,7 @@ export type SignTypedDataParameters<
 export type SignTypedDataReturnType = Hex
 
 /**
- * Signs typed data and calculates an Ethereum-specific signature in [EIP-191 format](https://eips.ethereum.org/EIPS/eip-191): `keccak256("\x19Ethereum Signed Message:\n" + len(message) + message))`.
+ * Signs typed data and calculates an Ethereum-specific signature in [https://eips.ethereum.org/EIPS/eip-712](https://eips.ethereum.org/EIPS/eip-712): `sign(keccak256("\x19\x01" ‖ domainSeparator ‖ hashStruct(message)))`
  *
  * - Docs: https://viem.sh/docs/actions/wallet/signTypedData.html
  * - JSON-RPC Methods:

package/src/actions/wallet/switchChain.ts

@@ -1,6 +1,8 @@
-import type { Transport, WalletClient } from '../../clients/index.js'
-import type { Account, Chain } from '../../types/index.js'
-import { numberToHex } from '../../utils/index.js'
+import type { Account } from '../../accounts/types.js'
+import type { WalletClient } from '../../clients/createWalletClient.js'
+import type { Transport } from '../../clients/transports/createTransport.js'
+import type { Chain } from '../../types/chain.js'
+import { numberToHex } from '../../utils/encoding/toHex.js'
 
 export type SwitchChainParameters = {
   /** ID of Chain to switch to */

package/src/actions/wallet/watchAsset.ts

@@ -1,5 +1,7 @@
-import type { Transport, WalletClient } from '../../clients/index.js'
-import type { Account, Chain } from '../../types/index.js'
+import type { Account } from '../../accounts/types.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 { WatchAssetParams } from '../../types/eip1193.js'
 
 export type WatchAssetParameters = WatchAssetParams

package/src/actions/wallet/writeContract.ts

@@ -1,20 +1,20 @@
 import type { Abi } from 'abitype'
 
-import type { Transport, WalletClient } from '../../clients/index.js'
-import type {
-  Account,
-  Chain,
-  ContractFunctionConfig,
-  GetChain,
-  GetValue,
-  Hex,
-} from '../../types/index.js'
-import { encodeFunctionData } from '../../utils/index.js'
-import type { EncodeFunctionDataParameters } from '../../utils/index.js'
-import { sendTransaction } from './sendTransaction.js'
-import type {
-  SendTransactionParameters,
-  SendTransactionReturnType,
+import type { Account } from '../../accounts/types.js'
+import type { WalletClient } from '../../clients/createWalletClient.js'
+import type { Transport } from '../../clients/transports/createTransport.js'
+import type { Chain, GetChain } from '../../types/chain.js'
+import type { ContractFunctionConfig, GetValue } from '../../types/contract.js'
+import type { Hex } from '../../types/misc.js'
+import {
+  type EncodeFunctionDataParameters,
+  encodeFunctionData,
+} from '../../utils/abi/encodeFunctionData.js'
+
+import {
+  type SendTransactionParameters,
+  type SendTransactionReturnType,
+  sendTransaction,
 } from './sendTransaction.js'
 
 export type WriteContractParameters<
@@ -42,15 +42,15 @@ export type WriteContractReturnType = SendTransactionReturnType
  * - Docs: https://viem.sh/docs/contract/writeContract.html
  * - Examples: https://stackblitz.com/github/wagmi-dev/viem/tree/main/examples/contracts/writing-to-contracts
  *
- * A "write" function on a Solidity contract modifies the state of the blockchain. These types of functions require gas to be executed, and hence a [Transaction](https://viem.sh/docs/glossary/terms) is needed to be broadcast in order to change the state.
+ * A "write" function on a Solidity contract modifies the state of the blockchain. These types of functions require gas to be executed, and hence a [Transaction](https://viem.sh/docs/glossary/terms.html) is needed to be broadcast in order to change the state.
  *
- * Internally, uses a [Wallet Client](https://viem.sh/docs/clients/wallet) to call the [`sendTransaction` action](https://viem.sh/docs/actions/wallet/sendTransaction) with [ABI-encoded `data`](https://viem.sh/docs/contract/encodeFunctionData).
+ * Internally, uses a [Wallet Client](https://viem.sh/docs/clients/wallet.html) to call the [`sendTransaction` action](https://viem.sh/docs/actions/wallet/sendTransaction.html) with [ABI-encoded `data`](https://viem.sh/docs/contract/encodeFunctionData.html).
  *
  * __Warning: The `write` internally sends a transaction – it does not validate if the contract write will succeed (the contract may throw an error). It is highly recommended to [simulate the contract write with `contract.simulate`](https://viem.sh/docs/contract/writeContract.html#usage) before you execute it.__
  *
  * @param client - Client to use
  * @param parameters - {@link WriteContractParameters}
- * @returns A [Transaction Hash](https://viem.sh/docs/glossary/terms#hash). {@link WriteContractReturnType}
+ * @returns A [Transaction Hash](https://viem.sh/docs/glossary/terms.html#hash). {@link WriteContractReturnType}
  *
  * @example
  * import { createWalletClient, custom, parseAbi } from 'viem'

package/src/chains.ts

@@ -1,15 +1,14 @@
 import * as chains from '@wagmi/chains'
 
-import type { Address, Hex, Quantity } from './types/index.js'
-import {
-  defineBlock,
-  defineChain,
-  defineTransaction,
-  defineTransactionReceipt,
-  defineTransactionRequest,
-} from './utils/index.js'
+import type { Address } from 'abitype'
 
-export type { Chain } from './types/index.js'
+import type { Hex } from './types/misc.js'
+import type { Quantity } from './types/rpc.js'
+import { defineChain } from './utils/chain.js'
+import { defineBlock } from './utils/formatters/block.js'
+import { defineTransaction } from './utils/formatters/transaction.js'
+import { defineTransactionReceipt } from './utils/formatters/transactionReceipt.js'
+import { defineTransactionRequest } from './utils/formatters/transactionRequest.js'
 
 const celoFormatters = {
   block: defineBlock({
@@ -71,6 +70,10 @@ export const celoAlfajores = defineChain({
   ...chains.celoAlfajores,
   formatters: celoFormatters,
 })
+export const celoCannoli = defineChain({
+  ...chains.celoCannoli,
+  formatters: celoFormatters,
+})
 export const cronos = defineChain(chains.cronos)
 export const crossbell = defineChain(chains.crossbell)
 export const dfk = defineChain(chains.dfk)
@@ -90,9 +93,12 @@ export const iotexTestnet = defineChain(chains.iotexTestnet)
 export const goerli = defineChain(chains.goerli)
 export const gnosis = defineChain(chains.gnosis)
 export const gnosisChiado = defineChain(chains.gnosisChiado)
+export const haqqMainnet = defineChain(chains.haqqMainnet)
+export const haqqTestedge2 = defineChain(chains.haqqTestedge2)
 export const hardhat = defineChain(chains.hardhat)
 export const harmonyOne = defineChain(chains.harmonyOne)
 export const klaytn = defineChain(chains.klaytn)
+export const lineaTestnet = defineChain(chains.lineaTestnet)
 export const localhost = defineChain(chains.localhost)
 export const mainnet = defineChain(chains.mainnet)
 export const metis = defineChain(chains.metis)
@@ -108,6 +114,8 @@ export const polygon = defineChain(chains.polygon)
 export const polygonMumbai = defineChain(chains.polygonMumbai)
 export const polygonZkEvm = defineChain(chains.polygonZkEvm)
 export const polygonZkEvmTestnet = defineChain(chains.polygonZkEvmTestnet)
+export const pulsechain = defineChain(chains.pulsechain)
+export const pulsechainV4 = defineChain(chains.pulsechainV4)
 export const scrollTestnet = defineChain(chains.scrollTestnet)
 export const sepolia = defineChain(chains.sepolia)
 export const skaleBlockBrawlers = defineChain(chains.skaleBlockBrawlers)
@@ -128,10 +136,12 @@ export const skaleTitanTestnet = defineChain(chains.skaleTitanTestnet)
 export const songbird = defineChain(chains.songbird)
 export const songbirdTestnet = defineChain(chains.songbirdTestnet)
 export const shardeumSphinx = defineChain(chains.shardeumSphinx)
+export const syscoin = defineChain(chains.syscoin)
 export const taraxa = defineChain(chains.taraxa)
 export const taraxaTestnet = defineChain(chains.taraxaTestnet)
 export const telos = defineChain(chains.telos)
 export const telosTestnet = defineChain(chains.telosTestnet)
+export const thunderTestnet = defineChain(chains.thunderTestnet)
 export const wanchain = defineChain(chains.wanchain)
 export const wanchainTestnet = defineChain(chains.wanchainTestnet)
 export const xdc = defineChain(chains.xdc)
@@ -139,3 +149,6 @@ export const xdcTestnet = defineChain(chains.xdcTestnet)
 export const zhejiang = defineChain(chains.zhejiang)
 export const zkSync = defineChain(chains.zkSync)
 export const zkSyncTestnet = defineChain(chains.zkSyncTestnet)
+export const zoraTestnet = defineChain(chains.zoraTestnet)
+
+export type { Chain } from './types/chain.js'

package/src/clients/createClient.ts

@@ -1,10 +1,11 @@
-import type { Chain } from '../types/index.js'
-import type { Requests } from '../types/eip1193.js'
-import { uid } from '../utils/uid.js'
+import type { Chain } from '../types/chain.js'
 import type {
-  BaseRpcRequests,
-  Transport,
-} from './transports/createTransport.js'
+  EIP1193RequestFn,
+  EIP1474Methods,
+  RpcSchema,
+} from '../types/eip1193.js'
+import { uid } from '../utils/uid.js'
+import type { Transport } from './transports/createTransport.js'
 
 export type ClientConfig<
   TTransport extends Transport = Transport,
@@ -29,7 +30,7 @@ export type ClientConfig<
 
 export type Client<
   TTransport extends Transport = Transport,
-  TRequests extends BaseRpcRequests = Requests,
+  TRpcSchema extends RpcSchema | undefined = undefined,
   TChain extends Chain | undefined = Chain | undefined,
 > = {
   /** Chain for the client. */
@@ -41,7 +42,9 @@ export type Client<
   /** Frequency (in ms) for polling enabled actions & events. Defaults to 4_000 milliseconds. */
   pollingInterval: number
   /** Request function wrapped with friendly error handling */
-  request: TRequests['request']
+  request: TRpcSchema extends undefined
+    ? EIP1193RequestFn<EIP1474Methods>
+    : EIP1193RequestFn<TRpcSchema>
   /** The RPC transport */
   transport: ReturnType<TTransport>['config'] & ReturnType<TTransport>['value']
   /** The type of client. */
@@ -55,7 +58,7 @@ export type Client<
  */
 export function createClient<
   TTransport extends Transport,
-  TRequests extends BaseRpcRequests,
+  TRpcSchema extends RpcSchema | undefined = undefined,
   TChain extends Chain | undefined = undefined,
 >({
   chain,
@@ -64,14 +67,14 @@ export function createClient<
   pollingInterval = 4_000,
   transport,
   type = 'base',
-}: ClientConfig<TTransport, TChain>): Client<TTransport, TRequests, TChain> {
+}: ClientConfig<TTransport, TChain>): Client<TTransport, TRpcSchema, TChain> {
   const { config, request, value } = transport({ chain, pollingInterval })
   return {
     chain: chain as TChain,
     key,
     name,
     pollingInterval,
-    request,
+    request: request as any,
     transport: { ...config, ...value },
     type,
     uid: uid(),

package/src/clients/createPublicClient.ts

@@ -1,15 +1,14 @@
-import type { PublicRequests } from '../types/eip1193.js'
+import type { Chain } from '../types/chain.js'
+import type { PublicRpcSchema } from '../types/eip1193.js'
+import type { Prettify } from '../types/utils.js'
+import { type Client, type ClientConfig, createClient } from './createClient.js'
+import { type PublicActions, publicActions } from './decorators/public.js'
 import type { Transport } from './transports/createTransport.js'
-import type { Client, ClientConfig } from './createClient.js'
-import { createClient } from './createClient.js'
-import { publicActions } from './decorators/index.js'
-import type { PublicActions } from './decorators/index.js'
-import type { Chain, Prettify } from '../types/index.js'
 
 export type MulticallBatchOptions = {
   /** The maximum size (in bytes) for each calldata chunk. @default 1_024 */
   batchSize?: number
-  /** The maximum number of milliseconds to wait before sending a batch. @default 16 */
+  /** The maximum number of milliseconds to wait before sending a batch. @default 0 */
   wait?: number
 }
 
@@ -32,13 +31,13 @@ export type PublicClient<
   TChain extends Chain | undefined = Chain | undefined,
   TIncludeActions extends boolean = true,
 > = Prettify<
-  Client<TTransport, PublicRequests, TChain> &
+  Client<TTransport, PublicRpcSchema, TChain> &
     Pick<PublicClientConfig, 'batch'> &
     (TIncludeActions extends true ? PublicActions<TTransport, TChain> : unknown)
 >
 
 /**
- * Creates a Public Client with a given [Transport](https://viem.sh/docs/clients/intro) configured for a [Chain](https://viem.sh/docs/clients/chains).
+ * Creates a Public Client with a given [Transport](https://viem.sh/docs/clients/intro.html) configured for a [Chain](https://viem.sh/docs/clients/chains.html).
  *
  * - Docs: https://viem.sh/docs/clients/public.html
  *

package/src/clients/createTestClient.ts

@@ -1,12 +1,10 @@
-import type { Chain } from '../types/index.js'
-import type { TestRequests } from '../types/eip1193.js'
-import type { Client, ClientConfig } from './createClient.js'
-import { createClient } from './createClient.js'
-import { testActions } from './decorators/index.js'
-import type { TestActions } from './decorators/index.js'
+import type { Chain } from '../types/chain.js'
+import type { TestRpcSchema } from '../types/eip1193.js'
+import { type Client, type ClientConfig, createClient } from './createClient.js'
+import { type TestActions, testActions } from './decorators/test.js'
 import type { Transport } from './transports/createTransport.js'
 
-export type TestClientMode = 'anvil' | 'hardhat'
+export type TestClientMode = 'anvil' | 'hardhat' | 'ganache'
 
 export type TestClientConfig<
   TMode extends TestClientMode = TestClientMode,
@@ -16,7 +14,7 @@ export type TestClientConfig<
   ClientConfig<TTransport, TChain>,
   'chain' | 'key' | 'name' | 'pollingInterval' | 'transport'
 > & {
-  /** Mode of the test client. Available: "anvil" | "hardhat" */
+  /** Mode of the test client. Available: "anvil" | "hardhat" | "ganache" */
   mode: TMode
 }
 
@@ -25,7 +23,7 @@ export type TestClient<
   TTransport extends Transport = Transport,
   TChain extends Chain | undefined = Chain | undefined,
   TIncludeActions extends boolean = true,
-> = Client<TTransport, TestRequests<TMode>, TChain> &
+> = Client<TTransport, TestRpcSchema<TMode>, TChain> &
   (TIncludeActions extends true ? TestActions : unknown) & {
     mode: TMode
   }
@@ -34,11 +32,11 @@ export type TestClient<
  * @description Creates a test client with a given transport.
  */
 /**
- * Creates a Test Client with a given [Transport](https://viem.sh/docs/clients/intro) configured for a [Chain](https://viem.sh/docs/clients/chains).
+ * Creates a Test Client with a given [Transport](https://viem.sh/docs/clients/intro.html) configured for a [Chain](https://viem.sh/docs/clients/chains.html).
  *
  * - Docs: https://viem.sh/docs/clients/test.html
  *
- * A Test Client is an interface to "test" JSON-RPC API methods accessible through a local Ethereum test node such as [Anvil](https://book.getfoundry.sh/anvil/) or [Hardhat](https://hardhat.org/) such as mining blocks, impersonating accounts, setting fees, etc through [Test Actions](https://viem.sh/docs/actions/test/introduction).
+ * A Test Client is an interface to "test" JSON-RPC API methods accessible through a local Ethereum test node such as [Anvil](https://book.getfoundry.sh/anvil/) or [Hardhat](https://hardhat.org/) such as mining blocks, impersonating accounts, setting fees, etc through [Test Actions](https://viem.sh/docs/actions/test/introduction.html).
  *
  * @param config - {@link TestClientConfig}
  * @returns A Test Client. {@link TestClient}