viem 2.21.27 → 2.21.28

package/experimental/eip5792/actions/getCapabilities.ts

@@ -1,9 +1,11 @@
+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 { AccountNotFoundError } from '../../../errors/account.js'
 import type { ErrorType } from '../../../errors/utils.js'
-import type { Account, GetAccountParameter } from '../../../types/account.js'
+import type { Account } from '../../../types/account.js'
 import type { Chain } from '../../../types/chain.js'
 import type {
   WalletCapabilities,
@@ -12,9 +14,9 @@ import type {
 import type { Prettify } from '../../../types/utils.js'
 import type { RequestErrorType } from '../../../utils/buildRequest.js'
 
-export type GetCapabilitiesParameters<
-  account extends Account | undefined = Account | undefined,
-> = GetAccountParameter<account>
+export type GetCapabilitiesParameters = {
+  account?: Account | Address | undefined
+}
 
 export type GetCapabilitiesReturnType = Prettify<
   WalletCapabilitiesRecord<WalletCapabilities, number>
@@ -42,24 +44,11 @@ export type GetCapabilitiesErrorType = RequestErrorType | ErrorType
  * })
  * const capabilities = await getCapabilities(client)
  */
-export async function getCapabilities<
-  chain extends Chain | undefined,
-  account extends Account | undefined = undefined,
->(
-  ...parameters: account extends Account
-    ?
-        | [client: Client<Transport, chain, account>]
-        | [
-            client: Client<Transport, chain, account>,
-            parameters: GetCapabilitiesParameters<account>,
-          ]
-    : [
-        client: Client<Transport, chain, account>,
-        parameters: GetCapabilitiesParameters<account>,
-      ]
+export async function getCapabilities<chain extends Chain | undefined>(
+  client: Client<Transport, chain>,
+  parameters: GetCapabilitiesParameters = {},
 ): Promise<GetCapabilitiesReturnType> {
-  const [client, args] = parameters
-  const account_raw = args?.account ?? client.account
+  const account_raw = parameters?.account ?? client.account
 
   if (!account_raw) throw new AccountNotFoundError()
   const account = parseAccount(account_raw)

package/experimental/eip5792/decorators/eip5792.ts

@@ -80,9 +80,7 @@ export type Eip5792Actions<
    * })
    */
   getCapabilities: (
-    ...parameters: account extends Account
-      ? [] | [parameters: GetCapabilitiesParameters<account>]
-      : [parameters: GetCapabilitiesParameters<undefined>]
+    parameters?: GetCapabilitiesParameters,
   ) => Promise<GetCapabilitiesReturnType>
   /**
    * Requests the connected wallet to send a batch of calls.

package/package.json

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

package/types/account.ts

@@ -1,7 +1,7 @@
 import type { Address } from 'abitype'
 
 import type { Account, JsonRpcAccount } from '../accounts/types.js'
-import type { IsUndefined, Prettify } from './utils.js'
+import type { IsUndefined, MaybeRequired, Prettify } from './utils.js'
 
 export type DeriveAccount<
   account extends Account | undefined,
@@ -12,11 +12,22 @@ export type GetAccountParameter<
   account extends Account | undefined = Account | undefined,
   accountOverride extends Account | Address | undefined = Account | Address,
   required extends boolean = true,
-> = IsUndefined<account> extends true
-  ? required extends true
-    ? { account: accountOverride | Account | Address }
-    : { account?: accountOverride | Account | Address | undefined }
-  : { account?: accountOverride | Account | Address | undefined }
+  nullish extends boolean = false,
+> = MaybeRequired<
+  {
+    account?:
+      | accountOverride
+      | Account
+      | Address
+      | (nullish extends true ? null : never)
+      | undefined
+  },
+  IsUndefined<account> extends true
+    ? required extends true
+      ? true
+      : false
+    : false
+>
 
 export type ParseAccount<
   accountOrAddress extends Account | Address | undefined =

package/utils/errors/getTransactionError.ts

@@ -19,7 +19,7 @@ export type GetTransactionErrorParameters = Omit<
   SendTransactionParameters,
   'account' | 'chain'
 > & {
-  account: Account
+  account: Account | null
   chain?: Chain | undefined
   docsPath?: string | undefined
 }