Skip to content

[29.x] Backports#33474

Merged
fanquake merged 7 commits into
bitcoin:29.xfrom
fanquake:29_2rc2
Oct 3, 2025
Merged

[29.x] Backports#33474
fanquake merged 7 commits into
bitcoin:29.xfrom
fanquake:29_2rc2

Conversation

@fanquake

@fanquake fanquake commented Sep 24, 2025

Copy link
Copy Markdown
Member

The next commit requires an additional mainnet block which changes the difficulty.

Also fix a few minor mistakes in the test (suite):
- rename the create_coinbase retarger_period argument to halving_period. Before bitcoin#31583 this was hardcoded for regtest where these values are the same.
- drop unused fees argument from mine helper

Finally the CPU miner instructions for generating the alternative mainnet chain are expanded.

Github-Pull: bitcoin#33446
Rebased-From: 4c3c1f4
A target field was added to the getblock and getblockheader RPC calls in bitcoin#31583, but it mistakingly always used the tip value.

Because regtest does not have difficulty adjustment, a test is added for mainnet instead.

Github-Pull: bitcoin#33446
Rebased-From: bf7996c
@fanquake fanquake added this to the 29.2 milestone Sep 24, 2025
@DrahtBot

DrahtBot commented Sep 24, 2025

Copy link
Copy Markdown
Contributor

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Code Coverage & Benchmarks

For details see: https://corecheck.dev/bitcoin/bitcoin/pulls/33474.

Reviews

See the guideline for information on the review process.

Type Reviewers
ACK dergoegge, luke-jr, marcofleon

If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.

instagibbs and others added 4 commits October 2, 2025 15:17
Using bypass_limits=true is essentially fuzzing part of a
reorg only, and results in TRUC invariants unable to be
checked. Remove most instances of bypassing limits, leaving
one harness able to do so.

Github-Pull: bitcoin#33504
Rebased-From: bbe8e90
Not enforcing TRUC topology on reorg was the intended
behavior, but the appropriate bypass argument was not
checked.

This mistake means we could potentially invalidate a long
chain of perfectly incentive-compatible transactions that
were made historically, including subsequent non-TRUC
transactions, all of which may have been very high feerate.

Lastly, it wastes CPU cycles doing topology checks since
this behavior cannot actually enforce the topology in
general for the reorg setting.

Github-Pull: bitcoin#33504
Rebased-From: 26e71c2

@dergoegge dergoegge left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 2d7ebd2

@luke-jr

luke-jr commented Oct 3, 2025

Copy link
Copy Markdown
Member

ACK 2d7ebd2

@fanquake fanquake marked this pull request as ready for review October 3, 2025 12:53

@marcofleon marcofleon left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 2d7ebd2

@fanquake fanquake merged commit d1b5d4e into bitcoin:29.x Oct 3, 2025
19 checks passed
@fanquake fanquake deleted the 29_2rc2 branch October 3, 2025 13:28
glozow added a commit that referenced this pull request Oct 3, 2025
d82fc69 doc: update release notes for 29.2rc2 (fanquake)
513cef7 doc: update manual pages for v29.2rc2 (fanquake)
eea16f7 build: bump version to v29.2rc2 (fanquake)
6b3c1db contrib: fix using macdploy script without translations. (amisha)

Pull request description:

  It's been 2 weeks since rc1: https://github.com/bitcoin/bitcoin/releases/tag/v29.2rc1.
  We've backported more changes:
  * #33403
  * #33474
  * #33482

  Lets do `rc2`.

ACKs for top commit:
  davidgumberg:
    reACK d82fc69
  glozow:
    ACK d82fc69
  darosior:
    utACK d82fc69. Changes look good to me, but i have not been through the process of regenerating the doc myself.

Tree-SHA512: c829efe89f86c9c76767ffe60a3779ece902ee9e3c8f6b4203562aaf257019484bfa49916ddfabdcabbd1478368d9b80a3f0a15057778aa1984852ea245283a6
@glozow glozow mentioned this pull request Oct 9, 2025
14 tasks
morozow pushed a commit to morozow/bitcoin_rd that referenced this pull request May 8, 2026
e3820d4 doc: update release notes for 29.x (fanquake)
69c4661 test: add more TRUC reorg coverge (Greg Sanders)
e439ed1 Mempool: Do not enforce TRUC checks on reorg (Greg Sanders)
54377c7 fuzz: don't bypass_limits for most mempool harnesses (Greg Sanders)
cf82bb4 doc: rpc: fix case typo in `finalizepsbt` help (final_scriptwitness) (Sebastian Falbesoner)
ff55cf5 rpc: fix getblock(header) returns target for tip (Sjors Provoost)
b29bbb0 test: add block 2016 to mock mainnet (Sjors Provoost)

Pull request description:

  Backports:
  * bitcoin#33446
  * bitcoin#33484
  * bitcoin#33504

ACKs for top commit:
  luke-jr:
    ACK e3820d4
  dergoegge:
    ACK e3820d4
  marcofleon:
    ACK e3820d4

Tree-SHA512: 27b852177d8502d6c703cb0eeb1e4df9d651c9c8add5fbf6ae4eeb4b8aefc145471f38f9794c0ed276bf7ebba1844ecbaf5a84cb5913ca7d0a546f5216ea3b2d
morozow pushed a commit to morozow/bitcoin_rd that referenced this pull request May 8, 2026
a735fe5 doc: update release notes for 29.2rc2 (fanquake)
69cd3ef doc: update manual pages for v29.2rc2 (fanquake)
f7f8689 build: bump version to v29.2rc2 (fanquake)
ed62c32 contrib: fix using macdploy script without translations. (amisha)

Pull request description:

  It's been 2 weeks since rc1: https://github.com/bitcoin/bitcoin/releases/tag/v29.2rc1.
  We've backported more changes:
  * bitcoin#33403
  * bitcoin#33474
  * bitcoin#33482

  Lets do `rc2`.

ACKs for top commit:
  davidgumberg:
    reACK a735fe5
  glozow:
    ACK a735fe5
  darosior:
    utACK a735fe5. Changes look good to me, but i have not been through the process of regenerating the doc myself.

Tree-SHA512: c829efe89f86c9c76767ffe60a3779ece902ee9e3c8f6b4203562aaf257019484bfa49916ddfabdcabbd1478368d9b80a3f0a15057778aa1984852ea245283a6
ivanlele added a commit to ivanlele/elements that referenced this pull request Jul 14, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants