From 0b55cec91383f49fb5d499d2d2de02e7c70d3edb Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Sat, 3 Sep 2022 15:07:11 +0300
Subject: [PATCH 1/4] feat(wallet): TopUpKeyPool improvements

- make progress calculations sane
- show progress in GUI but only when you need 100+ new keys
- make it stop on shutdown request
- spam less in debug.log
---
 src/wallet/scriptpubkeyman.cpp | 39 +++++++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/src/wallet/scriptpubkeyman.cpp b/src/wallet/scriptpubkeyman.cpp
index bc3b6c7c322f..3bf24e6e8424 100644
--- a/src/wallet/scriptpubkeyman.cpp
+++ b/src/wallet/scriptpubkeyman.cpp
@@ -7,6 +7,7 @@
 #include <logging.h>
 #include <script/descriptor.h>
 #include <script/sign.h>
+#include <shutdown.h>
 #include <ui_interface.h>
 #include <util/bip32.h>
 #include <util/strencodings.h>
@@ -1414,14 +1415,23 @@ bool LegacyScriptPubKeyMan::TopUpInner(unsigned int kpSize)
         {
             // don't create extra internal keys
             missingInternal = 0;
-        } else {
-            nTargetSize *= 2;
         }
+        int64_t total_missing = missingInternal + missingExternal;
+        if (total_missing == 0) return true;
+        bool should_show_progress = total_missing > 100;
         bool fInternal = false;
         WalletBatch batch(m_storage.GetDatabase());
-        for (int64_t i = missingInternal + missingExternal; i--;)
+        std::string strMsg = _("Topping up keypool...").translated;
+        WalletLogPrintf("%s\n", strMsg);
+        if (should_show_progress) {
+            uiInterface.ShowProgress(strMsg, 0, false);
+        }
+        int64_t progress_report_time = GetTime();
+        constexpr int64_t PROGRESS_REPORT_INTERVAL = 1; // in seconds
+        int64_t i{0};
+        for (i = 0; i < total_missing; ++i)
         {
-            if (i < missingInternal) {
+            if (i == missingExternal) {
                 fInternal = true;
             }
 
@@ -1429,15 +1439,20 @@ bool LegacyScriptPubKeyMan::TopUpInner(unsigned int kpSize)
             CPubKey pubkey(GenerateNewKey(batch, 0, fInternal));
             AddKeypoolPubkeyWithDB(pubkey, fInternal, batch);
 
-            if (missingInternal + missingExternal > 0) {
-                WalletLogPrintf("keypool added %d keys (%d internal), size=%u (%u internal)\n",
-                          missingInternal + missingExternal, missingInternal,
-                          setInternalKeyPool.size() + setExternalKeyPool.size(), setInternalKeyPool.size());
+            double dProgress = 100.f * i / (total_missing);
+            if (GetTime() >= progress_report_time + PROGRESS_REPORT_INTERVAL) {
+                progress_report_time = GetTime();
+                WalletLogPrintf("Still topping up. At key %i. Progress=%f\n", i, dProgress);
+                if (should_show_progress && (int)dProgress > 0) {
+                    uiInterface.ShowProgress(strMsg, (int)dProgress, false);
+                }
             }
-
-            double dProgress = 100.f * m_max_keypool_index / (nTargetSize + 1);
-            std::string strMsg = strprintf(_("Loading wallet... (%3.2f %%)").translated, dProgress);
-            uiInterface.InitMessage(strMsg);
+            if (ShutdownRequested()) break;
+        }
+        WalletLogPrintf("Keypool added %d keys, size=%u (%u internal)\n",
+                  i + 1, setInternalKeyPool.size() + setExternalKeyPool.size(), setInternalKeyPool.size());
+        if (should_show_progress) {
+            uiInterface.ShowProgress("", 100, false);
         }
     }
     NotifyCanGetAddressesChanged();

From d9ae13fc85b125c25a705ee58fe30cc40ce3c44c Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Sun, 25 Jun 2023 13:10:53 +0300
Subject: [PATCH 2/4] fix: apply suggestions, move code for better readability

---
 src/wallet/scriptpubkeyman.cpp | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/wallet/scriptpubkeyman.cpp b/src/wallet/scriptpubkeyman.cpp
index 3bf24e6e8424..44b9fc1d1951 100644
--- a/src/wallet/scriptpubkeyman.cpp
+++ b/src/wallet/scriptpubkeyman.cpp
@@ -1416,22 +1416,26 @@ bool LegacyScriptPubKeyMan::TopUpInner(unsigned int kpSize)
             // don't create extra internal keys
             missingInternal = 0;
         }
-        int64_t total_missing = missingInternal + missingExternal;
+
+        const int64_t total_missing = missingInternal + missingExternal;
         if (total_missing == 0) return true;
