Uh oh!
There was an error while loading. Please reload this page.
fix: remove cs_main from MaybePunishNodeForTx, missing changes from #19607 - #7332
Conversation
✅ No Merge Conflicts DetectedThis PR currently has no conflicts with other open PRs. |
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Repository UI Review profile: CHILL Plan: Pro Run ID: 📒 Files selected for processing (1)
WalkthroughThis pull request removes a scoped Estimated code review effort🎯 2 (Simple) | ⏱️ ~8 minutes Suggested reviewers
🚥 Pre-merge checks | ✅ 4 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (4 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
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. Comment |
thepastaclaw
left a comment
There was a problem hiding this comment.
Code Review
Small, correct cleanup completing the bitcoin#19607 backport. Removes a stale LOCK(cs_main) around Misbehaving(nodeid, 100) in MaybePunishNodeForTx. Misbehaving() is internally guarded by peer->m_misbehavior_mutex and does not require cs_main; the sibling MaybePunishNodeForBlock already calls it the same way. Both reviewers (Claude and Codex, plus backport specialists) independently reached the same conclusion with no findings.
Uh oh!
There was an error while loading. Please reload this page.
…hanges from bitcoin#19607eb769ab fix: remove cs_main from PeerManagerImpl::MaybePunishNodeForTx, missing changes from bitcoin#19607 (Konstantin Akimov) Pull request description: ## Issue being fixed or feature implemented Helper MaybePunishNodeForTx has been introduced when bitcoin#19607 is done, it caused missing changes. ## What was done? Removed cs_main from MaybePunishNodeForTx ## How Has This Been Tested? N/A ## Breaking Changes N/A ## Checklist: - [x] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have added or updated relevant unit/integration/functional/e2e tests - [ ] I have made corresponding changes to the documentation - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ ACKs for top commit: PastaPastaPasta: utACK eb769ab Tree-SHA512: ce9b26d5dd3036d1b8b5ff7f302e813b6c3e776f0132d8cdca5ccabbd9f485fd93cd55629c73d576362723f6f35fcc528c4be0ad3d3ae64aca6dd4546d913cbd
…isbehaving() 89fd0a9 Merge bitcoin#25144: refactor: Pass Peer& to Misbehaving() (Konstantin Akimov) Pull request description: ## What was done? After all refactorings to separate network and consensus code it's finally possible to do bitcoin#25144 Depends on #7314, #7332 - both are merged. ## How Has This Been Tested? Run unit & functional tests ## Breaking Changes N/A ## Checklist: - [x] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have added or updated relevant unit/integration/functional/e2e tests - [ ] I have made corresponding changes to the documentation - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ ACKs for top commit: PastaPastaPasta: utACK 89fd0a9 Tree-SHA512: b065464e7b47139559319f5249d52ce13824d84befb2fc4165ecf64c72428dd750c4f876dabb085d3122c64bb8c2aa98e734833f0b421efd6685e36d3288565c
01640b9 chore: prepare v23.1.5 release (PastaClaw) c3e3b9d fix: correct v23.1.4 checkpoint hash (PastaClaw) 10b6309 docs: use standard bug fixes wording (PastaClaw) 0495b47 docs: refine v23.1.4 release intro (PastaClaw) 3826688 docs: fix v23.1.4 release notes title (PastaClaw) 2068176 Merge #7317: fix: drop `virtual` specifier for `CZMQNotificationInterface` dtor (pasta) 9a463a2 test: early bail-out for huge QSIGSHARESINV and QGETSIGSHARES (Konstantin Akimov) 3426458 fix: early bail-out for huge QSIGSHARESINV and QGETSIGSHARES (Konstantin Akimov) b9c6b95 chore: version bump, man pages, flatpak, release notes for release v23.1.4 (Konstantin Akimov) 6f7a0ef chore: version bump, man pages, flatpak, release notes for release v23.1.4 (Konstantin Akimov) 78bb4c4 Merge #7359: fix: make huge asset lock tx non-standard (pasta) 5962016 chore: update min-chainwork, checkpoints and seeds for v23.1.4 (Konstantin Akimov) 99305fb test: add test for duplicated platform-node-id in mempool (Konstantin Akimov) 78b8274 fix: don't let 2 protx with the same platform-id to be presented in mempool (Konstantin Akimov) 54187cd perf: avoid re-validation of ehf signals during block-connect (Konstantin Akimov) 47fa631 Merge #7352: perf: optimize division to uint32 to make re-target-pow calculation much faster (pasta) d93f755 Merge #7332: fix: remove cs_main from MaybePunishNodeForTx, missing changes from bitcoin#19607 (pasta) Pull request description: # chore: merge master 23.1.5 back into develop ## Issue being fixed or feature implemented Backmerge current `master` into `develop` so the active development branch includes the `v23.1.4` and `v23.1.5` release-line changes. ## What was done? Merged `upstream/master` (`v23.1.5`, `5dde61050d20c23c3e179c34e663a025f56843f3`) into `upstream/develop`. Carried forward release metadata and generated artifacts for `v23.1.4` and `v23.1.5`, including version metadata, man pages, release notes, checkpoints, chainTxData, minimum chain work, assume-valid data, and seed updates. Resolved conflicts in Dash-specific code while preserving develop-only refactors: - Kept develop's `CChainstateHelper` ownership layout and `SuperblockManager` integration. - Carried forward the EHF block-connect optimization without reintroducing the removed `CMNHFManager` quorum-manager member. - Carried forward the LLMQ signing-share inventory bounds into develop's `NetSigning` split. - Carried forward the Platform node ID mempool conflict handling and its functional test coverage. ## How Has This Been Tested? - Ran `git diff --check upstream/develop...HEAD`. - Scanned changed files for conflict markers. - Verified the corrected `CMNHFManager` constructor call after conflict resolution. - Ran the required pre-PR `code-review` gate against the backmerge branch; final recommendation was `ship` with no significant issues found. No local build was run; this is a release backmerge and CI should run the full Dash Core PR build/test matrix. ## Breaking Changes None expected. This is a backmerge from the release branch into `develop`. ## Checklist - [x] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [x] I have added or updated relevant unit/integration/functional/e2e tests - [x] I have made corresponding changes to the documentation - [ ] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ Top commit has no ACKs. Tree-SHA512: 1a828c9acd5fe87617f3ab11ca1b5b13656adc61e591b58d68b685bba7404696afa664c53cc752dfbaca7fe08439d9428f33116f475c18c0959293460062b284
Issue being fixed or feature implemented
Helper MaybePunishNodeForTx has been introduced when bitcoin#19607 is done, it caused missing changes.
What was done?
Removed cs_main from MaybePunishNodeForTx
How Has This Been Tested?
N/A
Breaking Changes
N/A
Checklist: