fix: estimated hashrate calculation is incorrect #3996
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…fix-estimated-hashrate
mrnaveira
changed the title
| uint64 height = 3; | ||
| uint64 timestamp = 4; | ||
| uint64 pow_algo = 5; | ||
| uint64 sha3_estimated_hash_rate = 3; |
There was a problem hiding this comment.
Rather add these fields at the end. numbers in protobuf should not change.
Suggested change
| uint64 sha3_estimated_hash_rate = 3; | |
| uint64 sha3_estimated_hash_rate = 6; | |
| uint64 height =3; |
|
|
||
| /// The number of past blocks to be used on moving averages for (smooth) estimated hashrate | ||
| /// The hash rate is calculated as the difficulty divided by the target block time | ||
| const SHA3_HASH_RATE_MOVING_AVERAGE_WINDOW: usize = 12; |
There was a problem hiding this comment.
Need a comment here for why these values are different
| /// Adds a new hash rate entry in the moving average and recalculates the average | ||
| pub fn add(&mut self, height: u64, difficulty: Difficulty) { | ||
| // target block time for the current block is provided by the consensus rules | ||
| let target_time = self |
| sum / count | ||
| } | ||
|
|
||
| pub fn get_average(&self) -> u64 { |
There was a problem hiding this comment.
Suggested change
| pub fn get_average(&self) -> u64 { | |
| pub fn average(&self) -> u64 { |
…/tari into fix-estimated-hashrate
|
Implemented all suggested changes |
stringhandler
approved these changes
Apr 4, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
estimated_hash_ratefield but now it corresponds to the sum of the sha3 and monero hash rates, so existing clients (i.e. web explorer) will not breakMotivation and Context
The current hash rate calculation is incorrect, we want to use a separated moving average for each PoW algo independently
How Has This Been Tested?
Unit testing for the moving average hash rate calculation