viem 2.25.0 → 2.26.0-canary-20250406061806

package/experimental/eip5792/actions/sendCalls.ts

@@ -27,13 +27,16 @@ export type SendCallsParameters<
 > = {
   chain?: chainOverride | Chain | undefined
   calls: Calls<Narrow<calls>>
-  capabilities?:
-    | WalletSendCallsParameters<WalletCapabilities>[number]['capabilities']
-    | undefined
+  capabilities?: WalletCapabilities | undefined
+  forceAtomic?: boolean | undefined
+  id?: string | undefined
   version?: WalletSendCallsParameters[number]['version'] | undefined
 } & GetAccountParameter<account, Account | Address, true, true>
 
-export type SendCallsReturnType = string
+export type SendCallsReturnType = {
+  capabilities?: WalletCapabilities | undefined
+  id: string
+}
 
 export type SendCallsErrorType = RequestErrorType | ErrorType
 
@@ -82,6 +85,8 @@ export async function sendCalls<
     account: account_ = client.account,
     capabilities,
     chain = client.chain,
+    forceAtomic = false,
+    id,
     version = '1.0',
   } = parameters
 
@@ -110,21 +115,25 @@ export async function sendCalls<
   })
 
   try {
-    return await client.request(
+    const response = await client.request(
       {
         method: 'wallet_sendCalls',
         params: [
           {
+            atomicRequired: forceAtomic,
             calls,
             capabilities,
             chainId: numberToHex(chain!.id),
             from: account?.address,
+            id,
             version,
           },
         ],
       },
       { retryCount: 0 },
     )
+    if (typeof response === 'string') return { id: response }
+    return response
   } catch (err) {
     throw getTransactionError(err as BaseError, {
       ...parameters,

package/experimental/eip5792/actions/waitForCallsStatus.ts

@@ -3,14 +3,13 @@ import type { Transport } from '../../../clients/transports/createTransport.js'
 import { BaseError } from '../../../errors/base.js'
 import type { ErrorType } from '../../../errors/utils.js'
 import type { Chain } from '../../../types/chain.js'
-import type { WalletGetCallsStatusReturnType } from '../../../types/eip1193.js'
-import type { Prettify } from '../../../types/utils.js'
 import { type ObserveErrorType, observe } from '../../../utils/observe.js'
 import { type PollErrorType, poll } from '../../../utils/poll.js'
 import { withResolvers } from '../../../utils/promise/withResolvers.js'
 import { stringify } from '../../../utils/stringify.js'
 import {
   type GetCallsStatusErrorType,
+  type GetCallsStatusReturnType,
   getCallsStatus,
 } from './getCallsStatus.js'
 
@@ -26,11 +25,11 @@ export type WaitForCallsStatusParameters = {
    */
   pollingInterval?: number | undefined
   /**
-   * The status to wait for.
+   * The status range to wait for.
    *
-   * @default 'CONFIRMED'
+   * @default (status) => status >= 200
    */
-  status?: 'CONFIRMED' | undefined
+  status?: ((parameters: GetCallsStatusReturnType) => boolean) | undefined
   /**
    * Optional timeout (in milliseconds) to wait before stopping polling.
    *
@@ -39,9 +38,7 @@ export type WaitForCallsStatusParameters = {
   timeout?: number | undefined
 }
 
-export type WaitForCallsStatusReturnType = Prettify<
-  WalletGetCallsStatusReturnType<bigint, 'success' | 'reverted'>
->
+export type WaitForCallsStatusReturnType = GetCallsStatusReturnType
 
 export type WaitForCallsStatusErrorType =
   | ObserveErrorType
@@ -79,7 +76,7 @@ export async function waitForCallsStatus<chain extends Chain | undefined>(
   const {
     id,
     pollingInterval = client.pollingInterval,
-    status = 'CONFIRMED',
+    status = ({ statusCode }) => statusCode >= 200,
     timeout = 60_000,
   } = parameters
   const observerId = stringify(['waitForCallsStatus', client.uid, id])
@@ -92,15 +89,19 @@ export async function waitForCallsStatus<chain extends Chain | undefined>(
   const unobserve = observe(observerId, { resolve, reject }, (emit) => {
     const unpoll = poll(
       async () => {
+        const done = (fn: () => void) => {
+          clearTimeout(timer)
+          unpoll()
+          fn()
+          unobserve()
+        }
+
         try {
           const result = await getCallsStatus(client, { id })
-          if (result.status !== status) return
-          emit.resolve(result)
+          if (!status(result)) return
+          done(() => emit.resolve(result))
         } catch (error) {
-          if (timer) clearTimeout(timer)
-          unpoll()
-          emit.reject(error)
-          unobserve()
+          done(() => emit.reject(error))
         }
       },
       {

package/index.ts

@@ -1098,6 +1098,7 @@ export type {
   WalletGrantPermissionsParameters,
   WalletGrantPermissionsReturnType,
   WalletSendCallsParameters,
+  WalletSendCallsReturnType,
   WalletPermissionCaveat,
   WalletPermission,
   WalletRpcSchema,

package/package.json

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

package/types/eip1193.ts

@@ -186,9 +186,19 @@ export type WalletGrantPermissionsReturnType = {
     | undefined
 }
 
-export type WalletGetCallsStatusReturnType<quantity = Hex, status = Hex> = {
-  status: 'PENDING' | 'CONFIRMED'
-  receipts?: WalletCallReceipt<quantity, status>[] | undefined
+export type WalletGetCallsStatusReturnType<
+  capabilities extends WalletCapabilities = WalletCapabilities,
+  numberType = Hex,
+  bigintType = Hex,
+  receiptStatus = Hex,
+> = {
+  atomic: boolean
+  capabilities?: capabilities | WalletCapabilities | undefined
+  chainId: numberType
+  id: string
+  receipts?: WalletCallReceipt<bigintType, receiptStatus>[] | undefined
+  status: number
+  version: string
 }
 
 export type WalletPermissionCaveat = {
@@ -210,18 +220,28 @@ export type WalletSendCallsParameters<
   quantity extends Quantity | bigint = Quantity,
 > = [
   {
+    atomicRequired: boolean
     calls: readonly {
+      capabilities?: capabilities | WalletCapabilities | undefined
       to?: Address | undefined
       data?: Hex | undefined
       value?: quantity | undefined
     }[]
-    capabilities?: capabilities | undefined
+    capabilities?: capabilities | WalletCapabilities | undefined
     chainId?: chainId | undefined
+    id?: string | undefined
     from?: Address | undefined
     version: string
   },
 ]
 
+export type WalletSendCallsReturnType<
+  capabilities extends WalletCapabilities = WalletCapabilities,
+> = {
+  capabilities?: capabilities | undefined
+  id: string
+}
+
 export type WatchAssetParams = {
   /** Token type. */
   type: 'ERC20'
@@ -1775,7 +1795,7 @@ export type WalletRpcSchema = [
    */
   {
     Method: 'wallet_getCapabilities'
-    Parameters?: [Address]
+    Parameters?: [Address | undefined] | undefined
     ReturnType: Prettify<WalletCapabilitiesRecord>
   },
   /**
@@ -1836,7 +1856,7 @@ export type WalletRpcSchema = [
   {
     Method: 'wallet_sendCalls'
     Parameters?: WalletSendCallsParameters
-    ReturnType: string
+    ReturnType: WalletSendCallsReturnType
   },
   /**
    * @description Creates, signs, and sends a new transaction to the network