viem 2.0.0-alpha.9 → 2.0.0-beta.1

package/actions/public/watchContractEvent.ts

@@ -1,19 +1,21 @@
-import type { Abi, AbiEvent, Address, ExtractAbiEvent } from 'abitype'
+import type { Abi, Address, ExtractAbiEvent } from 'abitype'
 
 import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
+import type { Chain } from '../../types/chain.js'
+import type { Filter } from '../../types/filter.js'
+import type { Log } from '../../types/log.js'
+
 import {
   DecodeLogDataMismatch,
   DecodeLogTopicsMismatch,
 } from '../../errors/abi.js'
 import { InvalidInputRpcError } from '../../errors/rpc.js'
-import type { Chain } from '../../types/chain.js'
+import type { ErrorType } from '../../errors/utils.js'
 import type {
   ContractEventArgs,
   ContractEventName,
 } from '../../types/contract.js'
-import type { Filter } from '../../types/filter.js'
-import type { Log } from '../../types/log.js'
 import type { LogTopic } from '../../types/misc.js'
 import type { GetPollOptions } from '../../types/transport.js'
 import { decodeEventLog } from '../../utils/abi/decodeEventLog.js'
@@ -21,18 +23,18 @@ import {
   type EncodeEventTopicsParameters,
   encodeEventTopics,
 } from '../../utils/abi/encodeEventTopics.js'
-import {
-  type GetAbiItemParameters,
-  getAbiItem,
-} from '../../utils/abi/getAbiItem.js'
 import { formatLog } from '../../utils/formatters/log.js'
-import { observe } from '../../utils/observe.js'
+import { getAction } from '../../utils/getAction.js'
+import { type ObserveErrorType, observe } from '../../utils/observe.js'
 import { poll } from '../../utils/poll.js'
-import { stringify } from '../../utils/stringify.js'
+import { type StringifyErrorType, stringify } from '../../utils/stringify.js'
 import { createContractEventFilter } from './createContractEventFilter.js'
 import { getBlockNumber } from './getBlockNumber.js'
+import {
+  type GetContractEventsParameters,
+  getContractEvents,
+} from './getContractEvents.js'
 import { getFilterChanges } from './getFilterChanges.js'
-import { getLogs } from './getLogs.js'
 import { uninstallFilter } from './uninstallFilter.js'
 
 export type WatchContractEventOnLogsParameter<
@@ -85,11 +87,16 @@ export type WatchContractEventParameters<
    * Whether or not the logs must match the indexed/non-indexed arguments on `event`.
    * @default false
    */
-  strict?: strict | undefined
+  strict?: strict | boolean | undefined
 } & GetPollOptions<transport>
 
 export type WatchContractEventReturnType = () => void
 
