aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorluigi1111 <luigi1111w@gmail.com>2018-07-19 14:11:24 -0500
committerluigi1111 <luigi1111w@gmail.com>2018-07-19 14:11:24 -0500
commit9474567d76c6c4657a9dc380e359742ce09d498c (patch)
tree7fbcc133461dacb053a10bf9c53c552dcf92d712 /src
parentMerge pull request #4075 (diff)
parentblockchain: set the m_verifivation_failed flag in a couple more places (diff)
downloadmonero-9474567d76c6c4657a9dc380e359742ce09d498c.tar.xz
Merge pull request #4076
aa0ea0a blockchain: set the m_verifivation_failed flag in a couple more places (moneromooo-monero)
Diffstat (limited to 'src')
-rw-r--r--src/cryptonote_core/blockchain.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp
index c729f5cc6..a92711208 100644
--- a/src/cryptonote_core/blockchain.cpp
+++ b/src/cryptonote_core/blockchain.cpp
@@ -3363,6 +3363,7 @@ bool Blockchain::handle_block_to_main_chain(const block& bl, const crypto::hash&
if(bl.prev_id != get_tail_id())
{
MERROR_VER("Block with id: " << id << std::endl << "has wrong prev_id: " << bl.prev_id << std::endl << "expected: " << get_tail_id());
+ bvc.m_verifivation_failed = true;
leave:
m_db->block_txn_stop();
return false;
@@ -3664,6 +3665,7 @@ leave:
{
//TODO: figure out the best way to deal with this failure
LOG_ERROR("Error adding block with hash: " << id << " to blockchain, what = " << e.what());
+ bvc.m_verifivation_failed = true;
return_tx_to_pool(txs);
return false;
}