viem 2.27.3 → 2.28.0-canary-20250422025603

package/account-abstraction/index.ts

@@ -17,6 +17,12 @@ export {
   type ToSoladySmartAccountReturnType,
   toSoladySmartAccount,
 } from './accounts/implementations/toSoladySmartAccount.js'
+export {
+  type Simple7702SmartAccountImplementation,
+  type ToSimple7702SmartAccountParameters,
+  type ToSimple7702SmartAccountReturnType,
+  toSimple7702SmartAccount,
+} from './accounts/implementations/toSimple7702SmartAccount.js'
 export {
   type ToSmartAccountParameters,
   type ToSmartAccountReturnType,
@@ -112,10 +118,15 @@ export {
   createPaymasterClient,
 } from './clients/createPaymasterClient.js'
 
-export { entryPoint06Abi, entryPoint07Abi } from './constants/abis.js'
+export {
+  entryPoint06Abi,
+  entryPoint07Abi,
+  entryPoint08Abi,
+} from './constants/abis.js'
 export {
   entryPoint06Address,
   entryPoint07Address,
+  entryPoint08Address,
 } from './constants/address.js'
 
 export {

package/account-abstraction/types/entryPointVersion.ts

@@ -1,7 +1,7 @@
 import type { SmartAccount } from '../accounts/types.js'
 
 /** @link https://github.com/eth-infinitism/account-abstraction/releases */
-export type EntryPointVersion = '0.6' | '0.7'
+export type EntryPointVersion = '0.6' | '0.7' | '0.8'
 
 export type DeriveEntryPointVersion<account extends SmartAccount | undefined> =
   account extends SmartAccount

package/account-abstraction/types/rpc.ts

@@ -1,4 +1,5 @@
 import type { Hex } from '../../types/misc.js'
+import type { RpcAuthorization } from '../../types/rpc.js'
 import type { EntryPointVersion } from './entryPointVersion.js'
 import type {
   EstimateUserOperationGasReturnType,
@@ -14,11 +15,13 @@ export type RpcEstimateUserOperationGasReturnType<
 
 export type RpcGetUserOperationByHashReturnType<
   entryPointVersion extends EntryPointVersion = EntryPointVersion,
-> = GetUserOperationByHashReturnType<entryPointVersion, Hex>
+> = GetUserOperationByHashReturnType<entryPointVersion, Hex, Hex>
 
 export type RpcUserOperation<
   entryPointVersion extends EntryPointVersion = EntryPointVersion,
-> = UserOperation<entryPointVersion, Hex>
+> = UserOperation<entryPointVersion, Hex, Hex> & {
+  eip7702Auth?: RpcAuthorization
+}
 
 export type RpcUserOperationReceipt<
   entryPointVersion extends EntryPointVersion = EntryPointVersion,
@@ -26,4 +29,4 @@ export type RpcUserOperationReceipt<
 
 export type RpcUserOperationRequest<
   entryPointVersion extends EntryPointVersion = EntryPointVersion,
-> = UserOperationRequest<entryPointVersion, Hex>
+> = UserOperationRequest<entryPointVersion, Hex, Hex>

package/account-abstraction/types/userOperation.ts

@@ -1,4 +1,5 @@
 import type { Address } from 'abitype'
+import type { SignedAuthorization } from '../../types/authorization.js'
 import type { Log } from '../../types/log.js'
 import type { Hash, Hex } from '../../types/misc.js'
 import type { TransactionReceipt } from '../../types/transaction.js'
@@ -10,6 +11,15 @@ export type EstimateUserOperationGasReturnType<
   entryPointVersion extends EntryPointVersion = EntryPointVersion,
   uint256 = bigint,
 > = OneOf<
+  | (entryPointVersion extends '0.8'
+      ? {
+          preVerificationGas: uint256
+          verificationGasLimit: uint256
+          callGasLimit: uint256
+          paymasterVerificationGasLimit?: uint256 | undefined
+          paymasterPostOpGasLimit?: uint256 | undefined
+        }
+      : never)
   | (entryPointVersion extends '0.7'
       ? {
           preVerificationGas: uint256
@@ -32,12 +42,13 @@ export type EstimateUserOperationGasReturnType<
 export type GetUserOperationByHashReturnType<
   entryPointVersion extends EntryPointVersion = EntryPointVersion,
   uint256 = bigint,
+  uint32 = number,
 > = {
   blockHash: Hash
   blockNumber: uint256
   entryPoint: Address
   transactionHash: Hash
-  userOperation: UserOperation<entryPointVersion, uint256>
+  userOperation: UserOperation<entryPointVersion, uint256, uint32>
 }
 
 /** @link https://eips.ethereum.org/EIPS/eip-4337#entrypoint-definition */
@@ -66,9 +77,48 @@ export type PackedUserOperation = {
 export type UserOperation<
   entryPointVersion extends EntryPointVersion = EntryPointVersion,
   uint256 = bigint,
+  uint32 = number,
 > = OneOf<
+  | (entryPointVersion extends '0.8'
+      ? {
+          /** Authorization data. */
+          authorization?: SignedAuthorization<uint32> | undefined
+          /** The data to pass to the `sender` during the main execution call. */
+          callData: Hex
+          /** The amount of gas to allocate the main execution call */
+          callGasLimit: uint256
+          /** Account factory. Only for new accounts. */
+          factory?: Address | undefined
+          /** Data for account factory. */
+          factoryData?: Hex | undefined
+          /** Maximum fee per gas. */
+          maxFeePerGas: uint256
+          /** Maximum priority fee per gas. */
+          maxPriorityFeePerGas: uint256
+          /** Anti-replay parameter. */
+          nonce: uint256
+          /** Address of paymaster contract. */
+          paymaster?: Address | undefined
+          /** Data for paymaster. */
+          paymasterData?: Hex | undefined
+          /** The amount of gas to allocate for the paymaster post-operation code. */
+          paymasterPostOpGasLimit?: uint256 | undefined
+          /** The amount of gas to allocate for the paymaster validation code. */
+          paymasterVerificationGasLimit?: uint256 | undefined
+          /** Extra gas to pay the Bundler. */
+          preVerificationGas: uint256
+          /** The account making the operation. */
+          sender: Address
+          /** Data passed into the account to verify authorization. */
+          signature: Hex
+          /** The amount of gas to allocate for the verification step. */
+          verificationGasLimit: uint256
+        }
+      : never)
   | (entryPointVersion extends '0.7'
       ? {
+          /** Authorization data. */
+          authorization?: SignedAuthorization<uint32> | undefined
           /** The data to pass to the `sender` during the main execution call. */
           callData: Hex
           /** The amount of gas to allocate the main execution call */
@@ -103,6 +153,8 @@ export type UserOperation<
       : never)
   | (entryPointVersion extends '0.6'
       ? {
+          /** Authorization data. */
+          authorization?: SignedAuthorization<uint32> | undefined
           /** The data to pass to the `sender` during the main execution call. */
           callData: Hex
           /** The amount of gas to allocate the main execution call */
@@ -132,10 +184,24 @@ export type UserOperation<
 export type UserOperationRequest<
   entryPointVersion extends EntryPointVersion = EntryPointVersion,
   uint256 = bigint,
+  uint32 = number,
 > = OneOf<
+  | (entryPointVersion extends '0.8'
+      ? UnionPartialBy<
+          UserOperation<'0.8', uint256, uint32>,
+          // We are able to calculate these via `prepareUserOperation`.
+          | keyof EstimateUserOperationGasReturnType<'0.8'>
+          | 'callData'
+          | 'maxFeePerGas'
+          | 'maxPriorityFeePerGas'
+          | 'nonce'
+          | 'sender'
+          | 'signature'
+        >
+      : never)
   | (entryPointVersion extends '0.7'
       ? UnionPartialBy<
-          UserOperation<'0.7', uint256>,
+          UserOperation<'0.7', uint256, uint32>,
           // We are able to calculate these via `prepareUserOperation`.
           | keyof EstimateUserOperationGasReturnType<'0.7'>
           | 'callData'
@@ -148,7 +214,7 @@ export type UserOperationRequest<
       : never)
   | (entryPointVersion extends '0.6'
       ? UnionPartialBy<
-          UserOperation<'0.6', uint256>,
+          UserOperation<'0.6', uint256, uint32>,
           // We are able to calculate these via `prepareUserOperation`.
           | keyof EstimateUserOperationGasReturnType<'0.6'>
           | 'callData'

package/account-abstraction/utils/formatters/userOperationRequest.ts

@@ -1,6 +1,8 @@
 import type { ErrorType } from '../../../errors/utils.js'
+import type { SignedAuthorization } from '../../../types/authorization.js'
 import type { ExactPartial } from '../../../types/utils.js'
 import { numberToHex } from '../../../utils/encoding/toHex.js'
+import { pad } from '../../../utils/index.js'
 import type { RpcUserOperation } from '../../types/rpc.js'
 import type { UserOperation } from '../../types/userOperation.js'
 
@@ -48,6 +50,25 @@ export function formatUserOperationRequest(
     rpcRequest.signature = request.signature
   if (typeof request.verificationGasLimit !== 'undefined')
     rpcRequest.verificationGasLimit = numberToHex(request.verificationGasLimit)
+  if (typeof request.authorization !== 'undefined')
+    rpcRequest.eip7702Auth = formatAuthorization(request.authorization)
 
   return rpcRequest
 }
+
+function formatAuthorization(authorization: SignedAuthorization) {
+  return {
+    address: authorization.address,
+    chainId: numberToHex(authorization.chainId),
+    nonce: numberToHex(authorization.nonce),
+    r: authorization.r
+      ? numberToHex(BigInt(authorization.r), { size: 32 })
+      : pad('0x', { size: 32 }),
+    s: authorization.s
+      ? numberToHex(BigInt(authorization.s), { size: 32 })
+      : pad('0x', { size: 32 }),
+    yParity: authorization.yParity
+      ? numberToHex(authorization.yParity, { size: 1 })
+      : pad('0x', { size: 32 }),
+  }
+}

package/account-abstraction/utils/userOperation/getInitCode.ts

@@ -0,0 +1,21 @@
+import { concat } from '../../../utils/data/concat.js'
+import type { UserOperation } from '../../types/userOperation.js'
+
+export function getInitCode(
+  userOperation: Pick<
+    UserOperation,
+    'authorization' | 'factory' | 'factoryData'
+  >,
+) {
+  const { authorization, factory, factoryData } = userOperation
+  if (
+    factory === '0x7702' ||
+    factory === '0x7702000000000000000000000000000000000000'
+  ) {
+    if (!authorization) return '0x7702000000000000000000000000000000000000'
+    const delegation = authorization.address
+    return concat([delegation, factoryData ?? '0x'])
+  }
+  if (!factory) return '0x'
+  return concat([factory, factoryData ?? '0x'])
+}

package/account-abstraction/utils/userOperation/getUserOperationHash.ts

@@ -1,12 +1,14 @@
 import type { Address } from 'abitype'
-import type { Hash } from '../../../types/misc.js'
+
+import type { Hash, Hex } from '../../../types/misc.js'
 import { encodeAbiParameters } from '../../../utils/abi/encodeAbiParameters.js'
-import { concat } from '../../../utils/data/concat.js'
-import { pad } from '../../../utils/data/pad.js'
-import { numberToHex } from '../../../utils/encoding/toHex.js'
 import { keccak256 } from '../../../utils/hash/keccak256.js'
+import { hashTypedData } from '../../../utils/signature/hashTypedData.js'
 import type { EntryPointVersion } from '../../types/entryPointVersion.js'
 import type { UserOperation } from '../../types/userOperation.js'
+import { getInitCode } from './getInitCode.js'
+import { getUserOperationTypedData } from './getUserOperationTypedData.js'
+import { toPackedUserOperation } from './toPackedUserOperation.js'
 
 export type GetUserOperationHashParameters<
   entryPointVersion extends EntryPointVersion = EntryPointVersion,
@@ -27,20 +29,36 @@ export function getUserOperationHash<
   const { chainId, entryPointAddress, entryPointVersion } = parameters
   const userOperation = parameters.userOperation as UserOperation
   const {
-    callData,
+    authorization,
+    callData = '0x',
     callGasLimit,
-    initCode,
     maxFeePerGas,
     maxPriorityFeePerGas,
     nonce,
-    paymasterAndData,
+    paymasterAndData = '0x',
     preVerificationGas,
     sender,
     verificationGasLimit,
   } = userOperation
 
+  if (entryPointVersion === '0.8')
+    return hashTypedData(
+      getUserOperationTypedData({
+        chainId,
+        entryPointAddress,
+        userOperation,
+      }),
+    )
+
   const packedUserOp = (() => {
     if (entryPointVersion === '0.6') {
+      const factory = userOperation.initCode?.slice(0, 42) as Hex
+      const factoryData = userOperation.initCode?.slice(42) as Hex | undefined
+      const initCode = getInitCode({
+        authorization,
+        factory,
+        factoryData,
+      })
       return encodeAbiParameters(
         [
           { type: 'address' },
@@ -57,51 +75,20 @@ export function getUserOperationHash<
         [
           sender,
           nonce,
-          keccak256(initCode ?? '0x'),
-          keccak256(callData ?? '0x'),
+          keccak256(initCode),
+          keccak256(callData),
           callGasLimit,
           verificationGasLimit,
           preVerificationGas,
           maxFeePerGas,
           maxPriorityFeePerGas,
-          keccak256(paymasterAndData ?? '0x'),
+          keccak256(paymasterAndData),
         ],
       )
     }
 
     if (entryPointVersion === '0.7') {
-      const accountGasLimits = concat([
-        pad(numberToHex(userOperation.verificationGasLimit), { size: 16 }),
-        pad(numberToHex(userOperation.callGasLimit), { size: 16 }),
-      ])
-      const callData_hashed = keccak256(callData)
-      const gasFees = concat([
-        pad(numberToHex(userOperation.maxPriorityFeePerGas), { size: 16 }),
-        pad(numberToHex(userOperation.maxFeePerGas), { size: 16 }),
-      ])
-      const initCode_hashed = keccak256(
-        userOperation.factory && userOperation.factoryData
-          ? concat([userOperation.factory, userOperation.factoryData])
-          : '0x',
-      )
-      const paymasterAndData_hashed = keccak256(
-        userOperation.paymaster
-          ? concat([
-              userOperation.paymaster,
-              pad(
-                numberToHex(userOperation.paymasterVerificationGasLimit || 0),
-                {
-                  size: 16,
-                },
-              ),
-              pad(numberToHex(userOperation.paymasterPostOpGasLimit || 0), {
-                size: 16,
-              }),
-              userOperation.paymasterData || '0x',
-            ])
-          : '0x',
-      )
-
+      const packedUserOp = toPackedUserOperation(userOperation)
       return encodeAbiParameters(
         [
           { type: 'address' },
@@ -114,14 +101,14 @@ export function getUserOperationHash<
           { type: 'bytes32' },
         ],
         [
-          sender,
-          nonce,
-          initCode_hashed,
-          callData_hashed,
-          accountGasLimits,
-          preVerificationGas,
-          gasFees,
-          paymasterAndData_hashed,
+          packedUserOp.sender,
+          packedUserOp.nonce,
+          keccak256(packedUserOp.initCode),
+          keccak256(packedUserOp.callData),
+          packedUserOp.accountGasLimits,
+          packedUserOp.preVerificationGas,
+          packedUserOp.gasFees,
+          keccak256(packedUserOp.paymasterAndData),
         ],
       )
     }

package/account-abstraction/utils/userOperation/getUserOperationTypedData.ts

@@ -0,0 +1,42 @@
+import type { Address } from 'abitype'
+
+import type { TypedDataDefinition } from '../../../types/typedData.js'
+import type { UserOperation } from '../../types/userOperation.js'
+import { toPackedUserOperation } from './toPackedUserOperation.js'
+
+export type GetUserOperationTypedDataParameters = {
+  chainId: number
+  entryPointAddress: Address
+  userOperation: UserOperation<'0.8'>
+}
+
+export function getUserOperationTypedData(
+  parameters: GetUserOperationTypedDataParameters,
+) {
+  const { chainId, entryPointAddress, userOperation } = parameters
+
+  const packedUserOp = toPackedUserOperation(userOperation)
+
+  return {
+    types: {
+      PackedUserOperation: [
+        { type: 'address', name: 'sender' },
+        { type: 'uint256', name: 'nonce' },
+        { type: 'bytes', name: 'initCode' },
+        { type: 'bytes', name: 'callData' },
+        { type: 'bytes32', name: 'accountGasLimits' },
+        { type: 'uint256', name: 'preVerificationGas' },
+        { type: 'bytes32', name: 'gasFees' },
+        { type: 'bytes', name: 'paymasterAndData' },
+      ],
+    },
+    primaryType: 'PackedUserOperation',
+    domain: {
+      name: 'ERC4337',
+      version: '1',
+      chainId,
+      verifyingContract: entryPointAddress,
+    },
+    message: packedUserOp,
+  } as const satisfies TypedDataDefinition
+}

package/account-abstraction/utils/userOperation/toPackedUserOperation.ts

@@ -5,6 +5,7 @@ import type {
   PackedUserOperation,
   UserOperation,
 } from '../../types/userOperation.js'
+import { getInitCode } from './getInitCode.js'
 
 export function toPackedUserOperation(
   userOperation: UserOperation,
@@ -12,8 +13,6 @@ export function toPackedUserOperation(
   const {
     callGasLimit,
     callData,
-    factory,
-    factoryData,
     maxPriorityFeePerGas,
     maxFeePerGas,
     paymaster,
@@ -29,8 +28,7 @@ export function toPackedUserOperation(
     pad(numberToHex(verificationGasLimit || 0n), { size: 16 }),
     pad(numberToHex(callGasLimit || 0n), { size: 16 }),
   ])
-  const initCode =
-    factory && factoryData ? concat([factory, factoryData]) : '0x'
+  const initCode = getInitCode(userOperation)
   const gasFees = concat([
     pad(numberToHex(maxPriorityFeePerGas || 0n), { size: 16 }),
     pad(numberToHex(maxFeePerGas || 0n), { size: 16 }),

package/actions/index.ts

@@ -316,6 +316,37 @@ export {
   type GetPermissionsReturnType,
   getPermissions,
 } from './wallet/getPermissions.js'
+export {
+  type GetCapabilitiesParameters,
+  type GetCapabilitiesErrorType,
+  type GetCapabilitiesReturnType,
+  getCapabilities,
+} from './wallet/getCapabilities.js'
+export {
+  type SendCallsErrorType,
+  type SendCallsParameters,
+  type SendCallsReturnType,
+  sendCalls,
+} from './wallet/sendCalls.js'
+export {
+  type GetCallsStatusErrorType,
+  type GetCallsStatusParameters,
+  type GetCallsStatusReturnType,
+  getCallsStatus,
+} from './wallet/getCallsStatus.js'
+export {
+  type ShowCallsStatusErrorType,
+  type ShowCallsStatusParameters,
+  type ShowCallsStatusReturnType,
+  showCallsStatus,
+} from './wallet/showCallsStatus.js'
+export {
+  type WaitForCallsStatusErrorType,
+  type WaitForCallsStatusParameters,
+  type WaitForCallsStatusReturnType,
+  type WaitForCallsStatusTimeoutErrorType,
+  waitForCallsStatus,
+} from './wallet/waitForCallsStatus.js'
 export {
   type GetProofErrorType,
   type GetProofParameters,

package/{experimental/eip5792/actions → actions/wallet}/getCallsStatus.ts

@@ -1,16 +1,16 @@
-import type { Client } from '../../../clients/createClient.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 { Client } from '../../clients/createClient.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 {
   WalletCapabilities,
   WalletGetCallsStatusReturnType,
-} from '../../../types/eip1193.js'
-import type { Prettify } from '../../../types/utils.js'
-import type { RequestErrorType } from '../../../utils/buildRequest.js'
-import { hexToBigInt, hexToNumber } from '../../../utils/encoding/fromHex.js'
-import { receiptStatuses } from '../../../utils/formatters/transactionReceipt.js'
+} from '../../types/eip1193.js'
+import type { Prettify } from '../../types/utils.js'
+import type { RequestErrorType } from '../../utils/buildRequest.js'
+import { hexToBigInt, hexToNumber } from '../../utils/encoding/fromHex.js'
+import { receiptStatuses } from '../../utils/formatters/transactionReceipt.js'
 
 export type GetCallsStatusParameters = { id: string }
 
@@ -34,7 +34,7 @@ export type GetCallsStatusErrorType = RequestErrorType | ErrorType
 /**
  * Returns the status of a call batch that was sent via `sendCalls`.
  *
- * - Docs: https://viem.sh/experimental/eip5792/getCallsStatus
+ * - Docs: https://viem.sh/docs/actions/wallet/getCallsStatus
  * - JSON-RPC Methods: [`wallet_getCallsStatus`](https://eips.ethereum.org/EIPS/eip-5792)
  *
  * @param client - Client to use
@@ -43,7 +43,7 @@ export type GetCallsStatusErrorType = RequestErrorType | ErrorType
  * @example
  * import { createWalletClient, custom } from 'viem'
  * import { mainnet } from 'viem/chains'
- * import { getCallsStatus } from 'viem/experimental'
+ * import { getCallsStatus } from 'viem/actions'
  *
  * const client = createWalletClient({
  *   chain: mainnet,
@@ -62,7 +62,7 @@ export async function getCallsStatus<
     atomic = false,
     chainId,
     receipts,
-    version = '1.0',
+    version = '2.0.0',
     ...response
   } = await client.request({
     method: 'wallet_getCallsStatus',

package/{experimental/eip5792/actions → actions/wallet}/getCapabilities.ts

@@ -1,16 +1,16 @@
 import type { Address } from 'abitype'
 
-import { parseAccount } from '../../../accounts/utils/parseAccount.js'
-import type { Client } from '../../../clients/createClient.js'
-import type { Transport } from '../../../clients/transports/createTransport.js'
-import type { ErrorType } from '../../../errors/utils.js'
-import type { Account } from '../../../types/account.js'
+import { parseAccount } from '../../accounts/utils/parseAccount.js'
+import type { Client } from '../../clients/createClient.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 {
   WalletCapabilities,
   WalletCapabilitiesRecord,
-} from '../../../types/eip1193.js'
-import type { Prettify } from '../../../types/utils.js'
-import type { RequestErrorType } from '../../../utils/buildRequest.js'
+} from '../../types/eip1193.js'
+import type { Prettify } from '../../types/utils.js'
+import type { RequestErrorType } from '../../utils/buildRequest.js'
 
 export type GetCapabilitiesParameters<
   chainId extends number | undefined = undefined,
@@ -32,7 +32,7 @@ export type GetCapabilitiesErrorType = RequestErrorType | ErrorType
 /**
  * Extract capabilities that a connected wallet supports (e.g. paymasters, session keys, etc).
  *
- * - Docs: https://viem.sh/experimental/eip5792/getCapabilities
+ * - Docs: https://viem.sh/docs/actions/wallet/getCapabilities
  * - JSON-RPC Methods: [`wallet_getCapabilities`](https://eips.ethereum.org/EIPS/eip-5792)
  *
  * @param client - Client to use
@@ -41,7 +41,7 @@ export type GetCapabilitiesErrorType = RequestErrorType | ErrorType
  * @example
  * import { createWalletClient, custom } from 'viem'
  * import { mainnet } from 'viem/chains'
- * import { getCapabilities } from 'viem/experimental'
+ * import { getCapabilities } from 'viem/actions'
  *
  * const client = createWalletClient({
  *   chain: mainnet,

package/{experimental/eip5792/actions → actions/wallet}/sendCalls.ts

@@ -1,21 +1,21 @@
 import type { Address, Narrow } from 'abitype'
-import { parseAccount } from '../../../accounts/utils/parseAccount.js'
-import type { Client } from '../../../clients/createClient.js'
-import type { Transport } from '../../../clients/transports/createTransport.js'
-import { AccountNotFoundError } from '../../../errors/account.js'
-import type { BaseError } from '../../../errors/base.js'
-import type { ErrorType } from '../../../errors/utils.js'
-import type { Account, GetAccountParameter } from '../../../types/account.js'
-import type { Call, Calls } from '../../../types/calls.js'
-import type { Chain, DeriveChain } from '../../../types/chain.js'
+import { parseAccount } from '../../accounts/utils/parseAccount.js'
+import type { Client } from '../../clients/createClient.js'
+import type { Transport } from '../../clients/transports/createTransport.js'
+import { AccountNotFoundError } from '../../errors/account.js'
+import type { BaseError } from '../../errors/base.js'
+import type { ErrorType } from '../../errors/utils.js'
+import type { Account, GetAccountParameter } from '../../types/account.js'
+import type { Call, Calls } from '../../types/calls.js'
+import type { Chain, DeriveChain } from '../../types/chain.js'
 import type {
   WalletCapabilities,
   WalletSendCallsParameters,
-} from '../../../types/eip1193.js'
-import { encodeFunctionData } from '../../../utils/abi/encodeFunctionData.js'
-import type { RequestErrorType } from '../../../utils/buildRequest.js'
-import { numberToHex } from '../../../utils/encoding/toHex.js'
-import { getTransactionError } from '../../../utils/errors/getTransactionError.js'
+} from '../../types/eip1193.js'
+import { encodeFunctionData } from '../../utils/abi/encodeFunctionData.js'
+import type { RequestErrorType } from '../../utils/buildRequest.js'
+import { numberToHex } from '../../utils/encoding/toHex.js'
+import { getTransactionError } from '../../utils/errors/getTransactionError.js'
 
 export type SendCallsParameters<
   chain extends Chain | undefined = Chain | undefined,
@@ -43,7 +43,7 @@ export type SendCallsErrorType = RequestErrorType | ErrorType
 /**
  * Requests the connected wallet to send a batch of calls.
  *
- * - Docs: https://viem.sh/experimental/eip5792/sendCalls
+ * - Docs: https://viem.sh/docs/actions/wallet/sendCalls
  * - JSON-RPC Methods: [`wallet_sendCalls`](https://eips.ethereum.org/EIPS/eip-5792)
  *
  * @param client - Client to use
@@ -52,7 +52,7 @@ export type SendCallsErrorType = RequestErrorType | ErrorType
  * @example
  * import { createWalletClient, custom } from 'viem'
  * import { mainnet } from 'viem/chains'
- * import { sendCalls } from 'viem/experimental'
+ * import { sendCalls } from 'viem/actions'
  *
  * const client = createWalletClient({
  *   chain: mainnet,
@@ -87,7 +87,7 @@ export async function sendCalls<
     chain = client.chain,
     forceAtomic = false,
     id,
-    version = '1.0',
+    version = '2.0.0',
   } = parameters
 
   if (typeof account_ === 'undefined')