Merge 19746513b1 into 3d5dc160d8

.github/workflows/build.yml

@@ -114,22 +114,22 @@ jobs:
           - build_target: linux64
             host: x86_64-pc-linux-gnu
             depends_on: linux64
-          - build_target: linux64_cxx20
+          - build_target: linux64_tsan
+            host: x86_64-pc-linux-gnu
+            depends_on: linux64
+          - build_target: linux64_ubsan
             host: x86_64-pc-linux-gnu
             depends_on: linux64
           - build_target: linux64_fuzz
             host: x86_64-pc-linux-gnu
             depends_on: linux64
-          - build_target: linux64_nowallet
+          - build_target: linux64_cxx20
             host: x86_64-pc-linux-gnu
             depends_on: linux64
           - build_target: linux64_sqlite
             host: x86_64-pc-linux-gnu
             depends_on: linux64
-          - build_target: linux64_tsan
-            host: x86_64-pc-linux-gnu
-            depends_on: linux64
-          - build_target: linux64_ubsan
+          - build_target: linux64_nowallet
             host: x86_64-pc-linux-gnu
             depends_on: linux64
     container:

.gitlab-ci.yml

@@ -40,11 +40,26 @@ builder-image:
   needs:
     - builder-image
   image: $CI_REGISTRY_IMAGE:builder-$CI_COMMIT_REF_SLUG
+  variables:
+    SDK_URL: https://bitcoincore.org/depends-sources/sdks
+    XCODE_VERSION: "15.0"
+    XCODE_BUILD_ID: 15A240d
   before_script:
+    - echo HOST=$HOST
     - |
-      echo HOST=${HOST}
-      if [[ "${HOST}" == "x86_64-apple-darwin" ]]; then
-        ./contrib/containers/guix/scripts/setup-sdk
+      if [ "$HOST" = "x86_64-apple-darwin" ]; then
+        mkdir -p depends/SDKs
+        mkdir -p depends/sdk-sources
+        OSX_SDK_BASENAME="Xcode-${XCODE_VERSION}-${XCODE_BUILD_ID}-extracted-SDK-with-libcxx-headers.tar.gz"
+        OSX_SDK_PATH="depends/sdk-sources/${OSX_SDK_BASENAME}"
+        if [ ! -f "$OSX_SDK_PATH" ]; then
+          echo "Downloading MacOS SDK"
+          curl --location --fail "${SDK_URL}/${OSX_SDK_BASENAME}" -o "$OSX_SDK_PATH"
+        fi
+        if [ -f "$OSX_SDK_PATH" ]; then
+          echo "Extracting MacOS SDK"
+          tar -C depends/SDKs -xf "$OSX_SDK_PATH"
+        fi
       fi
   script:
     - make -j$(nproc) -C depends HOST=$HOST $DEP_OPTS
@@ -178,13 +193,13 @@ x86_64-w64-mingw32:
   variables:
     HOST: x86_64-w64-mingw32
 
-x86_64-pc-linux-gnu_debug:
+x86_64-pc-linux-gnu-debug:
   extends: .build-depends-template
   variables:
     HOST: x86_64-pc-linux-gnu
     DEP_OPTS: "DEBUG=1"
 
-x86_64-pc-linux-gnu_nowallet:
+x86_64-pc-linux-gnu-nowallet:
   extends:
     - .build-depends-template
     - .skip-in-fast-mode-template
@@ -192,13 +207,13 @@ x86_64-pc-linux-gnu_nowallet:
     HOST: x86_64-pc-linux-gnu
     DEP_OPTS: "NO_WALLET=1"
 
-x86_64-pc-linux-gnu_multiprocess:
+x86_64-pc-linux-gnu-multiprocess:
   extends:
     - .build-depends-template
     - .skip-in-fast-mode-template
   variables:
     HOST: x86_64-pc-linux-gnu
-    DEP_OPTS: "DEBUG=1 MULTIPROCESS=1"
+    DEP_OPTS: "MULTIPROCESS=1"
 
 x86_64-apple-darwin:
   extends:
@@ -228,7 +243,7 @@ win64-build:
 linux64-build:
   extends: .build-template
   needs:
-    - x86_64-pc-linux-gnu_debug
+    - x86_64-pc-linux-gnu-debug
   variables:
     BUILD_TARGET: linux64
 
@@ -237,7 +252,7 @@ linux64_cxx20-build:
     - .build-template
     - .skip-in-fast-mode-template
   needs:
-    - x86_64-pc-linux-gnu_debug
+    - x86_64-pc-linux-gnu-debug
   variables:
     BUILD_TARGET: linux64_cxx20
 
@@ -246,7 +261,7 @@ linux64_sqlite-build:
     - .build-template
     - .skip-in-fast-mode-template
   needs:
-    - x86_64-pc-linux-gnu_debug
+    - x86_64-pc-linux-gnu-debug
   variables:
     BUILD_TARGET: linux64_sqlite
 
@@ -255,7 +270,7 @@ linux64_fuzz-build:
     - .build-template
     - .skip-in-fast-mode-template
   needs:
-    - x86_64-pc-linux-gnu_debug
+    - x86_64-pc-linux-gnu-debug
   variables:
     BUILD_TARGET: linux64_fuzz
 
@@ -264,7 +279,7 @@ linux64_fuzz-build:
 #    - .build-template
 #    - .skip-in-fast-mode-template
 #  needs:
-#    - x86_64-pc-linux-gnu_debug
+#    - x86_64-pc-linux-gnu-debug
 #  variables:
 #    BUILD_TARGET: linux64_asan
 
@@ -273,7 +288,7 @@ linux64_tsan-build:
     - .build-template
     - .skip-in-fast-mode-template
   needs:
-    - x86_64-pc-linux-gnu_debug
+    - x86_64-pc-linux-gnu-debug
   variables:
     BUILD_TARGET: linux64_tsan
 
@@ -282,7 +297,7 @@ linux64_ubsan-build:
     - .build-template
     - .skip-in-fast-mode-template
   needs:
-    - x86_64-pc-linux-gnu_debug
+    - x86_64-pc-linux-gnu-debug
   variables:
     BUILD_TARGET: linux64_ubsan
 
@@ -291,7 +306,7 @@ linux64_nowallet-build:
     - .build-template
     - .skip-in-fast-mode-template
   needs:
-    - x86_64-pc-linux-gnu_nowallet
+    - x86_64-pc-linux-gnu-nowallet
   variables:
     BUILD_TARGET: linux64_nowallet
 
@@ -300,7 +315,7 @@ linux64_multiprocess-build:
     - .build-template
     - .skip-in-fast-mode-template
   needs:
-    - x86_64-pc-linux-gnu_multiprocess
+    - x86_64-pc-linux-gnu-multiprocess
   variables:
     BUILD_TARGET: linux64_multiprocess
 
@@ -309,7 +324,7 @@ linux64_multiprocess-build:
 #    - .build-template
 #    - .skip-in-fast-mode-template
 #  needs:
-#    - x86_64-pc-linux-gnu_debug
+#    - x86_64-pc-linux-gnu-debug
 #  variables:
 #    BUILD_TARGET: linux64_valgrind
 

ci/dash/build_depends.sh

@@ -20,8 +20,17 @@ mkdir -p $CACHE_DIR/sdk-sources
 ln -s $CACHE_DIR/depends ${DEPENDS_DIR}/built
 ln -s $CACHE_DIR/sdk-sources ${DEPENDS_DIR}/sdk-sources
 
-if [[ "${HOST}" == "x86_64-apple-darwin" ]]; then
-    ./contrib/containers/guix/scripts/setup-sdk
+mkdir -p ${DEPENDS_DIR}/SDKs
+
+if [ -n "$XCODE_VERSION" ]; then
+  OSX_SDK_BASENAME="Xcode-${XCODE_VERSION}-${XCODE_BUILD_ID}-extracted-SDK-with-libcxx-headers.tar.gz"
+  OSX_SDK_PATH="${DEPENDS_DIR}/sdk-sources/${OSX_SDK_BASENAME}"
+  if [ ! -f "$OSX_SDK_PATH" ]; then
+    curl --location --fail "${SDK_URL}/${OSX_SDK_BASENAME}" -o "$OSX_SDK_PATH"
+  fi
+  if [ -f "$OSX_SDK_PATH" ]; then
+    tar -C ${DEPENDS_DIR}/SDKs -xf "$OSX_SDK_PATH"
+  fi
 fi
 
 make $MAKEJOBS -C depends HOST=$HOST $DEP_OPTS

ci/dash/matrix.sh

@@ -18,30 +18,28 @@ export UBSAN_OPTIONS="suppressions=${BASE_ROOT_DIR}/test/sanitizer_suppressions/
 
 if [ "$BUILD_TARGET" = "arm-linux" ]; then
   source ./ci/test/00_setup_env_arm.sh
+elif [ "$BUILD_TARGET" = "win64" ]; then
+  source ./ci/test/00_setup_env_win64.sh
 elif [ "$BUILD_TARGET" = "linux64" ]; then
   source ./ci/test/00_setup_env_native_qt5.sh
 elif [ "$BUILD_TARGET" = "linux64_asan" ]; then
   source ./ci/test/00_setup_env_native_asan.sh
