change(mempool): Refactor the ZIP-317 minimum fee rate calculation to use usize #6585
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
teor2345
added
C-cleanup
teor2345
commented
Apr 27, 2023
Comment on lines
+214
to
+215
| let min_fee = (MIN_MEMPOOL_TX_FEE_RATE * transaction_size / KILOBYTE) | ||
| .clamp(MIN_MEMPOOL_TX_FEE_RATE, MEMPOOL_TX_FEE_REQUIREMENT_CAP); |
There was a problem hiding this comment.
It seemed easier to do this calculation in usize then convert to Amount, which is what zcashd does.
Otherwise every calculation has to be checked for overflow, even though we clamp to [100, 1000] at the end anyway.
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## issue5336 #6585 +/- ##
=============================================
+ Coverage 77.90% 77.99% +0.09%
=============================================
Files 308 308
Lines 40583 40594 +11
=============================================
+ Hits 31615 31662 +47
+ Misses 8968 8932 -36 |
mergify bot
pushed a commit
that referenced
this pull request
May 2, 2023
* add ZIP-317 rules to mempool * fix some docs * rustfmt * fix import * typo * fix tests * fix tests 2 * fix tests 3 * fix tests 4 * fix tests 5 * move constant * fix constant for feature * document/quote zip rules * add Minimum Fee Rate rule * change(mempool): Refactor the ZIP-317 minimum fee rate calculation to use usize (#6585) * Refactor the minimum fee rate calculation to use usize * Check for overflow if constants change * remove 1 rule check, fix docs --------- Co-authored-by: teor <teor@riseup.net>
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.
Motivation
@oxarbitrage asked for some help refactoring this.
Specifications
See the links in the code.
Solution
zcashdcode, but make it simplerusizefor all the calculationsThis might break the tests, I'll let you update them all at once in whatever way you'd like, to avoid merge issues.
Review
Alfredo asked for this PR.
Feel free to merge or copy-paste.