Skip to content

backport: bitcoin#29421, bitcoin#29752, bitcoin#29419, bitcoin#29798 - #8168

Open
DCG-Claude wants to merge 4 commits into
dashpay:developfrom
thepastaclaw:backport-0.28-b011-src
Open

DCG-Claude wants to merge 4 commits into
dashpay:developfrom
thepastaclaw:backport-0.28-b011-src

Conversation

@DCG-Claude

@DCG-Claude DCG-Claude commented Nov 16, 2026 •

Copy link
Copy Markdown
Collaborator

Issue being fixed or feature implemented

Backports 4 Bitcoin Core v0.28 pull request(s) to Dash.

What was done?

  • net: make the list of known message types a compile time constant bitcoin/bitcoin#29421 — net: make the list of known message types a compile time constant.
    Upstream: net: make the list of known message types a compile time constant bitcoin/bitcoin#29421 (merge 6c13b13). Dash commit: afb9ad1.
    Backports net: make the list of known message types a compile time constant bitcoin/bitcoin#29421: the NetMsgType constants become inline constexpr in protocol.h and getAllNetMessageTypes() is replaced by a compile-time ALL_NET_MESSAGE_TYPES std::array. Dash's own message types and their order are kept, and the Dash-only callers in net.cpp and net_processing.cpp plus the fuzz test runner's name mapping are updated to match. FEEFILTER/WTXIDRELAY are left out because Dash has neither message.

    Dash adaptations:

    • src/protocol.h: no FEEFILTER/WTXIDRELAY constants or ALL_NET_MESSAGE_TYPES entries; Dash does not implement feefilter or wtxidrelay
    • src/protocol.h: Dash message types (SPORK..PLATFORMBAN) become inline constexpr with their existing strings (e.g. DSACCEPT{"dsa"}) and stay in ALL_NET_MESSAGE_TYPES in Dash's order
    • src/protocol.h: adds #include ‹array› for std::array/std::to_array; upstream's protocol.h already had this include
    • src/protocol.cpp: Dash's MAKE_MSG macro and its compile-time COMMAND_SIZE static_assert go away with the definitions; the runtime assert in CMessageHeader's constructor still applies
    • src/protocol.cpp: keeps Dash's blocks-only message list and NetMessageViolatesBlocksOnly(); its comment now refers to ALL_NET_MESSAGE_TYPES in protocol.h
    • src/net.cpp: Dash-only CalculateNumConnectionsChangedStats() loops now use ALL_NET_MESSAGE_TYPES instead of getAllNetMessageTypes()
    • src/net_processing.cpp: Dash-only extension-message lookup in ProcessMessage() now uses ALL_NET_MESSAGE_TYPES instead of getAllNetMessageTypes()
    • test/fuzz/test_runner.py: Dash maps NetMsgType names to message strings by parsing the protocol.h constexpr definitions instead of lowercasing (DSACCEPT is "dsa")
    • src/test/fuzz/p2p_transport_serialization.cpp: g_all_messages stays outside an anonymous namespace; Dash's version of this file never had that namespace
  • log: deduplicate category names and improve logging.cpp bitcoin/bitcoin#29419 — log: deduplicate category names and improve logging.cpp.
    Upstream: log: deduplicate category names and improve logging.cpp bitcoin/bitcoin#29419 (merge 3b987d0). Dash commit: 9914d56.
    Backports log: deduplicate category names and improve logging.cpp bitcoin/bitcoin#29419: Dash's log category table becomes upstream's std::map keyed by name, with a reverse flag-to-name map derived from it, replacing the hand-written LogCategoryToStr switch. Dash's categories, the NET_NETCONN name, LogCategoriesList's enabled_only option and its exclusion of DASH are all kept; UTIL was already gone in Dash, so only the flag renumbering was needed.

    Dash adaptations:

    • src/logging.cpp: LOG_CATEGORIES_BY_STR uses Dash's enum names BCLog::BENCHMARK and BCLog::RANDOM (Dash never renamed them to BENCH/RAND); the strings "bench"/"rand" are unchanged
    • src/logging.cpp: Dash categories (chainlocks, gobject, instantsend, llmq, llmq-dkg, llmq-sigs, mnpayments, mnsync, coinjoin, spork, netconn, creditpool, ehf, dash) move into LOG_CATEGORIES_BY_STR in string-›flag form
    • src/logging.cpp: LOG_CATEGORIES_BY_FLAG also maps NET_NETCONN to "net|netconn", which Dash's removed switch returned; it is not a parseable category so it cannot go in the string map
    • src/logging.cpp: LogCategoriesList keeps Dash's enabled_only parameter and its exclusion of the BCLog::DASH group flag, now looping over LOG_CATEGORIES_BY_STR
    • src/logging.h: UTIL removal (bitcoin commit b0344c2) only renumbers BLOCKSTORAGE..TXPACKAGES to bits 25..28; Dash never had UTIL, and Dash's 64-bit flags and ALL = ~(uint64_t)0 are kept
  • refactor: Use typesafe Wtxid in compact block encodings bitcoin/bitcoin#29752 — refactor: Use typesafe Wtxid in compact block encodings.
    Upstream: refactor: Use typesafe Wtxid in compact block encodings bitcoin/bitcoin#29752 (merge bf031a5). Dash commit: d3b4e21.
    Backports refactor: Use typesafe Wtxid in compact block encodings bitcoin/bitcoin#29752: the compact-block extra-transaction pool now holds plain CTransactionRef and InitData works out each transaction's short-ID hash itself, using Dash's GetInstanceHash() where upstream uses GetWitnessHash(). The typed Wtxid parameter on GetShortID is left out because Dash has no Wtxid type; the function still takes uint256 and behaves the same.

    Dash adaptations:

    • src/blockencodings.cpp: extra_txn short IDs use GetInstanceHash() instead of GetWitnessHash(), the hash Dash computes short IDs from (no witness in Dash)
    • src/blockencodings.cpp: duplicate check keeps Dash's GetHash() comparison instead of upstream's GetWitnessHash(); only the .second access is dropped
    • src/net_processing.cpp: stores bare CTransactionRef in Dash's append-until-full ring buffer (net: optimize compact block extra tx iteration bitcoin/bitcoin#35670 backport) instead of upstream's resize-based version
    • src/test/blockencodings_tests.cpp: short-ID call sites use GetInstanceHash() where upstream switched to GetWitnessHash(), and the stream stays CDataStream as in Dash

    Not applicable to Dash (intentionally omitted):

    • src/blockencodings.h: GetShortID(const Wtxid&): Dash has no Wtxid type and its short IDs hash the instance hash, not a witness hash; signature stays uint256
    • src/blockencodings.cpp: GetShortID(const Wtxid& wtxid) definition: same reason, Dash keeps GetShortID(const uint256& txhash)
    • src/test/blockencodings_tests.cpp: TestHeaderAndShortIDs::GetShortID(const Wtxid&) helper: stays uint256 to match Dash's CBlockHeaderAndShortTxIDs::GetShortID
  • Logging cleanup bitcoin/bitcoin#29798 — Logging cleanup.
    Upstream: Logging cleanup bitcoin/bitcoin#29798 (merge 55d1994). Dash commit: a301cb8.
    Backports Logging cleanup bitcoin/bitcoin#29798's logging cleanup: "0", "", "1" and "all" are removed from the category map ("1"/"all" are now handled in GetLogCategory), LogCategoryToStr becomes static and handles ALL itself, GetLogPrefix becomes private, and the -debug/-debugexclude/logging RPC help text is updated. The only differences are mechanical: Dash's 64-bit categories field, its extra Dash categories and the kept DASH meta-category filter in LogCategoriesList.

    Dash adaptations:

    • src/logging.h: m_categories keeps Dash's std::atomic‹uint64_t› type (Dash has 64-bit LogFlags); only the initializer becomes BCLog::NONE as upstream
    • src/logging.cpp: LOG_CATEGORIES_BY_STR keeps Dash's plain std::map (no std::less‹›, which comes from a separate string_view PR) and its Dash categories; only the 0/""/1/all entries are removed
    • src/logging.cpp: LogCategoriesList keeps Dash's enabled_only filter and BCLog::DASH exclusion; only the now-redundant NONE/ALL checks are dropped
    • src/rpc/node.cpp: removes only the "none"/"0" help line; Dash's "dash" and "deactivate all" help lines stay

