viem 2.21.24 → 2.21.25

package/actions/public/verifyHash.ts

@@ -5,6 +5,7 @@ import type { Transport } from '../../clients/transports/createTransport.js'
 import { universalSignatureValidatorAbi } from '../../constants/abis.js'
 import { universalSignatureValidatorByteCode } from '../../constants/contracts.js'
 import { CallExecutionError } from '../../errors/contract.js'
+import type { InvalidHexBooleanError } from '../../errors/encoding.js'
 import type { ErrorType } from '../../errors/utils.js'
 import type { Chain } from '../../types/chain.js'
 import type { ByteArray, Hex, Signature } from '../../types/misc.js'
@@ -15,13 +16,10 @@ import {
 } from '../../utils/abi/encodeDeployData.js'
 import { getAddress } from '../../utils/address/getAddress.js'
 import { isAddressEqual } from '../../utils/address/isAddressEqual.js'
-import {
-  type IsBytesEqualErrorType,
-  isBytesEqual,
-} from '../../utils/data/isBytesEqual.js'
 import { type IsHexErrorType, isHex } from '../../utils/data/isHex.js'
 import { type ToHexErrorType, bytesToHex } from '../../utils/encoding/toHex.js'
 import { getAction } from '../../utils/getAction.js'
+import { encodeFunctionData, hexToBool } from '../../utils/index.js'
 import { isErc6492Signature } from '../../utils/signature/isErc6492Signature.js'
 import { recoverAddress } from '../../utils/signature/recoverAddress.js'
 import { serializeErc6492Signature } from '../../utils/signature/serializeErc6492Signature.js'
@@ -38,6 +36,7 @@ export type VerifyHashParameters = Pick<
   hash: Hex
   /** The signature that was generated by signing the message with the address's private key. */
   signature: Hex | ByteArray | Signature
+  universalSignatureVerifierAddress?: Address | undefined
 } & OneOf<{ factory: Address; factoryData: Hex } | {}>
 
 export type VerifyHashReturnType = boolean
@@ -46,7 +45,7 @@ export type VerifyHashErrorType =
   | CallErrorType
   | IsHexErrorType
   | ToHexErrorType
-  | IsBytesEqualErrorType
+  | InvalidHexBooleanError
   | EncodeDeployDataErrorType
   | ErrorType
 
