v20240401

dynexcoin · Apr 1, 2024 · 8e9f077 · 8e9f077
1 parent 58f3de4
commit 8e9f077
Show file tree

Hide file tree

Showing 810 changed files with 2,387 additions and 2,039 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,55 +1,52 @@
 cmake_minimum_required(VERSION 3.5)
 
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
-set(CMAKE_CONFIGURATION_TYPES Debug RelWithDebInfo Release CACHE TYPE INTERNAL)
+set(CMAKE_CONFIGURATION_TYPES "Release;Debug;RelWithDebInfo" CACHE TYPE INTERNAL FORCE)
 set(CMAKE_SKIP_INSTALL_RULES ON)
 set(CMAKE_SKIP_PACKAGE_ALL_DEPENDENCY ON)
 set(CMAKE_SUPPRESS_REGENERATION ON)
+include(CheckCXXCompilerFlag)
+
 enable_testing()
 configure_file(${CMAKE_SOURCE_DIR}/CTestCustom.cmake ${CMAKE_BINARY_DIR})
 
 project(Dynex)
 
 include_directories(include src external "${CMAKE_BINARY_DIR}/version")
-if(APPLE)
-  include_directories(SYSTEM /usr/include/malloc)
-  enable_language(ASM)
-endif()
 
-if(WIN32)
-  option(CMAKE_USE_WIN32_THREADS_INIT "using WIN32 threads" ON)
+if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "aarch64" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "arm64")
+  set(ARM64 ON)
 else()
-  set(CMAKE_THREAD_LIBS_INIT "-lpthread")
-  set(CMAKE_HAVE_THREADS_LIBRARY 1)
-  set(CMAKE_USE_WIN32_THREADS_INIT 0)
-  set(CMAKE_USE_PTHREADS_INIT 1)
-  set(THREADS_PREFER_PTHREAD_FLAG ON)
+  set(ARM64 OFF)
 endif()
 
+#if(WIN32)
+#  option(CMAKE_USE_WIN32_THREADS_INIT "using WIN32 threads" ON)
+#else(UNIX)
+#  set(CMAKE_THREAD_LIBS_INIT "-lpthread")
+#  set(CMAKE_HAVE_THREADS_LIBRARY 1)
+#  set(CMAKE_USE_WIN32_THREADS_INIT 0)
+#  set(CMAKE_USE_PTHREADS_INIT 1)
+#  set(THREADS_PREFER_PTHREAD_FLAG ON)
+#endif()
+
 if(MSVC)
   include_directories(src/Platform/Windows)
+  set(STATIC_DEFAULT ON)
 elseif(APPLE)
   include_directories(src/Platform/OSX)
   include_directories(src/Platform/Posix)
+  set(STATIC_DEFAULT ON)
 else()
   include_directories(src/Platform/Linux)
   include_directories(src/Platform/Posix)
+  set(STATIC_DEFAULT OFF)
 endif()
 
+option(STATIC "Link libraries statically" ${STATIC_DEFAULT})
 
 if(MSVC)
-include_directories(src/Platform/Windows)
-elseif(APPLE)
-include_directories(src/Platform/OSX)
-include_directories(src/Platform/Posix)
-else()
-include_directories(src/Platform/Linux)
-include_directories(src/Platform/Posix)
-endif()
-
-set(STATIC ${MSVC} CACHE BOOL "Link libraries statically")
-
-if(MSVC)
+  add_compile_options("/std:c++17")
   add_definitions("/bigobj /MP /W3 /GS- /D_CRT_SECURE_NO_WARNINGS /wd4996 /wd4345 /D_WIN32_WINNT=0x0600 /DWIN32_LEAN_AND_MEAN /DGTEST_HAS_TR1_TUPLE=0 /D_VARIADIC_MAX=8 /D__SSE4_1__ /d2archSSE42")
   set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /STACK:10485760")
   if(STATIC)
@@ -65,15 +62,13 @@ else()
     add_definitions("-D_DEFAULT_SOURCE -D_GNU_SOURCE")
   endif()
   set(ARCH native CACHE STRING "CPU to build for: -march value or default")
-  if("${ARCH}" STREQUAL "default")
+  # Apple clang is slow with -march=native
+  if(("${ARCH}" STREQUAL "default") OR (APPLE AND CMAKE_C_COMPILER_ID MATCHES "Clang"))
     set(ARCH_FLAG "")
   else()
     set(ARCH_FLAG "-march=${ARCH}")
   endif()
-  #set(WARNINGS "-Wall -Wextra -Wpointer-arith -Wundef -Wvla -Wwrite-strings -Werror -Wno-error=extra -Wno-error=unused-function -Wno-error=deprecated-declarations -Wno-error=sign-compare -Wno-error=strict-aliasing -Wno-error=type-limits -Wno-unused-parameter -Wno-error=unused-variable -Wno-error=undef -Wno-error=uninitialized -Wno-error=unused-result")
-
-  set(WARNINGS "-Wall -Wextra -Wpointer-arith -Wundef -Wvla -Wwrite-strings -Wno-error=extra -Wno-error=unused-function -Wno-error=deprecated-declarations -Wno-error=sign-compare -Wno-error=strict-aliasing -Wno-error=type-limits -Wno-error=undef -Wno-unused-parameter -Wno-undef -Wno-unused-const-variable -Wno-unused-variable -Wno-unused-but-set-variable -Wno-write-strings")
-
+  set(WARNINGS "-Wall -Wextra -Wpointer-arith -Wundef -Wvla -Wwrite-strings -Wno-error=extra -Wno-error=deprecated-declarations -Wno-error=sign-compare -Wno-error=strict-aliasing -Wno-error=type-limits -Wno-error=undef -Wno-unused-parameter -Wno-undef -Wno-unused-const-variable -Wno-unused-variable -Wno-unused-but-set-variable -Wno-write-strings -Wno-unused-function ")
   if(CMAKE_C_COMPILER_ID MATCHES "Clang")
     set(WARNINGS "${WARNINGS} -Wno-error=mismatched-tags -Wno-error=null-conversion -Wno-overloaded-shift-op-parentheses -Wno-error=shift-count-overflow -Wno-error=tautological-constant-out-of-range-compare -Wno-error=unneeded-internal-declaration -Wno-unused-private-field")
   else()
