gitea-mirror/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2026-01-20 00:20:55 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6336

Browse Source 
760ecf2 console_handler: do not let exception past the dor (moneromooo-monero)
09c8111 threadpool: lock mutex in create (moneromooo-monero)
e377977 tx_pool: catch theoretical error in get_block_reward (moneromooo-monero)
This commit is contained in:
luigi1111
2020-03-31 15:14:12 -05:00
parent 94f44d4ee3 e3779775d7
commit 6c7d928f19
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/cryptonote_core/tx_pool.cpp
View File

@@ -1283,7 +1283,11 @@ namespace cryptonote
fee = 0;
//baseline empty block
get_block_reward(median_weight, total_weight, already_generated_coins, best_coinbase, version);
if (!get_block_reward(median_weight, total_weight, already_generated_coins, best_coinbase, version))
{
MERROR("Failed to get block reward for empty block");
return false;
}
size_t max_total_weight_pre_v5 = (130 * median_weight) / 100 - CRYPTONOTE_COINBASE_BLOB_RESERVED_SIZE;