[pull] master from bitcoin:master

.github/ci-windows.py

@@ -8,6 +8,7 @@
 import shlex
 import subprocess
 import sys
+import time
 from pathlib import Path
 
 sys.path.append(str(Path(__file__).resolve().parent.parent / "test"))
@@ -73,7 +74,12 @@ def generate(ci_type):
         "--preset",
         "vs2026",
     ] + GENERATE_OPTIONS[ci_type]
-    run(command)
+    if run(command, check=False).returncode != 0:
+        print("=== ⚠️ ===")
+        print("Generate failure! Network issue? Retry once ...")
+        time.sleep(12)
+        print("=== ⚠️ ===")
+        run(command)
 
 
 def build(_ci_type):

CMakeLists.txt

@@ -453,6 +453,7 @@ else()
   try_append_cxx_flags("-Wall" TARGET warn_interface SKIP_LINK)
   try_append_cxx_flags("-Wextra" TARGET warn_interface SKIP_LINK)
   try_append_cxx_flags("-Wgnu" TARGET warn_interface SKIP_LINK)
+  try_append_cxx_flags("-Wcovered-switch-default" TARGET warn_interface SKIP_LINK)
   # Some compilers will ignore -Wformat-security without -Wformat, so just combine the two here.
   try_append_cxx_flags("-Wformat -Wformat-security" TARGET warn_interface SKIP_LINK)
   try_append_cxx_flags("-Wvla" TARGET warn_interface SKIP_LINK)

ci/lint/01_install.sh

@@ -41,7 +41,7 @@ command -v python3
 python3 --version
 
 ${CI_RETRY_EXE} pip3 install \
-  lief==0.16.6 \
+  lief==0.17.5 \
   mypy==1.19.1 \
   pyzmq==27.1.0 \
   ruff==0.15.5

cmake/leveldb.cmake

@@ -87,6 +87,9 @@ else()
   try_append_cxx_flags("-Wconditional-uninitialized" TARGET nowarn_leveldb_interface SKIP_LINK
     IF_CHECK_PASSED "-Wno-conditional-uninitialized"
   )
+  try_append_cxx_flags("-Wcovered-switch-default" TARGET nowarn_leveldb_interface SKIP_LINK
+    IF_CHECK_PASSED "-Wno-covered-switch-default"
+  )
 endif()
 
 target_link_libraries(leveldb PRIVATE

contrib/guix/INSTALL.md

@@ -761,6 +761,21 @@ Please see the following links for more details:
 - A commit to skip this test is included since Guix 1.4.0:
 [codeberg/guix@6ba1058](https://codeberg.org/guix/guix/commit/6ba1058df0c4ce5611c2367531ae5c3cdc729ab4)
 
+## zdiff3
+
+[Currently](https://issues.guix.gnu.org/72942) `guix` builds may fail if the
+global git config has `merge.conflictstyle` set to `zdiff3` as follows:
+
+```
+Updating channel 'guix' from Git repository at 'https://codeberg.org/guix/guix.git'...
+guix time-machine: error: Git error: unknown style 'zdiff3' given for 'merge.conflictstyle'
+```
+
+This can be fixed by setting `merge.conflictstyle` to `diff3`:
+
+```bash
+git config --global merge.conflictstyle diff3
+```
 
 [install-script]: #options-1-and-2-using-the-official-shell-installer-script-or-binary-tarball
 [install-bin-tarball]: #options-1-and-2-using-the-official-shell-installer-script-or-binary-tarball
@@ -782,7 +797,9 @@ an irreversible way, you may want to completely purge Guix from your system and
 start over.
 
 1. Uninstall Guix itself according to the way you installed it (e.g. `sudo apt
-   purge guix` for Ubuntu packaging, `sudo make uninstall` for a build from source).
+   purge guix` for Ubuntu packaging, `sudo make uninstall` for a build from
+   source, or running the GUIX [install script][install-script] with the
+   `--uninstall` [flag](https://guix.gnu.org/manual/devel/en/guix.html#index-uninstalling-Guix)).
 2. Remove all build users and groups
 
    You may check for relevant users and groups using:

contrib/guix/guix-build

@@ -383,6 +383,8 @@ EOF
         #     Running in an isolated container minimizes build-time differences
         #     between machines and improves reproducibility
         #
+        #   --writable-root    make the root filesystem writable
+        #
         #   --pure             unset existing environment variables
         #
         #     Same rationale as --container
@@ -441,6 +443,7 @@ EOF
         # shellcheck disable=SC2086,SC2031
         time-machine shell --manifest="${PWD}/contrib/guix/manifest.scm" \
                                  --container \
+                                 --writable-root \
                                  --pure \
                                  --no-cwd \
                                  --share="$PWD"=/bitcoin \

contrib/guix/guix-codesign

@@ -299,6 +299,8 @@ EOF
         #     Running in an isolated container minimizes build-time differences
         #     between machines and improves reproducibility
         #
+        #   --writable-root    make the root filesystem writable
+        #
         #   --pure             unset existing environment variables
         #
         #     Same rationale as --container
@@ -341,6 +343,7 @@ EOF
         # shellcheck disable=SC2086,SC2031
         time-machine shell --manifest="${PWD}/contrib/guix/manifest.scm" \
                                  --container \
+                                 --writable-root \
                                  --pure \
                                  --no-cwd \
                                  --share="$PWD"=/bitcoin \

contrib/guix/libexec/build.sh

@@ -6,7 +6,7 @@ export LC_ALL=C
 set -e -o pipefail
 
 # Environment variables for determinism
-export TAR_OPTIONS="--owner=0 --group=0 --numeric-owner --mtime='@${SOURCE_DATE_EPOCH}' --sort=name"
+export TAR_OPTIONS="--no-same-owner --owner=0 --group=0 --numeric-owner --mtime='@${SOURCE_DATE_EPOCH}' --sort=name"
 export TZ=UTC
 
 # Although Guix _does_ set umask when building its own packages (in our case,
@@ -272,10 +272,6 @@ mkdir -p "$DISTSRC"
     # Install built Bitcoin Core to $INSTALLPATH
     case "$HOST" in
         *darwin*)
-            # This workaround can be dropped for CMake >= 3.27.
-            # See the upstream commit 689616785f76acd844fd448c51c5b2a0711aafa2.
-            find build -name 'cmake_install.cmake' -exec sed -i 's| -u -r | |g' {} +
-
             cmake --install build --strip --prefix "${INSTALLPATH}" ${V:+--verbose}
             ;;
         *)

contrib/guix/libexec/prelude.bash

@@ -71,7 +71,7 @@ fi
 time-machine() {
     # shellcheck disable=SC2086
     guix time-machine --url=https://codeberg.org/guix/guix.git \
-                      --commit=5cb84f2013c5b1e48a7d0e617032266f1e6059e2 \
+                      --commit=c5eee3336cc1d10a3cc1c97fde2809c3451624d3 \
                       --cores="$JOBS" \
                       --keep-failed \
                       --fallback \