@@ -90,21 +85,37 @@ else()
     set(WARNINGS "${WARNINGS} -Wno-error=odr")
   endif()
   set(C_WARNINGS "-Waggregate-return -Wnested-externs -Wold-style-definition -Wstrict-prototypes")
-  set(CXX_WARNINGS "-Wno-reorder -Wno-missing-field-initializers -Wno-class-memaccess")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 ${MINGW_FLAG} ${WARNINGS} ${C_WARNINGS} ${ARCH_FLAG} -maes")
-  if(NOT APPLE)
-    #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
+  set(CXX_WARNINGS "-Wno-reorder -Wno-missing-field-initializers")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c17 ${MINGW_FLAG} ${WARNINGS} ${C_WARNINGS} ${ARCH_FLAG}")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 ${MINGW_FLAG} ${WARNINGS} ${CXX_WARNINGS} ${ARCH_FLAG}")
+
+  #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DGTEST_HAS_TR1_TUPLE=0")
+
+  CHECK_CXX_COMPILER_FLAG("-Werror -Wclass-memaccess" CLASS_MEMACCESS)
+  if(CLASS_MEMACCESS)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-class-memaccess")
+  endif()
+
+  CHECK_CXX_COMPILER_FLAG("-Werror -maes" MAES)
+  if (MAES)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -maes")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -maes")
   endif()
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${MINGW_FLAG} ${WARNINGS} ${CXX_WARNINGS} ${ARCH_FLAG} -maes")
-  if(APPLE)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DGTEST_HAS_TR1_TUPLE=0")
+
+  CHECK_CXX_COMPILER_FLAG("-Werror -pthread" PTHREAD)
+  if (PTHREAD)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
   endif()
+
   if(CMAKE_C_COMPILER_ID STREQUAL "GNU" AND NOT (CMAKE_C_COMPILER_VERSION VERSION_LESS 4.8))
     set(DEBUG_FLAGS "-g3 -Og")
   else()
     set(DEBUG_FLAGS "-g3 -O0")
   endif()
-  set(RELEASE_FLAGS "-Ofast -DNDEBUG -Wno-unused-variable")
+
+  set(RELEASE_FLAGS "-Ofast -DNDEBUG -Wno-unused-variable -fno-strict-aliasing")
+
   if(NOT APPLE)
     # There is a clang bug that does not allow to compile code that uses AES-NI intrinsics if -flto is enabled
     if (CMAKE_C_COMPILER_ID STREQUAL "GNU" AND CMAKE_SYSTEM_NAME STREQUAL "Linux" 
@@ -127,32 +138,25 @@ else()
   endif()
 endif()
 
-# CURL is required:
+# CURL is requred:
 FIND_PACKAGE(CURL REQUIRED)
 IF(CURL_FOUND)
   INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIRS})
-  #if(APPLE)
-  #  INCLUDE_DIRECTORIES("/usr/local/homebrew/cellar/curl/7.85.0/include")
-  #  SET(CURL_LIBRARIES "-L /usr/local/homebrew/cellar/curl/7.85.0/lib -L /usr/local/homebrew/cellar/curl/7.85.0/include" )
-  #  MESSAGE(INFO " Apple M1 curl path set to x86_64 versions /usr/local/homebrew/cellar/curl/7.85.0/")
-  #endif()
 ELSE(CURL_FOUND)
   MESSAGE(FATAL_ERROR "Could not find the CURL library and development files.")
 ENDIF(CURL_FOUND)
 
 # Boost is required:
 if(STATIC)
+  MESSAGE(STATUS "LIB BOOST: Static linking")
   set(Boost_USE_STATIC_LIBS ON)
-  set(Boost_USE_STATIC_RUNTIME ON)
 endif()
-find_package(Boost 1.55 REQUIRED COMPONENTS system filesystem thread date_time chrono regex serialization program_options)
+find_package(Boost 1.55 REQUIRED COMPONENTS filesystem program_options)
 include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
 if(MINGW)
   set(Boost_LIBRARIES "${Boost_LIBRARIES};ws2_32;mswsock")
 elseif(APPLE)
   set(Boost_LIBRARIES "${Boost_LIBRARIES}")
-  #set(Boost_LIBRARIES "-lboost_program_options -lboost_filesystem -lboost_serialization -lboost_chrono -L ${BOOST_ROOT}/include -L ${BOOST_ROOT}/lib") #dm ${"Boost_LIBRARIES}")
-
 elseif(NOT MSVC)
   set(Boost_LIBRARIES "${Boost_LIBRARIES};rt")
 endif()
@@ -183,6 +187,17 @@ else()
   endif()
 endif()
 
