Merge fecc1be231 into merged_master (Bitcoin PR #16884)

This commit is contained in:
Andrew Poelstra 2020-11-09 21:20:33 +00:00
commit 1b3ae6c58b
15 changed files with 25 additions and 30 deletions

View file

@ -201,7 +201,6 @@ public:
return GuessVerificationProgress(tip, Params().GetConsensus().nPowTargetSpacing);
}
bool isInitialBlockDownload() override { return ::ChainstateActive().IsInitialBlockDownload(); }
bool isAddressTypeSet() override { return !::gArgs.GetArg("-addresstype", "").empty(); }
bool getReindex() override { return ::fReindex; }
bool getImporting() override { return ::fImporting; }
void setNetworkActive(bool active) override