Merge #893: [Wallet] Reduce shutdown delays when mining

f71b152 [Wallet] Reduce shutdown delays when mining (Cave Spectre)

Pull request description:

  # Problem
  The wallet sometimes still takes a while before it actually shuts down when mining; this is most prevalent when the mining has been shutdown before the wallet is shut down.

  # Root cause
  The wallet will have to abort the mining generation loops when shutdown is active

  # Solution
  Add checks in the mining loops to abort when necessary

Tree-SHA512: 3d6314058a5eeeea29ec26ee96127c69cdf356a3a5a55658396c7351dc94278fd6b069c377a953764839ca2bc331d29d150d056600db8f53a4b8cd7f3afa217c

Author: codeofalltrades

src/miner.cpp

@@ -869,7 +869,7 @@ void BitcoinMiner(std::shared_ptr<CReserveScript> coinbaseScript, bool fProofOfS
     enablewallet = !gArgs.GetBoolArg("-disablewallet", DEFAULT_DISABLE_WALLET);
 #endif
 
-    while (GenerateActive() || (fProofOfStake && enablewallet))
+    while (!ShutdownRequested() && (GenerateActive() || (fProofOfStake && enablewallet)))
     {
         boost::this_thread::interruption_point();
 #ifdef ENABLE_WALLET

src/rpc/mining.cpp

@@ -232,7 +232,7 @@ UniValue generateBlocks(std::shared_ptr<CReserveScript> coinbaseScript, int nGen
             uint256 mix_hash;
             while (nMaxTries > 0 && pblock->nNonce64 < nInnerLoopCount &&
                    !CheckProofOfWork(ProgPowHash(*pblock, mix_hash), pblock->nBits,
-                                     Params().GetConsensus(), CBlockHeader::PROGPOW_BLOCK)) {
+                                     Params().GetConsensus(), CBlockHeader::PROGPOW_BLOCK) && !ShutdownRequested()) {
                 ++pblock->nNonce64;
                 --nMaxTries;
             }
@@ -246,7 +246,7 @@ UniValue generateBlocks(std::shared_ptr<CReserveScript> coinbaseScript, int nGen
 
             bnTarget.SetCompact(pblock->nBits, &fNegative, &fOverflow);
 
-            while (nMaxTries > 0 && pblock->nNonce < nInnerLoopCount) {
+            while (nMaxTries > 0 && pblock->nNonce < nInnerLoopCount && !ShutdownRequested()) {
                 // RandomX hash
                 uint256 hash_blob = pblock->GetRandomXHeaderHash();
                 randomx_calculate_hash(GetMyMachineValidating(), &hash_blob, sizeof uint256(), hash);
@@ -263,7 +263,7 @@ UniValue generateBlocks(std::shared_ptr<CReserveScript> coinbaseScript, int nGen
         } else if (pblock->IsSha256D() && pblock->nTime >= Params().PowUpdateTimestamp()) {
             while (nMaxTries > 0 && pblock->nNonce64 < nInnerLoopCount &&
                    !CheckProofOfWork(pblock->GetSha256DPoWHash(), pblock->nBits,
-                                     Params().GetConsensus(), CBlockHeader::SHA256D_BLOCK)) {
+                                     Params().GetConsensus(), CBlockHeader::SHA256D_BLOCK) && !ShutdownRequested()) {
                 ++pblock->nNonce64;
                 --nMaxTries;
             }