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

Merge pull request #796

Browse Source 
d817aec tx_pool: ensure no txes that fail check_inputs get in the block template (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2016-04-14 16:20:17 +09:00
commit da277e17b5
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cryptonote_core/tx_pool.cpp
View File

@ -512,7 +512,7 @@ namespace cryptonote
{ {
if(txd.max_used_block_height >= m_blockchain.get_current_blockchain_height()) if(txd.max_used_block_height >= m_blockchain.get_current_blockchain_height())
return false; return false;
if(m_blockchain.get_block_id_by_height(txd.max_used_block_height) != txd.max_used_block_id) if(true)
{ {
//if we already failed on this height and id, skip actual ring signature check //if we already failed on this height and id, skip actual ring signature check
if(txd.last_failed_id == m_blockchain.get_block_id_by_height(txd.last_failed_height)) if(txd.last_failed_id == m_blockchain.get_block_id_by_height(txd.last_failed_height))