+export type WatchContractEventErrorType =
+  | StringifyErrorType
+  | ObserveErrorType
+  | ErrorType
+
 /**
  * Watches and returns emitted contract event logs.
  *
@@ -167,7 +174,10 @@ export function watchContractEvent<
         async () => {
           if (!initialized) {
             try {
-              filter = (await createContractEventFilter(client, {
+              filter = (await getAction(
+                client,
+                createContractEventFilter,
+              )({
                 abi,
                 address,
                 args: args as any,
@@ -182,28 +192,30 @@ export function watchContractEvent<
           try {
             let logs: Log[]
             if (filter) {
-              logs = await getFilterChanges(client, { filter })
+              logs = await getAction(client, getFilterChanges)({ filter })
             } else {
               // If the filter doesn't exist, we will fall back to use `getLogs`.
               // The fall back exists because some RPC Providers do not support filters.
 
               // Fetch the block number to use for `getLogs`.
-              const blockNumber = await getBlockNumber(client)
+              const blockNumber = await getAction(client, getBlockNumber)({})
 
               // If the block number has changed, we will need to fetch the logs.
               // If the block number doesn't exist, we are yet to reach the first poll interval,
               // so do not emit any logs.
               if (previousBlockNumber && previousBlockNumber !== blockNumber) {
-                logs = await getLogs(client, {
+                logs = await getAction(
+                  client,
+                  getContractEvents,
+                )({
+                  abi,
                   address,
-                  args: args as any,
+                  args,
+                  eventName,
                   fromBlock: previousBlockNumber + 1n,
                   toBlock: blockNumber,
-                  event: getAbiItem({
-                    abi,
-                    name: eventName,
-                  } as unknown as GetAbiItemParameters) as AbiEvent,
-                })
+                  strict,
+                } as {} as GetContractEventsParameters)
               } else {
                 logs = []
               }
@@ -228,7 +240,7 @@ export function watchContractEvent<
       )
 
       return async () => {
-        if (filter) await uninstallFilter(client, { filter })
+        if (filter) await getAction(client, uninstallFilter)({ filter })
         unwatch()
       }
     })

package/actions/public/watchEvent.ts

@@ -12,15 +12,17 @@ import type { Log } from '../../types/log.js'
 import type { LogTopic } from '../../types/misc.js'
 import type { GetPollOptions } from '../../types/transport.js'
 import type { EncodeEventTopicsParameters } from '../../utils/index.js'
-import { observe } from '../../utils/observe.js'
+import { type ObserveErrorType, observe } from '../../utils/observe.js'
 import { poll } from '../../utils/poll.js'
-import { stringify } from '../../utils/stringify.js'
+import { type StringifyErrorType, stringify } from '../../utils/stringify.js'
 
 import {
   DecodeLogDataMismatch,
   DecodeLogTopicsMismatch,
 } from '../../errors/abi.js'
 import { InvalidInputRpcError } from '../../errors/rpc.js'
+import type { ErrorType } from '../../errors/utils.js'
+import { getAction } from '../../utils/getAction.js'
 import {
   decodeEventLog,
   encodeEventTopics,
@@ -104,6 +106,11 @@ export type WatchEventParameters<
 
 export type WatchEventReturnType = () => void
 
+export type WatchEventErrorType =
+  | StringifyErrorType
+  | ObserveErrorType
+  | ErrorType
+
 /**
  * Watches and returns emitted [Event Logs](https://viem.sh/docs/glossary/terms.html#event-log).
  *
@@ -185,7 +192,10 @@ export function watchEvent<
         async () => {
           if (!initialized) {
             try {
-              filter = (await createEventFilter(client, {
+              filter = (await getAction(
+                client,
+                createEventFilter as any,
+              )({
                 address,
                 args,
                 event: event!,
@@ -204,19 +214,22 @@ export function watchEvent<
           try {
             let logs: Log[]
             if (filter) {
-              logs = await getFilterChanges(client, { filter })
+              logs = await getAction(client, getFilterChanges)({ filter })
             } else {
               // If the filter doesn't exist, we will fall back to use `getLogs`.
               // The fall back exists because some RPC Providers do not support filters.
 
               // Fetch the block number to use for `getLogs`.
-              const blockNumber = await getBlockNumber(client)
+              const blockNumber = await getAction(client, getBlockNumber)({})
 
               // If the block number has changed, we will need to fetch the logs.
               // If the block number doesn't exist, we are yet to reach the first poll interval,
               // so do not emit any logs.
               if (previousBlockNumber && previousBlockNumber !== blockNumber) {
-                logs = await getLogs(client, {
+                logs = await getAction(
+                  client,
+                  getLogs,
+                )({
                   address,
                   args,
                   event: event!,
@@ -248,7 +261,7 @@ export function watchEvent<
       )
 
       return async () => {
-        if (filter) await uninstallFilter(client, { filter })
+        if (filter) await getAction(client, uninstallFilter)({ filter })
         unwatch()
       }
     })

package/actions/public/watchPendingTransactions.ts

@@ -1,12 +1,14 @@
 import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
+import type { ErrorType } from '../../errors/utils.js'
 import type { Chain } from '../../types/chain.js'
 import type { Filter } from '../../types/filter.js'
 import type { Hash } from '../../types/misc.js'
 import type { GetPollOptions } from '../../types/transport.js'
-import { observe } from '../../utils/observe.js'
+import { getAction } from '../../utils/getAction.js'
+import { type ObserveErrorType, observe } from '../../utils/observe.js'
 import { poll } from '../../utils/poll.js'
-import { stringify } from '../../utils/stringify.js'
+import { type StringifyErrorType, stringify } from '../../utils/stringify.js'
 
 import { createPendingTransactionFilter } from './createPendingTransactionFilter.js'
 import { getFilterChanges } from './getFilterChanges.js'
@@ -26,6 +28,11 @@ export type WatchPendingTransactionsParameters<
 
 export type WatchPendingTransactionsReturnType = () => void
 
+export type WatchPendingTransactionsErrorType =
+  | StringifyErrorType
+  | ObserveErrorType
+  | ErrorType
+
 /**
  * Watches and returns pending transaction hashes.
  *
@@ -86,7 +93,10 @@ export function watchPendingTransactions<
           try {
             if (!filter) {
               try {
-                filter = await createPendingTransactionFilter(client)
+                filter = await getAction(
+                  client,
+                  createPendingTransactionFilter,
+                )({})
                 return
               } catch (err) {
                 unwatch()
@@ -94,7 +104,7 @@ export function watchPendingTransactions<
               }
             }
 
-            const hashes = await getFilterChanges(client, { filter })
+            const hashes = await getAction(client, getFilterChanges)({ filter })
             if (hashes.length === 0) return
             if (batch) emit.onTransactions(hashes)
             else hashes.forEach((hash) => emit.onTransactions([hash]))
@@ -109,7 +119,7 @@ export function watchPendingTransactions<
       )
 
       return async () => {
-        if (filter) await uninstallFilter(client, { filter })
+        if (filter) await getAction(client, uninstallFilter)({ filter })
         unwatch()
       }
     })

package/actions/test/dropTransaction.ts

@@ -3,15 +3,19 @@ import type {
   TestClientMode,
 } from '../../clients/createTestClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
+import type { ErrorType } from '../../errors/utils.js'
 import type { Account } from '../../types/account.js'
 import type { Chain } from '../../types/chain.js'
 import type { Hash } from '../../types/misc.js'
+import type { RequestErrorType } from '../../utils/buildRequest.js'
 
 export type DropTransactionParameters = {
   /** The hash of the transaction to drop. */
   hash: Hash
 }
 
