diff options
| author | AwfulCrawler <AwfulCrawler@users.noreply.github.com> | 2016-04-18 13:58:22 +1200 |
|---|---|---|
| committer | AwfulCrawler <AwfulCrawler@users.noreply.github.com> | 2016-04-18 13:58:22 +1200 |
| commit | 2d9dfd082096429b4b1876aff8cb8c76f93b7b10 (patch) | |
| tree | 3665fcb864eabc32a754c7bfddc90a3c672dd598 /src/cryptonote_core/tx_pool.cpp | |
| parent | abea280dd3df0c0f6d67a930eb2ffe5b73255fa9 (diff) | |
| parent | 1c66fe04bcebf50102abe6c96322f0fa5ce740ec (diff) | |
| download | monzero-core-2d9dfd082096429b4b1876aff8cb8c76f93b7b10.tar.gz monzero-core-2d9dfd082096429b4b1876aff8cb8c76f93b7b10.tar.xz monzero-core-2d9dfd082096429b4b1876aff8cb8c76f93b7b10.zip | |
Merge pull request #1 from monero-project/master
Catch up with Monero master
Diffstat (limited to 'src/cryptonote_core/tx_pool.cpp')
| -rw-r--r-- | src/cryptonote_core/tx_pool.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cryptonote_core/tx_pool.cpp b/src/cryptonote_core/tx_pool.cpp index a06826163..3d5ab86e1 100644 --- a/src/cryptonote_core/tx_pool.cpp +++ b/src/cryptonote_core/tx_pool.cpp @@ -512,7 +512,7 @@ namespace cryptonote { if(txd.max_used_block_height >= m_blockchain.get_current_blockchain_height()) 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(txd.last_failed_id == m_blockchain.get_block_id_by_height(txd.last_failed_height)) |