From 18bc7bf302b90000611b8c1d31ca85a7a1370e52 Mon Sep 17 00:00:00 2001
From: Craig Raw <craigraw@gmail.com>
Date: Thu, 17 Dec 2020 08:38:41 +0200
Subject: [PATCH] improve debug logging for wallet history updates

---
 .../java/com/sparrowwallet/sparrow/net/ElectrumServer.java    | 2 +-
 .../java/com/sparrowwallet/sparrow/wallet/WalletForm.java     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/sparrowwallet/sparrow/net/ElectrumServer.java b/src/main/java/com/sparrowwallet/sparrow/net/ElectrumServer.java
index d333db3b..26547bc0 100644
--- a/src/main/java/com/sparrowwallet/sparrow/net/ElectrumServer.java
+++ b/src/main/java/com/sparrowwallet/sparrow/net/ElectrumServer.java
@@ -156,7 +156,7 @@ public class ElectrumServer {
 
         if(!newReferences.isEmpty()) {
             //Look for additional nodes to fetch history for by considering the inputs and outputs of new transactions found
-            log.debug("Found new transactions: " + newReferences);
+            log.debug(wallet.getName() + " found new transactions: " + newReferences);
             Set<WalletNode> additionalNodes = new HashSet<>();
             Map<String, WalletNode> walletScriptHashes = getAllScriptHashes(wallet);
             for(BlockTransactionHash reference : newReferences) {
diff --git a/src/main/java/com/sparrowwallet/sparrow/wallet/WalletForm.java b/src/main/java/com/sparrowwallet/sparrow/wallet/WalletForm.java
index 1f0b58ac..dc36c78f 100644
--- a/src/main/java/com/sparrowwallet/sparrow/wallet/WalletForm.java
+++ b/src/main/java/com/sparrowwallet/sparrow/wallet/WalletForm.java
@@ -76,7 +76,7 @@ public class WalletForm {
     public void refreshHistory(Integer blockHeight, WalletNode node) {
         Wallet previousWallet = wallet.copy();
         if(wallet.isValid() && AppServices.isOnline()) {
-            log.debug(node == null ? "Refreshing full wallet history" : "Requesting node wallet history for " + node.getDerivationPath());
+            log.debug(node == null ? wallet.getName() + " refreshing full wallet history" : wallet.getName() + " requesting node wallet history for " + node.getDerivationPath());
             ElectrumServer.TransactionHistoryService historyService = new ElectrumServer.TransactionHistoryService(wallet, getWalletTransactionNodes(node));
             historyService.setOnSucceeded(workerStateEvent -> {
                 EventManager.get().post(new WalletHistoryStatusEvent(wallet, true));
@@ -248,7 +248,7 @@ public class WalletForm {
         if(wallet.isValid()) {
             WalletNode walletNode = event.getWalletNode(wallet);
             if(walletNode != null) {
-                log.debug(wallet.getName() + " history event for node " + walletNode);
+                log.debug(wallet.getName() + " history event for node " + walletNode + " (" + event.getScriptHash() + ")");
                 refreshHistory(AppServices.getCurrentBlockHeight(), walletNode);
             }
         }