backport: merge bitcoin#24989, #26135, #26150, #26159, #26489, #26825, #28127, #29275, #29263, partial bitcoin#27790, #27978 (c++20 backports) #6378

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

PastaPastaPasta merged 12 commits into dashpay:develop from kwvg:cxx20_bps1

Feb 21, 2025

configure.ac

-Original file line number
+Diff line change
@@ Expand Up / @@ -1035,7 +1035,7 @@ if test x$TARGET_OS = xdarwin; then @@
       AX_CHECK_LINK_FLAG([[-Wl,-fixup_chains]], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,-fixup_chains"], [], [[$LDFLAG_WERROR]])
     fi
-    AC_CHECK_HEADERS([endian.h sys/endian.h byteswap.h stdio.h stdlib.h unistd.h strings.h sys/types.h sys/stat.h sys/select.h sys/prctl.h sys/sysctl.h vm/vm_param.h sys/vmmeter.h sys/resources.h])
+    AC_CHECK_HEADERS([sys/select.h sys/prctl.h sys/sysctl.h vm/vm_param.h sys/vmmeter.h sys/resources.h])
     AC_CHECK_DECLS([getifaddrs, freeifaddrs],[CHECK_SOCKET],,
         [#include <sys/types.h>
@@ Expand All / @@ -1050,18 +1050,6 @@ AC_CHECK_DECLS([pipe2]) @@
     AC_CHECK_FUNCS([timingsafe_bcmp])
-    AC_CHECK_DECLS([le16toh, le32toh, le64toh, htole16, htole32, htole64, be16toh, be32toh, be64toh, htobe16, htobe32, htobe64],,,
-    		[#if HAVE_ENDIAN_H
-                     #include <endian.h>
-                     #elif HAVE_SYS_ENDIAN_H
-                     #include <sys/endian.h>
-                     #endif])
-    AC_CHECK_DECLS([bswap_16, bswap_32, bswap_64],,,
-    		[#if HAVE_BYTESWAP_H
-                     #include <byteswap.h>
-                     #endif])
     dnl Check for mallopt(M_ARENA_MAX) (to set glibc arenas)
     AC_MSG_CHECKING(for mallopt M_ARENA_MAX)
     AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <malloc.h>]],
@@ Expand Down @@

src/Makefile.test.include

-Original file line number
+Diff line change
@@ Expand Up / @@ -73,6 +73,7 @@ endif @@
     # test_dash binary #
     BITCOIN_TESTS =\
+      test/argsman_tests.cpp \
       test/arith_uint256_tests.cpp \
       test/scriptnum10.h \
       test/addrman_tests.cpp \
@@ Expand Down @@

src/bench/ellswift.cpp

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -17,12 +17,12 @@ static void EllSwiftCreate(benchmark::Bench& bench)
  
        uint256 entropy = GetRandHash();

        bench.batch(1).unit("pubkey").run([&] {

            auto ret = key.EllSwiftCreate(AsBytes(Span{entropy}));

            auto ret = key.EllSwiftCreate(MakeByteSpan(entropy));

            /* Use the first 32 bytes of the ellswift encoded public key as next private key. */

            key.Set(UCharCast(ret.data()), UCharCast(ret.data()) + 32, true);

            assert(key.IsValid());

            /* Use the last 32 bytes of the ellswift encoded public key as next entropy. */

            std::copy(ret.begin() + 32, ret.begin() + 64, BytePtr(entropy.data()));

            std::copy(ret.begin() + 32, ret.begin() + 64, MakeWritableByteSpan(entropy).begin());

        });

        ECC_Stop();

src/bitcoin-tx.cpp

-Original file line number
+Diff line change
@@ Expand Up / @@ -26,10 +26,10 @@ @@
     #include <util/system.h>
     #include <util/translation.h>
+    #include <cstdio>
     #include <functional>
     #include <memory>
     #include <optional>
-    #include <stdio.h>
     #include <stacktraces.h>
@@ Expand Down @@

src/bitcoind.cpp

-Original file line number
+Diff line change
@@ Expand Up / @@ -28,8 +28,8 @@ @@
     #include <stacktraces.h>
     #include <util/url.h>
+    #include <cstdio>
     #include <functional>
-    #include <stdio.h>
     const std::function<std::string(const char*)> G_TRANSLATION_FUN = nullptr;
     UrlDecodeFn* const URL_DECODE = urlDecode;
@@ Expand Down @@

src/compat/byteswap.h

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -5,44 +5,66 @@
  
    #ifndef BITCOIN_COMPAT_BYTESWAP_H

    #define BITCOIN_COMPAT_BYTESWAP_H

    #if defined(HAVE_CONFIG_H)

    #include <config/bitcoin-config.h>

    #include <cstdint>

    #ifdef _MSC_VER

    #include <cstdlib>

    #endif

    #include <cstdint>

    #if defined(HAVE_BYTESWAP_H)

    #include <byteswap.h>

    #endif

    // All internal_bswap_* functions can be replaced with std::byteswap once we

    // require c++23. Both libstdc++ and libc++ implement std::byteswap via these

    // builtins.

    #if defined(MAC_OSX)

    #ifndef DISABLE_BUILTIN_BSWAPS

    #  if defined __has_builtin

    #    if __has_builtin(__builtin_bswap16)

    #      define bitcoin_builtin_bswap16(x) __builtin_bswap16(x)

    #    endif

    #    if __has_builtin(__builtin_bswap32)

    #      define bitcoin_builtin_bswap32(x) __builtin_bswap32(x)

    #    endif

    #    if __has_builtin(__builtin_bswap64)

    #      define bitcoin_builtin_bswap64(x) __builtin_bswap64(x)

    #    endif

    #  elif defined(_MSC_VER)

    #      define bitcoin_builtin_bswap16(x) _byteswap_ushort(x)

    #      define bitcoin_builtin_bswap32(x) _byteswap_ulong(x)

    #      define bitcoin_builtin_bswap64(x) _byteswap_uint64(x)

    #  endif

    #endif

    #include <libkern/OSByteOrder.h>

    #define bswap_16(x) OSSwapInt16(x)

    #define bswap_32(x) OSSwapInt32(x)

    #define bswap_64(x) OSSwapInt64(x)

    // MSVC's _byteswap_* functions are not constexpr

    #ifndef _MSC_VER

    #define BSWAP_CONSTEXPR constexpr

    #else

    // Non-MacOS / non-Darwin

    #define BSWAP_CONSTEXPR

    #endif

    #if HAVE_DECL_BSWAP_16 == 0

    inline uint16_t bswap_16(uint16_t x)

    inline BSWAP_CONSTEXPR uint16_t internal_bswap_16(uint16_t x)

    {

    #ifdef bitcoin_builtin_bswap16

        return bitcoin_builtin_bswap16(x);

    #else

        return (x >> 8) | (x << 8);

    #endif

    }

    #endif // HAVE_DECL_BSWAP16 == 0

    #if HAVE_DECL_BSWAP_32 == 0

    inline uint32_t bswap_32(uint32_t x)

    inline BSWAP_CONSTEXPR uint32_t internal_bswap_32(uint32_t x)

    {

    #ifdef bitcoin_builtin_bswap32

        return bitcoin_builtin_bswap32(x);

    #else

        return (((x & 0xff000000U) >> 24) | ((x & 0x00ff0000U) >>  8) |

                ((x & 0x0000ff00U) <<  8) | ((x & 0x000000ffU) << 24));

    #endif

    }

    #endif // HAVE_DECL_BSWAP32 == 0

    #if HAVE_DECL_BSWAP_64 == 0

    inline uint64_t bswap_64(uint64_t x)

    inline BSWAP_CONSTEXPR uint64_t internal_bswap_64(uint64_t x)

    {

    #ifdef bitcoin_builtin_bswap64

        return bitcoin_builtin_bswap64(x);

    #else

         return (((x & 0xff00000000000000ull) >> 56)

              | ((x & 0x00ff000000000000ull) >> 40)

              | ((x & 0x0000ff0000000000ull) >> 24)

    @@ -51,9 +73,7 @@ inline uint64_t bswap_64(uint64_t x)
  
              | ((x & 0x0000000000ff0000ull) << 24)

              | ((x & 0x000000000000ff00ull) << 40)

              | ((x & 0x00000000000000ffull) << 56));

    #endif

    }

    #endif // HAVE_DECL_BSWAP64 == 0

    #endif // defined(MAC_OSX)

    #endif // BITCOIN_COMPAT_BYTESWAP_H

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

backport: merge bitcoin#24989, #26135, #26150, #26159, #26489, #26825, #28127, #29275, #29263, partial bitcoin#27790, #27978 (c++20 backports) #6378

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!