nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tx_pool: use new filling algorithm from v5 only

Browse Source
This commit is contained in:
moneromooo-monero 2017-03-20 18:01:46 +00:00
parent 5b7c6ced80
commit 266492e919
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
1 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/cryptonote_core/tx_pool.cpp
View File

@ -614,7 +614,7 @@ namespace cryptonote
CRITICAL_REGION_LOCAL(m_transactions_lock); CRITICAL_REGION_LOCAL(m_transactions_lock);
uint64_t best_coinbase = 0; uint64_t best_coinbase = 0, coinbase;
total_size = 0; total_size = 0;
fee = 0; fee = 0;
@ -622,11 +622,9 @@ namespace cryptonote
get_block_reward(median_size, total_size, already_generated_coins, best_coinbase, version); get_block_reward(median_size, total_size, already_generated_coins, best_coinbase, version);
#if 1 size_t max_total_size_pre_v5 = (130 * median_size) / 100 - CRYPTONOTE_COINBASE_BLOB_RESERVED_SIZE;
size_t max_total_size = (130 * median_size) / 100 - CRYPTONOTE_COINBASE_BLOB_RESERVED_SIZE; size_t max_total_size_v5 = 2 * median_size - CRYPTONOTE_COINBASE_BLOB_RESERVED_SIZE;
#else size_t max_total_size = version >= 5 ? max_total_size_v5 : max_total_size_pre_v5;
size_t max_total_size = 2 * median_size - CRYPTONOTE_COINBASE_BLOB_RESERVED_SIZE;
#endif
std::unordered_set<crypto::key_image> k_images; std::unordered_set<crypto::key_image> k_images;
LOG_PRINT_L2("Filling block template, median size " << median_size << ", " << m_txs_by_fee_and_receive_time.size() << " txes in the pool"); LOG_PRINT_L2("Filling block template, median size " << median_size << ", " << m_txs_by_fee_and_receive_time.size() << " txes in the pool");
@ -644,21 +642,35 @@ namespace cryptonote
continue; continue;
} }
// If we're getting lower coinbase tx, // start using the optimal filling algorithm from v5
// stop including more tx if (version >= 5)
uint64_t block_reward;
if(!get_block_reward(median_size, total_size + tx_it->second.blob_size, already_generated_coins, block_reward, version))
{ {
LOG_PRINT_L2(" would exceed maximum block size"); // If we're getting lower coinbase tx,
sorted_it++; // stop including more tx
continue; uint64_t block_reward;
if(!get_block_reward(median_size, total_size + tx_it->second.blob_size, already_generated_coins, block_reward, version))
{
LOG_PRINT_L2(" would exceed maximum block size");
sorted_it++;
continue;
}
coinbase = block_reward + fee + tx_it->second.fee;
if (coinbase < template_accept_threshold(best_coinbase))
{
LOG_PRINT_L2(" would decrease coinbase to " << print_money(coinbase));
sorted_it++;
continue;
}
} }
uint64_t coinbase = block_reward + fee + tx_it->second.fee; else
if (coinbase < template_accept_threshold(best_coinbase))
{ {
LOG_PRINT_L2(" would decrease coinbase to " << print_money(coinbase)); // If we've exceeded the penalty free size,
sorted_it++; // stop including more tx
continue; if (total_size > median_size)
{
LOG_PRINT_L2(" would exceed median block size");
break;
}
} }
// Skip transactions that are not ready to be // Skip transactions that are not ready to be
@ -680,9 +692,7 @@ namespace cryptonote
bl.tx_hashes.push_back(tx_it->first); bl.tx_hashes.push_back(tx_it->first);
total_size += tx_it->second.blob_size; total_size += tx_it->second.blob_size;
fee += tx_it->second.fee; fee += tx_it->second.fee;
#if 0
best_coinbase = coinbase; best_coinbase = coinbase;
#endif
append_key_images(k_images, tx_it->second.tx); append_key_images(k_images, tx_it->second.tx);
sorted_it++; 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));