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

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

Commits on Nov 24, 2024

  1. Merge bitcoin#23136: test: update fee rate assertion helper in the fu…

    …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
    MarcoFalke authored and vijaydasmp committed Nov 24, 2024
    Configuration menu
    Copy the full SHA
    5187ec0 View commit details
    Browse the repository at this point in the history
  2. Merge bitcoin#24434: Add missed word to error message

    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
    laanwj authored and vijaydasmp committed Nov 24, 2024
    Configuration menu
    Copy the full SHA
    379aefa View commit details
    Browse the repository at this point in the history