Skip to content

backport: Merge bitcoin#28144, 26705#7078

Draft
vijaydasmp wants to merge 2 commits intodashpay:developfrom
vijaydasmp:Jan_2026_3
Draft

backport: Merge bitcoin#28144, 26705#7078
vijaydasmp wants to merge 2 commits intodashpay:developfrom
vijaydasmp:Jan_2026_3

Conversation

@vijaydasmp
Copy link

Bitcoin backports

@github-actions
Copy link

github-actions bot commented Dec 20, 2025

✅ No Merge Conflicts Detected

This PR currently has no conflicts with other open PRs.

@vijaydasmp vijaydasmp changed the title backport : Merge bitcoin#28144, 27695, 26705 backport: Merge bitcoin#28144, 27695, 26705 Dec 20, 2025
@vijaydasmp vijaydasmp changed the title backport: Merge bitcoin#28144, 27695, 26705 backport: Merge bitcoin#28144, 26705 Dec 20, 2025
@vijaydasmp vijaydasmp force-pushed the Jan_2026_3 branch 3 times, most recently from 7b8e611 to 9ce7567 Compare December 23, 2025 05:06
@github-actions
Copy link

This pull request has conflicts, please rebase.

@vijaydasmp vijaydasmp changed the title backport: Merge bitcoin#28144, 26705 backport: Merge bitcoin#28144, 26705, 27832, 28101, 28028 Dec 23, 2025
@vijaydasmp vijaydasmp force-pushed the Jan_2026_3 branch 5 times, most recently from 80472e8 to e003f51 Compare December 25, 2025 17:40
@vijaydasmp vijaydasmp force-pushed the Jan_2026_3 branch 3 times, most recently from 1270050 to 48eff20 Compare January 5, 2026 16:38
@vijaydasmp vijaydasmp changed the title backport: Merge bitcoin#28144, 26705, 27832, 28101, 28028 backport: Merge bitcoin#28144, 26705 Jan 10, 2026
…ching.py

8a20f76 test: drop duplicate getaddrs from p2p_getaddr_caching (Martin Zumsande)
feb0096 test: fix intermittent failure in p2p_getaddr_caching (Martin Zumsande)

Pull request description:

  Fixes bitcoin#28133

  In the consistency check, it's not enough to check that our address/port is unique, only the combination of source and target must be unique. Otherwise, the OS may reuse ports for connections to different `-addrbind`, which was happening in the failed runs.

  While at it, the second commit cleans up duplicate `getaddr` messages in `p2p_getaddr_caching.py` that do nothing but generate `Ignoring repeated "getaddr"` log messages (and cleans up some whitespace the python linter complains about).

ACKs for top commit:
  vasild:
    ACK 8a20f76

Tree-SHA512: eabe4727d7887f729074076f6333a918bba8cb34b8e3baaa83f167b441b0daa24f7c4824abcf03a9538a2ef14b2d826ff19aeffcb93a6c20735253a9678aac9c
@github-actions
Copy link

This pull request has conflicts, please rebase.

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
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.

3 participants