diff --git a/CMakeLists.txt b/CMakeLists.txt index d1ea8bea..ecaf33c5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,5 @@ cmake_minimum_required(VERSION 3.16) +message(STATUS "Using CMake version: ${CMAKE_VERSION}") set(DISABLE_TOR TRUE CACHE BOOL "Disable TOR library(and related tor-connect submodule)") diff --git a/Makefile b/Makefile index cc52680a..e0b51891 100644 --- a/Makefile +++ b/Makefile @@ -101,9 +101,13 @@ debug: conan-profile-detect cmake -S . -B build/debug -DCMAKE_TOOLCHAIN_FILE=build/debug/conan_toolchain.cmake -DCMAKE_BUILD_TYPE=Debug -DTESTNET=$(TESTNET) cmake --build build/debug --config=Debug --parallel=$(CPU_CORES) -configure: conan-profile-detect - @echo "Config profile: $(BUILD_TYPE) testnet=$(TESTNET)" + +build-deps: conan-profile-detect + @echo "Build Dependencies: $(BUILD_TYPE) testnet=$(TESTNET)" $(FIX_ENV) CONAN_HOME=$(CONAN_CACHE) conan install . --build=missing -s build_type=$(BUILD_TYPE) + +configure: build-deps + @echo "Running Configure: $(BUILD_TYPE) testnet=$(TESTNET)" cmake -S . -B $(BUILD_FOLDER) -DCMAKE_TOOLCHAIN_FILE=$(BUILD_FOLDER)/generators/conan_toolchain.cmake -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) -DSTATIC=$(STATIC) -DTESTNET=$(TESTNET) -DBUILD_VERSION=$(BUILD_VERSION) diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl index 32e3dac6..c6b33ca8 100644 --- a/src/p2p/net_node.inl +++ b/src/p2p/net_node.inl @@ -435,7 +435,8 @@ namespace nodetool #ifndef TESTNET //TODO: // ADD_HARDCODED_SEED_NODE(std::string("0.0.0.0:") + std::to_string(P2P_DEFAULT_PORT)); - ADD_HARDCODED_SEED_NODE("116.202.82.115", P2P_DEFAULT_PORT); + ADD_HARDCODED_SEED_NODE("116.202.82.115", P2P_DEFAULT_PORT); // Hetzner + ADD_HARDCODED_SEED_NODE("34.13.212.174", P2P_DEFAULT_PORT); // Google //ADD_HARDCODED_SEED_NODE("94.130.137.230", P2P_DEFAULT_PORT); //ADD_HARDCODED_SEED_NODE("95.217.42.247", P2P_DEFAULT_PORT); //ADD_HARDCODED_SEED_NODE("94.130.160.115", P2P_DEFAULT_PORT); @@ -445,7 +446,8 @@ namespace nodetool //ADD_HARDCODED_SEED_NODE("144.76.183.143", P2P_DEFAULT_PORT); #else // TESTNET - ADD_HARDCODED_SEED_NODE("116.202.82.115", P2P_DEFAULT_PORT); + ADD_HARDCODED_SEED_NODE("116.202.82.115", P2P_DEFAULT_PORT); // Hetzner + ADD_HARDCODED_SEED_NODE("34.13.212.174", P2P_DEFAULT_PORT); // Google //ADD_HARDCODED_SEED_NODE("94.130.137.230", P2P_DEFAULT_PORT); //ADD_HARDCODED_SEED_NODE("95.217.42.247", P2P_DEFAULT_PORT); //ADD_HARDCODED_SEED_NODE("94.130.160.115", P2P_DEFAULT_PORT); @@ -705,7 +707,7 @@ namespace nodetool }else { LOG_PRINT_L0(" COMMAND_HANDSHAKE(AND CLOSE) INVOKED OK"); - m_net_server.get_config_object().close(context_.m_connection_id); + // m_net_server.get_config_object().close(context_.m_connection_id); } }, P2P_DEFAULT_HANDSHAKE_INVOKE_TIMEOUT);