GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-14 12:43:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge 8edfc1715a into merged_master (Bitcoin PR #19204)

Browse source
This commit is contained in:
Andrew Poelstra 2020-11-26 01:09:15 +00:00
commit a4f01a718d
6 changed files with 60 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/validation.cpp
View file

@ -5587,10 +5587,10 @@ CChainState& ChainstateManager::InitializeChainstate(const uint256& snapshot_blo
return *to_modify;
}
CChain& ChainstateManager::ActiveChain() const
CChainState& ChainstateManager::ActiveChainstate() const
{
assert(m_active_chainstate);
return m_active_chainstate->m_chain;
return *m_active_chainstate;
}
bool ChainstateManager::IsSnapshotActive() const