+file(STRINGS "src/version.h.in" CNVER REGEX "#define CN_VER_.*")
+foreach(VAL CN_VER_MAJOR CN_VER_MINOR CN_VER_REV CN_VER_WAL CN_VER_BUILD)
+  if(CNVER MATCHES "#define ${VAL} ([0-9]+)")
+    #message(STATUS "${VAL}=${CMAKE_MATCH_1}")
+    set(${VAL} "${CMAKE_MATCH_1}")
+  endif()
+endforeach()
+MESSAGE(STATUS "VERSION: ${CN_VER_MAJOR}.${CN_VER_MINOR}.${CN_VER_REV}(.${CN_VER_WAL})-${CN_VER_BUILD}")
+
 add_subdirectory(external)
 add_subdirectory(src)
 add_subdirectory(tests)
+
+MESSAGE(STATUS "BUILD: ${CMAKE_BUILD_TYPE}")
diff --git a/CTestCustom.cmake b/CTestCustom.cmake
diff --git a/LICENSE.md b/LICENSE.md
diff --git a/Makefile b/Makefile
diff --git a/README.md b/README.md
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
diff --git a/external/README.md b/external/README.md
diff --git a/external/google/README.md b/external/google/README.md
diff --git a/external/google/dense_hash_map b/external/google/dense_hash_map
diff --git a/external/google/dense_hash_set b/external/google/dense_hash_set
diff --git a/external/google/sparse_hash_map b/external/google/sparse_hash_map
diff --git a/external/google/sparse_hash_set b/external/google/sparse_hash_set
diff --git a/external/google/sparsehash/README.md b/external/google/sparsehash/README.md
diff --git a/external/google/sparsehash/densehashtable.h b/external/google/sparsehash/densehashtable.h
diff --git a/external/google/sparsehash/hashtable-common.h b/external/google/sparsehash/hashtable-common.h
diff --git a/external/google/sparsehash/libc_allocator_with_realloc.h b/external/google/sparsehash/libc_allocator_with_realloc.h
diff --git a/external/google/sparsehash/os_config.h b/external/google/sparsehash/os_config.h
diff --git a/external/google/sparsehash/sparseconfig.h b/external/google/sparsehash/sparseconfig.h
diff --git a/external/google/sparsehash/sparseconfig_win.h b/external/google/sparsehash/sparseconfig_win.h
diff --git a/external/google/sparsehash/sparsehashtable.h b/external/google/sparsehash/sparsehashtable.h
diff --git a/external/google/sparsetable b/external/google/sparsetable
diff --git a/external/google/type_traits.h b/external/google/type_traits.h
diff --git a/external/gtest/CMakeLists.txt b/external/gtest/CMakeLists.txt
diff --git a/external/gtest/README.md b/external/gtest/README.md
diff --git a/external/linenoise/README.md b/external/linenoise/README.md
diff --git a/external/linenoise/linenoise.hpp b/external/linenoise/linenoise.hpp
diff --git a/external/miniupnpc/CMakeLists.txt b/external/miniupnpc/CMakeLists.txt
diff --git a/external/miniupnpc/Changelog.txt b/external/miniupnpc/Changelog.txt
diff --git a/external/miniupnpc/LICENSE b/external/miniupnpc/LICENSE
diff --git a/external/miniupnpc/MANIFEST.in b/external/miniupnpc/MANIFEST.in
diff --git a/external/miniupnpc/Makefile b/external/miniupnpc/Makefile
diff --git a/external/miniupnpc/Makefile.mingw b/external/miniupnpc/Makefile.mingw
diff --git a/external/miniupnpc/README b/external/miniupnpc/README
diff --git a/external/miniupnpc/README.md b/external/miniupnpc/README.md
diff --git a/external/miniupnpc/VERSION b/external/miniupnpc/VERSION
diff --git a/external/miniupnpc/addr_is_reserved.c b/external/miniupnpc/addr_is_reserved.c
diff --git a/external/miniupnpc/addr_is_reserved.h b/external/miniupnpc/addr_is_reserved.h
diff --git a/external/miniupnpc/apiversions.txt b/external/miniupnpc/apiversions.txt
diff --git a/external/miniupnpc/codelength.h b/external/miniupnpc/codelength.h
diff --git a/external/miniupnpc/connecthostport.c b/external/miniupnpc/connecthostport.c
diff --git a/external/miniupnpc/connecthostport.h b/external/miniupnpc/connecthostport.h
diff --git a/external/miniupnpc/external-ip.sh b/external/miniupnpc/external-ip.sh
diff --git a/external/miniupnpc/igd_desc_parse.c b/external/miniupnpc/igd_desc_parse.c
diff --git a/external/miniupnpc/igd_desc_parse.h b/external/miniupnpc/igd_desc_parse.h
diff --git a/external/miniupnpc/java/JavaBridgeTest.java b/external/miniupnpc/java/JavaBridgeTest.java
diff --git a/external/miniupnpc/java/testjava.bat b/external/miniupnpc/java/testjava.bat
diff --git a/external/miniupnpc/java/testjava.sh b/external/miniupnpc/java/testjava.sh
diff --git a/external/miniupnpc/listdevices.c b/external/miniupnpc/listdevices.c
diff --git a/external/miniupnpc/man3/miniupnpc.3 b/external/miniupnpc/man3/miniupnpc.3
diff --git a/external/miniupnpc/mingw32make.bat b/external/miniupnpc/mingw32make.bat
diff --git a/external/miniupnpc/minihttptestserver.c b/external/miniupnpc/minihttptestserver.c
diff --git a/external/miniupnpc/minisoap.c b/external/miniupnpc/minisoap.c
diff --git a/external/miniupnpc/minisoap.h b/external/miniupnpc/minisoap.h
diff --git a/external/miniupnpc/minissdpc.c b/external/miniupnpc/minissdpc.c
diff --git a/external/miniupnpc/minissdpc.h b/external/miniupnpc/minissdpc.h
diff --git a/external/miniupnpc/miniupnpc-config.cmake b/external/miniupnpc/miniupnpc-config.cmake
diff --git a/external/miniupnpc/miniupnpc.c b/external/miniupnpc/miniupnpc.c
diff --git a/external/miniupnpc/miniupnpc.def b/external/miniupnpc/miniupnpc.def
diff --git a/external/miniupnpc/miniupnpc.h b/external/miniupnpc/miniupnpc.h
diff --git a/external/miniupnpc/miniupnpc.rc b/external/miniupnpc/miniupnpc.rc
diff --git a/external/miniupnpc/miniupnpc_declspec.h b/external/miniupnpc/miniupnpc_declspec.h
diff --git a/external/miniupnpc/miniupnpc_socketdef.h b/external/miniupnpc/miniupnpc_socketdef.h
diff --git a/external/miniupnpc/miniupnpcmodule.c b/external/miniupnpc/miniupnpcmodule.c
diff --git a/external/miniupnpc/miniupnpcstrings.h.cmake b/external/miniupnpc/miniupnpcstrings.h.cmake
diff --git a/external/miniupnpc/miniupnpcstrings.h.in b/external/miniupnpc/miniupnpcstrings.h.in
diff --git a/external/miniupnpc/miniupnpctypes.h b/external/miniupnpc/miniupnpctypes.h
diff --git a/external/miniupnpc/miniwget.c b/external/miniupnpc/miniwget.c
diff --git a/external/miniupnpc/miniwget.h b/external/miniupnpc/miniwget.h
diff --git a/external/miniupnpc/miniwget_private.h b/external/miniupnpc/miniwget_private.h
diff --git a/external/miniupnpc/minixml.c b/external/miniupnpc/minixml.c
diff --git a/external/miniupnpc/minixml.h b/external/miniupnpc/minixml.h
diff --git a/external/miniupnpc/minixmlvalid.c b/external/miniupnpc/minixmlvalid.c
diff --git a/external/miniupnpc/msvc/genminiupnpcstrings.vbs b/external/miniupnpc/msvc/genminiupnpcstrings.vbs
diff --git a/external/miniupnpc/msvc/miniupnpc.sln b/external/miniupnpc/msvc/miniupnpc.sln
diff --git a/external/miniupnpc/msvc/miniupnpc.vcproj b/external/miniupnpc/msvc/miniupnpc.vcproj
diff --git a/external/miniupnpc/msvc/miniupnpc.vcxproj b/external/miniupnpc/msvc/miniupnpc.vcxproj
diff --git a/external/miniupnpc/msvc/miniupnpc.vcxproj.filters b/external/miniupnpc/msvc/miniupnpc.vcxproj.filters
diff --git a/external/miniupnpc/msvc/miniupnpc_vs2010.sln b/external/miniupnpc/msvc/miniupnpc_vs2010.sln
diff --git a/external/miniupnpc/msvc/miniupnpc_vs2010.vcxproj b/external/miniupnpc/msvc/miniupnpc_vs2010.vcxproj
diff --git a/external/miniupnpc/msvc/miniupnpc_vs2010.vcxproj.filters b/external/miniupnpc/msvc/miniupnpc_vs2010.vcxproj.filters
diff --git a/external/miniupnpc/msvc/miniupnpc_vs2015.sln b/external/miniupnpc/msvc/miniupnpc_vs2015.sln
diff --git a/external/miniupnpc/msvc/upnpc-static.vcproj b/external/miniupnpc/msvc/upnpc-static.vcproj
diff --git a/external/miniupnpc/msvc/upnpc-static.vcxproj b/external/miniupnpc/msvc/upnpc-static.vcxproj
diff --git a/external/miniupnpc/msvc/upnpc-static.vcxproj.filters b/external/miniupnpc/msvc/upnpc-static.vcxproj.filters
diff --git a/external/miniupnpc/msvc/upnpc-static_vs2010.vcxproj b/external/miniupnpc/msvc/upnpc-static_vs2010.vcxproj
diff --git a/external/miniupnpc/portlistingparse.c b/external/miniupnpc/portlistingparse.c
diff --git a/external/miniupnpc/portlistingparse.h b/external/miniupnpc/portlistingparse.h
diff --git a/external/miniupnpc/pymoduletest.py b/external/miniupnpc/pymoduletest.py
diff --git a/external/miniupnpc/receivedata.c b/external/miniupnpc/receivedata.c
diff --git a/external/miniupnpc/receivedata.h b/external/miniupnpc/receivedata.h
diff --git a/external/miniupnpc/setup.py b/external/miniupnpc/setup.py
diff --git a/external/miniupnpc/setupmingw32.py b/external/miniupnpc/setupmingw32.py
diff --git a/external/miniupnpc/testaddr_is_reserved.c b/external/miniupnpc/testaddr_is_reserved.c
diff --git a/external/miniupnpc/testdesc/linksys_WAG200G_desc.values b/external/miniupnpc/testdesc/linksys_WAG200G_desc.values
diff --git a/external/miniupnpc/testdesc/linksys_WAG200G_desc.xml b/external/miniupnpc/testdesc/linksys_WAG200G_desc.xml
diff --git a/external/miniupnpc/testdesc/new_LiveBox_desc.values b/external/miniupnpc/testdesc/new_LiveBox_desc.values
diff --git a/external/miniupnpc/testdesc/new_LiveBox_desc.xml b/external/miniupnpc/testdesc/new_LiveBox_desc.xml
diff --git a/external/miniupnpc/testigddescparse.c b/external/miniupnpc/testigddescparse.c
diff --git a/external/miniupnpc/testminiwget.c b/external/miniupnpc/testminiwget.c
diff --git a/external/miniupnpc/testminiwget.sh b/external/miniupnpc/testminiwget.sh
diff --git a/external/miniupnpc/testminixml.c b/external/miniupnpc/testminixml.c
diff --git a/external/miniupnpc/testportlistingparse.c b/external/miniupnpc/testportlistingparse.c
diff --git a/external/miniupnpc/testreplyparse/DeletePortMapping.namevalue b/external/miniupnpc/testreplyparse/DeletePortMapping.namevalue
diff --git a/external/miniupnpc/testreplyparse/DeletePortMapping.xml b/external/miniupnpc/testreplyparse/DeletePortMapping.xml
diff --git a/external/miniupnpc/testreplyparse/GetExternalIPAddress.namevalue b/external/miniupnpc/testreplyparse/GetExternalIPAddress.namevalue
diff --git a/external/miniupnpc/testreplyparse/GetExternalIPAddress.xml b/external/miniupnpc/testreplyparse/GetExternalIPAddress.xml
diff --git a/external/miniupnpc/testreplyparse/GetSpecificPortMappingEntryReq.namevalue b/external/miniupnpc/testreplyparse/GetSpecificPortMappingEntryReq.namevalue
diff --git a/external/miniupnpc/testreplyparse/GetSpecificPortMappingEntryReq.xml b/external/miniupnpc/testreplyparse/GetSpecificPortMappingEntryReq.xml
diff --git a/external/miniupnpc/testreplyparse/GetSpecificPortMappingEntryResp.namevalue b/external/miniupnpc/testreplyparse/GetSpecificPortMappingEntryResp.namevalue
diff --git a/external/miniupnpc/testreplyparse/GetSpecificPortMappingEntryResp.xml b/external/miniupnpc/testreplyparse/GetSpecificPortMappingEntryResp.xml
diff --git a/external/miniupnpc/testreplyparse/SetDefaultConnectionService.namevalue b/external/miniupnpc/testreplyparse/SetDefaultConnectionService.namevalue
diff --git a/external/miniupnpc/testreplyparse/SetDefaultConnectionService.xml b/external/miniupnpc/testreplyparse/SetDefaultConnectionService.xml
diff --git a/external/miniupnpc/testreplyparse/readme.txt b/external/miniupnpc/testreplyparse/readme.txt
diff --git a/external/miniupnpc/testupnpigd.py b/external/miniupnpc/testupnpigd.py
diff --git a/external/miniupnpc/testupnpreplyparse.c b/external/miniupnpc/testupnpreplyparse.c
diff --git a/external/miniupnpc/testupnpreplyparse.sh b/external/miniupnpc/testupnpreplyparse.sh
diff --git a/external/miniupnpc/updateminiupnpcstrings.sh b/external/miniupnpc/updateminiupnpcstrings.sh
diff --git a/external/miniupnpc/upnpc.c b/external/miniupnpc/upnpc.c
diff --git a/external/miniupnpc/upnpcommands.c b/external/miniupnpc/upnpcommands.c
diff --git a/external/miniupnpc/upnpcommands.h b/external/miniupnpc/upnpcommands.h
diff --git a/external/miniupnpc/upnpdev.c b/external/miniupnpc/upnpdev.c
diff --git a/external/miniupnpc/upnpdev.h b/external/miniupnpc/upnpdev.h
diff --git a/external/miniupnpc/upnperrors.c b/external/miniupnpc/upnperrors.c
diff --git a/external/miniupnpc/upnperrors.h b/external/miniupnpc/upnperrors.h
diff --git a/external/miniupnpc/upnpreplyparse.c b/external/miniupnpc/upnpreplyparse.c
diff --git a/external/miniupnpc/upnpreplyparse.h b/external/miniupnpc/upnpreplyparse.h
diff --git a/external/miniupnpc/win32_snprintf.h b/external/miniupnpc/win32_snprintf.h
diff --git a/external/miniupnpc/wingenminiupnpcstrings.c b/external/miniupnpc/wingenminiupnpcstrings.c
diff --git a/include/BlockchainExplorerData.h b/include/BlockchainExplorerData.h
diff --git a/include/BlockchainExplorerData2.h b/include/BlockchainExplorerData2.h
diff --git a/include/CryptoTypes.h b/include/CryptoTypes.h
@@ -41,6 +41,10 @@
 
 namespace Crypto {
 
+struct Uuid {
+  uint8_t data[16];
+};
+
 struct Hash {
   uint8_t data[32];
 };

diff --git a/include/DynexCN.h b/include/DynexCN.h
diff --git a/include/IBlockchainExplorer.h b/include/IBlockchainExplorer.h
diff --git a/include/INode.h b/include/INode.h
diff --git a/include/IObservable.h b/include/IObservable.h
diff --git a/include/IStreamSerializable.h b/include/IStreamSerializable.h
diff --git a/include/ITransaction.h b/include/ITransaction.h
diff --git a/include/ITransfersContainer.h b/include/ITransfersContainer.h
diff --git a/include/ITransfersSynchronizer.h b/include/ITransfersSynchronizer.h
diff --git a/include/IWallet.h b/include/IWallet.h
diff --git a/include/IWalletLegacy.h b/include/IWalletLegacy.h
diff --git a/include/android.h b/include/android.h
diff --git a/src/BlockchainExplorer/BlockchainExplorer.cpp b/src/BlockchainExplorer/BlockchainExplorer.cpp
diff --git a/src/BlockchainExplorer/BlockchainExplorer.h b/src/BlockchainExplorer/BlockchainExplorer.h
diff --git a/src/BlockchainExplorer/BlockchainExplorerDataBuilder.cpp b/src/BlockchainExplorer/BlockchainExplorerDataBuilder.cpp
@@ -210,7 +210,8 @@ bool BlockchainExplorerDataBuilder::fillBlockDetails(const Block &block, BlockDe
   }
 
   if (!core.getGeneratedTransactionsNumber(blockDetails.height, blockDetails.alreadyGeneratedTransactions)) {
-    return false;
+    //return false;
+    blockDetails.alreadyGeneratedTransactions = 0;
   }
 
   uint64_t prevBlockGeneratedCoins = 0;

diff --git a/src/BlockchainExplorer/BlockchainExplorerDataBuilder.h b/src/BlockchainExplorer/BlockchainExplorerDataBuilder.h
diff --git a/src/BlockchainExplorer/BlockchainExplorerErrors.cpp b/src/BlockchainExplorer/BlockchainExplorerErrors.cpp
diff --git a/src/BlockchainExplorer/BlockchainExplorerErrors.h b/src/BlockchainExplorer/BlockchainExplorerErrors.h
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -86,4 +86,4 @@ set_property(TARGET GreenWallet PROPERTY OUTPUT_NAME "greenwallet")
 
 if (DEFINED GUI)
   add_subdirectory(WalletGui)
-endif()
+endif()
diff --git a/src/CheckpointsData.h b/src/CheckpointsData.h
@@ -76,7 +76,11 @@ const std::initializer_list<CheckpointData> CHECKPOINTS = {
   {322609, "0c94b77d4ba377ea42108a24345338a7dbe2217a6aa6774c6d0b6da9f2c14882"},
   {324706, "8b9099e50ddb3c111c4919223f071db4c888ee9a22b8893951ebb4295f864498"},
   {329541, "f493e1ca40fe4e3a45143e02b5e061761149f02f2dfaeccfe06416c6d4c1e3da"},
-  {333158, "780bf986a1294a9227e9b9624a9c18a87cb282c494a58d400e0cf08422a53902"}
+  {333158, "780bf986a1294a9227e9b9624a9c18a87cb282c494a58d400e0cf08422a53902"},
+  {336000, "ee73127ab5773a465b0e6c544dfb84a764eb795a8e5dccbff8b6c87de10e45a9"},
+  {385300, "3896c73bc8027b30c31302ad6685f3580892d632145c381e79ee07b0ad2e0d7f"},
+  {400000, "48b8c448c11a8ef95fc0accfc967309a1159915d12b03a41aa2ea4b41cc5bb46"},
+  {410000, "e28586d1ce84881e2dd718f5659087d1435a68c400123c8f6cff6a76542ef9be"},
 };
 
 }
