Skip to content

backport: Merge bitcoin#23813, 27297, 27647, 28015#7365

Draft
vijaydasmp wants to merge 4 commits into
dashpay:developfrom
vijaydasmp:June_2026_6
Draft

backport: Merge bitcoin#23813, 27297, 27647, 28015#7365
vijaydasmp wants to merge 4 commits into
dashpay:developfrom
vijaydasmp:June_2026_6

Conversation

@vijaydasmp

@vijaydasmp vijaydasmp commented Jun 14, 2026

Copy link
Copy Markdown

bitcoin back ports

fanquake added 2 commits June 14, 2026 21:18
fe329dc test: Add test for getblockfrompeer on pruned nodes (Fabian Jahr)
cd761e6 rpc: Add note on guarantees to getblockfrompeer (Fabian Jahr)

Pull request description:

  These are additions to `getblockfrompeer` that I already [suggested on the original PR](bitcoin#20295 (review)).

  The two commits do the following:
  1. Add a test for `getblockfrompeer` usage on pruned nodes. This is important because many use-cases for `getblockfrompeer` are in a context of a pruned node.
  2. Add some information on how long the users of pruned nodes can expect the block to be available after they have used the RPC. I think the behavior is not very intuitive for users and I would not be surprised if users expect the block to be available indefinitely.

ACKs for top commit:
  Sjors:
    re-utACK fe329dc
  MarcoFalke:
    review ACK fe329dc 🍉
  stratospher:
    ACK  fe329dc.
  brunoerg:
    re-ACK fe329dc

Tree-SHA512: a686bd8955d9c3baf365db384e497d6ee1aa9ce2fdb0733fe6150f7e3d94bae19d55bc1b347f1c9f619e749e18b41a52b9f8c0aa2042dd311a968a4b5d251fac
fae3490 test: Remove unused Check* default constructors (MarcoFalke)

Pull request description:

  They are no longer needed after the removal of `swap`, see bitcoin#26749 (comment)

  Also, flatten a redundant `if` check.

ACKs for top commit:
  hebasto:
    ACK fae3490

Tree-SHA512: c0bc0c16b5df0f16fc25e18d2414a2a3c4769da1aa30d53f8d267bc2e97dd79a0296db94c1e49cd1ca89bd42275d8c462f7bf47f03f105dfe867ebea6563454b
@github-actions

github-actions Bot commented Jun 14, 2026

Copy link
Copy Markdown

✅ No Merge Conflicts Detected

This PR currently has no conflicts with other open PRs.

fanquake added 2 commits June 15, 2026 01:02
fa1e27f fuzz: Generate rpc fuzz targets individually (MarcoFalke)

Pull request description:

  The `rpc` fuzz target was added more than two years ago in e458631. However, the bug bitcoin#27913 was only found recently. Thus, it is pretty clear that fuzz engines can't deal with a search space that is too broad and can be extended in too many directions.

  Fix that by limiting the search space to each RPC method name and then iterate over all names, instead of letting the fuzz engine do the iteration.

  With this, the bug can be found in seconds, as opposed to years of CPU time (or never).

ACKs for top commit:
  brunoerg:
    ACK fa1e27f
  dergoegge:
    ACK fa1e27f

Tree-SHA512: 45ccba842367650d010320603153276b1b303deda9ba8c6bb31a4d2473b00aa5bca866db95f541485d65efd8276e2575026968c037872ef344fa33cf45bcdcd7
…wap functions

95ad70a test: Default initialize `should_freeze` to `true` (Hennadii Stepanov)
cea5052 refactor: Drop no longer used `swap` member functions (Hennadii Stepanov)
a87fb6b clang-tidy: Fix modernize-use-default-member-init in `CScriptCheck` (Hennadii Stepanov)
b4bed5c refactor: Drop no longer used `CScriptCheck()` default constructor (Hennadii Stepanov)
d8427cc refactor: Use move semantics in `CCheckQueue::Loop` (Hennadii Stepanov)
9a0b524 clang-tidy, test: Fix bugprone-use-after-move in `Correct_Queue_range()` (Hennadii Stepanov)
04831fe refactor: Make move semantics explicit for callers (Hennadii Stepanov)
6c2d597 refactor: Use move semantics in `CCheckQueue::Add` (Hennadii Stepanov)
0682003 test, refactor: Avoid `CScriptCheck::swap` in `transaction_tests` (Hennadii Stepanov)
15209d9 consensus, refactor: Avoid `CScriptCheck::swap` in `CheckInputScripts` (Hennadii Stepanov)

Pull request description:

  This PR makes code more succinct and readable by using move semantics.

ACKs for top commit:
  martinus:
    re-ACK 95ad70a
  achow101:
    ACK 95ad70a
  TheCharlatan:
    re-ACK bitcoin@95ad70a
  MarcoFalke:
    re-ACK 95ad70a 🚥

Tree-SHA512: adda760891b12d252dc9b823fe7c41eed660364b6fb1a69f17607d7a31eb0bbb82a80d154a7acfaa241b5de37d42a293c2b6e059f26a8e92d88d3a87c99768fb
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