Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-10-01 11:49:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1867

Browse Source 
b54e19d0 protocol: fix wrong tx being looked up from fluffy block (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-03-15 18:21:19 +01:00
commit 2f8e0af7f9
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/cryptonote_protocol/cryptonote_protocol_handler.inl
View File

@ -548,7 +548,16 @@ namespace cryptonote
tx_ids.push_back(tx_hash); tx_ids.push_back(tx_hash);
if (m_core.get_transactions(tx_ids, txes, missing) && missing.empty()) if (m_core.get_transactions(tx_ids, txes, missing) && missing.empty())
{ {
have_tx.push_back(tx_to_blob(tx)); if (txes.size() == 1)
{
have_tx.push_back(tx_to_blob(txes.front()));
}
else
{
MERROR("1 tx requested, none not found, but " << txes.size() << " returned");
m_core.resume_mine();
return 1;
}
} }
else else
{ {