backport: Merge bitcoin#22507, 21464, 23050, 24367

[vijaydasmp]

bitcoin backports

[github-actions]

This pull request has conflicts, please rebase.

[github-actions]

This pull request has conflicts, please rebase.

[github-actions]

This pull request has conflicts, please rebase.

[github-actions]

This pull request has conflicts, please rebase.

[coderabbitai]

empty for merge -pasta

[coderabbitai]

Actionable comments posted: 0

🧹 Nitpick comments (2)

src/txmempool.h (1)

678-698: Good clarity on parameter usage and documentation.
The updated documentation thoroughly describes how ancestor_size_limit and ancestor_count_limit are used in UpdateTransactionsFromBlock. Consider clarifying the behavior if these limits are zero or extremely high to avoid confusion.

src/validation.cpp (1)

366-368: Enhance mempool ancestor limit control

The addition of ancestor_size_limit and ancestor_count_limit parameters improves control over transaction ancestor limits during mempool updates after reorganization. These limits help prevent memory exhaustion from large transaction chains.

Consider adding validation to ensure the limits don't exceed system constraints, and document the expected ranges in comments.

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between a5787c9 and e2db0fd.

📒 Files selected for processing (20)

• contrib/guix/guix-build (1 hunks)
• doc/developer-notes.md (2 hunks)
• doc/release-process.md (1 hunks)
• src/net.cpp (1 hunks)
• src/node/miner.cpp (1 hunks)
• src/qt/bitcoin.cpp (1 hunks)
• src/qt/intro.cpp (1 hunks)
• src/rpc/misc.cpp (1 hunks)
• src/test/util_tests.cpp (1 hunks)
• src/txdb.cpp (1 hunks)
• src/txmempool.cpp (5 hunks)
• src/txmempool.h (2 hunks)
• src/validation.cpp (1 hunks)
• src/wallet/rpcwallet.cpp (3 hunks)
• test/functional/feature_txindex_compatibility.py (1 hunks)
• test/functional/mempool_updatefromblock.py (1 hunks)
• test/functional/rpc_decodescript.py (1 hunks)
• test/functional/rpc_uptime.py (1 hunks)
• test/functional/wallet_encryption.py (1 hunks)
• test/util/test_runner.py (1 hunks)

✅ Files skipped from review due to trivial changes (14)

• test/util/test_runner.py
• src/txdb.cpp
• src/node/miner.cpp
• src/qt/intro.cpp
• contrib/guix/guix-build
• doc/developer-notes.md
• src/net.cpp
• test/functional/wallet_encryption.py
• test/functional/rpc_decodescript.py
• test/functional/feature_txindex_compatibility.py
• src/qt/bitcoin.cpp
• src/test/util_tests.cpp
• src/rpc/misc.cpp
• src/wallet/rpcwallet.cpp

🔇 Additional comments (9)

test/functional/rpc_uptime.py (1)

26-26: LGTM! Grammatical improvement in error message.

The change from "can not" to "cannot" improves the grammatical accuracy of the error message while maintaining the same semantic meaning.

Let's verify this matches Bitcoin's implementation:

✅ Verification successful

Error message standardization is consistent within the codebase

The verification shows that the error message "Mocktime cannot be negative" is consistently used in both the RPC implementation (src/rpc/misc.cpp) and its corresponding test (test/functional/rpc_uptime.py). The error message format follows the same pattern in both locations, ensuring internal consistency within the Dash codebase.

While we couldn't directly verify against Bitcoin's implementation, the change aligns with good coding practices by:

1. Maintaining consistency between implementation and test
2. Using proper grammar ("cannot" instead of "can not")
3. Preserving the same error code (-8) and error handling pattern

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Verify the error message matches Bitcoin's implementation
# Expected: The error message should be identical in both codebases

# Search for this error message in Bitcoin's codebase
rg -l "Mocktime cannot be negative" $(gh repo clone bitcoin/bitcoin --depth 1 2>/dev/null || echo "bitcoin")

Length of output: 152

---

Script:

#!/bin/bash
# Let's try searching in the current repository first to understand the context better
rg "Mocktime cannot be negative" -A 2 -B 2

Length of output: 658

---

Script:

