Skip to content

[pull] master from bitcoin:master - #1875

Merged
pull[bot] merged 7 commits into
All-Blockchains:masterfrom
bitcoin:master
Sep 25, 2026
Merged

pull[bot] merged 7 commits into
All-Blockchains:masterfrom
bitcoin:master

Conversation

@pull

@pull pull Bot commented Sep 25, 2026 •

Copy link
Copy Markdown

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

andrewtoth and others added 7 commits September 23, 2026 11:57
Keep private broadcast connections outside normal discouragement handling.
Misbehaving private broadcast peers are still disconnected.
Shutdown saves and unregisters the fee estimator before draining queued validation callbacks, so a pending block update can be missing from the saved estimates.
The mempool estimator also ignores its saved file on restart when the saved tip no longer matches the active tip.

Queue a block update after the scheduler stops and check that the block-policy height in the saved estimates does not reflect it.

Co-authored-by: Rob Hamilton <6456095+Rob1Ham@users.noreply.github.com>
Save and unregister the fee estimator after the existing callback drain so queued block updates are reflected in the saved estimates.

The estimator comment now says its shutdown actions follow the callback drain.
The old paragraph below the indexes claimed the drain only let wallets catch up, although wallets are already unloaded.
The new comment beside the final chainstate flush keeps the accurate point that callbacks queued there can be dropped.
eab6630 net: don't discourage private broadcast peers (Andrew Toth)

Pull request description:

  Discouraging a private broadcast connection may be observable.
  Prevent this by keeping private broadcast connections outside normal discouragement handling.
  Misbehaving private broadcast peers are still disconnected.

ACKs for top commit:
  instagibbs:
    reACK eab6630 with same caveat
  ViniciusCestarii:
    ACK eab6630 confirmed the added test captures the regression
  vasild:
    ACK eab6630
  mzumsande:
    Code Review ACK eab6630
  danielabrozzoni:
    tACK eab6630

Tree-SHA512: 17539236a6c6f57d4ed01e0e1ee1b9ff35c69c0467fc723400c08a5a26fa6dd9b1d2616beef34ae623415c78c99418b54a9c913db84c585f25442d2bf28e98e9
fa2c620 test: Fixup MAX_BODY_SIZE http throttling test (MarcoFalke)

Pull request description:

  The `check_slow_read_throttle` test asserts that throttling happens during a hard-coded time limit, via a hard-coded `tries` limit.

  This is mostly fine, but can intermittently fail on slow CPUs or when using unoptimized sanitizers.

  Fix it by waiting for a time scaled by `--timeout-factor`, without a hard-coded `tries` limit. Also, retain the hard-coded 5s sleep to "verify" throttling happened.

ACKs for top commit:
  davidgumberg:
    utcrACK fa2c620
  pinheadmz:
    ACK fa2c620
  winterrdog:
    tACK fa2c620
  willcl-ark:
    ACK fa2c620

Tree-SHA512: 5315eef2df242947831a9973accba77b5c9f7ec6f69aece1726ffa5ed63a5c259cb2d121f73b80b72515afb59d6bb7ea1651c25f78a6672ccad6d461b67ba1d9
8c27c38 init: drain callbacks before saving fee estimates (Lőrinc)
08729e6 test: characterize fee callback loss at shutdown (Lőrinc)

Pull request description:

  **Problem:** The mempool estimator added in #34075 persists mined-block stats for restart.
  Shutdown saves and unregisters the fee estimator before draining queued validation callbacks.
  A queued block update can leave the saved stats behind the active chain tip, so the mempool estimator ignores its file on restart.

  **Fix:** Save and unregister the fee estimator after the existing callback drain, which follows the first chainstate flush.

ACKs for top commit:
  davidgumberg:
    crACK 8c27c38
  maflcko:
    review ACK 8c27c38 🚸
  w0xlt:
    ACK 8c27c38
  ismaelsadeeq:
    ACK 8c27c38
  sedited:
    ACK 8c27c38

Tree-SHA512: 38f06f810f97f2fbc971234b1c7488b78a73fd3286d6c926d2d46c05dbeece392dc554c95c00c02841585e744e0718d567f352363dff04b9c57eccdd029c2a8e
@pull pull Bot locked and limited conversation to collaborators Sep 25, 2026
@pull pull Bot added the ⤵️ pull label Sep 25, 2026
@pull
pull Bot merged commit f6b19b1 into All-Blockchains:master Sep 25, 2026
0 of 22 checks passed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants