diff --git a/builds/cmake/install-cmake.sh b/builds/cmake/install-cmake.sh index caacfe9ec..053de1a55 100755 --- a/builds/cmake/install-cmake.sh +++ b/builds/cmake/install-cmake.sh @@ -9,7 +9,7 @@ # # Script options: -# --build-secp256k1 Build libsecp256k1 libraries +# --build-libsecp256k1 Build bitcoin core libsecp256k1 libraries # --build-src-dir= Location for sources. # Default: $(pwd) # --build-obj-dir= Location for intermediate objects. @@ -80,12 +80,12 @@ # Default: OFF # -Denable-aes= Check for ARM AES and PMULL Extensions. # Default: OFF -# -Dwith-secp256k1= Use bitcoin-core/secp256k1 library. -# Default: OFF +# -Dwith-secp256k1= Use native secp256k1 interface, otherwise external library. +# Default: ON # -Dwith-valgrind= Use valgrind memcheck client requests. # Default: OFF -# -Dwith-cuda= Use cuda (gpu) batch signature verification (inert on macOS). -# Default: ON +# -Dwith-verbose= Compile verbose logging. +# Default: OFF # # All unrecognized options provided shall be passed as configuration # options for all dependencies. @@ -139,7 +139,7 @@ main() for OPTION in "$@"; do case ${OPTION} in - (--build-secp256k1) BUILD_secp256k1="yes";; + (--build-libsecp256k1) BUILD_libsecp256k1="yes";; (--hardware-aes) HARDWARE_AES="yes";; (--hardware-sha2) HARDWARE_SHA2="yes";; (--hardware-sha3) HARDWARE_SHA3="yes";; @@ -178,7 +178,7 @@ main() CONFIGURE_OPTIONS_ORIGINAL=("$@") CONFIGURE_OPTIONS=("$@") - CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--build-secp256k1/}") + CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--build-libsecp256k1/}") CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--build-src-dir=*/}") CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--build-obj-dir=*/}") CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--build-obj-dir-relative/}") @@ -639,7 +639,7 @@ main() if [[ ${BUILD_LIMIT} == "external" ]] || [[ ${BUILD_LIMIT} == "dependencies" ]] || [[ ${BUILD_LIMIT} == "none" ]]; then - if [[ ${BUILD_secp256k1} == "yes" ]]; then + if [[ ${BUILD_libsecp256k1} == "yes" ]]; then source_github "${secp256k1_OWNER}" "secp256k1" "${secp256k1_TAG}" local SAVE_CPPFLAGS="${CPPFLAGS}" export CPPFLAGS="${CPPFLAGS} ${secp256k1_FLAGS[@]}" @@ -965,7 +965,7 @@ test_cmake() display_build_variables() { - msg "BUILD_secp256k1 : ${BUILD_secp256k1}" + msg "BUILD_libsecp256k1 : ${BUILD_libsecp256k1}" msg "BUILD_LIMIT : ${BUILD_LIMIT}" msg "BUILD_SRC_DIR : ${BUILD_SRC_DIR}" msg "BUILD_OBJ_DIR : ${BUILD_OBJ_DIR}" @@ -1030,7 +1030,7 @@ help() msg "" msg "Script options:" - msg "--build-secp256k1 Build libsecp256k1 libraries" + msg "--build-libsecp256k1 Build bitcoin core libsecp256k1 libraries" msg "--build-src-dir= Location for sources." msg " Default: $(pwd)" msg "--build-obj-dir= Location for intermediate objects." @@ -1101,12 +1101,12 @@ help() msg " Default: OFF" msg "-Denable-aes= Check for ARM AES and PMULL Extensions." msg " Default: OFF" - msg "-Dwith-secp256k1= Use bitcoin-core/secp256k1 library." - msg " Default: OFF" + msg "-Dwith-secp256k1= Use native secp256k1 interface, otherwise external library." + msg " Default: ON" msg "-Dwith-valgrind= Use valgrind memcheck client requests." msg " Default: OFF" - msg "-Dwith-cuda= Use cuda (gpu) batch signature verification (inert on macOS)." - msg " Default: ON" + msg "-Dwith-verbose= Compile verbose logging." + msg " Default: OFF" msg "" msg "All unrecognized options provided shall be passed as configuration" msg "options for all dependencies." diff --git a/builds/cmake/install-presets.sh b/builds/cmake/install-presets.sh index f31b10314..4fb431640 100755 --- a/builds/cmake/install-presets.sh +++ b/builds/cmake/install-presets.sh @@ -9,7 +9,7 @@ # # Script options: -# --build-secp256k1 Build libsecp256k1 libraries +# --build-libsecp256k1 Build bitcoin core libsecp256k1 libraries # --build-preset= Specifies preset configuration to build. # --build-src-dir= Location for sources. # Default: $(pwd) @@ -70,12 +70,12 @@ # Default: OFF # -Denable-aes= Check for ARM AES and PMULL Extensions. # Default: OFF -# -Dwith-secp256k1= Use bitcoin-core/secp256k1 library. -# Default: OFF +# -Dwith-secp256k1= Use native secp256k1 interface, otherwise external library. +# Default: ON # -Dwith-valgrind= Use valgrind memcheck client requests. # Default: OFF -# -Dwith-cuda= Use cuda (gpu) batch signature verification (inert on macOS). -# Default: ON +# -Dwith-verbose= Compile verbose logging. +# Default: OFF # # All unrecognized options provided shall be passed as configuration # options for all dependencies. @@ -129,7 +129,7 @@ main() for OPTION in "$@"; do case ${OPTION} in - (--build-secp256k1) BUILD_secp256k1="yes";; + (--build-libsecp256k1) BUILD_libsecp256k1="yes";; (--hardware-aes) HARDWARE_AES="yes";; (--hardware-sha2) HARDWARE_SHA2="yes";; (--hardware-sha3) HARDWARE_SHA3="yes";; @@ -164,7 +164,7 @@ main() CONFIGURE_OPTIONS_ORIGINAL=("$@") CONFIGURE_OPTIONS=("$@") - CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--build-secp256k1/}") + CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--build-libsecp256k1/}") CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--build-preset=*/}") CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--build-src-dir=*/}") CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--build-limit=*/}") @@ -643,7 +643,7 @@ main() if [[ ${BUILD_LIMIT} == "external" ]] || [[ ${BUILD_LIMIT} == "dependencies" ]] || [[ ${BUILD_LIMIT} == "none" ]]; then - if [[ ${BUILD_secp256k1} == "yes" ]]; then + if [[ ${BUILD_libsecp256k1} == "yes" ]]; then source_github "${secp256k1_OWNER}" "secp256k1" "${secp256k1_TAG}" local SAVE_CPPFLAGS="${CPPFLAGS}" export CPPFLAGS="${CPPFLAGS} ${secp256k1_FLAGS[@]}" @@ -1029,7 +1029,7 @@ test_cmake() display_build_variables() { - msg "BUILD_secp256k1 : ${BUILD_secp256k1}" + msg "BUILD_libsecp256k1 : ${BUILD_libsecp256k1}" msg "BUILD_PRESET : ${BUILD_PRESET}" msg "BUILD_LIMIT : ${BUILD_LIMIT}" msg "BUILD_SRC_DIR : ${BUILD_SRC_DIR}" @@ -1095,7 +1095,7 @@ help() msg "" msg "Script options:" - msg "--build-secp256k1 Build libsecp256k1 libraries" + msg "--build-libsecp256k1 Build bitcoin core libsecp256k1 libraries" msg "--build-preset= Specifies preset configuration to build." msg "--build-src-dir= Location for sources." msg " Default: $(pwd)" @@ -1156,12 +1156,12 @@ help() msg " Default: OFF" msg "-Denable-aes= Check for ARM AES and PMULL Extensions." msg " Default: OFF" - msg "-Dwith-secp256k1= Use bitcoin-core/secp256k1 library." - msg " Default: OFF" + msg "-Dwith-secp256k1= Use native secp256k1 interface, otherwise external library." + msg " Default: ON" msg "-Dwith-valgrind= Use valgrind memcheck client requests." msg " Default: OFF" - msg "-Dwith-cuda= Use cuda (gpu) batch signature verification (inert on macOS)." - msg " Default: ON" + msg "-Dwith-verbose= Compile verbose logging." + msg " Default: OFF" msg "" msg "All unrecognized options provided shall be passed as configuration" msg "options for all dependencies." diff --git a/builds/gnu/install-gnu.sh b/builds/gnu/install-gnu.sh index 540d56626..6a4078813 100755 --- a/builds/gnu/install-gnu.sh +++ b/builds/gnu/install-gnu.sh @@ -9,7 +9,7 @@ # # Script options: -# --build-secp256k1 Build libsecp256k1 libraries +# --build-libsecp256k1 Build bitcoin core libsecp256k1 libraries # --build-src-dir= Location for sources. # Default: $(pwd) # --build-obj-dir= Location for intermediate objects. @@ -81,12 +81,12 @@ # Default: --disable-sha3 # ---aes Check for ARM AES and PMULL Extensions. # Default: --disable-aes -# ---secp256k1 Use bitcoin-core/secp256k1 library. -# Default: --without-secp256k1 +# ---secp256k1 Use native secp256k1 interface, otherwise external library. +# Default: --with-secp256k1 # ---valgrind Use valgrind memcheck client requests. # Default: --without-valgrind -# ---cuda Use cuda (gpu) batch signature verification (inert on macOS). -# Default: --with-cuda +# ---verbose Compile verbose logging. +# Default: --without-verbose # # All unrecognized options provided shall be passed as configuration # options for all dependencies. @@ -140,7 +140,7 @@ main() for OPTION in "$@"; do case ${OPTION} in - (--build-secp256k1) BUILD_secp256k1="yes";; + (--build-libsecp256k1) BUILD_libsecp256k1="yes";; (--hardware-aes) HARDWARE_AES="yes";; (--hardware-sha2) HARDWARE_SHA2="yes";; (--hardware-sha3) HARDWARE_SHA3="yes";; @@ -176,7 +176,7 @@ main() CONFIGURE_OPTIONS_ORIGINAL=("$@") CONFIGURE_OPTIONS=("$@") - CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--build-secp256k1/}") + CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--build-libsecp256k1/}") CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--build-src-dir=*/}") CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--build-obj-dir=*/}") CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--build-obj-dir-relative/}") @@ -686,7 +686,7 @@ main() if [[ ${BUILD_LIMIT} == "external" ]] || [[ ${BUILD_LIMIT} == "dependencies" ]] || [[ ${BUILD_LIMIT} == "none" ]]; then - if [[ ${BUILD_secp256k1} == "yes" ]]; then + if [[ ${BUILD_libsecp256k1} == "yes" ]]; then source_github "${secp256k1_OWNER}" "secp256k1" "${secp256k1_TAG}" local SAVE_CPPFLAGS="${CPPFLAGS}" export CPPFLAGS="${CPPFLAGS} ${secp256k1_FLAGS[@]}" @@ -1037,7 +1037,7 @@ test_gnu() display_build_variables() { - msg "BUILD_secp256k1 : ${BUILD_secp256k1}" + msg "BUILD_libsecp256k1 : ${BUILD_libsecp256k1}" msg "BUILD_LIMIT : ${BUILD_LIMIT}" msg "BUILD_SRC_DIR : ${BUILD_SRC_DIR}" msg "BUILD_OBJ_DIR : ${BUILD_OBJ_DIR}" @@ -1103,7 +1103,7 @@ help() msg "" msg "Script options:" - msg "--build-secp256k1 Build libsecp256k1 libraries" + msg "--build-libsecp256k1 Build bitcoin core libsecp256k1 libraries" msg "--build-src-dir= Location for sources." msg " Default: $(pwd)" msg "--build-obj-dir= Location for intermediate objects." @@ -1175,12 +1175,12 @@ help() msg " Default: --disable-sha3" msg "---aes Check for ARM AES and PMULL Extensions." msg " Default: --disable-aes" - msg "---secp256k1 Use bitcoin-core/secp256k1 library." - msg " Default: --without-secp256k1" + msg "---secp256k1 Use native secp256k1 interface, otherwise external library." + msg " Default: --with-secp256k1" msg "---valgrind Use valgrind memcheck client requests." msg " Default: --without-valgrind" - msg "---cuda Use cuda (gpu) batch signature verification (inert on macOS)." - msg " Default: --with-cuda" + msg "---verbose Compile verbose logging." + msg " Default: --without-verbose" msg "" msg "All unrecognized options provided shall be passed as configuration" msg "options for all dependencies." diff --git a/builds/msvc/build-msvc.cmd b/builds/msvc/build-msvc.cmd index 590019909..a4055d2a9 100644 --- a/builds/msvc/build-msvc.cmd +++ b/builds/msvc/build-msvc.cmd @@ -23,7 +23,6 @@ REM --enable-sse41 Add SSE4.1 hardware instructions via compilation REM --enable-sha2 Check for ARM SHA1/SHA256 Extensions. REM --enable-sha3 Check for ARM SHA3 Extensions for SHA512. REM --enable-aes Check for ARM AES and PMULL Extensions. -REM --[with/without]-cuda Use cuda (gpu) batch signature verification (inert on macOS). REM --build-config config Build configuration. REM --build-platform platform Build platform. REM --build-version version Build MSVC version. @@ -330,18 +329,6 @@ if "!libbitcoin_node_TAG!" == "" ( ) else ( set "libbitcoin-system_PARAMS=!libbitcoin-system_PARAMS! /p:Option-aes=true" ) - ) else if "%~1" == "--with-cuda" ( - if "!libbitcoin-system_PARAMS!" == "" ( - set "libbitcoin-system_PARAMS=/p:Option-cuda=true" - ) else ( - set "libbitcoin-system_PARAMS=!libbitcoin-system_PARAMS! /p:Option-cuda=true" - ) - ) else if "%~1" == "--without-cuda" ( - if "!libbitcoin-system_PARAMS!" == "" ( - set "libbitcoin-system_PARAMS=/p:Option-cuda=false" - ) else ( - set "libbitcoin-system_PARAMS=!libbitcoin-system_PARAMS! /p:Option-cuda=false" - ) ) else if "%~1" == "--build-config" ( set "BUILD_CONFIG=%~2" shift @@ -606,7 +593,6 @@ if "!libbitcoin_node_TAG!" == "" ( call :msg "--enable-sha2 Check for ARM SHA1/SHA256 Extensions." call :msg "--enable-sha3 Check for ARM SHA3 Extensions for SHA512." call :msg "--enable-aes Check for ARM AES and PMULL Extensions." - call :msg "--[with/without]-cuda Use cuda (gpu) batch signature verification (inert on macOS)." call :msg "--build-config config Build configuration." call :msg "--build-platform platform Build platform." call :msg "--build-version version Build MSVC version." diff --git a/builds/msvc/vs2026/libbitcoin-network.import.props b/builds/msvc/vs2026/libbitcoin-network.import.props index f95585518..baeb82da3 100644 --- a/builds/msvc/vs2026/libbitcoin-network.import.props +++ b/builds/msvc/vs2026/libbitcoin-network.import.props @@ -11,6 +11,18 @@ + + + + false + + + + + + + + @@ -18,6 +30,7 @@ $(ProjectDir)..\..\..\..\..\libbitcoin-network\include\;%(AdditionalIncludeDirectories) $(ProjectDir)..\..\..\..\..\libbitcoin-network\build\include\;%(AdditionalIncludeDirectories) BCT_STATIC;%(PreprocessorDefinitions) + WITH_LOGV;%(PreprocessorDefinitions) libbitcoin-network.lib;%(AdditionalDependencies) diff --git a/builds/msvc/vs2026/libbitcoin-network.import.xml b/builds/msvc/vs2026/libbitcoin-network.import.xml index 7bcfea233..73e57e10b 100644 --- a/builds/msvc/vs2026/libbitcoin-network.import.xml +++ b/builds/msvc/vs2026/libbitcoin-network.import.xml @@ -14,4 +14,16 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2026/libbitcoin-node-test/libbitcoin-node-test.props b/builds/msvc/vs2026/libbitcoin-node-test/libbitcoin-node-test.props index 250099639..c387a47f9 100644 --- a/builds/msvc/vs2026/libbitcoin-node-test/libbitcoin-node-test.props +++ b/builds/msvc/vs2026/libbitcoin-node-test/libbitcoin-node-test.props @@ -32,21 +32,18 @@ - dynamic dynamic dynamic dynamic dynamic - ltcg ltcg ltcg ltcg ltcg - static static static static @@ -56,7 +53,6 @@ - diff --git a/builds/msvc/vs2026/libbitcoin-node-test/libbitcoin-node-test.vcxproj b/builds/msvc/vs2026/libbitcoin-node-test/libbitcoin-node-test.vcxproj index e0c368564..d1a9d2d15 100644 --- a/builds/msvc/vs2026/libbitcoin-node-test/libbitcoin-node-test.vcxproj +++ b/builds/msvc/vs2026/libbitcoin-node-test/libbitcoin-node-test.vcxproj @@ -131,13 +131,11 @@ - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The Missing file is {0}. - diff --git a/builds/msvc/vs2026/libbitcoin-node-test/packages.config b/builds/msvc/vs2026/libbitcoin-node-test/packages.config index a2cb1d1a4..9bca6543a 100644 --- a/builds/msvc/vs2026/libbitcoin-node-test/packages.config +++ b/builds/msvc/vs2026/libbitcoin-node-test/packages.config @@ -6,5 +6,4 @@ | --> - diff --git a/builds/msvc/vs2026/libbitcoin-node/libbitcoin-node.props b/builds/msvc/vs2026/libbitcoin-node/libbitcoin-node.props index f31ce4cc6..19c89492a 100644 --- a/builds/msvc/vs2026/libbitcoin-node/libbitcoin-node.props +++ b/builds/msvc/vs2026/libbitcoin-node/libbitcoin-node.props @@ -38,19 +38,16 @@ - dynamic dynamic dynamic dynamic - ltcg ltcg ltcg ltcg - static static static static @@ -59,7 +56,6 @@ - diff --git a/builds/msvc/vs2026/libbitcoin-node/libbitcoin-node.vcxproj b/builds/msvc/vs2026/libbitcoin-node/libbitcoin-node.vcxproj index 9191339d6..cf70bde96 100644 --- a/builds/msvc/vs2026/libbitcoin-node/libbitcoin-node.vcxproj +++ b/builds/msvc/vs2026/libbitcoin-node/libbitcoin-node.vcxproj @@ -235,13 +235,11 @@ - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The Missing file is {0}. - diff --git a/builds/msvc/vs2026/libbitcoin-node/packages.config b/builds/msvc/vs2026/libbitcoin-node/packages.config index a2cb1d1a4..9bca6543a 100644 --- a/builds/msvc/vs2026/libbitcoin-node/packages.config +++ b/builds/msvc/vs2026/libbitcoin-node/packages.config @@ -6,5 +6,4 @@ | --> - diff --git a/builds/msvc/vs2026/libbitcoin-system.import.props b/builds/msvc/vs2026/libbitcoin-system.import.props index ff532d931..612b7c138 100644 --- a/builds/msvc/vs2026/libbitcoin-system.import.props +++ b/builds/msvc/vs2026/libbitcoin-system.import.props @@ -26,7 +26,7 @@ false false false - false + true diff --git a/src/chasers/chaser_confirm.cpp b/src/chasers/chaser_confirm.cpp index 4b67c387e..4454f4a40 100644 --- a/src/chasers/chaser_confirm.cpp +++ b/src/chasers/chaser_confirm.cpp @@ -353,7 +353,7 @@ bool chaser_confirm::complete_block(const code& ec, const header_link& link, } bool chaser_confirm::notify_block(const code& ec, size_t height, - const header_link& link, bool bypass) NOEXCEPT + const header_link& link, bool LOG_ONLY(bypass)) NOEXCEPT { if (ec) { diff --git a/src/chasers/chaser_validate.cpp b/src/chasers/chaser_validate.cpp index 539c57230..eb72532f7 100644 --- a/src/chasers/chaser_validate.cpp +++ b/src/chasers/chaser_validate.cpp @@ -349,7 +349,7 @@ void chaser_validate::complete_block(const code& ec, const header_link& link, } void chaser_validate::notify_block(const code& ec, size_t height, - const header_link& link, bool bypass, bool startup) NOEXCEPT + const header_link& link, bool LOG_ONLY(bypass), bool startup) NOEXCEPT { // Not stranded when complete_block is called from validate_block. diff --git a/src/protocols/protocol_block_in_31800.cpp b/src/protocols/protocol_block_in_31800.cpp index 440ef20d5..4946d0601 100644 --- a/src/protocols/protocol_block_in_31800.cpp +++ b/src/protocols/protocol_block_in_31800.cpp @@ -393,7 +393,7 @@ void protocol_block_in_31800::restore(const map_ptr& map) NOEXCEPT } void protocol_block_in_31800::handle_put_hashes(const code& ec, - size_t count) NOEXCEPT + size_t LOG_ONLY(count)) NOEXCEPT { LOGV("Put (" << count << ") work for [" << opposite() << "].");