@alchemy/wallet-apis 0.0.0-alpha.16 → 0.0.0-alpha.18

package/dist/esm/actions/formatSign.d.ts

@@ -1,16 +1,12 @@
 import type { WalletServerRpcSchemaType } from "@alchemy/wallet-api-types/rpc";
-import type { InnerWalletApiClient, OptionalChainId } from "../types.ts";
-import { type Address, type IsUndefined, type Prettify } from "viem";
+import type { InnerWalletApiClient, OptionalChainId, OptionalFrom } from "../types.ts";
+import { type Prettify } from "viem";
 type RpcSchema = Extract<WalletServerRpcSchemaType, {
     Request: {
         method: "wallet_formatSign";
     };
 }>;
-export type FormatSignParams<TAccount extends Address | undefined = Address | undefined> = Prettify<Omit<OptionalChainId<RpcSchema["Request"]["params"][0]>, "from"> & (IsUndefined<TAccount> extends true ? {
-    from: Address;
-} : {
-    from?: never;
-})>;
+export type FormatSignParams = Prettify<OptionalFrom<OptionalChainId<RpcSchema["Request"]["params"][0]>>>;
 export type FormatSignResult = Prettify<RpcSchema["ReturnType"]>;
 /**
  * Formats a signature request for signing messages or transactions.
@@ -31,5 +27,5 @@ export type FormatSignResult = Prettify<RpcSchema["ReturnType"]>;
  * });
  * ```
  */
-export declare function formatSign<TAccount extends Address | undefined = Address | undefined>(client: InnerWalletApiClient, params: FormatSignParams<TAccount>): Promise<FormatSignResult>;
+export declare function formatSign(client: InnerWalletApiClient, params: FormatSignParams): Promise<FormatSignResult>;
 export {};

package/dist/esm/actions/formatSign.js.map