-elif [ "$BUILD_TARGET" = "linux64_cxx20" ]; then
-  source ./ci/test/00_setup_env_native_cxx20.sh
-elif [ "$BUILD_TARGET" = "linux64_fuzz" ]; then
-  source ./ci/test/00_setup_env_native_fuzz.sh
-elif [ "$BUILD_TARGET" = "linux64_multiprocess" ]; then
-  source ./ci/test/00_setup_env_native_multiprocess.sh
-elif [ "$BUILD_TARGET" = "linux64_nowallet" ]; then
-  source ./ci/test/00_setup_env_native_nowallet.sh
-elif [ "$BUILD_TARGET" = "linux64_sqlite" ]; then
-  source ./ci/test/00_setup_env_native_sqlite.sh
 elif [ "$BUILD_TARGET" = "linux64_tsan" ]; then
   source ./ci/test/00_setup_env_native_tsan.sh
 elif [ "$BUILD_TARGET" = "linux64_ubsan" ]; then
   source ./ci/test/00_setup_env_native_ubsan.sh
+elif [ "$BUILD_TARGET" = "linux64_fuzz" ]; then
+  source ./ci/test/00_setup_env_native_fuzz.sh
+elif [ "$BUILD_TARGET" = "linux64_cxx20" ]; then
+  source ./ci/test/00_setup_env_native_cxx20.sh
+elif [ "$BUILD_TARGET" = "linux64_sqlite" ]; then
+  source ./ci/test/00_setup_env_native_sqlite.sh
+elif [ "$BUILD_TARGET" = "linux64_nowallet" ]; then
+  source ./ci/test/00_setup_env_native_nowallet.sh
 elif [ "$BUILD_TARGET" = "linux64_valgrind" ]; then
   source ./ci/test/00_setup_env_native_valgrind.sh
 elif [ "$BUILD_TARGET" = "mac" ]; then
   source ./ci/test/00_setup_env_mac.sh
 elif [ "$BUILD_TARGET" = "s390x" ]; then
   source ./ci/test/00_setup_env_s390x.sh
-elif [ "$BUILD_TARGET" = "win64" ]; then
-  source ./ci/test/00_setup_env_win64.sh
 fi

ci/dash/test_integrationtests.sh

@@ -42,7 +42,7 @@ echo "Using socketevents mode: $SOCKETEVENTS"
 EXTRA_ARGS="--dashd-arg=-socketevents=$SOCKETEVENTS"
 
 set +e
-LD_LIBRARY_PATH=$DEPENDS_DIR/$HOST/lib ./test/functional/test_runner.py --ci --attempts=3 --ansi --combinedlogslen=4000 --timeout-factor=${TEST_RUNNER_TIMEOUT_FACTOR} ${TEST_RUNNER_EXTRA} --failfast --nocleanup --tmpdir=$(pwd)/testdatadirs $PASS_ARGS $EXTRA_ARGS
+LD_LIBRARY_PATH=$DEPENDS_DIR/$HOST/lib ${TEST_RUNNER_ENV} ./test/functional/test_runner.py --ci --attempts=3 --ansi --combinedlogslen=4000 --timeout-factor=${TEST_RUNNER_TIMEOUT_FACTOR} ${TEST_RUNNER_EXTRA} --failfast --nocleanup --tmpdir=$(pwd)/testdatadirs $PASS_ARGS $EXTRA_ARGS
 RESULT=$?
 set -e
 

ci/dash/test_unittests.sh

@@ -29,8 +29,8 @@ if [ "$DIRECT_WINE_EXEC_TESTS" = "true" ]; then
   wine ./src/test/test_dash.exe
 else
   if [ "$RUN_UNIT_TESTS_SEQUENTIAL" = "true" ]; then
-    ./src/test/test_dash --catch_system_errors=no -l test_suite
+    ${TEST_RUNNER_ENV} ./src/test/test_dash --catch_system_errors=no -l test_suite
   else
-      make $MAKEJOBS check VERBOSE=1
+      ${TEST_RUNNER_ENV} make $MAKEJOBS check VERBOSE=1
   fi
 fi

ci/test/00_setup_env.sh

@@ -43,6 +43,7 @@ export RUN_SECURITY_TESTS=${RUN_SECURITY_TESTS:-false}
 # This is needed because some ci machines have slow CPU or disk, so sanitizers
 # might be slow or a reindex might be waiting on disk IO.
 export TEST_RUNNER_TIMEOUT_FACTOR=${TEST_RUNNER_TIMEOUT_FACTOR:-4}
+export TEST_RUNNER_ENV=${TEST_RUNNER_ENV:-}
 export RUN_FUZZ_TESTS=${RUN_FUZZ_TESTS:-false}
 export EXPECTED_TESTS_DURATION_IN_SECONDS=${EXPECTED_TESTS_DURATION_IN_SECONDS:-1000}
 

ci/test/00_setup_env_native_multiprocess.sh

@@ -11,5 +11,5 @@ export PACKAGES="cmake python3 llvm clang"
 export DEP_OPTS="DEBUG=1 MULTIPROCESS=1"
 export GOAL="install"
 export TEST_RUNNER_EXTRA="--v2transport"
-export BITCOIN_CONFIG="--with-boost-process --enable-debug CC=clang-16 CXX=clang++-16" # Use clang to avoid OOM
-export BITCOIND=dash-node  # Used in functional tests
+export BITCOIN_CONFIG="--with-boost-process --enable-debug CC=clang CXX=clang++" # Use clang to avoid OOM
+export TEST_RUNNER_ENV="BITCOIND=dash-node"

ci/test/00_setup_env_s390x.sh

@@ -19,6 +19,7 @@ fi
 # Use debian to avoid 404 apt errors
 export CONTAINER_NAME=ci_s390x
 export RUN_UNIT_TESTS=true
+export TEST_RUNNER_ENV="LC_ALL=C"
 export RUN_FUNCTIONAL_TESTS=true
 export GOAL="install"
 export BITCOIN_CONFIG="--enable-reduce-exports --disable-gui-tests --with-boost-process"  # GUI tests disabled for now, see https://github.com/bitcoin/bitcoin/issues/23730

contrib/containers/ci/Dockerfile

@@ -7,17 +7,14 @@ ENV DEBIAN_FRONTEND="noninteractive" TZ="Europe/London"
 # (zlib1g-dev is needed for the Qt host binary builds, but should not be used by target binaries)
 ENV APT_ARGS="-y --no-install-recommends --no-upgrade"
 
