backport: Merge bitcoin#31718, 28857, 28825, 29361, 26533, 27302, 29034

[vijaydasmp]

bitcoin backports

[github-actions]

This pull request has conflicts, please rebase.

[github-actions]

⚠️ Potential Merge Conflicts Detected

This PR has potential conflicts with the following open PRs:

• backport: Merge bitcoin#28725, 28771, 28814, 28546, 28076, 28741, 28727, 22764 #7280 - backport: Merge bitcoin#28725, 28771, 28814, 28546, 28076, 28741, 28727, 22764
• backport: Merge bitcoin/bitcoin#(partial) 30291, 30397, 22729, 29633, 29459 #7300 - backport: Merge bitcoin/bitcoin#(partial) 30291, 30397, 22729, 29633, 29459
• backport: Merge bitcoin/bitcoin#28831, 28966 #7177 - backport: Merge bitcoin/bitcoin#28831, 28966

Please coordinate with the authors of these PRs to avoid merge conflicts.

[chatgpt-codex-connector]

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: dfb30988e8

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

• Open a pull request for review
• Mark a draft as ready
• Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

[chatgpt-codex-connector]

Implement ignored-conf handling for the new option

This registers -allowignoredconf, but ArgsManager::ReadConfigFiles() still has no logic to detect an ignored datadir config file or to downgrade that error when this flag is set. In the scenario added by test_ignored_conf, -conf=<temp> points back to a datadir that already has dash.conf, but startup will succeed and silently ignore that datadir config instead of failing or warning, so the new default functional test fails and users get a no-op safety option.

Useful? React with 👍 / 👎.

[chatgpt-codex-connector]

Use Dash config names in default-datadir tests

Here the test writes bitcoin.conf under the helper's Bitcoin default directory, but Dash reads $HOME/.dashcore/dash.conf on Unix-like systems and ~/Library/Application Support/DashCore/dash.conf on macOS. Once the test removes -datadir, dashd ignores this file and starts from an unconfigured default datadir/RPC port, so test_config_file_log and the same pattern in test_ignored_default_conf time out instead of checking the intended config behavior.

Useful? React with 👍 / 👎.

[chatgpt-codex-connector]

Count every dynamic width/precision argument

For non-positional format strings with both dynamic width and precision, such as %*.*f, there are two * arguments plus the value, but this regex only captures the first * in the specifier. count_format_specifiers('%*.*f') now returns 2 instead of 3, so the lint can miss calls that are missing one argument when dynamic precision is used.

Useful? React with 👍 / 👎.

[coderabbitai]

Walkthrough

This PR bundles four independent tracks: (1) a new BlockManager::ScanAndUnlinkAlreadyPrunedFiles() method, called from LoadBlockIndex, that detects and removes pruned blk/rev files still on disk after a crash or open-fd scenario, backed by a unit test and a new functional test; (2) a -allowignoredconf startup option and associated functional tests that detect when bitcoin.conf in the active datadir is silently ignored due to a conflicting -conf= argument; (3) a broad migration of os.name/sys.platform OS detection to platform.system() across all functional tests, plus TestNode.start(env=) and get_temp_default_datadir() test framework additions; and (4) miscellaneous C++ include cleanups, V1Transport::m_magic_bytes constification, std::array serialization tests, P2WSH empty-script test constants, a format-string lint fix, and several typo corrections.

Estimated code review effort

🎯 4 (Complex) | ⏱️ ~60 minutes

Suggested reviewers

• PastaPastaPasta
• thepastaclaw
• UdjinM6

🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 warning)

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

✅ Passed checks (4 passed)

Check name	Status	Explanation
Title check	✅ Passed	The title directly refers to specific Bitcoin Core PR numbers being backported, clearly summarizing the main change of integrating seven upstream pull requests.
Description check	✅ Passed	The description is minimal but directly related to the changeset—it indicates this is a bitcoin backport, which aligns with the actual backport nature of the pull request.
Linked Issues check	✅ Passed	Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check	✅ Passed	Check skipped because no linked issues were found for this pull request.

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

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests

---

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

• X
• Mastodon
• Reddit
• LinkedIn

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

[coderabbitai]

Actionable comments posted: 3