How Has This Been Tested?

Breaking Changes

None beyond the upstream changes themselves.

Checklist:

  • I have performed a self-review of my own code
  • I have made corresponding changes to the documentation
  • I have assigned this pull request to a milestone (for repository code-owners and collaborators only)

@DCG-Claude

DCG-Claude commented Nov 16, 2026 •

Copy link
Copy Markdown
Collaborator Author

Maintainer controls

Tick a box; backportsys acts within a few minutes, then clears it. For other requests, leave a review comment.

  • 🔒 Hands off — stop every automated update to this branch
  • 🔄 Rebase onto current develop
  • ❌ Close — abandon this batch and release its items

Hands off persists after its box clears: no automated branch updates until operator release (not tracker Release hold). Close abandons the batch and releases its items.

Review confidence

🟡 3/5 overall (1 at 5/5, 1 at 4/5, 2 at 3/5).

How sure the system is that each commit is exactly right, so how much review it needs: 5 clean or plainly correct, a glance · 4 small adaptations, check the noted spots · 3 real judgment calls, review them · 2 substantial or risky, review in full · 1 not checked, or the system doubts it. The independent reviewer gives the score; a failed check or an open decision below caps it. Below 5 the cause of concern says why. The adapting lane's explanations are in the PR description and each commit body.

Upstream Confidence Cause of concern Where it differs from upstream
bitcoin#29421 🟡 3/5 Dash's compile-time check that every message name fits in COMMAND_SIZE (the static_assert inside MAKE_MSG, from dash#4614) is dropped without a replacement. Only the runtime assert in CMessageHeader's constructor is left, although static_asserts on the new constexpr constants in protocol.h could have kept the check. All current names are 12 characters or fewer, so nothing breaks today. It needs a maintainer decision (listed below). Check: src/protocol.h: decide whether to restore the compile-time COMMAND_SIZE length check from dash#4614 (e.g. static_assert over the constexpr NetMsgType constants); src/protocol.h: confirm the Dash message strings and the order of ALL_NET_MESSAGE_TYPES are unchanged from the old protocol.cpp (they matched when I compared) Dash code differs from upstream in src/net.cpp, src/net_processing.cpp, src/protocol.cpp, src/protocol.h; edits a Dash-only line in src/protocol.h: extern const char* QUORUMROTATIONINFO;; docs/tests/build differ in test/fuzz/test_runner.py
bitcoin#29419 🟡 3/5 LogCategoryToStr used to cover Dash's combined NET_NETCONN flag through an explicit switch case. It now relies on one extra Dash-only emplace into the derived flag map, and the logging unit tests do not exercise that flag. It needs a maintainer decision (listed below). Check: src/logging.cpp: confirm the out.emplace(BCLog::NET_NETCONN, "net|netconn") addition in the LOG_CATEGORIES_BY_FLAG lambda covers the only combined flag passed to LogPrint (DASH and ALL are already i Dash code differs from upstream in src/logging.cpp, src/logging.h
bitcoin#29752 🟢 4/5 When a block is rebuilt from extra transactions, the short ID is now computed from GetInstanceHash(), while the duplicate check still compares GetHash(). Dash code already behaved this way before the commit, but for re-signed v2+ asset-unlock transactions the two hashes differ, so a reviewer should confirm that keeping GetHash() in the duplicate check is intended. Check: src/blockencodings.cpp: confirm that GetInstanceHash() for the short ID and GetHash() for the duplicate check is intended for v2+ asset unlocks, where the two hashes differ.; src/net_processing.cpp: confirm that both the emplace_back branch and the ring-buffer overwrite branch of Dash's AddToCompactExtraTransactions now store a plain CTransactionRef. Dash code differs from upstream in src/blockencodings.cpp, src/net_processing.cpp; docs/tests/build differ in src/test/blockencodings_tests.cpp, src/test/fuzz/partially_downloaded_block.cpp; skips upstream hunks as not needed in Dash: src/blockencodings.cpp, src/blockencodings.h, src/test/blockencodings_tests.cpp
bitcoin#29798 🟢 5/5 none Dash code differs from upstream in src/logging.cpp, src/logging.h; same lines as upstream, placement adapted for Dash in src/rpc/node.cpp

