Skip to content

Conversation

@vijaydasmp
Copy link

backport

@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_6 branch 3 times, most recently from 66b11f8 to c027286 Compare January 7, 2026 02:21
@vijaydasmp vijaydasmp changed the title backport: Merge bitcoin/bitcoin#28815, 28578, 28931, 28933, 28952 backport: Merge bitcoin/bitcoin#28815, 28931 Jan 7, 2026
fabb504 fuzz: Avoid timeout and bloat in fuzz targets (MarcoFalke)

Pull request description:

  If the fuzz input contains invalid data *in a loop*, abort early. This will teach the fuzz engine to look for useful data and avoids bloating the fuzz input folder with useless (repeated) data.

ACKs for top commit:
  dergoegge:
    utACK fabb504
  brunoerg:
    crACK fabb504

Tree-SHA512: 26da100d7558ae6fdd5292fb146d8858b2af8f78c546ca2509b9d27b33a33e9462ecb6035de142f9f36dd5de32f8cbad099d6c7a697902d23e1bb621cd27dc88
faf1fb2 Fix IWYU for the script_flags fuzz target (MarcoFalke)
fa71285 fuzz: Limit fuzz buffer size in script_flags target (MarcoFalke)
fa6b87b fuzz: CDataStream -> DataStream in script_flags (MarcoFalke)

Pull request description:

  Most fuzz targets have an upper limit on the buffer size to avoid excessive runtime. Do the same for `script_flags` to avoid timeouts such as bitcoin#28812 (comment)

  Also, fix iwyu. Also, remove legacy `CDataStream`.

ACKs for top commit:
  dergoegge:
    ACK faf1fb2
  brunoerg:
    utACK faf1fb2

Tree-SHA512: 9301917b353f7409e448b6fd3635de19330856e0742431db5ef04e62873501b5b4cd6cb78ad81ada2747fa2bdae033115b5951d10489dd5d0d320426c8b96bee
6c97757 script: appease spelling linter (Jon Atack)
1316119 script: update ignored-words.txt (Jon Atack)
146c861 script: update linter dependencies (Jon Atack)
9240822 test: fix PEP484 no implicit optional argument types errors (Jon Atack)
f86a301 script, test: add missing python type annotations (Jon Atack)

Pull request description:

  With these updates, `./test/lint/lint-python.py` and `./test/lint/lint-spelling.py` should be green again for developers using relatively recent Python dependencies, in particular mypy 0.991 (released 11/2022) and later. Please see the commit messages for details.

ACKs for top commit:
  fanquake:
    ACK 6c97757

Tree-SHA512: 8a46a4d36d5978affdcecf4f2ace20ca1b52d483e098304911a2169afe60ccb9b042fa90c04b762d94f3ce53d2cafe6f24476ae839867a770c7f31e7e7242d99
@vijaydasmp vijaydasmp changed the title backport: Merge bitcoin/bitcoin#28815, 28931 backport: Merge bitcoin/bitcoin#28815, 28931, 28009 Jan 10, 2026
glozow and others added 2 commits January 14, 2026 21:49
fa818e1 txmempool: Remove unused clear() member function (MarcoFalke)

Pull request description:

  Seems odd to have code in Bitcoin Core that is unused.

  Moreover the function was broken (see bitcoin#24145) and is brittle, as there is nothing that prevents similar bugs from re-appearing.

  Fix both issues by replacing it with C++11 member initializers.

ACKs for top commit:
  glozow:
    ACK fa818e1

Tree-SHA512: e79e44cac7d5a84d9ecc8e3f3b0b9a50e1e3ebec358b20ba5dac175ef07d1fbe338a20f83ee80f746f7c726c79e77f8be49e14bca57a41063da8a5302123c3a9
… than tip

3784009 wallet: Skip rescanning if wallet is more recent than tip (Andrew Chow)

Pull request description:

  If a wallet has key birthdates that are more recent than the currrent chain tip, or a bestblock height higher than the current tip, we should not attempt to rescan as there is nothing to scan for.

  Fixes bitcoin#26655

ACKs for top commit:
  ishaanam:
    re-utACK 3784009
  w0xlt:
    utACK bitcoin@3784009
  furszy:
    Code review ACK 3784009

Tree-SHA512: f0d90b62940d97d50f21e1e01fa6dcb54409fad819cea4283612825c4d93d733df323cd92787fed43956b0a8e386a5bf88218f1f5749c913398667a5c8f54470
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.

4 participants