viem 1.10.13 → 1.11.0

package/utils/hash/getEventSelector.ts

@@ -1,9 +1,10 @@
 import type { AbiEvent } from 'abitype'
-import type { EventDefinition } from '../../types/contract.js'
 
-import { hashAbiItem, hashFunction } from './hashFunction.js'
+import { toBytes } from '../encoding/toBytes.js'
+import { getEventSignature } from './getEventSignature.js'
+import { keccak256 } from './keccak256.js'
 
-export const getEventSelector = (event: EventDefinition | AbiEvent) => {
-  if (typeof event === 'string') return hashFunction(event)
-  return hashAbiItem(event)
-}
+const hash = (value: string) => keccak256(toBytes(value))
+
+export const getEventSelector = (fn: string | AbiEvent) =>
+  hash(getEventSignature(fn))

package/utils/hash/getEventSignature.ts

@@ -0,0 +1,7 @@
+import type { AbiEvent, AbiFunction } from 'abitype'
+
+import { getFunctionSignature } from './getFunctionSignature.js'
+
+export const getEventSignature = (fn: string | AbiEvent) => {
+  return getFunctionSignature(fn as {} as AbiFunction)
+}

package/utils/hash/getFunctionSelector.ts

@@ -1,9 +1,11 @@
 import type { AbiFunction } from 'abitype'
 import { slice } from '../data/slice.js'
 
-import { hashAbiItem, hashFunction } from './hashFunction.js'
+import { toBytes } from '../encoding/toBytes.js'
+import { getFunctionSignature } from './getFunctionSignature.js'
+import { keccak256 } from './keccak256.js'
 
-export const getFunctionSelector = (fn: string | AbiFunction) => {
-  if (typeof fn === 'string') return slice(hashFunction(fn), 0, 4)
-  return slice(hashAbiItem(fn), 0, 4)
-}
+const hash = (value: string) => keccak256(toBytes(value))
+
+export const getFunctionSelector = (fn: string | AbiFunction) =>
+  slice(hash(getFunctionSignature(fn)), 0, 4)

package/utils/hash/getFunctionSignature.ts

@@ -0,0 +1,17 @@
+import type { AbiFunction } from 'abitype'
+
+import { formatAbiItem } from '../abi/formatAbiItem.js'
+import {
+  extractFunctionName,
+  extractFunctionParams,
+} from '../contract/extractFunctionParts.js'
+
+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)
+}

package/utils/hash/hashFunction.ts

@@ -1,19 +1,14 @@
 import type { AbiEvent, AbiFunction } from 'abitype'
 import { formatAbiItem } from '../abi/formatAbiItem.js'
-import {
-  extractFunctionName,
-  extractFunctionParams,
-} from '../contract/extractFunctionParts.js'
 import { toBytes } from '../encoding/toBytes.js'
 
+import { getFunctionSignature } from './getFunctionSignature.js'
 import { keccak256 } from './keccak256.js'
 
 const hash = (value: string) => keccak256(toBytes(value))
 
 export function hashFunction(def: string) {
-  const name = extractFunctionName(def)
-  const params = extractFunctionParams(def) || []
-  return hash(`${name}(${params.map(({ type }) => type).join(',')})`)
+  return hash(getFunctionSignature(def))
 }
 
 export function hashAbiItem(abiItem: AbiFunction | AbiEvent) {