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

package/dist/types/src/ma-v2/account/common/modularAccountV2Base.d.ts

@@ -0,0 +1,40 @@
+import { type SmartAccountSigner, type SmartContractAccountWithSigner, type ToSmartContractAccountParams } from "@aa-sdk/core";
+import { type Hex, type Address, type Chain, type Transport } from "viem";
+export declare const executeUserOpSelector: Hex;
+export type SignerEntity = {
+    isGlobalValidation: boolean;
+    entityId: number;
+};
+export type ExecutionDataView = {
+    module: Address;
+    skipRuntimeValidation: boolean;
+    allowGlobalValidation: boolean;
+    executionHooks: readonly Hex[];
+};
+export type ValidationDataView = {
+    validationHooks: readonly Hex[];
+    executionHooks: readonly Hex[];
+    selectors: readonly Hex[];
+    validationFlags: number;
+};
+export type ValidationDataParams = {
+    validationModuleAddress: Address;
+    entityId?: never;
+} | {
+    validationModuleAddress?: never;
+    entityId: number;
+};
+export type ModularAccountV2<TSigner extends SmartAccountSigner = SmartAccountSigner> = SmartContractAccountWithSigner<"ModularAccountV2", TSigner, "0.7.0"> & {
+    signerEntity: SignerEntity;
+    getExecutionData: (selector: Hex) => Promise<ExecutionDataView>;
+    getValidationData: (args: ValidationDataParams) => Promise<ValidationDataView>;
+    encodeCallData: (callData: Hex) => Promise<Hex>;
+};
+export type CreateMAV2BaseParams<TSigner extends SmartAccountSigner = SmartAccountSigner, TTransport extends Transport = Transport> = Omit<ToSmartContractAccountParams<"ModularAccountV2", TTransport, Chain, "0.7.0">, "encodeExecute" | "encodeBatchExecute" | "getNonce" | "signMessage" | "signTypedData" | "getDummySignature"> & {
+    signer: TSigner;
+    signerEntity?: SignerEntity;
+    accountAddress: Address;
+};
+export type CreateMAV2BaseReturnType<TSigner extends SmartAccountSigner = SmartAccountSigner> = Promise<ModularAccountV2<TSigner>>;
+export declare function createMAv2Base<TSigner extends SmartAccountSigner = SmartAccountSigner>(config: CreateMAV2BaseParams<TSigner>): CreateMAV2BaseReturnType<TSigner>;
+//# sourceMappingURL=modularAccountV2Base.d.ts.map

package/dist/types/src/ma-v2/account/common/modularAccountV2Base.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"modularAccountV2Base.d.ts","sourceRoot":"","sources":["../../../../../../src/ma-v2/account/common/modularAccountV2Base.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,KAAK,kBAAkB,EACvB,KAAK,8BAA8B,EACnC,KAAK,4BAA4B,EAClC,MAAM,cAAc,CAAC;AAEtB,OAAO,EACL,KAAK,GAAG,EACR,KAAK,OAAO,EACZ,KAAK,KAAK,EACV,KAAK,SAAS,EAOf,MAAM,MAAM,CAAC;AAMd,eAAO,MAAM,qBAAqB,EAAE,GAAkB,CAAC;AAEvD,MAAM,MAAM,YAAY,GAAG;IACzB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,EAAE,OAAO,CAAC;IAChB,qBAAqB,EAAE,OAAO,CAAC;IAC/B,qBAAqB,EAAE,OAAO,CAAC;IAC/B,cAAc,EAAE,SAAS,GAAG,EAAE,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,eAAe,EAAE,SAAS,GAAG,EAAE,CAAC;IAChC,cAAc,EAAE,SAAS,GAAG,EAAE,CAAC;IAC/B,SAAS,EAAE,SAAS,GAAG,EAAE,CAAC;IAC1B,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAC5B;IACE,uBAAuB,EAAE,OAAO,CAAC;IACjC,QAAQ,CAAC,EAAE,KAAK,CAAC;CAClB,GACD;IACE,uBAAuB,CAAC,EAAE,KAAK,CAAC;IAChC,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEN,MAAM,MAAM,gBAAgB,CAC1B,OAAO,SAAS,kBAAkB,GAAG,kBAAkB,IACrD,8BAA8B,CAAC,kBAAkB,EAAE,OAAO,EAAE,OAAO,CAAC,GAAG;IACzE,YAAY,EAAE,YAAY,CAAC;IAC3B,gBAAgB,EAAE,CAAC,QAAQ,EAAE,GAAG,KAAK,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAChE,iBAAiB,EAAE,CACjB,IAAI,EAAE,oBAAoB,KACvB,OAAO,CAAC,kBAAkB,CAAC,CAAC;IACjC,cAAc,EAAE,CAAC,QAAQ,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;CACjD,CAAC;AAEF,MAAM,MAAM,oBAAoB,CAC9B,OAAO,SAAS,kBAAkB,GAAG,kBAAkB,EACvD,UAAU,SAAS,SAAS,GAAG,SAAS,IACtC,IAAI,CACN,4BAA4B,CAAC,kBAAkB,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,CAAC,EAE1E,eAAe,GACf,oBAAoB,GACpB,UAAU,GACV,aAAa,GACb,eAAe,GACf,mBAAmB,CACtB,GAAG;IACF,MAAM,EAAE,OAAO,CAAC;IAChB,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,cAAc,EAAE,OAAO,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,wBAAwB,CAClC,OAAO,SAAS,kBAAkB,GAAG,kBAAkB,IACrD,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;AAEvC,wBAAsB,cAAc,CAClC,OAAO,SAAS,kBAAkB,GAAG,kBAAkB,EACvD,MAAM,EAAE,oBAAoB,CAAC,OAAO,CAAC,GAAG,wBAAwB,CAAC,OAAO,CAAC,CAsJ1E"}

