Skip to content

Conversation

@vijaydasmp
Copy link

Bitcoin Backporting work

@github-actions
Copy link

github-actions bot commented Jan 6, 2026

⚠️ 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 Jan_2026_5 branch 2 times, most recently from 2904f22 to 1a61563 Compare January 7, 2026 08:27
@vijaydasmp vijaydasmp changed the title backport: Merge bitcoin/bitcoin#28644, 24957, gui#757, gui#765 backport: Merge bitcoin/bitcoin#28644, gui#765 Jan 7, 2026
@vijaydasmp vijaydasmp changed the title backport: Merge bitcoin/bitcoin#28644, gui#765 backport: Merge bitcoin/bitcoin#28644, gui#765 , 28184, 28542, 28450, 27944, 25284 Jan 8, 2026
@vijaydasmp vijaydasmp changed the title backport: Merge bitcoin/bitcoin#28644, gui#765 , 28184, 28542, 28450, 27944, 25284 backport: Merge bitcoin/bitcoin#28644, gui#765 , 28184, 28542, 28450, 27944 Jan 8, 2026
@vijaydasmp vijaydasmp force-pushed the Jan_2026_5 branch 2 times, most recently from faf0dce to 343e254 Compare January 10, 2026 08:13
fanquake and others added 4 commits January 10, 2026 19:49
faa190b test: Fuzz merge with -use_value_profile=0 for now (MarcoFalke)

Pull request description:

  Seems odd that this has to be done, but for now there are (unknown) size limits on the qa-assets repo. Also, a larger size means that cloning and iterating over the files takes a longer time.

  Not sure how to measure the net impact of this, but with some backups reverting this commit, it can be limited on the downside?

ACKs for top commit:
  dergoegge:
    ACK faa190b

Tree-SHA512: 9f8b3f4526f60e4ff6fca97859a725d145a8339c216bd15c92fad7e53f84308745fee47727527de459c0245ef9d474a9dc836fee599ab2b556b519bd900b9a33
8b6470a gui: disable top bar menu actions during shutdown (furszy)
7066e89 gui: provide wallet controller context to wallet actions (furszy)

Pull request description:

  Small follow-up to dashpay#751.

  Fixes another crash cause during shutdown. Which occurs when the user hovers over the wallets list.

  Future Note:
  This surely happen in other places as well, we should re-work the way we connect signals. Register
  lambas without any precaution can leave dangling pointers.

ACKs for top commit:
  hebasto:
    ACK 8b6470a, I've tested each commit separately on macOS Sonoma 14.0 (Apple M1).

Tree-SHA512: 6fbd1bcd6717a8c1633beb9371463ed22422f929cccf9b791ee292c5364134c501e099329cf77a06b74a84c64c1c3d22539199ec49ccd74b3950036316c0dab3
f904777 lint: fix custom mypy cache dir setting (Fabian Jahr)

Pull request description:

  fixes bitcoin#28183

  The custom cache dir for `mypy` can only be set via an environment variable, setting the `MYPY_CACHE_DIR` variable in the program is not sufficient. This error was introduced while translating the shell script to python.

  See also the mypy documentation: https://mypy.readthedocs.io/en/stable/config_file.html#confval-cache_dir

ACKs for top commit:
  MarcoFalke:
    lgtm ACK f904777

Tree-SHA512: 7e8fb0cd06688129bd46d1afb8647262eb53d0f60b1ef6f288fedaa122d906fb62c9855e8bb0d6c6297d41a87a47d3cec7a00df55a7d033947937dfe23d07ba7
…31 follow-ups)

9f55773 test: refactor: usdt_mempool: store all events (stickies-v)
bc43270 test: refactor: remove unnecessary nonlocal (stickies-v)
326db63 test: log sanity check assertion failures (stickies-v)
f5525ad test: store utxocache events (stickies-v)
f1b99ac test: refactor: deduplicate handle_utxocache_* logic (stickies-v)
ad90ba3 test: refactor:  rename inbound to is_inbound (stickies-v)
afc0224 test: refactor: remove unnecessary blocks_checked counter (stickies-v)

Pull request description:

  Various cleanups to the USDT functional tests, largely (but not exclusively) follow-ups to bitcoin#27831 (review). Except for slightly different logging behaviour in "test: store utxocache events" and "test: log sanity check assertion failures", this is a refactor PR, removing unnecessary code and (imo) making it more readable and maintainable.

  The rationale for each change is in the corresponding commit message.

  Note: except for "test: store utxocache events" (which relies on its parent, and I separated into two commits because we may want the parent but not the child), all commits are stand-alone and I'm okay with dropping one/multiple commits if they turn out to be controversial or undesired.

ACKs for top commit:
  0xB10C:
    ACK 9f55773. Reviewed the code and ran the USDT interface tests. I stepped through the commits and think all changes are reasonable.

Tree-SHA512: 6c37a0265b6c26d4f9552a056a690b8f86f7304bd33b4419febd8b17369cf6af799cb87c16df35d0c2a1b839ad31de24661d4384eafa88816c2051c522fd3bf5
@vijaydasmp vijaydasmp changed the title backport: Merge bitcoin/bitcoin#28644, gui#765 , 28184, 28542, 28450, 27944 backport: Merge bitcoin/bitcoin#28644, gui#765 , 28184, 28450 Jan 10, 2026
@vijaydasmp vijaydasmp changed the title backport: Merge bitcoin/bitcoin#28644, gui#765 , 28184, 28450 backport: Merge bitcoin/bitcoin#28644, gui#765 , 28184, 27944 Jan 10, 2026
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