diff options
author | MarcoFalke <falke.marco@gmail.com> | 2019-04-22 14:30:02 -0400 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2019-05-06 14:03:56 -0400 |
commit | faf3729242c5e9486e137e549f05bf20bd3908a0 (patch) | |
tree | 2e8eac01221ff69a1c9c5ccacff731d6ee0ed1ff /src/interfaces/chain.cpp | |
parent | 3356799ee3f5441b8d6e68b9172eb641011354f8 (diff) |
wallet: Only fail rescan when blocks have actually been pruned
Diffstat (limited to 'src/interfaces/chain.cpp')
-rw-r--r-- | src/interfaces/chain.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/interfaces/chain.cpp b/src/interfaces/chain.cpp index 839af650bb..1a60d4fd09 100644 --- a/src/interfaces/chain.cpp +++ b/src/interfaces/chain.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 The Bitcoin Core developers +// Copyright (c) 2018-2019 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -325,7 +325,11 @@ public: CFeeRate relayMinFee() override { return ::minRelayTxFee; } CFeeRate relayIncrementalFee() override { return ::incrementalRelayFee; } CFeeRate relayDustFee() override { return ::dustRelayFee; } - bool getPruneMode() override { return ::fPruneMode; } + bool havePruned() override + { + LOCK(cs_main); + return ::fHavePruned; + } bool p2pEnabled() override { return g_connman != nullptr; } bool isReadyToBroadcast() override { return !::fImporting && !::fReindex && !IsInitialBlockDownload(); } bool isInitialBlockDownload() override { return IsInitialBlockDownload(); } |