viem 0.3.16 → 0.3.18

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({
@@ -139,3 +138,5 @@ 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 type { Chain } from './types/chain.js'

package/src/clients/createClient.ts

@@ -1,6 +1,7 @@
-import type { Chain } from '../types/index.js'
+import type { Chain } from '../types/chain.js'
 import type { Requests } from '../types/eip1193.js'
 import { uid } from '../utils/uid.js'
+
 import type {
   BaseRpcRequests,
   Transport,

package/src/clients/createPublicClient.ts

@@ -1,10 +1,10 @@
+import type { Chain } from '../types/chain.js'
 import type { PublicRequests } 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 */

package/src/clients/createTestClient.ts

@@ -1,9 +1,8 @@
-import type { Chain } from '../types/index.js'
+import type { Chain } from '../types/chain.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 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'

package/src/clients/createWalletClient.ts

@@ -1,17 +1,14 @@
-import type { Client, ClientConfig } from './createClient.js'
-import { createClient } from './createClient.js'
-import type { Transport } from './transports/createTransport.js'
-import type {
-  Account,
-  Address,
-  Chain,
-  JsonRpcAccount,
-  Prettify,
-} from '../types/index.js'
-import { walletActions } from './decorators/index.js'
-import type { WalletActions } from './decorators/index.js'
-import { parseAccount } from '../utils/index.js'
+import type { Address } from 'abitype'
+
+import type { Account, JsonRpcAccount } from '../accounts/types.js'
+import { parseAccount } from '../accounts/utils/parseAccount.js'
+import type { Chain } from '../types/chain.js'
 import type { Requests } from '../types/eip1193.js'
+import type { Prettify } from '../types/utils.js'
+
+import { type Client, type ClientConfig, createClient } from './createClient.js'
+import { type WalletActions, walletActions } from './decorators/wallet.js'
+import type { Transport } from './transports/createTransport.js'
 
 export type WalletClientConfig<
   TTransport extends Transport = Transport,

package/src/clients/decorators/public.ts

@@ -1,130 +1,199 @@
 import type { Abi, AbiEvent } from 'abitype'
-import type {
-  GetEnsAddressParameters,
-  GetEnsAddressReturnType,
-  GetEnsAvatarParameters,
-  GetEnsAvatarReturnType,
-  GetEnsNameParameters,
-  GetEnsNameReturnType,
-  GetEnsResolverParameters,
-  GetEnsResolverReturnType,
-  GetEnsTextParameters,
-  GetEnsTextReturnType,
-} from '../../actions/ens/index.js'
+
 import {
+  type GetEnsAddressParameters,
+  type GetEnsAddressReturnType,
   getEnsAddress,
+} from '../../actions/ens/getEnsAddress.js'
+import {
+  type GetEnsAvatarParameters,
+  type GetEnsAvatarReturnType,
   getEnsAvatar,
+} from '../../actions/ens/getEnsAvatar.js'
+import {
+  type GetEnsNameParameters,
+  type GetEnsNameReturnType,
   getEnsName,
+} from '../../actions/ens/getEnsName.js'
+import {
+  type GetEnsResolverParameters,
+  type GetEnsResolverReturnType,
   getEnsResolver,
+} from '../../actions/ens/getEnsResolver.js'
+import {
+  type GetEnsTextParameters,
+  type GetEnsTextReturnType,
   getEnsText,
-} from '../../actions/ens/index.js'
-import type {
-  CallParameters,
-  CallReturnType,
-  CreateBlockFilterReturnType,
-  CreateContractEventFilterParameters,
-  CreateContractEventFilterReturnType,
-  CreateEventFilterParameters,
-  CreateEventFilterReturnType,
-  CreatePendingTransactionFilterReturnType,
-  EstimateContractGasParameters,
-  EstimateContractGasReturnType,
-  EstimateGasParameters,
-  EstimateGasReturnType,
-  GetBalanceParameters,
-  GetBalanceReturnType,
-  GetBlockNumberParameters,
-  GetBlockNumberReturnType,
-  GetBlockParameters,
-  GetBlockReturnType,
-  GetBlockTransactionCountParameters,
-  GetBlockTransactionCountReturnType,
-  GetBytecodeParameters,
-  GetBytecodeReturnType,
-  GetChainIdReturnType,
-  GetFeeHistoryParameters,
-  GetFeeHistoryReturnType,
-  GetFilterChangesParameters,
-  GetFilterChangesReturnType,
-  GetFilterLogsParameters,
-  GetFilterLogsReturnType,
-  GetGasPriceReturnType,
-  GetLogsParameters,
-  GetLogsReturnType,
-  GetStorageAtParameters,
-  GetStorageAtReturnType,
-  GetTransactionConfirmationsParameters,
-  GetTransactionConfirmationsReturnType,
-  GetTransactionCountParameters,
-  GetTransactionCountReturnType,
-  GetTransactionParameters,
-  GetTransactionReceiptParameters,
-  GetTransactionReceiptReturnType,
-  GetTransactionReturnType,
-  MulticallParameters,
-  MulticallReturnType,
-  ReadContractParameters,
-  ReadContractReturnType,
-  SimulateContractParameters,
-  SimulateContractReturnType,
-  UninstallFilterParameters,
-  UninstallFilterReturnType,
-  WaitForTransactionReceiptParameters,
-  WaitForTransactionReceiptReturnType,
-  WatchBlockNumberParameters,
-  WatchBlockNumberReturnType,
-  WatchBlocksParameters,
-  WatchBlocksReturnType,
-  WatchContractEventParameters,
-  WatchContractEventReturnType,
-  WatchEventParameters,
-  WatchEventReturnType,
-  WatchPendingTransactionsParameters,
-  WatchPendingTransactionsReturnType,
-} from '../../actions/public/index.js'
+} from '../../actions/ens/getEnsText.js'
 import {
+  type CallParameters,
+  type CallReturnType,
   call,
+} from '../../actions/public/call.js'
+import {
+  type CreateBlockFilterReturnType,
   createBlockFilter,
+} from '../../actions/public/createBlockFilter.js'
+import {
+  type CreateContractEventFilterParameters,
+  type CreateContractEventFilterReturnType,
   createContractEventFilter,
+} from '../../actions/public/createContractEventFilter.js'
+import {
+  type CreateEventFilterParameters,
+  type CreateEventFilterReturnType,
   createEventFilter,
+} from '../../actions/public/createEventFilter.js'
+import {
+  type CreatePendingTransactionFilterReturnType,
   createPendingTransactionFilter,
+} from '../../actions/public/createPendingTransactionFilter.js'
+import {
+  type EstimateContractGasParameters,
+  type EstimateContractGasReturnType,
   estimateContractGas,
+} from '../../actions/public/estimateContractGas.js'
+import {
+  type EstimateGasParameters,
+  type EstimateGasReturnType,
   estimateGas,
+} from '../../actions/public/estimateGas.js'
+import {
+  type GetBalanceParameters,
+  type GetBalanceReturnType,
   getBalance,
+} from '../../actions/public/getBalance.js'
+import {
+  type GetBlockParameters,
+  type GetBlockReturnType,
   getBlock,
+} from '../../actions/public/getBlock.js'
+import {
+  type GetBlockNumberParameters,
+  type GetBlockNumberReturnType,
   getBlockNumber,
+} from '../../actions/public/getBlockNumber.js'
+import {
+  type GetBlockTransactionCountParameters,
+  type GetBlockTransactionCountReturnType,
   getBlockTransactionCount,
+} from '../../actions/public/getBlockTransactionCount.js'
+import {
+  type GetBytecodeParameters,
+  type GetBytecodeReturnType,
   getBytecode,
+} from '../../actions/public/getBytecode.js'
+import {
+  type GetChainIdReturnType,
   getChainId,
+} from '../../actions/public/getChainId.js'
+import {
+  type GetFeeHistoryParameters,
+  type GetFeeHistoryReturnType,
   getFeeHistory,
+} from '../../actions/public/getFeeHistory.js'
+import {
+  type GetFilterChangesParameters,
+  type GetFilterChangesReturnType,
   getFilterChanges,
+} from '../../actions/public/getFilterChanges.js'
+import {
+  type GetFilterLogsParameters,
+  type GetFilterLogsReturnType,
   getFilterLogs,
+} from '../../actions/public/getFilterLogs.js'
+import {
+  type GetGasPriceReturnType,
   getGasPrice,
+} from '../../actions/public/getGasPrice.js'
+import {
+  type GetLogsParameters,
+  type GetLogsReturnType,
   getLogs,
+} from '../../actions/public/getLogs.js'
+import {
+  type GetStorageAtParameters,
+  type GetStorageAtReturnType,
   getStorageAt,
+} from '../../actions/public/getStorageAt.js'
+import {
+  type GetTransactionParameters,
+  type GetTransactionReturnType,
   getTransaction,
+} from '../../actions/public/getTransaction.js'
+import {
+  type GetTransactionConfirmationsParameters,
+  type GetTransactionConfirmationsReturnType,
   getTransactionConfirmations,
+} from '../../actions/public/getTransactionConfirmations.js'
+import {
+  type GetTransactionCountParameters,
+  type GetTransactionCountReturnType,
   getTransactionCount,
+} from '../../actions/public/getTransactionCount.js'
+import {
+  type GetTransactionReceiptParameters,
+  type GetTransactionReceiptReturnType,
   getTransactionReceipt,
+} from '../../actions/public/getTransactionReceipt.js'
+import {
+  type MulticallParameters,
+  type MulticallReturnType,
   multicall,
+} from '../../actions/public/multicall.js'
+import {
+  type ReadContractParameters,
+  type ReadContractReturnType,
   readContract,
+} from '../../actions/public/readContract.js'
+import {
+  type SimulateContractParameters,
+  type SimulateContractReturnType,
   simulateContract,
+} from '../../actions/public/simulateContract.js'
+import {
+  type UninstallFilterParameters,
+  type UninstallFilterReturnType,
   uninstallFilter,
+} from '../../actions/public/uninstallFilter.js'
+import {
+  type WaitForTransactionReceiptParameters,
+  type WaitForTransactionReceiptReturnType,
   waitForTransactionReceipt,
+} from '../../actions/public/waitForTransactionReceipt.js'
+import {
+  type WatchBlockNumberParameters,
+  type WatchBlockNumberReturnType,
   watchBlockNumber,
+} from '../../actions/public/watchBlockNumber.js'
+import {
+  type WatchBlocksParameters,
+  type WatchBlocksReturnType,
   watchBlocks,
+} from '../../actions/public/watchBlocks.js'
+import {
+  type WatchContractEventParameters,
+  type WatchContractEventReturnType,
   watchContractEvent,
+} from '../../actions/public/watchContractEvent.js'
+import {
+  type WatchEventParameters,
+  type WatchEventReturnType,
   watchEvent,
+} from '../../actions/public/watchEvent.js'
+import {
+  type WatchPendingTransactionsParameters,
+  type WatchPendingTransactionsReturnType,
   watchPendingTransactions,
-} from '../../actions/public/index.js'
+} from '../../actions/public/watchPendingTransactions.js'
+import type { Chain } from '../../types/chain.js'
 import type {
-  Chain,
   ContractFunctionConfig,
-  FilterType,
   MaybeExtractEventArgsFromAbi,
-} from '../../types/index.js'
+} from '../../types/contract.js'
+import type { FilterType } from '../../types/filter.js'
 import type { PublicClient } from '../createPublicClient.js'
