viem 1.1.7 → 1.2.0

package/src/errors/rpc.ts

@@ -95,10 +95,11 @@ export class ProviderRpcError<
  */
 export class ParseRpcError extends RpcError {
   override name = 'ParseRpcError'
+  static code = -32700 as const
 
   constructor(cause: Error) {
     super(cause, {
-      code: -32700,
+      code: ParseRpcError.code,
       shortMessage:
         'Invalid JSON was received by the server. An error occurred on the server while parsing the JSON text.',
     })
@@ -112,10 +113,11 @@ export class ParseRpcError extends RpcError {
  */
 export class InvalidRequestRpcError extends RpcError {
   override name = 'InvalidRequestRpcError'
+  static code = -32600 as const
 
   constructor(cause: Error) {
     super(cause, {
-      code: -32600,
+      code: InvalidRequestRpcError.code,
       shortMessage: 'JSON is not a valid request object.',
     })
   }
@@ -128,10 +130,11 @@ export class InvalidRequestRpcError extends RpcError {
  */
 export class MethodNotFoundRpcError extends RpcError {
   override name = 'MethodNotFoundRpcError'
+  static code = -32601 as const
 
   constructor(cause: Error) {
     super(cause, {
-      code: -32601,
+      code: MethodNotFoundRpcError.code,
       shortMessage: 'The method does not exist / is not available.',
     })
   }
@@ -144,10 +147,11 @@ export class MethodNotFoundRpcError extends RpcError {
  */
 export class InvalidParamsRpcError extends RpcError {
   override name = 'InvalidParamsRpcError'
+  static code = -32602 as const
 
   constructor(cause: Error) {
     super(cause, {
-      code: -32602,
+      code: InvalidParamsRpcError.code,
       shortMessage: [
         'Invalid parameters were provided to the RPC method.',
         'Double check you have provided the correct parameters.',
@@ -163,10 +167,11 @@ export class InvalidParamsRpcError extends RpcError {
  */
 export class InternalRpcError extends RpcError {
   override name = 'InternalRpcError'
+  static code = -32603 as const
 
   constructor(cause: Error) {
     super(cause, {
-      code: -32603,
+      code: InternalRpcError.code,
       shortMessage: 'An internal error was received.',
     })
   }
@@ -179,10 +184,11 @@ export class InternalRpcError extends RpcError {
  */
 export class InvalidInputRpcError extends RpcError {
   override name = 'InvalidInputRpcError'
+  static code = -32000 as const
 
   constructor(cause: Error) {
     super(cause, {
-      code: -32000,
+      code: InvalidInputRpcError.code,
       shortMessage: [
         'Missing or invalid parameters.',
         'Double check you have provided the correct parameters.',
@@ -198,10 +204,11 @@ export class InvalidInputRpcError extends RpcError {
  */
 export class ResourceNotFoundRpcError extends RpcError {
   override name = 'ResourceNotFoundRpcError'
+  static code = -32001 as const
 
   constructor(cause: Error) {
     super(cause, {
-      code: -32001,
+      code: ResourceNotFoundRpcError.code,
       shortMessage: 'Requested resource not found.',
     })
   }
@@ -214,10 +221,11 @@ export class ResourceNotFoundRpcError extends RpcError {
  */
 export class ResourceUnavailableRpcError extends RpcError {
   override name = 'ResourceUnavailableRpcError'
+  static code = -32002 as const
 
   constructor(cause: Error) {
     super(cause, {
-      code: -32002,
+      code: ResourceUnavailableRpcError.code,
       shortMessage: 'Requested resource not available.',
     })
   }
@@ -230,9 +238,13 @@ export class ResourceUnavailableRpcError extends RpcError {
  */
 export class TransactionRejectedRpcError extends RpcError {
   override name = 'TransactionRejectedRpcError'
+  static code = -32003 as const
 
   constructor(cause: Error) {
-    super(cause, { code: -32003, shortMessage: 'Transaction creation failed.' })
+    super(cause, {
+      code: TransactionRejectedRpcError.code,
+      shortMessage: 'Transaction creation failed.',
+    })
   }
 }
 
@@ -243,9 +255,13 @@ export class TransactionRejectedRpcError extends RpcError {
  */
 export class MethodNotSupportedRpcError extends RpcError {
   override name = 'MethodNotSupportedRpcError'
+  static code = -32004 as const
 
   constructor(cause: Error) {
-    super(cause, { code: -32004, shortMessage: 'Method is not implemented.' })
+    super(cause, {
+      code: MethodNotSupportedRpcError.code,
+      shortMessage: 'Method is not implemented.',
+    })
   }
 }
 
@@ -256,10 +272,11 @@ export class MethodNotSupportedRpcError extends RpcError {
  */
 export class LimitExceededRpcError extends RpcError {
   override name = 'LimitExceededRpcError'
+  static code = -32005 as const
 
   constructor(cause: Error) {
     super(cause, {
-      code: -32005,
+      code: LimitExceededRpcError.code,
       shortMessage: 'Request exceeds defined limit.',
     })
   }
@@ -272,10 +289,11 @@ export class LimitExceededRpcError extends RpcError {
  */
 export class JsonRpcVersionUnsupportedError extends RpcError {
   override name = 'JsonRpcVersionUnsupportedError'
+  static code = -32006 as const
 
   constructor(cause: Error) {
     super(cause, {
-      code: -32006,
+      code: JsonRpcVersionUnsupportedError.code,
       shortMessage: 'Version of JSON-RPC protocol is not supported.',
     })
   }
@@ -288,10 +306,11 @@ export class JsonRpcVersionUnsupportedError extends RpcError {
  */
 export class UserRejectedRequestError extends ProviderRpcError {
   override name = 'UserRejectedRequestError'
+  static code = 4001 as const
 
   constructor(cause: Error) {
     super(cause, {
-      code: 4001,
+      code: UserRejectedRequestError.code,
       shortMessage: 'User rejected the request.',
     })
   }
@@ -304,10 +323,11 @@ export class UserRejectedRequestError extends ProviderRpcError {
  */
 export class UnauthorizedProviderError extends ProviderRpcError {
   override name = 'UnauthorizedProviderError'
+  static code = 4100 as const
 
   constructor(cause: Error) {
     super(cause, {
-      code: 4100,
+      code: UnauthorizedProviderError.code,
       shortMessage:
         'The requested method and/or account has not been authorized by the user.',
     })
@@ -321,10 +341,11 @@ export class UnauthorizedProviderError extends ProviderRpcError {
  */
 export class UnsupportedProviderMethodError extends ProviderRpcError {
   override name = 'UnsupportedProviderMethodError'
+  static code = 4200 as const
 
   constructor(cause: Error) {
     super(cause, {
-      code: 4200,
+      code: UnsupportedProviderMethodError.code,
       shortMessage: 'The Provider does not support the requested method.',
     })
   }
@@ -337,10 +358,11 @@ export class UnsupportedProviderMethodError extends ProviderRpcError {
  */
 export class ProviderDisconnectedError extends ProviderRpcError {
   override name = 'ProviderDisconnectedError'
+  static code = 4900 as const
 
   constructor(cause: Error) {
     super(cause, {
-      code: 4900,
+      code: ProviderDisconnectedError.code,
       shortMessage: 'The Provider is disconnected from all chains.',
     })
   }
@@ -353,10 +375,11 @@ export class ProviderDisconnectedError extends ProviderRpcError {
  */
 export class ChainDisconnectedError extends ProviderRpcError {
   override name = 'ChainDisconnectedError'
+  static code = 4901 as const
 
   constructor(cause: Error) {
     super(cause, {
-      code: 4901,
+      code: ChainDisconnectedError.code,
       shortMessage: 'The Provider is not connected to the requested chain.',
     })
   }
@@ -369,10 +392,11 @@ export class ChainDisconnectedError extends ProviderRpcError {
  */
 export class SwitchChainError extends ProviderRpcError {
   override name = 'SwitchChainError'
+  static code = 4902 as const
 
   constructor(cause: Error) {
     super(cause, {
-      code: 4902,
+      code: SwitchChainError.code,
       shortMessage: 'An error occurred when attempting to switch chain.',
     })
   }

package/src/errors/version.ts

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

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/types/utils.ts

@@ -176,9 +176,9 @@ export type PartialBy<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>
 /**
  * @description Combines members of an intersection into a readable type.
  *
- * @link https://twitter.com/mattpocockuk/status/1622730173446557697?s=20&t=NdpAcmEFXY01xkqU3KO0Mg
+ * @see {@link https://twitter.com/mattpocockuk/status/1622730173446557697?s=20&t=NdpAcmEFXY01xkqU3KO0Mg}
  * @example
- * Prettify<{ a: string } | { b: string } | { c: number, d: bigint }>
+ * Prettify<{ a: string } & { b: string } & { c: number, d: bigint }>
  * => { a: string, b: string, c: number, d: bigint }
  */
 export type Prettify<T> = {

package/src/utils/buildRequest.ts

@@ -71,27 +71,65 @@ export function buildRequest<TRequest extends (args: any) => Promise<any>>(
           const err = err_ as unknown as RpcError<
             RpcErrorCode | ProviderRpcErrorCode
           >
-          if (err.code === -32700) throw new ParseRpcError(err)
-          if (err.code === -32600) throw new InvalidRequestRpcError(err)
-          if (err.code === -32601) throw new MethodNotFoundRpcError(err)
-          if (err.code === -32602) throw new InvalidParamsRpcError(err)
-          if (err.code === -32603) throw new InternalRpcError(err)
-          if (err.code === -32000) throw new InvalidInputRpcError(err)
-          if (err.code === -32001) throw new ResourceNotFoundRpcError(err)
-          if (err.code === -32002) throw new ResourceUnavailableRpcError(err)
-          if (err.code === -32003) throw new TransactionRejectedRpcError(err)
-          if (err.code === -32004) throw new MethodNotSupportedRpcError(err)
-          if (err.code === -32005) throw new LimitExceededRpcError(err)
-          if (err.code === -32006) throw new JsonRpcVersionUnsupportedError(err)
-          if (err.code === -32042) throw new MethodNotSupportedRpcError(err)
-          if (err.code === 4001) throw new UserRejectedRequestError(err)
-          if (err.code === 4100) throw new UnauthorizedProviderError(err)
-          if (err.code === 4200) throw new UnsupportedProviderMethodError(err)
-          if (err.code === 4900) throw new ProviderDisconnectedError(err)
-          if (err.code === 4901) throw new ChainDisconnectedError(err)
-          if (err.code === 4902) throw new SwitchChainError(err)
-          if (err_ instanceof BaseError) throw err_
-          throw new UnknownRpcError(err as Error)
+          switch (err.code) {
+            // -32700
+            case ParseRpcError.code:
+              throw new ParseRpcError(err)
+            // -32600
+            case InvalidRequestRpcError.code:
+              throw new InvalidRequestRpcError(err)
+            // -32601
+            case MethodNotFoundRpcError.code:
+              throw new MethodNotFoundRpcError(err)
+            // -32602
+            case InvalidParamsRpcError.code:
+              throw new InvalidParamsRpcError(err)
+            // -32603
+            case InternalRpcError.code:
+              throw new InternalRpcError(err)
+            // -32000
+            case InvalidInputRpcError.code:
+              throw new InvalidInputRpcError(err)
+            // -32001
+            case ResourceNotFoundRpcError.code:
+              throw new ResourceNotFoundRpcError(err)
+            // -32002
+            case ResourceUnavailableRpcError.code:
+              throw new ResourceUnavailableRpcError(err)
+            // -32003
+            case TransactionRejectedRpcError.code:
+              throw new TransactionRejectedRpcError(err)
+            // -32004
+            case MethodNotSupportedRpcError.code:
+              throw new MethodNotSupportedRpcError(err)
+            // -32005
+            case LimitExceededRpcError.code:
+              throw new LimitExceededRpcError(err)
+            // -32006
+            case JsonRpcVersionUnsupportedError.code:
+              throw new JsonRpcVersionUnsupportedError(err)
+            // 4001
+            case UserRejectedRequestError.code:
+              throw new UserRejectedRequestError(err)
+            // 4100
+            case UnauthorizedProviderError.code:
+              throw new UnauthorizedProviderError(err)
+            // 4200
+            case UnsupportedProviderMethodError.code:
+              throw new UnsupportedProviderMethodError(err)
+            // 4900
+            case ProviderDisconnectedError.code:
+              throw new ProviderDisconnectedError(err)
+            // 4901
+            case ChainDisconnectedError.code:
+              throw new ChainDisconnectedError(err)
+            // 4902
+            case SwitchChainError.code:
+              throw new SwitchChainError(err)
+            default:
+              if (err_ instanceof BaseError) throw err_
+              throw new UnknownRpcError(err as Error)
+          }
         }
       },
       {

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 {