diff options
| author | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2019-10-27 19:14:14 +0000 |
|---|---|---|
| committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2019-10-27 19:23:36 +0000 |
| commit | 86ac20f64ef64e4cadf6ceb2914f7342747cbabc (patch) | |
| tree | 9d4ef8c83e91c0ed010ad02c8c493dea217cd1b2 | |
| parent | Merge pull request #6033 (diff) | |
| download | monero-86ac20f64ef64e4cadf6ceb2914f7342747cbabc.tar.xz | |
blockchain: fix unwanted error when probing the pool for a tx
Diffstat (limited to '')
| -rw-r--r-- | src/cryptonote_core/blockchain.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index b7e9f4ca2..b13ecbbf1 100644 --- a/src/cryptonote_core/blockchain.cpp +++ b/src/cryptonote_core/blockchain.cpp @@ -1765,9 +1765,18 @@ bool Blockchain::handle_alternative_block(const block& b, const crypto::hash& id { cryptonote::tx_memory_pool::tx_details td; cryptonote::blobdata blob; - if (m_tx_pool.get_transaction_info(txid, td)) + if (m_tx_pool.have_tx(txid)) { - bei.block_cumulative_weight += td.weight; + if (m_tx_pool.get_transaction_info(txid, td)) + { + bei.block_cumulative_weight += td.weight; + } + else + { + MERROR_VER("Transaction is in the txpool, but metadata not found"); + bvc.m_verifivation_failed = true; + return false; + } } else if (m_db->get_pruned_tx_blob(txid, blob)) { |