npm - @account-kit/smart-contracts - Versions diffs - 4.41.0 → 4.42.0 - Mend

@account-kit/smart-contracts 4.41.0 → 4.42.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (37) hide show

package/dist/esm/src/ma-v2/modules/webauthn-validation/signingMethods.d.ts ADDED Viewed

@@ -0,0 +1,36 @@
+import { type Address, type Chain, type Hex, type SignableMessage, type TypedData, type TypedDataDefinition } from "viem";
+import { type ToWebAuthnAccountParameters } from "viem/account-abstraction";
+/**
+ * Creates an object with methods for generating a dummy signature, signing user operation hashes, signing messages, and signing typed data.
+ *
+ * @example
+ * ```ts
+ * import { webauthnSigningFunctions } from "@account-kit/smart-contracts";
+ * import { LocalAccountSigner } from "@aa-sdk/core";
+ *
+ * const messageSigner = webauthnSigningFunctions(credential, getFn, rpId, chain, account.address, account.signerEntity.entityId);
+ * ```
+ *
+ * @param {ToWebAuthnAccountParameters} credential the Webauthn public key credential object
+ * @param {ToWebAuthnAccountParameters["getFn"]} getFn function to retrieve the WebAuthn credential
+ * @param {ToWebAuthnAccountParameters["rpId"]} rpId the relying party ID for the WebAuthn credential
+ * @param {Chain} chain Chain object for the signer
+ * @param {Address} accountAddress address of the smart account using this signer
+ * @param {number} entityId the entity id of the signing validation
+ * @param {Hex} deferredActionData optional deferred action data to prepend to the uo signatures
+ * @returns {object} an object with methods for signing operations and managing signatures
+ */
+export declare const webauthnSigningFunctions: (credential: ToWebAuthnAccountParameters["credential"], getFn: ToWebAuthnAccountParameters["getFn"], rpId: ToWebAuthnAccountParameters["rpId"], chain: Chain, accountAddress: Address, entityId: number, deferredActionData?: Hex) => {
+    id: string;
+    publicKey: `0x${string}`;
+    getDummySignature: () => Hex;
+    sign: ({ hash }: {
+        hash: Hex;
+    }) => Promise<`0x${string}`>;
+    signUserOperationHash: (uoHash: Hex) => Promise<Hex>;
+    signMessage({ message }: {
+        message: SignableMessage;
+    }): Promise<Hex>;
+    signTypedData: <const typedData extends TypedData | Record<string, unknown>, primaryType extends keyof typedData | "EIP712Domain" = keyof typedData>(typedDataDefinition: TypedDataDefinition<typedData, primaryType>) => Promise<Hex>;
+};

package/dist/esm/src/ma-v2/modules/webauthn-validation/signingMethods.js ADDED Viewed

@@ -0,0 +1,119 @@
+import * as WebAuthnP256 from "ox/WebAuthnP256";
+import { concatHex, encodeAbiParameters, hashMessage, hashTypedData, } from "viem";
+import {} from "viem/account-abstraction";
+import { pack1271Signature } from "../../utils.js";
+import { getDefaultWebauthnValidationModuleAddress } from "../utils.js";
+/**
+ * Creates an object with methods for generating a dummy signature, signing user operation hashes, signing messages, and signing typed data.
+ *
+ * @example
+ * ```ts
+ * import { webauthnSigningFunctions } from "@account-kit/smart-contracts";
+ * import { LocalAccountSigner } from "@aa-sdk/core";
+ *
+ * const messageSigner = webauthnSigningFunctions(credential, getFn, rpId, chain, account.address, account.signerEntity.entityId);
+ * ```
+ *
+ * @param {ToWebAuthnAccountParameters} credential the Webauthn public key credential object
+ * @param {ToWebAuthnAccountParameters["getFn"]} getFn function to retrieve the WebAuthn credential
+ * @param {ToWebAuthnAccountParameters["rpId"]} rpId the relying party ID for the WebAuthn credential
+ * @param {Chain} chain Chain object for the signer
+ * @param {Address} accountAddress address of the smart account using this signer
+ * @param {number} entityId the entity id of the signing validation
+ * @param {Hex} deferredActionData optional deferred action data to prepend to the uo signatures
+ * @returns {object} an object with methods for signing operations and managing signatures
+ */
+export const webauthnSigningFunctions = (credential, getFn, rpId, chain, accountAddress, entityId, deferredActionData) => {
+    const { id, publicKey } = credential;
+    const sign = async ({ hash }) => {
+        const { metadata, signature } = await WebAuthnP256.sign({
+            credentialId: id,
+            getFn,
+            challenge: hash,
+            rpId,
+        });
+        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: metadata.authenticatorData,
+                clientDataJSON: metadata.clientDataJSON,
+                challengeIndex: BigInt(metadata.challengeIndex),
+                typeIndex: BigInt(metadata.typeIndex),
+                r: signature.r,
+                s: signature.s,
+            },
+        ]);
+    };
+    return {
+        id,
+        publicKey,
+        getDummySignature: () => "0xff000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000000170000000000000000000000000000000000000000000000000000000000000001949fc7c88032b9fcb5f6efc7a7b8c63668eae9871b765e23123bb473ff57aa831a7c0d9276168ebcc29f2875a0239cffdf2a9cd1c2007c5c77c071db9264df1d000000000000000000000000000000000000000000000000000000000000002549960de5880e8c687434170f6476605b8fe4aeb9a28632c7995cf3ba831d97630500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008a7b2274797065223a22776562617574686e2e676574222c226368616c6c656e6765223a2273496a396e6164474850596759334b7156384f7a4a666c726275504b474f716d59576f4d57516869467773222c226f726967696e223a2268747470733a2f2f7369676e2e636f696e626173652e636f6d222c2263726f73734f726967696e223a66616c73657d00000000000000000000000000000000000000000000",
+        sign,
+        signUserOperationHash: async (uoHash) => {
+            let sig = await sign({ hash: hashMessage({ raw: uoHash }) });
+            if (deferredActionData) {
+                sig = concatHex([deferredActionData, sig]);
+                deferredActionData = undefined;
+            }
+            return concatHex(["0xff", sig]);
+        },
+        async signMessage({ message }) {
+            const hash = hashTypedData({
+                domain: {
+                    chainId: Number(chain.id),
+                    verifyingContract: getDefaultWebauthnValidationModuleAddress(chain),
+                    salt: concatHex([`0x${"00".repeat(12)}`, accountAddress]),
+                },
+                types: {
+                    ReplaySafeHash: [{ name: "hash", type: "bytes32" }],
+                },
+                message: {
+                    hash: hashMessage(message),
+                },
+                primaryType: "ReplaySafeHash",
+            });
+            return pack1271Signature({
+                validationSignature: await sign({ hash }),
+                entityId,
+            });
+        },
+        signTypedData: async (typedDataDefinition) => {
+            const isDeferredAction = typedDataDefinition?.primaryType === "DeferredAction" &&
+                // @ts-expect-error the domain type I think changed in viem, so this is not working correctly (TODO: fix this)
+                "verifyingContract" in typedDataDefinition.domain &&
+                typedDataDefinition.domain.verifyingContract === accountAddress;
+            const hash = await hashTypedData({
+                domain: {
+                    chainId: Number(chain.id),
+                    verifyingContract: getDefaultWebauthnValidationModuleAddress(chain),
+                    salt: concatHex([`0x${"00".repeat(12)}`, accountAddress]),
+                },
+                types: {
+                    ReplaySafeHash: [{ name: "hash", type: "bytes32" }],
+                },
+                message: {
+                    hash: hashTypedData(typedDataDefinition),
+                },
+                primaryType: "ReplaySafeHash",
+            });
+            const validationSignature = await sign({ hash });
+            return isDeferredAction
+                ? pack1271Signature({ validationSignature, entityId })
+                : validationSignature;
+        },
+    };
+};
+//# sourceMappingURL=signingMethods.js.map

