viem 2.28.2 → 2.28.4

package/actions/wallet/getCapabilities.ts

@@ -6,11 +6,13 @@ 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'
+  Capabilities,
+  ChainIdToCapabilities,
+  ExtractCapabilities,
+} from '../../types/capabilities.js'
 import type { Prettify } from '../../types/utils.js'
 import type { RequestErrorType } from '../../utils/buildRequest.js'
+import { numberToHex } from '../../utils/encoding/toHex.js'
 
 export type GetCapabilitiesParameters<
   chainId extends number | undefined = undefined,
@@ -23,8 +25,11 @@ export type GetCapabilitiesReturnType<
   chainId extends number | undefined = undefined,
 > = Prettify<
   chainId extends number
-    ? WalletCapabilities
-    : WalletCapabilitiesRecord<WalletCapabilities, number>
+    ? ExtractCapabilities<'getCapabilities', 'ReturnType'>
+    : ChainIdToCapabilities<
+        Capabilities<ExtractCapabilities<'getCapabilities', 'ReturnType'>>,
+        number
+      >
 >
 
 export type GetCapabilitiesErrorType = RequestErrorType | ErrorType
@@ -59,17 +64,20 @@ export async function getCapabilities<
 
   const account_ = account ? parseAccount(account) : undefined
 
+  const params = chainId
+    ? ([account_?.address, [numberToHex(chainId)]] as const)
+    : ([account_?.address] as const)
   const capabilities_raw = await client.request({
     method: 'wallet_getCapabilities',
-    params: [account_?.address],
+    params,
   })
 
-  const capabilities = {} as WalletCapabilitiesRecord<
-    WalletCapabilities,
+  const capabilities = {} as ChainIdToCapabilities<
+    ExtractCapabilities<'getCapabilities', 'ReturnType'>,
     number
   >
   for (const [key, value] of Object.entries(capabilities_raw))
-    capabilities[Number(key)] = value
+    capabilities[Number(key)] = value as never
   return (
     typeof chainId === 'number' ? capabilities[chainId] : capabilities
   ) as never

package/actions/wallet/sendCalls.ts

@@ -7,11 +7,10 @@ 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 { ExtractCapabilities } from '../../types/capabilities.js'
 import type { Chain, DeriveChain } from '../../types/chain.js'
-import type {
-  WalletCapabilities,
-  WalletSendCallsParameters,
-} from '../../types/eip1193.js'
+import type { WalletSendCallsParameters } from '../../types/eip1193.js'
+import type { Prettify } from '../../types/utils.js'
 import { encodeFunctionData } from '../../utils/abi/encodeFunctionData.js'
 import type { RequestErrorType } from '../../utils/buildRequest.js'
 import { numberToHex } from '../../utils/encoding/toHex.js'
@@ -27,16 +26,16 @@ export type SendCallsParameters<
 > = {
   chain?: chainOverride | Chain | undefined
   calls: Calls<Narrow<calls>>
-  capabilities?: WalletCapabilities | undefined
+  capabilities?: ExtractCapabilities<'sendCalls', 'Request'> | undefined
   forceAtomic?: boolean | undefined
   id?: string | undefined
   version?: WalletSendCallsParameters[number]['version'] | undefined
 } & GetAccountParameter<account, Account | Address, true, true>
 
-export type SendCallsReturnType = {
-  capabilities?: WalletCapabilities | undefined
+export type SendCallsReturnType = Prettify<{
+  capabilities?: ExtractCapabilities<'sendCalls', 'ReturnType'> | undefined
   id: string
-}
+}>
 
 export type SendCallsErrorType = RequestErrorType | ErrorType
 
@@ -83,7 +82,6 @@ export async function sendCalls<
 ): Promise<SendCallsReturnType> {
   const {
     account: account_ = client.account,
-    capabilities,
     chain = client.chain,
     forceAtomic = false,
     id,
@@ -122,7 +120,7 @@ export async function sendCalls<
           {
             atomicRequired: forceAtomic,
             calls,
-            capabilities,
+            capabilities: formatRequestCapabilities(parameters.capabilities),
             chainId: numberToHex(chain!.id),
             from: account?.address,
             id,
@@ -133,7 +131,7 @@ export async function sendCalls<
       { retryCount: 0 },
     )
     if (typeof response === 'string') return { id: response }
-    return response
+    return response as never
   } catch (err) {
     throw getTransactionError(err as BaseError, {
       ...parameters,
@@ -142,3 +140,26 @@ export async function sendCalls<
     })
   }
 }
+
+function formatRequestCapabilities(
+  capabilities: ExtractCapabilities<'sendCalls', 'Request'> | undefined,
+) {
+  const paymasterService = capabilities?.paymasterService
+    ? Object.entries(capabilities.paymasterService).reduce(
+        (paymasterService, [chainId, value]) => ({
+          ...(paymasterService ?? {}),
+          [numberToHex(Number(chainId))]: value,
+        }),
+        {},
+      )
+    : undefined
+
+  return {
+    ...capabilities,
+    ...(paymasterService
+      ? {
+          paymasterService,
+        }
+      : {}),
+  }
+}

