Rename CalculateHeadersWork to CalculateClaimedHeadersWork #29569

pull instagibbs wants to merge 1 commits into bitcoin:master from instagibbs:2024-03-claimed_work changing 4 files +9 −9

instagibbs commented at 3:07 PM on March 5, 2024: member

And clean up some comments. Confusion about what this is doing seems to be a running theme:

#29549 (review)

#27278 (review)
Rename CalculateHeadersWork to CalculateClaimedHeadersWork eb7cc9fd21
DrahtBot commented at 3:07 PM on March 5, 2024: contributor



The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.



Code Coverage

For detailed information about the code coverage, see the test coverage report.



Reviews

See the guideline for information on the review process.

Type Reviewers

ACK pablomartin4btc, 0xB10C, dergoegge, BrandonOdiwuor, achow101

If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.
pablomartin4btc commented at 5:34 PM on March 5, 2024: member

ACK eb7cc9fd2140df77acc6eb42004cf45b260bc629

Type	Reviewers
ACK	pablomartin4btc, 0xB10C, dergoegge, BrandonOdiwuor, achow101

in src/net_processing.cpp:4749 in eb7cc9fd21

4743 | @@ -4744,8 +4744,8 @@ void PeerManagerImpl::ProcessMessage(CNode& pfrom, const std::string& msg_type,
4744 |              // cs_main in ProcessNewBlock is fine.
4745 |              mapBlockSource.emplace(hash, std::make_pair(pfrom.GetId(), true));
4746 |  
4747 | -            // Check work on this block against our anti-dos thresholds.
4748 | -            if (prev_block && prev_block->nChainWork + CalculateHeadersWork({pblock->GetBlockHeader()}) >= GetAntiDoSWorkThreshold()) {
4749 | +            // Check claimed work on this block against our anti-dos thresholds.
4750 | +            if (prev_block && prev_block->nChainWork + CalculateClaimedHeadersWork({pblock->GetBlockHeader()}) >= GetAntiDoSWorkThreshold()) {
4751 |                  min_pow_checked = true;

0xB10C commented at 8:44 AM on March 6, 2024:

nit: I also found min_pow_checked confusing. At least I read "PoW checked" at first.

instagibbs commented at 7:17 PM on March 6, 2024:

agreed it's also confusing, but it's also called that down the call stack for a bit, so I kept scope to here

0xB10C approved
0xB10C commented at 8:48 AM on March 6, 2024: contributor

ACK eb7cc9fd2140df77acc6eb42004cf45b260bc629

I misinterpreted CalculateHeadersWork - CalculateClaimedHeadersWork is a bit clearer.
dergoegge approved
dergoegge commented at 9:24 AM on March 6, 2024: member

ACK eb7cc9fd2140df77acc6eb42004cf45b260bc629
BrandonOdiwuor approved
BrandonOdiwuor commented at 4:08 PM on March 8, 2024: contributor

ACK eb7cc9fd2140df77acc6eb42004cf45b260bc629
achow101 commented at 2:31 AM on March 9, 2024: member

ACK eb7cc9fd2140df77acc6eb42004cf45b260bc629
achow101 merged this on Mar 9, 2024
achow101 closed this on Mar 9, 2024
bitcoin locked this on Mar 9, 2025

Contributors

Linked (view graph)

#27278 Log new headers #29549 p2p: log mutated blocks when unknown & valid PoW

Rename CalculateHeadersWork to CalculateClaimedHeadersWork #29569

Code Coverage

Reviews