feat: support for multiple HD Wallet keyrings (#578)

Author: jinoosss

packages/adena-extension/src/hooks/use-add-account.tsx

@@ -1,12 +1,12 @@
+import { isHDWalletKeyring, SeedAccount } from 'adena-module';
 import { useCallback, useState } from 'react';
-import { SeedAccount } from 'adena-module';
 
-import { RoutePath } from '@types';
+import { waitForRun } from '@common/utils/timeout-utils';
 import useAppNavigate from '@hooks/use-app-navigate';
 import { useWalletContext } from '@hooks/use-context';
 import { useCurrentAccount } from '@hooks/use-current-account';
+import { RoutePath } from '@types';
 import useQuestionnaire from './use-questionnaire';
-import { waitForRun } from '@common/utils/timeout-utils';
 
 export type UseAccountAddScreenReturn = {
   step: AccountAddStateType;
@@ -64,11 +64,20 @@ const useAccountAddScreen = (): UseAccountAddScreenReturn => {
       if (!wallet) {
         return false;
       }
-      const account = await SeedAccount.createByWallet(wallet);
-      account.index = wallet.lastAccountIndex + 1;
-      account.name = `Account ${wallet.lastAccountIndex + 1}`;
+
+      const hdWalletKeyring = wallet.keyrings.find(isHDWalletKeyring);
+      if (!hdWalletKeyring) {
+        return false;
+      }
+
+      const name = `Account ${wallet.lastAccountIndex + 1}`;
+      const hdPath = wallet.getNextHDPathBy(hdWalletKeyring);
+      const index = wallet.lastAccountIndex + 1;
+      const account = await SeedAccount.createBy(hdWalletKeyring, name, hdPath, index);
+
       const clone = wallet.clone();
       clone.addAccount(account);
+
       const storedAccount = clone.accounts.find((storedAccount) => storedAccount.id === account.id);
       if (storedAccount) {
         await changeCurrentAccount(storedAccount);

packages/adena-extension/src/hooks/web/use-account-add-screen.ts

@@ -1,14 +1,14 @@
-import { useCallback, useMemo, useState } from 'react';
 import { AdenaWallet, HDWalletKeyring, SeedAccount } from 'adena-module';
+import { useCallback, useMemo, useState } from 'react';
 
-import { RoutePath } from '@types';
 import useAppNavigate from '@hooks/use-app-navigate';
 import { useWalletContext } from '@hooks/use-context';
 import { useCurrentAccount } from '@hooks/use-current-account';
-import useQuestionnaire from './use-questionnaire';
 import useIndicatorStep, {
   UseIndicatorStepReturn,
 } from '@hooks/wallet/broadcast-transaction/use-indicator-step';
+import { RoutePath } from '@types';
+import useQuestionnaire from './use-questionnaire';
 
 export type UseWalletCreateReturn = {
   seeds: string;

packages/adena-extension/src/hooks/web/use-wallet-create-screen.ts

@@ -1,20 +1,20 @@
-import { useCallback, useEffect, useState } from 'react';
 import { Account } from 'adena-module';
+import { useCallback, useEffect, useState } from 'react';
 
-import useAppNavigate from '@hooks/use-app-navigate';
-import { useAdenaContext, useWalletContext } from '@hooks/use-context';
-import { useCurrentAccount } from '@hooks/use-current-account';
-import { RoutePath } from '@types';
-import { AdenaStorage } from '@common/storage';
 import {
   WALLET_EXPORT_ACCOUNT_ID,
   WALLET_EXPORT_TYPE_STORAGE_KEY,
 } from '@common/constants/storage.constant';
-import useQuestionnaire from '../use-questionnaire';
+import { AdenaStorage } from '@common/storage';
+import useAppNavigate from '@hooks/use-app-navigate';
+import { useAdenaContext, useWalletContext } from '@hooks/use-context';
+import { useCurrentAccount } from '@hooks/use-current-account';
 import useIndicatorStep, {
   UseIndicatorStepReturn,
 } from '@hooks/wallet/broadcast-transaction/use-indicator-step';
 import { useQuery } from '@tanstack/react-query';
+import { RoutePath } from '@types';
+import useQuestionnaire from '../use-questionnaire';
 
 export type UseWalletExportReturn = {
   currentAccount: Account | null;
@@ -152,7 +152,7 @@ const useWalletExportScreen = (): UseWalletExportReturn => {
         const privateKey = await instance.getPrivateKeyStr();
         setExportData(privateKey);
       } else {
-        const seedPhrase = instance.mnemonic;
+        const seedPhrase = instance.getMnemonic();
         setExportData(seedPhrase);
       }
       setWalletExportState('RESULT');

packages/adena-extension/src/hooks/web/wallet-export/use-wallet-export-screen.ts

@@ -1,6 +1,7 @@
+export * from './address';
 export { arrayContentEquals, arrayContentStartsWith } from './arrays';
 export { assert, assertDefined, assertDefinedAndNotNull } from './assert';
+export * from './data';
+export * from './messages';
 export { sleep } from './sleep';
 export { isDefined, isNonNullObject, isUint8Array } from './typechecks';
-export * from './messages';
-export * from './address';

packages/adena-module/src/utils/index.ts

@@ -1,8 +1,9 @@
 import { v4 as uuidv4 } from 'uuid';
-import { Account, AccountInfo } from './account';
-import { Wallet } from '../wallet';
-import { isHDWalletKeyring, Keyring, KeyringType } from '../../wallet/keyring';
+
 import { publicKeyToAddress } from '../../utils/address';
+import { isHDWalletKeyring, Keyring, KeyringType } from '../../wallet/keyring';
+import { Wallet } from '../wallet';
+import { Account, AccountInfo } from './account';
 
 export class SeedAccount implements Account {
   public readonly id;
@@ -60,7 +61,7 @@ export class SeedAccount implements Account {
     };
   }
 
-  public static async createBy(keyring: Keyring, name: string, hdPath: number) {
+  public static async createBy(keyring: Keyring, name: string, hdPath: number, index = 1) {
     if (!isHDWalletKeyring(keyring)) {
       throw new Error('Invalid account type');
     }
@@ -69,7 +70,7 @@ export class SeedAccount implements Account {
     const { id: keyringId, type: type } = keyring;
     return new SeedAccount({
       keyringId,
-      index: 1,
+      index,
       type,
       publicKey: Array.from(publicKey),
       name,
@@ -78,10 +79,11 @@ export class SeedAccount implements Account {
   }
 
   public static async createByWallet(wallet: Wallet) {
-    if (!wallet.hdWalletKeyring) {
-      throw new Error('HD Wallet does not exist');
+    if (!wallet.currentKeyring || !isHDWalletKeyring(wallet.currentKeyring)) {
+      throw new Error('The current keyring is not an HD Wallet Keyring');
     }
-    return this.createBy(wallet.hdWalletKeyring, wallet.nextAccountName, wallet.nextHDPath);
+    const hdPath = wallet.getNextHDPathBy(wallet.currentKeyring);
+    return this.createBy(wallet.currentKeyring, wallet.nextAccountName, hdPath);
   }
 
   public static fromData(accountInfo: AccountInfo) {

packages/adena-module/src/wallet/account/seed-account.ts

@@ -6,8 +6,9 @@ import {
   uint8ArrayToBase64,
 } from '@gnolang/tm2-js-client';
 import { v4 as uuidv4 } from 'uuid';
-import { Keyring, KeyringData, KeyringType } from './keyring';
+
 import { Document, fromBech32 } from '../..';
+import { Keyring, KeyringData, KeyringType } from './keyring';
 
 export class AddressKeyring implements Keyring {
   public readonly id: string;

packages/adena-module/src/wallet/keyring/address-keyring.ts

@@ -1,14 +1,15 @@
 import {
   generateKeyPair,
-  Wallet as Tm2Wallet,
-  Tx,
-  TxSignature,
   Provider,
   TransactionEndpoint,
+  Tx,
+  TxSignature,
+  Wallet as Tm2Wallet,
 } from '@gnolang/tm2-js-client';
 import { v4 as uuidv4 } from 'uuid';
+
 import { Bip39, EnglishMnemonic } from '../../crypto';
-import { useTm2Wallet, decodeTxMessages, Document, documentToTx, makeSignedTx } from './../..';
+import { Document, makeSignedTx, useTm2Wallet } from './../..';
 import { Keyring, KeyringData, KeyringType } from './keyring';
 
 export class HDWalletKeyring implements Keyring {

packages/adena-module/src/wallet/keyring/hd-wallet-keyring.ts

@@ -1,11 +1,12 @@
+import { Tx, Wallet as Tm2Wallet } from '@gnolang/tm2-js-client';
+
+import { decodeTxMessages, Document, documentToTx } from './../../utils/messages';
 import { AddressKeyring } from './address-keyring';
 import { HDWalletKeyring } from './hd-wallet-keyring';
 import { Keyring } from './keyring';
 import { LedgerKeyring } from './ledger-keyring';
 import { PrivateKeyKeyring } from './private-key-keyring';
 import { Web3AuthKeyring } from './web3-auth-keyring';
-import { Tx, Wallet as Tm2Wallet } from '@gnolang/tm2-js-client';
-import { Document, documentToTx, decodeTxMessages } from './../../utils/messages';
 
 export function isHDWalletKeyring(keyring: Keyring): keyring is HDWalletKeyring {
   return keyring.type === 'HD_WALLET';

packages/adena-module/src/wallet/keyring/keyring-util.ts

@@ -5,6 +5,7 @@ import {
   Tx,
   TxSignature,
 } from '@gnolang/tm2-js-client';
+
 import { Document } from './../..';
 import { AddressKeyring } from './address-keyring';
 import { HDWalletKeyring } from './hd-wallet-keyring';