viem 2.35.1 → 2.36.0-jxom-erc8010-20250826223301

package/utils/promise/withCache.ts

@@ -52,7 +52,7 @@ export async function withCache<data>(
   // If the max age is 0, the cache is disabled.
   const response = cache.response.get()
   if (response && cacheTime > 0) {
-    const age = new Date().getTime() - response.created.getTime()
+    const age = Date.now() - response.created.getTime()
     if (age < cacheTime) return response.data
   }
 

package/utils/promise/withTimeout.ts

@@ -5,7 +5,9 @@ export type WithTimeoutErrorType = ErrorType
 export function withTimeout<data>(
   fn: ({
     signal,
-  }: { signal: AbortController['signal'] | null }) => Promise<data>,
+  }: {
+    signal: AbortController['signal'] | null
+  }) => Promise<data>,
   {
     errorInstance = new Error('timed out'),
     timeout,

package/utils/rpc/compat.ts

@@ -9,7 +9,7 @@ import type {
 import type { ErrorType } from '../../errors/utils.js'
 import type { RpcResponse } from '../../types/rpc.js'
 import type { WithTimeoutErrorType } from '../promise/withTimeout.js'
-import { type HttpRequestParameters, getHttpRpcClient } from './http.js'
+import { getHttpRpcClient, type HttpRequestParameters } from './http.js'
 import type { SocketRpcClient } from './socket.js'
 import { getWebSocketRpcClient } from './webSocket.js'
 

package/utils/rpc/ipc.ts

@@ -1,10 +1,10 @@
-import { type Socket as NetSocket, connect } from 'node:net'
+import { connect, type Socket as NetSocket } from 'node:net'
 import { WebSocketRequestError } from '../../index.js'
 import {
   type GetSocketRpcClientParameters,
+  getSocketRpcClient,
   type Socket,
   type SocketRpcClient,
-  getSocketRpcClient,
 } from './socket.js'
 
 export type GetIpcRpcClientOptions = Pick<

package/utils/rpc/socket.ts

@@ -144,6 +144,7 @@ export async function getSocketRpcClient<socket extends {}>(
           socket?.close()
 
           setTimeout(async () => {
+            // biome-ignore lint/suspicious/noConsole: _
             await setup().catch(console.error)
             reconnectInProgress = false
           }, delay)

package/utils/rpc/webSocket.ts

@@ -7,9 +7,9 @@ import {
 import type { RpcRequest } from '../../types/rpc.js'
 import {
   type GetSocketRpcClientParameters,
+  getSocketRpcClient,
   type Socket,
   type SocketRpcClient,
-  getSocketRpcClient,
 } from './socket.js'
 
 export type GetWebSocketRpcClientOptions = Pick<

package/utils/signature/hashTypedData.ts

@@ -14,8 +14,8 @@ import { type ToHexErrorType, toHex } from '../encoding/toHex.js'
 import { type Keccak256ErrorType, keccak256 } from '../hash/keccak256.js'
 import {
   type GetTypesForEIP712DomainErrorType,
-  type ValidateTypedDataErrorType,
   getTypesForEIP712Domain,
+  type ValidateTypedDataErrorType,
   validateTypedData,
 } from '../typedData.js'
 

package/utils/signature/isErc8010Signature.ts

@@ -0,0 +1,14 @@
+import * as SignatureErc8010 from 'ox/erc8010/SignatureErc8010'
+import type { ErrorType } from '../../errors/utils.js'
+import type { Hex } from '../../types/misc.js'
+
+export type IsErc8010SignatureParameters = Hex
+export type IsErc8010SignatureReturnType = boolean
+export type IsErc8010SignatureErrorType = ErrorType
+
+/** Whether or not the signature is an ERC-8010 formatted signature. */
+export function isErc8010Signature(
+  signature: IsErc8010SignatureParameters,
+): IsErc8010SignatureReturnType {
+  return SignatureErc8010.validate(signature)
+}

package/utils/signature/parseErc8010Signature.ts

@@ -0,0 +1,64 @@
+import * as SignatureErc8010 from 'ox/erc8010/SignatureErc8010'
+import type { ErrorType } from '../../errors/utils.js'
+import type { SignedAuthorization } from '../../types/authorization.js'
+import type { Hex } from '../../types/misc.js'
+import type { OneOf, Prettify } from '../../types/utils.js'
+import { numberToHex } from '../encoding/toHex.js'
+import {
+  type IsErc8010SignatureErrorType,
+  isErc8010Signature,
+} from './isErc8010Signature.js'
+
+export type ParseErc8010SignatureParameters = Hex
+
+export type ParseErc8010SignatureReturnType = Prettify<
+  OneOf<
+    | {
+        /** Authorization signed by the delegatee. */
+        authorization: SignedAuthorization
+        /** Data to initialize the delegation. */
+        data?: Hex | undefined
+        /** The original signature. */
+        signature: Hex
+      }
+    | {
+        /** The original signature. */
+        signature: Hex
+      }
+  >
+>
+
+export type ParseErc8010SignatureErrorType =
+  | IsErc8010SignatureErrorType
+  | ErrorType
+
+/**
+ * @description Parses a hex-formatted ERC-8010 flavoured signature.
+ * If the signature is not in ERC-8010 format, then the underlying (original) signature is returned.
+ *
+ * @param signature ERC-8010 signature in hex format.
+ * @returns The parsed ERC-8010 signature.
+ */
+export function parseErc8010Signature(
+  signature: ParseErc8010SignatureParameters,
+): ParseErc8010SignatureReturnType {
+  if (!isErc8010Signature(signature)) return { signature }
+
+  const {
+    authorization: authorization_ox,
+    data,
+    signature: inner,
+  } = SignatureErc8010.unwrap(signature)
+  return {
+    authorization: {
+      address: authorization_ox.address,
+      chainId: authorization_ox.chainId,
+      nonce: Number(authorization_ox.nonce),
+      r: numberToHex(authorization_ox.r, { size: 32 }),
+      s: numberToHex(authorization_ox.s, { size: 32 }),
+      yParity: authorization_ox.yParity,
+    },
+    data,
+    signature: inner,
+  }
+}

package/utils/signature/recoverAddress.ts

@@ -1,9 +1,8 @@
 import type { Address } from 'abitype'
 
 import { publicKeyToAddress } from '../../accounts/utils/publicKeyToAddress.js'
-import type { ByteArray, Hex, Signature } from '../../types/misc.js'
-
 import type { ErrorType } from '../../errors/utils.js'
+import type { ByteArray, Hex, Signature } from '../../types/misc.js'
 import { recoverPublicKey } from './recoverPublicKey.js'
 
 export type RecoverAddressParameters = {

package/utils/signature/recoverMessageAddress.ts

@@ -1,13 +1,11 @@
 import type { Address } from 'abitype'
-
+import type { ErrorType } from '../../errors/utils.js'
 import type {
   ByteArray,
   Hex,
   SignableMessage,
   Signature,
 } from '../../types/misc.js'
-
-import type { ErrorType } from '../../errors/utils.js'
 import { type HashMessageErrorType, hashMessage } from './hashMessage.js'
 import {
   type RecoverAddressErrorType,

package/utils/signature/recoverTypedDataAddress.ts

@@ -1,9 +1,7 @@
 import type { Address, TypedData } from 'abitype'
-
+import type { ErrorType } from '../../errors/utils.js'
 import type { ByteArray, Hex, Signature } from '../../types/misc.js'
 import type { TypedDataDefinition } from '../../types/typedData.js'
-
-import type { ErrorType } from '../../errors/utils.js'
 import { type HashTypedDataErrorType, hashTypedData } from './hashTypedData.js'
 import {
   type RecoverAddressErrorType,

package/utils/signature/serializeErc8010Signature.ts

@@ -0,0 +1,48 @@
+import * as SignatureErc8010 from 'ox/erc8010/SignatureErc8010'
+import type { ErrorType } from '../../errors/utils.js'
+import type { SignedAuthorization } from '../../types/authorization.js'
+import type { ByteArray, Hex } from '../../types/misc.js'
+import { hexToBytes } from '../encoding/toBytes.js'
+
+type To = 'bytes' | 'hex'
+
+export type SerializeErc8010SignatureParameters<to extends To = 'hex'> = {
+  /** Authorization signed by the delegatee. */
+  authorization: SignedAuthorization
+  /** Data to initialize the delegation. */
+  data?: Hex | undefined
+  /** The original signature. */
+  signature: Hex
+  to?: to | To | undefined
+}
+
+export type SerializeErc8010SignatureReturnType<to extends To = 'hex'> =
+  | (to extends 'hex' ? Hex : never)
+  | (to extends 'bytes' ? ByteArray : never)
+
+export type SerializeErc8010SignatureErrorType = ErrorType
+
+/**
+ * @description Serializes a ERC-8010 flavoured signature into hex format.
+ *
+ * @param signature ERC-8010 signature in object format.
+ * @returns ERC-8010 signature in hex format.
+ */
+export function serializeErc8010Signature<to extends To = 'hex'>(
+  parameters: SerializeErc8010SignatureParameters<to>,
+): SerializeErc8010SignatureReturnType<to> {
+  const { to = 'hex' } = parameters
+  const signature_ = SignatureErc8010.wrap({
+    ...parameters,
+    authorization: {
+      address: parameters.authorization.address,
+      chainId: parameters.authorization.chainId,
+      nonce: BigInt(parameters.authorization.nonce),
+      r: BigInt(parameters.authorization.r),
+      s: BigInt(parameters.authorization.s),
+      yParity: parameters.authorization.yParity!,
+    },
+  })
+  if (to === 'hex') return signature_ as SerializeErc8010SignatureReturnType<to>
+  return hexToBytes(signature_) as SerializeErc8010SignatureReturnType<to>
+}

package/utils/signature/toPrefixedMessage.ts

@@ -5,8 +5,8 @@ import { type ConcatErrorType, concat } from '../data/concat.js'
 import { size } from '../data/size.js'
 import {
   type BytesToHexErrorType,
-  type StringToHexErrorType,
   bytesToHex,
+  type StringToHexErrorType,
   stringToHex,
 } from '../encoding/toHex.js'
 

package/utils/signature/verifyHash.ts

@@ -1,13 +1,11 @@
 import type { Address } from 'abitype'
-
+import type { ErrorType } from '../../errors/utils.js'
 import type { ByteArray, Hash, Hex, Signature } from '../../types/misc.js'
 import { type GetAddressErrorType, getAddress } from '../address/getAddress.js'
 import {
   type IsAddressEqualErrorType,
   isAddressEqual,
 } from '../address/isAddressEqual.js'
-
-import type { ErrorType } from '../../errors/utils.js'
 import {
   type RecoverAddressErrorType,
   recoverAddress,

package/utils/signature/verifyMessage.ts

@@ -1,5 +1,5 @@
 import type { Address } from 'abitype'
-
+import type { ErrorType } from '../../errors/utils.js'
 import type {
   ByteArray,
   Hex,
@@ -11,8 +11,6 @@ import {
   type IsAddressEqualErrorType,
   isAddressEqual,
 } from '../address/isAddressEqual.js'
-
-import type { ErrorType } from '../../errors/utils.js'
 import {
   type RecoverMessageAddressErrorType,
   recoverMessageAddress,

package/utils/signature/verifyTypedData.ts

@@ -1,5 +1,5 @@
 import type { Address, TypedData } from 'abitype'
-
+import type { ErrorType } from '../../errors/utils.js'
 import type { ByteArray, Hex, Signature } from '../../types/misc.js'
 import type { TypedDataDefinition } from '../../types/typedData.js'
 import { type GetAddressErrorType, getAddress } from '../address/getAddress.js'
@@ -7,8 +7,6 @@ import {
   type IsAddressEqualErrorType,
   isAddressEqual,
 } from '../address/isAddressEqual.js'
-
-import type { ErrorType } from '../../errors/utils.js'
 import {
   type RecoverTypedDataAddressParameters,
   recoverTypedDataAddress,

package/utils/siwe/createSiweMessage.ts

@@ -170,7 +170,7 @@ export function createSiweMessage(
 }
 
 const domainRegex =
-  /^([a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,}(:[0-9]{1,5})?$/
+  /^([a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,}(:[0-9]{1,5})?$/
 const ipRegex =
   /^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)(:[0-9]{1,5})?$/
 const localhostRegex = /^localhost(:[0-9]{1,5})?$/

package/utils/siwe/utils.ts

@@ -2,8 +2,7 @@ export function isUri(value: string) {
   // based on https://github.com/ogt/valid-url
 
   // check for illegal characters
-  if (/[^a-z0-9\:\/\?\#\[\]\@\!\$\&\'\(\)\*\+\,\;\=\.\-\_\~\%]/i.test(value))
-    return false
+  if (/[^a-z0-9:/?#[\]@!$&'()*+,;=.\-_~%]/i.test(value)) return false
 
   // check for hex escapes that aren't complete
   if (/%[^0-9a-f]/i.test(value)) return false
@@ -29,7 +28,7 @@ export function isUri(value: string) {
   }
 
   // scheme must begin with a letter, then consist of letters, digits, +, ., or -
-  if (!/^[a-z][a-z0-9\+\-\.]*$/.test(scheme.toLowerCase())) return false
+  if (!/^[a-z][a-z0-9+\-.]*$/.test(scheme.toLowerCase())) return false
 
   let out = ''
   // re-assemble the URL per section 5.3 in RFC 3986
@@ -46,6 +45,6 @@ export function isUri(value: string) {
 
 function splitUri(value: string) {
   return value.match(
-    /(?:([^:\/?#]+):)?(?:\/\/([^\/?#]*))?([^?#]*)(?:\?([^#]*))?(?:#(.*))?/,
+    /(?:([^:/?#]+):)?(?:\/\/([^/?#]*))?([^?#]*)(?:\?([^#]*))?(?:#(.*))?/,
   )!
 }

package/utils/transaction/serializeTransaction.ts

@@ -49,8 +49,8 @@ import {
 import { type ConcatHexErrorType, concatHex } from '../data/concat.js'
 import { trim } from '../data/trim.js'
 import {
-  type NumberToHexErrorType,
   bytesToHex,
+  type NumberToHexErrorType,
   numberToHex,
 } from '../encoding/toHex.js'
 import { type ToRlpErrorType, toRlp } from '../encoding/toRlp.js'

package/utils/typedData.ts

@@ -96,7 +96,7 @@ export function validateTypedData<
         // and will throw.
         numberToHex(value, {
           signed: base === 'int',
-          size: Number.parseInt(size_) / 8,
+          size: Number.parseInt(size_, 10) / 8,
         })
       }
 
@@ -106,9 +106,9 @@ export function validateTypedData<
       const bytesMatch = type.match(bytesRegex)
       if (bytesMatch) {
         const [_type, size_] = bytesMatch
-        if (size_ && size(value as Hex) !== Number.parseInt(size_))
+        if (size_ && size(value as Hex) !== Number.parseInt(size_, 10))
           throw new BytesSizeMismatchError({
-            expectedSize: Number.parseInt(size_),
+            expectedSize: Number.parseInt(size_, 10),
             givenSize: size(value as Hex),
           })
       }
@@ -138,7 +138,9 @@ export type GetTypesForEIP712DomainErrorType = ErrorType
 
 export function getTypesForEIP712Domain({
   domain,
-}: { domain?: TypedDataDomain | undefined }): TypedDataParameter[] {
+}: {
+  domain?: TypedDataDomain | undefined
+}): TypedDataParameter[] {
   return [
     typeof domain?.name === 'string' && { name: 'name', type: 'string' },
     domain?.version && { name: 'version', type: 'string' },

package/zksync/actions/claimFailedDeposit.ts

@@ -21,15 +21,14 @@ import type {
   DeriveChain,
   GetChainParameter,
 } from '../../types/chain.js'
-import type { Hash } from '../../types/misc.js'
-import type { Hex } from '../../types/misc.js'
+import type { Hash, Hex } from '../../types/misc.js'
 import type { UnionEvaluate, UnionOmit } from '../../types/utils.js'
 import {
-  type FormattedTransactionRequest,
   decodeAbiParameters,
   decodeFunctionData,
   encodeAbiParameters,
   encodeFunctionData,
+  type FormattedTransactionRequest,
   isAddressEqual,
   parseAccount,
 } from '../../utils/index.js'

package/zksync/actions/deposit.ts

@@ -33,10 +33,10 @@ import type {
 import type { Hex } from '../../types/misc.js'
 import type { UnionEvaluate, UnionOmit } from '../../types/utils.js'
 import {
-  type FormattedTransactionRequest,
   concatHex,
   encodeAbiParameters,
   encodeFunctionData,
+  type FormattedTransactionRequest,
   isAddressEqual,
   keccak256,
   parseAccount,

package/zksync/actions/requestExecute.ts

@@ -23,8 +23,8 @@ import type {
 import type { Hex } from '../../types/misc.js'
 import type { UnionEvaluate, UnionOmit } from '../../types/utils.js'
 import {
-  type FormattedTransactionRequest,
   encodeFunctionData,
+  type FormattedTransactionRequest,
   isAddressEqual,
   parseAccount,
 } from '../../utils/index.js'

package/zksync/actions/sendTransaction.ts

@@ -1,11 +1,11 @@
 import type { Account } from '../../accounts/types.js'
-import { sendTransaction as core_sendTransaction } from '../../actions/wallet/sendTransaction.js'
 import type {
-  SendTransactionRequest,
   SendTransactionErrorType as core_SendTransactionErrorType,
   SendTransactionParameters as core_SendTransactionParameters,
   SendTransactionReturnType as core_SendTransactionReturnType,
+  SendTransactionRequest,
 } from '../../actions/wallet/sendTransaction.js'
+import { sendTransaction as core_sendTransaction } from '../../actions/wallet/sendTransaction.js'
 import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
 import type { ChainEIP712 } from '../types/chain.js'

package/zksync/actions/signTransaction.ts

@@ -1,9 +1,9 @@
 import type { Account } from '../../accounts/types.js'
-import { signTransaction as signTransaction_ } from '../../actions/wallet/signTransaction.js'
 import type {
   SignTransactionErrorType as SignTransactionErrorType_,
   SignTransactionReturnType as SignTransactionReturnType_,
 } from '../../actions/wallet/signTransaction.js'
+import { signTransaction as signTransaction_ } from '../../actions/wallet/signTransaction.js'
 import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
 import type { GetAccountParameter } from '../../types/account.js'

package/zksync/decorators/publicL2.ts

@@ -2,11 +2,11 @@ import type { Address } from 'abitype'
 import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
 import type { Account } from '../../types/account.js'
-import { estimateFee } from '../actions/estimateFee.js'
 import type {
   EstimateFeeParameters,
   EstimateFeeReturnType,
 } from '../actions/estimateFee.js'
+import { estimateFee } from '../actions/estimateFee.js'
 import {
   type EstimateGasL1ToL2Parameters,
   type EstimateGasL1ToL2ReturnType,