Move wallet callbacks into cs_main.

furszy · furszy · commit 9d1beb3b1cba · 2020-08-04T00:57:17.000-03:00
adaptation of btc@989989354b68d3954fe2742b96c53eeb2e8a7670
diff --git a/src/main.cpp b/src/main.cpp
@@ -3031,22 +3031,22 @@ bool ActivateBestChain(CValidationState& state, const CBlock* pblock, bool fAlre
             pindexNewTip = chainActive.Tip();
             pindexFork = chainActive.FindFork(pindexOldTip);
             fInitialDownload = IsInitialBlockDownload();
+
+            // throw all transactions though the signal-interface
+            for (const CTransaction &tx : txConflicted) {
+                GetMainSignals().SyncTransaction(tx, pindexNewTip, CMainSignals::SYNC_TRANSACTION_NOT_IN_BLOCK);
+            }
+            // ... and about transactions that got confirmed:
+            for(unsigned int i = 0; i < txChanged.size(); i++) {
+                GetMainSignals().SyncTransaction(std::get<0>(txChanged[i]), std::get<1>(txChanged[i]), std::get<2>(txChanged[i]));
+            }
+
             break;
         }
 
         // When we reach this point, we switched to a new tip (stored in pindexNewTip).
         // Notifications/callbacks that can run without cs_main
 
-        // throw all transactions though the signal-interface
-        // while _not_ holding the cs_main lock
-        for (const CTransaction &tx : txConflicted) {
-            GetMainSignals().SyncTransaction(tx, pindexNewTip, CMainSignals::SYNC_TRANSACTION_NOT_IN_BLOCK);
-        }
-        // ... and about transactions that got confirmed:
-        for(unsigned int i = 0; i < txChanged.size(); i++) {
-            GetMainSignals().SyncTransaction(std::get<0>(txChanged[i]), std::get<1>(txChanged[i]), std::get<2>(txChanged[i]));
-        }
-
         // Always notify the UI if a new block tip was connected
         if (pindexFork != pindexNewTip) {
 
