aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormoneromooo-monero <moneromooo-monero@users.noreply.github.com>2016-03-23 17:01:49 +0000
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2016-03-25 15:11:45 +0000
commit97638b1fb7fde487e4025066874fa3274779eabc (patch)
tree3e6e69f553213bcb090c6b27852fa63f82b9b725
parentMerge pull request #762 (diff)
downloadmonero-97638b1fb7fde487e4025066874fa3274779eabc.tar.xz
core: fix miner tx block reward with fees
-rw-r--r--src/cryptonote_core/cryptonote_format_utils.cpp15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/cryptonote_core/cryptonote_format_utils.cpp b/src/cryptonote_core/cryptonote_format_utils.cpp
index 253e568b5..3c1acd8a9 100644
--- a/src/cryptonote_core/cryptonote_format_utils.cpp
+++ b/src/cryptonote_core/cryptonote_format_utils.cpp
@@ -126,20 +126,19 @@ namespace cryptonote
return false;
}
- // from hard fork 2, we cut out the low significant digits. This makes the tx smaller, and
- // keeps the paid amount almost the same. The unpaid remainder gets pushed back to the
- // emission schedule
- if (hard_fork_version >= 2)
- {
- block_reward = block_reward - block_reward % ::config::BASE_REWARD_CLAMP_THRESHOLD;
- }
-
#if defined(DEBUG_CREATE_BLOCK_TEMPLATE)
LOG_PRINT_L1("Creating block template: reward " << block_reward <<
", fee " << fee)
#endif
block_reward += fee;
+ // from hard fork 2, we cut out the low significant digits. This makes the tx smaller, and
+ // keeps the paid amount almost the same. The unpaid remainder gets pushed back to the
+ // emission schedule
+ if (hard_fork_version >= 2) {
+ block_reward = block_reward - block_reward % ::config::BASE_REWARD_CLAMP_THRESHOLD;
+ }
+
std::vector<uint64_t> out_amounts;
decompose_amount_into_digits(block_reward, hard_fork_version >= 2 ? 0 : ::config::DEFAULT_DUST_THRESHOLD,
[&out_amounts](uint64_t a_chunk) { out_amounts.push_back(a_chunk); },