package/chains/definitions/plumeMainnet.ts

@@ -12,15 +12,15 @@ export const plumeMainnet = /*#__PURE__*/ defineChain({
   },
   rpcUrls: {
     default: {
-      http: ['https://phoenix-rpc.plumenetwork.xyz'],
-      webSocket: ['wss://phoenix-rpc.plumenetwork.xyz'],
+      http: ['https://rpc.plume.org'],
+      webSocket: ['wss://rpc.plume.org'],
     },
   },
   blockExplorers: {
     default: {
       name: 'Blockscout',
-      url: 'https://phoenix-explorer.plumenetwork.xyz',
-      apiUrl: 'https://phoenix-explorer.plumenetwork.xyz/api',
+      url: 'https://explorer.plume.org',
+      apiUrl: 'https://explorer.plume.org/api',
     },
   },
   contracts: {

package/chains/definitions/plumeSepolia.ts

@@ -12,15 +12,15 @@ export const plumeSepolia = /*#__PURE__*/ defineChain({
   },
   rpcUrls: {
     default: {
-      http: ['https://testnet-rpc.plumenetwork.xyz'],
-      webSocket: ['wss://testnet-rpc.plumenetwork.xyz'],
+      http: ['https://testnet-rpc.plume.org'],
+      webSocket: ['wss://testnet-rpc.plume.org'],
     },
   },
   blockExplorers: {
     default: {
       name: 'Blockscout',
-      url: 'https://testnet-explorer.plumenetwork.xyz',
-      apiUrl: 'https://testnet-explorer.plumenetwork.xyz/api',
+      url: 'https://testnet-explorer.plume.org',
+      apiUrl: 'https://testnet-explorer.plume.org/api',
     },
   },
   contracts: {

package/clients/decorators/wallet.ts

@@ -238,9 +238,9 @@ export type WalletActions<
    *   account: '0xA0Cf798816D4b9b9866b5330EEa46a18382f251e',
    * })
    */
-  getCapabilities: (
-    parameters?: GetCapabilitiesParameters,
-  ) => Promise<GetCapabilitiesReturnType>
+  getCapabilities: <chainId extends number | undefined>(
+    parameters?: GetCapabilitiesParameters<chainId>,
+  ) => Promise<GetCapabilitiesReturnType<chainId>>
   /**
    * Returns the chain ID associated with the current network.
    *
@@ -963,7 +963,7 @@ export function walletActions<
     deployContract: (args) => deployContract(client, args),
     getAddresses: () => getAddresses(client),
     getCallsStatus: (args) => getCallsStatus(client, args),
-    getCapabilities: () => getCapabilities(client),
+    getCapabilities: (args) => getCapabilities(client, args),
     getChainId: () => getChainId(client),
     getPermissions: () => getPermissions(client),
     prepareAuthorization: (args) => prepareAuthorization(client, args),

package/errors/version.ts

@@ -1 +1 @@
-export const version = '2.28.2'
+export const version = '2.28.4'

package/index.ts

@@ -13,7 +13,6 @@ export {
   type ParseAbiItem,
   type ParseAbiParameter,
   type ParseAbiParameters,
-  type ResolvedRegister,
   type TypedData,
   type TypedDataDomain,
   type TypedDataParameter,
@@ -1105,6 +1104,16 @@ export type {
   BlockTag,
   Uncle,
 } from './types/block.js'
+export type {
+  Capabilities,
+  /** @deprecated Use `Capabilities` instead. */
+  Capabilities as WalletCapabilities,
+  CapabilitiesSchema,
+  /** @deprecated Use `ChainIdToCapabilities` instead. */
+  ChainIdToCapabilities as WalletCapabilitiesRecord,
+  ChainIdToCapabilities,
+  ExtractCapabilities,
+} from './types/capabilities.js'
 export type {
   ByteArray,
   Hash,
@@ -1133,8 +1142,6 @@ export type {
   RpcSchema,
   RpcSchemaOverride,
   TestRpcSchema,
-  WalletCapabilities,
-  WalletCapabilitiesRecord,
   WalletCallReceipt,
   WalletGetCallsStatusReturnType,
   WalletGrantPermissionsParameters,
@@ -1178,6 +1185,7 @@ export type {
   SignedAuthorization,
   SignedAuthorizationList,
 } from './types/authorization.js'
+export type { ResolvedRegister } from './types/register.js'
 export type {
   Index,
   Quantity,

package/package.json

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

package/types/capabilities.ts

@@ -0,0 +1,58 @@
+import type { Hex } from './misc.js'
+import type { ResolvedRegister } from './register.js'
+import type { Prettify } from './utils.js'
+
+export type CapabilitiesSchema = ResolvedRegister['CapabilitiesSchema']
+
+export type DefaultCapabilitiesSchema = {
+  getCapabilities: {
+    ReturnType: {
+      atomic?:
+        | {
+            status: 'supported' | 'ready' | 'unsupported'
+          }
+        | undefined
+      paymasterService?:
+        | {
+            supported: boolean
+          }
+        | undefined
+    }
+  }
+  sendCalls: {
+    Request: {
+      paymasterService?:
+        | {
+            [chainId: number]: {
+              url: string
+              context?: Record<string, any> | undefined
+            }
+          }
+        | undefined
+    }
+  }
+}
+
+export type Capabilities<capabilities extends Record<string, any> = {}> = {
+  [key: string]: any
+} & capabilities
+
+export type ChainIdToCapabilities<
+  capabilities extends Capabilities = Capabilities,
+  id extends string | number = Hex,
+> = {
+  [chainId in id]: capabilities
+}
+
+export type ExtractCapabilities<
+  method extends string,
+  key extends 'Request' | 'ReturnType',
+> = Prettify<
+  method extends keyof CapabilitiesSchema
+    ? CapabilitiesSchema[method] extends {
+        [k in key]: infer value extends Record<string, any>
+      }
+      ? Capabilities<value>
+      : Capabilities
+    : Capabilities
+>

package/types/eip1193.ts

@@ -9,6 +9,7 @@ import type {
   RpcUserOperationReceipt,
 } from '../account-abstraction/types/rpc.js'
 import type { BlockTag } from './block.js'
+import type { Capabilities, ChainIdToCapabilities } from './capabilities.js'
 import type { Hash, Hex, LogTopic } from './misc.js'
 import type { RpcStateOverride } from './rpc.js'
 import type {
@@ -121,17 +122,6 @@ export type NetworkSync = {
   startingBlock: Quantity
 }
 
-export type WalletCapabilities = {
-  [capability: string]: any
-}
-
-export type WalletCapabilitiesRecord<
-  capabilities extends WalletCapabilities = WalletCapabilities,
-  id extends string | number = Hex,
-> = {
-  [chainId in id]: capabilities
-}
-
 export type WalletCallReceipt<quantity = Hex, status = Hex> = {
   logs: {
     address: Hex
@@ -187,13 +177,13 @@ export type WalletGrantPermissionsReturnType = {
 }
 
 export type WalletGetCallsStatusReturnType<
-  capabilities extends WalletCapabilities = WalletCapabilities,
+  capabilities extends Capabilities = Capabilities,
   numberType = Hex,
   bigintType = Hex,
   receiptStatus = Hex,
 > = {
   atomic: boolean
-  capabilities?: capabilities | WalletCapabilities | undefined
+  capabilities?: capabilities | Capabilities | undefined
   chainId: numberType
   id: string
   receipts?: WalletCallReceipt<bigintType, receiptStatus>[] | undefined
@@ -215,19 +205,19 @@ export type WalletPermission = {
 }
 
 export type WalletSendCallsParameters<
-  capabilities extends WalletCapabilities = WalletCapabilities,
+  capabilities extends Capabilities = Capabilities,
   chainId extends Hex | number = Hex,
   quantity extends Quantity | bigint = Quantity,
 > = [
   {
     atomicRequired: boolean
     calls: readonly {
-      capabilities?: capabilities | WalletCapabilities | undefined
+      capabilities?: capabilities | Capabilities | undefined
       to?: Address | undefined
       data?: Hex | undefined
       value?: quantity | undefined
     }[]
-    capabilities?: capabilities | WalletCapabilities | undefined
+    capabilities?: capabilities | Capabilities | undefined
     chainId?: chainId | undefined
     id?: string | undefined
     from?: Address | undefined
@@ -236,7 +226,7 @@ export type WalletSendCallsParameters<
 ]
 
 export type WalletSendCallsReturnType<
-  capabilities extends WalletCapabilities = WalletCapabilities,
+  capabilities extends Capabilities = Capabilities,
 > = {
   capabilities?: capabilities | undefined
   id: string
@@ -1795,8 +1785,12 @@ export type WalletRpcSchema = [
    */
   {
     Method: 'wallet_getCapabilities'
-    Parameters?: [Address | undefined] | undefined
-    ReturnType: Prettify<WalletCapabilitiesRecord>
+    Parameters?:
+      | readonly []
+      | readonly [Address | undefined]
+      | readonly [Address | undefined, readonly Hex[] | undefined]
+      | undefined
+    ReturnType: Prettify<ChainIdToCapabilities>
   },
   /**
    * @description Gets the wallets current permissions.

package/types/register.ts

@@ -0,0 +1,15 @@
+import type { DefaultCapabilitiesSchema } from './capabilities.js'
+
+// biome-ignore lint/suspicious/noEmptyInterface:
+export interface Register {}
+
+export type ResolvedRegister = {
+  CapabilitiesSchema: Register extends { CapabilitiesSchema: infer schema }
+    ? schema
+    : DefaultRegister['CapabilitiesSchema']
+}
+
+/** @internal */
+type DefaultRegister = {
+  CapabilitiesSchema: DefaultCapabilitiesSchema
+}