viem 2.8.9 → 2.8.11

package/actions/public/getLogs.ts

@@ -41,48 +41,48 @@ export type GetLogsParameters<
   _EventName extends string | undefined = MaybeAbiEventName<TAbiEvent>,
 > = {
   /** Address or list of addresses from which logs originated */
-  address?: Address | Address[]
+  address?: Address | Address[] | undefined
 } & (
   | {
       event: TAbiEvent
-      events?: never
-      args?: MaybeExtractEventArgsFromAbi<TAbiEvents, _EventName>
+      events?: never | undefined
+      args?: MaybeExtractEventArgsFromAbi<TAbiEvents, _EventName> | undefined
       /**
        * Whether or not the logs must match the indexed/non-indexed arguments on `event`.
        * @default false
        */
-      strict?: TStrict
+      strict?: TStrict | undefined
     }
   | {
-      event?: never
+      event?: never | undefined
       events: TAbiEvents
-      args?: never
+      args?: never | undefined
       /**
        * Whether or not the logs must match the indexed/non-indexed arguments on `event`.
        * @default false
        */
-      strict?: TStrict
+      strict?: TStrict | undefined
     }
   | {
-      event?: never
-      events?: never
-      args?: never
-      strict?: never
+      event?: never | undefined
+      events?: never | undefined
+      args?: never | undefined
+      strict?: never | undefined
     }
 ) &
   (
     | {
         /** Block number or tag after which to include logs */
-        fromBlock?: TFromBlock | BlockNumber | BlockTag
+        fromBlock?: TFromBlock | BlockNumber | BlockTag | undefined
         /** Block number or tag before which to include logs */
-        toBlock?: TToBlock | BlockNumber | BlockTag
-        blockHash?: never
+        toBlock?: TToBlock | BlockNumber | BlockTag | undefined
+        blockHash?: never | undefined
       }
     | {
-        fromBlock?: never
-        toBlock?: never
+        fromBlock?: never | undefined
+        toBlock?: never | undefined
         /** Hash of block to include logs from */
-        blockHash?: Hash
+        blockHash?: Hash | undefined
       }
   )
 

package/actions/public/getProof.ts

@@ -24,16 +24,16 @@ export type GetProofParameters = {
 } & (
   | {
       /** The block number. */
-      blockNumber?: bigint
-      blockTag?: never
+      blockNumber?: bigint | undefined
+      blockTag?: never | undefined
     }
   | {
-      blockNumber?: never
+      blockNumber?: never | undefined
       /**
        * The block tag.
        * @default 'latest'
        */
-      blockTag?: BlockTag
+      blockTag?: BlockTag | undefined
     }
 )
 

package/actions/public/getStorageAt.ts

@@ -17,12 +17,12 @@ export type GetStorageAtParameters = {
   slot: Hex
 } & (
   | {
-      blockNumber?: never
-      blockTag?: BlockTag
+      blockNumber?: never | undefined
+      blockTag?: BlockTag | undefined
     }
   | {
-      blockNumber?: bigint
-      blockTag?: never
+      blockNumber?: bigint | undefined
+      blockTag?: never | undefined
     }
 )
 

package/actions/public/getTransaction.ts

@@ -21,37 +21,37 @@ export type GetTransactionParameters<TBlockTag extends BlockTag = 'latest'> =
   | {
       /** The block hash */
       blockHash: Hash
-      blockNumber?: never
-      blockTag?: never
-      hash?: never
+      blockNumber?: never | undefined
+      blockTag?: never | undefined
+      hash?: never | undefined
       /** The index of the transaction on the block. */
       index: number
     }
   | {
-      blockHash?: never
+      blockHash?: never | undefined
       /** The block number */
       blockNumber: bigint
-      blockTag?: never
-      hash?: never
+      blockTag?: never | undefined
+      hash?: never | undefined
       /** The index of the transaction on the block. */
       index: number
     }
   | {
-      blockHash?: never
-      blockNumber?: never
+      blockHash?: never | undefined
+      blockNumber?: never | undefined
       /** The block tag. */
       blockTag: TBlockTag | BlockTag
-      hash?: never
+      hash?: never | undefined
       /** The index of the transaction on the block. */
       index: number
     }
   | {
-      blockHash?: never
-      blockNumber?: never
-      blockTag?: never
+      blockHash?: never | undefined
+      blockNumber?: never | undefined
+      blockTag?: never | undefined
       /** The hash of the transaction. */
       hash: Hash
-      index?: number
+      index?: number | undefined
     }
 
 export type GetTransactionReturnType<

