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

package/dist/esm/src/index.d.ts

@@ -51,3 +51,8 @@ export { SessionKeySigner } from "./msca/plugins/session-key/signer.js";
 export { buildSessionKeysToRemoveStruct } from "./msca/plugins/session-key/utils.js";
 export type * from "./msca/plugins/types.js";
 export { getDefaultMultiOwnerModularAccountFactoryAddress, getDefaultMultisigModularAccountFactoryAddress, getMAInitializationData, getMSCAUpgradeToData, } from "./msca/utils.js";
+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/dist/esm/src/index.js

@@ -39,4 +39,6 @@ export { SessionKeyPlugin, SessionKeyPluginAbi, SessionKeyPluginExecutionFunctio
 export { SessionKeySigner } from "./msca/plugins/session-key/signer.js";
 export { buildSessionKeysToRemoveStruct } from "./msca/plugins/session-key/utils.js";
 export { getDefaultMultiOwnerModularAccountFactoryAddress, getDefaultMultisigModularAccountFactoryAddress, getMAInitializationData, getMSCAUpgradeToData, } from "./msca/utils.js";
+export { createModularAccountV2 } from "./ma-v2/account/modularAccountV2.js";
+export { createModularAccountV2Client } from "./ma-v2/client/client.js";
 //# sourceMappingURL=index.js.map

package/dist/esm/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"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","sourcesContent":["// Add you exports here, make sure to export types separately from impls and use the `type` keyword when exporting them\n// Don't use wildcard exports, instead use named exports\n\n//light-account exports\nexport type * from \"./light-account/accounts/account.js\";\nexport { createLightAccount } from \"./light-account/accounts/account.js\";\nexport { transferOwnership as transferLightAccountOwnership } from \"./light-account/actions/transferOwnership.js\";\nexport {\n  createLightAccountAlchemyClient,\n  type AlchemyLightAccountClientConfig,\n} from \"./light-account/clients/alchemyClient.js\";\nexport { createLightAccountClient } from \"./light-account/clients/client.js\";\nexport {\n  createMultiOwnerLightAccountAlchemyClient,\n  type AlchemyMultiOwnerLightAccountClientConfig,\n} from \"./light-account/clients/multiOwnerAlchemyClient.js\";\nexport type * from \"./light-account/decorators/lightAccount.js\";\nexport { lightAccountClientActions } from \"./light-account/decorators/lightAccount.js\";\nexport type * from \"./light-account/types.js\";\n\nexport {\n  AccountVersionRegistry,\n  LightAccountUnsupported1271Factories,\n  LightAccountUnsupported1271Impls,\n  defaultLightAccountVersion,\n  getDefaultLightAccountFactoryAddress,\n  getDefaultMultiOwnerLightAccountFactoryAddress,\n  getLightAccountVersionForAccount,\n} from \"./light-account/utils.js\";\n\n//multi-owner-light-account exports\nexport type * from \"./light-account/accounts/multiOwner.js\";\nexport { createMultiOwnerLightAccount } from \"./light-account/accounts/multiOwner.js\";\nexport { updateOwners as updateMultiOwnerLightAccountOwners } from \"./light-account/actions/updateOwners.js\";\nexport { createMultiOwnerLightAccountClient } from \"./light-account/clients/multiOwnerLightAccount.js\";\nexport type * from \"./light-account/decorators/multiOwnerLightAccount.js\";\nexport { multiOwnerLightAccountClientActions } from \"./light-account/decorators/multiOwnerLightAccount.js\";\n\n// msca exports\nexport { IAccountLoupeAbi } from \"./msca/abis/IAccountLoupe.js\";\nexport { IPluginAbi } from \"./msca/abis/IPlugin.js\";\nexport { IPluginManagerAbi } from \"./msca/abis/IPluginManager.js\";\nexport { IStandardExecutorAbi } from \"./msca/abis/IStandardExecutor.js\";\nexport { MultiOwnerModularAccountFactoryAbi } from \"./msca/abis/MultiOwnerModularAccountFactory.js\";\nexport { MultisigModularAccountFactoryAbi } from \"./msca/abis/MultisigModularAccountFactory.js\";\nexport { UpgradeableModularAccountAbi } from \"./msca/abis/UpgradeableModularAccount.js\";\nexport type * from \"./msca/account-loupe/decorator.js\";\nexport { accountLoupeActions } from \"./msca/account-loupe/decorator.js\";\nexport type * from \"./msca/account-loupe/types.js\";\nexport type * from \"./msca/account/multiOwnerAccount.js\";\nexport { createMultiOwnerModularAccount } from \"./msca/account/multiOwnerAccount.js\";\nexport type * from \"./msca/account/multisigAccount.js\";\nexport { createMultisigModularAccount } from \"./msca/account/multisigAccount.js\";\nexport { standardExecutor } from \"./msca/account/standardExecutor.js\";\nexport {\n  createModularAccountAlchemyClient,\n  type AlchemyModularAccountClientConfig,\n} from \"./msca/client/alchemyClient.js\";\nexport {\n  createMultiOwnerModularAccountClient,\n  createMultisigModularAccountClient,\n} from \"./msca/client/client.js\";\nexport {\n  createMultisigAccountAlchemyClient,\n  type AlchemyMultisigAccountClientConfig,\n} from \"./msca/client/multiSigAlchemyClient.js\";\nexport {\n  InvalidAggregatedSignatureError,\n  InvalidContextSignatureError,\n  MultisigAccountExpectedError,\n  MultisigMissingSignatureError,\n} from \"./msca/errors.js\";\nexport type * from \"./msca/plugin-manager/decorator.js\";\nexport { pluginManagerActions } from \"./msca/plugin-manager/decorator.js\";\nexport { installPlugin } from \"./msca/plugin-manager/installPlugin.js\";\nexport { multiOwnerPluginActions } from \"./msca/plugins/multi-owner/extension.js\";\nexport type * from \"./msca/plugins/multi-owner/index.js\";\nexport {\n  MultiOwnerPlugin,\n  MultiOwnerPluginAbi,\n  MultiOwnerPluginExecutionFunctionAbi,\n} from \"./msca/plugins/multi-owner/plugin.js\";\nexport type * from \"./msca/plugins/multisig/index.js\";\nexport {\n  MultisigPlugin,\n  MultisigPluginAbi,\n  MultisigPluginExecutionFunctionAbi,\n  multisigPluginActions,\n  multisigSignatureMiddleware,\n} from \"./msca/plugins/multisig/index.js\";\nexport {\n  combineSignatures,\n  formatSignatures,\n  getSignerType,\n  splitAggregatedSignature,\n} from \"./msca/plugins/multisig/utils/index.js\";\nexport { sessionKeyPluginActions } from \"./msca/plugins/session-key/extension.js\";\nexport type * from \"./msca/plugins/session-key/index.js\";\nexport type * from \"./msca/plugins/session-key/permissions.js\";\nexport {\n  SessionKeyAccessListType,\n  SessionKeyPermissionsBuilder,\n} from \"./msca/plugins/session-key/permissions.js\";\nexport {\n  SessionKeyPlugin,\n  SessionKeyPluginAbi,\n  SessionKeyPluginExecutionFunctionAbi,\n} from \"./msca/plugins/session-key/plugin.js\";\nexport { SessionKeySigner } from \"./msca/plugins/session-key/signer.js\";\nexport { buildSessionKeysToRemoveStruct } from \"./msca/plugins/session-key/utils.js\";\nexport type * from \"./msca/plugins/types.js\";\nexport {\n  getDefaultMultiOwnerModularAccountFactoryAddress,\n  getDefaultMultisigModularAccountFactoryAddress,\n  getMAInitializationData,\n  getMSCAUpgradeToData,\n} from \"./msca/utils.js\";\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"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","sourcesContent":["// Add you exports here, make sure to export types separately from impls and use the `type` keyword when exporting them\n// Don't use wildcard exports, instead use named exports\n\n//light-account exports\nexport type * from \"./light-account/accounts/account.js\";\nexport { createLightAccount } from \"./light-account/accounts/account.js\";\nexport { transferOwnership as transferLightAccountOwnership } from \"./light-account/actions/transferOwnership.js\";\nexport {\n  createLightAccountAlchemyClient,\n  type AlchemyLightAccountClientConfig,\n} from \"./light-account/clients/alchemyClient.js\";\nexport { createLightAccountClient } from \"./light-account/clients/client.js\";\nexport {\n  createMultiOwnerLightAccountAlchemyClient,\n  type AlchemyMultiOwnerLightAccountClientConfig,\n} from \"./light-account/clients/multiOwnerAlchemyClient.js\";\nexport type * from \"./light-account/decorators/lightAccount.js\";\nexport { lightAccountClientActions } from \"./light-account/decorators/lightAccount.js\";\nexport type * from \"./light-account/types.js\";\n\nexport {\n  AccountVersionRegistry,\n  LightAccountUnsupported1271Factories,\n  LightAccountUnsupported1271Impls,\n  defaultLightAccountVersion,\n  getDefaultLightAccountFactoryAddress,\n  getDefaultMultiOwnerLightAccountFactoryAddress,\n  getLightAccountVersionForAccount,\n} from \"./light-account/utils.js\";\n\n//multi-owner-light-account exports\nexport type * from \"./light-account/accounts/multiOwner.js\";\nexport { createMultiOwnerLightAccount } from \"./light-account/accounts/multiOwner.js\";\nexport { updateOwners as updateMultiOwnerLightAccountOwners } from \"./light-account/actions/updateOwners.js\";\nexport { createMultiOwnerLightAccountClient } from \"./light-account/clients/multiOwnerLightAccount.js\";\nexport type * from \"./light-account/decorators/multiOwnerLightAccount.js\";\nexport { multiOwnerLightAccountClientActions } from \"./light-account/decorators/multiOwnerLightAccount.js\";\n\n// msca exports\nexport { IAccountLoupeAbi } from \"./msca/abis/IAccountLoupe.js\";\nexport { IPluginAbi } from \"./msca/abis/IPlugin.js\";\nexport { IPluginManagerAbi } from \"./msca/abis/IPluginManager.js\";\nexport { IStandardExecutorAbi } from \"./msca/abis/IStandardExecutor.js\";\nexport { MultiOwnerModularAccountFactoryAbi } from \"./msca/abis/MultiOwnerModularAccountFactory.js\";\nexport { MultisigModularAccountFactoryAbi } from \"./msca/abis/MultisigModularAccountFactory.js\";\nexport { UpgradeableModularAccountAbi } from \"./msca/abis/UpgradeableModularAccount.js\";\nexport type * from \"./msca/account-loupe/decorator.js\";\nexport { accountLoupeActions } from \"./msca/account-loupe/decorator.js\";\nexport type * from \"./msca/account-loupe/types.js\";\nexport type * from \"./msca/account/multiOwnerAccount.js\";\nexport { createMultiOwnerModularAccount } from \"./msca/account/multiOwnerAccount.js\";\nexport type * from \"./msca/account/multisigAccount.js\";\nexport { createMultisigModularAccount } from \"./msca/account/multisigAccount.js\";\nexport { standardExecutor } from \"./msca/account/standardExecutor.js\";\nexport {\n  createModularAccountAlchemyClient,\n  type AlchemyModularAccountClientConfig,\n} from \"./msca/client/alchemyClient.js\";\nexport {\n  createMultiOwnerModularAccountClient,\n  createMultisigModularAccountClient,\n} from \"./msca/client/client.js\";\nexport {\n  createMultisigAccountAlchemyClient,\n  type AlchemyMultisigAccountClientConfig,\n} from \"./msca/client/multiSigAlchemyClient.js\";\nexport {\n  InvalidAggregatedSignatureError,\n  InvalidContextSignatureError,\n  MultisigAccountExpectedError,\n  MultisigMissingSignatureError,\n} from \"./msca/errors.js\";\nexport type * from \"./msca/plugin-manager/decorator.js\";\nexport { pluginManagerActions } from \"./msca/plugin-manager/decorator.js\";\nexport { installPlugin } from \"./msca/plugin-manager/installPlugin.js\";\nexport { multiOwnerPluginActions } from \"./msca/plugins/multi-owner/extension.js\";\nexport type * from \"./msca/plugins/multi-owner/index.js\";\nexport {\n  MultiOwnerPlugin,\n  MultiOwnerPluginAbi,\n  MultiOwnerPluginExecutionFunctionAbi,\n} from \"./msca/plugins/multi-owner/plugin.js\";\nexport type * from \"./msca/plugins/multisig/index.js\";\nexport {\n  MultisigPlugin,\n  MultisigPluginAbi,\n  MultisigPluginExecutionFunctionAbi,\n  multisigPluginActions,\n  multisigSignatureMiddleware,\n} from \"./msca/plugins/multisig/index.js\";\nexport {\n  combineSignatures,\n  formatSignatures,\n  getSignerType,\n  splitAggregatedSignature,\n} from \"./msca/plugins/multisig/utils/index.js\";\nexport { sessionKeyPluginActions } from \"./msca/plugins/session-key/extension.js\";\nexport type * from \"./msca/plugins/session-key/index.js\";\nexport type * from \"./msca/plugins/session-key/permissions.js\";\nexport {\n  SessionKeyAccessListType,\n  SessionKeyPermissionsBuilder,\n} from \"./msca/plugins/session-key/permissions.js\";\nexport {\n  SessionKeyPlugin,\n  SessionKeyPluginAbi,\n  SessionKeyPluginExecutionFunctionAbi,\n} from \"./msca/plugins/session-key/plugin.js\";\nexport { SessionKeySigner } from \"./msca/plugins/session-key/signer.js\";\nexport { buildSessionKeysToRemoveStruct } from \"./msca/plugins/session-key/utils.js\";\nexport type * from \"./msca/plugins/types.js\";\nexport {\n  getDefaultMultiOwnerModularAccountFactoryAddress,\n  getDefaultMultisigModularAccountFactoryAddress,\n  getMAInitializationData,\n  getMSCAUpgradeToData,\n} from \"./msca/utils.js\";\n\n// ma v2 types\nexport type * from \"./ma-v2/account/modularAccountV2.js\";\nexport type * from \"./ma-v2/account/common/modularAccountV2Base.js\";\nexport { createModularAccountV2 } from \"./ma-v2/account/modularAccountV2.js\";\nexport type * from \"./ma-v2/client/client.js\";\nexport { createModularAccountV2Client } from \"./ma-v2/client/client.js\";\n"]}

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

@@ -0,0 +1,39 @@
+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>;

package/dist/esm/src/ma-v2/account/{semiModularAccountV2.js → common/modularAccountV2Base.js}

@@ -1,24 +1,16 @@
-import { createBundlerClient, getEntryPoint, toSmartContractAccount, InvalidEntityIdError, InvalidNonceKeyError, getAccountAddress, } from "@aa-sdk/core";
-import { concatHex, encodeFunctionData, getContract, maxUint32, maxUint152, zeroAddress, } 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";
-const executeUserOpSelector = "0x8DD7712F";
-/**
- * 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) {
-    const { transport, chain, signer, salt = 0n, factoryAddress = getDefaultMAV2FactoryAddress(chain), initCode, initialOwner, accountAddress, entryPoint = getEntryPoint(chain, { version: "0.7.0" }), signerEntity = {
+import { createBundlerClient, getEntryPoint, InvalidEntityIdError, InvalidNonceKeyError, toSmartContractAccount, } from "@aa-sdk/core";
+import { DEFAULT_OWNER_ENTITY_ID } from "../../utils.js";
+import { encodeFunctionData, maxUint32, zeroAddress, getContract, concatHex, maxUint152, } from "viem";
+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";
+export const executeUserOpSelector = "0x8DD7712F";
+export async function createMAv2Base(config) {
+    const { transport, chain, signer, entryPoint = getEntryPoint(chain, { version: "0.7.0" }), signerEntity = {
         isGlobalValidation: true,
         entityId: DEFAULT_OWNER_ENTITY_ID,
-    }, signerEntity: { isGlobalValidation = true, entityId = DEFAULT_OWNER_ENTITY_ID, } = {}, } = config;
+    }, signerEntity: { isGlobalValidation = true, entityId = DEFAULT_OWNER_ENTITY_ID, } = {}, accountAddress, ...remainingToSmartContractAccountParams } = config;
     if (entityId > Number(maxUint32)) {
         throw new InvalidEntityIdError(entityId);
     }
@@ -26,21 +18,6 @@ export async function createSMAV2Account(config) {
         transport,
         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 = async ({ target, data, value, }) => await encodeCallData(encodeFunctionData({
         abi: modularAccountAbi,
         functionName: "execute",
@@ -57,27 +34,9 @@ export async function createSMAV2Account(config) {
             })),
         ],
     }));
-    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 = async () => !!(await client.getCode({ address: accountAddress }));
     // TODO: add deferred action flag
-    const getAccountNonce = async (nonceKey = 0n) => {
+    const getNonce = async (nonceKey = 0n) => {
         if (nonceKey > maxUint152) {
             throw new InvalidNonceKeyError(nonceKey);
         }
@@ -87,20 +46,20 @@ export async function createSMAV2Account(config) {
             client,
         });
         const fullNonceKey = (nonceKey << 40n) +
-            BigInt(entityId << 8) +
+            (BigInt(entityId) << 8n) +
             (isGlobalValidation ? 1n : 0n);
         return entryPointContract.read.getNonce([
-            _accountAddress,
+            accountAddress,
             fullNonceKey,
         ]);
     };
     const accountContract = getContract({
-        address: _accountAddress,
+        address: accountAddress,
         abi: modularAccountAbi,
         client,
     });
     const getExecutionData = async (selector) => {
-        if (!(await baseAccount.isAccountDeployed())) {
+        if (!(await isAccountDeployed())) {
             return {
                 module: zeroAddress,
                 skipRuntimeValidation: false,
@@ -111,7 +70,7 @@ export async function createSMAV2Account(config) {
         return await accountContract.read.getExecutionData([selector]);
     };
     const getValidationData = async (args) => {
-        if (!(await baseAccount.isAccountDeployed())) {
+        if (!(await isAccountDeployed())) {
             return {
                 validationHooks: [],
                 executionHooks: [],
@@ -135,9 +94,21 @@ export async function createSMAV2Account(config) {
             ? concatHex([executeUserOpSelector, callData])
             : 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,
@@ -145,4 +116,4 @@ export async function createSMAV2Account(config) {
         encodeCallData,
     };
 }
-//# sourceMappingURL=semiModularAccountV2.js.map
+//# sourceMappingURL=modularAccountV2Base.js.map

package/dist/esm/src/ma-v2/account/common/modularAccountV2Base.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"modularAccountV2Base.js","sourceRoot":"","sources":["../../../../../../src/ma-v2/account/common/modularAccountV2Base.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mBAAmB,EACnB,aAAa,EACb,oBAAoB,EACpB,oBAAoB,EACpB,sBAAsB,GAKvB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,EAKL,kBAAkB,EAClB,SAAS,EACT,WAAW,EACX,WAAW,EACX,SAAS,EACT,UAAU,GACX,MAAM,MAAM,CAAC;AACd,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,yBAAyB,EAAE,MAAM,kDAAkD,CAAC;AAE7F,MAAM,CAAC,MAAM,qBAAqB,GAAQ,YAAY,CAAC;AAgEvD,MAAM,CAAC,KAAK,UAAU,cAAc,CAElC,MAAqC;IACrC,MAAM,EACJ,SAAS,EACT,KAAK,EACL,MAAM,EACN,UAAU,GAAG,aAAa,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,EACvD,YAAY,GAAG;QACb,kBAAkB,EAAE,IAAI;QACxB,QAAQ,EAAE,uBAAuB;KAClC,EACD,YAAY,EAAE,EACZ,kBAAkB,GAAG,IAAI,EACzB,QAAQ,GAAG,uBAAuB,GACnC,GAAG,EAAE,EACN,cAAc,EACd,GAAG,qCAAqC,EACzC,GAAG,MAAM,CAAC;IAEX,IAAI,QAAQ,GAAG,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;QACjC,MAAM,IAAI,oBAAoB,CAAC,QAAQ,CAAC,CAAC;IAC3C,CAAC;IAED,MAAM,MAAM,GAAG,mBAAmB,CAAC;QACjC,SAAS;QACT,KAAK;KACN,CAAC,CAAC;IAEH,MAAM,aAAa,GAAoC,KAAK,EAAE,EAC5D,MAAM,EACN,IAAI,EACJ,KAAK,GACN,EAAE,EAAE,CACH,MAAM,cAAc,CAClB,kBAAkB,CAAC;QACjB,GAAG,EAAE,iBAAiB;QACtB,YAAY,EAAE,SAAS;QACvB,IAAI,EAAE,CAAC,MAAM,EAAE,KAAK,IAAI,EAAE,EAAE,IAAI,CAAC;KAClC,CAAC,CACH,CAAC;IAEJ,MAAM,kBAAkB,GAAuC,KAAK,EAAE,GAAG,EAAE,EAAE,CAC3E,MAAM,cAAc,CAClB,kBAAkB,CAAC;QACjB,GAAG,EAAE,iBAAiB;QACtB,YAAY,EAAE,cAAc;QAC5B,IAAI,EAAE;YACJ,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;gBACf,MAAM,EAAE,EAAE,CAAC,MAAM;gBACjB,IAAI,EAAE,EAAE,CAAC,IAAI;gBACb,KAAK,EAAE,EAAE,CAAC,KAAK,IAAI,EAAE;aACtB,CAAC,CAAC;SACJ;KACF,CAAC,CACH,CAAC;IAEJ,MAAM,iBAAiB,GAA2B,KAAK,IAAI,EAAE,CAC3D,CAAC,CAAC,CAAC,MAAM,MAAM,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC;IACxD,iCAAiC;IACjC,MAAM,QAAQ,GAAG,KAAK,EAAE,WAAmB,EAAE,EAAmB,EAAE;QAChE,IAAI,QAAQ,GAAG,UAAU,EAAE,CAAC;YAC1B,MAAM,IAAI,oBAAoB,CAAC,QAAQ,CAAC,CAAC;QAC3C,CAAC;QAED,MAAM,kBAAkB,GAAG,WAAW,CAAC;YACrC,OAAO,EAAE,UAAU,CAAC,OAAO;YAC3B,GAAG,EAAE,UAAU,CAAC,GAAG;YACnB,MAAM;SACP,CAAC,CAAC;QAEH,MAAM,YAAY,GAChB,CAAC,QAAQ,IAAI,GAAG,CAAC;YACjB,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;YACxB,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAEjC,OAAO,kBAAkB,CAAC,IAAI,CAAC,QAAQ,CAAC;YACtC,cAAc;YACd,YAAY;SACb,CAAoB,CAAC;IACxB,CAAC,CAAC;IAEF,MAAM,eAAe,GAAG,WAAW,CAAC;QAClC,OAAO,EAAE,cAAc;QACvB,GAAG,EAAE,iBAAiB;QACtB,MAAM;KACP,CAAC,CAAC;IAEH,MAAM,gBAAgB,GAAG,KAAK,EAAE,QAAa,EAAE,EAAE;QAC/C,IAAI,CAAC,CAAC,MAAM,iBAAiB,EAAE,CAAC,EAAE,CAAC;YACjC,OAAO;gBACL,MAAM,EAAE,WAAW;gBACnB,qBAAqB,EAAE,KAAK;gBAC5B,qBAAqB,EAAE,KAAK;gBAC5B,cAAc,EAAE,EAAE;aACnB,CAAC;QACJ,CAAC;QAED,OAAO,MAAM,eAAe,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;IACjE,CAAC,CAAC;IAEF,MAAM,iBAAiB,GAAG,KAAK,EAAE,IAA0B,EAAE,EAAE;QAC7D,IAAI,CAAC,CAAC,MAAM,iBAAiB,EAAE,CAAC,EAAE,CAAC;YACjC,OAAO;gBACL,eAAe,EAAE,EAAE;gBACnB,cAAc,EAAE,EAAE;gBAClB,SAAS,EAAE,EAAE;gBACb,eAAe,EAAE,CAAC;aACnB,CAAC;QACJ,CAAC;QAED,MAAM,EAAE,uBAAuB,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;QACnD,OAAO,MAAM,eAAe,CAAC,IAAI,CAAC,iBAAiB,CAAC;YAClD,qBAAqB,CAAC;gBACpB,aAAa,EAAE,uBAAuB,IAAI,WAAW;gBACrD,QAAQ,EAAE,QAAQ,IAAI,MAAM,CAAC,SAAS,CAAC;aACxC,CAAC;SACH,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,MAAM,cAAc,GAAG,KAAK,EAAE,QAAa,EAAgB,EAAE;QAC3D,MAAM,cAAc,GAAG,MAAM,iBAAiB,CAAC;YAC7C,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC;SAC3B,CAAC,CAAC;QAEH,OAAO,cAAc,CAAC,cAAc,CAAC,MAAM;YACzC,CAAC,CAAC,SAAS,CAAC,CAAC,qBAAqB,EAAE,QAAQ,CAAC,CAAC;YAC9C,CAAC,CAAC,QAAQ,CAAC;IACf,CAAC,CAAC;IAEF,MAAM,WAAW,GAAG,MAAM,sBAAsB,CAAC;QAC/C,GAAG,qCAAqC;QACxC,SAAS;QACT,KAAK;QACL,UAAU;QACV,cAAc;QACd,aAAa;QACb,kBAAkB;QAClB,QAAQ;QACR,GAAG,CAAC,QAAQ,KAAK,uBAAuB;YACtC,CAAC,CAAC,eAAe,CAAC,MAAM,EAAE,KAAK,EAAE,cAAc,CAAC;YAChD,CAAC,CAAC,yBAAyB,CAAC,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,QAAQ,CAAC,CAAC;KACxE,CAAC,CAAC;IAEH,OAAO;QACL,GAAG,WAAW;QACd,SAAS,EAAE,GAAG,EAAE,CAAC,MAAM;QACvB,YAAY;QACZ,gBAAgB;QAChB,iBAAiB;QACjB,cAAc;KACf,CAAC;AACJ,CAAC","sourcesContent":["import {\n  createBundlerClient,\n  getEntryPoint,\n  InvalidEntityIdError,\n  InvalidNonceKeyError,\n  toSmartContractAccount,\n  type AccountOp,\n  type SmartAccountSigner,\n  type SmartContractAccountWithSigner,\n  type ToSmartContractAccountParams,\n} from \"@aa-sdk/core\";\nimport { DEFAULT_OWNER_ENTITY_ID } from \"../../utils.js\";\nimport {\n  type Hex,\n  type Address,\n  type Chain,\n  type Transport,\n  encodeFunctionData,\n  maxUint32,\n  zeroAddress,\n  getContract,\n  concatHex,\n  maxUint152,\n} from \"viem\";\nimport { modularAccountAbi } from \"../../abis/modularAccountAbi.js\";\nimport { serializeModuleEntity } from \"../../actions/common/utils.js\";\nimport { nativeSMASigner } from \"../nativeSMASigner.js\";\nimport { singleSignerMessageSigner } from \"../../modules/single-signer-validation/signer.js\";\n\nexport const executeUserOpSelector: Hex = \"0x8DD7712F\";\n\nexport type SignerEntity = {\n  isGlobalValidation: boolean;\n  entityId: number;\n};\n\nexport type ExecutionDataView = {\n  module: Address;\n  skipRuntimeValidation: boolean;\n  allowGlobalValidation: boolean;\n  executionHooks: readonly Hex[];\n};\n\nexport type ValidationDataView = {\n  validationHooks: readonly Hex[];\n  executionHooks: readonly Hex[];\n  selectors: readonly Hex[];\n  validationFlags: number;\n};\n\nexport type ValidationDataParams =\n  | {\n      validationModuleAddress: Address;\n      entityId?: never;\n    }\n  | {\n      validationModuleAddress?: never;\n      entityId: number;\n    };\n\nexport type ModularAccountV2<\n  TSigner extends SmartAccountSigner = SmartAccountSigner\n> = SmartContractAccountWithSigner<\"ModularAccountV2\", TSigner, \"0.7.0\"> & {\n  signerEntity: SignerEntity;\n  getExecutionData: (selector: Hex) => Promise<ExecutionDataView>;\n  getValidationData: (\n    args: ValidationDataParams\n  ) => Promise<ValidationDataView>;\n  encodeCallData: (callData: Hex) => Promise<Hex>;\n};\n\nexport type CreateMAV2BaseParams<\n  TSigner extends SmartAccountSigner = SmartAccountSigner,\n  TTransport extends Transport = Transport\n> = Omit<\n  ToSmartContractAccountParams<\"ModularAccountV2\", TTransport, Chain, \"0.7.0\">,\n  // Implements the following methods required by `toSmartContractAccount`, and passes through any other parameters.\n  | \"encodeExecute\"\n  | \"encodeBatchExecute\"\n  | \"getNonce\"\n  | \"signMessage\"\n  | \"signTypedData\"\n  | \"getDummySignature\"\n> & {\n  signer: TSigner;\n  signerEntity?: SignerEntity;\n  accountAddress: Address;\n};\n\nexport type CreateMAV2BaseReturnType<\n  TSigner extends SmartAccountSigner = SmartAccountSigner\n> = Promise<ModularAccountV2<TSigner>>;\n\nexport async function createMAv2Base<\n  TSigner extends SmartAccountSigner = SmartAccountSigner\n>(config: CreateMAV2BaseParams<TSigner>): CreateMAV2BaseReturnType<TSigner> {\n  const {\n    transport,\n    chain,\n    signer,\n    entryPoint = getEntryPoint(chain, { version: \"0.7.0\" }),\n    signerEntity = {\n      isGlobalValidation: true,\n      entityId: DEFAULT_OWNER_ENTITY_ID,\n    },\n    signerEntity: {\n      isGlobalValidation = true,\n      entityId = DEFAULT_OWNER_ENTITY_ID,\n    } = {},\n    accountAddress,\n    ...remainingToSmartContractAccountParams\n  } = config;\n\n  if (entityId > Number(maxUint32)) {\n    throw new InvalidEntityIdError(entityId);\n  }\n\n  const client = createBundlerClient({\n    transport,\n    chain,\n  });\n\n  const encodeExecute: (tx: AccountOp) => Promise<Hex> = async ({\n    target,\n    data,\n    value,\n  }) =>\n    await encodeCallData(\n      encodeFunctionData({\n        abi: modularAccountAbi,\n        functionName: \"execute\",\n        args: [target, value ?? 0n, data],\n      })\n    );\n\n  const encodeBatchExecute: (txs: AccountOp[]) => Promise<Hex> = async (txs) =>\n    await encodeCallData(\n      encodeFunctionData({\n        abi: modularAccountAbi,\n        functionName: \"executeBatch\",\n        args: [\n          txs.map((tx) => ({\n            target: tx.target,\n            data: tx.data,\n            value: tx.value ?? 0n,\n          })),\n        ],\n      })\n    );\n\n  const isAccountDeployed: () => Promise<boolean> = async () =>\n    !!(await client.getCode({ address: accountAddress }));\n  // TODO: add deferred action flag\n  const getNonce = async (nonceKey: bigint = 0n): Promise<bigint> => {\n    if (nonceKey > maxUint152) {\n      throw new InvalidNonceKeyError(nonceKey);\n    }\n\n    const entryPointContract = getContract({\n      address: entryPoint.address,\n      abi: entryPoint.abi,\n      client,\n    });\n\n    const fullNonceKey: bigint =\n      (nonceKey << 40n) +\n      (BigInt(entityId) << 8n) +\n      (isGlobalValidation ? 1n : 0n);\n\n    return entryPointContract.read.getNonce([\n      accountAddress,\n      fullNonceKey,\n    ]) as Promise<bigint>;\n  };\n\n  const accountContract = getContract({\n    address: accountAddress,\n    abi: modularAccountAbi,\n    client,\n  });\n\n  const getExecutionData = async (selector: Hex) => {\n    if (!(await isAccountDeployed())) {\n      return {\n        module: zeroAddress,\n        skipRuntimeValidation: false,\n        allowGlobalValidation: false,\n        executionHooks: [],\n      };\n    }\n\n    return await accountContract.read.getExecutionData([selector]);\n  };\n\n  const getValidationData = async (args: ValidationDataParams) => {\n    if (!(await isAccountDeployed())) {\n      return {\n        validationHooks: [],\n        executionHooks: [],\n        selectors: [],\n        validationFlags: 0,\n      };\n    }\n\n    const { validationModuleAddress, entityId } = args;\n    return await accountContract.read.getValidationData([\n      serializeModuleEntity({\n        moduleAddress: validationModuleAddress ?? zeroAddress,\n        entityId: entityId ?? Number(maxUint32),\n      }),\n    ]);\n  };\n\n  const encodeCallData = async (callData: Hex): Promise<Hex> => {\n    const validationData = await getValidationData({\n      entityId: Number(entityId),\n    });\n\n    return validationData.executionHooks.length\n      ? concatHex([executeUserOpSelector, callData])\n      : callData;\n  };\n\n  const baseAccount = await toSmartContractAccount({\n    ...remainingToSmartContractAccountParams,\n    transport,\n    chain,\n    entryPoint,\n    accountAddress,\n    encodeExecute,\n    encodeBatchExecute,\n    getNonce,\n    ...(entityId === DEFAULT_OWNER_ENTITY_ID\n      ? nativeSMASigner(signer, chain, accountAddress)\n      : singleSignerMessageSigner(signer, chain, accountAddress, entityId)),\n  });\n\n  return {\n    ...baseAccount,\n    getSigner: () => signer,\n    signerEntity,\n    getExecutionData,\n    getValidationData,\n    encodeCallData,\n  };\n}\n"]}

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

@@ -0,0 +1,16 @@
+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>>;

package/dist/esm/src/ma-v2/account/modularAccountV2.js

@@ -0,0 +1,113 @@
+import { createBundlerClient, getEntryPoint, getAccountAddress, EntityIdOverrideError, InvalidModularAccountV2Mode, } from "@aa-sdk/core";
+import { concatHex, encodeFunctionData, } from "viem";
+import { accountFactoryAbi } from "../abis/accountFactoryAbi.js";
+import { getDefaultMAV2FactoryAddress } from "../utils.js";
+import { createMAv2Base, } from "./common/modularAccountV2Base.js";
+import { DEFAULT_OWNER_ENTITY_ID } from "../utils.js";
+/**
+ * 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) {
+    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 () => {
+                    return "0x";
+                };
+                const signerAddress = await signer.getAddress();
+                const accountAddress = _accountAddress ?? signerAddress;
+                if (entityId === DEFAULT_OWNER_ENTITY_ID &&
+                    signerAddress !== accountAddress) {
+                    throw new EntityIdOverrideError();
+                }
+                const implementation = "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) {
+    throw new InvalidModularAccountV2Mode();
+}
+//# sourceMappingURL=modularAccountV2.js.map

package/dist/esm/src/ma-v2/account/modularAccountV2.js.map

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

package/dist/esm/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/esm/src/ma-v2/account/nativeSMASigner.js

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

package/dist/esm/src/ma-v2/account/nativeSMASigner.js.map

@@ -1 +1 @@
-{"version":3,"file":"nativeSMASigner.js","sourceRoot":"","sources":["../../../../../src/ma-v2/account/nativeSMASigner.ts"],"names":[],"mappings":"AACA,OAAO,EACL,WAAW,EACX,aAAa,GAOd,MAAM,MAAM,CAAC;AAEd,OAAO,EACL,eAAe,EACf,iBAAiB,EACjB,uBAAuB,GACxB,MAAM,aAAa,CAAC;AACrB;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,MAA0B,EAC1B,KAAY,EACZ,cAAuB,EACvB,EAAE;IACF,OAAO;QACL,iBAAiB,EAAE,GAAQ,EAAE;YAC3B,MAAM,mBAAmB,GACvB,sIAAsI,CAAC;YAEzI,OAAO,eAAe,CAAC;gBACrB,uBAAuB;gBACvB,mBAAmB,EAAE,mBAAmB;aACzC,CAAC,CAAC;QACL,CAAC;QAED,qBAAqB,EAAE,CAAC,MAAW,EAAgB,EAAE;YACnD,OAAO,MAAM,CAAC,WAAW,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,SAAc,EAAE,EAAE,CACjE,eAAe,CAAC;gBACd,uBAAuB;gBACvB,mBAAmB,EAAE,SAAS;aAC/B,CAAC,CACH,CAAC;QACJ,CAAC;QAED,oFAAoF;QACpF,KAAK,CAAC,WAAW,CAAC,EAAE,OAAO,EAAgC;YACzD,MAAM,IAAI,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;YAElC,OAAO,iBAAiB,CAAC;gBACvB,mBAAmB,EAAE,MAAM,MAAM,CAAC,aAAa,CAAC;oBAC9C,MAAM,EAAE;wBACN,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;wBACzB,iBAAiB,EAAE,cAAc;qBAClC;oBACD,KAAK,EAAE;wBACL,cAAc,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;qBACpD;oBACD,OAAO,EAAE;wBACP,IAAI;qBACL;oBACD,WAAW,EAAE,gBAAgB;iBAC9B,CAAC;gBACF,QAAQ,EAAE,uBAAuB;aAClC,CAAC,CAAC;QACL,CAAC;QAED,mEAAmE;QACnE,qHAAqH;QACrH,aAAa,EAAE,KAAK,EAIlB,mBAAgE,EAClD,EAAE;YAChB,uIAAuI;YACvI,MAAM,gBAAgB,GACpB,mBAAmB,EAAE,WAAW,KAAK,gBAAgB;gBACrD,mBAAmB,EAAE,MAAM,EAAE,iBAAiB,KAAK,cAAc,CAAC;YAEpE,OAAO,gBAAgB;gBACrB,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,mBAAmB,CAAC;gBAC3C,CAAC,CAAC,iBAAiB,CAAC;oBAChB,mBAAmB,EAAE,MAAM,MAAM,CAAC,aAAa,CAAC;wBAC9C,MAAM,EAAE;4BACN,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;4BACzB,iBAAiB,EAAE,cAAc;yBAClC;wBACD,KAAK,EAAE;4BACL,cAAc,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;yBACpD;wBACD,OAAO,EAAE;4BACP,IAAI,EAAE,MAAM,aAAa,CAAC,mBAAmB,CAAC;yBAC/C;wBACD,WAAW,EAAE,gBAAgB;qBAC9B,CAAC;oBACF,QAAQ,EAAE,uBAAuB;iBAClC,CAAC,CAAC;QACT,CAAC;KACF,CAAC;AACJ,CAAC,CAAC","sourcesContent":["import type { SmartAccountSigner } from \"@aa-sdk/core\";\nimport {\n  hashMessage,\n  hashTypedData,\n  type Hex,\n  type SignableMessage,\n  type TypedData,\n  type TypedDataDefinition,\n  type Chain,\n  type Address,\n} from \"viem\";\n\nimport {\n  packUOSignature,\n  pack1271Signature,\n  DEFAULT_OWNER_ENTITY_ID,\n} from \"../utils.js\";\n/**\n * Creates an object with methods for generating a dummy signature, signing user operation hashes, signing messages, and signing typed data.\n *\n * @example\n * ```ts\n * import { nativeSMASigner } from \"@account-kit/smart-contracts\";\n \n * import { LocalAccountSigner } from \"@aa-sdk/core\";\n *\n * const MNEMONIC = \"...\":\n *\n * const account = createSMAV2Account({ config });\n *\n * const signer = LocalAccountSigner.mnemonicToAccountSigner(MNEMONIC);\n *\n * const messageSigner = nativeSMASigner(signer, chain, account.address);\n * ```\n *\n * @param {SmartAccountSigner} signer Signer to use for signing operations\n * @param {Chain} chain Chain object for the signer\n * @param {Address} accountAddress address of the smart account using this signer\n * @returns {object} an object with methods for signing operations and managing signatures\n */\nexport const nativeSMASigner = (\n  signer: SmartAccountSigner,\n  chain: Chain,\n  accountAddress: Address\n) => {\n  return {\n    getDummySignature: (): Hex => {\n      const dummyEcdsaSignature =\n        \"0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c\";\n\n      return packUOSignature({\n        // orderedHookData: [],\n        validationSignature: dummyEcdsaSignature,\n      });\n    },\n\n    signUserOperationHash: (uoHash: Hex): Promise<Hex> => {\n      return signer.signMessage({ raw: uoHash }).then((signature: Hex) =>\n        packUOSignature({\n          // orderedHookData: [],\n          validationSignature: signature,\n        })\n      );\n    },\n\n    // we apply the expected 1271 packing here since the account contract will expect it\n    async signMessage({ message }: { message: SignableMessage }): Promise<Hex> {\n      const hash = hashMessage(message);\n\n      return pack1271Signature({\n        validationSignature: await signer.signTypedData({\n          domain: {\n            chainId: Number(chain.id),\n            verifyingContract: accountAddress,\n          },\n          types: {\n            ReplaySafeHash: [{ name: \"hash\", type: \"bytes32\" }],\n          },\n          message: {\n            hash,\n          },\n          primaryType: \"ReplaySafeHash\",\n        }),\n        entityId: DEFAULT_OWNER_ENTITY_ID,\n      });\n    },\n\n    // TODO: maybe move \"sign deferred actions\" to a separate function?\n    // we don't apply the expected 1271 packing since deferred sigs use typed data sigs and don't expect the 1271 packing\n    signTypedData: async <\n      const typedData extends TypedData | Record<string, unknown>,\n      primaryType extends keyof typedData | \"EIP712Domain\" = keyof typedData\n    >(\n      typedDataDefinition: TypedDataDefinition<typedData, primaryType>\n    ): Promise<Hex> => {\n      // the accounts domain already gives replay protection across accounts for deferred actions, so we don't need to apply another wrapping\n      const isDeferredAction =\n        typedDataDefinition?.primaryType === \"DeferredAction\" &&\n        typedDataDefinition?.domain?.verifyingContract === accountAddress;\n\n      return isDeferredAction\n        ? signer.signTypedData(typedDataDefinition)\n        : pack1271Signature({\n            validationSignature: await signer.signTypedData({\n              domain: {\n                chainId: Number(chain.id),\n                verifyingContract: accountAddress,\n              },\n              types: {\n                ReplaySafeHash: [{ name: \"hash\", type: \"bytes32\" }],\n              },\n              message: {\n                hash: await hashTypedData(typedDataDefinition),\n              },\n              primaryType: \"ReplaySafeHash\",\n            }),\n            entityId: DEFAULT_OWNER_ENTITY_ID,\n          });\n    },\n  };\n};\n"]}
+{"version":3,"file":"nativeSMASigner.js","sourceRoot":"","sources":["../../../../../src/ma-v2/account/nativeSMASigner.ts"],"names":[],"mappings":"AACA,OAAO,EACL,WAAW,EACX,aAAa,GAOd,MAAM,MAAM,CAAC;AAEd,OAAO,EACL,eAAe,EACf,iBAAiB,EACjB,uBAAuB,GACxB,MAAM,aAAa,CAAC;AACrB;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,MAA0B,EAC1B,KAAY,EACZ,cAAuB,EACvB,EAAE;IACF,OAAO;QACL,iBAAiB,EAAE,GAAQ,EAAE;YAC3B,MAAM,mBAAmB,GACvB,sIAAsI,CAAC;YAEzI,OAAO,eAAe,CAAC;gBACrB,uBAAuB;gBACvB,mBAAmB,EAAE,mBAAmB;aACzC,CAAC,CAAC;QACL,CAAC;QAED,qBAAqB,EAAE,CAAC,MAAW,EAAgB,EAAE;YACnD,OAAO,MAAM,CAAC,WAAW,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,SAAc,EAAE,EAAE,CACjE,eAAe,CAAC;gBACd,uBAAuB;gBACvB,mBAAmB,EAAE,SAAS;aAC/B,CAAC,CACH,CAAC;QACJ,CAAC;QAED,oFAAoF;QACpF,KAAK,CAAC,WAAW,CAAC,EAAE,OAAO,EAAgC;YACzD,MAAM,IAAI,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;YAElC,OAAO,iBAAiB,CAAC;gBACvB,mBAAmB,EAAE,MAAM,MAAM,CAAC,aAAa,CAAC;oBAC9C,MAAM,EAAE;wBACN,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;wBACzB,iBAAiB,EAAE,cAAc;qBAClC;oBACD,KAAK,EAAE;wBACL,cAAc,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;qBACpD;oBACD,OAAO,EAAE;wBACP,IAAI;qBACL;oBACD,WAAW,EAAE,gBAAgB;iBAC9B,CAAC;gBACF,QAAQ,EAAE,uBAAuB;aAClC,CAAC,CAAC;QACL,CAAC;QAED,mEAAmE;QACnE,qHAAqH;QACrH,aAAa,EAAE,KAAK,EAIlB,mBAAgE,EAClD,EAAE;YAChB,uIAAuI;YACvI,MAAM,gBAAgB,GACpB,mBAAmB,EAAE,WAAW,KAAK,gBAAgB;gBACrD,mBAAmB,EAAE,MAAM,EAAE,iBAAiB,KAAK,cAAc,CAAC;YAEpE,OAAO,gBAAgB;gBACrB,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,mBAAmB,CAAC;gBAC3C,CAAC,CAAC,iBAAiB,CAAC;oBAChB,mBAAmB,EAAE,MAAM,MAAM,CAAC,aAAa,CAAC;wBAC9C,MAAM,EAAE;4BACN,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;4BACzB,iBAAiB,EAAE,cAAc;yBAClC;wBACD,KAAK,EAAE;4BACL,cAAc,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;yBACpD;wBACD,OAAO,EAAE;4BACP,IAAI,EAAE,MAAM,aAAa,CAAC,mBAAmB,CAAC;yBAC/C;wBACD,WAAW,EAAE,gBAAgB;qBAC9B,CAAC;oBACF,QAAQ,EAAE,uBAAuB;iBAClC,CAAC,CAAC;QACT,CAAC;KACF,CAAC;AACJ,CAAC,CAAC","sourcesContent":["import type { SmartAccountSigner } from \"@aa-sdk/core\";\nimport {\n  hashMessage,\n  hashTypedData,\n  type Hex,\n  type SignableMessage,\n  type TypedData,\n  type TypedDataDefinition,\n  type Chain,\n  type Address,\n} from \"viem\";\n\nimport {\n  packUOSignature,\n  pack1271Signature,\n  DEFAULT_OWNER_ENTITY_ID,\n} from \"../utils.js\";\n/**\n * Creates an object with methods for generating a dummy signature, signing user operation hashes, signing messages, and signing typed data.\n *\n * @example\n * ```ts\n * import { nativeSMASigner } from \"@account-kit/smart-contracts\";\n \n * import { LocalAccountSigner } from \"@aa-sdk/core\";\n *\n * const MNEMONIC = \"...\":\n *\n * const account = createModularAccountV2({ config });\n *\n * const signer = LocalAccountSigner.mnemonicToAccountSigner(MNEMONIC);\n *\n * const messageSigner = nativeSMASigner(signer, chain, account.address);\n * ```\n *\n * @param {SmartAccountSigner} signer Signer to use for signing operations\n * @param {Chain} chain Chain object for the signer\n * @param {Address} accountAddress address of the smart account using this signer\n * @returns {object} an object with methods for signing operations and managing signatures\n */\nexport const nativeSMASigner = (\n  signer: SmartAccountSigner,\n  chain: Chain,\n  accountAddress: Address\n) => {\n  return {\n    getDummySignature: (): Hex => {\n      const dummyEcdsaSignature =\n        \"0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c\";\n\n      return packUOSignature({\n        // orderedHookData: [],\n        validationSignature: dummyEcdsaSignature,\n      });\n    },\n\n    signUserOperationHash: (uoHash: Hex): Promise<Hex> => {\n      return signer.signMessage({ raw: uoHash }).then((signature: Hex) =>\n        packUOSignature({\n          // orderedHookData: [],\n          validationSignature: signature,\n        })\n      );\n    },\n\n    // we apply the expected 1271 packing here since the account contract will expect it\n    async signMessage({ message }: { message: SignableMessage }): Promise<Hex> {\n      const hash = hashMessage(message);\n\n      return pack1271Signature({\n        validationSignature: await signer.signTypedData({\n          domain: {\n            chainId: Number(chain.id),\n            verifyingContract: accountAddress,\n          },\n          types: {\n            ReplaySafeHash: [{ name: \"hash\", type: \"bytes32\" }],\n          },\n          message: {\n            hash,\n          },\n          primaryType: \"ReplaySafeHash\",\n        }),\n        entityId: DEFAULT_OWNER_ENTITY_ID,\n      });\n    },\n\n    // TODO: maybe move \"sign deferred actions\" to a separate function?\n    // we don't apply the expected 1271 packing since deferred sigs use typed data sigs and don't expect the 1271 packing\n    signTypedData: async <\n      const typedData extends TypedData | Record<string, unknown>,\n      primaryType extends keyof typedData | \"EIP712Domain\" = keyof typedData\n    >(\n      typedDataDefinition: TypedDataDefinition<typedData, primaryType>\n    ): Promise<Hex> => {\n      // the accounts domain already gives replay protection across accounts for deferred actions, so we don't need to apply another wrapping\n      const isDeferredAction =\n        typedDataDefinition?.primaryType === \"DeferredAction\" &&\n        typedDataDefinition?.domain?.verifyingContract === accountAddress;\n\n      return isDeferredAction\n        ? signer.signTypedData(typedDataDefinition)\n        : pack1271Signature({\n            validationSignature: await signer.signTypedData({\n              domain: {\n                chainId: Number(chain.id),\n                verifyingContract: accountAddress,\n              },\n              types: {\n                ReplaySafeHash: [{ name: \"hash\", type: \"bytes32\" }],\n              },\n              message: {\n                hash: await hashTypedData(typedDataDefinition),\n              },\n              primaryType: \"ReplaySafeHash\",\n            }),\n            entityId: DEFAULT_OWNER_ENTITY_ID,\n          });\n    },\n  };\n};\n"]}

package/dist/esm/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,4 +70,4 @@ 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>;