nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2638

Browse Source 
529a6a4a core: guard against a mined block not finding all txes in the pool (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-10-15 18:58:57 +02:00
commit 344c01c712
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/cryptonote_core/cryptonote_core.cpp
View File

@ -1029,7 +1029,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;
blocks.push_back(get_block_complete_entry(b, m_mempool)); try
{
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);