package/dist/esm/src/ma-v2/modules/webauthn-validation/signingMethods.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"signingMethods.js","sourceRoot":"","sources":["../../../../../../src/ma-v2/modules/webauthn-validation/signingMethods.ts"],"names":[],"mappings":"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","sourcesContent":["import * as WebAuthnP256 from \"ox/WebAuthnP256\";\nimport {\n type Address,\n type Chain,\n concatHex,\n encodeAbiParameters,\n hashMessage,\n hashTypedData,\n type Hex,\n type SignableMessage,\n type TypedData,\n type TypedDataDefinition,\n} from \"viem\";\nimport { type ToWebAuthnAccountParameters } from \"viem/account-abstraction\";\nimport { pack1271Signature } from \"../../utils.js\";\nimport { getDefaultWebauthnValidationModuleAddress } from \"../utils.js\";\n\n/**\n * Creates an object with methods for generating a dummy signature, signing user operation hashes, signing messages, and signing typed data.\n *\n * @example \n \n * ```ts\n * import { webauthnSigningFunctions } from \"@account-kit/smart-contracts\";\n * import { LocalAccountSigner } from \"@aa-sdk/core\";\n *\n * const messageSigner = webauthnSigningFunctions(credential, getFn, rpId, chain, account.address, account.signerEntity.entityId);\n * ```\n *\n * @param {ToWebAuthnAccountParameters} credential the Webauthn public key credential object\n * @param {ToWebAuthnAccountParameters[\"getFn\"]} getFn function to retrieve the WebAuthn credential\n * @param {ToWebAuthnAccountParameters[\"rpId\"]} rpId the relying party ID for the WebAuthn credential\n * @param {Chain} chain Chain object for the signer\n * @param {Address} accountAddress address of the smart account using this signer\n * @param {number} entityId the entity id of the signing validation\n * @param {Hex} deferredActionData optional deferred action data to prepend to the uo signatures\n * @returns {object} an object with methods for signing operations and managing signatures\n */\nexport const webauthnSigningFunctions = (\n credential: ToWebAuthnAccountParameters[\"credential\"],\n getFn: ToWebAuthnAccountParameters[\"getFn\"],\n rpId: ToWebAuthnAccountParameters[\"rpId\"],\n chain: Chain,\n accountAddress: Address,\n entityId: number,\n deferredActionData?: Hex,\n) => {\n const { id, publicKey } = credential;\n\n const sign = async ({ hash }: { hash: Hex }) => {\n const { metadata, signature } = await WebAuthnP256.sign({\n credentialId: id,\n getFn,\n challenge: hash,\n rpId,\n });\n\n return encodeAbiParameters(\n [\n {\n name: \"params\",\n type: \"tuple\",\n components: [\n { name: \"authenticatorData\", type: \"bytes\" },\n { name: \"clientDataJSON\", type: \"string\" },\n { name: \"challengeIndex\", type: \"uint256\" },\n { name: \"typeIndex\", type: \"uint256\" },\n { name: \"r\", type: \"uint256\" },\n { name: \"s\", type: \"uint256\" },\n ],\n },\n ],\n [\n {\n authenticatorData: metadata.authenticatorData,\n clientDataJSON: metadata.clientDataJSON,\n challengeIndex: BigInt(metadata.challengeIndex),\n typeIndex: BigInt(metadata.typeIndex),\n r: signature.r,\n s: signature.s,\n },\n ],\n );\n };\n\n return {\n id,\n publicKey,\n getDummySignature: (): Hex =>\n \"0xff000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000000170000000000000000000000000000000000000000000000000000000000000001949fc7c88032b9fcb5f6efc7a7b8c63668eae9871b765e23123bb473ff57aa831a7c0d9276168ebcc29f2875a0239cffdf2a9cd1c2007c5c77c071db9264df1d000000000000000000000000000000000000000000000000000000000000002549960de5880e8c687434170f6476605b8fe4aeb9a28632c7995cf3ba831d97630500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008a7b2274797065223a22776562617574686e2e676574222c226368616c6c656e6765223a2273496a396e6164474850596759334b7156384f7a4a666c726275504b474f716d59576f4d57516869467773222c226f726967696e223a2268747470733a2f2f7369676e2e636f696e626173652e636f6d222c2263726f73734f726967696e223a66616c73657d00000000000000000000000000000000000000000000\",\n sign,\n signUserOperationHash: async (uoHash: Hex): Promise<Hex> => {\n let sig = await sign({ hash: hashMessage({ raw: uoHash }) });\n if (deferredActionData) {\n sig = concatHex([deferredActionData, sig]);\n deferredActionData = undefined;\n }\n\n return concatHex([\"0xff\", sig]);\n },\n\n async signMessage({ message }: { message: SignableMessage }): Promise<Hex> {\n const hash = hashTypedData({\n domain: {\n chainId: Number(chain.id),\n verifyingContract: getDefaultWebauthnValidationModuleAddress(chain),\n salt: concatHex([`0x${\"00\".repeat(12)}`, accountAddress]),\n },\n types: {\n ReplaySafeHash: [{ name: \"hash\", type: \"bytes32\" }],\n },\n message: {\n hash: hashMessage(message),\n },\n primaryType: \"ReplaySafeHash\",\n });\n\n return pack1271Signature({\n validationSignature: await sign({ hash }),\n entityId,\n });\n },\n\n signTypedData: async <\n const typedData extends TypedData | Record<string, unknown>,\n primaryType extends keyof typedData | \"EIP712Domain\" = keyof typedData,\n >(\n typedDataDefinition: TypedDataDefinition<typedData, primaryType>,\n ): Promise<Hex> => {\n const isDeferredAction =\n typedDataDefinition?.primaryType === \"DeferredAction\" &&\n // @ts-expect-error the domain type I think changed in viem, so this is not working correctly (TODO: fix this)\n \"verifyingContract\" in typedDataDefinition.domain &&\n typedDataDefinition.domain.verifyingContract === accountAddress;\n\n const hash = await hashTypedData({\n domain: {\n chainId: Number(chain.id),\n verifyingContract: getDefaultWebauthnValidationModuleAddress(chain),\n salt: concatHex([`0x${\"00\".repeat(12)}`, accountAddress]),\n },\n types: {\n ReplaySafeHash: [{ name: \"hash\", type: \"bytes32\" }],\n },\n message: {\n hash: hashTypedData(typedDataDefinition),\n },\n primaryType: \"ReplaySafeHash\",\n });\n\n const validationSignature = await sign({ hash });\n\n return isDeferredAction\n ? pack1271Signature({ validationSignature, entityId })\n : validationSignature;\n },\n };\n};\n"]}

