viem 2.9.25 → 2.9.27

package/chains/definitions/skale/cryptoColosseum.ts

@@ -1,7 +1,7 @@
 import { defineChain } from '../../../utils/chain/defineChain.js'
 
 export const skaleCryptoColosseum = /*#__PURE__*/ defineChain({
-  id: 2_046_399_126,
+  id: 1_032_942_172,
   name: 'SKALE | Crypto Colosseum',
   nativeCurrency: { name: 'sFUEL', symbol: 'sFUEL', decimals: 18 },
   rpcUrls: {

package/chains/definitions/yooldoVerse.ts

@@ -0,0 +1,18 @@
+import { defineChain } from '../../utils/chain/defineChain.js'
+
+export const yooldoVerse = /*#__PURE__*/ defineChain({
+  id: 50_005,
+  name: 'Yooldo Verse',
+  nativeCurrency: { name: 'OAS', symbol: 'OAS', decimals: 18 },
+  rpcUrls: {
+    default: {
+      http: ['https://rpc.yooldo-verse.xyz'],
+    },
+  },
+  blockExplorers: {
+    default: {
+      name: 'Yooldo Verse Explorer',
+      url: 'https://explorer.yooldo-verse.xyz',
+    },
+  },
+})

package/chains/definitions/yooldoVerseTestnet.ts

@@ -0,0 +1,19 @@
+import { defineChain } from '../../utils/chain/defineChain.js'
+
+export const yooldoVerseTestnet = /*#__PURE__*/ defineChain({
+  id: 50_006,
+  name: 'Yooldo Verse Testnet',
+  nativeCurrency: { name: 'OAS', symbol: 'OAS', decimals: 18 },
+  rpcUrls: {
+    default: {
+      http: ['https://rpc.testnet.yooldo-verse.xyz'],
+    },
+  },
+  blockExplorers: {
+    default: {
+      name: 'Yooldo Verse Testnet Explorer',
+      url: 'https://explorer.testnet.yooldo-verse.xyz',
+    },
+  },
+  testnet: true,
+})

package/chains/index.ts

@@ -52,6 +52,7 @@ export { coreDao } from './definitions/coreDao.js'
 export { cronos } from './definitions/cronos.js'
 export { cronosTestnet } from './definitions/cronosTestnet.js'
 export { crossbell } from './definitions/crossbell.js'
+export { cyber } from './definitions/cyber.js'
 export { cyberTestnet } from './definitions/cyberTestnet.js'
 export { darwinia } from './definitions/darwinia.js'
 export { defichainEvm } from './definitions/defichainEvm.js'
@@ -246,6 +247,8 @@ export {
 export { xLayer } from './definitions/xLayer.js'
 export { xdc } from './definitions/xdc.js'
 export { xdcTestnet } from './definitions/xdcTestnet.js'
+export { yooldoVerse } from './definitions/yooldoVerse.js'
+export { yooldoVerseTestnet } from './definitions/yooldoVerseTestnet.js'
 export { zetachain } from './definitions/zetachain.js'
 export { zetachainAthensTestnet } from './definitions/zetachainAthensTestnet.js'
 export { zhejiang } from './definitions/zhejiang.js'

package/errors/version.ts

@@ -1 +1 @@
-export const version = '2.9.25'
+export const version = '2.9.27'

package/experimental/eip3074/actions/signAuthMessage.ts

@@ -1,22 +1,51 @@
+import type { Address } from 'abitype'
+import { getTransactionCount } from '../../../actions/public/getTransactionCount.js'
 import type { Client } from '../../../clients/createClient.js'
 import type { Transport } from '../../../clients/transports/createTransport.js'
 import { AccountNotFoundError } from '../../../errors/account.js'
 import type { ErrorType } from '../../../errors/utils.js'
-import type { Account, PrivateKeyAccount } from '../../../types/account.js'
-import type { Chain } from '../../../types/chain.js'
-import type { Hex } from '../../../types/misc.js'
+import type {
+  Account,
+  DeriveAccount,
+  PrivateKeyAccount,
+} from '../../../types/account.js'
+import type { Chain, GetChainParameter } from '../../../types/chain.js'
+import type { Hash, Hex } from '../../../types/misc.js'
 import type { IsUndefined } from '../../../types/utils.js'
-import type { ToAuthMessageParameters } from '../utils/toAuthMessage.js'
+import { getAction } from '../../../utils/getAction.js'
+
+// TODO: Use `GetAccountParameter` from `types/utils.ts` when JSON-RPC method for sign auth message exists.
+type GetAccountParameter<
+  account extends Account | undefined = Account | undefined,
+  accountOverride extends Account | Address | undefined = Account | Address,
+> = IsUndefined<account> extends true
+  ? { account: accountOverride | PrivateKeyAccount }
+  : account extends PrivateKeyAccount
+    ? {
+        account?: accountOverride | PrivateKeyAccount | undefined
+      }
+    : { account: accountOverride | PrivateKeyAccount }
+
+type GetNonceParameter<account extends Account | Address | undefined> =
+  account extends Address | Account
+    ? {
+        nonce?: number | undefined
+      }
+    : {
+        nonce: number
+      }
 
 export type SignAuthMessageParameters<
+  chain extends Chain | undefined = Chain | undefined,
   account extends Account | undefined = Account | undefined,
-> = ToAuthMessageParameters &
-  // TODO: Use `GetAccountParameter` when JSON-RPC method for sign auth message exists.
-  (IsUndefined<account> extends true
-    ? { account: PrivateKeyAccount }
-    : account extends PrivateKeyAccount
-      ? { account?: PrivateKeyAccount | undefined }
-      : { account: PrivateKeyAccount })
+  chainOverride extends Chain | undefined = Chain | undefined,
+  accountOverride extends Account | Address | undefined = Account | Address,
+> = {
+  commit: Hash
+  invokerAddress: Address
+} & GetAccountParameter<account, accountOverride> &
+  GetChainParameter<chain, chainOverride> &
+  GetNonceParameter<DeriveAccount<account, accountOverride>>
 
 export type SignAuthMessageReturnType = Hex
 
@@ -77,25 +106,44 @@ export type SignAuthMessageErrorType = ErrorType
  */
 export async function signAuthMessage<
   chain extends Chain | undefined,
-  // TODO: Use `Account` when JSON-RPC method for sign auth message exists.
   account extends Account | undefined,
+  chainOverride extends Chain | undefined = undefined,
+  accountOverride extends Account | undefined = undefined,
 >(
   client: Client<Transport, chain, account>,
-  {
-    // @ts-expect-error – TODO: Remove when JSON-RPC method for sign auth message exists.
+  parameters: SignAuthMessageParameters<
+    chain,
+    account,
+    chainOverride,
+    accountOverride
+  >,
+): Promise<SignAuthMessageReturnType> {
+  const {
     account = client.account,
-    chainId,
+    chain = client.chain,
     commit,
     invokerAddress,
-    nonce,
-  }: SignAuthMessageParameters<account>,
-): Promise<SignAuthMessageReturnType> {
+  } = parameters
+
   if (!account)
     throw new AccountNotFoundError({
       docsPath: '/experimental/eip5792/signAuthMessage',
     })
-  return account.experimental_signAuthMessage({
-    chainId,
+
+  const nonce = await (() => {
+    if (typeof parameters.nonce === 'number') return parameters.nonce
+    return getAction(
+      client,
+      getTransactionCount,
+      'getTransactionCount',
+    )({
+      address: account.address,
+      blockTag: 'pending',
+    })
+  })()
+
+  return account.experimental_signAuthMessage!({
+    chainId: chain!.id,
     commit,
     invokerAddress,
     nonce,

package/experimental/eip3074/decorators/eip3074.ts

@@ -1,6 +1,6 @@
 import type { Client } from '../../../clients/createClient.js'
 import type { Transport } from '../../../clients/transports/createTransport.js'
-import type { Account, PrivateKeyAccount } from '../../../types/account.js'
+import type { Account } from '../../../types/account.js'
 import type { Chain } from '../../../types/chain.js'
 import {
   type SignAuthMessageParameters,
@@ -9,11 +9,18 @@ import {
 } from '../actions/signAuthMessage.js'
 
 export type WalletActionsEip3074<
+  chain extends Chain | undefined = Chain | undefined,
   account extends Account | undefined = Account | undefined,
 > = {
-  signAuthMessage: (
+  signAuthMessage: <
+    chainOverride extends Chain | undefined = undefined,
+    accountOverride extends Account | undefined = undefined,
+  >(
     parameters: SignAuthMessageParameters<
-      account extends PrivateKeyAccount ? account : undefined
+      chain,
+      account,
+      chainOverride,
+      accountOverride
     >,
   ) => Promise<SignAuthMessageReturnType>
 }
@@ -42,7 +49,7 @@ export function walletActionsEip3074() {
     account extends Account | undefined = Account | undefined,
   >(
     client: Client<transport, chain, account>,
-  ): WalletActionsEip3074<account> => {
+  ): WalletActionsEip3074<chain, account> => {
     return {
       signAuthMessage: (parameters) =>
         signAuthMessage(client as any, parameters),

package/experimental/eip3074/utils/recoverAuthMessageAddress.ts

@@ -1,6 +1,6 @@
 import type { Address } from 'abitype'
 
-import type { ByteArray, Hex } from '../../../types/misc.js'
+import type { ByteArray, Hex, Signature } from '../../../types/misc.js'
 
 import type { ErrorType } from '../../../errors/utils.js'
 import { keccak256 } from '../../../utils/hash/keccak256.js'
@@ -11,7 +11,7 @@ import {
 import { type ToAuthMessageParameters, toAuthMessage } from './toAuthMessage.js'
 
 export type RecoverAuthMessageAddressParameters = ToAuthMessageParameters & {
-  signature: Hex | ByteArray
+  signature: Hex | ByteArray | Signature
 }
 
 export type RecoverAuthMessageAddressReturnType = Address

package/package.json

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

package/utils/rpc/http.ts

@@ -118,7 +118,10 @@ export function getHttpRpcClient(
           response.headers.get('Content-Type')?.startsWith('application/json')
         )
           data = await response.json()
-        else data = await response.text()
+        else {
+          data = await response.text()
+          data = JSON.parse(data || '{}')
+        }
 
         if (!response.ok) {
           throw new HttpRequestError({

package/utils/rpc/socket.ts

@@ -47,6 +47,7 @@ export type SocketRpcClient<socket extends {}> = {
 
 export type GetSocketRpcClientParameters<socket extends {} = {}> = {
   getSocket(params: GetSocketParameters): Promise<Socket<socket>>
+  key?: string
   /**
    * Whether or not to attempt to reconnect on socket failure.
    * @default true
@@ -81,11 +82,11 @@ export const socketClientCache = /*#__PURE__*/ new Map<
 export async function getSocketRpcClient<socket extends {}>(
   params: GetSocketRpcClientParameters<socket>,
 ): Promise<SocketRpcClient<socket>> {
-  const { getSocket, reconnect = true, url } = params
+  const { getSocket, key = 'socket', reconnect = true, url } = params
   const { attempts = 5, delay = 2_000 } =
     typeof reconnect === 'object' ? reconnect : {}
 
-  let socketClient = socketClientCache.get(url)
+  let socketClient = socketClientCache.get(`${key}:${url}`)
 
   // If the socket already exists, return it.
   if (socketClient) return socketClient as {} as SocketRpcClient<socket>
@@ -95,7 +96,7 @@ export async function getSocketRpcClient<socket extends {}>(
     undefined,
     [SocketRpcClient<socket>]
   >({
-    id: url,
+    id: `${key}:${url}`,
     fn: async () => {
       // Set up a cache for incoming "synchronous" requests.
       const requests = new Map<Id, CallbackFn>()
@@ -148,7 +149,7 @@ export async function getSocketRpcClient<socket extends {}>(
       socketClient = {
         close() {
           socket.close()
-          socketClientCache.delete(url)
+          socketClientCache.delete(`${key}:${url}`)
         },
         socket,
         request({ body, onError, onResponse }) {
@@ -210,7 +211,7 @@ export async function getSocketRpcClient<socket extends {}>(
         subscriptions,
         url,
       }
-      socketClientCache.set(url, socketClient)
+      socketClientCache.set(`${key}:${url}`, socketClient)
 
       return [socketClient as {} as SocketRpcClient<socket>]
     },

package/utils/signature/hexToSignature.ts

@@ -21,11 +21,24 @@ export type HexToSignatureErrorType = NumberToHexErrorType | ErrorType
  */
 export function hexToSignature(signatureHex: Hex) {
   const { r, s } = secp256k1.Signature.fromCompact(signatureHex.slice(2, 130))
-  const v = BigInt(`0x${signatureHex.slice(130)}`)
+  const yParityOrV = Number(`0x${signatureHex.slice(130)}`)
+  const [v, yParity] = (() => {
+    if (yParityOrV === 0 || yParityOrV === 1) return [undefined, yParityOrV]
+    if (yParityOrV === 27) return [BigInt(yParityOrV), 0]
+    if (yParityOrV === 28) return [BigInt(yParityOrV), 1]
+    throw new Error('Invalid yParityOrV value')
+  })()
+
+  if (typeof v !== 'undefined')
+    return {
+      r: numberToHex(r, { size: 32 }),
+      s: numberToHex(s, { size: 32 }),
+      v,
+      yParity,
+    } satisfies Signature
   return {
     r: numberToHex(r, { size: 32 }),
     s: numberToHex(s, { size: 32 }),
-    v,
-    yParity: v === 28n ? 1 : 0,
+    yParity,
   } satisfies Signature
 }

package/utils/signature/recoverAddress.ts

@@ -1,14 +1,14 @@
 import type { Address } from 'abitype'
 
 import { publicKeyToAddress } from '../../accounts/utils/publicKeyToAddress.js'
-import type { ByteArray, Hex } from '../../types/misc.js'
+import type { ByteArray, Hex, Signature } from '../../types/misc.js'
 
 import type { ErrorType } from '../../errors/utils.js'
 import { recoverPublicKey } from './recoverPublicKey.js'
 
 export type RecoverAddressParameters = {
   hash: Hex | ByteArray
-  signature: Hex | ByteArray
+  signature: Hex | ByteArray | Signature
 }
 
 export type RecoverAddressReturnType = Address

package/utils/signature/recoverMessageAddress.ts

@@ -1,6 +1,11 @@
 import type { Address } from 'abitype'
 
-import type { ByteArray, Hex, SignableMessage } from '../../types/misc.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'
@@ -11,7 +16,7 @@ import {
 
 export type RecoverMessageAddressParameters = {
   message: SignableMessage
-  signature: Hex | ByteArray
+  signature: Hex | ByteArray | Signature
 }
 
 export type RecoverMessageAddressReturnType = Address

package/utils/signature/recoverPublicKey.ts

@@ -1,12 +1,16 @@
 import type { ErrorType } from '../../errors/utils.js'
-import type { ByteArray, Hex } from '../../types/misc.js'
+import type { ByteArray, Hex, Signature } from '../../types/misc.js'
 import { type IsHexErrorType, isHex } from '../data/isHex.js'
-import { type HexToNumberErrorType, hexToNumber } from '../encoding/fromHex.js'
+import {
+  type HexToNumberErrorType,
+  hexToBigInt,
+  hexToNumber,
+} from '../encoding/fromHex.js'
 import { toHex } from '../encoding/toHex.js'
 
 export type RecoverPublicKeyParameters = {
   hash: Hex | ByteArray
-  signature: Hex | ByteArray
+  signature: Hex | ByteArray | Signature
 }
 
 export type RecoverPublicKeyReturnType = Hex
@@ -20,20 +24,39 @@ export async function recoverPublicKey({
   hash,
   signature,
 }: RecoverPublicKeyParameters): Promise<RecoverPublicKeyReturnType> {
-  const signatureHex = isHex(signature) ? signature : toHex(signature)
   const hashHex = isHex(hash) ? hash : toHex(hash)
 
-  // Derive v = recoveryId + 27 from end of the signature (27 is added when signing the message)
-  // The recoveryId represents the y-coordinate on the secp256k1 elliptic curve and can have a value [0, 1].
-  let v = hexToNumber(`0x${signatureHex.slice(130)}`)
-  if (v === 0 || v === 1) v += 27
-
   const { secp256k1 } = await import('@noble/curves/secp256k1')
-  const publicKey = secp256k1.Signature.fromCompact(
-    signatureHex.substring(2, 130),
-  )
-    .addRecoveryBit(v - 27)
+  const signature_ = (() => {
+    // typeof signature: `Signature`
+    if (typeof signature === 'object' && 'r' in signature && 's' in signature) {
+      const { r, s, v, yParity } = signature
+      const yParityOrV = Number(yParity ?? v)!
+      const recoveryBit = toRecoveryBit(yParityOrV)
+      return new secp256k1.Signature(
+        hexToBigInt(r),
+        hexToBigInt(s),
+      ).addRecoveryBit(recoveryBit)
+    }
+
+    // typeof signature: `Hex | ByteArray`
+    const signatureHex = isHex(signature) ? signature : toHex(signature)
+    const yParityOrV = hexToNumber(`0x${signatureHex.slice(130)}`)
+    const recoveryBit = toRecoveryBit(yParityOrV)
+    return secp256k1.Signature.fromCompact(
+      signatureHex.substring(2, 130),
+    ).addRecoveryBit(recoveryBit)
+  })()
+
+  const publicKey = signature_
     .recoverPublicKey(hashHex.substring(2))
     .toHex(false)
   return `0x${publicKey}`
 }
+
+function toRecoveryBit(yParityOrV: number) {
+  if (yParityOrV === 0 || yParityOrV === 1) return yParityOrV
+  if (yParityOrV === 27) return 0
+  if (yParityOrV === 28) return 1
+  throw new Error('Invalid yParityOrV value')
+}

package/utils/signature/recoverTransactionAddress.ts

@@ -1,6 +1,6 @@
 import type { Address } from 'abitype'
 import type { ErrorType } from '../../errors/utils.js'
-import type { ByteArray, Hex } from '../../types/misc.js'
+import type { ByteArray, Hex, Signature } from '../../types/misc.js'
 import type { TransactionSerialized } from '../../types/transaction.js'
 import { type Keccak256ErrorType, keccak256 } from '../hash/keccak256.js'
 import { parseTransaction } from '../transaction/parseTransaction.js'
@@ -19,7 +19,7 @@ import {
 
 export type RecoverTransactionAddressParameters = {
   serializedTransaction: TransactionSerialized
-  signature?: Hex | ByteArray
+  signature?: Hex | ByteArray | Signature
 }
 
 export type RecoverTransactionAddressReturnType = Address
@@ -53,6 +53,7 @@ export async function recoverTransactionAddress(
     s: undefined,
     v: undefined,
     yParity: undefined,
+    sidecars: undefined,
   })
 
   return await recoverAddress({

package/utils/signature/recoverTypedDataAddress.ts

@@ -1,6 +1,6 @@
 import type { Address, TypedData } from 'abitype'
 
-import type { ByteArray, Hex } from '../../types/misc.js'
+import type { ByteArray, Hex, Signature } from '../../types/misc.js'
 import type { TypedDataDefinition } from '../../types/typedData.js'
 
 import type { ErrorType } from '../../errors/utils.js'
@@ -14,7 +14,7 @@ export type RecoverTypedDataAddressParameters<
   typedData extends TypedData | Record<string, unknown> = TypedData,
   primaryType extends keyof typedData | 'EIP712Domain' = keyof typedData,
 > = TypedDataDefinition<typedData, primaryType> & {
-  signature: Hex | ByteArray
+  signature: Hex | ByteArray | Signature
 }
 
 export type RecoverTypedDataAddressReturnType = Address

package/utils/signature/verifyMessage.ts

@@ -1,6 +1,11 @@
 import type { Address } from 'abitype'
 
-import type { ByteArray, Hex, SignableMessage } from '../../types/misc.js'
+import type {
+  ByteArray,
+  Hex,
+  SignableMessage,
+  Signature,
+} from '../../types/misc.js'
 import { type GetAddressErrorType, getAddress } from '../address/getAddress.js'
 import {
   type IsAddressEqualErrorType,
@@ -19,7 +24,7 @@ export type VerifyMessageParameters = {
   /** The message to be verified. */
   message: SignableMessage
   /** The signature that was generated by signing the message with the address's private key. */
-  signature: Hex | ByteArray
+  signature: Hex | ByteArray | Signature
 }
 
 export type VerifyMessageReturnType = boolean

package/utils/signature/verifyTypedData.ts

@@ -1,6 +1,6 @@
 import type { Address, TypedData } from 'abitype'
 
-import type { ByteArray, Hex } from '../../types/misc.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'
 import {
@@ -21,7 +21,7 @@ export type VerifyTypedDataParameters<
   /** The address to verify the typed data for. */
   address: Address
   /** The signature to verify */
-  signature: Hex | ByteArray
+  signature: Hex | ByteArray | Signature
 }
 
 export type VerifyTypedDataReturnType = boolean

package/zksync/actions/sendEip712Transaction.ts

@@ -95,7 +95,7 @@ export async function sendEip712Transaction<
     // Prepare the request for signing (assign appropriate fees, etc.)
     const request = await prepareTransactionRequest(client, {
       ...args,
-      parameters: ['gas', 'nonce'],
+      parameters: ['gas', 'nonce', 'fees'],
     } as any)
 
     let chainId: number | undefined

package/zksync/constants/number.ts

@@ -1,3 +1,4 @@
 import { maxUint16 } from '../../constants/number.js'
 
+export const gasPerPubdataDefault = 50000n
 export const maxBytecodeSize = maxUint16 * 32n

package/zksync/formatters.ts

@@ -8,6 +8,7 @@ import { formatLog } from '../utils/formatters/log.js'
 import { defineTransaction } from '../utils/formatters/transaction.js'
 import { defineTransactionReceipt } from '../utils/formatters/transactionReceipt.js'
 import { defineTransactionRequest } from '../utils/formatters/transactionRequest.js'
+import { gasPerPubdataDefault } from './constants/number.js'
 import type {
   ZkSyncBlockOverrides,
   ZkSyncRpcBlockOverrides,
@@ -125,7 +126,7 @@ export const formatters = {
           eip712Meta: {
             ...(args.gasPerPubdata
               ? { gasPerPubdata: toHex(args.gasPerPubdata) }
-              : {}),
+              : { gasPerPubdata: toHex(gasPerPubdataDefault) }),
             ...(args.paymaster && args.paymasterInput
               ? {
                   paymasterParams: {

package/zksync/serializers.ts

@@ -5,6 +5,7 @@ import { concatHex } from '../utils/data/concat.js'
 import { toHex } from '../utils/encoding/toHex.js'
 import { toRlp } from '../utils/encoding/toRlp.js'
 import { serializeTransaction as serializeTransaction_ } from '../utils/transaction/serializeTransaction.js'
+import { gasPerPubdataDefault } from './constants/number.js'
 import type {
   ZkSyncTransactionSerializable,
   ZkSyncTransactionSerializableEIP712,
@@ -69,7 +70,7 @@ function serializeTransactionEIP712(
     toHex(''),
     toHex(chainId),
     from ?? '0x',
-    gasPerPubdata ? toHex(gasPerPubdata) : '0x',
+    gasPerPubdata ? toHex(gasPerPubdata) : toHex(gasPerPubdataDefault),
     factoryDeps ?? [],
     customSignature ?? '0x', // EIP712 signature
     paymaster && paymasterInput ? [paymaster, paymasterInput] : [],

package/zksync/utils/getEip712Domain.ts

@@ -1,4 +1,5 @@
 import { toHex } from '../../utils/encoding/toHex.js'
+import { gasPerPubdataDefault } from '../constants/number.js'
 import type { EIP712DomainFn } from '../types/eip712.js'
 import type {
   ZkSyncEIP712TransactionSignable,
@@ -72,7 +73,7 @@ function transactionToMessage(
     from: BigInt(from),
     to: to ? BigInt(to) : 0n,
     gasLimit: gas ?? 0n,
-    gasPerPubdataByteLimit: gasPerPubdata ?? 0n,
+    gasPerPubdataByteLimit: gasPerPubdata ?? gasPerPubdataDefault,
     maxFeePerGas: maxFeePerGas ?? 0n,
     maxPriorityFeePerGas: maxPriorityFeePerGas ?? 0n,
     paymaster: paymaster ? BigInt(paymaster) : 0n,