1 files changed, 22 insertions, 1 deletions
diff --git a/src/app.js b/src/app.js
index 4dd1235..2d29c4f 100644
--- a/src/app.js
+++ b/src/app.js
@@ -11,6 +11,7 @@ import './rich-text.js'; // <coinos-text>, the composers' field
 import { makeSearcher, resultRows, searchable, punkUrl, warmSearch } from './recipient-search.js';
 import { assetUrl } from './asset-url.js';
 import { npubOf, seedPubkey, neventOf, parseNostrPubkey } from './nostr.js';
+import { warmSeed, forgetSeeds } from './seed.js';
 import { nip98Header } from './nip98.js';
 import { uploadPublicMedia, uploadStream, mediaUploadSigner, MediaUploadError } from './media-upload.js';
 import { NOSTR_MARK } from './features/nostrlogin.js';
@@ -2171,6 +2172,25 @@ function bootWillRestore() {
 }
 const restorePending = () => _restorePending && bootWillRestore();
 
+// The phrases the restore below is about to open, stretched into their seeds
+// natively (seed.js) while the stores open: the restore and the wallet then
+// read them instead of stretching each in JavaScript, once per use.
+async function warmBootSeeds() {
+  let list = [];
+  try {
+    if (!unlockDeadlinePassed()) {
+      const s = JSON.parse(sessionStorage.getItem(ACCOUNTS_KEY) || 'null');
+      if (s && Array.isArray(s.accounts)) list = s.accounts;
+    }
+  } catch {}
+  if (!list.length && vaultOpensBlank()) {
+    try { list = decryptVault(loadVaultBlob(), ''); } catch {}
+  }
+  await Promise.all((Array.isArray(list) ? list : [])
+    .filter((a) => a && a.mnemonic && !a.xprv)
+    .map((a) => warmSeed(a.mnemonic, a.passphrase || '')));
+}
+
 function restoreAccountsState() {
   let sess = null;
   try { sess = JSON.parse(sessionStorage.getItem(ACCOUNTS_KEY) || 'null'); } catch {}
@@ -2737,6 +2757,7 @@ function lock({ offerPassword = false } = {}) {
   _featuresInited = false;
   for (const f of FEATURES) { try { f.stop && f.stop(); } catch {} }
   clearAccounts();
+  forgetSeeds();
   vaultPassword = null;
   vaultPasskeyId = null;
   wallet.load({ mnemonic: '', passphrase: '', netName: getNetwork(), offline: false });
@@ -6977,7 +6998,7 @@ loadLocale(getLang()).finally(async () => {
   const storeReady = featureHook('arkStoreReady');
   // the IndexedDB caches (profiles, reports, …) open alongside: a wallet's
   // caches are read as soon as it opens
-  await Promise.all([storeReady, cacheReady()].filter(Boolean)).catch(() => {});
+  await Promise.all([storeReady, cacheReady(), warmBootSeeds()].filter(Boolean)).catch(() => {});
   // Ask the browser not to evict this site's storage under disk pressure.
   // Chrome answers without a prompt (yes for an installed or busy site).
   try { navigator.storage?.persist?.().catch(() => {}); } catch {}