🤖 Prompt for all review comments with AI agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@src/node/miner.cpp`:
- Line 24: The include change removed timedata.h but miner.cpp calls
GetAdjustedTime() on lines 52 and 221, which is defined in timedata.h and not
available in util/time.h. Either restore the `#include` <timedata.h> directive at
the top of miner.cpp, or move the GetAdjustedTime() function definition from
timedata.h to util/time.h and update the corresponding header file to ensure
miner.cpp can resolve the symbol.

In `@test/functional/feature_config_args.py`:
- Around line 116-150: The test_config_file_log function and related tests
contain hardcoded references to "bitcoin.conf" which should be "dash.conf" since
the repository uses "dash.conf" as the configuration filename. Replace all
occurrences of "bitcoin.conf" with "dash.conf" in the conf_path path creation
(where it constructs the configuration file path using pathlib.Path), in the
start_node method call arguments (where -conf parameter is specified), and in
any file write operations that create the configuration file. Additionally,
update any assertion messages and expected_msgs parameters that reference the
configuration filename to use "dash.conf" instead of "bitcoin.conf".

In `@test/lint/run-lint-format-strings.py`:
- Around line 267-271: The regex match on line 267 only captures the first `*`
in the format specifier string, causing format specifiers with multiple `*`
characters (like `%*.*d`) to be undercounted. Replace the single re.match call
with re.finditer or re.findall to find all occurrences of the `*` pattern in
m.group(1), then iterate through each match to properly count all positional
arguments and increment n for each `*` specifier found.

🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

• Push a commit to this branch (recommended)
• Create a new PR with the fixes

---

ℹ️ Review info

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: 35f19a2a-66e5-4557-be3e-60a0c05e17ad

📥 Commits

Reviewing files that changed from the base of the PR and between a59ad9e and dfb3098.

📒 Files selected for processing (33)

• ci/README.md
• contrib/guix/README.md
• contrib/tracing/README.md
• contrib/tracing/log_raw_p2p_msgs.py
• doc/release-notes-27302.md
• src/chain.h
• src/init.cpp
• src/net.cpp
• src/net.h
• src/net_processing.cpp
• src/node/blockstorage.cpp
• src/node/blockstorage.h
• src/node/miner.cpp
• src/qt/test/test_main.cpp
• src/rpc/mining.cpp
• src/test/blockmanager_tests.cpp
• src/test/serialize_tests.cpp
• src/test/util/script.h
• src/timedata.h
• src/validation.cpp
• test/functional/README.md
• test/functional/feature_bind_extra.py
• test/functional/feature_config_args.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_framework/util.py
• test/functional/test_runner.py
• test/functional/wallet_multiwallet.py
• test/lint/run-lint-format-strings.py

💤 Files with no reviewable changes (1)

• src/timedata.h

[coderabbitai]

⚠️ Potential issue | 🔴 Critical

🧩 Analysis chain

🏁 Script executed:

#!/bin/bash
# Description: Check for orphaned timedata symbols in miner.cpp after include swap

# Search for timedata usage in miner.cpp
echo "=== Checking for timedata symbol usage in miner.cpp ==="
rg -n 'timedata|dNtpOffset' src/node/miner.cpp || echo "No timedata symbol references found"

# Verify util/time.h exports needed symbols
echo ""
echo "=== Checking util/time.h for time symbols ==="
grep -E '(GetTime|GetAdjustedTime|dNtpOffset)' src/util/time.h || echo "Time symbols may not be in util/time.h"

Repository: dashpay/dash

Length of output: 282

---

🏁 Script executed:

#!/bin/bash
# Check what time functions miner.cpp actually uses
echo "=== Time-related function calls in miner.cpp ==="
rg -n '(GetTime|GetAdjustedTime|GetSystemTimeInSeconds|dNtpOffset)' src/node/miner.cpp

# Also check for any remaining includes that might provide time functionality
echo ""
echo "=== All includes in miner.cpp ==="
head -30 src/node/miner.cpp | grep '^`#include`'

Repository: dashpay/dash

Length of output: 1009

---

🏁 Script executed:

#!/bin/bash
# Find GetAdjustedTime definition
echo "=== Searching for GetAdjustedTime definition ==="
rg -n 'GetAdjustedTime' --type cpp --type h | head -20

# Check full util/time.h content to see all exports
echo ""
echo "=== Full util/time.h content ==="
cat src/util/time.h

