feat(ironfish): Save encrypted accounts in the wallet (#5237)

* feat(ironfish): Save encrypted accounts in the wallet

* feat(ironfish): Revert storing id

* test(ironfish): Fix account value test

Author: rohanjadvani

ironfish/src/wallet/wallet.ts

@@ -42,6 +42,7 @@ import {
 import { WorkerPool } from '../workerPool'
 import { DecryptedNote, DecryptNotesItem } from '../workerPool/tasks/decryptNotes'
 import { Account, ACCOUNT_SCHEMA_VERSION } from './account/account'
+import { EncryptedAccount } from './account/encryptedAccount'
 import { AssetBalances } from './assetBalances'
 import {
   DuplicateAccountNameError,
@@ -94,6 +95,7 @@ export class Wallet {
   readonly onAccountRemoved = new Event<[account: Account]>()
 
   protected readonly accountById = new Map<string, Account>()
+  protected readonly encryptedAccounts = new Map<string, EncryptedAccount>()
   readonly walletDb: WalletDB
   private readonly logger: Logger
   readonly workerPool: WorkerPool
@@ -208,9 +210,17 @@ export class Wallet {
   }
 
   private async load(): Promise<void> {
-    for await (const accountValue of this.walletDb.loadAccounts()) {
-      const account = new Account({ accountValue, walletDb: this.walletDb })
-      this.accountById.set(account.id, account)
+    for await (const [id, accountValue] of this.walletDb.loadAccounts()) {
+      if (accountValue.encrypted) {
+        const encryptedAccount = new EncryptedAccount({
+          data: accountValue.data,
+          walletDb: this.walletDb,
+        })
+        this.encryptedAccounts.set(id, encryptedAccount)
+      } else {
+        const account = new Account({ accountValue, walletDb: this.walletDb })
+        this.accountById.set(account.id, account)
+      }
     }
 
     const meta = await this.walletDb.loadAccountsMeta()

ironfish/src/wallet/walletdb/walletdb.ts

@@ -32,7 +32,7 @@ import { BufferUtils } from '../../utils'
 import { BloomFilter } from '../../utils/bloomFilter'
 import { WorkerPool } from '../../workerPool'
 import { Account, calculateAccountPrefix } from '../account/account'
-import { AccountValue, AccountValueEncoding, DecryptedAccountValue } from './accountValue'
+import { AccountValue, AccountValueEncoding } from './accountValue'
 import { AssetValue, AssetValueEncoding } from './assetValue'
 import { BalanceValue, BalanceValueEncoding } from './balanceValue'
 import { DecryptedNoteValue, DecryptedNoteValueEncoding } from './decryptedNoteValue'
@@ -393,12 +393,9 @@ export class WalletDB {
 
   async *loadAccounts(
     tx?: IDatabaseTransaction,
-  ): AsyncGenerator<DecryptedAccountValue, void, unknown> {
-    for await (const account of this.accounts.getAllValuesIter(tx)) {
-      // TODO(rohanjadvani): Remove this when encrypted accounts are managed in the wallet
-      if (!account.encrypted) {
-        yield account
-      }
+  ): AsyncGenerator<[string, AccountValue], void, unknown> {
+    for await (const [id, account] of this.accounts.getAllIter(tx)) {
+      yield [id, account]
     }
   }