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

Merge pull request #2496

Browse source 
3b8b4be5 tx_pool: drop invalid txes from the pool on startup (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-09-21 12:07:35 +02:00
commit 1f9058187c
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
1 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/cryptonote_core/tx_pool.cpp
View file

@ -1090,12 +1090,13 @@ namespace cryptonote
m_txs_by_fee_and_receive_time.clear(); m_txs_by_fee_and_receive_time.clear();
m_spent_key_images.clear(); m_spent_key_images.clear();
return m_blockchain.for_all_txpool_txes([this](const crypto::hash &txid, const txpool_tx_meta_t &meta, const cryptonote::blobdata *bd) { 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; cryptonote::transaction tx;
if (!parse_and_validate_tx_from_blob(*bd, tx)) if (!parse_and_validate_tx_from_blob(*bd, tx))
{ {
MERROR("Failed to parse tx from txpool"); MWARNING("Failed to parse tx from txpool, removing");
return false; remove.push_back(txid);
} }
if (!insert_key_images(tx, meta.kept_by_block)) if (!insert_key_images(tx, meta.kept_by_block))
{ {
@ -1105,6 +1106,25 @@ namespace cryptonote
m_txs_by_fee_and_receive_time.emplace(std::pair<double, time_t>(meta.fee / (double)meta.blob_size, meta.receive_time), txid); m_txs_by_fee_and_receive_time.emplace(std::pair<double, time_t>(meta.fee / (double)meta.blob_size, meta.receive_time), txid);
return true; return true;
}, true); }, true);
if (!r)
return false;
if (!remove.empty())
{
LockedTXN lock(m_blockchain);
for (const auto &txid: remove)
{
try
{
m_blockchain.remove_txpool_tx(txid);
}
catch (const std::exception &e)
{
MWARNING("Failed to remove corrupt transaction: " << txid);
// ignore error
}
}
}
return true;
} }
//--------------------------------------------------------------------------------- //---------------------------------------------------------------------------------