@account-kit/smart-contracts 4.12.1-alpha.0 → 4.13.0

package/dist/types/src/ma-v2/client/client.d.ts

@@ -1,14 +1,15 @@
 import { type SmartAccountClient, type SmartAccountSigner, type SmartAccountClientConfig, type NotType } from "@aa-sdk/core";
 import { type Chain, type Transport } from "viem";
-import { type CreateSMAV2AccountParams, type MAV2Account } from "../account/semiModularAccountV2.js";
+import { type CreateModularAccountV2Params } from "../account/modularAccountV2.js";
 import { type AlchemySmartAccountClientConfig, type AlchemyTransport } from "@account-kit/infra";
 import type { LightAccount } from "../../light-account/accounts/account.js";
-export type SMAV2AccountClient<TSigner extends SmartAccountSigner = SmartAccountSigner, TChain extends Chain = Chain, TTransport extends Transport | AlchemyTransport = Transport> = SmartAccountClient<TTransport, TChain, MAV2Account<TSigner>>;
-export type CreateSMAV2AccountClientParams<TTransport extends Transport = Transport, TChain extends Chain = Chain, TSigner extends SmartAccountSigner = SmartAccountSigner> = CreateSMAV2AccountParams<TTransport, TSigner> & Omit<SmartAccountClientConfig<TTransport, TChain>, "transport" | "account" | "chain">;
-export type CreateSMAV2AlchemyAccountClientParams<TTransport extends Transport = Transport, TChain extends Chain = Chain, TSigner extends SmartAccountSigner = SmartAccountSigner> = Omit<CreateSMAV2AccountClientParams<TTransport, TChain, TSigner>, "transport"> & Omit<AlchemySmartAccountClientConfig<TChain, LightAccount<TSigner>>, "account"> & {
+import type { ModularAccountV2 } from "../account/common/modularAccountV2Base.js";
+export type ModularAccountV2Client<TSigner extends SmartAccountSigner = SmartAccountSigner, TChain extends Chain = Chain, TTransport extends Transport | AlchemyTransport = Transport> = SmartAccountClient<TTransport, TChain, ModularAccountV2<TSigner>>;
+export type CreateModularAccountV2ClientParams<TTransport extends Transport = Transport, TChain extends Chain = Chain, TSigner extends SmartAccountSigner = SmartAccountSigner> = CreateModularAccountV2Params<TTransport, TSigner> & Omit<SmartAccountClientConfig<TTransport, TChain>, "transport" | "account" | "chain">;
+export type CreateModularAccountV2AlchemyClientParams<TTransport extends Transport = Transport, TChain extends Chain = Chain, TSigner extends SmartAccountSigner = SmartAccountSigner> = Omit<CreateModularAccountV2ClientParams<TTransport, TChain, TSigner>, "transport"> & Omit<AlchemySmartAccountClientConfig<TChain, LightAccount<TSigner>>, "account"> & {
     paymasterAndData?: never;
     dummyPaymasterAndData?: never;
 };
-export declare function createSMAV2AccountClient<TChain extends Chain = Chain, TSigner extends SmartAccountSigner = SmartAccountSigner>(args: CreateSMAV2AlchemyAccountClientParams<AlchemyTransport, TChain, TSigner>): Promise<SMAV2AccountClient<TSigner, TChain, AlchemyTransport>>;
-export declare function createSMAV2AccountClient<TTransport extends Transport = Transport, TChain extends Chain = Chain, TSigner extends SmartAccountSigner = SmartAccountSigner>(args: CreateSMAV2AccountClientParams<TTransport, TChain, TSigner> & NotType<TTransport, AlchemyTransport>): Promise<SMAV2AccountClient<TSigner, TChain>>;
+export declare function createModularAccountV2Client<TChain extends Chain = Chain, TSigner extends SmartAccountSigner = SmartAccountSigner>(args: CreateModularAccountV2AlchemyClientParams<AlchemyTransport, TChain, TSigner>): Promise<ModularAccountV2Client<TSigner, TChain, AlchemyTransport>>;
+export declare function createModularAccountV2Client<TTransport extends Transport = Transport, TChain extends Chain = Chain, TSigner extends SmartAccountSigner = SmartAccountSigner>(args: CreateModularAccountV2ClientParams<TTransport, TChain, TSigner> & NotType<TTransport, AlchemyTransport>): Promise<ModularAccountV2Client<TSigner, TChain>>;
 //# sourceMappingURL=client.d.ts.map

package/dist/types/src/ma-v2/client/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../../../src/ma-v2/client/client.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAC7B,KAAK,OAAO,EAEb,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,KAAK,KAAK,EAAE,KAAK,SAAS,EAAE,MAAM,MAAM,CAAC;AAElD,OAAO,EAEL,KAAK,wBAAwB,EAC7B,KAAK,WAAW,EACjB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAGL,KAAK,+BAA+B,EACpC,KAAK,gBAAgB,EACtB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAC5E,MAAM,MAAM,kBAAkB,CAC5B,OAAO,SAAS,kBAAkB,GAAG,kBAAkB,EACvD,MAAM,SAAS,KAAK,GAAG,KAAK,EAC5B,UAAU,SAAS,SAAS,GAAG,gBAAgB,GAAG,SAAS,IACzD,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC;AAEjE,MAAM,MAAM,8BAA8B,CACxC,UAAU,SAAS,SAAS,GAAG,SAAS,EACxC,MAAM,SAAS,KAAK,GAAG,KAAK,EAC5B,OAAO,SAAS,kBAAkB,GAAG,kBAAkB,IACrD,wBAAwB,CAAC,UAAU,EAAE,OAAO,CAAC,GAC/C,IAAI,CACF,wBAAwB,CAAC,UAAU,EAAE,MAAM,CAAC,EAC5C,WAAW,GAAG,SAAS,GAAG,OAAO,CAClC,CAAC;AACJ,MAAM,MAAM,qCAAqC,CAC/C,UAAU,SAAS,SAAS,GAAG,SAAS,EACxC,MAAM,SAAS,KAAK,GAAG,KAAK,EAC5B,OAAO,SAAS,kBAAkB,GAAG,kBAAkB,IACrD,IAAI,CACN,8BAA8B,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,EAC3D,WAAW,CACZ,GACC,IAAI,CACF,+BAA+B,CAAC,MAAM,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC,EAC9D,SAAS,CACV,GAAG;IAAE,gBAAgB,CAAC,EAAE,KAAK,CAAC;IAAC,qBAAqB,CAAC,EAAE,KAAK,CAAA;CAAE,CAAC;AAElE,wBAAgB,wBAAwB,CACtC,MAAM,SAAS,KAAK,GAAG,KAAK,EAC5B,OAAO,SAAS,kBAAkB,GAAG,kBAAkB,EAEvD,IAAI,EAAE,qCAAqC,CAAC,gBAAgB,EAAE,MAAM,EAAE,OAAO,CAAC,GAC7E,OAAO,CAAC,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC;AAElE,wBAAgB,wBAAwB,CACtC,UAAU,SAAS,SAAS,GAAG,SAAS,EACxC,MAAM,SAAS,KAAK,GAAG,KAAK,EAC5B,OAAO,SAAS,kBAAkB,GAAG,kBAAkB,EAEvD,IAAI,EAAE,8BAA8B,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,GAC/D,OAAO,CAAC,UAAU,EAAE,gBAAgB,CAAC,GACtC,OAAO,CAAC,kBAAkB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../../../src/ma-v2/client/client.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAC7B,KAAK,OAAO,EAIb,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,KAAK,KAAK,EAAE,KAAK,SAAS,EAAE,MAAM,MAAM,CAAC;AAElD,OAAO,EAEL,KAAK,4BAA4B,EAClC,MAAM,gCAAgC,CAAC;AAExC,OAAO,EAIL,KAAK,+BAA+B,EACpC,KAAK,gBAAgB,EACtB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAE5E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAElF,MAAM,MAAM,sBAAsB,CAChC,OAAO,SAAS,kBAAkB,GAAG,kBAAkB,EACvD,MAAM,SAAS,KAAK,GAAG,KAAK,EAC5B,UAAU,SAAS,SAAS,GAAG,gBAAgB,GAAG,SAAS,IACzD,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;AAEtE,MAAM,MAAM,kCAAkC,CAC5C,UAAU,SAAS,SAAS,GAAG,SAAS,EACxC,MAAM,SAAS,KAAK,GAAG,KAAK,EAC5B,OAAO,SAAS,kBAAkB,GAAG,kBAAkB,IACrD,4BAA4B,CAAC,UAAU,EAAE,OAAO,CAAC,GACnD,IAAI,CACF,wBAAwB,CAAC,UAAU,EAAE,MAAM,CAAC,EAC5C,WAAW,GAAG,SAAS,GAAG,OAAO,CAClC,CAAC;AAEJ,MAAM,MAAM,yCAAyC,CACnD,UAAU,SAAS,SAAS,GAAG,SAAS,EACxC,MAAM,SAAS,KAAK,GAAG,KAAK,EAC5B,OAAO,SAAS,kBAAkB,GAAG,kBAAkB,IACrD,IAAI,CACN,kCAAkC,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,EAC/D,WAAW,CACZ,GACC,IAAI,CACF,+BAA+B,CAAC,MAAM,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC,EAC9D,SAAS,CACV,GAAG;IAAE,gBAAgB,CAAC,EAAE,KAAK,CAAC;IAAC,qBAAqB,CAAC,EAAE,KAAK,CAAA;CAAE,CAAC;AAElE,wBAAgB,4BAA4B,CAC1C,MAAM,SAAS,KAAK,GAAG,KAAK,EAC5B,OAAO,SAAS,kBAAkB,GAAG,kBAAkB,EAEvD,IAAI,EAAE,yCAAyC,CAC7C,gBAAgB,EAChB,MAAM,EACN,OAAO,CACR,GACA,OAAO,CAAC,sBAAsB,CAAC,OAAO,EAAE,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC;AAEtE,wBAAgB,4BAA4B,CAC1C,UAAU,SAAS,SAAS,GAAG,SAAS,EACxC,MAAM,SAAS,KAAK,GAAG,KAAK,EAC5B,OAAO,SAAS,kBAAkB,GAAG,kBAAkB,EAEvD,IAAI,EAAE,kCAAkC,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,GACnE,OAAO,CAAC,UAAU,EAAE,gBAAgB,CAAC,GACtC,OAAO,CAAC,sBAAsB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC"}

package/dist/types/src/ma-v2/index.d.ts

@@ -3,15 +3,11 @@ export { modularAccountAbi } from "./abis/modularAccountAbi.js";
 export { semiModularAccountBytecodeAbi } from "./abis/semiModularAccountBytecodeAbi.js";
 export { semiModularAccountStorageAbi } from "./abis/semiModularAccountStorageAbi.js";
 export { nativeSMASigner } from "./account/nativeSMASigner.js";
-export type * from "./account/semiModularAccountV2.js";
-export { createSMAV2Account } from "./account/semiModularAccountV2.js";
 export type { ModuleEntity, ValidationConfig, HookConfig, ValidationData, } from "./actions/common/types.js";
 export { HookType } from "./actions/common/types.js";
 export { serializeValidationConfig, serializeHookConfig, serializeModuleEntity, } from "./actions/common/utils.js";
 export type * from "./actions/install-validation/installValidation.js";
 export { installValidationActions } from "./actions/install-validation/installValidation.js";
-export type * from "./client/client.js";
-export { createSMAV2AccountClient } from "./client/client.js";
 export { getDefaultAllowlistModuleAddress, getDefaultNativeTokenLimitModuleAddress, getDefaultPaymasterGuardModuleAddress, getDefaultSingleSignerValidationModuleAddress, getDefaultTimeRangeModuleAddress, getDefaultWebauthnValidationModuleAddress, } from "./modules/utils.js";
 export { allowlistModuleAbi } from "./modules/allowlist-module/abis/allowlistModuleAbi.js";
 export { AllowlistModule } from "./modules/allowlist-module/module.js";

package/dist/types/src/ma-v2/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/ma-v2/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,6BAA6B,EAAE,MAAM,yCAAyC,CAAC;AACxF,OAAO,EAAE,4BAA4B,EAAE,MAAM,wCAAwC,CAAC;AAEtF,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,mBAAmB,mCAAmC,CAAC;AACvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AAEvE,YAAY,EACV,YAAY,EACZ,gBAAgB,EAChB,UAAU,EACV,cAAc,GACf,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AACrD,OAAO,EACL,yBAAyB,EACzB,mBAAmB,EACnB,qBAAqB,GACtB,MAAM,2BAA2B,CAAC;AACnC,mBAAmB,mDAAmD,CAAC;AACvE,OAAO,EAAE,wBAAwB,EAAE,MAAM,mDAAmD,CAAC;AAE7F,mBAAmB,oBAAoB,CAAC;AACxC,OAAO,EAAE,wBAAwB,EAAE,MAAM,oBAAoB,CAAC;AAE9D,OAAO,EACL,gCAAgC,EAChC,uCAAuC,EACvC,qCAAqC,EACrC,6CAA6C,EAC7C,gCAAgC,EAChC,yCAAyC,GAC1C,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,kBAAkB,EAAE,MAAM,uDAAuD,CAAC;AAC3F,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AACvE,OAAO,EAAE,yBAAyB,EAAE,MAAM,uEAAuE,CAAC;AAClH,OAAO,EAAE,sBAAsB,EAAE,MAAM,+CAA+C,CAAC;AACvF,OAAO,EAAE,uBAAuB,EAAE,MAAM,kEAAkE,CAAC;AAC3G,OAAO,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAClF,OAAO,EAAE,+BAA+B,EAAE,MAAM,4EAA4E,CAAC;AAC7H,OAAO,EAAE,4BAA4B,EAAE,MAAM,8CAA8C,CAAC;AAC5F,OAAO,EAAE,kBAAkB,EAAE,MAAM,wDAAwD,CAAC;AAC5F,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,OAAO,EAAE,2BAA2B,EAAE,MAAM,6DAA6D,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/ma-v2/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,6BAA6B,EAAE,MAAM,yCAAyC,CAAC;AACxF,OAAO,EAAE,4BAA4B,EAAE,MAAM,wCAAwC,CAAC;AAEtF,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAE/D,YAAY,EACV,YAAY,EACZ,gBAAgB,EAChB,UAAU,EACV,cAAc,GACf,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AACrD,OAAO,EACL,yBAAyB,EACzB,mBAAmB,EACnB,qBAAqB,GACtB,MAAM,2BAA2B,CAAC;AACnC,mBAAmB,mDAAmD,CAAC;AACvE,OAAO,EAAE,wBAAwB,EAAE,MAAM,mDAAmD,CAAC;AAE7F,OAAO,EACL,gCAAgC,EAChC,uCAAuC,EACvC,qCAAqC,EACrC,6CAA6C,EAC7C,gCAAgC,EAChC,yCAAyC,GAC1C,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,kBAAkB,EAAE,MAAM,uDAAuD,CAAC;AAC3F,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AACvE,OAAO,EAAE,yBAAyB,EAAE,MAAM,uEAAuE,CAAC;AAClH,OAAO,EAAE,sBAAsB,EAAE,MAAM,+CAA+C,CAAC;AACvF,OAAO,EAAE,uBAAuB,EAAE,MAAM,kEAAkE,CAAC;AAC3G,OAAO,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAClF,OAAO,EAAE,+BAA+B,EAAE,MAAM,4EAA4E,CAAC;AAC7H,OAAO,EAAE,4BAA4B,EAAE,MAAM,8CAA8C,CAAC;AAC5F,OAAO,EAAE,kBAAkB,EAAE,MAAM,wDAAwD,CAAC;AAC5F,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,OAAO,EAAE,2BAA2B,EAAE,MAAM,6DAA6D,CAAC"}

package/dist/types/src/ma-v2/modules/single-signer-validation/signer.d.ts

@@ -11,7 +11,7 @@ import { type Hex, type SignableMessage, type TypedDataDefinition, type Chain, t
  *
  * const MNEMONIC = "...":
  *
- * const account = createSMAV2Account({ config });
+ * const account = createModularAccountV2({ config });
  *
  * const signer = LocalAccountSigner.mnemonicToAccountSigner(MNEMONIC);
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@account-kit/smart-contracts",
-  "version": "4.12.1-alpha.0",
+  "version": "4.13.0",
   "description": "aa-sdk compatible interfaces for Alchemy Smart Accounts",
   "author": "Alchemy",
   "license": "MIT",
@@ -52,7 +52,7 @@
     "test:run": "vitest run"
   },
   "devDependencies": {
-    "@account-kit/plugingen": "^4.12.1-alpha.0",
+    "@account-kit/plugingen": "^4.13.0",
     "change-case": "^5.1.2",
     "dedent": "^1.5.1",
     "dotenv": "^16.3.1",
@@ -72,12 +72,12 @@
     "url": "https://github.com/alchemyplatform/aa-sdk/issues"
   },
   "homepage": "https://github.com/alchemyplatform/aa-sdk#readme",
-  "gitHead": "7835fad48bb913cc0b9adfb82fc98610e5cde0b1",
+  "gitHead": "6865bd7b49bc7db064bca7026914e4299febdb34",
   "dependencies": {
-    "@aa-sdk/core": "^4.12.1-alpha.0",
-    "@account-kit/infra": "^4.12.1-alpha.0"
+    "@aa-sdk/core": "^4.13.0",
+    "@account-kit/infra": "^4.13.0"
   },
   "peerDependencies": {
-    "viem": "^2.20.0"
+    "viem": "^2.22.6"
   }
 }

