Skip to content

[pull] master from bitcoin:master#1676

Merged
pull[bot] merged 10 commits into
All-Blockchains:masterfrom
bitcoin:master
Jun 9, 2026
Merged

[pull] master from bitcoin:master#1676
pull[bot] merged 10 commits into
All-Blockchains:masterfrom
bitcoin:master

Conversation

@pull

@pull pull Bot commented Jun 9, 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 : )

hodlinator and others added 10 commits June 3, 2026 21:40
Instead we fully reset CoinsResult-instances without forgetting any fields.

Fixes: #35449

Variant resetting the other fields in Clear():
₿ hyperfine --warmup 2 "./build/bin/test_bitcoin -t coinselector_tests/knapsack_solver_test"
Benchmark 1: ./build/bin/test_bitcoin -t coinselector_tests/knapsack_solver_test
  Time (mean ± σ):      4.289 s ±  0.008 s    [User: 4.252 s, System: 0.027 s]
  Range (min … max):    4.279 s …  4.301 s    10 runs

This variant:
₿ hyperfine --warmup 2 "./build/bin/test_bitcoin -t coinselector_tests/knapsack_solver_test"
Benchmark 1: ./build/bin/test_bitcoin -t coinselector_tests/knapsack_solver_test
  Time (mean ± σ):      4.279 s ±  0.005 s    [User: 4.244 s, System: 0.026 s]
  Range (min … max):    4.271 s …  4.287 s    10 runs
The test needs multiple wallets that can be created on a single node, multiple
nodes are not required.

As there is a cost associated with setting-up and tearing-down nodes, this patch
helps in reducing the test time as well.
…e node is running without -privatebroadcast set
…cast fail if privatebroadcast is not enabled

0bfc5e4 add release notes (Pol Espinasa)
fdc9fc1 test: check getprivatebroadcast and abortprivatebroadcast throw if the node is running without -privatebroadcast set (Pol Espinasa)
7b821ef rpc: getprivatebroadcastinfo and abortprivatebroadcast throw if -privatebroadcast is disabled (Pol Espinasa)

Pull request description:

  Makes `getprivatebroadcast` and `abortprivatebroadcast` throw if `-privatebroadcast=0`.

  This is motivated by: sparrowwallet/sparrow#1989

  Knowing if `privatebroadcast` is set can be useful for some external software like Sparrow to avoid call `getprivatebroadcastinfo` each time to see if broadcast was done through that.

ACKs for top commit:
  stickies-v:
    ACK 0bfc5e4
  sedited:
    ACK 0bfc5e4
  rkrux:
    code review ACK 0bfc5e4
  andrewtoth:
    ACK 0bfc5e4

Tree-SHA512: 3bdb3909e93fc3835d801e1efc2bbec673a75a1ff089debd59e8970a0ff2b44d4e00b7ac26f10c972dcb50bf042521921370e1ec57885d67cd8459b3831da898
…id passing 21M BTC

d0b76c7 rpc+bitcoin-tx: Specify correct type for ParseFixedPoint() (Hodlinator)
43ca54c refactor(test): Make CAmount arg explicit for BuildCreditingTransaction() (Hodlinator)
b5e91e9 wallet: Remove CoinsResult::Clear() (Hodlinator)

Pull request description:

  The *knapsack_solver_test* in *coinselector_tests.cpp* was accumulating satoshi amounts beyond 21M BTC. This was uncovered while experimenting with adding checks to `CAmount`. Fix that by fully resetting the `CoinsResult` object accumulating those amounts, inspired by #35449 (comment).

  Also, while we're at it, add 2 commits which correct some `int64_t`/`CAmount` confusion.

  Fixes #35449

ACKs for top commit:
  sedited:
    ACK d0b76c7
  furszy:
    utACK d0b76c7
  brunoerg:
    code review ACK d0b76c7

Tree-SHA512: 6d989ded6f6327dc657f437dc256d4adf42a34a1252621421ee38d7851c6cdc97a462f033a4728e3aa7d5514deee4db6e83646105633f9cf7ed6e7e90406b67d
…criptor_psbt

5b65e31 test: remove two unnecessary nodes from the test (rkrux)

Pull request description:

  A discussion in the review of #35443 PR brought this test to my attention.

  The test needs multiple wallets that can be created on a single node, multiple nodes are not required.

  As there is a cost associated with setting-up and tearing-down nodes, this patch helps in reducing the test time as well.

ACKs for top commit:
  ekzyis:
    ACK 5b65e31
  polespinasa:
    lgtm ACK 5b65e31
  sedited:
    ACK 5b65e31

Tree-SHA512: f6b4a96b9beee968ef5438fd9db582a48834ff36ba27c19dd7012902528fa713424212530e34cc16b58c19c023f1accd2b89fe846ef2cc36677c24e160c5b817
@pull pull Bot locked and limited conversation to collaborators Jun 9, 2026
@pull pull Bot added the ⤵️ pull label Jun 9, 2026
@pull pull Bot merged commit 577999c into All-Blockchains:master Jun 9, 2026
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