Implement review suggestion

scripts/masterkey.js

@@ -61,7 +61,7 @@ export class MasterKey {
      * @return {void}
      * @abstract
      */
-    wipePrivateData(nAccount) {
+    wipePrivateData(_nAccount) {
         throw new Error('Not implemented');
     }
 
@@ -77,7 +77,7 @@ export class MasterKey {
      * @return {Promise<String>} public key to export. Only suitable for monitoring balance.
      * @abstract
      */
-    getKeyToExport(nAccount) {
+    getKeyToExport(_nAccount) {
         throw new Error('Not implemented');
     }
 
@@ -220,7 +220,7 @@ export class HardwareWalletMasterKey extends MasterKey {
     }
 
     // Hardware Wallets don't have exposed private data
-    wipePrivateData() {}
+    wipePrivateData(_nAccount) {}
 
     get isViewOnly() {
         return false;
@@ -248,7 +248,7 @@ export class LegacyMasterKey extends MasterKey {
         return this._address;
     }
 
-    getKeyToExport() {
+    getKeyToExport(_nAccount) {
         return this._address;
     }
 
@@ -271,7 +271,7 @@ export class LegacyMasterKey extends MasterKey {
         );
     }
 
-    wipePrivateData() {
+    wipePrivateData(_nAccount) {
         this._pkBytes = null;
         this._isViewOnly = true;
     }

scripts/network.js

@@ -2,7 +2,6 @@ import { cChainParams, COIN } from './chain_params.js';
 import { createAlert } from './misc.js';
 import { Mempool, UTXO } from './mempool.js';
 import { getEventEmitter } from './event_bus.js';
-import { Wallet } from './wallet.js';
 import {
     STATS,
     cStatKeys,
@@ -94,10 +93,10 @@ export class HistoricalTx {
  *
  */
 export class Network {
+    wallet;
     /**
-     * @type {Wallet}
+     * @param {import('./wallet.js').Wallet} wallet
      */
-    wallet;
     constructor(wallet) {
         if (this.constructor === Network) {
             throw new Error('Initializing virtual class');
@@ -251,7 +250,7 @@ export class ExplorerNetwork extends Network {
     async getUTXOs(strAddress = '') {
         // Don't fetch UTXOs if we're already scanning for them!
         if (!strAddress) {
-            if (!this.wallet) return;
+            if (!this.wallet || !this.wallet.isLoaded()) return;
             if (this.isSyncing) return;
             this.isSyncing = true;
         }
@@ -363,7 +362,8 @@ export class ExplorerNetwork extends Network {
             return false;
         }
         try {
-            if (!this.enabled || !this.wallet) return this.arrTxHistory;
+            if (!this.enabled || !this.wallet || !this.wallet.isLoaded())
+                return this.arrTxHistory;
             this.historySyncing = true;
             const nHeight = this.arrTxHistory.length
                 ? this.arrTxHistory[this.arrTxHistory.length - 1].blockHeight

scripts/wallet.js

@@ -4,7 +4,6 @@ import { doms, beforeUnloadListener } from './global.js';
 import { getNetwork } from './network.js';
 import { MAX_ACCOUNT_GAP } from './chain_params.js';
 import {
-    MasterKey,
     LegacyMasterKey,
     HdMasterKey,
     HardwareWalletMasterKey,
@@ -39,7 +38,7 @@ export let fWalletLoaded = false;
  */
 export class Wallet {
     /**
-     * @type {MasterKey}
+     * @type {import('./masterkey.js').MasterKey}
      */
     #masterKey;
     /**