backport: Merge bitcoin#29404, 28144, 28118

[vijaydasmp]

bitcoin backporting
🤕➡️🛌🩹➡️💪⚡💻🔙

[github-actions]

⚠️ Potential Merge Conflicts Detected

This PR has potential conflicts with the following open PRs:

• feat!: migrate additional indexes from synchronous to async operation #7101 - feat!: migrate additional indexes from synchronous to async operation

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

[github-actions]

This pull request has conflicts, please rebase.

[github-actions]

This pull request has conflicts, please rebase.

[coderabbitai]

Walkthrough

The diff standardizes conditional inclusion of <config/bitcoin-config.h> (guarded by HAVE_CONFIG_H) across many source files while removing it from several headers. Most changes are compile-time include adjustments with no behavioral changes. Functional edits in src/rpc/node.cpp replace optional GetContext usage with EnsureAnyNodeContext(request.context) and update RPC handlers to call setMockTime on each chain_client and to call MockForward on the node scheduler followed by SyncWithValidationInterfaceQueue(). Tests and P2P utilities include small changes to peer selection and addr-message handling.

Sequence Diagram(s)

mermaid
sequenceDiagram
participant RPC_Client
participant RPC_Handler as RPC Handler
participant NodeContext as NodeContext
participant ChainClients as ChainClients[*]
participant Scheduler as Scheduler
participant ValIntQueue as ValidationInterfaceQueue

RPC_Client->>RPC_Handler: send "setmocktime" request
RPC_Handler->>NodeContext: EnsureAnyNodeContext(request.context)
Note right of NodeContext: returns const NodeContext reference
RPC_Handler->>ChainClients: for each chain_client -> setMockTime(t)
ChainClients-->>RPC_Handler: ack
RPC_Handler-->>RPC_Client: return result

mermaid
sequenceDiagram
participant RPC_Client
participant RPC_Handler as RPC Handler
participant NodeContext as NodeContext
participant Scheduler as Scheduler
participant ValIntQueue as ValidationInterfaceQueue

