aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2016-03-25 08:20:56 +0200
committerRiccardo Spagni <ric@spagni.net>2016-03-25 08:20:56 +0200
commitcb6be986c36b78eddb4b7f16e9ad440af8567dc4 (patch)
tree177959a9f6c7ee62a0aec0e128baa4b1ac9711a9 /src
parentMerge pull request #746 (diff)
parentblockchain: fix partial block reward detection (diff)
downloadmonero-cb6be986c36b78eddb4b7f16e9ad440af8567dc4.tar.xz
Merge pull request #748
cc4b19c blockchain: fix partial block reward detection (moneromooo-monero)
Diffstat (limited to 'src')
-rw-r--r--src/cryptonote_core/blockchain.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp
index 00bae3741..131f56a4d 100644
--- a/src/cryptonote_core/blockchain.cpp
+++ b/src/cryptonote_core/blockchain.cpp
@@ -984,9 +984,9 @@ bool Blockchain::validate_miner_transaction(const block& b, size_t cumulative_bl
// to show the amount of coins that were actually generated, the remainder will be pushed back for later
// emission. This modifies the emission curve very slightly.
CHECK_AND_ASSERT_MES(money_in_use - fee <= base_reward, false, "base reward calculation bug");
- base_reward = money_in_use - fee;
if(base_reward + fee != money_in_use)
partial_block_reward = true;
+ base_reward = money_in_use - fee;
}
return true;
}