feat: return new account on add account wallet manager (#691)

Author: luizstacio

.changeset/famous-eyes-guess.md

@@ -0,0 +1,6 @@
+---
+"@fuel-ts/wallet-manager": patch
+---
+
+Return account after addAccount
+Export types from WalletManager

packages/wallet-manager/src/index.ts

@@ -1 +1,2 @@
 export * from './wallet-manager';
+export * from './types';

packages/wallet-manager/src/storages/memory-storage.ts

@@ -1,13 +1,15 @@
-class MemoryStorage {
+import type { StorageAbstract } from '../types';
+
+class MemoryStorage implements StorageAbstract {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   storage = new Map<string, any>();
 
-  async getItem(key: string) {
+  async getItem<T>(key: string): Promise<T | null> {
     return this.storage.get(key);
   }
 
-  async setItem<T>(key: string, value: T) {
-    return this.storage.set(key, value);
+  async setItem(key: string, value: string) {
+    this.storage.set(key, value);
   }
 
   async removeItem(key: string) {

packages/wallet-manager/src/types.ts

@@ -58,8 +58,8 @@ export abstract class Vault<TOptions = { secret?: string }> {
 }
 
 export abstract class StorageAbstract {
-  abstract setItem<T>(key: string, value: T): Promise<unknown>;
-  abstract getItem<T>(key: string): Promise<T | null>;
+  abstract setItem(key: string, value: string): Promise<void>;
+  abstract getItem(key: string): Promise<string | null | undefined>;
   abstract removeItem(key: string): Promise<void>;
   abstract clear(): Promise<void>;
 }

packages/wallet-manager/src/vaults/mnemonic-vault.ts

@@ -60,7 +60,7 @@ export class MnemonicVault implements Vault<MnemonicVaultOptions> {
 
   addAccount() {
     this.numberOfAccounts += 1;
-    const wallet = Wallet.fromMnemonic(this.#secret, this.getDerivePath(this.numberOfAccounts));
+    const wallet = Wallet.fromMnemonic(this.#secret, this.getDerivePath(this.numberOfAccounts - 1));
 
     return {
       publicKey: wallet.publicKey,

packages/wallet-manager/src/vaults/privatekey-vault.test.ts

@@ -41,4 +41,15 @@ describe('PrivateKeyVault', () => {
     expect(vaultFromState.getAccounts()[0].publicKey).toBe(walletSpec.publicKey);
     expect(vaultFromState.getAccounts()[1].publicKey).toBe(walletSpec2.publicKey);
   });
+
+  it('Return new account on add account', async () => {
+    const vault = new PrivateKeyVault({
+      secret: walletSpec.privateKey,
+    });
+
+    const account = vault.addAccount();
+    const accounts = vault.getAccounts();
+
+    expect(account.publicKey).toBe(accounts[1].publicKey);
+  });
 });

packages/wallet-manager/src/wallet-manager.test.ts

@@ -139,6 +139,25 @@ describe('Wallet Manager', () => {
     expect(privateKeyReturned).toBe(wallet.privateKey);
   });
 
+  it('Return account when adding account to vault', async () => {
+    // #region typedoc:wallet-manager-create
+    const walletManager = new WalletManager();
+    const password = '0b540281-f87b-49ca-be37-2264c7f260f7';
+
+    // Add a vault of type privateKey
+    await walletManager.unlock(password);
+    // #endregion
+
+    await walletManager.addVault({
+      type: 'mnemonic',
+      secret: WalletManagerSpec.mnemonic,
+    });
+    const account = await walletManager.addAccount();
+    const accounts = await walletManager.getAccounts();
+
+    expect(account.publicKey).toBe(accounts[1].publicKey);
+  });
+
   it('Export privateKey from address from a mnemonic vault', async () => {
     const { walletManager } = await setupWallet({
       type: 'mnemonic',

packages/wallet-manager/src/wallet-manager.ts

@@ -142,9 +142,11 @@ export class WalletManager extends EventEmitter {
     const vaultState = this.#vaults[options?.vaultId || 0];
     await assert(vaultState, ERROR_MESSAGES.vault_not_found);
     // Add account on vault
-    vaultState.vault.addAccount();
+    const account = vaultState.vault.addAccount();
     // Save the accounts state
     await this.saveState();
+    // Return account
+    return account;
   }
 
   /**
@@ -231,7 +233,7 @@ export class WalletManager extends EventEmitter {
   async loadState() {
     await assert(!this.#isLocked, ERROR_MESSAGES.wallet_not_unlocked);
 
-    const data = await this.storage.getItem<string>(this.STORAGE_KEY);
+    const data = await this.storage.getItem(this.STORAGE_KEY);
     if (data) {
       const state = await decrypt<WalletManagerState>(this.#passphrase, <Keystore>JSON.parse(data));
       this.#vaults = this.#deserializeVaults(state.vaults);
@@ -247,7 +249,7 @@ export class WalletManager extends EventEmitter {
     const encryptedData = await encrypt(this.#passphrase, {
       vaults: this.#serializeVaults(this.#vaults),
     });
-    this.storage.setItem(this.STORAGE_KEY, JSON.stringify(encryptedData));
+    await this.storage.setItem(this.STORAGE_KEY, JSON.stringify(encryptedData));
     this.emit('update');
   }