Merge #6987: chore: merge bitcoin#28347, partial bitcoin#30527, bitcoin#26257, bump to Python 3.10, mypy 0.981, fix Docker group assignment, minor housekeeping (misc. changes: part 2)

82723dc fix: don't forget to assign user to group if group exists (Kittywhiskers Van Gogh)
066d409 chore: remove outdated `boot2docker` comment (Kittywhiskers Van Gogh)
29e98e3 chore: document `USER_ID` and `GROUP_ID` in `docker-compose.yml` (Kittywhiskers Van Gogh)
6ea897a chore: drop unmaintained Guix container (Kittywhiskers Van Gogh)
6a1786c fix: resolve `test: =: unary operator expected` error (Kittywhiskers Van Gogh)
d6489f0 fix: make copy of `skip` in `GetStackFrames` to avoid clobbering (Kittywhiskers Van Gogh)
4110ff3 lint: mypy 0.981 (Kittywhiskers Van Gogh)
80a44e9 partial bitcoin#26257: python linter flake8 E275 fixup, update dependencies (Kittywhiskers Van Gogh)
7b80dfb merge bitcoin#28347: replace deprecated pkg_resources with importlib.metadata (Kittywhiskers Van Gogh)
04ac20a partial bitcoin#30527: Bump python minimum supported version to 3.10 (Kittywhiskers Van Gogh)

