monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-23 03:59:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #6045

Browse source 
86ac20f blockchain: fix unwanted error when probing the pool for a tx (moneromooo-monero)
This commit is contained in:
luigi1111 2019-10-27 16:26:25 -05:00
commit bb04201505
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/cryptonote_core/blockchain.cpp
View file

@ -1765,10 +1765,19 @@ bool Blockchain::handle_alternative_block(const block& b, const crypto::hash& id
{ {
cryptonote::tx_memory_pool::tx_details td; cryptonote::tx_memory_pool::tx_details td;
cryptonote::blobdata blob; cryptonote::blobdata blob;
if (m_tx_pool.have_tx(txid))
{
if (m_tx_pool.get_transaction_info(txid, td)) if (m_tx_pool.get_transaction_info(txid, td))
{ {
bei.block_cumulative_weight += td.weight; 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)) else if (m_db->get_pruned_tx_blob(txid, blob))
{ {
cryptonote::transaction tx; cryptonote::transaction tx;