-# Install packages for i386 on amd64 hosts, then install common packages
-RUN set -ex; \
-    apt-get update && \
-    if [ "$(dpkg --print-architecture)" = "amd64" ]; then \
-        dpkg --add-architecture i386 && \
-        apt-get update && \
-        apt-get install $APT_ARGS \
-        g++-multilib \
-        wine32; \
-    fi; \
-    apt-get install $APT_ARGS \
+
+# Install packages for i386; disabled on aarch64 and arm64 hosts
+RUN (dpkg --print-architecture | grep -Eq 'aarch64|arm64' || dpkg --add-architecture i386)
+RUN (dpkg --print-architecture | grep -Eq 'aarch64|arm64' || (apt-get update && apt-get install $APT_ARGS \
+    g++-multilib \
+    wine32) && rm -rf /var/lib/apt/lists/*)
+
+RUN apt-get update && apt-get install $APT_ARGS \
     autotools-dev \
     automake \
     autoconf \
@@ -26,11 +23,13 @@ RUN set -ex; \
     bsdmainutils \
     curl \
     ccache \
+    clang \
     cmake \
     g++ \
     gettext \
     git \
-    gnupg \
+    libc++-dev \
+    libc++abi-dev \
     libtool \
     libxcb-icccm4 \
     libxcb-image0 \
@@ -43,38 +42,11 @@ RUN set -ex; \
     libxcb-xinerama0 \
     libxcb-xkb1 \
     libxkbcommon-x11-0 \
-    lsb-release \
-    software-properties-common \
-    unzip \
     wget \
+    unzip \
     m4 \
     pkg-config \
-    zlib1g-dev \
-    && rm -rf /var/lib/apt/lists/*
-
-# Install Clang+LLVM and set it as default
-# We don't need all packages but the default set doesn't include some
-# packages we want so we will need to install some of them manually.
-ARG LLVM_VERSION=16
-RUN set -ex; \
-    echo "Installing LLVM and Clang ${LLVM_VERSION}..."; \
-    curl -sL https://apt.llvm.org/llvm.sh | bash -s "${LLVM_VERSION}"; \
-    echo "Installing additional packages..."; \
-    apt-get update && apt-get install $APT_ARGS \
-    "clang-format-${LLVM_VERSION}" \
-    "clang-tidy-${LLVM_VERSION}" \
-    "libc++-${LLVM_VERSION}-dev" \
-    "libc++abi-${LLVM_VERSION}-dev" \
-    "libclang-rt-${LLVM_VERSION}-dev"; \
-    rm -rf /var/lib/apt/lists/*; \
-    echo "Setting defaults..."; \
-    lldbUpdAltArgs="update-alternatives --install /usr/bin/llvm-config llvm-config /usr/bin/llvm-config-${LLVM_VERSION} 100"; \
-    for binName in clang clang++ clang-format clang-tidy clangd ld.lld lldb lldb-server; do \
-        lldbUpdAltArgs="${lldbUpdAltArgs} --slave /usr/bin/${binName} ${binName} /usr/bin/${binName}-${LLVM_VERSION}"; \
-    done; \
-    sh -c "${lldbUpdAltArgs}";
-# LD_LIBRARY_PATH is empty by default, this is the first entry
-ENV LD_LIBRARY_PATH="/usr/lib/llvm-${LLVM_VERSION}/lib"
+    zlib1g-dev
 
 # Python setup
 # PYTHON_VERSION should match the value in .python-version
@@ -89,11 +61,10 @@ RUN apt-get update && apt-get install $APT_ARGS \
     libreadline-dev \
     libsqlite3-dev \
     libssl-dev \
+    llvm \
     make \
     tk-dev \
-    xz-utils \
-    && rm -rf /var/lib/apt/lists/*
-
+    xz-utils
 ENV PYENV_ROOT="/usr/local/pyenv"
 ENV PATH="${PYENV_ROOT}/shims:${PYENV_ROOT}/bin:${PATH}"
 RUN curl https://pyenv.run | bash \
@@ -111,38 +82,19 @@ RUN pip3 install \
     pyzmq==22.3.0 \
     vulture==2.3
 
+# dash_hash
 ARG DASH_HASH_VERSION=1.4.0
-RUN set -ex; \
-    cd /tmp; \
-    git clone --depth 1 --no-tags --branch=${DASH_HASH_VERSION} https://github.com/dashpay/dash_hash; \
-    cd dash_hash && pip3 install -r requirements.txt .; \
-    cd .. && rm -rf dash_hash
+RUN git clone --depth 1 --no-tags --branch=${DASH_HASH_VERSION} https://github.com/dashpay/dash_hash
+RUN cd dash_hash && pip3 install -r requirements.txt .
 
-ARG CPPCHECK_VERSION=2.13.0
-RUN set -ex; \
-    curl -fL "https://github.com/danmar/cppcheck/archive/${CPPCHECK_VERSION}.tar.gz" -o /tmp/cppcheck.tar.gz; \
-    mkdir -p /opt/cppcheck && tar -xzf /tmp/cppcheck.tar.gz -C /opt/cppcheck --strip-components=1 && rm /tmp/cppcheck.tar.gz; \
-    cd /opt/cppcheck; \
-    mkdir build && cd build && cmake .. && cmake --build . -j "$(( $(nproc) - 1 ))"; \
-    mkdir /usr/local/share/Cppcheck && ln -s /opt/cppcheck/cfg/ /usr/local/share/Cppcheck/cfg; \
-    rm -rf /tmp/cppcheck.tar.gz
-ENV PATH="/opt/cppcheck/build/bin:${PATH}"
-
-ARG SHELLCHECK_VERSION=v0.7.1
-RUN set -ex; \
-    curl -fL "https://github.com/koalaman/shellcheck/releases/download/${SHELLCHECK_VERSION}/shellcheck-${SHELLCHECK_VERSION}.linux.x86_64.tar.xz" -o /tmp/shellcheck.tar.xz; \
-    mkdir -p /opt/shellcheck && tar -xf /tmp/shellcheck.tar.xz -C /opt/shellcheck --strip-components=1 && rm /tmp/shellcheck.tar.xz
-ENV PATH="/opt/shellcheck:${PATH}"
-
-# Add user with specified (or default) user/group ids and setup configuration files
 ARG USER_ID=1000
 ARG GROUP_ID=1000
-RUN set -ex; \
-    groupadd -g ${GROUP_ID} dash; \
-    useradd -u ${USER_ID} -g dash -s /bin/bash -m -d /home/dash dash; \
-    mkdir -p /home/dash/.config/gdb; \
-    echo "add-auto-load-safe-path /usr/lib/llvm-${LLVM_VERSION}/lib" | tee /home/dash/.config/gdb/gdbinit; \
-    chown ${USER_ID}:${GROUP_ID} -R /home/dash
+
+# add user with specified (or default) user/group ids
+ENV USER_ID="${USER_ID}"
+ENV GROUP_ID="${GROUP_ID}"
+RUN groupadd -g ${GROUP_ID} dash
+RUN useradd -u ${USER_ID} -g dash -s /bin/bash -m -d /home/dash dash
 
 # Packages needed for all target builds
 RUN apt-get update && apt-get install $APT_ARGS \
@@ -159,8 +111,17 @@ RUN apt-get update && apt-get install $APT_ARGS \
     valgrind \
     wine-stable \
     wine64 \
-    xorriso \
-    && rm -rf /var/lib/apt/lists/*
+    xorriso
+
+ARG CPPCHECK_VERSION=2.13.0
+RUN curl -sL "https://github.com/danmar/cppcheck/archive/${CPPCHECK_VERSION}.tar.gz" | tar -xvzf - --directory /tmp/
+RUN cd /tmp/cppcheck-${CPPCHECK_VERSION} && mkdir build && cd build && cmake .. && cmake --build . -j 8
+ENV PATH="/tmp/cppcheck-${CPPCHECK_VERSION}/build/bin:${PATH}"
+RUN mkdir /usr/local/share/Cppcheck && ln -s /tmp/cppcheck-${CPPCHECK_VERSION}/cfg/ /usr/local/share/Cppcheck/cfg
+
+ARG SHELLCHECK_VERSION=v0.7.1
+RUN curl -sL "https://github.com/koalaman/shellcheck/releases/download/${SHELLCHECK_VERSION}/shellcheck-${SHELLCHECK_VERSION}.linux.x86_64.tar.xz" | tar --xz -xf - --directory /tmp/
+ENV PATH="/tmp/shellcheck-${SHELLCHECK_VERSION}:${PATH}"
 
 # This is a hack. It is needed because gcc-multilib and g++-multilib are conflicting with g++-arm-linux-gnueabihf. This is
 # due to gcc-multilib installing the following symbolic link, which is needed for -m32 support. However, this causes
@@ -174,6 +135,20 @@ RUN \
   update-alternatives --set x86_64-w64-mingw32-g++  /usr/bin/x86_64-w64-mingw32-g++-posix; \
   exit 0
 
+ARG LLVM_VERSION=16
+# Setup Clang+LLVM support
+RUN apt-get update && apt-get install $APT_ARGS \
+    lsb-release \
+    software-properties-common \
+    gnupg \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN cd /tmp && \
+    wget https://apt.llvm.org/llvm.sh && \
+    chmod +x llvm.sh && \
+    /tmp/llvm.sh ${LLVM_VERSION} && \
+    rm -rf /tmp/llvm.sh
+
 RUN \
   mkdir -p /src/dash && \
   mkdir -p /cache/ccache && \

contrib/containers/develop/docker-compose.yml

@@ -1,18 +1,17 @@
+version: "3.9"
 services:
   container:
     entrypoint: /bin/bash
     build:
       context: '..'
       dockerfile: './develop/Dockerfile'
+    tty: true         # Equivalent to -t
+    stdin_open: true  # Equivalent to -i
     ports:
       - "9998:9998"           # Mainnet Ports
       - "9999:9999"
       - "19998:19998"         # Testnet Ports
       - "19999:19999"
-    security_opt:
-      - seccomp:unconfined
-    stdin_open: true  # Equivalent to -i
-    tty: true         # Equivalent to -t
 
 # A note about volumes:
 #

contrib/containers/guix/Dockerfile

@@ -18,11 +18,7 @@ RUN apt-get update && \
     sudo \
     wget \
     xz-utils && \
-    rm -rf /var/lib/apt/lists/*; \
-    targetLocale="en_US.UTF-8"; \
-    locale-gen ${targetLocale} && \
-    update-locale LC_ALL=${targetLocale} && \
-    update-locale LANG=${targetLocale};
+    rm -rf /var/lib/apt/lists/*
 
 ARG guix_download_path=ftp://ftp.gnu.org/gnu/guix
 ARG guix_version=1.4.0
@@ -34,7 +30,8 @@ ENV PATH="/usr/local/bin:/usr/local/guix/current/bin:$PATH"
 
 # Application Setup
 # https://guix.gnu.org/manual/en/html_node/Application-Setup.html
-ENV GUIX_LOCPATH="/usr/local/guix/profile"
+ENV GUIX_LOCPATH="/usr/local/guix/profile" \
+    LC_ALL="en_US.UTF-8"
 
 RUN guix_file_name=guix-binary-${guix_version}.$(uname -m)-linux.tar.xz          && \
     eval "guix_checksum=\${guix_checksum_$(uname -m)}"                           && \
@@ -77,19 +74,18 @@ RUN usermod -aG sudo ${USERNAME} && \
     echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
 
 # Copy required files to container
-COPY --from=docker_root ./motd.txt             /etc/motd
-COPY --from=docker_root ./scripts/entrypoint   /usr/local/bin/entrypoint
-COPY --from=docker_root ./scripts/guix-check   /usr/local/bin/guix-check
-COPY --from=docker_root ./scripts/guix-start   /usr/local/bin/guix-start
-COPY --from=docker_root ./scripts/setup-sdk    /usr/local/bin/setup-sdk
+COPY --from=docker_root ./motd.txt           /etc/motd
+COPY --from=docker_root ./scripts/entrypoint /usr/local/bin/entrypoint
+COPY --from=docker_root ./scripts/guix-check /usr/local/bin/guix-check
+COPY --from=docker_root ./scripts/guix-start /usr/local/bin/guix-start
 
 # Create directories for mounting to save/restore cache and grant necessary permissions
 RUN mkdir -p \
         /home/${USERNAME}/.cache \
-        /src/dash/depends/{built,sources,work}; \
+        /src/dash/depends/{built,sources,work} && \
     chown -R ${USER_ID}:${GROUP_ID} \
         /home/${USERNAME}/.cache \
-        /src;
+        /src
 
 WORKDIR "/src/dash"
 

contrib/containers/guix/docker-compose.yml

@@ -1,3 +1,4 @@
+version: "3.9"
 services:
   guix_ubuntu:
     build:

contrib/containers/guix/scripts/guix-start

@@ -9,10 +9,19 @@ if [[ ! -d "${WORKSPACE_PATH}" || ! "${WORKSPACE_PATH}" = /* || ! -f "${WORKSPAC
     exit 1
 fi
 
-export SDK_PATH="${SDK_PATH:-${WORKSPACE_PATH}/depends/SDKs}"
-export SDK_SRCS="${SDK_PATH:-${WORKSPACE_PATH}/depends/sdk-sources}"
+XCODE_VERSION="15.0"
+XCODE_RELEASE="15A240d"
+XCODE_ARCHIVE="Xcode-${XCODE_VERSION}-${XCODE_RELEASE}-extracted-SDK-with-libcxx-headers"
+XCODE_SOURCE="${XCODE_SOURCE:-https://bitcoincore.org/depends-sources/sdks}"
 
-./contrib/containers/guix/scripts/setup-sdk
+export SDK_PATH="${SDK_PATH:-${WORKSPACE_PATH}/depends/SDKs}"
+
+# Check if macOS SDK is present, if not, download it
+if [[ ! -d "${SDK_PATH}/${XCODE_ARCHIVE}" ]]; then
+    echo "Preparing macOS SDK..."
+    mkdir -p "${SDK_PATH}"
+    curl -L "${XCODE_SOURCE}/${XCODE_ARCHIVE}.tar.gz" | tar -xz -C "${SDK_PATH}"
+fi
 
 # Add safe.directory option only when WORKSPACE_PATH was specified via cmd-line arguments (happens in CI)
 if [[ -n "${1}" ]]; then

contrib/containers/guix/scripts/setup-sdk

@@ -1,27 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (c) 2024 The Dash Core developers
-# Distributed under the MIT software license, see the accompanying
-# file COPYING or http://www.opensource.org/licenses/mit-license.php.
-
-export LC_ALL=C.UTF-8
-
-set -eo pipefail
-
-SDK_URL="${SDK_URL:-https://bitcoincore.org/depends-sources/sdks}"
-SDK_PATH="${SDK_PATH:-depends/SDKs}"
-SDK_SRCS="${SDK_SOURCES:-depends/sdk-sources}"
-XCODE_VERSION="${XCODE_VERSION:-15.0}"
-XCODE_RELEASE="${XCODE_RELEASE:-15A240d}"
-XCODE_ARCHIVE="Xcode-${XCODE_VERSION}-${XCODE_RELEASE}-extracted-SDK-with-libcxx-headers"
-XCODE_AR_PATH="${SDK_SRCS}/${XCODE_ARCHIVE}.tar.gz"
-
-if [ ! -d "${SDK_PATH}/${XCODE_ARCHIVE}" ]; then
-    if [ ! -f "${XCODE_AR_PATH}" ]; then
-        echo "Downloading macOS SDK..."
-        mkdir -p "${SDK_SRCS}"
-        curl --location --fail "${SDK_URL}/${XCODE_ARCHIVE}.tar.gz" -o "${XCODE_AR_PATH}"
-    fi
-    echo "Extracting macOS SDK..."
-    mkdir -p "${SDK_PATH}"
-    tar -C "${SDK_PATH}" -xf "${XCODE_AR_PATH}"
-fi

depends/packages/qt.mk

@@ -159,15 +159,9 @@ $(package)_config_opts_linux += -dbus-runtime
 ifneq ($(LTO),)
 $(package)_config_opts_linux += -ltcg
 endif
-
-ifneq (,$(findstring clang,$($(package)_cxx)))
-  ifneq (,$(findstring -stdlib=libc++,$($(package)_cxx)))
-    $(package)_config_opts_linux += -platform linux-clang-libc++ -xplatform linux-clang-libc++
-  else
-    $(package)_config_opts_linux += -platform linux-clang -xplatform linux-clang
-  endif
-else
-  $(package)_config_opts_linux += -platform linux-g++ -xplatform bitcoin-linux-g++
+$(package)_config_opts_linux += -platform linux-g++ -xplatform bitcoin-linux-g++
+ifneq (,$(findstring -stdlib=libc++,$($(1)_cxx)))
+$(package)_config_opts_x86_64_linux = -xplatform linux-clang-libc++
 endif
 
 $(package)_config_opts_mingw32 = -no-opengl

src/bitcoin-tx.cpp

@@ -220,16 +220,6 @@ static void MutateTxLocktime(CMutableTransaction& tx, const std::string& cmdVal)
     tx.nLockTime = (unsigned int) newLocktime;
 }
 
-template <typename T>
-static T TrimAndParse(const std::string& int_str, const std::string& err)
-{
-    const auto parsed{ToIntegral<T>(TrimString(int_str))};
-    if (!parsed.has_value()) {
-        throw std::runtime_error(err + " '" + int_str + "'");
-    }
-    return parsed.value();
-}
-
 static void MutateTxAddInput(CMutableTransaction& tx, const std::string& strInput)
 {
     std::vector<std::string> vStrInputParts = SplitString(strInput, ':');
@@ -255,9 +245,8 @@ static void MutateTxAddInput(CMutableTransaction& tx, const std::string& strInpu
 
     // extract the optional sequence number
     uint32_t nSequenceIn = CTxIn::SEQUENCE_FINAL;
-    if (vStrInputParts.size() > 2) {
-        nSequenceIn = TrimAndParse<uint32_t>(vStrInputParts.at(2), "invalid TX sequence id");
-    }
+    if (vStrInputParts.size() > 2)
+        nSequenceIn = std::stoul(vStrInputParts[2]);
 
     // append to transaction input list
     CTxIn txin(txid, vout, CScript(), nSequenceIn);
@@ -335,10 +324,10 @@ static void MutateTxAddOutMultiSig(CMutableTransaction& tx, const std::string& s
     CAmount value = ExtractAndValidateValue(vStrInputParts[0]);
 
     // Extract REQUIRED
-    const uint32_t required{TrimAndParse<uint32_t>(vStrInputParts.at(1), "invalid multisig required number")};
+    uint32_t required = stoul(vStrInputParts[1]);
 
     // Extract NUMKEYS
-    const uint32_t numkeys{TrimAndParse<uint32_t>(vStrInputParts.at(2), "invalid multisig total number")};
+    uint32_t numkeys = stoul(vStrInputParts[2]);
 
     // Validate there are the correct number of pubkeys
     if (vStrInputParts.size() < numkeys + 3)

src/common/bloom.cpp

@@ -314,8 +314,8 @@ void CRollingBloomFilter::insert(Span<const unsigned char> vKey)
         /* FastMod works with the upper bits of h, so it is safe to ignore that the lower bits of h are already used for bit. */
         uint32_t pos = FastRange32(h, data.size());
         /* The lowest bit of pos is ignored, and set to zero for the first bit, and to one for the second. */
-        data[pos & ~1U] = (data[pos & ~1U] & ~(uint64_t{1} << bit)) | (uint64_t(nGeneration & 1)) << bit;
-        data[pos | 1] = (data[pos | 1] & ~(uint64_t{1} << bit)) | (uint64_t(nGeneration >> 1)) << bit;
+        data[pos & ~1] = (data[pos & ~1] & ~(((uint64_t)1) << bit)) | ((uint64_t)(nGeneration & 1)) << bit;
+        data[pos | 1] = (data[pos | 1] & ~(((uint64_t)1) << bit)) | ((uint64_t)(nGeneration >> 1)) << bit;
     }
 }
 