@@ -1 +1 @@
-{"version":3,"file":"formatSign.js","sourceRoot":"","sources":["../../../src/actions/formatSign.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAiD,MAAM,MAAM,CAAC;AAC5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAoBtC;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAG9B,MAA4B,EAC5B,MAAkC;IAElC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC;IACpD,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,IAAI,oBAAoB,EAAE,CAAC;IACnC,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;IACjC,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;QAC/B,MAAM,EAAE,mBAAmB;QAC3B,MAAM,EAAE;YACN,EAAE,GAAG,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE;SACvE;KACF,CAAC,CAAC;IACH,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;IAChC,OAAO,GAAG,CAAC;AACb,CAAC","sourcesContent":["import type { WalletServerRpcSchemaType } from \"@alchemy/wallet-api-types/rpc\";\nimport type { InnerWalletApiClient, OptionalChainId } from \"../types.ts\";\nimport { toHex, type Address, type IsUndefined, type Prettify } from \"viem\";\nimport { AccountNotFoundError } from \"@alchemy/common\";\nimport { LOGGER } from \"../logger.js\";\n\ntype RpcSchema = Extract<\n  WalletServerRpcSchemaType,\n  {\n    Request: {\n      method: \"wallet_formatSign\";\n    };\n  }\n>;\n\nexport type FormatSignParams<\n  TAccount extends Address | undefined = Address | undefined,\n> = Prettify<\n  Omit<OptionalChainId<RpcSchema[\"Request\"][\"params\"][0]>, \"from\"> &\n    (IsUndefined<TAccount> extends true ? { from: Address } : { from?: never })\n>;\n\nexport type FormatSignResult = Prettify<RpcSchema[\"ReturnType\"]>;\n\n/**\n * Formats a signature request for signing messages or transactions.\n *\n * @param {InnerWalletApiClient} client - The wallet API client to use for the request\n * @param {FormatSignParams} params - Parameters for formatting the signature\n * @returns {Promise<FormatSignResult>} A Promise that resolves to the formatSign result containing the formatted signature.\n *\n * @example\n * ```ts\n * // Formats a signature\n * const result = await client.formatSign({\n *    from: \"0x1234...\",\n *    signature: {\n *      type: \"ecdsa\",\n *      data: \"0xabcd...\"\n *    },\n * });\n * ```\n */\nexport async function formatSign<\n  TAccount extends Address | undefined = Address | undefined,\n>(\n  client: InnerWalletApiClient,\n  params: FormatSignParams<TAccount>,\n): Promise<FormatSignResult> {\n  const from = params.from ?? client.account?.address;\n  if (!from) {\n    throw new AccountNotFoundError();\n  }\n\n  LOGGER.debug(\"formatSign:start\");\n  const res = await client.request({\n    method: \"wallet_formatSign\",\n    params: [\n      { ...params, from, chainId: params.chainId ?? toHex(client.chain.id) },\n    ],\n  });\n  LOGGER.debug(\"formatSign:done\");\n  return res;\n}\n"]}
+{"version":3,"file":"formatSign.js","sourceRoot":"","sources":["../../../src/actions/formatSign.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,EAAiB,MAAM,MAAM,CAAC;AAC5C,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAiBtC;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,MAA4B,EAC5B,MAAwB;IAExB,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC;IACpD,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,IAAI,oBAAoB,EAAE,CAAC;IACnC,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;IACjC,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;QAC/B,MAAM,EAAE,mBAAmB;QAC3B,MAAM,EAAE;YACN,EAAE,GAAG,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE;SACvE;KACF,CAAC,CAAC;IACH,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;IAChC,OAAO,GAAG,CAAC;AACb,CAAC","sourcesContent":["import type { WalletServerRpcSchemaType } from \"@alchemy/wallet-api-types/rpc\";\nimport type {\n  InnerWalletApiClient,\n  OptionalChainId,\n  OptionalFrom,\n} from \"../types.ts\";\nimport { toHex, type Prettify } from \"viem\";\nimport { AccountNotFoundError } from \"@alchemy/common\";\nimport { LOGGER } from \"../logger.js\";\n\ntype RpcSchema = Extract<\n  WalletServerRpcSchemaType,\n  {\n    Request: {\n      method: \"wallet_formatSign\";\n    };\n  }\n>;\n\nexport type FormatSignParams = Prettify<\n  OptionalFrom<OptionalChainId<RpcSchema[\"Request\"][\"params\"][0]>>\n>;\n\nexport type FormatSignResult = Prettify<RpcSchema[\"ReturnType\"]>;\n\n/**\n * Formats a signature request for signing messages or transactions.\n *\n * @param {InnerWalletApiClient} client - The wallet API client to use for the request\n * @param {FormatSignParams} params - Parameters for formatting the signature\n * @returns {Promise<FormatSignResult>} A Promise that resolves to the formatSign result containing the formatted signature.\n *\n * @example\n * ```ts\n * // Formats a signature\n * const result = await client.formatSign({\n *    from: \"0x1234...\",\n *    signature: {\n *      type: \"ecdsa\",\n *      data: \"0xabcd...\"\n *    },\n * });\n * ```\n */\nexport async function formatSign(\n  client: InnerWalletApiClient,\n  params: FormatSignParams,\n): Promise<FormatSignResult> {\n  const from = params.from ?? client.account?.address;\n  if (!from) {\n    throw new AccountNotFoundError();\n  }\n\n  LOGGER.debug(\"formatSign:start\");\n  const res = await client.request({\n    method: \"wallet_formatSign\",\n    params: [\n      { ...params, from, chainId: params.chainId ?? toHex(client.chain.id) },\n    ],\n  });\n  LOGGER.debug(\"formatSign:done\");\n  return res;\n}\n"]}

package/dist/esm/actions/grantPermissions.d.ts

@@ -1,4 +1,4 @@
-import { type Address, type Hex, type IsUndefined, type Prettify } from "viem";
+import { type Address, type Hex, type Prettify } from "viem";
 import type { InnerWalletApiClient } from "../types.ts";
 import type { WalletServerRpcSchemaType } from "@alchemy/wallet-api-types/rpc";
 import type { OptionalChainId } from "../types.ts";
@@ -7,11 +7,9 @@ type RpcSchema = Extract<WalletServerRpcSchemaType, {
         method: "wallet_createSession";
     };
 }>;
-export type GrantPermissionsParams<TAccount extends Address | undefined = Address | undefined> = Prettify<OptionalChainId<Omit<RpcSchema["Request"]["params"][0], "account">> & (IsUndefined<TAccount> extends true ? {
-    account: Address;
-} : {
-    account?: never;
-})>;
+export type GrantPermissionsParams = Prettify<OptionalChainId<Omit<RpcSchema["Request"]["params"][0], "account">> & {
+    account?: Address;
+}>;
 export type GrantPermissionsResult = Prettify<{
     context: Hex;
 }>;
@@ -69,5 +67,5 @@ export type GrantPermissionsResult = Prettify<{
  * });
  * ```
  */
-export declare function grantPermissions<TAccount extends Address | undefined = Address | undefined>(client: InnerWalletApiClient, params: GrantPermissionsParams<TAccount>): Promise<GrantPermissionsResult>;
+export declare function grantPermissions(client: InnerWalletApiClient, params: GrantPermissionsParams): Promise<GrantPermissionsResult>;
 export {};

package/dist/esm/actions/grantPermissions.js

@@ -1,8 +1,7 @@
-import { toHex, concatHex, } from "viem";
+import { toHex, concatHex } from "viem";
 import { signSignatureRequest } from "./signSignatureRequest.js";
-import { AccountNotFoundError, BaseError } from "@alchemy/common";
+import { AccountNotFoundError } from "@alchemy/common";
 import { LOGGER } from "../logger.js";
-import { isWebAuthnAccount } from "../utils/assertions.js";
 /**
  * Grants permissions to a smart account by creating a session.
  * This allows another key to perform operations on behalf of the account.
@@ -58,15 +57,11 @@ import { isWebAuthnAccount } from "../utils/assertions.js";
  * ```
  */
 export async function grantPermissions(client, params) {
-    const account = params.account ?? client.account?.address;
+    const account = params.account ?? client.account.address;
     if (!account) {
         LOGGER.warn("grantPermissions:no-account");
         throw new AccountNotFoundError();
     }
-    if (isWebAuthnAccount(client.owner)) {
-        LOGGER.warn("grantPermissions:unsupported-account");
-        throw new BaseError("WebAuthn signer is not currently supported for grantPermissions");
-    }
     LOGGER.debug("grantPermissions:start", { expirySec: params.expirySec });
     const { sessionId, signatureRequest } = await client.request({
         method: "wallet_createSession",
@@ -83,9 +78,7 @@ export async function grantPermissions(client, params) {
         context: concatHex([
             "0x00", // Remote mode.
             sessionId,
-            signature.type === "webauthn-p256"
-                ? signature.data.signature
-                : signature.data,
+            signature.data,
         ]),
     };
     LOGGER.debug("grantPermissions:done");

package/dist/esm/actions/grantPermissions.js.map

@@ -1 +1 @@
-{"version":3,"file":"grantPermissions.js","sourceRoot":"","sources":["../../../src/actions/grantPermissions.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,EAKL,SAAS,GACV,MAAM,MAAM,CAAC;AAGd,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,oBAAoB,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAClE,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAwB3D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqDG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAGpC,MAA4B,EAC5B,MAAwC;IAExC,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1D,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;QAC3C,MAAM,IAAI,oBAAoB,EAAE,CAAC;IACnC,CAAC;IACD,IAAI,iBAAiB,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;QACpC,MAAM,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;QACpD,MAAM,IAAI,SAAS,CACjB,iEAAiE,CAClE,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,wBAAwB,EAAE,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC;IACxE,MAAM,EAAE,SAAS,EAAE,gBAAgB,EAAE,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;QAC3D,MAAM,EAAE,sBAAsB;QAC9B,MAAM,EAAE;YACN;gBACE,GAAG,MAAM;gBACT,OAAO;gBACP,OAAO,EAAE,MAAM,CAAC,OAAO,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;aAClD;SACF;KACF,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,MAAM,oBAAoB,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IAEvE,MAAM,GAAG,GAAG;QACV,OAAO,EAAE,SAAS,CAAC;YACjB,MAAM,EAAE,eAAe;YACvB,SAAS;YACT,SAAS,CAAC,IAAI,KAAK,eAAe;gBAChC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS;gBAC1B,CAAC,CAAC,SAAS,CAAC,IAAI;SACnB,CAAC;KACM,CAAC;IACX,MAAM,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;IACtC,OAAO,GAAG,CAAC;AACb,CAAC","sourcesContent":["import {\n  toHex,\n  type Address,\n  type Hex,\n  type IsUndefined,\n  type Prettify,\n  concatHex,\n} from \"viem\";\nimport type { InnerWalletApiClient } from \"../types.ts\";\nimport type { WalletServerRpcSchemaType } from \"@alchemy/wallet-api-types/rpc\";\nimport { signSignatureRequest } from \"./signSignatureRequest.js\";\nimport { AccountNotFoundError, BaseError } from \"@alchemy/common\";\nimport { LOGGER } from \"../logger.js\";\nimport type { OptionalChainId } from \"../types.ts\";\nimport { isWebAuthnAccount } from \"../utils/assertions.js\";\n\ntype RpcSchema = Extract<\n  WalletServerRpcSchemaType,\n  {\n    Request: {\n      method: \"wallet_createSession\";\n    };\n  }\n>;\n\nexport type GrantPermissionsParams<\n  TAccount extends Address | undefined = Address | undefined,\n> = Prettify<\n  OptionalChainId<Omit<RpcSchema[\"Request\"][\"params\"][0], \"account\">> &\n    (IsUndefined<TAccount> extends true\n      ? { account: Address }\n      : { account?: never })\n>;\n\nexport type GrantPermissionsResult = Prettify<{\n  context: Hex;\n}>;\n\n/**\n * Grants permissions to a smart account by creating a session.\n * This allows another key to perform operations on behalf of the account.\n *\n * @param {InnerWalletApiClient} client - The wallet API client to use for the request\n * @param {GrantPermissionsParams} params - The parameters for granting permissions\n * @param {Address} [params.account] - The account address (required if client was not initialized with an account)\n * @param {number} params.expirySec - Unix timestamp when the permissions expire\n * @param {sessionKeyData} params.key - The session key information\n * @param {string} params.key.publicKey - The public key of the session key\n * @param {string} params.key.type - The type of the key (e.g., \"secp256k1\")\n * @param {Array} params.permissions - Array of permission objects defining what the session key can do\n * @returns {Promise<GrantPermissionsResult>} A Promise that resolves to the result containing a context identifier\n *\n * @example\n * ```ts\n * // Create a session key and grant root permissions\n * const sessionKey = LocalAccountSigner.generatePrivateKeySigner();\n * const account = await client.requestAccount();\n *\n * const permissions = await client.grantPermissions({\n *   account: account.address,\n *   expirySec: Math.floor(Date.now() / 1000) + 60 * 60, // 1 hour from now\n *   key: {\n *     publicKey: await sessionKey.getAddress(),\n *     type: \"secp256k1\",\n *   },\n *   permissions: [{ type: \"root\" }],\n * });\n *\n * // Use the permissions to prepare a call\n * const preparedCalls = await client.prepareCalls({\n *   calls: [{ to: zeroAddress, value: \"0x0\" }],\n *   from: account.address,\n *   capabilities: {\n *     paymasterService: {\n *       policyId: \"your-paymaster-policy-id\",\n *     },\n *     permissions,\n *   },\n * });\n *\n * // Sign with the session key\n * const signedCalls = await signPreparedCalls(sessionKey, preparedCalls);\n *\n * // Send the prepared call using the session key\n * const result = await client.sendPreparedCalls({\n *   ...signedCalls,\n *   capabilities: {\n *     permissions,\n *   },\n * });\n * ```\n */\nexport async function grantPermissions<\n  TAccount extends Address | undefined = Address | undefined,\n>(\n  client: InnerWalletApiClient,\n  params: GrantPermissionsParams<TAccount>,\n): Promise<GrantPermissionsResult> {\n  const account = params.account ?? client.account?.address;\n  if (!account) {\n    LOGGER.warn(\"grantPermissions:no-account\");\n    throw new AccountNotFoundError();\n  }\n  if (isWebAuthnAccount(client.owner)) {\n    LOGGER.warn(\"grantPermissions:unsupported-account\");\n    throw new BaseError(\n      \"WebAuthn signer is not currently supported for grantPermissions\",\n    );\n  }\n\n  LOGGER.debug(\"grantPermissions:start\", { expirySec: params.expirySec });\n  const { sessionId, signatureRequest } = await client.request({\n    method: \"wallet_createSession\",\n    params: [\n      {\n        ...params,\n        account,\n        chainId: params.chainId ?? toHex(client.chain.id),\n      },\n    ],\n  });\n\n  const signature = await signSignatureRequest(client, signatureRequest);\n\n  const res = {\n    context: concatHex([\n      \"0x00\", // Remote mode.\n      sessionId,\n      signature.type === \"webauthn-p256\"\n        ? signature.data.signature\n        : signature.data,\n    ]),\n  } as const;\n  LOGGER.debug(\"grantPermissions:done\");\n  return res;\n}\n"]}
+{"version":3,"file":"grantPermissions.js","sourceRoot":"","sources":["../../../src/actions/grantPermissions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAyC,SAAS,EAAE,MAAM,MAAM,CAAC;AAG/E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAsBtC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqDG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,MAA4B,EAC5B,MAA8B;IAE9B,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC;IACzD,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;QAC3C,MAAM,IAAI,oBAAoB,EAAE,CAAC;IACnC,CAAC;IACD,MAAM,CAAC,KAAK,CAAC,wBAAwB,EAAE,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC;IACxE,MAAM,EAAE,SAAS,EAAE,gBAAgB,EAAE,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;QAC3D,MAAM,EAAE,sBAAsB;QAC9B,MAAM,EAAE;YACN;gBACE,GAAG,MAAM;gBACT,OAAO;gBACP,OAAO,EAAE,MAAM,CAAC,OAAO,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;aAClD;SACF;KACF,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,MAAM,oBAAoB,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IAEvE,MAAM,GAAG,GAAG;QACV,OAAO,EAAE,SAAS,CAAC;YACjB,MAAM,EAAE,eAAe;YACvB,SAAS;YACT,SAAS,CAAC,IAAI;SACf,CAAC;KACM,CAAC;IACX,MAAM,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;IACtC,OAAO,GAAG,CAAC;AACb,CAAC","sourcesContent":["import { toHex, type Address, type Hex, type Prettify, concatHex } from \"viem\";\nimport type { InnerWalletApiClient } from \"../types.ts\";\nimport type { WalletServerRpcSchemaType } from \"@alchemy/wallet-api-types/rpc\";\nimport { signSignatureRequest } from \"./signSignatureRequest.js\";\nimport { AccountNotFoundError } from \"@alchemy/common\";\nimport { LOGGER } from \"../logger.js\";\nimport type { OptionalChainId } from \"../types.ts\";\n\ntype RpcSchema = Extract<\n  WalletServerRpcSchemaType,\n  {\n    Request: {\n      method: \"wallet_createSession\";\n    };\n  }\n>;\n\nexport type GrantPermissionsParams = Prettify<\n  OptionalChainId<Omit<RpcSchema[\"Request\"][\"params\"][0], \"account\">> & {\n    account?: Address;\n  }\n>;\n\nexport type GrantPermissionsResult = Prettify<{\n  context: Hex;\n}>;\n\n/**\n * Grants permissions to a smart account by creating a session.\n * This allows another key to perform operations on behalf of the account.\n *\n * @param {InnerWalletApiClient} client - The wallet API client to use for the request\n * @param {GrantPermissionsParams} params - The parameters for granting permissions\n * @param {Address} [params.account] - The account address (required if client was not initialized with an account)\n * @param {number} params.expirySec - Unix timestamp when the permissions expire\n * @param {sessionKeyData} params.key - The session key information\n * @param {string} params.key.publicKey - The public key of the session key\n * @param {string} params.key.type - The type of the key (e.g., \"secp256k1\")\n * @param {Array} params.permissions - Array of permission objects defining what the session key can do\n * @returns {Promise<GrantPermissionsResult>} A Promise that resolves to the result containing a context identifier\n *\n * @example\n * ```ts\n * // Create a session key and grant root permissions\n * const sessionKey = LocalAccountSigner.generatePrivateKeySigner();\n * const account = await client.requestAccount();\n *\n * const permissions = await client.grantPermissions({\n *   account: account.address,\n *   expirySec: Math.floor(Date.now() / 1000) + 60 * 60, // 1 hour from now\n *   key: {\n *     publicKey: await sessionKey.getAddress(),\n *     type: \"secp256k1\",\n *   },\n *   permissions: [{ type: \"root\" }],\n * });\n *\n * // Use the permissions to prepare a call\n * const preparedCalls = await client.prepareCalls({\n *   calls: [{ to: zeroAddress, value: \"0x0\" }],\n *   from: account.address,\n *   capabilities: {\n *     paymasterService: {\n *       policyId: \"your-paymaster-policy-id\",\n *     },\n *     permissions,\n *   },\n * });\n *\n * // Sign with the session key\n * const signedCalls = await signPreparedCalls(sessionKey, preparedCalls);\n *\n * // Send the prepared call using the session key\n * const result = await client.sendPreparedCalls({\n *   ...signedCalls,\n *   capabilities: {\n *     permissions,\n *   },\n * });\n * ```\n */\nexport async function grantPermissions(\n  client: InnerWalletApiClient,\n  params: GrantPermissionsParams,\n): Promise<GrantPermissionsResult> {\n  const account = params.account ?? client.account.address;\n  if (!account) {\n    LOGGER.warn(\"grantPermissions:no-account\");\n    throw new AccountNotFoundError();\n  }\n  LOGGER.debug(\"grantPermissions:start\", { expirySec: params.expirySec });\n  const { sessionId, signatureRequest } = await client.request({\n    method: \"wallet_createSession\",\n    params: [\n      {\n        ...params,\n        account,\n        chainId: params.chainId ?? toHex(client.chain.id),\n      },\n    ],\n  });\n\n  const signature = await signSignatureRequest(client, signatureRequest);\n\n  const res = {\n    context: concatHex([\n      \"0x00\", // Remote mode.\n      sessionId,\n      signature.data,\n    ]),\n  } as const;\n  LOGGER.debug(\"grantPermissions:done\");\n  return res;\n}\n"]}

package/dist/esm/actions/listAccounts.d.ts

@@ -1,22 +1,15 @@
 import type { InnerWalletApiClient } from "../types.ts";
 import type { Address, Prettify } from "viem";
 import type { WalletServerRpcSchemaType } from "@alchemy/wallet-api-types/rpc";
-import type { WebAuthnPublicKey } from "@alchemy/wallet-api-types";
 type RpcSchema = Extract<WalletServerRpcSchemaType, {
     Request: {
         method: "wallet_listAccounts";
     };
 }>;
-export type ListAccountsParams = Prettify<Omit<RpcSchema["Request"]["params"][0], "signerAddress"> & ({
+export type ListAccountsParams = Prettify<Omit<RpcSchema["Request"]["params"][0], "signerAddress" | "signerPublicKey"> & {
     signerAddress?: Address;
     signerPublicKey?: never;
-} | {
-    signerPublicKey: WebAuthnPublicKey;
-    signerAddress?: never;
-} | {
-    signerAddress?: never;
-    signerPublicKey?: never;
-})>;
+}>;
 export type ListAccountsResult = Prettify<RpcSchema["ReturnType"]>;
 /**
  * Lists all smart accounts for a given signer using the wallet API client.

package/dist/esm/actions/listAccounts.js

@@ -1,5 +1,5 @@
 import { LOGGER } from "../logger.js";
-import { getSignerAddressOrPublicKey } from "../utils/signer.js";
+import { isLocalAccount } from "../utils/assertions.js";
 /**
  * Lists all smart accounts for a given signer using the wallet API client.
  *
@@ -27,34 +27,17 @@ import { getSignerAddressOrPublicKey } from "../utils/signer.js";
  * ```
  */
 export async function listAccounts(client, params) {
-    const owner = getSignerAddressOrPublicKey(client.owner);
-    // Coalesce:
-    // signerAddress or signerPublicKey in params takes priority.
-    // if not present, then fallback to client's attached signer.
-    const signerParam = params.signerAddress
-        ? { signerAddress: params.signerAddress }
-        : params.signerPublicKey
-            ? {
-                signerPublicKey: {
-                    type: "webauthn-p256",
-                    ...params.signerPublicKey,
-                },
-            }
-            : owner.type === "webauthn-p256"
-                ? {
-                    signerPublicKey: {
-                        type: "webauthn-p256",
-                        ...owner.publicKey,
-                    },
-                }
-                : { signerAddress: owner.address };
+    const signerAddress = params.signerAddress ??
+        (isLocalAccount(client.owner)
+            ? client.owner.address
+            : client.owner.account.address);
     LOGGER.debug("listAccounts:start", { hasAfter: !!params.after });
     const res = await client.request({
         method: "wallet_listAccounts",
         params: [
             {
                 ...params,
-                ...signerParam,
+                signerAddress,
             },
         ],
     });

package/dist/esm/actions/listAccounts.js.map

@@ -1 +1 @@
-{"version":3,"file":"listAccounts.js","sourceRoot":"","sources":["../../../src/actions/listAccounts.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAGtC,OAAO,EAAE,2BAA2B,EAAE,MAAM,oBAAoB,CAAC;AA6BjE;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,MAA4B,EAC5B,MAA0B;IAE1B,MAAM,KAAK,GAAG,2BAA2B,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAExD,YAAY;IACZ,6DAA6D;IAC7D,6DAA6D;IAC7D,MAAM,WAAW,GAAsC,MAAM,CAAC,aAAa;QACzE,CAAC,CAAC,EAAE,aAAa,EAAE,MAAM,CAAC,aAAa,EAAE;QACzC,CAAC,CAAC,MAAM,CAAC,eAAe;YACtB,CAAC,CAAC;gBACE,eAAe,EAAE;oBACf,IAAI,EAAE,eAAe;oBACrB,GAAG,MAAM,CAAC,eAAe;iBAC1B;aACF;YACH,CAAC,CAAC,KAAK,CAAC,IAAI,KAAK,eAAe;gBAC9B,CAAC,CAAC;oBACE,eAAe,EAAE;wBACf,IAAI,EAAE,eAAe;wBACrB,GAAG,KAAK,CAAC,SAAS;qBACnB;iBACF;gBACH,CAAC,CAAC,EAAE,aAAa,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC;IAEzC,MAAM,CAAC,KAAK,CAAC,oBAAoB,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;IACjE,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;QAC/B,MAAM,EAAE,qBAAqB;QAC7B,MAAM,EAAE;YACN;gBACE,GAAG,MAAM;gBACT,GAAG,WAAW;aACf;SACF;KACF,CAAC,CAAC;IACH,MAAM,CAAC,KAAK,CAAC,mBAAmB,EAAE,EAAE,KAAK,EAAE,GAAG,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;IAElE,OAAO,GAAG,CAAC;AACb,CAAC","sourcesContent":["import type { InnerWalletApiClient } from \"../types.ts\";\nimport { LOGGER } from \"../logger.js\";\nimport type { Address, Prettify } from \"viem\";\nimport type { WalletServerRpcSchemaType } from \"@alchemy/wallet-api-types/rpc\";\nimport { getSignerAddressOrPublicKey } from \"../utils/signer.js\";\nimport type { WebAuthnPublicKey } from \"@alchemy/wallet-api-types\";\n\ntype RpcSchema = Extract<\n  WalletServerRpcSchemaType,\n  {\n    Request: {\n      method: \"wallet_listAccounts\";\n    };\n  }\n>;\n\nexport type ListAccountsParams = Prettify<\n  Omit<RpcSchema[\"Request\"][\"params\"][0], \"signerAddress\"> &\n    (\n      | {\n          signerAddress?: Address;\n          signerPublicKey?: never;\n        }\n      | { signerPublicKey: WebAuthnPublicKey; signerAddress?: never }\n      | {\n          signerAddress?: never;\n          signerPublicKey?: never;\n        }\n    )\n>;\n\nexport type ListAccountsResult = Prettify<RpcSchema[\"ReturnType\"]>;\n\n/**\n * Lists all smart accounts for a given signer using the wallet API client.\n *\n * @param {InnerWalletApiClient} client - The wallet API client to use for the request\n * @param {ListAccountsParams} params - Parameters for listing accounts\n * @param {string} params.signerAddress - The address of the signer to list accounts for\n * @param {number} [params.limit] - Optional maximum number of accounts to return (default: 100, max: 100)\n * @param {string} [params.after] - Optional pagination cursor for fetching subsequent pages\n * @returns {Promise<ListAccountsResult>} A Promise that resolves to the list of accounts and pagination metadata\n *\n * @example\n * ```ts\n * // Fetch the first page of accounts\n * const firstPage = await client.listAccounts({\n *   signerAddress: \"0x123...\",\n *   limit: 10\n * });\n *\n * // If an 'after' cursor exists, use it to fetch the next page\n * const nextPage = await client.listAccounts({\n *   signerAddress: \"0x123...\",\n *   limit: 10,\n *   after: firstPage.meta.after\n * });\n * ```\n */\nexport async function listAccounts(\n  client: InnerWalletApiClient,\n  params: ListAccountsParams,\n): Promise<ListAccountsResult> {\n  const owner = getSignerAddressOrPublicKey(client.owner);\n\n  // Coalesce:\n  // signerAddress or signerPublicKey in params takes priority.\n  // if not present, then fallback to client's attached signer.\n  const signerParam: RpcSchema[\"Request\"][\"params\"][0] = params.signerAddress\n    ? { signerAddress: params.signerAddress }\n    : params.signerPublicKey\n      ? {\n          signerPublicKey: {\n            type: \"webauthn-p256\",\n            ...params.signerPublicKey,\n          },\n        }\n      : owner.type === \"webauthn-p256\"\n        ? {\n            signerPublicKey: {\n              type: \"webauthn-p256\",\n              ...owner.publicKey,\n            },\n          }\n        : { signerAddress: owner.address };\n\n  LOGGER.debug(\"listAccounts:start\", { hasAfter: !!params.after });\n  const res = await client.request({\n    method: \"wallet_listAccounts\",\n    params: [\n      {\n        ...params,\n        ...signerParam,\n      },\n    ],\n  });\n  LOGGER.debug(\"listAccounts:done\", { count: res.accounts.length });\n\n  return res;\n}\n"]}
+{"version":3,"file":"listAccounts.js","sourceRoot":"","sources":["../../../src/actions/listAccounts.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAGtC,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAuBxD;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,MAA4B,EAC5B,MAA0B;IAE1B,MAAM,aAAa,GACjB,MAAM,CAAC,aAAa;QACpB,CAAC,cAAc,CAAC,MAAM,CAAC,KAAK,CAAC;YAC3B,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO;YACtB,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAEpC,MAAM,CAAC,KAAK,CAAC,oBAAoB,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;IACjE,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;QAC/B,MAAM,EAAE,qBAAqB;QAC7B,MAAM,EAAE;YACN;gBACE,GAAG,MAAM;gBACT,aAAa;aACd;SACF;KACF,CAAC,CAAC;IACH,MAAM,CAAC,KAAK,CAAC,mBAAmB,EAAE,EAAE,KAAK,EAAE,GAAG,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;IAElE,OAAO,GAAG,CAAC;AACb,CAAC","sourcesContent":["import type { InnerWalletApiClient } from \"../types.ts\";\nimport { LOGGER } from \"../logger.js\";\nimport type { Address, Prettify } from \"viem\";\nimport type { WalletServerRpcSchemaType } from \"@alchemy/wallet-api-types/rpc\";\nimport { isLocalAccount } from \"../utils/assertions.js\";\n\ntype RpcSchema = Extract<\n  WalletServerRpcSchemaType,\n  {\n    Request: {\n      method: \"wallet_listAccounts\";\n    };\n  }\n>;\n\nexport type ListAccountsParams = Prettify<\n  Omit<\n    RpcSchema[\"Request\"][\"params\"][0],\n    \"signerAddress\" | \"signerPublicKey\"\n  > & {\n    signerAddress?: Address;\n    signerPublicKey?: never;\n  }\n>;\n\nexport type ListAccountsResult = Prettify<RpcSchema[\"ReturnType\"]>;\n\n/**\n * Lists all smart accounts for a given signer using the wallet API client.\n *\n * @param {InnerWalletApiClient} client - The wallet API client to use for the request\n * @param {ListAccountsParams} params - Parameters for listing accounts\n * @param {string} params.signerAddress - The address of the signer to list accounts for\n * @param {number} [params.limit] - Optional maximum number of accounts to return (default: 100, max: 100)\n * @param {string} [params.after] - Optional pagination cursor for fetching subsequent pages\n * @returns {Promise<ListAccountsResult>} A Promise that resolves to the list of accounts and pagination metadata\n *\n * @example\n * ```ts\n * // Fetch the first page of accounts\n * const firstPage = await client.listAccounts({\n *   signerAddress: \"0x123...\",\n *   limit: 10\n * });\n *\n * // If an 'after' cursor exists, use it to fetch the next page\n * const nextPage = await client.listAccounts({\n *   signerAddress: \"0x123...\",\n *   limit: 10,\n *   after: firstPage.meta.after\n * });\n * ```\n */\nexport async function listAccounts(\n  client: InnerWalletApiClient,\n  params: ListAccountsParams,\n): Promise<ListAccountsResult> {\n  const signerAddress =\n    params.signerAddress ??\n    (isLocalAccount(client.owner)\n      ? client.owner.address\n      : client.owner.account.address);\n\n  LOGGER.debug(\"listAccounts:start\", { hasAfter: !!params.after });\n  const res = await client.request({\n    method: \"wallet_listAccounts\",\n    params: [\n      {\n        ...params,\n        signerAddress,\n      },\n    ],\n  });\n  LOGGER.debug(\"listAccounts:done\", { count: res.accounts.length });\n\n  return res;\n}\n"]}

package/dist/esm/actions/prepareCalls.d.ts

@@ -1,33 +1,32 @@
-import { type Address, type IsUndefined, type Prettify } from "viem";
-import type { InnerWalletApiClient, OptionalChainId } from "../types.ts";
+import { type Prettify } from "viem";
+import type { InnerWalletApiClient, OptionalChainId, OptionalFrom } from "../types.ts";
 import type { WalletServerRpcSchemaType } from "@alchemy/wallet-api-types/rpc";
 type RpcSchema = Extract<WalletServerRpcSchemaType, {
     Request: {
         method: "wallet_prepareCalls";
     };
 }>;
-export type PrepareCallsParams<TAccount extends Address | undefined = Address | undefined> = Prettify<OptionalChainId<Omit<RpcSchema["Request"]["params"][0], "from">> & (IsUndefined<TAccount> extends true ? {
-    from: Address;
-} : {
-    from?: never;
-})>;
+export type PrepareCallsParams = Prettify<OptionalFrom<OptionalChainId<RpcSchema["Request"]["params"][0]>>>;
 export type PrepareCallsResult = Prettify<RpcSchema["ReturnType"]>;
 /**
  * Prepares a set of contract calls for execution by building a user operation.
  * Returns the built user operation and a signature request that needs to be signed
  * before submitting to sendPreparedCalls.
  *
- * @param {InnerWalletApiClient<TAccount>} client - The wallet API client to use for the request
- * @param {PrepareCallsParams<TAccount>} params - Parameters for preparing calls
+ * The client defaults to using EIP-7702 with the signer's address, so you can call
+ * this directly without first calling `requestAccount`.
+ *
+ * @param {InnerWalletApiClient} client - The wallet API client to use for the request
+ * @param {PrepareCallsParams} params - Parameters for preparing calls
  * @param {Array<{to: Address, data?: Hex, value?: Hex}>} params.calls - Array of contract calls to execute
- * @param {Address} [params.from] - The address to execute the calls from (required if the client wasn't initialized with an account)
+ * @param {Address} [params.from] - The address to execute the calls from. Defaults to the client's account (signer address via EIP-7702).
  * @param {object} [params.capabilities] - Optional capabilities to include with the request
  * @returns {Promise<PrepareCallsResult>} A Promise that resolves to the prepared calls result containing
  * the user operation data and signature request
  *
  * @example
  * ```ts
- * // Prepare a sponsored user operation call
+ * // Prepare a sponsored user operation call (uses signer address via EIP-7702 by default)
  * const result = await client.prepareCalls({
  *   calls: [{
  *     to: "0x1234...",
@@ -40,5 +39,5 @@ export type PrepareCallsResult = Prettify<RpcSchema["ReturnType"]>;
  * });
  * ```
  */
-export declare function prepareCalls<TAccount extends Address | undefined = Address | undefined>(client: InnerWalletApiClient, params: PrepareCallsParams<TAccount>): Promise<PrepareCallsResult>;
+export declare function prepareCalls(client: InnerWalletApiClient, params: PrepareCallsParams): Promise<PrepareCallsResult>;
 export {};

package/dist/esm/actions/prepareCalls.js

@@ -7,17 +7,20 @@ import { mergeClientCapabilities } from "../utils/capabilities.js";
  * Returns the built user operation and a signature request that needs to be signed
  * before submitting to sendPreparedCalls.
  *
- * @param {InnerWalletApiClient<TAccount>} client - The wallet API client to use for the request
- * @param {PrepareCallsParams<TAccount>} params - Parameters for preparing calls
+ * The client defaults to using EIP-7702 with the signer's address, so you can call
+ * this directly without first calling `requestAccount`.
+ *
+ * @param {InnerWalletApiClient} client - The wallet API client to use for the request
+ * @param {PrepareCallsParams} params - Parameters for preparing calls
  * @param {Array<{to: Address, data?: Hex, value?: Hex}>} params.calls - Array of contract calls to execute
- * @param {Address} [params.from] - The address to execute the calls from (required if the client wasn't initialized with an account)
+ * @param {Address} [params.from] - The address to execute the calls from. Defaults to the client's account (signer address via EIP-7702).
  * @param {object} [params.capabilities] - Optional capabilities to include with the request
  * @returns {Promise<PrepareCallsResult>} A Promise that resolves to the prepared calls result containing
  * the user operation data and signature request
  *
  * @example
  * ```ts
- * // Prepare a sponsored user operation call
+ * // Prepare a sponsored user operation call (uses signer address via EIP-7702 by default)
  * const result = await client.prepareCalls({
  *   calls: [{
  *     to: "0x1234...",

package/dist/esm/actions/prepareCalls.js.map

@@ -1 +1 @@
-{"version":3,"file":"prepareCalls.js","sourceRoot":"","sources":["../../../src/actions/prepareCalls.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAiD,MAAM,MAAM,CAAC;AAE5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AAqBnE;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAGhC,MAA4B,EAC5B,MAAoC;IAEpC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC;IACpD,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,CAAC,IAAI,CAAC,sBAAsB,EAAE,EAAE,gBAAgB,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;QAC5E,MAAM,IAAI,oBAAoB,EAAE,CAAC;IACnC,CAAC;IAED,MAAM,YAAY,GAAG,uBAAuB,CAAC,MAAM,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC;IAE1E,MAAM,CAAC,KAAK,CAAC,oBAAoB,EAAE;QACjC,UAAU,EAAE,MAAM,CAAC,KAAK,EAAE,MAAM;QAChC,eAAe,EAAE,CAAC,CAAC,MAAM,CAAC,YAAY;KACvC,CAAC,CAAC;IACH,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;QAC/B,MAAM,EAAE,qBAAqB;QAC7B,MAAM,EAAE;YACN;gBACE,GAAG,MAAM;gBACT,OAAO,EAAE,MAAM,CAAC,OAAO,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;gBACjD,IAAI;gBACJ,YAAY;aACb;SACF;KACF,CAAC,CAAC;IACH,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;IAClC,OAAO,GAAG,CAAC;AACb,CAAC","sourcesContent":["import { toHex, type Address, type IsUndefined, type Prettify } from \"viem\";\nimport type { InnerWalletApiClient, OptionalChainId } from \"../types.ts\";\nimport { AccountNotFoundError } from \"@alchemy/common\";\nimport { LOGGER } from \"../logger.js\";\nimport { mergeClientCapabilities } from \"../utils/capabilities.js\";\nimport type { WalletServerRpcSchemaType } from \"@alchemy/wallet-api-types/rpc\";\n\ntype RpcSchema = Extract<\n  WalletServerRpcSchemaType,\n  {\n    Request: {\n      method: \"wallet_prepareCalls\";\n    };\n  }\n>;\n\nexport type PrepareCallsParams<\n  TAccount extends Address | undefined = Address | undefined,\n> = Prettify<\n  OptionalChainId<Omit<RpcSchema[\"Request\"][\"params\"][0], \"from\">> &\n    (IsUndefined<TAccount> extends true ? { from: Address } : { from?: never })\n>;\n\nexport type PrepareCallsResult = Prettify<RpcSchema[\"ReturnType\"]>;\n\n/**\n * Prepares a set of contract calls for execution by building a user operation.\n * Returns the built user operation and a signature request that needs to be signed\n * before submitting to sendPreparedCalls.\n *\n * @param {InnerWalletApiClient<TAccount>} client - The wallet API client to use for the request\n * @param {PrepareCallsParams<TAccount>} params - Parameters for preparing calls\n * @param {Array<{to: Address, data?: Hex, value?: Hex}>} params.calls - Array of contract calls to execute\n * @param {Address} [params.from] - The address to execute the calls from (required if the client wasn't initialized with an account)\n * @param {object} [params.capabilities] - Optional capabilities to include with the request\n * @returns {Promise<PrepareCallsResult>} A Promise that resolves to the prepared calls result containing\n * the user operation data and signature request\n *\n * @example\n * ```ts\n * // Prepare a sponsored user operation call\n * const result = await client.prepareCalls({\n *   calls: [{\n *     to: \"0x1234...\",\n *     data: \"0xabcdef...\",\n *     value: \"0x0\"\n *   }],\n *   capabilities: {\n *     paymasterService: { policyId: \"your-policy-id\" }\n *   }\n * });\n * ```\n */\nexport async function prepareCalls<\n  TAccount extends Address | undefined = Address | undefined,\n>(\n  client: InnerWalletApiClient,\n  params: PrepareCallsParams<TAccount>,\n): Promise<PrepareCallsResult> {\n  const from = params.from ?? client.account?.address;\n  if (!from) {\n    LOGGER.warn(\"prepareCalls:no-from\", { hasClientAccount: !!client.account });\n    throw new AccountNotFoundError();\n  }\n\n  const capabilities = mergeClientCapabilities(client, params.capabilities);\n\n  LOGGER.debug(\"prepareCalls:start\", {\n    callsCount: params.calls?.length,\n    hasCapabilities: !!params.capabilities,\n  });\n  const res = await client.request({\n    method: \"wallet_prepareCalls\",\n    params: [\n      {\n        ...params,\n        chainId: params.chainId ?? toHex(client.chain.id),\n        from,\n        capabilities,\n      },\n    ],\n  });\n  LOGGER.debug(\"prepareCalls:done\");\n  return res;\n}\n"]}
+{"version":3,"file":"prepareCalls.js","sourceRoot":"","sources":["../../../src/actions/prepareCalls.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAiB,MAAM,MAAM,CAAC;AAM5C,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AAkBnE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,MAA4B,EAC5B,MAA0B;IAE1B,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC;IACpD,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,CAAC,IAAI,CAAC,sBAAsB,EAAE,EAAE,gBAAgB,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;QAC5E,MAAM,IAAI,oBAAoB,EAAE,CAAC;IACnC,CAAC;IAED,MAAM,YAAY,GAAG,uBAAuB,CAAC,MAAM,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC;IAE1E,MAAM,CAAC,KAAK,CAAC,oBAAoB,EAAE;QACjC,UAAU,EAAE,MAAM,CAAC,KAAK,EAAE,MAAM;QAChC,eAAe,EAAE,CAAC,CAAC,MAAM,CAAC,YAAY;KACvC,CAAC,CAAC;IACH,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;QAC/B,MAAM,EAAE,qBAAqB;QAC7B,MAAM,EAAE;YACN;gBACE,GAAG,MAAM;gBACT,OAAO,EAAE,MAAM,CAAC,OAAO,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;gBACjD,IAAI;gBACJ,YAAY;aACb;SACF;KACF,CAAC,CAAC;IACH,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;IAClC,OAAO,GAAG,CAAC;AACb,CAAC","sourcesContent":["import { toHex, type Prettify } from \"viem\";\nimport type {\n  InnerWalletApiClient,\n  OptionalChainId,\n  OptionalFrom,\n} from \"../types.ts\";\nimport { AccountNotFoundError } from \"@alchemy/common\";\nimport { LOGGER } from \"../logger.js\";\nimport { mergeClientCapabilities } from \"../utils/capabilities.js\";\nimport type { WalletServerRpcSchemaType } from \"@alchemy/wallet-api-types/rpc\";\n\ntype RpcSchema = Extract<\n  WalletServerRpcSchemaType,\n  {\n    Request: {\n      method: \"wallet_prepareCalls\";\n    };\n  }\n>;\n\nexport type PrepareCallsParams = Prettify<\n  OptionalFrom<OptionalChainId<RpcSchema[\"Request\"][\"params\"][0]>>\n>;\n\nexport type PrepareCallsResult = Prettify<RpcSchema[\"ReturnType\"]>;\n\n/**\n * Prepares a set of contract calls for execution by building a user operation.\n * Returns the built user operation and a signature request that needs to be signed\n * before submitting to sendPreparedCalls.\n *\n * The client defaults to using EIP-7702 with the signer's address, so you can call\n * this directly without first calling `requestAccount`.\n *\n * @param {InnerWalletApiClient} client - The wallet API client to use for the request\n * @param {PrepareCallsParams} params - Parameters for preparing calls\n * @param {Array<{to: Address, data?: Hex, value?: Hex}>} params.calls - Array of contract calls to execute\n * @param {Address} [params.from] - The address to execute the calls from. Defaults to the client's account (signer address via EIP-7702).\n * @param {object} [params.capabilities] - Optional capabilities to include with the request\n * @returns {Promise<PrepareCallsResult>} A Promise that resolves to the prepared calls result containing\n * the user operation data and signature request\n *\n * @example\n * ```ts\n * // Prepare a sponsored user operation call (uses signer address via EIP-7702 by default)\n * const result = await client.prepareCalls({\n *   calls: [{\n *     to: \"0x1234...\",\n *     data: \"0xabcdef...\",\n *     value: \"0x0\"\n *   }],\n *   capabilities: {\n *     paymasterService: { policyId: \"your-policy-id\" }\n *   }\n * });\n * ```\n */\nexport async function prepareCalls(\n  client: InnerWalletApiClient,\n  params: PrepareCallsParams,\n): Promise<PrepareCallsResult> {\n  const from = params.from ?? client.account?.address;\n  if (!from) {\n    LOGGER.warn(\"prepareCalls:no-from\", { hasClientAccount: !!client.account });\n    throw new AccountNotFoundError();\n  }\n\n  const capabilities = mergeClientCapabilities(client, params.capabilities);\n\n  LOGGER.debug(\"prepareCalls:start\", {\n    callsCount: params.calls?.length,\n    hasCapabilities: !!params.capabilities,\n  });\n  const res = await client.request({\n    method: \"wallet_prepareCalls\",\n    params: [\n      {\n        ...params,\n        chainId: params.chainId ?? toHex(client.chain.id),\n        from,\n        capabilities,\n      },\n    ],\n  });\n  LOGGER.debug(\"prepareCalls:done\");\n  return res;\n}\n"]}

package/dist/esm/actions/prepareSign.d.ts

@@ -1,16 +1,12 @@
-import type { InnerWalletApiClient, OptionalChainId } from "../types.ts";
-import { type Address, type IsUndefined, type Prettify } from "viem";
+import type { InnerWalletApiClient, OptionalChainId, OptionalFrom } from "../types.ts";
+import { type Prettify } from "viem";
 import type { WalletServerRpcSchemaType } from "@alchemy/wallet-api-types/rpc";
 type RpcSchema = Extract<WalletServerRpcSchemaType, {
     Request: {
         method: "wallet_prepareSign";
     };
 }>;
-export type PrepareSignParams<TAccount extends Address | undefined = Address | undefined> = Prettify<OptionalChainId<Omit<RpcSchema["Request"]["params"][0], "from">> & (IsUndefined<TAccount> extends true ? {
-    from: Address;
-} : {
-    from?: never;
-})>;
+export type PrepareSignParams = Prettify<OptionalFrom<OptionalChainId<RpcSchema["Request"]["params"][0]>>>;
 export type PrepareSignResult = Prettify<RpcSchema["ReturnType"]>;
 /**
  * Prepares a signature request for signing messages or transactions.
@@ -29,5 +25,5 @@ export type PrepareSignResult = Prettify<RpcSchema["ReturnType"]>;
  * });
  * ```
  */
-export declare function prepareSign<TAccount extends Address | undefined = Address | undefined>(client: InnerWalletApiClient, params: PrepareSignParams<TAccount>): Promise<PrepareSignResult>;
+export declare function prepareSign(client: InnerWalletApiClient, params: PrepareSignParams): Promise<PrepareSignResult>;
 export {};

package/dist/esm/actions/prepareSign.js.map

@@ -1 +1 @@
-{"version":3,"file":"prepareSign.js","sourceRoot":"","sources":["../../../src/actions/prepareSign.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAiD,MAAM,MAAM,CAAC;AAE5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAoBtC;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAG/B,MAA4B,EAC5B,MAAmC;IAEnC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC;IACpD,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,CAAC,IAAI,CAAC,qBAAqB,EAAE,EAAE,gBAAgB,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;QAC3E,MAAM,IAAI,oBAAoB,EAAE,CAAC;IACnC,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,mBAAmB,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAC,CAAC;IAC1E,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;QAC/B,MAAM,EAAE,oBAAoB;QAC5B,MAAM,EAAE;YACN;gBACE,GAAG,MAAM;gBACT,IAAI;gBACJ,OAAO,EAAE,MAAM,CAAC,OAAO,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;aAClD;SACF;KACF,CAAC,CAAC;IACH,MAAM,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;IACjC,OAAO,GAAG,CAAC;AACb,CAAC","sourcesContent":["import type { InnerWalletApiClient, OptionalChainId } from \"../types.ts\";\nimport { toHex, type Address, type IsUndefined, type Prettify } from \"viem\";\nimport type { WalletServerRpcSchemaType } from \"@alchemy/wallet-api-types/rpc\";\nimport { AccountNotFoundError } from \"@alchemy/common\";\nimport { LOGGER } from \"../logger.js\";\n\ntype RpcSchema = Extract<\n  WalletServerRpcSchemaType,\n  {\n    Request: {\n      method: \"wallet_prepareSign\";\n    };\n  }\n>;\n\nexport type PrepareSignParams<\n  TAccount extends Address | undefined = Address | undefined,\n> = Prettify<\n  OptionalChainId<Omit<RpcSchema[\"Request\"][\"params\"][0], \"from\">> &\n    (IsUndefined<TAccount> extends true ? { from: Address } : { from?: never })\n>;\n\nexport type PrepareSignResult = Prettify<RpcSchema[\"ReturnType\"]>;\n\n/**\n * Prepares a signature request for signing messages or transactions.\n *\n * @param {InnerWalletApiClient} client - The wallet API client to use for the request\n * @param {PrepareSignParams} params - Parameters for preparing the signature request\n * @returns {Promise<PrepareSignResult>} A Promise that resolves to the prepare sign result containing a signature request\n *\n * @example\n * ```ts\n * // Prepare a message to be signed\n * const result = await client.prepareSign({\n *    from: \"0x1234...\",\n *    type: \"personal_sign\",\n *    data: \"Hello, world!\",\n * });\n * ```\n */\nexport async function prepareSign<\n  TAccount extends Address | undefined = Address | undefined,\n>(\n  client: InnerWalletApiClient,\n  params: PrepareSignParams<TAccount>,\n): Promise<PrepareSignResult> {\n  const from = params.from ?? client.account?.address;\n  if (!from) {\n    LOGGER.warn(\"prepareSign:no-from\", { hasClientAccount: !!client.account });\n    throw new AccountNotFoundError();\n  }\n\n  LOGGER.debug(\"prepareSign:start\", { type: params.signatureRequest.type });\n  const res = await client.request({\n    method: \"wallet_prepareSign\",\n    params: [\n      {\n        ...params,\n        from,\n        chainId: params.chainId ?? toHex(client.chain.id),\n      },\n    ],\n  });\n  LOGGER.debug(\"prepareSign:done\");\n  return res;\n}\n"]}
+{"version":3,"file":"prepareSign.js","sourceRoot":"","sources":["../../../src/actions/prepareSign.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,EAAiB,MAAM,MAAM,CAAC;AAE5C,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAiBtC;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,MAA4B,EAC5B,MAAyB;IAEzB,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC;IACpD,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,CAAC,IAAI,CAAC,qBAAqB,EAAE,EAAE,gBAAgB,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;QAC3E,MAAM,IAAI,oBAAoB,EAAE,CAAC;IACnC,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,mBAAmB,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAC,CAAC;IAC1E,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;QAC/B,MAAM,EAAE,oBAAoB;QAC5B,MAAM,EAAE;YACN;gBACE,GAAG,MAAM;gBACT,IAAI;gBACJ,OAAO,EAAE,MAAM,CAAC,OAAO,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;aAClD;SACF;KACF,CAAC,CAAC;IACH,MAAM,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;IACjC,OAAO,GAAG,CAAC;AACb,CAAC","sourcesContent":["import type {\n  InnerWalletApiClient,\n  OptionalChainId,\n  OptionalFrom,\n} from \"../types.ts\";\nimport { toHex, type Prettify } from \"viem\";\nimport type { WalletServerRpcSchemaType } from \"@alchemy/wallet-api-types/rpc\";\nimport { AccountNotFoundError } from \"@alchemy/common\";\nimport { LOGGER } from \"../logger.js\";\n\ntype RpcSchema = Extract<\n  WalletServerRpcSchemaType,\n  {\n    Request: {\n      method: \"wallet_prepareSign\";\n    };\n  }\n>;\n\nexport type PrepareSignParams = Prettify<\n  OptionalFrom<OptionalChainId<RpcSchema[\"Request\"][\"params\"][0]>>\n>;\n\nexport type PrepareSignResult = Prettify<RpcSchema[\"ReturnType\"]>;\n\n/**\n * Prepares a signature request for signing messages or transactions.\n *\n * @param {InnerWalletApiClient} client - The wallet API client to use for the request\n * @param {PrepareSignParams} params - Parameters for preparing the signature request\n * @returns {Promise<PrepareSignResult>} A Promise that resolves to the prepare sign result containing a signature request\n *\n * @example\n * ```ts\n * // Prepare a message to be signed\n * const result = await client.prepareSign({\n *    from: \"0x1234...\",\n *    type: \"personal_sign\",\n *    data: \"Hello, world!\",\n * });\n * ```\n */\nexport async function prepareSign(\n  client: InnerWalletApiClient,\n  params: PrepareSignParams,\n): Promise<PrepareSignResult> {\n  const from = params.from ?? client.account?.address;\n  if (!from) {\n    LOGGER.warn(\"prepareSign:no-from\", { hasClientAccount: !!client.account });\n    throw new AccountNotFoundError();\n  }\n\n  LOGGER.debug(\"prepareSign:start\", { type: params.signatureRequest.type });\n  const res = await client.request({\n    method: \"wallet_prepareSign\",\n    params: [\n      {\n        ...params,\n        from,\n        chainId: params.chainId ?? toHex(client.chain.id),\n      },\n    ],\n  });\n  LOGGER.debug(\"prepareSign:done\");\n  return res;\n}\n"]}

package/dist/esm/actions/requestAccount.d.ts

@@ -2,7 +2,6 @@ import type { Address } from "abitype";
 import { type Prettify } from "viem";
 import type { WalletServerRpcSchemaType } from "@alchemy/wallet-api-types/rpc";
 import type { InnerWalletApiClient } from "../types";
-import type { WebAuthnPublicKey } from "@alchemy/wallet-api-types";
 type RpcSchema = Extract<WalletServerRpcSchemaType, {
     Request: {
         method: "wallet_requestAccount";
@@ -10,16 +9,23 @@ type RpcSchema = Extract<WalletServerRpcSchemaType, {
 }>;
 export type RequestAccountParams = Prettify<Omit<Extract<RpcSchema["Request"]["params"][0], {
     signerAddress: Address;
+}>, "signerAddress" | "includeCounterfactualInfo"> & ({
+    signerAddress?: Address;
+    accountAddress?: never;
 } | {
-    signerPublicKey: WebAuthnPublicKey;
-}>, "signerAddress" | "signerPublicKey" | "includeCounterfactualInfo"> & {
-    accountAddress?: Address;
-}>;
+    signerAddress?: never;
+    accountAddress: Address;
+})>;
 export type RequestAccountResult = Prettify<{
     address: Address;
 }>;
 /**
- * Requests an account for the provided signer using the wallet API client.
+ * Requests a smart account address for the provided signer using the wallet API client.
+ *
+ * Note: This is only needed for non-EIP-7702 accounts. The client defaults to using
+ * EIP-7702 with the signer's address, so you can call `prepareCalls` or `sendCalls`
+ * directly without first calling `requestAccount`.
+ *
  * If an account already exists for the signer, it will always return that account unless a new ID is specified.
  * If an account already exists, the creationHint will be ignored.
  *
@@ -31,9 +37,8 @@ export type RequestAccountResult = Prettify<{
  *
  * @example
  * ```ts
- * // Request an account with default parameters using a local signer
- * const signer = LocalAccountSigner.privateKeyToAccountSigner("0x...");
- * const account = await client.requestAccount(signer);
+ * // Request a non-7702 smart account
+ * const account = await client.requestAccount();
  * ```
  */
 export declare function requestAccount(client: InnerWalletApiClient, params?: RequestAccountParams): Promise<RequestAccountResult>;

package/dist/esm/actions/requestAccount.js

@@ -1,10 +1,14 @@
-import { BaseError } from "viem";
+import { isAddressEqual } from "viem";
 import deepEqual from "deep-equal";
 import { LOGGER } from "../logger.js";
-import { isWebAuthnAccount } from "../utils/assertions.js";
-import { getSignerAddressOrPublicKey } from "../utils/signer.js";
+import { isLocalAccount } from "../utils/assertions.js";
 /**
- * Requests an account for the provided signer using the wallet API client.
+ * Requests a smart account address for the provided signer using the wallet API client.
+ *
+ * Note: This is only needed for non-EIP-7702 accounts. The client defaults to using
+ * EIP-7702 with the signer's address, so you can call `prepareCalls` or `sendCalls`
+ * directly without first calling `requestAccount`.
+ *
  * If an account already exists for the signer, it will always return that account unless a new ID is specified.
  * If an account already exists, the creationHint will be ignored.
  *
@@ -16,9 +20,8 @@ import { getSignerAddressOrPublicKey } from "../utils/signer.js";
  *
  * @example
  * ```ts
- * // Request an account with default parameters using a local signer
- * const signer = LocalAccountSigner.privateKeyToAccountSigner("0x...");
- * const account = await client.requestAccount(signer);
+ * // Request a non-7702 smart account
+ * const account = await client.requestAccount();
  * ```
  */
 export async function requestAccount(client, params) {
@@ -26,51 +29,24 @@ export async function requestAccount(client, params) {
         hasParams: !!params,
         hasAccountOnClient: !!client.account,
     });
-    const { creationHint = {} } = params ?? {};
-    if (isWebAuthnAccount(client.owner)) {
-        if (creationHint.accountType &&
-            creationHint.accountType !== "mav2-webauthn") {
-            throw new BaseError("WebAuthn signers are only supported with mav2-webauthn account type");
-        }
-    }
-    else {
-        // Non-webauthn signers do not support the "mav2-webauthn" account type.
-        if (creationHint.accountType === "mav2-webauthn") {
-            throw new BaseError("ECDSA (secp256k1) signers are not supported with mav2-webauthn account type");
-        }
-    }
-    const owner = getSignerAddressOrPublicKey(client.owner);
-    const args = (client.account && !params) || params?.accountAddress
+    const signerAddress = (params && "signerAddress" in params ? params.signerAddress : undefined) ??
+        (isLocalAccount(client.owner)
+            ? client.owner.address
+            : client.owner.account.address);
+    const args = params && "accountAddress" in params && params.accountAddress
         ? {
-            accountAddress: params?.accountAddress ?? client.account.address,
+            accountAddress: params.accountAddress,
             includeCounterfactualInfo: true,
         }
         : {
-            ...(owner.type === "webauthn-p256"
-                ? {
-                    signerPublicKey: {
-                        ...owner.publicKey,
-                        type: "webauthn-p256",
-                    },
-                    // Casts here are safe due to our checks above.
-                    ...(creationHint
-                        ? { creationHint: creationHint }
-                        : {}),
-                }
-                : {
-                    signerAddress: owner.address,
-                    ...(creationHint
-                        ? {
-                            creationHint: creationHint,
-                        }
-                        : {}),
-                }),
+            ...params,
+            signerAddress,
             includeCounterfactualInfo: true,
         };
     const cachedAccount = client.internal?.getAccount();
     if (cachedAccount &&
-        ((params?.accountAddress &&
-            cachedAccount.address === params.accountAddress) ||
+        ((args.accountAddress &&
+            isAddressEqual(cachedAccount.address, args.accountAddress)) ||
             deepEqual(cachedAccount.requestParams, args, { strict: true }))) {
         LOGGER.debug("requestAccount:cache-hit", {
             address: cachedAccount.address,

package/dist/esm/actions/requestAccount.js.map

@@ -1 +1 @@
-{"version":3,"file":"requestAccount.js","sourceRoot":"","sources":["../../../src/actions/requestAccount.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAiB,MAAM,MAAM,CAAC;AAEhD,OAAO,SAAS,MAAM,YAAY,CAAC;AAEnC,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAMtC,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,2BAA2B,EAAE,MAAM,oBAAoB,CAAC;AAuBjE;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,MAA4B,EAC5B,MAA6B;IAE7B,MAAM,CAAC,KAAK,CAAC,sBAAsB,EAAE;QACnC,SAAS,EAAE,CAAC,CAAC,MAAM;QACnB,kBAAkB,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO;KACrC,CAAC,CAAC;IAEH,MAAM,EAAE,YAAY,GAAG,EAAE,EAAE,GAAG,MAAM,IAAI,EAAE,CAAC;IAE3C,IAAI,iBAAiB,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;QACpC,IACE,YAAY,CAAC,WAAW;YACxB,YAAY,CAAC,WAAW,KAAK,eAAe,EAC5C,CAAC;YACD,MAAM,IAAI,SAAS,CACjB,qEAAqE,CACtE,CAAC;QACJ,CAAC;IACH,CAAC;SAAM,CAAC;QACN,wEAAwE;QACxE,IAAI,YAAY,CAAC,WAAW,KAAK,eAAe,EAAE,CAAC;YACjD,MAAM,IAAI,SAAS,CACjB,6EAA6E,CAC9E,CAAC;QACJ,CAAC;IACH,CAAC;IAED,MAAM,KAAK,GAAG,2BAA2B,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAExD,MAAM,IAAI,GACR,CAAC,MAAM,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,MAAM,EAAE,cAAc;QACnD,CAAC,CAAC;YACE,cAAc,EAAE,MAAM,EAAE,cAAc,IAAI,MAAM,CAAC,OAAQ,CAAC,OAAO;YACjE,yBAAyB,EAAE,IAAI;SAChC;QACH,CAAC,CAAC;YACE,GAAG,CAAC,KAAK,CAAC,IAAI,KAAK,eAAe;gBAChC,CAAC,CAAC;oBACE,eAAe,EAAE;wBACf,GAAG,KAAK,CAAC,SAAS;wBAClB,IAAI,EAAE,eAAe;qBACtB;oBACD,+CAA+C;oBAC/C,GAAG,CAAC,YAAY;wBACd,CAAC,CAAC,EAAE,YAAY,EAAE,YAA0C,EAAE;wBAC9D,CAAC,CAAC,EAAE,CAAC;iBACR;gBACH,CAAC,CAAC;oBACE,aAAa,EAAE,KAAK,CAAC,OAAO;oBAC5B,GAAG,CAAC,YAAY;wBACd,CAAC,CAAC;4BACE,YAAY,EACV,YAA8C;yBACjD;wBACH,CAAC,CAAC,EAAE,CAAC;iBACR,CAAC;YACN,yBAAyB,EAAE,IAAI;SAChC,CAAC;IAER,MAAM,aAAa,GAAG,MAAM,CAAC,QAAQ,EAAE,UAAU,EAAE,CAAC;IAEpD,IACE,aAAa;QACb,CAAC,CAAC,MAAM,EAAE,cAAc;YACtB,aAAa,CAAC,OAAO,KAAK,MAAM,CAAC,cAAc,CAAC;YAChD,SAAS,CAAC,aAAa,CAAC,aAAa,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,EACjE,CAAC;QACD,MAAM,CAAC,KAAK,CAAC,0BAA0B,EAAE;YACvC,OAAO,EAAE,aAAa,CAAC,OAAO;SAC/B,CAAC,CAAC;QACH,OAAO;YACL,OAAO,EAAE,aAAa,CAAC,OAAO;SAC/B,CAAC;IACJ,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;QAChC,MAAM,EAAE,uBAAuB;QAC/B,MAAM,EAAE,CAAC,IAAI,CAAC;KACf,CAAC,CAAC;IAEH,MAAM,CAAC,QAAQ,EAAE,UAAU,CAAC;QAC1B,OAAO,EAAE,IAAI,CAAC,cAAc;QAC5B,aAAa,EAAE,IAAI;KACpB,CAAC,CAAC;IAEH,MAAM,CAAC,KAAK,CAAC,qBAAqB,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC;IACtE,OAAO;QACL,OAAO,EAAE,IAAI,CAAC,cAAc;KAC7B,CAAC;AACJ,CAAC","sourcesContent":["import type { Address } from \"abitype\";\nimport { BaseError, type Prettify } from \"viem\";\nimport type { WalletServerRpcSchemaType } from \"@alchemy/wallet-api-types/rpc\";\nimport deepEqual from \"deep-equal\";\nimport type { InnerWalletApiClient } from \"../types\";\nimport { LOGGER } from \"../logger.js\";\nimport type {\n  CreationOptionsByPublicKey,\n  CreationOptionsBySignerAddress,\n  WebAuthnPublicKey,\n} from \"@alchemy/wallet-api-types\";\nimport { isWebAuthnAccount } from \"../utils/assertions.js\";\nimport { getSignerAddressOrPublicKey } from \"../utils/signer.js\";\n\ntype RpcSchema = Extract<\n  WalletServerRpcSchemaType,\n  {\n    Request: {\n      method: \"wallet_requestAccount\";\n    };\n  }\n>;\n\nexport type RequestAccountParams = Prettify<\n  Omit<\n    Extract<\n      RpcSchema[\"Request\"][\"params\"][0],\n      { signerAddress: Address } | { signerPublicKey: WebAuthnPublicKey }\n    >,\n    \"signerAddress\" | \"signerPublicKey\" | \"includeCounterfactualInfo\"\n  > & { accountAddress?: Address }\n>;\n\nexport type RequestAccountResult = Prettify<{ address: Address }>;\n\n/**\n * Requests an account for the provided signer using the wallet API client.\n * If an account already exists for the signer, it will always return that account unless a new ID is specified.\n * If an account already exists, the creationHint will be ignored.\n *\n * @param {InnerWalletApiClient} client - The wallet API client to use for the request\n * @param {RequestAccountParams} [params] - Optional parameters for requesting a specific account\n * @param {string} [params.id] - Optional identifier for the account. If specified, a new account with this ID will be created even if one already exists for the signer\n * @param {object} [params.creationHint] - Optional hints to guide account creation. These are ignored if an account already exists\n * @returns {Promise<RequestAccountResult>} A Promise that resolves to an object containing a smart account address\n *\n * @example\n * ```ts\n * // Request an account with default parameters using a local signer\n * const signer = LocalAccountSigner.privateKeyToAccountSigner(\"0x...\");\n * const account = await client.requestAccount(signer);\n * ```\n */\nexport async function requestAccount(\n  client: InnerWalletApiClient,\n  params?: RequestAccountParams,\n): Promise<RequestAccountResult> {\n  LOGGER.debug(\"requestAccount:start\", {\n    hasParams: !!params,\n    hasAccountOnClient: !!client.account,\n  });\n\n  const { creationHint = {} } = params ?? {};\n\n  if (isWebAuthnAccount(client.owner)) {\n    if (\n      creationHint.accountType &&\n      creationHint.accountType !== \"mav2-webauthn\"\n    ) {\n      throw new BaseError(\n        \"WebAuthn signers are only supported with mav2-webauthn account type\",\n      );\n    }\n  } else {\n    // Non-webauthn signers do not support the \"mav2-webauthn\" account type.\n    if (creationHint.accountType === \"mav2-webauthn\") {\n      throw new BaseError(\n        \"ECDSA (secp256k1) signers are not supported with mav2-webauthn account type\",\n      );\n    }\n  }\n\n  const owner = getSignerAddressOrPublicKey(client.owner);\n\n  const args: RpcSchema[\"Request\"][\"params\"][0] =\n    (client.account && !params) || params?.accountAddress\n      ? {\n          accountAddress: params?.accountAddress ?? client.account!.address,\n          includeCounterfactualInfo: true,\n        }\n      : {\n          ...(owner.type === \"webauthn-p256\"\n            ? {\n                signerPublicKey: {\n                  ...owner.publicKey,\n                  type: \"webauthn-p256\",\n                },\n                // Casts here are safe due to our checks above.\n                ...(creationHint\n                  ? { creationHint: creationHint as CreationOptionsByPublicKey }\n                  : {}),\n              }\n            : {\n                signerAddress: owner.address,\n                ...(creationHint\n                  ? {\n                      creationHint:\n                        creationHint as CreationOptionsBySignerAddress,\n                    }\n                  : {}),\n              }),\n          includeCounterfactualInfo: true,\n        };\n\n  const cachedAccount = client.internal?.getAccount();\n\n  if (\n    cachedAccount &&\n    ((params?.accountAddress &&\n      cachedAccount.address === params.accountAddress) ||\n      deepEqual(cachedAccount.requestParams, args, { strict: true }))\n  ) {\n    LOGGER.debug(\"requestAccount:cache-hit\", {\n      address: cachedAccount.address,\n    });\n    return {\n      address: cachedAccount.address,\n    };\n  }\n\n  const resp = await client.request({\n    method: \"wallet_requestAccount\",\n    params: [args],\n  });\n\n  client.internal?.setAccount({\n    address: resp.accountAddress,\n    requestParams: args,\n  });\n\n  LOGGER.debug(\"requestAccount:done\", { address: resp.accountAddress });\n  return {\n    address: resp.accountAddress,\n  };\n}\n"]}
+{"version":3,"file":"requestAccount.js","sourceRoot":"","sources":["../../../src/actions/requestAccount.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAiB,MAAM,MAAM,CAAC;AAErD,OAAO,SAAS,MAAM,YAAY,CAAC;AAEnC,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAwBxD;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,MAA4B,EAC5B,MAA6B;IAE7B,MAAM,CAAC,KAAK,CAAC,sBAAsB,EAAE;QACnC,SAAS,EAAE,CAAC,CAAC,MAAM;QACnB,kBAAkB,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO;KACrC,CAAC,CAAC;IAEH,MAAM,aAAa,GACjB,CAAC,MAAM,IAAI,eAAe,IAAI,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC;QACxE,CAAC,cAAc,CAAC,MAAM,CAAC,KAAK,CAAC;YAC3B,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO;YACtB,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAEpC,MAAM,IAAI,GACR,MAAM,IAAI,gBAAgB,IAAI,MAAM,IAAI,MAAM,CAAC,cAAc;QAC3D,CAAC,CAAC;YACE,cAAc,EAAE,MAAM,CAAC,cAAc;YACrC,yBAAyB,EAAE,IAAI;SAChC;QACH,CAAC,CAAC;YACE,GAAG,MAAM;YACT,aAAa;YACb,yBAAyB,EAAE,IAAI;SAChC,CAAC;IAER,MAAM,aAAa,GAAG,MAAM,CAAC,QAAQ,EAAE,UAAU,EAAE,CAAC;IAEpD,IACE,aAAa;QACb,CAAC,CAAC,IAAI,CAAC,cAAc;YACnB,cAAc,CAAC,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;YAC3D,SAAS,CAAC,aAAa,CAAC,aAAa,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,EACjE,CAAC;QACD,MAAM,CAAC,KAAK,CAAC,0BAA0B,EAAE;YACvC,OAAO,EAAE,aAAa,CAAC,OAAO;SAC/B,CAAC,CAAC;QACH,OAAO;YACL,OAAO,EAAE,aAAa,CAAC,OAAO;SAC/B,CAAC;IACJ,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;QAChC,MAAM,EAAE,uBAAuB;QAC/B,MAAM,EAAE,CAAC,IAAI,CAAC;KACf,CAAC,CAAC;IAEH,MAAM,CAAC,QAAQ,EAAE,UAAU,CAAC;QAC1B,OAAO,EAAE,IAAI,CAAC,cAAc;QAC5B,aAAa,EAAE,IAAI;KACpB,CAAC,CAAC;IAEH,MAAM,CAAC,KAAK,CAAC,qBAAqB,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC;IAEtE,OAAO;QACL,OAAO,EAAE,IAAI,CAAC,cAAc;KAC7B,CAAC;AACJ,CAAC","sourcesContent":["import type { Address } from \"abitype\";\nimport { isAddressEqual, type Prettify } from \"viem\";\nimport type { WalletServerRpcSchemaType } from \"@alchemy/wallet-api-types/rpc\";\nimport deepEqual from \"deep-equal\";\nimport type { InnerWalletApiClient } from \"../types\";\nimport { LOGGER } from \"../logger.js\";\nimport { isLocalAccount } from \"../utils/assertions.js\";\n\ntype RpcSchema = Extract<\n  WalletServerRpcSchemaType,\n  {\n    Request: {\n      method: \"wallet_requestAccount\";\n    };\n  }\n>;\n\nexport type RequestAccountParams = Prettify<\n  Omit<\n    Extract<RpcSchema[\"Request\"][\"params\"][0], { signerAddress: Address }>,\n    \"signerAddress\" | \"includeCounterfactualInfo\"\n  > &\n    (\n      | { signerAddress?: Address; accountAddress?: never }\n      | { signerAddress?: never; accountAddress: Address }\n    )\n>;\n\nexport type RequestAccountResult = Prettify<{ address: Address }>;\n\n/**\n * Requests a smart account address for the provided signer using the wallet API client.\n *\n * Note: This is only needed for non-EIP-7702 accounts. The client defaults to using\n * EIP-7702 with the signer's address, so you can call `prepareCalls` or `sendCalls`\n * directly without first calling `requestAccount`.\n *\n * If an account already exists for the signer, it will always return that account unless a new ID is specified.\n * If an account already exists, the creationHint will be ignored.\n *\n * @param {InnerWalletApiClient} client - The wallet API client to use for the request\n * @param {RequestAccountParams} [params] - Optional parameters for requesting a specific account\n * @param {string} [params.id] - Optional identifier for the account. If specified, a new account with this ID will be created even if one already exists for the signer\n * @param {object} [params.creationHint] - Optional hints to guide account creation. These are ignored if an account already exists\n * @returns {Promise<RequestAccountResult>} A Promise that resolves to an object containing a smart account address\n *\n * @example\n * ```ts\n * // Request a non-7702 smart account\n * const account = await client.requestAccount();\n * ```\n */\nexport async function requestAccount(\n  client: InnerWalletApiClient,\n  params?: RequestAccountParams,\n): Promise<RequestAccountResult> {\n  LOGGER.debug(\"requestAccount:start\", {\n    hasParams: !!params,\n    hasAccountOnClient: !!client.account,\n  });\n\n  const signerAddress =\n    (params && \"signerAddress\" in params ? params.signerAddress : undefined) ??\n    (isLocalAccount(client.owner)\n      ? client.owner.address\n      : client.owner.account.address);\n\n  const args =\n    params && \"accountAddress\" in params && params.accountAddress\n      ? {\n          accountAddress: params.accountAddress,\n          includeCounterfactualInfo: true,\n        }\n      : {\n          ...params,\n          signerAddress,\n          includeCounterfactualInfo: true,\n        };\n\n  const cachedAccount = client.internal?.getAccount();\n\n  if (\n    cachedAccount &&\n    ((args.accountAddress &&\n      isAddressEqual(cachedAccount.address, args.accountAddress)) ||\n      deepEqual(cachedAccount.requestParams, args, { strict: true }))\n  ) {\n    LOGGER.debug(\"requestAccount:cache-hit\", {\n      address: cachedAccount.address,\n    });\n    return {\n      address: cachedAccount.address,\n    };\n  }\n\n  const resp = await client.request({\n    method: \"wallet_requestAccount\",\n    params: [args],\n  });\n\n  client.internal?.setAccount({\n    address: resp.accountAddress,\n    requestParams: args,\n  });\n\n  LOGGER.debug(\"requestAccount:done\", { address: resp.accountAddress });\n\n  return {\n    address: resp.accountAddress,\n  };\n}\n"]}