@account-kit/smart-contracts 4.12.0 → 4.13.0

package/src/ma-v2/actions/install-validation/installValidation.ts

@@ -24,8 +24,8 @@ import {
   serializeModuleEntity,
 } from "../common/utils.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";
 import { DEFAULT_OWNER_ENTITY_ID } from "../../utils.js";
 
 export type InstallValidationParams<
@@ -38,9 +38,9 @@ export type InstallValidationParams<
     hookConfig: HookConfig;
     initData: Hex;
   }[];
-  account?: MAV2Account<TSigner> | undefined;
+  account?: ModularAccountV2<TSigner> | undefined;
 } & UserOperationOverridesParameter<
-  GetEntryPointFromAccount<MAV2Account<TSigner>>
+  GetEntryPointFromAccount<ModularAccountV2<TSigner>>
 >;
 
 export type UninstallValidationParams<
@@ -50,9 +50,9 @@ export type UninstallValidationParams<
   entityId: number;
   uninstallData: Hex;
   hookUninstallDatas: Hex[];
-  account?: MAV2Account<TSigner> | undefined;
+  account?: ModularAccountV2<TSigner> | undefined;
 } & UserOperationOverridesParameter<
-  GetEntryPointFromAccount<MAV2Account<TSigner>>
+  GetEntryPointFromAccount<ModularAccountV2<TSigner>>
 >;
 
 export type InstallValidationActions<
@@ -61,9 +61,16 @@ export type InstallValidationActions<
   installValidation: (
     args: InstallValidationParams<TSigner>
   ) => Promise<SendUserOperationResult>;
+  encodeInstallValidation: (
+    // TODO: omit the user op sending related parameters from this type
+    args: InstallValidationParams<TSigner>
+  ) => Promise<Hex>;
   uninstallValidation: (
     args: UninstallValidationParams<TSigner>
   ) => Promise<SendUserOperationResult>;
