firoorg · reubenyap · May 3, 2025 · May 3, 2025
diff --git a/src/liblelantus/threadpool.h b/src/liblelantus/threadpool.h
@@ -68,26 +68,13 @@ class ParallelOpThreadPool {
         // start missing threads
         while (threads.size() < number_of_threads)
             threads.emplace_back(std::bind(&ParallelOpThreadPool::ThreadProc, this));
-    }
+        }
 
 public:
     ParallelOpThreadPool(std::size_t thread_number) : number_of_threads(thread_number), shutdown(false) {}
 
     ~ParallelOpThreadPool() {
-        std::list<boost::thread> threadsToJoin;
-
-        {
-            boost::mutex::scoped_lock lock(task_queue_mutex);
-            shutdown = true;
-            task_queue_condition.notify_all();
-
-            // move the list to separate variable to wait for the shutdown process to complete
-            threadsToJoin.swap(threads);
-        }
-
-        // wait for all the threads
-        for (boost::thread &t: threadsToJoin)
-            t.join();
+        Shutdown();
     }
 
     // Post a task to the thread pool and return a future to wait for its completion
@@ -110,6 +97,23 @@ class ParallelOpThreadPool {
     int GetNumberOfThreads() const {
         return number_of_threads;
     }
+
+    void Shutdown() {
+        std::list<boost::thread> threadsToJoin;
+
+        {
+            boost::mutex::scoped_lock lock(task_queue_mutex);
+            shutdown = true;
+            task_queue_condition.notify_all();
+
+            // move the list to separate variable to wait for the shutdown process to complete
+            threadsToJoin.swap(threads);
+        }
+
+        // wait for all the threads
+        for (boost::thread &t: threadsToJoin)
+            t.join();
+    }
 };
 
 

diff --git a/src/spark/sparkwallet.cpp b/src/spark/sparkwallet.cpp
@@ -84,6 +84,10 @@ CSparkWallet::~CSparkWallet() {
     delete (ParallelOpThreadPool<void>*)threadPool;
 }
 
+void CSparkWallet::FinishTasks() {
+    ((ParallelOpThreadPool<void>*)threadPool)->Shutdown();
+}
+
 void CSparkWallet::resetDiversifierFromDB(CWalletDB& walletdb) {
     walletdb.readDiversifier(lastDiversifier);
 }

diff --git a/src/spark/sparkwallet.h b/src/spark/sparkwallet.h
@@ -153,6 +153,8 @@ class CSparkWallet  {
     // Returns the list of pairs of coins and metadata for that coin,
     std::list<CSparkMintMeta> GetAvailableSparkCoins(const CCoinControl *coinControl = NULL) const;
 
+    void FinishTasks();
+
 public:
     // to protect coinMeta
     mutable CCriticalSection cs_spark_wallet;

diff --git a/src/spark/state.cpp b/src/spark/state.cpp
@@ -950,6 +950,7 @@ CSparkState::CSparkState(
 }
 
 void CSparkState::Reset() {
+    ShutdownWallet();
     coinGroups.clear();
     latestCoinId = 0;
     mintedCoins.clear();

diff --git a/src/spark/state.h b/src/spark/state.h
@@ -7,6 +7,7 @@
 
 #include "libspark/coin.h"
 #include "chain.h"
+#include "../wallet/wallet.h"
 #include "../libspark/mint_transaction.h"
 #include "../libspark/spend_transaction.h"
 #include "primitives.h"

diff --git a/src/test/fixtures.cpp b/src/test/fixtures.cpp
@@ -423,4 +423,5 @@ CTransaction SparkTestingSetup::GenerateSparkSpend(
 
 SparkTestingSetup::~SparkTestingSetup()
 {
+    pwalletMain->sparkWallet->FinishTasks();
 }
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -8265,6 +8265,14 @@ bool CMerkleTx::AcceptToMemoryPool(const CAmount &nAbsurdFee, CValidationState &
 bool CompSigmaHeight(const CSigmaEntry &a, const CSigmaEntry &b) { return a.nHeight < b.nHeight; }
 bool CompSigmaID(const CSigmaEntry &a, const CSigmaEntry &b) { return a.id < b.id; }
 
+void ShutdownWallet() {
+    if (pwalletMain) {
+        if (pwalletMain->sparkWallet) {
+            pwalletMain->sparkWallet->FinishTasks();
+        }
+    }
+}
+
 bool CWallet::CreateSparkMintTransactions(
     const std::vector<spark::MintedCoinData>& outputs,
     std::vector<std::pair<CWalletTx, CAmount>>& wtxAndFee,

diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
@@ -1489,6 +1489,7 @@ class CAccount
 
 bool CompSigmaHeight(const CSigmaEntry& a, const CSigmaEntry& b);
 bool CompSigmaID(const CSigmaEntry& a, const CSigmaEntry& b);
+void ShutdownWallet();
 
 // Helper for producing a bunch of max-sized low-S signatures (eg 72 bytes)
 // ContainerType is meant to hold pair<CWalletTx *, int>, and be iterable
-Original file line number
+Diff line change
@@ Expand Up / @@ -423,4 +423,5 @@ CTransaction SparkTestingSetup::GenerateSparkSpend( @@
     SparkTestingSetup::~SparkTestingSetup()
     {
+        pwalletMain->sparkWallet->FinishTasks();
     }