Fix CMPCTBLOCK handler scope mismatch in net_processing.cpp#3
Merged
packetloss404 merged 6 commits intomainfrom Jan 26, 2026
Merged
Fix CMPCTBLOCK handler scope mismatch in net_processing.cpp#3packetloss404 merged 6 commits intomainfrom
packetloss404 merged 6 commits intomainfrom
Conversation
- Move variable declarations (fProcessBLOCKTXN, blockTxnMsg, fRevertToHeaderProcessing, pblock, fBlockReconstructed) outside the LOCK(cs_main) scope so they remain accessible after the lock is released - Add missing closing brace for LOCK(cs_main) scope - Fix whitespace on empty line (remove stray tabs) - Update comments to clarify which scope each closing brace belongs to This completes the partial merge conflict resolution from commit bcb9aed.
Non-consensus security improvements: 1. Update miniupnpc 2.0.20180203 -> 2.2.2 - Fixes infinite loop vulnerability (local network DoS) - New patch: dont_leak_info.patch (reduces User-Agent fingerprinting) 2. Add mutated blocks protection (hindered block propagation fix) - MarkBlockAsReceived() now accepts optional from_peer parameter - Only clears download state if peer matches the original requester - Prevents malicious peers from interfering with block relay These are P2P/networking layer fixes only - no consensus changes.
- Document all backported security fixes (CVE-2023-33297, CVE-2024-35202, mutated blocks fix, miniupnpc update) - Update description to mention 0.21.4 security parity - Update credits section
- Build on macos-13 runner - Install dependencies via Homebrew (Qt5, Boost, OpenSSL, BerkeleyDB4) - Produce defcoin-macos-x64 artifact with all binaries - Completes cross-platform CI: Linux, Windows, macOS
…21.3) - Add context menu option to rebroadcast unconfirmed transactions - Useful for stuck transactions that haven't propagated to the network - Only enabled for unconfirmed, non-abandoned, non-coinbase transactions Changes: - interfaces/wallet.h: Add transactionCanBeRebroadcast() and rebroadcastTransaction() - interfaces/wallet.cpp: Implement wallet interface methods using SubmitMemoryPoolAndRelay - qt/transactionview.h: Add rebroadcastAction and rebroadcastTx() slot - qt/transactionview.cpp: Add menu action, connect slot, implement rebroadcast logic
- Add export button to console tab to save console history to a text file - Add node uptime display to Information tab (updates every second) - Add average peer ping display to Network section in Information tab - Reorganize Information tab rows to accommodate new fields
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
2 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.
fRevertToHeaderProcessing, pblock, fBlockReconstructed) outside the
LOCK(cs_main) scope so they remain accessible after the lock is released
This completes the partial merge conflict resolution from commit bcb9aed.