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

Make m_tip_block an std::optional

Browse source 
This change avoids ambiguity when no tip is connected and it is
compared to uint256::ZERO.
This commit is contained in:
Sjors Provoost 2024-12-17 10:18:36 +07:00
parent b042c4f053
commit e058544d0e
No known key found for this signature in database
GPG key ID: 57FF9BDBCC301009
4 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/node/interfaces.cpp
View file

@ -973,7 +973,9 @@ public:
{
WAIT_LOCK(notifications().m_tip_block_mutex, lock);
notifications().m_tip_block_cv.wait_for(lock, timeout, [&]() EXCLUSIVE_LOCKS_REQUIRED(notifications().m_tip_block_mutex) {
return (notifications().m_tip_block != current_tip && notifications().m_tip_block != uint256::ZERO) || chainman().m_interrupt;
// We need to wait for m_tip_block to be set AND for the value
// to differ from the current_tip value.
return (notifications().m_tip_block && notifications().m_tip_block != current_tip) || chainman().m_interrupt;
});
}
// Must release m_tip_block_mutex before locking cs_main, to avoid deadlocks.