monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-24 20:49:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: guard against a mined block not finding all txes in the pool

Browse source 
This can happen for several reasons, but mainly if another block
was received, which took that tx off the pool.
This commit is contained in:
moneromooo-monero 2017-10-11 13:00:49 +01:00
parent 86e9de588c
commit 529a6a4af8
No known key found for this signature in database
GPG key ID: 686F07454D6CEFC3
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/cryptonote_core/cryptonote_core.cpp
View file

@ -1026,7 +1026,15 @@ namespace cryptonote
block_verification_context bvc = boost::value_initialized<block_verification_context>(); block_verification_context bvc = boost::value_initialized<block_verification_context>();
m_miner.pause(); m_miner.pause();
std::list<block_complete_entry> blocks; std::list<block_complete_entry> blocks;
try
{
blocks.push_back(get_block_complete_entry(b, m_mempool)); blocks.push_back(get_block_complete_entry(b, m_mempool));
}
catch (const std::exception &e)
{
m_miner.resume();
return false;
}
prepare_handle_incoming_blocks(blocks); prepare_handle_incoming_blocks(blocks);
m_blockchain_storage.add_new_block(b, bvc); m_blockchain_storage.add_new_block(b, bvc);
cleanup_handle_incoming_blocks(true); cleanup_handle_incoming_blocks(true);