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

…loading..
handshake-org · Jan 26, 2023 · 2f5576c · 2f5576c
1 parent a1dd9a3
commit 2f5576c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 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
@@ -199,15 +199,6 @@ class WalletDB extends EventEmitter {
     if (this.options.wipeNoReally)
       await this.wipe();
 
-    await this.watch();
-    await this.connect();
-
-    this.logger.info(
-      'WalletDB loaded (depth=%d, height=%d, start=%d).',
-      this.depth,
-      this.state.height,
-      this.state.startHeight);
-
     const wallet = await this.ensure({
       id: 'primary'
     });
@@ -227,6 +218,16 @@ class WalletDB extends EventEmitter {
 
     await this.checkLookahead();
     await this.preloadAll();
+
+    await this.watch();
+    await this.connect();
+
+    this.logger.info(
+      'WalletDB loaded (depth=%d, height=%d, start=%d).',
+      this.depth,
+      this.state.height,
+      this.state.startHeight);
+
   }
 
   /**