From fab8bc03082d4e10b5c8008b96d2951991746064 Mon Sep 17 00:00:00 2001
From: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz>
Date: Fri, 16 Jan 2026 13:54:39 +0100
Subject: [PATCH 1/2] contrib: Revert "verify-commits sha1 exceptions"

This reverts commit 8ac134be5e57680eb1c6ef596e5de085825e83ee, because it
is no longer needed.
---
 contrib/verify-commits/allow-sha1-commits | 1 -
 contrib/verify-commits/verify-commits.py  | 4 ----
 2 files changed, 5 deletions(-)
 delete mode 100644 contrib/verify-commits/allow-sha1-commits

diff --git a/contrib/verify-commits/allow-sha1-commits b/contrib/verify-commits/allow-sha1-commits
deleted file mode 100644
index 95650029eb7..00000000000
--- a/contrib/verify-commits/allow-sha1-commits
+++ /dev/null
@@ -1 +0,0 @@
-aeaa67a9eac0decb89c60a67f9755ca10cbcc1d9
diff --git a/contrib/verify-commits/verify-commits.py b/contrib/verify-commits/verify-commits.py
index a0eaf8cdbc5..1af6b0314e1 100755
--- a/contrib/verify-commits/verify-commits.py
+++ b/contrib/verify-commits/verify-commits.py
@@ -94,8 +94,6 @@ def main():
         incorrect_sha512_allowed = f.read().splitlines()
     with open(dirname + "/trusted-keys", "r") as f:
         trusted_keys = f.read().splitlines()
-    with open(dirname + "/allow-sha1-commits", "r") as f:
-        sha1_allowed = f.read().splitlines()
 
     # Set commit and variables
     current_commit = args.commit
@@ -138,8 +136,6 @@ def main():
 
 
         os.environ['BITCOIN_VERIFY_COMMITS_ALLOW_SHA1'] = "0" if no_sha1 else "1"
-        if current_commit in sha1_allowed:
-            os.environ['BITCOIN_VERIFY_COMMITS_ALLOW_SHA1'] = "1"
         allow_revsig = current_commit in revsig_allowed
 
         # Check that the commit (and parents) was signed with a trusted key

From fa38ffac6ff560bf76a2bfa48a300a79d31ba466 Mon Sep 17 00:00:00 2001
From: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz>
Date: Fri, 16 Jan 2026 14:40:29 +0100
Subject: [PATCH 2/2] contrib: [refactor] Use shorter read_text from pathlib

---
 contrib/verify-commits/verify-commits.py | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/contrib/verify-commits/verify-commits.py b/contrib/verify-commits/verify-commits.py
index 1af6b0314e1..b053fbd1ffe 100755
--- a/contrib/verify-commits/verify-commits.py
+++ b/contrib/verify-commits/verify-commits.py
@@ -7,6 +7,7 @@ import argparse
 import hashlib
 import logging
 import os
+from pathlib import Path
 import subprocess
 import sys
 import time
@@ -80,20 +81,14 @@ def main():
     args = parser.parse_args()
 
     # get directory of this program and read data files
-    dirname = os.path.dirname(os.path.abspath(__file__))
-    print("Using verify-commits data from " + dirname)
-    with open(dirname + "/trusted-git-root", "r") as f:
-        verified_root = f.read().splitlines()[0]
-    with open(dirname + "/trusted-sha512-root-commit", "r") as f:
-        verified_sha512_root = f.read().splitlines()[0]
-    with open(dirname + "/allow-revsig-commits", "r") as f:
-        revsig_allowed = f.read().splitlines()
-    with open(dirname + "/allow-unclean-merge-commits", "r") as f:
-        unclean_merge_allowed = f.read().splitlines()
-    with open(dirname + "/allow-incorrect-sha512-commits", "r") as f:
-        incorrect_sha512_allowed = f.read().splitlines()
-    with open(dirname + "/trusted-keys", "r") as f:
-        trusted_keys = f.read().splitlines()
+    dirname = Path(__file__).absolute().parent
+    print(f"Using verify-commits data from {dirname}")
+    verified_root = (dirname / "trusted-git-root").read_text().splitlines()[0]
+    verified_sha512_root = (dirname / "trusted-sha512-root-commit").read_text().splitlines()[0]
+    revsig_allowed = (dirname / "allow-revsig-commits").read_text().splitlines()
+    unclean_merge_allowed = (dirname / "allow-unclean-merge-commits").read_text().splitlines()
+    incorrect_sha512_allowed = (dirname / "allow-incorrect-sha512-commits").read_text().splitlines()
+    trusted_keys = (dirname / "trusted-keys").read_text().splitlines()
 
     # Set commit and variables
     current_commit = args.commit