RPC_Client->>RPC_Handler: send "mockscheduler" request
RPC_Handler->>NodeContext: EnsureAnyNodeContext(request.context)
RPC_Handler->>Scheduler: MockForward(delta)
Scheduler-->>RPC_Handler: ack
RPC_Handler->>ValIntQueue: SyncWithValidationInterfaceQueue()
ValIntQueue-->>RPC_Handler: synced
RPC_Handler-->>RPC_Client: return result

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 20.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 references the three Bitcoin backports being merged (bitcoin#29404, 28144, 28118), which matches the commit messages and primary changes in the PR.
Description check	✅ Passed	The description mentions 'bitcoin backporting' which relates to the changeset's purpose of merging Bitcoin upstream changes, though it is minimal and uses only emojis for elaboration.

_{✏️ 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.}

[coderabbitai]

Actionable comments posted: 1

🧹 Nitpick comments (1)

src/rpc/node.cpp (1)

7-11: Include order: config/bitcoin-config.h should be included before other headers.

The config header defines macros (e.g., HAVE_MALLOC_INFO used on line 43) that may affect how subsequent headers behave. Placing the config include after <addressindex.h> violates the standard pattern where config headers come first.

Suggested fix

+#if defined(HAVE_CONFIG_H)
+#include <config/bitcoin-config.h>
+#endif
+
 `#include` <addressindex.h>
-#if defined(HAVE_CONFIG_H)
-#include <config/bitcoin-config.h>
-#endif
-
 `#include` <chainparams.h>

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@src/rpc/node.cpp` around lines 7 - 11, Move the config include so it appears
before any other headers: place `#if` defined(HAVE_CONFIG_H) / `#include`
<config/bitcoin-config.h> at the top of src/rpc/node.cpp (above `#include`
<addressindex.h>) so macros like HAVE_MALLOC_INFO are defined before other
headers are processed; update the include block around the existing preprocessor
directives accordingly to ensure config is included first.

🤖 Prompt for all review comments with AI agents

Verify each finding against the current code and only fix it if needed.

Inline comments:
In `@test/functional/test_framework/test_node.py`:
- Line 723: The peer matching assumes addrbind is always present and can raise
KeyError; update the filter in test_node.py where getpeerinfo() is iterated (the
list comprehension that builds info) to safely handle missing addrbind by using
peer.get("addrbind") (or "in" check) when comparing to dst_addr_and_port, so
replace peer["addrbind"] == dst_addr_and_port with a safe check such as
peer.get("addrbind") == dst_addr_and_port to avoid KeyError for peers without
addrbind while still matching addr and addrbind correctly for our_addr_and_port
and dst_addr_and_port.

---

Nitpick comments:
In `@src/rpc/node.cpp`:
- Around line 7-11: Move the config include so it appears before any other
headers: place `#if` defined(HAVE_CONFIG_H) / `#include` <config/bitcoin-config.h>
at the top of src/rpc/node.cpp (above `#include` <addressindex.h>) so macros like
HAVE_MALLOC_INFO are defined before other headers are processed; update the
include block around the existing preprocessor directives accordingly to ensure
config is included first.

---

ℹ️ Review info

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 2cd9132 and 10a457b.

📒 Files selected for processing (56)

• src/addrdb.cpp
• src/addrman.cpp
• src/bench/verify_script.cpp
• src/bench/wallet_create.cpp
• src/bench/wallet_loading.cpp
• src/clientversion.cpp
• src/compat/compat.h
• src/crypto/chacha20poly1305.cpp
• src/crypto/muhash.h
• src/crypto/sha256.cpp
• src/netaddress.h
• src/netbase.h
• src/qt/addressbookpage.cpp
• src/qt/askpassphrasedialog.cpp
• src/qt/bitcoingui.cpp
• src/qt/coincontroldialog.cpp
• src/qt/guiutil.cpp
• src/qt/modaloverlay.cpp
• src/qt/notificator.cpp
• src/qt/paymentserver.cpp
• src/qt/paymentserver.h
• src/qt/sendcoinsentry.cpp
• src/qt/sendcoinsrecipient.h
• src/qt/test/apptests.cpp
• src/qt/test/optiontests.cpp
• src/qt/transactiondesc.cpp
• src/qt/walletmodel.cpp
• src/qt/walletmodel.h
• src/qt/walletmodeltransaction.cpp
• src/random.cpp
• src/rest.cpp
• src/rpc/external_signer.cpp
• src/rpc/mining.cpp
• src/rpc/node.cpp
• src/rpc/register.h
• src/rpc/server.cpp
• src/rpc/util.cpp
• src/serialize.h
• src/support/lockedpool.cpp
• src/sync.cpp
• src/test/script_tests.cpp
• src/test/system_tests.cpp
• src/test/util/setup_common.cpp
• src/validation.cpp
• src/validation.h
• src/wallet/init.cpp
• src/wallet/rpc/addresses.cpp
• src/wallet/rpc/backup.cpp
• src/wallet/rpc/wallet.cpp
• src/wallet/sqlite.cpp
• src/wallet/test/db_tests.cpp
• src/wallet/test/util.h
• src/wallet/walletdb.cpp
• src/warnings.cpp
• test/functional/p2p_getaddr_caching.py
• test/functional/test_framework/test_node.py

💤 Files with no reviewable changes (19)

• src/netaddress.h
• src/qt/sendcoinsentry.cpp
• src/validation.h
• src/support/lockedpool.cpp
• src/qt/sendcoinsrecipient.h
• src/qt/addressbookpage.cpp
• src/qt/transactiondesc.cpp
• src/qt/paymentserver.cpp
• src/crypto/muhash.h
• src/netbase.h
• src/qt/walletmodel.h
• src/qt/askpassphrasedialog.cpp
• src/qt/test/apptests.cpp
• src/qt/walletmodeltransaction.cpp
• src/sync.cpp
• src/qt/walletmodel.cpp
• src/qt/paymentserver.h
• src/qt/coincontroldialog.cpp
• src/compat/compat.h

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

• src/wallet/test/util.h
• src/random.cpp
• src/serialize.h
• src/wallet/rpc/addresses.cpp
• src/bench/wallet_loading.cpp
• src/wallet/rpc/wallet.cpp
• src/rpc/mining.cpp
• src/wallet/sqlite.cpp
• src/bench/verify_script.cpp
• src/wallet/init.cpp
• src/qt/modaloverlay.cpp
• src/rest.cpp
• src/test/system_tests.cpp
• src/test/script_tests.cpp
• src/qt/guiutil.cpp
• src/qt/notificator.cpp
• src/addrdb.cpp
• src/crypto/sha256.cpp
• src/wallet/rpc/backup.cpp
• src/rpc/server.cpp
• src/rpc/external_signer.cpp
• test/functional/p2p_getaddr_caching.py
• src/crypto/chacha20poly1305.cpp

[coderabbitai]

⚠️ Potential issue | 🟠 Major

Handle optional addrbind safely in peer matching.

Line 723 assumes peer["addrbind"] always exists, but getpeerinfo documents addrbind as optional (src/rpc/net.cpp Line 108-115, 207-211). This can throw KeyError and reintroduce intermittent test failures.

Proposed fix

-            info = [peer for peer in self.getpeerinfo() if peer["addr"] == our_addr_and_port and peer["addrbind"] == dst_addr_and_port]
+            peers = [peer for peer in self.getpeerinfo() if peer["addr"] == our_addr_and_port]
+            info = [peer for peer in peers if peer.get("addrbind") == dst_addr_and_port]
+            if not info:
+                # Fallback for peers where addrbind is not reported by getpeerinfo.
+                info = peers

📝 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

	info = [peer for peer in self.getpeerinfo() if peer["addr"] == our_addr_and_port and peer["addrbind"] == dst_addr_and_port]
	peers = [peer for peer in self.getpeerinfo() if peer["addr"] == our_addr_and_port]
	info = [peer for peer in peers if peer.get("addrbind") == dst_addr_and_port]
	if not info:
	# Fallback for peers where addrbind is not reported by getpeerinfo.
	info = peers

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@test/functional/test_framework/test_node.py` at line 723, The peer matching
assumes addrbind is always present and can raise KeyError; update the filter in
test_node.py where getpeerinfo() is iterated (the list comprehension that builds
info) to safely handle missing addrbind by using peer.get("addrbind") (or "in"
check) when comparing to dst_addr_and_port, so replace peer["addrbind"] ==
dst_addr_and_port with a safe check such as peer.get("addrbind") ==
dst_addr_and_port to avoid KeyError for peers without addrbind while still
matching addr and addrbind correctly for our_addr_and_port and
dst_addr_and_port.