-        bool should_show_progress = total_missing > 100;
-        bool fInternal = false;
-        WalletBatch batch(m_storage.GetDatabase());
-        std::string strMsg = _("Topping up keypool...").translated;
+
+        constexpr int64_t PROGRESS_REPORT_INTERVAL = 1; // in seconds
+        const bool should_show_progress = total_missing > 100;
+        const std::string strMsg = _("Topping up keypool...").translated;
+
+        int64_t progress_report_time = GetTime();
         WalletLogPrintf("%s\n", strMsg);
         if (should_show_progress) {
             uiInterface.ShowProgress(strMsg, 0, false);
         }
-        int64_t progress_report_time = GetTime();
-        constexpr int64_t PROGRESS_REPORT_INTERVAL = 1; // in seconds
-        int64_t i{0};
-        for (i = 0; i < total_missing; ++i)
-        {
-            if (i == missingExternal) {
+
+        bool fInternal = false;
+        int64_t current_index{0};
+        WalletBatch batch(m_storage.GetDatabase());
+
+        for (current_index = 0; current_index < total_missing; ++current_index) {
+            if (current_index == missingExternal) {
                 fInternal = true;
             }
 
@@ -1439,10 +1443,10 @@ bool LegacyScriptPubKeyMan::TopUpInner(unsigned int kpSize)
             CPubKey pubkey(GenerateNewKey(batch, 0, fInternal));
             AddKeypoolPubkeyWithDB(pubkey, fInternal, batch);
 
-            double dProgress = 100.f * i / (total_missing);
             if (GetTime() >= progress_report_time + PROGRESS_REPORT_INTERVAL) {
+                const double dProgress = 100.f * current_index / (total_missing);
                 progress_report_time = GetTime();
-                WalletLogPrintf("Still topping up. At key %i. Progress=%f\n", i, dProgress);
+                WalletLogPrintf("Still topping up. At key %i. Progress=%f\n", current_index, dProgress);
                 if (should_show_progress && (int)dProgress > 0) {
                     uiInterface.ShowProgress(strMsg, (int)dProgress, false);
                 }
@@ -1450,7 +1454,7 @@ bool LegacyScriptPubKeyMan::TopUpInner(unsigned int kpSize)
             if (ShutdownRequested()) break;
         }
         WalletLogPrintf("Keypool added %d keys, size=%u (%u internal)\n",
-                  i + 1, setInternalKeyPool.size() + setExternalKeyPool.size(), setInternalKeyPool.size());
+                  current_index + 1, setInternalKeyPool.size() + setExternalKeyPool.size(), setInternalKeyPool.size());
         if (should_show_progress) {
             uiInterface.ShowProgress("", 100, false);
         }

From cc0d58da41159aa8de722b480ca22d78ac2e5fbf Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Mon, 26 Jun 2023 15:03:16 +0300
Subject: [PATCH 3/4] apply more suggestions

---
 src/wallet/scriptpubkeyman.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/wallet/scriptpubkeyman.cpp b/src/wallet/scriptpubkeyman.cpp
index 44b9fc1d1951..336f19f866c6 100644
--- a/src/wallet/scriptpubkeyman.cpp
+++ b/src/wallet/scriptpubkeyman.cpp
@@ -1444,11 +1444,11 @@ bool LegacyScriptPubKeyMan::TopUpInner(unsigned int kpSize)
             AddKeypoolPubkeyWithDB(pubkey, fInternal, batch);
 
             if (GetTime() >= progress_report_time + PROGRESS_REPORT_INTERVAL) {
-                const double dProgress = 100.f * current_index / (total_missing);
+                const double dProgress = 100.f * current_index / total_missing;
                 progress_report_time = GetTime();
                 WalletLogPrintf("Still topping up. At key %i. Progress=%f\n", current_index, dProgress);
-                if (should_show_progress && (int)dProgress > 0) {
-                    uiInterface.ShowProgress(strMsg, (int)dProgress, false);
+                if (should_show_progress) {
+                    uiInterface.ShowProgress(strMsg, static_cast<int>(dProgress), false);
                 }
             }
             if (ShutdownRequested()) break;

From e9be3e1ca002c617d4f9747f8211932fae73103c Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Mon, 26 Jun 2023 23:05:41 +0300
Subject: [PATCH 4/4] fix: `%i` -> `%lld`

---
 src/wallet/scriptpubkeyman.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wallet/scriptpubkeyman.cpp b/src/wallet/scriptpubkeyman.cpp
index 336f19f866c6..2d962b678eeb 100644
--- a/src/wallet/scriptpubkeyman.cpp
+++ b/src/wallet/scriptpubkeyman.cpp
@@ -1446,7 +1446,7 @@ bool LegacyScriptPubKeyMan::TopUpInner(unsigned int kpSize)
             if (GetTime() >= progress_report_time + PROGRESS_REPORT_INTERVAL) {
                 const double dProgress = 100.f * current_index / total_missing;
                 progress_report_time = GetTime();
-                WalletLogPrintf("Still topping up. At key %i. Progress=%f\n", current_index, dProgress);
+                WalletLogPrintf("Still topping up. At key %lld. Progress=%f\n", current_index, dProgress);
                 if (should_show_progress) {
                     uiInterface.ShowProgress(strMsg, static_cast<int>(dProgress), false);
                 }