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

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

@@ -1,5 +1,5 @@
 import { concat, concatHex, encodeFunctionData, hashMessage, hashTypedData, maxUint32, maxUint152, zeroAddress, } from "viem";
-import { entryPoint07Abi, entryPoint07Address, getUserOperationHash, toSmartAccount, estimateUserOperationGas, } from "viem/account-abstraction";
+import { entryPoint07Abi, entryPoint07Address, getUserOperationHash, toSmartAccount, } from "viem/account-abstraction";
 import { getCode, readContract, signMessage, signTypedData, } from "viem/actions";
 import { assertNever, BaseError } from "@alchemy/common";
 import { SignaturePrefix, } from "../types.js";
@@ -7,11 +7,11 @@ import { modularAccountAbi } from "../abis/modularAccountAbi.js";
 import { decodeFunctionData, getAction, isAddressEqual, sliceHex, } from "viem/utils";
 import { DEFAULT_OWNER_ENTITY_ID, DefaultModuleAddress, EXECUTE_USER_OP_SELECTOR, serializeModuleEntity, } from "../utils/account.js";
 import { parseDeferredAction } from "../utils/deferredActions.js";
-import { pack1271Signature, toWebAuthnSignature, toReplaySafeTypedData, packUOSignature, WEBAUTHN_DUMMY_SIGNATURE, } from "../utils/signature.js";
-import { chainHas7212 } from "../../utils.js";
+import { pack1271Signature, toReplaySafeTypedData, packUOSignature, } from "../utils/signature.js";
 import { InvalidDeferredActionNonceError } from "../../errors/InvalidDeferredActionNonceError.js";
 import { InvalidNonceKeyError } from "../../errors/InvalidNonceKeyError.js";
 import { InvalidEntityIdError } from "../../errors/InvalidEntityIdError.js";
