viem 1.1.8 → 1.2.1

package/src/clients/decorators/public.ts

@@ -196,6 +196,7 @@ import {
   type WatchPendingTransactionsReturnType,
   watchPendingTransactions,
 } from '../../actions/public/watchPendingTransactions.js'
+import type { Account } from '../../types/account.js'
 import type { Chain } from '../../types/chain.js'
 import type {
   ContractFunctionConfig,
@@ -203,12 +204,13 @@ import type {
   MaybeExtractEventArgsFromAbi,
 } from '../../types/contract.js'
 import type { FilterType } from '../../types/filter.js'
-import type { PublicClient } from '../createPublicClient.js'
+import type { Client } from '../createClient.js'
 import type { Transport } from '../transports/createTransport.js'
 
 export type PublicActions<
   TTransport extends Transport = Transport,
   TChain extends Chain | undefined = Chain | undefined,
+  TAccount extends Account | undefined = Account | undefined,
 > = {
   /**
    * Executes a new message call immediately without submitting a transaction to the network.
@@ -375,7 +377,7 @@ export type PublicActions<
     TAbi extends Abi | readonly unknown[],
     TFunctionName extends string,
   >(
-    args: EstimateContractGasParameters<TAbi, TFunctionName, TChain>,
+    args: EstimateContractGasParameters<TAbi, TFunctionName, TChain, TAccount>,
   ) => Promise<EstimateContractGasReturnType>
   /**
    * Estimates the gas necessary to complete a transaction without submitting it to the network.
@@ -401,7 +403,7 @@ export type PublicActions<
    * })
    */
   estimateGas: (
-    args: EstimateGasParameters<TChain>,
+    args: EstimateGasParameters<TChain, TAccount>,
   ) => Promise<EstimateGasReturnType>
   /**
    * Returns the balance of an address in wei.
@@ -1372,23 +1374,19 @@ export type PublicActions<
   ) => WatchPendingTransactionsReturnType
 }
 
-export const publicActions: <
+export const publicActions = <
   TTransport extends Transport = Transport,
   TChain extends Chain | undefined = Chain | undefined,
+  TAccount extends Account | undefined = Account | undefined,
 >(
-  client: PublicClient<TTransport, TChain>,
-) => PublicActions<TTransport, TChain> = <
-  TTransport extends Transport = Transport,
-  TChain extends Chain | undefined = Chain | undefined,
->(
-  client: PublicClient<TTransport, TChain>,
-): PublicActions<TTransport, TChain> => ({
+  client: Client<TTransport, TChain, TAccount>,
+): PublicActions<TTransport, TChain, TAccount> => ({
   call: (args) => call(client, args),
   createBlockFilter: () => createBlockFilter(client),
   createContractEventFilter: (args) => createContractEventFilter(client, args),
   createEventFilter: (args) => createEventFilter(client, args),
   createPendingTransactionFilter: () => createPendingTransactionFilter(client),
-  estimateContractGas: (args) => estimateContractGas(client, args),
+  estimateContractGas: (args) => estimateContractGas(client, args as any),
   estimateGas: (args) => estimateGas(client, args),
   getBalance: (args) => getBalance(client, args),
   getBlock: (args) => getBlock(client, args),

package/src/clients/decorators/test.ts

@@ -84,9 +84,11 @@ import {
   type StopImpersonatingAccountParameters,
   stopImpersonatingAccount,
 } from '../../actions/test/stopImpersonatingAccount.js'
+import type { Account } from '../../types/account.js'
 import type { Chain } from '../../types/chain.js'
 import type { Quantity } from '../../types/rpc.js'
-import type { TestClient, TestClientMode } from '../createTestClient.js'
+import type { Client } from '../createClient.js'
+import type { TestClientMode } from '../createTestClient.js'
 import type { Transport } from '../transports/createTransport.js'
 
 export type TestActions = {
@@ -666,40 +668,58 @@ export type TestActions = {
   ) => Promise<void>
 }
 
-export function testActions<TChain extends Chain | undefined>(
-  client: TestClient<TestClientMode, Transport, TChain>,
-): TestActions {
-  return {
-    dropTransaction: (args) => dropTransaction(client, args),
-    getAutomine: () => getAutomine(client),
-    getTxpoolContent: () => getTxpoolContent(client),
-    getTxpoolStatus: () => getTxpoolStatus(client),
-    impersonateAccount: (args) => impersonateAccount(client, args),
-    increaseTime: (args) => increaseTime(client, args),
-    inspectTxpool: () => inspectTxpool(client),
-    mine: (args) => mine(client, args),
-    removeBlockTimestampInterval: () => removeBlockTimestampInterval(client),
-    reset: (args) => reset(client, args),
-    revert: (args) => revert(client, args),
-    sendUnsignedTransaction: (args) =>
-      sendUnsignedTransaction(client, args as any),
-    setAutomine: (args) => setAutomine(client, args),
-    setBalance: (args) => setBalance(client, args),
-    setBlockGasLimit: (args) => setBlockGasLimit(client, args),
-    setBlockTimestampInterval: (args) =>
-      setBlockTimestampInterval(client, args),
-    setCode: (args) => setCode(client, args),
-    setCoinbase: (args) => setCoinbase(client, args),
-    setIntervalMining: (args) => setIntervalMining(client, args),
-    setLoggingEnabled: (args) => setLoggingEnabled(client, args),
-    setMinGasPrice: (args) => setMinGasPrice(client, args),
-    setNextBlockBaseFeePerGas: (args) =>
-      setNextBlockBaseFeePerGas(client, args),
-    setNextBlockTimestamp: (args) => setNextBlockTimestamp(client, args),
-    setNonce: (args) => setNonce(client, args),
-    setRpcUrl: (args) => setRpcUrl(client, args),
-    setStorageAt: (args) => setStorageAt(client, args),
-    snapshot: () => snapshot(client),
-    stopImpersonatingAccount: (args) => stopImpersonatingAccount(client, args),
+export function testActions<TMode extends TestClientMode>({
+  mode,
+}: { mode: TMode }): <
+  TTransport extends Transport = Transport,
+  TChain extends Chain | undefined = Chain | undefined,
+  TAccount extends Account | undefined = Account | undefined,
+>(
+  client: Client<TTransport, TChain, TAccount>,
+) => TestActions {
+  return <
+    TTransport extends Transport = Transport,
+    TChain extends Chain | undefined = Chain | undefined,
+    TAccount extends Account | undefined = Account | undefined,
+  >(
+    client_: Client<TTransport, TChain, TAccount>,
+  ): TestActions => {
+    const client = client_.extend(() => ({
+      mode,
+    }))
+    return {
+      dropTransaction: (args) => dropTransaction(client, args),
+      getAutomine: () => getAutomine(client),
+      getTxpoolContent: () => getTxpoolContent(client),
+      getTxpoolStatus: () => getTxpoolStatus(client),
+      impersonateAccount: (args) => impersonateAccount(client, args),
+      increaseTime: (args) => increaseTime(client, args),
+      inspectTxpool: () => inspectTxpool(client),
+      mine: (args) => mine(client, args),
+      removeBlockTimestampInterval: () => removeBlockTimestampInterval(client),
+      reset: (args) => reset(client, args),
+      revert: (args) => revert(client, args),
+      sendUnsignedTransaction: (args) =>
+        sendUnsignedTransaction(client, args as any),
+      setAutomine: (args) => setAutomine(client, args),
+      setBalance: (args) => setBalance(client, args),
+      setBlockGasLimit: (args) => setBlockGasLimit(client, args),
+      setBlockTimestampInterval: (args) =>
+        setBlockTimestampInterval(client, args),
+      setCode: (args) => setCode(client, args),
+      setCoinbase: (args) => setCoinbase(client, args),
+      setIntervalMining: (args) => setIntervalMining(client, args),
+      setLoggingEnabled: (args) => setLoggingEnabled(client, args),
+      setMinGasPrice: (args) => setMinGasPrice(client, args),
+      setNextBlockBaseFeePerGas: (args) =>
+        setNextBlockBaseFeePerGas(client, args),
+      setNextBlockTimestamp: (args) => setNextBlockTimestamp(client, args),
+      setNonce: (args) => setNonce(client, args),
+      setRpcUrl: (args) => setRpcUrl(client, args),
+      setStorageAt: (args) => setStorageAt(client, args),
+      snapshot: () => snapshot(client),
+      stopImpersonatingAccount: (args) =>
+        stopImpersonatingAccount(client, args),
+    }
   }
 }

package/src/clients/decorators/wallet.ts

@@ -61,7 +61,7 @@ import {
   writeContract,
 } from '../../actions/wallet/writeContract.js'
 import type { Chain } from '../../types/chain.js'
-import type { WalletClient } from '../createWalletClient.js'
+import type { Client } from '../createClient.js'
 import type { Transport } from '../transports/createTransport.js'
 
 export type WalletActions<
@@ -523,18 +523,12 @@ export type WalletActions<
   ) => Promise<WriteContractReturnType>
 }
 
-export const walletActions: <
+export const walletActions = <
   TTransport extends Transport,
   TChain extends Chain | undefined = Chain | undefined,
   TAccount extends Account | undefined = Account | undefined,
 >(
-  client: WalletClient<TTransport, TChain, TAccount>,
-) => WalletActions<TChain, TAccount> = <
-  TTransport extends Transport,
-  TChain extends Chain | undefined = Chain | undefined,
-  TAccount extends Account | undefined = Account | undefined,
->(
-  client: WalletClient<TTransport, TChain, TAccount>,
+  client: Client<TTransport, TChain, TAccount>,
 ): WalletActions<TChain, TAccount> => ({
   addChain: (args) => addChain(client, args),
   deployContract: (args) => deployContract(client, args),

package/src/errors/version.ts

@@ -1 +1 @@
-export const version = '1.1.7'
+export const version = '1.2.1'

package/src/index.ts

@@ -34,10 +34,10 @@ export {
   type GetContractParameters,
   type GetContractReturnType,
 } from './actions/getContract.js'
-export type { AddChainParameters } from './actions/wallet/addChain.js'
-export type {
-  CallParameters,
-  CallReturnType,
+export { type AddChainParameters } from './actions/wallet/addChain.js'
+export {
+  type CallParameters,
+  type CallReturnType,
 } from './actions/public/call.js'
 export type { CreateBlockFilterReturnType } from './actions/public/createBlockFilter.js'
 export type {
@@ -223,6 +223,10 @@ export type {
   WatchAssetParameters,
   WatchAssetReturnType,
 } from './actions/wallet/watchAsset.js'
+export type {
+  VerifyHashParameters,
+  VerifyHashReturnType,
+} from './actions/public/verifyHash.js'
 export type {
   WatchContractEventParameters,
   WatchContractEventReturnType,
@@ -261,6 +265,18 @@ export {
   type TestClientConfig,
   createTestClient,
 } from './clients/createTestClient.js'
+export {
+  type PublicActions,
+  publicActions,
+} from './clients/decorators/public.js'
+export {
+  type TestActions,
+  testActions,
+} from './clients/decorators/test.js'
+export {
+  type WalletActions,
+  walletActions,
+} from './clients/decorators/wallet.js'
 export {
   type Transport,
   type TransportConfig,

package/src/types/account.ts

@@ -2,7 +2,7 @@ import type { Address } from 'abitype'
 
 import type { Account, JsonRpcAccount } from '../accounts/types.js'
 
-import type { IsUndefined } from './utils.js'
+import type { IsUndefined, Prettify } from './utils.js'
 
 export type GetAccountParameter<
   TAccount extends Account | undefined = Account | undefined,
@@ -10,10 +10,14 @@ export type GetAccountParameter<
   ? { account: Account | Address }
   : { account?: Account | Address }
 
-export type ParseAccount<TAccount extends Account | Address | undefined> =
-  | (TAccount extends Account ? TAccount : never)
-  | (TAccount extends Address ? JsonRpcAccount : never)
-  | (TAccount extends undefined ? undefined : never)
+export type ParseAccount<
+  TAccountOrAddress extends Account | Address | undefined =
+    | Account
+    | Address
+    | undefined,
+> = TAccountOrAddress extends Address
+  ? Prettify<JsonRpcAccount<TAccountOrAddress>>
+  : TAccountOrAddress
 
 export type {
   Account,

package/src/utils/ccip.ts

@@ -1,7 +1,6 @@
 import type { Abi, Address } from 'abitype'
 
 import { type CallParameters, call } from '../actions/public/call.js'
-import type { PublicClient } from '../clients/createPublicClient.js'
 import type { Transport } from '../clients/transports/createTransport.js'
 import { type BaseError } from '../errors/base.js'
 import {
@@ -14,6 +13,7 @@ import type { Chain } from '../types/chain.js'
 import type { GetErrorArgs } from '../types/contract.js'
 import type { Hex } from '../types/misc.js'
 
+import type { Client } from '../clients/createClient.js'
 import { decodeErrorResult } from './abi/decodeErrorResult.js'
 import { encodeAbiParameters } from './abi/encodeAbiParameters.js'
 import { isAddressEqual } from './address/isAddressEqual.js'
@@ -49,8 +49,8 @@ export const offchainLookupAbiItem = {
   ],
 } as const satisfies Abi[number]
 
-export async function offchainLookup<TChain extends Chain | undefined>(
-  client: PublicClient<Transport, TChain>,
+export async function offchainLookup<TChain extends Chain | undefined,>(
+  client: Client<Transport, TChain>,
   {
     blockNumber,
     blockTag,

package/src/utils/ens/avatar/parseAvatarRecord.ts

@@ -1,4 +1,4 @@
-import type { PublicClient } from '../../../clients/createPublicClient.js'
+import type { Client } from '../../../clients/createClient.js'
 import type { Transport } from '../../../clients/transports/createTransport.js'
 import type { Chain } from '../../../types/chain.js'
 import type { AssetGatewayUrls } from '../../../types/ens.js'
@@ -13,7 +13,7 @@ import {
 } from './utils.js'
 
 export async function parseAvatarRecord<TChain extends Chain | undefined>(
-  client: PublicClient<Transport, TChain>,
+  client: Client<Transport, TChain>,
   {
     gatewayUrls,
     record,
@@ -28,7 +28,7 @@ export async function parseAvatarRecord<TChain extends Chain | undefined>(
 }
 
 async function parseNftAvatarUri<TChain extends Chain | undefined>(
-  client: PublicClient<Transport, TChain>,
+  client: Client<Transport, TChain>,
   {
     gatewayUrls,
     record,

package/src/utils/ens/avatar/utils.ts

@@ -1,7 +1,7 @@
 import type { Address } from 'abitype'
 
 import { readContract } from '../../../actions/public/readContract.js'
-import type { PublicClient } from '../../../clients/createPublicClient.js'
+import type { Client } from '../../../clients/createClient.js'
 import type { Transport } from '../../../clients/transports/createTransport.js'
 import {
   EnsAvatarInvalidMetadataError,
@@ -213,7 +213,7 @@ export function parseNftUri(uri: string): ParsedNft {
 }
 
 export async function getNftTokenUri<TChain extends Chain | undefined>(
-  client: PublicClient<Transport, TChain>,
+  client: Client<Transport, TChain>,
   { nft }: { nft: ParsedNft },
 ) {
   if (nft.namespace === 'erc721') {

package/src/utils/filters/createFilterRequestScope.ts

@@ -1,8 +1,9 @@
-import type { PublicClient } from '../../clients/createPublicClient.js'
+import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
 import type { OnResponseFn } from '../../clients/transports/fallback.js'
 import type { Chain } from '../../types/chain.js'
-import type { EIP1193RequestFn, PublicRpcSchema } from '../../types/eip1193.js'
+import type { PublicRpcSchema } from '../../types/eip1193.js'
+import type { EIP1193RequestFn } from '../../types/eip1193.js'
 import type { Hex } from '../../types/misc.js'
 import type { Filter } from '../../types/utils.js'
 
@@ -28,7 +29,7 @@ type CreateFilterRequestScopeReturnType = (
  * to the successful filter ID.
  */
 export function createFilterRequestScope<TChain extends Chain | undefined>(
-  client: PublicClient<Transport, TChain>,
+  client: Client<Transport, TChain>,
   { method }: CreateFilterRequestScopeParameters,
 ): CreateFilterRequestScopeReturnType {
   const requestMap: Record<Hex, EIP1193RequestFn> = {}

package/src/utils/transaction/prepareRequest.ts

@@ -10,8 +10,7 @@ import { getBlock } from '../../actions/public/getBlock.js'
 import { getGasPrice } from '../../actions/public/getGasPrice.js'
 import { getTransactionCount } from '../../actions/public/getTransactionCount.js'
 import type { SendTransactionParameters } from '../../actions/wallet/sendTransaction.js'
-import type { PublicClient } from '../../clients/createPublicClient.js'
-import type { WalletClient } from '../../clients/createWalletClient.js'
+import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
 import { AccountNotFoundError } from '../../errors/account.js'
 import { BaseError } from '../../errors/base.js'
@@ -49,9 +48,7 @@ export async function prepareRequest<
   TAccount extends Account | undefined,
   TParameters extends PrepareRequestParameters<TAccount>,
 >(
-  client:
-    | WalletClient<Transport, TChain, TAccount>
-    | PublicClient<Transport, TChain>,
+  client: Client<Transport, TChain, TAccount>,
   args: TParameters,
 ): Promise<PrepareRequestReturnType<TAccount, TParameters>> {
   const {