Skip to content

backport: Merge bitcoin#29260, 27832 - #7201

Draft
vijaydasmp wants to merge 1 commit into
dashpay:developfrom
vijaydasmp:March_2026_7
Draft

backport: Merge bitcoin#29260, 27832#7201
vijaydasmp wants to merge 1 commit into
dashpay:developfrom
vijaydasmp:March_2026_7

Conversation

@vijaydasmp

Copy link
Copy Markdown

bitcoin backporting

@vijaydasmpvijaydasmp changed the title backport: Merge bitcoin#29260, 28379backport: Merge bitcoin#29260, 28379, 28191, 27832Mar 5, 2026
@github-actions

github-actionsBot commented Mar 5, 2026

Copy link
Copy Markdown

✅ No Merge Conflicts Detected

This PR currently has no conflicts with other open PRs.

@vijaydasmp
vijaydasmpforce-pushed the March_2026_7 branch 2 times, most recently from 060c553 to 426cae8CompareMarch 6, 2026 15:46
@vijaydasmpvijaydasmp changed the title backport: Merge bitcoin#29260, 28379, 28191, 27832backport: Merge bitcoin#29260, 28379, 28191, 27832, 27491Mar 6, 2026
@vijaydasmp
vijaydasmpforce-pushed the March_2026_7 branch 4 times, most recently from e9db4d4 to 165bbb4CompareMarch 7, 2026 00:26
@vijaydasmpvijaydasmp changed the title backport: Merge bitcoin#29260, 28379, 28191, 27832, 27491backport: Merge bitcoin#29260, 28379, 28191, 27832Mar 7, 2026
@vijaydasmpvijaydasmp changed the title backport: Merge bitcoin#29260, 28379, 28191, 27832backport: Merge bitcoin#29260, 28191, 27832Mar 7, 2026
@vijaydasmpvijaydasmp changed the title backport: Merge bitcoin#29260, 28191, 27832backport: Merge bitcoin#29260, 27832Mar 26, 2026
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
Comment threadsrc/rpc/mempool.cpp
{
LOCK(pool.cs);
pool.queryHashes(vtxid);
for (const CTxMemPoolEntry& e : pool.entryAll()) {

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@vijaydasmp@knst@glozow