Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

blockchain: do not try to add a tx the pool when it was nor taken out 

This is an unintended difference from the old code. Though I don't
think it can actually happen in practice with the current take_tx
implementation.
This commit is contained in:
moneromooo-monero 2015-08-15 18:42:29 +01:00
parent 769d5ef0e6
commit 3f9089a767
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
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

@ -2365,6 +2365,7 @@ bool Blockchain::handle_block_to_main_chain(const block& bl, const crypto::hash&
uint64_t t_pool = 0;
uint64_t t_dblspnd = 0;
uint64_t t_cc;
bool add_tx_to_pool = false;
TIME_MEASURE_FINISH(t3);
int tx_index = 0;
@ -2430,6 +2431,7 @@ bool Blockchain::handle_block_to_main_chain(const block& bl, const crypto::hash&
add_block_as_invalid(bl, id);
LOG_PRINT_L1("Block with id " << id << " added as invalid because of wrong inputs in transactions");
bvc.m_verifivation_failed = true;
add_tx_to_pool = true;
break;
}
}
@ -2445,6 +2447,7 @@ bool Blockchain::handle_block_to_main_chain(const block& bl, const crypto::hash&
add_block_as_invalid(bl, id);
LOG_PRINT_L1("Block with id " << id << " added as invalid because of wrong inputs in transactions");
bvc.m_verifivation_failed = true;
add_tx_to_pool = true;
break;
}
}
@ -2503,7 +2506,7 @@ bool Blockchain::handle_block_to_main_chain(const block& bl, const crypto::hash&
// if we failed for any reason to verify the block, return taken
// transactions to the tx_pool.
if (bvc.m_verifivation_failed || !add_success)
if ((bvc.m_verifivation_failed && add_tx_to_pool) || !add_success)
{
// return taken transactions to transaction pool
for (auto& tx : txs)