package/dist/types/src/ma-v2/account/modularAccountV2.d.ts

@@ -0,0 +1,17 @@
+import type { EntryPointDef, SmartAccountSigner, ToSmartContractAccountParams } from "@aa-sdk/core";
+import { type Address, type Chain, type Hex, type Transport } from "viem";
+import { type SignerEntity, type ModularAccountV2 } from "./common/modularAccountV2Base.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 declare function createModularAccountV2<TTransport extends Transport = Transport, TSigner extends SmartAccountSigner = SmartAccountSigner>(config: CreateModularAccountV2Params<TTransport, TSigner>): Promise<ModularAccountV2<TSigner>>;
+//# sourceMappingURL=modularAccountV2.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"modularAccountV2.d.ts","sourceRoot":"","sources":["../../../../../src/ma-v2/account/modularAccountV2.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EACb,kBAAkB,EAClB,4BAA4B,EAC7B,MAAM,cAAc,CAAC;AAQtB,OAAO,EAGL,KAAK,OAAO,EACZ,KAAK,KAAK,EACV,KAAK,GAAG,EACR,KAAK,SAAS,EACf,MAAM,MAAM,CAAC;AAGd,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,gBAAgB,EAEtB,MAAM,kCAAkC,CAAC;AAG1C,MAAM,MAAM,4BAA4B,CACtC,UAAU,SAAS,SAAS,GAAG,SAAS,EACxC,OAAO,SAAS,kBAAkB,GAAG,kBAAkB,IACrD,CAAC,IAAI,CACP,4BAA4B,CAAC,kBAAkB,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,CAAC,EAC5E,WAAW,GAAG,OAAO,GAAG,gBAAgB,CACzC,GAAG;IACF,MAAM,EAAE,OAAO,CAAC;IAChB,UAAU,CAAC,EAAE,aAAa,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAC3C,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B,CAAC,GACA,CACI;IACE,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,EAAE,GAAG,CAAC;CAChB,GACD;IACE,IAAI,EAAE,MAAM,CAAC;CACd,CACJ,CAAC;AAEJ,wBAAsB,sBAAsB,CAC1C,UAAU,SAAS,SAAS,GAAG,SAAS,EACxC,OAAO,SAAS,kBAAkB,GAAG,kBAAkB,EAEvD,MAAM,EAAE,4BAA4B,CAAC,UAAU,EAAE,OAAO,CAAC,GACxD,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC"}

package/dist/types/src/ma-v2/account/nativeSMASigner.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/dist/types/src/ma-v2/actions/install-validation/installValidation.d.ts

@@ -1,8 +1,8 @@
 import { type GetEntryPointFromAccount, type SendUserOperationResult, type UserOperationOverridesParameter, type SmartAccountSigner } from "@aa-sdk/core";
 import { type Address, type Hex } from "viem";
 import type { HookConfig, ValidationConfig } from "../common/types.js";
