Merge remote-tracking branch 'upstream/master' into shield_activity_f…

…inal
PIVX-Labs · Nov 19, 2024 · ead84d0 · ead84d0
2 parents 98c00ed + a44f5f0
commit ead84d0
Showing 1 changed file with 17 additions and 2 deletions.
diff --git a/scripts/wallet.js b/scripts/wallet.js
@@ -40,7 +40,13 @@ import { guiToggleReceiveType } from './contacts-book.js';
 import { TransactionBuilder } from './transaction_builder.js';
 import { createAlert } from './alerts/alert.js';
 import { AsyncInterval } from './async_interval.js';
-import { debugError, debugLog, DebugTopics } from './debug.js';
+import {
+    debugError,
+    debugLog,
+    debugTimerEnd,
+    debugTimerStart,
+    DebugTopics,
+} from './debug.js';
 import { OrderedArray } from './ordered_array.js';
 
 /**
@@ -773,7 +779,9 @@ export class Wallet {
         this.#lastProcessedBlock = blockCount - 5;
         await this.#transparentSync();
         if (this.hasShield()) {
+            debugTimerStart(DebugTopics.WALLET, 'syncShield');
             await this.#syncShield();
+            debugTimerEnd(DebugTopics.WALLET, 'syncShield');
         }
         this.#isSynced = true;
         // At this point download the last missing blocks in the range (blockCount -5, blockCount]
@@ -844,7 +852,9 @@ export class Wallet {
              * @type {{txs: string[]; height: number; time: number}[]}
              */
             let blocksArray = [];
+            let handleBlocksTime = 0;
             const handleAllBlocks = async () => {
+                const start = performance.now();
                 // Process the current batch of blocks before starting to parse the next one
                 if (blocksArray.length) {
                     const ownTxs = await this.#shield.handleBlocks(blocksArray);
@@ -862,6 +872,7 @@ export class Wallet {
                         }
                     }
                 }
+                handleBlocksTime += performance.now() - start;
                 blocksArray = [];
                 // Emit status update
                 getEventEmitter().emit(
@@ -895,11 +906,15 @@ export class Wallet {
                     // This is neither a block or a tx.
                     throw new Error('Failed to parse shield binary');
                 }
-                if (blocksArray.length > 50) {
+                if (blocksArray.length >= 10) {
                     await handleAllBlocks();
                 }
             }
             await handleAllBlocks();
+            debugLog(
+                DebugTopics.WALLET,
+                `syncShield rust internal ${handleBlocksTime} ms`
+            );
             // At this point it should be safe to assume that shield is ready to use
             await this.saveShieldOnDisk();
         } catch (e) {