viem 2.0.0-beta.0 → 2.0.0-beta.2

package/errors/transaction.ts

@@ -174,7 +174,7 @@ export class TransactionExecutionError extends BaseError {
       to,
       value:
         typeof value !== 'undefined' &&
-        `${formatEther(value)} ${chain?.nativeCurrency.symbol || 'ETH'}`,
+        `${formatEther(value)} ${chain?.nativeCurrency?.symbol || 'ETH'}`,
       data,
       gas,
       gasPrice:

package/errors/version.ts

@@ -1 +1 @@
-export const version = '2.0.0-beta.0'
+export const version = '2.0.0-beta.2'

package/index.ts

@@ -232,11 +232,7 @@ export type {
 } from './actions/public/watchBlockNumber.js'
 export type {
   WatchEventOnLogsFn,
-  /** @deprecated - use `WatchEventOnLogsFn` instead. */
-  WatchEventOnLogsFn as OnLogFn,
   WatchEventOnLogsParameter,
-  /** @deprecated - use `WatchEventOnLogsParameter` instead. */
-  WatchEventOnLogsParameter as OnLogParameter,
   WatchEventErrorType,
   WatchEventParameters,
   WatchEventReturnType,
@@ -295,8 +291,6 @@ export type {
   PrepareTransactionRequestErrorType,
   PrepareTransactionRequestParameters,
   PrepareTransactionRequestReturnType,
-  /** @deprecated import `prepareTransactionRequest` from `viem/actions` instead. */
-  prepareTransactionRequest as prepareRequest,
 } from './actions/wallet/prepareTransactionRequest.js'
 export type {
   SendUnsignedTransactionErrorType,
@@ -404,23 +398,11 @@ export type {
   ChainFormatter,
   ChainEstimateFeesPerGasFnParameters,
   GetChain,
-  /** @deprecated use `ChainFormatter` instead. */
-  ChainFormatter as Formatter,
   ChainFormatters,
-  /** @deprecated use `ChainFormatters` instead. */
-  ChainFormatters as Formatters,
   ChainSerializers,
-  /** @deprecated use `ChainSerializers` instead. */
-  ChainSerializers as Serializers,
   ExtractChainFormatterExclude,
-  /** @deprecated use `ExtractChainFormatterExclude` instead. */
-  ExtractChainFormatterExclude as ExtractFormatterExclude,
   ExtractChainFormatterParameters,
-  /** @deprecated use `ExtractChainFormatterParameters` instead. */
-  ExtractChainFormatterParameters as ExtractFormatterParameters,
   ExtractChainFormatterReturnType,
-  /** @deprecated use `ExtractChainFormatterReturnType` instead. */
-  ExtractChainFormatterReturnType as ExtractFormatterReturnType,
 } from './types/chain.js'
 export {
   type Client,
@@ -731,10 +713,6 @@ export {
   type InvalidChainIdErrorType,
 } from './errors/chain.js'
 export {
-  DataLengthTooLongError,
-  type DataLengthTooLongErrorType,
-  DataLengthTooShortError,
-  type DataLengthTooShortErrorType,
   InvalidBytesBooleanError,
   type InvalidBytesBooleanErrorType,
   IntegerOutOfRangeError,
@@ -743,8 +721,6 @@ export {
   type InvalidHexBooleanErrorType,
   InvalidHexValueError,
   type InvalidHexValueErrorType,
-  OffsetOutOfBoundsError,
-  type OffsetOutOfBoundsErrorType,
   SizeOverflowError,
   type SizeOverflowErrorType,
 } from './errors/encoding.js'
@@ -1211,8 +1187,6 @@ export {
   type BytesToBigIntErrorType,
   type BytesToBigIntOpts,
   bytesToBigInt,
-  /** @deprecated - use `bytesToBigInt` */
-  bytesToBigInt as bytesToBigint,
   type BytesToBoolErrorType,
   type BytesToBoolOpts,
   bytesToBool,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "viem",
   "description": "TypeScript Interface for Ethereum",
-  "version": "2.0.0-beta.0",
+  "version": "2.0.0-beta.2",
   "main": "./_cjs/index.js",
   "module": "./_esm/index.js",
   "types": "./_types/index.d.ts",
@@ -103,6 +103,7 @@
     "ws": "8.13.0"
   },
   "license": "MIT",
+  "homepage": "https://viem.sh",
   "repository": "wagmi-dev/viem",
   "authors": [
     "awkweb.eth",

package/types/contract.ts

@@ -25,7 +25,6 @@ import type {
   MaybeRequired,
   NoUndefined,
   Prettify,
-  UnionEvaluate,
   UnionToTuple,
 } from './utils.js'
 
@@ -154,6 +153,8 @@ export type Widen<type> =
         : never
       : never)
 
+export type UnionWiden<type> = type extends any ? Widen<type> : never
+
 export type ExtractAbiFunctionForArgs<
   abi extends Abi,
   mutability extends AbiStateMutability,
@@ -205,25 +206,8 @@ export type ContractFunctionParameters<
   functionName:
     | allFunctionNames // show all options
     | (functionName extends allFunctionNames ? functionName : never) // infer value
-} & UnionEvaluate<
-  readonly [] extends allArgs
-    ? {
-        args?:
-          | allArgs // show all options
-          // infer value, widen inferred value of `args` conditionally to match `allArgs`
-          | (abi extends Abi
-              ? args extends allArgs
-                ? Widen<args>
-                : never
-              : never)
-          | undefined
-      }
-    : {
-        args:
-          | allArgs // show all options
-          | (Widen<args> & (args extends allArgs ? unknown : never)) // infer value, widen inferred value of `args` match `allArgs` (e.g. avoid union `args: readonly [123n] | readonly [bigint]`)
-      }
->
+  args?: (abi extends Abi ? UnionWiden<args> : never) | allArgs | undefined
+} & (readonly [] extends allArgs ? {} : { args: Widen<args> })
 
 export type ContractFunctionReturnType<
   abi extends Abi | readonly unknown[] = Abi,

package/utils/hash/getFunctionSignature.ts

@@ -1,29 +1,19 @@
-import type { AbiFunction } from 'abitype'
+import { type AbiFunction, formatAbiItem } from 'abitype'
 
 import type { ErrorType } from '../../errors/utils.js'
 import {
-  type FormatAbiItemErrorType,
-  formatAbiItem,
-} from '../abi/formatAbiItem.js'
-import {
-  type ExtractFunctionNameErrorType,
-  type ExtractFunctionParamsErrorType,
-  extractFunctionName,
-  extractFunctionParams,
-} from '../contract/extractFunctionParts.js'
+  type NormalizeSignatureErrorType,
+  normalizeSignature,
+} from './normalizeSignature.js'
 
 export type GetFunctionSignatureErrorType =
-  | ExtractFunctionNameErrorType
-  | ExtractFunctionParamsErrorType
-  | FormatAbiItemErrorType
+  | NormalizeSignatureErrorType
   | ErrorType
 
-export const getFunctionSignature = (fn: string | AbiFunction) => {
-  if (typeof fn === 'string') {
-    const name = extractFunctionName(fn)
-    const params = extractFunctionParams(fn) || []
-    return `${name}(${params.map(({ type }) => type).join(',')})`
-  }
-
-  return formatAbiItem(fn)
+export const getFunctionSignature = (fn_: string | AbiFunction) => {
+  const fn = (() => {
+    if (typeof fn_ === 'string') return fn_
+    return formatAbiItem(fn_)
+  })()
+  return normalizeSignature(fn)
 }

package/utils/hash/normalizeSignature.ts

@@ -0,0 +1,64 @@
+import { BaseError } from '../../errors/base.js'
+import type { ErrorType } from '../../errors/utils.js'
+
+export type NormalizeSignatureParameters = string
+export type NormalizeSignatureReturnType = string
+export type NormalizeSignatureErrorType = ErrorType
+
+export function normalizeSignature(
+  signature: NormalizeSignatureParameters,
+): NormalizeSignatureReturnType {
+  let active = true
+  let current = ''
+  let level = 0
+  let result = ''
+  let valid = false
+
+  for (let i = 0; i < signature.length; i++) {
+    const char = signature[i]
+
+    // If the character is a separator, we want to reactivate.
+    if (['(', ')', ','].includes(char)) active = true
+
+    // If the character is a "level" token, we want to increment/decrement.
+    if (char === '(') level++
+    if (char === ')') level--
+
+    // If we aren't active, we don't want to mutate the result.
+    if (!active) continue
+
+    // If level === 0, we are at the definition level.
+    if (level === 0) {
+      if (char === ' ' && ['event', 'function', ''].includes(result))
+        result = ''
+      else {
+        result += char
+
+        // If we are at the end of the definition, we must be finished.
+        if (char === ')') {
+          valid = true
+          break
+        }
+      }
+
+      continue
+    }
+
+    // Ignore spaces
+    if (char === ' ') {
+      // If the previous character is a separator, and the current section isn't empty, we want to deactivate.
+      if (signature[i - 1] !== ',' && current !== ',' && current !== ',(') {
+        current = ''
+        active = false
+      }
+      continue
+    }
+
+    result += char
+    current += char
+  }
+
+  if (!valid) throw new BaseError('Unable to normalize signature.')
+
+  return result
+}

package/utils/index.ts

@@ -167,16 +167,6 @@ export {
   type IsAddressEqualErrorType,
   isAddressEqual,
 } from './address/isAddressEqual.js'
-export {
-  type ExtractFunctionNameErrorType,
-  type ExtractFunctionParamsErrorType,
-  type ExtractFunctionPartsErrorType,
-  type ExtractFunctionTypeErrorType,
-  extractFunctionName,
-  extractFunctionParams,
-  extractFunctionType,
-  extractFunctionParts,
-} from './contract/extractFunctionParts.js'
 export {
   type ConcatBytesErrorType,
   type ConcatErrorType,
@@ -291,7 +281,6 @@ export {
   type FromBytesParameters,
   type FromBytesReturnType,
   bytesToBigInt,
-  /** @deprecated – use `bytesToBigInt` */
   bytesToBigInt as bytesToBigint,
   bytesToBool,
   bytesToNumber,
@@ -431,10 +420,6 @@ export {
   type ParseTransactionErrorType,
   parseTransaction,
 } from './transaction/parseTransaction.js'
-export {
-  /** @deprecated import `prepareTransactionRequest` from `viem/actions` instead. */
-  prepareTransactionRequest,
-} from '../actions/wallet/prepareTransactionRequest.js'
 export {
   serializeTransaction,
   type SerializeTransactionErrorType,

package/utils/transaction/serializeTransaction.ts

@@ -203,10 +203,23 @@ function serializeTransactionLegacy(
   ]
 
   if (signature) {
-    let v = 27n + (signature.v === 27n ? 0n : 1n)
-    if (chainId > 0) v = BigInt(chainId * 2) + BigInt(35n + signature.v - 27n)
-    else if (signature.v !== v)
-      throw new InvalidLegacyVError({ v: signature.v })
+    const v = (() => {
+      // EIP-155 (explicit chainId)
+      if (chainId > 0)
+        return BigInt(chainId * 2) + BigInt(35n + signature.v - 27n)
+
+      // EIP-155 (inferred chainId)
+      if (signature.v >= 35n) {
+        const inferredChainId = (signature.v - 35n) / 2n
+        if (inferredChainId > 0) return signature.v
+        return 27n + (signature.v === 35n ? 0n : 1n)
+      }
+
+      // Pre-EIP-155 (no chainId)
+      const v = 27n + (signature.v === 27n ? 0n : 1n)
+      if (signature.v !== v) throw new InvalidLegacyVError({ v: signature.v })
+      return v
+    })()
 
     serializedTransaction = [
       ...serializedTransaction,

package/_cjs/utils/contract/extractFunctionParts.js

@@ -1,31 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractFunctionType = exports.extractFunctionParams = exports.extractFunctionName = exports.extractFunctionParts = void 0;
-const paramsRegex = /((function|event)\s)?(.*)(\((.*)\))/;
-function extractFunctionParts(def) {
-    const parts = def.match(paramsRegex);
-    const type = parts?.[2] || undefined;
-    const name = parts?.[3];
-    const params = parts?.[5] || undefined;
-    return { type, name, params };
-}
-exports.extractFunctionParts = extractFunctionParts;
-function extractFunctionName(def) {
-    return extractFunctionParts(def).name;
-}
-exports.extractFunctionName = extractFunctionName;
-function extractFunctionParams(def) {
-    const params = extractFunctionParts(def).params;
-    const splitParams = params?.split(',').map((x) => x.trim().split(' '));
-    return splitParams?.map((param) => ({
-        type: param[0],
-        name: param[1] === 'indexed' ? param[2] : param[1],
-        ...(param[1] === 'indexed' ? { indexed: true } : {}),
-    }));
-}
-exports.extractFunctionParams = extractFunctionParams;
-function extractFunctionType(def) {
-    return extractFunctionParts(def).type;
-}
-exports.extractFunctionType = extractFunctionType;
-//# sourceMappingURL=extractFunctionParts.js.map

package/_cjs/utils/contract/extractFunctionParts.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"extractFunctionParts.js","sourceRoot":"","sources":["../../../utils/contract/extractFunctionParts.ts"],"names":[],"mappings":";;;AAEA,MAAM,WAAW,GAAG,qCAAqC,CAAA;AAIzD,SAAgB,oBAAoB,CAAC,GAAW;IAC9C,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,CAAA;IACpC,MAAM,IAAI,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,SAAS,CAAA;IACpC,MAAM,IAAI,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC,CAAA;IACvB,MAAM,MAAM,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,SAAS,CAAA;IACtC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,CAAA;AAC/B,CAAC;AAND,oDAMC;AAID,SAAgB,mBAAmB,CAAC,GAAW;IAC7C,OAAO,oBAAoB,CAAC,GAAG,CAAC,CAAC,IAAI,CAAA;AACvC,CAAC;AAFD,kDAEC;AAID,SAAgB,qBAAqB,CAAC,GAAW;IAC/C,MAAM,MAAM,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC,MAAM,CAAA;IAC/C,MAAM,WAAW,GAAG,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAA;IACtE,OAAO,WAAW,EAAE,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAClC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;QACd,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;QAClD,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACrD,CAAC,CAAC,CAAA;AACL,CAAC;AARD,sDAQC;AAID,SAAgB,mBAAmB,CAAC,GAAW;IAC7C,OAAO,oBAAoB,CAAC,GAAG,CAAC,CAAC,IAAI,CAAA;AACvC,CAAC;AAFD,kDAEC"}

package/_esm/utils/contract/extractFunctionParts.js

@@ -1,24 +0,0 @@
-const paramsRegex = /((function|event)\s)?(.*)(\((.*)\))/;
-export function extractFunctionParts(def) {
-    const parts = def.match(paramsRegex);
-    const type = parts?.[2] || undefined;
-    const name = parts?.[3];
-    const params = parts?.[5] || undefined;
-    return { type, name, params };
-}
-export function extractFunctionName(def) {
-    return extractFunctionParts(def).name;
-}
-export function extractFunctionParams(def) {
-    const params = extractFunctionParts(def).params;
-    const splitParams = params?.split(',').map((x) => x.trim().split(' '));
-    return splitParams?.map((param) => ({
-        type: param[0],
-        name: param[1] === 'indexed' ? param[2] : param[1],
-        ...(param[1] === 'indexed' ? { indexed: true } : {}),
-    }));
-}
-export function extractFunctionType(def) {
-    return extractFunctionParts(def).type;
-}
-//# sourceMappingURL=extractFunctionParts.js.map

package/_esm/utils/contract/extractFunctionParts.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"extractFunctionParts.js","sourceRoot":"","sources":["../../../utils/contract/extractFunctionParts.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,GAAG,qCAAqC,CAAA;AAIzD,MAAM,UAAU,oBAAoB,CAAC,GAAW;IAC9C,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,CAAA;IACpC,MAAM,IAAI,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,SAAS,CAAA;IACpC,MAAM,IAAI,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC,CAAA;IACvB,MAAM,MAAM,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,SAAS,CAAA;IACtC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,CAAA;AAC/B,CAAC;AAID,MAAM,UAAU,mBAAmB,CAAC,GAAW;IAC7C,OAAO,oBAAoB,CAAC,GAAG,CAAC,CAAC,IAAI,CAAA;AACvC,CAAC;AAID,MAAM,UAAU,qBAAqB,CAAC,GAAW;IAC/C,MAAM,MAAM,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC,MAAM,CAAA;IAC/C,MAAM,WAAW,GAAG,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAA;IACtE,OAAO,WAAW,EAAE,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAClC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;QACd,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;QAClD,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACrD,CAAC,CAAC,CAAA;AACL,CAAC;AAID,MAAM,UAAU,mBAAmB,CAAC,GAAW;IAC7C,OAAO,oBAAoB,CAAC,GAAG,CAAC,CAAC,IAAI,CAAA;AACvC,CAAC"}

package/_types/utils/contract/extractFunctionParts.d.ts

@@ -1,18 +0,0 @@
-import type { ErrorType } from '../../errors/utils.js';
-export type ExtractFunctionPartsErrorType = ErrorType;
-export declare function extractFunctionParts(def: string): {
-    type: string | undefined;
-    name: string | undefined;
-    params: string | undefined;
-};
-export type ExtractFunctionNameErrorType = ErrorType;
-export declare function extractFunctionName(def: string): string | undefined;
-export type ExtractFunctionParamsErrorType = ErrorType;
-export declare function extractFunctionParams(def: string): {
-    indexed?: boolean | undefined;
-    type: string;
-    name: string;
-}[] | undefined;
-export type ExtractFunctionTypeErrorType = ErrorType;
-export declare function extractFunctionType(def: string): string | undefined;
-//# sourceMappingURL=extractFunctionParts.d.ts.map

package/_types/utils/contract/extractFunctionParts.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"extractFunctionParts.d.ts","sourceRoot":"","sources":["../../../utils/contract/extractFunctionParts.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAItD,MAAM,MAAM,6BAA6B,GAAG,SAAS,CAAA;AAErD,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM;;;;EAM/C;AAED,MAAM,MAAM,4BAA4B,GAAG,SAAS,CAAA;AAEpD,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,sBAE9C;AAED,MAAM,MAAM,8BAA8B,GAAG,SAAS,CAAA;AAEtD,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM;;;;gBAQhD;AAED,MAAM,MAAM,4BAA4B,GAAG,SAAS,CAAA;AAEpD,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,sBAE9C"}

package/utils/contract/extractFunctionParts.ts

@@ -1,37 +0,0 @@
-import type { ErrorType } from '../../errors/utils.js'
-
-const paramsRegex = /((function|event)\s)?(.*)(\((.*)\))/
-
-export type ExtractFunctionPartsErrorType = ErrorType
-
-export function extractFunctionParts(def: string) {
-  const parts = def.match(paramsRegex)
-  const type = parts?.[2] || undefined
-  const name = parts?.[3]
-  const params = parts?.[5] || undefined
-  return { type, name, params }
-}
-
-export type ExtractFunctionNameErrorType = ErrorType
-
-export function extractFunctionName(def: string) {
-  return extractFunctionParts(def).name
-}
-
-export type ExtractFunctionParamsErrorType = ErrorType
-
-export function extractFunctionParams(def: string) {
-  const params = extractFunctionParts(def).params
-  const splitParams = params?.split(',').map((x) => x.trim().split(' '))
-  return splitParams?.map((param) => ({
-    type: param[0],
-    name: param[1] === 'indexed' ? param[2] : param[1],
-    ...(param[1] === 'indexed' ? { indexed: true } : {}),
-  }))
-}
-
-export type ExtractFunctionTypeErrorType = ErrorType
-
-export function extractFunctionType(def: string) {
-  return extractFunctionParts(def).type
-}