package/dist/types/src/ma-v2/account/common/modularAccountV2Base.d.ts CHANGED Viewed

@@ -1,5 +1,6 @@
-import { type SmartAccountSigner, type SmartContractAccountWithSigner, type ToSmartContractAccountParams } from "@aa-sdk/core";
+import { type SmartAccountSigner, type SmartContractAccountWithSigner, type ToSmartContractAccountParams, type SmartContractAccount } from "@aa-sdk/core";
 import { type Hex, type Address, type Chain, type Transport } from "viem";
+import type { ToWebAuthnAccountParameters } from "viem/account-abstraction";
 export declare const executeUserOpSelector: Hex;
 export type SignerEntity = {
     isGlobalValidation: boolean;
@@ -30,12 +31,25 @@ export type ModularAccountV2<TSigner extends SmartAccountSigner = SmartAccountSi
     getValidationData: (args: ValidationDataParams) => Promise<ValidationDataView>;
     encodeCallData: (callData: Hex) => Promise<Hex>;
 };
-export type CreateMAV2BaseParams<TSigner extends SmartAccountSigner = SmartAccountSigner, TTransport extends Transport = Transport> = Omit<ToSmartContractAccountParams<"ModularAccountV2", TTransport, Chain, "0.7.0">, "encodeExecute" | "encodeBatchExecute" | "getNonce" | "signMessage" | "signTypedData" | "getDummySignature" | "prepareSign" | "formatSign"> & {
+export type WebauthnModularAccountV2 = SmartContractAccount<"ModularAccountV2", "0.7.0"> & {
+    params: ToWebAuthnAccountParameters;
+    signerEntity: SignerEntity;
+    getExecutionData: (selector: Hex) => Promise<ExecutionDataView>;
+    getValidationData: (args: ValidationDataParams) => Promise<ValidationDataView>;
+    encodeCallData: (callData: Hex) => Promise<Hex>;
+};
+export type CreateMAV2BaseParams<TSigner extends SmartAccountSigner | undefined = SmartAccountSigner | undefined, TTransport extends Transport = Transport> = Omit<ToSmartContractAccountParams<"ModularAccountV2", TTransport, Chain, "0.7.0">, "encodeExecute" | "encodeBatchExecute" | "getNonce" | "signMessage" | "signTypedData" | "getDummySignature" | "prepareSign" | "formatSign"> & {
     signer: TSigner;
     signerEntity?: SignerEntity;
     accountAddress: Address;
     deferredAction?: Hex;
 };
+export type CreateWebauthnMAV2BaseParams = Omit<CreateMAV2BaseParams, "signer"> & {
+    credential: ToWebAuthnAccountParameters["credential"];
+    getFn?: ToWebAuthnAccountParameters["getFn"] | undefined;
+    rpId?: ToWebAuthnAccountParameters["rpId"] | undefined;
+};
 export type CreateMAV2BaseReturnType<TSigner extends SmartAccountSigner = SmartAccountSigner> = Promise<ModularAccountV2<TSigner>>;
-export declare function createMAv2Base<TSigner extends SmartAccountSigner = SmartAccountSigner>(config: CreateMAV2BaseParams<TSigner>): CreateMAV2BaseReturnType<TSigner>;
+export declare function createMAv2Base(config: CreateWebauthnMAV2BaseParams): Promise<WebauthnModularAccountV2>;
+export declare function createMAv2Base<TSigner extends SmartAccountSigner = SmartAccountSigner>(config: CreateMAV2BaseParams): CreateMAV2BaseReturnType<TSigner>;
 //# sourceMappingURL=modularAccountV2Base.d.ts.map

package/dist/types/src/ma-v2/account/common/modularAccountV2Base.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"modularAccountV2Base.d.ts","sourceRoot":"","sources":["../../../../../../src/ma-v2/account/common/modularAccountV2Base.ts"],"names":[],"mappings":"AAAA,OAAO,EAQL,KAAK,kBAAkB,EACvB,KAAK,8BAA8B,EACnC,KAAK,4BAA4B,~~EAClC~~,MAAM,cAAc,CAAC;AAEtB,OAAO,EACL,KAAK,GAAG,EACR,KAAK,OAAO,EACZ,KAAK,KAAK,EACV,KAAK,SAAS,EAOf,MAAM,MAAM,CAAC;~~AAMd~~,eAAO,MAAM,qBAAqB,EAAE,GAAkB,CAAC;AAEvD,MAAM,MAAM,YAAY,GAAG;IACzB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,EAAE,OAAO,CAAC;IAChB,qBAAqB,EAAE,OAAO,CAAC;IAC/B,qBAAqB,EAAE,OAAO,CAAC;IAC/B,cAAc,EAAE,SAAS,GAAG,EAAE,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,eAAe,EAAE,SAAS,GAAG,EAAE,CAAC;IAChC,cAAc,EAAE,SAAS,GAAG,EAAE,CAAC;IAC/B,SAAS,EAAE,SAAS,GAAG,EAAE,CAAC;IAC1B,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAC5B;IACE,uBAAuB,EAAE,OAAO,CAAC;IACjC,QAAQ,CAAC,EAAE,KAAK,CAAC;CAClB,GACD;IACE,uBAAuB,CAAC,EAAE,KAAK,CAAC;IAChC,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEN,MAAM,MAAM,gBAAgB,CAC1B,OAAO,SAAS,kBAAkB,GAAG,kBAAkB,IACrD,8BAA8B,CAAC,kBAAkB,EAAE,OAAO,EAAE,OAAO,CAAC,GAAG;IACzE,YAAY,EAAE,YAAY,CAAC;IAC3B,gBAAgB,EAAE,CAAC,QAAQ,EAAE,GAAG,KAAK,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAChE,iBAAiB,EAAE,CACjB,IAAI,EAAE,oBAAoB,KACvB,OAAO,CAAC,kBAAkB,CAAC,CAAC;IACjC,cAAc,EAAE,CAAC,QAAQ,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;CACjD,CAAC;AAEF,MAAM,MAAM,oBAAoB,CAC9B,OAAO,SAAS,kBAAkB,GAAG,kBAAkB,~~EACvD~~,UAAU,SAAS,SAAS,GAAG,SAAS,IACtC,IAAI,CACN,4BAA4B,CAAC,kBAAkB,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,CAAC,EAE1E,eAAe,GACf,oBAAoB,GACpB,UAAU,GACV,aAAa,GACb,eAAe,GACf,mBAAmB,GACnB,aAAa,GACb,YAAY,CACf,GAAG;IACF,MAAM,EAAE,OAAO,CAAC;IAChB,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,cAAc,EAAE,OAAO,CAAC;IACxB,cAAc,CAAC,EAAE,GAAG,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,wBAAwB,CAClC,OAAO,SAAS,kBAAkB,GAAG,kBAAkB,IACrD,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;~~AAEvC~~,wBAAsB,cAAc,CAClC,OAAO,SAAS,kBAAkB,GAAG,kBAAkB,EACvD,MAAM,EAAE,oBAAoB,~~CAAC,OAAO,CAAC,~~GAAG,wBAAwB,CAAC,OAAO,CAAC,~~CAqM1E~~"}
1	+ {"version":3,"file":"modularAccountV2Base.d.ts","sourceRoot":"","sources":["../../../../../../src/ma-v2/account/common/modularAccountV2Base.ts"],"names":[],"mappings":"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"}