Repository: dashpay/dash

Length of output: 7294

---

🏁 Script executed:

#!/bin/bash
# Check if timedata.h is included transitively
echo "=== Checking node/miner.h for timedata.h include ==="
rg -n 'timedata' src/node/miner.h

echo ""
echo "=== Checking validation.h for timedata.h include ==="
rg -n 'timedata' src/validation.h | head -5

echo ""
echo "=== Checking chain.h for timedata.h include ==="
rg -n 'timedata' src/chain.h

echo ""
echo "=== Full search for timedata.h includes ==="
rg '`#include`.*timedata' --type h --type cpp | grep -E '(chain\.h|validation\.h|node/miner\.h|pow\.h)'

Repository: dashpay/dash

Length of output: 257

---

🏁 Script executed:

#!/bin/bash
# Check what headers transitively include timedata.h
echo "=== Which headers include timedata.h ==="
rg '`#include`.*timedata\.h' --type h --type cpp

echo ""
echo "=== Does pow.h include timedata ==="
cat src/pow.h | grep -E '(timedata|GetAdjustedTime)' || echo "Not found in pow.h"

echo ""
echo "=== Verify miner.cpp would have access to GetAdjustedTime ==="
# Check if any of miner's includes transitively get timedata.h
for header in consensus/consensus.h consensus/validation.h pow.h; do
  if rg '`#include`.*timedata' "src/$header" > /dev/null 2>&1; then
    echo "$header includes timedata.h"
  fi
done
echo "Done checking transitive includes"

Repository: dashpay/dash

Length of output: 1053

---

🏁 Script executed:

#!/bin/bash
# Check if validation.h or pow.h indirectly include timedata.h
echo "=== Check validation.h includes ==="
head -50 src/validation.h | grep '`#include`'

echo ""
echo "=== Check pow.h includes ==="
head -50 src/pow.h | grep '`#include`'

echo ""
echo "=== Comprehensive check: trace includes from miner.cpp ==="
# For key headers, check if they include timedata
for header in src/validation.h src/pow.h src/consensus/consensus.h src/chainparams.h; do
  if [ -f "$header" ]; then
    result=$(grep '`#include`.*timedata' "$header")
    if [ -n "$result" ]; then
      echo "$header INCLUDES timedata.h"
    fi
  fi
done
echo "Check complete"

Repository: dashpay/dash

Length of output: 1050

---

Add timedata.h include or implement GetAdjustedTime() in util/time.h.

The include swap removes timedata.h but miner.cpp calls GetAdjustedTime() on lines 52 and 221. This function is defined in timedata.h, and util/time.h does not provide it. No transitive includes supply this symbol. Either restore #include <timedata.h> or relocate GetAdjustedTime() to util/time.h.

🧰 Tools

🪛 Cppcheck (2.21.0)

[error] 24-24: #error No known always_inline attribute for this platform.

(preprocessorErrorDirective)

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@src/node/miner.cpp` at line 24, The include change removed timedata.h but
miner.cpp calls GetAdjustedTime() on lines 52 and 221, which is defined in
timedata.h and not available in util/time.h. Either restore the `#include`
<timedata.h> directive at the top of miner.cpp, or move the GetAdjustedTime()
function definition from timedata.h to util/time.h and update the corresponding
header file to ensure miner.cpp can resolve the symbol.

[coderabbitai]

⚠️ Potential issue | 🔴 Critical

🧩 Analysis chain

🏁 Script executed:

#!/bin/bash
set -euo pipefail

echo "== Core config filename and config-path wiring =="
rg -n -C2 "BITCOIN_CONF_FILENAME|GetConfigFilePath|ReadConfigFiles" src/util src/init.cpp

echo
echo "== Functional framework config filename usage =="
rg -n -C2 "bitcoinconf|dash\\.conf|bitcoin\\.conf|write_config|initialize_datadir" \
  test/functional/test_framework test/functional/feature_config_args.py

Repository: dashpay/dash

Length of output: 22289

---

Replace hardcoded "bitcoin.conf" with "dash.conf" throughout the test.

The repository uses "dash.conf" as the configuration filename (defined in src/util/system.cpp:90 and used by the test framework in test/functional/test_framework/test_node.py:83). The new tests hardcode "bitcoin.conf" in multiple locations, which will cause them to fail:

