[23.x] Final rc4 backports #24807

1. 
   fanquake commented at 12:29 pm on April 8, 2022: member

   Backports:

   • #24770
   • #24806
2. Put lock logging behind DEBUG_LOCKCONTENTION preprocessor directive

   Github-Pull: #24770
   Rebased-From: 39a34b6877945908759f6a2322f60852e521e2ee

   6374e24887
3. Add DEBUG_LOCKCONTENTION documentation to the developer notes

   Github-Pull: #24770
   Rebassedd-From: 43947333315d07f59e1247bd76e0ba9d35a99e31

   69cc83df69
4. RPC: Switch getblockfrompeer back to standard param name blockhash

   This commit partially reverts 923312fbf6a89efde1739da0b7209694d4f892ba.
   
   Github-Pull: #24806
   Rebased-From: 88917f93cc01b5e881072b0e476b74d20b7673c4

   e3e4be9cd5
5. fanquake added the label Backport on Apr 8, 2022
6. fanquake added this to the milestone 23.0 on Apr 8, 2022
7. 
   laanwj commented at 12:41 pm on April 8, 2022: member

   Commit list and code review ACK e3e4be9cd513c85311634a8128e018dbf8748888 Concept ACK on reverting only the block_hash change (as discussed on IRC 2022-04-08).
8. 
   jonatack commented at 12:44 pm on April 8, 2022: member

   Code review and commit metadata ACK e3e4be9cd513c85311634a8128e018dbf8748888
9. laanwj merged this on Apr 8, 2022
10. laanwj closed this on Apr 8, 2022

    ---

11. fanquake deleted the branch on Apr 8, 2022
12. DrahtBot locked this on Apr 8, 2023

Contributors
fanquake laanwj jonatack

Labels
Backport

Milestone
23.0