@alchemy/smart-accounts 0.0.0-alpha.2 → 0.0.0-alpha.21

package/src/ma-v2/accounts/base.ts

@@ -19,14 +19,10 @@ import {
 import {
   entryPoint07Abi,
   type SmartAccountImplementation,
-  type SmartAccount,
   entryPoint07Address,
   getUserOperationHash,
   toSmartAccount,
-  type WebAuthnAccount,
   type ToSmartAccountParameters,
-  estimateUserOperationGas,
-  type UserOperation,
 } from "viem/account-abstraction";
 import {
   getCode,
@@ -42,7 +38,10 @@ import {
   type ValidationDataView,
 } from "../types.js";
 import { modularAccountAbi } from "../abis/modularAccountAbi.js";
-import type { SignatureRequest } from "../../types.js";
+import type {
+  SignatureRequest,
+  SmartAccountWithDecodeCalls,
+} from "../../types.js";
 import {
   decodeFunctionData,
   getAction,
@@ -58,14 +57,13 @@ import {
 import { parseDeferredAction } from "../utils/deferredActions.js";
 import {
   pack1271Signature,
-  toWebAuthnSignature,
   toReplaySafeTypedData,
   packUOSignature,
 } from "../utils/signature.js";
-import { chainHas7212 } from "../../utils.js";
 import { InvalidDeferredActionNonceError } from "../../errors/InvalidDeferredActionNonceError.js";
 import { InvalidNonceKeyError } from "../../errors/InvalidNonceKeyError.js";
 import { InvalidEntityIdError } from "../../errors/InvalidEntityIdError.js";
+import { is7702Delegated } from "../../utils.js";
 
 export type ValidationDataParams =
   | {
@@ -81,7 +79,7 @@ export type BaseModularAccountV2Implementation = SmartAccountImplementation<
   typeof entryPoint07Abi,
   "0.7",
   {
-    source: "ModularAccountV2";
+    smartAccountType: "ModularAccountV2";
     signerEntity: SignerEntity;
     encodeCallData: (callData: Hex) => Promise<Hex>;
     getExecutionData: (selector: Hex) => Promise<ExecutionDataView>;
@@ -95,13 +93,13 @@ export type BaseModularAccountV2Implementation = SmartAccountImplementation<
 >;
 
 export type ModularAccountV2Base =
-  SmartAccount<BaseModularAccountV2Implementation>;
+  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;
@@ -144,10 +142,18 @@ export async function toModularAccountV2Base<
     throw new InvalidEntityIdError(entityId);
   }
 
+  let isDeployed = false;
+
   const isAccountDeployed: () => Promise<boolean> = async () => {
+    if (isDeployed) {
+      return true;
+    }
     const action = getAction(client, getCode, "getCode");
     const code = await action({ address: accountAddress });
-    return code != null && code !== "0x";
+    isDeployed = authorization
+      ? is7702Delegated(authorization.address, code)
+      : !!code;
+    return isDeployed;
   };
 
   // These default values signal that we should not use the set deferred action nonce
@@ -294,17 +300,12 @@ export async function toModularAccountV2Base<
       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]),
-              }),
+            }),
       }),
     };
   };
@@ -312,8 +313,7 @@ export async function toModularAccountV2Base<
   const formatSignature = async (signature: Hex): Promise<Hex> => {
     return pack1271Signature({
       entityId,
-      validationSignaturePrefix:
-        owner.type === "webAuthn" ? null : SignaturePrefix.EOA,
+      validationSignaturePrefix: SignaturePrefix.EOA,
       validationSignature: signature,
     });
   };
