viem 1.1.0 → 1.1.2

package/src/chains/formatters/optimism.ts

@@ -1,5 +1,5 @@
-import { defineBlock, formatTransaction } from '../../index.js'
 import type { FeeValuesEIP1559 } from '../../types/fee.js'
+import { type Formatters } from '../../types/formatter.js'
 import type { Hash, Hex } from '../../types/misc.js'
 import type {
   Index,
@@ -11,7 +11,11 @@ import type {
   TransactionBase,
 } from '../../types/transaction.js'
 import { hexToBigInt } from '../../utils/encoding/fromHex.js'
-import { defineTransaction } from '../../utils/formatters/transaction.js'
+import { defineBlock } from '../../utils/formatters/block.js'
+import {
+  defineTransaction,
+  formatTransaction,
+} from '../../utils/formatters/transaction.js'
 
 type RpcTransaction = RpcTransaction_ & {
   isSystemTx?: undefined
@@ -19,7 +23,7 @@ type RpcTransaction = RpcTransaction_ & {
   sourceHash?: undefined
 }
 
-type RpcDepositTransaction = TransactionBase<Quantity, Index> &
+export type RpcDepositTransaction = TransactionBase<Quantity, Index> &
   FeeValuesEIP1559<Quantity> & {
     isSystemTx?: boolean
     mint?: Hex
@@ -33,7 +37,7 @@ type Transaction = Transaction_ & {
   sourceHash?: undefined
 }
 
-type DepositTransaction = TransactionBase &
+export type DepositTransaction = TransactionBase &
   FeeValuesEIP1559 & {
     isSystemTx?: boolean
     mint?: bigint
@@ -51,7 +55,6 @@ type OptimismOverrides = {
 
 export const optimismFormatters = {
   block: /*#__PURE__*/ defineBlock({
-    exclude: ['difficulty', 'gasLimit', 'mixHash', 'nonce', 'uncles'],
     format(args: OptimismOverrides['RpcBlock']) {
       const transactions = args.transactions?.map((transaction) => {
         if (typeof transaction === 'string') return transaction
@@ -85,4 +88,4 @@ export const optimismFormatters = {
       return transaction
     },
   }),
-} as const
+} as const satisfies Formatters

package/src/chains/index.ts

@@ -129,6 +129,7 @@ export const xdcTestnet = /*#__PURE__*/ defineChain(chains.xdcTestnet)
 export const zhejiang = /*#__PURE__*/ defineChain(chains.zhejiang)
 export const zkSync = /*#__PURE__*/ defineChain(chains.zkSync)
 export const zkSyncTestnet = /*#__PURE__*/ defineChain(chains.zkSyncTestnet)
+export const zora = /*#__PURE__*/ defineChain(chains.zora)
 export const zoraTestnet = /*#__PURE__*/ defineChain(chains.zoraTestnet)
 
 export type { Chain } from '../types/chain.js'

package/src/errors/version.ts

@@ -1 +1 @@
-export const version = '1.1.0'
+export const version = '1.1.2'

package/src/index.ts

@@ -512,6 +512,7 @@ export {
   defineBlock,
   formatBlock,
 } from './utils/formatters/block.js'
+export { formatLog } from './utils/formatters/log.js'
 export {
   type DecodeAbiParametersReturnType,
   decodeAbiParameters,

package/src/types/formatter.ts

@@ -1,14 +1,15 @@
 import type { Chain } from './chain.js'
 
-export type Formatter<TSource = any, TTarget = any> = (
-  value: TSource,
-) => TTarget
+export type Formatter<TType extends string = string> = {
+  format: (args: any) => any
+  type: TType
+}
 
 export type Formatters = {
-  block?: Formatter
-  transaction?: Formatter
-  transactionReceipt?: Formatter
-  transactionRequest?: Formatter
+  block?: Formatter<'block'>
+  transaction?: Formatter<'transaction'>
+  transactionReceipt?: Formatter<'transactionReceipt'>
+  transactionRequest?: Formatter<'transactionRequest'>
 }
 
 export type ExtractFormatterParameters<
@@ -17,7 +18,7 @@ export type ExtractFormatterParameters<
   TFallback,
 > = TChain extends Chain<infer _Formatters extends Formatters>
   ? _Formatters[TType] extends Formatter
-    ? Parameters<_Formatters[TType]>[0]
+    ? Parameters<_Formatters[TType]['format']>[0]
     : TFallback
   : TFallback
 
@@ -27,6 +28,6 @@ export type ExtractFormatterReturnType<
   TFallback,
 > = TChain extends Chain<infer _Formatters extends Formatters>
   ? _Formatters[TType] extends Formatter
-    ? ReturnType<_Formatters[TType]>
+    ? ReturnType<_Formatters[TType]['format']>
     : TFallback
   : TFallback

package/src/types/serializer.ts

@@ -12,7 +12,7 @@ export type Serializers<
     TFormatters extends Formatters
       ? TFormatters['transactionRequest'] extends Formatter
         ? TransactionSerializableGeneric &
-            Parameters<TFormatters['transactionRequest']>[0]
+            Parameters<TFormatters['transactionRequest']['format']>[0]
         : TransactionSerializable
       : TransactionSerializable
   >

package/src/utils/formatters/block.ts

@@ -34,4 +34,4 @@ export function formatBlock(block: Partial<RpcBlock>) {
   } as Block
 }
 
-export const defineBlock = /*#__PURE__*/ defineFormatter(formatBlock)
+export const defineBlock = /*#__PURE__*/ defineFormatter('block', formatBlock)

package/src/utils/formatters/extract.ts

@@ -5,10 +5,10 @@ import type { Formatter } from '../../types/formatter.js'
  */
 export function extract(
   value: Record<string, unknown>,
-  { formatter }: { formatter?: Formatter },
+  { format }: { format?: Formatter['format'] },
 ) {
-  if (!formatter) return {}
-  const keys = Object.keys(formatter({}))
+  if (!format) return {}
+  const keys = Object.keys(format({}))
   return keys.reduce((data, key) => {
     if (value?.hasOwnProperty(key)) {
       ;(data as any)[key] = value[key]

package/src/utils/formatters/formatter.ts

@@ -1,6 +1,7 @@
 import type { Assign, Prettify } from '../../types/utils.js'
 
-export function defineFormatter<TParameters, TReturnType>(
+export function defineFormatter<TType extends string, TParameters, TReturnType>(
+  type: TType,
   format: (_: TParameters) => TReturnType,
 ) {
   return <
@@ -14,19 +15,22 @@ export function defineFormatter<TParameters, TReturnType>(
     exclude?: TExclude
     format: (_: TOverrideParameters) => TOverrideReturnType
   }) => {
-    return (args: TParameters & TOverrideParameters) => {
-      const formatted = format(args)
-      if (exclude) {
-        for (const key of exclude) {
-          delete (formatted as any)[key]
+    return {
+      format: (args: TParameters & TOverrideParameters) => {
+        const formatted = format(args)
+        if (exclude) {
+          for (const key of exclude) {
+            delete (formatted as any)[key]
+          }
         }
-      }
-      return {
-        ...formatted,
-        ...overrides(args),
-      } as Prettify<Assign<TReturnType, TOverrideReturnType>> & {
-        [K in TExclude[number]]: never
-      }
+        return {
+          ...formatted,
+          ...overrides(args),
+        } as Prettify<Assign<TReturnType, TOverrideReturnType>> & {
+          [K in TExclude[number]]: never
+        }
+      },
+      type,
     }
   }
 }

package/src/utils/formatters/transaction.ts

@@ -54,5 +54,7 @@ export function formatTransaction(transaction: Partial<RpcTransaction>) {
   return transaction_ as Transaction
 }
 
-export const defineTransaction =
-  /*#__PURE__*/ defineFormatter(formatTransaction)
+export const defineTransaction = /*#__PURE__*/ defineFormatter(
+  'transaction',
+  formatTransaction,
+)

package/src/utils/formatters/transactionReceipt.ts

@@ -56,5 +56,6 @@ export function formatTransactionReceipt(
 }
 
 export const defineTransactionReceipt = /*#__PURE__*/ defineFormatter(
+  'transactionReceipt',
   formatTransactionReceipt,
 )

package/src/utils/formatters/transactionRequest.ts

@@ -42,5 +42,6 @@ export function formatTransactionRequest(
 }
 
 export const defineTransactionRequest = /*#__PURE__*/ defineFormatter(
+  'transactionRequest',
   formatTransactionRequest,
 )

package/src/utils/index.ts

@@ -128,6 +128,7 @@ export {
   formatTransaction,
   transactionType,
 } from './formatters/transaction.js'
+export { formatLog } from './formatters/log.js'
 export {
   type FormattedTransactionReceipt,
   defineTransactionReceipt,