@alchemy/smart-accounts 0.0.0-alpha.9 → 5.0.0-beta.2

package/dist/esm/light-account/registry.js

@@ -1,4 +1,4 @@
-import { lightAccountStaticImplV1_0_1, lightAccountStaticImplV1_0_2, lightAccountStaticImplV1_1_0, lightAccountStaticImplV2_0_0, multiOwnerLightAccountStaticImplV2_0_0, } from "./lightAccountStaticImpl.js";
+import { lightAccountStaticImplV1_0_1, lightAccountStaticImplV1_0_2, lightAccountStaticImplV1_1_0, lightAccountStaticImplV2_0_0, lightAccountStaticImplV2_1_0, lightAccountStaticImplV2_2_0, multiOwnerLightAccountStaticImplV2_0_0, } from "./lightAccountStaticImpl.js";
 /**
  * Account version registry interface that defines the light account versions
  * and the version definition for each light account type
@@ -10,9 +10,41 @@ export const AccountVersionRegistry = {
         "v1.0.2": lightAccountStaticImplV1_0_2,
         "v1.1.0": lightAccountStaticImplV1_1_0,
         "v2.0.0": lightAccountStaticImplV2_0_0,
+        "v2.1.0": lightAccountStaticImplV2_1_0,
+        "v2.2.0": lightAccountStaticImplV2_2_0,
     },
     MultiOwnerLightAccount: {
         "v2.0.0": multiOwnerLightAccountStaticImplV2_0_0,
     },
 };
+/**
+ * Light Account v1 versions
+ */
+export const LightAccountV1Versions = [
+    "v1.0.1",
+    "v1.0.2",
+    "v1.1.0",
+];
+/**
+ * Light Account v2 versions
+ */
+export const LightAccountV2Versions = [
+    "v2.0.0",
+    "v2.1.0",
+    "v2.2.0",
+];
+/**
+ * Type guard to check if a version is a Light Account v1 version
+ *
+ * @param {LightAccountVersion<"LightAccount">} version - The version to check.
+ * @returns {boolean} True if the version is a v1 version.
+ */
+export const isLightAccountVersion1 = (version) => LightAccountV1Versions.includes(version);
+/**
+ * Type guard to check if a version is a Light Account v2 version
+ *
+ * @param {LightAccountVersion<"LightAccount">} version - The version to check.
+ * @returns {boolean} True if the version is a v2 version.
+ */
+export const isLightAccountVersion2 = (version) => LightAccountV2Versions.includes(version);
 //# sourceMappingURL=registry.js.map

package/dist/esm/light-account/registry.js.map

@@ -1 +1 @@
-{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../../src/light-account/registry.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,4BAA4B,EAC5B,4BAA4B,EAC5B,4BAA4B,EAC5B,4BAA4B,EAC5B,sCAAsC,GACvC,MAAM,6BAA6B,CAAC;AAGrC;;;;GAIG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG;IACpC,YAAY,EAAE;QACZ,QAAQ,EAAE,4BAA4B;QACtC,QAAQ,EAAE,4BAA4B;QACtC,QAAQ,EAAE,4BAA4B;QACtC,QAAQ,EAAE,4BAA4B;KACvC;IACD,sBAAsB,EAAE;QACtB,QAAQ,EAAE,sCAAsC;KACjD;CACyE,CAAC","sourcesContent":["import type { Abi, Address } from \"viem\";\nimport type { LightAccountBase } from \"./accounts/base.js\";\nimport {\n  lightAccountStaticImplV1_0_1,\n  lightAccountStaticImplV1_0_2,\n  lightAccountStaticImplV1_1_0,\n  lightAccountStaticImplV2_0_0,\n  multiOwnerLightAccountStaticImplV2_0_0,\n} from \"./lightAccountStaticImpl.js\";\nimport type { StaticSmartAccountImplementation } from \"../types.js\";\n\n/**\n * Account version registry interface that defines the light account versions\n * and the version definition for each light account type\n *\n */\nexport const AccountVersionRegistry = {\n  LightAccount: {\n    \"v1.0.1\": lightAccountStaticImplV1_0_1,\n    \"v1.0.2\": lightAccountStaticImplV1_0_2,\n    \"v1.1.0\": lightAccountStaticImplV1_1_0,\n    \"v2.0.0\": lightAccountStaticImplV2_0_0,\n  },\n  MultiOwnerLightAccount: {\n    \"v2.0.0\": multiOwnerLightAccountStaticImplV2_0_0,\n  },\n} satisfies Record<string, Record<string, StaticSmartAccountImplementation>>;\n\nexport type LightAccountType = Extract<\n  keyof typeof AccountVersionRegistry,\n  \"LightAccount\" | \"MultiOwnerLightAccount\"\n>;\n\nexport type LightAccountVersion<TAccountType extends LightAccountType> =\n  keyof (typeof AccountVersionRegistry)[TAccountType];\n\nexport type GetLightAccountType<TAccount extends LightAccountBase> =\n  TAccount[\"smartAccountType\"] extends LightAccountType\n    ? TAccount[\"smartAccountType\"]\n    : never;\n\nexport type LightAccountAbi<\n  TAccountType extends LightAccountType,\n  TAccountVersion extends LightAccountVersion<TAccountType>,\n> = TAccountVersion extends keyof (typeof AccountVersionRegistry)[TAccountType]\n  ? (typeof AccountVersionRegistry)[TAccountType][TAccountVersion] extends StaticSmartAccountImplementation\n    ? (typeof AccountVersionRegistry)[TAccountType][TAccountVersion][\"accountAbi\"]\n    : never\n  : never;\n\n/**\n * Infers the EntryPoint details as a type, given the account type and version.\n */\nexport type EntryPointFromAccountRegistry<\n  TLightAccountType extends LightAccountType,\n  TLightAccountVersion extends\n    LightAccountVersion<TLightAccountType> = LightAccountVersion<TLightAccountType>,\n> =\n  (typeof AccountVersionRegistry)[TLightAccountType][TLightAccountVersion] extends StaticSmartAccountImplementation<\n    // eslint-disable-next-line @typescript-eslint/no-unused-vars\n    infer _7702,\n    infer entryPointVersion,\n    // eslint-disable-next-line @typescript-eslint/no-unused-vars\n    infer _factoryArgs,\n    infer entryPointAbi extends Abi\n  >\n    ? (typeof AccountVersionRegistry)[TLightAccountType][TLightAccountVersion][\"entryPoint\"] extends {\n        readonly version: entryPointVersion;\n        readonly address: Address;\n        readonly abi: entryPointAbi;\n      }\n      ? (typeof AccountVersionRegistry)[TLightAccountType][TLightAccountVersion][\"entryPoint\"]\n      : never\n    : never;\n"]}
+{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../../src/light-account/registry.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,4BAA4B,EAC5B,4BAA4B,EAC5B,4BAA4B,EAC5B,4BAA4B,EAC5B,4BAA4B,EAC5B,4BAA4B,EAC5B,sCAAsC,GACvC,MAAM,6BAA6B,CAAC;AAGrC;;;;GAIG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG;IACpC,YAAY,EAAE;QACZ,QAAQ,EAAE,4BAA4B;QACtC,QAAQ,EAAE,4BAA4B;QACtC,QAAQ,EAAE,4BAA4B;QACtC,QAAQ,EAAE,4BAA4B;QACtC,QAAQ,EAAE,4BAA4B;QACtC,QAAQ,EAAE,4BAA4B;KACvC;IACD,sBAAsB,EAAE;QACtB,QAAQ,EAAE,sCAAsC;KACjD;CACyE,CAAC;AAU7E;;GAEG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG;IACpC,QAAQ;IACR,QAAQ;IACR,QAAQ;CACgD,CAAC;AAE3D;;GAEG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG;IACpC,QAAQ;IACR,QAAQ;IACR,QAAQ;CACgD,CAAC;AAE3D;;;;;GAKG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,OAA4C,EACQ,EAAE,CACrD,sBAA4C,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;AAElE;;;;;GAKG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,OAA4C,EACQ,EAAE,CACrD,sBAA4C,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC","sourcesContent":["import type { Abi, Address } from \"viem\";\nimport type { LightAccountBase } from \"./accounts/base.js\";\nimport {\n  lightAccountStaticImplV1_0_1,\n  lightAccountStaticImplV1_0_2,\n  lightAccountStaticImplV1_1_0,\n  lightAccountStaticImplV2_0_0,\n  lightAccountStaticImplV2_1_0,\n  lightAccountStaticImplV2_2_0,\n  multiOwnerLightAccountStaticImplV2_0_0,\n} from \"./lightAccountStaticImpl.js\";\nimport type { StaticSmartAccountImplementation } from \"../types.js\";\n\n/**\n * Account version registry interface that defines the light account versions\n * and the version definition for each light account type\n *\n */\nexport const AccountVersionRegistry = {\n  LightAccount: {\n    \"v1.0.1\": lightAccountStaticImplV1_0_1,\n    \"v1.0.2\": lightAccountStaticImplV1_0_2,\n    \"v1.1.0\": lightAccountStaticImplV1_1_0,\n    \"v2.0.0\": lightAccountStaticImplV2_0_0,\n    \"v2.1.0\": lightAccountStaticImplV2_1_0,\n    \"v2.2.0\": lightAccountStaticImplV2_2_0,\n  },\n  MultiOwnerLightAccount: {\n    \"v2.0.0\": multiOwnerLightAccountStaticImplV2_0_0,\n  },\n} satisfies Record<string, Record<string, StaticSmartAccountImplementation>>;\n\nexport type LightAccountType = Extract<\n  keyof typeof AccountVersionRegistry,\n  \"LightAccount\" | \"MultiOwnerLightAccount\"\n>;\n\nexport type LightAccountVersion<TAccountType extends LightAccountType> =\n  keyof (typeof AccountVersionRegistry)[TAccountType];\n\n/**\n * Light Account v1 versions\n */\nexport const LightAccountV1Versions = [\n  \"v1.0.1\",\n  \"v1.0.2\",\n  \"v1.1.0\",\n] as const satisfies LightAccountVersion<\"LightAccount\">[];\n\n/**\n * Light Account v2 versions\n */\nexport const LightAccountV2Versions = [\n  \"v2.0.0\",\n  \"v2.1.0\",\n  \"v2.2.0\",\n] as const satisfies LightAccountVersion<\"LightAccount\">[];\n\n/**\n * Type guard to check if a version is a Light Account v1 version\n *\n * @param {LightAccountVersion<\"LightAccount\">} version - The version to check.\n * @returns {boolean} True if the version is a v1 version.\n */\nexport const isLightAccountVersion1 = (\n  version: LightAccountVersion<\"LightAccount\">,\n): version is (typeof LightAccountV1Versions)[number] =>\n  (LightAccountV1Versions as readonly string[]).includes(version);\n\n/**\n * Type guard to check if a version is a Light Account v2 version\n *\n * @param {LightAccountVersion<\"LightAccount\">} version - The version to check.\n * @returns {boolean} True if the version is a v2 version.\n */\nexport const isLightAccountVersion2 = (\n  version: LightAccountVersion<\"LightAccount\">,\n): version is (typeof LightAccountV2Versions)[number] =>\n  (LightAccountV2Versions as readonly string[]).includes(version);\n\nexport type GetLightAccountType<TAccount extends LightAccountBase> =\n  TAccount[\"smartAccountType\"] extends LightAccountType\n    ? TAccount[\"smartAccountType\"]\n    : never;\n\nexport type LightAccountAbi<\n  TAccountType extends LightAccountType,\n  TAccountVersion extends LightAccountVersion<TAccountType>,\n> = TAccountVersion extends keyof (typeof AccountVersionRegistry)[TAccountType]\n  ? (typeof AccountVersionRegistry)[TAccountType][TAccountVersion] extends StaticSmartAccountImplementation\n    ? (typeof AccountVersionRegistry)[TAccountType][TAccountVersion][\"accountAbi\"]\n    : never\n  : never;\n\n/**\n * Infers the EntryPoint details as a type, given the account type and version.\n */\nexport type EntryPointFromAccountRegistry<\n  TLightAccountType extends LightAccountType,\n  TLightAccountVersion extends\n    LightAccountVersion<TLightAccountType> = LightAccountVersion<TLightAccountType>,\n> =\n  (typeof AccountVersionRegistry)[TLightAccountType][TLightAccountVersion] extends StaticSmartAccountImplementation<\n    // eslint-disable-next-line @typescript-eslint/no-unused-vars\n    infer _7702,\n    infer entryPointVersion,\n    // eslint-disable-next-line @typescript-eslint/no-unused-vars\n    infer _factoryArgs,\n    infer entryPointAbi extends Abi\n  >\n    ? (typeof AccountVersionRegistry)[TLightAccountType][TLightAccountVersion][\"entryPoint\"] extends {\n        readonly version: entryPointVersion;\n        readonly address: Address;\n        readonly abi: entryPointAbi;\n      }\n      ? (typeof AccountVersionRegistry)[TLightAccountType][TLightAccountVersion][\"entryPoint\"]\n      : never\n    : never;\n"]}