diff --git a/src/Common/ArrayRef.h b/src/Common/ArrayRef.h
diff --git a/src/Common/ArrayView.h b/src/Common/ArrayView.h
diff --git a/src/Common/Base58.cpp b/src/Common/Base58.cpp
diff --git a/src/Common/Base58.h b/src/Common/Base58.h
diff --git a/src/Common/Base64.cpp b/src/Common/Base64.cpp
diff --git a/src/Common/Base64.h b/src/Common/Base64.h
diff --git a/src/Common/BlockingQueue.cpp b/src/Common/BlockingQueue.cpp
diff --git a/src/Common/BlockingQueue.h b/src/Common/BlockingQueue.h
diff --git a/src/Common/CommandLine.cpp b/src/Common/CommandLine.cpp
diff --git a/src/Common/CommandLine.h b/src/Common/CommandLine.h
diff --git a/src/Common/ConsoleHandler.cpp b/src/Common/ConsoleHandler.cpp
diff --git a/src/Common/ConsoleHandler.h b/src/Common/ConsoleHandler.h
diff --git a/src/Common/ConsoleTools.cpp b/src/Common/ConsoleTools.cpp
diff --git a/src/Common/ConsoleTools.h b/src/Common/ConsoleTools.h
diff --git a/src/Common/DnsTools.cpp b/src/Common/DnsTools.cpp
@@ -127,7 +127,7 @@ namespace Common {
 
 		map<ns_type, function<void(const ns_rr &rr)>> callbacks;
 
-		callbacks[ns_t_txt] = [&nsMsg, &records](const ns_rr &rr) -> void {
+		callbacks[ns_t_txt] = [&records](const ns_rr &rr) -> void {
 			int txt_len = *(unsigned char *) ns_rr_rdata(rr);
 			char txt[256];
 			memset(txt, 0, 256);

diff --git a/src/Common/DnsTools.h b/src/Common/DnsTools.h
diff --git a/src/Common/FileMappedVector.cpp b/src/Common/FileMappedVector.cpp
diff --git a/src/Common/FileMappedVector.h b/src/Common/FileMappedVector.h
diff --git a/src/Common/FormatTools.cpp b/src/Common/FormatTools.cpp
@@ -178,8 +178,7 @@ std::string formatAmount(const uint64_t amount)
     const uint64_t dollars = amount / divisor;
     const uint64_t cents = amount % divisor;
 
-    return formatDollars(dollars) + "." + formatCents(cents) + " "
-         + "CROAT";
+    return formatDollars(dollars) + "." + formatCents(cents) + " " + DynexCN::CRYPTONOTE_TICKER;
 }
 
 std::string formatAmountBasic(const uint64_t amount)

diff --git a/src/Common/FormatTools.h b/src/Common/FormatTools.h
diff --git a/src/Common/IInputStream.cpp b/src/Common/IInputStream.cpp
diff --git a/src/Common/IInputStream.h b/src/Common/IInputStream.h
diff --git a/src/Common/IOutputStream.cpp b/src/Common/IOutputStream.cpp
diff --git a/src/Common/IOutputStream.h b/src/Common/IOutputStream.h
diff --git a/src/Common/JsonValue.cpp b/src/Common/JsonValue.cpp
diff --git a/src/Common/JsonValue.h b/src/Common/JsonValue.h
diff --git a/src/Common/Lazy.h b/src/Common/Lazy.h
diff --git a/src/Common/Math.cpp b/src/Common/Math.cpp
diff --git a/src/Common/Math.h b/src/Common/Math.h
diff --git a/src/Common/MemoryInputStream.cpp b/src/Common/MemoryInputStream.cpp
diff --git a/src/Common/MemoryInputStream.h b/src/Common/MemoryInputStream.h
diff --git a/src/Common/ObserverManager.h b/src/Common/ObserverManager.h
diff --git a/src/Common/PasswordContainer.cpp b/src/Common/PasswordContainer.cpp
diff --git a/src/Common/PasswordContainer.h b/src/Common/PasswordContainer.h
diff --git a/src/Common/PathTools.cpp b/src/Common/PathTools.cpp
diff --git a/src/Common/PathTools.h b/src/Common/PathTools.h
diff --git a/src/Common/ScopeExit.cpp b/src/Common/ScopeExit.cpp
diff --git a/src/Common/ScopeExit.h b/src/Common/ScopeExit.h
diff --git a/src/Common/ShuffleGenerator.h b/src/Common/ShuffleGenerator.h
diff --git a/src/Common/SignalHandler.cpp b/src/Common/SignalHandler.cpp
diff --git a/src/Common/SignalHandler.h b/src/Common/SignalHandler.h
diff --git a/src/Common/StdInputStream.cpp b/src/Common/StdInputStream.cpp
diff --git a/src/Common/StdInputStream.h b/src/Common/StdInputStream.h
diff --git a/src/Common/StdOutputStream.cpp b/src/Common/StdOutputStream.cpp
diff --git a/src/Common/StdOutputStream.h b/src/Common/StdOutputStream.h
diff --git a/src/Common/StreamTools.cpp b/src/Common/StreamTools.cpp
diff --git a/src/Common/StreamTools.h b/src/Common/StreamTools.h
diff --git a/src/Common/StringBuffer.h b/src/Common/StringBuffer.h
diff --git a/src/Common/StringInputStream.cpp b/src/Common/StringInputStream.cpp
diff --git a/src/Common/StringInputStream.h b/src/Common/StringInputStream.h
diff --git a/src/Common/StringOutputStream.cpp b/src/Common/StringOutputStream.cpp
diff --git a/src/Common/StringOutputStream.h b/src/Common/StringOutputStream.h
diff --git a/src/Common/StringTools.cpp b/src/Common/StringTools.cpp
@@ -328,7 +328,7 @@ std::string ipAddressToString(uint32_t ip) {
   bytes[3] = (ip >> 24) & 0xFF;
 
   char buf[16];
-  sprintf(buf, "%d.%d.%d.%d", bytes[0], bytes[1], bytes[2], bytes[3]);
+  snprintf(buf, sizeof(buf), "%d.%d.%d.%d", bytes[0], bytes[1], bytes[2], bytes[3]);
 
   return std::string(buf);
 }

diff --git a/src/Common/StringTools.h b/src/Common/StringTools.h
diff --git a/src/Common/StringView.cpp b/src/Common/StringView.cpp
diff --git a/src/Common/StringView.h b/src/Common/StringView.h
diff --git a/src/Common/UrlTools.cpp b/src/Common/UrlTools.cpp
@@ -40,7 +40,7 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <string>
-#include <boost/regex.hpp>
+#include <regex>
 #include "DynexCNConfig.h"
 
 
@@ -58,9 +58,9 @@ bool parseUrlAddress(const std::string& url, std::string& host, uint16_t& port,
   port = 0;
   ssl = false;
 
-  boost::regex uri_exp("^(https://|http://|)(([a-z|A-Z|0-9]|[a-z|A-Z|0-9]-[a-z|A-Z|0-9]|[a-z|A-Z|0-9]\\.)+)(:[0-9]{1,5}|)(/([\\w|-]+/)+|/|)$");
-  boost::cmatch reg_res;
-  if (boost::regex_match(url.c_str(), reg_res, uri_exp)) {
+  std::regex uri_exp("^(https://|http://|)(([a-z|A-Z|0-9]|[a-z|A-Z|0-9]-[a-z|A-Z|0-9]|[a-z|A-Z|0-9]\\.)+)(:[0-9]{1,5}|)(/([\\w|-]+/)+|/|)$");
+  std::smatch reg_res;
+  if (std::regex_match(url, reg_res, uri_exp)) {
     if (reg_res.length(4) > 0) {
       int port_src = 0;
       if (sscanf(reg_res.str(4).c_str() + 1, "%d", &port_src) == 1) {

diff --git a/src/Common/UrlTools.h b/src/Common/UrlTools.h
diff --git a/src/Common/Util.cpp b/src/Common/Util.cpp
diff --git a/src/Common/Util.h b/src/Common/Util.h
diff --git a/src/Common/Varint.h b/src/Common/Varint.h
diff --git a/src/Common/VectorOutputStream.cpp b/src/Common/VectorOutputStream.cpp
diff --git a/src/Common/VectorOutputStream.h b/src/Common/VectorOutputStream.h
diff --git a/src/Common/int-util.h b/src/Common/int-util.h
diff --git a/src/Common/pod-class.h b/src/Common/pod-class.h
diff --git a/src/Common/static_assert.h b/src/Common/static_assert.h
diff --git a/src/ConnectivityTool/ConnectivityTool.cpp b/src/ConnectivityTool/ConnectivityTool.cpp
@@ -176,7 +176,6 @@ bool print_COMMAND_REQUEST_STAT_INFO(const COMMAND_REQUEST_STAT_INFO::response &
 
   std::cout << "Tx pool size:        " << si.payload_info.tx_pool_size << ENDL;
   std::cout << "BC height:           " << si.payload_info.blockchain_height << ENDL;
-  std::cout << "Mining speed:          " << si.payload_info.mining_speed << ENDL;
   std::cout << "Alternative blocks:  " << si.payload_info.alternative_blocks << ENDL;
   std::cout << "Top block id:        " << si.payload_info.top_block_id_str << ENDL;
   return true;

diff --git a/src/Daemon/Daemon.cpp b/src/Daemon/Daemon.cpp
@@ -57,7 +57,6 @@
 #include "DynexCNCore/Core.h"
 #include "DynexCNCore/CoreConfig.h"
 #include "DynexCNCore/Currency.h"
-#include "DynexCNCore/MinerConfig.h"
 #include "DynexCNProtocol/DynexCNProtocolHandler.h"
 #include "DynexCNProtocol/IDynexCNProtocolQuery.h"
 #include "P2p/NetNode.h"
@@ -178,7 +177,6 @@ int main(int argc, char* argv[])
     RpcServerConfig::initOptions(desc_cmd_sett);
     CoreConfig::initOptions(desc_cmd_sett);
     NetNodeConfig::initOptions(desc_cmd_sett);
-    MinerConfig::initOptions(desc_cmd_sett);
 
     po::options_description desc_options("Allowed options");
     desc_options.add(desc_cmd_only).add(desc_cmd_sett);
@@ -458,41 +456,33 @@ int main(int argc, char* argv[])
     DynexCN::core ccore(currency, nullptr, logManager, command_line::get_arg(vm, arg_enable_blockchain_indexes));
 
 	bool disable_checkpoints = command_line::get_arg(vm, arg_disable_checkpoints);
-	if (!disable_checkpoints) {
-
-		DynexCN::Checkpoints checkpoints(logManager);
-		for (const auto& cp : DynexCN::CHECKPOINTS) {
-			checkpoints.add_checkpoint(cp.height, cp.blockId);
-		}
-
-#ifndef __ANDROID__
-		checkpoints.load_checkpoints_from_dns();
-#endif
-
-		bool manual_checkpoints = !command_line::get_arg(vm, arg_load_checkpoints).empty();
-
-		if (manual_checkpoints && !testnet_mode) {
-			logger(INFO) << "Loading checkpoints from file...";
-			std::string checkpoints_file = command_line::get_arg(vm, arg_load_checkpoints);
-			bool results = checkpoints.load_checkpoints_from_file(checkpoints_file);
-			if (!results) {
-				throw std::runtime_error("Failed to load checkpoints");
-			}
-		}
+    if (!disable_checkpoints) {
+        DynexCN::Checkpoints checkpoints(logManager);
+        if (!testnet_mode) {
+            for (const auto& cp : DynexCN::CHECKPOINTS) {
+                checkpoints.add_checkpoint(cp.height, cp.blockId);
+            }
+        }
 
-		if (!testnet_mode) {
-			ccore.set_checkpoints(std::move(checkpoints));
-		}
+        checkpoints.load_checkpoints_from_remote(testnet_mode);
 
-	}
+        bool manual_checkpoints = !command_line::get_arg(vm, arg_load_checkpoints).empty();
+        if (manual_checkpoints) {
+            logger(INFO) << "Loading checkpoints from file...";
+            std::string checkpoints_file = command_line::get_arg(vm, arg_load_checkpoints);
+            bool results = checkpoints.load_checkpoints_from_file(checkpoints_file);
+            if (!results) {
+                throw std::runtime_error("Failed to load checkpoints");
+            }
+        }
+        ccore.set_checkpoints(std::move(checkpoints));
+    }
 
     CoreConfig coreConfig;
     coreConfig.init(vm);
     NetNodeConfig netNodeConfig;
     netNodeConfig.init(vm);
     netNodeConfig.setTestnet(testnet_mode);
-    MinerConfig minerConfig;
-    minerConfig.init(vm);
     RpcServerConfig rpcConfig;
     rpcConfig.init(vm);
 
@@ -563,7 +553,7 @@ int main(int argc, char* argv[])
 
     // initialize core here
     logger(INFO) << "Initializing core...";
-    if (!ccore.init(coreConfig, minerConfig, true)) {
+    if (!ccore.init(coreConfig, true)) {
       logger(ERROR, BRIGHT_RED) << "Failed to initialize core";
       return 1;
     }
@@ -575,7 +565,7 @@ int main(int argc, char* argv[])
         uint32_t _index = 0;
         if (!Common::fromString(rollback_str, _index)) {
           std::cout << "wrong block index parameter" << ENDL;
-          return false;
+          return 0;
         }
         logger(INFO, BRIGHT_YELLOW) << "Rollback blockchain to height " << _index;
         ccore.rollbackBlockchain(_index);
-Original file line number
+Diff line change
@@ Expand Up @@
     if (DEFINED GUI)
       add_subdirectory(WalletGui)
-    endif()
+    endif()