monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-11-18 00:37:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4276

Browse source 
48a7bc4 tx_pool: fix infinite loop when failing to find a meta record (moneromooo-monero)
This commit is contained in:
luigi1111 2018-09-04 13:25:44 -05:00
commit 03738fdde1
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
1 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/cryptonote_core/tx_pool.cpp
View file

@ -1154,7 +1154,7 @@ namespace cryptonote
LockedTXN lock(m_blockchain); LockedTXN lock(m_blockchain);
auto sorted_it = m_txs_by_fee_and_receive_time.begin(); auto sorted_it = m_txs_by_fee_and_receive_time.begin();
while (sorted_it != m_txs_by_fee_and_receive_time.end()) for (; sorted_it != m_txs_by_fee_and_receive_time.end(); ++sorted_it)
{ {
txpool_tx_meta_t meta; txpool_tx_meta_t meta;
if (!m_blockchain.get_txpool_tx_meta(sorted_it->second, meta)) if (!m_blockchain.get_txpool_tx_meta(sorted_it->second, meta))
@ -1168,7 +1168,6 @@ namespace cryptonote
if (max_total_size < total_size + meta.blob_size) if (max_total_size < total_size + meta.blob_size)
{ {
LOG_PRINT_L2(" would exceed maximum block size"); LOG_PRINT_L2(" would exceed maximum block size");
sorted_it++;
continue; continue;
} }
@ -1181,14 +1180,12 @@ namespace cryptonote
if(!get_block_reward(median_size, total_size + meta.blob_size, already_generated_coins, block_reward, version)) if(!get_block_reward(median_size, total_size + meta.blob_size, already_generated_coins, block_reward, version))
{ {
LOG_PRINT_L2(" would exceed maximum block size"); LOG_PRINT_L2(" would exceed maximum block size");
sorted_it++;
continue; continue;
} }
coinbase = block_reward + fee + meta.fee; coinbase = block_reward + fee + meta.fee;
if (coinbase < template_accept_threshold(best_coinbase)) if (coinbase < template_accept_threshold(best_coinbase))
{ {
LOG_PRINT_L2(" would decrease coinbase to " << print_money(coinbase)); LOG_PRINT_L2(" would decrease coinbase to " << print_money(coinbase));
sorted_it++;
continue; continue;
} }
} }
@ -1235,13 +1232,11 @@ namespace cryptonote
if (!ready) if (!ready)
{ {
LOG_PRINT_L2(" not ready to go"); LOG_PRINT_L2(" not ready to go");
sorted_it++;
continue; continue;
} }
if (have_key_images(k_images, tx)) if (have_key_images(k_images, tx))
{ {
LOG_PRINT_L2(" key images already seen"); LOG_PRINT_L2(" key images already seen");
sorted_it++;
continue; continue;
} }
@ -1250,7 +1245,6 @@ namespace cryptonote
fee += meta.fee; fee += meta.fee;
best_coinbase = coinbase; best_coinbase = coinbase;
append_key_images(k_images, tx); append_key_images(k_images, tx);
sorted_it++;
LOG_PRINT_L2(" added, new block size " << total_size << "/" << max_total_size << ", coinbase " << print_money(best_coinbase)); LOG_PRINT_L2(" added, new block size " << total_size << "/" << max_total_size << ", coinbase " << print_money(best_coinbase));
} }