GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-17 13:07:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge b2a6b02161 into merged_master (Bitcoin PR #15948)

Browse source
This commit is contained in:
Andrew Poelstra 2020-10-29 02:34:48 +00:00
commit c91184f6c2
28 changed files with 312 additions and 309 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/interfaces/node.cpp
View file

@ -178,13 +178,13 @@ public:
int getNumBlocks() override
{
LOCK(::cs_main);
return ::chainActive.Height();
return ::ChainActive().Height();
}
int64_t getLastBlockTime() override
{
LOCK(::cs_main);
if (::chainActive.Tip()) {
return ::chainActive.Tip()->GetBlockTime();
if (::ChainActive().Tip()) {
return ::ChainActive().Tip()->GetBlockTime();
}
return Params().GenesisBlock().GetBlockTime(); // Genesis block's time of current network
}
@ -193,7 +193,7 @@ public:
const CBlockIndex* tip;
{
LOCK(::cs_main);
tip = ::chainActive.Tip();
tip = ::ChainActive().Tip();
}
return GuessVerificationProgress(tip, Params().GetConsensus().nPowTargetSpacing);
}