@account-kit/smart-contracts 4.12.0 → 4.13.0

package/dist/esm/src/ma-v2/actions/install-validation/installValidation.js

@@ -3,17 +3,17 @@ import { encodeFunctionData, concatHex, zeroAddress, } from "viem";
 import { semiModularAccountBytecodeAbi } from "../../abis/semiModularAccountBytecodeAbi.js";
 import { serializeValidationConfig, serializeHookConfig, serializeModuleEntity, } from "../common/utils.js";
 import {} from "../../client/client.js";
-import {} from "../../account/semiModularAccountV2.js";
+import {} from "../../account/common/modularAccountV2Base.js";
 import { DEFAULT_OWNER_ENTITY_ID } from "../../utils.js";
 /**
  * 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;
  *
@@ -49,8 +49,8 @@ import { DEFAULT_OWNER_ENTITY_ID } from "../../utils.js";
  * @param {object} client - The client instance which provides account and sendUserOperation functionality.
  * @returns {object} - An object containing two methods, `installValidation` and `uninstallValidation`.
  */
-export const installValidationActions = (client) => ({
-    installValidation: async ({ validationConfig, selectors, installData, hooks, account = client.account, overrides, }) => {
+export const installValidationActions = (client) => {
+    const encodeInstallValidation = async ({ validationConfig, selectors, installData, hooks, account = client.account, }) => {
         if (!account) {
             throw new AccountNotFoundError();
         }
@@ -62,8 +62,7 @@ export const installValidationActions = (client) => ({
             validationConfig.moduleAddress !== zeroAddress) {
             throw new EntityIdOverrideError();
         }
-        const { encodeCallData } = account;
-        const callData = await encodeCallData(encodeFunctionData({
+        return account.encodeCallData(encodeFunctionData({
             abi: semiModularAccountBytecodeAbi,
             functionName: "installValidation",
             args: [
@@ -73,21 +72,15 @@ export const installValidationActions = (client) => ({
                 hooks.map((hook) => concatHex([serializeHookConfig(hook.hookConfig), hook.initData])),
             ],
         }));
-        return client.sendUserOperation({
-            uo: callData,
-            account,
-            overrides,
-        });
-    },
-    uninstallValidation: async ({ moduleAddress, entityId, uninstallData, hookUninstallDatas, account = client.account, overrides, }) => {
+    };
+    const encodeUninstallValidation = async ({ moduleAddress, entityId, uninstallData, hookUninstallDatas, account = client.account, }) => {
         if (!account) {
             throw new AccountNotFoundError();
         }
         if (!isSmartAccountClient(client)) {
             throw new IncompatibleClientError("SmartAccountClient", "uninstallValidation", client);
         }
-        const { encodeCallData } = account;
-        const callData = await encodeCallData(encodeFunctionData({
+        return account.encodeCallData(encodeFunctionData({
             abi: semiModularAccountBytecodeAbi,
             functionName: "uninstallValidation",
             args: [
@@ -99,11 +92,38 @@ export const installValidationActions = (client) => ({
                 hookUninstallDatas,
             ],
         }));
-        return client.sendUserOperation({
-            uo: callData,
-            account,
-            overrides,
-        });
-    },
-});
+    };
+    return {
+        encodeInstallValidation,
+        encodeUninstallValidation,
+        installValidation: async ({ validationConfig, selectors, installData, hooks, account = client.account, overrides, }) => {
+            const callData = await encodeInstallValidation({
+                validationConfig,
+                selectors,
+                installData,
+                hooks,
+                account,
+            });
+            return client.sendUserOperation({
+                uo: callData,
+                account,
+                overrides,
+            });
+        },
+        uninstallValidation: async ({ moduleAddress, entityId, uninstallData, hookUninstallDatas, account = client.account, overrides, }) => {
+            const callData = await encodeUninstallValidation({
+                moduleAddress,
+                entityId,
+                uninstallData,
+                hookUninstallDatas,
+                account,
+            });
+            return client.sendUserOperation({
+                uo: callData,
+                account,
+                overrides,
+            });
+        },
+    };
+};
 //# sourceMappingURL=installValidation.js.map

package/dist/esm/src/ma-v2/actions/install-validation/installValidation.js.map

@@ -1 +1 @@
-{"version":3,"file":"installValidation.js","sourceRoot":"","sources":["../../../../../../src/ma-v2/actions/install-validation/installValidation.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  AccountNotFoundError,\n  IncompatibleClientError,\n  isSmartAccountClient,\n  EntityIdOverrideError,\n  type GetEntryPointFromAccount,\n  type SendUserOperationResult,\n  type UserOperationOverridesParameter,\n  type SmartAccountSigner,\n} from \"@aa-sdk/core\";\nimport {\n  type Address,\n  type Hex,\n  encodeFunctionData,\n  concatHex,\n  zeroAddress,\n} from \"viem\";\n\nimport { semiModularAccountBytecodeAbi } from \"../../abis/semiModularAccountBytecodeAbi.js\";\nimport type { HookConfig, ValidationConfig } from \"../common/types.js\";\nimport {\n  serializeValidationConfig,\n  serializeHookConfig,\n  serializeModuleEntity,\n} from \"../common/utils.js\";\n\nimport { type SMAV2AccountClient } from \"../../client/client.js\";\nimport { type MAV2Account } from \"../../account/semiModularAccountV2.js\";\nimport { DEFAULT_OWNER_ENTITY_ID } from \"../../utils.js\";\n\nexport type InstallValidationParams<\n  TSigner extends SmartAccountSigner = SmartAccountSigner\n> = {\n  validationConfig: ValidationConfig;\n  selectors: Hex[];\n  installData: Hex;\n  hooks: {\n    hookConfig: HookConfig;\n    initData: Hex;\n  }[];\n  account?: MAV2Account<TSigner> | undefined;\n} & UserOperationOverridesParameter<\n  GetEntryPointFromAccount<MAV2Account<TSigner>>\n>;\n\nexport type UninstallValidationParams<\n  TSigner extends SmartAccountSigner = SmartAccountSigner\n> = {\n  moduleAddress: Address;\n  entityId: number;\n  uninstallData: Hex;\n  hookUninstallDatas: Hex[];\n  account?: MAV2Account<TSigner> | undefined;\n} & UserOperationOverridesParameter<\n  GetEntryPointFromAccount<MAV2Account<TSigner>>\n>;\n\nexport type InstallValidationActions<\n  TSigner extends SmartAccountSigner = SmartAccountSigner\n> = {\n  installValidation: (\n    args: InstallValidationParams<TSigner>\n  ) => Promise<SendUserOperationResult>;\n  uninstallValidation: (\n    args: UninstallValidationParams<TSigner>\n  ) => Promise<SendUserOperationResult>;\n};\n\n/**\n * Provides validation installation and uninstallation functionalities for a MA v2 client, ensuring compatibility with `SmartAccountClient`.\n *\n * @example\n * ```ts\n * import { createSMAV2AccountClient, installValidationActions, getDefaultSingleSignerValidationModuleAddress, SingleSignerValidationModule } from \"@account-kit/smart-contracts\";\n * import { Address } from \"viem\";\n *\n * const client = (await createSMAV2AccountClient({ ... })).extend(installValidationActions);\n * const sessionKeyAddress: Address = \"0x1234\";\n * const sessionKeyEntityId: number = 1;\n *\n * await client.installValidation({\n *   validationConfig: {\n *     moduleAddress: getDefaultSingleSignerValidationModuleAddress(\n *       client.chain\n *     ),\n *     entityId: sessionKeyEntityId,\n *     isGlobal: true,\n *     isSignatureValidation: false,\n *     isUserOpValidation: true,\n *   },\n *   selectors: [],\n *   installData: SingleSignerValidationModule.encodeOnInstallData({\n *     entityId: sessionKeyEntityId,\n *     signer: sessionKeyAddress,\n *   }),\n *   hooks: [],\n * });\n *\n * await client.uninstallValidation({\n *   moduleAddress: sessionKeyAddress,\n *   entityId: sessionKeyEntityId,\n *   uninstallData: SingleSignerValidationModule.encodeOnUninstallData({\n *     entityId: sessionKeyEntityId,\n *   }),\n *   hookUninstallDatas: [],\n * });\n *\n * ```\n *\n * @param {object} client - The client instance which provides account and sendUserOperation functionality.\n * @returns {object} - An object containing two methods, `installValidation` and `uninstallValidation`.\n */\nexport const installValidationActions: <\n  TSigner extends SmartAccountSigner = SmartAccountSigner\n>(\n  client: SMAV2AccountClient<TSigner>\n) => InstallValidationActions<TSigner> = (client) => ({\n  installValidation: async ({\n    validationConfig,\n    selectors,\n    installData,\n    hooks,\n    account = client.account,\n    overrides,\n  }) => {\n    if (!account) {\n      throw new AccountNotFoundError();\n    }\n\n    if (!isSmartAccountClient(client)) {\n      throw new IncompatibleClientError(\n        \"SmartAccountClient\",\n        \"installValidation\",\n        client\n      );\n    }\n\n    // an entityId of zero is only allowed if we're installing or uninstalling hooks on the fallback validation\n    if (\n      validationConfig.entityId === DEFAULT_OWNER_ENTITY_ID &&\n      validationConfig.moduleAddress !== zeroAddress\n    ) {\n      throw new EntityIdOverrideError();\n    }\n\n    const { encodeCallData } = account;\n\n    const callData = await encodeCallData(\n      encodeFunctionData({\n        abi: semiModularAccountBytecodeAbi,\n        functionName: \"installValidation\",\n        args: [\n          serializeValidationConfig(validationConfig),\n          selectors,\n          installData,\n          hooks.map((hook: { hookConfig: HookConfig; initData: Hex }) =>\n            concatHex([serializeHookConfig(hook.hookConfig), hook.initData])\n          ),\n        ],\n      })\n    );\n\n    return client.sendUserOperation({\n      uo: callData,\n      account,\n      overrides,\n    });\n  },\n\n  uninstallValidation: async ({\n    moduleAddress,\n    entityId,\n    uninstallData,\n    hookUninstallDatas,\n    account = client.account,\n    overrides,\n  }) => {\n    if (!account) {\n      throw new AccountNotFoundError();\n    }\n\n    if (!isSmartAccountClient(client)) {\n      throw new IncompatibleClientError(\n        \"SmartAccountClient\",\n        \"uninstallValidation\",\n        client\n      );\n    }\n\n    const { encodeCallData } = account;\n\n    const callData = await encodeCallData(\n      encodeFunctionData({\n        abi: semiModularAccountBytecodeAbi,\n        functionName: \"uninstallValidation\",\n        args: [\n          serializeModuleEntity({\n            moduleAddress,\n            entityId,\n          }),\n          uninstallData,\n          hookUninstallDatas,\n        ],\n      })\n    );\n\n    return client.sendUserOperation({\n      uo: callData,\n      account,\n      overrides,\n    });\n  },\n});\n"]}
+{"version":3,"file":"installValidation.js","sourceRoot":"","sources":["../../../../../../src/ma-v2/actions/install-validation/installValidation.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  AccountNotFoundError,\n  IncompatibleClientError,\n  isSmartAccountClient,\n  EntityIdOverrideError,\n  type GetEntryPointFromAccount,\n  type SendUserOperationResult,\n  type UserOperationOverridesParameter,\n  type SmartAccountSigner,\n} from \"@aa-sdk/core\";\nimport {\n  type Address,\n  type Hex,\n  encodeFunctionData,\n  concatHex,\n  zeroAddress,\n} from \"viem\";\n\nimport { semiModularAccountBytecodeAbi } from \"../../abis/semiModularAccountBytecodeAbi.js\";\nimport type { HookConfig, ValidationConfig } from \"../common/types.js\";\nimport {\n  serializeValidationConfig,\n  serializeHookConfig,\n  serializeModuleEntity,\n} from \"../common/utils.js\";\n\nimport { type ModularAccountV2Client } from \"../../client/client.js\";\nimport { type ModularAccountV2 } from \"../../account/common/modularAccountV2Base.js\";\nimport { DEFAULT_OWNER_ENTITY_ID } from \"../../utils.js\";\n\nexport type InstallValidationParams<\n  TSigner extends SmartAccountSigner = SmartAccountSigner\n> = {\n  validationConfig: ValidationConfig;\n  selectors: Hex[];\n  installData: Hex;\n  hooks: {\n    hookConfig: HookConfig;\n    initData: Hex;\n  }[];\n  account?: ModularAccountV2<TSigner> | undefined;\n} & UserOperationOverridesParameter<\n  GetEntryPointFromAccount<ModularAccountV2<TSigner>>\n>;\n\nexport type UninstallValidationParams<\n  TSigner extends SmartAccountSigner = SmartAccountSigner\n> = {\n  moduleAddress: Address;\n  entityId: number;\n  uninstallData: Hex;\n  hookUninstallDatas: Hex[];\n  account?: ModularAccountV2<TSigner> | undefined;\n} & UserOperationOverridesParameter<\n  GetEntryPointFromAccount<ModularAccountV2<TSigner>>\n>;\n\nexport type InstallValidationActions<\n  TSigner extends SmartAccountSigner = SmartAccountSigner\n> = {\n  installValidation: (\n    args: InstallValidationParams<TSigner>\n  ) => Promise<SendUserOperationResult>;\n  encodeInstallValidation: (\n    // TODO: omit the user op sending related parameters from this type\n    args: InstallValidationParams<TSigner>\n  ) => Promise<Hex>;\n  uninstallValidation: (\n    args: UninstallValidationParams<TSigner>\n  ) => Promise<SendUserOperationResult>;\n  encodeUninstallValidation: (\n    args: UninstallValidationParams<TSigner>\n  ) => Promise<Hex>;\n};\n\n/**\n * Provides validation installation and uninstallation functionalities for a MA v2 client, ensuring compatibility with `SmartAccountClient`.\n *\n * @example\n * ```ts\n * import { createModularAccountV2Client, installValidationActions, getDefaultSingleSignerValidationModuleAddress, SingleSignerValidationModule } from \"@account-kit/smart-contracts\";\n * import { Address } from \"viem\";\n *\n * const client = (await createModularAccountV2Client({ ... })).extend(installValidationActions);\n * const sessionKeyAddress: Address = \"0x1234\";\n * const sessionKeyEntityId: number = 1;\n *\n * await client.installValidation({\n *   validationConfig: {\n *     moduleAddress: getDefaultSingleSignerValidationModuleAddress(\n *       client.chain\n *     ),\n *     entityId: sessionKeyEntityId,\n *     isGlobal: true,\n *     isSignatureValidation: false,\n *     isUserOpValidation: true,\n *   },\n *   selectors: [],\n *   installData: SingleSignerValidationModule.encodeOnInstallData({\n *     entityId: sessionKeyEntityId,\n *     signer: sessionKeyAddress,\n *   }),\n *   hooks: [],\n * });\n *\n * await client.uninstallValidation({\n *   moduleAddress: sessionKeyAddress,\n *   entityId: sessionKeyEntityId,\n *   uninstallData: SingleSignerValidationModule.encodeOnUninstallData({\n *     entityId: sessionKeyEntityId,\n *   }),\n *   hookUninstallDatas: [],\n * });\n *\n * ```\n *\n * @param {object} client - The client instance which provides account and sendUserOperation functionality.\n * @returns {object} - An object containing two methods, `installValidation` and `uninstallValidation`.\n */\nexport const installValidationActions: <\n  TSigner extends SmartAccountSigner = SmartAccountSigner\n>(\n  client: ModularAccountV2Client<TSigner>\n) => InstallValidationActions<TSigner> = (client) => {\n  const encodeInstallValidation = async ({\n    validationConfig,\n    selectors,\n    installData,\n    hooks,\n    account = client.account,\n  }: InstallValidationParams) => {\n    if (!account) {\n      throw new AccountNotFoundError();\n    }\n\n    if (!isSmartAccountClient(client)) {\n      throw new IncompatibleClientError(\n        \"SmartAccountClient\",\n        \"installValidation\",\n        client\n      );\n    }\n\n    // an entityId of zero is only allowed if we're installing or uninstalling hooks on the fallback validation\n    if (\n      validationConfig.entityId === DEFAULT_OWNER_ENTITY_ID &&\n      validationConfig.moduleAddress !== zeroAddress\n    ) {\n      throw new EntityIdOverrideError();\n    }\n\n    return account.encodeCallData(\n      encodeFunctionData({\n        abi: semiModularAccountBytecodeAbi,\n        functionName: \"installValidation\",\n        args: [\n          serializeValidationConfig(validationConfig),\n          selectors,\n          installData,\n          hooks.map((hook: { hookConfig: HookConfig; initData: Hex }) =>\n            concatHex([serializeHookConfig(hook.hookConfig), hook.initData])\n          ),\n        ],\n      })\n    );\n  };\n\n  const encodeUninstallValidation = async ({\n    moduleAddress,\n    entityId,\n    uninstallData,\n    hookUninstallDatas,\n    account = client.account,\n  }: UninstallValidationParams) => {\n    if (!account) {\n      throw new AccountNotFoundError();\n    }\n\n    if (!isSmartAccountClient(client)) {\n      throw new IncompatibleClientError(\n        \"SmartAccountClient\",\n        \"uninstallValidation\",\n        client\n      );\n    }\n\n    return account.encodeCallData(\n      encodeFunctionData({\n        abi: semiModularAccountBytecodeAbi,\n        functionName: \"uninstallValidation\",\n        args: [\n          serializeModuleEntity({\n            moduleAddress,\n            entityId,\n          }),\n          uninstallData,\n          hookUninstallDatas,\n        ],\n      })\n    );\n  };\n\n  return {\n    encodeInstallValidation,\n    encodeUninstallValidation,\n    installValidation: async ({\n      validationConfig,\n      selectors,\n      installData,\n      hooks,\n      account = client.account,\n      overrides,\n    }) => {\n      const callData = await encodeInstallValidation({\n        validationConfig,\n        selectors,\n        installData,\n        hooks,\n        account,\n      });\n\n      return client.sendUserOperation({\n        uo: callData,\n        account,\n        overrides,\n      });\n    },\n\n    uninstallValidation: async ({\n      moduleAddress,\n      entityId,\n      uninstallData,\n      hookUninstallDatas,\n      account = client.account,\n      overrides,\n    }) => {\n      const callData = await encodeUninstallValidation({\n        moduleAddress,\n        entityId,\n        uninstallData,\n        hookUninstallDatas,\n        account,\n      });\n\n      return client.sendUserOperation({\n        uo: callData,\n        account,\n        overrides,\n      });\n    },\n  };\n};\n"]}

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

@@ -1,13 +1,14 @@
 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>>;

package/dist/esm/src/ma-v2/client/client.js

@@ -1,16 +1,15 @@
-import { createSmartAccountClient, } from "@aa-sdk/core";
+import { createSmartAccountClient, default7702GasEstimator, default7702UserOpSigner, } from "@aa-sdk/core";
 import {} from "viem";
-import { createSMAV2Account, } from "../account/semiModularAccountV2.js";
+import { createModularAccountV2, } from "../account/modularAccountV2.js";
 import { createAlchemySmartAccountClient, isAlchemyTransport, } from "@account-kit/infra";
 /**
- * Creates a SMAv2 account client using the provided configuration parameters.
+ * Creates a Modular Account V2 client using the provided configuration parameters.
  *
  * @example
- * ```ts
- * import { http } from "viem";
- * import { createSMAV2AccountClient } from "@account-kit/smart-contracts";
+ * ```ts twoslash
+ * import { createModularAccountV2Client } from "@account-kit/smart-contracts";
  * import { LocalAccountSigner } from "@aa-sdk/core";
- * import { sepolia } from "@account-kit/infra";
+ * import { alchemy, sepolia } from "@account-kit/infra";
  *
  * const MNEMONIC = "...";
  * const RPC_URL = "...";
@@ -19,11 +18,11 @@ import { createAlchemySmartAccountClient, isAlchemyTransport, } from "@account-k
  *
  * const chain = sepolia;
  *
- * const transport = http(RPC_URL);
+ * const transport = alchemy({ rpcUrl: RPC_URL });
  *
  * const policyId = "...";
  *
- * const SMAV2SignerAccountClient = await createSMAV2AccountClient({
+ * const modularAccountV2Client = await createModularAccountV2Client({
  *  chain,
  *  signer,
  *  transport,
@@ -31,27 +30,31 @@ import { createAlchemySmartAccountClient, isAlchemyTransport, } from "@account-k
  * });
  * ```
  *
- * @param {CreateSMAV2AccountClientParams} config The configuration parameters required to create the MAv2 account client
+ * @param {CreateModularAccountV2ClientParams} config The configuration parameters required to create the Modular Account v2 account client
  * @returns {Promise<SmartAccountClient>} A promise that resolves to a `SmartAccountClient` instance
  */
-export async function createSMAV2AccountClient(config) {
+export async function createModularAccountV2Client(config) {
     const { transport, chain } = config;
-    const smaV2Account = await createSMAV2Account({
-        ...config,
-        transport,
-        chain,
-    });
+    const account = await createModularAccountV2(config);
+    const middlewareToAppend = config.mode === "7702"
+        ? {
+            gasEstimator: default7702GasEstimator(config.gasEstimator),
+            signUserOperation: default7702UserOpSigner(config.signUserOperation),
+        }
+        : {};
     if (isAlchemyTransport(transport, chain)) {
         return createAlchemySmartAccountClient({
             ...config,
             transport,
             chain,
-            account: smaV2Account,
+            account,
+            ...middlewareToAppend,
         });
     }
     return createSmartAccountClient({
         ...config,
-        account: smaV2Account,
+        account,
+        ...middlewareToAppend,
     });
 }
 //# sourceMappingURL=client.js.map

package/dist/esm/src/ma-v2/client/client.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../../../src/ma-v2/client/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,wBAAwB,GACzB,MAAM,cAAc,CAAC;AACtB,OAAO,EAA8B,MAAM,MAAM,CAAC;AAElD,OAAO,EACL,kBAAkB,GAGnB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EACL,+BAA+B,EAC/B,kBAAkB,GAGnB,MAAM,oBAAoB,CAAC;AA8C5B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC5C,MAAsC;IAEtC,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC;IACpC,MAAM,YAAY,GAAG,MAAM,kBAAkB,CAAC;QAC5C,GAAG,MAAM;QACT,SAAS;QACT,KAAK;KACN,CAAC,CAAC;IACH,IAAI,kBAAkB,CAAC,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC;QACzC,OAAO,+BAA+B,CAAC;YACrC,GAAG,MAAM;YACT,SAAS;YACT,KAAK;YACL,OAAO,EAAE,YAAY;SACtB,CAAC,CAAC;IACL,CAAC;IAED,OAAO,wBAAwB,CAAC;QAC9B,GAAG,MAAM;QACT,OAAO,EAAE,YAAY;KACtB,CAAC,CAAC;AACL,CAAC","sourcesContent":["import {\n  type SmartAccountClient,\n  type SmartAccountSigner,\n  type SmartAccountClientConfig,\n  type NotType,\n  createSmartAccountClient,\n} from \"@aa-sdk/core\";\nimport { type Chain, type Transport } from \"viem\";\n\nimport {\n  createSMAV2Account,\n  type CreateSMAV2AccountParams,\n  type MAV2Account,\n} from \"../account/semiModularAccountV2.js\";\nimport {\n  createAlchemySmartAccountClient,\n  isAlchemyTransport,\n  type AlchemySmartAccountClientConfig,\n  type AlchemyTransport,\n} from \"@account-kit/infra\";\nimport type { LightAccount } from \"../../light-account/accounts/account.js\";\nexport type SMAV2AccountClient<\n  TSigner extends SmartAccountSigner = SmartAccountSigner,\n  TChain extends Chain = Chain,\n  TTransport extends Transport | AlchemyTransport = Transport\n> = SmartAccountClient<TTransport, TChain, MAV2Account<TSigner>>;\n\nexport type CreateSMAV2AccountClientParams<\n  TTransport extends Transport = Transport,\n  TChain extends Chain = Chain,\n  TSigner extends SmartAccountSigner = SmartAccountSigner\n> = CreateSMAV2AccountParams<TTransport, TSigner> &\n  Omit<\n    SmartAccountClientConfig<TTransport, TChain>,\n    \"transport\" | \"account\" | \"chain\"\n  >;\nexport type CreateSMAV2AlchemyAccountClientParams<\n  TTransport extends Transport = Transport,\n  TChain extends Chain = Chain,\n  TSigner extends SmartAccountSigner = SmartAccountSigner\n> = Omit<\n  CreateSMAV2AccountClientParams<TTransport, TChain, TSigner>,\n  \"transport\"\n> &\n  Omit<\n    AlchemySmartAccountClientConfig<TChain, LightAccount<TSigner>>,\n    \"account\"\n  > & { paymasterAndData?: never; dummyPaymasterAndData?: never };\n\nexport function createSMAV2AccountClient<\n  TChain extends Chain = Chain,\n  TSigner extends SmartAccountSigner = SmartAccountSigner\n>(\n  args: CreateSMAV2AlchemyAccountClientParams<AlchemyTransport, TChain, TSigner>\n): Promise<SMAV2AccountClient<TSigner, TChain, AlchemyTransport>>;\n\nexport function createSMAV2AccountClient<\n  TTransport extends Transport = Transport,\n  TChain extends Chain = Chain,\n  TSigner extends SmartAccountSigner = SmartAccountSigner\n>(\n  args: CreateSMAV2AccountClientParams<TTransport, TChain, TSigner> &\n    NotType<TTransport, AlchemyTransport>\n): Promise<SMAV2AccountClient<TSigner, TChain>>;\n\n/**\n * Creates a SMAv2 account client using the provided configuration parameters.\n *\n * @example\n * ```ts\n * import { http } from \"viem\";\n * import { createSMAV2AccountClient } from \"@account-kit/smart-contracts\";\n * import { LocalAccountSigner } from \"@aa-sdk/core\";\n * import { 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 = http(RPC_URL);\n *\n * const policyId = \"...\";\n *\n * const SMAV2SignerAccountClient = await createSMAV2AccountClient({\n *  chain,\n *  signer,\n *  transport,\n *  policyId, // NOTE: you may only pass in a gas policy ID if you provide an Alchemy transport!\n * });\n * ```\n *\n * @param {CreateSMAV2AccountClientParams} config The configuration parameters required to create the MAv2 account client\n * @returns {Promise<SmartAccountClient>} A promise that resolves to a `SmartAccountClient` instance\n */\nexport async function createSMAV2AccountClient(\n  config: CreateSMAV2AccountClientParams\n): Promise<SmartAccountClient> {\n  const { transport, chain } = config;\n  const smaV2Account = await createSMAV2Account({\n    ...config,\n    transport,\n    chain,\n  });\n  if (isAlchemyTransport(transport, chain)) {\n    return createAlchemySmartAccountClient({\n      ...config,\n      transport,\n      chain,\n      account: smaV2Account,\n    });\n  }\n\n  return createSmartAccountClient({\n    ...config,\n    account: smaV2Account,\n  });\n}\n"]}
+{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../../../src/ma-v2/client/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,wBAAwB,EACxB,uBAAuB,EACvB,uBAAuB,GACxB,MAAM,cAAc,CAAC;AACtB,OAAO,EAA8B,MAAM,MAAM,CAAC;AAElD,OAAO,EACL,sBAAsB,GAEvB,MAAM,gCAAgC,CAAC;AAExC,OAAO,EACL,+BAA+B,EAC/B,kBAAkB,GAInB,MAAM,oBAAoB,CAAC;AAsD5B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,MAAM,CAAC,KAAK,UAAU,4BAA4B,CAChD,MAE6C;IAE7C,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC;IAEpC,MAAM,OAAO,GAAG,MAAM,sBAAsB,CAAC,MAAM,CAAC,CAAC;IAErD,MAAM,kBAAkB,GACtB,MAAM,CAAC,IAAI,KAAK,MAAM;QACpB,CAAC,CAAC;YACE,YAAY,EAAE,uBAAuB,CAAC,MAAM,CAAC,YAAY,CAAC;YAC1D,iBAAiB,EAAE,uBAAuB,CAAC,MAAM,CAAC,iBAAiB,CAAC;SACrE;QACH,CAAC,CAAC,EAAE,CAAC;IAET,IAAI,kBAAkB,CAAC,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC;QACzC,OAAO,+BAA+B,CAAC;YACrC,GAAG,MAAM;YACT,SAAS;YACT,KAAK;YACL,OAAO;YACP,GAAG,kBAAkB;SACtB,CAAC,CAAC;IACL,CAAC;IAED,OAAO,wBAAwB,CAAC;QAC9B,GAAG,MAAM;QACT,OAAO;QACP,GAAG,kBAAkB;KACtB,CAAC,CAAC;AACL,CAAC","sourcesContent":["import {\n  type SmartAccountClient,\n  type SmartAccountSigner,\n  type SmartAccountClientConfig,\n  type NotType,\n  createSmartAccountClient,\n  default7702GasEstimator,\n  default7702UserOpSigner,\n} from \"@aa-sdk/core\";\nimport { type Chain, type Transport } from \"viem\";\n\nimport {\n  createModularAccountV2,\n  type CreateModularAccountV2Params,\n} from \"../account/modularAccountV2.js\";\n\nimport {\n  createAlchemySmartAccountClient,\n  isAlchemyTransport,\n  type AlchemySmartAccountClient,\n  type AlchemySmartAccountClientConfig,\n  type AlchemyTransport,\n} from \"@account-kit/infra\";\nimport type { LightAccount } from \"../../light-account/accounts/account.js\";\n\nimport type { ModularAccountV2 } from \"../account/common/modularAccountV2Base.js\";\n\nexport type ModularAccountV2Client<\n  TSigner extends SmartAccountSigner = SmartAccountSigner,\n  TChain extends Chain = Chain,\n  TTransport extends Transport | AlchemyTransport = Transport\n> = SmartAccountClient<TTransport, TChain, ModularAccountV2<TSigner>>;\n\nexport type CreateModularAccountV2ClientParams<\n  TTransport extends Transport = Transport,\n  TChain extends Chain = Chain,\n  TSigner extends SmartAccountSigner = SmartAccountSigner\n> = CreateModularAccountV2Params<TTransport, TSigner> &\n  Omit<\n    SmartAccountClientConfig<TTransport, TChain>,\n    \"transport\" | \"account\" | \"chain\"\n  >;\n\nexport type CreateModularAccountV2AlchemyClientParams<\n  TTransport extends Transport = Transport,\n  TChain extends Chain = Chain,\n  TSigner extends SmartAccountSigner = SmartAccountSigner\n> = Omit<\n  CreateModularAccountV2ClientParams<TTransport, TChain, TSigner>,\n  \"transport\"\n> &\n  Omit<\n    AlchemySmartAccountClientConfig<TChain, LightAccount<TSigner>>,\n    \"account\"\n  > & { paymasterAndData?: never; dummyPaymasterAndData?: never };\n\nexport function createModularAccountV2Client<\n  TChain extends Chain = Chain,\n  TSigner extends SmartAccountSigner = SmartAccountSigner\n>(\n  args: CreateModularAccountV2AlchemyClientParams<\n    AlchemyTransport,\n    TChain,\n    TSigner\n  >\n): Promise<ModularAccountV2Client<TSigner, TChain, AlchemyTransport>>;\n\nexport function createModularAccountV2Client<\n  TTransport extends Transport = Transport,\n  TChain extends Chain = Chain,\n  TSigner extends SmartAccountSigner = SmartAccountSigner\n>(\n  args: CreateModularAccountV2ClientParams<TTransport, TChain, TSigner> &\n    NotType<TTransport, AlchemyTransport>\n): Promise<ModularAccountV2Client<TSigner, TChain>>;\n\n/**\n * Creates a Modular Account V2 client using the provided configuration parameters.\n *\n * @example\n * ```ts twoslash\n * import { createModularAccountV2Client } 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 * const policyId = \"...\";\n *\n * const modularAccountV2Client = await createModularAccountV2Client({\n *  chain,\n *  signer,\n *  transport,\n *  policyId, // NOTE: you may only pass in a gas policy ID if you provide an Alchemy transport!\n * });\n * ```\n *\n * @param {CreateModularAccountV2ClientParams} config The configuration parameters required to create the Modular Account v2 account client\n * @returns {Promise<SmartAccountClient>} A promise that resolves to a `SmartAccountClient` instance\n */\nexport async function createModularAccountV2Client(\n  config:\n    | CreateModularAccountV2ClientParams\n    | CreateModularAccountV2AlchemyClientParams\n): Promise<SmartAccountClient | AlchemySmartAccountClient> {\n  const { transport, chain } = config;\n\n  const account = await createModularAccountV2(config);\n\n  const middlewareToAppend =\n    config.mode === \"7702\"\n      ? {\n          gasEstimator: default7702GasEstimator(config.gasEstimator),\n          signUserOperation: default7702UserOpSigner(config.signUserOperation),\n        }\n      : {};\n\n  if (isAlchemyTransport(transport, chain)) {\n    return createAlchemySmartAccountClient({\n      ...config,\n      transport,\n      chain,\n      account,\n      ...middlewareToAppend,\n    });\n  }\n\n  return createSmartAccountClient({\n    ...config,\n    account,\n    ...middlewareToAppend,\n  });\n}\n"]}

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

@@ -4,11 +4,9 @@ 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 { createSMAV2Account } from "./account/semiModularAccountV2.js";
 export { HookType } from "./actions/common/types.js";
 export { serializeValidationConfig, serializeHookConfig, serializeModuleEntity, } from "./actions/common/utils.js";
 export { installValidationActions } from "./actions/install-validation/installValidation.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/esm/src/ma-v2/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/ma-v2/index.ts"],"names":[],"mappings":"AAAA,gBAAgB;AAChB,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,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AAQvE,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AACrD,OAAO,EACL,yBAAyB,EACzB,mBAAmB,EACnB,qBAAqB,GACtB,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EAAE,wBAAwB,EAAE,MAAM,mDAAmD,CAAC;AAG7F,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","sourcesContent":["// ma v2 exports\nexport { accountFactoryAbi } from \"./abis/accountFactoryAbi.js\";\nexport { modularAccountAbi } from \"./abis/modularAccountAbi.js\";\nexport { semiModularAccountBytecodeAbi } from \"./abis/semiModularAccountBytecodeAbi.js\";\nexport { semiModularAccountStorageAbi } from \"./abis/semiModularAccountStorageAbi.js\";\n\nexport { nativeSMASigner } from \"./account/nativeSMASigner.js\";\nexport type * from \"./account/semiModularAccountV2.js\";\nexport { createSMAV2Account } from \"./account/semiModularAccountV2.js\";\n\nexport type {\n  ModuleEntity,\n  ValidationConfig,\n  HookConfig,\n  ValidationData,\n} from \"./actions/common/types.js\";\nexport { HookType } from \"./actions/common/types.js\";\nexport {\n  serializeValidationConfig,\n  serializeHookConfig,\n  serializeModuleEntity,\n} from \"./actions/common/utils.js\";\nexport type * from \"./actions/install-validation/installValidation.js\";\nexport { installValidationActions } from \"./actions/install-validation/installValidation.js\";\n\nexport type * from \"./client/client.js\";\nexport { createSMAV2AccountClient } from \"./client/client.js\";\n\nexport {\n  getDefaultAllowlistModuleAddress,\n  getDefaultNativeTokenLimitModuleAddress,\n  getDefaultPaymasterGuardModuleAddress,\n  getDefaultSingleSignerValidationModuleAddress,\n  getDefaultTimeRangeModuleAddress,\n  getDefaultWebauthnValidationModuleAddress,\n} from \"./modules/utils.js\";\nexport { allowlistModuleAbi } from \"./modules/allowlist-module/abis/allowlistModuleAbi.js\";\nexport { AllowlistModule } from \"./modules/allowlist-module/module.js\";\nexport { nativeTokenLimitModuleAbi } from \"./modules/native-token-limit-module/abis/nativeTokenLimitModuleAbi.js\";\nexport { NativeTokenLimitModule } from \"./modules/native-token-limit-module/module.js\";\nexport { paymasterGuardModuleAbi } from \"./modules/paymaster-guard-module/abis/paymasterGuardModuleAbi.js\";\nexport { PaymasterGuardModule } from \"./modules/paymaster-guard-module/module.js\";\nexport { singleSignerValidationModuleAbi } from \"./modules/single-signer-validation/abis/singleSignerValidationModuleAbi.js\";\nexport { SingleSignerValidationModule } from \"./modules/single-signer-validation/module.js\";\nexport { timeRangeModuleAbi } from \"./modules/time-range-module/abis/timeRangeModuleAbi.js\";\nexport { TimeRangeModule } from \"./modules/time-range-module/module.js\";\nexport { webauthnValidationModuleAbi } from \"./modules/webauthn-validation/abis/webauthnValidationAbi.js\";\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/ma-v2/index.ts"],"names":[],"mappings":"AAAA,gBAAgB;AAChB,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;AAQ/D,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AACrD,OAAO,EACL,yBAAyB,EACzB,mBAAmB,EACnB,qBAAqB,GACtB,MAAM,2BAA2B,CAAC;AAEnC,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","sourcesContent":["// ma v2 exports\nexport { accountFactoryAbi } from \"./abis/accountFactoryAbi.js\";\nexport { modularAccountAbi } from \"./abis/modularAccountAbi.js\";\nexport { semiModularAccountBytecodeAbi } from \"./abis/semiModularAccountBytecodeAbi.js\";\nexport { semiModularAccountStorageAbi } from \"./abis/semiModularAccountStorageAbi.js\";\n\nexport { nativeSMASigner } from \"./account/nativeSMASigner.js\";\n\nexport type {\n  ModuleEntity,\n  ValidationConfig,\n  HookConfig,\n  ValidationData,\n} from \"./actions/common/types.js\";\nexport { HookType } from \"./actions/common/types.js\";\nexport {\n  serializeValidationConfig,\n  serializeHookConfig,\n  serializeModuleEntity,\n} from \"./actions/common/utils.js\";\nexport type * from \"./actions/install-validation/installValidation.js\";\nexport { installValidationActions } from \"./actions/install-validation/installValidation.js\";\n\nexport {\n  getDefaultAllowlistModuleAddress,\n  getDefaultNativeTokenLimitModuleAddress,\n  getDefaultPaymasterGuardModuleAddress,\n  getDefaultSingleSignerValidationModuleAddress,\n  getDefaultTimeRangeModuleAddress,\n  getDefaultWebauthnValidationModuleAddress,\n} from \"./modules/utils.js\";\nexport { allowlistModuleAbi } from \"./modules/allowlist-module/abis/allowlistModuleAbi.js\";\nexport { AllowlistModule } from \"./modules/allowlist-module/module.js\";\nexport { nativeTokenLimitModuleAbi } from \"./modules/native-token-limit-module/abis/nativeTokenLimitModuleAbi.js\";\nexport { NativeTokenLimitModule } from \"./modules/native-token-limit-module/module.js\";\nexport { paymasterGuardModuleAbi } from \"./modules/paymaster-guard-module/abis/paymasterGuardModuleAbi.js\";\nexport { PaymasterGuardModule } from \"./modules/paymaster-guard-module/module.js\";\nexport { singleSignerValidationModuleAbi } from \"./modules/single-signer-validation/abis/singleSignerValidationModuleAbi.js\";\nexport { SingleSignerValidationModule } from \"./modules/single-signer-validation/module.js\";\nexport { timeRangeModuleAbi } from \"./modules/time-range-module/abis/timeRangeModuleAbi.js\";\nexport { TimeRangeModule } from \"./modules/time-range-module/module.js\";\nexport { webauthnValidationModuleAbi } from \"./modules/webauthn-validation/abis/webauthnValidationAbi.js\";\n"]}

package/dist/esm/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/esm/src/ma-v2/modules/single-signer-validation/signer.js

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

package/dist/esm/src/ma-v2/modules/single-signer-validation/signer.js.map

@@ -1 +1 @@
-{"version":3,"file":"signer.js","sourceRoot":"","sources":["../../../../../../src/ma-v2/modules/single-signer-validation/signer.ts"],"names":[],"mappings":"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","sourcesContent":["import type { SmartAccountSigner } from \"@aa-sdk/core\";\nimport {\n  hashMessage,\n  hashTypedData,\n  concatHex,\n  type Hex,\n  type SignableMessage,\n  type TypedData,\n  type TypedDataDefinition,\n  type Chain,\n  type Address,\n} from \"viem\";\nimport { getDefaultSingleSignerValidationModuleAddress } from \"../utils.js\";\n\nimport { packUOSignature, pack1271Signature } 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 \n * ```ts\n * import { singleSignerMessageSigner } from \"@account-kit/smart-contracts\";\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 = singleSignerMessageSigner(signer, chain, account.address, account.signerEntity.entityId);\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 * @param {number} entityId the entity id of the signing validation\n * @returns {object} an object with methods for signing operations and managing signatures\n */\nexport const singleSignerMessageSigner = (\n  signer: SmartAccountSigner,\n  chain: Chain,\n  accountAddress: Address,\n  entityId: number\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 = await hashMessage(message);\n\n      return pack1271Signature({\n        validationSignature: await signer.signTypedData({\n          domain: {\n            chainId: Number(chain.id),\n            verifyingContract:\n              getDefaultSingleSignerValidationModuleAddress(chain),\n            salt: concatHex([`0x${\"00\".repeat(12)}`, accountAddress]),\n          },\n          types: {\n            ReplaySafeHash: [{ name: \"hash\", type: \"bytes32\" }],\n          },\n          message: {\n            hash,\n          },\n          primaryType: \"ReplaySafeHash\",\n        }),\n        entityId,\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      const validationSignature = await signer.signTypedData({\n        domain: {\n          chainId: Number(chain.id),\n          verifyingContract:\n            getDefaultSingleSignerValidationModuleAddress(chain),\n          salt: concatHex([`0x${\"00\".repeat(12)}`, accountAddress]),\n        },\n        types: {\n          ReplaySafeHash: [{ name: \"hash\", type: \"bytes32\" }],\n        },\n        message: {\n          hash: await hashTypedData(typedDataDefinition),\n        },\n        primaryType: \"ReplaySafeHash\",\n      });\n\n      return isDeferredAction\n        ? validationSignature\n        : pack1271Signature({\n            validationSignature,\n            entityId,\n          });\n    },\n  };\n};\n"]}
+{"version":3,"file":"signer.js","sourceRoot":"","sources":["../../../../../../src/ma-v2/modules/single-signer-validation/signer.ts"],"names":[],"mappings":"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","sourcesContent":["import type { SmartAccountSigner } from \"@aa-sdk/core\";\nimport {\n  hashMessage,\n  hashTypedData,\n  concatHex,\n  type Hex,\n  type SignableMessage,\n  type TypedData,\n  type TypedDataDefinition,\n  type Chain,\n  type Address,\n} from \"viem\";\nimport { getDefaultSingleSignerValidationModuleAddress } from \"../utils.js\";\n\nimport { packUOSignature, pack1271Signature } 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 \n * ```ts\n * import { singleSignerMessageSigner } from \"@account-kit/smart-contracts\";\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 = singleSignerMessageSigner(signer, chain, account.address, account.signerEntity.entityId);\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 * @param {number} entityId the entity id of the signing validation\n * @returns {object} an object with methods for signing operations and managing signatures\n */\nexport const singleSignerMessageSigner = (\n  signer: SmartAccountSigner,\n  chain: Chain,\n  accountAddress: Address,\n  entityId: number\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 = await hashMessage(message);\n\n      return pack1271Signature({\n        validationSignature: await signer.signTypedData({\n          domain: {\n            chainId: Number(chain.id),\n            verifyingContract:\n              getDefaultSingleSignerValidationModuleAddress(chain),\n            salt: concatHex([`0x${\"00\".repeat(12)}`, accountAddress]),\n          },\n          types: {\n            ReplaySafeHash: [{ name: \"hash\", type: \"bytes32\" }],\n          },\n          message: {\n            hash,\n          },\n          primaryType: \"ReplaySafeHash\",\n        }),\n        entityId,\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      const validationSignature = await signer.signTypedData({\n        domain: {\n          chainId: Number(chain.id),\n          verifyingContract:\n            getDefaultSingleSignerValidationModuleAddress(chain),\n          salt: concatHex([`0x${\"00\".repeat(12)}`, accountAddress]),\n        },\n        types: {\n          ReplaySafeHash: [{ name: \"hash\", type: \"bytes32\" }],\n        },\n        message: {\n          hash: await hashTypedData(typedDataDefinition),\n        },\n        primaryType: \"ReplaySafeHash\",\n      });\n\n      return isDeferredAction\n        ? validationSignature\n        : pack1271Signature({\n            validationSignature,\n            entityId,\n          });\n    },\n  };\n};\n"]}

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

@@ -51,4 +51,9 @@ 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";
 //# sourceMappingURL=index.d.ts.map

package/dist/types/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAIA,mBAAmB,qCAAqC,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AACzE,OAAO,EAAE,iBAAiB,IAAI,6BAA6B,EAAE,MAAM,8CAA8C,CAAC;AAClH,OAAO,EACL,+BAA+B,EAC/B,KAAK,+BAA+B,GACrC,MAAM,0CAA0C,CAAC;AAClD,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,EACL,yCAAyC,EACzC,KAAK,yCAAyC,GAC/C,MAAM,oDAAoD,CAAC;AAC5D,mBAAmB,4CAA4C,CAAC;AAChE,OAAO,EAAE,yBAAyB,EAAE,MAAM,4CAA4C,CAAC;AACvF,mBAAmB,0BAA0B,CAAC;AAE9C,OAAO,EACL,sBAAsB,EACtB,oCAAoC,EACpC,gCAAgC,EAChC,0BAA0B,EAC1B,oCAAoC,EACpC,8CAA8C,EAC9C,gCAAgC,GACjC,MAAM,0BAA0B,CAAC;AAGlC,mBAAmB,wCAAwC,CAAC;AAC5D,OAAO,EAAE,4BAA4B,EAAE,MAAM,wCAAwC,CAAC;AACtF,OAAO,EAAE,YAAY,IAAI,kCAAkC,EAAE,MAAM,yCAAyC,CAAC;AAC7G,OAAO,EAAE,kCAAkC,EAAE,MAAM,mDAAmD,CAAC;AACvG,mBAAmB,sDAAsD,CAAC;AAC1E,OAAO,EAAE,mCAAmC,EAAE,MAAM,sDAAsD,CAAC;AAG3G,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AACxE,OAAO,EAAE,kCAAkC,EAAE,MAAM,gDAAgD,CAAC;AACpG,OAAO,EAAE,gCAAgC,EAAE,MAAM,8CAA8C,CAAC;AAChG,OAAO,EAAE,4BAA4B,EAAE,MAAM,0CAA0C,CAAC;AACxF,mBAAmB,mCAAmC,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AACxE,mBAAmB,+BAA+B,CAAC;AACnD,mBAAmB,qCAAqC,CAAC;AACzD,OAAO,EAAE,8BAA8B,EAAE,MAAM,qCAAqC,CAAC;AACrF,mBAAmB,mCAAmC,CAAC;AACvD,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AACjF,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AACtE,OAAO,EACL,iCAAiC,EACjC,KAAK,iCAAiC,GACvC,MAAM,gCAAgC,CAAC;AACxC,OAAO,EACL,oCAAoC,EACpC,kCAAkC,GACnC,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,kCAAkC,EAClC,KAAK,kCAAkC,GACxC,MAAM,wCAAwC,CAAC;AAChD,OAAO,EACL,+BAA+B,EAC/B,4BAA4B,EAC5B,4BAA4B,EAC5B,6BAA6B,GAC9B,MAAM,kBAAkB,CAAC;AAC1B,mBAAmB,oCAAoC,CAAC;AACxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAC1E,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AACvE,OAAO,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AAClF,mBAAmB,qCAAqC,CAAC;AACzD,OAAO,EACL,gBAAgB,EAChB,mBAAmB,EACnB,oCAAoC,GACrC,MAAM,sCAAsC,CAAC;AAC9C,mBAAmB,kCAAkC,CAAC;AACtD,OAAO,EACL,cAAc,EACd,iBAAiB,EACjB,kCAAkC,EAClC,qBAAqB,EACrB,2BAA2B,GAC5B,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EACL,iBAAiB,EACjB,gBAAgB,EAChB,aAAa,EACb,wBAAwB,GACzB,MAAM,wCAAwC,CAAC;AAChD,OAAO,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AAClF,mBAAmB,qCAAqC,CAAC;AACzD,mBAAmB,2CAA2C,CAAC;AAC/D,OAAO,EACL,wBAAwB,EACxB,4BAA4B,GAC7B,MAAM,2CAA2C,CAAC;AACnD,OAAO,EACL,gBAAgB,EAChB,mBAAmB,EACnB,oCAAoC,GACrC,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AACxE,OAAO,EAAE,8BAA8B,EAAE,MAAM,qCAAqC,CAAC;AACrF,mBAAmB,yBAAyB,CAAC;AAC7C,OAAO,EACL,gDAAgD,EAChD,8CAA8C,EAC9C,uBAAuB,EACvB,oBAAoB,GACrB,MAAM,iBAAiB,CAAC;AAGzB,mBAAmB,qCAAqC,CAAC;AACzD,mBAAmB,gDAAgD,CAAC;AACpE,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAC7E,mBAAmB,0BAA0B,CAAC;AAC9C,OAAO,EAAE,4BAA4B,EAAE,MAAM,0BAA0B,CAAC"}

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"}