monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-11-18 10:01:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3308

Browse source 
6f8779d2 blockchain: fix random sync failures (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2018-03-05 19:12:05 +02:00
commit abcdb7b5c4
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/cryptonote_core/blockchain.cpp
View file

@ -3564,6 +3564,7 @@ bool Blockchain::add_new_block(const block& bl_, block_verification_context& bvc
LOG_PRINT_L3("block with id = " << id << " already exists"); LOG_PRINT_L3("block with id = " << id << " already exists");
bvc.m_already_exists = true; bvc.m_already_exists = true;
m_db->block_txn_stop(); m_db->block_txn_stop();
m_blocks_txs_check.clear();
return false; return false;
} }
@ -3573,7 +3574,9 @@ bool Blockchain::add_new_block(const block& bl_, block_verification_context& bvc
//chain switching or wrong block //chain switching or wrong block
bvc.m_added_to_main_chain = false; bvc.m_added_to_main_chain = false;
m_db->block_txn_stop(); m_db->block_txn_stop();
return handle_alternative_block(bl, id, bvc); bool r = handle_alternative_block(bl, id, bvc);
m_blocks_txs_check.clear();
return r;
//never relay alternative blocks //never relay alternative blocks
} }