package/dist/types/src/ma-v2/account/modularAccountV2.d.ts CHANGED Viewed

@@ -1,6 +1,7 @@
 import type { EntryPointDef, SmartAccountSigner, ToSmartContractAccountParams } from "@aa-sdk/core";
 import { type Address, type Chain, type Hex, type Transport } from "viem";
-import { type SignerEntity, type ModularAccountV2 } from "./common/modularAccountV2Base.js";
+import { type SignerEntity, type ModularAccountV2, type WebauthnModularAccountV2 } from "./common/modularAccountV2Base.js";
+import type { ToWebAuthnAccountParameters } from "viem/account-abstraction";
 export type CreateModularAccountV2Params<TTransport extends Transport = Transport, TSigner extends SmartAccountSigner = SmartAccountSigner> = (Pick<ToSmartContractAccountParams<"ModularAccountV2", TTransport, Chain, "0.7.0">, "transport" | "chain" | "accountAddress"> & {
     signer: TSigner;
     entryPoint?: EntryPointDef<"0.7.0", Chain>;
@@ -15,5 +16,18 @@ export type CreateModularAccountV2Params<TTransport extends Transport = Transpor
 } | {
     mode: "7702";
 });
+export type CreateWebauthnModularAccountV2Params<TTransport extends Transport = Transport> = Pick<ToSmartContractAccountParams<"ModularAccountV2", TTransport, Chain, "0.7.0">, "transport" | "chain" | "accountAddress"> & {
+    mode: "webauthn";
+    credential: ToWebAuthnAccountParameters["credential"];
+    getFn?: ToWebAuthnAccountParameters["getFn"] | undefined;
+    rpId?: ToWebAuthnAccountParameters["rpId"] | undefined;
+    entryPoint?: EntryPointDef<"0.7.0", Chain>;
+    deferredAction?: Hex;
+    signerEntity?: SignerEntity;
+    salt?: bigint;
+    factoryAddress?: Address;
+    initCode?: Hex;
+};
 export declare function createModularAccountV2<TTransport extends Transport = Transport, TSigner extends SmartAccountSigner = SmartAccountSigner>(config: CreateModularAccountV2Params<TTransport, TSigner>): Promise<ModularAccountV2<TSigner>>;
+export declare function createModularAccountV2<TTransport extends Transport = Transport>(config: CreateWebauthnModularAccountV2Params<TTransport>): Promise<WebauthnModularAccountV2>;
 //# sourceMappingURL=modularAccountV2.d.ts.map

