diff --git a/CMakeLists.txt b/CMakeLists.txt index 40154c06..0e853567 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,7 +53,7 @@ else() 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 -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-strict-prototypes -Wno-error=unused-variable -Wno-error=undef -Wno-error=uninitialized -Wno-error=unused-result") if(CMAKE_C_COMPILER_ID STREQUAL "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=unused-private-field -Wno-error=unneeded-internal-declaration -Wno-error=unused-function") else() @@ -69,7 +69,7 @@ else() if(CMAKE_C_COMPILER_ID STREQUAL "GNU" AND NOT (CMAKE_C_COMPILER_VERSION VERSION_LESS 5.1)) set(WARNINGS "${WARNINGS} -Wno-error=odr") endif() - set(C_WARNINGS "-Waggregate-return -Wnested-externs -Wold-style-definition -Wstrict-prototypes") + set(C_WARNINGS "-Waggregate-return -Wnested-externs -Wold-style-definition -Wno-strict-prototypes") set(CXX_WARNINGS "-Wno-reorder -Wno-missing-field-initializers") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 ${MINGW_FLAG} ${WARNINGS} ${C_WARNINGS} ${ARCH_FLAG} -maes") if(NOT APPLE) diff --git a/CMakeLists.txt.user b/CMakeLists.txt.user new file mode 100644 index 00000000..33133ab6 --- /dev/null +++ b/CMakeLists.txt.user @@ -0,0 +1,2372 @@ + + + + + + EnvironmentId + {6456bd3e-5e55-47a8-ad6c-ec9a540cb738} + + + ProjectExplorer.Project.ActiveTarget + 1 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + true + false + 0 + true + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + true + + + + ProjectExplorer.Project.Target.0 + + Desktop Qt 5.11.2 clang 64bit + Desktop Qt 5.11.2 clang 64bit + qt.qt5.5112.clang_64_kit + 0 + 0 + 6 + + + Boost_INCLUDE_DIR:PATH=/usr/opt/local/boost/include + Boost_LIBRARY_DIR_DEBUG:PATH=/usr/opt/local/boost/lib + Boost_LIBRARY_DIR_RELEASE:PATH=/usr/opt/local/boost/lib + CMAKE_CXX_COMPILER:STRING=%{Compiler:Executable:Cxx} + CMAKE_C_COMPILER:STRING=%{Compiler:Executable:C} + CMAKE_PREFIX_PATH:STRING=%{Qt:QT_INSTALL_PREFIX} + QT_QMAKE_EXECUTABLE:STRING=%{Qt:qmakeExecutable} + + /Users/marco/Documents/Digitalnote_Default + + + + + all + + true + CMake Build + + CMakeProjectManager.MakeStep + + 1 + Build + + ProjectExplorer.BuildSteps.Build + + + + + + all + + true + CMake Build + + CMakeProjectManager.MakeStep + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Default + Default + CMakeProjectManager.CMakeBuildConfiguration + + + + CMAKE_BUILD_TYPE:STRING=Debug + + /Users/marco/Documents/GitHub/build-digitalnote-Desktop_Qt_5_11_2_clang_64bit-Debug + + + + + all + + true + CMake Build + + CMakeProjectManager.MakeStep + + 1 + Build + + ProjectExplorer.BuildSteps.Build + + + + + + all + + true + CMake Build + + CMakeProjectManager.MakeStep + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Debug + CMakeProjectManager.CMakeBuildConfiguration + + + + CMAKE_BUILD_TYPE:STRING=Release + + /Users/marco/Documents/GitHub/build-digitalnote-Desktop_Qt_5_11_2_clang_64bit-Release + + + + + all + + true + CMake Build + + CMakeProjectManager.MakeStep + + 1 + Build + + ProjectExplorer.BuildSteps.Build + + + + + + all + + true + CMake Build + + CMakeProjectManager.MakeStep + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Release + CMakeProjectManager.CMakeBuildConfiguration + + + + CMAKE_BUILD_TYPE:STRING=RelWithDebInfo + + /Users/marco/Documents/GitHub/build-digitalnote-Desktop_Qt_5_11_2_clang_64bit-Release with Debug Information + + + + + all + + true + CMake Build + + CMakeProjectManager.MakeStep + + 1 + Build + + ProjectExplorer.BuildSteps.Build + + + + + + all + + true + CMake Build + + CMakeProjectManager.MakeStep + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release with Debug Information + Release with Debug Information + CMakeProjectManager.CMakeBuildConfiguration + + + + CMAKE_BUILD_TYPE:STRING=MinSizeRel + + /Users/marco/Documents/GitHub/build-digitalnote-Desktop_Qt_5_11_2_clang_64bit-Minimum Size Release + + + + + all + + true + CMake Build + + CMakeProjectManager.MakeStep + + 1 + Build + + ProjectExplorer.BuildSteps.Build + + + + + + all + + true + CMake Build + + CMakeProjectManager.MakeStep + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Minimum Size Release + Minimum Size Release + CMakeProjectManager.CMakeBuildConfiguration + + 5 + + + 0 + Deploy + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy Configuration + + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + + + 2 + + Daemon + + CMakeProjectManager.CMakeRunConfiguration.Daemon +/Users/marco/Documents/GitHub/digitalnote/src/ + 3768 + false + true + false + false + true + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + + + 2 + + PaymentGateService + + CMakeProjectManager.CMakeRunConfiguration.PaymentGateService +/Users/marco/Documents/GitHub/digitalnote/src/ + 3768 + false + true + false + false + true + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + + + 2 + + PerformanceTests + + CMakeProjectManager.CMakeRunConfiguration.PerformanceTests +/Users/marco/Documents/GitHub/digitalnote/tests/ + 3768 + false + true + false + false + true + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + + + 2 + + SystemTests + + CMakeProjectManager.CMakeRunConfiguration.SystemTests +/Users/marco/Documents/GitHub/digitalnote/tests/ + 3768 + false + true + false + false + true + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + + + 2 + + NodeRpcProxyTests + + CMakeProjectManager.CMakeRunConfiguration.NodeRpcProxyTests +/Users/marco/Documents/GitHub/digitalnote/tests/ + 3768 + false + true + false + false + true + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + + + 2 + + CryptoTests + + CMakeProjectManager.CMakeRunConfiguration.CryptoTests +/Users/marco/Documents/GitHub/digitalnote/tests/ + 3768 + false + true + false + false + true + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + + + 2 + + CoreTests + + CMakeProjectManager.CMakeRunConfiguration.CoreTests +/Users/marco/Documents/GitHub/digitalnote/tests/ + 3768 + false + true + false + false + true + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + + + 2 + + IntegrationTests + + CMakeProjectManager.CMakeRunConfiguration.IntegrationTests +/Users/marco/Documents/GitHub/digitalnote/tests/ + 3768 + false + true + false + false + true + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + + + 2 + + Miner + + CMakeProjectManager.CMakeRunConfiguration.Miner +/Users/marco/Documents/GitHub/digitalnote/src/ + 3768 + false + true + false + false + true + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + + + 2 + + SimpleWallet + + CMakeProjectManager.CMakeRunConfiguration.SimpleWallet +/Users/marco/Documents/GitHub/digitalnote/src/ + 3768 + false + true + false + false + true + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + + + 2 + + ConnectivityTool + + CMakeProjectManager.CMakeRunConfiguration.ConnectivityTool +/Users/marco/Documents/GitHub/digitalnote/src/ + 3768 + false + true + false + false + true + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + + + 2 + + HashTests + + CMakeProjectManager.CMakeRunConfiguration.HashTests +/Users/marco/Documents/GitHub/digitalnote/tests/ + 3768 + false + true + false + false + true + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + + + 2 + + HashTargetTests + + CMakeProjectManager.CMakeRunConfiguration.HashTargetTests +/Users/marco/Documents/GitHub/digitalnote/tests/ + 3768 + false + true + false + false + true + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + + + 2 + + DifficultyTests + + CMakeProjectManager.CMakeRunConfiguration.DifficultyTests +/Users/marco/Documents/GitHub/digitalnote/tests/ + 3768 + false + true + false + false + true + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + + + 2 + + UnitTests + + CMakeProjectManager.CMakeRunConfiguration.UnitTests +/Users/marco/Documents/GitHub/digitalnote/tests/ + 3768 + false + true + false + false + true + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + + + 2 + + TransfersTests + + CMakeProjectManager.CMakeRunConfiguration.TransfersTests +/Users/marco/Documents/GitHub/digitalnote/tests/ + 3768 + false + true + false + false + true + + 16 + + + + ProjectExplorer.Project.Target.1 + + Qt 5.11.2 clang 64bit + Qt 5.11.2 clang 64bit + {67a6f49c-d847-40dd-b865-43dc81007b45} + 0 + 0 + 0 + + + Boost_INCLUDE_DIR:PATH=/usr/local/opt/boost/include + Boost_LIBRARY_DIR_DEBUG:PATH=/usr/local/opt/boost/lib + Boost_LIBRARY_DIR_RELEASE:PATH=/usr/local/opt/boost/lib + CMAKE_CXX_COMPILER:STRING=%{Compiler:Executable:Cxx} + CMAKE_C_COMPILER:STRING=%{Compiler:Executable:C} + CMAKE_PREFIX_PATH:STRING=%{Qt:QT_INSTALL_PREFIX} + QT_QMAKE_EXECUTABLE:STRING=%{Qt:qmakeExecutable} + + /Users/marco/Documents/GitHub/build-digitalnote-1-release + + + + + all + + true + CMake Build + + CMakeProjectManager.MakeStep + + 1 + Build + + ProjectExplorer.BuildSteps.Build + + + + + + clean + + true + CMake Build + + CMakeProjectManager.MakeStep + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Default + Default + CMakeProjectManager.CMakeBuildConfiguration + + + + CMAKE_BUILD_TYPE:STRING=Debug + + /Users/marco/Documents/GitHub/build-digitalnote-Qt_5_11_2_clang_64bit_67a6f4-Debug + + + + + all + + true + CMake Build + + CMakeProjectManager.MakeStep + + 1 + Build + + ProjectExplorer.BuildSteps.Build + + + + + + clean + + true + CMake Build + + CMakeProjectManager.MakeStep + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Debug + CMakeProjectManager.CMakeBuildConfiguration + + + + CMAKE_BUILD_TYPE:STRING=Release + + /Users/marco/Documents/GitHub/build-digitalnote-Qt_5_11_2_clang_64bit_67a6f4-Release + + + + + all + + true + CMake Build + + CMakeProjectManager.MakeStep + + 1 + Build + + ProjectExplorer.BuildSteps.Build + + + + + + clean + + true + CMake Build + + CMakeProjectManager.MakeStep + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Release + CMakeProjectManager.CMakeBuildConfiguration + + + + CMAKE_BUILD_TYPE:STRING=RelWithDebInfo + + /Users/marco/Documents/GitHub/build-digitalnote-Qt_5_11_2_clang_64bit_67a6f4-Release with Debug Information + + + + + all + + true + CMake Build + + CMakeProjectManager.MakeStep + + 1 + Build + + ProjectExplorer.BuildSteps.Build + + + + + + clean + + true + CMake Build + + CMakeProjectManager.MakeStep + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release with Debug Information + Release with Debug Information + CMakeProjectManager.CMakeBuildConfiguration + + + + CMAKE_BUILD_TYPE:STRING=MinSizeRel + + /Users/marco/Documents/GitHub/build-digitalnote-Qt_5_11_2_clang_64bit_67a6f4-Minimum Size Release + + + + + all + + true + CMake Build + + CMakeProjectManager.MakeStep + + 1 + Build + + ProjectExplorer.BuildSteps.Build + + + + + + clean + + true + CMake Build + + CMakeProjectManager.MakeStep + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Minimum Size Release + Minimum Size Release + CMakeProjectManager.CMakeBuildConfiguration + + 5 + + + 0 + Deploy + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy Configuration + + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + + /Users/marco/Documents/GitHub/build-digitalnote-1-release/src + 2 + + Daemon + + CMakeProjectManager.CMakeRunConfiguration.Daemon +/Users/marco/Documents/GitHub/digitalnote/src/ + 3768 + false + true + false + false + true + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + + /Users/marco/Documents/GitHub/build-digitalnote-1-release/src + 2 + + PaymentGateService + + CMakeProjectManager.CMakeRunConfiguration.PaymentGateService +/Users/marco/Documents/GitHub/digitalnote/src/ + 3768 + false + true + false + false + true + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + + /Users/marco/Documents/GitHub/build-digitalnote-1-release/tests + 2 + + PerformanceTests + + CMakeProjectManager.CMakeRunConfiguration.PerformanceTests +/Users/marco/Documents/GitHub/digitalnote/tests/ + 3768 + false + true + false + false + true + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + + /Users/marco/Documents/GitHub/build-digitalnote-1-release/tests + 2 + + SystemTests + + CMakeProjectManager.CMakeRunConfiguration.SystemTests +/Users/marco/Documents/GitHub/digitalnote/tests/ + 3768 + false + true + false + false + true + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + + /Users/marco/Documents/GitHub/build-digitalnote-1-release/tests + 2 + + NodeRpcProxyTests + + CMakeProjectManager.CMakeRunConfiguration.NodeRpcProxyTests +/Users/marco/Documents/GitHub/digitalnote/tests/ + 3768 + false + true + false + false + true + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + + /Users/marco/Documents/GitHub/build-digitalnote-1-release/tests + 2 + + CoreTests + + CMakeProjectManager.CMakeRunConfiguration.CoreTests +/Users/marco/Documents/GitHub/digitalnote/tests/ + 3768 + false + true + false + false + true + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + + /Users/marco/Documents/GitHub/build-digitalnote-1-release/tests + 2 + + IntegrationTests + + CMakeProjectManager.CMakeRunConfiguration.IntegrationTests +/Users/marco/Documents/GitHub/digitalnote/tests/ + 3768 + false + true + false + false + true + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + + /Users/marco/Documents/GitHub/build-digitalnote-1-release/tests + 2 + + CryptoTests + + CMakeProjectManager.CMakeRunConfiguration.CryptoTests +/Users/marco/Documents/GitHub/digitalnote/tests/ + 3768 + false + true + false + false + true + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + + /Users/marco/Documents/GitHub/build-digitalnote-1-release/src + 2 + + Miner + + CMakeProjectManager.CMakeRunConfiguration.Miner +/Users/marco/Documents/GitHub/digitalnote/src/ + 3768 + false + true + false + false + true + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + + /Users/marco/Documents/GitHub/build-digitalnote-1-release/src + 2 + + SimpleWallet + + CMakeProjectManager.CMakeRunConfiguration.SimpleWallet +/Users/marco/Documents/GitHub/digitalnote/src/ + 3768 + false + true + false + false + true + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + + /Users/marco/Documents/GitHub/build-digitalnote-1-release/src + 2 + + ConnectivityTool + + CMakeProjectManager.CMakeRunConfiguration.ConnectivityTool +/Users/marco/Documents/GitHub/digitalnote/src/ + 3768 + false + true + false + false + true + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + + /Users/marco/Documents/GitHub/build-digitalnote-1-release/tests + 2 + + HashTests + + CMakeProjectManager.CMakeRunConfiguration.HashTests +/Users/marco/Documents/GitHub/digitalnote/tests/ + 3768 + false + true + false + false + true + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + + /Users/marco/Documents/GitHub/build-digitalnote-1-release/tests + 2 + + HashTargetTests + + CMakeProjectManager.CMakeRunConfiguration.HashTargetTests +/Users/marco/Documents/GitHub/digitalnote/tests/ + 3768 + false + true + false + false + true + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + + /Users/marco/Documents/GitHub/build-digitalnote-1-release/tests + 2 + + DifficultyTests + + CMakeProjectManager.CMakeRunConfiguration.DifficultyTests +/Users/marco/Documents/GitHub/digitalnote/tests/ + 3768 + false + true + false + false + true + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + + /Users/marco/Documents/GitHub/build-digitalnote-1-release/tests + 2 + + UnitTests + + CMakeProjectManager.CMakeRunConfiguration.UnitTests +/Users/marco/Documents/GitHub/digitalnote/tests/ + 3768 + false + true + false + false + true + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + + /Users/marco/Documents/GitHub/build-digitalnote-1-release/tests + 2 + + TransfersTests + + CMakeProjectManager.CMakeRunConfiguration.TransfersTests +/Users/marco/Documents/GitHub/digitalnote/tests/ + 3768 + false + true + false + false + true + + 16 + + + + ProjectExplorer.Project.TargetCount + 2 + + + ProjectExplorer.Project.Updater.FileVersion + 18 + + + Version + 18 + + diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index a7d18605..4c70383e 100755 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -10,5 +10,5 @@ set_property(TARGET upnpc-static gtest gtest_main PROPERTY FOLDER "external") if(MSVC) set_property(TARGET upnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -wd4244 -wd4267") elseif(NOT MSVC) - set_property(TARGET upnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-undef -Wno-unused-result -Wno-unused-value") + set_property(TARGET upnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-undef -Wno-unused-result -Wno-unused-value -Wno-strict-prototypes") endif() diff --git a/external/google/sparse_hash_set b/external/google/sparse_hash_set index 6be16e9a..b5bf0f3e 100644 --- a/external/google/sparse_hash_set +++ b/external/google/sparse_hash_set @@ -85,7 +85,7 @@ // // See /usr/(local/)?doc/sparsehash-*/sparse_hash_set.html // for information about how to use this class. - +#pragma once #ifndef _SPARSE_HASH_SET_H_ #define _SPARSE_HASH_SET_H_ diff --git a/external/google/sparsehash/sparsehashtable.h b/external/google/sparsehash/sparsehashtable.h index 9f2d1443..cd7f7bdb 100644 --- a/external/google/sparsehash/sparsehashtable.h +++ b/external/google/sparsehash/sparsehashtable.h @@ -92,7 +92,7 @@ // // The value type is required to be copy constructible and default // constructible, but it need not be (and commonly isn't) assignable. - +#pragma once #ifndef _SPARSEHASHTABLE_H_ #define _SPARSEHASHTABLE_H_ diff --git a/src/CryptoNoteConfig.h b/src/CryptoNoteConfig.h index 0a05b533..762277d5 100644 --- a/src/CryptoNoteConfig.h +++ b/src/CryptoNoteConfig.h @@ -45,7 +45,8 @@ const size_t DIFFICULTY_CUT = 30; // timestamp const size_t DIFFICULTY_LAG = 15; // not used in LWMA-2 static_assert(2 * DIFFICULTY_CUT <= DIFFICULTY_WINDOW - 2, "Bad DIFFICULTY_WINDOW or DIFFICULTY_CUT"); -const uint64_t DEPOSIT_MIN_AMOUNT = 150 * COIN; +const uint64_t DEPOSIT_MIN_AMOUNT = 7000000000 * COIN; +// disable staking on old chain const uint32_t DEPOSIT_MIN_TERM = 11000; const uint32_t DEPOSIT_MAX_TERM = 10 * 12 * 11000; const uint64_t DEPOSIT_MIN_TOTAL_RATE_FACTOR = 77000; @@ -114,8 +115,8 @@ const uint8_t BLOCK_MINOR_VERSION_1 = 1; const size_t BLOCKS_IDS_SYNCHRONIZING_DEFAULT_COUNT = 10000; //by default, blocks ids count in synchronizing const size_t BLOCKS_SYNCHRONIZING_DEFAULT_COUNT = 128; //by default, blocks count in blocks downloading const size_t COMMAND_RPC_GET_BLOCKS_FAST_MAX_COUNT = 1000; - -const int P2P_DEFAULT_PORT = 42080; +// change binding port +const int P2P_DEFAULT_PORT = 42090; const int RPC_DEFAULT_PORT = 42081; const size_t P2P_LOCAL_WHITE_PEERLIST_LIMIT = 1000; @@ -133,6 +134,7 @@ const uint64_t P2P_DEFAULT_INVOKE_TIMEOUT = 60 * 2 * 1000; // const size_t P2P_DEFAULT_HANDSHAKE_INVOKE_TIMEOUT = 5000; // 5 seconds const char P2P_STAT_TRUSTED_PUB_KEY[] = "85ae8734f90bc1ee295ceb0ec05a49852d4dbbc9d1c27a619b5f4bdf26a0196e"; +// change binding port const std::initializer_list SEED_NODES = { "199.175.54.187:42080", "seed2.digitalnote.biz:42080", @@ -201,4 +203,5 @@ const std::map Version = { } // CryptoNote +//no dangerous command #define ALLOW_DEBUG_COMMANDS diff --git a/src/CryptoNoteCore/Blockchain.cpp b/src/CryptoNoteCore/Blockchain.cpp index 5f5342a2..d6487fe8 100644 --- a/src/CryptoNoteCore/Blockchain.cpp +++ b/src/CryptoNoteCore/Blockchain.cpp @@ -879,7 +879,7 @@ difficulty_type Blockchain::get_next_difficulty_for_alternative_chain(const std: std::vector timestamps; std::vector commulative_difficulties; uint8_t version = getForkVersion(); - size_t difficultyBlocksCount; + size_t difficultyBlocksCount = 0; auto height = getCurrentBlockchainHeight(); if (version == 0) { @@ -1787,9 +1787,14 @@ bool Blockchain::getBlockCumulativeSize(const Block& block, size_t& cumulativeSi // Precondition: m_blockchain_lock is locked. bool Blockchain::update_next_comulative_size_limit() { size_t blockGrantedFullRewardZone = - get_block_major_version_for_height(getCurrentBlockchainHeight()) < parameters::UPGRADE_HEIGHT_V4 ? - parameters::CRYPTONOTE_BLOCK_GRANTED_FULL_REWARD_ZONE_V1 : - m_currency.blockGrantedFullRewardZone(); + /* get_block_major_version_for_height(getCurrentBlockchainHeight()) < parameters::UPGRADE_HEIGHT_V4 ? + that was the bug limitin Tx size. Compared Block number to zone number. That was always true + Try rewrting to: */ + getCurrentBlockchainHeight() < parameters::UPGRADE_HEIGHT_V4 ? + // that' should work, or I hope so. + + parameters::CRYPTONOTE_BLOCK_GRANTED_FULL_REWARD_ZONE_V1 : + m_currency.blockGrantedFullRewardZone(); std::vector sz; get_last_n_blocks_sizes(sz, m_currency.rewardBlocksWindow()); diff --git a/src/CryptoNoteCore/Core.h b/src/CryptoNoteCore/Core.h index 3f7ebad0..2fd24848 100755 --- a/src/CryptoNoteCore/Core.h +++ b/src/CryptoNoteCore/Core.h @@ -24,6 +24,7 @@ #include "CryptoNoteCore/BlockchainMessages.h" #include +#include namespace CryptoNote { diff --git a/src/P2p/IP2pNodeInternal.cpp.zip b/src/P2p/IP2pNodeInternal.cpp.zip new file mode 100644 index 00000000..f4513821 Binary files /dev/null and b/src/P2p/IP2pNodeInternal.cpp.zip differ diff --git a/src/P2p/LevinProtocol.cpp b/src/P2p/LevinProtocol.cpp index ec94375a..731e87e8 100644 --- a/src/P2p/LevinProtocol.cpp +++ b/src/P2p/LevinProtocol.cpp @@ -9,8 +9,8 @@ using namespace CryptoNote; namespace { - -const uint64_t LEVIN_SIGNATURE = 0x0101010101012101LL; //Bender's nightmare +// change Levini signature to avoid connection on old chain +const uint64_t LEVIN_SIGNATURE = 0x0101010101112101LL; //Bender's nightmare const uint32_t LEVIN_PACKET_REQUEST = 0x00000001; const uint32_t LEVIN_PACKET_RESPONSE = 0x00000002; const uint32_t LEVIN_DEFAULT_MAX_PACKET_SIZE = 100000000; //100MB by default diff --git a/src/P2p/LevinProtocol.h b/src/P2p/LevinProtocol.h index da2e3454..6d0297cb 100755 --- a/src/P2p/LevinProtocol.h +++ b/src/P2p/LevinProtocol.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2016 The Cryptonote developers + // Copyright (c) 2011-2016 The Cryptonote developers // Copyright (c) 2014-2017 XDN-project developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/P2p/NetNode.cpp b/src/P2p/NetNode.cpp index fdd69211..3cf86807 100644 --- a/src/P2p/NetNode.cpp +++ b/src/P2p/NetNode.cpp @@ -727,11 +727,11 @@ namespace CryptoNote handshakeContext.interrupt(); logger(DEBUGGING) << "Handshake with " << na << " timed out, interrupt it"; }); - +/* if (!handshakeContext.get()) { logger(WARNING) << "Failed to HANDSHAKE with peer " << na; return false; - } + } */ } catch (System::InterruptedException&) { logger(DEBUGGING) << "Handshake timed out"; return false; diff --git a/src/P2p/P2pNetworks.h b/src/P2p/P2pNetworks.h index cb13bb1e..575f3fbb 100644 --- a/src/P2p/P2pNetworks.h +++ b/src/P2p/P2pNetworks.h @@ -5,6 +5,9 @@ #pragma once +#include +#include + namespace CryptoNote { const static boost::uuids::uuid CRYPTONOTE_NETWORK = { { 0x4B, 0x4F, 0x32, 0x66, 0x75, 0x20, 0x74, 0x6B, 0x20, 0x69, 0x70, 0x69, 0x75, 0x6D, 0x45, 0x20 } }; diff --git a/src/Rpc/HttpServer.cpp b/src/Rpc/HttpServer.cpp index 3434af5b..f8990d1d 100755 --- a/src/Rpc/HttpServer.cpp +++ b/src/Rpc/HttpServer.cpp @@ -3,6 +3,7 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. + #include "HttpServer.h" #include diff --git a/src/System/InterruptedException.cpp b/src/System/InterruptedException.cpp index 67b50811..a76a97ac 100644 --- a/src/System/InterruptedException.cpp +++ b/src/System/InterruptedException.cpp @@ -5,6 +5,6 @@ #include "InterruptedException.h" -namespace { +namespace System { char suppressMSVCWarningLNK4221; }