+import { is7702Delegated } from "../../utils.js";
 /**
  * Creates a ModularAccountV2Base instance.
  *
@@ -38,7 +38,9 @@ export async function toModularAccountV2Base({ client, owner, accountAddress, ge
         }
         const action = getAction(client, getCode, "getCode");
         const code = await action({ address: accountAddress });
-        isDeployed = !!code;
+        isDeployed = authorization
+            ? is7702Delegated(authorization.address, code)
+            : !!code;
         return isDeployed;
     };
     // These default values signal that we should not use the set deferred action nonce
@@ -159,24 +161,19 @@ export async function toModularAccountV2Base({ client, owner, accountAddress, ge
             data: toReplaySafeTypedData({
                 chainId: client.chain.id,
                 hash,
-                ...(owner.type === "webAuthn"
-                    ? {
-                        address: DefaultModuleAddress.WEBAUTHN_VALIDATION,
+                ...(entityId === DEFAULT_OWNER_ENTITY_ID
+                    ? { address: accountAddress }
+                    : {
+                        address: DefaultModuleAddress.SINGLE_SIGNER_VALIDATION,
                         salt: concatHex([`0x${"00".repeat(12)}`, accountAddress]),
-                    }
-                    : entityId === DEFAULT_OWNER_ENTITY_ID
-                        ? { address: accountAddress }
-                        : {
-                            address: DefaultModuleAddress.SINGLE_SIGNER_VALIDATION,
-                            salt: concatHex([`0x${"00".repeat(12)}`, accountAddress]),
-                        }),
+                    }),
             }),
         };
     };
     const formatSignature = async (signature) => {
         return pack1271Signature({
             entityId,
-            validationSignaturePrefix: owner.type === "webAuthn" ? null : SignaturePrefix.EOA,
+            validationSignaturePrefix: SignaturePrefix.EOA,
             validationSignature: signature,
         });
     };
@@ -254,9 +251,6 @@ export async function toModularAccountV2Base({ client, owner, accountAddress, ge
             ];
         },
         async getStubSignature() {
-            if (owner.type === "webAuthn") {
-                return WEBAUTHN_DUMMY_SIGNATURE;
-            }
             const sig = packUOSignature({
                 validationSignature: "0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c",
             });
@@ -267,10 +261,6 @@ export async function toModularAccountV2Base({ client, owner, accountAddress, ge
                 type: "personal_sign",
                 data: message,
             });
-            if (owner.type === "webAuthn") {
-                const validationSignature = toWebAuthnSignature(await owner.sign({ hash: hashTypedData(data) }));
-                return formatSignature(validationSignature);
-            }
             const action = getAction(client, signTypedData, "signTypedData");
             const signature = await action({
                 ...data,
@@ -288,12 +278,6 @@ export async function toModularAccountV2Base({ client, owner, accountAddress, ge
                 type: "eth_signTypedData_v4",
                 data: td, // TODO(v5): Try harder to satisfy this w/o casting.
             });
-            if (owner.type === "webAuthn") {
-                const validationSignature = toWebAuthnSignature(await owner.sign({ hash: hashTypedData(data) }));
-                return isDeferredAction
-                    ? validationSignature
-                    : formatSignature(validationSignature);
-            }
             const action = getAction(client, signTypedData, "signTypedData");
             const signature = await action({
                 ...data,
@@ -313,17 +297,6 @@ export async function toModularAccountV2Base({ client, owner, accountAddress, ge
                     sender: accountAddress,
                 },
             });
-            if (owner.type === "webAuthn") {
-                const validationSignature = toWebAuthnSignature(await owner.sign({
-                    hash: hashMessage({ raw: hash }),
-                }));
-                const signature = deferredActionData
-                    ? concatHex([deferredActionData, validationSignature])
-                    : validationSignature;
-                deferredActionData = undefined; // clear once used
-                hasAssociatedExecHooks = false; // set to falsy value once used
-                return concatHex(["0xff", signature]);
-            }
             const signMessageAction = getAction(client, signMessage, "signMessage");
             const validationSignature = await signMessageAction({
                 account: owner,
@@ -339,26 +312,6 @@ export async function toModularAccountV2Base({ client, owner, accountAddress, ge
             hasAssociatedExecHooks = false; // set to falsy value once used
             return signature;
         },
-        userOperation: {
-            estimateGas: async (uo) => {
-                if (owner.type !== "webAuthn") {
-                    // Uses the default gas estimator.
-                    // Note that we get 7702 support automatically from Viem.
-                    return undefined;
-                }
-                const estimateGasAction = getAction(client, estimateUserOperationGas, "estimateUserOperationGas");
-                const estimate = await estimateGasAction({
-                    ...uo,
-                    entryPointAddress: entryPoint.address,
-                });
-                const buffer = (await chainHas7212(client)) ? 10000n : 300000n;
-                // TODO(v4): iterate numbers. Aim to have ~1000 gas buffer to account for longer authenticatorDatas and clientDataJSONs.
-                return {
-                    ...estimate,
-                    verificationGasLimit: estimate.verificationGasLimit + buffer,
-                };
-            },
-        },
         extend: {
             smartAccountType: "ModularAccountV2",
             signerEntity: {

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

@@ -1 +1 @@
-{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../../src/ma-v2/accounts/base.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  type Address,\n  type Hex,\n  type Chain,\n  type Client,\n  type JsonRpcAccount,\n  type LocalAccount,\n  type Transport,\n  concat,\n  concatHex,\n  encodeFunctionData,\n  hashMessage,\n  hashTypedData,\n  type TypedDataDefinition,\n  maxUint32,\n  maxUint152,\n  zeroAddress,\n} from \"viem\";\nimport {\n  entryPoint07Abi,\n  type SmartAccountImplementation,\n  entryPoint07Address,\n  getUserOperationHash,\n  toSmartAccount,\n  type WebAuthnAccount,\n  type ToSmartAccountParameters,\n  estimateUserOperationGas,\n  type UserOperation,\n} from \"viem/account-abstraction\";\nimport {\n  getCode,\n  readContract,\n  signMessage,\n  signTypedData,\n} from \"viem/actions\";\nimport { assertNever, BaseError } from \"@alchemy/common\";\nimport {\n  SignaturePrefix,\n  type ExecutionDataView,\n  type SignerEntity,\n  type ValidationDataView,\n} from \"../types.js\";\nimport { modularAccountAbi } from \"../abis/modularAccountAbi.js\";\nimport type {\n  SignatureRequest,\n  SmartAccountWithDecodeCalls,\n} from \"../../types.js\";\nimport {\n  decodeFunctionData,\n  getAction,\n  isAddressEqual,\n  sliceHex,\n} from \"viem/utils\";\nimport {\n  DEFAULT_OWNER_ENTITY_ID,\n  DefaultModuleAddress,\n  EXECUTE_USER_OP_SELECTOR,\n  serializeModuleEntity,\n} from \"../utils/account.js\";\nimport { parseDeferredAction } from \"../utils/deferredActions.js\";\nimport {\n  pack1271Signature,\n  toWebAuthnSignature,\n  toReplaySafeTypedData,\n  packUOSignature,\n  WEBAUTHN_DUMMY_SIGNATURE,\n} from \"../utils/signature.js\";\nimport { chainHas7212 } from \"../../utils.js\";\nimport { InvalidDeferredActionNonceError } from \"../../errors/InvalidDeferredActionNonceError.js\";\nimport { InvalidNonceKeyError } from \"../../errors/InvalidNonceKeyError.js\";\nimport { InvalidEntityIdError } from \"../../errors/InvalidEntityIdError.js\";\n\nexport type ValidationDataParams =\n  | {\n      validationModuleAddress: Address;\n      entityId?: never;\n    }\n  | {\n      validationModuleAddress?: never;\n      entityId: number;\n    };\n\nexport type BaseModularAccountV2Implementation = SmartAccountImplementation<\n  typeof entryPoint07Abi,\n  \"0.7\",\n  {\n    smartAccountType: \"ModularAccountV2\";\n    signerEntity: SignerEntity;\n    encodeCallData: (callData: Hex) => Promise<Hex>;\n    getExecutionData: (selector: Hex) => Promise<ExecutionDataView>;\n    getValidationData: (\n      args: ValidationDataParams,\n    ) => Promise<ValidationDataView>;\n    prepareSignature: (request: SignatureRequest) => Promise<SignatureRequest>;\n    formatSignature: (signature: Hex) => Promise<Hex>;\n  },\n  boolean\n>;\n\nexport type ModularAccountV2Base =\n  SmartAccountWithDecodeCalls<BaseModularAccountV2Implementation>;\n\nexport type ToModularAccountV2BaseParams<\n  TTransport extends Transport = Transport,\n> = {\n  client: Client<TTransport, Chain, JsonRpcAccount | LocalAccount | undefined>;\n  owner: JsonRpcAccount | LocalAccount | WebAuthnAccount;\n  accountAddress: Address;\n  getFactoryArgs: () => Promise<{\n    factory?: Address | undefined;\n    factoryData?: Hex | undefined;\n  }>;\n  signerEntity?: SignerEntity;\n  deferredAction?: Hex;\n  authorization?: ToSmartAccountParameters[\"authorization\"];\n};\n\n/**\n * Creates a ModularAccountV2Base instance.\n *\n * @param {ToModularAccountV2BaseParams<TTransport>} params - The parameters for creating a ModularAccountV2Base instance.\n * @returns {Promise<ModularAccountV2Base>} A promise that resolves to a ModularAccountV2Base instance.\n */\nexport async function toModularAccountV2Base<\n  TTransport extends Transport = Transport,\n>({\n  client,\n  owner,\n  accountAddress,\n  getFactoryArgs,\n  signerEntity = {\n    isGlobalValidation: true,\n    entityId: DEFAULT_OWNER_ENTITY_ID,\n  },\n  deferredAction,\n  authorization,\n}: ToModularAccountV2BaseParams<TTransport>): Promise<ModularAccountV2Base> {\n  let { isGlobalValidation, entityId } = signerEntity;\n\n  const entryPoint = {\n    abi: entryPoint07Abi,\n    address: entryPoint07Address as Address,\n    version: \"0.7\" as const,\n  };\n\n  if (entityId > Number(maxUint32)) {\n    throw new InvalidEntityIdError(entityId);\n  }\n\n  let isDeployed = false;\n\n  const isAccountDeployed: () => Promise<boolean> = async () => {\n    if (isDeployed) {\n      return true;\n    }\n    const action = getAction(client, getCode, \"getCode\");\n    const code = await action({ address: accountAddress });\n    isDeployed = !!code;\n    return isDeployed;\n  };\n\n  // These default values signal that we should not use the set deferred action nonce\n  let nonce: bigint | undefined;\n  let deferredActionData: Hex | undefined;\n  let hasAssociatedExecHooks: boolean = false;\n\n  if (deferredAction) {\n    let deferredActionNonce = 0n;\n    // We always update entity id and isGlobalValidation to the deferred action value since the client could be used to send multiple calls\n    ({\n      entityId,\n      isGlobalValidation,\n      nonce: deferredActionNonce,\n    } = parseDeferredAction(deferredAction));\n\n    const readContractAction = getAction(client, readContract, \"readContract\");\n\n    // Set these values if the deferred action has not been consumed. We check this with the EP.\n    const nextNonceForDeferredAction: bigint = await readContractAction({\n      ...entryPoint,\n      functionName: \"getNonce\",\n      args: [accountAddress, deferredActionNonce >> 64n],\n    });\n\n    if (deferredActionNonce === nextNonceForDeferredAction) {\n      ({ nonce, deferredActionData, hasAssociatedExecHooks } =\n        parseDeferredAction(deferredAction));\n    } else if (deferredActionNonce > nextNonceForDeferredAction) {\n      // if nonce is greater than the next nonce, its invalid, so we throw\n      throw new InvalidDeferredActionNonceError();\n    }\n  }\n\n  const getNonce = async (\n    params?: { key?: bigint | undefined } | undefined,\n  ): Promise<bigint> => {\n    if (nonce) {\n      const tempNonce = nonce;\n      nonce = undefined; // set to falsy value once used\n      return tempNonce;\n    }\n\n    const nonceKey = params?.key ?? 0n;\n\n    if (nonceKey > maxUint152) {\n      throw new InvalidNonceKeyError(nonceKey);\n    }\n\n    const fullNonceKey =\n      (nonceKey << 40n) +\n      (BigInt(entityId) << 8n) +\n      (isGlobalValidation ? 1n : 0n);\n\n    const readContractAction = getAction(client, readContract, \"readContract\");\n\n    return readContractAction({\n      ...entryPoint,\n      functionName: \"getNonce\",\n      args: [accountAddress, fullNonceKey],\n    });\n  };\n\n  const accountContract = {\n    address: accountAddress,\n    abi: modularAccountAbi,\n  };\n\n  const getExecutionData = async (selector: Hex) => {\n    if (!(await isAccountDeployed())) {\n      return {\n        module: zeroAddress,\n        skipRuntimeValidation: false,\n        allowGlobalValidation: false,\n        executionHooks: [],\n      };\n    }\n\n    return readContract(client, {\n      ...accountContract,\n      functionName: \"getExecutionData\",\n      args: [selector],\n    });\n  };\n\n  const getValidationData = async (args: ValidationDataParams) => {\n    if (!(await isAccountDeployed())) {\n      return {\n        validationHooks: [],\n        executionHooks: [],\n        selectors: [],\n        validationFlags: 0,\n      };\n    }\n\n    const { validationModuleAddress, entityId } = args;\n    const readContractAction = getAction(client, readContract, \"readContract\");\n    return readContractAction({\n      ...accountContract,\n      functionName: \"getValidationData\",\n      args: [\n        serializeModuleEntity({\n          moduleAddress: validationModuleAddress ?? zeroAddress,\n          entityId: entityId ?? Number(maxUint32),\n        }),\n      ],\n    });\n  };\n\n  const encodeCallData = async (callData: Hex): Promise<Hex> => {\n    const validationData = await getValidationData({\n      entityId: Number(entityId),\n    });\n    if (hasAssociatedExecHooks) {\n      return concatHex([EXECUTE_USER_OP_SELECTOR, callData]);\n    }\n    if (validationData.executionHooks.length) {\n      return concatHex([EXECUTE_USER_OP_SELECTOR, callData]);\n    }\n    return callData;\n  };\n\n  const prepareSignature = async (\n    request: SignatureRequest,\n  ): Promise<Extract<SignatureRequest, { type: \"eth_signTypedData_v4\" }>> => {\n    const isDeferredAction =\n      request.type === \"eth_signTypedData_v4\" &&\n      request.data?.primaryType === \"DeferredAction\" &&\n      request.data?.domain?.verifyingContract === accountAddress;\n\n    if (isDeferredAction && entityId === DEFAULT_OWNER_ENTITY_ID) {\n      return request;\n    }\n\n    const hash =\n      request.type === \"personal_sign\"\n        ? hashMessage(request.data)\n        : request.type === \"eth_signTypedData_v4\"\n          ? hashTypedData(request.data)\n          : assertNever(request, \"Unexpected signature request type\");\n\n    return {\n      type: \"eth_signTypedData_v4\",\n      data: toReplaySafeTypedData({\n        chainId: client.chain.id,\n        hash,\n        ...(owner.type === \"webAuthn\"\n          ? {\n              address: DefaultModuleAddress.WEBAUTHN_VALIDATION,\n              salt: concatHex([`0x${\"00\".repeat(12)}`, accountAddress]),\n            }\n          : entityId === DEFAULT_OWNER_ENTITY_ID\n            ? { address: accountAddress }\n            : {\n                address: DefaultModuleAddress.SINGLE_SIGNER_VALIDATION,\n                salt: concatHex([`0x${\"00\".repeat(12)}`, accountAddress]),\n              }),\n      }),\n    };\n  };\n\n  const formatSignature = async (signature: Hex): Promise<Hex> => {\n    return pack1271Signature({\n      entityId,\n      validationSignaturePrefix:\n        owner.type === \"webAuthn\" ? null : SignaturePrefix.EOA,\n      validationSignature: signature,\n    });\n  };\n\n  return await toSmartAccount({\n    getFactoryArgs,\n    client,\n    entryPoint,\n    getNonce,\n    authorization,\n\n    async getAddress() {\n      return accountAddress;\n    },\n\n    async encodeCalls(calls) {\n      if (calls.length === 1) {\n        const call = calls[0];\n\n        if (isAddressEqual(call.to, accountAddress)) {\n          // If the call is to the account itself, we need to avoid wrapping it in an `execute` call.\n\n          if (call.data === undefined) {\n            throw new BaseError(\"Data is required for an account self-call.\");\n          }\n\n          return encodeCallData(call.data);\n        }\n\n        return encodeCallData(\n          encodeFunctionData({\n            abi: modularAccountAbi,\n            functionName: \"execute\",\n            args: [call.to, call.value ?? 0n, call.data ?? \"0x\"],\n          }),\n        );\n      }\n\n      return encodeCallData(\n        encodeFunctionData({\n          abi: modularAccountAbi,\n          functionName: \"executeBatch\",\n          args: [\n            calls.map((call) => ({\n              target: call.to,\n              data: call.data ?? \"0x\",\n              value: call.value ?? 0n,\n            })),\n          ],\n        }),\n      );\n    },\n\n    async decodeCalls(data) {\n      // Inverse of `encodeCalls`.\n      // Trim the EXECUTE_USER_OP_SELECTOR if it is present.\n      const trimmedData = data\n        .toLowerCase()\n        .startsWith(EXECUTE_USER_OP_SELECTOR.toLowerCase())\n        ? sliceHex(data, 4)\n        : data;\n\n      const decoded = decodeFunctionData({\n        abi: modularAccountAbi,\n        data: trimmedData,\n      });\n\n      if (decoded.functionName === \"execute\") {\n        return [\n          {\n            to: decoded.args[0],\n            value: decoded.args[1],\n            data: decoded.args[2],\n          },\n        ];\n      }\n\n      if (decoded.functionName === \"executeBatch\") {\n        return decoded.args[0].map((call) => ({\n          to: call.target,\n          value: call.value,\n          data: call.data,\n        }));\n      }\n\n      // If the data is not for an `execute` or `executeBatch` call, we treat it as a single call to the account itself.\n      return [\n        {\n          to: accountAddress,\n          data,\n        },\n      ];\n    },\n\n    async getStubSignature() {\n      if (owner.type === \"webAuthn\") {\n        return WEBAUTHN_DUMMY_SIGNATURE;\n      }\n\n      const sig = packUOSignature({\n        validationSignature:\n          \"0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c\",\n      });\n      return deferredActionData ? concatHex([deferredActionData, sig]) : sig;\n    },\n\n    async signMessage({ message }) {\n      const { data } = await prepareSignature({\n        type: \"personal_sign\",\n        data: message,\n      });\n\n      if (owner.type === \"webAuthn\") {\n        const validationSignature = toWebAuthnSignature(\n          await owner.sign({ hash: hashTypedData(data) }),\n        );\n        return formatSignature(validationSignature);\n      }\n\n      const action = getAction(client, signTypedData, \"signTypedData\");\n\n      const signature = await action({\n        ...data,\n        account: owner,\n      });\n\n      return formatSignature(signature);\n    },\n\n    async signTypedData(td) {\n      const isDeferredAction =\n        td.primaryType === \"DeferredAction\" &&\n        td.domain &&\n        typeof td.domain === \"object\" &&\n        \"verifyingContract\" in td.domain &&\n        td.domain.verifyingContract === accountAddress;\n\n      const { data } = await prepareSignature({\n        type: \"eth_signTypedData_v4\",\n        data: td as TypedDataDefinition, // TODO(v5): Try harder to satisfy this w/o casting.\n      });\n\n      if (owner.type === \"webAuthn\") {\n        const validationSignature = toWebAuthnSignature(\n          await owner.sign({ hash: hashTypedData(data) }),\n        );\n        return isDeferredAction\n          ? validationSignature\n          : formatSignature(validationSignature);\n      }\n\n      const action = getAction(client, signTypedData, \"signTypedData\");\n\n      const signature = await action({\n        ...data,\n        account: owner,\n      });\n\n      return isDeferredAction\n        ? concat([SignaturePrefix.EOA, signature])\n        : formatSignature(signature);\n    },\n\n    async signUserOperation(uo) {\n      const hash = getUserOperationHash({\n        chainId: uo.chainId ?? client.chain.id,\n        entryPointAddress: entryPoint.address,\n        entryPointVersion: entryPoint.version,\n        userOperation: {\n          ...uo,\n          sender: accountAddress,\n        },\n      });\n\n      if (owner.type === \"webAuthn\") {\n        const validationSignature = toWebAuthnSignature(\n          await owner.sign({\n            hash: hashMessage({ raw: hash }),\n          }),\n        );\n\n        const signature = deferredActionData\n          ? concatHex([deferredActionData, validationSignature])\n          : validationSignature;\n        deferredActionData = undefined; // clear once used\n        hasAssociatedExecHooks = false; // set to falsy value once used\n        return concatHex([\"0xff\", signature]);\n      }\n\n      const signMessageAction = getAction(client, signMessage, \"signMessage\");\n\n      const validationSignature = await signMessageAction({\n        account: owner,\n        message: { raw: hash },\n      });\n\n      const packedSignature = packUOSignature({\n        validationSignature,\n      });\n\n      const signature = deferredActionData\n        ? concatHex([deferredActionData, packedSignature])\n        : packedSignature;\n\n      deferredActionData = undefined; // clear once used\n      hasAssociatedExecHooks = false; // set to falsy value once used\n\n      return signature;\n    },\n\n    userOperation: {\n      estimateGas: async (uo) => {\n        if (owner.type !== \"webAuthn\") {\n          // Uses the default gas estimator.\n          // Note that we get 7702 support automatically from Viem.\n          return undefined;\n        }\n\n        const estimateGasAction = getAction(\n          client,\n          estimateUserOperationGas,\n          \"estimateUserOperationGas\",\n        );\n\n        const estimate = await estimateGasAction({\n          ...(uo as UserOperation<typeof entryPoint.version>),\n          entryPointAddress: entryPoint.address,\n        });\n\n        const buffer = (await chainHas7212(client)) ? 10000n : 300000n;\n\n        // TODO(v4): iterate numbers. Aim to have ~1000 gas buffer to account for longer authenticatorDatas and clientDataJSONs.\n        return {\n          ...estimate,\n          verificationGasLimit: estimate.verificationGasLimit + buffer,\n        };\n      },\n    },\n\n    extend: {\n      smartAccountType: \"ModularAccountV2\" as const,\n      signerEntity: {\n        entityId,\n        isGlobalValidation,\n      },\n      encodeCallData,\n      getExecutionData,\n      getValidationData,\n      prepareSignature,\n      formatSignature,\n    },\n  });\n}\n"]}
+{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../../src/ma-v2/accounts/base.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  type Address,\n  type Hex,\n  type Chain,\n  type Client,\n  type JsonRpcAccount,\n  type LocalAccount,\n  type Transport,\n  concat,\n  concatHex,\n  encodeFunctionData,\n  hashMessage,\n  hashTypedData,\n  type TypedDataDefinition,\n  maxUint32,\n  maxUint152,\n  zeroAddress,\n} from \"viem\";\nimport {\n  entryPoint07Abi,\n  type SmartAccountImplementation,\n  entryPoint07Address,\n  getUserOperationHash,\n  toSmartAccount,\n  type ToSmartAccountParameters,\n} from \"viem/account-abstraction\";\nimport {\n  getCode,\n  readContract,\n  signMessage,\n  signTypedData,\n} from \"viem/actions\";\nimport { assertNever, BaseError } from \"@alchemy/common\";\nimport {\n  SignaturePrefix,\n  type ExecutionDataView,\n  type SignerEntity,\n  type ValidationDataView,\n} from \"../types.js\";\nimport { modularAccountAbi } from \"../abis/modularAccountAbi.js\";\nimport type {\n  SignatureRequest,\n  SmartAccountWithDecodeCalls,\n} from \"../../types.js\";\nimport {\n  decodeFunctionData,\n  getAction,\n  isAddressEqual,\n  sliceHex,\n} from \"viem/utils\";\nimport {\n  DEFAULT_OWNER_ENTITY_ID,\n  DefaultModuleAddress,\n  EXECUTE_USER_OP_SELECTOR,\n  serializeModuleEntity,\n} from \"../utils/account.js\";\nimport { parseDeferredAction } from \"../utils/deferredActions.js\";\nimport {\n  pack1271Signature,\n  toReplaySafeTypedData,\n  packUOSignature,\n} from \"../utils/signature.js\";\nimport { InvalidDeferredActionNonceError } from \"../../errors/InvalidDeferredActionNonceError.js\";\nimport { InvalidNonceKeyError } from \"../../errors/InvalidNonceKeyError.js\";\nimport { InvalidEntityIdError } from \"../../errors/InvalidEntityIdError.js\";\nimport { is7702Delegated } from \"../../utils.js\";\n\nexport type ValidationDataParams =\n  | {\n      validationModuleAddress: Address;\n      entityId?: never;\n    }\n  | {\n      validationModuleAddress?: never;\n      entityId: number;\n    };\n\nexport type BaseModularAccountV2Implementation = SmartAccountImplementation<\n  typeof entryPoint07Abi,\n  \"0.7\",\n  {\n    smartAccountType: \"ModularAccountV2\";\n    signerEntity: SignerEntity;\n    encodeCallData: (callData: Hex) => Promise<Hex>;\n    getExecutionData: (selector: Hex) => Promise<ExecutionDataView>;\n    getValidationData: (\n      args: ValidationDataParams,\n    ) => Promise<ValidationDataView>;\n    prepareSignature: (request: SignatureRequest) => Promise<SignatureRequest>;\n    formatSignature: (signature: Hex) => Promise<Hex>;\n  },\n  boolean\n>;\n\nexport type ModularAccountV2Base =\n  SmartAccountWithDecodeCalls<BaseModularAccountV2Implementation>;\n\nexport type ToModularAccountV2BaseParams<\n  TTransport extends Transport = Transport,\n> = {\n  client: Client<TTransport, Chain, JsonRpcAccount | LocalAccount | undefined>;\n  owner: JsonRpcAccount | LocalAccount;\n  accountAddress: Address;\n  getFactoryArgs: () => Promise<{\n    factory?: Address | undefined;\n    factoryData?: Hex | undefined;\n  }>;\n  signerEntity?: SignerEntity;\n  deferredAction?: Hex;\n  authorization?: ToSmartAccountParameters[\"authorization\"];\n};\n\n/**\n * Creates a ModularAccountV2Base instance.\n *\n * @param {ToModularAccountV2BaseParams<TTransport>} params - The parameters for creating a ModularAccountV2Base instance.\n * @returns {Promise<ModularAccountV2Base>} A promise that resolves to a ModularAccountV2Base instance.\n */\nexport async function toModularAccountV2Base<\n  TTransport extends Transport = Transport,\n>({\n  client,\n  owner,\n  accountAddress,\n  getFactoryArgs,\n  signerEntity = {\n    isGlobalValidation: true,\n    entityId: DEFAULT_OWNER_ENTITY_ID,\n  },\n  deferredAction,\n  authorization,\n}: ToModularAccountV2BaseParams<TTransport>): Promise<ModularAccountV2Base> {\n  let { isGlobalValidation, entityId } = signerEntity;\n\n  const entryPoint = {\n    abi: entryPoint07Abi,\n    address: entryPoint07Address as Address,\n    version: \"0.7\" as const,\n  };\n\n  if (entityId > Number(maxUint32)) {\n    throw new InvalidEntityIdError(entityId);\n  }\n\n  let isDeployed = false;\n\n  const isAccountDeployed: () => Promise<boolean> = async () => {\n    if (isDeployed) {\n      return true;\n    }\n    const action = getAction(client, getCode, \"getCode\");\n    const code = await action({ address: accountAddress });\n    isDeployed = authorization\n      ? is7702Delegated(authorization.address, code)\n      : !!code;\n    return isDeployed;\n  };\n\n  // These default values signal that we should not use the set deferred action nonce\n  let nonce: bigint | undefined;\n  let deferredActionData: Hex | undefined;\n  let hasAssociatedExecHooks: boolean = false;\n\n  if (deferredAction) {\n    let deferredActionNonce = 0n;\n    // We always update entity id and isGlobalValidation to the deferred action value since the client could be used to send multiple calls\n    ({\n      entityId,\n      isGlobalValidation,\n      nonce: deferredActionNonce,\n    } = parseDeferredAction(deferredAction));\n\n    const readContractAction = getAction(client, readContract, \"readContract\");\n\n    // Set these values if the deferred action has not been consumed. We check this with the EP.\n    const nextNonceForDeferredAction: bigint = await readContractAction({\n      ...entryPoint,\n      functionName: \"getNonce\",\n      args: [accountAddress, deferredActionNonce >> 64n],\n    });\n\n    if (deferredActionNonce === nextNonceForDeferredAction) {\n      ({ nonce, deferredActionData, hasAssociatedExecHooks } =\n        parseDeferredAction(deferredAction));\n    } else if (deferredActionNonce > nextNonceForDeferredAction) {\n      // if nonce is greater than the next nonce, its invalid, so we throw\n      throw new InvalidDeferredActionNonceError();\n    }\n  }\n\n  const getNonce = async (\n    params?: { key?: bigint | undefined } | undefined,\n  ): Promise<bigint> => {\n    if (nonce) {\n      const tempNonce = nonce;\n      nonce = undefined; // set to falsy value once used\n      return tempNonce;\n    }\n\n    const nonceKey = params?.key ?? 0n;\n\n    if (nonceKey > maxUint152) {\n      throw new InvalidNonceKeyError(nonceKey);\n    }\n\n    const fullNonceKey =\n      (nonceKey << 40n) +\n      (BigInt(entityId) << 8n) +\n      (isGlobalValidation ? 1n : 0n);\n\n    const readContractAction = getAction(client, readContract, \"readContract\");\n\n    return readContractAction({\n      ...entryPoint,\n      functionName: \"getNonce\",\n      args: [accountAddress, fullNonceKey],\n    });\n  };\n\n  const accountContract = {\n    address: accountAddress,\n    abi: modularAccountAbi,\n  };\n\n  const getExecutionData = async (selector: Hex) => {\n    if (!(await isAccountDeployed())) {\n      return {\n        module: zeroAddress,\n        skipRuntimeValidation: false,\n        allowGlobalValidation: false,\n        executionHooks: [],\n      };\n    }\n\n    return readContract(client, {\n      ...accountContract,\n      functionName: \"getExecutionData\",\n      args: [selector],\n    });\n  };\n\n  const getValidationData = async (args: ValidationDataParams) => {\n    if (!(await isAccountDeployed())) {\n      return {\n        validationHooks: [],\n        executionHooks: [],\n        selectors: [],\n        validationFlags: 0,\n      };\n    }\n\n    const { validationModuleAddress, entityId } = args;\n    const readContractAction = getAction(client, readContract, \"readContract\");\n    return readContractAction({\n      ...accountContract,\n      functionName: \"getValidationData\",\n      args: [\n        serializeModuleEntity({\n          moduleAddress: validationModuleAddress ?? zeroAddress,\n          entityId: entityId ?? Number(maxUint32),\n        }),\n      ],\n    });\n  };\n\n  const encodeCallData = async (callData: Hex): Promise<Hex> => {\n    const validationData = await getValidationData({\n      entityId: Number(entityId),\n    });\n    if (hasAssociatedExecHooks) {\n      return concatHex([EXECUTE_USER_OP_SELECTOR, callData]);\n    }\n    if (validationData.executionHooks.length) {\n      return concatHex([EXECUTE_USER_OP_SELECTOR, callData]);\n    }\n    return callData;\n  };\n\n  const prepareSignature = async (\n    request: SignatureRequest,\n  ): Promise<Extract<SignatureRequest, { type: \"eth_signTypedData_v4\" }>> => {\n    const isDeferredAction =\n      request.type === \"eth_signTypedData_v4\" &&\n      request.data?.primaryType === \"DeferredAction\" &&\n      request.data?.domain?.verifyingContract === accountAddress;\n\n    if (isDeferredAction && entityId === DEFAULT_OWNER_ENTITY_ID) {\n      return request;\n    }\n\n    const hash =\n      request.type === \"personal_sign\"\n        ? hashMessage(request.data)\n        : request.type === \"eth_signTypedData_v4\"\n          ? hashTypedData(request.data)\n          : assertNever(request, \"Unexpected signature request type\");\n\n    return {\n      type: \"eth_signTypedData_v4\",\n      data: toReplaySafeTypedData({\n        chainId: client.chain.id,\n        hash,\n        ...(entityId === DEFAULT_OWNER_ENTITY_ID\n          ? { address: accountAddress }\n          : {\n              address: DefaultModuleAddress.SINGLE_SIGNER_VALIDATION,\n              salt: concatHex([`0x${\"00\".repeat(12)}`, accountAddress]),\n            }),\n      }),\n    };\n  };\n\n  const formatSignature = async (signature: Hex): Promise<Hex> => {\n    return pack1271Signature({\n      entityId,\n      validationSignaturePrefix: SignaturePrefix.EOA,\n      validationSignature: signature,\n    });\n  };\n\n  return await toSmartAccount({\n    getFactoryArgs,\n    client,\n    entryPoint,\n    getNonce,\n    authorization,\n\n    async getAddress() {\n      return accountAddress;\n    },\n\n    async encodeCalls(calls) {\n      if (calls.length === 1) {\n        const call = calls[0];\n\n        if (isAddressEqual(call.to, accountAddress)) {\n          // If the call is to the account itself, we need to avoid wrapping it in an `execute` call.\n\n          if (call.data === undefined) {\n            throw new BaseError(\"Data is required for an account self-call.\");\n          }\n\n          return encodeCallData(call.data);\n        }\n\n        return encodeCallData(\n          encodeFunctionData({\n            abi: modularAccountAbi,\n            functionName: \"execute\",\n            args: [call.to, call.value ?? 0n, call.data ?? \"0x\"],\n          }),\n        );\n      }\n\n      return encodeCallData(\n        encodeFunctionData({\n          abi: modularAccountAbi,\n          functionName: \"executeBatch\",\n          args: [\n            calls.map((call) => ({\n              target: call.to,\n              data: call.data ?? \"0x\",\n              value: call.value ?? 0n,\n            })),\n          ],\n        }),\n      );\n    },\n\n    async decodeCalls(data) {\n      // Inverse of `encodeCalls`.\n      // Trim the EXECUTE_USER_OP_SELECTOR if it is present.\n      const trimmedData = data\n        .toLowerCase()\n        .startsWith(EXECUTE_USER_OP_SELECTOR.toLowerCase())\n        ? sliceHex(data, 4)\n        : data;\n\n      const decoded = decodeFunctionData({\n        abi: modularAccountAbi,\n        data: trimmedData,\n      });\n\n      if (decoded.functionName === \"execute\") {\n        return [\n          {\n            to: decoded.args[0],\n            value: decoded.args[1],\n            data: decoded.args[2],\n          },\n        ];\n      }\n\n      if (decoded.functionName === \"executeBatch\") {\n        return decoded.args[0].map((call) => ({\n          to: call.target,\n          value: call.value,\n          data: call.data,\n        }));\n      }\n\n      // If the data is not for an `execute` or `executeBatch` call, we treat it as a single call to the account itself.\n      return [\n        {\n          to: accountAddress,\n          data,\n        },\n      ];\n    },\n\n    async getStubSignature() {\n      const sig = packUOSignature({\n        validationSignature:\n          \"0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c\",\n      });\n      return deferredActionData ? concatHex([deferredActionData, sig]) : sig;\n    },\n\n    async signMessage({ message }) {\n      const { data } = await prepareSignature({\n        type: \"personal_sign\",\n        data: message,\n      });\n\n      const action = getAction(client, signTypedData, \"signTypedData\");\n\n      const signature = await action({\n        ...data,\n        account: owner,\n      });\n\n      return formatSignature(signature);\n    },\n\n    async signTypedData(td) {\n      const isDeferredAction =\n        td.primaryType === \"DeferredAction\" &&\n        td.domain &&\n        typeof td.domain === \"object\" &&\n        \"verifyingContract\" in td.domain &&\n        td.domain.verifyingContract === accountAddress;\n\n      const { data } = await prepareSignature({\n        type: \"eth_signTypedData_v4\",\n        data: td as TypedDataDefinition, // TODO(v5): Try harder to satisfy this w/o casting.\n      });\n\n      const action = getAction(client, signTypedData, \"signTypedData\");\n\n      const signature = await action({\n        ...data,\n        account: owner,\n      });\n\n      return isDeferredAction\n        ? concat([SignaturePrefix.EOA, signature])\n        : formatSignature(signature);\n    },\n\n    async signUserOperation(uo) {\n      const hash = getUserOperationHash({\n        chainId: uo.chainId ?? client.chain.id,\n        entryPointAddress: entryPoint.address,\n        entryPointVersion: entryPoint.version,\n        userOperation: {\n          ...uo,\n          sender: accountAddress,\n        },\n      });\n\n      const signMessageAction = getAction(client, signMessage, \"signMessage\");\n\n      const validationSignature = await signMessageAction({\n        account: owner,\n        message: { raw: hash },\n      });\n\n      const packedSignature = packUOSignature({\n        validationSignature,\n      });\n\n      const signature = deferredActionData\n        ? concatHex([deferredActionData, packedSignature])\n        : packedSignature;\n\n      deferredActionData = undefined; // clear once used\n      hasAssociatedExecHooks = false; // set to falsy value once used\n\n      return signature;\n    },\n\n    extend: {\n      smartAccountType: \"ModularAccountV2\" as const,\n      signerEntity: {\n        entityId,\n        isGlobalValidation,\n      },\n      encodeCallData,\n      getExecutionData,\n      getValidationData,\n      prepareSignature,\n      formatSignature,\n    },\n  });\n}\n"]}

