backport: Merge bitcoin#29260, 27832#7201
Draft
vijaydasmp wants to merge 1 commit into
Draft
Conversation
vijaydasmp
changed the title
✅ No Merge Conflicts DetectedThis PR currently has no conflicts with other open PRs. |
vijaydasmp
force-pushed
the
March_2026_7
branch
2 times, most recently
from
060c553 to
426cae8
Compare
vijaydasmp
changed the title
vijaydasmp
force-pushed
the
March_2026_7
branch
4 times, most recently
from
e9db4d4 to
165bbb4
Compare
vijaydasmp
changed the title
vijaydasmp
changed the title
vijaydasmp
force-pushed
the
March_2026_7
branch
from
f5bd530 to
f776743
Compare
vijaydasmp
changed the title
282b12d refactor: remove CTxMemPool::queryHashes() (stickies-v) Pull request description: `CTxMemPool::queryHashes()` is only used in `MempoolToJSON()`, where it can just as easily be replaced with the more general `CTxMemPool::entryAll()`. No behaviour change, just cleans up the code. ACKs for top commit: dergoegge: Code review ACK 282b12d TheCharlatan: ACK 282b12d glozow: ACK 282b12d. Looks like there's no conflicts. Tree-SHA512: 16160dec8e1f2457fa0f62dc96d2d2efd92c4bab810ecdb0e08918b8e85a667702c8e41421eeb4ea6abe92a5956a2a39a7a6368514973b78be0d22de2ad299b2
knst
reviewed
Jun 2, 2026
| { | ||
| LOCK(pool.cs); | ||
| pool.queryHashes(vtxid); | ||
| for (const CTxMemPoolEntry& e : pool.entryAll()) { |
Collaborator
There was a problem hiding this comment.
it depends on bitcoin#28391 ; can't be done right now because no entryAll helper yet.
@vijaydasmp you may consider to backport a single commit 453b481 from bitcoin#28391 ; call this commit as "partial bitcoin#28391 refactor: Simplify CTxMempool/BlockAssembler fields, remove some external mapTx access` and rebase this PR on top of 28391-partial.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
bitcoin backporting