package/actions/public/getTransactionConfirmations.ts

@@ -21,10 +21,10 @@ export type GetTransactionConfirmationsParameters<
   | {
       /** The transaction hash. */
       hash: Hash
-      transactionReceipt?: never
+      transactionReceipt?: never | undefined
     }
   | {
-      hash?: never
+      hash?: never | undefined
       /** The transaction receipt. */
       transactionReceipt: FormattedTransactionReceipt<TChain>
     }

package/actions/public/getTransactionCount.ts

@@ -22,13 +22,13 @@ export type GetTransactionCountParameters = {
 } & (
   | {
       /** The block number. */
-      blockNumber?: bigint
-      blockTag?: never
+      blockNumber?: bigint | undefined
+      blockTag?: never | undefined
     }
   | {
-      blockNumber?: never
+      blockNumber?: never | undefined
       /** The block tag. Defaults to 'latest'. */
-      blockTag?: BlockTag
+      blockTag?: BlockTag | undefined
     }
 )
 export type GetTransactionCountReturnType = number

package/actions/public/simulateContract.ts

@@ -54,10 +54,10 @@ export type SimulateContractParameters<
   ///
   derivedChain extends Chain | undefined = DeriveChain<chain, chainOverride>,
 > = {
-  account?: accountOverride
-  chain?: chainOverride
+  account?: accountOverride | undefined
+  chain?: chainOverride | undefined
   /** Data to append to the end of the calldata. Useful for adding a ["domain" tag](https://opensea.notion.site/opensea/Seaport-Order-Attributions-ec2d69bf455041a5baa490941aad307f). */
-  dataSuffix?: Hex
+  dataSuffix?: Hex | undefined
 } & ContractFunctionParameters<
   abi,
   'nonpayable' | 'payable',

package/actions/public/waitForTransactionReceipt.ts

@@ -55,28 +55,28 @@ export type WaitForTransactionReceiptParameters<
    * The number of confirmations (blocks that have passed) to wait before resolving.
    * @default 1
    */
-  confirmations?: number
+  confirmations?: number | undefined
   /** The hash of the transaction. */
   hash: Hash
   /** Optional callback to emit if the transaction has been replaced. */
-  onReplaced?: (response: ReplacementReturnType<TChain>) => void
+  onReplaced?: ((response: ReplacementReturnType<TChain>) => void) | undefined
   /**
    * Polling frequency (in ms). Defaults to the client's pollingInterval config.
    * @default client.pollingInterval
    */
-  pollingInterval?: number
+  pollingInterval?: number | undefined
   /**
    * Number of times to retry if the transaction or block is not found.
    * @default 6 (exponential backoff)
    */
-  retryCount?: WithRetryParameters['retryCount']
+  retryCount?: WithRetryParameters['retryCount'] | undefined
   /**
    * Time to wait (in ms) between retries.
    * @default `({ count }) => ~~(1 << count) * 200` (exponential backoff)
    */
-  retryDelay?: WithRetryParameters['delay']
+  retryDelay?: WithRetryParameters['delay'] | undefined
   /** Optional timeout (in milliseconds) to wait before stopping polling. */
-  timeout?: number
+  timeout?: number | undefined
 }
 
 export type WaitForTransactionReceiptErrorType =

package/actions/public/watchBlockNumber.ts

@@ -26,7 +26,7 @@ export type WatchBlockNumberParameters<
   /** The callback to call when a new block number is received. */
   onBlockNumber: OnBlockNumberFn
   /** The callback to call when an error occurred when trying to get for a new block. */
-  onError?: (error: Error) => void
+  onError?: ((error: Error) => void) | undefined
 } & (
   | (GetTransportConfig<TTransport>['type'] extends 'webSocket'
       ? {
@@ -180,7 +180,7 @@ export function watchBlockNumber<
           onError?.(err as Error)
         }
       })()
-      return unsubscribe
+      return () => unsubscribe()
     })
   }
 

package/actions/public/watchBlocks.ts

@@ -218,7 +218,7 @@ export function watchBlocks<
         onError?.(err as Error)
       }
     })()