+  encodeUninstallValidation: (
+    args: UninstallValidationParams<TSigner>
+  ) => Promise<Hex>;
 };
 
 /**
@@ -71,10 +78,10 @@ export type InstallValidationActions<
  *
  * @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;
  *
@@ -113,16 +120,15 @@ export type InstallValidationActions<
 export const installValidationActions: <
   TSigner extends SmartAccountSigner = SmartAccountSigner
 >(
-  client: SMAV2AccountClient<TSigner>
-) => InstallValidationActions<TSigner> = (client) => ({
-  installValidation: async ({
+  client: ModularAccountV2Client<TSigner>
+) => InstallValidationActions<TSigner> = (client) => {
+  const encodeInstallValidation = async ({
     validationConfig,
     selectors,
     installData,
     hooks,
     account = client.account,
-    overrides,
-  }) => {
+  }: InstallValidationParams) => {
     if (!account) {
       throw new AccountNotFoundError();
     }
@@ -143,9 +149,7 @@ export const installValidationActions: <
       throw new EntityIdOverrideError();
     }
 
-    const { encodeCallData } = account;
-
-    const callData = await encodeCallData(
+    return account.encodeCallData(
       encodeFunctionData({
         abi: semiModularAccountBytecodeAbi,
         functionName: "installValidation",
@@ -159,22 +163,15 @@ export const installValidationActions: <
         ],
       })
     );
+  };
 
-    return client.sendUserOperation({
-      uo: callData,
-      account,
-      overrides,
-    });
-  },
-
-  uninstallValidation: async ({
+  const encodeUninstallValidation = async ({
     moduleAddress,
     entityId,
     uninstallData,
     hookUninstallDatas,
     account = client.account,
-    overrides,
-  }) => {
+  }: UninstallValidationParams) => {
     if (!account) {
       throw new AccountNotFoundError();
     }
@@ -187,9 +184,7 @@ export const installValidationActions: <
       );
     }
 
-    const { encodeCallData } = account;
-
-    const callData = await encodeCallData(
+    return account.encodeCallData(
       encodeFunctionData({
         abi: semiModularAccountBytecodeAbi,
         functionName: "uninstallValidation",
@@ -203,11 +198,55 @@ export const installValidationActions: <
         ],
       })
     );
-
-    return client.sendUserOperation({
-      uo: callData,
-      account,
+  };
+
+  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,
+      });
+    },
+  };
+};

package/src/ma-v2/client/client.ts

@@ -4,42 +4,49 @@ import {
   type SmartAccountClientConfig,
   type NotType,
   createSmartAccountClient,
+  default7702GasEstimator,
+  default7702UserOpSigner,
 } from "@aa-sdk/core";
 import { type Chain, type Transport } from "viem";
 
 import {
-  createSMAV2Account,
-  type CreateSMAV2AccountParams,
-  type MAV2Account,
-} from "../account/semiModularAccountV2.js";
+  createModularAccountV2,
+  type CreateModularAccountV2Params,
+} from "../account/modularAccountV2.js";
+
 import {
   createAlchemySmartAccountClient,
   isAlchemyTransport,
+  type AlchemySmartAccountClient,
   type AlchemySmartAccountClientConfig,
   type AlchemyTransport,
 } from "@account-kit/infra";
 import type { LightAccount } from "../../light-account/accounts/account.js";
-export type SMAV2AccountClient<
+
+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, MAV2Account<TSigner>>;
+> = SmartAccountClient<TTransport, TChain, ModularAccountV2<TSigner>>;
 
-export type CreateSMAV2AccountClientParams<
+export type CreateModularAccountV2ClientParams<
   TTransport extends Transport = Transport,
   TChain extends Chain = Chain,
   TSigner extends SmartAccountSigner = SmartAccountSigner
-> = CreateSMAV2AccountParams<TTransport, TSigner> &
+> = CreateModularAccountV2Params<TTransport, TSigner> &
   Omit<
     SmartAccountClientConfig<TTransport, TChain>,
     "transport" | "account" | "chain"
   >;
-export type CreateSMAV2AlchemyAccountClientParams<
+
+export type CreateModularAccountV2AlchemyClientParams<
   TTransport extends Transport = Transport,
   TChain extends Chain = Chain,
   TSigner extends SmartAccountSigner = SmartAccountSigner
 > = Omit<
-  CreateSMAV2AccountClientParams<TTransport, TChain, TSigner>,
+  CreateModularAccountV2ClientParams<TTransport, TChain, TSigner>,
   "transport"
 > &
   Omit<
@@ -47,31 +54,34 @@ export type CreateSMAV2AlchemyAccountClientParams<
     "account"
   > & { paymasterAndData?: never; dummyPaymasterAndData?: never };
 
-export function createSMAV2AccountClient<
+export function createModularAccountV2Client<
   TChain extends Chain = Chain,
   TSigner extends SmartAccountSigner = SmartAccountSigner
 >(
-  args: CreateSMAV2AlchemyAccountClientParams<AlchemyTransport, TChain, TSigner>
-): Promise<SMAV2AccountClient<TSigner, TChain, AlchemyTransport>>;
+  args: CreateModularAccountV2AlchemyClientParams<
+    AlchemyTransport,
+    TChain,
+    TSigner
+  >
+): Promise<ModularAccountV2Client<TSigner, TChain, AlchemyTransport>>;
 
-export function createSMAV2AccountClient<
+export function createModularAccountV2Client<
   TTransport extends Transport = Transport,
   TChain extends Chain = Chain,
   TSigner extends SmartAccountSigner = SmartAccountSigner
 >(
-  args: CreateSMAV2AccountClientParams<TTransport, TChain, TSigner> &
+  args: CreateModularAccountV2ClientParams<TTransport, TChain, TSigner> &
     NotType<TTransport, AlchemyTransport>
-): Promise<SMAV2AccountClient<TSigner, TChain>>;
+): Promise<ModularAccountV2Client<TSigner, TChain>>;
 
 /**
- * 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 = "...";
@@ -80,11 +90,11 @@ export function createSMAV2AccountClient<
  *
  * 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,
@@ -92,29 +102,39 @@ export function createSMAV2AccountClient<
  * });
  * ```
  *
- * @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: CreateSMAV2AccountClientParams
-): Promise<SmartAccountClient> {
+export async function createModularAccountV2Client(
+  config:
+    | CreateModularAccountV2ClientParams
+    | CreateModularAccountV2AlchemyClientParams
+): Promise<SmartAccountClient | AlchemySmartAccountClient> {
   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,
   });
 }

package/src/ma-v2/index.ts

@@ -5,8 +5,6 @@ export { semiModularAccountBytecodeAbi } from "./abis/semiModularAccountBytecode
 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,
@@ -23,9 +21,6 @@ export {
 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,

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

@@ -24,7 +24,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/account/semiModularAccountV2.d.ts

@@ -1,41 +0,0 @@
-import type { EntryPointDef, SmartAccountSigner, SmartContractAccountWithSigner, ToSmartContractAccountParams } from "@aa-sdk/core";
-import { type Address, type Chain, type Hex, type Transport } from "viem";
-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 MAV2Account<TSigner extends SmartAccountSigner = SmartAccountSigner> = SmartContractAccountWithSigner<"MAV2Account", TSigner, "0.7.0"> & {
-    signerEntity: SignerEntity;
-    getExecutionData: (selector: Hex) => Promise<ExecutionDataView>;
-    getValidationData: (args: ValidationDataParams) => Promise<ValidationDataView>;
-    encodeCallData: (callData: Hex) => Promise<Hex>;
-};
-export type CreateSMAV2AccountParams<TTransport extends Transport = Transport, TSigner extends SmartAccountSigner = SmartAccountSigner> = Pick<ToSmartContractAccountParams<"MAV2Account", TTransport, Chain, "0.7.0">, "transport" | "chain" | "accountAddress"> & {
-    signer: TSigner;
-    salt?: bigint;
-    factoryAddress?: Address;
-    initCode?: Hex;
-    initialOwner?: Address;
-    entryPoint?: EntryPointDef<"0.7.0", Chain>;
-    signerEntity?: SignerEntity;
-};
-export declare function createSMAV2Account<TTransport extends Transport = Transport, TSigner extends SmartAccountSigner = SmartAccountSigner>(config: CreateSMAV2AccountParams<TTransport, TSigner>): Promise<MAV2Account<TSigner>>;

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

@@ -1 +0,0 @@
-{"version":3,"file":"semiModularAccountV2.js","sourceRoot":"","sources":["../../../../../src/ma-v2/account/semiModularAccountV2.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,mBAAmB,EACnB,aAAa,EACb,sBAAsB,EACtB,oBAAoB,EACpB,oBAAoB,EACpB,iBAAiB,GAClB,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,SAAS,EACT,kBAAkB,EAClB,WAAW,EACX,SAAS,EACT,UAAU,EACV,WAAW,GAKZ,MAAM,MAAM,CAAC;AACd,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EACL,4BAA4B,EAC5B,uBAAuB,GACxB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,yBAAyB,EAAE,MAAM,+CAA+C,CAAC;AAC1F,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAEnE,MAAM,qBAAqB,GAAQ,YAAY,CAAC;AAiEhD;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,MAAgC;IAEhC,MAAM,EACJ,SAAS,EACT,KAAK,EACL,MAAM,EACN,IAAI,GAAG,EAAE,EACT,cAAc,GAAG,4BAA4B,CAAC,KAAK,CAAC,EACpD,QAAQ,EACR,YAAY,EACZ,cAAc,EACd,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,GACP,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,kBAAkB,GAAG,KAAK,IAAI,EAAE;QACpC,IAAI,QAAQ,EAAE,CAAC;YACb,OAAO,QAAQ,CAAC;QAClB,CAAC;QAED,gEAAgE;QAChE,MAAM,YAAY,GAAG,YAAY,IAAI,CAAC,MAAM,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC;QAEjE,OAAO,SAAS,CAAC;YACf,cAAc;YACd,kBAAkB,CAAC;gBACjB,GAAG,EAAE,iBAAiB;gBACtB,YAAY,EAAE,0BAA0B;gBACxC,IAAI,EAAE,CAAC,YAAY,EAAE,IAAI,CAAC;aAC3B,CAAC;SACH,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,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,eAAe,GAAG,MAAM,iBAAiB,CAAC;QAC9C,MAAM;QACN,UAAU;QACV,cAAc;QACd,kBAAkB;KACnB,CAAC,CAAC;IAEH,MAAM,WAAW,GAAG,MAAM,sBAAsB,CAAC;QAC/C,SAAS;QACT,KAAK;QACL,UAAU;QACV,cAAc,EAAE,eAAe;QAC/B,MAAM,EAAE,aAAa;QACrB,aAAa;QACb,kBAAkB;QAClB,kBAAkB;QAClB,GAAG,CAAC,QAAQ,KAAK,uBAAuB;YACtC,CAAC,CAAC,eAAe,CAAC,MAAM,EAAE,KAAK,EAAE,eAAe,CAAC;YACjD,CAAC,CAAC,yBAAyB,CAAC,MAAM,EAAE,KAAK,EAAE,eAAe,EAAE,QAAQ,CAAC,CAAC;KACzE,CAAC,CAAC;IAEH,iCAAiC;IACjC,MAAM,eAAe,GAAG,KAAK,EAAE,WAAmB,EAAE,EAAmB,EAAE;QACvE,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,MAAM,CAAC,QAAQ,IAAI,CAAC,CAAC;YACrB,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAEjC,OAAO,kBAAkB,CAAC,IAAI,CAAC,QAAQ,CAAC;YACtC,eAAe;YACf,YAAY;SACb,CAAoB,CAAC;IACxB,CAAC,CAAC;IAEF,MAAM,eAAe,GAAG,WAAW,CAAC;QAClC,OAAO,EAAE,eAAe;QACxB,GAAG,EAAE,iBAAiB;QACtB,MAAM;KACP,CAAC,CAAC;IAEH,MAAM,gBAAgB,GAAG,KAAK,EAAE,QAAa,EAAE,EAAE;QAC/C,IAAI,CAAC,CAAC,MAAM,WAAW,CAAC,iBAAiB,EAAE,CAAC,EAAE,CAAC;YAC7C,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,WAAW,CAAC,iBAAiB,EAAE,CAAC,EAAE,CAAC;YAC7C,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,OAAO;QACL,GAAG,WAAW;QACd,eAAe;QACf,SAAS,EAAE,GAAG,EAAE,CAAC,MAAM;QACvB,YAAY;QACZ,gBAAgB;QAChB,iBAAiB;QACjB,cAAc;KACf,CAAC;AACJ,CAAC","sourcesContent":["import type {\n  EntryPointDef,\n  SmartAccountSigner,\n  AccountOp,\n  SmartContractAccountWithSigner,\n  ToSmartContractAccountParams,\n} from \"@aa-sdk/core\";\nimport {\n  createBundlerClient,\n  getEntryPoint,\n  toSmartContractAccount,\n  InvalidEntityIdError,\n  InvalidNonceKeyError,\n  getAccountAddress,\n} from \"@aa-sdk/core\";\nimport {\n  concatHex,\n  encodeFunctionData,\n  getContract,\n  maxUint32,\n  maxUint152,\n  zeroAddress,\n  type Address,\n  type Chain,\n  type Hex,\n  type Transport,\n} from \"viem\";\nimport { accountFactoryAbi } from \"../abis/accountFactoryAbi.js\";\nimport {\n  getDefaultMAV2FactoryAddress,\n  DEFAULT_OWNER_ENTITY_ID,\n} from \"../utils.js\";\nimport { singleSignerMessageSigner } from \"../modules/single-signer-validation/signer.js\";\nimport { nativeSMASigner } from \"./nativeSMASigner.js\";\nimport { modularAccountAbi } from \"../abis/modularAccountAbi.js\";\nimport { serializeModuleEntity } from \"../actions/common/utils.js\";\n\nconst 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 MAV2Account<\n  TSigner extends SmartAccountSigner = SmartAccountSigner\n> = SmartContractAccountWithSigner<\"MAV2Account\", 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 CreateSMAV2AccountParams<\n  TTransport extends Transport = Transport,\n  TSigner extends SmartAccountSigner = SmartAccountSigner\n> = Pick<\n  ToSmartContractAccountParams<\"MAV2Account\", TTransport, Chain, \"0.7.0\">,\n  \"transport\" | \"chain\" | \"accountAddress\"\n> & {\n  signer: TSigner;\n  salt?: bigint;\n  factoryAddress?: Address;\n  initCode?: Hex;\n  initialOwner?: Address;\n  entryPoint?: EntryPointDef<\"0.7.0\", Chain>;\n  signerEntity?: SignerEntity;\n};\n\nexport async function createSMAV2Account<\n  TTransport extends Transport = Transport,\n  TSigner extends SmartAccountSigner = SmartAccountSigner\n>(\n  config: CreateSMAV2AccountParams<TTransport, TSigner>\n): Promise<MAV2Account<TSigner>>;\n\n/**\n * Creates an SMAV2 account using defined parameters including chain, signer, salt, factory address, and more.\n * Handles account initialization code, nonce generation, transaction encoding, and more to construct a modular account with optional validation hooks.\n *\n * @param {CreateSMAV2AccountParams} config Configuration parameters for creating an SMAV2 account. Includes chain details, signer, salt, factory address, and more.\n * @returns {Promise<MAV2Account>} A promise that resolves to an `MAV2Account` providing methods for nonce retrieval, transaction execution, and more.\n */\nexport async function createSMAV2Account(\n  config: CreateSMAV2AccountParams\n): Promise<MAV2Account> {\n  const {\n    transport,\n    chain,\n    signer,\n    salt = 0n,\n    factoryAddress = getDefaultMAV2FactoryAddress(chain),\n    initCode,\n    initialOwner,\n    accountAddress,\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  } = 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 getAccountInitCode = async () => {\n    if (initCode) {\n      return initCode;\n    }\n\n    // If an initial owner is not provided, use the signer's address\n    const ownerAddress = initialOwner ?? (await signer.getAddress());\n\n    return concatHex([\n      factoryAddress,\n      encodeFunctionData({\n        abi: accountFactoryAbi,\n        functionName: \"createSemiModularAccount\",\n        args: [ownerAddress, salt],\n      }),\n    ]);\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 _accountAddress = await getAccountAddress({\n    client,\n    entryPoint,\n    accountAddress,\n    getAccountInitCode,\n  });\n\n  const baseAccount = await toSmartContractAccount({\n    transport,\n    chain,\n    entryPoint,\n    accountAddress: _accountAddress,\n    source: `MAV2Account`,\n    encodeExecute,\n    encodeBatchExecute,\n    getAccountInitCode,\n    ...(entityId === DEFAULT_OWNER_ENTITY_ID\n      ? nativeSMASigner(signer, chain, _accountAddress)\n      : singleSignerMessageSigner(signer, chain, _accountAddress, entityId)),\n  });\n\n  // TODO: add deferred action flag\n  const getAccountNonce = 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 << 8) +\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 baseAccount.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 baseAccount.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  return {\n    ...baseAccount,\n    getAccountNonce,\n    getSigner: () => signer,\n    signerEntity,\n    getExecutionData,\n    getValidationData,\n    encodeCallData,\n  };\n}\n"]}

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

@@ -1,42 +0,0 @@
-import type { EntryPointDef, SmartAccountSigner, SmartContractAccountWithSigner, ToSmartContractAccountParams } from "@aa-sdk/core";
-import { type Address, type Chain, type Hex, type Transport } from "viem";
-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 MAV2Account<TSigner extends SmartAccountSigner = SmartAccountSigner> = SmartContractAccountWithSigner<"MAV2Account", TSigner, "0.7.0"> & {
-    signerEntity: SignerEntity;
-    getExecutionData: (selector: Hex) => Promise<ExecutionDataView>;
-    getValidationData: (args: ValidationDataParams) => Promise<ValidationDataView>;
-    encodeCallData: (callData: Hex) => Promise<Hex>;
-};
-export type CreateSMAV2AccountParams<TTransport extends Transport = Transport, TSigner extends SmartAccountSigner = SmartAccountSigner> = Pick<ToSmartContractAccountParams<"MAV2Account", TTransport, Chain, "0.7.0">, "transport" | "chain" | "accountAddress"> & {
-    signer: TSigner;
-    salt?: bigint;
-    factoryAddress?: Address;
-    initCode?: Hex;
-    initialOwner?: Address;
-    entryPoint?: EntryPointDef<"0.7.0", Chain>;
-    signerEntity?: SignerEntity;
-};
-export declare function createSMAV2Account<TTransport extends Transport = Transport, TSigner extends SmartAccountSigner = SmartAccountSigner>(config: CreateSMAV2AccountParams<TTransport, TSigner>): Promise<MAV2Account<TSigner>>;
-//# sourceMappingURL=semiModularAccountV2.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"semiModularAccountV2.d.ts","sourceRoot":"","sources":["../../../../../src/ma-v2/account/semiModularAccountV2.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EACb,kBAAkB,EAElB,8BAA8B,EAC9B,4BAA4B,EAC7B,MAAM,cAAc,CAAC;AAStB,OAAO,EAOL,KAAK,OAAO,EACZ,KAAK,KAAK,EACV,KAAK,GAAG,EACR,KAAK,SAAS,EACf,MAAM,MAAM,CAAC;AAad,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,WAAW,CACrB,OAAO,SAAS,kBAAkB,GAAG,kBAAkB,IACrD,8BAA8B,CAAC,aAAa,EAAE,OAAO,EAAE,OAAO,CAAC,GAAG;IACpE,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,wBAAwB,CAClC,UAAU,SAAS,SAAS,GAAG,SAAS,EACxC,OAAO,SAAS,kBAAkB,GAAG,kBAAkB,IACrD,IAAI,CACN,4BAA4B,CAAC,aAAa,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,CAAC,EACvE,WAAW,GAAG,OAAO,GAAG,gBAAgB,CACzC,GAAG;IACF,MAAM,EAAE,OAAO,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,UAAU,CAAC,EAAE,aAAa,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAC3C,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B,CAAC;AAEF,wBAAsB,kBAAkB,CACtC,UAAU,SAAS,SAAS,GAAG,SAAS,EACxC,OAAO,SAAS,kBAAkB,GAAG,kBAAkB,EAEvD,MAAM,EAAE,wBAAwB,CAAC,UAAU,EAAE,OAAO,CAAC,GACpD,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC"}