+export type DropTransactionErrorType = RequestErrorType | ErrorType
+
 /**
  * Removes a transaction from the mempool.
  *

package/actions/test/getAutomine.ts

@@ -3,11 +3,15 @@ import type {
   TestClientMode,
 } from '../../clients/createTestClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
+import type { ErrorType } from '../../errors/utils.js'
 import type { Account } from '../../types/account.js'
 import type { Chain } from '../../types/chain.js'
+import type { RequestErrorType } from '../../utils/buildRequest.js'
 
 export type GetAutomineReturnType = boolean
 
+export type GetAutomineErrorType = RequestErrorType | ErrorType
+
 /**
  * Returns the automatic mining status of the node.
  *

package/actions/test/getTxpoolContent.ts

@@ -5,9 +5,11 @@ import type {
   TestClientMode,
 } from '../../clients/createTestClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
+import type { ErrorType } from '../../errors/utils.js'
 import type { Account } from '../../types/account.js'
 import type { Chain } from '../../types/chain.js'
 import type { RpcTransaction } from '../../types/rpc.js'
+import type { RequestErrorType } from '../../utils/buildRequest.js'
 
 export type GetTxpoolContentReturnType = {
   /** Pending transactions in the pool */
@@ -16,6 +18,8 @@ export type GetTxpoolContentReturnType = {
   queued: Record<Address, Record<string, RpcTransaction>>
 }
 
