chore: move optional mode into account params (#1339)

* chore: move optional mode into account params * chore: removed unused var
alchemyplatform · Feb 10, 2025 · aad98b8 · aad98b8
1 parent caed7a1
commit aad98b8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 23 deletions.
diff --git a/account-kit/core/src/actions/createAccount.ts b/account-kit/core/src/actions/createAccount.ts
@@ -1,4 +1,3 @@
-import { type OptionalFields } from "@aa-sdk/core";
 import type { AlchemyWebSigner } from "@account-kit/signer";
 import {
   createLightAccount,
@@ -48,10 +47,7 @@ export type AccountConfig<TAccount extends SupportedAccountTypes> =
       >
     : TAccount extends "ModularAccountV2"
     ? OmitSignerTransportChain<
-        OptionalFields<
-          CreateModularAccountV2Params<Transport, AlchemyWebSigner>,
-          "mode"
-        >
+        CreateModularAccountV2Params<Transport, AlchemyWebSigner>
       >
     : never;
 
@@ -160,12 +156,8 @@ export async function createAccount<TAccount extends SupportedAccountTypes>(
           return account;
         });
       case "ModularAccountV2":
-        const maV2Params = {
-          mode: "default",
-          ...params,
-        };
         return createModularAccountV2({
-          ...(maV2Params as AccountConfig<"ModularAccountV2">),
+          ...(params as AccountConfig<"ModularAccountV2">),
           ...(cachedConfig as OmitSignerTransportChain<CreateModularAccountV2Params>),
           signer,
           transport: (opts) => transport({ ...opts, retryCount: 0 }),

diff --git a/account-kit/smart-contracts/src/ma-v2/account/modularAccountV2.ts b/account-kit/smart-contracts/src/ma-v2/account/modularAccountV2.ts
@@ -40,7 +40,7 @@ export type CreateModularAccountV2Params<
 }) &
   (
     | {
-        mode: "default";
+        mode?: "default";
         salt?: bigint;
         factoryAddress?: Address;
         initCode?: Hex;
@@ -136,7 +136,8 @@ export async function createModularAccountV2(
           getImplementationAddress,
         };
       }
-      case "default": {
+      case "default":
+      case undefined: {
         const {
           salt = 0n,
           factoryAddress = getDefaultMAV2FactoryAddress(chain),

diff --git a/account-kit/smart-contracts/src/ma-v2/client/client.ts b/account-kit/smart-contracts/src/ma-v2/client/client.ts
@@ -3,7 +3,6 @@ import {
   type SmartAccountSigner,
   type SmartAccountClientConfig,
   type NotType,
-  type OptionalFields,
   createSmartAccountClient,
   default7702GasEstimator,
   default7702UserOpSigner,
@@ -36,7 +35,7 @@ export type CreateModularAccountV2ClientParams<
   TTransport extends Transport = Transport,
   TChain extends Chain = Chain,
   TSigner extends SmartAccountSigner = SmartAccountSigner
-> = OptionalFields<CreateModularAccountV2Params<TTransport, TSigner>, "mode"> &
+> = CreateModularAccountV2Params<TTransport, TSigner> &
   Omit<
     SmartAccountClientConfig<TTransport, TChain>,
     "transport" | "account" | "chain"
@@ -111,14 +110,9 @@ export async function createModularAccountV2Client(
     | CreateModularAccountV2ClientParams
     | CreateModularAccountV2AlchemyClientParams
 ): Promise<SmartAccountClient | AlchemySmartAccountClient> {
-  const config_ = {
-    ...config,
-    mode: config.mode ?? "default",
-  };
-
-  const { transport, chain } = config_;
+  const { transport, chain } = config;
 
-  const account = await createModularAccountV2(config_);
+  const account = await createModularAccountV2(config);
 
   const middlewareToAppend =
     config.mode === "7702"
@@ -130,7 +124,7 @@ export async function createModularAccountV2Client(
 
   if (isAlchemyTransport(transport, chain)) {
     return createAlchemySmartAccountClient({
-      ...config_,
+      ...config,
       transport,
       chain,
       account,
@@ -139,7 +133,7 @@ export async function createModularAccountV2Client(
   }
 
   return createSmartAccountClient({
-    ...config_,
+    ...config,
     account,
     ...middlewareToAppend,
   });