package/dist/types/src/ma-v2/account/modularAccountV2.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"modularAccountV2.d.ts","sourceRoot":"","sources":["../../../../../src/ma-v2/account/modularAccountV2.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EACb,kBAAkB,EAClB,4BAA4B,EAC7B,MAAM,cAAc,CAAC;~~AAMtB~~,OAAO,EAGL,KAAK,OAAO,EACZ,KAAK,KAAK,EACV,KAAK,GAAG,EACR,KAAK,SAAS,EACf,MAAM,MAAM,CAAC;AAMd,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,gBAAgB,~~EAEtB~~,MAAM,kCAAkC,CAAC;~~AAI1C~~,MAAM,MAAM,4BAA4B,CACtC,UAAU,SAAS,SAAS,GAAG,SAAS,EACxC,OAAO,SAAS,kBAAkB,GAAG,kBAAkB,IACrD,CAAC,IAAI,CACP,4BAA4B,CAAC,kBAAkB,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,CAAC,EAC5E,WAAW,GAAG,OAAO,GAAG,gBAAgB,CACzC,GAAG;IACF,MAAM,EAAE,OAAO,CAAC;IAChB,UAAU,CAAC,EAAE,aAAa,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAC3C,cAAc,CAAC,EAAE,GAAG,CAAC;IACrB,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B,CAAC,GACA,CACI;IACE,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,QAAQ,CAAC,EAAE,GAAG,CAAC;CAChB,GACD;IACE,IAAI,EAAE,MAAM,CAAC;CACd,CACJ,CAAC;AAEJ,wBAAsB,sBAAsB,CAC1C,UAAU,SAAS,SAAS,GAAG,SAAS,EACxC,OAAO,SAAS,kBAAkB,GAAG,kBAAkB,EAEvD,MAAM,EAAE,4BAA4B,CAAC,UAAU,EAAE,OAAO,CAAC,GACxD,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC"}
1	+ {"version":3,"file":"modularAccountV2.d.ts","sourceRoot":"","sources":["../../../../../src/ma-v2/account/modularAccountV2.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EACb,kBAAkB,EAClB,4BAA4B,EAC7B,MAAM,cAAc,CAAC;AAQtB,OAAO,EAGL,KAAK,OAAO,EACZ,KAAK,KAAK,EACV,KAAK,GAAG,EACR,KAAK,SAAS,EACf,MAAM,MAAM,CAAC;AAMd,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,gBAAgB,EAErB,KAAK,wBAAwB,EAC9B,MAAM,kCAAkC,CAAC;AAG1C,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,0BAA0B,CAAC;AAQ5E,MAAM,MAAM,4BAA4B,CACtC,UAAU,SAAS,SAAS,GAAG,SAAS,EACxC,OAAO,SAAS,kBAAkB,GAAG,kBAAkB,IACrD,CAAC,IAAI,CACP,4BAA4B,CAAC,kBAAkB,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,CAAC,EAC5E,WAAW,GAAG,OAAO,GAAG,gBAAgB,CACzC,GAAG;IACF,MAAM,EAAE,OAAO,CAAC;IAChB,UAAU,CAAC,EAAE,aAAa,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAC3C,cAAc,CAAC,EAAE,GAAG,CAAC;IACrB,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B,CAAC,GACA,CACI;IACE,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,QAAQ,CAAC,EAAE,GAAG,CAAC;CAChB,GACD;IACE,IAAI,EAAE,MAAM,CAAC;CACd,CACJ,CAAC;AAEJ,MAAM,MAAM,oCAAoC,CAC9C,UAAU,SAAS,SAAS,GAAG,SAAS,IACtC,IAAI,CACN,4BAA4B,CAAC,kBAAkB,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,CAAC,EAC5E,WAAW,GAAG,OAAO,GAAG,gBAAgB,CACzC,GAAG;IACF,IAAI,EAAE,UAAU,CAAC;IACjB,UAAU,EAAE,2BAA2B,CAAC,YAAY,CAAC,CAAC;IACtD,KAAK,CAAC,EAAE,2BAA2B,CAAC,OAAO,CAAC,GAAG,SAAS,CAAC;IACzD,IAAI,CAAC,EAAE,2BAA2B,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC;IACvD,UAAU,CAAC,EAAE,aAAa,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAC3C,cAAc,CAAC,EAAE,GAAG,CAAC;IACrB,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,EAAE,GAAG,CAAC;CAChB,CAAC;AAEF,wBAAsB,sBAAsB,CAC1C,UAAU,SAAS,SAAS,GAAG,SAAS,EACxC,OAAO,SAAS,kBAAkB,GAAG,kBAAkB,EAEvD,MAAM,EAAE,4BAA4B,CAAC,UAAU,EAAE,OAAO,CAAC,GACxD,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;AAEtC,wBAAsB,sBAAsB,CAC1C,UAAU,SAAS,SAAS,GAAG,SAAS,EAExC,MAAM,EAAE,oCAAoC,CAAC,UAAU,CAAC,GACvD,OAAO,CAAC,wBAAwB,CAAC,CAAC"}

package/dist/types/src/ma-v2/client/client.d.ts CHANGED Viewed

@@ -1,15 +1,23 @@
-import { type SmartAccountClient, type SmartAccountSigner, type SmartAccountClientConfig, type NotType } from "@aa-sdk/core";
+import { type SmartAccountClient, type SmartAccountClientConfig, type SmartAccountSigner } from "@aa-sdk/core";
 import { type Chain, type Transport } from "viem";
-import { type CreateModularAccountV2Params } from "../account/modularAccountV2.js";
-import { type AlchemySmartAccountClientConfig, type AlchemyTransport } from "@account-kit/infra";
+import { type CreateModularAccountV2Params, type CreateWebauthnModularAccountV2Params } from "../account/modularAccountV2.js";
+import { type AlchemySmartAccountClient, type AlchemySmartAccountClientConfig, type AlchemyTransport } from "@account-kit/infra";
 import type { LightAccount } from "../../light-account/accounts/account.js";
-import type { ModularAccountV2 } from "../account/common/modularAccountV2Base.js";
-export type ModularAccountV2Client<TSigner extends SmartAccountSigner = SmartAccountSigner, TChain extends Chain = Chain, TTransport extends Transport | AlchemyTransport = Transport> = SmartAccountClient<TTransport, TChain, ModularAccountV2<TSigner>>;
-export type CreateModularAccountV2ClientParams<TTransport extends Transport = Transport, TChain extends Chain = Chain, TSigner extends SmartAccountSigner = SmartAccountSigner> = CreateModularAccountV2Params<TTransport, TSigner> & Omit<SmartAccountClientConfig<TTransport, TChain>, "transport" | "account" | "chain">;
+import type { ToWebAuthnAccountParameters } from "viem/account-abstraction";
+import type { ModularAccountV2, WebauthnModularAccountV2 } from "../account/common/modularAccountV2Base.js";
+export type ModularAccountV2Client<TSigner extends SmartAccountSigner = SmartAccountSigner, TChain extends Chain = Chain, TTransport extends Transport | AlchemyTransport = Transport> = TTransport extends AlchemyTransport ? AlchemySmartAccountClient<TChain, ModularAccountV2<TSigner>> : SmartAccountClient<TTransport, TChain, ModularAccountV2<TSigner>>;
+export type WebauthnModularAccountV2Client<TChain extends Chain = Chain, TTransport extends Transport | AlchemyTransport = Transport> = TTransport extends AlchemyTransport ? AlchemySmartAccountClient<TChain, WebauthnModularAccountV2> : SmartAccountClient<TTransport, TChain, WebauthnModularAccountV2>;
+export type CreateModularAccountV2ClientParams<TTransport extends Transport | AlchemyTransport = Transport, TChain extends Chain = Chain, TSigner extends SmartAccountSigner = SmartAccountSigner> = CreateModularAccountV2Params<TTransport, TSigner> & Omit<TTransport extends AlchemyTransport ? AlchemySmartAccountClientConfig<TChain> : SmartAccountClientConfig<TTransport, TChain>, "transport" | "account" | "chain">;
+export type CreateWebauthnModularAccountV2ClientParams<TTransport extends Transport | AlchemyTransport = Transport, TChain extends Chain = Chain> = CreateWebauthnModularAccountV2Params<TTransport> & Omit<TTransport extends AlchemyTransport ? AlchemySmartAccountClientConfig<TChain> : SmartAccountClientConfig<TTransport, TChain>, "transport" | "account" | "chain"> & {
+    credential: ToWebAuthnAccountParameters["credential"];
+    getFn?: ToWebAuthnAccountParameters["getFn"];
+    rpId?: ToWebAuthnAccountParameters["rpId"];
+};
 export type CreateModularAccountV2AlchemyClientParams<TTransport extends Transport = Transport, TChain extends Chain = Chain, TSigner extends SmartAccountSigner = SmartAccountSigner> = Omit<CreateModularAccountV2ClientParams<TTransport, TChain, TSigner>, "transport"> & Omit<AlchemySmartAccountClientConfig<TChain, LightAccount<TSigner>>, "account"> & {
     paymasterAndData?: never;
     dummyPaymasterAndData?: never;
 };
 export declare function createModularAccountV2Client<TChain extends Chain = Chain, TSigner extends SmartAccountSigner = SmartAccountSigner>(args: CreateModularAccountV2AlchemyClientParams<AlchemyTransport, TChain, TSigner>): Promise<ModularAccountV2Client<TSigner, TChain, AlchemyTransport>>;
-export declare function createModularAccountV2Client<TTransport extends Transport = Transport, TChain extends Chain = Chain, TSigner extends SmartAccountSigner = SmartAccountSigner>(args: CreateModularAccountV2ClientParams<TTransport, TChain, TSigner> & NotType<TTransport, AlchemyTransport>): Promise<ModularAccountV2Client<TSigner, TChain>>;
+export declare function createModularAccountV2Client<TTransport extends Transport = Transport, TChain extends Chain = Chain, TSigner extends SmartAccountSigner = SmartAccountSigner>(args: CreateModularAccountV2ClientParams<TTransport, TChain, TSigner>): Promise<ModularAccountV2Client<TSigner, TChain, TTransport>>;
+export declare function createModularAccountV2Client<TTransport extends Transport = Transport, TChain extends Chain = Chain>(args: CreateWebauthnModularAccountV2ClientParams<TTransport, TChain>): Promise<WebauthnModularAccountV2Client<TChain, TTransport>>;
 //# sourceMappingURL=client.d.ts.map

package/dist/types/src/ma-v2/client/client.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../../../src/ma-v2/client/client.ts"],"names":[],"mappings":"AAAA,OAAO,~~EACL~~,KAAK,kBAAkB,EACvB,KAAK,~~kBAAkB,EACvB,KAAK,~~wBAAwB,EAC7B,KAAK,~~OAAO~~,~~EAIb~~,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,KAAK,KAAK,EAAE,KAAK,SAAS,EAAE,MAAM,MAAM,CAAC;AAElD,OAAO,EAEL,KAAK,4BAA4B,~~EAClC~~,MAAM,gCAAgC,CAAC;AAExC,OAAO,~~EAIL~~,KAAK,+BAA+B,EACpC,KAAK,gBAAgB,EACtB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAE5E,OAAO,KAAK,EAAE,~~gBAAgB~~,EAAE,MAAM,2CAA2C,CAAC;~~AAElF~~,MAAM,MAAM,sBAAsB,CAChC,OAAO,SAAS,kBAAkB,GAAG,kBAAkB,EACvD,MAAM,SAAS,KAAK,GAAG,KAAK,EAC5B,UAAU,SAAS,SAAS,GAAG,gBAAgB,GAAG,SAAS,IACzD,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;AAEtE,MAAM,MAAM,kCAAkC,CAC5C,UAAU,SAAS,SAAS,GAAG,SAAS,~~EACxC~~,MAAM,SAAS,KAAK,GAAG,KAAK,EAC5B,OAAO,SAAS,kBAAkB,GAAG,kBAAkB,IACrD,4BAA4B,CAAC,UAAU,EAAE,OAAO,CAAC,GACnD,IAAI,CACF,wBAAwB,CAAC,UAAU,EAAE,MAAM,CAAC,~~EAC5C~~,WAAW,GAAG,SAAS,GAAG,OAAO,CAClC,CAAC;AAEJ,MAAM,MAAM,yCAAyC,CACnD,UAAU,SAAS,SAAS,GAAG,SAAS,EACxC,MAAM,SAAS,KAAK,GAAG,KAAK,EAC5B,OAAO,SAAS,kBAAkB,GAAG,kBAAkB,IACrD,IAAI,CACN,kCAAkC,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,EAC/D,WAAW,CACZ,GACC,IAAI,CACF,+BAA+B,CAAC,MAAM,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC,EAC9D,SAAS,CACV,GAAG;IAAE,gBAAgB,CAAC,EAAE,KAAK,CAAC;IAAC,qBAAqB,CAAC,EAAE,KAAK,CAAA;CAAE,CAAC;AAElE,wBAAgB,4BAA4B,CAC1C,MAAM,SAAS,KAAK,GAAG,KAAK,EAC5B,OAAO,SAAS,kBAAkB,GAAG,kBAAkB,EAEvD,IAAI,EAAE,yCAAyC,CAC7C,gBAAgB,EAChB,MAAM,EACN,OAAO,CACR,GACA,OAAO,CAAC,sBAAsB,CAAC,OAAO,EAAE,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC;AAEtE,wBAAgB,4BAA4B,CAC1C,UAAU,SAAS,SAAS,GAAG,SAAS,EACxC,MAAM,SAAS,KAAK,GAAG,KAAK,EAC5B,OAAO,SAAS,kBAAkB,GAAG,kBAAkB,EAEvD,IAAI,EAAE,kCAAkC,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,~~GACnE~~,OAAO,CAAC,UAAU,EAAE,~~gBAAgB~~,CAAC,~~GACtC~~,OAAO,CAAC,~~sBAAsB~~,CAAC,~~OAAO~~,EAAE,~~MAAM~~,CAAC,CAAC,CAAC"}
1	+ {"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../../../src/ma-v2/client/client.ts"],"names":[],"mappings":"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"}

