feat: enables installValidation to take a Modular Account with no signer (#1663)

* fix: run api spec generate as part of aa-sdk deploy (#1654)

* fix: run api spec generate as part of aa-sdk deploy

* ci: create aa-sdk copy of setup-pnpm composite action

* ci: remove unnecessary install node in pnpm composite action

* ci: try installing pnpm with exact action version

* ci: test with pnpm moved out of its own composite

* ci: fuck you install pnpm

* ci: ??????

* revert: install pnpm in its own setup composite

* ci: specify package.json for pnpm

---------

Co-authored-by: dslovinsky <[email protected]>

* feat(rn-signer): support passkeys in React Native (#1653)

* chore(release): publish v4.37.0 [skip-ci]

* feat: add erc20 sponsorship card (#1631)

* fix: remove trailing slash from alchemy rpc url (#1657)

* chore(release): publish v4.38.0 [skip-ci]

* fix: update copy (#1658)

* feat: add alchemy_requestPaymasterTokenQuote to aa-sdk (#1659)

* feat: add alchemy_requestPaymasterTokenQuote to aa-sdk

* fix: typo

* chore(release): publish v4.39.0 [skip-ci]

* feat: enables installValidation to take a Modular Account with no signer

* fix: test thank you howy

* test: update the rundler version we use in prool (#1646)

* chore: experimenting with types (#1665)

* chore: modifies types

---------

Co-authored-by: Daniel Slovinsky <[email protected]>
Co-authored-by: dslovinsky <[email protected]>
Co-authored-by: David Philipson <[email protected]>
Co-authored-by: Alchemy Bot <[email protected]>
Co-authored-by: Blake Duncan <[email protected]>
Co-authored-by: jakehobbs <[email protected]>
Co-authored-by: Andy <[email protected]>
Co-authored-by: Michael Moldoveanu <[email protected]>
Co-authored-by: howy <[email protected]>

Author: 9 people

account-kit/smart-contracts/src/ma-v2/actions/install-validation/installValidation.ts

@@ -7,6 +7,7 @@ import {
   type SendUserOperationResult,
   type UserOperationOverridesParameter,
   type SmartAccountSigner,
+  isSmartAccountWithSigner,
 } from "@aa-sdk/core";
 import {
   type Address,
@@ -24,12 +25,20 @@ import {
   serializeModuleEntity,
 } from "../common/utils.js";
 
-import { type ModularAccountV2Client } from "../../client/client.js";
-import { type ModularAccountV2 } from "../../account/common/modularAccountV2Base.js";
+import {
+  type ModularAccountV2Client,
+  type WebauthnModularAccountV2Client,
+} from "../../client/client.js";
+import {
+  type ModularAccountV2,
+  type WebauthnModularAccountV2,
+} from "../../account/common/modularAccountV2Base.js";
 import { DEFAULT_OWNER_ENTITY_ID } from "../../utils.js";
 
 export type InstallValidationParams<
-  TSigner extends SmartAccountSigner = SmartAccountSigner,
+  TSigner extends SmartAccountSigner | undefined =
+    | SmartAccountSigner
+    | undefined,
 > = {
   validationConfig: ValidationConfig;
   selectors: Hex[];
@@ -38,25 +47,41 @@ export type InstallValidationParams<
     hookConfig: HookConfig;
     initData: Hex;
   }[];
-  account?: ModularAccountV2<TSigner> | undefined;
+  account?: TSigner extends SmartAccountSigner
+    ? ModularAccountV2<TSigner>
+    : WebauthnModularAccountV2;
 } & UserOperationOverridesParameter<
-  GetEntryPointFromAccount<ModularAccountV2<TSigner>>
+  GetEntryPointFromAccount<
+    TSigner extends SmartAccountSigner
+      ? ModularAccountV2<TSigner>
+      : WebauthnModularAccountV2
+  >
 >;
 
 export type UninstallValidationParams<
-  TSigner extends SmartAccountSigner = SmartAccountSigner,
+  TSigner extends SmartAccountSigner | undefined =
+    | SmartAccountSigner
+    | undefined,
 > = {
   moduleAddress: Address;
   entityId: number;
   uninstallData: Hex;
   hookUninstallDatas: Hex[];
-  account?: ModularAccountV2<TSigner> | undefined;
+  account?: TSigner extends SmartAccountSigner
+    ? ModularAccountV2<TSigner>
+    : WebauthnModularAccountV2;
 } & UserOperationOverridesParameter<
-  GetEntryPointFromAccount<ModularAccountV2<TSigner>>
+  GetEntryPointFromAccount<
+    TSigner extends SmartAccountSigner
+      ? ModularAccountV2<TSigner>
+      : WebauthnModularAccountV2
+  >
 >;
 
 export type InstallValidationActions<
-  TSigner extends SmartAccountSigner = SmartAccountSigner,
+  TSigner extends SmartAccountSigner | undefined =
+    | SmartAccountSigner
+    | undefined,
 > = {
   installValidation: (
     args: InstallValidationParams<TSigner>,
@@ -73,6 +98,10 @@ export type InstallValidationActions<
   ) => Promise<Hex>;
 };
 
+export function installValidationActions<
+  TSigner extends SmartAccountSigner = SmartAccountSigner,
+>(client: ModularAccountV2Client<TSigner>): InstallValidationActions<TSigner>;
+
 /**
  * Provides validation installation and uninstallation functionalities for a MA v2 client, ensuring compatibility with `SmartAccountClient`.
  *
@@ -117,11 +146,13 @@ export type InstallValidationActions<
  * @param {object} client - The client instance which provides account and sendUserOperation functionality.
  * @returns {object} - An object containing two methods, `installValidation` and `uninstallValidation`.
  */
-export const installValidationActions: <
+export function installValidationActions<
   TSigner extends SmartAccountSigner = SmartAccountSigner,
 >(
-  client: ModularAccountV2Client<TSigner>,
-) => InstallValidationActions<TSigner> = (client) => {
+  client: TSigner extends SmartAccountSigner
+    ? ModularAccountV2Client<TSigner>
+    : WebauthnModularAccountV2Client,
+): InstallValidationActions<TSigner> {
   const encodeInstallValidation = async ({
     validationConfig,
     selectors,
@@ -133,7 +164,18 @@ export const installValidationActions: <
       throw new AccountNotFoundError();
     }
 
-    if (!isSmartAccountClient(client)) {
+    if (isSmartAccountWithSigner(account)) {
+      if (!isSmartAccountClient(client as ModularAccountV2Client<TSigner>)) {
+        // if we don't differentiate between WebauthnModularAccountV2Client and ModularAccountV2Client, passing client to isSmartAccountClient complains
+        throw new IncompatibleClientError(
+          "SmartAccountClient",
+          "installValidation",
+          client,
+        );
+      }
+    } else if (
+      !isSmartAccountClient(client as WebauthnModularAccountV2Client)
+    ) {
       throw new IncompatibleClientError(
         "SmartAccountClient",
         "installValidation",
@@ -176,10 +218,21 @@ export const installValidationActions: <
       throw new AccountNotFoundError();
     }
 
-    if (!isSmartAccountClient(client)) {
+    if (isSmartAccountWithSigner(account)) {
+      if (!isSmartAccountClient(client as ModularAccountV2Client<TSigner>)) {
+        // if we don't differentiate between WebauthnModularAccountV2Client and ModularAccountV2Client, passing client to isSmartAccountClient complains
+        throw new IncompatibleClientError(
+          "SmartAccountClient",
+          "installValidation",
+          client,
+        );
+      }
+    } else if (
+      !isSmartAccountClient(client as WebauthnModularAccountV2Client)
+    ) {
       throw new IncompatibleClientError(
         "SmartAccountClient",
-        "uninstallValidation",
+        "installValidation",
         client,
       );
     }
@@ -210,14 +263,28 @@ export const installValidationActions: <
       hooks,
       account = client.account,
       overrides,
-    }) => {
-      const callData = await encodeInstallValidation({
-        validationConfig,
-        selectors,
-        installData,
-        hooks,
-        account,
-      });
+    }: InstallValidationParams) => {
+      const signer = "signer" in account ? account.signer : undefined;
+      let callData: Hex;
+      if (signer) {
+        const _account = account as ModularAccountV2<TSigner>;
+        callData = await encodeInstallValidation({
+          validationConfig,
+          selectors,
+          installData,
+          hooks,
+          account: _account,
+        });
+      } else {
+        const _account = account as WebauthnModularAccountV2;
+        callData = await encodeInstallValidation({
+          validationConfig,
+          selectors,
+          installData,
+          hooks,
+          account: _account,
+        });
+      }
 
       return client.sendUserOperation({
         uo: callData,
@@ -233,14 +300,28 @@ export const installValidationActions: <
       hookUninstallDatas,
       account = client.account,
       overrides,
-    }) => {
-      const callData = await encodeUninstallValidation({
-        moduleAddress,
-        entityId,
-        uninstallData,
-        hookUninstallDatas,
-        account,
-      });
+    }: UninstallValidationParams) => {
+      const signer = "signer" in account ? account.signer : undefined;
+      let callData: Hex;
+      if (signer) {
+        const _account = account as ModularAccountV2<TSigner>;
+        callData = await encodeUninstallValidation({
+          moduleAddress,
+          entityId,
+          uninstallData,
+          hookUninstallDatas,
+          account: _account,
+        });
+      } else {
+        const _account = account as WebauthnModularAccountV2;
+        callData = await encodeUninstallValidation({
+          moduleAddress,
+          entityId,
+          uninstallData,
+          hookUninstallDatas,
+          account: _account,
+        });
+      }
 
       return client.sendUserOperation({
         uo: callData,
@@ -249,4 +330,4 @@ export const installValidationActions: <
       });
     },
   };
-};
+}