backport: Merge bitcoin#28956, 29034

[thepastaclaw]

Issue being fixed or feature implemented

Follow-up replacement work for #7190 after splitting bitcoin#29041 into #7429.

This PR backports bitcoin#28956, which removes adjusted network time from validation/mining paths, and bitcoin#29034, which makes functional-test OS detection consistently use platform.system().

What was done?

• Backported Nuke adjusted time from validation (attempt 2) bitcoin/bitcoin#28956: Nuke adjusted time from validation (attempt 2).
  • Removed the adjusted-time callback from ChainstateManager::Options.
  • Removed the callback from SnapshotTestSetup::SimulateNodeRestart() now that Dash's current develop includes the assumeutxo: snapshot initialization bitcoin/bitcoin#25667 test setup.
  • Updated validation, mining, block-template, and test callsites to use local time where upstream does.
  • Kept Dash-specific GetAdjustedTime() users outside validation, such as governance, sporks, LLMQ debug, and CoinJoin.
• Backported test: detect OS in functional tests consistently using platform.system() bitcoin/bitcoin#29034: test: detect OS in functional tests consistently using platform.system().
  • Updated the matching Dash functional-test and framework callsites, including feature_remove_pruned_files_on_startup.py now that prune: scan and unlink already pruned block files on startup bitcoin/bitcoin#26533 is in Dash's current develop.
  • Kept os.name only for the existing POSIX helper exception, matching the upstream guideline.

Notes on intentionally omitted upstream hunks:

• Nuke adjusted time from validation (attempt 2) bitcoin/bitcoin#28956 updates src/headerssync.cpp from GetAdjustedTime() to NodeClock::now(), but that file and subsystem were introduced by p2p: Implement anti-DoS headers sync bitcoin/bitcoin#25717 and are not present in Dash. That prerequisite-dependent hunk is intentionally excluded here and should be carried with p2p: Implement anti-DoS headers sync bitcoin/bitcoin#25717 if/when it is backported.
• test: detect OS in functional tests consistently using platform.system() bitcoin/bitcoin#29034 also updates feature_config_args.py and test_framework/util.py around get_temp_default_datadir(), but those hunks depend on init: Error if ignored bitcoin.conf file is found bitcoin/bitcoin#27302 test/helper context that Dash does not currently have.
• Those prerequisite-dependent hunks are not imported here; they should come with their prerequisite backports if/when those are taken.

How Has This Been Tested?

Local environment: macOS arm64, configured from a fresh worktree with:

./autogen.sh
./configure --without-gui --disable-bench --disable-fuzz-binary --without-miniupnpc --without-natpmp

Validation:

git diff --check upstream/develop...HEAD
COMMIT_RANGE=upstream/develop..HEAD test/lint/lint-whitespace.py
PYTHONPYCACHEPREFIX=/tmp/tracker-1912-pycache python3 -m py_compile test/functional/feature_bind_extra.py test/functional/feature_init.py test/functional/feature_notifications.py test/functional/feature_remove_pruned_files_on_startup.py test/functional/rpc_bind.py test/functional/test_framework/p2p.py test/functional/test_framework/test_node.py test/functional/test_runner.py test/functional/wallet_multiwallet.py
test/lint/lint-python.py test/functional/feature_bind_extra.py test/functional/feature_init.py test/functional/feature_notifications.py test/functional/feature_remove_pruned_files_on_startup.py test/functional/rpc_bind.py test/functional/test_framework/p2p.py test/functional/test_framework/test_node.py test/functional/test_runner.py test/functional/wallet_multiwallet.py
make -C src -j8 test/test_dash
make -C src -j8 dashd dash-cli
./src/test/test_dash --run_test=validation_tests/ --run_test=miner_tests/ --run_test=bls_tests/ --run_test=validation_chainstatemanager_tests/
test/functional/test_runner.py feature_init.py feature_bind_extra.py rpc_bind.py wallet_multiwallet.py feature_notifications.py feature_remove_pruned_files_on_startup.py

The two-commit stack was rebased onto current develop, both rewritten commits are GPG-signed, and upstream-vs-Dash file coverage was rechecked after the rebase. The bitcoin#25667 snapshot restart hunk and bitcoin#26533 prune-test hunk are now included because those prerequisites have since landed in Dash. The only remaining exclusions are the explicitly documented bitcoin#25717 and bitcoin#27302 prerequisite-dependent hunks above.

Breaking Changes

None expected.

Checklist:

• I have performed a self-review of my own code
• I have commented my code, particularly in hard-to-understand areas
• I have added or updated relevant unit/integration/functional/e2e tests
• I have made corresponding changes to the documentation
• I have assigned this pull request to a milestone (for repository code-owners and collaborators only)

[thepastaclaw]

Prerequisite branch opened as #7431 for bitcoin#26533 + bitcoin#27302. I’m leaving this PR draft until that lands, then I’ll rebuild the bitcoin#28956/bitcoin#29034 branch on top so bitcoin#29034 has proper diff-on-diff hunks instead of carrying prereq-adapted context here.

[thepastaclaw]

