Lock cs_wallet in additional places.

- Declare CWallet::KeepKey as requiring the lock, and take it before all calls.
This eliminates a tsan data race.
Also, fields within CReserveKey may similarly contend during mining,
declare that they are guarded by the same lock.

- Add other cs_wallet uses per lock annotations.
This eliminates some clang warnings: AddKeyPubKey requires holding mutex 'pwalletParent->cs_wallet' exclusively

Author: Zannick

src/veil/ringct/anonwallet.cpp

@@ -4527,6 +4527,7 @@ bool AnonWallet::AddStealthDestinationMeta(const CKeyID& idStealth, const CKeyID
 
 bool AnonWallet::AddKeyToParent(const CKey& keySharedSecret)
 {
+    LOCK(pwalletParent->cs_wallet);
     //Since the new key is not derived through Ext, for now keep it in CWallet keystore
     bool fSuccess = true;
     if (!pwalletParent->AddKeyPubKey(keySharedSecret, keySharedSecret.GetPubKey())) {

src/wallet/wallet.cpp

@@ -4647,6 +4647,7 @@ std::set<CTxDestination> CWallet::GetLabelAddresses(const std::string& label) co
 
 bool CReserveKey::GetReservedKey(CPubKey& pubkey, bool internal)
 {
+    LOCK(pwallet->cs_wallet);
     if (nIndex == -1)
     {
         CKeyPool keypool;
@@ -4663,14 +4664,17 @@ bool CReserveKey::GetReservedKey(CPubKey& pubkey, bool internal)
 
 void CReserveKey::KeepKey()
 {
-    if (nIndex != -1)
+    LOCK(pwallet->cs_wallet);
+    if (nIndex != -1) {
         pwallet->KeepKey(nIndex);
+    }
     nIndex = -1;
     vchPubKey = CPubKey();
 }
 
 void CReserveKey::ReturnKey()
 {
+    LOCK(pwallet->cs_wallet);
     if (nIndex != -1) {
         pwallet->ReturnKey(nIndex, fInternal, vchPubKey);
     }

src/wallet/wallet.h

@@ -1157,7 +1157,7 @@ class CWallet final : public CCryptoKeyStore, public CValidationInterface
      *     or external keypool
      */
     bool ReserveKeyFromKeyPool(int64_t& nIndex, CKeyPool& keypool, bool fRequestedInternal);
-    void KeepKey(int64_t nIndex);
+    void KeepKey(int64_t nIndex) EXCLUSIVE_LOCKS_REQUIRED(cs_wallet);
     void ReturnKey(int64_t nIndex, bool fInternal, const CPubKey& pubkey);
     bool GetKeyFromPool(CPubKey &key, bool internal = false);
     int64_t GetOldestKeyPoolTime();
@@ -1380,8 +1380,8 @@ class CReserveKey final : public CReserveScript
 {
 protected:
     CWallet* pwallet;
-    int64_t nIndex;
-    CPubKey vchPubKey;
+    int64_t nIndex GUARDED_BY(pwallet->cs_wallet);
+    CPubKey vchPubKey GUARDED_BY(pwallet->cs_wallet);
     bool fInternal;
 public:
     explicit CReserveKey(CWallet* pwalletIn)