@alchemy/smart-accounts 0.0.0-alpha.1 → 0.0.0-alpha.10

package/dist/types/version.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,OAAO,UAAU,CAAC"}
+{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,OAAO,kBAAkB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alchemy/smart-accounts",
-  "version": "0.0.0-alpha.1",
+  "version": "0.0.0-alpha.10",
   "description": "This package contains all of the viem interfaces for Alchemy's Smart Contract Accounts",
   "author": "Alchemy",
   "license": "MIT",
@@ -39,13 +39,14 @@
     "test:run": "vitest run"
   },
   "devDependencies": {
-    "@alchemy/aa-infra": "0.0.0-alpha.1",
+    "@alchemy/aa-infra": "^0.0.0-alpha.10",
     "typescript-template": "*"
   },
   "dependencies": {
-    "@alchemy/common": "0.0.0-alpha.1",
+    "@alchemy/common": "^0.0.0-alpha.10",
     "ox": "^0.9.6",
-    "viem": "^2.32.0"
+    "viem": "^2.32.0",
+    "webauthn-p256": "^0.0.10"
   },
   "publishConfig": {
     "access": "public",
@@ -59,5 +60,5 @@
     "url": "https://github.com/alchemyplatform/aa-sdk/issues"
   },
   "homepage": "https://github.com/alchemyplatform/aa-sdk#readme",
-  "gitHead": "28d82120bf5ee7fa8391c3b91487c4283533d7e8"
+  "gitHead": "2cf1fd7a6a1ddca5c8a17b3139630b28a2a8b9e2"
 }

package/src/index.ts

@@ -1,3 +1,7 @@
+export type * from "./types.js";
+
+export { chainHas7212 } from "./utils.js";
+
 // LightAccount
 export type * from "./light-account/accounts/account.js";
 export { toLightAccount } from "./light-account/accounts/account.js";
@@ -127,6 +131,7 @@ export {
   pack1271Signature,
   toReplaySafeTypedData,
   toWebAuthnSignature,
+  WEBAUTHN_DUMMY_SIGNATURE,
 } from "./ma-v2/utils/signature.js";
 
 // Errors

package/src/light-account/accounts/account.ts

@@ -43,7 +43,8 @@ export type ToLightAccountParams<
   owner: JsonRpcAccount | LocalAccount;
   salt?: bigint;
   accountAddress?: Address;
-  factoryAddress?: Address;
+  factory?: Address;
+  factoryData?: Hex;
   version?: TLightAccountVersion;
 };
 
@@ -62,7 +63,8 @@ export async function toLightAccount<
   salt: salt_ = 0n,
   accountAddress: accountAddress_,
   version = defaultLightAccountVersion() as TLightAccountVersion,
