Skip to content

backport: Merge bitcoin/bitcoin#28136, 27581, 18919, 25634, 25284, 24957 #7121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Draft
vijaydasmp wants to merge 6 commits into
base: develop
Choose a base branch
from
Draft

backport: Merge bitcoin/bitcoin#28136, 27581, 18919, 25634, 25284, 24957 #7121

vijaydasmp wants to merge 6 commits into from

Conversation

@vijaydasmp
Copy link

@vijaydasmp vijaydasmp commented Jan 31, 2026

Backports

@github-actions
Copy link

github-actions bot commented Jan 31, 2026 •
edited
Loading

⚠️ 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 force-pushed the Feb_2026_01 branch 5 times, most recently from aafffbe to b5c5bdf Compare February 1, 2026 03:08
ryanofsky and others added 5 commits February 1, 2026 14:57
@ryanofsky @vijaydasmp
Merge bitcoin#25634: wallet, tests: Expand and test when the blank wa…
2b3d0d7 
…llet flag should be un/set

cdba23d wallet: Document blank flag use in descriptor wallets (Ryan Ofsky)
4331020 wallet: Ensure that the blank wallet flag is unset after imports (Andrew Chow)
e9379f1 rpc, wallet: Include information about blank flag (Andrew Chow)

Pull request description:

  The `blank` wallet flag is used to indicate that the wallet intentionally does not have any keys, scripts, or descriptors, and it prevents the automatic generation of those things for such a wallet. Once the wallet contains any of those data, it is unnecessary, and possibly incorrect, to have `blank` set. This PR fixes a few places where this was not properly happening. It also adds a test for this unset behavior.

ACKs for top commit:
  S3RK:
    reACK cdba23d
  ryanofsky:
    Code review ACK cdba23d. Only change since last review is dropping the commit which makes createwallet RPC set BLANK flag automatically when DISABLE_PRIVATE_KEYS flag is set

Tree-SHA512: 85bc2a9754df0531575d5c8f4ad7e8f38dcd50083dc29b3283dacf56feae842e81f34654c5e1781f2dadb0560ff80e454bbc8ca3b2d1fab1b236499ae9abd7da
@fanquake @vijaydasmp
Merge bitcoin#18919: test: Add gettransaction test for "coin-join" tx
c5b4e66 
fa20f89 test: Add gettransaction test for "coin-join" tx (MarcoFalke)

Pull request description:

ACKs for top commit:
  furszy:
    utACK fa20f89

Tree-SHA512: 6e92455ef478d6bf2c544910402be9046698ded66f1f68d5fe5b989aafc20ba0537d362331e0e653595bca553166f6197fe548bdd0bcf295743775b8afb663a1
@achow101 @vijaydasmp
Merge bitcoin#27581: net: Continuous ASMap health check
aa9bf2e 
3ea54e5 net: Add continuous ASMap health check logging (Fabian Jahr)
28d7e55 test: Add tests for unfiltered GetAddr usage (Fabian Jahr)
b8843d3 fuzz: Let fuzzers use filter options in GetAddr/GetAddresses (Fabian Jahr)
e16f420 net: Optionally include terrible addresses in GetAddr results (Fabian Jahr)

Pull request description:

  There are certain statistics we can collect by running all our known clearnet addresses against the ASMap file. This could show issues with a maliciously manipulated file or with an old file that has decayed with time.

  This is just a proof of concept for now. My idea currently is to run the analysis once per day and print the results to logs if an ASMap file is used.

ACKs for top commit:
  achow101:
    ACK 3ea54e5
  mzumsande:
    ACK 3ea54e5
  brunoerg:
    crACK 3ea54e5

Tree-SHA512: 777acbfac43cc43ce4a0a3612434e4ddbc65f59ae8ffc9e24f21de09011bccb297f0599cbaa82bcf40ef68e5af582c4e98556379db7ceff7d9f97574a1cf8e09
@achow101 @vijaydasmp
Merge bitcoin#28136: refactor: move GetServicesNames from rpc/util.{h…
79bf699 
…,cpp} to rpc/net.cpp

