From e6d5e6cbbef3dca1bc9dce095124f7b79d01a54a Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Wed, 8 Mar 2017 12:55:33 -0500
Subject: [PATCH] Hold cs_wallet for whole block [dis]connection processing

This simplifies fixing the wallet-returns-stale-info issue as we
now hold cs_wallet across an entire block instead of only per-tx.
---
 src/wallet/wallet.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 2b66faf68..b04037774 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -1138,6 +1138,7 @@ void CWallet::TransactionAddedToMempool(const CTransactionRef& ptx) {
 }
 
 void CWallet::BlockConnected(const std::shared_ptr<const CBlock>& pblock, const CBlockIndex *pindex, const std::vector<CTransactionRef>& vtxConflicted) {
+    LOCK2(cs_main, cs_wallet);
     // TODO: Tempoarily ensure that mempool removals are notified before
     // connected transactions.  This shouldn't matter, but the abandoned
     // state of transactions in our wallet is currently cleared when we
@@ -1147,18 +1148,17 @@ void CWallet::BlockConnected(const std::shared_ptr<const CBlock>& pblock, const
     // the notification that the conflicted transaction was evicted.
 
     for (const CTransactionRef& ptx : vtxConflicted) {
-        LOCK2(cs_main, cs_wallet);
         SyncTransaction(ptx, NULL, -1);
     }
     for (size_t i = 0; i < pblock->vtx.size(); i++) {
-        LOCK2(cs_main, cs_wallet);
         SyncTransaction(pblock->vtx[i], pindex, i);
     }
 }
 
 void CWallet::BlockDisconnected(const std::shared_ptr<const CBlock>& pblock) {
+    LOCK2(cs_main, cs_wallet);
+
     for (const CTransactionRef& ptx : pblock->vtx) {
-        LOCK2(cs_main, cs_wallet);
         SyncTransaction(ptx, NULL, -1);
     }
 }