fixup! feat: wallet manager can now handle multiple wallet accounts and types

Author: mkazlauskas

packages/e2e/test/web-extension/extension/ui.ts

@@ -32,7 +32,7 @@ import { Cardano } from '@cardano-sdk/core';
 import { CommunicationType, emip3encrypt, util } from '@cardano-sdk/key-management';
 import { HexBlob } from '@cardano-sdk/util';
 import { SodiumBip32Ed25519 } from '@cardano-sdk/crypto';
-import { combineLatest, firstValueFrom, of } from 'rxjs';
+import { combineLatest, firstValueFrom, merge, of } from 'rxjs';
 import { runtime } from 'webextension-polyfill';
 
 const delegationConfig = {
@@ -222,6 +222,18 @@ const signerManager = new SignerManager(
   }
 );
 
+const passphraseByteArray = Uint8Array.from(
+  env.KEY_MANAGEMENT_PARAMS.passphrase.split('').map((letter) => letter.charCodeAt(0))
+);
+merge(signerManager.signDataRequest$, signerManager.transactionWitnessRequest$).subscribe((req) => {
+  if (req.walletType === WalletType.InMemory) {
+    req.sign(passphraseByteArray);
+  } else {
+    req.sign();
+  }
+  logger.info('Signed', req);
+});
+
 // Expose signer manager.
 exposeSignerManagerApi(
   {
@@ -230,7 +242,9 @@ exposeSignerManagerApi(
   { logger, runtime }
 );
 
-const walletManager = new WalletManagerUi({ walletName }, { logger, runtime });
+type Metadata = { name: string };
+// TODO: toSerializableObj does not support serializing empty obj {}
+const walletManager = new WalletManagerUi<Metadata>({ walletName }, { logger, runtime });
 
 // Wallet object does not change when wallets are activated/deactivated.
 // Instead, it's observable properties emit from the currently active wallet.
@@ -253,40 +267,50 @@ wallet.delegation.distribution$.subscribe((delegationDistrib) => {
   }
 });
 
-const createWallet = async (accountIndex: number) => {
-  logger.log('creating wallet');
-  clearWalletValues();
-  const bip32Ed25519 = new SodiumBip32Ed25519();
-  const passphraseByteArray = Uint8Array.from(
-    env.KEY_MANAGEMENT_PARAMS.passphrase.split('').map((letter) => letter.charCodeAt(0))
-  );
-  const entropy = Buffer.from(util.mnemonicWordsToEntropy(env.KEY_MANAGEMENT_PARAMS.mnemonic.split(' ')), 'hex');
-  const rootPrivateKey = await bip32Ed25519.fromBip39Entropy(entropy, env.KEY_MANAGEMENT_PARAMS.passphrase);
-  const encryptedRootPrivateKey = await emip3encrypt(Buffer.from(rootPrivateKey, 'hex'), passphraseByteArray);
-  const encryptedEntropy = await emip3encrypt(entropy, passphraseByteArray);
-
-  const accountPrivateKey = await util.deriveAccountPrivateKey({
-    accountIndex,
-    bip32Ed25519,
-    rootPrivateKey
-  });
+const createWalletIfNotExistsAndActivate = async (accountIndex: number) => {
+  const wallets = await firstValueFrom(walletManager.repository.wallets$);
+  let walletId = wallets.find(
+    (w) => w.type !== WalletType.Script && w.accounts.some((a) => a.accountIndex === accountIndex)
+  )?.walletId;
+  if (!walletId) {
+    logger.log('creating wallet');
+    clearWalletValues();
+    const bip32Ed25519 = new SodiumBip32Ed25519();
+    const entropy = Buffer.from(util.mnemonicWordsToEntropy(env.KEY_MANAGEMENT_PARAMS.mnemonic.split(' ')), 'hex');
+    const rootPrivateKey = await bip32Ed25519.fromBip39Entropy(entropy, env.KEY_MANAGEMENT_PARAMS.passphrase);
+    const encryptedRootPrivateKey = await emip3encrypt(Buffer.from(rootPrivateKey, 'hex'), passphraseByteArray);
+    const encryptedEntropy = await emip3encrypt(entropy, passphraseByteArray);
+
+    const accountPrivateKey = await util.deriveAccountPrivateKey({
+      accountIndex,
+      bip32Ed25519,
+      rootPrivateKey
+    });
 
-  const extendedAccountPublicKey = await bip32Ed25519.getBip32PublicKey(accountPrivateKey);
-
-  logger.log('adding to repository wallet');
-  // Add wallet to the repository.
-  const walletId = await walletManager.repository.addWallet({
-    encryptedSecrets: {
-      entropy: HexBlob.fromBytes(encryptedEntropy),
-      rootPrivateKeyBytes: HexBlob.fromBytes(encryptedRootPrivateKey)
-    },
-    extendedAccountPublicKey,
-    type: WalletType.InMemory
-  });
+    const extendedAccountPublicKey = await bip32Ed25519.getBip32PublicKey(accountPrivateKey);
+
+    logger.log('adding to repository wallet');
+    // Add wallet to the repository.
+    walletId = await walletManager.repository.addWallet({
+      encryptedSecrets: {
+        entropy: HexBlob.fromBytes(encryptedEntropy),
+        rootPrivateKeyBytes: HexBlob.fromBytes(encryptedRootPrivateKey)
+      },
+      extendedAccountPublicKey,
+      type: WalletType.InMemory
+    });
+    await walletManager.repository.addAccount({
+      accountIndex,
+      metadata: { name: `Wallet #${accountIndex + 1}` },
+      walletId
+    });
 
-  logger.log(`Wallet added: ${walletId}`);
+    logger.log(`Wallet added: ${walletId}`);
+  } else {
+    logger.info(`Wallet with accountIndex ${accountIndex} already exists`);
+  }
 
-  await walletManager.destroy();
+  // await walletManager.destroy();
   await walletManager.activate({
     accountIndex,
     chainId: env.KEY_MANAGEMENT_PARAMS.chainId,
@@ -299,8 +323,12 @@ const createWallet = async (accountIndex: number) => {
   setName(await wallet.getName());
 };
 
-document.querySelector(selectors.btnActivateWallet1)!.addEventListener('click', async () => await createWallet(0));
-document.querySelector(selectors.btnActivateWallet2)!.addEventListener('click', async () => await createWallet(1));
+document
+  .querySelector(selectors.btnActivateWallet1)!
+  .addEventListener('click', async () => await createWalletIfNotExistsAndActivate(0));
+document
+  .querySelector(selectors.btnActivateWallet2)!
+  .addEventListener('click', async () => await createWalletIfNotExistsAndActivate(1));
 document.querySelector(selectors.deactivateWallet)!.addEventListener('click', async () => await deactivateWallet());
 document.querySelector(selectors.destroyWallet)!.addEventListener('click', async () => await destroyWallet());
 document.querySelector(selectors.btnDelegate)!.addEventListener('click', async () => {

packages/web-extension/src/walletManager/walletManagerUi.ts

@@ -1,4 +1,3 @@
-import { AnyWallet } from './types';
 import { Cardano } from '@cardano-sdk/core';
 import { MessengerDependencies, consumeRemoteApi } from '../messaging';
 import { ObservableWallet } from '@cardano-sdk/wallet';
@@ -17,7 +16,7 @@ import { repositoryChannel, walletChannel, walletManagerChannel, walletManagerPr
  */
 export class WalletManagerUi<Metadata extends {}> implements Shutdown {
   #remoteApi: WalletManagerApi & Shutdown;
-  repository: WalletRepository<AnyWallet<Metadata>> & Shutdown;
+  repository: WalletRepository<Metadata> & Shutdown;
 
   /**
    * Observable wallet. Its properties can be subscribed to at any point, even before activating a wallet.