viem 1.18.7 → 1.18.9

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

@@ -1 +1 @@
-{"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"}
+{"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,uDAAuD;AACvD,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM;;;;EAM/C;AAED,MAAM,MAAM,4BAA4B,GAAG,SAAS,CAAA;AAEpD,uDAAuD;AACvD,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,sBAE9C;AAED,MAAM,MAAM,8BAA8B,GAAG,SAAS,CAAA;AAEtD,uDAAuD;AACvD,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM;;;;gBAQhD;AAED,MAAM,MAAM,4BAA4B,GAAG,SAAS,CAAA;AAEpD,uDAAuD;AACvD,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,sBAE9C"}

package/_types/utils/hash/getFunctionSignature.d.ts

@@ -1,7 +1,6 @@
-import type { AbiFunction } from 'abitype';
+import { type AbiFunction } from 'abitype';
 import type { ErrorType } from '../../errors/utils.js';
-import { type FormatAbiItemErrorType } from '../abi/formatAbiItem.js';
-import { type ExtractFunctionNameErrorType, type ExtractFunctionParamsErrorType } from '../contract/extractFunctionParts.js';
-export type GetFunctionSignatureErrorType = ExtractFunctionNameErrorType | ExtractFunctionParamsErrorType | FormatAbiItemErrorType | ErrorType;
-export declare const getFunctionSignature: (fn: string | AbiFunction) => string;
+import { type NormalizeSignatureErrorType } from './normalizeSignature.js';
+export type GetFunctionSignatureErrorType = NormalizeSignatureErrorType | ErrorType;
+export declare const getFunctionSignature: (fn_: string | AbiFunction) => string;
 //# sourceMappingURL=getFunctionSignature.d.ts.map

package/_types/utils/hash/getFunctionSignature.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getFunctionSignature.d.ts","sourceRoot":"","sources":["../../../utils/hash/getFunctionSignature.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAE1C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AACtD,OAAO,EACL,KAAK,sBAAsB,EAE5B,MAAM,yBAAyB,CAAA;AAChC,OAAO,EACL,KAAK,4BAA4B,EACjC,KAAK,8BAA8B,EAGpC,MAAM,qCAAqC,CAAA;AAE5C,MAAM,MAAM,6BAA6B,GACrC,4BAA4B,GAC5B,8BAA8B,GAC9B,sBAAsB,GACtB,SAAS,CAAA;AAEb,eAAO,MAAM,oBAAoB,OAAQ,MAAM,GAAG,WAAW,WAQ5D,CAAA"}
+{"version":3,"file":"getFunctionSignature.d.ts","sourceRoot":"","sources":["../../../utils/hash/getFunctionSignature.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAiB,MAAM,SAAS,CAAA;AAEzD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AACtD,OAAO,EACL,KAAK,2BAA2B,EAEjC,MAAM,yBAAyB,CAAA;AAEhC,MAAM,MAAM,6BAA6B,GACrC,2BAA2B,GAC3B,SAAS,CAAA;AAEb,eAAO,MAAM,oBAAoB,QAAS,MAAM,GAAG,WAAW,WAM7D,CAAA"}

package/_types/utils/hash/normalizeSignature.d.ts

@@ -0,0 +1,6 @@
+import type { ErrorType } from '../../errors/utils.js';
+export type NormalizeSignatureParameters = string;
+export type NormalizeSignatureReturnType = string;
+export type NormalizeSignatureErrorType = ErrorType;
+export declare function normalizeSignature(signature: NormalizeSignatureParameters): NormalizeSignatureReturnType;
+//# sourceMappingURL=normalizeSignature.d.ts.map

package/_types/utils/hash/normalizeSignature.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"normalizeSignature.d.ts","sourceRoot":"","sources":["../../../utils/hash/normalizeSignature.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAEtD,MAAM,MAAM,4BAA4B,GAAG,MAAM,CAAA;AACjD,MAAM,MAAM,4BAA4B,GAAG,MAAM,CAAA;AACjD,MAAM,MAAM,2BAA2B,GAAG,SAAS,CAAA;AAEnD,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,4BAA4B,GACtC,4BAA4B,CAsD9B"}

package/errors/contract.ts

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

package/errors/estimateGas.ts

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

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/package.json

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

package/utils/contract/extractFunctionParts.ts

@@ -4,6 +4,7 @@ const paramsRegex = /((function|event)\s)?(.*)(\((.*)\))/
 
 export type ExtractFunctionPartsErrorType = ErrorType
 
+/** @deprecated – use `parseAbiItem` from `abitype`. */
 export function extractFunctionParts(def: string) {
   const parts = def.match(paramsRegex)
   const type = parts?.[2] || undefined
@@ -14,12 +15,14 @@ export function extractFunctionParts(def: string) {
 
 export type ExtractFunctionNameErrorType = ErrorType
 
+/** @deprecated – use `parseAbiItem` from `abitype`. */
 export function extractFunctionName(def: string) {
   return extractFunctionParts(def).name
 }
 
 export type ExtractFunctionParamsErrorType = ErrorType
 
+/** @deprecated – use `parseAbiItem` from `abitype`. */
 export function extractFunctionParams(def: string) {
   const params = extractFunctionParts(def).params
   const splitParams = params?.split(',').map((x) => x.trim().split(' '))
@@ -32,6 +35,7 @@ export function extractFunctionParams(def: string) {
 
 export type ExtractFunctionTypeErrorType = ErrorType
 
+/** @deprecated – use `parseAbiItem` from `abitype`. */
 export function extractFunctionType(def: string) {
   return extractFunctionParts(def).type
 }

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
+}