• Line 133: conf_path = default_datadir / "bitcoin.conf" → should be "dash.conf"
• Line 335: self.start_node(0, [f'-conf={node.datadir}/bitcoin.conf']) → should be "dash.conf"
• Line 357: (default_datadir / "bitcoin.conf").write_text(...) → should be "dash.conf"

Also update the assertion messages on lines 328 and 365 to reference "dash.conf" instead of "bitcoin.conf".

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@test/functional/feature_config_args.py` around lines 116 - 150, The
test_config_file_log function and related tests contain hardcoded references to
"bitcoin.conf" which should be "dash.conf" since the repository uses "dash.conf"
as the configuration filename. Replace all occurrences of "bitcoin.conf" with
"dash.conf" in the conf_path path creation (where it constructs the
configuration file path using pathlib.Path), in the start_node method call
arguments (where -conf parameter is specified), and in any file write operations
that create the configuration file. Additionally, update any assertion messages
and expected_msgs parameters that reference the configuration filename to use
"dash.conf" instead of "bitcoin.conf".

[coderabbitai]

⚠️ Potential issue | 🟠 Major

🧩 Analysis chain

🏁 Script executed:

#!/bin/bash
set -euo pipefail

# Confirm the current single-star logic exists in the changed file
rg -n "star, star_pos_num = re.match" test/lint/run-lint-format-strings.py

# Reproduce current behavior with equivalent logic (read-only verification)
python - <<'PY'
import re

def count_like_current(format_string):
    format_string = format_string.replace('%%', 'X')
    n = max_pos = 0
    for m in re.finditer("%(.*?)[aAcdeEfFgGinopsuxX]", format_string, re.DOTALL):
        pos_num, = re.match(r"(?:(^\d+)\$)?", m.group(1)).groups()
        if pos_num is not None:
            max_pos = max(max_pos, int(pos_num))
        else:
            n += 1
        star, star_pos_num = re.match(r"(?:.*?(\*(?:(\d+)\$)?)|)", m.group(1)).groups()
        if star_pos_num is not None:
            max_pos = max(max_pos, int(star_pos_num))
        elif star is not None:
            n += 1
    return max(n, max_pos)

cases = [
    ("%*.*d", 3),
    ("%2$*3$.*4$d", 4),
]
for fmt, expected in cases:
    got = count_like_current(fmt)
    print(f"{fmt}: got={got}, expected={expected}, {'OK' if got == expected else 'MISMATCH'}")
PY

Repository: dashpay/dash

Length of output: 224

---

Count all * argument specifiers, not just the first one.

The regex pattern on line 267 only captures the first * in a format specifier. Format specifiers like %*.*d and %2$*3$.*4$d are undercounted, producing false negatives in the lint check.

Proposed fix

-        star, star_pos_num = re.match(r"(?:.*?(\*(?:(\d+)\$)?)|)", m.group(1)).groups()
-        if star_pos_num is not None:
-            max_pos = max(max_pos, int(star_pos_num))
-        elif star is not None:
-            n += 1
+        for star_match in re.finditer(r"\*(?:(\d+)\$)?", m.group(1)):
+            star_pos_num = star_match.group(1)
+            if star_pos_num is not None:
+                max_pos = max(max_pos, int(star_pos_num))
+            else:
+                n += 1

📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change

	star, star_pos_num = re.match(r"(?:.*?(\*(?:(\d+)\$)?)|)", m.group(1)).groups()
	if star_pos_num is not None:
	max_pos = max(max_pos, int(star_pos_num))
	elif star is not None:
	n += 1
	for star_match in re.finditer(r"\*(?:(\d+)\$)?", m.group(1)):
	star_pos_num = star_match.group(1)
	if star_pos_num is not None:
	max_pos = max(max_pos, int(star_pos_num))
	else:
	n += 1

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@test/lint/run-lint-format-strings.py` around lines 267 - 271, The regex match
on line 267 only captures the first `*` in the format specifier string, causing
format specifiers with multiple `*` characters (like `%*.*d`) to be
undercounted. Replace the single re.match call with re.finditer or re.findall to
find all occurrences of the `*` pattern in m.group(1), then iterate through each
match to properly count all positional arguments and increment n for each `*`
specifier found.