viem 1.4.0 → 1.4.2

package/src/errors/contract.ts

@@ -15,6 +15,7 @@ import { getAbiItem } from '../utils/abi/getAbiItem.js'
 import { formatEther } from '../utils/unit/formatEther.js'
 import { formatGwei } from '../utils/unit/formatGwei.js'
 
+import { AbiErrorSignatureNotFoundError } from './abi.js'
 import { BaseError } from './base.js'
 import { prettyPrint } from './transaction.js'
 import { getContractAddress } from './utils.js'
@@ -154,6 +155,7 @@ export class ContractFunctionRevertedError extends BaseError {
 
   data?: DecodeErrorResultReturnType
   reason?: string
+  signature?: Hex
 
   constructor({
     abi,
@@ -161,56 +163,75 @@ export class ContractFunctionRevertedError extends BaseError {
     functionName,
     message,
   }: { abi: Abi; data?: Hex; functionName: string; message?: string }) {
+    let cause: Error | undefined
     let decodedData: DecodeErrorResultReturnType | undefined = undefined
     let metaMessages
     let reason
     if (data && data !== '0x') {
-      decodedData = decodeErrorResult({ abi, data })
-      const { abiItem, errorName, args: errorArgs } = decodedData
-      if (errorName === 'Error') {
-        reason = (errorArgs as [string])[0]
-      } else if (errorName === 'Panic') {
-        const [firstArg] = errorArgs as [number]
-        reason = panicReasons[firstArg as keyof typeof panicReasons]
-      } else {
-        const errorWithParams = abiItem
-          ? formatAbiItem(abiItem, { includeName: true })
-          : undefined
-        const formattedArgs =
-          abiItem && errorArgs
-            ? formatAbiItemWithArgs({
-                abiItem,
-                args: errorArgs,
-                includeFunctionName: false,
-                includeName: false,
-              })
+      try {
+        decodedData = decodeErrorResult({ abi, data })
+        const { abiItem, errorName, args: errorArgs } = decodedData
+        if (errorName === 'Error') {
+          reason = (errorArgs as [string])[0]
+        } else if (errorName === 'Panic') {
+          const [firstArg] = errorArgs as [number]
+          reason = panicReasons[firstArg as keyof typeof panicReasons]
+        } else {
+          const errorWithParams = abiItem
+            ? formatAbiItem(abiItem, { includeName: true })
             : undefined
+          const formattedArgs =
+            abiItem && errorArgs
+              ? formatAbiItemWithArgs({
+                  abiItem,
+                  args: errorArgs,
+                  includeFunctionName: false,
+                  includeName: false,
+                })
+              : undefined
 
-        metaMessages = [
-          errorWithParams ? `Error: ${errorWithParams}` : '',
-          formattedArgs && formattedArgs !== '()'
-            ? `       ${[...Array(errorName?.length ?? 0).keys()]
-                .map(() => ' ')
-                .join('')}${formattedArgs}`
-            : '',
-        ]
+          metaMessages = [
+            errorWithParams ? `Error: ${errorWithParams}` : '',
+            formattedArgs && formattedArgs !== '()'
+              ? `       ${[...Array(errorName?.length ?? 0).keys()]
+                  .map(() => ' ')
+                  .join('')}${formattedArgs}`
+              : '',
+          ]
+        }
+      } catch (err) {
+        cause = err as Error
       }
     } else if (message) reason = message
 
+    let signature: Hex | undefined
+    if (cause instanceof AbiErrorSignatureNotFoundError) {
+      signature = cause.signature
+      metaMessages = [
+        `Unable to decode signature "${signature}" as it was not found on the provided ABI.`,
+        'Make sure you are using the correct ABI and that the error exists on it.',
+        `You can look up the decoded signature here: https://openchain.xyz/signatures?query=${signature}.`,
+      ]
+    }
+
     super(
-      reason && reason !== 'execution reverted'
+      (reason && reason !== 'execution reverted') || signature
         ? [
-            `The contract function "${functionName}" reverted with the following reason:`,
-            reason,
+            `The contract function "${functionName}" reverted with the following ${
+              signature ? 'signature' : 'reason'
+            }:`,
+            reason || signature,
           ].join('\n')
         : `The contract function "${functionName}" reverted.`,
       {
+        cause,
         metaMessages,
       },
     )
 
-    this.reason = reason
     this.data = decodedData
+    this.reason = reason
+    this.signature = signature
   }
 }
 

package/src/errors/version.ts

@@ -1 +1 @@
-export const version = '1.3.1'
+export const version = '1.4.2'

package/src/index.ts

@@ -156,8 +156,12 @@ export type {
   WatchBlockNumberReturnType,
 } from './actions/public/watchBlockNumber.js'
 export type {
-  OnLogsFn,
-  OnLogsParameter,
+  WatchEventOnLogsFn,
+  /** @deprecated - use `WatchEventOnLogsFn` instead. */
+  WatchEventOnLogsFn as OnLogFn,
+  WatchEventOnLogsParameter,
+  /** @deprecated - use `WatchEventOnLogsParameter` instead. */
+  WatchEventOnLogsParameter as OnLogParameter,
   WatchEventParameters,
   WatchEventReturnType,
 } from './actions/public/watchEvent.js'
@@ -233,6 +237,7 @@ export type {
   VerifyHashReturnType,
 } from './actions/public/verifyHash.js'
 export type {
+  WatchContractEventOnLogsParameter,
   WatchContractEventParameters,
   WatchContractEventReturnType,
 } from './actions/public/watchContractEvent.js'

package/src/public.ts

@@ -114,8 +114,12 @@ export {
 } from './actions/public/watchBlocks.js'
 export {
   watchEvent,
-  type OnLogsFn,
-  type OnLogsParameter,
+  type WatchEventOnLogsFn,
+  /** @deprecated - use `WatchEventOnLogsFn` instead. */
+  type WatchEventOnLogsFn as OnLogsFn,
+  type WatchEventOnLogsParameter,
+  /** @deprecated - use `WatchEventOnLogsParameter` instead. */
+  type WatchEventOnLogsParameter as OnLogsParameter,
 } from './actions/public/watchEvent.js'
 export {
   watchPendingTransactions,

package/src/utils/abi/encodePacked.ts

@@ -104,6 +104,7 @@ function encode<TPackedAbiType extends PackedAbiType | unknown>(
     for (let i = 0; i < value.length; i++) {
       data.push(encode(childType, value[i], true))
     }
+    if (data.length === 0) return '0x'
     return concat(data)
   }
 

package/src/utils/unit/parseUnits.ts

@@ -9,7 +9,8 @@ export function parseUnits(value: string, decimals: number) {
 
   // round off if the fraction is larger than the number of decimals.
   if (decimals === 0) {
-    integer = `${Math.round(Number(`${integer}.${fraction}`))}`
+    if (Math.round(Number(`.${fraction}`)) === 1)
+      integer = `${BigInt(integer) + 1n}`
     fraction = ''
   } else if (fraction.length > decimals) {
     const [left, unit, right] = [