fix: wipe account address from storage if login fails

Author: pcarranzav

packages/hypergraph/src/connect/login.ts

@@ -4,7 +4,7 @@ import type { Address, Chain, Hex, WalletClient } from 'viem';
 import { proveIdentityOwnership } from '../identity/prove-ownership.js';
 import * as Messages from '../messages/index.js';
 import { store } from '../store-connect.js';
-import { loadAccountAddress, storeAccountAddress, storeKeys } from './auth-storage.js';
+import { loadAccountAddress, storeAccountAddress, storeKeys, wipeAccountAddress } from './auth-storage.js';
 import { createIdentityKeys } from './create-identity-keys.js';
 import { decryptIdentity, encryptIdentity } from './identity-encryption.js';
 import {
@@ -103,23 +103,7 @@ export async function restoreKeys(
   throw new Error(`Error fetching identity ${res.status}`);
 }
 
-export async function login({
-  walletClient,
-  signer,
-  syncServerUri,
-  storage,
-  identityToken,
-  rpcUrl,
-  chain,
-}: {
-  walletClient: WalletClient;
-  signer: Signer;
-  syncServerUri: string;
-  storage: Storage;
-  identityToken: string;
-  rpcUrl: string;
-  chain: Chain;
-}) {
+const getAndDeploySmartAccount = async (walletClient: WalletClient, rpcUrl: string, chain: Chain, storage: Storage) => {
   const accountAddressFromStorage = loadAccountAddress(storage) as Hex;
   const smartAccountParams: SmartAccountParams = {
     owner: walletClient,
@@ -140,10 +124,8 @@ export async function login({
   if (await smartAccountNeedsUpdate(smartAccountWalletClient, chain, rpcUrl)) {
     console.log('updating smart account');
     await updateLegacySmartAccount(smartAccountWalletClient, chain, rpcUrl);
-  }
-
-  // TODO: remove this once we manage to get counterfactual signatures working
-  if (!(await isSmartAccountDeployed(smartAccountWalletClient))) {
+  } else if (!(await isSmartAccountDeployed(smartAccountWalletClient))) {
+    // TODO: remove this once we manage to get counterfactual signatures working
     console.log('sending dummy userOp to deploy smart account');
     if (!walletClient.account) {
       throw new Error('Wallet client account not found');
@@ -157,6 +139,36 @@ export async function login({
     const receipt = await smartAccountWalletClient.waitForUserOperationReceipt({ hash: tx });
     console.log('receipt', receipt);
   }
+  return smartAccountWalletClient;
+};
+
+export async function login({
+  walletClient,
+  signer,
+  syncServerUri,
+  storage,
+  identityToken,
+  rpcUrl,
+  chain,
+}: {
+  walletClient: WalletClient;
+  signer: Signer;
+  syncServerUri: string;
+  storage: Storage;
+  identityToken: string;
+  rpcUrl: string;
+  chain: Chain;
+}) {
+  let smartAccountWalletClient: SmartAccountClient;
+  try {
+    smartAccountWalletClient = await getAndDeploySmartAccount(walletClient, rpcUrl, chain, storage);
+  } catch (error) {
+    wipeAccountAddress(storage);
+    smartAccountWalletClient = await getAndDeploySmartAccount(walletClient, rpcUrl, chain, storage);
+  }
+  if (!smartAccountWalletClient.account) {
+    throw new Error('Smart account wallet client account not found');
+  }
   const accountAddress = smartAccountWalletClient.account.address;
   // const keys = loadKeys(storage, accountAddress);
   let authData: {