-    return unsubscribe
+    return () => unsubscribe()
   }
 
   return enablePolling ? pollBlocks() : subscribeBlocks()

package/actions/public/watchContractEvent.ts

@@ -154,6 +154,7 @@ export function watchContractEvent<
     typeof poll_ !== 'undefined' ? poll_ : client.transport.type !== 'webSocket'
 
   const pollContractEvent = () => {
+    const strict = strict_ ?? false
     const observerId = stringify([
       'watchContractEvent',
       address,
@@ -162,8 +163,8 @@ export function watchContractEvent<
       client.uid,
       eventName,
       pollingInterval,
+      strict,
     ])
-    const strict = strict_ ?? false
 
     return observe(observerId, { onLogs, onError }, (emit) => {
       let previousBlockNumber: bigint
@@ -262,69 +263,84 @@ export function watchContractEvent<
   }
 
   const subscribeContractEvent = () => {
+    const strict = strict_ ?? false
+    const observerId = stringify([
+      'watchContractEvent',
+      address,
+      args,
+      batch,
+      client.uid,
+      eventName,
+      pollingInterval,
+      strict,
+    ])
+
     let active = true
     let unsubscribe = () => (active = false)
-    ;(async () => {
-      try {
-        const topics: LogTopic[] = eventName
-          ? encodeEventTopics({
-              abi: abi,
-              eventName: eventName,
-              args,
-            } as EncodeEventTopicsParameters)
-          : []
-
-        const { unsubscribe: unsubscribe_ } = await client.transport.subscribe({
-          params: ['logs', { address, topics }],
-          onData(data: any) {
-            if (!active) return
-            const log = data.result
-            try {
-              const { eventName, args } = decodeEventLog({
+    return observe(observerId, { onLogs, onError }, (emit) => {
+      ;(async () => {
+        try {
+          const topics: LogTopic[] = eventName
+            ? encodeEventTopics({
                 abi: abi,
-                data: log.data,
-                topics: log.topics as any,
-                strict: strict_,
-              })
-              const formatted = formatLog(log, {
+                eventName: eventName,
                 args,
-                eventName: eventName as string,
-              })
-              onLogs([formatted] as any)
-            } catch (err) {
-              let eventName: string | undefined
-              let isUnnamed: boolean | undefined
-              if (
-                err instanceof DecodeLogDataMismatch ||
-                err instanceof DecodeLogTopicsMismatch
-              ) {
-                // If strict mode is on, and log data/topics do not match event definition, skip.
-                if (strict_) return
-                eventName = err.abiItem.name
-                isUnnamed = err.abiItem.inputs?.some(
-                  (x) => !('name' in x && x.name),
-                )
-              }
+              } as EncodeEventTopicsParameters)
+            : []
 
-              // Set args to empty if there is an error decoding (e.g. indexed/non-indexed params mismatch).
-              const formatted = formatLog(log, {
-                args: isUnnamed ? [] : {},
-                eventName,
-              })
-              onLogs([formatted] as any)
-            }
-          },
-          onError(error: Error) {
-            onError?.(error)
-          },
-        })
-        unsubscribe = unsubscribe_
-        if (!active) unsubscribe()
-      } catch (err) {
-        onError?.(err as Error)
-      }
-    })()
-    return unsubscribe
+          const { unsubscribe: unsubscribe_ } =
+            await client.transport.subscribe({
+              params: ['logs', { address, topics }],
+              onData(data: any) {
+                if (!active) return
+                const log = data.result
+                try {
+                  const { eventName, args } = decodeEventLog({
+                    abi: abi,
+                    data: log.data,
+                    topics: log.topics as any,
+                    strict: strict_,
+                  })
+                  const formatted = formatLog(log, {
+                    args,
+                    eventName: eventName as string,
+                  })
+                  emit.onLogs([formatted] as any)
+                } catch (err) {
+                  let eventName: string | undefined
+                  let isUnnamed: boolean | undefined
+                  if (
+                    err instanceof DecodeLogDataMismatch ||
+                    err instanceof DecodeLogTopicsMismatch
+                  ) {
+                    // If strict mode is on, and log data/topics do not match event definition, skip.
+                    if (strict_) return
+                    eventName = err.abiItem.name
+                    isUnnamed = err.abiItem.inputs?.some(
+                      (x) => !('name' in x && x.name),
+                    )
+                  }
+
+                  // Set args to empty if there is an error decoding (e.g. indexed/non-indexed params mismatch).
+                  const formatted = formatLog(log, {
+                    args: isUnnamed ? [] : {},
+                    eventName,
+                  })
+                  emit.onLogs([formatted] as any)
+                }
+              },
+              onError(error: Error) {
+                emit.onError?.(error)
+              },
+            })
+          unsubscribe = unsubscribe_
+          if (!active) unsubscribe()
+        } catch (err) {
+          onError?.(err as Error)
+        }
+      })()
+      return () => unsubscribe()
+    })
   }
 
   return enablePolling ? pollContractEvent() : subscribeContractEvent()

package/actions/public/watchEvent.ts

@@ -69,38 +69,38 @@ export type WatchEventParameters<
   _EventName extends string | undefined = MaybeAbiEventName<TAbiEvent>,
 > = {
   /** The address of the contract. */
-  address?: Address | Address[]
+  address?: Address | Address[] | undefined
   /** The callback to call when an error occurred when trying to get for a new block. */
-  onError?: (error: Error) => void
+  onError?: ((error: Error) => void) | undefined
   /** The callback to call when new event logs are received. */
   onLogs: WatchEventOnLogsFn<TAbiEvent, TAbiEvents, TStrict, _EventName>
 } & GetPollOptions<TTransport> &
   (
     | {
         event: TAbiEvent
-        events?: never
-        args?: MaybeExtractEventArgsFromAbi<TAbiEvents, _EventName>
+        events?: never | undefined
+        args?: MaybeExtractEventArgsFromAbi<TAbiEvents, _EventName> | undefined
         /**
          * Whether or not the logs must match the indexed/non-indexed arguments on `event`.
          * @default false
          */
-        strict?: TStrict
+        strict?: TStrict | undefined
       }
     | {
-        event?: never
-        events?: TAbiEvents
-        args?: never
+        event?: never | undefined
+        events?: TAbiEvents | undefined
+        args?: never | undefined
         /**
          * Whether or not the logs must match the indexed/non-indexed arguments on `event`.
          * @default false
          */
-        strict?: TStrict
+        strict?: TStrict | undefined
       }
     | {
-        event?: never
-        events?: never
-        args?: never
-        strict?: never
+        event?: never | undefined
+        events?: never | undefined
+        args?: never | undefined
+        strict?: never | undefined
       }
   )
 
@@ -349,7 +349,7 @@ export function watchEvent<
         onError?.(err as Error)
       }
     })()