package/dist/types/src/ma-v2/errors.d.ts ADDED Viewed

@@ -0,0 +1,23 @@
+import { BaseError } from "@aa-sdk/core";
+/**
+ * Error when Webauthn credentials are not passed to Webauthn Modular Account V2
+ */
+export declare class WebauthnCredentialsRequiredError extends BaseError {
+    name: string;
+    constructor();
+}
+/**
+ * Error when a signer is not passed to 7702 version of Modular Account V2
+ */
+export declare class SignerRequiredFor7702Error extends BaseError {
+    name: string;
+    constructor();
+}
+/**
+ * Error when a signer is not passed to default Modular Account V2
+ */
+export declare class SignerRequiredForDefaultError extends BaseError {
+    name: string;
+    constructor();
+}
+//# sourceMappingURL=errors.d.ts.map

package/dist/types/src/ma-v2/errors.d.ts.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../../../src/ma-v2/errors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC;;GAEG;AACH,qBAAa,gCAAiC,SAAQ,SAAS;IACpD,IAAI,SAAsC;;CAMpD;AAED;;GAEG;AACH,qBAAa,0BAA2B,SAAQ,SAAS;IAC9C,IAAI,SAAgC;;CAI9C;AAED;;GAEG;AACH,qBAAa,6BAA8B,SAAQ,SAAS;IACjD,IAAI,SAAmC;;CAIjD"}

package/dist/types/src/ma-v2/index.d.ts CHANGED Viewed

@@ -26,4 +26,5 @@ export { SingleSignerValidationModule } from "./modules/single-signer-validation
 export { timeRangeModuleAbi } from "./modules/time-range-module/abis/timeRangeModuleAbi.js";
 export { TimeRangeModule } from "./modules/time-range-module/module.js";
 export { webauthnValidationModuleAbi } from "./modules/webauthn-validation/abis/webauthnValidationAbi.js";