-import type { Transport } from '../transports/index.js'
+import type { Transport } from '../transports/createTransport.js'
 
 export type PublicActions<
   TTransport extends Transport = Transport,
@@ -711,14 +780,11 @@ export type PublicActions<
    */
   getFilterChanges: <
     TFilterType extends FilterType,
-    TAbiEvent extends AbiEvent | undefined,
     TAbi extends Abi | readonly unknown[],
     TEventName extends string | undefined,
   >(
-    args: GetFilterChangesParameters<TFilterType, TAbiEvent, TAbi, TEventName>,
-  ) => Promise<
-    GetFilterChangesReturnType<TFilterType, TAbiEvent, TAbi, TEventName>
-  >
+    args: GetFilterChangesParameters<TFilterType, TAbi, TEventName>,
+  ) => Promise<GetFilterChangesReturnType<TFilterType, TAbi, TEventName>>
   /**
    * Returns a list of event logs since the filter was created.
    *
@@ -746,12 +812,11 @@ export type PublicActions<
    * const logs = await client.getFilterLogs({ filter })
    */
   getFilterLogs: <
-    TAbiEvent extends AbiEvent | undefined,
     TAbi extends Abi | readonly unknown[],
     TEventName extends string | undefined,
   >(
-    args: GetFilterLogsParameters<TAbiEvent, TAbi, TEventName>,
-  ) => Promise<GetFilterLogsReturnType<TAbiEvent, TAbi, TEventName>>
+    args: GetFilterLogsParameters<TAbi, TEventName>,
+  ) => Promise<GetFilterLogsReturnType<TAbi, TEventName>>
   /**
    * Returns the current price of gas (in wei).
    *

package/src/clients/decorators/test.ts

@@ -1,62 +1,93 @@
-import type {
-  DropTransactionParameters,
-  GetAutomineReturnType,
-  GetTxpoolContentReturnType,
-  GetTxpoolStatusReturnType,
-  ImpersonateAccountParameters,
-  IncreaseTimeParameters,
-  InspectTxpoolReturnType,
-  MineParameters,
-  ResetParameters,
-  RevertParameters,
-  SendUnsignedTransactionParameters,
-  SendUnsignedTransactionReturnType,
-  SetBalanceParameters,
-  SetBlockGasLimitParameters,
-  SetBlockTimestampIntervalParameters,
-  SetCodeParameters,
-  SetCoinbaseParameters,
-  SetIntervalMiningParameters,
-  SetMinGasPriceParameters,
-  SetNextBlockBaseFeePerGasParameters,
-  SetNextBlockTimestampParameters,
-  SetNonceParameters,
-  SetStorageAtParameters,
-  StopImpersonatingAccountParameters,
-} from '../../actions/test/index.js'
 import {
+  type DropTransactionParameters,
   dropTransaction,
+} from '../../actions/test/dropTransaction.js'
+import {
+  type GetAutomineReturnType,
   getAutomine,
+} from '../../actions/test/getAutomine.js'
+import {
+  type GetTxpoolContentReturnType,
   getTxpoolContent,
+} from '../../actions/test/getTxpoolContent.js'
+import {
+  type GetTxpoolStatusReturnType,
   getTxpoolStatus,
+} from '../../actions/test/getTxpoolStatus.js'
+import {
+  type ImpersonateAccountParameters,
   impersonateAccount,
+} from '../../actions/test/impersonateAccount.js'
+import {
+  type IncreaseTimeParameters,
   increaseTime,
+} from '../../actions/test/increaseTime.js'
+import {
+  type InspectTxpoolReturnType,
   inspectTxpool,
-  mine,
-  removeBlockTimestampInterval,
-  reset,
-  revert,
+} from '../../actions/test/inspectTxpool.js'
+import { type MineParameters, mine } from '../../actions/test/mine.js'
+import { removeBlockTimestampInterval } from '../../actions/test/removeBlockTimestampInterval.js'
+import { type ResetParameters, reset } from '../../actions/test/reset.js'
+import { type RevertParameters, revert } from '../../actions/test/revert.js'
+import {
+  type SendUnsignedTransactionParameters,
+  type SendUnsignedTransactionReturnType,
   sendUnsignedTransaction,
-  setAutomine,
+} from '../../actions/test/sendUnsignedTransaction.js'
+import { setAutomine } from '../../actions/test/setAutomine.js'
+import {
+  type SetBalanceParameters,
   setBalance,
+} from '../../actions/test/setBalance.js'
+import {
+  type SetBlockGasLimitParameters,
   setBlockGasLimit,
+} from '../../actions/test/setBlockGasLimit.js'
+import {
+  type SetBlockTimestampIntervalParameters,
   setBlockTimestampInterval,
-  setCode,
+} from '../../actions/test/setBlockTimestampInterval.js'
+import { type SetCodeParameters, setCode } from '../../actions/test/setCode.js'
+import {
+  type SetCoinbaseParameters,
   setCoinbase,
+} from '../../actions/test/setCoinbase.js'
+import {
+  type SetIntervalMiningParameters,
   setIntervalMining,
-  setLoggingEnabled,
+} from '../../actions/test/setIntervalMining.js'
+import { setLoggingEnabled } from '../../actions/test/setLoggingEnabled.js'
+import {
+  type SetMinGasPriceParameters,
   setMinGasPrice,
+} from '../../actions/test/setMinGasPrice.js'
+import {
+  type SetNextBlockBaseFeePerGasParameters,
   setNextBlockBaseFeePerGas,
+} from '../../actions/test/setNextBlockBaseFeePerGas.js'
+import {
+  type SetNextBlockTimestampParameters,
   setNextBlockTimestamp,
+} from '../../actions/test/setNextBlockTimestamp.js'
+import {
+  type SetNonceParameters,
   setNonce,
-  setRpcUrl,
+} from '../../actions/test/setNonce.js'
+import { setRpcUrl } from '../../actions/test/setRpcUrl.js'
+import {
+  type SetStorageAtParameters,
   setStorageAt,
-  snapshot,
+} from '../../actions/test/setStorageAt.js'
+import { snapshot } from '../../actions/test/snapshot.js'
+import {
+  type StopImpersonatingAccountParameters,
   stopImpersonatingAccount,
-} from '../../actions/test/index.js'
-import type { Chain, Quantity } from '../../types/index.js'
+} from '../../actions/test/stopImpersonatingAccount.js'
+import type { Chain } from '../../types/chain.js'
+import type { Quantity } from '../../types/rpc.js'
 import type { TestClient, TestClientMode } from '../createTestClient.js'
-import type { Transport } from '../transports/index.js'
+import type { Transport } from '../transports/createTransport.js'
 
 export type TestActions = {
   /**

package/src/clients/decorators/wallet.ts

@@ -1,44 +1,68 @@
 import type { Abi, TypedData } from 'abitype'
-import type {
-  AddChainParameters,
-  DeployContractParameters,
-  DeployContractReturnType,
-  GetAddressesReturnType,
-  GetChainIdReturnType,
-  GetPermissionsReturnType,
-  RequestAddressesReturnType,
-  RequestPermissionsParameters,
-  RequestPermissionsReturnType,
-  SendTransactionParameters,
-  SendTransactionReturnType,
-  SignMessageParameters,
-  SignMessageReturnType,
-  SignTypedDataParameters,
-  SignTypedDataReturnType,
-  SwitchChainParameters,
-  WatchAssetParameters,
-  WatchAssetReturnType,
-  WriteContractParameters,
-  WriteContractReturnType,
-} from '../../actions/wallet/index.js'
+
+import type { Account } from '../../accounts/types.js'
+import {
+  type GetChainIdReturnType,
+  getChainId,
+} from '../../actions/public/getChainId.js'
 import {
+  type AddChainParameters,
   addChain,
+} from '../../actions/wallet/addChain.js'
+import {
+  type DeployContractParameters,
+  type DeployContractReturnType,
   deployContract,
+} from '../../actions/wallet/deployContract.js'
+import {
+  type GetAddressesReturnType,
   getAddresses,
-  getChainId,
+} from '../../actions/wallet/getAddresses.js'
+import {
+  type GetPermissionsReturnType,
   getPermissions,
+} from '../../actions/wallet/getPermissions.js'
+import {
+  type RequestAddressesReturnType,
   requestAddresses,
+} from '../../actions/wallet/requestAddresses.js'
+import {
+  type RequestPermissionsParameters,
+  type RequestPermissionsReturnType,
   requestPermissions,
+} from '../../actions/wallet/requestPermissions.js'
+import {
+  type SendTransactionParameters,
+  type SendTransactionReturnType,
   sendTransaction,
+} from '../../actions/wallet/sendTransaction.js'
+import {
+  type SignMessageParameters,
+  type SignMessageReturnType,
   signMessage,
+} from '../../actions/wallet/signMessage.js'
+import {
+  type SignTypedDataParameters,
+  type SignTypedDataReturnType,
   signTypedData,
+} from '../../actions/wallet/signTypedData.js'
+import {
+  type SwitchChainParameters,
   switchChain,
+} from '../../actions/wallet/switchChain.js'
+import {
+  type WatchAssetParameters,
+  type WatchAssetReturnType,
   watchAsset,
+} from '../../actions/wallet/watchAsset.js'
+import {
+  type WriteContractParameters,
+  type WriteContractReturnType,
   writeContract,
-} from '../../actions/wallet/index.js'
-import type { Account, Chain } from '../../types/index.js'
+} from '../../actions/wallet/writeContract.js'
+import type { Chain } from '../../types/chain.js'
 import type { WalletClient } from '../createWalletClient.js'
-import type { Transport } from '../transports/index.js'
+import type { Transport } from '../transports/createTransport.js'
 
 export type WalletActions<
   TChain extends Chain | undefined = Chain | undefined,

package/src/clients/transports/createTransport.ts

@@ -1,6 +1,6 @@
-import type { Chain } from '../../types/index.js'
+import type { Chain } from '../../types/chain.js'
 import type { Requests } from '../../types/eip1193.js'
-import { buildRequest } from '../../utils/index.js'
+import { buildRequest } from '../../utils/buildRequest.js'
 import type { ClientConfig } from '../createClient.js'
 
 export type BaseRpcRequests = {

package/src/clients/transports/custom.ts

@@ -1,9 +1,9 @@
-import type {
-  BaseRpcRequests,
-  Transport,
-  TransportConfig,
+import {
+  type BaseRpcRequests,
+  type Transport,
+  type TransportConfig,
+  createTransport,
 } from './createTransport.js'
-import { createTransport } from './createTransport.js'
 
 type EthereumProvider = { request: BaseRpcRequests['request'] }
 

package/src/clients/transports/fallback.ts

@@ -1,9 +1,12 @@
-import type { Chain } from '../../types/index.js'
+import type { Chain } from '../../types/chain.js'
 import { isDeterministicError } from '../../utils/buildRequest.js'
 import { wait } from '../../utils/wait.js'
-import type { Transport, TransportConfig } from './createTransport.js'
-import { createTransport } from './createTransport.js'
 
+import {
+  type Transport,
+  type TransportConfig,
+  createTransport,
+} from './createTransport.js'
 // TODO: Narrow `method` & `params` types.
 export type OnResponseFn = (
   args: {