package/src/index.ts

@@ -115,3 +115,10 @@ export {
   getMAInitializationData,
   getMSCAUpgradeToData,
 } from "./msca/utils.js";
+
+// ma v2 types
+export type * from "./ma-v2/account/modularAccountV2.js";
+export type * from "./ma-v2/account/common/modularAccountV2Base.js";
+export { createModularAccountV2 } from "./ma-v2/account/modularAccountV2.js";
+export type * from "./ma-v2/client/client.js";
+export { createModularAccountV2Client } from "./ma-v2/client/client.js";

package/src/ma-v2/account/{semiModularAccountV2.ts → common/modularAccountV2Base.ts}

@@ -1,41 +1,33 @@
-import type {
-  EntryPointDef,
-  SmartAccountSigner,
-  AccountOp,
-  SmartContractAccountWithSigner,
-  ToSmartContractAccountParams,
-} from "@aa-sdk/core";
 import {
   createBundlerClient,
   getEntryPoint,
-  toSmartContractAccount,
   InvalidEntityIdError,
   InvalidNonceKeyError,
-  getAccountAddress,
+  toSmartContractAccount,
+  type AccountOp,
+  type SmartAccountSigner,
+  type SmartContractAccountWithSigner,
+  type ToSmartContractAccountParams,
 } from "@aa-sdk/core";