+export { WebAuthnValidationModule } from "./modules/webauthn-validation/module.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/types/src/ma-v2/index.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/ma-v2/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,6BAA6B,EAAE,MAAM,yCAAyC,CAAC;AACxF,OAAO,EAAE,4BAA4B,EAAE,MAAM,wCAAwC,CAAC;AAEtF,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAE/D,YAAY,EACV,YAAY,EACZ,gBAAgB,EAChB,UAAU,EACV,cAAc,GACf,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AACrD,OAAO,EACL,yBAAyB,EACzB,mBAAmB,EACnB,qBAAqB,GACtB,MAAM,2BAA2B,CAAC;AACnC,mBAAmB,mDAAmD,CAAC;AACvE,OAAO,EAAE,wBAAwB,EAAE,MAAM,mDAAmD,CAAC;AAC7F,mBAAmB,8BAA8B,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,mBAAmB,wBAAwB,CAAC;AAC5C,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAC3E,cAAc,8BAA8B,CAAC;AAE7C,OAAO,EACL,gCAAgC,EAChC,uCAAuC,EACvC,qCAAqC,EACrC,6CAA6C,EAC7C,gCAAgC,EAChC,yCAAyC,GAC1C,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,iBAAiB,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAC;AAC1E,OAAO,EAAE,kBAAkB,EAAE,MAAM,uDAAuD,CAAC;AAC3F,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AACvE,OAAO,EAAE,yBAAyB,EAAE,MAAM,uEAAuE,CAAC;AAClH,OAAO,EAAE,sBAAsB,EAAE,MAAM,+CAA+C,CAAC;AACvF,OAAO,EAAE,uBAAuB,EAAE,MAAM,kEAAkE,CAAC;AAC3G,OAAO,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAClF,OAAO,EAAE,+BAA+B,EAAE,MAAM,4EAA4E,CAAC;AAC7H,OAAO,EAAE,4BAA4B,EAAE,MAAM,8CAA8C,CAAC;AAC5F,OAAO,EAAE,kBAAkB,EAAE,MAAM,wDAAwD,CAAC;AAC5F,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,OAAO,EAAE,2BAA2B,EAAE,MAAM,6DAA6D,CAAC"}
1	+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/ma-v2/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,6BAA6B,EAAE,MAAM,yCAAyC,CAAC;AACxF,OAAO,EAAE,4BAA4B,EAAE,MAAM,wCAAwC,CAAC;AAEtF,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAE/D,YAAY,EACV,YAAY,EACZ,gBAAgB,EAChB,UAAU,EACV,cAAc,GACf,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AACrD,OAAO,EACL,yBAAyB,EACzB,mBAAmB,EACnB,qBAAqB,GACtB,MAAM,2BAA2B,CAAC;AACnC,mBAAmB,mDAAmD,CAAC;AACvE,OAAO,EAAE,wBAAwB,EAAE,MAAM,mDAAmD,CAAC;AAC7F,mBAAmB,8BAA8B,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,mBAAmB,wBAAwB,CAAC;AAC5C,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAC3E,cAAc,8BAA8B,CAAC;AAE7C,OAAO,EACL,gCAAgC,EAChC,uCAAuC,EACvC,qCAAqC,EACrC,6CAA6C,EAC7C,gCAAgC,EAChC,yCAAyC,GAC1C,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,iBAAiB,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAC;AAC1E,OAAO,EAAE,kBAAkB,EAAE,MAAM,uDAAuD,CAAC;AAC3F,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AACvE,OAAO,EAAE,yBAAyB,EAAE,MAAM,uEAAuE,CAAC;AAClH,OAAO,EAAE,sBAAsB,EAAE,MAAM,+CAA+C,CAAC;AACvF,OAAO,EAAE,uBAAuB,EAAE,MAAM,kEAAkE,CAAC;AAC3G,OAAO,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAClF,OAAO,EAAE,+BAA+B,EAAE,MAAM,4EAA4E,CAAC;AAC7H,OAAO,EAAE,4BAA4B,EAAE,MAAM,8CAA8C,CAAC;AAC5F,OAAO,EAAE,kBAAkB,EAAE,MAAM,wDAAwD,CAAC;AAC5F,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,OAAO,EAAE,2BAA2B,EAAE,MAAM,6DAA6D,CAAC;AAC1G,OAAO,EAAE,wBAAwB,EAAE,MAAM,yCAAyC,CAAC"}

package/dist/types/src/ma-v2/modules/webauthn-validation/signingMethods.d.ts ADDED Viewed

@@ -0,0 +1,37 @@
+import { type Address, type Chain, type Hex, type SignableMessage, type TypedData, type TypedDataDefinition } from "viem";
+import { type ToWebAuthnAccountParameters } from "viem/account-abstraction";
+/**
+ * Creates an object with methods for generating a dummy signature, signing user operation hashes, signing messages, and signing typed data.
+ *
+ * @example
+ * ```ts
+ * import { webauthnSigningFunctions } from "@account-kit/smart-contracts";
+ * import { LocalAccountSigner } from "@aa-sdk/core";
+ *
+ * const messageSigner = webauthnSigningFunctions(credential, getFn, rpId, chain, account.address, account.signerEntity.entityId);
+ * ```
+ *
+ * @param {ToWebAuthnAccountParameters} credential the Webauthn public key credential object
+ * @param {ToWebAuthnAccountParameters["getFn"]} getFn function to retrieve the WebAuthn credential
+ * @param {ToWebAuthnAccountParameters["rpId"]} rpId the relying party ID for the WebAuthn credential
+ * @param {Chain} chain Chain object for the signer
+ * @param {Address} accountAddress address of the smart account using this signer
+ * @param {number} entityId the entity id of the signing validation
+ * @param {Hex} deferredActionData optional deferred action data to prepend to the uo signatures
+ * @returns {object} an object with methods for signing operations and managing signatures
+ */
+export declare const webauthnSigningFunctions: (credential: ToWebAuthnAccountParameters["credential"], getFn: ToWebAuthnAccountParameters["getFn"], rpId: ToWebAuthnAccountParameters["rpId"], chain: Chain, accountAddress: Address, entityId: number, deferredActionData?: Hex) => {
+    id: string;
+    publicKey: `0x${string}`;
+    getDummySignature: () => Hex;
+    sign: ({ hash }: {
+        hash: Hex;
+    }) => Promise<`0x${string}`>;
+    signUserOperationHash: (uoHash: Hex) => Promise<Hex>;
+    signMessage({ message }: {
+        message: SignableMessage;
+    }): Promise<Hex>;
+    signTypedData: <const typedData extends TypedData | Record<string, unknown>, primaryType extends keyof typedData | "EIP712Domain" = keyof typedData>(typedDataDefinition: TypedDataDefinition<typedData, primaryType>) => Promise<Hex>;
+};
+//# sourceMappingURL=signingMethods.d.ts.map

package/dist/types/src/ma-v2/modules/webauthn-validation/signingMethods.d.ts.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"signingMethods.d.ts","sourceRoot":"","sources":["../../../../../../src/ma-v2/modules/webauthn-validation/signingMethods.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,OAAO,EACZ,KAAK,KAAK,EAKV,KAAK,GAAG,EACR,KAAK,eAAe,EACpB,KAAK,SAAS,EACd,KAAK,mBAAmB,EACzB,MAAM,MAAM,CAAC;AACd,OAAO,EAAE,KAAK,2BAA2B,EAAE,MAAM,0BAA0B,CAAC;AAI5E;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,eAAO,MAAM,wBAAwB,GACnC,YAAY,2BAA2B,CAAC,YAAY,CAAC,EACrD,OAAO,2BAA2B,CAAC,OAAO,CAAC,EAC3C,MAAM,2BAA2B,CAAC,MAAM,CAAC,EACzC,OAAO,KAAK,EACZ,gBAAgB,OAAO,EACvB,UAAU,MAAM,EAChB,qBAAqB,GAAG;;;6BA2CC,GAAG;qBAvCE;QAAE,IAAI,EAAE,GAAG,CAAA;KAAE;oCA0CH,GAAG,KAAG,OAAO,CAAC,GAAG,CAAC;6BAUzB;QAAE,OAAO,EAAE,eAAe,CAAA;KAAE,GAAG,OAAO,CAAC,GAAG,CAAC;0BAuBlE,SAAS,SAAS,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC3D,WAAW,SAAS,MAAM,SAAS,GAAG,cAAc,yCAE/B,mBAAmB,CAAC,SAAS,EAAE,WAAW,CAAC,KAC/D,OAAO,CAAC,GAAG,CAAC;CA6BlB,CAAC"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@account-kit/smart-contracts",
-  "version": "4.41.0",
+  "version": "4.42.0",
   "description": "aa-sdk compatible interfaces for Alchemy Smart Accounts",
   "author": "Alchemy",
   "license": "MIT",
@@ -52,7 +52,7 @@
     "test:run": "vitest run"
   },
   "devDependencies": {
-    "@account-kit/plugingen": "^4.41.0",
+    "@account-kit/plugingen": "^4.42.0",
     "change-case": "^5.1.2",
     "dedent": "^1.5.1",
     "dotenv": "^16.3.1",
@@ -70,10 +70,10 @@
     "url": "https://github.com/alchemyplatform/aa-sdk/issues"
   },
   "homepage": "https://github.com/alchemyplatform/aa-sdk#readme",