Correction on the prerequisite chain: #7431 is now scoped to bitcoin#26533 only. The next prerequisite before bitcoin#27302 / bitcoin#29034 is bitcoin#27419 (the common/args split), so I pulled bitcoin#27302 out of #7431 to avoid carrying cross-layout hunks.

[thepastaclaw]

🕓 Ready for review — 23 ahead in queue (commit df310c5)
Queue position: 24/24 · 2 reviews active
ETA: start ~14:12 UTC · complete ~14:33 UTC (median 21m across 30 recent reviews; 2 slots)
Queued 11h 18m ago · Last checked: 2026-07-23 10:10 UTC

[thepastaclaw]

Preliminary review — Codex only

At the exact head, three blocking issues remain: the test runner restores Windows behavior removed by an ancestor backport, and the advertised full bitcoin#28956 backport omits two upstream hunks without documenting those omissions as intentional exclusions. The two omitted bitcoin#29034 areas are explicitly excluded by the PR body, and the author comments correctly refine their prerequisite chains, so those claims are dropped.

Validated blockers were found in the Codex precheck. Sonnet is deferred until a fresh Codex revalidation clears the blocker gate.

Review provenance

• Codex reviewers: gpt-5.6-sol — general (completed), gpt-5.6-sol — dash-core-commit-history (completed), gpt-5.6-sol — backport-reviewer (completed)
• Verifier: gpt-5.6-sol — verifier
• Sonnet: not run (deferred by blocker gate)

🔴 3 blocking

3 additional finding(s) omitted (not in diff).

🤖 Prompt for all review comments with AI agents

These findings are from an automated code review. Verify each finding against the current code and only fix it if needed.

In `test/functional/test_runner.py`:
- [BLOCKING] test/functional/test_runner.py:46-68: Preserve the newer Windows terminal logic while changing OS detection
  Commit e189624b5e58, which is an ancestor of this PR's base, deliberately removed the `sys.getwindowsversion()` guard and moved the ANSI formatting assignments into the non-Windows branch when Dash backported bitcoin#31172. This hunk reapplies the older pre-#31172 structure from bitcoin#29034 instead of changing only the OS detector. As a result, the obsolete version gate returns and Windows now receives the ANSI formatting assignments that the current base deliberately leaves disabled. Preserve the base structure and replace only `os.name == 'nt'` with `platform.system() == 'Windows'`.

In `src/headerssync.cpp`:
- [BLOCKING] src/headerssync.cpp:44: Missing prerequisite: bitcoin#25717
  Upstream bitcoin#28956 changes the `HeadersSyncState` commitment bound from `GetAdjustedTime()` to `NodeClock::now()` at `src/headerssync.cpp:44`. The block was introduced by bitcoin#25717, and neither `src/headerssync.cpp` nor its corresponding subsystem exists in this PR's Dash base or head. The PR advertises a full bitcoin#28956 backport, while its documented intentional exclusions cover only bitcoin#29034, so this omitted hunk is an undeclared prerequisite gap. Backport bitcoin#25717 and carry the bitcoin#28956 transformation, or explicitly re-scope and document this area as intentionally excluded.

In `src/test/validation_chainstatemanager_tests.cpp`:
- [BLOCKING] src/test/validation_chainstatemanager_tests.cpp:383-386: Missing prerequisite: bitcoin#25667
  Upstream bitcoin#28956 removes `.adjusted_time_callback = GetAdjustedTime` from the snapshot restart setup at `src/test/validation_chainstatemanager_tests.cpp:383`. A first-parent diff of the bitcoin#25667 merge shows that PR introduced `SnapshotTestSetup::SimulateNodeRestart()` and this callback assignment. Dash's exact base and head lack that test section, and the PR body does not declare the bitcoin#25667-dependent bitcoin#28956 hunk as intentionally excluded. Because the PR advertises the full upstream backport, the missing test prerequisite must be restored or explicitly excluded and tracked.

Note: GitHub does not allow PastaClaw to submit an approval or request changes on their own PR, so the canonical verifier result is transported as a COMMENT review.

[thepastaclaw]

Addressed the preliminary backport-review findings in the rewritten two-commit stack:

• 168326f6a3e (bitcoin#28956): rebased onto current develop and folded in the now-applicable SnapshotTestSetup::SimulateNodeRestart() adjusted-time callback removal from assumeutxo: snapshot initialization bitcoin/bitcoin#25667.
• df310c56b8f (bitcoin#29034): preserved Dash's newer Windows terminal-control structure in test_runner.py, changing only the OS detector, and included the now-applicable feature_remove_pruned_files_on_startup.py hunk from prune: scan and unlink already pruned block files on startup bitcoin/bitcoin#26533.
• Updated the PR description to explicitly document the only remaining prerequisite-dependent exclusions: src/headerssync.cpp from p2p: Implement anti-DoS headers sync bitcoin/bitcoin#25717 and the get_temp_default_datadir() test/helper hunks from init: Error if ignored bitcoin.conf file is found bitcoin/bitcoin#27302.

Fresh local validation passed: whitespace/diff checks, Python compile + lint/mypy, signed-commit verification, test_dash build and targeted validation/miner/BLS/snapshot suites, dashd/dash-cli builds, and the touched functional tests.