bbb68ff refactor: drop protocol.h include header in rpc/util.h (Jon Atack)
1dd62c5 refactor: move GetServicesNames from rpc/util.{h,cpp} to rpc/net.cpp (Jon Atack)

Pull request description:

  Move `GetServicesNames()` from `rpc/util` to `rpc/net.cpp`, as it is only called from that compilation unit and there is no reason for other ones to need it.

  Remove the `protocol.h` include in `rpc/util.h`, as it was only needed for `GetServicesNames()`, drop an unneeded forward declaration (the other IWYU suggestions would require more extensive changes in other files), and add 3 already-missing include headers in other translation units that are needed to compile without `protocol.h` in `rpc/util.h`, as `protocol.h` includes `netaddress.h`, which in turn includes `util/strencodings.h`.

ACKs for top commit:
  kevkevinpal:
    lgtm ACK [bbb68ff](bitcoin@bbb68ff)
  ns-xvrn:
    ACK bbb68ff
  achow101:
    ACK bbb68ff

Tree-SHA512: fcbe195874dd4aa9e86548685b6b28595a2c46f9869b79b6e2b3835f76b49cab4bef6a59c8ad6428063a41b7bb6f687229b06ea614fbd103e0531104af7de55d
@achow101 @vijaydasmp
Merge bitcoin#27829: rpc: fix data optionality for RPC calls.
95e2ae8 
27b168b Update help text for spend and rawtransaction rpcs (Michael Tidwell)

Pull request description:

  The "data" field without outputs was marked as "required" in the help docs when using bitcoin-cli. This field when left off worked as an intended optional OP_RETURN. closes bitcoin#27828.

  Motivation: It is hard to understand that "data" is actually optional for commands like `createpsbt` and `walletcreatefundedpsbt`.

ACKs for top commit:
  achow101:
    ACK 27b168b
  Sjors:
    tACK 27b168b

Tree-SHA512: 235e7ed4af69880880c04015b3f7de72c8f31ae035485c4c64c483e282948f3ea3f1eef16f15e260a1aaf21114150713516ba6a99967ccad9ecd91ff67cb0450
@vijaydasmp vijaydasmp force-pushed the Feb_2026_01 branch 3 times, most recently from 273ece9 to 08759f6 Compare February 1, 2026 13:32
@achow101 @vijaydasmp
Merge bitcoin#26480: test: Remove wallet option from non-wallet tests
7db0da0 
fa10f19 test: Set default in add_wallet_options if only one type can be chosen (MacroFake)
555519d test: Remove wallet option from non-wallet tests (MacroFake)
fac8d59 test: Set -disablewallet when no wallet has been compiled (MacroFake)
fa68937 test: Make requires_wallet private (MacroFake)

Pull request description:

  The tests have several issues:

  * Some tests that are wallet-type specific offer the option to run the test with the incompatible type

  For example, `wallet_dump.py` offers `--descriptors` and on current master fails with `JSONRPCException: Invalid public key`. After the changes here, it fails with a clear error: `unrecognized arguments: --descriptors`.

  * Tests that don't use the wallet at all offer the option to run it with a wallet type. This is confusing and wastes developers time if they are "tricked" into running the test for both wallet types, even though no wallet code is executed at all.

  For example, `feature_addrman.py` will happily accept and run with `--descriptors` or `--legacy-wallet`. After the changes here, it no longer silently ignores the flag, but reports a clear error: `unrecognized arguments`.

ACKs for top commit:
  achow101:
    ACK fa10f19

Tree-SHA512: a5784da7305f4ec58c0013f433289000d94fc3d434b00fc329ffa37b812e2cd1da0071e34c3462bf79d904808564f2ae6d3d582f6b86b26215f9b07391b58460
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@vijaydasmp @ryanofsky @fanquake @achow101