backport: Merge bitcoin#28101, 28787, 27572, 28025

[vijaydasmp]

Backporting Bitcoin

[github-actions]

✅ No Merge Conflicts Detected

This PR currently has no conflicts with other open PRs.

[coderabbitai]

Walkthrough

This pull request centralizes the default Tor control port by adding constexpr int DEFAULT_TOR_CONTROL_PORT = 9051 and updating references and help text to use it. It removes the wallet CLI option -zapwallettxes from registration and validation. Test code changes replace inline signing and manual hashing with a new sign_input helper and use sha256sum_file for file SHA-256 computations; several test files import and use these helpers accordingly. No public API signatures were changed.

Sequence Diagram(s)

(omitted)

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~20 minutes

Pre-merge checks and finishing touches

❌ Failed checks (1 warning, 2 inconclusive)

Check name	Status	Explanation	Resolution
Docstring Coverage	⚠️ Warning	Docstring coverage is 20.00% which is insufficient. The required threshold is 80.00%.	You can run @coderabbitai generate docstrings to improve docstring coverage.
Title check	❓ Inconclusive	The title references four Bitcoin PR numbers but does not clearly summarize the main changes; it reads as a commit reference list rather than describing what the changes accomplish.	Consider a more descriptive title such as 'refactor: Extract Tor control port constant and remove -zapwallettxes' to better communicate the primary changes.
Description check	❓ Inconclusive	The description 'Backporting Bitcoin' is too vague and generic; it does not convey any meaningful information about what is being backported or what changes are included.	Expand the description to briefly outline the main changes, such as extracting the Tor control port constant, removing the -zapwallettxes option, and refactoring test helper functions.

✨ Finishing touches

• 📝 Generate docstrings

🧪 Generate unit tests (beta)

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

---

📜 Recent review details

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between b655259 and b1269fe.

📒 Files selected for processing (10)

• src/init.cpp
• src/torcontrol.cpp
• src/torcontrol.h
• src/wallet/init.cpp
• test/functional/feature_block.py
• test/functional/rpc_dumptxoutset.py
• test/functional/test_framework/script.py
• test/functional/test_framework/wallet.py
• test/functional/tool_wallet.py
• test/lint/check-doc.py

💤 Files with no reviewable changes (1)

• src/wallet/init.cpp

🚧 Files skipped from review as they are similar to previous changes (6)

• src/torcontrol.h
• src/torcontrol.cpp
• src/init.cpp
• test/lint/check-doc.py
• test/functional/test_framework/script.py
• test/functional/rpc_dumptxoutset.py

🧰 Additional context used

📓 Path-based instructions (1)

test/functional/**/*.py

📄 CodeRabbit inference engine (CLAUDE.md)

Functional tests in test/functional/ must be written in Python (minimum version specified in .python-version) and depend on dashd and dash-node

Files:

• test/functional/test_framework/wallet.py
• test/functional/feature_block.py
• test/functional/tool_wallet.py

🧠 Learnings (1)

📓 Common learnings

Learnt from: knst
Repo: dashpay/dash PR: 6916
File: src/univalue/include/univalue.h:81-88
Timestamp: 2025-10-25T07:08:51.918Z
Learning: For backport PRs from bitcoin/bitcoin, bitcoin-core/gui, etc., backported changes should match the original upstream PRs even if they appear strange, modify vendored code, or seem to violate coding guidelines. Still flag genuine issues like bugs, undefined behavior, crashes, compilation errors, or linter failures.

Learnt from: kwvg
Repo: dashpay/dash PR: 6543
File: src/wallet/receive.cpp:240-251
Timestamp: 2025-02-06T14:34:30.466Z
Learning: Pull request #6543 is focused on move-only changes and refactoring, specifically backporting from Bitcoin. Behavior changes should be proposed in separate PRs.

Learnt from: knst
Repo: dashpay/dash PR: 6871
File: contrib/guix/libexec/build.sh:358-360
Timestamp: 2025-10-05T20:38:28.457Z
Learning: In the Dash repository, when backporting code from Bitcoin Core, typos and minor issues in comments should be kept as-is to reduce merge conflicts in future backports, even if they remain unfixed in Bitcoin Core's master branch.

