Unify DeployAccount (#138)

* feat: get new sdk changes

The goal is to keep the e2e tests passing as we merge a branch where
they fail.

* Update packages/sdk/src/client/index.ts

thanks AI!

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* fix: attempt to undo more changes

still fails locally? Trying to undo any breaking changes

* Update packages/sdk/src/client/passkey/actions/account.test.ts

thanks AI

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* feat: use new modular account interface

still isn't using the new factory entry point,
but it would be easier to use it if needed!

Also add support for recovery, if provided by client

* feat: create throwaway owner on deployment

Can be saved or used later, mostly as a demo to show all 3 signer
types together.

* fix: undo test renaming

We want this to be new tests with a new name, not losing the old name
tests!

* fix: fully revert passkey deploy test changes

Other updates were made that broke things

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Author: cpb8010

.github/instructions/nx.instructions.md

@@ -0,0 +1,31 @@
+---
+applyTo: '**'
+---
+
+// This file is automatically generated by Nx Console
+
+You are in an nx workspace using Nx 19.8.6 and pnpm as the package manager.
+
+You have access to the Nx MCP server and the tools it provides. Use them. Follow these guidelines in order to best help the user:
+
+# General Guidelines
+- When answering questions, use the nx_workspace tool first to gain an understanding of the workspace architecture
+- For questions around nx configuration, best practices or if you're unsure, use the nx_docs tool to get relevant, up-to-date docs!! Always use this instead of assuming things about nx configuration
+- If the user needs help with an Nx configuration or project graph error, use the 'nx_workspace' tool to get any errors
+- To help answer questions about the workspace structure or simply help with demonstrating how tasks depend on each other, use the 'nx_visualize_graph' tool
+
+# Generation Guidelines
+If the user wants to generate something, use the following flow:
+
+- learn about the nx workspace and any specifics the user needs by using the 'nx_workspace' tool and the 'nx_project_details' tool if applicable
+- get the available generators using the 'nx_generators' tool
+- decide which generator to use. If no generators seem relevant, check the 'nx_available_plugins' tool to see if the user could install a plugin to help them
+- get generator details using the 'nx_generator_schema' tool
+- you may use the 'nx_docs' tool to learn more about a specific generator or technology if you're unsure
+- decide which options to provide in order to best complete the user's request. Don't make any assumptions and keep the options minimalistic
+- open the generator UI using the 'nx_open_generate_ui' tool
+- wait for the user to finish the generator
+- read the generator log file using the 'nx_read_generator_log' tool
+- use the information provided in the log file to answer the user's question or continue with what they were doing
+
+

.vscode/settings.json

@@ -36,5 +36,12 @@
   "[solidity]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
-  "css.customData": [".vscode/tailwind.json"]
+  "css.customData": [".vscode/tailwind.json"],
+  "nxConsole.generateAiAgentRules": true,
+  "[json]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[jsonc]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  }
 }

examples/bank-demo/components/app/AddCryptoButton.vue

@@ -17,7 +17,7 @@
 <script setup lang="ts">
 import NoPasskeyDialog from "~/components/app/NoPasskeyDialog.vue";
 import type { Hex } from "viem";
-import { deployAccount } from "zksync-sso/client";
+import { deployModularAccount } from "zksync-sso/client";
 import { registerNewPasskey } from "zksync-sso/client/passkey";
 import { getDeployerClient } from "../common/CryptoDeployer";
 
@@ -73,10 +73,16 @@ const createAccountWithPasskey = async () => {
   const deployerClient = await getDeployerClient(deployerKey as Hex);
 
   try {
-    const { address, transactionReceipt } = await deployAccount(deployerClient, {
-      credentialPublicKey: publicPassKey.credentialPublicKey,
-      credentialId: publicPassKey.credentialId,
-      contracts,
+    const { address, transactionReceipt } = await deployModularAccount(deployerClient, {
+      passkeyModule: {
+        location: contracts.passkey,
+        credentialPublicKey: publicPassKey.credentialPublicKey,
+        credentialId: publicPassKey.credentialId,
+      },
+      accountFactory: contracts.accountFactory,
+      installNoDataModules: [],
+      // installing creator as an account owner!
+      owners: [deployerClient.account.address],
     });
 
     appMeta.value = {

examples/bank-demo/components/app/NoPasskeyDialog.vue

@@ -125,8 +125,9 @@ type="button"
 <script setup lang="ts">
 import { toHex, type HDAccount, type Hex } from "viem";
 import { english, generateMnemonic, mnemonicToAccount } from "viem/accounts";
-import { deployAccount, fetchAccount } from "zksync-sso/client/ecdsa";
+import { fetchAccount } from "zksync-sso/client/ecdsa";
 import { getDeployerClient } from "../common/CryptoDeployer";
+import { deployModularAccount } from "zksync-sso/client";
 
 const { appMeta, contracts, deployerKey } = useAppMeta();
 
@@ -245,10 +246,10 @@ async function deployAddress(accountAddress: HDAccount) {
     return fetchedAccount.address;
   } catch (err) {
     console.info("account does not exist, deploy!", err);
-    const deployedAccount = await deployAccount(deployerClient, {
+    const deployedAccount = await deployModularAccount(deployerClient, {
       contracts,
-      prefix: "bank-demo",
-      owner: accountAddress.address,
+      uniqueAccountId: "bank-demo",
+      owners: [accountAddress.address],
     });
     return deployedAccount.address;
   }

packages/auth-server/composables/useAccountCreate.ts

@@ -1,6 +1,6 @@
 import { toHex } from "viem";
 import { generatePrivateKey, privateKeyToAddress } from "viem/accounts";
-import { deployAccount } from "zksync-sso/client";
+import { deployModularAccount } from "zksync-sso/client";
 import type { SessionConfig } from "zksync-sso/utils";
 
 export const useAccountCreate = (_chainId: MaybeRef<SupportedChainId>) => {
@@ -26,15 +26,30 @@ export const useAccountCreate = (_chainId: MaybeRef<SupportedChainId>) => {
       };
     }
 
+    // Don't yet want this to be imported as part of the setup process
+    const ownerKey = generatePrivateKey();
+    const ownerAddress = privateKeyToAddress(ownerKey);
+
     const deployerClient = getThrowAwayClient({ chainId: chainId.value });
 
-    const deployedAccount = await deployAccount(deployerClient, {
-      credentialId,
-      credentialPublicKey,
+    const chainContracts = contractsByChain[chainId.value];
+    const deployedAccount = await deployModularAccount(deployerClient, {
+      accountFactory: chainContracts.accountFactory,
+      passkeyModule: {
+        location: chainContracts.passkey,
+        credentialId,
+        credentialPublicKey,
+      },
+      paymaster: {
+        location: chainContracts.accountPaymaster,
+      },
       uniqueAccountId: credentialId,
-      contracts: contractsByChain[chainId.value],
-      paymasterAddress: contractsByChain[chainId.value].accountPaymaster,
-      initialSession: sessionData || undefined,
+      sessionModule: {
+        location: chainContracts.session,
+        initialSession: sessionData,
+      },
+      owners: [ownerAddress],
+      installNoDataModules: [chainContracts.recovery],
     });
 
     login({