-  factoryAddress = AccountVersionRegistry.LightAccount[version].factoryAddress,
+  factory = AccountVersionRegistry.LightAccount[version].factoryAddress,
+  factoryData: factoryData_,
 }: ToLightAccountParams<TLightAccountVersion>): Promise<
   LightAccount<TLightAccountVersion>
 > {
@@ -78,16 +80,14 @@ export async function toLightAccount<
       ? LightAccountFactoryAbi_v2
       : LightAccountFactoryAbi_v1;
 
-  const salt = LightAccountUnsupported1271Factories.has(
-    lowerAddress(factoryAddress),
-  )
+  const salt = LightAccountUnsupported1271Factories.has(lowerAddress(factory))
     ? 0n
     : salt_;
 
   const accountAddress =
     accountAddress_ ??
     predictLightAccountAddress({
-      factoryAddress,
+      factoryAddress: factory,
       salt,
       ownerAddress: owner.address,
       version,
@@ -96,14 +96,16 @@ export async function toLightAccount<
   LOGGER.debug("toLightAccount:address-resolved", { accountAddress });
 
   const getFactoryArgs = async () => {
-    const factoryData = encodeFunctionData({
-      abi: factoryAbi,
-      functionName: "createAccount",
-      args: [owner.address, salt],
-    });
+    const factoryData =
+      factoryData_ ??
+      encodeFunctionData({
+        abi: factoryAbi,
+        functionName: "createAccount",
+        args: [owner.address, salt],
+      });
 
     return {
-      factory: factoryAddress,
+      factory,
       factoryData,
     };
   };

package/src/light-account/accounts/base.ts

@@ -19,7 +19,6 @@ import {
 import {
   getUserOperationHash,
   toSmartAccount,
-  type SmartAccount,
   type SmartAccountImplementation,
 } from "viem/account-abstraction";
 import { getStorageAt, signMessage, signTypedData } from "viem/actions";
@@ -38,6 +37,7 @@ import { BaseError, lowerAddress } from "@alchemy/common";
 import type {
   SignatureRequest,
   StaticSmartAccountImplementation,
+  SmartAccountWithDecodeCalls,
 } from "../../types.js";
 import { getAction } from "viem/utils";
 
@@ -59,7 +59,7 @@ export type BaseLightAccountImplementation<
   >["version"],
   {
     getLightAccountVersion: () => TLightAccountVersion;
-    source: TLightAccountType;
+    smartAccountType: TLightAccountType;
     encodeUpgradeToAndCall: (params: {
       upgradeToAddress: Address;
       upgradeToInitData: Hex;
@@ -74,7 +74,7 @@ export type LightAccountBase<
   TLightAccountType extends LightAccountType = LightAccountType,
   TLightAccountVersion extends
     LightAccountVersion<TLightAccountType> = LightAccountVersion<TLightAccountType>,
-> = SmartAccount<
+> = SmartAccountWithDecodeCalls<
   BaseLightAccountImplementation<TLightAccountType, TLightAccountVersion>
 >;
 
@@ -330,7 +330,7 @@ export async function toLightAccountBase<
     },
 
     extend: {
-      source: type,
+      smartAccountType: type,
       getLightAccountVersion: () => version,
       encodeUpgradeToAndCall,
       prepareSignature,

package/src/light-account/accounts/multi-owner-account.ts

@@ -32,10 +32,11 @@ export type MultiOwnerLightAccount = LightAccountBase<
 
 export type ToMultiOwnerLightAccountParams = {
   client: Client<Transport, Chain, JsonRpcAccount | LocalAccount | undefined>;
-  owners: OneOf<JsonRpcAccount | LocalAccount>[];
+  owners: [OneOf<JsonRpcAccount | LocalAccount>, ...{ address: Address }[]];
   salt?: bigint;
   accountAddress?: Address;
-  factoryAddress?: Address;
+  factory?: Address;
+  factoryData?: Hex;
 };
 
 /**
@@ -47,10 +48,11 @@ export type ToMultiOwnerLightAccountParams = {
 export async function toMultiOwnerLightAccount({
   client,
   salt = 0n,
-  owners = [],
+  owners,
   accountAddress: accountAddress_,
-  factoryAddress = AccountVersionRegistry.MultiOwnerLightAccount["v2.0.0"]
+  factory = AccountVersionRegistry.MultiOwnerLightAccount["v2.0.0"]
     .factoryAddress,
+  factoryData: factoryData_,
 }: ToMultiOwnerLightAccountParams): Promise<MultiOwnerLightAccount> {
   const signer = owners[0];
 
@@ -67,20 +69,22 @@ export async function toMultiOwnerLightAccount({
   const accountAddress =
     accountAddress_ ??
     predictMultiOwnerLightAccountAddress({
-      factoryAddress,
+      factoryAddress: factory,
       salt,
       ownerAddresses: sortedOwners,
     });
 
   const getFactoryArgs = async () => {
-    const factoryData = encodeFunctionData({
-      abi: MultiOwnerLightAccountFactoryAbi,
-      functionName: "createAccount",
-      args: [sortedOwners, salt],
-    });
+    const factoryData =
+      factoryData_ ??
+      encodeFunctionData({
+        abi: MultiOwnerLightAccountFactoryAbi,
+        functionName: "createAccount",
+        args: [sortedOwners, salt],
+      });
 
     return {
-      factory: factoryAddress,
+      factory,
       factoryData,
     };
   };

package/src/light-account/decorators/multiOwner.ts

@@ -21,7 +21,10 @@ export type MultiOwnerLightAccountActions<
 function isMultiOwnerLightAccount(
   account: SmartAccount,
 ): account is MultiOwnerLightAccount {
-  return "source" in account && account.source === "MultiOwnerLightAccount";
+  return (
+    "smartAccountType" in account &&
+    account.smartAccountType === "MultiOwnerLightAccount"
+  );
 }
 
 /**

package/src/light-account/decorators/singleOwner.ts

@@ -16,7 +16,9 @@ export type LightAccountActions<
 };
 
 function isLightAccount(account: SmartAccount): account is LightAccount {
-  return "source" in account && account.source === "LightAccount";
+  return (
+    "smartAccountType" in account && account.smartAccountType === "LightAccount"
+  );
 }
 
 /**

package/src/light-account/registry.ts

@@ -35,7 +35,9 @@ export type LightAccountVersion<TAccountType extends LightAccountType> =
   keyof (typeof AccountVersionRegistry)[TAccountType];
 
 export type GetLightAccountType<TAccount extends LightAccountBase> =
-  TAccount["source"] extends LightAccountType ? TAccount["source"] : never;
+  TAccount["smartAccountType"] extends LightAccountType
+    ? TAccount["smartAccountType"]
+    : never;
 
 export type LightAccountAbi<
   TAccountType extends LightAccountType,

package/src/light-account/utils.ts

@@ -61,7 +61,7 @@ export async function getLightAccountImplAddress<
     throw new ChainNotFoundError();
   }
   const version = account.getLightAccountVersion();
-  const type = account.source;
+  const type = account.smartAccountType;
 
   const expectedImplAddresses = Object.values(AccountVersionRegistry[type]).map(
     (x) => x.accountImplementation,

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

@@ -13,12 +13,14 @@ import {
 import {
   entryPoint06Abi,
   toSmartAccount,
-  type SmartAccount,
   type SmartAccountImplementation,
   entryPoint06Address,
   getUserOperationHash,
 } from "viem/account-abstraction";
-import type { SignatureRequest } from "../../types.js";
+import type {
+  SignatureRequest,
+  SmartAccountWithDecodeCalls,
+} from "../../types.js";
 import { IStandardExecutorAbi } from "../abis/IStandardExecutor.js";
 import { signMessage, signTypedData } from "viem/actions";
 import {
@@ -36,14 +38,15 @@ export type BaseMaV1AccountImplementation = SmartAccountImplementation<
   typeof entryPoint06Abi,
   "0.6",
   {
-    source: MaV1AccountType;
+    smartAccountType: MaV1AccountType;
     prepareSignature: (request: SignatureRequest) => Promise<SignatureRequest>;
     formatSignature: (signature: Hex) => Promise<Hex>;
   },
   false
 >;
 
-export type ModularAccountV1Base = SmartAccount<BaseMaV1AccountImplementation>;
+export type ModularAccountV1Base =
+  SmartAccountWithDecodeCalls<BaseMaV1AccountImplementation>;
 
 export type ToModularAccountV1BaseParams<
   TTransport extends Transport = Transport,
@@ -237,7 +240,7 @@ export async function toModularAccountV1Base<
     },
 
     extend: {
-      source: type,
+      smartAccountType: type,
       prepareSignature,
       formatSignature,
     },

package/src/ma-v1/accounts/multi-owner-account.ts

@@ -35,7 +35,8 @@ export type ToMultiOwnerModularAccountV1Params = {
   owners: [OneOf<JsonRpcAccount | LocalAccount>, ...{ address: Address }[]];
   salt?: bigint;
   accountAddress?: Address;
-  factoryAddress?: Address;
+  factory?: Address;
+  factoryData?: Hex;
 };
 
 /**
@@ -49,7 +50,8 @@ export async function toMultiOwnerModularAccountV1({
   salt = 0n,
   owners,
   accountAddress: accountAddress_,
-  factoryAddress = DefaultMaV1Address.MULTI_OWNER_MAV1_FACTORY,
+  factory = DefaultMaV1Address.MULTI_OWNER_MAV1_FACTORY,
+  factoryData: factoryData_,
 }: ToMultiOwnerModularAccountV1Params): Promise<MultiOwnerModularAccountV1> {
   const signer = owners[0];
 
@@ -66,20 +68,22 @@ export async function toMultiOwnerModularAccountV1({
   const accountAddress =
     accountAddress_ ??
     predictMultiOwnerModularAccountV1Address({
-      factoryAddress,
+      factoryAddress: factory,
       salt,
       ownerAddresses: sortedOwners,
     });
 
   const getFactoryArgs = async () => {
-    const factoryData = encodeFunctionData({
-      abi: MultiOwnerModularAccountFactoryAbi,
-      functionName: "createAccount",
-      args: [salt, sortedOwners],
-    });
+    const factoryData =
+      factoryData_ ??
+      encodeFunctionData({
+        abi: MultiOwnerModularAccountFactoryAbi,
+        functionName: "createAccount",
+        args: [salt, sortedOwners],
+      });
 
     return {
-      factory: factoryAddress,
+      factory,
       factoryData,
     };
   };

package/src/ma-v1/decorators/multiOwner.ts

@@ -21,7 +21,10 @@ export type MultiOwnerModularAccountV1Actions<
 function isMultiOwnerModularAccountV1(
   account: SmartAccount,
 ): account is MultiOwnerModularAccountV1 {
-  return "source" in account && account.source === "MultiOwnerModularAccountV1";
+  return (
+    "smartAccountType" in account &&
+    account.smartAccountType === "MultiOwnerModularAccountV1"
+  );
 }
 
 /**

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

@@ -41,13 +41,13 @@ export type ToModularAccountV2Params<
 } & (TMode extends "7702"
   ? {
       salt?: never;
-      factoryAddress?: never;
+      factory?: never;
       factoryData?: never;
       implementationAddress?: never;
     }
   : {
       salt?: bigint;
-      factoryAddress?: Address;
+      factory?: Address;
       factoryData?: Hex;
       implementationAddress?: Address;
     });
@@ -65,7 +65,7 @@ export async function toModularAccountV2<TMode extends Mode = Mode>({
   signerEntity,
   accountAddress: accountAddress_,
   salt = 0n,
-  factoryAddress: factoryAddress_,
+  factory,
   factoryData: factoryData_,
   implementationAddress: implementationAddress_,
   mode,
@@ -82,7 +82,7 @@ export async function toModularAccountV2<TMode extends Mode = Mode>({
   const entityId = signerEntity?.entityId ?? DEFAULT_OWNER_ENTITY_ID;
 
   const factoryAddress =
-    factoryAddress_ ??
+    factory ??
     (owner.type === "webAuthn"
       ? DefaultAddress.MAV2_FACTORY_WEBAUTHN
       : DefaultAddress.MAV2_FACTORY);

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

@@ -19,7 +19,6 @@ import {
 import {
   entryPoint07Abi,
   type SmartAccountImplementation,
-  type SmartAccount,
   entryPoint07Address,
   getUserOperationHash,
   toSmartAccount,
@@ -42,7 +41,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,
@@ -61,6 +63,7 @@ import {
   toWebAuthnSignature,
   toReplaySafeTypedData,
   packUOSignature,
+  WEBAUTHN_DUMMY_SIGNATURE,
 } from "../utils/signature.js";
 import { chainHas7212 } from "../../utils.js";
 import { InvalidDeferredActionNonceError } from "../../errors/InvalidDeferredActionNonceError.js";
@@ -81,7 +84,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,7 +98,7 @@ export type BaseModularAccountV2Implementation = SmartAccountImplementation<
 >;
 
 export type ModularAccountV2Base =
-  SmartAccount<BaseModularAccountV2Implementation>;
+  SmartAccountWithDecodeCalls<BaseModularAccountV2Implementation>;
 
 export type ToModularAccountV2BaseParams<
   TTransport extends Transport = Transport,
@@ -144,10 +147,16 @@ 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 = !!code;
+    return isDeployed;
   };
 
   // These default values signal that we should not use the set deferred action nonce
@@ -410,7 +419,7 @@ export async function toModularAccountV2Base<
 
     async getStubSignature() {
       if (owner.type === "webAuthn") {
-        return "0xff000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000000170000000000000000000000000000000000000000000000000000000000000001949fc7c88032b9fcb5f6efc7a7b8c63668eae9871b765e23123bb473ff57aa831a7c0d9276168ebcc29f2875a0239cffdf2a9cd1c2007c5c77c071db9264df1d000000000000000000000000000000000000000000000000000000000000002549960de5880e8c687434170f6476605b8fe4aeb9a28632c7995cf3ba831d97630500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008a7b2274797065223a22776562617574686e2e676574222c226368616c6c656e6765223a2273496a396e6164474850596759334b7156384f7a4a666c726275504b474f716d59576f4d57516869467773222c226f726967696e223a2268747470733a2f2f7369676e2e636f696e626173652e636f6d222c2263726f73734f726967696e223a66616c73657d00000000000000000000000000000000000000000000";
+        return WEBAUTHN_DUMMY_SIGNATURE;
       }
 
       const sig = packUOSignature({
@@ -554,7 +563,7 @@ export async function toModularAccountV2Base<
     },
 
     extend: {
-      source: "ModularAccountV2" as const,
+      smartAccountType: "ModularAccountV2" as const,
       signerEntity: {
         entityId,
         isGlobalValidation,

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

@@ -133,5 +133,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

@@ -127,3 +127,9 @@ export function toWebAuthnSignature({
     ],
   );
 }
+
+/**
+ * A dummy WebAuthn signature used for gas estimation.
+ */
+export const WEBAUTHN_DUMMY_SIGNATURE =
+  "0xff000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000000170000000000000000000000000000000000000000000000000000000000000001949fc7c88032b9fcb5f6efc7a7b8c63668eae9871b765e23123bb473ff57aa831a7c0d9276168ebcc29f2875a0239cffdf2a9cd1c2007c5c77c071db9264df1d000000000000000000000000000000000000000000000000000000000000002549960de5880e8c687434170f6476605b8fe4aeb9a28632c7995cf3ba831d97630500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008a7b2274797065223a22776562617574686e2e676574222c226368616c6c656e6765223a2273496a396e6164474850596759334b7156384f7a4a666c726275504b474f716d59576f4d57516869467773222c226f726967696e223a2268747470733a2f2f7369676e2e636f696e626173652e636f6d222c2263726f73734f726967696e223a66616c73657d00000000000000000000000000000000000000000000";

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

package/src/utils.ts

@@ -7,6 +7,14 @@ import { BaseError } from "@alchemy/common";
 const RIP_7212_CHECK_BYTECODE =
   "0x60806040526040517f532eaabd9574880dbf76b9b8cc00832c20a6ec113d682299550d7a6e0f345e25815260056020820152600160408201527f4a03ef9f92eb268cafa601072489a56380fa0dc43171d7712813b3a19a1eb5e560608201527f3e213e28a608ce9a2f4a17fd830c6654018a79b3e0263d91a8ba90622df6f2f0608082015260208160a0836101005afa503d5f823e3d81f3fe";
 
+/**
+ * Checks if the current chain supports RIP-7212 (precompiled contract for secp256r1 curve operations).
+ * This is used to determine if the chain has native support for P256 signature verification,
+ * which is commonly used in WebAuthn/passkey implementations.
+ *
+ * @param {Client} client - The viem client to use for the check
+ * @returns {Promise<boolean>} True if the chain supports RIP-7212, false otherwise
+ */
 export const chainHas7212 = async (client: Client): Promise<boolean> => {
   const callAction = getAction(client, call, "call");
 

package/src/version.ts

@@ -1,3 +1,3 @@
 // This file is autogenerated by inject-version.ts. Any changes will be
 // overwritten on commit!
-export const VERSION = "0.0.0";
+export const VERSION = "0.0.0-alpha.9";