-import { type SMAV2AccountClient } from "../../client/client.js";
-import { type MAV2Account } from "../../account/semiModularAccountV2.js";
+import { type ModularAccountV2Client } from "../../client/client.js";
+import { type ModularAccountV2 } from "../../account/common/modularAccountV2Base.js";
 export type InstallValidationParams<TSigner extends SmartAccountSigner = SmartAccountSigner> = {
     validationConfig: ValidationConfig;
     selectors: Hex[];
@@ -11,28 +11,30 @@ export type InstallValidationParams<TSigner extends SmartAccountSigner = SmartAc
         hookConfig: HookConfig;
         initData: Hex;
     }[];
-    account?: MAV2Account<TSigner> | undefined;
-} & UserOperationOverridesParameter<GetEntryPointFromAccount<MAV2Account<TSigner>>>;
+    account?: ModularAccountV2<TSigner> | undefined;
+} & UserOperationOverridesParameter<GetEntryPointFromAccount<ModularAccountV2<TSigner>>>;
 export type UninstallValidationParams<TSigner extends SmartAccountSigner = SmartAccountSigner> = {
     moduleAddress: Address;
     entityId: number;
     uninstallData: Hex;
     hookUninstallDatas: Hex[];
-    account?: MAV2Account<TSigner> | undefined;
-} & UserOperationOverridesParameter<GetEntryPointFromAccount<MAV2Account<TSigner>>>;
+    account?: ModularAccountV2<TSigner> | undefined;
+} & UserOperationOverridesParameter<GetEntryPointFromAccount<ModularAccountV2<TSigner>>>;
 export type InstallValidationActions<TSigner extends SmartAccountSigner = SmartAccountSigner> = {
     installValidation: (args: InstallValidationParams<TSigner>) => Promise<SendUserOperationResult>;
+    encodeInstallValidation: (args: InstallValidationParams<TSigner>) => Promise<Hex>;
     uninstallValidation: (args: UninstallValidationParams<TSigner>) => Promise<SendUserOperationResult>;
+    encodeUninstallValidation: (args: UninstallValidationParams<TSigner>) => Promise<Hex>;
 };
 /**
  * Provides validation installation and uninstallation functionalities for a MA v2 client, ensuring compatibility with `SmartAccountClient`.
  *
  * @example
  * ```ts
- * import { createSMAV2AccountClient, installValidationActions, getDefaultSingleSignerValidationModuleAddress, SingleSignerValidationModule } from "@account-kit/smart-contracts";
+ * import { createModularAccountV2Client, installValidationActions, getDefaultSingleSignerValidationModuleAddress, SingleSignerValidationModule } from "@account-kit/smart-contracts";
  * import { Address } from "viem";
  *
- * const client = (await createSMAV2AccountClient({ ... })).extend(installValidationActions);
+ * const client = (await createModularAccountV2Client({ ... })).extend(installValidationActions);
  * const sessionKeyAddress: Address = "0x1234";
  * const sessionKeyEntityId: number = 1;
  *
@@ -68,5 +70,5 @@ export type InstallValidationActions<TSigner extends SmartAccountSigner = SmartA
  * @param {object} client - The client instance which provides account and sendUserOperation functionality.
  * @returns {object} - An object containing two methods, `installValidation` and `uninstallValidation`.
  */
-export declare const installValidationActions: <TSigner extends SmartAccountSigner = SmartAccountSigner>(client: SMAV2AccountClient<TSigner>) => InstallValidationActions<TSigner>;
+export declare const installValidationActions: <TSigner extends SmartAccountSigner = SmartAccountSigner>(client: ModularAccountV2Client<TSigner>) => InstallValidationActions<TSigner>;
 //# sourceMappingURL=installValidation.d.ts.map

