Merge pull request #748

cc4b19c blockchain: fix partial block reward detection (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2016-03-25 08:20:56 +02:00
commit cb6be986c3
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD

View File

@ -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 // 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. // emission. This modifies the emission curve very slightly.
CHECK_AND_ASSERT_MES(money_in_use - fee <= base_reward, false, "base reward calculation bug"); 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) if(base_reward + fee != money_in_use)
partial_block_reward = true; partial_block_reward = true;
base_reward = money_in_use - fee;
} }
return true; return true;
} }