viem 2.5.0 → 2.6.1

package/chains/zksync/{types.ts → types/transaction.ts}

@@ -1,15 +1,11 @@
-import type { Abi, AbiEvent, Address } from 'abitype'
-import type { Block, BlockTag } from '../../types/block.js'
-import type { FeeValuesEIP1559 } from '../../types/fee.js'
-import type { Log as Log_ } from '../../types/log.js'
-import type { Hex } from '../../types/misc.js'
+import type { Address } from 'abitype'
+import type { FeeValuesEIP1559 } from '../../../types/fee.js'
+import type { Hex } from '../../../types/misc.js'
 import type {
   Index,
   Quantity,
-  RpcBlock,
-  RpcLog as RpcLog_,
   RpcTransactionRequest as RpcTransactionRequest_,
-} from '../../types/rpc.js'
+} from '../../../types/rpc.js'
 import type {
   Transaction as Transaction_,
   TransactionBase,
@@ -23,121 +19,20 @@ import type {
   TransactionSerializableEIP1559,
   TransactionSerialized,
   TransactionType,
-} from '../../types/transaction.js'
-import type { UnionOmit } from '../../types/utils.js'
+} from '../../../types/transaction.js'
+import type { OneOf, UnionOmit } from '../../../types/utils.js'
+import type { ZkSyncEip712Meta } from './eip712.js'
+import type { ZkSyncFeeValues } from './fee.js'
+import type {
+  ZkSyncL2ToL1Log,
+  ZkSyncLog,
+  ZkSyncRpcL2ToL1Log,
+  ZkSyncRpcLog,
+} from './log.js'
 
 type EIP712Type = '0x71'
 type PriorityType = '0xff'
 
-// Types
-// https://era.zksync.io/docs/api/js/types
-
-export type ZkSyncLog<
-  TQuantity = bigint,
-  TIndex = number,
-  TPending extends boolean = boolean,
-  TAbiEvent extends AbiEvent | undefined = undefined,
-  TStrict extends boolean | undefined = undefined,
-  TAbi extends Abi | readonly unknown[] | undefined = TAbiEvent extends AbiEvent
-    ? [TAbiEvent]
-    : undefined,
-  TEventName extends string | undefined = TAbiEvent extends AbiEvent
-    ? TAbiEvent['name']
-    : undefined,
-> = Log_<TQuantity, TIndex, TPending, TAbiEvent, TStrict, TAbi, TEventName> & {
-  l1BatchNumber: TQuantity | null
-  transactionLogIndex: TIndex
-  logType: Hex | null
-}
-
-export type ZkSyncRpcLog = RpcLog_ & {
-  l1BatchNumber: Hex | null
-  // These are returned but doesn't apear in Log structure neither is mentioned in https://era.zksync.io/docs/api/js/types
-  transactionLogIndex: Hex
-  logType: Hex | null
-}
-
-type PaymasterParams = {
-  paymaster: Address
-  paymasterInput: number[]
-}
-
-export type ZkSyncEip712Meta = {
-  gasPerPubdata?: Hex
-  factoryDeps?: Hex[]
-  customSignature?: Hex
-  paymasterParams?: PaymasterParams
-}
-
-export type ZkSyncL2ToL1Log = {
-  blockNumber: bigint
-  blockHash: string
-  l1BatchNumber: bigint
-  transactionIndex: bigint
-  shardId: bigint
-  isService: boolean
-  sender: string
-  key: string
-  value: string
-  transactionHash: string
-  logIndex: bigint
-}
-
-export type ZkSyncRpcL2ToL1Log = {
-  blockNumber: Hex
-  blockHash: Hex
-  l1BatchNumber: Hex
-  transactionIndex: Hex
-  shardId: Hex
-  isService: boolean
-  sender: Hex
-  key: Hex
-  value: Hex
-  transactionHash: Hex
-  logIndex: Hex
-}
-
-export type ZkSyncFeeValues<TQuantity = bigint> = {
-  gasPrice: TQuantity
-  maxFeePerGas: TQuantity
-  maxPriorityFeePerGas: TQuantity
-}
-
-// Block
-// https://era.zksync.io/docs/api/js/types#block
-
-export type ZkSyncBlockOverrides = {
-  l1BatchNumber: bigint | null
-  l1BatchTimestamp: bigint | null
-}
-
-export type ZkSyncBlock<
-  TIncludeTransactions extends boolean = boolean,
-  TBlockTag extends BlockTag = BlockTag,
-> = Block<
-  bigint,
-  TIncludeTransactions,
-  TBlockTag,
-  ZkSyncTransaction<TBlockTag extends 'pending' ? true : false>
-> &
-  ZkSyncBlockOverrides
-
-// Block (RPC)
-
-export type ZkSyncRpcBlockOverrides = {
-  l1BatchNumber: Hex | null
-  l1BatchTimestamp: Hex | null
-}
-export type ZkSyncRpcBlock<
-  TBlockTag extends BlockTag = BlockTag,
-  TIncludeTransactions extends boolean = boolean,
-> = RpcBlock<
-  TBlockTag,
-  TIncludeTransactions,
-  ZkSyncRpcTransaction<TBlockTag extends 'pending' ? true : false>
-> &
-  ZkSyncRpcBlockOverrides
-
 // Transaction
 // https://era.zksync.io/docs/api/js/types#transactionresponse
 