@@ -326,7 +326,7 @@ bool CRollingBloomFilter::contains(Span<const unsigned char> vKey) const
         int bit = h & 0x3F;
         uint32_t pos = FastRange32(h, data.size());
         /* If the relevant bit is not set in either data[pos & ~1] or data[pos | 1], the filter does not contain vKey */
-        if (!(((data[pos & ~1U] | data[pos | 1]) >> bit) & 1)) {
+        if (!(((data[pos & ~1] | data[pos | 1]) >> bit) & 1)) {
             return false;
         }
     }

src/qt/bitcoin.cpp

@@ -44,7 +44,6 @@
 #endif // ENABLE_WALLET
 
 #include <boost/signals2/connection.hpp>
-#include <chrono>
 #include <memory>
 
 #include <QApplication>
@@ -398,10 +397,10 @@ void BitcoinApplication::initializeResult(bool success, interfaces::BlockAndHead
             connect(paymentServer, &PaymentServer::message, [this](const QString& title, const QString& message, unsigned int style) {
                 window->message(title, message, style);
             });
-            QTimer::singleShot(100ms, paymentServer, &PaymentServer::uiReady);
+            QTimer::singleShot(100, paymentServer, &PaymentServer::uiReady);
         }
 #endif
-        pollShutdownTimer->start(SHUTDOWN_POLLING_DELAY);
+        pollShutdownTimer->start(200);
     } else {
         Q_EMIT splashFinished(); // Make sure splash screen doesn't stick around during shutdown
         quit(); // Exit first main loop invocation

src/qt/clientmodel.cpp

@@ -21,7 +21,6 @@
 #include <netbase.h>
 #include <util/system.h>
 #include <util/threadnames.h>
-#include <util/time.h>
 #include <validation.h>
 
 #include <stdint.h>
@@ -324,7 +323,7 @@ static void BlockTipChanged(ClientModel* clientmodel, SynchronizationState sync_
     const bool throttle = (sync_state != SynchronizationState::POST_INIT && !fHeader) || sync_state == SynchronizationState::INIT_REINDEX;
     const int64_t now = throttle ? GetTimeMillis() : 0;
     int64_t& nLastUpdateNotification = fHeader ? nLastHeaderTipUpdateNotification : nLastBlockTipUpdateNotification;
-    if (throttle && now < nLastUpdateNotification + count_milliseconds(MODEL_UPDATE_DELAY)) {
+    if (throttle && now < nLastUpdateNotification + MODEL_UPDATE_DELAY) {
         return;
     }
 

src/qt/guiconstants.h

@@ -6,16 +6,10 @@
 #ifndef BITCOIN_QT_GUICONSTANTS_H
 #define BITCOIN_QT_GUICONSTANTS_H
 
-#include <chrono>
 #include <cstdint>
 
-using namespace std::chrono_literals;
-
-/* A delay between model updates */
-static constexpr auto MODEL_UPDATE_DELAY{250ms};
-
-/* A delay between shutdown pollings */
-static constexpr auto SHUTDOWN_POLLING_DELAY{200ms};
+/* Milliseconds between model updates */
+static const int MODEL_UPDATE_DELAY = 250;
 
 /* AskPassphraseDialog -- Maximum passphrase length */
 static const int MAX_PASSPHRASE_SIZE = 1024;

src/qt/optionsdialog.cpp

@@ -24,8 +24,6 @@
 #include <util/underlying.h>
 
 #include <QButtonGroup>
-#include <chrono>
-
 #include <QDataWidgetMapper>
 #include <QDir>
 #include <QIntValidator>
@@ -459,7 +457,7 @@ void OptionsDialog::showRestartWarning(bool fPersistent)
         ui->statusLabel->setText(tr("This change would require a client restart."));
         // clear non-persistent status label after 10 seconds
         // Todo: should perhaps be a class attribute, if we extend the use of statusLabel
-        QTimer::singleShot(10s, this, &OptionsDialog::clearStatusLabel);
+        QTimer::singleShot(10000, this, &OptionsDialog::clearStatusLabel);
     }
 }
 

src/qt/sendcoinsdialog.cpp

@@ -24,11 +24,10 @@
 #include <node/interface_ui.h>
 #include <policy/fees.h>
 #include <txmempool.h>
-#include <validation.h>
 #include <wallet/coincontrol.h>
 #include <wallet/fees.h>
 #include <wallet/wallet.h>
-#include <chrono>
+#include <validation.h>
 
 #include <array>
 #include <fstream>
@@ -1081,7 +1080,7 @@ SendConfirmationDialog::SendConfirmationDialog(const QString& title, const QStri
 int SendConfirmationDialog::exec()
 {
     updateYesButton();
-    countDownTimer.start(1s);
+    countDownTimer.start(1000);
     return QMessageBox::exec();
 }
 

src/qt/test/addressbooktests.cpp

@@ -19,8 +19,6 @@
 #include <wallet/wallet.h>
 #include <walletinitinterface.h>
 
-#include <chrono>
-
 #include <QApplication>
 #include <QTimer>
 #include <QMessageBox>
@@ -41,7 +39,7 @@ void EditAddressAndSubmit(
     dialog->findChild<QLineEdit*>("labelEdit")->setText(label);
     dialog->findChild<QValidatedLineEdit*>("addressEdit")->setText(address);
 
-    ConfirmMessage(&warning_text, 5ms);
+    ConfirmMessage(&warning_text, 5);
     dialog->accept();
     QCOMPARE(warning_text, expected_msg);
 }

src/qt/test/util.cpp

@@ -2,8 +2,6 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <chrono>
-
 #include <QApplication>
 #include <QMessageBox>
 #include <QPushButton>
@@ -11,7 +9,7 @@
 #include <QTimer>
 #include <QWidget>
 
-void ConfirmMessage(QString* text, std::chrono::milliseconds msec)
+void ConfirmMessage(QString* text, int msec)
 {
     QTimer::singleShot(msec, [text]() {
         for (QWidget* widget : QApplication::topLevelWidgets()) {

src/qt/test/util.h

@@ -5,11 +5,7 @@
 #ifndef BITCOIN_QT_TEST_UTIL_H
 #define BITCOIN_QT_TEST_UTIL_H
 
-#include <chrono>
-
-QT_BEGIN_NAMESPACE
-class QString;
-QT_END_NAMESPACE
+#include <QString>
 
 /**
  * Press "Ok" button in message box dialog.
@@ -17,6 +13,6 @@ QT_END_NAMESPACE
  * @param text - Optionally store dialog text.
  * @param msec - Number of milliseconds to pause before triggering the callback.
  */
-void ConfirmMessage(QString* text, std::chrono::milliseconds msec);
+void ConfirmMessage(QString* text = nullptr, int msec = 0);
 
 #endif // BITCOIN_QT_TEST_UTIL_H

src/qt/test/wallettests.cpp

@@ -25,7 +25,6 @@
 #include <qt/recentrequeststablemodel.h>
 #include <qt/receiverequestdialog.h>
 
-#include <chrono>
 #include <memory>
 
 #include <QAbstractButton>

src/qt/transactionview.cpp

@@ -23,7 +23,6 @@
 #include <optional>
 
 #include <QCalendarWidget>
-#include <chrono>
 #include <QComboBox>
 #include <QDateTimeEdit>
 #include <QDesktopServices>
@@ -115,8 +114,8 @@ TransactionView::TransactionView(QWidget* parent) :
     amountWidget->setObjectName("amountWidget");
     hlayout->addWidget(amountWidget);
 
-    // Delay before filtering transactions
-    static constexpr auto input_filter_delay{200ms};
+    // Delay before filtering transactions in ms
+    static const int input_filter_delay = 200;
 
     QTimer* amount_typing_delay = new QTimer(this);
     amount_typing_delay->setSingleShot(true);

src/qt/walletcontroller.cpp

@@ -21,7 +21,6 @@
 #include <wallet/wallet.h>
 
 #include <algorithm>
-#include <chrono>
 
 #include <QApplication>
 #include <QMessageBox>
@@ -272,12 +271,12 @@ void CreateWalletActivity::createWallet()
         flags |= WALLET_FLAG_DESCRIPTORS;
     }
 
-    QTimer::singleShot(500ms, worker(), [this, name, flags] {
+    QTimer::singleShot(500, worker(), [this, name, flags] {
         std::unique_ptr<interfaces::Wallet> wallet = node().walletLoader().createWallet(name, m_passphrase, flags, m_error_message, m_warning_message);
 
         if (wallet) m_wallet_model = m_wallet_controller->getOrCreateWallet(std::move(wallet));
 
-        QTimer::singleShot(500ms, this, &CreateWalletActivity::finish);
+        QTimer::singleShot(500, this, &CreateWalletActivity::finish);
     });
 }
 

src/rpc/rawtransaction.cpp

@@ -874,30 +874,29 @@ static RPCHelpMan decoderawtransaction()
 
 static RPCHelpMan decodescript()
 {
-    return RPCHelpMan{
-        "decodescript",
-        "\nDecode a hex-encoded script.\n",
-        {
-            {"hexstring", RPCArg::Type::STR_HEX, RPCArg::Optional::NO, "the hex-encoded script"},
-        },
-        RPCResult{
-            RPCResult::Type::OBJ, "", "",
-            {
-                {RPCResult::Type::STR, "asm", "Script public key"},
-                {RPCResult::Type::STR, "type", "The output type (e.g. " + GetAllOutputTypes() + ")"},
-                {RPCResult::Type::STR, "address", /* optional */ true, "Dash address (only if a well-defined address exists)"},
-                {RPCResult::Type::NUM, "reqSigs", /* optional */ true, "(DEPRECATED, returned only if config option -deprecatedrpc=addresses is passed) Number of required signatures"},
-                {RPCResult::Type::ARR, "addresses", /* optional */ true, "(DEPRECATED, returned only if config option -deprecatedrpc=addresses is passed) Array of Dash addresses",
+    return RPCHelpMan{"decodescript",
+                "\nDecode a hex-encoded script.\n",
+                {
+                    {"hexstring", RPCArg::Type::STR_HEX, RPCArg::Optional::NO, "the hex-encoded script"},
+                },
+                RPCResult{
+                    RPCResult::Type::OBJ, "", "",
                     {
-                        {RPCResult::Type::STR, "address", "Dash address"},
-                    }},
-                    {RPCResult::Type::STR, "p2sh", "address of P2SH script wrapping this redeem script (not returned if the script is already a P2SH)"},
-            },
-        },
-        RPCExamples{
-            HelpExampleCli("decodescript", "\"hexstring\"")
-          + HelpExampleRpc("decodescript", "\"hexstring\"")
-        },
+                        {RPCResult::Type::STR, "asm", "Script public key"},
+                        {RPCResult::Type::STR, "type", "The output type (e.g. "+GetAllOutputTypes()+")"},
+                        {RPCResult::Type::STR, "address", /* optional */ true, "Dash address (only if a well-defined address exists)"},
+                        {RPCResult::Type::NUM, "reqSigs", /* optional */ true, "(DEPRECATED, returned only if config option -deprecatedrpc=addresses is passed) Number of required signatures"},
+                        {RPCResult::Type::ARR, "addresses", /* optional */ true, "(DEPRECATED, returned only if config option -deprecatedrpc=addresses is passed) Array of Dash addresses",
+                        {
+                            {RPCResult::Type::STR, "address", "Dash address"},
+                        }},
+                        {RPCResult::Type::STR, "p2sh", "address of P2SH script wrapping this redeem script (not returned if the script is already a P2SH)"},
+                    }
+                },
+                RPCExamples{
+                    HelpExampleCli("decodescript", "\"hexstring\"")
+            + HelpExampleRpc("decodescript", "\"hexstring\"")
+                },
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     RPCTypeCheck(request.params, {UniValue::VSTR});
@@ -912,10 +911,11 @@ static RPCHelpMan decodescript()
     }
     ScriptPubKeyToUniv(script, r, /* fIncludeHex */ false);
 
-    std::vector<std::vector<unsigned char>> solutions_data;
-    const TxoutType which_type{Solver(script, solutions_data)};
+    UniValue type;
 
-    if (which_type != TxoutType::SCRIPTHASH) {
+    type = find_value(r, "type");
+
+    if (type.isStr() && type.get_str() != "scripthash") {
         // P2SH cannot be wrapped in a P2SH. If this script is already a P2SH,
         // don't return the address for a P2SH of the P2SH.
         r.pushKV("p2sh", EncodeDestination(ScriptHash(script)));

src/test/fuzz/util.cpp

@@ -461,7 +461,7 @@ ssize_t FuzzedFileProvider::write(void* cookie, const char* buf, size_t size)
     SetFuzzedErrNo(fuzzed_file->m_fuzzed_data_provider);
     const ssize_t n = fuzzed_file->m_fuzzed_data_provider.ConsumeIntegralInRange<ssize_t>(0, size);
     if (AdditionOverflow(fuzzed_file->m_offset, (int64_t)n)) {
-        return 0;
+        return fuzzed_file->m_fuzzed_data_provider.ConsumeBool() ? 0 : -1;
     }
     fuzzed_file->m_offset += n;
     return n;

test/functional/mempool_limit.py

@@ -6,11 +6,8 @@
 
 from decimal import Decimal
 
-from test_framework.blocktools import COINBASE_MATURITY
 from test_framework.test_framework import BitcoinTestFramework
-from test_framework.util import assert_equal, assert_greater_than, assert_raises_rpc_error, gen_return_txouts
-from test_framework.wallet import MiniWallet
-
+from test_framework.util import assert_equal, assert_greater_than, assert_raises_rpc_error, create_confirmed_utxos, create_lots_of_big_transactions, gen_return_txouts
 
 class MempoolLimitTest(BitcoinTestFramework):
     def set_test_params(self):
@@ -23,59 +20,55 @@ class MempoolLimitTest(BitcoinTestFramework):
         ]]
         self.supports_cli = False
 
-    def send_large_txs(self, node, miniwallet, txouts, fee_rate, tx_batch_size):
-        for _ in range(tx_batch_size):
-            tx = miniwallet.create_self_transfer(from_node=node, fee_rate=fee_rate)['tx']
-            for txout in txouts:
-                tx.vout.append(txout)
-            miniwallet.sendrawtransaction(from_node=node, tx_hex=tx.serialize().hex())
+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
 
     def run_test(self):
         txouts = gen_return_txouts()
-        node=self.nodes[0]
-        miniwallet = MiniWallet(node)
-        relayfee = node.getnetworkinfo()['relayfee']
+        relayfee = self.nodes[0].getnetworkinfo()['relayfee']
 
-        self.log.info('Check that mempoolminfee is minrelaytxfee')
-        assert_equal(node.getmempoolinfo()['minrelaytxfee'], Decimal('0.00001000'))
-        assert_equal(node.getmempoolinfo()['mempoolminfee'], Decimal('0.00001000'))
+        self.log.info('Check that mempoolminfee is minrelytxfee')
+        assert_equal(self.nodes[0].getmempoolinfo()['minrelaytxfee'], Decimal('0.00001000'))
+        assert_equal(self.nodes[0].getmempoolinfo()['mempoolminfee'], Decimal('0.00001000'))
 
-        tx_batch_size = 25
-        num_of_batches = 3
-        # Generate UTXOs to flood the mempool
-        # 1 to create a tx initially that will be evicted from the mempool later
-        # 3 batches of multiple transactions with a fee rate much higher than the previous UTXO
-        # And 1 more to verify that this tx does not get added to the mempool with a fee rate less than the mempoolminfee
-        self.generate(miniwallet, 1 + (num_of_batches * tx_batch_size) + 1)
-
-        # Mine 99 blocks so that the UTXOs are allowed to be spent
-        self.generate(node, COINBASE_MATURITY - 1)
+        txids = []
+        utxos = create_confirmed_utxos(self, relayfee, self.nodes[0], 491)
 
         self.log.info('Create a mempool tx that will be evicted')
-        tx_to_be_evicted_id = miniwallet.send_self_transfer(from_node=node, fee_rate=relayfee)["txid"]
+        us0 = utxos.pop()
+        inputs = [{ "txid" : us0["txid"], "vout" : us0["vout"]}]
+        outputs = {self.nodes[0].getnewaddress() : 0.0001}
+        tx = self.nodes[0].createrawtransaction(inputs, outputs)
+        self.nodes[0].settxfee(relayfee) # specifically fund this tx with low fee
+        txF = self.nodes[0].fundrawtransaction(tx)
+        self.nodes[0].settxfee(0) # return to automatic fee selection
+        txFS = self.nodes[0].signrawtransactionwithwallet(txF['hex'])
+        txid = self.nodes[0].sendrawtransaction(txFS['hex'])
 
-        # Increase the tx fee rate massively to give the subsequent transactions a higher priority in the mempool
-        base_fee = relayfee * 1000
-
-        self.log.info("Fill up the mempool with txs with higher fee rate")
-        for batch_of_txid in range(num_of_batches):
-            fee_rate=(batch_of_txid + 1) * base_fee
-            self.send_large_txs(node, miniwallet, txouts, fee_rate, tx_batch_size)
+        relayfee = self.nodes[0].getnetworkinfo()['relayfee']
+        base_fee = relayfee*100
+        for i in range (3):
+            txids.append([])
+            txids[i] = create_lots_of_big_transactions(self.nodes[0], txouts, utxos[30*i:30*i+30], 30, (i+1)*base_fee)
 
         self.log.info('The tx should be evicted by now')
-        # The number of transactions created should be greater than the ones present in the mempool
-        assert_greater_than(tx_batch_size * num_of_batches, len(node.getrawmempool()))
-        # Initial tx created should not be present in the mempool anymore as it had a lower fee rate
-        assert tx_to_be_evicted_id not in node.getrawmempool()
+        assert txid not in self.nodes[0].getrawmempool()
+        txdata = self.nodes[0].gettransaction(txid)
+        assert txdata['confirmations'] ==  0  #confirmation should still be 0
 
-        self.log.info('Check that mempoolminfee is larger than minrelaytxfee')
-        assert_equal(node.getmempoolinfo()['minrelaytxfee'], Decimal('0.00001000'))
-        assert_greater_than(node.getmempoolinfo()['mempoolminfee'], Decimal('0.00001000'))
+        self.log.info('Check that mempoolminfee is larger than minrelytxfee')
+        assert_equal(self.nodes[0].getmempoolinfo()['minrelaytxfee'], Decimal('0.00001000'))
+        assert_greater_than(self.nodes[0].getmempoolinfo()['mempoolminfee'], Decimal('0.00001000'))
 
-        # Deliberately try to create a tx with a fee less than the minimum mempool fee to assert that it does not get added to the mempool
         self.log.info('Create a mempool tx that will not pass mempoolminfee')
-        assert_raises_rpc_error(-26, "mempool min fee not met", miniwallet.send_self_transfer, from_node=node, fee_rate=relayfee, mempool_valid=False)
-
+        us0 = utxos.pop()
+        inputs = [{ "txid" : us0["txid"], "vout" : us0["vout"]}]
+        outputs = {self.nodes[0].getnewaddress() : 0.0001}
+        tx = self.nodes[0].createrawtransaction(inputs, outputs)
+        # specifically fund this tx with a fee < mempoolminfee, >= than minrelaytxfee
+        txF = self.nodes[0].fundrawtransaction(tx, {'feeRate': relayfee})
+        txFS = self.nodes[0].signrawtransactionwithwallet(txF['hex'])
+        assert_raises_rpc_error(-26, "mempool min fee not met", self.nodes[0].sendrawtransaction, txFS['hex'])
 
 if __name__ == '__main__':
     MempoolLimitTest().main()

test/functional/rpc_coinjoin.py

@@ -3,26 +3,14 @@
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-import random
-
 from test_framework.test_framework import BitcoinTestFramework
-from test_framework.messages import (
-    COIN,
-    MAX_MONEY,
-    uint256_to_string,
-)
-from test_framework.util import (
-    assert_equal,
-    assert_is_hex_string,
-    assert_raises_rpc_error,
-)
+from test_framework.util import assert_equal
 
-# See coinjoin/options.h
-COINJOIN_ROUNDS_DEFAULT = 4
-COINJOIN_ROUNDS_MAX = 16
-COINJOIN_ROUNDS_MIN = 2
-COINJOIN_TARGET_MAX = int(MAX_MONEY / COIN)
-COINJOIN_TARGET_MIN = 2
+'''
+rpc_coinjoin.py
+
+Tests CoinJoin basic RPC
+'''
 
 class CoinJoinTest(BitcoinTestFramework):
     def set_test_params(self):
@@ -31,128 +19,45 @@ class CoinJoinTest(BitcoinTestFramework):
     def skip_test_if_missing_module(self):
         self.skip_if_no_wallet()
 
-    def setup_nodes(self):
-        self.add_nodes(self.num_nodes)
-        self.start_nodes()
-
     def run_test(self):
-        node = self.nodes[0]
+        self.test_coinjoin_start_stop()
+        self.test_coinjoin_setamount()
+        self.test_coinjoin_setrounds()
 
-        node.createwallet(wallet_name='w1', blank=True, disable_private_keys=False)
-        w1 = node.get_wallet_rpc('w1')
-        self.test_salt_presence(w1)
-        self.test_coinjoin_start_stop(w1)
-        self.test_setcoinjoinamount(w1)
-        self.test_setcoinjoinrounds(w1)
-        self.test_coinjoinsalt(w1)
-        w1.unloadwallet()
-
-        node.createwallet(wallet_name='w2', blank=True, disable_private_keys=True)
-        w2 = node.get_wallet_rpc('w2')
-        self.test_coinjoinsalt_disabled(w2)
-        w2.unloadwallet()
-
-    def test_salt_presence(self, node):
-        self.log.info('Salt should be automatically generated in new wallet')
-        # Will raise exception if no salt generated
-        assert_is_hex_string(node.coinjoinsalt('get'))
-
-    def test_coinjoin_start_stop(self, node):
-        self.log.info('"coinjoin" subcommands should update mixing status')
-        # Start mix session and ensure it's reported
-        node.coinjoin('start')
-        cj_info = node.getcoinjoininfo()
+    def test_coinjoin_start_stop(self):
+        # Start Mixing
+        self.nodes[0].coinjoin("start")
+        # Get CoinJoin info
+        cj_info = self.nodes[0].getcoinjoininfo()
+        # Ensure that it started properly
         assert_equal(cj_info['enabled'], True)
         assert_equal(cj_info['running'], True)
-        # Repeated start should yield error
-        assert_raises_rpc_error(-32603, 'Mixing has been started already.', node.coinjoin, 'start')
 
-        # Stop mix session and ensure it's reported
-        node.coinjoin('stop')
-        cj_info = node.getcoinjoininfo()
+        # Stop mixing
+        self.nodes[0].coinjoin("stop")
+        # Get CoinJoin info
+        cj_info = self.nodes[0].getcoinjoininfo()
+        # Ensure that it stopped properly
         assert_equal(cj_info['enabled'], True)
         assert_equal(cj_info['running'], False)
-        # Repeated stop should yield error
-        assert_raises_rpc_error(-32603, 'No mix session to stop', node.coinjoin, 'stop')
 
-        # Reset mix session
-        assert_equal(node.coinjoin('reset'), "Mixing was reset")
+    def test_coinjoin_setamount(self):
+        # Try normal values
+        self.nodes[0].setcoinjoinamount(50)
+        cj_info = self.nodes[0].getcoinjoininfo()
+        assert_equal(cj_info['max_amount'], 50)
 
-    def test_setcoinjoinamount(self, node):
-        self.log.info('"setcoinjoinamount" should update mixing target')
-        # Test normal and large values
-        for value in [COINJOIN_TARGET_MIN, 50, 1200000, COINJOIN_TARGET_MAX]:
-            node.setcoinjoinamount(value)
-            assert_equal(node.getcoinjoininfo()['max_amount'], value)
-        # Test values below minimum and above maximum
-        for value in [COINJOIN_TARGET_MIN - 1, COINJOIN_TARGET_MAX + 1]:
-            assert_raises_rpc_error(-8, "Invalid amount of DASH as mixing goal amount", node.setcoinjoinamount, value)
+        # Try large values
+        self.nodes[0].setcoinjoinamount(1200000)
+        cj_info = self.nodes[0].getcoinjoininfo()
+        assert_equal(cj_info['max_amount'], 1200000)
 
-    def test_setcoinjoinrounds(self, node):
-        self.log.info('"setcoinjoinrounds" should update mixing rounds')
-        # Test acceptable values
-        for value in [COINJOIN_ROUNDS_MIN, COINJOIN_ROUNDS_DEFAULT, COINJOIN_ROUNDS_MAX]:
-            node.setcoinjoinrounds(value)
-            assert_equal(node.getcoinjoininfo()['max_rounds'], value)
-        # Test values below minimum and above maximum
-        for value in [COINJOIN_ROUNDS_MIN - 1, COINJOIN_ROUNDS_MAX + 1]:
-            assert_raises_rpc_error(-8, "Invalid number of rounds", node.setcoinjoinrounds, value)
+    def test_coinjoin_setrounds(self):
+        # Try normal values
+        self.nodes[0].setcoinjoinrounds(5)
+        cj_info = self.nodes[0].getcoinjoininfo()
+        assert_equal(cj_info['max_rounds'], 5)
 
-    def test_coinjoinsalt(self, node):
-        self.log.info('"coinjoinsalt generate" should fail if salt already present')
-        assert_raises_rpc_error(-32600, 'Wallet "w1" already has set CoinJoin salt!', node.coinjoinsalt, 'generate')
-
-        self.log.info('"coinjoinsalt" subcommands should succeed if no balance and not mixing')
-        # 'coinjoinsalt generate' should return a new salt if overwrite enabled
-        s1 = node.coinjoinsalt('get')
-        assert_equal(node.coinjoinsalt('generate', True), True)
-        s2 = node.coinjoinsalt('get')
-        assert s1 != s2
-
-        # 'coinjoinsalt get' should fetch newly generated value (i.e. new salt should persist)
-        node.unloadwallet('w1')
-        node.loadwallet('w1')
-        node = self.nodes[0].get_wallet_rpc('w1')
-        assert_equal(s2, node.coinjoinsalt('get'))
-
-        # 'coinjoinsalt set' should work with random hashes
-        s1 = uint256_to_string(random.getrandbits(256))
-        node.coinjoinsalt('set', s1)
-        assert_equal(s1, node.coinjoinsalt('get'))
-        assert s1 != s2
-
-        # 'coinjoinsalt set' shouldn't work with nonsense values
-        s2 = format(0, '064x')
-        assert_raises_rpc_error(-8, "Invalid CoinJoin salt value", node.coinjoinsalt, 'set', s2, True)
-        s2 = s2[0:63] + 'h'
-        assert_raises_rpc_error(-8, "salt must be hexadecimal string (not '%s')" % s2, node.coinjoinsalt, 'set', s2, True)
-
-        self.log.info('"coinjoinsalt generate" and "coinjoinsalt set" should fail if mixing')
-        # Start mix session
-        node.coinjoin('start')
-        assert_equal(node.getcoinjoininfo()['running'], True)
-
-        # 'coinjoinsalt generate' and 'coinjoinsalt set' should fail when mixing
-        assert_raises_rpc_error(-4, 'Wallet "w1" is currently mixing, cannot change salt!', node.coinjoinsalt, 'generate', True)
-        assert_raises_rpc_error(-4, 'Wallet "w1" is currently mixing, cannot change salt!', node.coinjoinsalt, 'set', s1, True)
-
-        # 'coinjoinsalt get' should still work
-        assert_equal(node.coinjoinsalt('get'), s1)
-
-        # Stop mix session
-        node.coinjoin('stop')
-        assert_equal(node.getcoinjoininfo()['running'], False)
-
-        # 'coinjoinsalt generate' and 'coinjoinsalt set' should start working again
-        assert_equal(node.coinjoinsalt('generate', True), True)
-        assert_equal(node.coinjoinsalt('set', s1, True), True)
-
-    def test_coinjoinsalt_disabled(self, node):
-        self.log.info('"coinjoinsalt" subcommands should fail if private keys disabled')
-        for subcommand in ['generate', 'get']:
-            assert_raises_rpc_error(-32600, 'Wallet "w2" has private keys disabled, cannot perform CoinJoin!', node.coinjoinsalt, subcommand)
-        s1 = uint256_to_string(random.getrandbits(256))
-        assert_raises_rpc_error(-32600, 'Wallet "w2" has private keys disabled, cannot perform CoinJoin!', node.coinjoinsalt, 'set', s1)
 
 if __name__ == '__main__':
     CoinJoinTest().main()

test/functional/rpc_invalid_address_message.py

@@ -22,6 +22,9 @@ class InvalidAddressErrorMessageTest(BitcoinTestFramework):
         self.setup_clean_chain = True
         self.num_nodes = 1
 
+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
     def test_validateaddress(self):
         node = self.nodes[0]
 
@@ -47,10 +50,7 @@ class InvalidAddressErrorMessageTest(BitcoinTestFramework):
 
     def run_test(self):
         self.test_validateaddress()
-
-        if self.is_wallet_compiled():
-            self.init_wallet(node=0)
-            self.test_getaddressinfo()
+        self.test_getaddressinfo()
 
 
 if __name__ == '__main__':

test/functional/test_framework/test_framework.py

@@ -473,12 +473,12 @@ class BitcoinTestFramework(metaclass=BitcoinTestMetaClass):
 
     def import_deterministic_coinbase_privkeys(self):
         for i in range(len(self.nodes)):
-            self.init_wallet(node=i)
+            self.init_wallet(i)
 
-    def init_wallet(self, *, node):
-        wallet_name = self.default_wallet_name if self.wallet_names is None else self.wallet_names[node] if node < len(self.wallet_names) else False
+    def init_wallet(self, i):
+        wallet_name = self.default_wallet_name if self.wallet_names is None else self.wallet_names[i] if i < len(self.wallet_names) else False
         if wallet_name is not False:
-            n = self.nodes[node]
+            n = self.nodes[i]
             if wallet_name is not None:
                 n.createwallet(wallet_name=wallet_name, descriptors=self.options.descriptors, load_on_startup=True)
             n.importprivkey(privkey=n.get_deterministic_priv_key().key, label='coinbase', rescan=True)

test/functional/test_runner.py

@@ -892,6 +892,8 @@ class RPCCoverage():
         # Consider RPC generate covered, because it is overloaded in
         # test_framework/test_node.py and not seen by the coverage check.
         covered_cmds = set({'generate'})
+        # TODO: implement functional tests for coinjoinsalt
+        covered_cmds.add('coinjoinsalt')
         # TODO: implement functional tests for voteraw
         covered_cmds.add('voteraw')
         # TODO: implement functional tests for getmerkleblocks

test/functional/wallet_backup.py

@@ -135,9 +135,9 @@ class WalletBackupTest(BitcoinTestFramework):
         assert os.path.exists(wallet_file)
 
     def init_three(self):
-        self.init_wallet(node=0)
-        self.init_wallet(node=1)
-        self.init_wallet(node=2)
+        self.init_wallet(0)
+        self.init_wallet(1)
+        self.init_wallet(2)
 
     def run_test(self):
         self.log.info("Generating initial blockchain")

test/functional/wallet_listdescriptors.py

@@ -23,7 +23,7 @@ class ListDescriptorsTest(BitcoinTestFramework):
         self.skip_if_no_sqlite()
 
     # do not create any wallet by default
-    def init_wallet(self, *, node):
+    def init_wallet(self, i):
         return
 
     def run_test(self):

test/functional/wallet_upgradewallet.py

@@ -239,16 +239,5 @@ class UpgradeWalletTest(BitcoinTestFramework):
             desc_wallet = self.nodes[0].get_wallet_rpc("desc_upgrade")
             self.test_upgradewallet(desc_wallet, previous_version=120200, expected_version=120200)
 
-            self.log.info("Checking that descriptor wallets without privkeys do nothing, successfully")
-            self.nodes[0].createwallet(wallet_name="desc_upgrade_nopriv", descriptors=True, disable_private_keys=True)
-            desc_wallet = self.nodes[0].get_wallet_rpc("desc_upgrade_nopriv")
-            self.test_upgradewallet(desc_wallet, previous_version=120200, expected_version=120200)
-
-        if self.is_bdb_compiled():
-            self.log.info("Upgrading a wallet with private keys disabled")
-            self.nodes[0].createwallet(wallet_name="privkeys_disabled_upgrade", disable_private_keys=True, descriptors=False)
-            disabled_wallet = self.nodes[0].get_wallet_rpc("privkeys_disabled_upgrade")
-            self.test_upgradewallet(disabled_wallet, previous_version=120200, expected_version=120200)
-
 if __name__ == '__main__':
     UpgradeWalletTest().main()

test/sanitizer_suppressions/ubsan

@@ -48,6 +48,7 @@ implicit-integer-sign-change:*/include/c++/
 implicit-integer-sign-change:*/new_allocator.h
 implicit-integer-sign-change:addrman.h
 implicit-integer-sign-change:bech32.cpp
+implicit-integer-sign-change:common/bloom.cpp
 implicit-integer-sign-change:chain.cpp
 implicit-integer-sign-change:chain.h
 implicit-integer-sign-change:compat/stdin.cpp

test/util/data/bitcoin-util-test.json

@@ -425,30 +425,6 @@
     "output_cmp": "txcreatedata2.json",
     "description": "Creates a new transaction with one input, one address output and one data (zero value) output (output in json)"
   },
-  { "exec": "./dash-tx",
-    "args":
-    ["-create",
-     "in=5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f:0:11aa"],
-    "return_code": 1,
-    "error_txt": "error: invalid TX sequence id '11aa'",
-    "description": "Try to parse a sequence number outside the allowed range"
-  },
-  { "exec": "./dash-tx",
-    "args":
-    ["-create",
-     "in=5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f:0:-1"],
-    "return_code": 1,
-    "error_txt": "error: invalid TX sequence id '-1'",
-    "description": "Try to parse a sequence number outside the allowed range"
-  },
-  { "exec": "./dash-tx",
-    "args":
-    ["-create",
-     "in=5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f:0:4294967296"],
-    "return_code": 1,
-    "error_txt": "error: invalid TX sequence id '4294967296'",
-    "description": "Try to parse a sequence number outside the allowed range"
-  },
   { "exec": "./dash-tx",
     "args":
     ["-create",
@@ -457,14 +433,6 @@
     "output_cmp": "txcreatedata_seq0.hex",
     "description": "Creates a new transaction with one input with sequence number and one address output"
   },
-  { "exec": "./dash-tx",
-    "args":
-    ["-create",
-     "in=5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f:0: 4294967293 ",
-     "outaddr=0.18:XijDvbYpPmznwgpWD3DkdYNfGmRP2KoVSk"],
-    "output_cmp": "txcreatedata_seq0.hex",
-    "description": "Creates a new transaction with one input with sequence number (+whitespace) and one address output"
-  },
   { "exec": "./dash-tx",
     "args":
     ["-json",
@@ -489,27 +457,15 @@
     "output_cmp": "txcreatedata_seq1.json",
     "description": "Adds a new input with sequence number to a transaction (output in json)"
   },
-  { "exec": "./dash-tx",
-    "args": ["-create", "outmultisig=1:-2:3:02a5:021:02df", "nversion=1"],
-    "return_code": 1,
-    "error_txt": "error: invalid multisig required number '-2'",
-    "description": "Try to parse a multisig number outside the allowed range"
-  },
-  { "exec": "./dash-tx",
-    "args": ["-create", "outmultisig=1:2:3a:02a5:021:02df", "nversion=1"],
-    "return_code": 1,
-    "error_txt": "error: invalid multisig total number '3a'",
-    "description": "Try to parse a multisig number outside the allowed range"
-  },
   { "exec": "./dash-tx",
     "args": ["-create", "outmultisig=1:2:3:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397:021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d:02df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb485", "nversion=1"],
     "output_cmp": "txcreatemultisig1.hex",
     "description": "Creates a new transaction with a single 2-of-3 multisig output"
   },
   { "exec": "./dash-tx",
-    "args": ["-json", "-create", "outmultisig=1: 2: 3:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397:021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d:02df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb485", "nversion=1"],
+    "args": ["-json", "-create", "outmultisig=1:2:3:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397:021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d:02df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb485", "nversion=1"],
     "output_cmp": "txcreatemultisig1.json",
-    "description": "Creates a new transaction with a single 2-of-3 multisig output (with whitespace, output in json)"
+    "description": "Creates a new transaction with a single 2-of-3 multisig output (output in json)"
   },
   { "exec": "./dash-tx",
     "args": ["-create", "outmultisig=1:2:3:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397:021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d:02df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb485:S", "nversion=1"],