viem 3.0.0-next.0 → 3.0.0-next.2

package/dist/core/actions/{verifyTypedData.js → typedData/verify.js}

@@ -1,5 +1,5 @@
 import { TypedData } from 'ox';
-import { verifyHash } from './verifyHash.js';
+import { verifyHash } from '../verifyHash.js';
 /**
  * Verifies that typed data was signed by the provided address, supporting
  * Smart Contract Accounts (ERC-1271/6492/8010) and Externally Owned Accounts.
@@ -13,7 +13,7 @@ import { verifyHash } from './verifyHash.js';
  *   chain: mainnet,
  *   transport: http(),
  * })
- * const valid = await Actions.verifyTypedData(client, {
+ * const valid = await Actions.typedData.verify(client, {
  *   address: '0xA0Cf798816D4b9b9866b5330EEa46a18382f251e',
  *   domain: { name: 'Ether Mail', version: '1', chainId: 1 },
  *   types: {
@@ -25,7 +25,7 @@ import { verifyHash } from './verifyHash.js';
  * })
  * ```
  */
-export async function verifyTypedData(client, options) {
+export async function verify(client, options) {
     const { address, blockHash, blockNumber, blockTag, erc6492VerifierAddress, factory, factoryData, mode, multicallAddress, requestOptions, requireCanonical, signature, ...typedData } = options;
     return verifyHash(client, {
         address,
@@ -43,4 +43,4 @@ export async function verifyTypedData(client, options) {
         signature,
     });
 }
-//# sourceMappingURL=verifyTypedData.js.map
+//# sourceMappingURL=verify.js.map

package/dist/core/actions/typedData/verify.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"verify.js","sourceRoot":"","sources":["../../../../src/core/actions/typedData/verify.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,IAAI,CAAA;AAI9B,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAE7C;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,MAAM,CAAC,KAAK,UAAU,MAAM,CAI1B,MAAqB,EACrB,OAA+C;IAE/C,MAAM,EACJ,OAAO,EACP,SAAS,EACT,WAAW,EACX,QAAQ,EACR,sBAAsB,EACtB,OAAO,EACP,WAAW,EACX,IAAI,EACJ,gBAAgB,EAChB,cAAc,EACd,gBAAgB,EAChB,SAAS,EACT,GAAG,SAAS,EACb,GAAG,OAAyB,CAAA;IAE7B,OAAO,UAAU,CAAC,MAAM,EAAE;QACxB,OAAO;QACP,SAAS;QACT,WAAW;QACX,QAAQ;QACR,sBAAsB;QACtB,OAAO;QACP,WAAW;QACX,IAAI,EAAE,SAAS,CAAC,cAAc,CAAC,SAAmC,CAAC;QACnE,IAAI;QACJ,gBAAgB;QAChB,cAAc;QACd,gBAAgB;QAChB,SAAS;KACY,CAAC,CAAA;AAC1B,CAAC"}

package/dist/erc4337/internal/erc7739.js

@@ -1,6 +1,6 @@
 import { AbiParameters, Hex, PersonalMessage, TypedData } from 'ox';
 import { getEip712Domain } from '../../core/actions/contract/getEip712Domain.js';
-import { signTypedData as signTypedData_ } from '../../core/actions/signTypedData.js';
+import { sign as signTypedData_ } from '../../core/actions/typedData/sign.js';
 /** Signs a personal message with ERC-7739 nested EIP-712. */
 export async function signMessage(client, options) {
     const { account, factory, factoryData, message, verifier } = options;

package/dist/erc4337/internal/erc7739.js.map

@@ -1 +1 @@
-{"version":3,"file":"erc7739.js","sourceRoot":"","sources":["../../../src/erc4337/internal/erc7739.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"erc7739.js","sourceRoot":"","sources":["../../../src/erc4337/internal/erc7739.ts"],"names":[],"mappings":"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"}

package/dist/version.d.ts

@@ -1,3 +1,3 @@
 /** @internal */
-export declare const version = "3.0.0-next.0";
+export declare const version = "3.0.0-next.2";
 //# sourceMappingURL=version.d.ts.map

package/dist/version.js

@@ -1,3 +1,3 @@
 /** @internal */
-export const version = '3.0.0-next.0';
+export const version = '3.0.0-next.2';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "viem",
   "description": "TypeScript Interface for Ethereum",
-  "version": "3.0.0-next.0",
+  "version": "3.0.0-next.2",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",

package/src/core/Client.ts

@@ -1,4 +1,9 @@
-import type { Address, Errors as ox_Errors, RpcSchema } from 'ox'
+import {
+  type Address,
+  type Errors as ox_Errors,
+  Provider,
+  type RpcSchema,
+} from 'ox'
 
 import type * as CcipRead from '../utils/CcipRead.js'
 import * as Account from './Account.js'
@@ -464,6 +469,444 @@ export declare namespace createResolver {
     | create.ErrorType
 }
 
+/**
+ * Creates a v3 {@link Client} from a v2-compatible base Client. The returned
+ * Client forwards requests through the v2 Client and can be extended with v3
+ * action decorators.
+ *
+ * The adapted Client derives its Chain from the source chain ID and carries
+ * only JSON-RPC Accounts by default. Pass v3-native values to preserve full
+ * Chain or Account behavior.
+ * The returned Client owns retries: forwarded requests disable the v2 Client's
+ * retry layer. Forwarded errors are normalized with `Provider.parseError`.
+ *
+ * @example
+ * ```ts
+ * import { createClient as createClientV2, http as httpV2 } from 'viem'
+ * import { Client, publicActions } from 'viem-v3'
+ *
+ * const clientV2 = createClientV2({ transport: httpV2() })
+ * const publicClient = Client.fromV2(clientV2).extend(publicActions())
+ * ```
+ *
+ * @param client - The v2-compatible base Client.
+ * @param options - Optional v3 Chain and Account overrides.
+ * @returns A v3 Client.
+ */
+export function fromV2<
+  const source extends V2SourceClient,
+  chainOrId extends Chain.Chain | number | undefined = never,
+  accountOrAddress extends Account.Account | Address.Address | undefined =
+    never,
+>(
+  client: source,
+  options: fromV2.Options<chainOrId, accountOrAddress> = {},
+): fromV2.ReturnType<
+  V2ResolveChain<source['chain'], chainOrId>,
+  V2ResolveAccount<source['account'], accountOrAddress>
+> {
+  const chain = (
+    'chain' in options ? options.chain : client.chain?.id
+  ) as V2ResolveChain<source['chain'], chainOrId>
+  const account = (
+    'account' in options
+      ? options.account
+      : client.account?.type === 'json-rpc'
+        ? client.account
+        : undefined
+  ) as V2ResolveAccount<source['account'], accountOrAddress>
+  const request = client.request as unknown as V2Request
+
+  const transport = Transport.from({
+    key: 'v2',
+    name: 'Viem v2 Client',
+    type: 'custom',
+    setup() {
+      return {
+        async request(parameters, options) {
+          try {
+            return await request(parameters, { ...options, retryCount: 0 })
+          } catch (error) {
+            throw Provider.parseError(error)
+          }
+        },
+      }
+    },
+  })
+
+  // The runtime branches above mirror the conditional target types.
+  return create({
+    account,
+    batch: client.batch,
+    blockTag: client.experimental_blockTag,
+    cacheTime: client.cacheTime,
+    ccipRead: client.ccipRead === false ? false : undefined,
+    chain,
+    dataSuffix: client.dataSuffix,
+    key: client.key,
+    name: client.name,
+    pollingInterval: client.pollingInterval,
+    transport,
+    type: client.type,
+  }) as unknown as Client<
+    V2ResolveChain<source['chain'], chainOrId>,
+    V2ResolveAccount<source['account'], accountOrAddress>,
+    Transport.Transport<'custom'>
+  >
+}
+
+export declare namespace fromV2 {
+  /** Options for {@link fromV2}. */
+  type Options<
+    chainOrId extends Chain.Chain | number | undefined = never,
+    accountOrAddress extends Account.Account | Address.Address | undefined =
+      never,
+  > = {
+    /** v3 Account or address to use instead of the v2 Client's Account. */
+    account?: accountOrAddress | undefined
+    /** v3 Chain or chain ID to use instead of the v2 Client's chain ID. */
+    chain?: chainOrId | undefined
+  }
+
+  /** Return type of {@link fromV2}. */
+  type ReturnType<
+    chain extends Chain.Chain | undefined = Chain.Chain | undefined,
+    account extends Account.Account | undefined = Account.Account | undefined,
+  > = Client<chain, account, Transport.Transport<'custom'>>
+
+  /** Errors thrown while adapting a v2 Client. */
+  type ErrorType = create.ErrorType | ox_Errors.GlobalErrorType
+}
+
+/**
+ * Creates a v2-compatible base Client from a v3 {@link Client}. Extend the
+ * result with v2 action decorators to create a v2 Public, Wallet, or custom
+ * Client.
+ *
+ * The one-argument form creates a chainless Client and only preserves
+ * JSON-RPC Accounts. Pass v2-native values to preserve full Chain or local
+ * Account behavior. Requests preserve the v3 Client's error identities.
+ *
+ * @example
+ * ```ts
+ * import { publicActions as publicActionsV2 } from 'viem'
+ * import { Client, http } from 'viem-v3'
+ *
+ * const client = Client.create({ transport: http() })
+ * const publicClientV2 = Client.toV2(client).extend(publicActionsV2)
+ * ```
+ *
+ * @param client - The v3 Client.
+ * @param options - Optional v2 Chain and Account overrides.
+ * @returns A v2-compatible base Client.
+ */
+export function toV2<
+  const source extends Client,
+  chain extends V2Chain | undefined = never,
+  account extends V2Account | undefined = never,
+>(
+  client: source,
+  options: toV2.Options<chain, account> = {},
+): toV2.ReturnType<
+  V2ResolveTargetChain<chain>,
+  V2ResolveTargetAccount<source['account'], account>
+> {
+  const request = client.request as unknown as V2Request
+  const account = (
+    'account' in options
+      ? options.account
+      : client.account?.type === 'json-rpc'
+        ? client.account
+        : undefined
+  ) as V2ResolveTargetAccount<source['account'], account>
+
+  const base: V2Base<
+    V2ResolveTargetChain<chain>,
+    V2ResolveTargetAccount<source['account'], account>
+  > = {
+    account,
+    batch: client.batch,
+    cacheTime: client.cacheTime,
+    ccipRead: client.ccipRead === false ? false : undefined,
+    chain: options.chain as V2ResolveTargetChain<chain>,
+    dataSuffix: client.dataSuffix,
+    experimental_blockTag: client.blockTag,
+    key: client.key,
+    name: client.name,
+    pollingInterval: client.pollingInterval,
+    request,
+    tokens: undefined,
+    transport: {
+      key: 'custom',
+      name: 'Viem v3 Client',
+      request,
+      retryCount: 0,
+      type: 'custom',
+    },
+    type: client.type,
+    uid: uid(),
+  }
+
+  return withV2Extend(base)
+}
+
+export declare namespace toV2 {
+  /** Options for {@link toV2}. */
+  type Options<
+    chain extends V2Chain | undefined = never,
+    account extends V2Account | undefined = never,
+  > = {
+    /** v2 JSON-RPC or local Account to use instead of the v3 Client's Account. */
+    account?: account | undefined
+    /** v2 Chain to attach to the adapted Client. */
+    chain?: chain | undefined
+  }
+
+  /** Return type of {@link toV2}. */
+  type ReturnType<
+    chain extends V2Chain | undefined = undefined,
+    account extends V2Account | undefined = undefined,
+  > = V2Client<chain, account, undefined>
+}
+
+type V2Base<
+  chain extends V2Chain | undefined,
+  account extends V2Account | undefined,
+> = {
+  /** The Account of the Client. */
+  account: account
+  /** `eth_call` multicall aggregation flags. */
+  batch?: { multicall?: boolean | MulticallOptions | undefined } | undefined
+  /** Time (in ms) cached data stays in memory. */
+  cacheTime: number
+  /** Whether CCIP Read is disabled. */
+  ccipRead?: false | undefined
+  /** Chain for the Client. */
+  chain: chain
+  /** Data suffix appended to transaction calldata. */
+  dataSuffix?: DataSuffix | undefined
+  /** Default block tag for RPC requests. */
+  experimental_blockTag?: BlockTag | undefined
+  /** A key for the Client. */
+  key: string
+  /** A name for the Client. */
+  name: string
+  /** Polling frequency (ms) for actions and events. */
+  pollingInterval: number
+  /** Request function forwarded to the v3 Client. */
+  request: V2Request
+  /** Token functions are not adapted between versions. */
+  tokens: undefined
+  /** Synthetic custom transport backed by the v3 Client. */
+  transport: V2Transport
+  /** The type of Client. */
+  type: string
+  /** A unique id for the Client. */
+  uid: string
+}
+
+type V2Extended = Prettify<
+  { [key in keyof V2Base<any, any>]?: undefined } & {
+    [key: string]: unknown
+  }
+>
+
+type V2Client<
+  chain extends V2Chain | undefined,
+  account extends V2Account | undefined,
+  extended extends V2Extended | undefined,
+> = V2Base<chain, account> &
+  (extended extends V2Extended ? extended : unknown) & {
+    /**
+     * Extends the Client with a v2 decorator. The installed v2 Client type
+     * supplies target-version protected-action constraints.
+     */
+    extend: <const extension extends V2Extended>(
+      fn: (client: V2Client<chain, account, extended>) => extension,
+    ) => V2Client<
+      chain,
+      account,
+      Prettify<extension> & (extended extends V2Extended ? extended : unknown)
+    >
+  }
+
+function withV2Extend<
+  chain extends V2Chain | undefined,
+  account extends V2Account | undefined,
+>(client: V2Base<chain, account>): V2Client<chain, account, undefined> {
+  function extend(base: Record<string, unknown>) {
+    return (
+      fn: (client: Record<string, unknown>) => Record<string, unknown>,
+    ) => {
+      const extended = fn(base)
+      for (const key in client) delete extended[key]
+      const combined = { ...base, ...extended }
+      for (const key in extended) {
+        const a = base[key]
+        const b = extended[key]
+        if (isPlainObject(a) && isPlainObject(b)) combined[key] = { ...a, ...b }
+      }
+      return Object.assign(combined, { extend: extend(combined) })
+    }
+  }
+
+  const base = client as unknown as Record<string, unknown>
+  return Object.assign(base, {
+    extend: extend(base),
+  }) as V2Client<chain, account, undefined>
+}
+
+type V2Account = V2JsonRpcAccount | V2LocalAccount
+
+type V2JsonRpcAccount = {
+  address: Address.Address
+  type: 'json-rpc'
+}
+
+type V2LocalAccount = {
+  address: Address.Address
+  nonceManager?: object | undefined
+  publicKey: `0x${string}`
+  sign?: V2SignFn | undefined
+  signAuthorization?: V2SignFn | undefined
+  signMessage: V2SignFn
+  signTransaction: V2SignFn
+  signTypedData: V2SignFn
+  source: string
+  type: 'local'
+}
+
+type V2Chain = {
+  id: number
+  name: string
+  nativeCurrency: {
+    decimals: number
+    name: string
+    symbol: string
+  }
+  rpcUrls: {
+    [key: string]: V2RpcUrls
+    default: V2RpcUrls
+  }
+}
+
+type V2RpcUrls = {
+  http: readonly string[]
+  webSocket?: readonly string[] | undefined
+}
+
+type V2RequestOptions = {
+  dedupe?: boolean | undefined
+  methods?:
+    | { include?: string[] | undefined }
+    | { exclude?: string[] | undefined }
+    | undefined
+  retryDelay?: number | undefined
+  retryCount?: number | undefined
+  signal?: AbortSignal | undefined
+  uid?: string | undefined
+}
+
+type V2Request = <
+  schemaOverride extends V2RequestOverride | undefined = undefined,
+  parameters extends V2RequestParameters = V2RequestParameters,
+  returnType = schemaOverride extends { ReturnType: infer returnType }
+    ? returnType
+    : unknown,
+>(
+  parameters: parameters,
+  options?: V2RequestOptions | undefined,
+) => Promise<returnType>
+
+type V2RequestOverride = {
+  Parameters?: unknown | undefined
+  ReturnType: unknown
+}
+
+type V2RequestParameters = {
+  method: string
+  params?: unknown | undefined
+}
+
+type V2SourceClient<
+  chain extends { id: number } | undefined = { id: number } | undefined,
+  account extends V2SourceAccount | undefined = V2SourceAccount | undefined,
+> = {
+  account: account
+  batch?: { multicall?: boolean | MulticallOptions | undefined } | undefined
+  cacheTime: number
+  ccipRead?: object | false | undefined
+  chain: chain
+  dataSuffix?: DataSuffix | undefined
+  experimental_blockTag?: BlockTag | undefined
+  key: string
+  name: string
+  pollingInterval: number
+  request: (...args: never[]) => Promise<unknown>
+  type: string
+}
+
+type V2SourceAccount = {
+  address: Address.Address
+  type: string
+}
+
+type V2SignFn = (...args: never[]) => Promise<unknown>
+
+type V2Transport = {
+  key: string
+  methods?:
+    | { include?: string[] | undefined }
+    | { exclude?: string[] | undefined }
+    | undefined
+  name: string
+  request: V2Request
+  retryCount?: number | undefined
+  retryDelay?: number | undefined
+  timeout?: number | undefined
+  type: 'custom'
+}
+
+type V2ResolveAccount<
+  account extends V2SourceAccount | undefined,
+  accountOrAddress extends Account.Account | Address.Address | undefined,
+> = [accountOrAddress] extends [never]
+  ? account extends {
+      address: infer address extends Address.Address
+      type: 'json-rpc'
+    }
+    ? Account.JsonRpc<address>
+    : undefined
+  : accountOrAddress extends Address.Address
+    ? Account.JsonRpc<accountOrAddress>
+    : accountOrAddress
+
+type V2ResolveChain<
+  chain extends { id: number } | undefined,
+  chainOrId extends Chain.Chain | number | undefined,
+> = [chainOrId] extends [never]
+  ? chain extends { id: infer id extends number }
+    ? Chain.Chain & { id: id }
+    : undefined
+  : chainOrId extends number
+    ? Chain.Chain & { id: chainOrId }
+    : chainOrId
+
+type V2ResolveTargetAccount<
+  account extends Account.Account | undefined,
+  accountOverride extends V2Account | undefined,
+> = [accountOverride] extends [never]
+  ? account extends Account.JsonRpc<infer address>
+    ? { address: address; type: 'json-rpc' }
+    : undefined
+  : accountOverride
+
+type V2ResolveTargetChain<chain extends V2Chain | undefined> = [chain] extends [
+  never,
+]
+  ? undefined
+  : chain
+
 type ResolvedChain<
   chains extends ResolverChains,
   chainId extends chains[number]['id'],