@alchemy/wallet-apis 5.0.0-beta.20 → 5.0.0-beta.21

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

@@ -1,9 +1,7 @@
 import type { Prettify } from "viem";
 import type { InnerWalletApiClient } from "../types.js";
 import { type AccountParam } from "../utils/resolve.js";
-import { wallet_sendPreparedCalls as SendMethodSchema } from "@alchemy/wallet-api-types/rpc";
-import { type MethodResponse } from "../utils/schema.js";
-type SendPreparedCallsResponse = MethodResponse<typeof SendMethodSchema>;
+import { type SendPreparedCallsResult } from "./sendPreparedCalls.js";
 export type UndelegateAccountParams = Prettify<{
     account?: AccountParam;
     chainId?: number;
@@ -13,7 +11,7 @@ export type UndelegateAccountParams = Prettify<{
         };
     };
 }>;
-export type UndelegateAccountResult = Prettify<SendPreparedCallsResponse>;
+export type UndelegateAccountResult = Prettify<SendPreparedCallsResult>;
 /**
  * Prepares, signs, and sends an EIP-7702 undelegation to remove delegation from an EOA.
  * Gas is sponsored by Alchemy (requires Enterprise plan).
@@ -37,4 +35,3 @@ export type UndelegateAccountResult = Prettify<SendPreparedCallsResponse>;
  * ```
  */
 export declare function undelegateAccount(client: InnerWalletApiClient, params?: UndelegateAccountParams): Promise<UndelegateAccountResult>;
-export {};

package/dist/esm/actions/undelegateAccount.js

@@ -1,12 +1,10 @@
 import { LOGGER } from "../logger.js";
 import { resolveAddress } from "../utils/resolve.js";
-import { wallet_prepareCalls as PrepareMethodSchema, wallet_sendPreparedCalls as SendMethodSchema, } from "@alchemy/wallet-api-types/rpc";
-import { methodSchema, encode, decode, } from "../utils/schema.js";
-import { signSignatureRequest } from "./signSignatureRequest.js";
+import { prepareCalls } from "./prepareCalls.js";
+import { signPreparedCalls } from "./signPreparedCalls.js";
+import { sendPreparedCalls, } from "./sendPreparedCalls.js";
 import { BaseError } from "@alchemy/common";
-import { mergeClientCapabilities } from "../utils/capabilities.js";
-const prepareSchema = methodSchema(PrepareMethodSchema);
-const sendSchema = methodSchema(SendMethodSchema);
+import { extractCapabilitiesForSending } from "../utils/capabilities.js";
 /**
  * Prepares, signs, and sends an EIP-7702 undelegation to remove delegation from an EOA.
  * Gas is sponsored by Alchemy (requires Enterprise plan).
@@ -30,52 +28,38 @@ const sendSchema = methodSchema(SendMethodSchema);
  * ```
  */
 export async function undelegateAccount(client, params) {
-    const from = params?.account
+    const account = params?.account
         ? resolveAddress(params.account)
         : client.account.address;
-    const chainId = params?.chainId ?? client.chain.id;
-    const capabilities = mergeClientCapabilities(client, params?.capabilities);
-    LOGGER.info("undelegateAccount:start", { account: from, chainId });
-    // Step 1: Prepare — wallet_prepareCalls with zero-address delegation, no calls
-    const prepareRpcParams = encode(prepareSchema.request, {
-        from,
-        chainId,
+    LOGGER.info("undelegateAccount:start", {
+        account,
+        chainId: params?.chainId,
+    });
+    // Step 1: Prepare — zero-address delegation means "undelegate"
+    const prepared = await prepareCalls(client, {
+        calls: [],
+        account,
+        ...(params?.chainId != null ? { chainId: params.chainId } : {}),
         capabilities: {
-            ...capabilities,
+            ...params?.capabilities,
             eip7702Auth: {
                 delegation: "0x0000000000000000000000000000000000000000",
             },
         },
     });
-    const prepareRpcResp = await client.request({
-        method: "wallet_prepareCalls",
-        params: [prepareRpcParams],
-    });
-    const prepared = decode(prepareSchema.response, prepareRpcResp);
     if (prepared.type !== "authorization") {
         throw new BaseError(`Unexpected response type from wallet_prepareCalls: expected "authorization", got "${prepared.type}"`);
     }
     LOGGER.debug("undelegateAccount:prepared");
-    // Step 2: Sign the authorization
-    const signature = await signSignatureRequest(client, {
-        type: "eip7702Auth",
-        data: {
-            ...prepared.data,
-            chainId: prepared.chainId,
-        },
-    });
+    // Step 2: Sign
+    const signedCalls = await signPreparedCalls(client, prepared);
     LOGGER.debug("undelegateAccount:signed");
-    // Step 3: Send — wallet_sendPreparedCalls with the signed authorization
-    const { signatureRequest: _, ...rest } = prepared;
-    const sendRpcParams = encode(sendSchema.request, {
-        ...rest,
-        signature,
-    });
-    const sendRpcResp = await client.request({
-        method: "wallet_sendPreparedCalls",
-        params: [sendRpcParams],
+    // Step 3: Send
+    const sendCapabilities = extractCapabilitiesForSending(params?.capabilities);
+    const result = await sendPreparedCalls(client, {
+        ...signedCalls,
+        ...(sendCapabilities != null ? { capabilities: sendCapabilities } : {}),
     });
-    const result = decode(sendSchema.response, sendRpcResp);
     LOGGER.info("undelegateAccount:done", { id: result.id });
     return result;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"undelegateAccount.js","sourceRoot":"","sources":["../../../src/actions/undelegateAccount.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Prettify } from \"viem\";\nimport type { InnerWalletApiClient } from \"../types.js\";\nimport { LOGGER } from \"../logger.js\";\nimport { resolveAddress, type AccountParam } from \"../utils/resolve.js\";\nimport {\n  wallet_prepareCalls as PrepareMethodSchema,\n  wallet_sendPreparedCalls as SendMethodSchema,\n} from \"@alchemy/wallet-api-types/rpc\";\nimport {\n  methodSchema,\n  encode,\n  decode,\n  type MethodResponse,\n} from \"../utils/schema.js\";\nimport { signSignatureRequest } from \"./signSignatureRequest.js\";\nimport { BaseError } from \"@alchemy/common\";\nimport { mergeClientCapabilities } from \"../utils/capabilities.js\";\n\nconst prepareSchema = methodSchema(PrepareMethodSchema);\nconst sendSchema = methodSchema(SendMethodSchema);\n\ntype SendPreparedCallsResponse = MethodResponse<typeof SendMethodSchema>;\n\nexport type UndelegateAccountParams = Prettify<{\n  account?: AccountParam;\n  chainId?: number;\n  capabilities?: {\n    paymaster?: {\n      policyId: string;\n    };\n  };\n}>;\n\nexport type UndelegateAccountResult = Prettify<SendPreparedCallsResponse>;\n\n/**\n * Prepares, signs, and sends an EIP-7702 undelegation to remove delegation from an EOA.\n * Gas is sponsored by Alchemy (requires Enterprise plan).\n *\n * A BSO (Bundler Sponsorship Override) policy ID must be provided either via\n * `params.capabilities.paymaster.policyId` or pre-configured on the client via `policyIds`.\n *\n * @param {InnerWalletApiClient} client - The wallet API client to use for the request\n * @param {UndelegateAccountParams} params - Parameters for undelegating the account\n * @param {AccountParam} [params.account] - The account to undelegate. Defaults to the client's account (signer address).\n * @param {number} [params.chainId] - The chain ID. Defaults to the client's chain.\n * @param {object} [params.capabilities] - Optional capabilities. If omitted, falls back to the policy ID(s) set on the client.\n * @param {object} [params.capabilities.paymaster] - Paymaster capabilities. Requires a BSO policy ID.\n * @param {string} [params.capabilities.paymaster.policyId] - The BSO policy ID to use for gas sponsorship.\n * @returns {Promise<UndelegateAccountResult>} A Promise that resolves to the result containing the call ID.\n *\n * @example\n * ```ts\n * const result = await client.undelegateAccount();\n * const status = await client.waitForCallsStatus({ id: result.id });\n * ```\n */\nexport async function undelegateAccount(\n  client: InnerWalletApiClient,\n  params?: UndelegateAccountParams,\n): Promise<UndelegateAccountResult> {\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.info(\"undelegateAccount:start\", { account: from, chainId });\n\n  // Step 1: Prepare — wallet_prepareCalls with zero-address delegation, no calls\n  const prepareRpcParams = encode(prepareSchema.request, {\n    from,\n    chainId,\n    capabilities: {\n      ...capabilities,\n      eip7702Auth: {\n        delegation: \"0x0000000000000000000000000000000000000000\",\n      },\n    },\n  });\n\n  const prepareRpcResp = await client.request({\n    method: \"wallet_prepareCalls\",\n    params: [prepareRpcParams],\n  });\n\n  const prepared = decode(prepareSchema.response, prepareRpcResp);\n\n  if (prepared.type !== \"authorization\") {\n    throw new BaseError(\n      `Unexpected response type from wallet_prepareCalls: expected \"authorization\", got \"${prepared.type}\"`,\n    );\n  }\n\n  LOGGER.debug(\"undelegateAccount:prepared\");\n\n  // Step 2: Sign the authorization\n  const signature = await signSignatureRequest(client, {\n    type: \"eip7702Auth\",\n    data: {\n      ...prepared.data,\n      chainId: prepared.chainId,\n    },\n  });\n\n  LOGGER.debug(\"undelegateAccount:signed\");\n\n  // Step 3: Send — wallet_sendPreparedCalls with the signed authorization\n  const { signatureRequest: _, ...rest } = prepared;\n  const sendRpcParams = encode(sendSchema.request, {\n    ...rest,\n    signature,\n  });\n\n  const sendRpcResp = await client.request({\n    method: \"wallet_sendPreparedCalls\",\n    params: [sendRpcParams],\n  });\n\n  const result = decode(sendSchema.response, sendRpcResp);\n  LOGGER.info(\"undelegateAccount:done\", { id: result.id });\n  return result;\n}\n"]}
+{"version":3,"file":"undelegateAccount.js","sourceRoot":"","sources":["../../../src/actions/undelegateAccount.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,cAAc,EAAqB,MAAM,qBAAqB,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EACL,iBAAiB,GAElB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,6BAA6B,EAAE,MAAM,0BAA0B,CAAC;AAczE;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,MAA4B,EAC5B,MAAgC;IAEhC,MAAM,OAAO,GAAG,MAAM,EAAE,OAAO;QAC7B,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC;QAChC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC;IAE3B,MAAM,CAAC,IAAI,CAAC,yBAAyB,EAAE;QACrC,OAAO;QACP,OAAO,EAAE,MAAM,EAAE,OAAO;KACzB,CAAC,CAAC;IAEH,+DAA+D;IAC/D,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,MAAM,EAAE;QAC1C,KAAK,EAAE,EAAE;QACT,OAAO;QACP,GAAG,CAAC,MAAM,EAAE,OAAO,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/D,YAAY,EAAE;YACZ,GAAG,MAAM,EAAE,YAAY;YACvB,WAAW,EAAE;gBACX,UAAU,EAAE,4CAA4C;aACzD;SACF;KACF,CAAC,CAAC;IAEH,IAAI,QAAQ,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;QACtC,MAAM,IAAI,SAAS,CACjB,qFAAqF,QAAQ,CAAC,IAAI,GAAG,CACtG,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAC;IAE3C,eAAe;IACf,MAAM,WAAW,GAAG,MAAM,iBAAiB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAE9D,MAAM,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;IAEzC,eAAe;IACf,MAAM,gBAAgB,GAAG,6BAA6B,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IAE7E,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,MAAM,EAAE;QAC7C,GAAG,WAAW;QACd,GAAG,CAAC,gBAAgB,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,gBAAgB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACxE,CAAC,CAAC;IAEH,MAAM,CAAC,IAAI,CAAC,wBAAwB,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC;IACzD,OAAO,MAAM,CAAC;AAChB,CAAC","sourcesContent":["import type { Prettify } from \"viem\";\nimport type { InnerWalletApiClient } from \"../types.js\";\nimport { LOGGER } from \"../logger.js\";\nimport { resolveAddress, type AccountParam } from \"../utils/resolve.js\";\nimport { prepareCalls } from \"./prepareCalls.js\";\nimport { signPreparedCalls } from \"./signPreparedCalls.js\";\nimport {\n  sendPreparedCalls,\n  type SendPreparedCallsResult,\n} from \"./sendPreparedCalls.js\";\nimport { BaseError } from \"@alchemy/common\";\nimport { extractCapabilitiesForSending } from \"../utils/capabilities.js\";\n\nexport type UndelegateAccountParams = Prettify<{\n  account?: AccountParam;\n  chainId?: number;\n  capabilities?: {\n    paymaster?: {\n      policyId: string;\n    };\n  };\n}>;\n\nexport type UndelegateAccountResult = Prettify<SendPreparedCallsResult>;\n\n/**\n * Prepares, signs, and sends an EIP-7702 undelegation to remove delegation from an EOA.\n * Gas is sponsored by Alchemy (requires Enterprise plan).\n *\n * A BSO (Bundler Sponsorship Override) policy ID must be provided either via\n * `params.capabilities.paymaster.policyId` or pre-configured on the client via `policyIds`.\n *\n * @param {InnerWalletApiClient} client - The wallet API client to use for the request\n * @param {UndelegateAccountParams} params - Parameters for undelegating the account\n * @param {AccountParam} [params.account] - The account to undelegate. Defaults to the client's account (signer address).\n * @param {number} [params.chainId] - The chain ID. Defaults to the client's chain.\n * @param {object} [params.capabilities] - Optional capabilities. If omitted, falls back to the policy ID(s) set on the client.\n * @param {object} [params.capabilities.paymaster] - Paymaster capabilities. Requires a BSO policy ID.\n * @param {string} [params.capabilities.paymaster.policyId] - The BSO policy ID to use for gas sponsorship.\n * @returns {Promise<UndelegateAccountResult>} A Promise that resolves to the result containing the call ID.\n *\n * @example\n * ```ts\n * const result = await client.undelegateAccount();\n * const status = await client.waitForCallsStatus({ id: result.id });\n * ```\n */\nexport async function undelegateAccount(\n  client: InnerWalletApiClient,\n  params?: UndelegateAccountParams,\n): Promise<UndelegateAccountResult> {\n  const account = params?.account\n    ? resolveAddress(params.account)\n    : client.account.address;\n\n  LOGGER.info(\"undelegateAccount:start\", {\n    account,\n    chainId: params?.chainId,\n  });\n\n  // Step 1: Prepare — zero-address delegation means \"undelegate\"\n  const prepared = await prepareCalls(client, {\n    calls: [],\n    account,\n    ...(params?.chainId != null ? { chainId: params.chainId } : {}),\n    capabilities: {\n      ...params?.capabilities,\n      eip7702Auth: {\n        delegation: \"0x0000000000000000000000000000000000000000\",\n      },\n    },\n  });\n\n  if (prepared.type !== \"authorization\") {\n    throw new BaseError(\n      `Unexpected response type from wallet_prepareCalls: expected \"authorization\", got \"${prepared.type}\"`,\n    );\n  }\n\n  LOGGER.debug(\"undelegateAccount:prepared\");\n\n  // Step 2: Sign\n  const signedCalls = await signPreparedCalls(client, prepared);\n\n  LOGGER.debug(\"undelegateAccount:signed\");\n\n  // Step 3: Send\n  const sendCapabilities = extractCapabilitiesForSending(params?.capabilities);\n\n  const result = await sendPreparedCalls(client, {\n    ...signedCalls,\n    ...(sendCapabilities != null ? { capabilities: sendCapabilities } : {}),\n  });\n\n  LOGGER.info(\"undelegateAccount:done\", { id: result.id });\n  return result;\n}\n"]}

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "5.0.0-beta.19";
+export declare const VERSION = "5.0.0-beta.20";

package/dist/esm/version.js

@@ -1,4 +1,4 @@
 // This file is autogenerated by inject-version.ts. Any changes will be
 // overwritten on commit!
-export const VERSION = "5.0.0-beta.19";
+export const VERSION = "5.0.0-beta.20";
 //# sourceMappingURL=version.js.map

package/dist/esm/version.js.map

@@ -1 +1 @@
-{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA,uEAAuE;AACvE,yBAAyB;AACzB,MAAM,CAAC,MAAM,OAAO,GAAG,eAAe,CAAC","sourcesContent":["// This file is autogenerated by inject-version.ts. Any changes will be\n// overwritten on commit!\nexport const VERSION = \"5.0.0-beta.19\";\n"]}
+{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA,uEAAuE;AACvE,yBAAyB;AACzB,MAAM,CAAC,MAAM,OAAO,GAAG,eAAe,CAAC","sourcesContent":["// This file is autogenerated by inject-version.ts. Any changes will be\n// overwritten on commit!\nexport const VERSION = \"5.0.0-beta.20\";\n"]}

package/dist/types/actions/undelegateAccount.d.ts

@@ -1,9 +1,7 @@
 import type { Prettify } from "viem";
 import type { InnerWalletApiClient } from "../types.js";
 import { type AccountParam } from "../utils/resolve.js";
-import { wallet_sendPreparedCalls as SendMethodSchema } from "@alchemy/wallet-api-types/rpc";
-import { type MethodResponse } from "../utils/schema.js";
-type SendPreparedCallsResponse = MethodResponse<typeof SendMethodSchema>;
+import { type SendPreparedCallsResult } from "./sendPreparedCalls.js";
 export type UndelegateAccountParams = Prettify<{
     account?: AccountParam;
     chainId?: number;
@@ -13,7 +11,7 @@ export type UndelegateAccountParams = Prettify<{
         };
     };
 }>;
-export type UndelegateAccountResult = Prettify<SendPreparedCallsResponse>;
+export type UndelegateAccountResult = Prettify<SendPreparedCallsResult>;
 /**
  * Prepares, signs, and sends an EIP-7702 undelegation to remove delegation from an EOA.
  * Gas is sponsored by Alchemy (requires Enterprise plan).
@@ -37,5 +35,4 @@ export type UndelegateAccountResult = Prettify<SendPreparedCallsResponse>;
  * ```
  */
 export declare function undelegateAccount(client: InnerWalletApiClient, params?: UndelegateAccountParams): Promise<UndelegateAccountResult>;
-export {};
 //# sourceMappingURL=undelegateAccount.d.ts.map

package/dist/types/actions/undelegateAccount.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"undelegateAccount.d.ts","sourceRoot":"","sources":["../../../src/actions/undelegateAccount.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AACrC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAExD,OAAO,EAAkB,KAAK,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxE,OAAO,EAEL,wBAAwB,IAAI,gBAAgB,EAC7C,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAIL,KAAK,cAAc,EACpB,MAAM,oBAAoB,CAAC;AAQ5B,KAAK,yBAAyB,GAAG,cAAc,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAEzE,MAAM,MAAM,uBAAuB,GAAG,QAAQ,CAAC;IAC7C,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE;QACb,SAAS,CAAC,EAAE;YACV,QAAQ,EAAE,MAAM,CAAC;SAClB,CAAC;KACH,CAAC;CACH,CAAC,CAAC;AAEH,MAAM,MAAM,uBAAuB,GAAG,QAAQ,CAAC,yBAAyB,CAAC,CAAC;AAE1E;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAsB,iBAAiB,CACrC,MAAM,EAAE,oBAAoB,EAC5B,MAAM,CAAC,EAAE,uBAAuB,GAC/B,OAAO,CAAC,uBAAuB,CAAC,CAgElC"}
+{"version":3,"file":"undelegateAccount.d.ts","sourceRoot":"","sources":["../../../src/actions/undelegateAccount.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AACrC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAExD,OAAO,EAAkB,KAAK,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAGxE,OAAO,EAEL,KAAK,uBAAuB,EAC7B,MAAM,wBAAwB,CAAC;AAIhC,MAAM,MAAM,uBAAuB,GAAG,QAAQ,CAAC;IAC7C,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE;QACb,SAAS,CAAC,EAAE;YACV,QAAQ,EAAE,MAAM,CAAC;SAClB,CAAC;KACH,CAAC;CACH,CAAC,CAAC;AAEH,MAAM,MAAM,uBAAuB,GAAG,QAAQ,CAAC,uBAAuB,CAAC,CAAC;AAExE;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAsB,iBAAiB,CACrC,MAAM,EAAE,oBAAoB,EAC5B,MAAM,CAAC,EAAE,uBAAuB,GAC/B,OAAO,CAAC,uBAAuB,CAAC,CA8ClC"}

package/dist/types/version.d.ts

@@ -1,2 +1,2 @@
-export declare const VERSION = "5.0.0-beta.19";
+export declare const VERSION = "5.0.0-beta.20";
 //# sourceMappingURL=version.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alchemy/wallet-apis",
-  "version": "5.0.0-beta.20",
+  "version": "5.0.0-beta.21",
   "description": "Alchemy Wallet APIs",
   "author": "Alchemy",
   "license": "MIT",
@@ -55,7 +55,7 @@
     "viem": "^2.45.0"
   },
   "dependencies": {
-    "@alchemy/common": "5.0.0-beta.20",
+    "@alchemy/common": "5.0.0-beta.21",
     "@alchemy/wallet-api-types": "^0.1.0-alpha.27",
     "deep-equal": "^2.2.3",
     "ox": "^0.11.1",
@@ -76,5 +76,5 @@
     "url": "https://github.com/alchemyplatform/aa-sdk/issues"
   },
   "homepage": "https://github.com/alchemyplatform/aa-sdk#readme",
-  "gitHead": "e8b35b489e1f129877c618752b35b4fb05149a55"
+  "gitHead": "f7b6c8132c10a86488ea3ebbe73dce14965fe669"
 }

package/src/actions/undelegateAccount.ts

@@ -2,24 +2,14 @@ import type { Prettify } from "viem";
 import type { InnerWalletApiClient } from "../types.js";
 import { LOGGER } from "../logger.js";
 import { resolveAddress, type AccountParam } from "../utils/resolve.js";
+import { prepareCalls } from "./prepareCalls.js";
+import { signPreparedCalls } from "./signPreparedCalls.js";
 import {
-  wallet_prepareCalls as PrepareMethodSchema,
-  wallet_sendPreparedCalls as SendMethodSchema,
-} from "@alchemy/wallet-api-types/rpc";
-import {
-  methodSchema,
-  encode,
-  decode,
-  type MethodResponse,
-} from "../utils/schema.js";
-import { signSignatureRequest } from "./signSignatureRequest.js";
+  sendPreparedCalls,
+  type SendPreparedCallsResult,
+} from "./sendPreparedCalls.js";
 import { BaseError } from "@alchemy/common";
-import { mergeClientCapabilities } from "../utils/capabilities.js";
-
-const prepareSchema = methodSchema(PrepareMethodSchema);
-const sendSchema = methodSchema(SendMethodSchema);
-
-type SendPreparedCallsResponse = MethodResponse<typeof SendMethodSchema>;
+import { extractCapabilitiesForSending } from "../utils/capabilities.js";
 
 export type UndelegateAccountParams = Prettify<{
   account?: AccountParam;
@@ -31,7 +21,7 @@ export type UndelegateAccountParams = Prettify<{
   };
 }>;
 
-export type UndelegateAccountResult = Prettify<SendPreparedCallsResponse>;
+export type UndelegateAccountResult = Prettify<SendPreparedCallsResult>;
 
 /**
  * Prepares, signs, and sends an EIP-7702 undelegation to remove delegation from an EOA.
@@ -59,35 +49,28 @@ export async function undelegateAccount(
   client: InnerWalletApiClient,
   params?: UndelegateAccountParams,
 ): Promise<UndelegateAccountResult> {
-  const from = params?.account
+  const account = params?.account
     ? resolveAddress(params.account)
     : client.account.address;
 
-  const chainId = params?.chainId ?? client.chain.id;
-
-  const capabilities = mergeClientCapabilities(client, params?.capabilities);
-
-  LOGGER.info("undelegateAccount:start", { account: from, chainId });
+  LOGGER.info("undelegateAccount:start", {
+    account,
+    chainId: params?.chainId,
+  });
 
-  // Step 1: Prepare — wallet_prepareCalls with zero-address delegation, no calls
-  const prepareRpcParams = encode(prepareSchema.request, {
-    from,
-    chainId,
+  // Step 1: Prepare — zero-address delegation means "undelegate"
+  const prepared = await prepareCalls(client, {
+    calls: [],
+    account,
+    ...(params?.chainId != null ? { chainId: params.chainId } : {}),
     capabilities: {
-      ...capabilities,
+      ...params?.capabilities,
       eip7702Auth: {
         delegation: "0x0000000000000000000000000000000000000000",
       },
     },
   });
 
-  const prepareRpcResp = await client.request({
-    method: "wallet_prepareCalls",
-    params: [prepareRpcParams],
-  });
-
-  const prepared = decode(prepareSchema.response, prepareRpcResp);
-
   if (prepared.type !== "authorization") {
     throw new BaseError(
       `Unexpected response type from wallet_prepareCalls: expected "authorization", got "${prepared.type}"`,
@@ -96,30 +79,19 @@ export async function undelegateAccount(
 
   LOGGER.debug("undelegateAccount:prepared");
 
-  // Step 2: Sign the authorization
-  const signature = await signSignatureRequest(client, {
-    type: "eip7702Auth",
-    data: {
-      ...prepared.data,
-      chainId: prepared.chainId,
-    },
-  });
+  // Step 2: Sign
+  const signedCalls = await signPreparedCalls(client, prepared);
 
   LOGGER.debug("undelegateAccount:signed");
 
-  // Step 3: Send — wallet_sendPreparedCalls with the signed authorization
-  const { signatureRequest: _, ...rest } = prepared;
-  const sendRpcParams = encode(sendSchema.request, {
-    ...rest,
-    signature,
-  });
+  // Step 3: Send
+  const sendCapabilities = extractCapabilitiesForSending(params?.capabilities);
 
-  const sendRpcResp = await client.request({
-    method: "wallet_sendPreparedCalls",
-    params: [sendRpcParams],
+  const result = await sendPreparedCalls(client, {
+    ...signedCalls,
+    ...(sendCapabilities != null ? { capabilities: sendCapabilities } : {}),
   });
 
-  const result = decode(sendSchema.response, sendRpcResp);
   LOGGER.info("undelegateAccount:done", { id: result.id });
   return result;
 }

package/src/version.ts

@@ -1,3 +1,3 @@
 // This file is autogenerated by inject-version.ts. Any changes will be
 // overwritten on commit!
-export const VERSION = "5.0.0-beta.20";
+export const VERSION = "5.0.0-beta.21";