viem 2.22.17 → 2.22.20

package/experimental/erc7821/actions/supportsExecutionMode.ts

@@ -5,17 +5,24 @@ import type { Transport } from '../../../clients/transports/createTransport.js'
 import type { ErrorType } from '../../../errors/utils.js'
 import type { Chain } from '../../../types/chain.js'
 import type { Hex } from '../../../types/misc.js'
+import { withCache } from '../../../utils/promise/withCache.js'
 import { abi, executionMode } from '../constants.js'
 
 export type SupportsExecutionModeParameters = {
   address: Address
-  opData?: Hex | undefined
+  mode?: 'default' | 'opData' | 'batchOfBatches' | Hex
 }
 
 export type SupportsExecutionModeReturnType = boolean
 
 export type SupportsExecutionModeErrorType = ErrorType
 
+const toSerializedMode = {
+  default: executionMode.default,
+  opData: executionMode.opData,
+  batchOfBatches: executionMode.batchOfBatches,
+} as const
+
 /**
  * Checks if the contract supports the ERC-7821 execution mode.
  *
@@ -45,15 +52,21 @@ export async function supportsExecutionMode<
   client: Client<Transport, chain>,
   parameters: SupportsExecutionModeParameters,
 ): Promise<SupportsExecutionModeReturnType> {
-  const { address, opData } = parameters
-  const mode = opData ? executionMode.opData : executionMode.default
+  const { address, mode: m = 'default' } = parameters
+  const mode = m.startsWith('0x') ? m : (toSerializedMode as any)[m]
   try {
-    return await readContract(client, {
-      abi,
-      address,
-      functionName: 'supportsExecutionMode',
-      args: [mode],
-    })
+    return await withCache(
+      () =>
+        readContract(client, {
+          abi,
+          address,
+          functionName: 'supportsExecutionMode',
+          args: [mode],
+        }),
+      {
+        cacheKey: `supportsExecutionMode.${address}.${mode}`,
+      },
+    )
   } catch {
     return false
   }

package/experimental/erc7821/constants.ts

@@ -59,4 +59,6 @@ export const abi = [
 export const executionMode = {
   default: '0x0100000000000000000000000000000000000000000000000000000000000000',
   opData: '0x0100000000007821000100000000000000000000000000000000000000000000',
+  batchOfBatches:
+    '0x0100000000007821000200000000000000000000000000000000000000000000',
 } as const

package/experimental/erc7821/decorators/erc7821.ts

@@ -7,6 +7,12 @@ import {
   type ExecuteReturnType,
   execute,
 } from '../actions/execute.js'
+import {
+  type Batch,
+  type ExecuteBatchesParameters,
+  type ExecuteBatchesReturnType,
+  executeBatches,
+} from '../actions/executeBatches.js'
 import {
   type SupportsExecutionModeParameters,
   type SupportsExecutionModeReturnType,
@@ -91,6 +97,108 @@ export type Erc7821Actions<
   >(
     parameters: ExecuteParameters<calls, chain, account, chainOverride>,
   ) => Promise<ExecuteReturnType>
+  /**
+   * Executes batches of call(s) using "batch of batches" mode on an [ERC-7821-compatible contract](https://eips.ethereum.org/EIPS/eip-7821).
+   *
+   * @example
+   * ```ts
+   * import { createClient, http, parseEther } from 'viem'
+   * import { privateKeyToAccount } from 'viem/accounts'
+   * import { mainnet } from 'viem/chains'
+   * import { erc7821Actions } from 'viem/experimental'
+   *
+   * const account = privateKeyToAccount('0x...')
+   *
+   * const client = createClient({
+   *   chain: mainnet,
+   *   transport: http(),
+   * }).extend(erc7821Actions())
+   *
+   * const hash = await client.executeBatches({
+   *   account,
+   *   batches: [
+   *     {
+   *       calls: [
+   *         {
+   *           to: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8',
+   *           value: parseEther('1'),
+   *         },
+   *       ],
+   *     },
+   *     {
+   *       calls: [
+   *         {
+   *           to: '0xcb98643b8786950F0461f3B0edf99D88F274574D',
+   *           value: parseEther('2'),
+   *         },
+   *         {
+   *           data: '0xdeadbeef',
+   *           to: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8',
+   *         },
+   *       ],
+   *     },
+   *   ],
+   *   to: account.address,
+   * })
+   * ```
+   *
+   * @example
+   * ```ts
+   * // Account Hoisting
+   * import { createClient, http, parseEther } from 'viem'
+   * import { privateKeyToAccount } from 'viem/accounts'
+   * import { mainnet } from 'viem/chains'
+   * import { erc7821Actions } from 'viem/experimental'
+   *
+   * const account = privateKeyToAccount('0x...')
+   *
+   * const client = createClient({
+   *   chain: mainnet,
+   *   transport: http(),
+   * }).extend(erc7821Actions())
+   *
+   * const hash = await client.executeBatches({
+   *   batches: [
+   *     {
+   *       calls: [
+   *         {
+   *           to: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8',
+   *           value: parseEther('1'),
+   *         },
+   *       ],
+   *     },
+   *     {
+   *       calls: [
+   *         {
+   *           to: '0xcb98643b8786950F0461f3B0edf99D88F274574D',
+   *           value: parseEther('2'),
+   *         },
+   *         {
+   *           data: '0xdeadbeef',
+   *           to: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8',
+   *         },
+   *       ],
+   *     },
+   *   ],
+   *   to: account.address,
+   * })
+   * ```
+   *
+   * @param client - Client to use.
+   * @param parameters - {@link ExecuteBatchesParameters}
+   * @returns Transaction hash. {@link ExecuteBatchesReturnType}
+   */
+  executeBatches: <
+    const batches extends readonly Batch[],
+    chainOverride extends Chain | undefined = undefined,
+  >(
+    parameters: ExecuteBatchesParameters<
+      batches,
+      chain,
+      account,
+      chainOverride
+    >,
+  ) => Promise<ExecuteBatchesReturnType>
   /**
    * Checks if the contract supports the ERC-7821 execution mode.
    *
@@ -142,6 +250,7 @@ export function erc7821Actions() {
   ): Erc7821Actions<chain, account> => {
     return {
       execute: (parameters) => execute(client, parameters),
+      executeBatches: (parameters) => executeBatches(client, parameters),
       supportsExecutionMode: (parameters) =>
         supportsExecutionMode(client, parameters),
     }

package/experimental/erc7821/index.ts

@@ -1,4 +1,3 @@
-/**  */
 // biome-ignore lint/performance/noBarrelFile: entrypoint
 export {
   type ExecuteErrorType,
@@ -6,6 +5,12 @@ export {
   type ExecuteReturnType,
   execute,
 } from './actions/execute.js'
+export {
+  type ExecuteBatchesErrorType,
+  type ExecuteBatchesParameters,
+  type ExecuteBatchesReturnType,
+  executeBatches,
+} from './actions/executeBatches.js'
 export {
   type SupportsExecutionModeErrorType,
   type SupportsExecutionModeParameters,
@@ -21,3 +26,25 @@ export {
 } from './errors.js'
 
 export { type Erc7821Actions, erc7821Actions } from './decorators/erc7821.js'
+
+export {
+  type EncodeCallsErrorType,
+  encodeCalls,
+} from './utils/encodeCalls.js'
+export {
+  type EncodeExecuteBatchesDataErrorType,
+  type EncodeExecuteBatchesDataParameters,
+  type EncodeExecuteBatchesDataReturnType,
+  encodeExecuteBatchesData,
+} from './utils/encodeExecuteBatchesData.js'
+export {
+  type EncodeExecuteDataErrorType,
+  type EncodeExecuteDataParameters,
+  type EncodeExecuteDataReturnType,
+  encodeExecuteData,
+} from './utils/encodeExecuteData.js'
+export {
+  type GetExecuteErrorParameters,
+  type GetExecuteErrorReturnType,
+  getExecuteError,
+} from './utils/getExecuteError.js'

package/experimental/erc7821/utils/encodeCalls.ts

@@ -0,0 +1,38 @@
+import * as AbiParameters from 'ox/AbiParameters'
+
+import type { ErrorType } from '../../../errors/utils.js'
+import type { Call, Calls } from '../../../types/calls.js'
+import type { Hex } from '../../../types/misc.js'
+import {
+  type EncodeFunctionDataErrorType,
+  encodeFunctionData,
+} from '../../../utils/abi/encodeFunctionData.js'
+
+export type EncodeCallsErrorType =
+  | AbiParameters.encode.ErrorType
+  | AbiParameters.from.ErrorType
+  | EncodeFunctionDataErrorType
+  | ErrorType
+
+export function encodeCalls(
+  calls_: Calls<readonly unknown[]>,
+  opData?: Hex | undefined,
+) {
+  const calls = calls_.map((call_) => {
+    const call = call_ as Call
+    return {
+      data: call.abi ? encodeFunctionData(call) : (call.data ?? '0x'),
+      value: call.value ?? 0n,
+      target: call.to,
+    }
+  })
+
+  return AbiParameters.encode(
+    AbiParameters.from([
+      'struct Call { address target; uint256 value; bytes data; }',
+      'Call[] calls',
+      ...(opData ? ['bytes opData'] : []),
+    ]),
+    [calls, ...(opData ? [opData] : [])] as any,
+  )
+}

package/experimental/erc7821/utils/encodeExecuteBatchesData.ts

@@ -0,0 +1,48 @@
+import type { Narrow } from 'abitype'
+import * as AbiParameters from 'ox/AbiParameters'
+import type { ErrorType } from '../../../errors/utils.js'
+
+import type { Batches } from '../../../types/calls.js'
+import type { Hex } from '../../../types/misc.js'
+import {
+  type EncodeFunctionDataErrorType,
+  encodeFunctionData,
+} from '../../../utils/abi/encodeFunctionData.js'
+import { abi, executionMode } from '../constants.js'
+import { type EncodeCallsErrorType, encodeCalls } from './encodeCalls.js'
+
+/** @internal */
+export type Batch = { calls: readonly unknown[]; opData?: Hex | undefined }
+
+export type EncodeExecuteBatchesDataParameters<
+  batches extends readonly Batch[] = readonly Batch[],
+> = {
+  /** Batches to execute. */
+  batches: Batches<Narrow<batches>, { opData?: Hex | undefined }>
+}
+
+export type EncodeExecuteBatchesDataReturnType = Hex
+
+export type EncodeExecuteBatchesDataErrorType =
+  | EncodeCallsErrorType
+  | EncodeFunctionDataErrorType
+  | ErrorType
+
+export function encodeExecuteBatchesData<batches extends readonly Batch[]>(
+  parameters: EncodeExecuteBatchesDataParameters<batches>,
+): EncodeExecuteBatchesDataReturnType {
+  const { batches } = parameters
+
+  const encodedBatches = AbiParameters.encode(AbiParameters.from('bytes[]'), [
+    batches.map((b) => {
+      const batch = b as Batch
+      return encodeCalls(batch.calls, batch.opData)
+    }),
+  ])
+
+  return encodeFunctionData({
+    abi,
+    functionName: 'execute',
+    args: [executionMode.batchOfBatches, encodedBatches],
+  })
+}

package/experimental/erc7821/utils/encodeExecuteData.ts

@@ -0,0 +1,42 @@
+import type { Narrow } from 'abitype'
+
+import type { ErrorType } from '../../../errors/utils.js'
+import type { Calls } from '../../../types/calls.js'
+import type { Hex } from '../../../types/misc.js'
+import {
+  type EncodeFunctionDataErrorType,
+  encodeFunctionData,
+} from '../../../utils/abi/encodeFunctionData.js'
+import { abi, executionMode } from '../constants.js'
+import { type EncodeCallsErrorType, encodeCalls } from './encodeCalls.js'
+
+export type EncodeExecuteDataParameters<
+  calls extends readonly unknown[] = readonly unknown[],
+> = {
+  /** Calls to execute. */
+  calls: Calls<Narrow<calls>>
+  /** Additional data to include for execution. */
+  opData?: Hex | undefined
+}
+
+export type EncodeExecuteDataReturnType = Hex
+
+export type EncodeExecuteDataErrorType =
+  | EncodeCallsErrorType
+  | EncodeFunctionDataErrorType
+  | ErrorType
+
+export function encodeExecuteData<const calls extends readonly unknown[]>(
+  parameters: EncodeExecuteDataParameters<calls>,
+): EncodeExecuteDataReturnType {
+  const { calls, opData } = parameters
+
+  const encodedCalls = encodeCalls(calls, opData)
+  const mode = opData ? executionMode.opData : executionMode.default
+
+  return encodeFunctionData({
+    abi,
+    functionName: 'execute',
+    args: [mode, encodedCalls],
+  })
+}

package/experimental/erc7821/utils/getExecuteError.ts

@@ -0,0 +1,66 @@
+import type { Abi, Narrow } from 'abitype'
+import * as AbiError from 'ox/AbiError'
+
+import type { BaseError } from '../../../errors/base.js'
+import type { Call, Calls } from '../../../types/calls.js'
+import type { Hex } from '../../../types/misc.js'
+import { decodeErrorResult } from '../../../utils/abi/decodeErrorResult.js'
+import {
+  type GetContractErrorReturnType,
+  getContractError,
+} from '../../../utils/errors/getContractError.js'
+import {
+  FunctionSelectorNotRecognizedError,
+  type FunctionSelectorNotRecognizedErrorType,
+} from '../errors.js'
+
+export type GetExecuteErrorParameters<
+  calls extends readonly unknown[] = readonly unknown[],
+> = {
+  /** Calls to execute. */
+  calls: Calls<Narrow<calls>>
+}
+
+export type GetExecuteErrorReturnType =
+  | FunctionSelectorNotRecognizedErrorType
+  | GetContractErrorReturnType
+
+export function getExecuteError<const calls extends readonly unknown[]>(
+  e: BaseError,
+  parameters: GetExecuteErrorParameters<calls>,
+): GetExecuteErrorReturnType {
+  const error = e.walk((e) => 'data' in (e as Error)) as
+    | (BaseError & { data?: Hex | undefined })
+    | undefined
+
+  if (!error?.data) throw e
+  if (
+    error.data ===
+    AbiError.getSelector(AbiError.from('error FnSelectorNotRecognized()'))
+  )
+    return new FunctionSelectorNotRecognizedError() as never
+
+  let matched: Call | null = null
+  for (const c of parameters.calls) {
+    const call = c as Call
+    if (!call.abi) continue
+    try {
+      const matches = Boolean(
+        decodeErrorResult({
+          abi: call.abi,
+          data: error.data!,
+        }),
+      )
+      if (!matches) continue
+      matched = call
+    } catch {}
+  }
+  if (!matched) throw e
+
+  return getContractError(error as BaseError, {
+    abi: matched.abi as Abi,
+    address: matched.to,
+    args: matched.args,
+    functionName: matched.functionName,
+  })
+}

package/package.json

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

package/types/calls.ts

@@ -45,3 +45,21 @@ export type Calls<
           ? readonly Prettify<call>[]
           : // Fallback
             readonly OneOf<Call>[]
+
+export type Batches<
+  batches extends readonly { calls: readonly unknown[] }[],
+  properties extends Record<string, any> = {},
+  ///
+  result extends readonly any[] = [],
+> = batches extends readonly [infer batch extends { calls: readonly unknown[] }]
+  ? [...result, { calls: Calls<batch['calls']> } & properties]
+  : batches extends readonly [
+        infer batch extends { calls: readonly unknown[] },
+        ...infer rest extends readonly { calls: readonly unknown[] }[],
+      ]
+    ? Batches<
+        [...rest],
+        properties,
+        [...result, { calls: Calls<batch['calls']> } & properties]
+      >
+    : batches