+export type GetTxpoolContentErrorType = RequestErrorType | ErrorType
+
 /**
  * Returns the details of all transactions currently pending for inclusion in the next block(s), as well as the ones that are being scheduled for future execution only.
  *

package/actions/test/getTxpoolStatus.ts

@@ -3,8 +3,10 @@ import type {
   TestClientMode,
 } from '../../clients/createTestClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
+import type { ErrorType } from '../../errors/utils.js'
 import type { Account } from '../../types/account.js'
 import type { Chain } from '../../types/chain.js'
+import type { RequestErrorType } from '../../utils/buildRequest.js'
 import { hexToNumber } from '../../utils/encoding/fromHex.js'
 
 export type GetTxpoolStatusReturnType = {
@@ -12,6 +14,8 @@ export type GetTxpoolStatusReturnType = {
   queued: number
 }
 
+export type GetTxpoolStatusErrorType = RequestErrorType | ErrorType
+
 /**
  * Returns a summary of all the transactions currently pending for inclusion in the next block(s), as well as the ones that are being scheduled for future execution only.
  *

package/actions/test/impersonateAccount.ts

@@ -5,14 +5,18 @@ import type {
   TestClientMode,
 } from '../../clients/createTestClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
+import type { ErrorType } from '../../errors/utils.js'
 import type { Account } from '../../types/account.js'
 import type { Chain } from '../../types/chain.js'
+import type { RequestErrorType } from '../../utils/buildRequest.js'
 
 export type ImpersonateAccountParameters = {
   /** The account to impersonate. */
   address: Address
 }
 
+export type ImpersonateAccountErrorType = RequestErrorType | ErrorType
+
 /**
  * Impersonate an account or contract address. This lets you send transactions from that account even if you don't have access to its private key.
  *

package/actions/test/increaseTime.ts

@@ -3,8 +3,10 @@ import type {
   TestClientMode,
 } from '../../clients/createTestClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
+import type { ErrorType } from '../../errors/utils.js'
 import type { Account } from '../../types/account.js'
 import type { Chain } from '../../types/chain.js'
+import type { RequestErrorType } from '../../utils/buildRequest.js'
 import { numberToHex } from '../../utils/encoding/toHex.js'
 
 export type IncreaseTimeParameters = {
@@ -12,6 +14,8 @@ export type IncreaseTimeParameters = {
   seconds: number
 }
 
+export type IncreaseTimeErrorType = RequestErrorType | ErrorType
+
 /**
  * Jump forward in time by the given amount of time, in seconds.
  *

package/actions/test/inspectTxpool.ts

@@ -5,14 +5,18 @@ import type {
   TestClientMode,
 } from '../../clients/createTestClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
+import type { ErrorType } from '../../errors/utils.js'
 import type { Account } from '../../types/account.js'
 import type { Chain } from '../../types/chain.js'
+import type { RequestErrorType } from '../../utils/buildRequest.js'
 
 export type InspectTxpoolReturnType = {
   pending: Record<Address, Record<string, string>>
   queued: Record<Address, Record<string, string>>
 }
 
+export type InspectTxpoolErrorType = RequestErrorType | ErrorType
+
 /**
  * Returns a summary of all the transactions currently pending for inclusion in the next block(s), as well as the ones that are being scheduled for future execution only.
  *

package/actions/test/mine.ts

@@ -3,8 +3,10 @@ import type {
   TestClientMode,
 } from '../../clients/createTestClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
+import type { ErrorType } from '../../errors/utils.js'
 import type { Account } from '../../types/account.js'
 import type { Chain } from '../../types/chain.js'
+import type { RequestErrorType } from '../../utils/buildRequest.js'
 import { numberToHex } from '../../utils/encoding/toHex.js'
 
 export type MineParameters = {
@@ -14,6 +16,8 @@ export type MineParameters = {
   interval?: number
 }
 
+export type MineErrorType = RequestErrorType | ErrorType
+
 /**
  * Mine a specified number of blocks.
  *

package/actions/test/removeBlockTimestampInterval.ts

@@ -3,8 +3,12 @@ import type {
   TestClientMode,
 } from '../../clients/createTestClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
+import type { ErrorType } from '../../errors/utils.js'
 import type { Account } from '../../types/account.js'
 import type { Chain } from '../../types/chain.js'
+import type { RequestErrorType } from '../../utils/buildRequest.js'
+
+export type RemoveBlockTimestampIntervalErrorType = RequestErrorType | ErrorType
 
 /**
  * Removes [`setBlockTimestampInterval`](https://viem.sh/docs/actions/test/setBlockTimestampInterval.html) if it exists.

package/actions/test/reset.ts

@@ -3,8 +3,10 @@ import type {
   TestClientMode,
 } from '../../clients/createTestClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
+import type { ErrorType } from '../../errors/utils.js'
 import type { Account } from '../../types/account.js'
 import type { Chain } from '../../types/chain.js'
+import type { RequestErrorType } from '../../utils/buildRequest.js'
 
 export type ResetParameters = {
   /** The block number to reset from. */
@@ -13,6 +15,8 @@ export type ResetParameters = {
   jsonRpcUrl?: string
 }
 
+export type ResetErrorType = RequestErrorType | ErrorType
+
 /**
  * Resets fork back to its original state.
  *

package/actions/test/revert.ts

@@ -3,15 +3,19 @@ import type {
   TestClientMode,
 } from '../../clients/createTestClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
+import type { ErrorType } from '../../errors/utils.js'
 import type { Account } from '../../types/account.js'
 import type { Chain } from '../../types/chain.js'
 import type { Quantity } from '../../types/rpc.js'
+import type { RequestErrorType } from '../../utils/buildRequest.js'
 
 export type RevertParameters = {
   /** The snapshot ID to revert to. */
   id: Quantity
 }
 
+export type RevertErrorType = RequestErrorType | ErrorType
+
 /**
  * Revert the state of the blockchain at the current block.
  *

package/actions/test/sendUnsignedTransaction.ts

@@ -3,10 +3,12 @@ import type {
   TestClientMode,
 } from '../../clients/createTestClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
+import type { ErrorType } from '../../errors/utils.js'
 import type { Account } from '../../types/account.js'
 import type { Chain } from '../../types/chain.js'
 import type { Hash } from '../../types/misc.js'
 import type { TransactionRequest } from '../../types/transaction.js'
+import type { RequestErrorType } from '../../utils/buildRequest.js'
 import { extract } from '../../utils/formatters/extract.js'
 import {
   type FormattedTransactionRequest,
@@ -19,6 +21,8 @@ export type SendUnsignedTransactionParameters<
 
 export type SendUnsignedTransactionReturnType = Hash
 
+export type SendUnsignedTransactionErrorType = RequestErrorType | ErrorType
+
 /**
  * Returns the details of all transactions currently pending for inclusion in the next block(s), as well as the ones that are being scheduled for future execution only.
  *
@@ -65,12 +69,12 @@ export async function sendUnsignedTransaction<
     ...rest
   } = args
 
-  const format =
-    client.chain?.formatters?.transactionRequest?.format ||
-    formatTransactionRequest
+  const chainFormat = client.chain?.formatters?.transactionRequest?.format
+  const format = chainFormat || formatTransactionRequest
+
   const request = format({
     // Pick out extra data that might exist on the chain's transaction request type.
-    ...extract(rest, { format }),
+    ...extract(rest, { format: chainFormat }),
     accessList,
     data,
     from,

package/actions/test/setAutomine.ts

@@ -3,8 +3,12 @@ import type {
   TestClientMode,
 } from '../../clients/createTestClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
+import type { ErrorType } from '../../errors/utils.js'
 import type { Account } from '../../types/account.js'
 import type { Chain } from '../../types/chain.js'
+import type { RequestErrorType } from '../../utils/buildRequest.js'
+
+export type SetAutomineErrorType = RequestErrorType | ErrorType
 
 /**
  * Enables or disables the automatic mining of new blocks with each new transaction submitted to the network.

package/actions/test/setBalance.ts

@@ -5,8 +5,10 @@ import type {
   TestClientMode,
 } from '../../clients/createTestClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
+import type { ErrorType } from '../../errors/utils.js'
 import type { Account } from '../../types/account.js'
 import type { Chain } from '../../types/chain.js'
+import type { RequestErrorType } from '../../utils/buildRequest.js'
 import { numberToHex } from '../../utils/encoding/toHex.js'
 
 export type SetBalanceParameters = {
@@ -16,6 +18,8 @@ export type SetBalanceParameters = {
   value: bigint
 }
 
+export type SetBalanceErrorType = RequestErrorType | ErrorType
+
 /**
  * Modifies the balance of an account.
  *

package/actions/test/setBlockGasLimit.ts

@@ -3,8 +3,10 @@ import type {
   TestClientMode,
 } from '../../clients/createTestClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
+import type { ErrorType } from '../../errors/utils.js'
 import type { Account } from '../../types/account.js'
 import type { Chain } from '../../types/chain.js'
+import type { RequestErrorType } from '../../utils/buildRequest.js'
 import { numberToHex } from '../../utils/encoding/toHex.js'
 
 export type SetBlockGasLimitParameters = {
@@ -12,6 +14,8 @@ export type SetBlockGasLimitParameters = {
   gasLimit: bigint
 }
 
+export type SetBlockGasLimitErrorType = RequestErrorType | ErrorType
+
 /**
  * Sets the block's gas limit.
  *

package/actions/test/setBlockTimestampInterval.ts

@@ -3,14 +3,18 @@ import type {
   TestClientMode,
 } from '../../clients/createTestClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
+import type { ErrorType } from '../../errors/utils.js'
 import type { Account } from '../../types/account.js'
 import type { Chain } from '../../types/chain.js'
+import type { RequestErrorType } from '../../utils/buildRequest.js'
 
 export type SetBlockTimestampIntervalParameters = {
   /** The interval (in seconds). */
   interval: number
 }
 