#!/bin/bash
# Let's check the git history to see if this was indeed backported from Bitcoin
git log -n 5 --grep="cannot" --pretty=format:"%H %s" test/functional/rpc_uptime.py

Length of output: 0

src/txmempool.h (1)

840-871: Well-defined pre-/post-conditions for UpdateForDescendants.
The expanded docstring clearly outlines expectations for cachedDescendants and descendants_to_remove. Ensure edge cases (e.g., repeated removal requests, extremely large mempools) are handled gracefully.

src/txmempool.cpp (4)

127-129: Added parameters for ancestor limits.
Passing uint64_t ancestor_size_limit, ancestor_count_limit provides greater control. Verify that upstream calls handle invalid or zero values appropriately to avoid unexpected early removal of transactions.

---

166-171: Marked transactions for later removal, avoiding iterator invalidation.
This is a good approach to prevent invalid iterator usage. Confirm that follow-up calls remove these offending transactions in all scenarios to maintain a consistent mempool state.

---

Line range hint 177-228: Enhanced removal workflow for re-introduced transactions.
Using descendants_to_remove ensures that transactions exceeding ancestor limits after a block disconnection are removed in a separate pass. Verify that any reorg edge cases (e.g., chain tips toggling frequently) do not leave stale entries behind.

---

1481-1481: Refined log message in PrioritiseTransaction.
The logging now precisely indicates fee adjustments. This is consistent with related debug statements and improves clarity for debugging fee deltas in the mempool.

test/functional/mempool_updatefromblock.py (1)

20-20: Fine-tune ancestor count limit for test environment.
Adding -limitancestorcount=100 helps avoid unintentional errors when building large transaction graphs. Ensure that other tests setting conflicting ancestor limits don’t interfere with expected behaviors.

doc/release-process.md (1)

181-181: Improved commit message clarity.
Replacing “add detached sigs” with “Add attestations” more accurately describes the nature of the committed files. The instructions are now more intuitive and easier to follow for contributors.

src/validation.cpp (1)

368-368: Properly propagate ancestor limits to mempool updates

The ancestor limits are correctly passed through to UpdateTransactionsFromBlock, ensuring consistent application of the limits during reorganization.

Let's verify that these limits are properly enforced by checking the mempool code:

✅ Verification successful

Ancestor limits are properly enforced in mempool updates

The verification confirms that the ancestor limits are correctly propagated and enforced:

1. UpdateTransactionsFromBlock passes the limits to UpdateForDescendants
2. Inside UpdateForDescendants, transactions exceeding the limits are identified and added to descendants_to_remove
3. These transactions are then removed from the mempool via removeRecursive

This ensures that after a block reorganization, any transaction in the mempool that would exceed the ancestor limits is properly removed, maintaining consistency with the ancestor limit policy.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Check how UpdateTransactionsFromBlock uses the ancestor limits
ast-grep --pattern 'UpdateTransactionsFromBlock($_, $_, $_)'

Length of output: 228

---

Script:

#!/bin/bash
# Let's try a different approach to find the UpdateTransactionsFromBlock implementation
rg -U "UpdateTransactionsFromBlock.*\(" --type cpp

Length of output: 709

---

Script:

#!/bin/bash
# Let's check the implementation in txmempool.cpp to see how the limits are used
rg -A 20 "UpdateTransactionsFromBlock.*ancestor" src/txmempool.cpp

Length of output: 1222

---

Script:

#!/bin/bash
# Let's search for where these ancestor limits are actually used in the update process
rg -B 5 -A 15 "ancestor_size_limit|ancestor_count_limit" src/txmempool.cpp

Length of output: 3900

[UdjinM6]

24367: missing changes in:

• verifytxoutproof() help text (it's in src/rpc/txoutproof.cpp now)
• CreateTransactionInternal() error message
• test/functional/rpc_decodescript.py comment

Also, we don't have test/functional/wallet_timelock.py yet, so 24367 should be partial I guess

[coderabbitai]

Empty for git merge -pasta

[vijaydasmp]

Hello @UdjinM6 , requesting review

[UdjinM6]

utACK 7972af9

[UdjinM6]

Gitlab failure https://gitlab.com/dashpay/dash/-/jobs/8793673680 looks unrelated, restarted the job

[vijaydasmp]

Hello @PastaPastaPasta @knst requesting review

[PastaPastaPasta]

utACK 7972af9