fix: use accountParams instead of params when creating client

alchemyplatform · Feb 25, 2025 · 8d965ed · 8d965ed
1 parent 1462f67
commit 8d965ed
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/account-kit/core/src/actions/createAccount.ts b/account-kit/core/src/actions/createAccount.ts
@@ -105,7 +105,7 @@ export async function createAccount<TAccount extends SupportedAccountTypes>(
     if (isLightAccountParams(params)) {
       return createLightAccount({
         ...accountConfigs[chain.id]?.[params.type],
-        ...params,
+        ...params.accountParams,
         signer,
         transport: (opts) => transport({ ...opts, retryCount: 0 }),
         chain,
@@ -122,7 +122,7 @@ export async function createAccount<TAccount extends SupportedAccountTypes>(
     } else if (isMultiOwnerLightAccountParams(params)) {
       return createMultiOwnerLightAccount({
         ...accountConfigs[chain.id]?.[params.type],
-        ...params,
+        ...params.accountParams,
         signer,
         transport: (opts) => transport({ ...opts, retryCount: 0 }),
         chain,
@@ -139,7 +139,7 @@ export async function createAccount<TAccount extends SupportedAccountTypes>(
     } else if (isMultiOwnerModularAccountParams(params)) {
       return createMultiOwnerModularAccount({
         ...accountConfigs[chain.id]?.[params.type],
-        ...params,
+        ...params.accountParams,
         signer,
         transport: (opts) => transport({ ...opts, retryCount: 0 }),
         chain,
@@ -156,7 +156,7 @@ export async function createAccount<TAccount extends SupportedAccountTypes>(
     } else if (isModularV2AccountParams(params)) {
       return createModularAccountV2({
         ...accountConfigs[chain.id]?.[params.type],
-        ...params,
+        ...params.accountParams,
         signer,
         transport: (opts) => transport({ ...opts, retryCount: 0 }),
         chain,
@@ -168,7 +168,6 @@ export async function createAccount<TAccount extends SupportedAccountTypes>(
             accountVersion: "v2.0.0",
           },
         });
-
         return account;
       });
     } else {
@@ -193,7 +192,7 @@ export async function createAccount<TAccount extends SupportedAccountTypes>(
         [chain.id]: {
           ...state.accountConfigs[chain.id],
           [params.type]: {
-            ...params,
+            ...params.accountParams,
           },
         },
       },
@@ -219,7 +218,7 @@ export async function createAccount<TAccount extends SupportedAccountTypes>(
         [chain.id]: {
           ...state.accountConfigs[chain.id],
           [params.type]: {
-            ...params,
+            ...params.accountParams,
             accountAddress: account.address,
             initCode,
           },

diff --git a/account-kit/core/src/actions/getSmartAccountClient.ts b/account-kit/core/src/actions/getSmartAccountClient.ts
@@ -28,7 +28,7 @@ import type {
   SupportedAccounts,
   SupportedAccountTypes,
 } from "../types";
-import { createAccount } from "./createAccount.js";
+import { createAccount, isModularV2AccountParams } from "./createAccount.js";
 import { getAccount, type GetAccountParams } from "./getAccount.js";
 import { getAlchemyTransport } from "./getAlchemyTransport.js";
 import { getConnection } from "./getConnection.js";
@@ -221,9 +221,8 @@ export function getSmartAccountClient(
         };
       case "ModularAccountV2":
         const is7702 =
-          params.accountParams &&
-          "mode" in params.accountParams &&
-          params.accountParams.mode === "7702";
+          isModularV2AccountParams(params) &&
+          params.accountParams?.mode === "7702";
         return {
           client: createAlchemySmartAccountClient({
             transport,