package/dist/esm/ma-v2/mav2StaticImpl.d.ts

@@ -1,10 +1,8 @@
-import { type Address, type Hex } from "viem";
+import { type Address } from "viem";
 import { entryPoint07Abi } from "viem/account-abstraction";
 import type { StaticSmartAccountImplementation } from "../types.js";
 import { semiModularAccountBytecodeAbi } from "./abis/semiModularAccountBytecodeAbi.js";
 import { accountFactoryAbi } from "./abis/accountFactoryAbi.js";
-import { webAuthnFactoryAbi } from "./abis/webAuthnFactoryAbi.js";
-import { modularAccountAbi } from "./abis/modularAccountAbi.js";
 export type SemiModularAccountV2FactoryArgs = {
     owner: Address;
     salt: bigint;
@@ -23,15 +21,3 @@ export type SemiModularAccount7702StaticImpl = StaticSmartAccountImplementation<
  * TODO(v5): update JSDoc format when doc-gen supports structs or records.
  */
 export declare const semiModularAccount7702StaticImpl: SemiModularAccount7702StaticImpl;
-export type WebAuthnModularAccountV2FactoryArgs = {
-    ownerPublicKey: Hex;
-    salt: bigint;
-    entityId: number;
-};
-export type WebAuthnModularAccountV2StaticImpl = StaticSmartAccountImplementation<false, "0.7", WebAuthnModularAccountV2FactoryArgs, typeof entryPoint07Abi, typeof modularAccountAbi, typeof webAuthnFactoryAbi>;
-/**
- * Static implementation logic for WebAuthnModularAccountV2.
- *
- * TODO(v5): update JSDoc format when doc-gen supports structs or records.
- */
-export declare const webAuthnModularAccountV2StaticImpl: WebAuthnModularAccountV2StaticImpl;

package/dist/esm/ma-v2/mav2StaticImpl.js

@@ -3,11 +3,8 @@ import { entryPoint07Abi, entryPoint07Address } from "viem/account-abstraction";
 import { lowerAddress } from "@alchemy/common";
 import { semiModularAccountBytecodeAbi } from "./abis/semiModularAccountBytecodeAbi.js";
 import { accountFactoryAbi } from "./abis/accountFactoryAbi.js";
-import { webAuthnFactoryAbi } from "./abis/webAuthnFactoryAbi.js";
 import { DefaultAddress as DefaultMAV2Address } from "./utils/account.js";
 import { predictModularAccountV2Address } from "./predictAddress.js";
-import { modularAccountAbi } from "./abis/modularAccountAbi.js";
-import { parsePublicKey } from "webauthn-p256";
 // Shared entryPoint configuration across all modular account v2 implementations
 const entryPoint = {
     abi: entryPoint07Abi,
@@ -55,34 +52,4 @@ export const semiModularAccount7702StaticImpl = {
     ...semiModularAccountBase,
     delegationAddress: lowerAddress(DefaultMAV2Address.SMAV2_7702),
 };
-/**
- * Static implementation logic for WebAuthnModularAccountV2.
- *
- * TODO(v5): update JSDoc format when doc-gen supports structs or records.
- */
-export const webAuthnModularAccountV2StaticImpl = {
-    entryPoint,
-    accountAbi: modularAccountAbi,
-    accountImplementation: lowerAddress(DefaultMAV2Address.MAV2),
-    factoryAddress: lowerAddress(DefaultMAV2Address.MAV2_FACTORY_WEBAUTHN),
-    factoryAbi: webAuthnFactoryAbi,
-    getFactoryData: (args) => {
-        const { x, y } = parsePublicKey(args.ownerPublicKey);
-        return encodeFunctionData({
-            abi: webAuthnFactoryAbi,
-            functionName: "createWebAuthnAccount",
-            args: [x, y, args.salt, args.entityId],
-        });
-    },
-    predictAccountAddress: (args) => {
-        return predictModularAccountV2Address({
-            factoryAddress: DefaultMAV2Address.MAV2_FACTORY_WEBAUTHN,
-            implementationAddress: DefaultMAV2Address.MAV2,
-            type: "WebAuthn",
-            salt: args.salt,
-            ownerPublicKey: args.ownerPublicKey,
-            entityId: args.entityId,
-        });
-    },
-};
 //# sourceMappingURL=mav2StaticImpl.js.map

package/dist/esm/ma-v2/mav2StaticImpl.js.map

@@ -1 +1 @@
-{"version":3,"file":"mav2StaticImpl.js","sourceRoot":"","sources":["../../../src/ma-v2/mav2StaticImpl.ts"],"names":[],"mappings":"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","sourcesContent":["import { encodeFunctionData, type Address, type Hex } from \"viem\";\nimport { entryPoint07Abi, entryPoint07Address } from \"viem/account-abstraction\";\nimport { lowerAddress } from \"@alchemy/common\";\nimport type { StaticSmartAccountImplementation } from \"../types.js\";\nimport { semiModularAccountBytecodeAbi } from \"./abis/semiModularAccountBytecodeAbi.js\";\nimport { accountFactoryAbi } from \"./abis/accountFactoryAbi.js\";\nimport { webAuthnFactoryAbi } from \"./abis/webAuthnFactoryAbi.js\";\nimport { DefaultAddress as DefaultMAV2Address } from \"./utils/account.js\";\nimport { predictModularAccountV2Address } from \"./predictAddress.js\";\nimport { modularAccountAbi } from \"./abis/modularAccountAbi.js\";\nimport { parsePublicKey } from \"webauthn-p256\";\n\nexport type SemiModularAccountV2FactoryArgs = {\n  owner: Address;\n  salt: bigint;\n};\n\nexport type SemiModularAccountV2StaticImpl = StaticSmartAccountImplementation<\n  false,\n  \"0.7\",\n  SemiModularAccountV2FactoryArgs,\n  typeof entryPoint07Abi,\n  typeof semiModularAccountBytecodeAbi,\n  typeof accountFactoryAbi\n>;\n\n// Shared entryPoint configuration across all modular account v2 implementations\nconst entryPoint = {\n  abi: entryPoint07Abi,\n  address: entryPoint07Address,\n  version: \"0.7\",\n} as const;\n\n// Shared base for semi-modular account implementations (SMA and 7702)\nconst semiModularAccountBase = {\n  entryPoint,\n  accountAbi: semiModularAccountBytecodeAbi,\n} satisfies Partial<SemiModularAccountV2StaticImpl>;\n\n/**\n * Static implementation logic for SemiModularAccountV2.\n *\n * TODO(v5): update JSDoc format when doc-gen supports structs or records.\n */\nexport const semiModularAccountV2StaticImpl: SemiModularAccountV2StaticImpl = {\n  ...semiModularAccountBase,\n  accountImplementation: lowerAddress(DefaultMAV2Address.SMAV2_BYTECODE),\n  factoryAddress: lowerAddress(DefaultMAV2Address.MAV2_FACTORY),\n  factoryAbi: accountFactoryAbi,\n  getFactoryData: (args: SemiModularAccountV2FactoryArgs) => {\n    return encodeFunctionData({\n      abi: accountFactoryAbi,\n      functionName: \"createSemiModularAccount\",\n      args: [args.owner, args.salt],\n    });\n  },\n  predictAccountAddress: (args: SemiModularAccountV2FactoryArgs) => {\n    return predictModularAccountV2Address({\n      factoryAddress: DefaultMAV2Address.MAV2_FACTORY,\n      implementationAddress: DefaultMAV2Address.SMAV2_BYTECODE,\n      type: \"SMA\",\n      salt: args.salt,\n      ownerAddress: args.owner,\n    });\n  },\n};\n\nexport type SemiModularAccount7702StaticImpl = StaticSmartAccountImplementation<\n  true,\n  \"0.7\",\n  SemiModularAccountV2FactoryArgs,\n  typeof entryPoint07Abi,\n  typeof semiModularAccountBytecodeAbi,\n  typeof accountFactoryAbi\n>;\n\n/**\n * Static implementation logic for SemiModularAccount7702.\n *\n * TODO(v5): update JSDoc format when doc-gen supports structs or records.\n */\nexport const semiModularAccount7702StaticImpl: SemiModularAccount7702StaticImpl =\n  {\n    ...semiModularAccountBase,\n    delegationAddress: lowerAddress(DefaultMAV2Address.SMAV2_7702),\n  };\n\nexport type WebAuthnModularAccountV2FactoryArgs = {\n  ownerPublicKey: Hex;\n  salt: bigint;\n  entityId: number;\n};\n\nexport type WebAuthnModularAccountV2StaticImpl =\n  StaticSmartAccountImplementation<\n    false,\n    \"0.7\",\n    WebAuthnModularAccountV2FactoryArgs,\n    typeof entryPoint07Abi,\n    typeof modularAccountAbi,\n    typeof webAuthnFactoryAbi\n  >;\n\n/**\n * Static implementation logic for WebAuthnModularAccountV2.\n *\n * TODO(v5): update JSDoc format when doc-gen supports structs or records.\n */\nexport const webAuthnModularAccountV2StaticImpl: WebAuthnModularAccountV2StaticImpl =\n  {\n    entryPoint,\n    accountAbi: modularAccountAbi,\n    accountImplementation: lowerAddress(DefaultMAV2Address.MAV2),\n    factoryAddress: lowerAddress(DefaultMAV2Address.MAV2_FACTORY_WEBAUTHN),\n    factoryAbi: webAuthnFactoryAbi,\n    getFactoryData: (args: WebAuthnModularAccountV2FactoryArgs) => {\n      const { x, y } = parsePublicKey(args.ownerPublicKey);\n      return encodeFunctionData({\n        abi: webAuthnFactoryAbi,\n        functionName: \"createWebAuthnAccount\",\n        args: [x, y, args.salt, args.entityId],\n      });\n    },\n    predictAccountAddress: (args: WebAuthnModularAccountV2FactoryArgs) => {\n      return predictModularAccountV2Address({\n        factoryAddress: DefaultMAV2Address.MAV2_FACTORY_WEBAUTHN,\n        implementationAddress: DefaultMAV2Address.MAV2,\n        type: \"WebAuthn\",\n        salt: args.salt,\n        ownerPublicKey: args.ownerPublicKey,\n        entityId: args.entityId,\n      });\n    },\n  };\n"]}
+{"version":3,"file":"mav2StaticImpl.js","sourceRoot":"","sources":["../../../src/ma-v2/mav2StaticImpl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAgB,MAAM,MAAM,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAChF,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,OAAO,EAAE,6BAA6B,EAAE,MAAM,yCAAyC,CAAC;AACxF,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,cAAc,IAAI,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAC1E,OAAO,EAAE,8BAA8B,EAAE,MAAM,qBAAqB,CAAC;AAgBrE,gFAAgF;AAChF,MAAM,UAAU,GAAG;IACjB,GAAG,EAAE,eAAe;IACpB,OAAO,EAAE,mBAAmB;IAC5B,OAAO,EAAE,KAAK;CACN,CAAC;AAEX,sEAAsE;AACtE,MAAM,sBAAsB,GAAG;IAC7B,UAAU;IACV,UAAU,EAAE,6BAA6B;CACQ,CAAC;AAEpD;;;;GAIG;AACH,MAAM,CAAC,MAAM,8BAA8B,GAAmC;IAC5E,GAAG,sBAAsB;IACzB,qBAAqB,EAAE,YAAY,CAAC,kBAAkB,CAAC,cAAc,CAAC;IACtE,cAAc,EAAE,YAAY,CAAC,kBAAkB,CAAC,YAAY,CAAC;IAC7D,UAAU,EAAE,iBAAiB;IAC7B,cAAc,EAAE,CAAC,IAAqC,EAAE,EAAE;QACxD,OAAO,kBAAkB,CAAC;YACxB,GAAG,EAAE,iBAAiB;YACtB,YAAY,EAAE,0BAA0B;YACxC,IAAI,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC;SAC9B,CAAC,CAAC;IACL,CAAC;IACD,qBAAqB,EAAE,CAAC,IAAqC,EAAE,EAAE;QAC/D,OAAO,8BAA8B,CAAC;YACpC,cAAc,EAAE,kBAAkB,CAAC,YAAY;YAC/C,qBAAqB,EAAE,kBAAkB,CAAC,cAAc;YACxD,IAAI,EAAE,KAAK;YACX,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,YAAY,EAAE,IAAI,CAAC,KAAK;SACzB,CAAC,CAAC;IACL,CAAC;CACF,CAAC;AAWF;;;;GAIG;AACH,MAAM,CAAC,MAAM,gCAAgC,GAC3C;IACE,GAAG,sBAAsB;IACzB,iBAAiB,EAAE,YAAY,CAAC,kBAAkB,CAAC,UAAU,CAAC;CAC/D,CAAC","sourcesContent":["import { encodeFunctionData, type Address } from \"viem\";\nimport { entryPoint07Abi, entryPoint07Address } from \"viem/account-abstraction\";\nimport { lowerAddress } from \"@alchemy/common\";\nimport type { StaticSmartAccountImplementation } from \"../types.js\";\nimport { semiModularAccountBytecodeAbi } from \"./abis/semiModularAccountBytecodeAbi.js\";\nimport { accountFactoryAbi } from \"./abis/accountFactoryAbi.js\";\nimport { DefaultAddress as DefaultMAV2Address } from \"./utils/account.js\";\nimport { predictModularAccountV2Address } from \"./predictAddress.js\";\n\nexport type SemiModularAccountV2FactoryArgs = {\n  owner: Address;\n  salt: bigint;\n};\n\nexport type SemiModularAccountV2StaticImpl = StaticSmartAccountImplementation<\n  false,\n  \"0.7\",\n  SemiModularAccountV2FactoryArgs,\n  typeof entryPoint07Abi,\n  typeof semiModularAccountBytecodeAbi,\n  typeof accountFactoryAbi\n>;\n\n// Shared entryPoint configuration across all modular account v2 implementations\nconst entryPoint = {\n  abi: entryPoint07Abi,\n  address: entryPoint07Address,\n  version: \"0.7\",\n} as const;\n\n// Shared base for semi-modular account implementations (SMA and 7702)\nconst semiModularAccountBase = {\n  entryPoint,\n  accountAbi: semiModularAccountBytecodeAbi,\n} satisfies Partial<SemiModularAccountV2StaticImpl>;\n\n/**\n * Static implementation logic for SemiModularAccountV2.\n *\n * TODO(v5): update JSDoc format when doc-gen supports structs or records.\n */\nexport const semiModularAccountV2StaticImpl: SemiModularAccountV2StaticImpl = {\n  ...semiModularAccountBase,\n  accountImplementation: lowerAddress(DefaultMAV2Address.SMAV2_BYTECODE),\n  factoryAddress: lowerAddress(DefaultMAV2Address.MAV2_FACTORY),\n  factoryAbi: accountFactoryAbi,\n  getFactoryData: (args: SemiModularAccountV2FactoryArgs) => {\n    return encodeFunctionData({\n      abi: accountFactoryAbi,\n      functionName: \"createSemiModularAccount\",\n      args: [args.owner, args.salt],\n    });\n  },\n  predictAccountAddress: (args: SemiModularAccountV2FactoryArgs) => {\n    return predictModularAccountV2Address({\n      factoryAddress: DefaultMAV2Address.MAV2_FACTORY,\n      implementationAddress: DefaultMAV2Address.SMAV2_BYTECODE,\n      type: \"SMA\",\n      salt: args.salt,\n      ownerAddress: args.owner,\n    });\n  },\n};\n\nexport type SemiModularAccount7702StaticImpl = StaticSmartAccountImplementation<\n  true,\n  \"0.7\",\n  SemiModularAccountV2FactoryArgs,\n  typeof entryPoint07Abi,\n  typeof semiModularAccountBytecodeAbi,\n  typeof accountFactoryAbi\n>;\n\n/**\n * Static implementation logic for SemiModularAccount7702.\n *\n * TODO(v5): update JSDoc format when doc-gen supports structs or records.\n */\nexport const semiModularAccount7702StaticImpl: SemiModularAccount7702StaticImpl =\n  {\n    ...semiModularAccountBase,\n    delegationAddress: lowerAddress(DefaultMAV2Address.SMAV2_7702),\n  };\n"]}

package/dist/esm/ma-v2/modules/time-range-module/module.js

@@ -1,14 +1,15 @@
 import { encodeAbiParameters } from "viem";
 import { timeRangeModuleAbi } from "./abis/timeRangeModuleAbi.js";
 import { HookType } from "../../types.js";
+import { BaseError } from "@alchemy/common";
 export const TimeRangeModule = {
     abi: timeRangeModuleAbi,
     buildHook: (installArgs, address) => {
         if (installArgs.validUntil > 2 ** 48 - 1) {
-            throw new Error("TimeRangeModule.buildHook: validUntil > type(uint48).max");
+            throw new BaseError("TimeRangeModule.buildHook: validUntil > type(uint48).max");
         }
         if (installArgs.validAfter > 2 ** 48 - 1) {
-            throw new Error("TimeRangeModule.buildHook: validAfter > type(uint48).max");
+            throw new BaseError("TimeRangeModule.buildHook: validAfter > type(uint48).max");
         }
         const installData = TimeRangeModule.encodeOnInstallData(installArgs);
         return {

package/dist/esm/ma-v2/modules/time-range-module/module.js.map

@@ -1 +1 @@
-{"version":3,"file":"module.js","sourceRoot":"","sources":["../../../../../src/ma-v2/modules/time-range-module/module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAA0B,MAAM,MAAM,CAAC;AAEnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAmB,MAAM,gBAAgB,CAAC;AAE3D,MAAM,CAAC,MAAM,eAAe,GAAG;IAC7B,GAAG,EAAE,kBAAkB;IACvB,SAAS,EAAE,CACT,WAIC,EACD,OAAgB,EAC2B,EAAE;QAC7C,IAAI,WAAW,CAAC,UAAU,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,CAAC;YACzC,MAAM,IAAI,KAAK,CACb,0DAA0D,CAC3D,CAAC;QACJ,CAAC;QAED,IAAI,WAAW,CAAC,UAAU,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,CAAC;YACzC,MAAM,IAAI,KAAK,CACb,0DAA0D,CAC3D,CAAC;QACJ,CAAC;QAED,MAAM,WAAW,GAAG,eAAe,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC;QACrE,OAAO;YACL,UAAU,EAAE;gBACV,OAAO,EAAE,OAAO;gBAChB,QAAQ,EAAE,WAAW,CAAC,QAAQ;gBAC9B,QAAQ,EAAE,QAAQ,CAAC,UAAU;gBAC7B,WAAW,EAAE,KAAK;gBAClB,YAAY,EAAE,KAAK;aACpB;YACD,QAAQ,EAAE,WAAW;SACtB,CAAC;IACJ,CAAC;IACD,mBAAmB,EAAE,CAAC,IAIrB,EAAO,EAAE;QACR,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;QAElD,OAAO,mBAAmB,CACxB;YACE;gBACE,IAAI,EAAE,QAAQ;aACf;YACD;gBACE,IAAI,EAAE,QAAQ;aACf;YACD;gBACE,IAAI,EAAE,QAAQ;aACf;SACF,EACD,CAAC,QAAQ,EAAE,UAAU,EAAE,UAAU,CAAC,CACnC,CAAC;IACJ,CAAC;IACD,qBAAqB,EAAE,CAAC,IAA0B,EAAO,EAAE;QACzD,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;QAE1B,OAAO,mBAAmB,CACxB;YACE;gBACE,IAAI,EAAE,QAAQ;aACf;SACF,EACD,CAAC,QAAQ,CAAC,CACX,CAAC;IACJ,CAAC;IACD,kBAAkB,EAAE,CAAC,IAIpB,EAAO,EAAE;QACR,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;QAElD,OAAO,mBAAmB,CACxB;YACE;gBACE,IAAI,EAAE,QAAQ;aACf;YACD;gBACE,IAAI,EAAE,QAAQ;aACf;YACD;gBACE,IAAI,EAAE,QAAQ;aACf;SACF,EACD,CAAC,QAAQ,EAAE,UAAU,EAAE,UAAU,CAAC,CACnC,CAAC;IACJ,CAAC;CACF,CAAC","sourcesContent":["import { encodeAbiParameters, type Address, type Hex } from \"viem\";\n\nimport { timeRangeModuleAbi } from \"./abis/timeRangeModuleAbi.js\";\nimport { HookType, type HookConfig } from \"../../types.js\";\n\nexport const TimeRangeModule = {\n  abi: timeRangeModuleAbi,\n  buildHook: (\n    installArgs: {\n      entityId: number;\n      validUntil: number;\n      validAfter: number;\n    },\n    address: Address,\n  ): { hookConfig: HookConfig; initData: Hex } => {\n    if (installArgs.validUntil > 2 ** 48 - 1) {\n      throw new Error(\n        \"TimeRangeModule.buildHook: validUntil > type(uint48).max\",\n      );\n    }\n\n    if (installArgs.validAfter > 2 ** 48 - 1) {\n      throw new Error(\n        \"TimeRangeModule.buildHook: validAfter > type(uint48).max\",\n      );\n    }\n\n    const installData = TimeRangeModule.encodeOnInstallData(installArgs);\n    return {\n      hookConfig: {\n        address: address,\n        entityId: installArgs.entityId,\n        hookType: HookType.VALIDATION,\n        hasPreHooks: false,\n        hasPostHooks: false,\n      },\n      initData: installData,\n    };\n  },\n  encodeOnInstallData: (args: {\n    entityId: number;\n    validUntil: number;\n    validAfter: number;\n  }): Hex => {\n    const { entityId, validUntil, validAfter } = args;\n\n    return encodeAbiParameters(\n      [\n        {\n          type: \"uint32\",\n        },\n        {\n          type: \"uint48\",\n        },\n        {\n          type: \"uint48\",\n        },\n      ],\n      [entityId, validUntil, validAfter],\n    );\n  },\n  encodeOnUninstallData: (args: { entityId: number }): Hex => {\n    const { entityId } = args;\n\n    return encodeAbiParameters(\n      [\n        {\n          type: \"uint32\",\n        },\n      ],\n      [entityId],\n    );\n  },\n  encodeSetTimeRange: (args: {\n    entityId: number;\n    validUntil: number;\n    validAfter: number;\n  }): Hex => {\n    const { entityId, validUntil, validAfter } = args;\n\n    return encodeAbiParameters(\n      [\n        {\n          type: \"uint32\",\n        },\n        {\n          type: \"uint48\",\n        },\n        {\n          type: \"uint48\",\n        },\n      ],\n      [entityId, validUntil, validAfter],\n    );\n  },\n};\n"]}
+{"version":3,"file":"module.js","sourceRoot":"","sources":["../../../../../src/ma-v2/modules/time-range-module/module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAA0B,MAAM,MAAM,CAAC;AAEnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAmB,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,MAAM,CAAC,MAAM,eAAe,GAAG;IAC7B,GAAG,EAAE,kBAAkB;IACvB,SAAS,EAAE,CACT,WAIC,EACD,OAAgB,EAC2B,EAAE;QAC7C,IAAI,WAAW,CAAC,UAAU,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,CAAC;YACzC,MAAM,IAAI,SAAS,CACjB,0DAA0D,CAC3D,CAAC;QACJ,CAAC;QAED,IAAI,WAAW,CAAC,UAAU,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,CAAC;YACzC,MAAM,IAAI,SAAS,CACjB,0DAA0D,CAC3D,CAAC;QACJ,CAAC;QAED,MAAM,WAAW,GAAG,eAAe,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC;QACrE,OAAO;YACL,UAAU,EAAE;gBACV,OAAO,EAAE,OAAO;gBAChB,QAAQ,EAAE,WAAW,CAAC,QAAQ;gBAC9B,QAAQ,EAAE,QAAQ,CAAC,UAAU;gBAC7B,WAAW,EAAE,KAAK;gBAClB,YAAY,EAAE,KAAK;aACpB;YACD,QAAQ,EAAE,WAAW;SACtB,CAAC;IACJ,CAAC;IACD,mBAAmB,EAAE,CAAC,IAIrB,EAAO,EAAE;QACR,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;QAElD,OAAO,mBAAmB,CACxB;YACE;gBACE,IAAI,EAAE,QAAQ;aACf;YACD;gBACE,IAAI,EAAE,QAAQ;aACf;YACD;gBACE,IAAI,EAAE,QAAQ;aACf;SACF,EACD,CAAC,QAAQ,EAAE,UAAU,EAAE,UAAU,CAAC,CACnC,CAAC;IACJ,CAAC;IACD,qBAAqB,EAAE,CAAC,IAA0B,EAAO,EAAE;QACzD,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;QAE1B,OAAO,mBAAmB,CACxB;YACE;gBACE,IAAI,EAAE,QAAQ;aACf;SACF,EACD,CAAC,QAAQ,CAAC,CACX,CAAC;IACJ,CAAC;IACD,kBAAkB,EAAE,CAAC,IAIpB,EAAO,EAAE;QACR,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;QAElD,OAAO,mBAAmB,CACxB;YACE;gBACE,IAAI,EAAE,QAAQ;aACf;YACD;gBACE,IAAI,EAAE,QAAQ;aACf;YACD;gBACE,IAAI,EAAE,QAAQ;aACf;SACF,EACD,CAAC,QAAQ,EAAE,UAAU,EAAE,UAAU,CAAC,CACnC,CAAC;IACJ,CAAC;CACF,CAAC","sourcesContent":["import { encodeAbiParameters, type Address, type Hex } from \"viem\";\n\nimport { timeRangeModuleAbi } from \"./abis/timeRangeModuleAbi.js\";\nimport { HookType, type HookConfig } from \"../../types.js\";\nimport { BaseError } from \"@alchemy/common\";\n\nexport const TimeRangeModule = {\n  abi: timeRangeModuleAbi,\n  buildHook: (\n    installArgs: {\n      entityId: number;\n      validUntil: number;\n      validAfter: number;\n    },\n    address: Address,\n  ): { hookConfig: HookConfig; initData: Hex } => {\n    if (installArgs.validUntil > 2 ** 48 - 1) {\n      throw new BaseError(\n        \"TimeRangeModule.buildHook: validUntil > type(uint48).max\",\n      );\n    }\n\n    if (installArgs.validAfter > 2 ** 48 - 1) {\n      throw new BaseError(\n        \"TimeRangeModule.buildHook: validAfter > type(uint48).max\",\n      );\n    }\n\n    const installData = TimeRangeModule.encodeOnInstallData(installArgs);\n    return {\n      hookConfig: {\n        address: address,\n        entityId: installArgs.entityId,\n        hookType: HookType.VALIDATION,\n        hasPreHooks: false,\n        hasPostHooks: false,\n      },\n      initData: installData,\n    };\n  },\n  encodeOnInstallData: (args: {\n    entityId: number;\n    validUntil: number;\n    validAfter: number;\n  }): Hex => {\n    const { entityId, validUntil, validAfter } = args;\n\n    return encodeAbiParameters(\n      [\n        {\n          type: \"uint32\",\n        },\n        {\n          type: \"uint48\",\n        },\n        {\n          type: \"uint48\",\n        },\n      ],\n      [entityId, validUntil, validAfter],\n    );\n  },\n  encodeOnUninstallData: (args: { entityId: number }): Hex => {\n    const { entityId } = args;\n\n    return encodeAbiParameters(\n      [\n        {\n          type: \"uint32\",\n        },\n      ],\n      [entityId],\n    );\n  },\n  encodeSetTimeRange: (args: {\n    entityId: number;\n    validUntil: number;\n    validAfter: number;\n  }): Hex => {\n    const { entityId, validUntil, validAfter } = args;\n\n    return encodeAbiParameters(\n      [\n        {\n          type: \"uint32\",\n        },\n        {\n          type: \"uint48\",\n        },\n        {\n          type: \"uint48\",\n        },\n      ],\n      [entityId, validUntil, validAfter],\n    );\n  },\n};\n"]}

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

@@ -1,4 +1,5 @@
-import { type Address, type Hex } from "viem";
+import { type Address, type Client, type Hex } from "viem";
+import { type EntryPointVersion } from "viem/account-abstraction";
 export type PredictModularAccountV2AddressParams = {
     factoryAddress: Address;
     implementationAddress: Address;
@@ -10,13 +11,9 @@ export type PredictModularAccountV2AddressParams = {
 } | {
     type: "SMA";
     ownerAddress: Address;
-} | {
-    type: "WebAuthn";
-    ownerPublicKey: Hex;
-    entityId: number;
 });
 /**
- * Predicts the address of a modular account V2 based on the provided parameters, which include factory address, salt, and implementation address. This function supports different types of accounts including "SMA", "MA", and "WebAuthn".
+ * Predicts the address of a modular account V2 based on the provided parameters, which include factory address, salt, and implementation address. This function supports different types of accounts including "SMA" and "MA".
  *
  * @example
  * ```ts
@@ -35,3 +32,22 @@ export type PredictModularAccountV2AddressParams = {
  * @returns {Address} The predicted address for the modular account V2.
  */
 export declare function predictModularAccountV2Address(params: PredictModularAccountV2AddressParams): Address;
+export type GetModularAccountV2AddressFromFactoryDataParams = {
+    client: Client;
+    factoryAddress: Address;
+    factoryData: Hex;
+    implementationAddress: Address;
+    entryPoint?: {
+        version: EntryPointVersion;
+        address: Address;
+    };
+};
+/**
+ * Gets the modular account v2 address from factory data.
+ * If the factory is a known default (SMA), decodes the args and predicts without RPC.
+ * Otherwise falls back to calling the entry point's getSenderAddress.
+ *
+ * @param {GetModularAccountV2AddressFromFactoryDataParams} params - The parameters
+ * @returns {Promise<Address>} The account address
+ */
+export declare function getModularAccountV2AddressFromFactoryData({ client, factoryAddress, factoryData, implementationAddress, entryPoint, }: GetModularAccountV2AddressFromFactoryDataParams): Promise<Address>;

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

@@ -1,8 +1,11 @@
 import { assertNever } from "@alchemy/common";
-import { concatHex, encodePacked, getContractAddress, keccak256, } from "viem";
-import { parsePublicKey } from "webauthn-p256";
+import { concatHex, decodeFunctionData, encodePacked, getContractAddress, isAddressEqual, keccak256, } from "viem";
+import { entryPoint07Address, } from "viem/account-abstraction";
+import { accountFactoryAbi } from "./abis/accountFactoryAbi.js";
+import { DefaultAddress } from "./utils/account.js";
+import { getSenderFromFactoryData } from "../utils.js";
 /**
- * Predicts the address of a modular account V2 based on the provided parameters, which include factory address, salt, and implementation address. This function supports different types of accounts including "SMA", "MA", and "WebAuthn".
+ * Predicts the address of a modular account V2 based on the provided parameters, which include factory address, salt, and implementation address. This function supports different types of accounts including "SMA" and "MA".
  *
  * @example
  * ```ts
@@ -37,12 +40,6 @@ export function predictModularAccountV2Address(params) {
                     combinedSalt: getCombinedSaltK1(params.ownerAddress, salt, params.entityId),
                     initcode: getProxyBytecode(implementationAddress),
                 };
-            case "WebAuthn":
-                const { x, y } = parsePublicKey(params.ownerPublicKey);
-                return {
-                    combinedSalt: getCombinedSaltWebAuthn({ x, y }, salt, params.entityId),
-                    initcode: getProxyBytecode(implementationAddress),
-                };
             default:
                 return assertNever(params, "Unexpected MAv2 type");
         }
@@ -57,9 +54,6 @@ export function predictModularAccountV2Address(params) {
 function getCombinedSaltK1(ownerAddress, salt, entityId) {
     return keccak256(encodePacked(["address", "uint256", "uint32"], [ownerAddress, salt, entityId]));
 }
-function getCombinedSaltWebAuthn(ownerPublicKey, salt, entityId) {
-    return keccak256(encodePacked(["uint256", "uint256", "uint256", "uint32"], [ownerPublicKey.x, ownerPublicKey.y, salt, entityId]));
-}
 function getProxyBytecode(implementationAddress) {
     return concatHex([
         "0x603d3d8160223d3973",
@@ -70,4 +64,44 @@ function getProxyBytecode(implementationAddress) {
 function getProxyBytecodeWithImmutableArgs(implementationAddress, immutableArgs) {
     return `0x6100513d8160233d3973${implementationAddress.slice(2)}60095155f3363d3d373d3d363d7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc545af43d6000803e6038573d6000fd5b3d6000f3${immutableArgs.slice(2)}`;
 }
+/**
+ * Gets the modular account v2 address from factory data.
+ * If the factory is a known default (SMA), decodes the args and predicts without RPC.
+ * Otherwise falls back to calling the entry point's getSenderAddress.
+ *
+ * @param {GetModularAccountV2AddressFromFactoryDataParams} params - The parameters
+ * @returns {Promise<Address>} The account address
+ */
+export async function getModularAccountV2AddressFromFactoryData({ client, factoryAddress, factoryData, implementationAddress, entryPoint = {
+    version: "0.7",
+    address: entryPoint07Address,
+}, }) {
+    // Try SMA factory
+    if (isAddressEqual(factoryAddress, DefaultAddress.MAV2_FACTORY)) {
+        try {
+            const decoded = decodeFunctionData({
+                abi: accountFactoryAbi,
+                data: factoryData,
+            });
+            if (decoded.functionName === "createSemiModularAccount") {
+                const [decodedOwner, decodedSalt] = decoded.args;
+                return predictModularAccountV2Address({
+                    factoryAddress,
+                    implementationAddress,
+                    salt: decodedSalt,
+                    type: "SMA",
+                    ownerAddress: decodedOwner,
+                });
+            }
+        }
+        catch {
+            // Decode failed, fall through to RPC
+        }
+    }
+    return getSenderFromFactoryData(client, {
+        factory: factoryAddress,
+        factoryData,
+        entryPoint,
+    });
+}
 //# sourceMappingURL=predictAddress.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"predictAddress.js","sourceRoot":"","sources":["../../../src/ma-v2/predictAddress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EACL,SAAS,EACT,YAAY,EACZ,kBAAkB,EAClB,SAAS,GAGV,MAAM,MAAM,CAAC;AACd,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAuB/C;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,UAAU,8BAA8B,CAC5C,MAA4C;IAE5C,MAAM,EAAE,cAAc,EAAE,IAAI,EAAE,qBAAqB,EAAE,GAAG,MAAM,CAAC;IAE/D,yGAAyG;IACzG,6JAA6J;IAC7J,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,GAAG,CAAC,GAAG,EAAE;QACvC,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;YACpB,KAAK,KAAK;gBACR,gDAAgD;gBAChD,OAAO;oBACL,YAAY,EAAE,iBAAiB,CAC7B,MAAM,CAAC,YAAY,EACnB,IAAI,EACJ,UAAU,CACX;oBACD,QAAQ,EAAE,iCAAiC,CACzC,qBAAqB,EACrB,MAAM,CAAC,YAAY,CACpB;iBACF,CAAC;YACJ,KAAK,IAAI;gBACP,OAAO;oBACL,YAAY,EAAE,iBAAiB,CAC7B,MAAM,CAAC,YAAY,EACnB,IAAI,EACJ,MAAM,CAAC,QAAQ,CAChB;oBACD,QAAQ,EAAE,gBAAgB,CAAC,qBAAqB,CAAC;iBAClD,CAAC;YACJ,KAAK,UAAU;gBACb,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,cAAc,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;gBACvD,OAAO;oBACL,YAAY,EAAE,uBAAuB,CACnC,EAAE,CAAC,EAAE,CAAC,EAAE,EACR,IAAI,EACJ,MAAM,CAAC,QAAQ,CAChB;oBACD,QAAQ,EAAE,gBAAgB,CAAC,qBAAqB,CAAC;iBAClD,CAAC;YACJ;gBACE,OAAO,WAAW,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC;QACvD,CAAC;IACH,CAAC,CAAC,EAAE,CAAC;IAEL,OAAO,kBAAkB,CAAC;QACxB,IAAI,EAAE,cAAc;QACpB,MAAM,EAAE,SAAS;QACjB,IAAI,EAAE,YAAY;QAClB,QAAQ,EAAE,QAAQ;KACnB,CAAC,CAAC;AACL,CAAC;AAED,SAAS,iBAAiB,CACxB,YAAqB,EACrB,IAAY,EACZ,QAAgB;IAEhB,OAAO,SAAS,CACd,YAAY,CACV,CAAC,SAAS,EAAE,SAAS,EAAE,QAAQ,CAAC,EAChC,CAAC,YAAY,EAAE,IAAI,EAAE,QAAQ,CAAC,CAC/B,CACF,CAAC;AACJ,CAAC;AAED,SAAS,uBAAuB,CAC9B,cAAwC,EACxC,IAAY,EACZ,QAAgB;IAEhB,OAAO,SAAS,CACd,YAAY,CACV,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,CAAC,EAC3C,CAAC,cAAc,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,CACrD,CACF,CAAC;AACJ,CAAC;AAED,SAAS,gBAAgB,CAAC,qBAA8B;IACtD,OAAO,SAAS,CAAC;QACf,sBAAsB;QACtB,qBAAqB;QACrB,wIAAwI;KACzI,CAAC,CAAC;AACL,CAAC;AAED,SAAS,iCAAiC,CACxC,qBAA8B,EAC9B,aAAkB;IAElB,OAAO,yBAAyB,qBAAqB,CAAC,KAAK,CACzD,CAAC,CACF,uIAAuI,aAAa,CAAC,KAAK,CACzJ,CAAC,CACF,EAAE,CAAC;AACN,CAAC","sourcesContent":["import { assertNever } from \"@alchemy/common\";\nimport {\n  concatHex,\n  encodePacked,\n  getContractAddress,\n  keccak256,\n  type Address,\n  type Hex,\n} from \"viem\";\nimport { parsePublicKey } from \"webauthn-p256\";\n\nexport type PredictModularAccountV2AddressParams = {\n  factoryAddress: Address;\n  implementationAddress: Address; // Should be the implementation address of the account type you are predicting the address for.\n  salt: bigint;\n} & (\n  | {\n      type: \"MA\";\n      ownerAddress: Address;\n      entityId: number;\n    }\n  | {\n      type: \"SMA\";\n      ownerAddress: Address;\n    }\n  | {\n      type: \"WebAuthn\";\n      ownerPublicKey: Hex;\n      entityId: number;\n    }\n);\n\n/**\n * Predicts the address of a modular account V2 based on the provided parameters, which include factory address, salt, and implementation address. This function supports different types of accounts including \"SMA\", \"MA\", and \"WebAuthn\".\n *\n * @example\n * ```ts\n * import { predictModularAccountV2Address } from \"@alchemy/smart-accounts\";\n *\n * const accountAddress = predictModularAccountV2Address({\n *   factoryAddress: \"0xFactoryAddress\" as Address,\n *   implementationAddress: \"0xImplementation\" as Address,\n *   salt: 0n,\n *   type: \"SMA\",\n *   ownerAddress: \"0xOwner\" as Address,\n * });\n * ```\n *\n * @param {PredictModularAccountV2AddressParams} params The parameters for predicting the modular account address, including `factoryAddress`, `salt`, `implementationAddress`, and additional properties based on the account type.\n * @returns {Address} The predicted address for the modular account V2.\n */\nexport function predictModularAccountV2Address(\n  params: PredictModularAccountV2AddressParams,\n): Address {\n  const { factoryAddress, salt, implementationAddress } = params;\n\n  // Note(v4): prediction for MA is currently untested, because it is not supported as an account type yet.\n  // Prior to using this prediction logic, ensure that the counterfactual computation is correct by updating `predictAddress.test.ts` to include a test for MA.\n  const { combinedSalt, initcode } = (() => {\n    switch (params.type) {\n      case \"SMA\":\n        // MAv2 factory uses max uint32 for SMA entityId\n        return {\n          combinedSalt: getCombinedSaltK1(\n            params.ownerAddress,\n            salt,\n            0xffffffff,\n          ),\n          initcode: getProxyBytecodeWithImmutableArgs(\n            implementationAddress,\n            params.ownerAddress,\n          ),\n        };\n      case \"MA\":\n        return {\n          combinedSalt: getCombinedSaltK1(\n            params.ownerAddress,\n            salt,\n            params.entityId,\n          ),\n          initcode: getProxyBytecode(implementationAddress),\n        };\n      case \"WebAuthn\":\n        const { x, y } = parsePublicKey(params.ownerPublicKey);\n        return {\n          combinedSalt: getCombinedSaltWebAuthn(\n            { x, y },\n            salt,\n            params.entityId,\n          ),\n          initcode: getProxyBytecode(implementationAddress),\n        };\n      default:\n        return assertNever(params, \"Unexpected MAv2 type\");\n    }\n  })();\n\n  return getContractAddress({\n    from: factoryAddress,\n    opcode: \"CREATE2\",\n    salt: combinedSalt,\n    bytecode: initcode,\n  });\n}\n\nfunction getCombinedSaltK1(\n  ownerAddress: Address,\n  salt: bigint,\n  entityId: number,\n): Hex {\n  return keccak256(\n    encodePacked(\n      [\"address\", \"uint256\", \"uint32\"],\n      [ownerAddress, salt, entityId],\n    ),\n  );\n}\n\nfunction getCombinedSaltWebAuthn(\n  ownerPublicKey: { x: bigint; y: bigint },\n  salt: bigint,\n  entityId: number,\n): Hex {\n  return keccak256(\n    encodePacked(\n      [\"uint256\", \"uint256\", \"uint256\", \"uint32\"],\n      [ownerPublicKey.x, ownerPublicKey.y, salt, entityId],\n    ),\n  );\n}\n\nfunction getProxyBytecode(implementationAddress: Address): Hex {\n  return concatHex([\n    \"0x603d3d8160223d3973\",\n    implementationAddress,\n    \"0x60095155f3363d3d373d3d363d7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc545af43d6000803e6038573d6000fd5b3d6000f3\",\n  ]);\n}\n\nfunction getProxyBytecodeWithImmutableArgs(\n  implementationAddress: Address,\n  immutableArgs: Hex,\n): Hex {\n  return `0x6100513d8160233d3973${implementationAddress.slice(\n    2,\n  )}60095155f3363d3d373d3d363d7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc545af43d6000803e6038573d6000fd5b3d6000f3${immutableArgs.slice(\n    2,\n  )}`;\n}\n"]}
+{"version":3,"file":"predictAddress.js","sourceRoot":"","sources":["../../../src/ma-v2/predictAddress.ts"],"names":[],"mappings":"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","sourcesContent":["import { assertNever } from \"@alchemy/common\";\nimport {\n  concatHex,\n  decodeFunctionData,\n  encodePacked,\n  getContractAddress,\n  isAddressEqual,\n  keccak256,\n  type Address,\n  type Client,\n  type Hex,\n} from \"viem\";\nimport {\n  entryPoint07Address,\n  type EntryPointVersion,\n} from \"viem/account-abstraction\";\nimport { accountFactoryAbi } from \"./abis/accountFactoryAbi.js\";\nimport { DefaultAddress } from \"./utils/account.js\";\nimport { getSenderFromFactoryData } from \"../utils.js\";\n\nexport type PredictModularAccountV2AddressParams = {\n  factoryAddress: Address;\n  implementationAddress: Address; // Should be the implementation address of the account type you are predicting the address for.\n  salt: bigint;\n} & (\n  | {\n      type: \"MA\";\n      ownerAddress: Address;\n      entityId: number;\n    }\n  | {\n      type: \"SMA\";\n      ownerAddress: Address;\n    }\n);\n\n/**\n * Predicts the address of a modular account V2 based on the provided parameters, which include factory address, salt, and implementation address. This function supports different types of accounts including \"SMA\" and \"MA\".\n *\n * @example\n * ```ts\n * import { predictModularAccountV2Address } from \"@alchemy/smart-accounts\";\n *\n * const accountAddress = predictModularAccountV2Address({\n *   factoryAddress: \"0xFactoryAddress\" as Address,\n *   implementationAddress: \"0xImplementation\" as Address,\n *   salt: 0n,\n *   type: \"SMA\",\n *   ownerAddress: \"0xOwner\" as Address,\n * });\n * ```\n *\n * @param {PredictModularAccountV2AddressParams} params The parameters for predicting the modular account address, including `factoryAddress`, `salt`, `implementationAddress`, and additional properties based on the account type.\n * @returns {Address} The predicted address for the modular account V2.\n */\nexport function predictModularAccountV2Address(\n  params: PredictModularAccountV2AddressParams,\n): Address {\n  const { factoryAddress, salt, implementationAddress } = params;\n\n  // Note(v4): prediction for MA is currently untested, because it is not supported as an account type yet.\n  // Prior to using this prediction logic, ensure that the counterfactual computation is correct by updating `predictAddress.test.ts` to include a test for MA.\n  const { combinedSalt, initcode } = (() => {\n    switch (params.type) {\n      case \"SMA\":\n        // MAv2 factory uses max uint32 for SMA entityId\n        return {\n          combinedSalt: getCombinedSaltK1(\n            params.ownerAddress,\n            salt,\n            0xffffffff,\n          ),\n          initcode: getProxyBytecodeWithImmutableArgs(\n            implementationAddress,\n            params.ownerAddress,\n          ),\n        };\n      case \"MA\":\n        return {\n          combinedSalt: getCombinedSaltK1(\n            params.ownerAddress,\n            salt,\n            params.entityId,\n          ),\n          initcode: getProxyBytecode(implementationAddress),\n        };\n      default:\n        return assertNever(params, \"Unexpected MAv2 type\");\n    }\n  })();\n\n  return getContractAddress({\n    from: factoryAddress,\n    opcode: \"CREATE2\",\n    salt: combinedSalt,\n    bytecode: initcode,\n  });\n}\n\nfunction getCombinedSaltK1(\n  ownerAddress: Address,\n  salt: bigint,\n  entityId: number,\n): Hex {\n  return keccak256(\n    encodePacked(\n      [\"address\", \"uint256\", \"uint32\"],\n      [ownerAddress, salt, entityId],\n    ),\n  );\n}\n\nfunction getProxyBytecode(implementationAddress: Address): Hex {\n  return concatHex([\n    \"0x603d3d8160223d3973\",\n    implementationAddress,\n    \"0x60095155f3363d3d373d3d363d7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc545af43d6000803e6038573d6000fd5b3d6000f3\",\n  ]);\n}\n\nfunction getProxyBytecodeWithImmutableArgs(\n  implementationAddress: Address,\n  immutableArgs: Hex,\n): Hex {\n  return `0x6100513d8160233d3973${implementationAddress.slice(\n    2,\n  )}60095155f3363d3d373d3d363d7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc545af43d6000803e6038573d6000fd5b3d6000f3${immutableArgs.slice(\n    2,\n  )}`;\n}\n\nexport type GetModularAccountV2AddressFromFactoryDataParams = {\n  client: Client;\n  factoryAddress: Address;\n  factoryData: Hex;\n  implementationAddress: Address;\n  entryPoint?: {\n    version: EntryPointVersion;\n    address: Address;\n  };\n};\n\n/**\n * Gets the modular account v2 address from factory data.\n * If the factory is a known default (SMA), decodes the args and predicts without RPC.\n * Otherwise falls back to calling the entry point's getSenderAddress.\n *\n * @param {GetModularAccountV2AddressFromFactoryDataParams} params - The parameters\n * @returns {Promise<Address>} The account address\n */\nexport async function getModularAccountV2AddressFromFactoryData({\n  client,\n  factoryAddress,\n  factoryData,\n  implementationAddress,\n  entryPoint = {\n    version: \"0.7\",\n    address: entryPoint07Address,\n  },\n}: GetModularAccountV2AddressFromFactoryDataParams): Promise<Address> {\n  // Try SMA factory\n  if (isAddressEqual(factoryAddress, DefaultAddress.MAV2_FACTORY)) {\n    try {\n      const decoded = decodeFunctionData({\n        abi: accountFactoryAbi,\n        data: factoryData,\n      });\n      if (decoded.functionName === \"createSemiModularAccount\") {\n        const [decodedOwner, decodedSalt] = decoded.args;\n        return predictModularAccountV2Address({\n          factoryAddress,\n          implementationAddress,\n          salt: decodedSalt,\n          type: \"SMA\",\n          ownerAddress: decodedOwner,\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/utils/account.d.ts

@@ -8,18 +8,15 @@ import type { ModularAccountV2Base } from "../accounts/base.js";
  */
 export declare const DefaultAddress: {
     MAV2_FACTORY: "0x00000000000017c61b5bEe81050EC8eFc9c6fecd";
-    MAV2_FACTORY_WEBAUTHN: "0x55010E571dCf07e254994bfc88b9C1C8FAe31960";
     SMAV2_BYTECODE: "0x000000000000c5A9089039570Dd36455b5C07383";
     SMAV2_STORAGE: "0x0000000000006E2f9d80CaEc0Da6500f005EB25A";
     SMAV2_7702: "0x69007702764179f14F51cdce752f4f775d74E139";
-    MAV2: "0x00000000000002377B26b1EdA7b0BC371C60DD4f";
 };
 /**
  * A mapping of default addresses for the ModularAccountV2 modules.
  */
 export declare const DefaultModuleAddress: {
     SINGLE_SIGNER_VALIDATION: "0x00000000000099DE0BF6fA90dEB851E2A2df7d83";
-    WEBAUTHN_VALIDATION: "0x0000000000001D9d34E07D9834274dF9ae575217";
     TIME_RANGE: "0x00000000000082B8e2012be914dFA4f62A0573eA";
     PAYMASTER_GUARD: "0x0000000000001aA7A7F7E29abe0be06c72FD42A1";
     NATIVE_TOKEN_LIMIT: "0x00000000000001e541f0D090868FBe24b59Fbe06";