@alchemy/wallet-apis 0.0.0-alpha.17 → 0.0.0-alpha.19

package/dist/esm/actions/prepareCalls.js

@@ -1,58 +1,63 @@
-import { toHex } from "viem";
-import { AccountNotFoundError } from "@alchemy/common";
 import { LOGGER } from "../logger.js";
-import { mergeClientCapabilities } from "../utils/capabilities.js";
+import { mergeClientCapabilities, toRpcCapabilities, } from "../utils/capabilities.js";
+import { resolveAddress } from "../utils/resolve.js";
+import { wallet_prepareCalls as MethodSchema } from "@alchemy/wallet-api-types/rpc";
+import { Value } from "typebox/value";
+import { methodSchema, } from "../utils/schema.js";
+const schema = methodSchema(MethodSchema);
 /**
  * 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
- * @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)
+ * 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?: bigint}>} params.calls - Array of contract calls to execute
+ * @param {AccountParam} [params.account] - The account to execute the calls from. Can be an address string or an object with an `address` property. 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...",
  *     data: "0xabcdef...",
- *     value: "0x0"
+ *     value: 0n
  *   }],
  *   capabilities: {
- *     paymasterService: { policyId: "your-policy-id" }
+ *     paymaster: { policyId: "your-policy-id" }
  *   }
  * });
  * ```
  */
 export async function prepareCalls(client, params) {
-    const from = params.from ?? client.account?.address;
-    if (!from) {
-        LOGGER.warn("prepareCalls:no-from", { hasClientAccount: !!client.account });
-        throw new AccountNotFoundError();
-    }
+    const from = params.account
+        ? resolveAddress(params.account)
+        : client.account.address;
+    const chainId = params.chainId ?? client.chain.id;
     const capabilities = mergeClientCapabilities(client, params.capabilities);
     LOGGER.debug("prepareCalls:start", {
         callsCount: params.calls?.length,
         hasCapabilities: !!params.capabilities,
     });
-    const res = await client.request({
+    const { account: _, chainId: __, ...rest } = params;
+    const rpcParams = Value.Encode(schema.request, {
+        ...rest,
+        chainId,
+        from,
+        capabilities: toRpcCapabilities(capabilities),
+    });
+    const rpcResp = await client.request({
         method: "wallet_prepareCalls",
-        params: [
-            {
-                ...params,
-                chainId: params.chainId ?? toHex(client.chain.id),
-                from,
-                capabilities,
-            },
-        ],
+        params: [rpcParams],
     });
     LOGGER.debug("prepareCalls:done");
-    return res;
+    return Value.Decode(schema.response, rpcResp);
 }
 //# sourceMappingURL=prepareCalls.js.map

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":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EACL,uBAAuB,EACvB,iBAAiB,GAElB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,cAAc,EAAqB,MAAM,qBAAqB,CAAC;AACxE,OAAO,EAAE,mBAAmB,IAAI,YAAY,EAAE,MAAM,+BAA+B,CAAC;AACpF,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,EACL,YAAY,GAGb,MAAM,oBAAoB,CAAC;AAE5B,MAAM,MAAM,GAAG,YAAY,CAAC,YAAY,CAAC,CAAC;AAe1C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,MAA4B,EAC5B,MAA0B;IAE1B,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO;QACzB,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC;QAChC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC;IAE3B,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;IAElD,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;IAEH,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,GAAG,IAAI,EAAE,GAAG,MAAM,CAAC;IACpD,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE;QAC7C,GAAG,IAAI;QACP,OAAO;QACP,IAAI;QACJ,YAAY,EAAE,iBAAiB,CAAC,YAAY,CAAC;KACb,CAAC,CAAC;IAEpC,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;QACnC,MAAM,EAAE,qBAAqB;QAC7B,MAAM,EAAE,CAAC,SAAS,CAAC;KACpB,CAAC,CAAC;IAEH,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;IAClC,OAAO,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;AAChD,CAAC","sourcesContent":["import type { Prettify } from \"viem\";\nimport type { DistributiveOmit, InnerWalletApiClient } from \"../types.ts\";\nimport { LOGGER } from \"../logger.js\";\nimport {\n  mergeClientCapabilities,\n  toRpcCapabilities,\n  type WithCapabilities,\n} from \"../utils/capabilities.js\";\nimport { resolveAddress, type AccountParam } from \"../utils/resolve.js\";\nimport { wallet_prepareCalls as MethodSchema } from \"@alchemy/wallet-api-types/rpc\";\nimport { Value } from \"typebox/value\";\nimport {\n  methodSchema,\n  type MethodParams,\n  type MethodResponse,\n} from \"../utils/schema.js\";\n\nconst schema = methodSchema(MethodSchema);\ntype BasePrepareCallsParams = MethodParams<typeof MethodSchema>;\ntype PrepareCallsResponse = MethodResponse<typeof MethodSchema>;\n\nexport type PrepareCallsParams = Prettify<\n  WithCapabilities<\n    DistributiveOmit<BasePrepareCallsParams, \"from\" | \"chainId\"> & {\n      account?: AccountParam;\n      chainId?: number;\n    }\n  >\n>;\n\nexport type PrepareCallsResult = PrepareCallsResponse;\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?: bigint}>} params.calls - Array of contract calls to execute\n * @param {AccountParam} [params.account] - The account to execute the calls from. Can be an address string or an object with an `address` property. 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: 0n\n *   }],\n *   capabilities: {\n *     paymaster: { 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.account\n    ? resolveAddress(params.account)\n    : client.account.address;\n\n  const chainId = params.chainId ?? client.chain.id;\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\n  const { account: _, chainId: __, ...rest } = params;\n  const rpcParams = Value.Encode(schema.request, {\n    ...rest,\n    chainId,\n    from,\n    capabilities: toRpcCapabilities(capabilities),\n  } satisfies BasePrepareCallsParams);\n\n  const rpcResp = await client.request({\n    method: \"wallet_prepareCalls\",\n    params: [rpcParams],\n  });\n\n  LOGGER.debug(\"prepareCalls:done\");\n  return Value.Decode(schema.response, rpcResp);\n}\n"]}

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

@@ -1,17 +1,14 @@
-import type { InnerWalletApiClient, OptionalChainId } from "../types.ts";
-import { type Address, type IsUndefined, 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 PrepareSignResult = Prettify<RpcSchema["ReturnType"]>;
+import type { DistributiveOmit, InnerWalletApiClient } from "../types.ts";
+import { wallet_prepareSign as MethodSchema } from "@alchemy/wallet-api-types/rpc";
+import { type AccountParam } from "../utils/resolve.js";
+import { type MethodParams, type MethodResponse } from "../utils/schema.js";
+type BasePrepareSignParams = MethodParams<typeof MethodSchema>;
+type PrepareSignResponse = MethodResponse<typeof MethodSchema>;
+export type PrepareSignParams = DistributiveOmit<BasePrepareSignParams, "from" | "chainId"> & {
+    account?: AccountParam;
+    chainId?: number;
+};
+export type PrepareSignResult = PrepareSignResponse;
 /**
  * Prepares a signature request for signing messages or transactions.
  *
@@ -23,11 +20,11 @@ export type PrepareSignResult = Prettify<RpcSchema["ReturnType"]>;
  * ```ts
  * // Prepare a message to be signed
  * const result = await client.prepareSign({
- *    from: "0x1234...",
+ *    account: "0x1234...",
  *    type: "personal_sign",
  *    data: "Hello, world!",
  * });
  * ```
  */
-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

@@ -1,6 +1,9 @@
-import { toHex } from "viem";
-import { AccountNotFoundError } from "@alchemy/common";
+import { wallet_prepareSign as MethodSchema } from "@alchemy/wallet-api-types/rpc";
 import { LOGGER } from "../logger.js";
+import { resolveAddress } from "../utils/resolve.js";
+import { Value } from "typebox/value";
+import { methodSchema, } from "../utils/schema.js";
+const schema = methodSchema(MethodSchema);
 /**
  * Prepares a signature request for signing messages or transactions.
  *
@@ -12,30 +15,28 @@ import { LOGGER } from "../logger.js";
  * ```ts
  * // Prepare a message to be signed
  * const result = await client.prepareSign({
- *    from: "0x1234...",
+ *    account: "0x1234...",
  *    type: "personal_sign",
  *    data: "Hello, world!",
  * });
  * ```
  */
 export async function prepareSign(client, params) {
-    const from = params.from ?? client.account?.address;
-    if (!from) {
-        LOGGER.warn("prepareSign:no-from", { hasClientAccount: !!client.account });
-        throw new AccountNotFoundError();
-    }
+    const from = params.account
+        ? resolveAddress(params.account)
+        : client.account.address;
     LOGGER.debug("prepareSign:start", { type: params.signatureRequest.type });
-    const res = await client.request({
+    const { account: _, chainId: __, ...rest } = params;
+    const rpcParams = Value.Encode(schema.request, {
+        ...rest,
+        from,
+        chainId: params.chainId ?? client.chain.id,
+    });
+    const rpcResp = await client.request({
         method: "wallet_prepareSign",
-        params: [
-            {
-                ...params,
-                from,
-                chainId: params.chainId ?? toHex(client.chain.id),
-            },
-        ],
+        params: [rpcParams],
     });
     LOGGER.debug("prepareSign:done");
-    return res;
+    return Value.Decode(schema.response, rpcResp);
 }
 //# sourceMappingURL=prepareSign.js.map

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":"AACA,OAAO,EAAE,kBAAkB,IAAI,YAAY,EAAE,MAAM,+BAA+B,CAAC;AACnF,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,cAAc,EAAqB,MAAM,qBAAqB,CAAC;AACxE,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,EACL,YAAY,GAGb,MAAM,oBAAoB,CAAC;AAE5B,MAAM,MAAM,GAAG,YAAY,CAAC,YAAY,CAAC,CAAC;AAc1C;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,MAA4B,EAC5B,MAAyB;IAEzB,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO;QACzB,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC;QAChC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC;IAE3B,MAAM,CAAC,KAAK,CAAC,mBAAmB,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAC,CAAC;IAE1E,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,GAAG,IAAI,EAAE,GAAG,MAAM,CAAC;IACpD,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE;QAC7C,GAAG,IAAI;QACP,IAAI;QACJ,OAAO,EAAE,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,KAAK,CAAC,EAAE;KACX,CAAC,CAAC;IAEnC,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;QACnC,MAAM,EAAE,oBAAoB;QAC5B,MAAM,EAAE,CAAC,SAAS,CAAC;KACpB,CAAC,CAAC;IAEH,MAAM,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;IACjC,OAAO,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;AAChD,CAAC","sourcesContent":["import type { DistributiveOmit, InnerWalletApiClient } from \"../types.ts\";\nimport { wallet_prepareSign as MethodSchema } from \"@alchemy/wallet-api-types/rpc\";\nimport { LOGGER } from \"../logger.js\";\nimport { resolveAddress, type AccountParam } from \"../utils/resolve.js\";\nimport { Value } from \"typebox/value\";\nimport {\n  methodSchema,\n  type MethodParams,\n  type MethodResponse,\n} from \"../utils/schema.js\";\n\nconst schema = methodSchema(MethodSchema);\ntype BasePrepareSignParams = MethodParams<typeof MethodSchema>;\ntype PrepareSignResponse = MethodResponse<typeof MethodSchema>;\n\nexport type PrepareSignParams = DistributiveOmit<\n  BasePrepareSignParams,\n  \"from\" | \"chainId\"\n> & {\n  account?: AccountParam;\n  chainId?: number;\n};\n\nexport type PrepareSignResult = PrepareSignResponse;\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 *    account: \"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.account\n    ? resolveAddress(params.account)\n    : client.account.address;\n\n  LOGGER.debug(\"prepareSign:start\", { type: params.signatureRequest.type });\n\n  const { account: _, chainId: __, ...rest } = params;\n  const rpcParams = Value.Encode(schema.request, {\n    ...rest,\n    from,\n    chainId: params.chainId ?? client.chain.id,\n  } satisfies BasePrepareSignParams);\n\n  const rpcResp = await client.request({\n    method: \"wallet_prepareSign\",\n    params: [rpcParams],\n  });\n\n  LOGGER.debug(\"prepareSign:done\");\n  return Value.Decode(schema.response, rpcResp);\n}\n"]}

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

@@ -1,25 +1,26 @@
 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";
-    };
-}>;
-export type RequestAccountParams = Prettify<Omit<Extract<RpcSchema["Request"]["params"][0], {
+import { type JsonRpcAccount, type Prettify } from "viem";
+import { wallet_requestAccount as MethodSchema } from "@alchemy/wallet-api-types/rpc";
+import type { DistributiveOmit, InnerWalletApiClient } from "../types";
+import { type MethodParams } from "../utils/schema.js";
+type BaseRequestAccountParams = MethodParams<typeof MethodSchema>;
+export type RequestAccountParams = Prettify<DistributiveOmit<Extract<BaseRequestAccountParams, {
     signerAddress: Address;
+}>, "signerAddress" | "includeCounterfactualInfo"> & ({
+    signerAddress?: Address;
+    accountAddress?: never;
 } | {
-    signerPublicKey: WebAuthnPublicKey;
-}>, "signerAddress" | "signerPublicKey" | "includeCounterfactualInfo"> & {
-    accountAddress?: Address;
-}>;
-export type RequestAccountResult = Prettify<{
-    address: Address;
-}>;
+    signerAddress?: never;
+    accountAddress: Address;
+})>;
+export type RequestAccountResult = JsonRpcAccount<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 +32,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,18 @@
-import { BaseError } from "viem";
+import { isAddressEqual } from "viem";
+import { wallet_requestAccount as MethodSchema } from "@alchemy/wallet-api-types/rpc";
 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";
+import { Value } from "typebox/value";
+import { methodSchema } from "../utils/schema.js";
+const schema = methodSchema(MethodSchema);
 /**
- * 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 +24,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,63 +33,39 @@ 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,
         });
         return {
             address: cachedAccount.address,
+            type: "json-rpc",
         };
     }
-    const resp = await client.request({
+    const rpcParams = Value.Encode(schema.request, args);
+    const rpcResp = await client.request({
         method: "wallet_requestAccount",
-        params: [args],
+        params: [rpcParams],
     });
+    const resp = Value.Decode(schema.response, rpcResp);
     client.internal?.setAccount({
         address: resp.accountAddress,
         requestParams: args,
@@ -90,6 +73,7 @@ export async function requestAccount(client, params) {
     LOGGER.debug("requestAccount:done", { address: resp.accountAddress });
     return {
         address: resp.accountAddress,
+        type: "json-rpc",
     };
 }
 //# sourceMappingURL=requestAccount.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"requestAccount.js","sourceRoot":"","sources":["../../../src/actions/requestAccount.ts"],"names":[],"mappings":"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","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,EAAsC,MAAM,MAAM,CAAC;AAC1E,OAAO,EAAE,qBAAqB,IAAI,YAAY,EAAE,MAAM,+BAA+B,CAAC;AACtF,OAAO,SAAS,MAAM,YAAY,CAAC;AAEnC,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,YAAY,EAAqB,MAAM,oBAAoB,CAAC;AAErE,MAAM,MAAM,GAAG,YAAY,CAAC,YAAY,CAAC,CAAC;AAgB1C;;;;;;;;;;;;;;;;;;;;;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;YAC9B,IAAI,EAAE,UAAU;SACjB,CAAC;IACJ,CAAC;IAED,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,CAC5B,MAAM,CAAC,OAAO,EACd,IAAuC,CACxC,CAAC;IAEF,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;QACnC,MAAM,EAAE,uBAAuB;QAC/B,MAAM,EAAE,CAAC,SAAS,CAAC;KACpB,CAAC,CAAC;IAEH,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAEpD,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;QAC5B,IAAI,EAAE,UAAU;KACjB,CAAC;AACJ,CAAC","sourcesContent":["import type { Address } from \"abitype\";\nimport { isAddressEqual, type JsonRpcAccount, type Prettify } from \"viem\";\nimport { wallet_requestAccount as MethodSchema } from \"@alchemy/wallet-api-types/rpc\";\nimport deepEqual from \"deep-equal\";\nimport type { DistributiveOmit, InnerWalletApiClient } from \"../types\";\nimport { LOGGER } from \"../logger.js\";\nimport { isLocalAccount } from \"../utils/assertions.js\";\nimport { Value } from \"typebox/value\";\nimport { methodSchema, type MethodParams } from \"../utils/schema.js\";\n\nconst schema = methodSchema(MethodSchema);\ntype BaseRequestAccountParams = MethodParams<typeof MethodSchema>;\n\nexport type RequestAccountParams = Prettify<\n  DistributiveOmit<\n    Extract<BaseRequestAccountParams, { signerAddress: Address }>,\n    \"signerAddress\" | \"includeCounterfactualInfo\"\n  > &\n    (\n      | { signerAddress?: Address; accountAddress?: never }\n      | { signerAddress?: never; accountAddress: Address }\n    )\n>;\n\nexport type RequestAccountResult = JsonRpcAccount<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      type: \"json-rpc\",\n    };\n  }\n\n  const rpcParams = Value.Encode(\n    schema.request,\n    args satisfies BaseRequestAccountParams,\n  );\n\n  const rpcResp = await client.request({\n    method: \"wallet_requestAccount\",\n    params: [rpcParams],\n  });\n\n  const resp = Value.Decode(schema.response, rpcResp);\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    type: \"json-rpc\",\n  };\n}\n"]}

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

@@ -1,38 +1,44 @@
-import type { Address, Prettify } from "viem";
-import type { InnerWalletApiClient } from "../types.js";
+import type { Chain, Prettify } from "viem";
+import type { DistributiveOmit, InnerWalletApiClient } from "../types.js";
 import { type PrepareCallsParams } from "./prepareCalls.js";
 import { type SendPreparedCallsResult } from "./sendPreparedCalls.js";
-export type SendCallsParams<TAccount extends Address | undefined = Address | undefined> = Prettify<PrepareCallsParams<TAccount>>;
+export type SendCallsParams = Prettify<DistributiveOmit<PrepareCallsParams, "chainId"> & {
+    chain?: Pick<Chain, "id">;
+}>;
 export type SendCallsResult = Prettify<SendPreparedCallsResult>;
 /**
  * Prepares, signs, and submits calls. This function internally calls `prepareCalls`, `signPreparedCalls`, and `sendPreparedCalls`.
  *
+ * 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<TAccount>} params - Parameters for sending 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 {SendCallsParams} params - Parameters for sending calls
+ * @param {Array<{to: Address, data?: Hex, value?: bigint}>} params.calls - Array of contract calls to execute
+ * @param {AccountParam} [params.account] - The account to execute the calls from. Can be an address string or an object with an `address` property. Defaults to the client's account (signer address via EIP-7702).
  * @param {object} [params.capabilities] - Optional capabilities to include with the request.
- * @returns {Promise<SendPreparedCallsResult>} A Promise that resolves to the result containing the prepared call IDs.
+ * @returns {Promise<SendPreparedCallsResult>} A Promise that resolves to the result containing the call ID.
  *
  *  @example
  * ```ts
+ * // Send calls (uses signer address via EIP-7702 by default)
  * const result = await client.sendCalls({
  *   calls: [{
  *     to: "0x1234...",
  *     data: "0xabcdef...",
- *     value: "0x0"
+ *     value: 0n
  *   }],
  *   capabilities: {
- *     paymasterService: { policyId: "your-policy-id" }
+ *     paymaster: { policyId: "your-policy-id" }
  *   }
  * });
  *
- * // The result contains the prepared call IDs
- * console.log(result.preparedCallIds);
+ * // The result contains the call ID
+ * console.log(result.id);
  * ```
  * <Note>
  * If using this action with an ERC-20 paymaster in pre-operation mode with `autoPermit`, the contents of the permit will be hidden
  * from the user. It is recommended to use the `prepareCalls` action instead to manually handle the permit signature.
  * </Note>
  */
