4rkal/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-13 20:06:32 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3609

Browse Source 
08343aba tx_pool: fix loading with colliding key images (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2018-04-12 13:48:44 +02:00
commit a95461e76d
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/cryptonote_core/tx_pool.cpp
View File

@ -1268,24 +1268,33 @@ namespace cryptonote
m_spent_key_images.clear(); m_spent_key_images.clear();
m_txpool_size = 0; m_txpool_size = 0;
std::vector<crypto::hash> remove; std::vector<crypto::hash> remove;
bool r = m_blockchain.for_all_txpool_txes([this, &remove](const crypto::hash &txid, const txpool_tx_meta_t &meta, const cryptonote::blobdata *bd) {
cryptonote::transaction tx; // first add the not kept by block, then the kept by block,
if (!parse_and_validate_tx_from_blob(*bd, tx)) // to avoid rejection due to key image collision
{ for (int pass = 0; pass < 2; ++pass)
MWARNING("Failed to parse tx from txpool, removing"); {
remove.push_back(txid); const bool kept = pass == 1;
} bool r = m_blockchain.for_all_txpool_txes([this, &remove, kept](const crypto::hash &txid, const txpool_tx_meta_t &meta, const cryptonote::blobdata *bd) {
if (!insert_key_images(tx, meta.kept_by_block)) if (!!kept != !!meta.kept_by_block)
{ return true;
MFATAL("Failed to insert key images from txpool tx"); cryptonote::transaction tx;
if (!parse_and_validate_tx_from_blob(*bd, tx))
{
MWARNING("Failed to parse tx from txpool, removing");
remove.push_back(txid);
}
if (!insert_key_images(tx, meta.kept_by_block))
{
MFATAL("Failed to insert key images from txpool tx");
return false;
}
m_txs_by_fee_and_receive_time.emplace(std::pair<double, time_t>(meta.fee / (double)meta.blob_size, meta.receive_time), txid);
m_txpool_size += meta.blob_size;
return true;
}, true);
if (!r)
return false; return false;
} }
m_txs_by_fee_and_receive_time.emplace(std::pair<double, time_t>(meta.fee / (double)meta.blob_size, meta.receive_time), txid);
m_txpool_size += meta.blob_size;
return true;
}, true);
if (!r)
return false;
if (!remove.empty()) if (!remove.empty())
{ {
LockedTXN lock(m_blockchain); LockedTXN lock(m_blockchain);