From 2595e4e69cfa1120778accc15cfb070f2f481b57 Mon Sep 17 00:00:00 2001 From: Alessandro Rezzi Date: Wed, 19 Jul 2023 15:28:13 +0200 Subject: [PATCH] [SQUASH] FIx cmake? --- src/stakeinput.cpp | 2 -- src/wallet/wallet.cpp | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/stakeinput.cpp b/src/stakeinput.cpp index b067b9bb3789f4..18b4789129b2b4 100644 --- a/src/stakeinput.cpp +++ b/src/stakeinput.cpp @@ -4,10 +4,8 @@ #include "stakeinput.h" -#include "../wallet/wallet.h" #include "amount.h" #include "chain.h" -#include "librustzcash.h" #include "streams.h" #include "txdb.h" #include "validation.h" diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index b67c8cc3812c63..6c5037e996753a 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -7,7 +7,6 @@ #include "optional.h" #include "consensus/params.h" -#include "librustzcash.h" #include "primitives/transaction.h" #include "sapling/saplingscriptpubkeyman.h" #include "sapling/zip32.h" @@ -2751,6 +2750,7 @@ bool CWallet::StakeableUTXOs(std::vector* stakeableCoins) cons bool CWallet::StakeableNotes(std::vector* shieldNotes) const { + LOCK(cs_wallet); if (Params().GetConsensus().NetworkUpgradeActive(this->GetLastBlockHeight(), Consensus::UPGRADE_SHIELD_STAKING)) { return m_sspk_man->GetStakeableNotes(shieldNotes, Params().GetConsensus().nStakeMinDepth); }