viem 2.9.17 → 2.9.18

package/clients/createPublicClient.ts

@@ -1,6 +1,8 @@
+import type { Address } from 'abitype'
 import type { ErrorType } from '../errors/utils.js'
+import type { Account, ParseAccount } from '../types/account.js'
 import type { Chain } from '../types/chain.js'
-import type { PublicRpcSchema } from '../types/eip1193.js'
+import type { PublicRpcSchema, RpcSchema } from '../types/eip1193.js'
 import type { Prettify } from '../types/utils.js'
 import {
   type Client,
@@ -14,9 +16,11 @@ import type { Transport } from './transports/createTransport.js'
 export type PublicClientConfig<
   transport extends Transport = Transport,
   chain extends Chain | undefined = Chain | undefined,
+  accountOrAddress extends Account | Address | undefined = undefined,
+  rpcSchema extends RpcSchema | undefined = undefined,
 > = Prettify<
   Pick<
-    ClientConfig<transport, chain>,
+    ClientConfig<transport, chain, accountOrAddress, rpcSchema>,
     | 'batch'
     | 'cacheTime'
     | 'ccipRead'
@@ -24,6 +28,7 @@ export type PublicClientConfig<
     | 'key'
     | 'name'
     | 'pollingInterval'
+    | 'rpcSchema'
     | 'transport'
   >
 >
@@ -31,12 +36,16 @@ export type PublicClientConfig<
 export type PublicClient<
   transport extends Transport = Transport,
   chain extends Chain | undefined = Chain | undefined,
+  accountOrAddress extends Account | undefined = undefined,
+  rpcSchema extends RpcSchema | undefined = undefined,
 > = Prettify<
   Client<
     transport,
     chain,
-    undefined,
-    PublicRpcSchema,
+    accountOrAddress,
+    rpcSchema extends RpcSchema
+      ? [...PublicRpcSchema, ...rpcSchema]
+      : PublicRpcSchema,
     PublicActions<transport, chain>
   >
 >
@@ -65,9 +74,11 @@ export type CreatePublicClientErrorType = CreateClientErrorType | ErrorType
 export function createPublicClient<
   transport extends Transport,
   chain extends Chain | undefined = undefined,
+  accountOrAddress extends Account | Address | undefined = undefined,
+  rpcSchema extends RpcSchema | undefined = undefined,
 >(
-  parameters: PublicClientConfig<transport, chain>,
-): PublicClient<transport, chain> {
+  parameters: PublicClientConfig<transport, chain, accountOrAddress, rpcSchema>,
+): PublicClient<transport, chain, ParseAccount<accountOrAddress>, rpcSchema> {
   const { key = 'public', name = 'Public Client' } = parameters
   const client = createClient({
     ...parameters,
@@ -75,5 +86,5 @@ export function createPublicClient<
     name,
     type: 'publicClient',
   })
-  return client.extend(publicActions)
+  return client.extend(publicActions) as any
 }

package/clients/createTestClient.ts

@@ -4,7 +4,7 @@ import type { Account } from '../accounts/types.js'
 import type { ErrorType } from '../errors/utils.js'
 import type { ParseAccount } from '../types/account.js'
 import type { Chain } from '../types/chain.js'
-import type { TestRpcSchema } from '../types/eip1193.js'
+import type { RpcSchema, TestRpcSchema } from '../types/eip1193.js'
 import type { Prettify } from '../types/utils.js'
 import {
   type Client,
@@ -25,15 +25,17 @@ export type TestClientConfig<
     | Account
     | Address
     | undefined,
+  rpcSchema extends RpcSchema | undefined = undefined,
 > = Prettify<
   Pick<
-    ClientConfig<transport, chain, accountOrAddress>,
+    ClientConfig<transport, chain, accountOrAddress, rpcSchema>,
     | 'account'
     | 'cacheTime'
     | 'chain'
     | 'key'
     | 'name'
     | 'pollingInterval'
+    | 'rpcSchema'
     | 'transport'
   > & {
     /** Mode of the test client. */
@@ -42,18 +44,21 @@ export type TestClientConfig<
 >
 
 export type TestClient<
-  TMode extends TestClientMode = TestClientMode,
+  mode extends TestClientMode = TestClientMode,
   transport extends Transport = Transport,
   chain extends Chain | undefined = Chain | undefined,
-  TAccount extends Account | undefined = Account | undefined,
-  TIncludeActions extends boolean = true,
+  account extends Account | undefined = Account | undefined,
+  includeActions extends boolean = true,
+  rpcSchema extends RpcSchema | undefined = undefined,
 > = Prettify<
-  { mode: TMode } & Client<
+  { mode: mode } & Client<
     transport,
     chain,
-    TAccount,
-    TestRpcSchema<TMode>,
-    TIncludeActions extends true ? TestActions : Record<string, unknown>
+    account,
+    rpcSchema extends RpcSchema
+      ? [...TestRpcSchema<mode>, ...rpcSchema]
+      : TestRpcSchema<mode>,
+    includeActions extends true ? TestActions : Record<string, unknown>
   >
 >
 
@@ -87,9 +92,23 @@ export function createTestClient<
   transport extends Transport,
   chain extends Chain | undefined = undefined,
   accountOrAddress extends Account | Address | undefined = undefined,
+  rpcSchema extends RpcSchema | undefined = undefined,
 >(
-  parameters: TestClientConfig<mode, transport, chain, accountOrAddress>,
-): TestClient<mode, transport, chain, ParseAccount<accountOrAddress>>
+  parameters: TestClientConfig<
+    mode,
+    transport,
+    chain,
+    accountOrAddress,
+    rpcSchema
+  >,
+): TestClient<
+  mode,
+  transport,
+  chain,
+  ParseAccount<accountOrAddress>,
+  true,
+  rpcSchema
+>
 
 export function createTestClient(parameters: TestClientConfig): TestClient {
   const { key = 'test', name = 'Test Client', mode } = parameters

package/clients/createWalletClient.ts

@@ -4,7 +4,7 @@ import type { Account } from '../accounts/types.js'
 import type { ErrorType } from '../errors/utils.js'
 import type { ParseAccount } from '../types/account.js'
 import type { Chain } from '../types/chain.js'
-import type { WalletRpcSchema } from '../types/eip1193.js'
+import type { RpcSchema, WalletRpcSchema } from '../types/eip1193.js'
 import type { Prettify } from '../types/utils.js'
 import {
   type Client,
@@ -22,9 +22,10 @@ export type WalletClientConfig<
     | Account
     | Address
     | undefined,
+  rpcSchema extends RpcSchema | undefined = undefined,
 > = Prettify<
   Pick<
-    ClientConfig<transport, chain, accountOrAddress>,
+    ClientConfig<transport, chain, accountOrAddress, rpcSchema>,
     | 'account'
     | 'cacheTime'
     | 'ccipRead'
@@ -32,6 +33,7 @@ export type WalletClientConfig<
     | 'key'
     | 'name'
     | 'pollingInterval'
+    | 'rpcSchema'
     | 'transport'
   >
 >
@@ -40,12 +42,15 @@ export type WalletClient<
   transport extends Transport = Transport,
   chain extends Chain | undefined = Chain | undefined,
   account extends Account | undefined = Account | undefined,
+  rpcSchema extends RpcSchema | undefined = undefined,
 > = Prettify<
   Client<
     transport,
     chain,
     account,
-    WalletRpcSchema,
+    rpcSchema extends RpcSchema
+      ? [...WalletRpcSchema, ...rpcSchema]
+      : WalletRpcSchema,
     WalletActions<chain, account>
   >
 >
@@ -92,9 +97,10 @@ export function createWalletClient<
   transport extends Transport,
   chain extends Chain | undefined = undefined,
   accountOrAddress extends Account | Address | undefined = undefined,
+  rpcSchema extends RpcSchema | undefined = undefined,
 >(
-  parameters: WalletClientConfig<transport, chain, accountOrAddress>,
-): WalletClient<transport, chain, ParseAccount<accountOrAddress>>
+  parameters: WalletClientConfig<transport, chain, accountOrAddress, rpcSchema>,
+): WalletClient<transport, chain, ParseAccount<accountOrAddress>, rpcSchema>
 
 export function createWalletClient(
   parameters: WalletClientConfig,

package/errors/version.ts

@@ -1 +1 @@
-export const version = '2.9.17'
+export const version = '2.9.18'

package/index.ts

@@ -474,6 +474,7 @@ export {
   type CreateClientErrorType,
   type MulticallBatchOptions,
   createClient,
+  rpcSchema,
 } from './clients/createClient.js'
 export {
   type CustomTransport,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "viem",
   "description": "TypeScript Interface for Ethereum",
-  "version": "2.9.17",
+  "version": "2.9.18",
   "main": "./_cjs/index.js",
   "module": "./_esm/index.js",
   "types": "./_types/index.d.ts",