+import { DEFAULT_OWNER_ENTITY_ID } from "../../utils.js";
 import {
-  concatHex,
-  encodeFunctionData,
-  getContract,
-  maxUint32,
-  maxUint152,
-  zeroAddress,
+  type Hex,
   type Address,
   type Chain,
-  type Hex,
   type Transport,
+  encodeFunctionData,
+  maxUint32,
+  zeroAddress,
+  getContract,
+  concatHex,
+  maxUint152,
 } from "viem";
-import { accountFactoryAbi } from "../abis/accountFactoryAbi.js";
-import {
-  getDefaultMAV2FactoryAddress,
-  DEFAULT_OWNER_ENTITY_ID,
-} from "../utils.js";
-import { singleSignerMessageSigner } from "../modules/single-signer-validation/signer.js";
-import { nativeSMASigner } from "./nativeSMASigner.js";
-import { modularAccountAbi } from "../abis/modularAccountAbi.js";
-import { serializeModuleEntity } from "../actions/common/utils.js";
+import { modularAccountAbi } from "../../abis/modularAccountAbi.js";
+import { serializeModuleEntity } from "../../actions/common/utils.js";
+import { nativeSMASigner } from "../nativeSMASigner.js";
+import { singleSignerMessageSigner } from "../../modules/single-signer-validation/signer.js";
 
