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 8c0bd871fc into merged_master (Bitcoin PR bitcoin/bitcoin#23785)

Browse source
This commit is contained in:
Byron Hambly 2023-06-13 14:30:53 +00:00
commit 413786c613
5 changed files with 78 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/node/interfaces.cpp
View file

@ -494,8 +494,8 @@ public:
std::optional<int> findLocatorFork(const CBlockLocator& locator) override
{
LOCK(cs_main);
const CChain& active = Assert(m_node.chainman)->ActiveChain();
if (CBlockIndex* fork = m_node.chainman->m_blockman.FindForkInGlobalIndex(active, locator)) {
const CChainState& active = Assert(m_node.chainman)->ActiveChainstate();
if (CBlockIndex* fork = active.FindForkInGlobalIndex(locator)) {
return fork->nHeight;
}
return std::nullopt;