Skip to content

backport: Merge bitcoin#29434, 29459#7406

Draft
vijaydasmp wants to merge 3 commits into
dashpay:developfrom
vijaydasmp:July_2026_6
Draft

backport: Merge bitcoin#29434, 29459#7406
vijaydasmp wants to merge 3 commits into
dashpay:developfrom
vijaydasmp:July_2026_6

Conversation

@vijaydasmp

@vijaydasmp vijaydasmp commented Jul 4, 2026

Copy link
Copy Markdown

bitcoin back ports

@github-actions

github-actions Bot commented Jul 4, 2026

Copy link
Copy Markdown

⚠️ Potential Merge Conflicts Detected

This PR has potential conflicts with the following open PRs:

Please coordinate with the authors of these PRs to avoid merge conflicts.

@vijaydasmp vijaydasmp changed the title backport : Merge bitcoin#31718, 28825, 27302, 29034 backport: Merge bitcoin#31718, 28825, 27302, 29034 Jul 4, 2026
@vijaydasmp vijaydasmp closed this Jul 4, 2026
@vijaydasmp vijaydasmp reopened this Jul 4, 2026
achow101 and others added 2 commits July 4, 2026 18:51
…rates

dddd7be doc: Clarify maxfeerate help (MarcoFalke)
fa2a4fd rpc: Fixed signed integer overflow for large feerates (MarcoFalke)
fade94d rpc: Add ParseFeeRate helper (MarcoFalke)
fa0ff66 rpc: Implement RPCHelpMan::ArgValue<> for UniValue (MarcoFalke)

Pull request description:

  Passing large BTC/kvB feerates to RPCs is problematic, because:

  * They are likely a typo. 1BTC/kvB (or larger) seems absurd.
  * They may cause signed integer overflow.
  * Anyone really wanting to pick such a large value can set `0` to disable the check.

  Fix all issues by rejecting anything more than 1BTC/kvB during parsing.

ACKs for top commit:
  brunoerg:
    crACK dddd7be
  achow101:
    ACK dddd7be
  vasild:
    ACK dddd7be
  tdb3:
    Code review ACK and basic test ACK for dddd7be.
  fjahr:
    utACK dddd7be

Tree-SHA512: 5dcce1f0abe059dc6b2ff56787e11081d73a45b4ddd6dcc2c1ea13709ebc13af5e7265e84fffb97ef32027b56b81955672a67ed7702e8fa30c2e849d67727bac
bf264e0 test: check_mempool_result negative feerate (kevkevin)

Pull request description:

  Adds test coverage in `mempool_accept.py` to check if a negative `maxfeerate` is input into `check_mempool_result`
  Asserts "Amount out of range" error message and `-3` error code

  Motivated by this [comment](https://github.com/bitcoin/bitcoin/pull/29434/files#r1491112250)

ACKs for top commit:
  maflcko:
    lgtm ACK bf264e0
  brunoerg:
    nice, utACK bf264e0
  davidgumberg:
    Looks great, ACK bitcoin@bf264e0

Tree-SHA512: 58931b774cc887c616f2fd91af3ee65cc5db55acd8e2875c76de448c80bd4e020b057c5f4f85556431377f0d0e7553771fb285d1ec20cf64f64ec92a47776b78
@vijaydasmp vijaydasmp changed the title backport: Merge bitcoin#31718, 28825, 27302, 29034 backport: Merge bitcoin#29434, 29459 Jul 4, 2026
1c4b9cb bench: add readblock benchmark (Andrew Toth)

Pull request description:

  Requested in bitcoin#13151 (comment).
  See bitcoin#26415 and bitcoin#21319.

  Benchmarking shows a >50x increase in speed on both nvme and spinning disk.

  Benchmark results:
  |               ns/op |                op/s |    err% |          ins/op |          cyc/op |    IPC |         bra/op |   miss% |     total | benchmark
  |--------------------:|--------------------:|--------:|----------------:|----------------:|-------:|---------------:|--------:|----------:|:----------
  |        5,377,375.00 |              185.96 |    0.2% |   60,125,513.00 |   11,633,676.00 |  5.168 |   3,588,800.00 |    0.4% |      0.09 | `ReadBlockFromDiskTest`

  |               ns/op |                op/s |    err% |          ins/op |          cyc/op |    IPC |         bra/op |   miss% |     total | benchmark
  |--------------------:|--------------------:|--------:|----------------:|----------------:|-------:|---------------:|--------:|----------:|:----------
  |           89,945.58 |           11,117.83 |    0.7% |       12,743.90 |       64,530.33 |  0.197 |       2,595.20 |    0.2% |      0.01 | `ReadRawBlockFromDiskTest`

ACKs for top commit:
  maflcko:
    lgtm ACK 1c4b9cb
  achow101:
    ACK 1c4b9cb
  TheCharlatan:
    ACK 1c4b9cb

Tree-SHA512: 71dbcd6c7e2be97eb3001e35d0a95ef8e0c9b10dc9193025c7f8e11a09017fa2fbf89489b686353cd88fb409fb729fe2c4a25c567d2988f64c9c164ab09fba9f
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.

3 participants