backport: Merge bitcoin/bitcoin#28815, 28931, 26679 by vijaydasmp · Pull Request #7092 · dashpay/dash

vijaydasmp · 2026-01-06T23:48:43Z

backport

github-actions · 2026-01-06T23:49:13Z

✅ No Merge Conflicts Detected

This PR currently has no conflicts with other open PRs.

github-actions · 2026-01-24T15:44:24Z

This pull request has conflicts, please rebase.

github-actions · 2026-01-28T06:55:24Z

This pull request has conflicts, please rebase.

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

… 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

coderabbitai · 2026-01-31T14:51:43Z

Walkthrough

This pull request introduces changes across multiple areas: header management in interpreter.h (adjusting includes and forward declarations), enhancements to fuzz testing infrastructure by introducing a good_data flag mechanism to gracefully handle invalid input data across multiple fuzz test files, documentation updates to the LIMITED_WHILE macro, refactoring of serialization handling in script_flags.cpp, and modifications to wallet rescanning logic in CWallet::AttachChain to unconditionally infer wallet birth time and adjust rescanning windows based on chain state.

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~25 minutes

🚥 Pre-merge checks | ✅ 2 | ❌ 1

❌ Failed checks (1 warning)

Check name	Status	Explanation	Resolution
Docstring Coverage	⚠️ Warning	Docstring coverage is 0.00% which is insufficient. The required threshold is 80.00%.	Write docstrings for the functions missing them to satisfy the coverage threshold.

✅ Passed checks (2 passed)

Check name	Status	Explanation
Title check	✅ Passed	The title clearly identifies the PR as a backport of three specific Bitcoin issues (28815, 28931, 26679) and matches the commit messages summarizing those changes.
Description check	✅ Passed	While minimal, the description 'backport' directly relates to the changeset which consists entirely of backported Bitcoin improvements.

_{✏️ Tip: You can configure your own custom pre-merge checks in the settings.}

✨ Finishing touches

📝 Generate docstrings

🧪 Generate unit tests (beta)

Create PR with unit tests
Post copyable unit tests in a comment

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

knst

fixes for 26679 are required; other 2 backports are good overall, see nits

knst · 2026-02-05T07:01:35Z

src/test/fuzz/policy_estimator.cpp

 FUZZ_TARGET(policy_estimator, .init = initialize_policy_estimator)
 {
    FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
+    bool good_data{true};


nit: formatting is different (two missing \n) with original 28815:

knst · 2026-02-05T07:04:36Z

src/script/interpreter.h

-class uint256;
+class CScriptNum;
+class XOnlyPubKey;
+struct CScriptWitness;


nit(28931): remove CScriptWitness because no segwit in dash core

knst · 2026-02-05T07:09:28Z

src/wallet/wallet.cpp

-        // No need to read and scan block if block was created before
-        // our wallet birthday (as adjusted for block time variability)
-        // unless a full rescan was requested
-        if (gArgs.GetIntArg("-rescan", 0) != 2) {


26679: bitcoin doesn't have a line if (gArgs.GetIntArg("-rescan", 0) != 2) { and the previous unless a full rescan was requested which has been introduced by #3828

This -rescan feature is subject to remove in Dash Core v24; but it it is still not removed; please fix 26679 for now.

vijaydasmp force-pushed the Jan_2026_6 branch 3 times, most recently from 66b11f8 to c027286 Compare January 7, 2026 02:21

vijaydasmp changed the title ~~backport: Merge bitcoin/bitcoin#28815, 28578, 28931, 28933, 28952~~ backport: Merge bitcoin/bitcoin#28815, 28931 Jan 7, 2026

vijaydasmp force-pushed the Jan_2026_6 branch from bc3ba7e to b076563 Compare January 10, 2026 16:04

vijaydasmp changed the title ~~backport: Merge bitcoin/bitcoin#28815, 28931~~ backport: Merge bitcoin/bitcoin#28815, 28931, 28009 Jan 10, 2026

vijaydasmp force-pushed the Jan_2026_6 branch from b8a6809 to b076563 Compare January 14, 2026 14:42

github-actions bot added the needs rebase label Jan 24, 2026

vijaydasmp force-pushed the Jan_2026_6 branch from 5e143f3 to 63a91ab Compare January 28, 2026 06:54

fanquake added 2 commits January 28, 2026 13:13

vijaydasmp force-pushed the Jan_2026_6 branch from 63a91ab to c8eba8f Compare January 28, 2026 07:46

github-actions bot removed the needs rebase label Jan 28, 2026

vijaydasmp changed the title ~~backport: Merge bitcoin/bitcoin#28815, 28931, 28009~~ backport: Merge bitcoin/bitcoin#28815, 28931, 28009, 19909, 26679 Jan 28, 2026

vijaydasmp force-pushed the Jan_2026_6 branch from c8eba8f to 0bed3e3 Compare January 28, 2026 09:03

vijaydasmp changed the title ~~backport: Merge bitcoin/bitcoin#28815, 28931, 28009, 19909, 26679~~ backport: Merge bitcoin/bitcoin#28815, 28931, 28009, 26679 Jan 28, 2026

vijaydasmp force-pushed the Jan_2026_6 branch from 0bed3e3 to 1c0e1e6 Compare January 29, 2026 16:10

vijaydasmp marked this pull request as ready for review January 31, 2026 14:48

vijaydasmp changed the title ~~backport: Merge bitcoin/bitcoin#28815, 28931, 28009, 26679~~ backport: Merge bitcoin/bitcoin#28815, 28931, 26679 Jan 31, 2026

github-actions bot mentioned this pull request Feb 2, 2026

backport: Merge bitcoin#28903, 28924, 29056, 28455, 29037 #7123

Draft

knst requested changes Feb 5, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

backport: Merge bitcoin/bitcoin#28815, 28931, 26679#7092

backport: Merge bitcoin/bitcoin#28815, 28931, 26679#7092
vijaydasmp wants to merge 3 commits intodashpay:developfrom
vijaydasmp:Jan_2026_6

vijaydasmp commented Jan 6, 2026

Uh oh!

github-actions bot commented Jan 6, 2026 •

edited

Loading

Uh oh!

github-actions bot commented Jan 24, 2026

Uh oh!

github-actions bot commented Jan 28, 2026

Uh oh!

coderabbitai bot commented Jan 31, 2026

Uh oh!

knst left a comment •

edited

Loading

Uh oh!

knst Feb 5, 2026

Uh oh!

knst Feb 5, 2026

Uh oh!

knst Feb 5, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

vijaydasmp commented Jan 6, 2026

Uh oh!

github-actions bot commented Jan 6, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✅ No Merge Conflicts Detected

Uh oh!

github-actions bot commented Jan 24, 2026

Uh oh!

github-actions bot commented Jan 28, 2026

Uh oh!

coderabbitai bot commented Jan 31, 2026

Walkthrough

Estimated code review effort

Uh oh!

knst left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

knst Feb 5, 2026

Choose a reason for hiding this comment

Uh oh!

knst Feb 5, 2026

Choose a reason for hiding this comment

Uh oh!

knst Feb 5, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

github-actions bot commented Jan 6, 2026 •

edited

Loading

knst left a comment •

edited

Loading