-const executeUserOpSelector: Hex = "0x8DD7712F";
+export const executeUserOpSelector: Hex = "0x8DD7712F";
 
 export type SignerEntity = {
   isGlobalValidation: boolean;
@@ -66,9 +58,9 @@ export type ValidationDataParams =
       entityId: number;
     };
 
-export type MAV2Account<
+export type ModularAccountV2<
   TSigner extends SmartAccountSigner = SmartAccountSigner
-> = SmartContractAccountWithSigner<"MAV2Account", TSigner, "0.7.0"> & {
+> = SmartContractAccountWithSigner<"ModularAccountV2", TSigner, "0.7.0"> & {
   signerEntity: SignerEntity;
   getExecutionData: (selector: Hex) => Promise<ExecutionDataView>;
   getValidationData: (
@@ -77,48 +69,35 @@ export type MAV2Account<
   encodeCallData: (callData: Hex) => Promise<Hex>;
 };
 
-export type CreateSMAV2AccountParams<
-  TTransport extends Transport = Transport,
-  TSigner extends SmartAccountSigner = SmartAccountSigner
-> = Pick<
-  ToSmartContractAccountParams<"MAV2Account", TTransport, Chain, "0.7.0">,
-  "transport" | "chain" | "accountAddress"
+export type CreateMAV2BaseParams<
+  TSigner extends SmartAccountSigner = SmartAccountSigner,
+  TTransport extends Transport = Transport
+> = Omit<
+  ToSmartContractAccountParams<"ModularAccountV2", TTransport, Chain, "0.7.0">,
+  // Implements the following methods required by `toSmartContractAccount`, and passes through any other parameters.
+  | "encodeExecute"
+  | "encodeBatchExecute"
+  | "getNonce"
+  | "signMessage"
+  | "signTypedData"
+  | "getDummySignature"
 > & {
   signer: TSigner;
-  salt?: bigint;
-  factoryAddress?: Address;
-  initCode?: Hex;
-  initialOwner?: Address;
-  entryPoint?: EntryPointDef<"0.7.0", Chain>;
   signerEntity?: SignerEntity;
+  accountAddress: Address;
 };
 
-export async function createSMAV2Account<
-  TTransport extends Transport = Transport,
+export type CreateMAV2BaseReturnType<
   TSigner extends SmartAccountSigner = SmartAccountSigner
->(
-  config: CreateSMAV2AccountParams<TTransport, TSigner>
-): Promise<MAV2Account<TSigner>>;
+> = Promise<ModularAccountV2<TSigner>>;
 
-/**
- * Creates an SMAV2 account using defined parameters including chain, signer, salt, factory address, and more.
- * Handles account initialization code, nonce generation, transaction encoding, and more to construct a modular account with optional validation hooks.
- *
- * @param {CreateSMAV2AccountParams} config Configuration parameters for creating an SMAV2 account. Includes chain details, signer, salt, factory address, and more.
- * @returns {Promise<MAV2Account>} A promise that resolves to an `MAV2Account` providing methods for nonce retrieval, transaction execution, and more.
- */
-export async function createSMAV2Account(
-  config: CreateSMAV2AccountParams
-): Promise<MAV2Account> {
+export async function createMAv2Base<
+  TSigner extends SmartAccountSigner = SmartAccountSigner
+>(config: CreateMAV2BaseParams<TSigner>): CreateMAV2BaseReturnType<TSigner> {
   const {
     transport,
     chain,
     signer,
-    salt = 0n,
-    factoryAddress = getDefaultMAV2FactoryAddress(chain),
-    initCode,
-    initialOwner,
-    accountAddress,
     entryPoint = getEntryPoint(chain, { version: "0.7.0" }),
     signerEntity = {
       isGlobalValidation: true,
@@ -128,6 +107,8 @@ export async function createSMAV2Account(
       isGlobalValidation = true,
       entityId = DEFAULT_OWNER_ENTITY_ID,
     } = {},
+    accountAddress,
+    ...remainingToSmartContractAccountParams
   } = config;
 
   if (entityId > Number(maxUint32)) {
@@ -139,24 +120,6 @@ export async function createSMAV2Account(
     chain,
   });
 
-  const getAccountInitCode = async () => {
-    if (initCode) {
-      return initCode;
-    }
-
-    // If an initial owner is not provided, use the signer's address
-    const ownerAddress = initialOwner ?? (await signer.getAddress());
-
-    return concatHex([
-      factoryAddress,
-      encodeFunctionData({
-        abi: accountFactoryAbi,
-        functionName: "createSemiModularAccount",
-        args: [ownerAddress, salt],
-      }),
-    ]);
-  };
-
   const encodeExecute: (tx: AccountOp) => Promise<Hex> = async ({
     target,
     data,
@@ -185,29 +148,10 @@ export async function createSMAV2Account(
       })
     );
 
-  const _accountAddress = await getAccountAddress({
-    client,
-    entryPoint,
-    accountAddress,
-    getAccountInitCode,
-  });
-
-  const baseAccount = await toSmartContractAccount({
-    transport,
-    chain,
-    entryPoint,
-    accountAddress: _accountAddress,
-    source: `MAV2Account`,
-    encodeExecute,
-    encodeBatchExecute,
-    getAccountInitCode,
-    ...(entityId === DEFAULT_OWNER_ENTITY_ID
-      ? nativeSMASigner(signer, chain, _accountAddress)
-      : singleSignerMessageSigner(signer, chain, _accountAddress, entityId)),
-  });
-
+  const isAccountDeployed: () => Promise<boolean> = async () =>
+    !!(await client.getCode({ address: accountAddress }));
   // TODO: add deferred action flag
-  const getAccountNonce = async (nonceKey: bigint = 0n): Promise<bigint> => {
+  const getNonce = async (nonceKey: bigint = 0n): Promise<bigint> => {
     if (nonceKey > maxUint152) {
       throw new InvalidNonceKeyError(nonceKey);
     }
@@ -220,23 +164,23 @@ export async function createSMAV2Account(
 
     const fullNonceKey: bigint =
       (nonceKey << 40n) +
-      BigInt(entityId << 8) +
+      (BigInt(entityId) << 8n) +
       (isGlobalValidation ? 1n : 0n);
 
     return entryPointContract.read.getNonce([
-      _accountAddress,
+      accountAddress,
       fullNonceKey,
     ]) as Promise<bigint>;
   };
 
   const accountContract = getContract({
-    address: _accountAddress,
+    address: accountAddress,
     abi: modularAccountAbi,
     client,
   });
 
   const getExecutionData = async (selector: Hex) => {
-    if (!(await baseAccount.isAccountDeployed())) {
+    if (!(await isAccountDeployed())) {
       return {
         module: zeroAddress,
         skipRuntimeValidation: false,
@@ -249,7 +193,7 @@ export async function createSMAV2Account(
   };
 
   const getValidationData = async (args: ValidationDataParams) => {
-    if (!(await baseAccount.isAccountDeployed())) {
+    if (!(await isAccountDeployed())) {
       return {
         validationHooks: [],
         executionHooks: [],
@@ -277,9 +221,22 @@ export async function createSMAV2Account(
       : callData;
   };
 
+  const baseAccount = await toSmartContractAccount({
+    ...remainingToSmartContractAccountParams,
+    transport,
+    chain,
+    entryPoint,
+    accountAddress,
+    encodeExecute,
+    encodeBatchExecute,
+    getNonce,
+    ...(entityId === DEFAULT_OWNER_ENTITY_ID
+      ? nativeSMASigner(signer, chain, accountAddress)
+      : singleSignerMessageSigner(signer, chain, accountAddress, entityId)),
+  });
+
   return {
     ...baseAccount,
-    getAccountNonce,
     getSigner: () => signer,
     signerEntity,
     getExecutionData,

package/src/ma-v2/account/modularAccountV2.ts

@@ -0,0 +1,193 @@
+import type {
+  EntryPointDef,
+  SmartAccountSigner,
+  ToSmartContractAccountParams,
+} from "@aa-sdk/core";
+import {
+  createBundlerClient,
+  getEntryPoint,
+  getAccountAddress,
+  EntityIdOverrideError,
+  InvalidModularAccountV2Mode,
+} from "@aa-sdk/core";
+import {
+  concatHex,
+  encodeFunctionData,
+  type Address,
+  type Chain,
+  type Hex,
+  type Transport,
+} from "viem";
+import { accountFactoryAbi } from "../abis/accountFactoryAbi.js";
+import { getDefaultMAV2FactoryAddress } from "../utils.js";
+import {
+  type SignerEntity,
+  type ModularAccountV2,
+  createMAv2Base,
+} from "./common/modularAccountV2Base.js";
+import { DEFAULT_OWNER_ENTITY_ID } from "../utils.js";
+
+export type CreateModularAccountV2Params<
+  TTransport extends Transport = Transport,
+  TSigner extends SmartAccountSigner = SmartAccountSigner
+> = (Pick<
+  ToSmartContractAccountParams<"ModularAccountV2", TTransport, Chain, "0.7.0">,
+  "transport" | "chain" | "accountAddress"
+> & {
+  signer: TSigner;
+  entryPoint?: EntryPointDef<"0.7.0", Chain>;
+  signerEntity?: SignerEntity;
+}) &
+  (
+    | {
+        mode?: "default";
+        salt?: bigint;
+        factoryAddress?: Address;
+        initCode?: Hex;
+      }
+    | {
+        mode: "7702";
+      }
+  );
+
+export async function createModularAccountV2<
+  TTransport extends Transport = Transport,
+  TSigner extends SmartAccountSigner = SmartAccountSigner
+>(
+  config: CreateModularAccountV2Params<TTransport, TSigner>
+): Promise<ModularAccountV2<TSigner>>;
+
+/**
+ * Creates a ModularAccount V2 account, with the mode depending on the provided "mode" field.
+ * Possible modes include: "default", which is SMA Bytecode, and "7702", which is SMA 7702.
+ * Handles nonce generation, transaction encoding, and mode variant-specific behavior like initcode construction.
+ *
+ * @example
+ * ```ts twoslash
+ * import { createModularAccountV2 } from "@account-kit/smart-contracts";
+ * import { LocalAccountSigner } from "@aa-sdk/core";
+ * import { alchemy, sepolia } from "@account-kit/infra";
+ *
+ * const MNEMONIC = "...";
+ * const RPC_URL = "...";
+ *
+ * const signer = LocalAccountSigner.mnemonicToAccountSigner(MNEMONIC);
+ *
+ * const chain = sepolia;
+ *
+ * const transport = alchemy({ rpcUrl: RPC_URL });
+ *
+ *
+ * const modularAccountV2 = await createModularAccountV2({
+ *  mode: "default", // or "7702"
+ *  chain,
+ *  signer,
+ *  transport,
+ * });
+ * ```
+ *
+ * @param {CreateModularAccountV2Params} config Configuration parameters for creating a Modular Account V2.
+ * @returns {Promise<ModularAccountV2>} A promise that resolves to an `ModularAccountV2` providing methods for nonce retrieval, transaction execution, and more.
+ */
+export async function createModularAccountV2(
+  config: CreateModularAccountV2Params
+): Promise<ModularAccountV2> {
+  const {
+    transport,
+    chain,
+    signer,
+    accountAddress: _accountAddress,
+    entryPoint = getEntryPoint(chain, { version: "0.7.0" }),
+    signerEntity = {
+      isGlobalValidation: true,
+      entityId: DEFAULT_OWNER_ENTITY_ID,
+    },
+    signerEntity: { entityId = DEFAULT_OWNER_ENTITY_ID } = {},
+  } = config;
+
+  const client = createBundlerClient({
+    transport,
+    chain,
+  });
+
+  const accountFunctions = await (async () => {
+    switch (config.mode) {
+      case "7702": {
+        const getAccountInitCode = async (): Promise<Hex> => {
+          return "0x";
+        };
+        const signerAddress = await signer.getAddress();
+        const accountAddress = _accountAddress ?? signerAddress;
+        if (
+          entityId === DEFAULT_OWNER_ENTITY_ID &&
+          signerAddress !== accountAddress
+        ) {
+          throw new EntityIdOverrideError();
+        }
+
+        const implementation: Address =
+          "0x69007702764179f14F51cdce752f4f775d74E139";
+
+        const getImplementationAddress = async () => implementation;
+
+        return {
+          getAccountInitCode,
+          accountAddress,
+          getImplementationAddress,
+        };
+      }
+      case "default":
+      case undefined: {
+        const {
+          salt = 0n,
+          factoryAddress = getDefaultMAV2FactoryAddress(chain),
+          initCode,
+        } = config;
+
+        const getAccountInitCode = async () => {
+          if (initCode) {
+            return initCode;
+          }
+
+          return concatHex([
+            factoryAddress,
+            encodeFunctionData({
+              abi: accountFactoryAbi,
+              functionName: "createSemiModularAccount",
+              args: [await signer.getAddress(), salt],
+            }),
+          ]);
+        };
+
+        const accountAddress = await getAccountAddress({
+          client,
+          entryPoint,
+          accountAddress: _accountAddress,
+          getAccountInitCode,
+        });
+
+        return {
+          getAccountInitCode,
+          accountAddress,
+        };
+      }
+      default:
+        assertNever(config);
+    }
+  })();
+
+  return createMAv2Base({
+    source: "ModularAccountV2",
+    transport,
+    chain,
+    signer,
+    entryPoint,
+    signerEntity,
+    ...accountFunctions,
+  });
+}
+
+// If we add more valid modes, the switch case branch's mode will no longer be `never`, which will cause a compile time error here and ensure we handle the new type.
+function assertNever(_valid: never): never {
+  throw new InvalidModularAccountV2Mode();
+}

package/src/ma-v2/account/nativeSMASigner.ts

@@ -26,7 +26,7 @@ import {
  *
  * const MNEMONIC = "...":
  *
- * const account = createSMAV2Account({ config });
+ * const account = createModularAccountV2({ config });
  *
  * const signer = LocalAccountSigner.mnemonicToAccountSigner(MNEMONIC);
  *