@@ -291,9 +186,9 @@ export type ZkSyncTransactionReceipt<
 
 // Serializers
 
-export type ZkSyncTransactionSerializable =
-  | TransactionSerializable
-  | ZkSyncTransactionSerializableEIP712
+export type ZkSyncTransactionSerializable = OneOf<
+  TransactionSerializable | ZkSyncTransactionSerializableEIP712
+>
 
 export type ZkSyncTransactionSerialized<
   TType extends TransactionType = 'eip712',
@@ -315,3 +210,36 @@ export type ZkSyncTransactionSerializableEIP712<
   customSignature?: Hex
   type?: 'eip712'
 }
+
+// EIP712 Signer
+
+export type ZkSyncEIP712TransactionSignable = {
+  txType: bigint
+  from: bigint
+  to: bigint
+  gasLimit: bigint
+  gasPerPubdataByteLimit: bigint
+  maxFeePerGas: bigint
+  maxPriorityFeePerGas: bigint
+  paymaster: bigint
+  nonce: bigint
+  value: bigint
+  data: Hex
+  factoryDeps: Hex[]
+  paymasterInput: Hex
+}
+
+export type TransactionRequestEIP712<
+  TQuantity = bigint,
+  TIndex = number,
+  TTransactionType = 'eip712',
+> = TransactionRequestBase<TQuantity, TIndex> &
+  Partial<FeeValuesEIP1559<TQuantity>> & {
+    accessList?: never
+    gasPerPubdata?: bigint
+    factoryDeps?: Hex[]
+    paymaster?: Address
+    paymasterInput?: Hex
+    customSignature?: Hex
+    type?: TTransactionType
+  }

package/chains/zksync/utils/assertEip712Request.ts

@@ -0,0 +1,18 @@
+import type { ErrorType } from '../../../errors/utils.js'
+import { type AssertRequestErrorType, assertRequest } from '../../../index.js'
+import type { SendTransactionParameters } from '../actions/sendTransaction.js'
+import type { zkSync } from '../chains.js'
+import { InvalidEip712TransactionError } from '../errors/transaction.js'
+import { isEIP712Transaction } from './isEip712Transaction.js'
+
+export type AssertEip712RequestParameters = Partial<
+  SendTransactionParameters<typeof zkSync>
+>
+
+export type AssertEip712RequestErrorType = AssertRequestErrorType | ErrorType
+
+export function assertEip712Request(args: AssertEip712RequestParameters) {
+  if (!isEIP712Transaction(args as any))
+    throw new InvalidEip712TransactionError()
+  assertRequest(args as any)
+}