Needs maintainer input

Local checks without a pass or fail result (fork CI's full run covers these):

Fork gate: thepastaclaw#149 at a301cb8 (CI green).

@thepastaclaw

thepastaclaw commented Nov 16, 2026 •

Copy link
Copy Markdown
Collaborator

♻️ No change to this PR's diff since commit e359425 (an empty commit, a merge of the base or a rebase onto it): that review stands — approved; @thepastaclaw review asks for a review of this commit (commit a301cb8)

@coderabbitai

coderabbitai Bot commented Nov 16, 2026 •

Copy link
Copy Markdown

Explain Change →

No actionable comments were generated in the recent review.

Walkthrough

The change updates logging category parsing, conversion, listing, and help text. It defines protocol message names and ALL_NET_MESSAGE_TYPES inline in protocol.h, and updates callers to use that array. Compact-block extra transactions now pass as transaction references, with short IDs computed from instance hashes.

Estimated code review effort: 3 (Moderate) | ~25 minutes

Merge Risk: Minimal · up to e3594

This backport refactors logging category handling, the protocol message catalog and compact-block extra-transaction storage without a visible behavior regression. The remaining item is to set a milestone on the pull request, which a CI check requires before merging.

Pre-merge checks: Passed 4

Check name Status Explanation
Title check Passed The title names four Bitcoin Core backports (bitcoin#29421, #29752, #29419, #29798) that match the changeset. It lists PR numbers only and does not describe the individual changes, so it is partially …
Linked Issues check Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check Passed Check skipped because no linked issues were found for this pull request.
Description check Passed The description lists four backported Bitcoin Core pull requests (#29421, #29419, #29752, #29798). It explains the protocol.h message-type constants, the logging category map, the compact-block extra-…
Full details: Title check

Explanation

The title names four Bitcoin Core backports (bitcoin#29421, #29752, #29419, #29798) that match the changeset. It lists PR numbers only and does not describe the individual changes, so it is partially descriptive but still accurately tied to the main change, which is the backport set.

Full details: Description check

Explanation

The description lists four backported Bitcoin Core pull requests (#29421, #29419, #29752, #29798). It explains the protocol.h message-type constants, the logging category map, the compact-block extra-transaction change, and the logging help text. Each item matches the raw summary of changed files. The description also gives the Dash adaptations and test results, so it is related to the changeset.

Finishing Touches

Generate unit tests (beta)

  • Create a new PR
  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

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

Recent review info

Run configuration

  • Source mode: Auto
  • Repository: Unavailable
  • Branch: Unavailable
  • File: No configuration file from this repository applied
  • Commit: Unavailable
  • Layers: Repository UI
  • Review profile: CHILL
  • Plan: Advanced
  • Run ID: 9c439a87-a1f4-46f3-b755-d63d6cf50910
Commits

Reviewing files that changed from the base of the PR and between 53ee205 and e359425.

Files selected for processing: 15

  • src/blockencodings.cpp
  • src/blockencodings.h
  • src/init/common.cpp
  • src/logging.cpp
  • src/logging.h
  • src/net.cpp
  • src/net_processing.cpp
  • src/protocol.cpp
  • src/protocol.h
  • src/rpc/node.cpp
  • src/test/blockencodings_tests.cpp
  • src/test/fuzz/p2p_transport_serialization.cpp
  • src/test/fuzz/partially_downloaded_block.cpp
  • src/test/fuzz/process_message.cpp
  • test/fuzz/test_runner.py
Files with no reviewable changes: 1

  • src/rpc/node.cpp

Included review availability: This review used your included allowance. Your plan provides up to 4 included reviews per hour; 1 remain after this review.

@thepastaclaw thepastaclaw left a comment •

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.

Final validation — Phase 1 + Phase 2

Updated after discussion: 1 finding(s) of this review were settled in the inline threads.

  • ✅ Withdrawn: 💬 Stale extra-transaction API comment remains

The backport range is functionally sound and the available lint, cppcheck, fuzz-build, and depends checks pass. One stale API comment remains after the compact-block extra-transaction container changed from hash/reference pairs to transaction references; source builds are still queued or in progress, with no failed code checks reported.

💬 1 0 nitpick(s)

Approved: nothing here blocks the merge. The non-blocking findings are optional: fix them forward, in this PR or a follow-up, without waiting for another review round.

Review provenance

Source: reviewer 1: muse-spark-1.3-contributor (agent: phase1-reviewer, role: general); reviewer 2: gpt-6.1-sol (agent: phase2-reviewer, role: general); reviewer 3: gpt-6.1-sol (agent: phase2-reviewer, role: backport-reviewer); reviewer 4: gpt-6.1-sol (agent: phase2-reviewer, role: dash-core-commit-history); reviewer 5: gpt-6.1-sol (agent: phase2-reviewer, role: general); reviewer 6: gpt-6.1-sol (agent: phase2-reviewer, role: backport-reviewer); reviewer 7: gpt-6.1-sol (agent: phase2-reviewer, role: dash-core-commit-history); final verifier: gpt-6.1-sol (agent: sol-verifier, role: final-verifier)

  • Triage: normal by gpt-6.1-sol (effort low) — This is a broad but ordinary backport affecting protocol message declarations and network-related call sites, logging, and tests, without the diff itself changing consensus, funds movement, cryptography, or peer-facing network deserialization behavior.
  • Phase 1 reviewers: muse-spark-1.3-contributor — general (completed, effort xhigh); agent phase1-reviewer
  • Phase 1 model: muse-spark-1.3-contributor — not quota-gated; passed over gemini-3.8-flash-high (antigravity quota lookup failed), glm-5.3-flash (not used above high effort; tier asks max)
  • Second Phase-2 pass: on this first full review every Phase-2 reviewer also ran a second, independent time, and the verifier weighed both sets
  • Fresh verifier: gpt-6.1-sol — final-verifier; agent sol-verifier
  • Phase 2 reviewers: gpt-6.1-sol — general (completed, effort high); agent phase2-reviewer, gpt-6.1-sol — backport-reviewer (completed, effort high); agent phase2-reviewer, gpt-6.1-sol — dash-core-commit-history (completed, effort high); agent phase2-reviewer, gpt-6.1-sol — general (completed, effort high); agent phase2-reviewer, gpt-6.1-sol — backport-reviewer (completed, effort high); agent phase2-reviewer, gpt-6.1-sol — dash-core-commit-history (completed, effort high); agent phase2-reviewer
🤖 Prompt for all review comments with AI agents
These findings are from an automated code review (PastaClaw). How to work through them:
- Verify each finding against the code; fix only what is real, as narrowly as the finding.
- If a finding is wrong, decline it on its thread in one or two sentences; the bot answers once and stops.
- To defer one, link a tracking issue on its thread (or reply asking the bot to file one).
- Suggestions don't block the merge, but most are worth fixing in this PR; judge each on its merits.
- Keep the PR's scope; don't grow it to satisfy hardening suggestions.
- Carried items were raised in an earlier round: read the thread first, and don't re-fix what you already fixed, declined or deferred there. Disputed and deferred items are already handled and are not listed.

In `src/blockencodings.h`:
- [NITPICK → WITHDRAWN in discussion; do not fix] src/blockencodings.h:142: Stale extra-transaction API comment remains
  `InitData` now accepts `std::vector<CTransactionRef>`, and the implementation computes the instance hash from each transaction. The comment still describes the argument as being in `<hash, reference>` form, which is no longer accurate and can mislead callers about the required input. Update it to describe a list of transaction references.

Comment thread src/blockencodings.h
@@ -140,7 +140,7 @@ class PartiallyDownloadedBlock {
explicit PartiallyDownloadedBlock(CTxMemPool* poolIn) : pool(poolIn) {}

// extra_txn is a list of extra transactions to look at, in <hash, reference> form

@thepastaclaw thepastaclaw Nov 16, 2026 •

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.

✅ Withdrawn at e3594251; see the replies below.

💬 Nitpick: Stale extra-transaction API comment remains

InitData now accepts std::vector<CTransactionRef>, and the implementation computes the instance hash from each transaction. The comment still describes the argument as being in <hash, reference> form, which is no longer accurate and can mislead callers about the required input. Update it to describe a list of transaction references.

Suggested change
// extra_txn is a list of extra transactions to look at, in <hash, reference> form
// extra_txn is a list of extra transactions to look at

source: muse-spark-1.3-contributor (phase1-reviewer: general); gpt-6.1-sol (phase2-reviewer: general, backport-reviewer, dash-core-commit-history)

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

The backport matches upstream: bitcoin#29752 changed only the InitData signature and left this comment as it was (upstream's merge 7cc9a08 still says "in <witness hash, reference> form"). Rewording it would be a cleanup upstream never made, so it belongs in a separate upstream or Dash change, not this backport.


🤖 backportsys, on behalf of the Dash backport pipeline.

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.

I checked the parent diff and agree that this is an unchanged upstream comment carried through the faithful backport, rather than a Dash-specific adaptation error. The wording is stale relative to the upstream API change, but updating it here would be a separate documentation cleanup, so I withdraw this nitpick for this backport.

Withdrawing this finding.

@thepastaclaw thepastaclaw added the pastaclaw:approved thepastaclaw's latest review approved this PR label Nov 16, 2026
@PastaPastaPasta PastaPastaPasta added this to the 24.1 milestone Nov 16, 2026
@DCG-Claude

Copy link
Copy Markdown
Collaborator Author

CI failed at e359425 on dashpay/dash: linux64_tsan-build / Build source

The linux64_tsan failure is a ThreadSanitizer data race inside the vendored dashbls mimalloc (mi_tld_free vs _mi_meta_free in dashbls/runtest), with no frame from this branch's code; the branch touches no dashbls, sanitizer or CI files. Develop commit 84f36b2 adds race:dashbls/depends/mimalloc/ to test/sanitizer_suppressions/tsan for exactly this stack, and the branch base b46c5d1 doesn't have it, so rebasing onto develop resolves it. This branch is based on b46c5d1c73, older than develop (b3fb478e1b); it is being rebased onto develop and this is looked at again there.


🤖 backportsys, on behalf of the Dash backport pipeline.

…ile time constant

b3efb48 protocol: make message types constexpr (Vasil Dimov)
2fa9de0 net: make the list of known message types a compile time constant (Vasil Dimov)

Pull request description:

  Turn the `std::vector` to `std::array` because it is cheaper and allows us to have the number of the messages as a compile time constant: `ALL_NET_MESSAGE_TYPES.size()` which can be used in future code to build other `std::array`s with that size.

  ---

  This change is part of bitcoin#29418 but it makes sense on its own and would be good to have it, regardless of the fate of bitcoin#29418. Also, if this is merged, that would reduce the size of bitcoin#29418, thus the current standalone PR.

ACKs for top commit:
  achow101:
    ACK b3efb48
  jonatack:
    ACK b3efb48
  maflcko:
    utACK b3efb48 🎊
  willcl-ark:
    ACK b3efb48

Tree-SHA512: 6d3860c138c64514ebab13d97ea67893e2d346dfac30a48c3d9bc769a1970407375ea4170afdb522411ced306a14a9af4eede99e964d1fb1ea3efff5d5eb57af

Dash adaptations:
- src/protocol.h: no FEEFILTER/WTXIDRELAY constants or ALL_NET_MESSAGE_TYPES entries; Dash does not implement feefilter or wtxidrelay
- src/protocol.h: Dash message types (SPORK..PLATFORMBAN) become inline constexpr with their existing strings (e.g. DSACCEPT{"dsa"}) and stay in ALL_NET_MESSAGE_TYPES in Dash's order
- src/protocol.h: adds #include <array> for std::array/std::to_array; upstream's protocol.h already had this include
- src/protocol.cpp: Dash's MAKE_MSG macro and its compile-time COMMAND_SIZE static_assert go away with the definitions; the runtime assert in CMessageHeader's constructor still applies
- src/protocol.cpp: keeps Dash's blocks-only message list and NetMessageViolatesBlocksOnly(); its comment now refers to ALL_NET_MESSAGE_TYPES in protocol.h
- src/net.cpp: Dash-only CalculateNumConnectionsChangedStats() loops now use ALL_NET_MESSAGE_TYPES instead of getAllNetMessageTypes()
- src/net_processing.cpp: Dash-only extension-message lookup in ProcessMessage() now uses ALL_NET_MESSAGE_TYPES instead of getAllNetMessageTypes()
- test/fuzz/test_runner.py: Dash maps NetMsgType names to message strings by parsing the protocol.h constexpr definitions instead of lowercasing (DSACCEPT is "dsa")
- src/test/fuzz/p2p_transport_serialization.cpp: g_all_messages stays outside an anonymous namespace; Dash's version of this file never had that namespace
…codings

a8203e9 refactor: Simplify `extra_txn` to be a vec of CTransactionRef instead of a vec of pair<Wtxid, CTransactionRef> (AngusP)
c3c1843 refactor: Use typesafe Wtxid in compact block encoding message, instead of ambiguous uint256. (AngusP)

Pull request description:

  The first commit replaces `uint256` with typesafe `Wtxid` (or `Txid`) types introduced in bitcoin#28107.

  The second commit then simplifies the extra tx `vector` to just be of `CTransactionRef`s instead of a `std::pair<Wtxid, CTransactionRef>`, as it's easy to get a `Wtxid` from a transaction ref.

ACKs for top commit:
  glozow:
    ACK a8203e9
  dergoegge:
    ACK a8203e9

Tree-SHA512: b4ba1423a8059f9fc118782bd8a668213d229c822f22b01267de74d6ea97fe4f2aad46b5da7c0178ecc9905293e9a0eafba1d75330297c055e27fd53c8c8ebfd

Dash adaptations:
- src/blockencodings.cpp: extra_txn short IDs use GetInstanceHash() instead of GetWitnessHash(), the hash Dash computes short IDs from (no witness in Dash)
- src/blockencodings.cpp: duplicate check keeps Dash's GetHash() comparison instead of upstream's GetWitnessHash(); only the .second access is dropped
- src/net_processing.cpp: stores bare CTransactionRef in Dash's append-until-full ring buffer (bitcoin#35670 backport) instead of upstream's resize-based version
- src/test/blockencodings_tests.cpp: short-ID call sites use GetInstanceHash() where upstream switched to GetWitnessHash(), and the stream stays CDataStream as in Dash

Not applicable to Dash (intentionally omitted):
- src/blockencodings.h: GetShortID(const Wtxid&): Dash has no Wtxid type and its short IDs hash the instance hash, not a witness hash; signature stays uint256
- src/blockencodings.cpp: GetShortID(const Wtxid& wtxid) definition: same reason, Dash keeps GetShortID(const uint256& txhash)
- src/test/blockencodings_tests.cpp: TestHeaderAndShortIDs::GetShortID(const Wtxid&) helper: stays uint256 to match Dash's CBlockHeaderAndShortTxIDs::GetShortID
…ing.cpp

b0344c2 logging: remove unused BCLog::UTIL (Vasil Dimov)
d3b3af9 log: deduplicate category names and improve logging.cpp (Vasil Dimov)

Pull request description:

  The code in `logging.cpp` needs to:
  * Get the category name given the flag (e.g. `BCLog::PRUNE` -> `"prune"`)
  * Get the flag given the category name (e.g. `"prune"` -> `BCLog::PRUNE`)
  * Get the list of category names sorted in alphabetical order

  Achieve this by using the proper std containers. The result is
  * less code (the diff of the first commit is +62 / -129)
  * faster code (to linear search and no copy+sort)
  * more maintainable code (the categories are no longer duplicated in `LogCategories[]` and `LogCategoryToStr()`)

  This behavior is preserved:
  `BCLog::NONE` -> `""` (lookup by `LogCategoryToStr()`)
  `""` -> `BCLog::ALL` (lookup by `GetLogCategory("")`)

  ---

  Also remove unused `BCLog::UTIL`.

  ---

  These changes (modulo the `BCLog::UTIL` removal) are part of bitcoin#29415 but they make sense on their own and would be good to have them, regardless of the fate of bitcoin#29415. Also, if this is merged, that would reduce the size of bitcoin#29415, thus the current standalone PR.

ACKs for top commit:
  davidgumberg:
    crACK bitcoin@b0344c2
  pinheadmz:
    ACK b0344c2
  ryanofsky:
    Code review ACK b0344c2. Nice cleanup! Having to maintain multiple copies of the same mapping seemed messy and a like a possible footgun. I checked old and new mappings in both directions and confirmed no behavior should be changing.

Tree-SHA512: 57f87a090932f9b33dc8e075d1855dba9b71a3243a0758511745483dec2d9c46d3b532eadab297e78164c9b7caba370986ee380696a45f0778a841082f8e21a7

Dash adaptations:
- src/logging.cpp: LOG_CATEGORIES_BY_STR uses Dash's enum names BCLog::BENCHMARK and BCLog::RANDOM (Dash never renamed them to BENCH/RAND); the strings "bench"/"rand" are unchanged
- src/logging.cpp: Dash categories (chainlocks, gobject, instantsend, llmq, llmq-dkg, llmq-sigs, mnpayments, mnsync, coinjoin, spork, netconn, creditpool, ehf, dash) move into LOG_CATEGORIES_BY_STR in string->flag form
- src/logging.cpp: LOG_CATEGORIES_BY_FLAG also maps NET_NETCONN to "net|netconn", which Dash's removed switch returned; it is not a parseable category so it cannot go in the string map
- src/logging.cpp: LogCategoriesList keeps Dash's enabled_only parameter and its exclusion of the BCLog::DASH group flag, now looping over LOG_CATEGORIES_BY_STR
- src/logging.h: UTIL removal (bitcoin commit b0344c2) only renumbers BLOCKSTORAGE..TXPACKAGES to bits 25..28; Dash never had UTIL, and Dash's 64-bit flags and ALL = ~(uint64_t)0 are kept
a7432dd logging: clarify -debug and -debugexclude descriptions (Anthony Towns)
74dd33c rpc: make logging method reject "0" category and correct the help text (Vasil Dimov)
8c6f3bf logging, refactor: minor encapsulation improvement and use BCLog::NONE instead of 0 (Vasil Dimov)
160706a logging, refactor: make category special cases explicit (Ryan Ofsky)

Pull request description:

  * Move special cases from `LOG_CATEGORIES_BY_STR` to `GetLogCategory()` (suggested [here](bitcoin#29419 (comment))).

  * Remove `"none"` and `"0"` from RPC `logging` help because that help text was wrong. `"none"` resulted in an error and `"0"` was ignored itself (contrary to what the help text suggested).

  * Remove unused `LOG_CATEGORIES_BY_STR[""]` (suggested [here](bitcoin#29419 (comment))).

  This is a followup to bitcoin#29419, addressing leftover suggestions + more.

ACKs for top commit:
  LarryRuane:
    ACK a7432dd
  ryanofsky:
    Code review ACK a7432dd. Only changes since last review are removing dead if statement and adding AJ's suggested -debug and -debugexclude help improvements, which look accurate and much more clear.

Tree-SHA512: 41b997b06fccdb4c1d31f57d4752c83caa744cb3280276a337ef4a9b7012a04eb945071db6b8fad24c6a6cf8761f2f800fe6d8f3d8836f5b39c25e4f11c85bf0

Dash adaptations:
- src/logging.h: m_categories keeps Dash's std::atomic<uint64_t> type (Dash has 64-bit LogFlags); only the initializer becomes BCLog::NONE as upstream
- src/logging.cpp: LOG_CATEGORIES_BY_STR keeps Dash's plain std::map (no std::less<>, which comes from a separate string_view PR) and its Dash categories; only the 0/""/1/all entries are removed
- src/logging.cpp: LogCategoriesList keeps Dash's enabled_only filter and BCLog::DASH exclusion; only the now-redundant NONE/ALL checks are dropped
- src/rpc/node.cpp: removes only the "none"/"0" help line; Dash's "dash" and "deactivate all" help lines stay
@DCG-Claude
DCG-Claude force-pushed the backport-0.28-b011-src branch from e359425 to a301cb8 Compare November 16, 2026 05:14
@thepastaclaw thepastaclaw added pastaclaw:approved thepastaclaw's latest review approved this PR and removed pastaclaw:approved thepastaclaw's latest review approved this PR labels Nov 16, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

pastaclaw:approved thepastaclaw's latest review approved this PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants