@account-kit/wallet-client 0.1.0-alpha.3 → 0.1.0-alpha.5

package/src/client/client.e2e-test.ts

@@ -17,7 +17,7 @@ describe("Client E2E Tests", () => {
   );
   describe("Local Mode Tests", () => {
     const signer = LocalAccountSigner.privateKeyToAccountSigner(
-      "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff81",
+      "0xbaca22d9b6846ec09a4da378ffa07e2f14ce7d65675d135911b6fd281416bb03",
     );
 
     const client = createSmartWalletClient({
@@ -32,34 +32,34 @@ describe("Client E2E Tests", () => {
       transport,
     });
 
+    it("should successfully get a counterfactual address", async () => {
+      const account = await client.requestAccount();
+      expect(account.address).toMatchInlineSnapshot(
+        `"0xa46944b7a39c35d931D514ACAc3ac77c226a81ff"`,
+      );
+    });
+
     it("should successfully request account with different salt", async () => {
       const account = await client.requestAccount({
-        id: "2d00c64e-2e55-4925-832e-e288dbf1139e",
+        id: "f4c1d956-24ef-4002-a141-2c9d6d92af1a",
         creationHint: { salt: "0x1" },
       });
 
       expect(account.address).toMatchInlineSnapshot(
-        `"0x569bCECaC47Ef9706c4b2370f2891bccd4cdE30c"`,
+        `"0xA692f0E5AfAD20F771443D89C635146C6A592f06"`,
       );
     });
 
     it("should not cache account if different inputs provided", async () => {
       const account = await client.requestAccount();
       const account2 = await client.requestAccount({
-        id: "2d00c64e-2e55-4925-832e-e288dbf1139e",
-        creationHint: { salt: "0x1" },
+        id: "52ab44be-b03e-47ed-ad65-43014ea5fbfc",
+        creationHint: { salt: "0x2" },
       });
 
       expect(account.address).not.toEqual(account2.address);
     });
 
-    it("should successfully get a counterfactual address", async () => {
-      const account = await client.requestAccount();
-      expect(account.address).toMatchInlineSnapshot(
-        `"0x26809de7733F9CcB5c0c61210a4f78d6F1daFc58"`,
-      );
-    });
-
     it("can correctly sign a message", async () => {
       const account = await client.requestAccount();
       const message = "hello world";
@@ -85,7 +85,7 @@ describe("Client E2E Tests", () => {
 
     it("can correctly sign a message with a different account", async () => {
       const account = await client.requestAccount({
-        id: "2d00c64e-2e55-4925-832e-e288dbf1139e",
+        id: "f4c1d956-24ef-4002-a141-2c9d6d92af1a",
         creationHint: { salt: "0x1" },
       });
       const message = "hello world";
@@ -104,7 +104,7 @@ describe("Client E2E Tests", () => {
 
     it("can correctly sign typed data with a different account", async () => {
       const account = await client.requestAccount({
-        id: "2d00c64e-2e55-4925-832e-e288dbf1139e",
+        id: "f4c1d956-24ef-4002-a141-2c9d6d92af1a",
         creationHint: { salt: "0x1" },
       });
 
@@ -189,7 +189,7 @@ describe("Client E2E Tests", () => {
 
   describe("Remote Mode Tests", () => {
     const signer = LocalAccountSigner.privateKeyToAccountSigner(
-      "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80",
+      "0xd7b061ef04d29cf68b3c89356678eccec9988de8d5ed892c19461c4a9d65925d",
     );
 
     const client = createSmartWalletClient({
@@ -207,26 +207,26 @@ describe("Client E2E Tests", () => {
     it("should successfully get a counterfactual address", async () => {
       const account = await client.requestAccount();
       expect(account.address).toMatchInlineSnapshot(
-        `"0x65b5DE0251f553B2208762a4724303E750294D96"`,
+        `"0x76E765e80FFAC96ac10Aa8908a8267A3B80d606D"`,
       );
     });
 
     it("should successfully request account with different salt", async () => {
       const account = await client.requestAccount({
-        id: "8670d2d8-2781-49e9-a75c-1eb980271ca9",
+        id: "26b375e3-c94a-4e98-b6b7-5a97121aa583",
         creationHint: { salt: "0x1" },
       });
 
       expect(account.address).toMatchInlineSnapshot(
-        `"0xC9B8271E44f14be83CecfDE1dDb325e9fa15e9Ff"`,
+        `"0xdfdd407b9569D40BEFa503208753E59cAc9713fA"`,
       );
     });
 
     it("should not cache account if different inputs provided", async () => {
       const account = await client.requestAccount();
       const account2 = await client.requestAccount({
-        id: "8670d2d8-2781-49e9-a75c-1eb980271ca9",
-        creationHint: { salt: "0x1" },
+        id: "2a3320b4-6ed2-4833-a488-5188e9bdd9d2",
+        creationHint: { salt: "0x2" },
       });
 
       expect(account.address).not.toEqual(account2.address);
@@ -257,7 +257,7 @@ describe("Client E2E Tests", () => {
 
     it("can correctly sign a message with a different account", async () => {
       const account = await client.requestAccount({
-        id: "8670d2d8-2781-49e9-a75c-1eb980271ca9",
+        id: "26b375e3-c94a-4e98-b6b7-5a97121aa583",
         creationHint: { salt: "0x1" },
       });
 
@@ -276,7 +276,7 @@ describe("Client E2E Tests", () => {
 
     it("can correctly sign typed data with a different account", async () => {
       const account = await client.requestAccount({
-        id: "8670d2d8-2781-49e9-a75c-1eb980271ca9",
+        id: "26b375e3-c94a-4e98-b6b7-5a97121aa583",
         creationHint: { salt: "0x1" },
       });
 

package/src/client/decorator.ts

@@ -1,5 +1,5 @@
 import type { SmartAccountSigner } from "@aa-sdk/core";
-import type { Hex, JsonRpcAccount } from "viem";
+import type { Address, Hex } from "viem";
 import type {
   SendPreparedCallsParams,
   SendPreparedCallsResult,
@@ -48,10 +48,10 @@ import {
 } from "./actions/signTypedData.js";
 
 export type SmartWalletActions<
-  TAccount extends JsonRpcAccount | undefined = JsonRpcAccount | undefined,
+  TAccount extends Address | undefined = Address | undefined,
 > = {
   requestAccount: (
-    params?: RequestAccountParams<TAccount>,
+    params?: RequestAccountParams,
   ) => Promise<RequestAccountResult>;
   prepareCalls: (
     params: PrepareCallsParams<TAccount>,
@@ -75,16 +75,11 @@ export type SmartWalletActions<
 };
 
 export function smartWalletClientActions<
-  TAccount extends JsonRpcAccount | undefined = JsonRpcAccount | undefined,
+  TAccount extends Address | undefined = Address | undefined,
 >(
-  client: InnerWalletApiClient<TAccount>,
-  signer: SmartAccountSigner,
-): SmartWalletActions<TAccount>;
-
-export function smartWalletClientActions(
   client: InnerWalletApiClient,
   signer: SmartAccountSigner,
-): SmartWalletActions {
+): SmartWalletActions<TAccount> {
   return {
     requestAccount: (params) => requestAccount(client, signer, params),
     createAccount: (params) => createAccount(client, signer, params),

package/src/client/index.ts

@@ -1,11 +1,6 @@
 import type { SmartAccountSigner } from "@aa-sdk/core";
-import type {
-  Address,
-  Chain,
-  IsUndefined,
-  JsonRpcAccount,
-  Prettify,
-} from "viem";
+import type { AlchemyTransport } from "@account-kit/infra";
+import type { Address, Chain, Prettify } from "viem";
 import { createLocalClient } from "../local/client.js";
 import { createRemoteClient } from "../remote/client.js";
 import type { InnerWalletApiClient } from "../types.ts";
@@ -13,41 +8,21 @@ import {
   smartWalletClientActions,
   type SmartWalletActions,
 } from "./decorator.js";
-import type { AlchemyTransport } from "@account-kit/infra";
 
 export type SmartWalletClientParams<
-  TAccount extends JsonRpcAccount<Address> | undefined =
-    | JsonRpcAccount<Address>
-    | undefined,
-> = Prettify<
-  {
-    transport: AlchemyTransport;
-    chain: Chain;
-    signer: SmartAccountSigner;
-    mode: "local" | "remote";
-    policyId?: string;
-  } & (IsUndefined<TAccount> extends true
-    ? {
-        account?: never;
-      }
-    : {
-        account: Address;
-      })
->;
+  TAccount extends Address | undefined = Address | undefined,
+> = Prettify<{
+  transport: AlchemyTransport;
+  chain: Chain;
+  signer: SmartAccountSigner;
+  mode: "local" | "remote";
+  policyId?: string;
+  account?: TAccount | Address | undefined;
+}>;
 
-export function createSmartWalletClient<
-  TAccount extends JsonRpcAccount<Address> | undefined =
-    | JsonRpcAccount<Address>
-    | undefined,
->(
-  params: SmartWalletClientParams<TAccount>,
-): InnerWalletApiClient<TAccount> & SmartWalletActions<TAccount>;
-
-export function createSmartWalletClient<
-  TAccount extends JsonRpcAccount<Address> = JsonRpcAccount<Address>,
->(
-  params: SmartWalletClientParams<TAccount>,
-): InnerWalletApiClient<TAccount> & SmartWalletActions<TAccount>;
+export type SmartWalletClient<
+  TAccount extends Address | undefined = Address | undefined,
+> = InnerWalletApiClient & SmartWalletActions<TAccount>;
 
 /**
  * Creates a smart wallet client that can be used to interact with a smart account.
@@ -59,7 +34,7 @@ export function createSmartWalletClient<
  * @param {"local" | "remote"} params.mode - The client's mode (local or remote).
  * @param {string} [params.policyId] - The policy ID for gas sponsorship (optional)
  * @param {Address} [params.account] - The smart account address to use (optional)
- * @returns {InnerWalletApiClient & SmartWalletActions} - A viem-compatible client
+ * @returns {SmartWalletClient} - A viem-compatible client
  *
  * @example
  * import { LocalAccountSigner } from "@aa-sdk/core";
@@ -78,9 +53,13 @@ export function createSmartWalletClient<
  *   signer,
  * });
  */
+export function createSmartWalletClient<
+  TAccount extends Address | undefined = undefined,
+>(params: SmartWalletClientParams<TAccount>): SmartWalletClient<TAccount>;
+
 export function createSmartWalletClient(
   params: SmartWalletClientParams,
-): InnerWalletApiClient & SmartWalletActions {
+): SmartWalletClient {
   const { transport, chain, policyId, mode, account, signer } = params;
 
   const innerClient =

package/src/exports/index.ts

@@ -2,6 +2,7 @@
 // and we shouldn't export * for the sake of tree-shaking
 export {
   createSmartWalletClient,
+  type SmartWalletClient,
   type SmartWalletClientParams,
 } from "../client/index.js";
 
@@ -24,10 +25,10 @@ export {
 // client actions
 export { createAccount } from "../client/actions/createAccount.js";
 export { getCallsStatus } from "../client/actions/getCallsStatus.js";
+export { grantPermissions } from "../client/actions/grantPermissions.js";
 export { listAccounts } from "../client/actions/listAccounts.js";
 export { prepareCalls } from "../client/actions/prepareCalls.js";
 export { requestAccount } from "../client/actions/requestAccount.js";
 export { signMessage } from "../client/actions/signMessage.js";
 export { signSignatureRequest } from "../client/actions/signSignatureRequest.js";
 export { signTypedData } from "../client/actions/signTypedData.js";
-export { grantPermissions } from "../client/actions/grantPermissions.js";

package/src/isomorphic/actions/createSession.ts

@@ -26,6 +26,10 @@ import { createAccount, isModularAccountV2 } from "../utils/createAccount.js";
 import { createDummySigner } from "../utils/createDummySigner.js";
 import { createAuthorization } from "../utils/7702.js";
 import { InvalidRequestError } from "ox/RpcResponse";
+import {
+  parseDelegation,
+  assertValid7702AccountAddress,
+} from "../utils/7702.js";
 
 export type CreateSessionParams = Omit<
   Static<
@@ -59,15 +63,26 @@ export async function createSession(
     throw new ChainNotFoundError();
   }
 
-  const { counterfactualInfo, delegation } = await client.request({
-    method: "wallet_requestAccount",
-    params: [
-      {
-        accountAddress: params.account,
-        includeCounterfactualInfo: true,
-      },
-    ],
-  });
+  assertValid7702AccountAddress(
+    params.account,
+    params.capabilities?.eip7702Auth,
+  );
+
+  const { counterfactualInfo, delegation } = params.capabilities?.eip7702Auth
+    ? {
+        counterfactualInfo: undefined,
+        delegation: parseDelegation(params.capabilities.eip7702Auth),
+      }
+    : await client.request({
+        method: "wallet_requestAccount",
+        params: [
+          {
+            accountAddress: params.account,
+            includeCounterfactualInfo: true,
+          },
+        ],
+      });
+
   if (!counterfactualInfo && !delegation) {
     throw new InvalidRequestError({
       message:
@@ -104,7 +119,11 @@ export async function createSession(
   const { typedData, fullPreSignatureDeferredActionDigest } =
     await new PermissionBuilder({
       client: _client,
-      key: params.key,
+      key: {
+        ...params.key,
+        // Alias 'ecdsa' to 'secp256k1'
+        type: params.key.type === "ecdsa" ? "secp256k1" : params.key.type,
+      },
       entityId,
       nonce,
       deadline: params.expiry,

package/src/isomorphic/actions/getCallsStatus.ts

@@ -6,6 +6,7 @@ import type { Static } from "@sinclair/typebox";
 import { Value } from "@sinclair/typebox/value";
 import {
   ChainNotFoundError,
+  hexToNumber,
   isHex,
   type Chain,
   type Hex,
@@ -16,6 +17,21 @@ import type { wallet_getCallsStatus } from "../../rpc/request.js";
 import type { WalletServerViemRpcSchema } from "../../rpc/schema.js";
 import { TypeCallId } from "../../schemas.js";
 import { castToHex } from "../../utils.js";
+import { InternalError, BaseError } from "ox/RpcResponse";
+import {
+  polygon,
+  mainnet,
+  base,
+  worldchain,
+  optimism,
+  arbitrum,
+  sepolia,
+  polygonAmoy,
+  baseSepolia,
+  optimismSepolia,
+  worldchainSepolia,
+  arbitrumSepolia,
+} from "viem/chains";
 
 export type GetCallsStatusParams = Static<
   (typeof wallet_getCallsStatus)["properties"]["Request"]["properties"]["params"]
@@ -44,6 +60,29 @@ export const CallStatusCode = {
   PARTIAL_CHAIN_RULES_FAILURE: 600,
 } as const;
 
+// https://eips.ethereum.org/EIPS/eip-5792#error-codes
+const ErrorCode = {
+  UNKNOWN_BUNDLE_ID: 5730,
+};
+
+// "eth_getUserOperationByHash" is limited to the last 150 blocks
+//  for all networks except those in this list.
+// https://www.alchemy.com/docs/node/bundler-api/bundler-api-endpoints/eth-get-user-operation-by-hash
+const GET_USER_OP_BY_HASH_UNLIMITED_RANGE_NETWORKS: number[] = [
+  mainnet.id,
+  sepolia.id,
+  polygon.id,
+  polygonAmoy.id,
+  base.id,
+  baseSepolia.id,
+  optimism.id,
+  optimismSepolia.id,
+  worldchain.id,
+  worldchainSepolia.id,
+  arbitrum.id,
+  arbitrumSepolia.id,
+];
+
 export async function getCallsStatus(
   client: SmartAccountClient<
     Transport,
@@ -57,21 +96,54 @@ export async function getCallsStatus(
   if (!client.chain) {
     throw new ChainNotFoundError();
   }
-
   const { chainId, hash } = Value.Decode(TypeCallId, callId);
 
-  const result = await client.getUserOperationReceipt(hash);
-
-  return {
+  const baseResp = {
     id: callId,
     chainId,
     atomic: true,
-    status: !result?.receipt
-      ? CallStatusCode.PENDING
-      : result.success
-        ? CallStatusCode.CONFIRMED
-        : CallStatusCode.CHAIN_RULES_FAILURE,
-    receipts: !result?.receipt ? undefined : [transformReceipt(result.receipt)],
+  };
+
+  const result = await client.getUserOperationByHash(hash);
+  if (
+    !result &&
+    GET_USER_OP_BY_HASH_UNLIMITED_RANGE_NETWORKS.includes(hexToNumber(chainId))
+  ) {
+    // This network has unlimited range, so we should always have a result here if the callId is valid.
+    throw new BaseError({
+      message: `callId ${callId} not found`,
+      code: ErrorCode.UNKNOWN_BUNDLE_ID,
+    });
+  }
+  if (result && !result.transactionHash) {
+    // A result but no txn hash means it's valid but pending.
+    return {
+      ...baseResp,
+      status: CallStatusCode.PENDING,
+    };
+  }
+
+  const receipt = await client.getUserOperationReceipt(hash);
+  if (result?.transactionHash && !receipt) {
+    // This should never happen.
+    throw new InternalError({
+      message: `Failed to get receipt for callId ${callId}`,
+    });
+  }
+  if (!receipt) {
+    // This covers txns older than 150 blocks which were not retrievable by "eth_getUserOperationByHash".
+    throw new BaseError({
+      message: `callId ${callId} not found`,
+      code: ErrorCode.UNKNOWN_BUNDLE_ID,
+    });
+  }
+
+  return {
+    ...baseResp,
+    status: receipt.success
+      ? CallStatusCode.CONFIRMED
+      : CallStatusCode.CHAIN_RULES_FAILURE,
+    receipts: [transformReceipt(receipt.receipt)],
   };
 }
 

package/src/isomorphic/actions/prepareCalls.ts

@@ -17,8 +17,9 @@ import type { wallet_prepareCalls } from "../../rpc/request.js";
 import type { WalletServerViemRpcSchema } from "../../rpc/schema.js";
 import { createAccount } from "../utils/createAccount.js";
 import { createDummySigner } from "../utils/createDummySigner.js";
-import { createAuthorization } from "../utils/7702.js";
+import { createAuthorization, parseDelegation } from "../utils/7702.js";
 import { InvalidRequestError } from "ox/RpcResponse";
+import { assertValid7702AccountAddress } from "../utils/7702.js";
 
 export type PrepareCallsParams = Omit<
   Static<
@@ -45,16 +46,23 @@ export async function prepareCalls(
     throw new ChainNotFoundError();
   }
 
+  assertValid7702AccountAddress(params.from, params.capabilities?.eip7702Auth);
+
   // in local mode, we probably want some kind of caching for this
-  const { counterfactualInfo, delegation } = await client.request({
-    method: "wallet_requestAccount",
-    params: [
-      {
-        accountAddress: params.from,
-        includeCounterfactualInfo: true,
-      },
-    ],
-  });
+  const { counterfactualInfo, delegation } = params.capabilities?.eip7702Auth
+    ? {
+        counterfactualInfo: undefined,
+        delegation: parseDelegation(params.capabilities.eip7702Auth),
+      }
+    : await client.request({
+        method: "wallet_requestAccount",
+        params: [
+          {
+            accountAddress: params.from,
+            includeCounterfactualInfo: true,
+          },
+        ],
+      });
 
   if (!counterfactualInfo && !delegation) {
     throw new InvalidRequestError({
@@ -69,7 +77,7 @@ export async function prepareCalls(
     signer: createDummySigner(params.from),
     accountAddress: params.from,
     counterfactualInfo,
-    capabilities: params.capabilities,
+    permissions: params.capabilities?.permissions,
     delegation,
   });
 

package/src/isomorphic/actions/sendPreparedCalls.ts

@@ -19,7 +19,7 @@ import { decodePermissionsContext } from "../../capabilities/permissions/mav2.js
 import type { wallet_sendPreparedCalls } from "../../rpc/request.js";
 import type { WalletServerViemRpcSchema } from "../../rpc/schema.js";
 import { TypeCallId } from "../../schemas.js";
-import { isSupportedImplementationAddress7702 } from "../utils/7702.js";
+import { isSupportedDelegationAddress7702 } from "../utils/7702.js";
 import { InvalidRequestError } from "ox/RpcResponse";
 
 export type SendPreparedCallsParams = Omit<
@@ -51,7 +51,7 @@ export async function sendPreparedCalls(
   // One last safety check to be sure the UO wasn't modified to include an unsupported 7702 delegation address.
   if (
     params.signedAuthorization &&
-    !isSupportedImplementationAddress7702(params.signedAuthorization.address)
+    !isSupportedDelegationAddress7702(params.signedAuthorization.address)
   ) {
     throw new InvalidRequestError({
       message: `Unsupported 7702 delegation address: ${params.signedAuthorization.address}`,

package/src/isomorphic/utils/7702.ts

@@ -5,8 +5,12 @@ import {
   type Address,
   type Chain,
   type Transport,
+  isAddress,
 } from "viem";
 import type { WalletServerViemRpcSchema } from "../../rpc/schema.js";
+import type { Eip7702AuthCapability } from "../../capabilities/eip7702Auth.ts";
+import type { Static } from "@sinclair/typebox";
+import { InvalidRequestError } from "ox/RpcResponse";
 
 export const createAuthorization = async (
   client: SmartAccountClient<
@@ -32,27 +36,71 @@ export const createAuthorization = async (
   };
 };
 
-type Supported7702AccountType = "ModularAccountV2";
+export const EIP_7702_ACCOUNT_TYPE = ["ModularAccountV2"] as const;
 
-const IMPLEMENTATION_ADDRESS_TO_ACCOUNT_TYPE: Record<
+type Supported7702AccountType = (typeof EIP_7702_ACCOUNT_TYPE)[number];
+
+const Eip7702AccountTypeToDelegationAddress = {
+  ModularAccountV2: "0x69007702764179f14F51cdce752f4f775d74E139",
+} as const satisfies Record<Supported7702AccountType, Address>;
+
+const DelegationAddressToAccountType: Record<
   Address,
   Supported7702AccountType
-> = {
-  "0x69007702764179f14F51cdce752f4f775d74E139": "ModularAccountV2",
+> = Object.fromEntries(
+  Object.entries(Eip7702AccountTypeToDelegationAddress).map(([key, value]) => [
+    value,
+    key,
+  ]),
+) as Record<Address, Supported7702AccountType>;
+
+export const SUPPORTED_DELEGATION_ADDRESSES = Object.values(
+  Eip7702AccountTypeToDelegationAddress,
+);
+
+export const isSupportedDelegationAddress7702 = (address: Address): boolean => {
+  return (SUPPORTED_DELEGATION_ADDRESSES as Address[]).includes(address);
 };
 
-export const getAccountTypeForImplementationAddress7702 = (
+export const getAccountTypeForDelegationAddress7702 = (
   address: Address,
 ): Supported7702AccountType | undefined => {
-  return IMPLEMENTATION_ADDRESS_TO_ACCOUNT_TYPE[address];
+  return DelegationAddressToAccountType[address];
 };
 
-const SUPPORTED_IMPLEMENTATION_ADDRESSES = Object.keys(
-  IMPLEMENTATION_ADDRESS_TO_ACCOUNT_TYPE,
-);
+const getDelegationAddressForAccountType7702 = (
+  accountType: Supported7702AccountType,
+): (typeof SUPPORTED_DELEGATION_ADDRESSES)[number] => {
+  return Eip7702AccountTypeToDelegationAddress[accountType];
+};
+
+const DEFAULT_7702_DELEGATION_ADDR =
+  Eip7702AccountTypeToDelegationAddress["ModularAccountV2"];
 
-export const isSupportedImplementationAddress7702 = (
-  address: string,
-): boolean => {
-  return SUPPORTED_IMPLEMENTATION_ADDRESSES.includes(address);
+export const parseDelegation = (
+  eip7702AuthCapability: Static<typeof Eip7702AuthCapability>,
+) => {
+  return eip7702AuthCapability === true
+    ? DEFAULT_7702_DELEGATION_ADDR
+    : isAddress(eip7702AuthCapability.delegation)
+      ? eip7702AuthCapability.delegation
+      : getDelegationAddressForAccountType7702(
+          eip7702AuthCapability.delegation,
+        );
+};
+
+export const assertValid7702AccountAddress = (
+  fromAddress: Address,
+  eip7702AuthCapability: Static<typeof Eip7702AuthCapability> | undefined,
+) => {
+  if (
+    eip7702AuthCapability &&
+    typeof eip7702AuthCapability === "object" &&
+    "account" in eip7702AuthCapability &&
+    eip7702AuthCapability?.account !== fromAddress
+  ) {
+    throw new InvalidRequestError({
+      message: `EIP-7702 delegation account ${eip7702AuthCapability.account} must match 'from' address ${fromAddress}.`,
+    });
+  }
 };

package/src/isomorphic/utils/createAccount.ts

@@ -6,12 +6,12 @@ import {
 import type { StaticDecode } from "@sinclair/typebox";
 import type { Address, Chain, Transport } from "viem";
 import { concatHex, hexToNumber } from "viem";
-import type { Capabilities } from "../../capabilities/index.js";
 import type { TypeSerializedInitcode } from "../../schemas.js";
 import { parsePermissionsContext } from "./parsePermissionsContext.js";
 import { assertNever } from "../../utils.js";
-import { getAccountTypeForImplementationAddress7702 } from "./7702.js";
+import { getAccountTypeForDelegationAddress7702 } from "./7702.js";
 import { InternalError } from "ox/RpcResponse";
+import { PermissionsCapability } from "../../capabilities/permissions/index.js";
 
 type CreateAccountParams = {
   chain: Chain;
@@ -19,8 +19,8 @@ type CreateAccountParams = {
   signer: SmartAccountSigner;
   accountAddress: Address;
   counterfactualInfo?: StaticDecode<typeof TypeSerializedInitcode>; // undefined for 7702 accounts
+  permissions?: StaticDecode<typeof PermissionsCapability>;
   delegation?: Address;
-  capabilities?: StaticDecode<typeof Capabilities>;
 };
 
 /**
@@ -47,7 +47,7 @@ export async function createAccount(
       });
     }
   } else if (mode === "7702") {
-    const accountType = getAccountTypeForImplementationAddress7702(
+    const accountType = getAccountTypeForDelegationAddress7702(
       params.delegation!,
     );
     if (accountType !== "ModularAccountV2") {
@@ -60,7 +60,7 @@ export async function createAccount(
   }
 
   const parsedContext = parsePermissionsContext(
-    params.capabilities,
+    params.permissions,
     ci,
     params.delegation,
   );