contrib: Remove keys that are no longer used for merging #25197

1. 
   hebasto commented at 12:14 pm on May 24, 2022: member

   See:

   • https://bitcoin-irc.chaincode.com/bitcoin-core-dev/2021-10-21#726591
   • https://bitcoin-irc.chaincode.com/bitcoin-core-dev/2021-12-09#750000

   Also updated trusted-git-root to be right after meshcollider’s last merge.

   The latest similar change was bitcoin/bitcoin#7713.

   A related discussion on IRC:

   12:28 <MarcoFalke> jonasschnelli: I was about to ask you whether you planned to remove your fingerprint from the “trusted-keys” for merging, but it looks like this will break verify-commits … 12:31 <laanwj> you would also have a add all his merge commits to exceptions, i guess 12:32 <laanwj> or patch the script to allow different key for different ranges of commits 13:15 <jonasschnelli> MarcoFalke: I had no plan to remove my keyid,… would that make sense and how would you fix verify commits? 13:16 <jonasschnelli> Ideally, we should set en expiration date next to those keyid

2. contrib: Remove keys that are no longer used for merging

   See:
   https://bitcoin-irc.chaincode.com/bitcoin-core-dev/2021-10-21#726591
   https://bitcoin-irc.chaincode.com/bitcoin-core-dev/2021-12-09#750000
   
   Also updated trusted-git-root to be right after meshcollider's last
   merge.

   d4b3dc5b0a
3. in contrib/verify-commits/trusted-keys:3 in d4b3dc5b0a

   0@@ -1,8 +1,6 @@
   1 71A3B16735405025D447E8F274810B012346C9A6
   2 133EAC179436F14A5CF1B794860FEB804E669320
   3-32EE5C4C3FA15CCADB46ABE529D4BCB6416F53EC
   

   ---

   ---

   

   laanwj commented at 12:51 pm on May 24, 2022:

   0pub   rsa4096/0x29D4BCB6416F53EC 2015-05-22 [SC] [expires: 2027-05-19]
   1      32EE5C4C3FA15CCADB46ABE529D4BCB6416F53EC
   2uid                   [ unknown] Jonas Schnelli <dev@jonasschnelli.ch>
   

4. in contrib/verify-commits/trusted-keys:5 in d4b3dc5b0a

   0@@ -1,8 +1,6 @@
   1 71A3B16735405025D447E8F274810B012346C9A6
   2 133EAC179436F14A5CF1B794860FEB804E669320
   3-32EE5C4C3FA15CCADB46ABE529D4BCB6416F53EC
   4 B8B3F1C0E58C15DB6A81D30C3648A882F4316B9B
   5-CA03882CB1FC067B5D3ACFE4D300116E1C875A3D
   

   ---

   ---

   

   laanwj commented at 12:51 pm on May 24, 2022:

   0pub   rsa4096/0xD300116E1C875A3D 2017-07-13 [SC] [expires: 2033-07-09]
   1      CA03882CB1FC067B5D3ACFE4D300116E1C875A3D
   2uid                   [ unknown] MeshCollider <dobsonsa68@gmail.com>
   

5. DrahtBot added the label Scripts and tools on May 24, 2022
6. laanwj approved
7. 
   laanwj commented at 1:46 pm on May 24, 2022: member

   Changes LGTM, however when running locally I run into this verification issue:

   0bitcoin$ contrib/verify-commits/verify-commits.py
   1Using verify-commits data from …
   2
   3No parent of e658b0e49bee257e197dd8ca37ee3ffa73092d92 was signed with a trusted key!
   4Parents are:
   5commit 19e3e654293858141f39eef8fdae0badd224090f
   6Merge: 9b48b3ac42294410cb56e7da24a261fa69ddb503 915e34112b5a4c2ef391d7e3706603bcd6f62a2a
   7Author: MarcoFalke <falke.marco@gmail.com>
   8Date:   Fri Mar 26 17:30:18 2021 +0100
   

   This seems to be an old expired key of Marco Falke (60B0B8A402FB386B24A039ACD2EA4850E7528B25). I don’t think it’s caused by this change.

8. 
   fanquake commented at 8:23 am on May 25, 2022: member

   Concept ACK
9. 
   MarcoFalke commented at 8:29 am on May 25, 2022: member

   Commit 19e3e654293858141f39eef8fdae0badd224090f should be buried far under the trusted root 577bd51a4b8de066466a445192c1c653872657e2, so I don’t see how it could be considered even or cause a failure.
10. 
    laanwj commented at 10:57 am on May 25, 2022: member

    Commit https://github.com/bitcoin/bitcoin/commit/19e3e654293858141f39eef8fdae0badd224090f should be buried far under the trusted root https://github.com/bitcoin/bitcoin/commit/577bd51a4b8de066466a445192c1c653872657e2, so I don’t see how it could be considered even or cause a failure.

    Apparently I don’t know how to use the script, then. It also took almost a hour to run.

11. 
    laanwj commented at 11:27 am on May 25, 2022: member

    I just retried, it works now:

     0$ git fetch upstream pull/25197/head
     1From github.com:bitcoin/bitcoin
     2 * branch                                                                              refs/pull/25197/head -> FETCH_HEAD
     3$ git checkout FETCH_HEAD
     4Note: switching to 'FETCH_HEAD'.
     5…
     6HEAD is now at d4b3dc5b0a726cc4cc7a8467be43126e78f841cf contrib: Remove keys that are no longer used for merging
     7$ git reset --soft HEAD~1  # get rid of unsigned top-level commit, but keep changes in local tree
     8$ contrib/verify-commits/verify-commits.py
     9Using verify-commits data from /store/orion/projects/bitcoin/bitcoin/contrib/verify-commits
    10There is a valid path from "HEAD" to 577bd51a4b8de066466a445192c1c653872657e2 where all commits are signed!
    

    ACK d4b3dc5b0a726cc4cc7a8467be43126e78f841cf

12. laanwj merged this on May 25, 2022
13. laanwj closed this on May 25, 2022

    ---

14. hebasto deleted the branch on May 25, 2022
15. DrahtBot locked this on May 25, 2023

Contributors
hebasto laanwj fanquake MarcoFalke

Labels
Scripts and tools