Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-05-02 12:46:06 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5966

Browse source 
be82c40 Support median block size > 4 GB (moneromooo-monero)
This commit is contained in:
luigi1111 2019-10-22 10:08:32 -05:00
commit 84ce43a239
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
6 changed files with 174 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/cryptonote_basic/cryptonote_basic_impl.cpp
View file

@ -110,9 +110,6 @@ namespace cryptonote {
return false;
}
assert(median_weight < std::numeric_limits<uint32_t>::max());
assert(current_block_weight < std::numeric_limits<uint32_t>::max());
uint64_t product_hi;
// BUGFIX: 32-bit saturation bug (e.g. ARM7), the result was being
// treated as 32-bit by default.
@ -122,8 +119,8 @@ namespace cryptonote {
uint64_t reward_hi;
uint64_t reward_lo;
div128_32(product_hi, product_lo, static_cast<uint32_t>(median_weight), &reward_hi, &reward_lo);
div128_32(reward_hi, reward_lo, static_cast<uint32_t>(median_weight), &reward_hi, &reward_lo);
div128_64(product_hi, product_lo, median_weight, &reward_hi, &reward_lo, NULL, NULL);
div128_64(reward_hi, reward_lo, median_weight, &reward_hi, &reward_lo, NULL, NULL);
assert(0 == reward_hi);
assert(reward_lo < base_reward);