@@ -409,10 +409,6 @@ export async function toModularAccountV2Base<
     },
 
     async getStubSignature() {
-      if (owner.type === "webAuthn") {
-        return "0xff000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000000170000000000000000000000000000000000000000000000000000000000000001949fc7c88032b9fcb5f6efc7a7b8c63668eae9871b765e23123bb473ff57aa831a7c0d9276168ebcc29f2875a0239cffdf2a9cd1c2007c5c77c071db9264df1d000000000000000000000000000000000000000000000000000000000000002549960de5880e8c687434170f6476605b8fe4aeb9a28632c7995cf3ba831d97630500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008a7b2274797065223a22776562617574686e2e676574222c226368616c6c656e6765223a2273496a396e6164474850596759334b7156384f7a4a666c726275504b474f716d59576f4d57516869467773222c226f726967696e223a2268747470733a2f2f7369676e2e636f696e626173652e636f6d222c2263726f73734f726967696e223a66616c73657d00000000000000000000000000000000000000000000";
-      }
-
       const sig = packUOSignature({
         validationSignature:
           "0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c",
@@ -426,13 +422,6 @@ export async function toModularAccountV2Base<
         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({
@@ -456,15 +445,6 @@ export async function toModularAccountV2Base<
         data: td as TypedDataDefinition, // 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({
@@ -488,21 +468,6 @@ export async function toModularAccountV2Base<
         },
       });
 
-      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({
@@ -524,37 +489,8 @@ export async function toModularAccountV2Base<
       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 as UserOperation<typeof entryPoint.version>),
-          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: {
-      source: "ModularAccountV2" as const,
+      smartAccountType: "ModularAccountV2" as const,
       signerEntity: {
         entityId,
         isGlobalValidation,

package/src/ma-v2/mav2StaticImpl.ts

@@ -1,14 +1,11 @@
-import { encodeFunctionData, type Address, type Hex } from "viem";
+import { encodeFunctionData, type Address } from "viem";
 import { entryPoint07Abi, entryPoint07Address } from "viem/account-abstraction";
 import { lowerAddress } from "@alchemy/common";
 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 { DefaultAddress as DefaultMAV2Address } from "./utils/account.js";
 import { predictModularAccountV2Address } from "./predictAddress.js";
-import { modularAccountAbi } from "./abis/modularAccountAbi.js";
-import { parsePublicKey } from "webauthn-p256";
 
 export type SemiModularAccountV2FactoryArgs = {
   owner: Address;
@@ -84,51 +81,3 @@ export const semiModularAccount7702StaticImpl: SemiModularAccount7702StaticImpl
     ...semiModularAccountBase,
     delegationAddress: lowerAddress(DefaultMAV2Address.SMAV2_7702),
   };
-
-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 const webAuthnModularAccountV2StaticImpl: WebAuthnModularAccountV2StaticImpl =
-  {
-    entryPoint,
-    accountAbi: modularAccountAbi,
-    accountImplementation: lowerAddress(DefaultMAV2Address.MAV2),
-    factoryAddress: lowerAddress(DefaultMAV2Address.MAV2_FACTORY_WEBAUTHN),
-    factoryAbi: webAuthnFactoryAbi,
-    getFactoryData: (args: WebAuthnModularAccountV2FactoryArgs) => {
-      const { x, y } = parsePublicKey(args.ownerPublicKey);
-      return encodeFunctionData({
-        abi: webAuthnFactoryAbi,
-        functionName: "createWebAuthnAccount",
-        args: [x, y, args.salt, args.entityId],
-      });
-    },
-    predictAccountAddress: (args: WebAuthnModularAccountV2FactoryArgs) => {
-      return predictModularAccountV2Address({
-        factoryAddress: DefaultMAV2Address.MAV2_FACTORY_WEBAUTHN,
-        implementationAddress: DefaultMAV2Address.MAV2,
-        type: "WebAuthn",
-        salt: args.salt,
-        ownerPublicKey: args.ownerPublicKey,
-        entityId: args.entityId,
-      });
-    },
-  };

package/src/ma-v2/predictAddress.ts

@@ -1,13 +1,22 @@
 import { assertNever } from "@alchemy/common";
 import {
   concatHex,
+  decodeFunctionData,
   encodePacked,
   getContractAddress,
+  isAddressEqual,
   keccak256,
   type Address,
+  type Client,
   type Hex,
 } from "viem";
-import { parsePublicKey } from "webauthn-p256";
+import {
+  entryPoint07Address,
+  type EntryPointVersion,
+} from "viem/account-abstraction";
+import { accountFactoryAbi } from "./abis/accountFactoryAbi.js";
+import { DefaultAddress } from "./utils/account.js";
+import { getSenderFromFactoryData } from "../utils.js";
 
 export type PredictModularAccountV2AddressParams = {
   factoryAddress: Address;
@@ -23,15 +32,10 @@ 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
@@ -80,16 +84,6 @@ export function predictModularAccountV2Address(
           ),
           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");
     }
@@ -116,19 +110,6 @@ function getCombinedSaltK1(
   );
 }
 
-function getCombinedSaltWebAuthn(
-  ownerPublicKey: { x: bigint; y: bigint },
-  salt: bigint,
-  entityId: number,
-): Hex {
-  return keccak256(
-    encodePacked(
-      ["uint256", "uint256", "uint256", "uint32"],
-      [ownerPublicKey.x, ownerPublicKey.y, salt, entityId],
-    ),
-  );
-}
-
 function getProxyBytecode(implementationAddress: Address): Hex {
   return concatHex([
     "0x603d3d8160223d3973",
@@ -147,3 +128,60 @@ function getProxyBytecodeWithImmutableArgs(
     2,
   )}`;
 }
+
+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 async function getModularAccountV2AddressFromFactoryData({
+  client,
+  factoryAddress,
+  factoryData,
+  implementationAddress,
+  entryPoint = {
+    version: "0.7",
+    address: entryPoint07Address,
+  },
+}: GetModularAccountV2AddressFromFactoryDataParams): Promise<Address> {
+  // 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,
+  });
+}

package/src/ma-v2/utils/account.ts

@@ -16,11 +16,9 @@ import type { ModularAccountV2Base } from "../accounts/base.js";
  */
 export const DefaultAddress = {
   MAV2_FACTORY: "0x00000000000017c61b5bEe81050EC8eFc9c6fecd",
-  MAV2_FACTORY_WEBAUTHN: "0x55010E571dCf07e254994bfc88b9C1C8FAe31960",
   SMAV2_BYTECODE: "0x000000000000c5A9089039570Dd36455b5C07383",
   SMAV2_STORAGE: "0x0000000000006E2f9d80CaEc0Da6500f005EB25A",
   SMAV2_7702: "0x69007702764179f14F51cdce752f4f775d74E139",
-  MAV2: "0x00000000000002377B26b1EdA7b0BC371C60DD4f",
 } satisfies Record<string, Address>;
 
 /**
@@ -28,7 +26,6 @@ export const DefaultAddress = {
  */
 export const DefaultModuleAddress = {
   SINGLE_SIGNER_VALIDATION: "0x00000000000099DE0BF6fA90dEB851E2A2df7d83",
-  WEBAUTHN_VALIDATION: "0x0000000000001D9d34E07D9834274dF9ae575217",
   TIME_RANGE: "0x00000000000082B8e2012be914dFA4f62A0573eA",
   PAYMASTER_GUARD: "0x0000000000001aA7A7F7E29abe0be06c72FD42A1",
   NATIVE_TOKEN_LIMIT: "0x00000000000001e541f0D090868FBe24b59Fbe06",
@@ -133,5 +130,8 @@ export function serializeModuleEntity(config: ModuleEntity): Hex {
 export function isModularAccountV2(
   account: SmartAccount,
 ): account is ModularAccountV2Base {
-  return "source" in account && account.source === "ModularAccountV2";
+  return (
+    "smartAccountType" in account &&
+    account.smartAccountType === "ModularAccountV2"
+  );
 }

package/src/ma-v2/utils/signature.ts

@@ -1,13 +1,5 @@
-import {
-  concatHex,
-  encodeAbiParameters,
-  toHex,
-  type Address,
-  type Hash,
-  type Hex,
-} from "viem";
+import { concatHex, toHex, type Address, type Hash, type Hex } from "viem";
 import { SignaturePrefix } from "../types.js";
-import { Signature, type WebAuthnP256 } from "ox";
 
 export type PackUOSignatureParams = {
   // orderedHookData: HookData[];
@@ -30,7 +22,7 @@ export const packUOSignature = ({
 // TODO(v4): direct call validation 1271
 export type Pack1271SignatureParams = {
   entityId: number;
-  validationSignaturePrefix: SignaturePrefix | null;
+  validationSignaturePrefix: SignaturePrefix;
   validationSignature: Hex;
 };
 
@@ -86,44 +78,3 @@ export function toReplaySafeTypedData({
     primaryType: "ReplaySafeHash" as const,
   };
 }
-/**
- * Wraps a P256 signature with the webauthn metadata.
- *
- * @param {ToWebAuthnSignatureParams} params - The parameters for wrapping a P256 signature with the webauthn metadata.
- * @returns {object} The wrapped P256 signature.
- */
-export function toWebAuthnSignature({
-  webauthn,
-  signature,
-}: {
-  webauthn: WebAuthnP256.SignMetadata;
-  signature: Hex;
-}) {
-  const { r, s } = Signature.fromHex(signature);
-  return encodeAbiParameters(
-    [
-      {
-        name: "params",
-        type: "tuple",
-        components: [
-          { name: "authenticatorData", type: "bytes" },
-          { name: "clientDataJSON", type: "string" },
-          { name: "challengeIndex", type: "uint256" },
-          { name: "typeIndex", type: "uint256" },
-          { name: "r", type: "uint256" },
-          { name: "s", type: "uint256" },
-        ],
-      },
-    ],
-    [
-      {
-        authenticatorData: webauthn.authenticatorData,
-        clientDataJSON: webauthn.clientDataJSON,
-        challengeIndex: BigInt(webauthn.challengeIndex),
-        typeIndex: BigInt(webauthn.typeIndex),
-        r,
-        s,
-      },
-    ],
-  );
-}

package/src/types.ts

@@ -6,7 +6,11 @@ import type {
   SignableMessage,
   TypedDataDefinition,
 } from "viem";
-import type { EntryPointVersion, SmartAccount } from "viem/account-abstraction";
+import type {
+  EntryPointVersion,
+  SmartAccount,
+  SmartAccountImplementation,
+} from "viem/account-abstraction";
 
 export type GetAccountParameter<
   TAccount extends SmartAccount | undefined = SmartAccount | undefined,
@@ -16,6 +20,16 @@ export type GetAccountParameter<
     ? { account: TAccountOverride }
     : { account?: TAccountOverride };
 
+/**
+ * Helper type that converts a SmartAccount type to have a required `decodeCalls` function.
+ * This is useful for account implementations that always provide the `decodeCalls` functionality.
+ */
+export type SmartAccountWithDecodeCalls<
+  TImplementation extends SmartAccountImplementation,
+> = SmartAccount<TImplementation> & {
+  decodeCalls: NonNullable<SmartAccount<TImplementation>["decodeCalls"]>;
+};
+
 export type SignatureRequest =
   | {
       type: "personal_sign";