backport: Merge bitcoin#24434, 23136 #6305
Open
+6
−5
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
|
This pull request has conflicts, please rebase. |
vijaydasmp
force-pushed
the
bp23_2024_10_03
branch
from
8b2d097
to
1c3687d
Compare
vijaydasmp
changed the title
vijaydasmp
force-pushed
the
bp23_2024_10_03
branch
from
1c3687d
to
24d107f
Compare
vijaydasmp
force-pushed
the
bp23_2024_10_03
branch
from
24d107f
to
f09bbcc
Compare
vijaydasmp
changed the title
…nctional test framework b658d7d test: update assert_fee_amount() in test_framework/util.py (Jon Atack) Pull request description: Follow-up to 42e1b5d (bitcoin#12486). - update call to `round()` with our utility function `satoshi_round()` to avoid intermittent test failures - rename `fee_per_kB` to `feerate_BTC_kvB` for precision - store division result in `feerate_BTC_vB` Possibly resolves bitcoin#19418. ACKs for top commit: meshcollider: utACK b658d7d Tree-SHA512: f124ded98c913f98782dc047a85a05d3fdf5f0585041fa81129be562138f6261ec1bd9ee2af89729028277e75b591b0a7ad50244016c2b2fa935c6e400523183
ff33c5a Add missed word to error message (Hennadii Stepanov) Pull request description: Reported by Transifex translator [mmazi](https://www.transifex.com/user/profile/mmazi/). ACKs for top commit: laanwj: ACK ff33c5a Tree-SHA512: 487512956dbaa42a33057362fc438f45ded211493221646b23101784902e75e6d72ef5b5184f175362e0d821a8409badc58abab4e06e86d4934b064dc5bb7050
vijaydasmp
force-pushed
the
bp23_2024_10_03
branch
from
f09bbcc
to
379aefa
Compare
vijaydasmp
changed the title
knst
approved these changes
Nov 25, 2024
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.
bitcoin backports