viem 2.39.0 → 2.39.2

package/types/typedData.ts

@@ -13,11 +13,12 @@ export type TypedDataDefinition<
   primaryTypes = typedData extends TypedData ? keyof typedData : string,
 > = primaryType extends 'EIP712Domain'
   ? EIP712DomainDefinition<typedData, primaryType>
-  : MessageDefinition<typedData, primaryType, primaryTypes>
+  : MessageDefinition<typedData, primaryType, 'message', primaryTypes>
 
-type MessageDefinition<
+export type MessageDefinition<
   typedData extends TypedData | Record<string, unknown> = TypedData,
   primaryType extends keyof typedData = keyof typedData,
+  messageKey extends string = 'message',
   ///
   primaryTypes = typedData extends TypedData ? keyof typedData : string,
   schema extends Record<string, unknown> = typedData extends TypedData
@@ -37,12 +38,13 @@ type MessageDefinition<
         ? domain
         : Prettify<TypedDataDomain>)
     | undefined
-  message: { [_: string]: any } extends message // Check if message was inferred
+} & {
+  [k in messageKey]: { [_: string]: any } extends message // Check if message was inferred
     ? Record<string, unknown>
     : message
 }
 
-type EIP712DomainDefinition<
+export type EIP712DomainDefinition<
   typedData extends TypedData | Record<string, unknown> = TypedData,
   primaryType extends 'EIP712Domain' = 'EIP712Domain',
   ///

package/utils/errors/getContractError.ts

@@ -12,7 +12,7 @@ import {
   RawContractError,
 } from '../../errors/contract.js'
 import { RpcRequestError } from '../../errors/request.js'
-import { InternalRpcError } from '../../errors/rpc.js'
+import { InternalRpcError, InvalidInputRpcError } from '../../errors/rpc.js'
 import type { ErrorType } from '../../errors/utils.js'
 
 const EXECUTION_REVERTED_ERROR_CODE = 3
@@ -59,8 +59,11 @@ export function getContractError<err extends ErrorType<string>>(
     if (err instanceof AbiDecodingZeroDataError)
       return new ContractFunctionZeroDataError({ functionName })
     if (
-      [EXECUTION_REVERTED_ERROR_CODE, InternalRpcError.code].includes(code) &&
-      (data || details || message || shortMessage)
+      ([EXECUTION_REVERTED_ERROR_CODE, InternalRpcError.code].includes(code) &&
+        (data || details || message || shortMessage)) ||
+      (code === InvalidInputRpcError.code &&
+        details === 'execution reverted' &&
+        data)
     ) {
       return new ContractFunctionRevertedError({
         abi,

package/utils/signature/hashTypedData.ts

@@ -1,10 +1,15 @@
 // Implementation forked and adapted from https://github.com/MetaMask/eth-sig-util/blob/main/src/sign-typed-data.ts
 
-import type { AbiParameter, TypedData, TypedDataDomain } from 'abitype'
+import type { AbiParameter, TypedData } from 'abitype'
 
 import type { ErrorType } from '../../errors/utils.js'
 import type { Hex } from '../../types/misc.js'
-import type { TypedDataDefinition } from '../../types/typedData.js'
+import type {
+  EIP712DomainDefinition,
+  MessageDefinition,
+  TypedDataDefinition,
+} from '../../types/typedData.js'
+import type { UnionOmit } from '../../types/utils.js'
 import {
   type EncodeAbiParametersErrorType,
   encodeAbiParameters,
@@ -86,17 +91,16 @@ export function hashTypedData<
 
 export type HashDomainErrorType = HashStructErrorType | ErrorType
 
-export function hashDomain({
+export function hashDomain<
+  const typedData extends TypedData | Record<string, unknown> = TypedData,
+>({
   domain,
   types,
-}: {
-  domain: TypedDataDomain
-  types: Record<string, MessageTypeProperty[]>
-}) {
+}: UnionOmit<EIP712DomainDefinition<typedData>, 'primaryType'>) {
   return hashStruct({
-    data: domain,
+    data: domain as Record<string, unknown>,
     primaryType: 'EIP712Domain',
-    types,
+    types: types as Record<string, readonly MessageTypeProperty[]>,
   })
 }
 
@@ -105,19 +109,18 @@ export type HashStructErrorType =
   | Keccak256ErrorType
   | ErrorType
 
-export function hashStruct({
+export function hashStruct<
+  const typedData extends TypedData | Record<string, unknown>,
+  primaryType extends keyof typedData | 'EIP712Domain',
+>({
   data,
   primaryType,
   types,
-}: {
-  data: Record<string, unknown>
-  primaryType: string
-  types: Record<string, readonly MessageTypeProperty[]>
-}) {
+}: MessageDefinition<typedData, primaryType, 'data'>) {
   const encoded = encodeData({
-    data,
+    data: data as Record<string, unknown>,
     primaryType,
-    types,
+    types: types as Record<string, readonly MessageTypeProperty[]>,
   })
   return keccak256(encoded)
 }
@@ -244,11 +247,7 @@ function encodeField({
     ]
   }
 
-  if (type === 'bytes') {
-    const prepend = value.length % 2 ? '0' : ''
-    value = `0x${prepend + value.slice(2)}`
-    return [{ type: 'bytes32' }, keccak256(value)]
-  }
+  if (type === 'bytes') return [{ type: 'bytes32' }, keccak256(value)]
 
   if (type === 'string') return [{ type: 'bytes32' }, keccak256(toHex(value))]
 

package/utils/typedData.ts

@@ -164,7 +164,7 @@ export type DomainSeparatorErrorType =
 
 export function domainSeparator({ domain }: { domain: TypedDataDomain }): Hex {
   return hashDomain({
-    domain,
+    domain: domain as never,
     types: {
       EIP712Domain: getTypesForEIP712Domain({ domain }),
     },