package/dist/esm/logger.d.ts

@@ -1,2 +1,2 @@
-import type { DiagnosticsLogger } from "@alchemy/common";
+import type { DiagnosticsLogger } from "@alchemy/common/internal";
 export declare const LOGGER: DiagnosticsLogger;

package/dist/esm/logger.js

@@ -1,4 +1,4 @@
-import { createLogger } from "@alchemy/common";
+import { createLogger } from "@alchemy/common/internal";
 import { VERSION } from "./version.js";
 export const LOGGER = createLogger({
     package: "@alchemy/smart-accounts",

package/dist/esm/logger.js.map

@@ -1 +1 @@
-{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEvC,MAAM,CAAC,MAAM,MAAM,GAAsB,YAAY,CAAC;IACpD,OAAO,EAAE,yBAAyB;IAClC,OAAO,EAAE,OAAO;IAChB,SAAS,EAAE,gBAAgB;CAC5B,CAAC,CAAC","sourcesContent":["import { createLogger } from \"@alchemy/common\";\nimport type { DiagnosticsLogger } from \"@alchemy/common\";\nimport { VERSION } from \"./version.js\";\n\nexport const LOGGER: DiagnosticsLogger = createLogger({\n  package: \"@alchemy/smart-accounts\",\n  version: VERSION,\n  namespace: \"smart-accounts\",\n});\n"]}
+{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEvC,MAAM,CAAC,MAAM,MAAM,GAAsB,YAAY,CAAC;IACpD,OAAO,EAAE,yBAAyB;IAClC,OAAO,EAAE,OAAO;IAChB,SAAS,EAAE,gBAAgB;CAC5B,CAAC,CAAC","sourcesContent":["import { createLogger } from \"@alchemy/common/internal\";\nimport type { DiagnosticsLogger } from \"@alchemy/common/internal\";\nimport { VERSION } from \"./version.js\";\n\nexport const LOGGER: DiagnosticsLogger = createLogger({\n  package: \"@alchemy/smart-accounts\",\n  version: VERSION,\n  namespace: \"smart-accounts\",\n});\n"]}

package/dist/esm/ma-v1/accounts/multi-owner-account.d.ts