@@ -61,7 +60,16 @@ export async function verifyHash<chain extends Chain | undefined>(
   client: Client<Transport, chain>,
   parameters: VerifyHashParameters,
 ): Promise<VerifyHashReturnType> {
-  const { address, factory, factoryData, hash, signature, ...rest } = parameters
+  const {
+    address,
+    factory,
+    factoryData,
+    hash,
+    signature,
+    universalSignatureVerifierAddress = client.chain?.contracts
+      ?.universalSignatureVerifier?.address,
+    ...rest
+  } = parameters
 
   const signatureHex = (() => {
     if (isHex(signature)) return signature
@@ -88,20 +96,28 @@ export async function verifyHash<chain extends Chain | undefined>(
   })()
 
   try {
-    const { data } = await getAction(
-      client,
-      call,
-      'call',
-    )({
-      data: encodeDeployData({
-        abi: universalSignatureValidatorAbi,
-        args: [address, hash, wrappedSignature],
-        bytecode: universalSignatureValidatorByteCode,
-      }),
-      ...rest,
-    } as unknown as CallParameters)
+    const args = universalSignatureVerifierAddress
+      ? ({
+          to: universalSignatureVerifierAddress,
+          data: encodeFunctionData({
+            abi: universalSignatureValidatorAbi,
+            functionName: 'isValidSig',
+            args: [address, hash, wrappedSignature],
+          }),
+          ...rest,
+        } as unknown as CallParameters)
+      : ({
+          data: encodeDeployData({
+            abi: universalSignatureValidatorAbi,
+            args: [address, hash, wrappedSignature],
+            bytecode: universalSignatureValidatorByteCode,
+          }),
+          ...rest,
+        } as unknown as CallParameters)
+
+    const { data } = await getAction(client, call, 'call')(args)
 
-    return isBytesEqual(data ?? '0x0', '0x1')
+    return hexToBool(data ?? '0x0')
   } catch (error) {
     // Fallback attempt to verify the signature via ECDSA recovery.
     try {

package/actions/wallet/signTransaction.ts

@@ -38,9 +38,10 @@ import {
   type AssertRequestErrorType,
   assertRequest,
 } from '../../utils/transaction/assertRequest.js'
+import type { GetTransactionType } from '../../utils/transaction/getTransactionType.js'
 import { type GetChainIdErrorType, getChainId } from '../public/getChainId.js'
 
-type SignTransactionRequest<
+export type SignTransactionRequest<
   chain extends Chain | undefined = Chain | undefined,
   chainOverride extends Chain | undefined = Chain | undefined,
   ///
@@ -60,7 +61,9 @@ export type SignTransactionParameters<
   GetChainParameter<chain, chainOverride> &
   GetTransactionRequestKzgParameter<request>
 
-export type SignTransactionReturnType = TransactionSerialized
+export type SignTransactionReturnType<
+  request extends SignTransactionRequest = SignTransactionRequest,
+> = TransactionSerialized<GetTransactionType<request>>
 
 export type SignTransactionErrorType =
   | ParseAccountErrorType
@@ -126,7 +129,7 @@ export async function signTransaction<
 >(
   client: Client<Transport, chain, account>,
   parameters: SignTransactionParameters<chain, account, chainOverride, request>,
-): Promise<SignTransactionReturnType> {
+): Promise<SignTransactionReturnType<request>> {
   const {
     account: account_ = client.account,
     chain = client.chain,
@@ -162,7 +165,7 @@ export async function signTransaction<
         chainId,
       } as TransactionSerializable,
       { serializer: client.chain?.serializers?.transaction },
-    ) as Promise<SignTransactionReturnType>
+    ) as Promise<SignTransactionReturnType<request>>
 
   return await client.request(
     {

package/chains/definitions/abstractTestnet.ts

@@ -25,5 +25,9 @@ export const abstractTestnet = /*#__PURE__*/ defineChain({
       address: '0xF9cda624FBC7e059355ce98a31693d299FACd963',
       blockCreated: 358349,
     },
+    universalSignatureVerifier: {
+      address: '0xfB688330379976DA81eB64Fe4BF50d7401763B9C',
+      blockCreated: 431682,
+    },
   },
 })

package/chains/definitions/zksync.ts

@@ -33,5 +33,9 @@ export const zksync = /*#__PURE__*/ defineChain({
     multicall3: {
       address: '0xF9cda624FBC7e059355ce98a31693d299FACd963',
     },
+    universalSignatureVerifier: {
+      address: '0xfB688330379976DA81eB64Fe4BF50d7401763B9C',
+      blockCreated: 45659388,
+    },
   },
 })

package/chains/definitions/zksyncSepoliaTestnet.ts

@@ -29,6 +29,10 @@ export const zksyncSepoliaTestnet = /*#__PURE__*/ defineChain({
     multicall3: {
       address: '0xF9cda624FBC7e059355ce98a31693d299FACd963',
     },
+    universalSignatureVerifier: {
+      address: '0xfB688330379976DA81eB64Fe4BF50d7401763B9C',
+      blockCreated: 3855712,
+    },
   },
   testnet: true,
 })

package/clients/decorators/wallet.ts

@@ -55,6 +55,7 @@ import {
 } from '../../actions/wallet/signMessage.js'
 import {
   type SignTransactionParameters,
+  type SignTransactionRequest,
   type SignTransactionReturnType,
   signTransaction,
 } from '../../actions/wallet/signTransaction.js'
@@ -469,9 +470,15 @@ export type WalletActions<
    * })
    * const signature = await client.signTransaction(request)
    */
