[BUG] Missing cs_wallet lock in SaplingScriptPubKeyMan::GetNotes

needed by CWalletTx::GetDepthInMainChain
PIVX-Project · Apr 22, 2021 · 9bec9bc · 9bec9bc
1 parent b2d9061
commit 9bec9bc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/src/sapling/saplingscriptpubkeyman.cpp b/src/sapling/saplingscriptpubkeyman.cpp
@@ -397,6 +397,7 @@ void SaplingScriptPubKeyMan::GetNotes(const std::vector<SaplingOutPoint>& saplin
     for (const auto& outpoint : saplingOutpoints) {
         const auto* wtx = wallet->GetWalletTx(outpoint.hash);
         if (!wtx) throw std::runtime_error("No transaction available for hash " + outpoint.hash.GetHex());
+        const int depth = WITH_LOCK(wallet->cs_wallet, return wtx->GetDepthInMainChain(); );
         const auto& it = wtx->mapSaplingNoteData.find(outpoint);
         if (it != wtx->mapSaplingNoteData.end()) {
             const SaplingOutPoint& op = it->first;
@@ -414,7 +415,7 @@ void SaplingScriptPubKeyMan::GetNotes(const std::vector<SaplingOutPoint>& saplin
             const libzcash::SaplingPaymentAddress& pa = optNotePtAndAddress->second;
             auto note = notePt.note(ivk).get();
 
-            saplingEntriesRet.emplace_back(op, pa, note, notePt.memo(), wtx->GetDepthInMainChain());
+            saplingEntriesRet.emplace_back(op, pa, note, notePt.memo(), depth);
         }
     }
 }

diff --git a/src/test/librust/sapling_wallet_tests.cpp b/src/test/librust/sapling_wallet_tests.cpp
@@ -1222,11 +1222,6 @@ BOOST_AUTO_TEST_CASE(GetNotes)
         BOOST_CHECK_EQUAL(entries[i].confirmations, 1);
     }
 
-    /*
-     * !TODO: fix GetNotes.
-     * This test currently fails due to an assertion error (cs_wallet lock not held)
-     */
-
     // Check GetNotes
     std::vector<SaplingNoteEntry> entries2;
     wallet.GetSaplingScriptPubKeyMan()->GetNotes(saplingOutpoints, entries2);