@@ -9,11 +9,15 @@ export type ToMultiOwnerModularAccountV1Params = {
     owners: [OneOf<JsonRpcAccount | LocalAccount>, ...{
         address: Address;
     }[]];
-    salt?: bigint;
     accountAddress?: Address;
     factory?: Address;
+} & ({
+    salt?: bigint;
+    factoryData?: never;
+} | {
+    salt?: never;
     factoryData?: Hex;
-};
+});
 /**
  * Creates a multi-owner MAv1 account.
  *

package/dist/esm/ma-v1/accounts/multi-owner-account.js

@@ -1,13 +1,14 @@
-import { hexToBigInt, encodeFunctionData, } from "viem";
+import { encodeFunctionData, hexToBigInt, } from "viem";
 import { toModularAccountV1Base } from "./base.js";
 import { lowerAddress, BaseError } from "@alchemy/common";
 import { DefaultMaV1Address, DefaultMaV1PluginAddress } from "../account.js";
 import { MultiOwnerModularAccountFactoryAbi } from "../abis/MultiOwnerModularAccountFactory.js";
-import { predictMultiOwnerModularAccountV1Address } from "../predictAddress.js";
+import { getMultiOwnerModularAccountV1AddressFromFactoryData, predictMultiOwnerModularAccountV1Address, } from "../predictAddress.js";
 import { MultiOwnerPluginExecutionFunctionAbi } from "../abis/MultiOwnerPluginExecutionFunction.js";
 import { readContract } from "viem/actions";
 import { getAction } from "viem/utils";
 import { MultiOwnerPluginAbi } from "../abis/MultiOwnerPlugin.js";
+import { entryPoint06Address } from "viem/account-abstraction";
 /**
  * Creates a multi-owner MAv1 account.
  *
@@ -23,11 +24,21 @@ export async function toMultiOwnerModularAccountV1({ client, salt = 0n, owners,
         return bigintA < bigintB ? -1 : bigintA > bigintB ? 1 : 0;
     });
     const accountAddress = accountAddress_ ??
-        predictMultiOwnerModularAccountV1Address({
-            factoryAddress: factory,
-            salt,
-            ownerAddresses: sortedOwners,
-        });
+        (factoryData_
+            ? await getMultiOwnerModularAccountV1AddressFromFactoryData({
+                client,
+                factoryAddress: factory,
+                factoryData: factoryData_,
+                entryPoint: {
+                    version: "0.6",
+                    address: entryPoint06Address,
+                },
+            })
+            : predictMultiOwnerModularAccountV1Address({
+                factoryAddress: factory,
+                salt,
+                ownerAddresses: sortedOwners,
+            }));
     const getFactoryArgs = async () => {
         const factoryData = factoryData_ ??
             encodeFunctionData({

package/dist/esm/ma-v1/accounts/multi-owner-account.js.map

@@ -1 +1 @@
-{"version":3,"file":"multi-owner-account.js","sourceRoot":"","sources":["../../../../src/ma-v1/accounts/multi-owner-account.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  hexToBigInt,\n  type Address,\n  type Chain,\n  type Client,\n  type Hex,\n  type JsonRpcAccount,\n  type LocalAccount,\n  type OneOf,\n  type Transport,\n  encodeFunctionData,\n  type Hash,\n  type TypedDataDefinition,\n} from \"viem\";\nimport { toModularAccountV1Base, type ModularAccountV1Base } from \"./base.js\";\nimport { lowerAddress, BaseError } from \"@alchemy/common\";\nimport { DefaultMaV1Address, DefaultMaV1PluginAddress } from \"../account.js\";\nimport { MultiOwnerModularAccountFactoryAbi } from \"../abis/MultiOwnerModularAccountFactory.js\";\nimport { predictMultiOwnerModularAccountV1Address } from \"../predictAddress.js\";\nimport { MultiOwnerPluginExecutionFunctionAbi } from \"../abis/MultiOwnerPluginExecutionFunction.js\";\nimport { readContract } from \"viem/actions\";\nimport { getAction } from \"viem/utils\";\nimport { MultiOwnerPluginAbi } from \"../abis/MultiOwnerPlugin.js\";\n\nexport type MultiOwnerModularAccountV1 = ModularAccountV1Base & {\n  encodeUpdateOwners: (\n    ownersToAdd: Address[],\n    ownersToRemove: Address[],\n  ) => Hex;\n  getOwnerAddresses: () => Promise<readonly Address[]>;\n};\n\nexport type ToMultiOwnerModularAccountV1Params = {\n  client: Client<Transport, Chain, JsonRpcAccount | LocalAccount | undefined>;\n  owners: [OneOf<JsonRpcAccount | LocalAccount>, ...{ address: Address }[]];\n  salt?: bigint;\n  accountAddress?: Address;\n  factory?: Address;\n  factoryData?: Hex;\n};\n\n/**\n * Creates a multi-owner MAv1 account.\n *\n * @param {ToMultiOwnerModularAccountV1Params} param0 - The parameters for creating a multi-owner MAv1 account.\n * @returns {Promise<MultiOwnerModularAccountV1<TSigner>>} A multi-owner MAv1 account.\n */\nexport async function toMultiOwnerModularAccountV1({\n  client,\n  salt = 0n,\n  owners,\n  accountAddress: accountAddress_,\n  factory = DefaultMaV1Address.MULTI_OWNER_MAV1_FACTORY,\n  factoryData: factoryData_,\n}: ToMultiOwnerModularAccountV1Params): Promise<MultiOwnerModularAccountV1> {\n  const signer = owners[0];\n\n  const dedupedOwners = Array.from(\n    new Set(owners.map((it) => lowerAddress(it.address))),\n  );\n\n  const sortedOwners = dedupedOwners.sort((a, b) => {\n    const bigintA = hexToBigInt(a);\n    const bigintB = hexToBigInt(b);\n    return bigintA < bigintB ? -1 : bigintA > bigintB ? 1 : 0;\n  });\n\n  const accountAddress =\n    accountAddress_ ??\n    predictMultiOwnerModularAccountV1Address({\n      factoryAddress: factory,\n      salt,\n      ownerAddresses: sortedOwners,\n    });\n\n  const getFactoryArgs = async () => {\n    const factoryData =\n      factoryData_ ??\n      encodeFunctionData({\n        abi: MultiOwnerModularAccountFactoryAbi,\n        functionName: \"createAccount\",\n        args: [salt, sortedOwners],\n      });\n\n    return {\n      factory,\n      factoryData,\n    };\n  };\n\n  const get712Wrapper = async (msg: Hash): Promise<TypedDataDefinition> => {\n    const readContractAction = getAction(client, readContract, \"readContract\");\n\n    const [, name, version, chainId, verifyingContract, salt] =\n      await readContractAction({\n        abi: MultiOwnerPluginAbi,\n        address: DefaultMaV1PluginAddress.MULTI_OWNER,\n        functionName: \"eip712Domain\",\n        account: accountAddress,\n      });\n\n    return {\n      domain: {\n        chainId: Number(chainId),\n        name,\n        salt,\n        verifyingContract,\n        version,\n      },\n      types: {\n        AlchemyModularAccountMessage: [{ name: \"message\", type: \"bytes\" }],\n      },\n      message: {\n        message: msg,\n      },\n      primaryType: \"AlchemyModularAccountMessage\",\n    };\n  };\n\n  const baseAccount = await toModularAccountV1Base({\n    client,\n    owner: signer,\n    accountAddress,\n    getFactoryArgs,\n    type: \"MultiOwnerModularAccountV1\",\n    get712Wrapper,\n  });\n\n  return {\n    ...baseAccount,\n\n    encodeUpdateOwners: (ownersToAdd: Address[], ownersToRemove: Address[]) => {\n      return encodeFunctionData({\n        abi: MultiOwnerPluginExecutionFunctionAbi,\n        functionName: \"updateOwners\",\n        args: [ownersToAdd, ownersToRemove],\n      });\n    },\n\n    async getOwnerAddresses(): Promise<readonly Address[]> {\n      const readContractAction = getAction(\n        client,\n        readContract,\n        \"readContract\",\n      );\n      const ownersOnChain = await readContractAction({\n        address: DefaultMaV1PluginAddress.MULTI_OWNER,\n        abi: MultiOwnerPluginAbi,\n        functionName: \"ownersOf\",\n        args: [accountAddress],\n      });\n\n      if (\n        !ownersOnChain\n          .map((it) => lowerAddress(it))\n          .includes(lowerAddress(signer.address))\n      ) {\n        throw new BaseError(\n          \"on-chain owners does not include the current signer\",\n        );\n      }\n\n      return ownersOnChain;\n    },\n  };\n}\n"]}
+{"version":3,"file":"multi-owner-account.js","sourceRoot":"","sources":["../../../../src/ma-v1/accounts/multi-owner-account.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,WAAW,GAWZ,MAAM,MAAM,CAAC;AACd,OAAO,EAAE,sBAAsB,EAA6B,MAAM,WAAW,CAAC;AAC9E,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAC;AAC7E,OAAO,EAAE,kCAAkC,EAAE,MAAM,4CAA4C,CAAC;AAChG,OAAO,EACL,mDAAmD,EACnD,wCAAwC,GACzC,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,oCAAoC,EAAE,MAAM,8CAA8C,CAAC;AACpG,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAoB/D;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,4BAA4B,CAAC,EACjD,MAAM,EACN,IAAI,GAAG,EAAE,EACT,MAAM,EACN,cAAc,EAAE,eAAe,EAC/B,OAAO,GAAG,kBAAkB,CAAC,wBAAwB,EACrD,WAAW,EAAE,YAAY,GACU;IACnC,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;IAEzB,MAAM,aAAa,GAAG,KAAK,CAAC,IAAI,CAC9B,IAAI,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CACtD,CAAC;IAEF,MAAM,YAAY,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QAC/C,MAAM,OAAO,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;QAC/B,MAAM,OAAO,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;QAC/B,OAAO,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;IAEH,MAAM,cAAc,GAClB,eAAe;QACf,CAAC,YAAY;YACX,CAAC,CAAC,MAAM,mDAAmD,CAAC;gBACxD,MAAM;gBACN,cAAc,EAAE,OAAO;gBACvB,WAAW,EAAE,YAAY;gBACzB,UAAU,EAAE;oBACV,OAAO,EAAE,KAAK;oBACd,OAAO,EAAE,mBAAmB;iBAC7B;aACF,CAAC;YACJ,CAAC,CAAC,wCAAwC,CAAC;gBACvC,cAAc,EAAE,OAAO;gBACvB,IAAI;gBACJ,cAAc,EAAE,YAAY;aAC7B,CAAC,CAAC,CAAC;IAEV,MAAM,cAAc,GAAG,KAAK,IAAI,EAAE;QAChC,MAAM,WAAW,GACf,YAAY;YACZ,kBAAkB,CAAC;gBACjB,GAAG,EAAE,kCAAkC;gBACvC,YAAY,EAAE,eAAe;gBAC7B,IAAI,EAAE,CAAC,IAAI,EAAE,YAAY,CAAC;aAC3B,CAAC,CAAC;QAEL,OAAO;YACL,OAAO;YACP,WAAW;SACZ,CAAC;IACJ,CAAC,CAAC;IAEF,MAAM,aAAa,GAAG,KAAK,EAAE,GAAS,EAAgC,EAAE;QACtE,MAAM,kBAAkB,GAAG,SAAS,CAAC,MAAM,EAAE,YAAY,EAAE,cAAc,CAAC,CAAC;QAE3E,MAAM,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,IAAI,CAAC,GACvD,MAAM,kBAAkB,CAAC;YACvB,GAAG,EAAE,mBAAmB;YACxB,OAAO,EAAE,wBAAwB,CAAC,WAAW;YAC7C,YAAY,EAAE,cAAc;YAC5B,OAAO,EAAE,cAAc;SACxB,CAAC,CAAC;QAEL,OAAO;YACL,MAAM,EAAE;gBACN,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC;gBACxB,IAAI;gBACJ,IAAI;gBACJ,iBAAiB;gBACjB,OAAO;aACR;YACD,KAAK,EAAE;gBACL,4BAA4B,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;aACnE;YACD,OAAO,EAAE;gBACP,OAAO,EAAE,GAAG;aACb;YACD,WAAW,EAAE,8BAA8B;SAC5C,CAAC;IACJ,CAAC,CAAC;IAEF,MAAM,WAAW,GAAG,MAAM,sBAAsB,CAAC;QAC/C,MAAM;QACN,KAAK,EAAE,MAAM;QACb,cAAc;QACd,cAAc;QACd,IAAI,EAAE,4BAA4B;QAClC,aAAa;KACd,CAAC,CAAC;IAEH,OAAO;QACL,GAAG,WAAW;QAEd,kBAAkB,EAAE,CAAC,WAAsB,EAAE,cAAyB,EAAE,EAAE;YACxE,OAAO,kBAAkB,CAAC;gBACxB,GAAG,EAAE,oCAAoC;gBACzC,YAAY,EAAE,cAAc;gBAC5B,IAAI,EAAE,CAAC,WAAW,EAAE,cAAc,CAAC;aACpC,CAAC,CAAC;QACL,CAAC;QAED,KAAK,CAAC,iBAAiB;YACrB,MAAM,kBAAkB,GAAG,SAAS,CAClC,MAAM,EACN,YAAY,EACZ,cAAc,CACf,CAAC;YACF,MAAM,aAAa,GAAG,MAAM,kBAAkB,CAAC;gBAC7C,OAAO,EAAE,wBAAwB,CAAC,WAAW;gBAC7C,GAAG,EAAE,mBAAmB;gBACxB,YAAY,EAAE,UAAU;gBACxB,IAAI,EAAE,CAAC,cAAc,CAAC;aACvB,CAAC,CAAC;YAEH,IACE,CAAC,aAAa;iBACX,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;iBAC7B,QAAQ,CAAC,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,EACzC,CAAC;gBACD,MAAM,IAAI,SAAS,CACjB,qDAAqD,CACtD,CAAC;YACJ,CAAC;YAED,OAAO,aAAa,CAAC;QACvB,CAAC;KACF,CAAC;AACJ,CAAC","sourcesContent":["import {\n  encodeFunctionData,\n  hexToBigInt,\n  type Address,\n  type Chain,\n  type Client,\n  type Hash,\n  type Hex,\n  type JsonRpcAccount,\n  type LocalAccount,\n  type OneOf,\n  type Transport,\n  type TypedDataDefinition,\n} from \"viem\";\nimport { toModularAccountV1Base, type ModularAccountV1Base } from \"./base.js\";\nimport { lowerAddress, BaseError } from \"@alchemy/common\";\nimport { DefaultMaV1Address, DefaultMaV1PluginAddress } from \"../account.js\";\nimport { MultiOwnerModularAccountFactoryAbi } from \"../abis/MultiOwnerModularAccountFactory.js\";\nimport {\n  getMultiOwnerModularAccountV1AddressFromFactoryData,\n  predictMultiOwnerModularAccountV1Address,\n} from \"../predictAddress.js\";\nimport { MultiOwnerPluginExecutionFunctionAbi } from \"../abis/MultiOwnerPluginExecutionFunction.js\";\nimport { readContract } from \"viem/actions\";\nimport { getAction } from \"viem/utils\";\nimport { MultiOwnerPluginAbi } from \"../abis/MultiOwnerPlugin.js\";\nimport { entryPoint06Address } from \"viem/account-abstraction\";\n\nexport type MultiOwnerModularAccountV1 = ModularAccountV1Base & {\n  encodeUpdateOwners: (\n    ownersToAdd: Address[],\n    ownersToRemove: Address[],\n  ) => Hex;\n  getOwnerAddresses: () => Promise<readonly Address[]>;\n};\n\nexport type ToMultiOwnerModularAccountV1Params = {\n  client: Client<Transport, Chain, JsonRpcAccount | LocalAccount | undefined>;\n  owners: [OneOf<JsonRpcAccount | LocalAccount>, ...{ address: Address }[]];\n  accountAddress?: Address;\n  factory?: Address;\n} & (\n  | { salt?: bigint; factoryData?: never }\n  | { salt?: never; factoryData?: Hex }\n);\n\n/**\n * Creates a multi-owner MAv1 account.\n *\n * @param {ToMultiOwnerModularAccountV1Params} param0 - The parameters for creating a multi-owner MAv1 account.\n * @returns {Promise<MultiOwnerModularAccountV1<TSigner>>} A multi-owner MAv1 account.\n */\nexport async function toMultiOwnerModularAccountV1({\n  client,\n  salt = 0n,\n  owners,\n  accountAddress: accountAddress_,\n  factory = DefaultMaV1Address.MULTI_OWNER_MAV1_FACTORY,\n  factoryData: factoryData_,\n}: ToMultiOwnerModularAccountV1Params): Promise<MultiOwnerModularAccountV1> {\n  const signer = owners[0];\n\n  const dedupedOwners = Array.from(\n    new Set(owners.map((it) => lowerAddress(it.address))),\n  );\n\n  const sortedOwners = dedupedOwners.sort((a, b) => {\n    const bigintA = hexToBigInt(a);\n    const bigintB = hexToBigInt(b);\n    return bigintA < bigintB ? -1 : bigintA > bigintB ? 1 : 0;\n  });\n\n  const accountAddress =\n    accountAddress_ ??\n    (factoryData_\n      ? await getMultiOwnerModularAccountV1AddressFromFactoryData({\n          client,\n          factoryAddress: factory,\n          factoryData: factoryData_,\n          entryPoint: {\n            version: \"0.6\",\n            address: entryPoint06Address,\n          },\n        })\n      : predictMultiOwnerModularAccountV1Address({\n          factoryAddress: factory,\n          salt,\n          ownerAddresses: sortedOwners,\n        }));\n\n  const getFactoryArgs = async () => {\n    const factoryData =\n      factoryData_ ??\n      encodeFunctionData({\n        abi: MultiOwnerModularAccountFactoryAbi,\n        functionName: \"createAccount\",\n        args: [salt, sortedOwners],\n      });\n\n    return {\n      factory,\n      factoryData,\n    };\n  };\n\n  const get712Wrapper = async (msg: Hash): Promise<TypedDataDefinition> => {\n    const readContractAction = getAction(client, readContract, \"readContract\");\n\n    const [, name, version, chainId, verifyingContract, salt] =\n      await readContractAction({\n        abi: MultiOwnerPluginAbi,\n        address: DefaultMaV1PluginAddress.MULTI_OWNER,\n        functionName: \"eip712Domain\",\n        account: accountAddress,\n      });\n\n    return {\n      domain: {\n        chainId: Number(chainId),\n        name,\n        salt,\n        verifyingContract,\n        version,\n      },\n      types: {\n        AlchemyModularAccountMessage: [{ name: \"message\", type: \"bytes\" }],\n      },\n      message: {\n        message: msg,\n      },\n      primaryType: \"AlchemyModularAccountMessage\",\n    };\n  };\n\n  const baseAccount = await toModularAccountV1Base({\n    client,\n    owner: signer,\n    accountAddress,\n    getFactoryArgs,\n    type: \"MultiOwnerModularAccountV1\",\n    get712Wrapper,\n  });\n\n  return {\n    ...baseAccount,\n\n    encodeUpdateOwners: (ownersToAdd: Address[], ownersToRemove: Address[]) => {\n      return encodeFunctionData({\n        abi: MultiOwnerPluginExecutionFunctionAbi,\n        functionName: \"updateOwners\",\n        args: [ownersToAdd, ownersToRemove],\n      });\n    },\n\n    async getOwnerAddresses(): Promise<readonly Address[]> {\n      const readContractAction = getAction(\n        client,\n        readContract,\n        \"readContract\",\n      );\n      const ownersOnChain = await readContractAction({\n        address: DefaultMaV1PluginAddress.MULTI_OWNER,\n        abi: MultiOwnerPluginAbi,\n        functionName: \"ownersOf\",\n        args: [accountAddress],\n      });\n\n      if (\n        !ownersOnChain\n          .map((it) => lowerAddress(it))\n          .includes(lowerAddress(signer.address))\n      ) {\n        throw new BaseError(\n          \"on-chain owners does not include the current signer\",\n        );\n      }\n\n      return ownersOnChain;\n    },\n  };\n}\n"]}

package/dist/esm/ma-v1/predictAddress.d.ts

@@ -1,4 +1,5 @@
-import { type Address } from "viem";
+import { type Address, type Client, type Hex } from "viem";
+import type { EntryPointVersion } from "viem/account-abstraction";
 export type PredictMultiOwnerModularAccountV1AddressParams = {
     salt: bigint;
     ownerAddresses: Address[];
@@ -26,3 +27,21 @@ export type PredictMultiOwnerModularAccountV1AddressParams = {
  * ```
  */
 export declare const predictMultiOwnerModularAccountV1Address: ({ salt, ownerAddresses, factoryAddress, }: PredictMultiOwnerModularAccountV1AddressParams) => Address;
+export type GetMultiOwnerModularAccountV1AddressFromFactoryDataParams = {
+    client: Client;
+    factoryAddress: Address;
+    factoryData: Hex;
+    entryPoint: {
+        version: EntryPointVersion;
+        address: Address;
+    };
+};
+/**
+ * Gets the multi-owner modular account v1 address from factory data.
+ * If the factory is a known default, decodes the args and predicts without RPC.
+ * Otherwise falls back to calling the entry point's getSenderAddress.
+ *
+ * @param {GetMultiOwnerModularAccountV1AddressFromFactoryDataParams} params - The parameters
+ * @returns {Promise<Address>} The account address
+ */
+export declare function getMultiOwnerModularAccountV1AddressFromFactoryData({ client, factoryAddress, factoryData, entryPoint, }: GetMultiOwnerModularAccountV1AddressFromFactoryDataParams): Promise<Address>;

package/dist/esm/ma-v1/predictAddress.js

@@ -1,6 +1,8 @@
-import { getContractAddress, encodeAbiParameters, keccak256, concatHex, } from "viem";
+import { concatHex, decodeFunctionData, encodeAbiParameters, getContractAddress, isAddressEqual, keccak256, } from "viem";
 import { DefaultMaV1Address } from "./account.js";
+import { MultiOwnerModularAccountFactoryAbi } from "./abis/MultiOwnerModularAccountFactory.js";
 import { BaseError } from "@alchemy/common";
+import { getSenderFromFactoryData } from "../utils.js";
 /**
  * Predicts the address of a MultiOwnerModularAccountV1 smart account before deployment.
  *
@@ -27,7 +29,7 @@ export const predictMultiOwnerModularAccountV1Address = ({ salt, ownerAddresses,
         throw new BaseError("Owners array cannot be empty");
     }
     if (ownerAddresses.length > 100) {
-        throw new Error("Maximum 100 owners on creation");
+        throw new BaseError("Maximum 100 owners on creation");
     }
     const combinedSalt = getCombinedSalt(salt, ownerAddresses);
     const initCodeHash = getERC1967ProxyInitCodeHash(DefaultMaV1Address.IMPLEMENTATION_ADDRESS);
@@ -48,4 +50,38 @@ function getERC1967ProxyInitCodeHash(implementationAddress) {
     const constructorArgs = encodeAbiParameters([{ type: "address" }, { type: "bytes" }], [implementationAddress, "0x"]);
     return keccak256(concatHex([ERC1967_PROXY_BYTECODE, constructorArgs]));
 }
+/**
+ * Gets the multi-owner modular account v1 address from factory data.
+ * If the factory is a known default, decodes the args and predicts without RPC.
+ * Otherwise falls back to calling the entry point's getSenderAddress.
+ *
+ * @param {GetMultiOwnerModularAccountV1AddressFromFactoryDataParams} params - The parameters
+ * @returns {Promise<Address>} The account address
+ */
+export async function getMultiOwnerModularAccountV1AddressFromFactoryData({ client, factoryAddress, factoryData, entryPoint, }) {
+    if (isAddressEqual(factoryAddress, DefaultMaV1Address.MULTI_OWNER_MAV1_FACTORY)) {
+        try {
+            const decoded = decodeFunctionData({
+                abi: MultiOwnerModularAccountFactoryAbi,
+                data: factoryData,
+            });
+            if (decoded.functionName === "createAccount") {
+                const [decodedSalt, decodedOwners] = decoded.args;
+                return predictMultiOwnerModularAccountV1Address({
+                    factoryAddress,
+                    salt: decodedSalt,
+                    ownerAddresses: [...decodedOwners],
+                });
+            }
+        }
+        catch {
+            // Decode failed, fall through to RPC
+        }
+    }
+    return getSenderFromFactoryData(client, {
+        factory: factoryAddress,
+        factoryData,
+        entryPoint,
+    });
+}
 //# sourceMappingURL=predictAddress.js.map

package/dist/esm/ma-v1/predictAddress.js.map

@@ -1 +1 @@
-{"version":3,"file":"predictAddress.js","sourceRoot":"","sources":["../../../src/ma-v1/predictAddress.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,kBAAkB,EAClB,mBAAmB,EACnB,SAAS,EACT,SAAS,GAEV,MAAM,MAAM,CAAC;AACd,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAS5C;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,CAAC,MAAM,wCAAwC,GAAG,CAAC,EACvD,IAAI,EACJ,cAAc,EACd,cAAc,GAAG,kBAAkB,CAAC,wBAAwB,GACb,EAAW,EAAE;IAC5D,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAChC,MAAM,IAAI,SAAS,CAAC,8BAA8B,CAAC,CAAC;IACtD,CAAC;IACD,IAAI,cAAc,CAAC,MAAM,GAAG,GAAG,EAAE,CAAC;QAChC,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;IACpD,CAAC;IAED,MAAM,YAAY,GAAG,eAAe,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAE3D,MAAM,YAAY,GAAG,2BAA2B,CAC9C,kBAAkB,CAAC,sBAAsB,CAC1C,CAAC;IAEF,OAAO,kBAAkB,CAAC;QACxB,IAAI,EAAE,cAAc;QACpB,MAAM,EAAE,SAAS;QACjB,IAAI,EAAE,YAAY;QAClB,YAAY,EAAE,YAAY;KAC3B,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,SAAS,eAAe,CAAC,IAAY,EAAE,MAAiB;IACtD,MAAM,aAAa,GAAG,mBAAmB,CAAC,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IAC7E,MAAM,aAAa,GAAG,mBAAmB,CACvC,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EACxC,CAAC,IAAI,EAAE,aAAa,CAAC,CACtB,CAAC;IACF,OAAO,SAAS,CAAC,aAAa,CAAC,CAAC;AAClC,CAAC;AAED,SAAS,2BAA2B,CAAC,qBAA8B;IACjE,MAAM,sBAAsB,GAC1B,4lEAAqmE,CAAC;IAExmE,MAAM,eAAe,GAAG,mBAAmB,CACzC,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EACxC,CAAC,qBAAqB,EAAE,IAAI,CAAC,CAC9B,CAAC;IAEF,OAAO,SAAS,CAAC,SAAS,CAAC,CAAC,sBAAsB,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC;AACzE,CAAC","sourcesContent":["import {\n  type Address,\n  getContractAddress,\n  encodeAbiParameters,\n  keccak256,\n  concatHex,\n  type Hex,\n} from \"viem\";\nimport { DefaultMaV1Address } from \"./account.js\";\nimport { BaseError } from \"@alchemy/common\";\n\nexport type PredictMultiOwnerModularAccountV1AddressParams = {\n  salt: bigint;\n  /* Owner addresses must be already deduped, sorted in ascending order, and have the signer address included. */\n  ownerAddresses: Address[];\n  factoryAddress?: Address;\n};\n\n/**\n * Predicts the address of a MultiOwnerModularAccountV1 smart account before deployment.\n *\n * This function uses CREATE2 to deterministically compute the account address based on the factory address,\n * salt, and owner addresses. The predicted address will match the actual deployed address if the same\n * parameters are used during deployment.\n *\n * @param {PredictMultiOwnerModularAccountV1AddressParams} params The parameters for predicting the account address\n * @param {bigint} params.salt A unique value used to generate different account addresses for the same set of owners\n * @param {Address[]} params.ownerAddresses Array of owner addresses that will control the account. Must be deduplicated, sorted in ascending order, and include the signer address. Cannot be empty and must contain at most 100 addresses.\n * @param {Address} [params.factoryAddress] The factory contract address that will deploy the account. Defaults to the standard MultiOwnerModularAccountV1 factory address.\n * @returns {Address} The predicted address where the account will be deployed\n *\n * @example\n * ```ts\n * const predictedAddress = predictMultiOwnerModularAccountV1Address({\n *   salt: 0n,\n *   ownerAddresses: [\"0x1234...\", \"0x5678...\"]\n * });\n * ```\n */\nexport const predictMultiOwnerModularAccountV1Address = ({\n  salt,\n  ownerAddresses,\n  factoryAddress = DefaultMaV1Address.MULTI_OWNER_MAV1_FACTORY,\n}: PredictMultiOwnerModularAccountV1AddressParams): Address => {\n  if (ownerAddresses.length === 0) {\n    throw new BaseError(\"Owners array cannot be empty\");\n  }\n  if (ownerAddresses.length > 100) {\n    throw new Error(\"Maximum 100 owners on creation\");\n  }\n\n  const combinedSalt = getCombinedSalt(salt, ownerAddresses);\n\n  const initCodeHash = getERC1967ProxyInitCodeHash(\n    DefaultMaV1Address.IMPLEMENTATION_ADDRESS,\n  );\n\n  return getContractAddress({\n    from: factoryAddress,\n    opcode: \"CREATE2\",\n    salt: combinedSalt,\n    bytecodeHash: initCodeHash,\n  });\n};\n\nfunction getCombinedSalt(salt: bigint, owners: Address[]): Hex {\n  const encodedOwners = encodeAbiParameters([{ type: \"address[]\" }], [owners]);\n  const saltAndOwners = encodeAbiParameters(\n    [{ type: \"uint256\" }, { type: \"bytes\" }],\n    [salt, encodedOwners],\n  );\n  return keccak256(saltAndOwners);\n}\n\nfunction getERC1967ProxyInitCodeHash(implementationAddress: Address): Hex {\n  const ERC1967_PROXY_BYTECODE =\n    \"0x60406080815261042c908138038061001681610218565b93843982019181818403126102135780516001600160a01b038116808203610213576020838101516001600160401b0394919391858211610213570186601f820112156102135780519061007161006c83610253565b610218565b918083528583019886828401011161021357888661008f930161026e565b813b156101b9577f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc80546001600160a01b031916841790556000927fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b8480a28051158015906101b2575b61010b575b855160e790816103458239f35b855194606086019081118682101761019e578697849283926101889952602788527f416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c87890152660819985a5b195960ca1b8a8901525190845af4913d15610194573d9061017a61006c83610253565b91825281943d92013e610291565b508038808080806100fe565b5060609250610291565b634e487b7160e01b84526041600452602484fd5b50826100f9565b855162461bcd60e51b815260048101859052602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b6064820152608490fd5b600080fd5b6040519190601f01601f191682016001600160401b0381118382101761023d57604052565b634e487b7160e01b600052604160045260246000fd5b6001600160401b03811161023d57601f01601f191660200190565b60005b8381106102815750506000910152565b8181015183820152602001610271565b919290156102f357508151156102a5575090565b3b156102ae5790565b60405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e74726163740000006044820152606490fd5b8251909150156103065750805190602001fd5b6044604051809262461bcd60e51b825260206004830152610336815180928160248601526020868601910161026e565b601f01601f19168101030190fdfe60806040523615605f5773ffffffffffffffffffffffffffffffffffffffff7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc54166000808092368280378136915af43d82803e15605b573d90f35b3d90fd5b73ffffffffffffffffffffffffffffffffffffffff7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc54166000808092368280378136915af43d82803e15605b573d90f3fea26469706673582212208f3104255ee3c201238ea03e118ee6ec0a2cff51cbfbdc3af1727982a5a959a564736f6c63430008160033\" as const;\n\n  const constructorArgs = encodeAbiParameters(\n    [{ type: \"address\" }, { type: \"bytes\" }],\n    [implementationAddress, \"0x\"],\n  );\n\n  return keccak256(concatHex([ERC1967_PROXY_BYTECODE, constructorArgs]));\n}\n"]}
+{"version":3,"file":"predictAddress.js","sourceRoot":"","sources":["../../../src/ma-v1/predictAddress.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  type Address,\n  type Client,\n  concatHex,\n  decodeFunctionData,\n  encodeAbiParameters,\n  getContractAddress,\n  isAddressEqual,\n  keccak256,\n  type Hex,\n} from \"viem\";\nimport type { EntryPointVersion } from \"viem/account-abstraction\";\nimport { DefaultMaV1Address } from \"./account.js\";\nimport { MultiOwnerModularAccountFactoryAbi } from \"./abis/MultiOwnerModularAccountFactory.js\";\nimport { BaseError } from \"@alchemy/common\";\nimport { getSenderFromFactoryData } from \"../utils.js\";\n\nexport type PredictMultiOwnerModularAccountV1AddressParams = {\n  salt: bigint;\n  /* Owner addresses must be already deduped, sorted in ascending order, and have the signer address included. */\n  ownerAddresses: Address[];\n  factoryAddress?: Address;\n};\n\n/**\n * Predicts the address of a MultiOwnerModularAccountV1 smart account before deployment.\n *\n * This function uses CREATE2 to deterministically compute the account address based on the factory address,\n * salt, and owner addresses. The predicted address will match the actual deployed address if the same\n * parameters are used during deployment.\n *\n * @param {PredictMultiOwnerModularAccountV1AddressParams} params The parameters for predicting the account address\n * @param {bigint} params.salt A unique value used to generate different account addresses for the same set of owners\n * @param {Address[]} params.ownerAddresses Array of owner addresses that will control the account. Must be deduplicated, sorted in ascending order, and include the signer address. Cannot be empty and must contain at most 100 addresses.\n * @param {Address} [params.factoryAddress] The factory contract address that will deploy the account. Defaults to the standard MultiOwnerModularAccountV1 factory address.\n * @returns {Address} The predicted address where the account will be deployed\n *\n * @example\n * ```ts\n * const predictedAddress = predictMultiOwnerModularAccountV1Address({\n *   salt: 0n,\n *   ownerAddresses: [\"0x1234...\", \"0x5678...\"]\n * });\n * ```\n */\nexport const predictMultiOwnerModularAccountV1Address = ({\n  salt,\n  ownerAddresses,\n  factoryAddress = DefaultMaV1Address.MULTI_OWNER_MAV1_FACTORY,\n}: PredictMultiOwnerModularAccountV1AddressParams): Address => {\n  if (ownerAddresses.length === 0) {\n    throw new BaseError(\"Owners array cannot be empty\");\n  }\n  if (ownerAddresses.length > 100) {\n    throw new BaseError(\"Maximum 100 owners on creation\");\n  }\n\n  const combinedSalt = getCombinedSalt(salt, ownerAddresses);\n\n  const initCodeHash = getERC1967ProxyInitCodeHash(\n    DefaultMaV1Address.IMPLEMENTATION_ADDRESS,\n  );\n\n  return getContractAddress({\n    from: factoryAddress,\n    opcode: \"CREATE2\",\n    salt: combinedSalt,\n    bytecodeHash: initCodeHash,\n  });\n};\n\nfunction getCombinedSalt(salt: bigint, owners: Address[]): Hex {\n  const encodedOwners = encodeAbiParameters([{ type: \"address[]\" }], [owners]);\n  const saltAndOwners = encodeAbiParameters(\n    [{ type: \"uint256\" }, { type: \"bytes\" }],\n    [salt, encodedOwners],\n  );\n  return keccak256(saltAndOwners);\n}\n\nfunction getERC1967ProxyInitCodeHash(implementationAddress: Address): Hex {\n  const ERC1967_PROXY_BYTECODE =\n    \"0x60406080815261042c908138038061001681610218565b93843982019181818403126102135780516001600160a01b038116808203610213576020838101516001600160401b0394919391858211610213570186601f820112156102135780519061007161006c83610253565b610218565b918083528583019886828401011161021357888661008f930161026e565b813b156101b9577f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc80546001600160a01b031916841790556000927fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b8480a28051158015906101b2575b61010b575b855160e790816103458239f35b855194606086019081118682101761019e578697849283926101889952602788527f416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c87890152660819985a5b195960ca1b8a8901525190845af4913d15610194573d9061017a61006c83610253565b91825281943d92013e610291565b508038808080806100fe565b5060609250610291565b634e487b7160e01b84526041600452602484fd5b50826100f9565b855162461bcd60e51b815260048101859052602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b6064820152608490fd5b600080fd5b6040519190601f01601f191682016001600160401b0381118382101761023d57604052565b634e487b7160e01b600052604160045260246000fd5b6001600160401b03811161023d57601f01601f191660200190565b60005b8381106102815750506000910152565b8181015183820152602001610271565b919290156102f357508151156102a5575090565b3b156102ae5790565b60405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e74726163740000006044820152606490fd5b8251909150156103065750805190602001fd5b6044604051809262461bcd60e51b825260206004830152610336815180928160248601526020868601910161026e565b601f01601f19168101030190fdfe60806040523615605f5773ffffffffffffffffffffffffffffffffffffffff7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc54166000808092368280378136915af43d82803e15605b573d90f35b3d90fd5b73ffffffffffffffffffffffffffffffffffffffff7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc54166000808092368280378136915af43d82803e15605b573d90f3fea26469706673582212208f3104255ee3c201238ea03e118ee6ec0a2cff51cbfbdc3af1727982a5a959a564736f6c63430008160033\" as const;\n\n  const constructorArgs = encodeAbiParameters(\n    [{ type: \"address\" }, { type: \"bytes\" }],\n    [implementationAddress, \"0x\"],\n  );\n\n  return keccak256(concatHex([ERC1967_PROXY_BYTECODE, constructorArgs]));\n}\n\nexport type GetMultiOwnerModularAccountV1AddressFromFactoryDataParams = {\n  client: Client;\n  factoryAddress: Address;\n  factoryData: Hex;\n  entryPoint: {\n    version: EntryPointVersion;\n    address: Address;\n  };\n};\n\n/**\n * Gets the multi-owner modular account v1 address from factory data.\n * If the factory is a known default, decodes the args and predicts without RPC.\n * Otherwise falls back to calling the entry point's getSenderAddress.\n *\n * @param {GetMultiOwnerModularAccountV1AddressFromFactoryDataParams} params - The parameters\n * @returns {Promise<Address>} The account address\n */\nexport async function getMultiOwnerModularAccountV1AddressFromFactoryData({\n  client,\n  factoryAddress,\n  factoryData,\n  entryPoint,\n}: GetMultiOwnerModularAccountV1AddressFromFactoryDataParams): Promise<Address> {\n  if (\n    isAddressEqual(factoryAddress, DefaultMaV1Address.MULTI_OWNER_MAV1_FACTORY)\n  ) {\n    try {\n      const decoded = decodeFunctionData({\n        abi: MultiOwnerModularAccountFactoryAbi,\n        data: factoryData,\n      });\n      if (decoded.functionName === \"createAccount\") {\n        const [decodedSalt, decodedOwners] = decoded.args;\n        return predictMultiOwnerModularAccountV1Address({\n          factoryAddress,\n          salt: decodedSalt,\n          ownerAddresses: [...decodedOwners],\n        });\n      }\n    } catch {\n      // Decode failed, fall through to RPC\n    }\n  }\n  return getSenderFromFactoryData(client, {\n    factory: factoryAddress,\n    factoryData,\n    entryPoint,\n  });\n}\n"]}

package/dist/esm/ma-v2/accounts/account.d.ts

@@ -1,12 +1,11 @@
 import { type Address, type Chain, type Client, type Hex, type JsonRpcAccount, type LocalAccount, type Transport } from "viem";
-import type { WebAuthnAccount } from "viem/account-abstraction";
 import { type ModularAccountV2Base } from "./base.js";
 import type { SignerEntity } from "../types.js";
 type Mode = "default" | "7702";
 export type ModularAccountV2 = ModularAccountV2Base & {};
 export type ToModularAccountV2Params<TMode extends Mode | undefined = Mode | undefined> = {
     client: Client<Transport, Chain, JsonRpcAccount | LocalAccount | undefined>;
-    owner: JsonRpcAccount | LocalAccount | WebAuthnAccount;
+    owner: JsonRpcAccount | LocalAccount;
     deferredAction?: Hex;
     signerEntity?: SignerEntity;
     accountAddress?: Address;
@@ -17,11 +16,15 @@ export type ToModularAccountV2Params<TMode extends Mode | undefined = Mode | und
     factoryData?: never;
     implementationAddress?: never;
 } : {
-    salt?: bigint;
     factory?: Address;
-    factoryData?: Hex;
     implementationAddress?: Address;
-});
+} & ({
+    salt?: bigint;
+    factoryData?: never;
+} | {
+    salt?: never;
+    factoryData?: Hex;
+}));
 /**
  * Creates a MAv2 account.
  *

package/dist/esm/ma-v2/accounts/account.js

@@ -1,9 +1,8 @@
 import { encodeFunctionData, } from "viem";
+import { entryPoint07Address, } from "viem/account-abstraction";
 import { toModularAccountV2Base } from "./base.js";
-import { predictModularAccountV2Address } from "../predictAddress.js";
-import { parsePublicKey } from "webauthn-p256";
+import { getModularAccountV2AddressFromFactoryData, predictModularAccountV2Address, } from "../predictAddress.js";
 import { accountFactoryAbi } from "../abis/accountFactoryAbi.js";
-import { webAuthnFactoryAbi } from "../abis/webAuthnFactoryAbi.js";
 import { EntityIdOverrideError } from "../../errors/EntityIdOverrideError.js";
 import { InvalidOwnerError } from "../../errors/InvalidOwnerError.js";
 import { DEFAULT_OWNER_ENTITY_ID, DefaultAddress } from "../utils/account.js";
@@ -23,16 +22,9 @@ export async function toModularAccountV2({ client, owner, deferredAction, signer
         hasAccountAddress: !!accountAddress_,
     });
     const entityId = signerEntity?.entityId ?? DEFAULT_OWNER_ENTITY_ID;
-    const factoryAddress = factory ??
-        (owner.type === "webAuthn"
-            ? DefaultAddress.MAV2_FACTORY_WEBAUTHN
-            : DefaultAddress.MAV2_FACTORY);
+    const factoryAddress = factory ?? DefaultAddress.MAV2_FACTORY;
     const implementationAddress = implementationAddress_ ??
-        (is7702
-            ? DefaultAddress.SMAV2_7702
-            : owner.type === "webAuthn"
-                ? DefaultAddress.MAV2
-                : DefaultAddress.SMAV2_BYTECODE);
+        (is7702 ? DefaultAddress.SMAV2_7702 : DefaultAddress.SMAV2_BYTECODE);
     const getFactoryArgs = async () => {
         if (is7702) {
             // This is only for EP 0.8.0.
@@ -45,18 +37,6 @@ export async function toModularAccountV2({ client, owner, deferredAction, signer
                 factoryData: undefined,
             };
         }
-        if (owner.type === "webAuthn") {
-            const { x, y } = parsePublicKey(owner.publicKey);
-            return {
-                factory: factoryAddress,
-                factoryData: factoryData_ ??
-                    encodeFunctionData({
-                        abi: webAuthnFactoryAbi,
-                        functionName: "createWebAuthnAccount",
-                        args: [x, y, salt, entityId],
-                    }),
-            };
-        }
         return {
             factory: factoryAddress,
             factoryData: factoryData_ ??
@@ -68,24 +48,26 @@ export async function toModularAccountV2({ client, owner, deferredAction, signer
         };
     };
     const accountAddress = accountAddress_ ??
-        (mode === "7702" && owner.type === "local"
+        (is7702
             ? owner.address
-            : predictModularAccountV2Address({
-                factoryAddress,
-                implementationAddress,
-                salt,
-                ...(owner.type === "webAuthn"
-                    ? {
-                        type: "WebAuthn",
-                        ownerPublicKey: owner.publicKey,
-                        entityId,
-                    }
-                    : {
-                        type: "SMA", // `MA` is never used here since we only support deploying SMA & WebAuthn accounts.
-                        ownerAddress: owner.address,
-                        entityId,
-                    }),
-            }));
+            : factoryData_
+                ? await getModularAccountV2AddressFromFactoryData({
+                    client,
+                    factoryAddress,
+                    factoryData: factoryData_,
+                    implementationAddress,
+                    entryPoint: {
+                        version: "0.7",
+                        address: entryPoint07Address,
+                    },
+                })
+                : predictModularAccountV2Address({
+                    factoryAddress,
+                    implementationAddress,
+                    salt,
+                    type: "SMA",
+                    ownerAddress: owner.address,
+                }));
     LOGGER.debug("toModularAccountV2:address-resolved", {
         accountAddress,
         is7702,
@@ -93,7 +75,6 @@ export async function toModularAccountV2({ client, owner, deferredAction, signer
     let authorization;
     if (is7702) {
         LOGGER.debug("toModularAccountV2:7702-mode");
-        // TODO(v5): Ensure this works w/ our signer types.
         if (owner.type !== "local") {
             LOGGER.error("toModularAccountV2:invalid-owner-type", {
                 ownerType: owner.type,

package/dist/esm/ma-v2/accounts/account.js.map

@@ -1 +1 @@
-{"version":3,"file":"account.js","sourceRoot":"","sources":["../../../../src/ma-v2/accounts/account.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  encodeFunctionData,\n  type Address,\n  type Chain,\n  type Client,\n  type Hex,\n  type JsonRpcAccount,\n  type LocalAccount,\n  type PrivateKeyAccount,\n  type Transport,\n} from \"viem\";\nimport type {\n  WebAuthnAccount,\n  ToSmartAccountParameters,\n} from \"viem/account-abstraction\";\nimport { toModularAccountV2Base, type ModularAccountV2Base } from \"./base.js\";\nimport type { SignerEntity } from \"../types.js\";\nimport { predictModularAccountV2Address } from \"../predictAddress.js\";\nimport { parsePublicKey } from \"webauthn-p256\";\nimport { accountFactoryAbi } from \"../abis/accountFactoryAbi.js\";\nimport { webAuthnFactoryAbi } from \"../abis/webAuthnFactoryAbi.js\";\nimport { EntityIdOverrideError } from \"../../errors/EntityIdOverrideError.js\";\nimport { InvalidOwnerError } from \"../../errors/InvalidOwnerError.js\";\nimport { DEFAULT_OWNER_ENTITY_ID, DefaultAddress } from \"../utils/account.js\";\nimport { LOGGER } from \"../../logger.js\";\n\ntype Mode = \"default\" | \"7702\";\n\n// TODO(v5): does this need to be extended w/ any more methods like LightAccount does?\nexport type ModularAccountV2 = ModularAccountV2Base & {};\n\nexport type ToModularAccountV2Params<\n  TMode extends Mode | undefined = Mode | undefined,\n> = {\n  client: Client<Transport, Chain, JsonRpcAccount | LocalAccount | undefined>;\n  owner: JsonRpcAccount | LocalAccount | WebAuthnAccount;\n  deferredAction?: Hex;\n  signerEntity?: SignerEntity;\n  accountAddress?: Address;\n  mode?: TMode;\n} & (TMode extends \"7702\"\n  ? {\n      salt?: never;\n      factory?: never;\n      factoryData?: never;\n      implementationAddress?: never;\n    }\n  : {\n      salt?: bigint;\n      factory?: Address;\n      factoryData?: Hex;\n      implementationAddress?: Address;\n    });\n\n/**\n * Creates a MAv2 account.\n *\n * @param {ToModularAccountV2Params} param0 - The parameters for creating a MAv2 account.\n * @returns {Promise<ModularAccountV2>} A MAv2 account.\n */\nexport async function toModularAccountV2<TMode extends Mode = Mode>({\n  client,\n  owner,\n  deferredAction,\n  signerEntity,\n  accountAddress: accountAddress_,\n  salt = 0n,\n  factory,\n  factoryData: factoryData_,\n  implementationAddress: implementationAddress_,\n  mode,\n}: ToModularAccountV2Params<TMode>): Promise<ModularAccountV2> {\n  const is7702 = mode === \"7702\";\n\n  LOGGER.debug(\"toModularAccountV2:start\", {\n    ownerType: owner.type,\n    mode,\n    hasDeferredAction: !!deferredAction,\n    hasAccountAddress: !!accountAddress_,\n  });\n\n  const entityId = signerEntity?.entityId ?? DEFAULT_OWNER_ENTITY_ID;\n\n  const factoryAddress =\n    factory ??\n    (owner.type === \"webAuthn\"\n      ? DefaultAddress.MAV2_FACTORY_WEBAUTHN\n      : DefaultAddress.MAV2_FACTORY);\n\n  const implementationAddress =\n    implementationAddress_ ??\n    (is7702\n      ? DefaultAddress.SMAV2_7702\n      : owner.type === \"webAuthn\"\n        ? DefaultAddress.MAV2\n        : DefaultAddress.SMAV2_BYTECODE);\n\n  const getFactoryArgs = async () => {\n    if (is7702) {\n      // This is only for EP 0.8.0.\n      // return {\n      //   factory: \"0x7702\",\n      //   factoryData: \"0x\",\n      // } as const;\n      return {\n        factory: undefined,\n        factoryData: undefined,\n      } as const;\n    }\n\n    if (owner.type === \"webAuthn\") {\n      const { x, y } = parsePublicKey(owner.publicKey);\n      return {\n        factory: factoryAddress,\n        factoryData:\n          factoryData_ ??\n          encodeFunctionData({\n            abi: webAuthnFactoryAbi,\n            functionName: \"createWebAuthnAccount\",\n            args: [x, y, salt, entityId],\n          }),\n      };\n    }\n\n    return {\n      factory: factoryAddress,\n      factoryData:\n        factoryData_ ??\n        encodeFunctionData({\n          abi: accountFactoryAbi,\n          functionName: \"createSemiModularAccount\",\n          args: [owner.address, salt],\n        }),\n    };\n  };\n\n  const accountAddress =\n    accountAddress_ ??\n    (mode === \"7702\" && owner.type === \"local\"\n      ? owner.address\n      : predictModularAccountV2Address({\n          factoryAddress,\n          implementationAddress,\n          salt,\n          ...(owner.type === \"webAuthn\"\n            ? {\n                type: \"WebAuthn\",\n                ownerPublicKey: owner.publicKey,\n                entityId,\n              }\n            : {\n                type: \"SMA\", // `MA` is never used here since we only support deploying SMA & WebAuthn accounts.\n                ownerAddress: owner.address,\n                entityId,\n              }),\n        }));\n\n  LOGGER.debug(\"toModularAccountV2:address-resolved\", {\n    accountAddress,\n    is7702,\n  });\n\n  let authorization: ToSmartAccountParameters[\"authorization\"];\n  if (is7702) {\n    LOGGER.debug(\"toModularAccountV2:7702-mode\");\n    // TODO(v5): Ensure this works w/ our signer types.\n    if (owner.type !== \"local\") {\n      LOGGER.error(\"toModularAccountV2:invalid-owner-type\", {\n        ownerType: owner.type,\n      });\n      throw new InvalidOwnerError(\n        `Owner of type ${owner.type} is unsupported for 7702 mode.`,\n      );\n    }\n    if (owner.signAuthorization == null) {\n      LOGGER.error(\"toModularAccountV2:missing-signAuthorization\");\n      throw new InvalidOwnerError(\n        \"Owner must implement `signAuthorization` to be used with 7702 mode.\",\n      );\n    }\n    if (\n      entityId === DEFAULT_OWNER_ENTITY_ID &&\n      owner.address !== accountAddress\n    ) {\n      LOGGER.error(\"toModularAccountV2:entity-id-override\");\n      throw new EntityIdOverrideError();\n    }\n    authorization = {\n      // The current version of Viem has some pretty strict constraints\n      // on a `PrivateKeyAccount`, but this seems safe as long as the\n      // owner is able to `signAuthorization`.\n      account: owner as PrivateKeyAccount,\n      address: DefaultAddress.SMAV2_7702,\n    };\n  }\n\n  const base = await toModularAccountV2Base({\n    client,\n    owner,\n    accountAddress,\n    getFactoryArgs,\n    signerEntity,\n    deferredAction,\n    authorization,\n  });\n\n  return {\n    ...base,\n    // TODO(v5): does this need to be extended w/ any more methods like LightAccount does?\n  };\n}\n"]}
+{"version":3,"file":"account.js","sourceRoot":"","sources":["../../../../src/ma-v2/accounts/account.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  encodeFunctionData,\n  type Address,\n  type Chain,\n  type Client,\n  type Hex,\n  type JsonRpcAccount,\n  type LocalAccount,\n  type PrivateKeyAccount,\n  type Transport,\n} from \"viem\";\nimport {\n  type ToSmartAccountParameters,\n  entryPoint07Address,\n} from \"viem/account-abstraction\";\nimport { toModularAccountV2Base, type ModularAccountV2Base } from \"./base.js\";\nimport type { SignerEntity } from \"../types.js\";\nimport {\n  getModularAccountV2AddressFromFactoryData,\n  predictModularAccountV2Address,\n} from \"../predictAddress.js\";\nimport { accountFactoryAbi } from \"../abis/accountFactoryAbi.js\";\nimport { EntityIdOverrideError } from \"../../errors/EntityIdOverrideError.js\";\nimport { InvalidOwnerError } from \"../../errors/InvalidOwnerError.js\";\nimport { DEFAULT_OWNER_ENTITY_ID, DefaultAddress } from \"../utils/account.js\";\nimport { LOGGER } from \"../../logger.js\";\n\ntype Mode = \"default\" | \"7702\";\n\n// TODO(v5): does this need to be extended w/ any more methods like LightAccount does?\nexport type ModularAccountV2 = ModularAccountV2Base & {};\n\nexport type ToModularAccountV2Params<\n  TMode extends Mode | undefined = Mode | undefined,\n> = {\n  client: Client<Transport, Chain, JsonRpcAccount | LocalAccount | undefined>;\n  owner: JsonRpcAccount | LocalAccount;\n  deferredAction?: Hex;\n  signerEntity?: SignerEntity;\n  accountAddress?: Address;\n  mode?: TMode;\n} & (TMode extends \"7702\"\n  ? {\n      salt?: never;\n      factory?: never;\n      factoryData?: never;\n      implementationAddress?: never;\n    }\n  : {\n      factory?: Address;\n      implementationAddress?: Address;\n    } & (\n      | {\n          salt?: bigint;\n          factoryData?: never;\n        }\n      | {\n          salt?: never;\n          factoryData?: Hex;\n        }\n    ));\n\n/**\n * Creates a MAv2 account.\n *\n * @param {ToModularAccountV2Params} param0 - The parameters for creating a MAv2 account.\n * @returns {Promise<ModularAccountV2>} A MAv2 account.\n */\nexport async function toModularAccountV2<TMode extends Mode = Mode>({\n  client,\n  owner,\n  deferredAction,\n  signerEntity,\n  accountAddress: accountAddress_,\n  salt = 0n,\n  factory,\n  factoryData: factoryData_,\n  implementationAddress: implementationAddress_,\n  mode,\n}: ToModularAccountV2Params<TMode>): Promise<ModularAccountV2> {\n  const is7702 = mode === \"7702\";\n\n  LOGGER.debug(\"toModularAccountV2:start\", {\n    ownerType: owner.type,\n    mode,\n    hasDeferredAction: !!deferredAction,\n    hasAccountAddress: !!accountAddress_,\n  });\n\n  const entityId = signerEntity?.entityId ?? DEFAULT_OWNER_ENTITY_ID;\n\n  const factoryAddress = factory ?? DefaultAddress.MAV2_FACTORY;\n\n  const implementationAddress =\n    implementationAddress_ ??\n    (is7702 ? DefaultAddress.SMAV2_7702 : DefaultAddress.SMAV2_BYTECODE);\n\n  const getFactoryArgs = async () => {\n    if (is7702) {\n      // This is only for EP 0.8.0.\n      // return {\n      //   factory: \"0x7702\",\n      //   factoryData: \"0x\",\n      // } as const;\n      return {\n        factory: undefined,\n        factoryData: undefined,\n      } as const;\n    }\n\n    return {\n      factory: factoryAddress,\n      factoryData:\n        factoryData_ ??\n        encodeFunctionData({\n          abi: accountFactoryAbi,\n          functionName: \"createSemiModularAccount\",\n          args: [owner.address, salt],\n        }),\n    };\n  };\n\n  const accountAddress =\n    accountAddress_ ??\n    (is7702\n      ? owner.address\n      : factoryData_\n        ? await getModularAccountV2AddressFromFactoryData({\n            client,\n            factoryAddress,\n            factoryData: factoryData_,\n            implementationAddress,\n            entryPoint: {\n              version: \"0.7\",\n              address: entryPoint07Address,\n            },\n          })\n        : predictModularAccountV2Address({\n            factoryAddress,\n            implementationAddress,\n            salt,\n            type: \"SMA\",\n            ownerAddress: owner.address,\n          }));\n\n  LOGGER.debug(\"toModularAccountV2:address-resolved\", {\n    accountAddress,\n    is7702,\n  });\n\n  let authorization: ToSmartAccountParameters[\"authorization\"];\n  if (is7702) {\n    LOGGER.debug(\"toModularAccountV2:7702-mode\");\n    if (owner.type !== \"local\") {\n      LOGGER.error(\"toModularAccountV2:invalid-owner-type\", {\n        ownerType: owner.type,\n      });\n      throw new InvalidOwnerError(\n        `Owner of type ${owner.type} is unsupported for 7702 mode.`,\n      );\n    }\n    if (owner.signAuthorization == null) {\n      LOGGER.error(\"toModularAccountV2:missing-signAuthorization\");\n      throw new InvalidOwnerError(\n        \"Owner must implement `signAuthorization` to be used with 7702 mode.\",\n      );\n    }\n    if (\n      entityId === DEFAULT_OWNER_ENTITY_ID &&\n      owner.address !== accountAddress\n    ) {\n      LOGGER.error(\"toModularAccountV2:entity-id-override\");\n      throw new EntityIdOverrideError();\n    }\n    authorization = {\n      // The current version of Viem has some pretty strict constraints\n      // on a `PrivateKeyAccount`, but this seems safe as long as the\n      // owner is able to `signAuthorization`.\n      account: owner as PrivateKeyAccount,\n      address: DefaultAddress.SMAV2_7702,\n    };\n  }\n\n  const base = await toModularAccountV2Base({\n    client,\n    owner,\n    accountAddress,\n    getFactoryArgs,\n    signerEntity,\n    deferredAction,\n    authorization,\n  });\n\n  return {\n    ...base,\n    // TODO(v5): does this need to be extended w/ any more methods like LightAccount does?\n  };\n}\n"]}

package/dist/esm/ma-v2/accounts/base.d.ts

@@ -1,5 +1,5 @@
 import { type Address, type Hex, type Chain, type Client, type JsonRpcAccount, type LocalAccount, type Transport } from "viem";
-import { entryPoint07Abi, type SmartAccountImplementation, type WebAuthnAccount, type ToSmartAccountParameters } from "viem/account-abstraction";
+import { entryPoint07Abi, type SmartAccountImplementation, type ToSmartAccountParameters } from "viem/account-abstraction";
 import { type ExecutionDataView, type SignerEntity, type ValidationDataView } from "../types.js";
 import type { SignatureRequest, SmartAccountWithDecodeCalls } from "../../types.js";
 export type ValidationDataParams = {
@@ -21,7 +21,7 @@ export type BaseModularAccountV2Implementation = SmartAccountImplementation<type
 export type ModularAccountV2Base = SmartAccountWithDecodeCalls<BaseModularAccountV2Implementation>;
 export type ToModularAccountV2BaseParams<TTransport extends Transport = Transport> = {
     client: Client<TTransport, Chain, JsonRpcAccount | LocalAccount | undefined>;
-    owner: JsonRpcAccount | LocalAccount | WebAuthnAccount;
+    owner: JsonRpcAccount | LocalAccount;
     accountAddress: Address;
     getFactoryArgs: () => Promise<{
         factory?: Address | undefined;