Pull request description:

  ## Additional Information

  * Dependency for #6988

  * Python 3.9's security support elapsed on 31st Oct '25 ([source](https://endoflife.date/python)), in response to that we are switching over to Python 3.10.
    * Due to [python/mypy#13627](python/mypy#13627) arising as a result of this bump, we also had to upgrade `mypy` to 0.981. Note that this is a divergence from upstream as they opted to upgrade to `mypy` 1.x (see [bitcoin#28009](bitcoin#28009)) but the changes needed to do so are too disruptive given this PR's larger context.

      Future backports should feel free to overwrite the mypy version and realign with upstream.

  * CI identified potential clobbering ([build](https://github.com/kwvg/dash/actions/runs/19434684086/job/55606106842#step:8:1804)) in Windows stacktraces code that started to build after [dash#6966](#6966) (see below). Additionally, C++20 has deprecated certain operators like {in,de}crementation courtesy of [P1152](https://www.open-std.org/jtc1/sc22/wg21/docs/papers/2019/p1152r3.html), which required additional adaptation.

    <details>

    <summary>Build error:</summary>

    ```
    stacktraces.cpp: In function ‘std::vector<long long unsigned int> GetStackFrames(size_t, size_t, const CONTEXT*)’:
    stacktraces.cpp:167:56: error: variable ‘skip’ might be clobbered by ‘longjmp’ or ‘vfork’ [-Werror=clobbered]
      167 | static __attribute__((noinline)) std::vector<uint64_t> GetStackFrames(size_t skip, size_t max_frames, const CONTEXT* pContext = nullptr)
          |                                                        ^~~~~~~~~~~~~~
    cc1plus: all warnings being treated as errors
    ```

    </details>

  * The `AM_CONDITIONAL` for `CRASH_HOOKS_WRAPPED_CXX_ABI` wasn't evaluated due to missing quotations (see below), this has been resolved.

    <details>

    <summary>Configure:</summary>

    ```
    checking whether the linker accepts -Wl,-export-dynamic... no
    checking whether the linker accepts -rdynamic... yes
    checking whether C++ compiler accepts -gdwarf-4... yes
    checking whether C++ compiler accepts -fno-standalone-debug... yes
    checking whether the linker accepts -Wl,-wrap=__cxa_allocate_exception... no
    ./configure: line 30603: test: =: unary operator expected
    checking for Linux getrandom syscall... no
    checking for getentropy via random.h... yes
    checking for sysctl... yes
    checking for sysctl KERN_ARND... no
    checking for fdatasync... no
    ```

    </details>

  * Currently we offer two containers for Guix builds meant for developers who aren't on Linux, one was introduced by [dash#5285](#5285) (based on [fanquake/core-review](https://github.com/fanquake/core-review)'s container, [source](https://github.com/fanquake/core-review/blob/d8cf188214879ea1b095e2ba34ca5c23dbc3ebd2/guix/imagefile)) and the other introduced by [dash#5449](#5449), the former does not seem to get much use and has been out of sync with its upstream source for a while.

    As the second container is used by some developers and is updated and maintained to fit Dash's specific needs, the first container has been dropped and documentation has been updated to reflect the same.

  * As Docker has matured with the WSL2 backend on Windows and the Apple Virtualization framework on macOS, boot2docker has been deprecated (see [boot2docker/boot2docker#1408](boot2docker/boot2docker#1408)) and the comment referencing it has been dropped.

  * To avoid permissions issues with mounting directories, containers come with `USER_ID` and `GROUP_ID` args ([source](https://github.com/dashpay/dash/blob/23de96916a8b8f97a2c408bb76da1d2149d7227c/contrib/containers/ci/ci-slim.Dockerfile#L123-L131)) that need to be specified at build time if the mount needs different permissions (as is often the case on macOS).

    To make that option more explicitly clear, it has been specified in `docker-compose.yml` with default values filled in.

  * [dash#6929](#6929) introduced a fix to prevent unexpected container build failure due to conflicting groups (most commonly GID 20 that on macOS is `staff` but on Linux is `dialout`) but the fix did _not_ assign the default user to that group, that has been resolved here.

  ## Breaking Changes

  None expected.

  ## Checklist

  - [x] I have performed a self-review of my own code
  - [x] I have commented my code, particularly in hard-to-understand areas
  - [x] I have added or updated relevant unit/integration/functional/e2e tests
  - [x] I have made corresponding changes to the documentation
  - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_

ACKs for top commit:
  UdjinM6:
    utACK 82723dc ~with one nit~

Tree-SHA512: 0e906d1a7fea9edc52a40a6a6971fa6b2599674e97e99c65a220f99cc44be78f4290be8fb9af7782cac416bcdd2338b7f17a5c50b5fdcf727b1cf84fe44c8686

Author: PastaPastaPasta

.python-version

@@ -1 +1 @@
-3.9.18
+3.10.14

ci/lint/04_install.sh

@@ -36,9 +36,9 @@ fi
 ${CI_RETRY_EXE} pip3 install codespell==2.1.0
 ${CI_RETRY_EXE} pip3 install flake8==4.0.1
 ${CI_RETRY_EXE} pip3 install lief==0.13.1
-${CI_RETRY_EXE} pip3 install mypy==0.942
-${CI_RETRY_EXE} pip3 install pyzmq==22.3.0
-${CI_RETRY_EXE} pip3 install vulture==2.3
+${CI_RETRY_EXE} pip3 install mypy==0.981
+${CI_RETRY_EXE} pip3 install pyzmq==24.0.1
+${CI_RETRY_EXE} pip3 install vulture==2.6
 
 SHELLCHECK_VERSION=v0.8.0
 curl -sL "https://github.com/koalaman/shellcheck/releases/download/${SHELLCHECK_VERSION}/shellcheck-${SHELLCHECK_VERSION}.linux.x86_64.tar.xz" | \

configure.ac

@@ -1272,7 +1272,7 @@ if test "$enable_crashhooks" = "yes"; then
 fi
 
 AX_CHECK_LINK_FLAG([-Wl,-wrap=__cxa_allocate_exception], [LINK_WRAP_SUPPORTED=yes],,,)
-AM_CONDITIONAL([CRASH_HOOKS_WRAPPED_CXX_ABI],[test $LINK_WRAP_SUPPORTED = "yes"])
+AM_CONDITIONAL([CRASH_HOOKS_WRAPPED_CXX_ABI],[test "$LINK_WRAP_SUPPORTED" = "yes"])
 
 if test "$LINK_WRAP_SUPPORTED" = "yes"; then
   AC_DEFINE(CRASH_HOOKS_WRAPPED_CXX_ABI, 1, [Define this symbol to use wrapped CXX ABIs for exception stacktraces])

contrib/containers/ci/ci-slim.Dockerfile

@@ -55,7 +55,7 @@ COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
 
 # Install Python to a system-wide location and set it as default
 # PYTHON_VERSION should match the value in .python-version
-ARG PYTHON_VERSION=3.9.18
+ARG PYTHON_VERSION=3.10.14
 ENV UV_PYTHON_INSTALL_DIR=/usr/local/python
 RUN uv python install ${PYTHON_VERSION}
 
@@ -78,9 +78,9 @@ RUN uv pip install --system --break-system-packages \
     jinja2 \
     lief==0.13.2 \
     multiprocess \
-    mypy==0.942 \
-    pyzmq==22.3.0 \
-    vulture==2.3
+    mypy==0.981 \
+    pyzmq==24.0.1 \
+    vulture==2.6
 
 # Install packages relied on by tests
 ARG DASH_HASH_VERSION=1.4.0
@@ -123,7 +123,7 @@ RUN set -ex; \
 ARG USER_ID=1000 \
     GROUP_ID=1000
 RUN set -ex; \
-    getent group ${GROUP_ID} || groupmod -g ${GROUP_ID} -n dash ubuntu; \
+    (getent group ${GROUP_ID} && usermod -g ${GROUP_ID} ubuntu) || groupmod -g ${GROUP_ID} -n dash ubuntu; \
     usermod -u ${USER_ID} -md /home/dash -l dash ubuntu; \
     chown ${USER_ID}:${GROUP_ID} -R /home/dash; \
     mkdir -p /src/dash && \

contrib/containers/develop/docker-compose.yml

@@ -4,6 +4,9 @@ services:
     build:
       context: '..'
       dockerfile: './develop/Dockerfile'
+      args:
+        USER_ID: 1000   # set this to $(id -u) of the host
+        GROUP_ID: 1000  # set this to $(id -g) of the host
     ports:
       - "9998:9998"           # Mainnet Ports
       - "9999:9999"
@@ -13,19 +16,8 @@ services:
       - seccomp:unconfined
     stdin_open: true  # Equivalent to -i
     tty: true         # Equivalent to -t
-
-# A note about volumes:
-#
-# If Docker is interacting with your operating system directly
-# without an intermediate VM, then you do not need to change anything
-#
-# But if not, then you'll need to mount your system's root directory
-# (i.e. /) into the boot2docker instance if you want to mirror the exact
-# filesystem structure of your host.
-#
     volumes:
       - type: bind
-#        source: /host/$PWD # Workaround needed on non-Linux hosts
         source: ../../..
         target: /src/dash
 

contrib/guix/Dockerfile

@@ -19,7 +19,6 @@ Otherwise, you may choose from one of the following options to install Guix:
    - Installs any release
    - Binary installation only, requires high level of trust
 3. Using **Docker image** [↗︎ external instructions][install-docker]
-   - Maintained by pastapastapasta
    - Easy (automatically performs *some* setup)
    - Works wherever Docker images work
    - Installs any release
@@ -59,8 +58,8 @@ so you should log out and log back in.
 
 ## Option 3: Using Docker image
 
-Please refer to Docker's image
-[here](https://github.com/dashpay/dash/tree/master/contrib/guix/Dockerfile).
+Please refer to Docker image
+[here](https://github.com/dashpay/dash/tree/master/contrib/containers/guix/Dockerfile).
 
 ## Option 4: Using a distribution-maintained package
 

contrib/guix/INSTALL.md

@@ -10,7 +10,7 @@ You can find installation instructions in the `build-*.md` file for your platfor
 | [Automake](https://www.gnu.org/software/automake/) | [1.13](https://github.com/bitcoin/bitcoin/pull/18290) |
 | [Clang](https://clang.llvm.org) | [16.0](https://github.com/bitcoin/bitcoin/pull/30263) |
 | [GCC](https://gcc.gnu.org) | [11.1](https://github.com/bitcoin/bitcoin/pull/29091) |
-| [Python](https://www.python.org) (scripts, tests) | [3.9](https://github.com/bitcoin/bitcoin/pull/28211) |
+| [Python](https://www.python.org) (scripts, tests) | [3.10](https://github.com/bitcoin/bitcoin/pull/30527) |
 | [systemtap](https://sourceware.org/systemtap/) ([tracing](tracing.md))| N/A |
 
 ## Required

doc/dependencies.md

@@ -167,6 +167,8 @@ static uint64_t ConvertAddress(uint64_t addr)
 static __attribute__((noinline)) std::vector<uint64_t> GetStackFrames(size_t skip, size_t max_frames, const CONTEXT* pContext = nullptr)
 {
 #ifdef ENABLE_STACKTRACES
+    volatile size_t skip_frames = skip;
+
     // We can't use libbacktrace for stack unwinding on Windows as it returns invalid addresses (like 0x1 or 0xffffffff)
     // dbghelp is not thread safe
     static StdMutex m;
@@ -205,7 +207,7 @@ static __attribute__((noinline)) std::vector<uint64_t> GetStackFrames(size_t ski
     stackframe.AddrStack.Offset = context.Rsp;
     stackframe.AddrStack.Mode = AddrModeFlat;
     if (!pContext) {
-        skip++; // skip this method
+        skip_frames = skip_frames + 1; // skip this method
     }
 #else
 #error unsupported architecture
@@ -223,7 +225,7 @@ static __attribute__((noinline)) std::vector<uint64_t> GetStackFrames(size_t ski
         if (!result) {
             break;
         }
-        if (i >= skip) {
+        if (i >= skip_frames) {
             uint64_t pc = ConvertAddress(stackframe.AddrPC.Offset);
             if (pc == 0) {
                 pc = stackframe.AddrPC.Offset;

src/stacktraces.cpp

@@ -9,10 +9,12 @@
 """
 
 import os
-import pkg_resources
 import subprocess
 import sys
 
+from importlib.metadata import metadata, PackageNotFoundError
+
+
 DEPS = ['flake8', 'lief', 'mypy', 'pyzmq']
 MYPY_CACHE_DIR = f"{os.getenv('BASE_ROOT_DIR', '')}/test/.mypy_cache"
 FILES_ARGS = ['git', 'ls-files', '--','test/functional/*.py', 'contrib/devtools/*.py', ':(exclude)contrib/devtools/github-merge.py']
@@ -95,10 +97,10 @@
 
 
 def check_dependencies():
-    working_set = {pkg.key for pkg in pkg_resources.working_set}
-
     for dep in DEPS:
-        if dep not in working_set:
+        try:
+            metadata(dep)
+        except PackageNotFoundError:
             print(f"Skipping Python linting since {dep} is not installed.")
             exit(0)