wallet: connect to node and load filter only after walletdb finished …

…loading..
handshake-org · Oct 20, 2023 · b12650d · b12650d
1 parent 086d9c9
commit b12650d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/lib/wallet/wallet.js b/lib/wallet/wallet.js
@@ -199,9 +199,9 @@ class Wallet extends EventEmitter {
     const account = await this._createAccount(options, passphrase);
     assert(account);
 
-    this.logger.info('Wallet initialized (%s).', this.id);
+    await this.txdb.open(this);
 
-    return this.txdb.open(this);
+    this.logger.info('Wallet initialized (%s).', this.id);
   }
 
   /**
@@ -215,9 +215,8 @@ class Wallet extends EventEmitter {
     if (!account)
       throw new Error('Default account not found.');
 
+    await this.txdb.open(this);
     this.logger.info('Wallet opened (%s).', this.id);
-
-    return this.txdb.open(this);
   }
 
   /**

diff --git a/lib/wallet/walletdb.js b/lib/wallet/walletdb.js
@@ -208,11 +208,10 @@ class WalletDB extends EventEmitter {
     if (this.options.wipeNoReally)
       await this.wipe();
 
-    await this.watch();
     await this.loadState();
 
     this.logger.info(
-      'WalletDB loaded (depth=%d, height=%d, start=%d).',
+      'WalletDB is loading (depth=%d, height=%d, start=%d).',
       this.depth,
       this.state.height,
       this.state.startHeight);
@@ -240,6 +239,7 @@ class WalletDB extends EventEmitter {
     }
 
     await this.preloadAll();
+    await this.watch();
 
     this.logger.info('WalletDB opened.');
     this.emit('open');