package/chains/zksync/utils/assertEip712Transaction.ts

@@ -0,0 +1,35 @@
+import { InvalidAddressError } from '../../../errors/address.js'
+import { BaseError } from '../../../errors/base.js'
+import { InvalidChainIdError } from '../../../errors/chain.js'
+import { isAddress } from '../../../utils/address/isAddress.js'
+import { InvalidEip712TransactionError } from '../errors/transaction.js'
+import type {
+  ZkSyncTransactionSerializable,
+  ZkSyncTransactionSerializableEIP712,
+} from '../types/transaction.js'
+import { isEIP712Transaction } from './isEip712Transaction.js'
+
+export function assertEip712Transaction(
+  transaction: Partial<ZkSyncTransactionSerializable>,
+) {
+  const { chainId, to, from, paymaster, paymasterInput } =
+    transaction as ZkSyncTransactionSerializableEIP712
+
+  if (!isEIP712Transaction(transaction))
+    throw new InvalidEip712TransactionError()
+  if (!chainId || chainId <= 0) throw new InvalidChainIdError({ chainId })
+  if (to && !isAddress(to)) throw new InvalidAddressError({ address: to })
+  if (from && !isAddress(from)) throw new InvalidAddressError({ address: from })
+  if (paymaster && !isAddress(paymaster))
+    throw new InvalidAddressError({ address: paymaster })
+  if (paymaster && !paymasterInput) {
+    throw new BaseError(
+      '`paymasterInput` must be provided when `paymaster` is defined',
+    )
+  }
+  if (!paymaster && paymasterInput) {
+    throw new BaseError(
+      '`paymaster` must be provided when `paymasterInput` is defined',
+    )
+  }
+}

package/chains/zksync/utils/getEip712Domain.ts

@@ -0,0 +1,83 @@
+import type { EIP712DomainFn } from '../types/eip712.js'
+import type {
+  ZkSyncEIP712TransactionSignable,
+  ZkSyncTransactionSerializable,
+  ZkSyncTransactionSerializableEIP712,
+} from '../types/transaction.js'
+import { assertEip712Transaction } from './assertEip712Transaction.js'
+
+export const getEip712Domain: EIP712DomainFn<
+  ZkSyncTransactionSerializable,
+  ZkSyncEIP712TransactionSignable
+> = (transaction) => {
+  assertEip712Transaction(transaction)
+
+  const message = transactionToMessage(
+    transaction as ZkSyncTransactionSerializableEIP712,
+  )
+
+  return {
+    domain: {
+      name: 'zkSync',
+      version: '2',
+      chainId: transaction.chainId,
+    },
+    types: {
+      Transaction: [
+        { name: 'txType', type: 'uint256' },
+        { name: 'from', type: 'uint256' },
+        { name: 'to', type: 'uint256' },
+        { name: 'gasLimit', type: 'uint256' },
+        { name: 'gasPerPubdataByteLimit', type: 'uint256' },
+        { name: 'maxFeePerGas', type: 'uint256' },
+        { name: 'maxPriorityFeePerGas', type: 'uint256' },
+        { name: 'paymaster', type: 'uint256' },
+        { name: 'nonce', type: 'uint256' },
+        { name: 'value', type: 'uint256' },
+        { name: 'data', type: 'bytes' },
+        { name: 'factoryDeps', type: 'bytes32[]' },
+        { name: 'paymasterInput', type: 'bytes' },
+      ],
+    },
+    primaryType: 'Transaction',
+    message: message,
+  }
+}
+
+//////////////////////////////////////////////////////////////////////////////
+// Utilities
+
+function transactionToMessage(
+  transaction: ZkSyncTransactionSerializableEIP712,
+): ZkSyncEIP712TransactionSignable {
+  const {
+    gas,
+    nonce,
+    to,
+    from,
+    value,
+    maxFeePerGas,
+    maxPriorityFeePerGas,
+    factoryDeps,
+    paymaster,
+    paymasterInput,
+    gasPerPubdata,
+    data,
+  } = transaction
+
+  return {
+    txType: 113n,
+    from: BigInt(from),
+    to: to ? BigInt(to) : 0n,
+    gasLimit: gas ?? 0n,
+    gasPerPubdataByteLimit: gasPerPubdata ?? 0n,
+    maxFeePerGas: maxFeePerGas ?? 0n,
+    maxPriorityFeePerGas: maxPriorityFeePerGas ?? 0n,
+    paymaster: paymaster ? BigInt(paymaster) : 0n,
+    nonce: nonce ? BigInt(nonce) : 0n,
+    value: value ?? 0n,
+    data: data ? data : '0x0',
+    factoryDeps: factoryDeps ?? [],
+    paymasterInput: paymasterInput ? paymasterInput : '0x0',
+  }
+}

