Merge 85883a9f8e into merged_master (Bitcoin PR #16443)

This commit is contained in:
Andrew Poelstra 2020-11-09 21:20:14 +00:00
commit 028f2d94d1
17 changed files with 247 additions and 100 deletions

View file

@ -232,7 +232,7 @@ public:
bool getUnspentOutput(const COutPoint& output, Coin& coin) override
{
LOCK(::cs_main);
return ::pcoinsTip->GetCoin(output, coin);
return ::ChainstateActive().CoinsTip().GetCoin(output, coin);
}
std::string getWalletDir() override
{