Learnt from: knst
Repo: dashpay/dash PR: 6883
File: src/rpc/rawtransaction.cpp:1088-1125
Timestamp: 2025-10-13T12:37:12.357Z
Learning: In backport pull requests (especially from Bitcoin Core), treat "moved" or refactored code as out-of-scope for content-level review. Focus validation on verifying that code is moved correctly: no fields added, no fields removed, no fields reordered, and no unexpected changes beyond whitespace adjustments. Pre-existing issues in the upstream code should be preserved to maintain fidelity to the original implementation.

Learnt from: PastaPastaPasta
Repo: dashpay/dash PR: 6804
File: src/qt/proposalwizard.cpp:40-42
Timestamp: 2025-08-11T17:16:36.654Z
Learning: In the Dash repository, when a PR adds new files that are not from Bitcoin backports, these files must be added to the list in test/util/data/non-backported.txt. This applies to newly created files like qt/proposalwizard.{h,cpp} and forms/proposalwizard.ui. Limited exemptions may exist for subtrees and similar cases.

Learnt from: UdjinM6
Repo: dashpay/dash PR: 6786
File: ci/test/04_install.sh:99-101
Timestamp: 2025-08-01T07:46:37.840Z
Learning: In backport PRs like #6786, UdjinM6 prefers to defer non-critical fixes (such as shell command expansion issues) to separate commits/PRs to maintain focus on the primary backport objectives, consistent with the project's pattern of avoiding scope creep.

Learnt from: kwvg
Repo: dashpay/dash PR: 6718
File: test/functional/test_framework/test_framework.py:2102-2102
Timestamp: 2025-06-09T16:43:20.996Z
Learning: In the test framework consolidation PR (#6718), user kwvg prefers to limit functional changes to those directly related to MasternodeInfo, avoiding scope creep even for minor improvements like error handling consistency.

🧬 Code graph analysis (2)

test/functional/test_framework/wallet.py (1)

test/functional/test_framework/script.py (1)

• sign_input (669-677)

test/functional/tool_wallet.py (1)

test/functional/test_framework/util.py (1)

• sha256sum_file (304-311)

⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (10)

• GitHub Check: linux64_nowallet-build / Build source
• GitHub Check: arm-linux-build / Build source
• GitHub Check: mac-build / Build source
• GitHub Check: win64-build / Build source
• GitHub Check: linux64_ubsan-build / Build source
• GitHub Check: linux64-build / Build source
• GitHub Check: linux64_sqlite-build / Build source
• GitHub Check: linux64_fuzz-build / Build source
• GitHub Check: linux64_tsan-build / Build source
• GitHub Check: Lint / Run linters

🔇 Additional comments (5)

test/functional/tool_wallet.py (1)

15-18: LGTM! Clean refactor to use centralized hashing helper.

The change replaces manual hashing logic with the sha256sum_file utility function, which provides consistent SHA-256 checksumming across the test suite. The implementation correctly calls .hex() on the digest returned by the helper.

Based on learnings, this is a backport PR and the refactoring aligns with test framework improvements from upstream.

Also applies to: 52-52

test/functional/test_framework/wallet.py (1)

35-35: LGTM! Refactor to centralized signing helper is correct.

The change replaces manual sighash computation and DER signature construction with the sign_input helper. The retry loop correctly generates signatures until achieving the 73-byte target for deterministic fee calculation (high-R case: 33-byte R + 32-byte S + 6-byte DER headers + 1-byte sighash type + 1-byte push opcode).

The sign_input helper prepends the signature to scriptSig, which works correctly here since scriptSig starts empty.

Based on learnings, this backport aligns with the broader test framework refactor to standardize transaction signing across tests.

Also applies to: 138-143

test/functional/feature_block.py (3)

45-45: LGTM! Updated import to use centralized signing helper.

---

553-554: LGTM! Correct P2SH signing pattern.

The code correctly constructs P2SH scriptSig by:

1. Setting scriptSig = [redeem_script]
2. Calling sign_input, which prepends the signature

This produces the standard P2SH spend format: [signature] + [redeem_script].

Based on learnings, this backport correctly adopts the centralized sign_input helper.

---

1347-1352: LGTM! Clean replacement of manual signing logic.

The refactor correctly uses sign_input to replace manual sighash computation and signature construction. Since scriptSig starts empty (from the transaction constructor), the helper correctly sets it to the signature.

---

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.}

[UdjinM6]

utACK b655259 with a nit

[UdjinM6]

utACK b1269fe