-  signTransaction: <chainOverride extends Chain | undefined>(
-    args: SignTransactionParameters<chain, account, chainOverride>,
-  ) => Promise<SignTransactionReturnType>
+  signTransaction: <
+    chainOverride extends Chain | undefined,
+    const request extends SignTransactionRequest<
+      chain,
+      chainOverride
+    > = SignTransactionRequest<chain, chainOverride>,
+  >(
+    args: SignTransactionParameters<chain, account, chainOverride, request>,
+  ) => Promise<SignTransactionReturnType<request>>
   /**
    * Signs typed data and calculates an Ethereum-specific signature in [EIP-191 format](https://eips.ethereum.org/EIPS/eip-191): `keccak256("\x19Ethereum Signed Message:\n" + len(message) + message))`.
    *

package/constants/abis.ts

@@ -224,6 +224,30 @@ export const universalSignatureValidatorAbi = [
     stateMutability: 'nonpayable',
     type: 'constructor',
   },
+  {
+    inputs: [
+      {
+        name: '_signer',
+        type: 'address',
+      },
+      {
+        name: '_hash',
+        type: 'bytes32',
+      },
+      {
+        name: '_signature',
+        type: 'bytes',
+      },
+    ],
+    outputs: [
+      {
+        type: 'bool',
+      },
+    ],
+    stateMutability: 'nonpayable',
+    type: 'function',
+    name: 'isValidSig',
+  },
 ] as const
 
 /** [ERC-20 Token Standard](https://ethereum.org/en/developers/docs/standards/tokens/erc-20) */

package/errors/version.ts

@@ -1 +1 @@
-export const version = '2.21.24'
+export const version = '2.21.25'

package/package.json

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

package/types/chain.ts

@@ -40,6 +40,7 @@ export type Chain<
           ensRegistry?: ChainContract | undefined
           ensUniversalResolver?: ChainContract | undefined
           multicall3?: ChainContract | undefined
+          universalSignatureVerifier?: ChainContract | undefined
         }
       >
     | undefined

package/types/transaction.ts

@@ -216,7 +216,7 @@ export type TransactionRequestBase<
   /** Contract code or a hashed method call with encoded args */
   data?: Hex | undefined
   /** Transaction sender */
-  from: Address
+  from?: Address | undefined
   /** Gas provided for transaction execution */
   gas?: quantity | undefined
   /** Unique number identifying this transaction */

package/utils/rpc/http.ts

@@ -6,6 +6,7 @@ import {
 } from '../../errors/request.js'
 import type { ErrorType } from '../../errors/utils.js'
 import type { RpcRequest, RpcResponse } from '../../types/rpc.js'
