viem 2.16.5 → 2.17.0

package/op-stack/formatters.ts

@@ -1,5 +1,4 @@
 import type { ChainFormatters } from '../types/chain.js'
-import type { Hash } from '../types/misc.js'
 import type { RpcTransaction } from '../types/rpc.js'
 import { hexToBigInt } from '../utils/encoding/fromHex.js'
 import { defineBlock } from '../utils/formatters/block.js'
@@ -8,26 +7,17 @@ import {
   formatTransaction,
 } from '../utils/formatters/transaction.js'
 import { defineTransactionReceipt } from '../utils/formatters/transactionReceipt.js'
-import type {
-  OpStackBlockOverrides,
-  OpStackRpcBlockOverrides,
-} from './types/block.js'
+import type { OpStackBlock, OpStackRpcBlock } from './types/block.js'
 import type {
   OpStackRpcTransaction,
-  OpStackRpcTransactionReceiptOverrides,
+  OpStackRpcTransactionReceipt,
   OpStackTransaction,
-  OpStackTransactionReceiptOverrides,
+  OpStackTransactionReceipt,
 } from './types/transaction.js'
 
 export const formatters = {
   block: /*#__PURE__*/ defineBlock({
-    format(
-      args: OpStackRpcBlockOverrides & {
-        transactions: Hash[] | OpStackRpcTransaction[]
-      },
-    ): OpStackBlockOverrides & {
-      transactions: Hash[] | OpStackTransaction[]
-    } {
+    format(args: OpStackRpcBlock): OpStackBlock {
       const transactions = args.transactions?.map((transaction) => {
         if (typeof transaction === 'string') return transaction
         const formatted = formatTransaction(
@@ -42,11 +32,11 @@ export const formatters = {
           formatted.type = 'deposit'
         }
         return formatted
-      }) as Hash[] | OpStackTransaction[]
+      })
       return {
         transactions,
         stateRoot: args.stateRoot,
-      }
+      } as OpStackBlock
     },
   }),
   transaction: /*#__PURE__*/ defineTransaction({
@@ -62,15 +52,13 @@ export const formatters = {
     },
   }),
   transactionReceipt: /*#__PURE__*/ defineTransactionReceipt({
-    format(
-      args: OpStackRpcTransactionReceiptOverrides,
-    ): OpStackTransactionReceiptOverrides {
+    format(args: OpStackRpcTransactionReceipt): OpStackTransactionReceipt {
       return {
         l1GasPrice: args.l1GasPrice ? hexToBigInt(args.l1GasPrice) : null,
         l1GasUsed: args.l1GasUsed ? hexToBigInt(args.l1GasUsed) : null,
         l1Fee: args.l1Fee ? hexToBigInt(args.l1Fee) : null,
         l1FeeScalar: args.l1FeeScalar ? Number(args.l1FeeScalar) : null,
-      }
+      } as OpStackTransactionReceipt
     },
   }),
 } as const satisfies ChainFormatters

package/op-stack/types/transaction.ts

@@ -32,9 +32,9 @@ export type OpStackRpcDepositTransaction<TPending extends boolean = boolean> =
       sourceHash: Hex
       type: '0x7e'
     }
-export type OpStackRpcTransaction<TPending extends boolean = boolean> =
-  | RpcTransaction<TPending>
-  | OpStackRpcDepositTransaction<TPending>
+export type OpStackRpcTransaction<TPending extends boolean = boolean> = OneOf<
+  RpcTransaction<TPending> | OpStackRpcDepositTransaction<TPending>
+>
 
 export type OpStackRpcTransactionReceiptOverrides = {
   l1GasPrice: Hex | null

package/package.json

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

package/types/utils.ts

@@ -139,17 +139,6 @@ type Assign_<T, U> = {
     : K]: K extends keyof U ? U[K] : T[K]
 }
 
-/**
- * @description Make properties K of type T never.
- *
- * @example
- * NeverBy<{ a: string, b: boolean, c: number }, 'a' | 'c'>
- * => { a: never, b: boolean, c: never }
- */
-export type NeverBy<T, K extends keyof T> = {
-  [U in keyof T]: U extends K ? never : T[U]
-}
-
 // TODO: Remove when peer dep `typescript@>=4.5` (NoInfer is native)
 export type NoInfer<type> = [type][type extends any ? 0 : never]
 

package/utils/formatters/formatter.ts

@@ -1,5 +1,5 @@
 import type { ErrorType } from '../../errors/utils.js'
-import type { Assign, Prettify } from '../../types/utils.js'
+import type { Prettify } from '../../types/utils.js'
 
 export type DefineFormatterErrorType = ErrorType
 