package/dist/types/src/ma-v2/actions/install-validation/installValidation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"installValidation.d.ts","sourceRoot":"","sources":["../../../../../../src/ma-v2/actions/install-validation/installValidation.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,wBAAwB,EAC7B,KAAK,uBAAuB,EAC5B,KAAK,+BAA+B,EACpC,KAAK,kBAAkB,EACxB,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,KAAK,OAAO,EACZ,KAAK,GAAG,EAIT,MAAM,MAAM,CAAC;AAGd,OAAO,KAAK,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAOvE,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,uCAAuC,CAAC;AAGzE,MAAM,MAAM,uBAAuB,CACjC,OAAO,SAAS,kBAAkB,GAAG,kBAAkB,IACrD;IACF,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,SAAS,EAAE,GAAG,EAAE,CAAC;IACjB,WAAW,EAAE,GAAG,CAAC;IACjB,KAAK,EAAE;QACL,UAAU,EAAE,UAAU,CAAC;QACvB,QAAQ,EAAE,GAAG,CAAC;KACf,EAAE,CAAC;IACJ,OAAO,CAAC,EAAE,WAAW,CAAC,OAAO,CAAC,GAAG,SAAS,CAAC;CAC5C,GAAG,+BAA+B,CACjC,wBAAwB,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAC/C,CAAC;AAEF,MAAM,MAAM,yBAAyB,CACnC,OAAO,SAAS,kBAAkB,GAAG,kBAAkB,IACrD;IACF,aAAa,EAAE,OAAO,CAAC;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,GAAG,CAAC;IACnB,kBAAkB,EAAE,GAAG,EAAE,CAAC;IAC1B,OAAO,CAAC,EAAE,WAAW,CAAC,OAAO,CAAC,GAAG,SAAS,CAAC;CAC5C,GAAG,+BAA+B,CACjC,wBAAwB,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAC/C,CAAC;AAEF,MAAM,MAAM,wBAAwB,CAClC,OAAO,SAAS,kBAAkB,GAAG,kBAAkB,IACrD;IACF,iBAAiB,EAAE,CACjB,IAAI,EAAE,uBAAuB,CAAC,OAAO,CAAC,KACnC,OAAO,CAAC,uBAAuB,CAAC,CAAC;IACtC,mBAAmB,EAAE,CACnB,IAAI,EAAE,yBAAyB,CAAC,OAAO,CAAC,KACrC,OAAO,CAAC,uBAAuB,CAAC,CAAC;CACvC,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2CG;AACH,eAAO,MAAM,wBAAwB,EAAE,CACrC,OAAO,SAAS,kBAAkB,GAAG,kBAAkB,EAEvD,MAAM,EAAE,kBAAkB,CAAC,OAAO,CAAC,KAChC,wBAAwB,CAAC,OAAO,CAgGnC,CAAC"}
+{"version":3,"file":"installValidation.d.ts","sourceRoot":"","sources":["../../../../../../src/ma-v2/actions/install-validation/installValidation.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,wBAAwB,EAC7B,KAAK,uBAAuB,EAC5B,KAAK,+BAA+B,EACpC,KAAK,kBAAkB,EACxB,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,KAAK,OAAO,EACZ,KAAK,GAAG,EAIT,MAAM,MAAM,CAAC;AAGd,OAAO,KAAK,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAOvE,OAAO,EAAE,KAAK,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AACrE,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,8CAA8C,CAAC;AAGrF,MAAM,MAAM,uBAAuB,CACjC,OAAO,SAAS,kBAAkB,GAAG,kBAAkB,IACrD;IACF,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,SAAS,EAAE,GAAG,EAAE,CAAC;IACjB,WAAW,EAAE,GAAG,CAAC;IACjB,KAAK,EAAE;QACL,UAAU,EAAE,UAAU,CAAC;QACvB,QAAQ,EAAE,GAAG,CAAC;KACf,EAAE,CAAC;IACJ,OAAO,CAAC,EAAE,gBAAgB,CAAC,OAAO,CAAC,GAAG,SAAS,CAAC;CACjD,GAAG,+BAA+B,CACjC,wBAAwB,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CACpD,CAAC;AAEF,MAAM,MAAM,yBAAyB,CACnC,OAAO,SAAS,kBAAkB,GAAG,kBAAkB,IACrD;IACF,aAAa,EAAE,OAAO,CAAC;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,GAAG,CAAC;IACnB,kBAAkB,EAAE,GAAG,EAAE,CAAC;IAC1B,OAAO,CAAC,EAAE,gBAAgB,CAAC,OAAO,CAAC,GAAG,SAAS,CAAC;CACjD,GAAG,+BAA+B,CACjC,wBAAwB,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CACpD,CAAC;AAEF,MAAM,MAAM,wBAAwB,CAClC,OAAO,SAAS,kBAAkB,GAAG,kBAAkB,IACrD;IACF,iBAAiB,EAAE,CACjB,IAAI,EAAE,uBAAuB,CAAC,OAAO,CAAC,KACnC,OAAO,CAAC,uBAAuB,CAAC,CAAC;IACtC,uBAAuB,EAAE,CAEvB,IAAI,EAAE,uBAAuB,CAAC,OAAO,CAAC,KACnC,OAAO,CAAC,GAAG,CAAC,CAAC;IAClB,mBAAmB,EAAE,CACnB,IAAI,EAAE,yBAAyB,CAAC,OAAO,CAAC,KACrC,OAAO,CAAC,uBAAuB,CAAC,CAAC;IACtC,yBAAyB,EAAE,CACzB,IAAI,EAAE,yBAAyB,CAAC,OAAO,CAAC,KACrC,OAAO,CAAC,GAAG,CAAC,CAAC;CACnB,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2CG;AACH,eAAO,MAAM,wBAAwB,EAAE,CACrC,OAAO,SAAS,kBAAkB,GAAG,kBAAkB,EAEvD,MAAM,EAAE,sBAAsB,CAAC,OAAO,CAAC,KACpC,wBAAwB,CAAC,OAAO,CAgIpC,CAAC"}

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/allowlist-module/module.d.ts

@@ -1,4 +1,5 @@
 import { type Address, type Hex } from "viem";
+import { type HookConfig } from "../../actions/common/types.js";
 export declare const AllowlistModule: {
     abi: readonly [{
         readonly type: "function";
@@ -556,6 +557,19 @@ export declare const AllowlistModule: {
         readonly name: "UnexpectedDataPassed";
         readonly inputs: readonly [];
     }];
+    buildHook: (installArgs: {
+        entityId: number;
+        inputs: Array<{
+            target: Address;
+            hasSelectorAllowlist: boolean;
+            hasERC20SpendLimit: boolean;
+            erc20SpendLimit: bigint;
+            selectors: Array<Hex>;
+        }>;
+    }, address: Address) => {
+        hookConfig: HookConfig;
+        initData: Hex;
+    };
     encodeOnInstallData: (args: {
         entityId: number;
         inputs: Array<{

package/dist/types/src/ma-v2/modules/allowlist-module/module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../../../../../src/ma-v2/modules/allowlist-module/module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,KAAK,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,MAAM,CAAC;AAGnE,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;gCAEE;QAC1B,QAAQ,EAAE,MAAM,CAAC;QACjB,MAAM,EAAE,MAAM;YACZ,MAAM,EAAE,OAAO,CAAC;YAChB,oBAAoB,EAAE,OAAO,CAAC;YAC9B,kBAAkB,EAAE,OAAO,CAAC;YAC5B,eAAe,EAAE,MAAM,CAAC;YACxB,SAAS,EAAE,MAAM,GAAG,CAAC,CAAC;SACvB,CAAC,CAAC;KACJ,KAAG,GAAG;kCAgCuB;QAC5B,QAAQ,EAAE,MAAM,CAAC;QACjB,MAAM,EAAE,MAAM;YACZ,MAAM,EAAE,OAAO,CAAC;YAChB,oBAAoB,EAAE,OAAO,CAAC;YAC9B,kBAAkB,EAAE,OAAO,CAAC;YAC5B,eAAe,EAAE,MAAM,CAAC;YACxB,SAAS,EAAE,MAAM,GAAG,CAAC,CAAC;SACvB,CAAC,CAAC;KACJ,KAAG,GAAG;CA+BR,CAAC"}
+{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../../../../../src/ma-v2/modules/allowlist-module/module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,KAAK,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,MAAM,CAAC;AAEnE,OAAO,EAAY,KAAK,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE1E,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6BAGX;QACX,QAAQ,EAAE,MAAM,CAAC;QACjB,MAAM,EAAE,MAAM;YACZ,MAAM,EAAE,OAAO,CAAC;YAChB,oBAAoB,EAAE,OAAO,CAAC;YAC9B,kBAAkB,EAAE,OAAO,CAAC;YAC5B,eAAe,EAAE,MAAM,CAAC;YACxB,SAAS,EAAE,MAAM,GAAG,CAAC,CAAC;SACvB,CAAC,CAAC;KACJ,WACQ,OAAO,KACf;QACD,UAAU,EAAE,UAAU,CAAC;QACvB,QAAQ,EAAE,GAAG,CAAC;KACf;gCAa2B;QAC1B,QAAQ,EAAE,MAAM,CAAC;QACjB,MAAM,EAAE,MAAM;YACZ,MAAM,EAAE,OAAO,CAAC;YAChB,oBAAoB,EAAE,OAAO,CAAC;YAC9B,kBAAkB,EAAE,OAAO,CAAC;YAC5B,eAAe,EAAE,MAAM,CAAC;YACxB,SAAS,EAAE,MAAM,GAAG,CAAC,CAAC;SACvB,CAAC,CAAC;KACJ,KAAG,GAAG;kCAgCuB;QAC5B,QAAQ,EAAE,MAAM,CAAC;QACjB,MAAM,EAAE,MAAM;YACZ,MAAM,EAAE,OAAO,CAAC;YAChB,oBAAoB,EAAE,OAAO,CAAC;YAC9B,kBAAkB,EAAE,OAAO,CAAC;YAC5B,eAAe,EAAE,MAAM,CAAC;YACxB,SAAS,EAAE,MAAM,GAAG,CAAC,CAAC;SACvB,CAAC,CAAC;KACJ,KAAG,GAAG;CA+BR,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/dist/types/src/ma-v2/modules/time-range-module/module.d.ts

@@ -1,4 +1,5 @@
-import { type Hex } from "viem";
+import { type Address, type Hex } from "viem";
+import { type HookConfig } from "../../actions/common/types.js";
 export declare const TimeRangeModule: {
     abi: readonly [{
         readonly type: "function";
@@ -229,6 +230,14 @@ export declare const TimeRangeModule: {
         readonly name: "UnexpectedDataPassed";
         readonly inputs: readonly [];
     }];
+    buildHook: (installArgs: {
+        entityId: number;
+        validUntil: number;
+        validAfter: number;
+    }, address: Address) => {
+        hookConfig: HookConfig;
+        initData: Hex;
+    };
     encodeOnInstallData: (args: {
         entityId: number;
         validUntil: number;

package/dist/types/src/ma-v2/modules/time-range-module/module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../../../../../src/ma-v2/modules/time-range-module/module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,KAAK,GAAG,EAAE,MAAM,MAAM,CAAC;AAIrD,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;gCAEE;QAC1B,QAAQ,EAAE,MAAM,CAAC;QACjB,UAAU,EAAE,MAAM,CAAC;QACnB,UAAU,EAAE,MAAM,CAAC;KACpB,KAAG,GAAG;kCAkBuB;QAAE,QAAQ,EAAE,MAAM,CAAA;KAAE,KAAG,GAAG;+BAY7B;QACzB,QAAQ,EAAE,MAAM,CAAC;QACjB,UAAU,EAAE,MAAM,CAAC;QACnB,UAAU,EAAE,MAAM,CAAC;KACpB,KAAG,GAAG;CAkBR,CAAC"}
+{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../../../../../src/ma-v2/modules/time-range-module/module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,KAAK,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,MAAM,CAAC;AAGnE,OAAO,EAAY,KAAK,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE1E,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6BAGX;QACX,QAAQ,EAAE,MAAM,CAAC;QACjB,UAAU,EAAE,MAAM,CAAC;QACnB,UAAU,EAAE,MAAM,CAAC;KACpB,WACQ,OAAO,KACf;QAAE,UAAU,EAAE,UAAU,CAAC;QAAC,QAAQ,EAAE,GAAG,CAAA;KAAE;gCAyBhB;QAC1B,QAAQ,EAAE,MAAM,CAAC;QACjB,UAAU,EAAE,MAAM,CAAC;QACnB,UAAU,EAAE,MAAM,CAAC;KACpB,KAAG,GAAG;kCAkBuB;QAAE,QAAQ,EAAE,MAAM,CAAA;KAAE,KAAG,GAAG;+BAY7B;QACzB,QAAQ,EAAE,MAAM,CAAC;QACjB,UAAU,EAAE,MAAM,CAAC;QACnB,UAAU,EAAE,MAAM,CAAC;KACpB,KAAG,GAAG;CAkBR,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@account-kit/smart-contracts",
-  "version": "4.12.1-alpha.0",
+  "version": "4.13.1-alpha.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.1-alpha.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": "d026b488ed279f04424c57b745efb19b8d344056",
   "dependencies": {
-    "@aa-sdk/core": "^4.12.1-alpha.0",
-    "@account-kit/infra": "^4.12.1-alpha.0"
+    "@aa-sdk/core": "^4.13.1-alpha.0",
+    "@account-kit/infra": "^4.13.1-alpha.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,