-export declare function sendCalls<TAccount extends Address | undefined = Address | undefined>(client: InnerWalletApiClient, params: SendCallsParams<TAccount>): Promise<SendCallsResult>;
+export declare function sendCalls(client: InnerWalletApiClient, params: SendCallsParams): Promise<SendCallsResult>;

package/dist/esm/actions/sendCalls.js

@@ -3,34 +3,36 @@ import { signPreparedCalls } from "./signPreparedCalls.js";
 import { sendPreparedCalls, } from "./sendPreparedCalls.js";
 import { LOGGER } from "../logger.js";
 import { signSignatureRequest } from "./signSignatureRequest.js";
-import { isWebAuthnAccount } from "../utils/assertions.js";
-import { extractCapabilitiesForSending } from "../utils/capabilities.js";
-import { BaseError } from "@alchemy/common";
+import { extractCapabilitiesForSending, fromRpcCapabilities, } from "../utils/capabilities.js";
 /**
  * Prepares, signs, and submits calls. This function internally calls `prepareCalls`, `signPreparedCalls`, and `sendPreparedCalls`.
  *
+ * 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<TAccount>} params - Parameters for sending 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 {SendCallsParams} params - Parameters for sending calls
+ * @param {Array<{to: Address, data?: Hex, value?: bigint}>} params.calls - Array of contract calls to execute
+ * @param {AccountParam} [params.account] - The account to execute the calls from. Can be an address string or an object with an `address` property. Defaults to the client's account (signer address via EIP-7702).
  * @param {object} [params.capabilities] - Optional capabilities to include with the request.
- * @returns {Promise<SendPreparedCallsResult>} A Promise that resolves to the result containing the prepared call IDs.
+ * @returns {Promise<SendPreparedCallsResult>} A Promise that resolves to the result containing the call ID.
  *
  *  @example
  * ```ts
+ * // Send calls (uses signer address via EIP-7702 by default)
  * const result = await client.sendCalls({
  *   calls: [{
  *     to: "0x1234...",
  *     data: "0xabcdef...",
- *     value: "0x0"
+ *     value: 0n
  *   }],
  *   capabilities: {
- *     paymasterService: { policyId: "your-policy-id" }
+ *     paymaster: { policyId: "your-policy-id" }
  *   }
  * });
  *
- * // The result contains the prepared call IDs
- * console.log(result.preparedCallIds);
+ * // The result contains the call ID
+ * console.log(result.id);
  * ```
  * <Note>
  * If using this action with an ERC-20 paymaster in pre-operation mode with `autoPermit`, the contents of the permit will be hidden
@@ -42,16 +44,18 @@ export async function sendCalls(client, params) {
         calls: params.calls?.length,
         hasCapabilities: !!params.capabilities,
     });
-    let calls = await prepareCalls(client, params);
+    const { chain, ...prepareCallsParams } = params;
+    let calls = await prepareCalls(client, {
+        ...prepareCallsParams,
+        ...(chain != null ? { chainId: chain.id } : {}),
+    });
     if (calls.type === "paymaster-permit") {
-        if (isWebAuthnAccount(client.owner)) {
-            throw new BaseError("WebAuthn signer is not currently supported for signing paymaster permit signatures");
-        }
         const signature = await signSignatureRequest(client, calls.signatureRequest);
         const secondCallParams = {
-            from: calls.modifiedRequest.from,
+            account: calls.modifiedRequest.from,
             calls: calls.modifiedRequest.calls,
-            capabilities: calls.modifiedRequest.capabilities,
+            chainId: calls.modifiedRequest.chainId,
+            capabilities: fromRpcCapabilities(calls.modifiedRequest.capabilities),
             // WebAuthn signatures are not supported for paymaster permits (throws above).
             paymasterPermitSignature: signature,
         };