Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

backport: Merge bitcoin#24434, 23136 #6305

Draft
wants to merge 2 commits into
base: develop
Choose a base branch
from

Conversation

vijaydasmp
Copy link

@vijaydasmp vijaydasmp commented Oct 4, 2024

bitcoin backports

Copy link

github-actions bot commented Oct 5, 2024

This pull request has conflicts, please rebase.

@vijaydasmp vijaydasmp changed the title backport : Merge bitcoin#23750, 23496, 24434, 23136, 23725 backport: Merge bitcoin#23750, 23496, 24434, 23136, 23725 Oct 17, 2024
@vijaydasmp vijaydasmp changed the title backport: Merge bitcoin#23750, 23496, 24434, 23136, 23725 backport: Merge bitcoin#24434, 23136, 23725 Nov 24, 2024
MarcoFalke and others added 2 commits November 24, 2024 20:31
…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 vijaydasmp changed the title backport: Merge bitcoin#24434, 23136, 23725 backport: Merge bitcoin#24434, 23136 Nov 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants