sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-24 11:32:46 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
pasta 2024-12-15 12:29:59 -06:00
commit 3d5dc160d8
No known key found for this signature in database
GPG Key ID: 5255B86F912A614A
69 changed files with 193 additions and 198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build-aux/m4/bitcoin_qt.m4
View File

@ -116,8 +116,8 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
BITCOIN_QT_CHECK([ BITCOIN_QT_CHECK([
TEMP_CPPFLAGS=$CPPFLAGS TEMP_CPPFLAGS=$CPPFLAGS
TEMP_CXXFLAGS=$CXXFLAGS TEMP_CXXFLAGS=$CXXFLAGS
CPPFLAGS="$QT_INCLUDES $CPPFLAGS" CPPFLAGS="$QT_INCLUDES $CORE_CPPFLAGS $CPPFLAGS"
CXXFLAGS="$PIC_FLAGS $CXXFLAGS" CXXFLAGS="$PIC_FLAGS $CORE_CXXFLAGS $CXXFLAGS"
_BITCOIN_QT_IS_STATIC _BITCOIN_QT_IS_STATIC
if test "x$bitcoin_cv_static_qt" = xyes; then if test "x$bitcoin_cv_static_qt" = xyes; then
_BITCOIN_QT_CHECK_STATIC_LIBS _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) AC_MSG_CHECKING(whether -fPIE can be used with this Qt config)
TEMP_CPPFLAGS=$CPPFLAGS TEMP_CPPFLAGS=$CPPFLAGS
TEMP_CXXFLAGS=$CXXFLAGS TEMP_CXXFLAGS=$CXXFLAGS
CPPFLAGS="$QT_INCLUDES $CPPFLAGS" CPPFLAGS="$QT_INCLUDES $CORE_CPPFLAGS $CPPFLAGS"
CXXFLAGS="$PIE_FLAGS $CXXFLAGS" CXXFLAGS="$PIE_FLAGS $CORE_CXXFLAGS $CXXFLAGS"
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include <QtCore/qconfig.h> #include <QtCore/qconfig.h>
#ifndef QT_VERSION #ifndef QT_VERSION
@ -200,7 +200,7 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
BITCOIN_QT_CHECK([ BITCOIN_QT_CHECK([
AC_MSG_CHECKING(whether -fPIC is needed with this Qt config) AC_MSG_CHECKING(whether -fPIC is needed with this Qt config)
TEMP_CPPFLAGS=$CPPFLAGS TEMP_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$QT_INCLUDES $CPPFLAGS" CPPFLAGS="$QT_INCLUDES $CORE_CPPFLAGS $CPPFLAGS"
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include <QtCore/qconfig.h> #include <QtCore/qconfig.h>
#ifndef QT_VERSION #ifndef QT_VERSION

82
configure.ac
View File

@ -372,7 +372,9 @@ case $host in
esac esac
if test "x$enable_debug" = xyes; then 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 if test "x$CXXFLAGS_overridden" = xno; then
CXXFLAGS="" CXXFLAGS=""
fi fi
@ -397,11 +399,11 @@ else
# Stacktraces will be suboptimal due to optimization, but better than nothing. Also, -fno-omit-frame-pointer # Stacktraces will be suboptimal due to optimization, but better than nothing. Also, -fno-omit-frame-pointer
# mitigates this a little bit # mitigates this a little bit
if test "x$GCC" = xyes; then if test "x$GCC" = xyes; then
CFLAGS="$CFLAGS -g1 -fno-omit-frame-pointer" DEBUG_CFLAGS="$DEBUG_CFLAGS -g1 -fno-omit-frame-pointer"
fi fi
if test "x$GXX" = xyes; then if test "x$GXX" = xyes; then
CXXFLAGS="$CXXFLAGS -g1 -fno-omit-frame-pointer" DEBUG_CXXFLAGS="$DEBUG_CXXFLAGS -g1 -fno-omit-frame-pointer"
fi fi
fi fi
@ -429,7 +431,7 @@ if test x$LINK_WRAP_SUPPORTED = "xyes"; then
fi fi
# Needed for MinGW targets when debug symbols are enabled as compiled objects get very large # 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 if test x$use_sanitizers != x; then
dnl First check if the compiler accepts flags. If an incompatible pair like 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 fi
dnl Don't allow extended (non-ASCII) symbols in identifiers. This is easier for code review. 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_crc=no
enable_arm_shani=no enable_arm_shani=no
@ -683,7 +685,7 @@ CXXFLAGS="$TEMP_CXXFLAGS"
fi fi
CPPFLAGS="$CPPFLAGS -DHAVE_BUILD_INFO -DGSL_NO_IOSTREAMS" CORE_CPPFLAGS="$CORE_CPPFLAGS -DHAVE_BUILD_INFO -DGSL_NO_IOSTREAMS"
AC_ARG_WITH([utils], AC_ARG_WITH([utils],
[AS_HELP_STRING([--with-utils], [AS_HELP_STRING([--with-utils],
@ -755,7 +757,10 @@ case $host in
AC_MSG_ERROR("windres not found") AC_MSG_ERROR("windres not found")
fi 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 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 dnl That breaks our ability to build dll's with static libgcc/libstdc++/libssp. Override
@ -766,14 +771,14 @@ case $host in
postdeps_CXX= postdeps_CXX=
dnl We require Windows 7 (NT 6.1) or later 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*) *darwin*)
TARGET_OS=darwin TARGET_OS=darwin
if test x$cross_compiling != xyes; then if test x$cross_compiling != xyes; then
BUILD_OS=darwin 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) AC_CHECK_PROG([BREW],brew, brew)
if test x$BREW = xbrew; then if test x$BREW = xbrew; then
@ -800,8 +805,8 @@ case $host in
gmp_prefix=$($BREW --prefix gmp 2>/dev/null) gmp_prefix=$($BREW --prefix gmp 2>/dev/null)
if test x$gmp_prefix != x; then if test x$gmp_prefix != x; then
CPPFLAGS="$CPPFLAGS -I$gmp_prefix/include" CORE_CPPFLAGS="$CORE_CPPFLAGS -I$gmp_prefix/include"
LDFLAGS="$LDFLAGS -L$gmp_prefix/lib" CORE_LDFLAGS="$CORE_LDFLAGS -L$gmp_prefix/lib"
fi fi
case $host in case $host in
@ -813,20 +818,20 @@ case $host in
if test "x$use_upnp" != xno && $BREW list --versions miniupnpc >/dev/null; then if test "x$use_upnp" != xno && $BREW list --versions miniupnpc >/dev/null; then
miniupnpc_prefix=$($BREW --prefix miniupnpc 2>/dev/null) miniupnpc_prefix=$($BREW --prefix miniupnpc 2>/dev/null)
if test "x$suppress_external_warnings" != xno; then if test "x$suppress_external_warnings" != xno; then
CPPFLAGS="$CPPFLAGS -isystem $miniupnpc_prefix/include" CORE_CPPFLAGS="$CORE_CPPFLAGS -isystem $miniupnpc_prefix/include"
else else
CPPFLAGS="$CPPFLAGS -I$miniupnpc_prefix/include" CORE_CPPFLAGS="$CORE_CPPFLAGS -I$miniupnpc_prefix/include"
fi fi
LDFLAGS="$LDFLAGS -L$miniupnpc_prefix/lib" CORE_LDFLAGS="$CORE_LDFLAGS -L$miniupnpc_prefix/lib"
fi fi
if test "x$use_natpmp" != xno && $BREW list --versions libnatpmp >/dev/null; then if test "x$use_natpmp" != xno && $BREW list --versions libnatpmp >/dev/null; then
libnatpmp_prefix=$($BREW --prefix libnatpmp 2>/dev/null) libnatpmp_prefix=$($BREW --prefix libnatpmp 2>/dev/null)
if test "x$suppress_external_warnings" != xno; then if test "x$suppress_external_warnings" != xno; then
CPPFLAGS="$CPPFLAGS -isystem $libnatpmp_prefix/include" CORE_CPPFLAGS="$CORE_CPPFLAGS -isystem $libnatpmp_prefix/include"
else else
CPPFLAGS="$CPPFLAGS -I$libnatpmp_prefix/include" CORE_CPPFLAGS="$CORE_CPPFLAGS -I$libnatpmp_prefix/include"
fi fi
LDFLAGS="$LDFLAGS -L$libnatpmp_prefix/lib" CORE_LDFLAGS="$CORE_LDFLAGS -L$libnatpmp_prefix/lib"
fi fi
;; ;;
esac esac
@ -849,7 +854,7 @@ case $host in
esac esac
fi fi
CPPFLAGS="$CPPFLAGS -DMAC_OSX -DOBJC_OLD_DISPATCH_PROTOTYPES=0" CORE_CPPFLAGS="$CORE_CPPFLAGS -DMAC_OSX -DOBJC_OLD_DISPATCH_PROTOTYPES=0"
OBJCXXFLAGS="$CXXFLAGS" OBJCXXFLAGS="$CXXFLAGS"
;; ;;
*android*) *android*)
@ -912,11 +917,17 @@ if test x$use_lcov = xyes; then
AC_SUBST(COV_TOOL_WRAPPER, "cov_tool_wrapper.sh") AC_SUBST(COV_TOOL_WRAPPER, "cov_tool_wrapper.sh")
LCOV="$LCOV --gcov-tool $(pwd)/$COV_TOOL_WRAPPER" 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")]) [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")]) [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 fi
if test x$use_lcov_branch != xno; then 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 && 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 != xno &&
test x$ac_cv_sys_file_offset_bits != xunknown; then 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 fi
if test x$ac_cv_sys_large_files != x && if test x$ac_cv_sys_large_files != x &&
test x$ac_cv_sys_large_files != xno && test x$ac_cv_sys_large_files != xno &&
test x$ac_cv_sys_large_files != xunknown; then 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 fi
if test "x$enable_gprof" = xyes; then 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 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. dnl "ad_strip" as the symbol for the entry point.
if test x$TARGET_OS = xdarwin; then 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]], [CORE_LDFLAGS="$CORE_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_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]]) AX_CHECK_LINK_FLAG([[-Wl,-fixup_chains]], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,-fixup_chains"], [], [[$LDFLAG_WERROR]])
fi fi
@ -1048,7 +1059,6 @@ AC_CHECK_DECLS([getifaddrs, freeifaddrs],[CHECK_SOCKET],,
[#include <sys/types.h> [#include <sys/types.h>
#include <ifaddrs.h>] #include <ifaddrs.h>]
) )
AC_CHECK_DECLS([strnlen])
dnl These are used for daemonization in dashd dnl These are used for daemonization in dashd
AC_CHECK_DECLS([fork]) AC_CHECK_DECLS([fork])
@ -1361,7 +1371,7 @@ if test "x$enable_fuzz" = "xyes"; then
[[-fsanitize=$use_sanitizers]], [[-fsanitize=$use_sanitizers]],
[AC_MSG_RESULT([no])], [AC_MSG_RESULT([no])],
[AC_MSG_RESULT([yes]) [AC_MSG_RESULT([yes])
CPPFLAGS="$CPPFLAGS -DPROVIDE_FUZZ_MAIN_FUNCTION"], CORE_CPPFLAGS="$CORE_CPPFLAGS -DPROVIDE_FUZZ_MAIN_FUNCTION"],
[], [],
[AC_LANG_PROGRAM([[ [AC_LANG_PROGRAM([[
#include <cstdint> #include <cstdint>
@ -1385,7 +1395,7 @@ else
QT_TEST_INCLUDES=SUPPRESS_WARNINGS($QT_TEST_INCLUDES) QT_TEST_INCLUDES=SUPPRESS_WARNINGS($QT_TEST_INCLUDES)
fi fi
CPPFLAGS="$CPPFLAGS -DPROVIDE_FUZZ_MAIN_FUNCTION" CORE_CPPFLAGS="$CORE_CPPFLAGS -DPROVIDE_FUZZ_MAIN_FUNCTION"
fi fi
if test x$enable_wallet != xno; then if test x$enable_wallet != xno; then
@ -1518,7 +1528,7 @@ fi
dnl Check for reduced exports dnl Check for reduced exports
if test x$use_reduce_exports = xyes; then 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]]) [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,--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]) 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(BITCOIN_MP_GUI_NAME)
AC_SUBST(RELDFLAGS) 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_CPPFLAGS)
AC_SUBST(DEBUG_CXXFLAGS)
AC_SUBST(WARN_CXXFLAGS) AC_SUBST(WARN_CXXFLAGS)
AC_SUBST(NOWARN_CXXFLAGS) AC_SUBST(NOWARN_CXXFLAGS)
AC_SUBST(DEBUG_CXXFLAGS)
AC_SUBST(ERROR_CXXFLAGS) AC_SUBST(ERROR_CXXFLAGS)
AC_SUBST(GPROF_CXXFLAGS) AC_SUBST(GPROF_CXXFLAGS)
AC_SUBST(GPROF_LDFLAGS) AC_SUBST(GPROF_LDFLAGS)
@ -1995,10 +2009,10 @@ echo " target os = $host_os"
echo " build os = $build_os" echo " build os = $build_os"
echo echo
echo " CC = $CC" echo " CC = $CC"
echo " CFLAGS = $PTHREAD_CFLAGS $CFLAGS" echo " CFLAGS = $DEBUG_CFLAGS $PTHREAD_CFLAGS $CFLAGS"
echo " CPPFLAGS = $DEBUG_CPPFLAGS $HARDENED_CPPFLAGS $CPPFLAGS" echo " CPPFLAGS = $DEBUG_CPPFLAGS $HARDENED_CPPFLAGS $CORE_CPPFLAGS $CPPFLAGS"
echo " CXX = $CXX" echo " CXX = $CXX"
echo " CXXFLAGS = $DEBUG_CXXFLAGS $HARDENED_CXXFLAGS $WARN_CXXFLAGS $NOWARN_CXXFLAGS $ERROR_CXXFLAGS $GPROF_CXXFLAGS $CXXFLAGS" 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 $LDFLAGS" echo " LDFLAGS = $PTHREAD_LIBS $HARDENED_LDFLAGS $GPROF_LDFLAGS $CORE_LDFLAGS $LDFLAGS"
echo " ARFLAGS = $ARFLAGS" echo " ARFLAGS = $ARFLAGS"
echo echo

14
src/Makefile.am
View File

@ -9,9 +9,10 @@ print-%: FORCE
DIST_SUBDIRS = secp256k1 DIST_SUBDIRS = secp256k1
AM_LDFLAGS = $(LIBTOOL_LDFLAGS) $(HARDENED_LDFLAGS) $(GPROF_LDFLAGS) $(SANITIZER_LDFLAGS) AM_LDFLAGS = $(LIBTOOL_LDFLAGS) $(HARDENED_LDFLAGS) $(GPROF_LDFLAGS) $(SANITIZER_LDFLAGS) $(CORE_LDFLAGS)
AM_CXXFLAGS = $(DEBUG_CXXFLAGS) $(HARDENED_CXXFLAGS) $(WARN_CXXFLAGS) $(NOWARN_CXXFLAGS) $(ERROR_CXXFLAGS) $(GPROF_CXXFLAGS) $(SANITIZER_CXXFLAGS) AM_CFLAGS = $(DEBUG_CFLAGS)
AM_CPPFLAGS = $(DEBUG_CPPFLAGS) $(HARDENED_CPPFLAGS) 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 AM_LIBTOOLFLAGS = --preserve-dup-deps
PTHREAD_FLAGS = $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) PTHREAD_FLAGS = $(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
EXTRA_LIBRARIES = EXTRA_LIBRARIES =
@ -162,9 +163,9 @@ BITCOIN_CORE_H = \
coinjoin/util.h \ coinjoin/util.h \
coins.h \ coins.h \
common/bloom.h \ common/bloom.h \
compat.h \
compat/assumptions.h \ compat/assumptions.h \
compat/byteswap.h \ compat/byteswap.h \
compat/compat.h \
compat/cpuid.h \ compat/cpuid.h \
compat/endian.h \ compat/endian.h \
compressor.h \ compressor.h \
@ -279,7 +280,7 @@ BITCOIN_CORE_H = \
node/psbt.h \ node/psbt.h \
node/transaction.h \ node/transaction.h \
node/txreconciliation.h \ node/txreconciliation.h \
node/ui_interface.h \ node/interface_ui.h \
node/utxo_snapshot.h \ node/utxo_snapshot.h \
noui.h \ noui.h \
outputtype.h \ outputtype.h \
@ -512,7 +513,7 @@ libbitcoin_server_a_SOURCES = \
node/psbt.cpp \ node/psbt.cpp \
node/transaction.cpp \ node/transaction.cpp \
node/txreconciliation.cpp \ node/txreconciliation.cpp \
node/ui_interface.cpp \ node/interface_ui.cpp \
noui.cpp \ noui.cpp \
policy/fees.cpp \ policy/fees.cpp \
policy/packages.cpp \ policy/packages.cpp \
@ -792,7 +793,6 @@ libbitcoin_util_a_SOURCES = \
support/lockedpool.cpp \ support/lockedpool.cpp \
chainparamsbase.cpp \ chainparamsbase.cpp \
clientversion.cpp \ clientversion.cpp \
compat/strnlen.cpp \
fs.cpp \ fs.cpp \
interfaces/echo.cpp \ interfaces/echo.cpp \
interfaces/handler.cpp \ interfaces/handler.cpp \

2
src/banman.cpp
View File

@ -6,7 +6,7 @@
#include <banman.h> #include <banman.h>
#include <netaddress.h> #include <netaddress.h>
#include <node/ui_interface.h> #include <node/interface_ui.h>
#include <sync.h> #include <sync.h>
#include <util/system.h> #include <util/system.h>
#include <util/time.h> #include <util/time.h>

2
src/bitcoin-cli.cpp
View File

@ -10,7 +10,7 @@
#include <chainparamsbase.h> #include <chainparamsbase.h>
#include <clientversion.h> #include <clientversion.h>
#include <compat.h> #include <compat/compat.h>
#include <compat/stdin.h> #include <compat/stdin.h>
#include <policy/feerate.h> #include <policy/feerate.h>
#include <rpc/client.h> #include <rpc/client.h>

2
src/bitcoin-tx.cpp
View File

@ -9,7 +9,7 @@
#include <chainparams.h> #include <chainparams.h>
#include <clientversion.h> #include <clientversion.h>
#include <coins.h> #include <coins.h>
#include <compat.h> #include <compat/compat.h>
#include <consensus/consensus.h> #include <consensus/consensus.h>
#include <core_io.h> #include <core_io.h>
#include <key_io.h> #include <key_io.h>

2
src/bitcoin-wallet.cpp
View File

@ -8,7 +8,7 @@
#include <chainparams.h> #include <chainparams.h>
#include <chainparamsbase.h> #include <chainparamsbase.h>
#include <compat.h> #include <compat/compat.h>
#include <logging.h> #include <logging.h>
#include <util/strencodings.h> #include <util/strencodings.h>
#include <util/system.h> #include <util/system.h>

4
src/bitcoind.cpp
View File

@ -10,12 +10,12 @@
#include <chainparams.h> #include <chainparams.h>
#include <clientversion.h> #include <clientversion.h>
#include <compat.h> #include <compat/compat.h>
#include <init.h> #include <init.h>
#include <interfaces/chain.h> #include <interfaces/chain.h>
#include <interfaces/init.h> #include <interfaces/init.h>
#include <node/context.h> #include <node/context.h>
#include <node/ui_interface.h> #include <node/interface_ui.h>
#include <noui.h> #include <noui.h>
#include <shutdown.h> #include <shutdown.h>
#include <util/check.h> #include <util/check.h>

1
src/compat/assumptions.h
View File

@ -8,6 +8,7 @@
#ifndef BITCOIN_COMPAT_ASSUMPTIONS_H #ifndef BITCOIN_COMPAT_ASSUMPTIONS_H
#define BITCOIN_COMPAT_ASSUMPTIONS_H #define BITCOIN_COMPAT_ASSUMPTIONS_H
#include <cstddef>
#include <limits> #include <limits>
// Assumption: We assume that the macro NDEBUG is not defined. // Assumption: We assume that the macro NDEBUG is not defined.

54
src/compat.h → src/compat/compat.h
View File

@ -3,24 +3,24 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#ifndef BITCOIN_COMPAT_H #ifndef BITCOIN_COMPAT_COMPAT_H
#define BITCOIN_COMPAT_H #define BITCOIN_COMPAT_COMPAT_H
#if defined(HAVE_CONFIG_H) #if defined(HAVE_CONFIG_H)
#include <config/bitcoin-config.h> #include <config/bitcoin-config.h>
#endif #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 #ifdef WIN32
#ifndef NOMINMAX
#define NOMINMAX
#endif
#ifdef FD_SETSIZE #ifdef FD_SETSIZE
#undef FD_SETSIZE // prevent redefinition compiler warning #undef FD_SETSIZE
#endif #endif
#define FD_SETSIZE 1024 // max number of fds in fd_set #define FD_SETSIZE 1024
#include <winsock2.h> #include <winsock2.h>
#include <ws2tcpip.h> #include <ws2tcpip.h>
#include <stdint.h> #include <cstdint>
#else #else
#include <fcntl.h> #include <fcntl.h>
#include <sys/mman.h> #include <sys/mman.h>
@ -37,54 +37,46 @@
#include <unistd.h> #include <unistd.h>
#endif #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 #ifndef WIN32
typedef unsigned int SOCKET; typedef unsigned int SOCKET;
#include <errno.h> #include <cerrno>
#define WSAGetLastError() errno #define WSAGetLastError() errno
#define WSAEINVAL EINVAL #define WSAEINVAL EINVAL
#define WSAEALREADY EALREADY
#define WSAEWOULDBLOCK EWOULDBLOCK #define WSAEWOULDBLOCK EWOULDBLOCK
#define WSAEAGAIN EAGAIN #define WSAEAGAIN EAGAIN
#define WSAEMSGSIZE EMSGSIZE #define WSAEMSGSIZE EMSGSIZE
#define WSAEINTR EINTR #define WSAEINTR EINTR
#define WSAEINPROGRESS EINPROGRESS #define WSAEINPROGRESS EINPROGRESS
#define WSAEADDRINUSE EADDRINUSE #define WSAEADDRINUSE EADDRINUSE
#define WSAENOTSOCK EBADF
#define INVALID_SOCKET (SOCKET)(~0) #define INVALID_SOCKET (SOCKET)(~0)
#define SOCKET_ERROR -1 #define SOCKET_ERROR -1
#define SD_SEND SHUT_WR #define SD_SEND SHUT_WR
#else #else
#ifndef WSAEAGAIN // WSAEAGAIN doesn't exist on Windows
#ifdef EAGAIN #ifdef EAGAIN
#define WSAEAGAIN EAGAIN #define WSAEAGAIN EAGAIN
#else #else
#define WSAEAGAIN WSAEWOULDBLOCK #define WSAEAGAIN WSAEWOULDBLOCK
#endif #endif
#endif #endif
#endif
#ifdef WIN32 // Windows defines MAX_PATH as it's maximum path length.
#ifndef S_IRUSR // We define MAX_PATH for use on non-Windows systems.
#define S_IRUSR 0400 #ifndef WIN32
#define S_IWUSR 0200
#endif
#else
#define MAX_PATH 1024 #define MAX_PATH 1024
#endif #endif
// ssize_t is POSIX, and not present when using MSVC.
#ifdef _MSC_VER #ifdef _MSC_VER
#if !defined(ssize_t) #include <BaseTsd.h>
#ifdef _WIN64 typedef SSIZE_T ssize_t;
typedef int64_t ssize_t;
#else
typedef int32_t ssize_t;
#endif
#endif
#endif #endif
#if HAVE_DECL_STRNLEN == 0 // The type of the option value passed to getsockopt & setsockopt
size_t strnlen( const char *start, size_t max_len); // differs between Windows and non-Windows.
#endif // HAVE_DECL_STRNLEN
#ifndef WIN32 #ifndef WIN32
typedef void* sockopt_arg_type; typedef void* sockopt_arg_type;
#else #else
@ -135,4 +127,4 @@ bool static inline IsSelectableSocket(const SOCKET& s) {
#define MSG_DONTWAIT 0 #define MSG_DONTWAIT 0
#endif #endif
#endif // BITCOIN_COMPAT_H #endif // BITCOIN_COMPAT_COMPAT_H

18
src/compat/strnlen.cpp
View File

@ -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

3
src/fs.cpp
View File

@ -11,9 +11,6 @@
#include <sys/utsname.h> #include <sys/utsname.h>
#include <unistd.h> #include <unistd.h>
#else #else
#ifndef NOMINMAX
#define NOMINMAX
#endif
#include <codecvt> #include <codecvt>
#include <limits> #include <limits>
#include <windows.h> #include <windows.h>

2
src/httpserver.cpp
View File

@ -10,7 +10,7 @@
#include <chainparamsbase.h> #include <chainparamsbase.h>
#include <netbase.h> #include <netbase.h>
#include <node/ui_interface.h> #include <node/interface_ui.h>
#include <rpc/protocol.h> // For HTTP status codes #include <rpc/protocol.h> // For HTTP status codes
#include <shutdown.h> #include <shutdown.h>
#include <sync.h> #include <sync.h>

2
src/i2p.cpp
View File

@ -3,7 +3,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <chainparams.h> #include <chainparams.h>
#include <compat.h> #include <compat/compat.h>
#include <compat/endian.h> #include <compat/endian.h>
#include <crypto/sha256.h> #include <crypto/sha256.h>
#include <fs.h> #include <fs.h>

2
src/i2p.h
View File

@ -5,7 +5,7 @@
#ifndef BITCOIN_I2P_H #ifndef BITCOIN_I2P_H
#define BITCOIN_I2P_H #define BITCOIN_I2P_H
#include <compat.h> #include <compat/compat.h>
#include <fs.h> #include <fs.h>
#include <netaddress.h> #include <netaddress.h>
#include <sync.h> #include <sync.h>

2
src/index/base.cpp
View File

@ -5,7 +5,7 @@
#include <chainparams.h> #include <chainparams.h>
#include <index/base.h> #include <index/base.h>
#include <node/blockstorage.h> #include <node/blockstorage.h>
#include <node/ui_interface.h> #include <node/interface_ui.h>
#include <shutdown.h> #include <shutdown.h>
#include <tinyformat.h> #include <tinyformat.h>
#include <util/thread.h> #include <util/thread.h>

15
src/init.cpp
View File

@ -39,7 +39,7 @@
#include <netgroup.h> #include <netgroup.h>
#include <node/blockstorage.h> #include <node/blockstorage.h>
#include <node/context.h> #include <node/context.h>
#include <node/ui_interface.h> #include <node/interface_ui.h>
#include <node/txreconciliation.h> #include <node/txreconciliation.h>
#include <policy/feerate.h> #include <policy/feerate.h>
#include <policy/fees.h> #include <policy/fees.h>
@ -1441,11 +1441,6 @@ bool AppInitLockDataDirectory()
bool AppInitInterfaces(NodeContext& node) bool AppInitInterfaces(NodeContext& node)
{ {
node.chain = interfaces::MakeChain(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; return true;
} }
@ -1515,11 +1510,17 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
GetMainSignals().RegisterBackgroundSignalScheduler(*node.scheduler); 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 /* Register RPC commands regardless of -server setting so they will be
* available in the GUI RPC console even if external calls are disabled. * available in the GUI RPC console even if external calls are disabled.
*/ */
tableRPC.InitPlatformRestrictions();
RegisterAllCoreRPCCommands(tableRPC); RegisterAllCoreRPCCommands(tableRPC);
for (const auto& client : node.chain_clients) { for (const auto& client : node.chain_clients) {
client->registerRpcs(); client->registerRpcs();

2
src/init/common.cpp
View File

@ -11,7 +11,7 @@
#include <crypto/sha256.h> #include <crypto/sha256.h>
#include <key.h> #include <key.h>
#include <logging.h> #include <logging.h>
#include <node/ui_interface.h> #include <node/interface_ui.h>
#include <random.h> #include <random.h>
#include <util/string.h> #include <util/string.h>
#include <util/system.h> #include <util/system.h>

4
src/interfaces/node.h
View File

@ -309,6 +309,10 @@ public:
using ShowProgressFn = std::function<void(const std::string& title, int progress, bool resume_possible)>; using ShowProgressFn = std::function<void(const std::string& title, int progress, bool resume_possible)>;
virtual std::unique_ptr<Handler> handleShowProgress(ShowProgressFn fn) = 0; 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. //! Register handler for number of connections changed messages.
using NotifyNumConnectionsChangedFn = std::function<void(int new_num_connections)>; using NotifyNumConnectionsChangedFn = std::function<void(int new_num_connections)>;
virtual std::unique_ptr<Handler> handleNotifyNumConnectionsChanged(NotifyNumConnectionsChangedFn fn) = 0; virtual std::unique_ptr<Handler> handleNotifyNumConnectionsChanged(NotifyNumConnectionsChangedFn fn) = 0;

2
src/llmq/chainlocks.cpp
View File

@ -12,7 +12,7 @@
#include <consensus/validation.h> #include <consensus/validation.h>
#include <masternode/sync.h> #include <masternode/sync.h>
#include <node/blockstorage.h> #include <node/blockstorage.h>
#include <node/ui_interface.h> #include <node/interface_ui.h>
#include <scheduler.h> #include <scheduler.h>
#include <spork.h> #include <spork.h>
#include <txmempool.h> #include <txmempool.h>

2
src/mapport.cpp
View File

@ -18,7 +18,7 @@
#include <util/thread.h> #include <util/thread.h>
#ifdef USE_NATPMP #ifdef USE_NATPMP
#include <compat.h> #include <compat/compat.h>
#include <natpmp.h> #include <natpmp.h>
#endif // USE_NATPMP #endif // USE_NATPMP

4
src/masternode/sync.cpp
View File

@ -8,11 +8,11 @@
#include <governance/governance.h> #include <governance/governance.h>
#include <netfulfilledman.h> #include <netfulfilledman.h>
#include <netmessagemaker.h> #include <netmessagemaker.h>
#include <node/ui_interface.h> #include <node/interface_ui.h>
#include <shutdown.h> #include <shutdown.h>
#include <validation.h>
#include <util/time.h> #include <util/time.h>
#include <util/translation.h> #include <util/translation.h>
#include <validation.h>
class CMasternodeSync; class CMasternodeSync;

4
src/net.cpp
View File

@ -15,7 +15,7 @@
#include <addrman.h> #include <addrman.h>
#include <banman.h> #include <banman.h>
#include <clientversion.h> #include <clientversion.h>
#include <compat.h> #include <compat/compat.h>
#include <consensus/consensus.h> #include <consensus/consensus.h>
#include <crypto/sha256.h> #include <crypto/sha256.h>
#include <node/eviction.h> #include <node/eviction.h>
@ -25,7 +25,7 @@
#include <net_permissions.h> #include <net_permissions.h>
#include <netaddress.h> #include <netaddress.h>
#include <netbase.h> #include <netbase.h>
#include <node/ui_interface.h> #include <node/interface_ui.h>
#include <protocol.h> #include <protocol.h>
#include <random.h> #include <random.h>
#include <scheduler.h> #include <scheduler.h>

2
src/net.h
View File

@ -9,7 +9,7 @@
#include <bip324.h> #include <bip324.h>
#include <chainparams.h> #include <chainparams.h>
#include <common/bloom.h> #include <common/bloom.h>
#include <compat.h> #include <compat/compat.h>
#include <consensus/amount.h> #include <consensus/amount.h>
#include <fs.h> #include <fs.h>
#include <crypto/siphash.h> #include <crypto/siphash.h>

2
src/netaddress.h
View File

@ -10,7 +10,7 @@
#endif #endif
#include <attributes.h> #include <attributes.h>
#include <compat.h> #include <compat/compat.h>
#include <crypto/siphash.h> #include <crypto/siphash.h>
#include <prevector.h> #include <prevector.h>
#include <random.h> #include <random.h>

2
src/netbase.cpp
View File

@ -5,7 +5,7 @@
#include <netbase.h> #include <netbase.h>
#include <compat.h> #include <compat/compat.h>
#include <sync.h> #include <sync.h>
#include <tinyformat.h> #include <tinyformat.h>
#include <util/sock.h> #include <util/sock.h>

2
src/netbase.h
View File

@ -9,7 +9,7 @@
#include <config/bitcoin-config.h> #include <config/bitcoin-config.h>
#endif #endif
#include <compat.h> #include <compat/compat.h>
#include <netaddress.h> #include <netaddress.h>
#include <serialize.h> #include <serialize.h>
#include <util/sock.h> #include <util/sock.h>

5
src/node/ui_interface.cpp → src/node/interface_ui.cpp
View File

@ -2,7 +2,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // 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> #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::ThreadSafeMessageBoxSig, boost::signals2::optional_last_value<bool>> ThreadSafeMessageBox;
boost::signals2::signal<CClientUIInterface::ThreadSafeQuestionSig, boost::signals2::optional_last_value<bool>> ThreadSafeQuestion; boost::signals2::signal<CClientUIInterface::ThreadSafeQuestionSig, boost::signals2::optional_last_value<bool>> ThreadSafeQuestion;
boost::signals2::signal<CClientUIInterface::InitMessageSig> InitMessage; boost::signals2::signal<CClientUIInterface::InitMessageSig> InitMessage;
boost::signals2::signal<CClientUIInterface::InitWalletSig> InitWallet;
boost::signals2::signal<CClientUIInterface::NotifyNumConnectionsChangedSig> NotifyNumConnectionsChanged; boost::signals2::signal<CClientUIInterface::NotifyNumConnectionsChangedSig> NotifyNumConnectionsChanged;
boost::signals2::signal<CClientUIInterface::NotifyNetworkActiveChangedSig> NotifyNetworkActiveChanged; boost::signals2::signal<CClientUIInterface::NotifyNetworkActiveChangedSig> NotifyNetworkActiveChanged;
boost::signals2::signal<CClientUIInterface::NotifyAlertChangedSig> NotifyAlertChanged; boost::signals2::signal<CClientUIInterface::NotifyAlertChangedSig> NotifyAlertChanged;
@ -37,6 +38,7 @@ static UISignals g_ui_signals;
ADD_SIGNALS_IMPL_WRAPPER(ThreadSafeMessageBox); ADD_SIGNALS_IMPL_WRAPPER(ThreadSafeMessageBox);
ADD_SIGNALS_IMPL_WRAPPER(ThreadSafeQuestion); ADD_SIGNALS_IMPL_WRAPPER(ThreadSafeQuestion);
ADD_SIGNALS_IMPL_WRAPPER(InitMessage); ADD_SIGNALS_IMPL_WRAPPER(InitMessage);
ADD_SIGNALS_IMPL_WRAPPER(InitWallet);
ADD_SIGNALS_IMPL_WRAPPER(NotifyNumConnectionsChanged); ADD_SIGNALS_IMPL_WRAPPER(NotifyNumConnectionsChanged);
ADD_SIGNALS_IMPL_WRAPPER(NotifyNetworkActiveChanged); ADD_SIGNALS_IMPL_WRAPPER(NotifyNetworkActiveChanged);
ADD_SIGNALS_IMPL_WRAPPER(NotifyAlertChanged); 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::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);} 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::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::NotifyNumConnectionsChanged(int newNumConnections) { return g_ui_signals.NotifyNumConnectionsChanged(newNumConnections); }
void CClientUIInterface::NotifyNetworkActiveChanged(bool networkActive) { return g_ui_signals.NotifyNetworkActiveChanged(networkActive); } void CClientUIInterface::NotifyNetworkActiveChanged(bool networkActive) { return g_ui_signals.NotifyNetworkActiveChanged(networkActive); }
void CClientUIInterface::NotifyAlertChanged() { return g_ui_signals.NotifyAlertChanged(); } void CClientUIInterface::NotifyAlertChanged() { return g_ui_signals.NotifyAlertChanged(); }

9
src/node/ui_interface.h → src/node/interface_ui.h
View File

@ -3,8 +3,8 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#ifndef BITCOIN_NODE_UI_INTERFACE_H #ifndef BITCOIN_NODE_INTERFACE_UI_H
#define BITCOIN_NODE_UI_INTERFACE_H #define BITCOIN_NODE_INTERFACE_UI_H
#include <functional> #include <functional>
#include <memory> #include <memory>
@ -83,6 +83,9 @@ public:
/** Progress message during initialization. */ /** Progress message during initialization. */
ADD_SIGNALS_DECL_WRAPPER(InitMessage, void, const std::string& message); ADD_SIGNALS_DECL_WRAPPER(InitMessage, void, const std::string& message);
/** Wallet client created. */
ADD_SIGNALS_DECL_WRAPPER(InitWallet, void, );
/** Number of network connections changed. */ /** Number of network connections changed. */
ADD_SIGNALS_DECL_WRAPPER(NotifyNumConnectionsChanged, void, int newNumConnections); ADD_SIGNALS_DECL_WRAPPER(NotifyNumConnectionsChanged, void, int newNumConnections);
@ -128,4 +131,4 @@ constexpr auto AbortError = InitError;
extern CClientUIInterface uiInterface; extern CClientUIInterface uiInterface;
#endif // BITCOIN_NODE_UI_INTERFACE_H #endif // BITCOIN_NODE_INTERFACE_UI_H

6
src/node/interfaces.cpp
View File

@ -30,7 +30,7 @@
#include <node/blockstorage.h> #include <node/blockstorage.h>
#include <node/coin.h> #include <node/coin.h>
#include <node/context.h> #include <node/context.h>
#include <node/ui_interface.h> #include <node/interface_ui.h>
#include <node/transaction.h> #include <node/transaction.h>
#include <policy/feerate.h> #include <policy/feerate.h>
#include <policy/fees.h> #include <policy/fees.h>
@ -527,6 +527,10 @@ public:
{ {
return MakeHandler(::uiInterface.ShowProgress_connect(fn)); 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 std::unique_ptr<Handler> handleNotifyNumConnectionsChanged(NotifyNumConnectionsChangedFn fn) override
{ {
return MakeHandler(::uiInterface.NotifyNumConnectionsChanged_connect(fn)); return MakeHandler(::uiInterface.NotifyNumConnectionsChanged_connect(fn));

2
src/noui.cpp
View File

@ -7,7 +7,7 @@
#include <noui.h> #include <noui.h>
#include <logging.h> #include <logging.h>
#include <node/ui_interface.h> #include <node/interface_ui.h>
#include <util/translation.h> #include <util/translation.h>
#include <string> #include <string>

3
src/qt/bitcoin.cpp
View File

@ -16,7 +16,7 @@
#include <interfaces/node.h> #include <interfaces/node.h>
#include <net.h> #include <net.h>
#include <node/context.h> #include <node/context.h>
#include <node/ui_interface.h> #include <node/interface_ui.h>
#include <noui.h> #include <noui.h>
#include <qt/bitcoingui.h> #include <qt/bitcoingui.h>
#include <qt/clientmodel.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 // 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. // screen will take care of deleting itself when finish() happens.
m_splash->show(); m_splash->show();
connect(this, &BitcoinApplication::requestedInitialize, m_splash, &SplashScreen::handleLoadWallet);
connect(this, &BitcoinApplication::splashFinished, m_splash, &SplashScreen::finish); connect(this, &BitcoinApplication::splashFinished, m_splash, &SplashScreen::finish);
connect(this, &BitcoinApplication::requestedShutdown, m_splash, &QWidget::close); connect(this, &BitcoinApplication::requestedShutdown, m_splash, &QWidget::close);
} }

2
src/qt/bitcoingui.cpp
View File

@ -36,7 +36,7 @@
#include <interfaces/coinjoin.h> #include <interfaces/coinjoin.h>
#include <interfaces/handler.h> #include <interfaces/handler.h>
#include <interfaces/node.h> #include <interfaces/node.h>
#include <node/ui_interface.h> #include <node/interface_ui.h>
#include <qt/governancelist.h> #include <qt/governancelist.h>
#include <qt/masternodelist.h> #include <qt/masternodelist.h>
#include <util/system.h> #include <util/system.h>

3
src/qt/guiutil.cpp
View File

@ -29,9 +29,6 @@
#include <cmath> #include <cmath>
#ifdef WIN32 #ifdef WIN32
#ifndef NOMINMAX
#define NOMINMAX
#endif
#include <shellapi.h> #include <shellapi.h>
#include <shlobj.h> #include <shlobj.h>
#include <shlwapi.h> #include <shlwapi.h>

2
src/qt/main.cpp
View File

@ -4,7 +4,7 @@
#include <qt/bitcoin.h> #include <qt/bitcoin.h>
#include <compat.h> #include <compat/compat.h>
#include <util/translation.h> #include <util/translation.h>
#include <util/url.h> #include <util/url.h>

2
src/qt/paymentserver.cpp
View File

@ -17,7 +17,7 @@
#include <clientversion.h> #include <clientversion.h>
#include <interfaces/node.h> #include <interfaces/node.h>
#include <key_io.h> #include <key_io.h>
#include <node/ui_interface.h> #include <node/interface_ui.h>
#include <policy/policy.h> #include <policy/policy.h>
#include <util/system.h> #include <util/system.h>

2
src/qt/sendcoinsdialog.cpp
View File

@ -21,7 +21,7 @@
#include <chainparams.h> #include <chainparams.h>
#include <interfaces/node.h> #include <interfaces/node.h>
#include <key_io.h> #include <key_io.h>
#include <node/ui_interface.h> #include <node/interface_ui.h>
#include <policy/fees.h> #include <policy/fees.h>
#include <txmempool.h> #include <txmempool.h>
#include <wallet/coincontrol.h> #include <wallet/coincontrol.h>

1
src/qt/splashscreen.cpp
View File

@ -199,6 +199,7 @@ void SplashScreen::subscribeToCoreSignals()
// Connect signals to client // Connect signals to client
m_handler_init_message = m_node->handleInitMessage(std::bind(InitMessage, this, std::placeholders::_1)); 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_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() void SplashScreen::handleLoadWallet()

1
src/qt/splashscreen.h
View File

@ -66,6 +66,7 @@ private:
bool m_shutdown = false; bool m_shutdown = false;
std::unique_ptr<interfaces::Handler> m_handler_init_message; 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_show_progress;
std::unique_ptr<interfaces::Handler> m_handler_init_wallet;
std::unique_ptr<interfaces::Handler> m_handler_load_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::Wallet>> m_connected_wallets;
std::list<std::unique_ptr<interfaces::Handler>> m_connected_wallet_handlers; std::list<std::unique_ptr<interfaces::Handler>> m_connected_wallet_handlers;

2
src/qt/transactionview.cpp
View File

@ -18,7 +18,7 @@
#include <qt/walletmodel.h> #include <qt/walletmodel.h>
#include <interfaces/node.h> #include <interfaces/node.h>
#include <node/ui_interface.h> #include <node/interface_ui.h>
#include <optional> #include <optional>

2
src/qt/walletframe.cpp
View File

@ -5,7 +5,7 @@
#include <qt/walletframe.h> #include <qt/walletframe.h>
#include <fs.h> #include <fs.h>
#include <node/ui_interface.h> #include <node/interface_ui.h>
#include <psbt.h> #include <psbt.h>
#include <qt/governancelist.h> #include <qt/governancelist.h>
#include <qt/guiutil.h> #include <qt/guiutil.h>

2
src/qt/walletmodel.cpp
View File

@ -22,7 +22,7 @@
#include <interfaces/handler.h> #include <interfaces/handler.h>
#include <interfaces/node.h> #include <interfaces/node.h>
#include <key_io.h> #include <key_io.h>
#include <node/ui_interface.h> #include <node/interface_ui.h>
#include <psbt.h> #include <psbt.h>
#include <util/system.h> // for GetBoolArg #include <util/system.h> // for GetBoolArg
#include <util/translation.h> #include <util/translation.h>

2
src/qt/walletview.cpp
View File

@ -22,7 +22,7 @@
#include <qt/walletmodel.h> #include <qt/walletmodel.h>
#include <interfaces/node.h> #include <interfaces/node.h>
#include <node/ui_interface.h> #include <node/interface_ui.h>
#include <util/strencodings.h> #include <util/strencodings.h>
#include <QAction> #include <QAction>

19
src/random.cpp
View File

@ -9,24 +9,23 @@
#include <crypto/chacha20.h> #include <crypto/chacha20.h>
#include <crypto/sha256.h> #include <crypto/sha256.h>
#include <crypto/sha512.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 <logging.h>
#include <randomenv.h> #include <randomenv.h>
#include <support/allocators/secure.h>
#include <span.h> #include <span.h>
#include <sync.h> // for Mutex #include <support/allocators/secure.h>
#include <util/time.h> // for GetTimeMicros() #include <support/cleanse.h>
#include <sync.h>
#include <util/time.h>
#include <array> #include <array>
#include <cmath> #include <cmath>
#include <stdlib.h> #include <stdlib.h>
#include <thread> #include <thread>
#ifndef WIN32 #ifdef WIN32
#include <windows.h>
#include <wincrypt.h>
#else
#include <fcntl.h> #include <fcntl.h>
#endif #endif
@ -729,7 +728,7 @@ bool Random_SanityCheck()
* GetOSRand() overwrites all 32 bytes of the output given a maximum * GetOSRand() overwrites all 32 bytes of the output given a maximum
* number of tries. * number of tries.
*/ */
static const ssize_t MAX_TRIES = 1024; static constexpr int MAX_TRIES{1024};
uint8_t data[NUM_OS_RANDOM_BYTES]; uint8_t data[NUM_OS_RANDOM_BYTES];
bool overwritten[NUM_OS_RANDOM_BYTES] = {}; /* Tracks which bytes have been overwritten at least once */ bool overwritten[NUM_OS_RANDOM_BYTES] = {}; /* Tracks which bytes have been overwritten at least once */
int num_overwritten; int num_overwritten;

15
src/randomenv.cpp
View File

@ -14,22 +14,23 @@
#include <crypto/sha512.h> #include <crypto/sha512.h>
#include <span.h> #include <span.h>
#include <support/cleanse.h> #include <support/cleanse.h>
#include <util/time.h> // for GetTime() #include <util/time.h>
#ifdef WIN32
#include <compat.h> // for Windows API
#endif
#include <algorithm> #include <algorithm>
#include <atomic> #include <atomic>
#include <cstdint>
#include <cstring>
#include <chrono> #include <chrono>
#include <climits> #include <climits>
#include <thread> #include <thread>
#include <vector> #include <vector>
#include <stdint.h>
#include <string.h>
#ifndef WIN32
#include <sys/types.h> // must go before a number of other headers #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 <fcntl.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <sys/resource.h> #include <sys/resource.h>

2
src/shutdown.cpp
View File

@ -12,7 +12,7 @@
#include <logging.h> #include <logging.h>
#include <util/tokenpipe.h> #include <util/tokenpipe.h>
#include <node/ui_interface.h> #include <node/interface_ui.h>
#include <warnings.h> #include <warnings.h>
#include <assert.h> #include <assert.h>

2
src/stats/rawsender.h
View File

@ -6,7 +6,7 @@
#ifndef BITCOIN_STATS_RAWSENDER_H #ifndef BITCOIN_STATS_RAWSENDER_H
#define BITCOIN_STATS_RAWSENDER_H #define BITCOIN_STATS_RAWSENDER_H
#include <compat.h> #include <compat/compat.h>
#include <sync.h> #include <sync.h>
#include <threadinterrupt.h> #include <threadinterrupt.h>

3
src/support/lockedpool.cpp
View File

@ -10,9 +10,6 @@
#endif #endif
#ifdef WIN32 #ifdef WIN32
#ifndef NOMINMAX
#define NOMINMAX
#endif
#include <windows.h> #include <windows.h>
#else #else
#include <sys/mman.h> // for mmap #include <sys/mman.h> // for mmap

2
src/test/fuzz/util.h
View File

@ -9,7 +9,7 @@
#include <attributes.h> #include <attributes.h>
#include <chainparamsbase.h> #include <chainparamsbase.h>
#include <coins.h> #include <coins.h>
#include <compat.h> #include <compat/compat.h>
#include <consensus/amount.h> #include <consensus/amount.h>
#include <consensus/consensus.h> #include <consensus/consensus.h>
#include <key.h> #include <key.h>

2
src/test/fuzz/util/net.cpp
View File

@ -2,7 +2,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <compat.h> #include <compat/compat.h>
#include <netaddress.h> #include <netaddress.h>
#include <test/fuzz/FuzzedDataProvider.h> #include <test/fuzz/FuzzedDataProvider.h>
#include <util/strencodings.h> #include <util/strencodings.h>

2
src/test/net_peer_connection_tests.cpp
View File

@ -3,7 +3,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <chainparams.h> #include <chainparams.h>
#include <compat.h> #include <compat/compat.h>
#include <net.h> #include <net.h>
#include <net_processing.h> #include <net_processing.h>
#include <netaddress.h> #include <netaddress.h>

2
src/test/net_tests.cpp
View File

@ -6,7 +6,7 @@
#include <chainparams.h> #include <chainparams.h>
#include <clientversion.h> #include <clientversion.h>
#include <compat.h> #include <compat/compat.h>
#include <net.h> #include <net.h>
#include <net_processing.h> #include <net_processing.h>
#include <netaddress.h> #include <netaddress.h>

2
src/test/sock_tests.cpp
View File

@ -2,7 +2,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // 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 <test/util/setup_common.h>
#include <threadinterrupt.h> #include <threadinterrupt.h>
#include <util/sock.h> #include <util/sock.h>

2
src/test/util/net.h
View File

@ -5,7 +5,7 @@
#ifndef BITCOIN_TEST_UTIL_NET_H #ifndef BITCOIN_TEST_UTIL_NET_H
#define BITCOIN_TEST_UTIL_NET_H #define BITCOIN_TEST_UTIL_NET_H
#include <compat.h> #include <compat/compat.h>
#include <net.h> #include <net.h>
#include <net_permissions.h> #include <net_permissions.h>
#include <net_processing.h> #include <net_processing.h>

4
src/test/util_tests.cpp
View File

@ -37,9 +37,11 @@
#include <unordered_set> #include <unordered_set>
#include <utility> #include <utility>
#include <vector> #include <vector>
#include <sys/types.h>
#ifndef WIN32 #ifndef WIN32
#include <signal.h> #include <signal.h>
#include <sys/types.h>
#include <sys/wait.h> #include <sys/wait.h>
#endif #endif

2
src/timedata.cpp
View File

@ -9,7 +9,7 @@
#include <timedata.h> #include <timedata.h>
#include <netaddress.h> #include <netaddress.h>
#include <node/ui_interface.h> #include <node/interface_ui.h>
#include <sync.h> #include <sync.h>
#include <tinyformat.h> #include <tinyformat.h>
#include <util/system.h> #include <util/system.h>

2
src/torcontrol.cpp
View File

@ -7,7 +7,7 @@
#include <chainparams.h> #include <chainparams.h>
#include <chainparamsbase.h> #include <chainparamsbase.h>
#include <compat.h> #include <compat/compat.h>
#include <crypto/hmac_sha256.h> #include <crypto/hmac_sha256.h>
#include <net.h> #include <net.h>
#include <netaddress.h> #include <netaddress.h>

2
src/txdb.cpp
View File

@ -6,7 +6,7 @@
#include <txdb.h> #include <txdb.h>
#include <chain.h> #include <chain.h>
#include <node/ui_interface.h> #include <node/interface_ui.h>
#include <pow.h> #include <pow.h>
#include <random.h> #include <random.h>
#include <shutdown.h> #include <shutdown.h>

2
src/util/edge.h
View File

@ -5,7 +5,7 @@
#ifndef BITCOIN_UTIL_EDGE_H #ifndef BITCOIN_UTIL_EDGE_H
#define BITCOIN_UTIL_EDGE_H #define BITCOIN_UTIL_EDGE_H
#include <compat.h> #include <compat/compat.h>
#include <assert.h> #include <assert.h>
#include <cstdint> #include <cstdint>

2
src/util/sock.cpp
View File

@ -2,7 +2,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <compat.h> #include <compat/compat.h>
#include <logging.h> #include <logging.h>
#include <threadinterrupt.h> #include <threadinterrupt.h>
#include <tinyformat.h> #include <tinyformat.h>

2
src/util/sock.h
View File

@ -5,7 +5,7 @@
#ifndef BITCOIN_UTIL_SOCK_H #ifndef BITCOIN_UTIL_SOCK_H
#define BITCOIN_UTIL_SOCK_H #define BITCOIN_UTIL_SOCK_H
#include <compat.h> #include <compat/compat.h>
#include <threadinterrupt.h> #include <threadinterrupt.h>
#include <util/time.h> #include <util/time.h>

3
src/util/system.cpp
View File

@ -60,9 +60,6 @@
#pragma warning(disable:4717) #pragma warning(disable:4717)
#endif #endif
#ifndef NOMINMAX
#define NOMINMAX
#endif
#include <codecvt> #include <codecvt>
#include <io.h> /* for _commit */ #include <io.h> /* for _commit */

2
src/util/system.h
View File

@ -16,8 +16,8 @@
#endif #endif
#include <attributes.h> #include <attributes.h>
#include <compat.h>
#include <compat/assumptions.h> #include <compat/assumptions.h>
#include <compat/compat.h>
#include <consensus/amount.h> #include <consensus/amount.h>
#include <fs.h> #include <fs.h>
#include <logging.h> #include <logging.h>

2
src/util/time.cpp
View File

@ -7,7 +7,7 @@
#include <config/bitcoin-config.h> #include <config/bitcoin-config.h>
#endif #endif
#include <compat.h> #include <compat/compat.h>
#include <util/time.h> #include <util/time.h>
#include <util/check.h> #include <util/check.h>

2
src/util/time.h
View File

@ -6,7 +6,7 @@
#ifndef BITCOIN_UTIL_TIME_H #ifndef BITCOIN_UTIL_TIME_H
#define BITCOIN_UTIL_TIME_H #define BITCOIN_UTIL_TIME_H
#include <compat.h> #include <compat/compat.h>
#include <chrono> #include <chrono>
#include <stdint.h> #include <stdint.h>

2
src/validation.cpp
View File

@ -24,7 +24,7 @@
#include <logging/timer.h> #include <logging/timer.h>
#include <node/blockstorage.h> #include <node/blockstorage.h>
#include <node/coinstats.h> #include <node/coinstats.h>
#include <node/ui_interface.h> #include <node/interface_ui.h>
#include <node/utxo_snapshot.h> #include <node/utxo_snapshot.h>
#include <policy/policy.h> #include <policy/policy.h>
#include <policy/settings.h> #include <policy/settings.h>

10
src/wallet/bdb.cpp
View File

@ -3,6 +3,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <compat/compat.h>
#include <fs.h> #include <fs.h>
#include <wallet/bdb.h> #include <wallet/bdb.h>
#include <wallet/db.h> #include <wallet/db.h>
@ -12,8 +13,15 @@
#include <stdint.h> #include <stdint.h>
#ifndef WIN32
#include <sys/stat.h> #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 #endif
namespace { namespace {

2
src/wallet/init.cpp
View File

@ -9,7 +9,7 @@
#include <interfaces/wallet.h> #include <interfaces/wallet.h>
#include <net.h> #include <net.h>
#include <node/context.h> #include <node/context.h>
#include <node/ui_interface.h> #include <node/interface_ui.h>
#include <univalue.h> #include <univalue.h>
#include <util/check.h> #include <util/check.h>
#include <util/error.h> #include <util/error.h>

10
test/functional/test_framework/authproxy.py
View File

@ -39,7 +39,6 @@ from http import HTTPStatus
import http.client import http.client
import json import json
import logging import logging
import os
import socket import socket
import time import time
import urllib.parse import urllib.parse
@ -101,11 +100,6 @@ class AuthServiceProxy():
'User-Agent': USER_AGENT, 'User-Agent': USER_AGENT,
'Authorization': self.__auth_header, 'Authorization': self.__auth_header,
'Content-type': 'application/json'} '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: try:
self.__conn.request(method, path, postdata, headers) self.__conn.request(method, path, postdata, headers)
return self._get_response() return self._get_response()
@ -116,10 +110,8 @@ class AuthServiceProxy():
self.__conn.request(method, path, postdata, headers) self.__conn.request(method, path, postdata, headers)
return self._get_response() return self._get_response()
except OSError as e: 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 # 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: if retry:
self.__conn.close() self.__conn.close()
self.__conn.request(method, path, postdata, headers) self.__conn.request(method, path, postdata, headers)