backport: Merge bitcoin#27151, 25849, 27608

[vijaydasmp]

bitcoin backports

[github-actions]

⚠️ Potential Merge Conflicts Detected

This PR has potential conflicts with the following open PRs:

• backport: bitcoin/bitcoin#24118: Add 'sendall' RPC née sweep and related backports #7131 - backport: bitcoin/bitcoin#24118: Add 'sendall' RPC née sweep and related backports

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

[coderabbitai]

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between d71b89c and 9959cde.

📒 Files selected for processing (3)

• src/net_processing.cpp
• src/support/lockedpool.cpp
• src/wallet/rpc/spend.cpp

💤 Files with no reviewable changes (1)

• src/support/lockedpool.cpp

---

Walkthrough

The pull request introduces peer-aware block request removal by modifying the RemoveBlockRequest method to accept an optional from_peer parameter, ensuring blocks are only removed from the in-flight map when requested from a specific peer. Multiple call sites throughout block processing logic are updated to pass appropriate peer context (or std::nullopt where peer-specific removal is not applicable). Additionally, an #include <utility> header is removed from a support file, and RPC help text formatting is simplified in wallet spend methods.

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 12.50% 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 merging three specific upstream Bitcoin PRs (#27151, #25849, #27608), which directly matches the changeset containing these exact backports.
Description check	✅ Passed	The description 'bitcoin backports' is related to the changeset as it correctly identifies the PR's purpose of merging upstream Bitcoin changes, though it lacks detail about the specific changes involved.

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

✨ Finishing Touches

🧪 Generate unit tests (beta)

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

Tip

Try Coding Plans. Let us write the prompt for your AI agent so you can ship faster (with fewer bugs).
Share your feedback on Discord.

---

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