From d95d7f63c943a60faf25715158166da827bdc19c Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Tue, 21 Nov 2023 16:38:38 +0700
Subject: [PATCH] refactor: remove dependency scriptpubkeyman on uiInterface

---
 src/wallet/scriptpubkeyman.cpp | 7 +++----
 src/wallet/scriptpubkeyman.h   | 3 +++
 src/wallet/wallet.cpp          | 5 +++++
 src/wallet/wallet.h            | 2 ++
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/wallet/scriptpubkeyman.cpp b/src/wallet/scriptpubkeyman.cpp
index 78a2dbc2bc..74cd330038 100644
--- a/src/wallet/scriptpubkeyman.cpp
+++ b/src/wallet/scriptpubkeyman.cpp
@@ -8,7 +8,6 @@
 #include <script/descriptor.h>
 #include <script/sign.h>
 #include <shutdown.h>
-#include <ui_interface.h>
 #include <util/bip32.h>
 #include <util/strencodings.h>
 #include <util/system.h>
@@ -1437,7 +1436,7 @@ bool LegacyScriptPubKeyMan::TopUpInner(unsigned int kpSize)
         int64_t progress_report_time = GetTime();
         WalletLogPrintf("%s\n", strMsg);
         if (should_show_progress) {
-            uiInterface.ShowProgress(strMsg, 0, false);
+            m_storage.UpdateProgress(strMsg, 0);
         }
 
         bool fInternal = false;
@@ -1458,7 +1457,7 @@ bool LegacyScriptPubKeyMan::TopUpInner(unsigned int kpSize)
                 progress_report_time = GetTime();
                 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);
+                    m_storage.UpdateProgress(strMsg, static_cast<int>(dProgress));
                 }
             }
             if (ShutdownRequested()) break;
@@ -1466,7 +1465,7 @@ bool LegacyScriptPubKeyMan::TopUpInner(unsigned int kpSize)
         WalletLogPrintf("Keypool added %d keys, size=%u (%u internal)\n",
                   current_index + 1, setInternalKeyPool.size() + setExternalKeyPool.size(), setInternalKeyPool.size());
         if (should_show_progress) {
-            uiInterface.ShowProgress("", 100, false);
+            m_storage.UpdateProgress("", 100);
         }
     }
     NotifyCanGetAddressesChanged();
diff --git a/src/wallet/scriptpubkeyman.h b/src/wallet/scriptpubkeyman.h
index 07e0d806a8..045157428b 100644
--- a/src/wallet/scriptpubkeyman.h
+++ b/src/wallet/scriptpubkeyman.h
@@ -39,6 +39,9 @@ public:
     virtual bool HasEncryptionKeys() const = 0;
     virtual bool IsLocked(bool fForMixing = false) const = 0;
 
+    // for LegacyScriptPubKeyMan::TopUpInner needs:
+    virtual void UpdateProgress(const std::string&, int) = 0;
+
     // methods below are unique from Dash due to different implementation of HD
     virtual void NewKeyPoolCallback() = 0;
     virtual void KeepDestinationCallback(bool erased) = 0;
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index e6d454f3a8..00409f544a 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -5501,3 +5501,8 @@ bool CWallet::GenerateNewHDChainEncrypted(const SecureString& secureMnemonic, co
 
     return false;
 }
+
+void CWallet::UpdateProgress(const std::string& title, int nProgress)
+{
+    ShowProgress(title, nProgress);
+}
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index bda3989e01..1fcc65952c 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -855,6 +855,8 @@ public:
     bool IsLocked(bool fForMixing = false) const override;
     bool Lock(bool fForMixing = false);
 
+    void UpdateProgress(const std::string& title, int nProgress) override;
+
     std::map<uint256, CWalletTx> mapWallet GUARDED_BY(cs_wallet);
 
     typedef std::multimap<int64_t, CWalletTx*> TxItems;