+import type { MaybePromise } from '../../types/utils.js'
 import {
   type WithTimeoutErrorType,
   withTimeout,
@@ -17,7 +18,14 @@ export type HttpRpcClientOptions = {
   /** Request configuration to pass to `fetch`. */
   fetchOptions?: Omit<RequestInit, 'body'> | undefined
   /** A callback to handle the request. */
-  onRequest?: ((request: Request) => Promise<void> | void) | undefined
+  onRequest?:
+    | ((
+        request: Request,
+        init: RequestInit,
+      ) => MaybePromise<
+        void | undefined | (RequestInit & { url?: string | undefined })
+      >)
+    | undefined
   /** A callback to handle the response. */
   onResponse?: ((response: Response) => Promise<void> | void) | undefined
   /** The timeout (in ms) for the request. */
@@ -32,7 +40,14 @@ export type HttpRequestParameters<
   /** Request configuration to pass to `fetch`. */
   fetchOptions?: HttpRpcClientOptions['fetchOptions'] | undefined
   /** A callback to handle the response. */
-  onRequest?: ((request: Request) => Promise<void> | void) | undefined
+  onRequest?:
+    | ((
+        request: Request,
+        init: RequestInit,
+      ) => MaybePromise<
+        void | undefined | (RequestInit & { url?: string | undefined })
+      >)
+    | undefined
   /** A callback to handle the response. */
   onResponse?: ((response: Response) => Promise<void> | void) | undefined
   /** The timeout (in ms) for the request. */
@@ -101,8 +116,8 @@ export function getHttpRpcClient(
               signal: signal_ || (timeout > 0 ? signal : null),
             }
             const request = new Request(url, init)
-            if (onRequest) await onRequest(request)
-            const response = await fetch(url, init)
+            const args = (await onRequest?.(request, init)) ?? { ...init, url }
+            const response = await fetch(args.url ?? url, args)
             return response
           },
           {

package/utils/transaction/getTransactionType.ts

@@ -9,62 +9,24 @@ import type {
   FeeValuesLegacy,
 } from '../../index.js'
 import type {
-  TransactionRequestEIP1559,
-  TransactionRequestEIP2930,
-  TransactionRequestEIP4844,
-  TransactionRequestEIP7702,
   TransactionRequestGeneric,
-  TransactionRequestLegacy,
-  TransactionSerializableEIP1559,
   TransactionSerializableEIP2930,
   TransactionSerializableEIP4844,
   TransactionSerializableEIP7702,
   TransactionSerializableGeneric,
-  TransactionSerializableLegacy,
 } from '../../types/transaction.js'
-import type {
-  Assign,
-  ExactPartial,
-  IsNever,
-  OneOf,
-  ValueOf,
-} from '../../types/utils.js'
+import type { Assign, ExactPartial, IsNever, OneOf } from '../../types/utils.js'
 
 export type GetTransactionType<
   transaction extends OneOf<
     TransactionSerializableGeneric | TransactionRequestGeneric
   > = TransactionSerializableGeneric,
   result =
-    | (transaction extends
-        | MatchKeys<TransactionSerializableLegacy, transaction>
-        | MatchKeys<TransactionRequestLegacy, transaction>
-        | LegacyProperties
-        ? 'legacy'
-        : never)
-    | (transaction extends
-        | MatchKeys<TransactionSerializableEIP1559, transaction>
-        | MatchKeys<TransactionRequestEIP1559, transaction>
-        | EIP1559Properties
-        ? 'eip1559'
-        : never)
-    | (transaction extends
-        | MatchKeys<TransactionSerializableEIP2930, transaction>
-        | MatchKeys<TransactionRequestEIP2930, transaction>
-        | EIP2930Properties
-        ? 'eip2930'
-        : never)
-    | (transaction extends
-        | MatchKeys<TransactionSerializableEIP4844, transaction>
-        | MatchKeys<TransactionRequestEIP4844, transaction>
-        | EIP4844Properties
-        ? 'eip4844'
-        : never)
-    | (transaction extends
-        | MatchKeys<TransactionSerializableEIP7702, transaction>
-        | MatchKeys<TransactionRequestEIP7702, transaction>
-        | EIP7702Properties
-        ? 'eip7702'
-        : never)
+    | (transaction extends LegacyProperties ? 'legacy' : never)
+    | (transaction extends EIP1559Properties ? 'eip1559' : never)
+    | (transaction extends EIP2930Properties ? 'eip2930' : never)
+    | (transaction extends EIP4844Properties ? 'eip4844' : never)
+    | (transaction extends EIP7702Properties ? 'eip7702' : never)
     | (transaction['type'] extends TransactionSerializableGeneric['type']
         ? Extract<transaction['type'], string>
         : never),
@@ -115,14 +77,6 @@ export function getTransactionType<
 ////////////////////////////////////////////////////////////////////////////////////////////
 // Types
 
-type MatchKeys<T extends object, U extends object> = ValueOf<
-  Required<{
-    [K in keyof U]: K extends keyof T ? K : undefined
-  }>
-> extends string
-  ? T
-  : never
-
 type BaseProperties = {
   accessList?: undefined
   authorizationList?: undefined
@@ -151,13 +105,13 @@ type EIP1559Properties = Assign<
   }
 >
 type EIP2930Properties = Assign<
-  BaseProperties,
-  ExactPartial<FeeValuesLegacy> & {
+  ExactPartial<LegacyProperties>,
+  {
     accessList: TransactionSerializableEIP2930['accessList']
   }
 >
 type EIP4844Properties = Assign<
-  BaseProperties,
+  ExactPartial<EIP1559Properties>,
   ExactPartial<FeeValuesEIP4844> &
     OneOf<
       | {
@@ -173,8 +127,8 @@ type EIP4844Properties = Assign<
     >
 >
 type EIP7702Properties = Assign<
-  BaseProperties,
-  ExactPartial<FeeValuesEIP1559> & {
+  ExactPartial<EIP1559Properties>,
+  {
     authorizationList: TransactionSerializableEIP7702['authorizationList']
   }
 >

package/_cjs/utils/data/isBytesEqual.js

@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isBytesEqual = isBytesEqual;
-const utils_1 = require("@noble/curves/abstract/utils");
-const toBytes_js_1 = require("../encoding/toBytes.js");
-const isHex_js_1 = require("./isHex.js");
-function isBytesEqual(a_, b_) {
-    const a = (0, isHex_js_1.isHex)(a_) ? (0, toBytes_js_1.toBytes)(a_) : a_;
-    const b = (0, isHex_js_1.isHex)(b_) ? (0, toBytes_js_1.toBytes)(b_) : b_;
-    return (0, utils_1.equalBytes)(a, b);
-}
-//# sourceMappingURL=isBytesEqual.js.map

package/_cjs/utils/data/isBytesEqual.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"isBytesEqual.js","sourceRoot":"","sources":["../../../utils/data/isBytesEqual.ts"],"names":[],"mappings":";;AAYA,oCAIC;AAhBD,wDAAyD;AAIzD,uDAAuE;AACvE,yCAAuD;AAOvD,SAAgB,YAAY,CAAC,EAAmB,EAAE,EAAmB;IACnE,MAAM,CAAC,GAAG,IAAA,gBAAK,EAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAA,oBAAO,EAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;IACtC,MAAM,CAAC,GAAG,IAAA,gBAAK,EAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAA,oBAAO,EAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;IACtC,OAAO,IAAA,kBAAU,EAAC,CAAC,EAAE,CAAC,CAAC,CAAA;AACzB,CAAC"}

package/_esm/utils/data/isBytesEqual.js

@@ -1,9 +0,0 @@
-import { equalBytes } from '@noble/curves/abstract/utils';
-import { toBytes } from '../encoding/toBytes.js';
-import { isHex } from './isHex.js';
-export function isBytesEqual(a_, b_) {
-    const a = isHex(a_) ? toBytes(a_) : a_;
-    const b = isHex(b_) ? toBytes(b_) : b_;
-    return equalBytes(a, b);
-}
-//# sourceMappingURL=isBytesEqual.js.map

package/_esm/utils/data/isBytesEqual.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"isBytesEqual.js","sourceRoot":"","sources":["../../../utils/data/isBytesEqual.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAA;AAIzD,OAAO,EAAyB,OAAO,EAAE,MAAM,wBAAwB,CAAA;AACvE,OAAO,EAAuB,KAAK,EAAE,MAAM,YAAY,CAAA;AAOvD,MAAM,UAAU,YAAY,CAAC,EAAmB,EAAE,EAAmB;IACnE,MAAM,CAAC,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;IACtC,MAAM,CAAC,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;IACtC,OAAO,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;AACzB,CAAC"}

package/_types/utils/data/isBytesEqual.d.ts

@@ -1,7 +0,0 @@
-import type { ErrorType } from '../../errors/utils.js';
-import type { ByteArray, Hex } from '../../types/misc.js';
-import { type ToBytesErrorType } from '../encoding/toBytes.js';
-import { type IsHexErrorType } from './isHex.js';
-export type IsBytesEqualErrorType = IsHexErrorType | ToBytesErrorType | ErrorType;
-export declare function isBytesEqual(a_: ByteArray | Hex, b_: ByteArray | Hex): boolean;
-//# sourceMappingURL=isBytesEqual.d.ts.map

package/_types/utils/data/isBytesEqual.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"isBytesEqual.d.ts","sourceRoot":"","sources":["../../../utils/data/isBytesEqual.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AACtD,OAAO,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAA;AACzD,OAAO,EAAE,KAAK,gBAAgB,EAAW,MAAM,wBAAwB,CAAA;AACvE,OAAO,EAAE,KAAK,cAAc,EAAS,MAAM,YAAY,CAAA;AAEvD,MAAM,MAAM,qBAAqB,GAC7B,cAAc,GACd,gBAAgB,GAChB,SAAS,CAAA;AAEb,wBAAgB,YAAY,CAAC,EAAE,EAAE,SAAS,GAAG,GAAG,EAAE,EAAE,EAAE,SAAS,GAAG,GAAG,WAIpE"}

package/utils/data/isBytesEqual.ts

@@ -1,17 +0,0 @@
-import { equalBytes } from '@noble/curves/abstract/utils'
-
-import type { ErrorType } from '../../errors/utils.js'
-import type { ByteArray, Hex } from '../../types/misc.js'
-import { type ToBytesErrorType, toBytes } from '../encoding/toBytes.js'
-import { type IsHexErrorType, isHex } from './isHex.js'
-
-export type IsBytesEqualErrorType =
-  | IsHexErrorType
-  | ToBytesErrorType
-  | ErrorType
-
-export function isBytesEqual(a_: ByteArray | Hex, b_: ByteArray | Hex) {
-  const a = isHex(a_) ? toBytes(a_) : a_
-  const b = isHex(b_) ? toBytes(b_) : b_
-  return equalBytes(a, b)
-}