refactor: use withKeyring to batch account restore operation

app/util/importAdditionalAccounts.js

@@ -3,7 +3,6 @@ import { BNToHex } from '../util/number';
 import Logger from '../util/Logger';
 import ExtendedKeyringTypes from '../../app/constants/keyringTypes';
 
-const HD_KEY_TREE_ERROR = 'MetamaskController - No HD Key Tree found';
 const ZERO_BALANCE = '0x0';
 const MAX = 20;
 
@@ -30,31 +29,25 @@ const getBalance = async (address, ethQuery) =>
  */
 export default async () => {
   const { KeyringController } = Engine.context;
-
   const ethQuery = Engine.getGlobalEthQuery();
-  let accounts = await KeyringController.getAccounts();
-  let lastBalance = await getBalance(accounts[accounts.length - 1], ethQuery);
 
-  const { keyrings } = KeyringController.state;
-  const filteredKeyrings = keyrings.filter(
-    (keyring) => keyring.type === ExtendedKeyringTypes.hd,
-  );
-  const primaryKeyring = filteredKeyrings[0];
-  if (!primaryKeyring) throw new Error(HD_KEY_TREE_ERROR);
+  await KeyringController.withKeyring(
+    { type: ExtendedKeyringTypes.hd },
+    async (primaryKeyring) => {
+      let i = 0;
+      // seek out the first zero balance
+      while (i < MAX) {
+        const [newAccount] = await primaryKeyring.addAccounts(1);
+        const newAccountBalance = await getBalance(newAccount, ethQuery);
 
-  let i = 0;
-  // seek out the first zero balance
-  while (lastBalance !== ZERO_BALANCE) {
-    if (i === MAX) break;
-    await KeyringController.addNewAccountWithoutUpdate(primaryKeyring);
-    accounts = await KeyringController.getAccounts();
-    lastBalance = await getBalance(accounts[accounts.length - 1], ethQuery);
-    i++;
-  }
+        if (newAccountBalance === ZERO_BALANCE) {
+          // remove extra zero balance account we just added and break the loop
+          primaryKeyring.removeAccount(newAccount);
+          break;
+        }
 
-  // remove extra zero balance account potentially created from seeking ahead
-  if (accounts.length > 1 && lastBalance === ZERO_BALANCE) {
-    await KeyringController.removeAccount(accounts[accounts.length - 1]);
-    accounts = await KeyringController.getAccounts();
-  }
+        i++;
+      }
+    },
+  );
 };