package/chains/zksync/utils/isEip712Transaction.ts

@@ -0,0 +1,17 @@
+import type { ZkSyncTransactionSerializable } from '../types/transaction.js'
+
+export function isEIP712Transaction(
+  transaction: Partial<ZkSyncTransactionSerializable>,
+) {
+  if (transaction.type === 'eip712') return true
+  if (
+    ('customSignature' in transaction && transaction.customSignature) ||
+    ('paymaster' in transaction && transaction.paymaster) ||
+    ('paymasterInput' in transaction && transaction.paymasterInput) ||
+    ('gasPerPubdata' in transaction &&
+      typeof transaction.gasPerPubdata === 'bigint') ||
+    ('factoryDeps' in transaction && transaction.factoryDeps)
+  )
+    return true
+  return false
+}

package/errors/chain.ts

@@ -96,7 +96,11 @@ export type InvalidChainIdErrorType = InvalidChainIdError & {
 export class InvalidChainIdError extends BaseError {
   override name = 'InvalidChainIdError'
 
-  constructor({ chainId }: { chainId: number }) {
-    super(`Chain ID "${chainId}" is invalid.`)
+  constructor({ chainId }: { chainId?: number }) {
+    super(
+      typeof chainId === 'number'
+        ? `Chain ID "${chainId}" is invalid.`
+        : 'Chain ID is invalid.',
+    )
   }
 }

package/errors/version.ts

@@ -1 +1 @@
-export const version = '2.5.0'
+export const version = '2.6.1'

package/package.json

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

package/types/chain.ts

@@ -16,6 +16,9 @@ import type { SerializeTransactionFn } from '../utils/transaction/serializeTrans
 
 export type Chain<
   formatters extends ChainFormatters | undefined = ChainFormatters | undefined,
+  custom extends Record<string, unknown> | undefined =
+    | Record<string, unknown>
+    | undefined,
 > = {
   /** Collection of block explorers */
   blockExplorers?:
@@ -55,6 +58,8 @@ export type Chain<
   /** Flag for test networks */
   testnet?: boolean | undefined
 
+  /** Custom chain data. */
+  custom?: custom
   /**
    * Modifies how chain data structures (ie. Blocks, Transactions, etc)
    * are formatted & typed.

package/types/transaction.ts

@@ -35,6 +35,8 @@ export type TransactionReceipt<
   logs: Log<TQuantity, TIndex, false>[]
   /** Logs bloom filter */
   logsBloom: Hex
+  /** The post-transaction state root. Only specified for transactions included before the Byzantium upgrade. */
+  root?: Hash
   /** `success` if this transaction was successful or `reverted` if it failed */
   status: TStatus
   /** Transaction recipient or `null` if deploying a contract */

package/_cjs/chains/zksync/types.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../chains/zksync/types.ts"],"names":[],"mappings":""}

package/_esm/chains/zksync/types.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=types.js.map

package/_esm/chains/zksync/types.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../chains/zksync/types.ts"],"names":[],"mappings":""}

package/_types/chains/zksync/types.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../chains/zksync/types.ts"],"names":[],"mappings":"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"}