-    return unsubscribe
+    return () => unsubscribe()
   }
 
   return enablePolling ? pollEvent() : subscribeEvent()

package/actions/public/watchPendingTransactions.ts

@@ -21,7 +21,7 @@ export type WatchPendingTransactionsParameters<
   TTransport extends Transport = Transport,
 > = {
   /** The callback to call when an error occurred when trying to get for a new block. */
-  onError?: (error: Error) => void
+  onError?: ((error: Error) => void) | undefined
   /** The callback to call when new transactions are received. */
   onTransactions: OnTransactionsFn
 } & GetPollOptions<TTransport>
@@ -157,7 +157,7 @@ export function watchPendingTransactions<
         onError?.(err as Error)
       }
     })()
-    return unsubscribe
+    return () => unsubscribe()
   }
 
   return enablePolling

package/actions/test/mine.ts

@@ -13,7 +13,7 @@ export type MineParameters = {
   /** Number of blocks to mine. */
   blocks: number
   /** Interval between each block in seconds. */
-  interval?: number
+  interval?: number | undefined
 }
 
 export type MineErrorType = RequestErrorType | ErrorType

package/actions/test/reset.ts

@@ -10,9 +10,9 @@ import type { RequestErrorType } from '../../utils/buildRequest.js'
 
 export type ResetParameters = {
   /** The block number to reset from. */
-  blockNumber?: bigint
+  blockNumber?: bigint | undefined
   /** The JSON RPC URL. */
-  jsonRpcUrl?: string
+  jsonRpcUrl?: string | undefined
 }
 
 export type ResetErrorType = RequestErrorType | ErrorType

package/actions/wallet/prepareTransactionRequest.ts