+export type SetBlockTimestampIntervalErrorType = RequestErrorType | ErrorType
+
 /**
  * Similar to [`increaseTime`](https://viem.sh/docs/actions/test/increaseTime.html), but sets a block timestamp `interval`. The timestamp of future blocks will be computed as `lastBlock_timestamp` + `interval`.
  *
@@ -38,8 +42,13 @@ export async function setBlockTimestampInterval<
   client: TestClient<TestClientMode, Transport, TChain, TAccount, false>,
   { interval }: SetBlockTimestampIntervalParameters,
 ) {
+  const interval_ = (() => {
+    if (client.mode === 'hardhat') return interval * 1000
+    return interval
+  })()
+
   await client.request({
     method: `${client.mode}_setBlockTimestampInterval`,
-    params: [interval],
+    params: [interval_],
   })
 }

package/actions/test/setCode.ts

@@ -5,9 +5,11 @@ import type {
   TestClientMode,
 } from '../../clients/createTestClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
+import type { ErrorType } from '../../errors/utils.js'
 import type { Account } from '../../types/account.js'
 import type { Chain } from '../../types/chain.js'
 import type { Hex } from '../../types/misc.js'
+import type { RequestErrorType } from '../../utils/buildRequest.js'
 
 export type SetCodeParameters = {
   /** The account address. */
@@ -16,6 +18,8 @@ export type SetCodeParameters = {
   bytecode: Hex
 }
 
+export type SetCodeErrorType = RequestErrorType | ErrorType
+
 /**
  * Modifies the bytecode stored at an account's address.
  *

package/actions/test/setCoinbase.ts

@@ -5,14 +5,18 @@ import type {
   TestClientMode,
 } from '../../clients/createTestClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
+import type { ErrorType } from '../../errors/utils.js'
 import type { Account } from '../../types/account.js'
 import type { Chain } from '../../types/chain.js'
+import type { RequestErrorType } from '../../utils/buildRequest.js'
 
 export type SetCoinbaseParameters = {
   /** The coinbase address. */
   address: Address
 }
 
+export type SetCoinbaseErrorType = RequestErrorType | ErrorType
+
 /**
  * Sets the coinbase address to be used in new blocks.
  *