-  "gitHead": "db374bb77b5961b3d2c5c883e9e77f861df92f59",
+  "gitHead": "924c688a7ac5de77c453cc1b1fce41f6bbf02dce",
   "dependencies": {
-    "@aa-sdk/core": "^4.41.0",
-    "@account-kit/infra": "^4.41.0"
+    "@aa-sdk/core": "^4.42.0",
+    "@account-kit/infra": "^4.42.0"
   },
   "peerDependencies": {
     "viem": "2.29.2"

package/src/ma-v2/account/common/modularAccountV2Base.ts CHANGED Viewed

@@ -9,6 +9,7 @@ import {
   type SmartAccountSigner,
   type SmartContractAccountWithSigner,
   type ToSmartContractAccountParams,
+  type SmartContractAccount,
 } from "@aa-sdk/core";
 import { DEFAULT_OWNER_ENTITY_ID, parseDeferredAction } from "../../utils.js";
 import {
@@ -27,6 +28,8 @@ import { modularAccountAbi } from "../../abis/modularAccountAbi.js";
 import { serializeModuleEntity } from "../../actions/common/utils.js";
 import { nativeSMASigner } from "../nativeSMASigner.js";
 import { singleSignerMessageSigner } from "../../modules/single-signer-validation/signer.js";
+import type { ToWebAuthnAccountParameters } from "viem/account-abstraction";
+import { webauthnSigningFunctions } from "../../modules/webauthn-validation/signingMethods.js";
 export const executeUserOpSelector: Hex = "0x8DD7712F";
@@ -70,8 +73,23 @@ export type ModularAccountV2<
   encodeCallData: (callData: Hex) => Promise<Hex>;
 };
+export type WebauthnModularAccountV2 = SmartContractAccount<
+  "ModularAccountV2",
+  "0.7.0"
+> & {
+  params: ToWebAuthnAccountParameters;
+  signerEntity: SignerEntity;
+  getExecutionData: (selector: Hex) => Promise<ExecutionDataView>;
+  getValidationData: (
+    args: ValidationDataParams,
+  ) => Promise<ValidationDataView>;
+  encodeCallData: (callData: Hex) => Promise<Hex>;
+};
 export type CreateMAV2BaseParams<
-  TSigner extends SmartAccountSigner = SmartAccountSigner,
+  TSigner extends SmartAccountSigner | undefined =
+    | SmartAccountSigner
+    | undefined,
   TTransport extends Transport = Transport,
 > = Omit<
   ToSmartContractAccountParams<"ModularAccountV2", TTransport, Chain, "0.7.0">,
@@ -91,17 +109,36 @@ export type CreateMAV2BaseParams<
   deferredAction?: Hex;
 };
+export type CreateWebauthnMAV2BaseParams = Omit<
+  CreateMAV2BaseParams,
+  "signer"
+> & {
+  credential: ToWebAuthnAccountParameters["credential"];
+  getFn?: ToWebAuthnAccountParameters["getFn"] | undefined;
+  rpId?: ToWebAuthnAccountParameters["rpId"] | undefined;
+};
 export type CreateMAV2BaseReturnType<
   TSigner extends SmartAccountSigner = SmartAccountSigner,
 > = Promise<ModularAccountV2<TSigner>>;
+// function overload
+export async function createMAv2Base(
+  config: CreateWebauthnMAV2BaseParams,
+): Promise<WebauthnModularAccountV2>;
+export async function createMAv2Base<
+  TSigner extends SmartAccountSigner = SmartAccountSigner,
+>(config: CreateMAV2BaseParams): CreateMAV2BaseReturnType<TSigner>;
 export async function createMAv2Base<
   TSigner extends SmartAccountSigner = SmartAccountSigner,
->(config: CreateMAV2BaseParams<TSigner>): CreateMAV2BaseReturnType<TSigner> {
+>(
+  config: CreateMAV2BaseParams<TSigner> | CreateWebauthnMAV2BaseParams,
+): Promise<WebauthnModularAccountV2 | ModularAccountV2<TSigner>> {
   let {
     transport,
     chain,
-    signer,
     entryPoint = getEntryPoint(chain, { version: "0.7.0" }),
     signerEntity = {
       isGlobalValidation: true,
@@ -116,6 +153,11 @@ export async function createMAv2Base<
     ...remainingToSmartContractAccountParams
   } = config;
+  const signer = "signer" in config ? config.signer : undefined;
+  const credential = "credential" in config ? config.credential : undefined;
+  const getFn = "getFn" in config ? config.getFn : undefined;
+  const rpId = "rpId" in config ? config.rpId : undefined;
   if (entityId > Number(maxUint32)) {
     throw new InvalidEntityIdError(entityId);
   }
@@ -275,10 +317,21 @@ export async function createMAv2Base<
     encodeExecute,
     encodeBatchExecute,
     getNonce,
-    ...(entityId === DEFAULT_OWNER_ENTITY_ID
-      ? nativeSMASigner(signer, chain, accountAddress, deferredActionData)
-      : singleSignerMessageSigner(
-          signer,
+    ...(signer
+      ? entityId === DEFAULT_OWNER_ENTITY_ID
+        ? nativeSMASigner(signer, chain, accountAddress, deferredActionData)
+        : singleSignerMessageSigner(
+            signer,
+            chain,
+            accountAddress,
+            entityId,
+            deferredActionData,
+          )
+      : webauthnSigningFunctions(
+          // credential required for webauthn mode is checked at modularAccountV2 creation level
+          credential!,
+          getFn,
+          rpId,
           chain,
           accountAddress,
           entityId,
@@ -286,6 +339,16 @@ export async function createMAv2Base<
         )),
   });
+  if (!signer) {
+    return {
+      ...baseAccount,
+      signerEntity,
+      getExecutionData,
+      getValidationData,
+      encodeCallData,
+    } as WebauthnModularAccountV2; // TO DO: figure out when this breaks! we shouldn't have to cast
+  }
   return {
     ...baseAccount,
     getSigner: () => signer,
@@ -293,5 +356,5 @@ export async function createMAv2Base<
     getExecutionData,
     getValidationData,
     encodeCallData,
-  };
+  } as ModularAccountV2<TSigner>; // TO DO: figure out when this breaks! we shouldn't have to cast
 }