@@ -42,6 +42,7 @@ import type {
   TransactionSerializable,
 } from '../../types/transaction.js'
 import type {
+  ExactPartial,
   IsNever,
   Prettify,
   UnionOmit,
@@ -76,7 +77,7 @@ export type PrepareTransactionRequestRequest<
   _derivedChain extends Chain | undefined = DeriveChain<chain, chainOverride>,
 > = UnionOmit<FormattedTransactionRequest<_derivedChain>, 'from'> &
   GetTransactionRequestKzgParameter & {
-    parameters?: PrepareTransactionRequestParameterType[]
+    parameters?: PrepareTransactionRequestParameterType[] | undefined
   }
 
 export type PrepareTransactionRequestParameters<
@@ -94,7 +95,7 @@ export type PrepareTransactionRequestParameters<
 > = request &
   GetAccountParameter<account, accountOverride, false> &
   GetChainParameter<chain, chainOverride> &
-  GetTransactionRequestKzgParameter<request> & { chainId?: number }
+  GetTransactionRequestKzgParameter<request> & { chainId?: number | undefined }
 
 export type PrepareTransactionRequestReturnType_<
   chain extends Chain | undefined = Chain | undefined,
@@ -156,8 +157,8 @@ export type PrepareTransactionRequestReturnType<
           : { account?: undefined; from?: undefined }),
       IsNever<_transactionRequest> extends true
         ? unknown
-        : Partial<_transactionRequest>
-    > & { chainId?: number },
+        : ExactPartial<_transactionRequest>
+    > & { chainId?: number | undefined },
     ParameterTypeToParameters<
       request['parameters'] extends PrepareTransactionRequestParameterType[]
         ? request['parameters'][number]

package/actions/wallet/writeContract.ts

@@ -64,7 +64,7 @@ export type WriteContractParameters<
         FormattedTransactionRequest<derivedChain>['value']
       > & {
         /** Data to append to the end of the calldata. Useful for adding a ["domain" tag](https://opensea.notion.site/opensea/Seaport-Order-Attributions-ec2d69bf455041a5baa490941aad307f). */
-        dataSuffix?: Hex
+        dataSuffix?: Hex | undefined
       }
   > &
   UnionEvaluate<

package/chains/celo/parsers.ts

@@ -1,5 +1,6 @@
 import { InvalidSerializedTransactionError } from '../../errors/transaction.js'
 import type { Hex } from '../../types/misc.js'
+import type { ExactPartial } from '../../types/utils.js'
 import { isHex } from '../../utils/data/isHex.js'
 import { sliceHex } from '../../utils/data/slice.js'
 import { hexToBigInt, hexToNumber } from '../../utils/encoding/fromHex.js'
@@ -102,7 +103,7 @@ function parseTransactionCIP42(
     })
   }
 
-  const transaction: Partial<TransactionSerializableCIP42> = {
+  const transaction: ExactPartial<TransactionSerializableCIP42> = {
     chainId: hexToNumber(chainId as Hex),
     type: 'cip42',
   }
@@ -177,7 +178,7 @@ function parseTransactionCIP64(
     })
   }
 
-  const transaction: Partial<TransactionSerializableCIP64> = {
+  const transaction: ExactPartial<TransactionSerializableCIP64> = {
     chainId: hexToNumber(chainId as Hex),
     type: 'cip64',
   }

package/chains/celo/serializers.ts

@@ -24,7 +24,7 @@ import { isCIP42, isCIP64, isEmpty, isPresent } from './utils.js'
 
 export function serializeTransaction(
   transaction: CeloTransactionSerializable,
-  signature?: Signature,
+  signature?: Signature | undefined,
 ) {
   if (isCIP64(transaction))
     return serializeTransactionCIP64(transaction, signature)
@@ -48,7 +48,7 @@ export type SerializeTransactionCIP64ReturnType = TransactionSerializedCIP64
 // This will be in addition to the type 0x02 transaction as specified in EIP-1559.
 function serializeTransactionCIP42(
   transaction: TransactionSerializableCIP42,
-  signature?: Signature,
+  signature?: Signature | undefined,
 ): SerializeTransactionCIP42ReturnType {
   assertTransactionCIP42(transaction)
   const {
@@ -90,7 +90,7 @@ function serializeTransactionCIP42(
 
 function serializeTransactionCIP64(
   transaction: TransactionSerializableCIP64,
-  signature?: Signature,
+  signature?: Signature | undefined,
 ): SerializeTransactionCIP64ReturnType {
   assertTransactionCIP64(transaction)
   const {