@@ -20,7 +20,7 @@ export function defineFormatter<TType extends string, TParameters, TReturnType>(
   }) => {
     return {
       exclude,
-      format: (args: Assign<TParameters, TOverrideParameters>) => {
+      format: (args: TOverrideParameters) => {
         const formatted = format(args as any)
         if (exclude) {
           for (const key of exclude) {
@@ -30,7 +30,7 @@ export function defineFormatter<TType extends string, TParameters, TReturnType>(
         return {
           ...formatted,
           ...overrides(args),
-        } as Prettify<Assign<TReturnType, TOverrideReturnType>> & {
+        } as Prettify<TOverrideReturnType> & {
           [_key in TExclude[number]]: never
         }
       },

package/zksync/formatters.ts

@@ -1,5 +1,4 @@
 import type { ChainFormatters } from '../types/chain.js'
-import type { Hash } from '../types/misc.js'
 import { hexToBigInt, hexToNumber } from '../utils/encoding/fromHex.js'
 import { hexToBytes } from '../utils/encoding/toBytes.js'
 import { toHex } from '../utils/encoding/toHex.js'
@@ -9,14 +8,11 @@ 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,
-} from './types/block.js'
+import type { ZkSyncBlock, ZkSyncRpcBlock } from './types/block.js'
 import type { ZkSyncL2ToL1Log, ZkSyncLog } from './types/log.js'
 import type {
   ZkSyncRpcTransaction,
-  ZkSyncRpcTransactionReceiptOverrides,
+  ZkSyncRpcTransactionReceipt,
   ZkSyncRpcTransactionRequest,
   ZkSyncTransaction,
   ZkSyncTransactionReceipt,
@@ -25,13 +21,7 @@ import type {
 
 export const formatters = {
   block: /*#__PURE__*/ defineBlock({
-    format(
-      args: ZkSyncRpcBlockOverrides & {
-        transactions: Hash[] | ZkSyncRpcTransaction[]
-      },
-    ): ZkSyncBlockOverrides & {
-      transactions: Hash[] | ZkSyncTransaction[]
-    } {
+    format(args: ZkSyncRpcBlock): ZkSyncBlock {
       const transactions = args.transactions?.map((transaction) => {
         if (typeof transaction === 'string') return transaction
         const formatted = formatters.transaction?.format(
@@ -40,7 +30,7 @@ export const formatters = {
         if (formatted.typeHex === '0x71') formatted.type = 'eip712'
         else if (formatted.typeHex === '0xff') formatted.type = 'priority'
         return formatted
-      }) as Hash[] | ZkSyncTransaction[]
+      })
       return {
         l1BatchNumber: args.l1BatchNumber
           ? hexToBigInt(args.l1BatchNumber)
@@ -49,7 +39,7 @@ export const formatters = {
           ? hexToBigInt(args.l1BatchTimestamp)
           : null,
         transactions,
-      }
+      } as ZkSyncBlock
     },
   }),
   transaction: /*#__PURE__*/ defineTransaction({
@@ -69,9 +59,7 @@ export const formatters = {
     },
   }),
   transactionReceipt: /*#__PURE__*/ defineTransactionReceipt({
-    format(
-      args: ZkSyncRpcTransactionReceiptOverrides,
-    ): ZkSyncTransactionReceipt {
+    format(args: ZkSyncRpcTransactionReceipt): ZkSyncTransactionReceipt {
       return {
         l1BatchNumber: args.l1BatchNumber
           ? hexToBigInt(args.l1BatchNumber)

package/zksync/index.ts

@@ -124,9 +124,7 @@ export { serializeTransaction } from './serializers.js'
 
 export type {
   ZkSyncBlock,
-  ZkSyncBlockOverrides,
   ZkSyncRpcBlock,
-  ZkSyncRpcBlockOverrides,
 } from './types/block.js'
 export type { ChainEIP712 } from './types/chain.js'
 export type {

package/zksync/types/block.ts

@@ -2,6 +2,7 @@ import type { Address } from 'abitype'
 import type { Block, BlockTag } from '../../types/block.js'
 import type { Hash, Hex } from '../../types/misc.js'
 import type { RpcBlock } from '../../types/rpc.js'
+import type { Assign } from '../../types/utils.js'
 import type { ZkSyncRpcTransaction, ZkSyncTransaction } from './transaction.js'
 
 export type ZkSyncBatchDetails = Omit<
@@ -12,21 +13,21 @@ export type ZkSyncBatchDetails = Omit<
   l2FairGasPrice: number
 }
 
-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
+> = Assign<
+  Block<
+    bigint,
+    TIncludeTransactions,
+    TBlockTag,
+    ZkSyncTransaction<TBlockTag extends 'pending' ? true : false>
+  >,
+  {
+    l1BatchNumber: bigint | null
+    l1BatchTimestamp: bigint | null
+  }
+>
 
 export type ZkSyncBlockDetails = {
   number: number
@@ -50,20 +51,20 @@ export type ZkSyncBlockDetails = {
   protocolVersion?: string
 }
 
-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
+> = Assign<
+  RpcBlock<
+    TBlockTag,
+    TIncludeTransactions,
+    ZkSyncRpcTransaction<TBlockTag extends 'pending' ? true : false>
+  >,
+  {
+    l1BatchNumber: Hex | null
+    l1BatchTimestamp: Hex | null
+  }
+>
 
 export type ZkSyncNumberParameter = {
   number: number

package/zksync/types/transaction.ts

@@ -4,6 +4,7 @@ import type { Hash, Hex } from '../../types/misc.js'
 import type {
   Index,
   Quantity,
+  RpcTransactionReceipt,
   RpcTransactionRequest as RpcTransactionRequest_,
 } from '../../types/rpc.js'
 import type {
@@ -174,6 +175,9 @@ export type ZkSyncRpcTransactionReceiptOverrides = {
   root: Hex
 }
 
+export type ZkSyncRpcTransactionReceipt = Omit<RpcTransactionReceipt, 'logs'> &
+  ZkSyncRpcTransactionReceiptOverrides
+
 export type ZkSyncTransactionReceiptOverrides = {
   l1BatchNumber: bigint | null
   l1BatchTxIndex: bigint | null