Merge 04523fcd6c into 3d5dc160d8

Merge #6462 : backport: merge bitcoin#23092, #23005 , #24704 , #24391 , #25338 , #25422 , #25493 , #26826 , #26814 , #26832 , #27418 , partial bitcoin#27254 (compat backports)
2ab561d281 partial bitcoin#27254: Extract util/fs from util/system (Kittywhiskers Van Gogh) 280988bee3 merge bitcoin#27418: Remove windows workaround in authproxy (Kittywhiskers Van Gogh) a497df0339 merge bitcoin#26832: move (win) S_* defines into bdb (Kittywhiskers Van Gogh) db676a7e5f merge bitcoin#26814: remove windows-only compat.h usage in random (Kittywhiskers Van Gogh) 94e6637c33 merge bitcoin#26826: remove windows-only compat.h usage in randomenv (Kittywhiskers Van Gogh) bbb0cceb7a merge bitcoin#25493: document code in compat.h (Kittywhiskers Van Gogh) 3f143096c8 merge bitcoin#25422: globally define NOMINMAX when building with mingw-w64 (Kittywhiskers Van Gogh) 000495df8e merge bitcoin#25338: Avoid incompatibility with CMake AUTOUIC feature (Kittywhiskers Van Gogh) 714ea55dbe build: migrate stacktrace-related flags to `DEBUG_`{`C`,`CXX`}`FLAGS` (Kittywhiskers Van Gogh) 11323c3851 merge bitcoin#24391: stop overriding user autoconf flags (Kittywhiskers Van Gogh) 548121d366 merge bitcoin#24704: remove strnlen back-compat code (Kittywhiskers Van Gogh) b65038ec94 merge bitcoin#23005: Delay wallet client construction (Kittywhiskers Van Gogh) f3b065cd9c merge bitcoin#23092: Remove Windows workaround in authproxy (WinError 10053) (Kittywhiskers Van Gogh) Pull request description: ## Additional Information * This PR originally included [bitcoin#27378](https://github.com/bitcoin/bitcoin/pull/27378) but including it caused multiple tests to fail ([build](https://gitlab.com/dashpay/dash/-/jobs/8577987174#L2224)), even after adjusting `timeout`. It has been omitted instead. <details> <summary>Test failures:</summary> ``` feature_abortnode.py | Failed | 201 s feature_dip3_v19.py | Failed | 237 s feature_llmq_rotation.py | Failed | 54 s p2p_invalid_messages.py | Failed | 5 s rpc_bind.py --nonloopback | Failed | 63 s wallet_multiwallet.py --descriptors | Failed | 79 s wallet_multiwallet.py --legacy-wallet | Failed | 89 s ALL | Failed | 8540 s (accumulated) ``` </details> <details> <summary>feature_abortnode.py failure:</summary> ``` dash@107cfae2b2b5:/src/dash$ ./test/functional/feature_abortnode.py 2024-12-09T18:31:01.776000Z TestFramework (INFO): PRNG seed is: 6843309100291447752 2024-12-09T18:31:01.776000Z TestFramework (INFO): Initializing test directory /tmp/dash_func_test_fcijb99n 2024-12-09T18:31:02.802000Z TestFramework (INFO): Waiting for crash 2024-12-09T18:34:23.026000Z TestFramework.utils (ERROR): wait_until() failed. Predicate: '''' def is_node_stopped(self): """Checks whether the node has stopped. Returns True if the node has stopped. False otherwise. This method is responsible for freeing resources (self.process).""" if not self.running: return True return_code = self.process.poll() if return_code is None: return False # process has stopped. Assert that it didn't return an error code. assert return_code == 0, self._node_msg( "Node returned non-zero exit code (%d) when stopping" % return_code) self.running = False self.process = None self.rpc_connected = False self.rpc = None self.log.debug("Node stopped") return True ''' 2024-12-09T18:34:23.027000Z TestFramework (ERROR): Assertion failed Traceback (most recent call last): File "/src/dash/test/functional/test_framework/test_framework.py", line 161, in main self.run_test() File "/src/dash/./test/functional/feature_abortnode.py", line 44, in run_test self.nodes[0].wait_until_stopped(timeout=200) File "/src/dash/test/functional/test_framework/test_node.py", line 414, in wait_until_stopped wait_until_helper(self.is_node_stopped, timeout=timeout, timeout_factor=self.timeout_factor) File "/src/dash/test/functional/test_framework/util.py", line 287, in wait_until_helper raise AssertionError("Predicate {} not true after {} seconds".format(predicate_source, timeout)) AssertionError: Predicate '''' def is_node_stopped(self): """Checks whether the node has stopped. Returns True if the node has stopped. False otherwise. This method is responsible for freeing resources (self.process).""" if not self.running: return True return_code = self.process.poll() if return_code is None: return False # process has stopped. Assert that it didn't return an error code. assert return_code == 0, self._node_msg( "Node returned non-zero exit code (%d) when stopping" % return_code) self.running = False self.process = None self.rpc_connected = False self.rpc = None self.log.debug("Node stopped") return True ''' not true after 200.0 seconds 2024-12-09T18:34:23.530000Z TestFramework (INFO): Stopping nodes 2024-12-09T18:34:23.530000Z TestFramework (ERROR): Unexpected exception caught during shutdown Traceback (most recent call last): File "/src/dash/test/functional/test_framework/test_framework.py", line 341, in shutdown self.stop_nodes() File "/src/dash/test/functional/test_framework/test_framework.py", line 673, in stop_nodes node.stop_node(expected_stderr=expected_stderr, wait=wait, wait_until_stopped=False) File "/src/dash/test/functional/test_framework/test_node.py", line 368, in stop_node self.stop(wait=wait) File "/src/dash/test/functional/test_framework/coverage.py", line 49, in __call__ return_val = self.auth_service_proxy_instance.__call__(*args, **kwargs) File "/src/dash/test/functional/test_framework/authproxy.py", line 124, in __call__ response, status = self._request('POST', self.__url.path, postdata.encode('utf-8')) File "/src/dash/test/functional/test_framework/authproxy.py", line 103, in _request return self._get_response() File "/src/dash/test/functional/test_framework/authproxy.py", line 162, in _get_response raise JSONRPCException( test_framework.authproxy.JSONRPCException: non-JSON HTTP response with '503 Service Unavailable' from server (-342) 2024-12-09T18:34:23.531000Z TestFramework (WARNING): Not cleaning up dir /tmp/dash_func_test_fcijb99n 2024-12-09T18:34:23.531000Z TestFramework (ERROR): Test failed. Test logging available at /tmp/dash_func_test_fcijb99n/test_framework.log 2024-12-09T18:34:23.531000Z TestFramework (ERROR): 2024-12-09T18:34:23.531000Z TestFramework (ERROR): Hint: Call /src/dash/test/functional/combine_logs.py '/tmp/dash_func_test_fcijb99n' to consolidate all logs 2024-12-09T18:34:23.531000Z TestFramework (ERROR): 2024-12-09T18:34:23.531000Z TestFramework (ERROR): If this failure happened unexpectedly or intermittently, please file a bug and provide a link or upload of the combined log. 2024-12-09T18:34:23.531000Z TestFramework (ERROR): https://github.com/dashpay/dash/issues 2024-12-09T18:34:23.531000Z TestFramework (ERROR): [node 1] Cleaning up leftover process [node 0] Cleaning up leftover process ``` </details> * [bitcoin#27254](https://github.com/bitcoin/bitcoin/pull/27254) has been partially backported to include a missing header to allow it to build. <details> <summary>Compile error:</summary> ``` In file included from ./util/system.h:19, from util/system.cpp:7: ./compat/assumptions.h:49:22: error: 'size_t' was not declared in this scope; did you mean 'std::size_t'? 49 | static_assert(sizeof(size_t) == 4 || sizeof(size_t) == 8, "size_t assumed to be 32-bit or 64-bit"); | ^~~~~~ | std::size_t In file included from /usr/include/c++/11/limits:42, from ./compat/assumptions.h:11, from ./util/system.h:19, from util/system.cpp:7: /usr/include/x86_64-linux-gnu/c++/11/bits/c++config.h:280:33: note: 'std::size_t' declared here 280 | typedef __SIZE_TYPE__ size_t; | ^~~~~~ ``` </details> * ~~GitLab job failures as of 2339ae6459cad77d94795c0e92ba3f3fe31c485a, for `linux64-build` ([source](https://gitlab.com/dashpay/dash/-/jobs/8590291130#L4621)), `linux64_cxx20-build` ([source](https://gitlab.com/dashpay/dash/-/jobs/8590291134#L3497)) and `linux64_sqlite-build` ([source](https://gitlab.com/dashpay/dash/-/jobs/8590291137#L3489)) are not related to failures in compilation or unit tests but are to do with reaching the artifact limit.~~ Resolved with [dash#6487](https://github.com/dashpay/dash/pull/6487), thanks Udjin! ## 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 **(note: N/A)** - [x] I have added or updated relevant unit/integration/functional/e2e tests - [x] I have made corresponding changes to the documentation **(note: N/A)** - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ ACKs for top commit: UdjinM6: utACK 2ab561d281 PastaPastaPasta: utACK 2ab561d281 Tree-SHA512: 6d05305f17fd607ed93b4a2e00de195a96bde1a34bedf04f6dd84892dc71028ae71590fa5063026ec7ff728d6e411af410c363b4a88947ce6e5999d4431bb29b
2024-12-25 12:02:48 +01:00 · 2024-12-15 21:31:15 +03:00 · 2024-12-15 12:30:54 -06:00 · 2024-12-15 12:12:40 -06:00 · 2024-12-15 11:57:04 -06:00 · 2024-12-15 09:08:55 +00:00
77 changed files with 235 additions and 219 deletions
--- a/build-aux/m4/bitcoin_qt.m4
+++ b/build-aux/m4/bitcoin_qt.m4
@ -116,8 +116,8 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
  BITCOIN_QT_CHECK([
  TEMP_CPPFLAGS=$CPPFLAGS
  TEMP_CXXFLAGS=$CXXFLAGS
-  CPPFLAGS="$QT_INCLUDES $CPPFLAGS"
-  CXXFLAGS="$PIC_FLAGS $CXXFLAGS"
+  CPPFLAGS="$QT_INCLUDES $CORE_CPPFLAGS $CPPFLAGS"
+  CXXFLAGS="$PIC_FLAGS $CORE_CXXFLAGS $CXXFLAGS"
  _BITCOIN_QT_IS_STATIC
  if test "x$bitcoin_cv_static_qt" = xyes; then
    _BITCOIN_QT_CHECK_STATIC_LIBS
@ -177,8 +177,8 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
    AC_MSG_CHECKING(whether -fPIE can be used with this Qt config)
    TEMP_CPPFLAGS=$CPPFLAGS
    TEMP_CXXFLAGS=$CXXFLAGS
-    CPPFLAGS="$QT_INCLUDES $CPPFLAGS"
-    CXXFLAGS="$PIE_FLAGS $CXXFLAGS"
+    CPPFLAGS="$QT_INCLUDES $CORE_CPPFLAGS $CPPFLAGS"
+    CXXFLAGS="$PIE_FLAGS $CORE_CXXFLAGS $CXXFLAGS"
    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
        #include <QtCore/qconfig.h>
        #ifndef QT_VERSION
@ -200,7 +200,7 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
    BITCOIN_QT_CHECK([
    AC_MSG_CHECKING(whether -fPIC is needed with this Qt config)
    TEMP_CPPFLAGS=$CPPFLAGS
-    CPPFLAGS="$QT_INCLUDES $CPPFLAGS"
+    CPPFLAGS="$QT_INCLUDES $CORE_CPPFLAGS $CPPFLAGS"
    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
        #include <QtCore/qconfig.h>
        #ifndef QT_VERSION
--- a/ci/test/00_setup_env.sh
+++ b/ci/test/00_setup_env.sh
@ -25,8 +25,7 @@ export JOB_NUMBER=${JOB_NUMBER:-1}

 echo "Fallback to default values in env (if not yet set)"
 # The number of parallel jobs to pass down to make and test_runner.py
-MAKEJOBS="-j$(nproc)"
-export MAKEJOBS
+export MAKEJOBS=${MAKEJOBS:--j$(nproc)}
 # A folder for the ci system to put temporary files (ccache, datadirs for tests, ...)
 # This folder only exists on the ci host.
 export BASE_SCRATCH_DIR=${BASE_SCRATCH_DIR:-$BASE_ROOT_DIR/ci/scratch}
--- a/ci/test/00_setup_env_native_qt5.sh
+++ b/ci/test/00_setup_env_native_qt5.sh
@ -9,8 +9,7 @@ export LC_ALL=C.UTF-8
 export CONTAINER_NAME=ci_native_qt5
 export PACKAGES="python3-zmq qtbase5-dev qttools5-dev-tools libdbus-1-dev libharfbuzz-dev"
 export DEP_OPTS="NO_UPNP=1 DEBUG=1"
-# TODO: we have few rpcs that aren't covered by any test, re-enable the line below once it's fixed
-# export TEST_RUNNER_EXTRA="--previous-releases --coverage --extended --exclude feature_pruning,feature_dbcrash"  # Run extended tests so that coverage does not fail, but exclude the very slow dbcrash
+export TEST_RUNNER_EXTRA="--previous-releases --coverage --extended --exclude feature_pruning,feature_dbcrash"  # Run extended tests so that coverage does not fail, but exclude the very slow dbcrash
 export RUN_UNIT_TESTS_SEQUENTIAL="true"
 export RUN_UNIT_TESTS="false"
 export GOAL="install"
--- a/configure.ac
+++ b/configure.ac
@ -372,7 +372,9 @@ case $host in
 esac

 if test "x$enable_debug" = xyes; then
-  dnl Clear default -g -O2 flags
+  dnl If debugging is enabled, and the user hasn't overriden CXXFLAGS, clear
+  dnl them, to prevent autoconfs "-g -O2" being added. Otherwise we'd end up
+  dnl with "-O0 -g3 -g -O2".
  if test "x$CXXFLAGS_overridden" = xno; then
 	CXXFLAGS=""
  fi
@ -397,11 +399,11 @@ else
    # Stacktraces will be suboptimal due to optimization, but better than nothing. Also, -fno-omit-frame-pointer
    # mitigates this a little bit
    if test "x$GCC" = xyes; then
-        CFLAGS="$CFLAGS -g1 -fno-omit-frame-pointer"
+        DEBUG_CFLAGS="$DEBUG_CFLAGS -g1 -fno-omit-frame-pointer"
    fi

    if test "x$GXX" = xyes; then
-        CXXFLAGS="$CXXFLAGS -g1 -fno-omit-frame-pointer"
+        DEBUG_CXXFLAGS="$DEBUG_CXXFLAGS -g1 -fno-omit-frame-pointer"
    fi
 fi

@ -429,7 +431,7 @@ if test x$LINK_WRAP_SUPPORTED = "xyes"; then
 fi

 # Needed for MinGW targets when debug symbols are enabled as compiled objects get very large
-AX_CHECK_COMPILE_FLAG([-Wa,-mbig-obj], [CXXFLAGS="$CXXFLAGS -Wa,-mbig-obj"],,,)
+AX_CHECK_COMPILE_FLAG([-Wa,-mbig-obj], [DEBUG_CXXFLAGS="$DEBUG_CXXFLAGS -Wa,-mbig-obj"],,,)

 if test x$use_sanitizers != x; then
  dnl First check if the compiler accepts flags. If an incompatible pair like
@ -532,7 +534,7 @@ if test "x$CXXFLAGS_overridden" = "xno"; then
 fi

 dnl Don't allow extended (non-ASCII) symbols in identifiers. This is easier for code review.
-AX_CHECK_COMPILE_FLAG([-fno-extended-identifiers],[[CXXFLAGS="$CXXFLAGS -fno-extended-identifiers"]],,[[$CXXFLAG_WERROR]])
+AX_CHECK_COMPILE_FLAG([-fno-extended-identifiers],[[CORE_CXXFLAGS="$CORE_CXXFLAGS -fno-extended-identifiers"]],,[[$CXXFLAG_WERROR]])

 enable_arm_crc=no
 enable_arm_shani=no
@ -683,7 +685,7 @@ CXXFLAGS="$TEMP_CXXFLAGS"

 fi

-CPPFLAGS="$CPPFLAGS -DHAVE_BUILD_INFO -DGSL_NO_IOSTREAMS"
+CORE_CPPFLAGS="$CORE_CPPFLAGS -DHAVE_BUILD_INFO -DGSL_NO_IOSTREAMS"

 AC_ARG_WITH([utils],
  [AS_HELP_STRING([--with-utils],
@ -755,7 +757,10 @@ case $host in
       AC_MSG_ERROR("windres not found")
     fi

-     CPPFLAGS="$CPPFLAGS -D_MT -DWIN32 -D_WINDOWS -D_WIN32_WINNT=0x0601 -D_WIN32_IE=0x0501 -DWIN32_LEAN_AND_MEAN"
+     CORE_CPPFLAGS="$CORE_CPPFLAGS -D_MT -DWIN32 -D_WINDOWS -D_WIN32_WINNT=0x0601 -D_WIN32_IE=0x0501 -DWIN32_LEAN_AND_MEAN"
+     dnl Prevent the definition of min/max macros.
+     dnl We always want to use the standard library.
+     CORE_CPPFLAGS="$CORE_CPPFLAGS -DNOMINMAX"

     dnl libtool insists upon adding -nostdlib and a list of objects/libs to link against.
     dnl That breaks our ability to build dll's with static libgcc/libstdc++/libssp. Override
@ -766,14 +771,14 @@ case $host in
     postdeps_CXX=

     dnl We require Windows 7 (NT 6.1) or later
-     AX_CHECK_LINK_FLAG([[-Wl,--major-subsystem-version -Wl,6 -Wl,--minor-subsystem-version -Wl,1]],[LDFLAGS="$LDFLAGS -Wl,--major-subsystem-version -Wl,6 -Wl,--minor-subsystem-version -Wl,1"],,[[$LDFLAG_WERROR]])
+     AX_CHECK_LINK_FLAG([[-Wl,--major-subsystem-version -Wl,6 -Wl,--minor-subsystem-version -Wl,1]],[CORE_LDFLAGS="$CORE_LDFLAGS -Wl,--major-subsystem-version -Wl,6 -Wl,--minor-subsystem-version -Wl,1"],,[[$LDFLAG_WERROR]])
     ;;
  *darwin*)
     TARGET_OS=darwin
     if  test x$cross_compiling != xyes; then
       BUILD_OS=darwin

-       AX_CHECK_LINK_FLAG([[-Wl,-headerpad_max_install_names]], [LDFLAGS="$LDFLAGS -Wl,-headerpad_max_install_names"],, [[$LDFLAG_WERROR]])
+       AX_CHECK_LINK_FLAG([[-Wl,-headerpad_max_install_names]], [CORE_LDFLAGS="$CORE_LDFLAGS -Wl,-headerpad_max_install_names"],, [[$LDFLAG_WERROR]])

       AC_CHECK_PROG([BREW],brew, brew)
       if test x$BREW = xbrew; then
@ -800,8 +805,8 @@ case $host in

         gmp_prefix=$($BREW --prefix gmp 2>/dev/null)
         if test x$gmp_prefix != x; then
-           CPPFLAGS="$CPPFLAGS -I$gmp_prefix/include"
-           LDFLAGS="$LDFLAGS -L$gmp_prefix/lib"
+           CORE_CPPFLAGS="$CORE_CPPFLAGS -I$gmp_prefix/include"
+           CORE_LDFLAGS="$CORE_LDFLAGS -L$gmp_prefix/lib"
         fi

         case $host in
@ -813,20 +818,20 @@ case $host in
             if test "x$use_upnp" != xno && $BREW list --versions miniupnpc >/dev/null; then
               miniupnpc_prefix=$($BREW --prefix miniupnpc 2>/dev/null)
               if test "x$suppress_external_warnings" != xno; then
-                 CPPFLAGS="$CPPFLAGS -isystem $miniupnpc_prefix/include"
+                 CORE_CPPFLAGS="$CORE_CPPFLAGS -isystem $miniupnpc_prefix/include"
               else
-                 CPPFLAGS="$CPPFLAGS -I$miniupnpc_prefix/include"
+                 CORE_CPPFLAGS="$CORE_CPPFLAGS -I$miniupnpc_prefix/include"
               fi
-               LDFLAGS="$LDFLAGS -L$miniupnpc_prefix/lib"
+               CORE_LDFLAGS="$CORE_LDFLAGS -L$miniupnpc_prefix/lib"
             fi
             if test "x$use_natpmp" != xno && $BREW list --versions libnatpmp >/dev/null; then
               libnatpmp_prefix=$($BREW --prefix libnatpmp 2>/dev/null)
               if test "x$suppress_external_warnings" != xno; then
-                 CPPFLAGS="$CPPFLAGS -isystem $libnatpmp_prefix/include"
+                 CORE_CPPFLAGS="$CORE_CPPFLAGS -isystem $libnatpmp_prefix/include"
               else
-                 CPPFLAGS="$CPPFLAGS -I$libnatpmp_prefix/include"
+                 CORE_CPPFLAGS="$CORE_CPPFLAGS -I$libnatpmp_prefix/include"
               fi
-               LDFLAGS="$LDFLAGS -L$libnatpmp_prefix/lib"
+               CORE_LDFLAGS="$CORE_LDFLAGS -L$libnatpmp_prefix/lib"
             fi
             ;;
         esac
@ -849,7 +854,7 @@ case $host in
       esac
     fi

-     CPPFLAGS="$CPPFLAGS -DMAC_OSX -DOBJC_OLD_DISPATCH_PROTOTYPES=0"
+     CORE_CPPFLAGS="$CORE_CPPFLAGS -DMAC_OSX -DOBJC_OLD_DISPATCH_PROTOTYPES=0"
     OBJCXXFLAGS="$CXXFLAGS"
     ;;
   *android*)
@ -912,11 +917,17 @@ if test x$use_lcov = xyes; then
  AC_SUBST(COV_TOOL_WRAPPER, "cov_tool_wrapper.sh")
  LCOV="$LCOV --gcov-tool $(pwd)/$COV_TOOL_WRAPPER"

-  AX_CHECK_LINK_FLAG([[--coverage]], [LDFLAGS="$LDFLAGS --coverage"],
+  AX_CHECK_LINK_FLAG([[--coverage]], [CORE_LDFLAGS="$CORE_LDFLAGS --coverage"],
    [AC_MSG_ERROR("lcov testing requested but --coverage linker flag does not work")])
-  AX_CHECK_COMPILE_FLAG([--coverage],[CXXFLAGS="$CXXFLAGS --coverage"],
+  AX_CHECK_COMPILE_FLAG([--coverage],[CORE_CXXFLAGS="$CORE_CXXFLAGS --coverage"],
    [AC_MSG_ERROR("lcov testing requested but --coverage flag does not work")])
-  CXXFLAGS="$CXXFLAGS -Og"
+  dnl If coverage is enabled, and the user hasn't overriden CXXFLAGS, clear
+  dnl them, to prevent autoconfs "-g -O2" being added. Otherwise we'd end up
+  dnl with "--coverage -Og -O0 -g -O2".
+  if test "$CXXFLAGS_overridden" = "no"; then
+  CXXFLAGS=""
+  fi
+  CORE_CXXFLAGS="$CORE_CXXFLAGS -Og -O0"
 fi

 if test x$use_lcov_branch != xno; then
@ -942,13 +953,13 @@ AC_FUNC_STRERROR_R
 if test x$ac_cv_sys_file_offset_bits != x &&
   test x$ac_cv_sys_file_offset_bits != xno &&
   test x$ac_cv_sys_file_offset_bits != xunknown; then
-  CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits"
+  CORE_CPPFLAGS="$CORE_CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits"
 fi

 if test x$ac_cv_sys_large_files != x &&
   test x$ac_cv_sys_large_files != xno &&
   test x$ac_cv_sys_large_files != xunknown; then
-  CPPFLAGS="$CPPFLAGS -D_LARGE_FILES=$ac_cv_sys_large_files"
+  CORE_CPPFLAGS="$CORE_CPPFLAGS -D_LARGE_FILES=$ac_cv_sys_large_files"
 fi

 if test "x$enable_gprof" = xyes; then
@ -1037,8 +1048,8 @@ dnl These flags are specific to ld64, and may cause issues with other linkers.
 dnl For example: GNU ld will interpret -dead_strip as -de and then try and use
 dnl "ad_strip" as the symbol for the entry point.
 if test x$TARGET_OS = xdarwin; then
-  AX_CHECK_LINK_FLAG([[-Wl,-dead_strip]], [LDFLAGS="$LDFLAGS -Wl,-dead_strip"],, [[$LDFLAG_WERROR]])
-  AX_CHECK_LINK_FLAG([[-Wl,-dead_strip_dylibs]], [LDFLAGS="$LDFLAGS -Wl,-dead_strip_dylibs"],, [[$LDFLAG_WERROR]])
+  AX_CHECK_LINK_FLAG([[-Wl,-dead_strip]], [CORE_LDFLAGS="$CORE_LDFLAGS -Wl,-dead_strip"],, [[$LDFLAG_WERROR]])
+  AX_CHECK_LINK_FLAG([[-Wl,-dead_strip_dylibs]], [CORE_LDFLAGS="$CORE_LDFLAGS -Wl,-dead_strip_dylibs"],, [[$LDFLAG_WERROR]])
  AX_CHECK_LINK_FLAG([[-Wl,-fixup_chains]], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,-fixup_chains"], [], [[$LDFLAG_WERROR]])
 fi

@ -1048,7 +1059,6 @@ AC_CHECK_DECLS([getifaddrs, freeifaddrs],[CHECK_SOCKET],,
    [#include <sys/types.h>
    #include <ifaddrs.h>]
 )
-AC_CHECK_DECLS([strnlen])

 dnl These are used for daemonization in dashd
 AC_CHECK_DECLS([fork])
@ -1361,7 +1371,7 @@ if test "x$enable_fuzz" = "xyes"; then
    [[-fsanitize=$use_sanitizers]],
    [AC_MSG_RESULT([no])],
    [AC_MSG_RESULT([yes])
-     CPPFLAGS="$CPPFLAGS -DPROVIDE_FUZZ_MAIN_FUNCTION"],
+     CORE_CPPFLAGS="$CORE_CPPFLAGS -DPROVIDE_FUZZ_MAIN_FUNCTION"],
    [],
    [AC_LANG_PROGRAM([[
      #include <cstdint>
@ -1385,7 +1395,7 @@ else
      QT_TEST_INCLUDES=SUPPRESS_WARNINGS($QT_TEST_INCLUDES)
    fi

-    CPPFLAGS="$CPPFLAGS -DPROVIDE_FUZZ_MAIN_FUNCTION"
+    CORE_CPPFLAGS="$CORE_CPPFLAGS -DPROVIDE_FUZZ_MAIN_FUNCTION"
 fi

 if test x$enable_wallet != xno; then
@ -1518,7 +1528,7 @@ fi

 dnl Check for reduced exports
 if test x$use_reduce_exports = xyes; then
-    AX_CHECK_COMPILE_FLAG([-fvisibility=hidden],[CXXFLAGS="$CXXFLAGS -fvisibility=hidden"],
+    AX_CHECK_COMPILE_FLAG([-fvisibility=hidden],[CORE_CXXFLAGS="$CORE_CXXFLAGS -fvisibility=hidden"],
    [AC_MSG_ERROR([Cannot set hidden symbol visibility. Use --disable-reduce-exports.])],[[$CXXFLAG_WERROR]])
    AX_CHECK_LINK_FLAG([[-Wl,--exclude-libs,ALL]],[RELDFLAGS="-Wl,--exclude-libs,ALL"],,[[$LDFLAG_WERROR]])
    AX_CHECK_LINK_FLAG([-Wl,-no_exported_symbols], [LIBTOOL_APP_LDFLAGS="$LIBTOOL_APP_LDFLAGS -Wl,-no_exported_symbols"], [], [$LDFLAG_WERROR])
@ -1870,10 +1880,14 @@ AC_SUBST(BITCOIN_MP_NODE_NAME)
 AC_SUBST(BITCOIN_MP_GUI_NAME)

 AC_SUBST(RELDFLAGS)
+AC_SUBST(CORE_LDFLAGS)
+AC_SUBST(CORE_CPPFLAGS)
+AC_SUBST(CORE_CXXFLAGS)
+AC_SUBST(DEBUG_CFLAGS)
 AC_SUBST(DEBUG_CPPFLAGS)
+AC_SUBST(DEBUG_CXXFLAGS)
 AC_SUBST(WARN_CXXFLAGS)
 AC_SUBST(NOWARN_CXXFLAGS)
-AC_SUBST(DEBUG_CXXFLAGS)
 AC_SUBST(ERROR_CXXFLAGS)
 AC_SUBST(GPROF_CXXFLAGS)
 AC_SUBST(GPROF_LDFLAGS)
@ -1995,10 +2009,10 @@ echo "  target os           = $host_os"
 echo "  build os            = $build_os"
 echo
 echo "  CC                  = $CC"
-echo "  CFLAGS              = $PTHREAD_CFLAGS $CFLAGS"
-echo "  CPPFLAGS            = $DEBUG_CPPFLAGS $HARDENED_CPPFLAGS $CPPFLAGS"
+echo "  CFLAGS              = $DEBUG_CFLAGS $PTHREAD_CFLAGS $CFLAGS"
+echo "  CPPFLAGS            = $DEBUG_CPPFLAGS $HARDENED_CPPFLAGS $CORE_CPPFLAGS $CPPFLAGS"
 echo "  CXX                 = $CXX"
-echo "  CXXFLAGS            = $DEBUG_CXXFLAGS $HARDENED_CXXFLAGS $WARN_CXXFLAGS $NOWARN_CXXFLAGS $ERROR_CXXFLAGS $GPROF_CXXFLAGS $CXXFLAGS"
-echo "  LDFLAGS             = $PTHREAD_LIBS $HARDENED_LDFLAGS $GPROF_LDFLAGS $LDFLAGS"
+echo "  CXXFLAGS            = $DEBUG_CXXFLAGS $HARDENED_CXXFLAGS $WARN_CXXFLAGS $NOWARN_CXXFLAGS $ERROR_CXXFLAGS $GPROF_CXXFLAGS $CORE_CXXFLAGS $CXXFLAGS"
+echo "  LDFLAGS             = $PTHREAD_LIBS $HARDENED_LDFLAGS $GPROF_LDFLAGS $CORE_LDFLAGS $LDFLAGS"
 echo "  ARFLAGS             = $ARFLAGS"
 echo
--- a/src/Makefile.am
+++ b/src/Makefile.am
@ -9,9 +9,10 @@ print-%: FORCE

 DIST_SUBDIRS = secp256k1

-AM_LDFLAGS = $(LIBTOOL_LDFLAGS) $(HARDENED_LDFLAGS) $(GPROF_LDFLAGS) $(SANITIZER_LDFLAGS)
-AM_CXXFLAGS = $(DEBUG_CXXFLAGS) $(HARDENED_CXXFLAGS) $(WARN_CXXFLAGS) $(NOWARN_CXXFLAGS) $(ERROR_CXXFLAGS) $(GPROF_CXXFLAGS) $(SANITIZER_CXXFLAGS)
-AM_CPPFLAGS = $(DEBUG_CPPFLAGS) $(HARDENED_CPPFLAGS)
+AM_LDFLAGS = $(LIBTOOL_LDFLAGS) $(HARDENED_LDFLAGS) $(GPROF_LDFLAGS) $(SANITIZER_LDFLAGS) $(CORE_LDFLAGS)
+AM_CFLAGS = $(DEBUG_CFLAGS)
+AM_CXXFLAGS = $(DEBUG_CXXFLAGS) $(HARDENED_CXXFLAGS) $(WARN_CXXFLAGS) $(NOWARN_CXXFLAGS) $(ERROR_CXXFLAGS) $(GPROF_CXXFLAGS) $(SANITIZER_CXXFLAGS) $(CORE_CXXFLAGS)
+AM_CPPFLAGS = $(DEBUG_CPPFLAGS) $(HARDENED_CPPFLAGS) $(CORE_CPPFLAGS)
 AM_LIBTOOLFLAGS = --preserve-dup-deps
 PTHREAD_FLAGS = $(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
 EXTRA_LIBRARIES =
@ -162,9 +163,9 @@ BITCOIN_CORE_H = \
  coinjoin/util.h \
  coins.h \
  common/bloom.h \
-  compat.h \
  compat/assumptions.h \
  compat/byteswap.h \
+  compat/compat.h \
  compat/cpuid.h \
  compat/endian.h \
  compressor.h \
@ -281,7 +282,7 @@ BITCOIN_CORE_H = \
  node/psbt.h \
  node/transaction.h \
  node/txreconciliation.h \
-  node/ui_interface.h \
+  node/interface_ui.h \
  node/utxo_snapshot.h \
  noui.h \
  outputtype.h \
@ -516,7 +517,7 @@ libbitcoin_server_a_SOURCES = \
  node/psbt.cpp \
  node/transaction.cpp \
  node/txreconciliation.cpp \
-  node/ui_interface.cpp \
+  node/interface_ui.cpp \
  noui.cpp \
  policy/fees.cpp \
  policy/packages.cpp \
@ -796,7 +797,6 @@ libbitcoin_util_a_SOURCES = \
  support/lockedpool.cpp \
  chainparamsbase.cpp \
  clientversion.cpp \
-  compat/strnlen.cpp \
  fs.cpp \
  interfaces/echo.cpp \
  interfaces/handler.cpp \
--- a/src/banman.cpp
+++ b/src/banman.cpp
@ -6,7 +6,7 @@
 #include <banman.h>

 #include <netaddress.h>
-#include <node/ui_interface.h>
+#include <node/interface_ui.h>
 #include <sync.h>
 #include <util/system.h>
 #include <util/time.h>
--- a/src/bitcoin-cli.cpp
+++ b/src/bitcoin-cli.cpp
@ -10,7 +10,7 @@

 #include <chainparamsbase.h>
 #include <clientversion.h>
-#include <compat.h>
+#include <compat/compat.h>
 #include <compat/stdin.h>
 #include <policy/feerate.h>
 #include <rpc/client.h>
--- a/src/bitcoin-tx.cpp
+++ b/src/bitcoin-tx.cpp
@ -9,7 +9,7 @@
 #include <chainparams.h>
 #include <clientversion.h>
 #include <coins.h>
-#include <compat.h>
+#include <compat/compat.h>
 #include <consensus/consensus.h>
 #include <core_io.h>
 #include <key_io.h>
--- a/src/bitcoin-wallet.cpp
+++ b/src/bitcoin-wallet.cpp
@ -8,7 +8,7 @@

 #include <chainparams.h>
 #include <chainparamsbase.h>
-#include <compat.h>
+#include <compat/compat.h>
 #include <logging.h>
 #include <util/strencodings.h>
 #include <util/system.h>
--- a/src/bitcoind.cpp
+++ b/src/bitcoind.cpp
@ -10,12 +10,12 @@

 #include <chainparams.h>
 #include <clientversion.h>
-#include <compat.h>
+#include <compat/compat.h>
 #include <init.h>
 #include <interfaces/chain.h>
 #include <interfaces/init.h>
 #include <node/context.h>
-#include <node/ui_interface.h>
+#include <node/interface_ui.h>
 #include <noui.h>
 #include <shutdown.h>
 #include <util/check.h>
--- a/src/compat/assumptions.h
+++ b/src/compat/assumptions.h
@ -8,6 +8,7 @@
 #ifndef BITCOIN_COMPAT_ASSUMPTIONS_H
 #define BITCOIN_COMPAT_ASSUMPTIONS_H

+#include <cstddef>
 #include <limits>

 // Assumption: We assume that the macro NDEBUG is not defined.
--- a/src/compat/compat.h
+++ b/src/compat/compat.h
@ -3,24 +3,24 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.

-#ifndef BITCOIN_COMPAT_H
-#define BITCOIN_COMPAT_H
+#ifndef BITCOIN_COMPAT_COMPAT_H
+#define BITCOIN_COMPAT_COMPAT_H

 #if defined(HAVE_CONFIG_H)
 #include <config/bitcoin-config.h>
 #endif

+// Windows defines FD_SETSIZE to 64 (see _fd_types.h in mingw-w64),
+// which is too small for our usage, but allows us to redefine it safely.
+// We redefine it to be 1024, to match glibc, see typesizes.h.
 #ifdef WIN32
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
 #ifdef FD_SETSIZE
-#undef FD_SETSIZE // prevent redefinition compiler warning
+#undef FD_SETSIZE
 #endif
-#define FD_SETSIZE 1024 // max number of fds in fd_set
+#define FD_SETSIZE 1024
 #include <winsock2.h>
 #include <ws2tcpip.h>
-#include <stdint.h>
+#include <cstdint>
 #else
 #include <fcntl.h>
 #include <sys/mman.h>
@ -37,54 +37,46 @@
 #include <unistd.h>
 #endif

+// We map Linux / BSD error functions and codes, to the equivalent
+// Windows definitions, and use the WSA* names throughout our code.
+// Note that glibc defines EWOULDBLOCK as EAGAIN (see errno.h).
 #ifndef WIN32
 typedef unsigned int SOCKET;
-#include <errno.h>
+#include <cerrno>
 #define WSAGetLastError()   errno
 #define WSAEINVAL           EINVAL
-#define WSAEALREADY         EALREADY
 #define WSAEWOULDBLOCK      EWOULDBLOCK
 #define WSAEAGAIN           EAGAIN
 #define WSAEMSGSIZE         EMSGSIZE
 #define WSAEINTR            EINTR
 #define WSAEINPROGRESS      EINPROGRESS
 #define WSAEADDRINUSE       EADDRINUSE
-#define WSAENOTSOCK         EBADF
 #define INVALID_SOCKET      (SOCKET)(~0)
 #define SOCKET_ERROR        -1
 #define SD_SEND             SHUT_WR
 #else
-#ifndef WSAEAGAIN
+// WSAEAGAIN doesn't exist on Windows
 #ifdef EAGAIN
 #define WSAEAGAIN EAGAIN
 #else
 #define WSAEAGAIN WSAEWOULDBLOCK
 #endif
 #endif
-#endif

-#ifdef WIN32
-#ifndef S_IRUSR
-#define S_IRUSR             0400
-#define S_IWUSR             0200
-#endif
-#else
+// Windows defines MAX_PATH as it's maximum path length.
+// We define MAX_PATH for use on non-Windows systems.
+#ifndef WIN32
 #define MAX_PATH            1024
 #endif
+
+// ssize_t is POSIX, and not present when using MSVC.
 #ifdef _MSC_VER
-#if !defined(ssize_t)
-#ifdef _WIN64
-typedef int64_t ssize_t;
-#else
-typedef int32_t ssize_t;
-#endif
-#endif
+#include <BaseTsd.h>
+typedef SSIZE_T ssize_t;
 #endif

-#if HAVE_DECL_STRNLEN == 0
-size_t strnlen( const char *start, size_t max_len);
-#endif // HAVE_DECL_STRNLEN
-
+// The type of the option value passed to getsockopt & setsockopt
+// differs between Windows and non-Windows.
 #ifndef WIN32
 typedef void* sockopt_arg_type;
 #else
@ -135,4 +127,4 @@ bool static inline IsSelectableSocket(const SOCKET& s) {
 #define MSG_DONTWAIT 0
 #endif

-#endif // BITCOIN_COMPAT_H
+#endif // BITCOIN_COMPAT_COMPAT_H
--- a/src/compat/strnlen.cpp
+++ b/src/compat/strnlen.cpp
@ -1,18 +0,0 @@
-// Copyright (c) 2009-2014 The Bitcoin Core developers
-// Distributed under the MIT software license, see the accompanying
-// file COPYING or http://www.opensource.org/licenses/mit-license.php.
-
-#if defined(HAVE_CONFIG_H)
-#include <config/bitcoin-config.h>
-#endif
-
-#include <cstring>
-
-#if HAVE_DECL_STRNLEN == 0
-size_t strnlen( const char *start, size_t max_len)
-{
-    const char *end = (const char *)memchr(start, '\0', max_len);
-
-    return end ? (size_t)(end - start) : max_len;
-}
-#endif // HAVE_DECL_STRNLEN
--- a/src/fs.cpp
+++ b/src/fs.cpp
@ -11,9 +11,6 @@
 #include <sys/utsname.h>
 #include <unistd.h>
 #else
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
 #include <codecvt>
 #include <limits>
 #include <windows.h>
--- a/src/httpserver.cpp
+++ b/src/httpserver.cpp
@ -10,7 +10,7 @@

 #include <chainparamsbase.h>
 #include <netbase.h>
-#include <node/ui_interface.h>
+#include <node/interface_ui.h>
 #include <rpc/protocol.h> // For HTTP status codes
 #include <shutdown.h>
 #include <sync.h>
--- a/src/i2p.cpp
+++ b/src/i2p.cpp
@ -3,7 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.

 #include <chainparams.h>
-#include <compat.h>
+#include <compat/compat.h>
 #include <compat/endian.h>
 #include <crypto/sha256.h>
 #include <fs.h>
--- a/src/i2p.h
+++ b/src/i2p.h
@ -5,7 +5,7 @@
 #ifndef BITCOIN_I2P_H
 #define BITCOIN_I2P_H

-#include <compat.h>
+#include <compat/compat.h>
 #include <fs.h>
 #include <netaddress.h>
 #include <sync.h>
--- a/src/index/base.cpp
+++ b/src/index/base.cpp
@ -5,7 +5,7 @@
 #include <chainparams.h>
 #include <index/base.h>
 #include <node/blockstorage.h>
-#include <node/ui_interface.h>
+#include <node/interface_ui.h>
 #include <shutdown.h>
 #include <tinyformat.h>
 #include <util/thread.h>
--- a/src/init.cpp
+++ b/src/init.cpp
@ -41,7 +41,7 @@
 #include <node/caches.h>
 #include <node/chainstate.h>
 #include <node/context.h>
-#include <node/ui_interface.h>
+#include <node/interface_ui.h>
 #include <node/txreconciliation.h>
 #include <policy/feerate.h>
 #include <policy/fees.h>
@ -1436,11 +1436,6 @@ bool AppInitLockDataDirectory()
 bool AppInitInterfaces(NodeContext& node)
 {
    node.chain = interfaces::MakeChain(node);
-    // Create client interfaces for wallets that are supposed to be loaded
-    // according to -wallet and -disablewallet options. This only constructs
-    // the interfaces, it doesn't load wallet data. Wallets actually get loaded
-    // when load() and start() interface methods are called below.
-    g_wallet_init_interface.Construct(node);
    return true;
 }

@ -1510,11 +1505,17 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)

    GetMainSignals().RegisterBackgroundSignalScheduler(*node.scheduler);

-    tableRPC.InitPlatformRestrictions();
+    // Create client interfaces for wallets that are supposed to be loaded
+    // according to -wallet and -disablewallet options. This only constructs
+    // the interfaces, it doesn't load wallet data. Wallets actually get loaded
+    // when load() and start() interface methods are called below.
+    g_wallet_init_interface.Construct(node);
+    uiInterface.InitWallet();

    /* Register RPC commands regardless of -server setting so they will be
     * available in the GUI RPC console even if external calls are disabled.
     */
+    tableRPC.InitPlatformRestrictions();
    RegisterAllCoreRPCCommands(tableRPC);
    for (const auto& client : node.chain_clients) {
        client->registerRpcs();
--- a/src/init/common.cpp
+++ b/src/init/common.cpp
@ -11,7 +11,7 @@
 #include <crypto/sha256.h>
 #include <key.h>
 #include <logging.h>
-#include <node/ui_interface.h>
+#include <node/interface_ui.h>
 #include <random.h>
 #include <util/string.h>
 #include <util/system.h>
--- a/src/interfaces/node.h
+++ b/src/interfaces/node.h
@ -309,6 +309,10 @@ public:
    using ShowProgressFn = std::function<void(const std::string& title, int progress, bool resume_possible)>;
    virtual std::unique_ptr<Handler> handleShowProgress(ShowProgressFn fn) = 0;

+    //! Register handler for wallet client constructed messages.
+    using InitWalletFn = std::function<void()>;
+    virtual std::unique_ptr<Handler> handleInitWallet(InitWalletFn fn) = 0;
+
    //! Register handler for number of connections changed messages.
    using NotifyNumConnectionsChangedFn = std::function<void(int new_num_connections)>;
    virtual std::unique_ptr<Handler> handleNotifyNumConnectionsChanged(NotifyNumConnectionsChangedFn fn) = 0;
--- a/src/llmq/chainlocks.cpp
+++ b/src/llmq/chainlocks.cpp
@ -12,7 +12,7 @@
 #include <consensus/validation.h>
 #include <masternode/sync.h>
 #include <node/blockstorage.h>
-#include <node/ui_interface.h>
+#include <node/interface_ui.h>
 #include <scheduler.h>
 #include <spork.h>
 #include <txmempool.h>
--- a/src/mapport.cpp
+++ b/src/mapport.cpp
@ -18,7 +18,7 @@
 #include <util/thread.h>

 #ifdef USE_NATPMP
-#include <compat.h>
+#include <compat/compat.h>
 #include <natpmp.h>
 #endif // USE_NATPMP

--- a/src/masternode/sync.cpp
+++ b/src/masternode/sync.cpp
@ -8,11 +8,11 @@
 #include <governance/governance.h>
 #include <netfulfilledman.h>
 #include <netmessagemaker.h>
-#include <node/ui_interface.h>
+#include <node/interface_ui.h>
 #include <shutdown.h>
-#include <validation.h>
 #include <util/time.h>
 #include <util/translation.h>
+#include <validation.h>

 class CMasternodeSync;

--- a/src/net.cpp
+++ b/src/net.cpp
@ -15,7 +15,7 @@
 #include <addrman.h>
 #include <banman.h>
 #include <clientversion.h>
-#include <compat.h>
+#include <compat/compat.h>
 #include <consensus/consensus.h>
 #include <crypto/sha256.h>
 #include <node/eviction.h>
@ -25,7 +25,7 @@
 #include <net_permissions.h>
 #include <netaddress.h>
 #include <netbase.h>
-#include <node/ui_interface.h>
+#include <node/interface_ui.h>
 #include <protocol.h>
 #include <random.h>
 #include <scheduler.h>
--- a/src/net.h
+++ b/src/net.h
@ -9,7 +9,7 @@
 #include <bip324.h>
 #include <chainparams.h>
 #include <common/bloom.h>
-#include <compat.h>
+#include <compat/compat.h>
 #include <consensus/amount.h>
 #include <fs.h>
 #include <crypto/siphash.h>
--- a/src/netaddress.h
+++ b/src/netaddress.h
@ -10,7 +10,7 @@
 #endif

 #include <attributes.h>
-#include <compat.h>
+#include <compat/compat.h>
 #include <crypto/siphash.h>
 #include <prevector.h>
 #include <random.h>
--- a/src/netbase.cpp
+++ b/src/netbase.cpp
@ -5,7 +5,7 @@

 #include <netbase.h>

-#include <compat.h>
+#include <compat/compat.h>
 #include <sync.h>
 #include <tinyformat.h>
 #include <util/sock.h>
--- a/src/netbase.h
+++ b/src/netbase.h
@ -9,7 +9,7 @@
 #include <config/bitcoin-config.h>
 #endif

-#include <compat.h>
+#include <compat/compat.h>
 #include <netaddress.h>
 #include <serialize.h>
 #include <util/sock.h>
--- a/src/node/interface_ui.cpp
+++ b/src/node/interface_ui.cpp
@ -2,7 +2,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.

-#include <node/ui_interface.h>
+#include <node/interface_ui.h>

 #include <util/translation.h>

@ -15,6 +15,7 @@ struct UISignals {
    boost::signals2::signal<CClientUIInterface::ThreadSafeMessageBoxSig, boost::signals2::optional_last_value<bool>> ThreadSafeMessageBox;
    boost::signals2::signal<CClientUIInterface::ThreadSafeQuestionSig, boost::signals2::optional_last_value<bool>> ThreadSafeQuestion;
    boost::signals2::signal<CClientUIInterface::InitMessageSig> InitMessage;
+    boost::signals2::signal<CClientUIInterface::InitWalletSig> InitWallet;
    boost::signals2::signal<CClientUIInterface::NotifyNumConnectionsChangedSig> NotifyNumConnectionsChanged;
    boost::signals2::signal<CClientUIInterface::NotifyNetworkActiveChangedSig> NotifyNetworkActiveChanged;
    boost::signals2::signal<CClientUIInterface::NotifyAlertChangedSig> NotifyAlertChanged;
@ -37,6 +38,7 @@ static UISignals g_ui_signals;
 ADD_SIGNALS_IMPL_WRAPPER(ThreadSafeMessageBox);
 ADD_SIGNALS_IMPL_WRAPPER(ThreadSafeQuestion);
 ADD_SIGNALS_IMPL_WRAPPER(InitMessage);
+ADD_SIGNALS_IMPL_WRAPPER(InitWallet);
 ADD_SIGNALS_IMPL_WRAPPER(NotifyNumConnectionsChanged);
 ADD_SIGNALS_IMPL_WRAPPER(NotifyNetworkActiveChanged);
 ADD_SIGNALS_IMPL_WRAPPER(NotifyAlertChanged);
@ -51,6 +53,7 @@ ADD_SIGNALS_IMPL_WRAPPER(BannedListChanged);
 bool CClientUIInterface::ThreadSafeMessageBox(const bilingual_str& message, const std::string& caption, unsigned int style) { return g_ui_signals.ThreadSafeMessageBox(message, caption, style).value_or(false);}
 bool CClientUIInterface::ThreadSafeQuestion(const bilingual_str& message, const std::string& non_interactive_message, const std::string& caption, unsigned int style) { return g_ui_signals.ThreadSafeQuestion(message, non_interactive_message, caption, style).value_or(false);}
 void CClientUIInterface::InitMessage(const std::string& message) { return g_ui_signals.InitMessage(message); }
+void CClientUIInterface::InitWallet() { return g_ui_signals.InitWallet(); }
 void CClientUIInterface::NotifyNumConnectionsChanged(int newNumConnections) { return g_ui_signals.NotifyNumConnectionsChanged(newNumConnections); }
 void CClientUIInterface::NotifyNetworkActiveChanged(bool networkActive) { return g_ui_signals.NotifyNetworkActiveChanged(networkActive); }
 void CClientUIInterface::NotifyAlertChanged() { return g_ui_signals.NotifyAlertChanged(); }
--- a/src/node/interface_ui.h
+++ b/src/node/interface_ui.h
@ -3,8 +3,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.

-#ifndef BITCOIN_NODE_UI_INTERFACE_H
-#define BITCOIN_NODE_UI_INTERFACE_H
+#ifndef BITCOIN_NODE_INTERFACE_UI_H
+#define BITCOIN_NODE_INTERFACE_UI_H

 #include <functional>
 #include <memory>
@ -83,6 +83,9 @@ public:
    /** Progress message during initialization. */
    ADD_SIGNALS_DECL_WRAPPER(InitMessage, void, const std::string& message);

+    /** Wallet client created. */
+    ADD_SIGNALS_DECL_WRAPPER(InitWallet, void, );
+
    /** Number of network connections changed. */
    ADD_SIGNALS_DECL_WRAPPER(NotifyNumConnectionsChanged, void, int newNumConnections);

@ -128,4 +131,4 @@ constexpr auto AbortError = InitError;

 extern CClientUIInterface uiInterface;

-#endif // BITCOIN_NODE_UI_INTERFACE_H
+#endif // BITCOIN_NODE_INTERFACE_UI_H
--- a/src/node/interfaces.cpp
+++ b/src/node/interfaces.cpp
@ -30,7 +30,7 @@
 #include <node/blockstorage.h>
 #include <node/coin.h>
 #include <node/context.h>
-#include <node/ui_interface.h>
+#include <node/interface_ui.h>
 #include <node/transaction.h>
 #include <policy/feerate.h>
 #include <policy/fees.h>
@ -527,6 +527,10 @@ public:
    {
        return MakeHandler(::uiInterface.ShowProgress_connect(fn));
    }
+    std::unique_ptr<Handler> handleInitWallet(InitWalletFn fn) override
+    {
+        return MakeHandler(::uiInterface.InitWallet_connect(fn));
+    }
    std::unique_ptr<Handler> handleNotifyNumConnectionsChanged(NotifyNumConnectionsChangedFn fn) override
    {
        return MakeHandler(::uiInterface.NotifyNumConnectionsChanged_connect(fn));
--- a/src/noui.cpp
+++ b/src/noui.cpp
@ -7,7 +7,7 @@
 #include <noui.h>

 #include <logging.h>
-#include <node/ui_interface.h>
+#include <node/interface_ui.h>
 #include <util/translation.h>

 #include <string>
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@ -16,7 +16,7 @@
 #include <interfaces/node.h>
 #include <net.h>
 #include <node/context.h>
-#include <node/ui_interface.h>
+#include <node/interface_ui.h>
 #include <noui.h>
 #include <qt/bitcoingui.h>
 #include <qt/clientmodel.h>
@ -262,7 +262,6 @@ void BitcoinApplication::createSplashScreen(const NetworkStyle *networkStyle)
    // We don't hold a direct pointer to the splash screen after creation, but the splash
    // screen will take care of deleting itself when finish() happens.
    m_splash->show();
-    connect(this, &BitcoinApplication::requestedInitialize, m_splash, &SplashScreen::handleLoadWallet);
    connect(this, &BitcoinApplication::splashFinished, m_splash, &SplashScreen::finish);
    connect(this, &BitcoinApplication::requestedShutdown, m_splash, &QWidget::close);
 }
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@ -36,7 +36,7 @@
 #include <interfaces/coinjoin.h>
 #include <interfaces/handler.h>
 #include <interfaces/node.h>
-#include <node/ui_interface.h>
+#include <node/interface_ui.h>
 #include <qt/governancelist.h>
 #include <qt/masternodelist.h>
 #include <util/system.h>
--- a/src/qt/guiutil.cpp
+++ b/src/qt/guiutil.cpp
@ -29,9 +29,6 @@
 #include <cmath>

 #ifdef WIN32
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
 #include <shellapi.h>
 #include <shlobj.h>
 #include <shlwapi.h>
--- a/src/qt/main.cpp
+++ b/src/qt/main.cpp
@ -4,7 +4,7 @@

 #include <qt/bitcoin.h>

-#include <compat.h>
+#include <compat/compat.h>
 #include <util/translation.h>
 #include <util/url.h>

--- a/src/qt/paymentserver.cpp
+++ b/src/qt/paymentserver.cpp
@ -17,7 +17,7 @@
 #include <clientversion.h>
 #include <interfaces/node.h>
 #include <key_io.h>
-#include <node/ui_interface.h>
+#include <node/interface_ui.h>
 #include <policy/policy.h>
 #include <util/system.h>

--- a/src/qt/sendcoinsdialog.cpp
+++ b/src/qt/sendcoinsdialog.cpp
@ -21,7 +21,7 @@
 #include <chainparams.h>
 #include <interfaces/node.h>
 #include <key_io.h>
-#include <node/ui_interface.h>
+#include <node/interface_ui.h>
 #include <policy/fees.h>
 #include <txmempool.h>
 #include <wallet/coincontrol.h>
--- a/src/qt/splashscreen.cpp
+++ b/src/qt/splashscreen.cpp
@ -199,6 +199,7 @@ void SplashScreen::subscribeToCoreSignals()
    // Connect signals to client
    m_handler_init_message = m_node->handleInitMessage(std::bind(InitMessage, this, std::placeholders::_1));
    m_handler_show_progress = m_node->handleShowProgress(std::bind(ShowProgress, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3));
+    m_handler_init_wallet = m_node->handleInitWallet([this]() { handleLoadWallet(); });
 }

 void SplashScreen::handleLoadWallet()
--- a/src/qt/splashscreen.h
+++ b/src/qt/splashscreen.h
@ -66,6 +66,7 @@ private:
    bool m_shutdown = false;
    std::unique_ptr<interfaces::Handler> m_handler_init_message;
    std::unique_ptr<interfaces::Handler> m_handler_show_progress;
+    std::unique_ptr<interfaces::Handler> m_handler_init_wallet;
    std::unique_ptr<interfaces::Handler> m_handler_load_wallet;
    std::list<std::unique_ptr<interfaces::Wallet>> m_connected_wallets;
    std::list<std::unique_ptr<interfaces::Handler>> m_connected_wallet_handlers;
--- a/src/qt/transactionview.cpp
+++ b/src/qt/transactionview.cpp
@ -18,7 +18,7 @@
 #include <qt/walletmodel.h>

 #include <interfaces/node.h>
-#include <node/ui_interface.h>
+#include <node/interface_ui.h>

 #include <optional>

--- a/src/qt/walletframe.cpp
+++ b/src/qt/walletframe.cpp
@ -5,7 +5,7 @@
 #include <qt/walletframe.h>

 #include <fs.h>
-#include <node/ui_interface.h>
+#include <node/interface_ui.h>
 #include <psbt.h>
 #include <qt/governancelist.h>
 #include <qt/guiutil.h>
--- a/src/qt/walletmodel.cpp
+++ b/src/qt/walletmodel.cpp
@ -22,7 +22,7 @@
 #include <interfaces/handler.h>
 #include <interfaces/node.h>
 #include <key_io.h>
-#include <node/ui_interface.h>
+#include <node/interface_ui.h>
 #include <psbt.h>
 #include <util/system.h> // for GetBoolArg
 #include <util/translation.h>
--- a/src/qt/walletview.cpp
+++ b/src/qt/walletview.cpp
@ -22,7 +22,7 @@
 #include <qt/walletmodel.h>

 #include <interfaces/node.h>
-#include <node/ui_interface.h>
+#include <node/interface_ui.h>
 #include <util/strencodings.h>

 #include <QAction>
--- a/src/random.cpp
+++ b/src/random.cpp
@ -9,24 +9,23 @@
 #include <crypto/chacha20.h>
 #include <crypto/sha256.h>
 #include <crypto/sha512.h>
-#include <support/cleanse.h>
-#ifdef WIN32
-#include <compat.h> // for Windows API
-#include <wincrypt.h>
-#endif
 #include <logging.h>
 #include <randomenv.h>
-#include <support/allocators/secure.h>
 #include <span.h>
-#include <sync.h>     // for Mutex
-#include <util/time.h> // for GetTimeMicros()
+#include <support/allocators/secure.h>
+#include <support/cleanse.h>
+#include <sync.h>
+#include <util/time.h>

 #include <array>
 #include <cmath>
 #include <stdlib.h>
 #include <thread>

-#ifndef WIN32
+#ifdef WIN32
+#include <windows.h>
+#include <wincrypt.h>
+#else
 #include <fcntl.h>
 #endif

@ -729,7 +728,7 @@ bool Random_SanityCheck()
     * GetOSRand() overwrites all 32 bytes of the output given a maximum
     * number of tries.
     */
-    static const ssize_t MAX_TRIES = 1024;
+    static constexpr int MAX_TRIES{1024};
    uint8_t data[NUM_OS_RANDOM_BYTES];
    bool overwritten[NUM_OS_RANDOM_BYTES] = {}; /* Tracks which bytes have been overwritten at least once */
    int num_overwritten;
--- a/src/randomenv.cpp
+++ b/src/randomenv.cpp
@ -14,22 +14,23 @@
 #include <crypto/sha512.h>
 #include <span.h>
 #include <support/cleanse.h>
-#include <util/time.h> // for GetTime()
-#ifdef WIN32
-#include <compat.h> // for Windows API
-#endif
+#include <util/time.h>

 #include <algorithm>
 #include <atomic>
+#include <cstdint>
+#include <cstring>
 #include <chrono>
 #include <climits>
 #include <thread>
 #include <vector>

-#include <stdint.h>
-#include <string.h>
-#ifndef WIN32
 #include <sys/types.h> // must go before a number of other headers
+
+#ifdef WIN32
+#include <windows.h>
+#include <winreg.h>
+#else
 #include <fcntl.h>
 #include <netinet/in.h>
 #include <sys/resource.h>
--- a/src/rpc/coinjoin.cpp
+++ b/src/rpc/coinjoin.cpp
@ -365,6 +365,7 @@ static RPCHelpMan coinjoinsalt_set()
 }
 #endif // ENABLE_WALLET

+// TODO: remove it completely
 static RPCHelpMan getpoolinfo()
 {
    return RPCHelpMan{"getpoolinfo",
@ -469,7 +470,6 @@ void RegisterCoinJoinRPCCommands(CRPCTable &t)
 static const CRPCCommand commands[] =
 { //  category               actor (function)
  //  ---------------------  -----------------------
-    { "dash",                &getpoolinfo,            },
    { "dash",                &getcoinjoininfo,        },
 #ifdef ENABLE_WALLET
    { "dash",                &coinjoin,               },
@ -480,6 +480,8 @@ static const CRPCCommand commands[] =
    { "dash",                &coinjoinsalt_generate,  },
    { "dash",                &coinjoinsalt_get,       },
    { "dash",                &coinjoinsalt_set,       },
+
+    { "hidden",              &getpoolinfo,            },
 #endif // ENABLE_WALLET
 };
 // clang-format on
--- a/src/rpc/masternode.cpp
+++ b/src/rpc/masternode.cpp
@ -134,6 +134,7 @@ static UniValue GetNextMasternodeForPayment(const CChain& active_chain, CDetermi
    return obj;
 }

+// TODO: drop it
 static RPCHelpMan masternode_winner()
 {
    return RPCHelpMan{"masternode winner",
@ -154,6 +155,7 @@ static RPCHelpMan masternode_winner()
    };
 }

+// TODO: drop it
 static RPCHelpMan masternode_current()
 {
    return RPCHelpMan{"masternode current",
@ -227,7 +229,7 @@ static RPCHelpMan masternode_status()
    }

    UniValue mnObj(UniValue::VOBJ);
-    // keep compatibility with legacy status for now (might get deprecated/removed later)
+    // keep compatibility with legacy status for now (TODO: get deprecated/removed later)
    mnObj.pushKV("outpoint", node.mn_activeman->GetOutPoint().ToStringShort());
    mnObj.pushKV("service", node.mn_activeman->GetService().ToStringAddrPort());
    auto dmn = CHECK_NONFATAL(node.dmnman)->GetListAtChainTip().GetMN(node.mn_activeman->GetProTxHash());
@ -750,8 +752,8 @@ static const CRPCCommand commands[] =
    { "dash",               &masternode_status,        },
    { "dash",               &masternode_payments,      },
    { "dash",               &masternode_winners,       },
-    { "dash",               &masternode_current,       },
-    { "dash",               &masternode_winner,        },
+    { "hidden",             &masternode_current,       },
+    { "hidden",             &masternode_winner,        },
 };
 // clang-format on
    for (const auto& command : commands) {
--- a/src/rpc/net.cpp
+++ b/src/rpc/net.cpp
@ -241,7 +241,7 @@ static RPCHelpMan getpeerinfo()
        obj.pushKV("masternode", stats.m_masternode_connection);
        if (fStateStats) {
            if (IsDeprecatedRPCEnabled("banscore")) {
-                // banscore is deprecated in v21 for removal in v22
+                // TODO: banscore is deprecated in v21 for removal in v22, maybe impossible due to usages in p2p_quorum_data.py
                obj.pushKV("banscore", statestats.m_misbehavior_score);
            }
            obj.pushKV("startingheight", statestats.m_starting_height);
@ -1126,10 +1126,10 @@ static const CRPCCommand commands[] =
    { "network",             &setban,                  },
    { "network",             &listbanned,              },
    { "network",             &clearbanned,             },
-    { "network",             &cleardiscouraged,        },
    { "network",             &setnetworkactive,        },
    { "network",             &getnodeaddresses,        },

+    { "hidden",              &cleardiscouraged,        },
    { "hidden",              &addconnection,           },
    { "hidden",              &addpeeraddress,          },
    { "hidden",              &sendmsgtopeer            },
--- a/src/shutdown.cpp
+++ b/src/shutdown.cpp
@ -12,7 +12,7 @@
 #include <logging.h>
 #include <util/tokenpipe.h>

-#include <node/ui_interface.h>
+#include <node/interface_ui.h>
 #include <warnings.h>

 #include <assert.h>
--- a/src/stats/rawsender.h
+++ b/src/stats/rawsender.h
@ -6,7 +6,7 @@
 #ifndef BITCOIN_STATS_RAWSENDER_H
 #define BITCOIN_STATS_RAWSENDER_H

-#include <compat.h>
+#include <compat/compat.h>
 #include <sync.h>
 #include <threadinterrupt.h>

--- a/src/support/lockedpool.cpp
+++ b/src/support/lockedpool.cpp
@ -10,9 +10,6 @@
 #endif

 #ifdef WIN32
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
 #include <windows.h>
 #else
 #include <sys/mman.h> // for mmap
--- a/src/test/denialofservice_tests.cpp
+++ b/src/test/denialofservice_tests.cpp
@ -450,6 +450,8 @@ BOOST_AUTO_TEST_CASE(DoS_bantime)
    peerLogic->Misbehaving(dummyNode.GetId(), DISCOURAGEMENT_THRESHOLD);
    BOOST_CHECK(peerLogic->SendMessages(&dummyNode));
    BOOST_CHECK(banman->IsDiscouraged(addr));
+    banman->ClearDiscouraged();
+    BOOST_CHECK(!banman->IsDiscouraged(addr));

    peerLogic->FinalizeNode(dummyNode);
 }
--- a/src/test/fuzz/util.h
+++ b/src/test/fuzz/util.h
@ -9,7 +9,7 @@
 #include <attributes.h>
 #include <chainparamsbase.h>
 #include <coins.h>
-#include <compat.h>
+#include <compat/compat.h>
 #include <consensus/amount.h>
 #include <consensus/consensus.h>
 #include <key.h>
--- a/src/test/fuzz/util/net.cpp
+++ b/src/test/fuzz/util/net.cpp
@ -2,7 +2,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.

-#include <compat.h>
+#include <compat/compat.h>
 #include <netaddress.h>
 #include <test/fuzz/FuzzedDataProvider.h>
 #include <util/strencodings.h>
--- a/src/test/net_peer_connection_tests.cpp
+++ b/src/test/net_peer_connection_tests.cpp
@ -3,7 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.

 #include <chainparams.h>
-#include <compat.h>
+#include <compat/compat.h>
 #include <net.h>
 #include <net_processing.h>
 #include <netaddress.h>
--- a/src/test/net_tests.cpp
+++ b/src/test/net_tests.cpp
@ -6,7 +6,7 @@

 #include <chainparams.h>
 #include <clientversion.h>
-#include <compat.h>
+#include <compat/compat.h>
 #include <net.h>
 #include <net_processing.h>
 #include <netaddress.h>
--- a/src/test/sock_tests.cpp
+++ b/src/test/sock_tests.cpp
@ -2,7 +2,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.

-#include <compat.h>
+#include <compat/compat.h>
 #include <test/util/setup_common.h>
 #include <threadinterrupt.h>
 #include <util/sock.h>
--- a/src/test/util/net.h
+++ b/src/test/util/net.h
@ -5,7 +5,7 @@
 #ifndef BITCOIN_TEST_UTIL_NET_H
 #define BITCOIN_TEST_UTIL_NET_H

-#include <compat.h>
+#include <compat/compat.h>
 #include <net.h>
 #include <net_permissions.h>
 #include <net_processing.h>
--- a/src/test/util_tests.cpp
+++ b/src/test/util_tests.cpp
@ -37,9 +37,11 @@
 #include <unordered_set>
 #include <utility>
 #include <vector>
+
+#include <sys/types.h>
+
 #ifndef WIN32
 #include <signal.h>
-#include <sys/types.h>
 #include <sys/wait.h>
 #endif

--- a/src/timedata.cpp
+++ b/src/timedata.cpp
@ -9,7 +9,7 @@
 #include <timedata.h>

 #include <netaddress.h>
-#include <node/ui_interface.h>
+#include <node/interface_ui.h>
 #include <sync.h>
 #include <tinyformat.h>
 #include <util/system.h>
--- a/src/torcontrol.cpp
+++ b/src/torcontrol.cpp
@ -7,7 +7,7 @@

 #include <chainparams.h>
 #include <chainparamsbase.h>
-#include <compat.h>
+#include <compat/compat.h>
 #include <crypto/hmac_sha256.h>
 #include <net.h>
 #include <netaddress.h>
--- a/src/txdb.cpp
+++ b/src/txdb.cpp
@ -6,7 +6,7 @@
 #include <txdb.h>

 #include <chain.h>
-#include <node/ui_interface.h>
+#include <node/interface_ui.h>
 #include <pow.h>
 #include <random.h>
 #include <shutdown.h>
--- a/src/util/edge.h
+++ b/src/util/edge.h
@ -5,7 +5,7 @@
 #ifndef BITCOIN_UTIL_EDGE_H
 #define BITCOIN_UTIL_EDGE_H

-#include <compat.h>
+#include <compat/compat.h>

 #include <assert.h>
 #include <cstdint>
--- a/src/util/sock.cpp
+++ b/src/util/sock.cpp
@ -2,7 +2,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.

-#include <compat.h>
+#include <compat/compat.h>
 #include <logging.h>
 #include <threadinterrupt.h>
 #include <tinyformat.h>
--- a/src/util/sock.h
+++ b/src/util/sock.h
@ -5,7 +5,7 @@
 #ifndef BITCOIN_UTIL_SOCK_H
 #define BITCOIN_UTIL_SOCK_H

-#include <compat.h>
+#include <compat/compat.h>
 #include <threadinterrupt.h>
 #include <util/time.h>

--- a/src/util/system.cpp
+++ b/src/util/system.cpp
@ -60,9 +60,6 @@
 #pragma warning(disable:4717)
 #endif

-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
 #include <codecvt>

 #include <io.h> /* for _commit */
--- a/src/util/system.h
+++ b/src/util/system.h
@ -16,8 +16,8 @@
 #endif

 #include <attributes.h>
-#include <compat.h>
 #include <compat/assumptions.h>
+#include <compat/compat.h>
 #include <consensus/amount.h>
 #include <fs.h>
 #include <logging.h>
--- a/src/util/time.cpp
+++ b/src/util/time.cpp
@ -7,7 +7,7 @@
 #include <config/bitcoin-config.h>
 #endif

-#include <compat.h>
+#include <compat/compat.h>
 #include <util/time.h>

 #include <util/check.h>
--- a/src/util/time.h
+++ b/src/util/time.h
@ -6,7 +6,7 @@
 #ifndef BITCOIN_UTIL_TIME_H
 #define BITCOIN_UTIL_TIME_H

-#include <compat.h>
+#include <compat/compat.h>

 #include <chrono>
 #include <stdint.h>
--- a/src/validation.cpp
+++ b/src/validation.cpp
@ -24,7 +24,7 @@
 #include <logging/timer.h>
 #include <node/blockstorage.h>
 #include <node/coinstats.h>
-#include <node/ui_interface.h>
+#include <node/interface_ui.h>
 #include <node/utxo_snapshot.h>
 #include <policy/policy.h>
 #include <policy/settings.h>
--- a/src/wallet/bdb.cpp
+++ b/src/wallet/bdb.cpp
@ -3,6 +3,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.

+#include <compat/compat.h>
 #include <fs.h>
 #include <wallet/bdb.h>
 #include <wallet/db.h>
@ -12,8 +13,15 @@

 #include <stdint.h>

-#ifndef WIN32
 #include <sys/stat.h>
+
+// Windows may not define S_IRUSR or S_IWUSR. We define both
+// here, with the same values as glibc (see stat.h).
+#ifdef WIN32
+#ifndef S_IRUSR
+#define S_IRUSR             0400
+#define S_IWUSR             0200
+#endif
 #endif

 namespace {
--- a/src/wallet/init.cpp
+++ b/src/wallet/init.cpp
@ -9,7 +9,7 @@
 #include <interfaces/wallet.h>
 #include <net.h>
 #include <node/context.h>
-#include <node/ui_interface.h>
+#include <node/interface_ui.h>
 #include <univalue.h>
 #include <util/check.h>
 #include <util/error.h>
--- a/test/functional/rpc_blockchain.py
+++ b/test/functional/rpc_blockchain.py
@ -9,6 +9,7 @@ Test the following RPCs:
    - getchaintxstats
    - gettxoutsetinfo
    - getblockheader
+    - getblockheaders
    - getdifficulty
    - getnetworkhashps
    - waitforblockheight
@ -76,7 +77,8 @@ class BlockchainTest(BitcoinTestFramework):
        self._test_getblockchaininfo()
        self._test_getchaintxstats()
        self._test_gettxoutsetinfo()
-        self._test_getblockheader()
+        self._test_getblockheader(rpc_name='getblockheader')
+        self._test_getblockheader(rpc_name='getblockheaders')
        self._test_getdifficulty()
        self._test_getnetworkhashps()
        self._test_stopatheight()
@ -319,17 +321,20 @@ class BlockchainTest(BitcoinTestFramework):
        # Unknown hash_type raises an error
        assert_raises_rpc_error(-8, "'foo hash' is not a valid hash_type", node.gettxoutsetinfo, "foo hash")

-    def _test_getblockheader(self):
-        self.log.info("Test getblockheader")
+    def _test_getblockheader(self, rpc_name):
+        self.log.info(f"Test {rpc_name}")
        node = self.nodes[0]
-
-        assert_raises_rpc_error(-8, "hash must be of length 64 (not 8, for 'nonsense')", node.getblockheader, "nonsense")
-        assert_raises_rpc_error(-8, "hash must be hexadecimal string (not 'ZZZ7bb8b1697ea987f3b223ba7819250cae33efacb068d23dc24859824a77844')", node.getblockheader, "ZZZ7bb8b1697ea987f3b223ba7819250cae33efacb068d23dc24859824a77844")
-        assert_raises_rpc_error(-5, "Block not found", node.getblockheader, "0cf7bb8b1697ea987f3b223ba7819250cae33efacb068d23dc24859824a77844")
+        rpc_call = getattr(node, rpc_name)
+        assert_raises_rpc_error(-8, "hash must be of length 64 (not 8, for 'nonsense')", rpc_call, "nonsense")
+        assert_raises_rpc_error(-8, "hash must be hexadecimal string (not 'ZZZ7bb8b1697ea987f3b223ba7819250cae33efacb068d23dc24859824a77844')", rpc_call, "ZZZ7bb8b1697ea987f3b223ba7819250cae33efacb068d23dc24859824a77844")
+        assert_raises_rpc_error(-5, "Block not found", rpc_call, "0cf7bb8b1697ea987f3b223ba7819250cae33efacb068d23dc24859824a77844")

        besthash = node.getbestblockhash()
        secondbesthash = node.getblockhash(HEIGHT - 1)
-        header = node.getblockheader(blockhash=besthash)
+        header = rpc_call(blockhash=besthash)
+        if rpc_name == 'getblockheaders':
+            assert_equal(len(header), 1)
+            header = header[0]

        assert_equal(header['hash'], besthash)
        assert_equal(header['height'], HEIGHT)
@ -349,13 +354,17 @@ class BlockchainTest(BitcoinTestFramework):
        assert isinstance(header['difficulty'], Decimal)

        # Test with verbose=False, which should return the header as hex.
-        header_hex = node.getblockheader(blockhash=besthash, verbose=False)
+        header_hex = rpc_call(blockhash=besthash, verbose=False)
+        if rpc_name == 'getblockheaders':
+            header_hex = header_hex[0]
+
        assert_is_hex_string(header_hex)

        header = from_hex(CBlockHeader(), header_hex)
        header.calc_sha256()
        assert_equal(header.hash, besthash)

+        if rpc_name == 'getblockheader':
            assert 'previousblockhash' not in node.getblockheader(node.getblockhash(0))
            assert 'nextblockhash' not in node.getblockheader(node.getbestblockhash())

--- a/test/functional/test_framework/authproxy.py
+++ b/test/functional/test_framework/authproxy.py
@ -39,7 +39,6 @@ from http import HTTPStatus
 import http.client
 import json
 import logging
-import os
 import socket
 import time
 import urllib.parse
@ -101,11 +100,6 @@ class AuthServiceProxy():
                   'User-Agent': USER_AGENT,
                   'Authorization': self.__auth_header,
                   'Content-type': 'application/json'}
-        if os.name == 'nt':
-            # Windows somehow does not like to re-use connections
-            # TODO: Find out why the connection would disconnect occasionally and make it reusable on Windows
-            # Avoid "ConnectionAbortedError: [WinError 10053] An established connection was aborted by the software in your host machine"
-            self._set_conn()
        try:
            self.__conn.request(method, path, postdata, headers)
            return self._get_response()
@ -116,10 +110,8 @@ class AuthServiceProxy():
            self.__conn.request(method, path, postdata, headers)
            return self._get_response()
        except OSError as e:
-            retry = (
-                '[WinError 10053] An established connection was aborted by the software in your host machine' in str(e))
            # Workaround for a bug on macOS. See https://bugs.python.org/issue33450
-            retry = retry or ('[Errno 41] Protocol wrong type for socket' in str(e))
+            retry = '[Errno 41] Protocol wrong type for socket' in str(e)
            if retry:
                self.__conn.close()
                self.__conn.request(method, path, postdata, headers)
--- a/test/functional/test_runner.py
+++ b/test/functional/test_runner.py
@ -892,6 +892,14 @@ 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
+        covered_cmds.add('getmerkleblocks')
+        # TODO: drop it with v23+: remove `debug` in favour of `logging`
+        covered_cmds.add('debug')

        if not os.path.isfile(coverage_ref_filename):
            raise RuntimeError("No coverage reference found")
Author	SHA1	Message	Date
Kittywhiskers Van Gogh	545d40a703	Merge `04523fcd6c` into `3d5dc160d8`	2024-12-15 21:31:15 +03:00
pasta	3d5dc160d8	Merge #6462 : backport: merge bitcoin#23092, #23005 , #24704 , #24391 , #25338 , #25422 , #25493 , #26826 , #26814 , #26832 , #27418 , partial bitcoin#27254 (compat backports) Some checks failed Guix Build / build-image (push) Failing after 6m2s Details Guix Build / build (aarch64-linux-gnu) (push) Has been skipped Details Guix Build / build (arm-linux-gnueabihf) (push) Has been skipped Details Guix Build / build (arm64-apple-darwin) (push) Has been skipped Details Guix Build / build (powerpc64-linux-gnu) (push) Has been skipped Details Guix Build / build (riscv64-linux-gnu) (push) Has been skipped Details Guix Build / build (x86_64-apple-darwin) (push) Has been skipped Details Guix Build / build (x86_64-linux-gnu) (push) Has been skipped Details Guix Build / build (x86_64-w64-mingw32) (push) Has been skipped Details Check Merge Fast-Forward Only / check_merge (push) Successful in 1m49s Details Label Merge Conflicts / main (push) Failing after 40s Details CI / Build Image (push) Failing after 15m29s Details CI / Build Dependencies (arm-linux, arm-linux-gnueabihf) (push) Has been cancelled Details CI / Build Dependencies (linux64, x86_64-pc-linux-gnu) (push) Has been cancelled Details CI / Build (arm-linux, arm-linux, arm-linux-gnueabihf) (push) Has been cancelled Details CI / Build (linux64, linux64, x86_64-pc-linux-gnu) (push) Has been cancelled Details CI / Build (linux64_cxx20, linux64, x86_64-pc-linux-gnu) (push) Has been cancelled Details CI / Build (linux64_fuzz, linux64, x86_64-pc-linux-gnu) (push) Has been cancelled Details CI / Build (linux64_nowallet, linux64, x86_64-pc-linux-gnu) (push) Has been cancelled Details CI / Build (linux64_sqlite, linux64, x86_64-pc-linux-gnu) (push) Has been cancelled Details CI / Build (linux64_tsan, linux64, x86_64-pc-linux-gnu) (push) Has been cancelled Details CI / Build (linux64_ubsan, linux64, x86_64-pc-linux-gnu) (push) Has been cancelled Details `2ab561d281` partial bitcoin#27254: Extract util/fs from util/system (Kittywhiskers Van Gogh) `280988bee3` merge bitcoin#27418: Remove windows workaround in authproxy (Kittywhiskers Van Gogh) `a497df0339` merge bitcoin#26832: move (win) S_* defines into bdb (Kittywhiskers Van Gogh) `db676a7e5f` merge bitcoin#26814: remove windows-only compat.h usage in random (Kittywhiskers Van Gogh) `94e6637c33` merge bitcoin#26826: remove windows-only compat.h usage in randomenv (Kittywhiskers Van Gogh) `bbb0cceb7a` merge bitcoin#25493: document code in compat.h (Kittywhiskers Van Gogh) `3f143096c8` merge bitcoin#25422: globally define NOMINMAX when building with mingw-w64 (Kittywhiskers Van Gogh) `000495df8e` merge bitcoin#25338: Avoid incompatibility with CMake AUTOUIC feature (Kittywhiskers Van Gogh) `714ea55dbe` build: migrate stacktrace-related flags to `DEBUG_`{`C`,`CXX`}`FLAGS` (Kittywhiskers Van Gogh) `11323c3851` merge bitcoin#24391: stop overriding user autoconf flags (Kittywhiskers Van Gogh) `548121d366` merge bitcoin#24704: remove strnlen back-compat code (Kittywhiskers Van Gogh) `b65038ec94` merge bitcoin#23005: Delay wallet client construction (Kittywhiskers Van Gogh) `f3b065cd9c` merge bitcoin#23092: Remove Windows workaround in authproxy (WinError 10053) (Kittywhiskers Van Gogh) Pull request description: ## Additional Information * This PR originally included [bitcoin#27378](https://github.com/bitcoin/bitcoin/pull/27378) but including it caused multiple tests to fail ([build](https://gitlab.com/dashpay/dash/-/jobs/8577987174#L2224)), even after adjusting `timeout`. It has been omitted instead. <details> <summary>Test failures:</summary> ``` feature_abortnode.py \| Failed \| 201 s feature_dip3_v19.py \| Failed \| 237 s feature_llmq_rotation.py \| Failed \| 54 s p2p_invalid_messages.py \| Failed \| 5 s rpc_bind.py --nonloopback \| Failed \| 63 s wallet_multiwallet.py --descriptors \| Failed \| 79 s wallet_multiwallet.py --legacy-wallet \| Failed \| 89 s ALL \| Failed \| 8540 s (accumulated) ``` </details> <details> <summary>feature_abortnode.py failure:</summary> ``` dash@107cfae2b2b5:/src/dash$ ./test/functional/feature_abortnode.py 2024-12-09T18:31:01.776000Z TestFramework (INFO): PRNG seed is: 6843309100291447752 2024-12-09T18:31:01.776000Z TestFramework (INFO): Initializing test directory /tmp/dash_func_test_fcijb99n 2024-12-09T18:31:02.802000Z TestFramework (INFO): Waiting for crash 2024-12-09T18:34:23.026000Z TestFramework.utils (ERROR): wait_until() failed. Predicate: '''' def is_node_stopped(self): """Checks whether the node has stopped. Returns True if the node has stopped. False otherwise. This method is responsible for freeing resources (self.process).""" if not self.running: return True return_code = self.process.poll() if return_code is None: return False # process has stopped. Assert that it didn't return an error code. assert return_code == 0, self._node_msg( "Node returned non-zero exit code (%d) when stopping" % return_code) self.running = False self.process = None self.rpc_connected = False self.rpc = None self.log.debug("Node stopped") return True ''' 2024-12-09T18:34:23.027000Z TestFramework (ERROR): Assertion failed Traceback (most recent call last): File "/src/dash/test/functional/test_framework/test_framework.py", line 161, in main self.run_test() File "/src/dash/./test/functional/feature_abortnode.py", line 44, in run_test self.nodes[0].wait_until_stopped(timeout=200) File "/src/dash/test/functional/test_framework/test_node.py", line 414, in wait_until_stopped wait_until_helper(self.is_node_stopped, timeout=timeout, timeout_factor=self.timeout_factor) File "/src/dash/test/functional/test_framework/util.py", line 287, in wait_until_helper raise AssertionError("Predicate {} not true after {} seconds".format(predicate_source, timeout)) AssertionError: Predicate '''' def is_node_stopped(self): """Checks whether the node has stopped. Returns True if the node has stopped. False otherwise. This method is responsible for freeing resources (self.process).""" if not self.running: return True return_code = self.process.poll() if return_code is None: return False # process has stopped. Assert that it didn't return an error code. assert return_code == 0, self._node_msg( "Node returned non-zero exit code (%d) when stopping" % return_code) self.running = False self.process = None self.rpc_connected = False self.rpc = None self.log.debug("Node stopped") return True ''' not true after 200.0 seconds 2024-12-09T18:34:23.530000Z TestFramework (INFO): Stopping nodes 2024-12-09T18:34:23.530000Z TestFramework (ERROR): Unexpected exception caught during shutdown Traceback (most recent call last): File "/src/dash/test/functional/test_framework/test_framework.py", line 341, in shutdown self.stop_nodes() File "/src/dash/test/functional/test_framework/test_framework.py", line 673, in stop_nodes node.stop_node(expected_stderr=expected_stderr, wait=wait, wait_until_stopped=False) File "/src/dash/test/functional/test_framework/test_node.py", line 368, in stop_node self.stop(wait=wait) File "/src/dash/test/functional/test_framework/coverage.py", line 49, in __call__ return_val = self.auth_service_proxy_instance.__call__(args, kwargs) File "/src/dash/test/functional/test_framework/authproxy.py", line 124, in __call__ response, status = self._request('POST', self.__url.path, postdata.encode('utf-8')) File "/src/dash/test/functional/test_framework/authproxy.py", line 103, in _request return self._get_response() File "/src/dash/test/functional/test_framework/authproxy.py", line 162, in _get_response raise JSONRPCException( test_framework.authproxy.JSONRPCException: non-JSON HTTP response with '503 Service Unavailable' from server (-342) 2024-12-09T18:34:23.531000Z TestFramework (WARNING): Not cleaning up dir /tmp/dash_func_test_fcijb99n 2024-12-09T18:34:23.531000Z TestFramework (ERROR): Test failed. Test logging available at /tmp/dash_func_test_fcijb99n/test_framework.log 2024-12-09T18:34:23.531000Z TestFramework (ERROR): 2024-12-09T18:34:23.531000Z TestFramework (ERROR): Hint: Call /src/dash/test/functional/combine_logs.py '/tmp/dash_func_test_fcijb99n' to consolidate all logs 2024-12-09T18:34:23.531000Z TestFramework (ERROR): 2024-12-09T18:34:23.531000Z TestFramework (ERROR): If this failure happened unexpectedly or intermittently, please file a bug and provide a link or upload of the combined log. 2024-12-09T18:34:23.531000Z TestFramework (ERROR): https://github.com/dashpay/dash/issues 2024-12-09T18:34:23.531000Z TestFramework (ERROR): [node 1] Cleaning up leftover process [node 0] Cleaning up leftover process ``` </details> [bitcoin#27254](https://github.com/bitcoin/bitcoin/pull/27254) has been partially backported to include a missing header to allow it to build. <details> <summary>Compile error:</summary> ``` In file included from ./util/system.h:19, from util/system.cpp:7: ./compat/assumptions.h:49:22: error: 'size_t' was not declared in this scope; did you mean 'std::size_t'? 49 \| static_assert(sizeof(size_t) == 4 \|\| sizeof(size_t) == 8, "size_t assumed to be 32-bit or 64-bit"); \| ^~~~~~ \| std::size_t In file included from /usr/include/c++/11/limits:42, from ./compat/assumptions.h:11, from ./util/system.h:19, from util/system.cpp:7: /usr/include/x86_64-linux-gnu/c++/11/bits/c++config.h:280:33: note: 'std::size_t' declared here 280 \| typedef __SIZE_TYPE__ size_t; \| ^~~~~~ ``` </details> * ~~GitLab job failures as of 2339ae6459cad77d94795c0e92ba3f3fe31c485a, for `linux64-build` ([source](https://gitlab.com/dashpay/dash/-/jobs/8590291130#L4621)), `linux64_cxx20-build` ([source](https://gitlab.com/dashpay/dash/-/jobs/8590291134#L3497)) and `linux64_sqlite-build` ([source](https://gitlab.com/dashpay/dash/-/jobs/8590291137#L3489)) are not related to failures in compilation or unit tests but are to do with reaching the artifact limit.~~ Resolved with [dash#6487](https://github.com/dashpay/dash/pull/6487), thanks Udjin! ## 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 (note: N/A) - [x] I have added or updated relevant unit/integration/functional/e2e tests - [x] I have made corresponding changes to the documentation (note: N/A) - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ ACKs for top commit: UdjinM6: utACK `2ab561d281` PastaPastaPasta: utACK `2ab561d281` Tree-SHA512: 6d05305f17fd607ed93b4a2e00de195a96bde1a34bedf04f6dd84892dc71028ae71590fa5063026ec7ff728d6e411af410c363b4a88947ce6e5999d4431bb29b	2024-12-15 12:30:54 -06:00
pasta	032fc21198	Merge #6479 : feat: enable coverage linter for functional tests `2e509b96c4` fix: add a workaround for RPC getmerkleblocks, debug, coinjoinsalt, voteraw (Konstantin Akimov) `f0decc8790` feat: add unit test for ClearDiscouraged (Konstantin Akimov) `865b24ea00` feat: hide cleardiscouraged RPC so far as it no intent to use by regular users (Konstantin Akimov) `1f5fa7e7cf` feat: enable linter coverage for functional tests (Konstantin Akimov) `59ddac5656` feat: hide deprecated RPC from help and add TODOes to remove them (Konstantin Akimov) `05732aceaf` feat: implement functional tests for RPC getblockheaders (Konstantin Akimov) Pull request description: ## Issue being fixed or feature implemented https://github.com/dashpay/dash-issues/issues/63 ## What was done? Add functional tests for `getblockheaders` Hide RPC `cleardiscouraged` (as it is used only for functional tests) and RPC `getpoolinfo` (deprecated long time ago) Add a workaround to ignore these RPCs `getmerkleblocks`, `voteraw`, `debug`, `coinjoinsalt` at the moment Enables linter for coverage ## How Has This Been Tested? Run locally with `test/functional/test_runner.py -j20 --previous-releases --coverage --extended` Enabled in CI ## Breaking Changes N/A if hidding `cleardiscouraged` is not a breaking change. ## 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 ACKs for top commit: UdjinM6: LGTM, utACK `2e509b96c4` PastaPastaPasta: utACK `2e509b96c4` Tree-SHA512: bb31465d9a71ef824533d9310393d89293c87c7407ec3e37697f6d36dc6c010381a6e0408f9598354e610d51ef662485d8a653cc0e198842e2198ac1c30c90f1	2024-12-15 12:12:40 -06:00
pasta	05ca6cffff	Merge #6489 : ci: allow overriding MAKEJOBS `feb6a1ad3f` ci: allow overriding MAKEJOBS (UdjinM6) Pull request description: ## Issue being fixed or feature implemented That's how these variable are ment to behave >echo "Fallback to default values in env (if not yet set)" https://github.com/dashpay/dash/blame/develop/ci/test/00_setup_env.sh#L26 That's also how it's done in bitcoin https://github.com/bitcoin/bitcoin/blob/master/ci/test/00_setup_env.sh#L38. But we broke it in `c52992aaa4` and I'm not sure why 🤷‍♂️ ## What was done? ## How Has This Been Tested? ## Breaking Changes ## Checklist: - [ ] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have added or updated relevant unit/integration/functional/e2e tests - [ ] I have made corresponding changes to the documentation - [ ] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ ACKs for top commit: PastaPastaPasta: utACK `feb6a1ad3f` kwvg: utACK `feb6a1ad3f` Tree-SHA512: 617e761cf5c52d8e4329bf8aa1680c72a7816ae3248ed415d2c3232e5aa0941f18e21f0d6d363848238f53730097aa22f51a6e1cd62bd0b31d3da853f9f79e28	2024-12-15 11:57:04 -06:00
Kittywhiskers Van Gogh	2ab561d281	partial bitcoin#27254: Extract util/fs from util/system includes: - b202b3dd6393b415fa68e18dc49c9431dc6b58b2	2024-12-15 09:08:55 +00:00
Kittywhiskers Van Gogh	280988bee3	merge bitcoin#27418: Remove windows workaround in authproxy	2024-12-15 09:08:55 +00:00
Kittywhiskers Van Gogh	a497df0339	merge bitcoin#26832: move (win) S_* defines into bdb	2024-12-15 09:08:55 +00:00
Kittywhiskers Van Gogh	db676a7e5f	merge bitcoin#26814: remove windows-only compat.h usage in random	2024-12-15 09:08:55 +00:00
Kittywhiskers Van Gogh	94e6637c33	merge bitcoin#26826: remove windows-only compat.h usage in randomenv	2024-12-15 09:08:55 +00:00
Kittywhiskers Van Gogh	bbb0cceb7a	merge bitcoin#25493: document code in compat.h	2024-12-15 09:08:55 +00:00
Kittywhiskers Van Gogh	3f143096c8	merge bitcoin#25422: globally define NOMINMAX when building with mingw-w64	2024-12-15 09:08:22 +00:00
Kittywhiskers Van Gogh	000495df8e	merge bitcoin#25338: Avoid incompatibility with CMake AUTOUIC feature	2024-12-15 09:08:22 +00:00
Kittywhiskers Van Gogh	714ea55dbe	build: migrate stacktrace-related flags to `DEBUG_`{`C`,`CXX`}`FLAGS` `DEBUG_CFLAGS` doesn't exist so we need to create it	2024-12-15 09:08:22 +00:00
Kittywhiskers Van Gogh	11323c3851	merge bitcoin#24391: stop overriding user autoconf flags	2024-12-15 09:08:22 +00:00
Kittywhiskers Van Gogh	548121d366	merge bitcoin#24704: remove strnlen back-compat code	2024-12-15 09:08:22 +00:00
Kittywhiskers Van Gogh	b65038ec94	merge bitcoin#23005: Delay wallet client construction	2024-12-15 09:08:21 +00:00
Kittywhiskers Van Gogh	f3b065cd9c	merge bitcoin#23092: Remove Windows workaround in authproxy (WinError 10053)	2024-12-15 09:08:21 +00:00
UdjinM6	feb6a1ad3f	ci: allow overriding MAKEJOBS	2024-12-15 00:16:21 +03:00
Konstantin Akimov	2e509b96c4	fix: add a workaround for RPC getmerkleblocks, debug, coinjoinsalt, voteraw We indeed doesn't have functional tests for them yet, but this linter will help to avoid adding new RPCs without tests	2024-12-13 21:19:11 +07:00
Konstantin Akimov	f0decc8790	feat: add unit test for ClearDiscouraged	2024-12-13 21:19:11 +07:00
Konstantin Akimov	865b24ea00	feat: hide cleardiscouraged RPC so far as it no intent to use by regular users	2024-12-13 21:19:11 +07:00
Konstantin Akimov	1f5fa7e7cf	feat: enable linter coverage for functional tests	2024-12-13 21:19:11 +07:00
Konstantin Akimov	59ddac5656	feat: hide deprecated RPC from help and add TODOes to remove them	2024-12-13 21:19:11 +07:00
Konstantin Akimov	05732aceaf	feat: implement functional tests for RPC getblockheaders	2024-12-13 21:19:11 +07:00