Make bitcoin-util grind_task tsan friendly

This does not change behavior of the bitcoin-util binary.

1 files changed, 7 insertions, 5 deletions

diff --git a/src/bitcoin-util.cpp b/src/bitcoin-util.cpp
index fb184c0486..ad908de3e1 100644
--- a/src/bitcoin-util.cpp
+++ b/src/bitcoin-util.cpp
@@ -82,13 +82,12 @@ static int AppInitUtil(ArgsManager& args, int argc, char* argv[])
     return CONTINUE_EXECUTION;
 }
 
-static void grind_task(uint32_t nBits, CBlockHeader& header_orig, uint32_t offset, uint32_t step, std::atomic<bool>& found)
+static void grind_task(uint32_t nBits, CBlockHeader header, uint32_t offset, uint32_t step, std::atomic<bool>& found, uint32_t& proposed_nonce)
 {
     arith_uint256 target;
     bool neg, over;
     target.SetCompact(nBits, &neg, &over);
     if (target == 0 || neg || over) return;
-    CBlockHeader header = header_orig; // working copy
     header.nNonce = offset;
 
     uint32_t finish = std::numeric_limits<uint32_t>::max() - step;
@@ -99,7 +98,7 @@ static void grind_task(uint32_t nBits, CBlockHeader& header_orig, uint32_t offse
         do {
             if (UintToArith256(header.GetHash()) <= target) {
                 if (!found.exchange(true)) {
-                    header_orig.nNonce = header.nNonce;
+                    proposed_nonce = header.nNonce;
                 }
                 return;
             }
@@ -123,16 +122,19 @@ static int Grind(const std::vector<std::string>& args, std::string& strPrint)
 
     uint32_t nBits = header.nBits;
     std::atomic<bool> found{false};
+    uint32_t proposed_nonce{};
 
     std::vector<std::thread> threads;
     int n_tasks = std::max(1u, std::thread::hardware_concurrency());
     for (int i = 0; i < n_tasks; ++i) {
-        threads.emplace_back( grind_task, nBits, std::ref(header), i, n_tasks, std::ref(found) );
+        threads.emplace_back(grind_task, nBits, header, i, n_tasks, std::ref(found), std::ref(proposed_nonce));
     }
     for (auto& t : threads) {
         t.join();
     }
-    if (!found) {
+    if (found) {
+        header.nNonce = proposed_nonce;
+    } else {
         strPrint = "Could not satisfy difficulty target";
         return EXIT_FAILURE;
     }