sync with local changes

CMakeLists.txt

@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.10)
 project(p2pool)
 
 include(cmake/standard.cmake)
+enable_language(ASM)
 
 message(STATUS "Build environment:
     System processor: ${CMAKE_SYSTEM_PROCESSOR}
@@ -16,7 +17,7 @@ option(STATIC_LIBS "Link libuv and libzmq statically" OFF)
 option(WITH_RANDOMX "Include the RandomX library in the build. If this is turned off, p2pool will rely on monerod for verifying RandomX hashes" ON)
 option(WITH_LTO "Use link-time compiler optimization (if linking fails for you, run cmake with -DWITH_LTO=OFF)" ON)
 option(WITH_UPNP "Include UPnP support. If this is turned off, p2pool will not be able to configure port forwarding on UPnP-enabled routers." ON)
-option(WITH_GRPC "Include gRPC support. If this is turned off, p2pool will not be able to merge mine with Tari." ON)
+option(WITH_GRPC "Include gRPC support (Tari merge mining). Turn off to drop Tari dependency." OFF)
 option(WITH_TLS "Include TLS support. If this is turned off, p2pool will not support Stratum TLS connections, and lack many other security features. It's recommended to keep it ON!" ON)
 option(WITH_INDEXED_HASHES "Save memory used for storing transaction hashes and public keys (a bit slower block verification - use it only if you compile for a very low memory system)" OFF)
 
@@ -112,6 +113,11 @@ set(HEADERS
 	src/json_rpc_request.h
 	src/keccak.h
 	src/log.h
+	src/salvium_carrot.h
+	src/transcript_fixed.h
+	src/int-util.h
+	src/blake2b.h
+	src/memwipe.h
 	src/mempool.h
 	src/merge_mining_client.h
 	src/merge_mining_client_json_rpc.h
@@ -123,6 +129,7 @@ set(HEADERS
 	src/pool_block.h
 	src/pool_block_parser.inl
 	src/pow_hash.h
+	src/carrot_crypto.h
 	src/side_chain.h
 	src/stratum_server.h
 	src/tcp_server.h
@@ -137,11 +144,28 @@ set(SOURCES
 	external/src/cryptonote/crypto-ops-data.c
 	external/src/cryptonote/crypto-ops.c
 	external/src/cryptonote/fcmp_pp_crypto.cpp
-	external/src/hardforks/hardforks.cpp
-	src/block_cache.cpp
+	external/mx25519/src/mx25519.c
+	external/mx25519/src/impl.c
+	external/mx25519/src/platform.c
+external/mx25519/src/scalar.c
+external/mx25519/src/cpu.c
+external/mx25519/src/portable/scalarmult.c
+)
+
+if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "AMD64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "amd64")
+	list(APPEND SOURCES external/mx25519/src/amd64/scalarmult_gnu.S)
+endif()
+
+list(APPEND SOURCES
+external/src/hardforks/hardforks.cpp
+src/block_cache.cpp
 	src/block_template.cpp
 	src/console_commands.cpp
 	src/crypto.cpp
+	src/carrot_crypto.cpp
+	src/salvium_carrot.cpp
+	src/blake2b.c
+	src/memwipe.c
 	src/json_rpc_request.cpp
 	src/keccak.cpp
 	src/log.cpp
@@ -160,7 +184,7 @@ set(SOURCES
 	src/side_chain.cpp
 	src/stratum_server.cpp
 	src/tcp_server.cpp
-	src/util.cpp
+src/util.cpp
 	src/wallet.cpp
 	src/zmq_reader.cpp
 )
@@ -180,7 +204,7 @@ else()
 	set(SOURCES ${SOURCES} external/src/RandomX/src/cpu.cpp)
 endif()
 
-if (WITH_GRPC)
+if (WITH_GRPC AND NOT P2POOL_UNIT_TESTS)
 	set(HEADERS ${HEADERS} src/merge_mining_client_tari.h)
 	set(SOURCES ${SOURCES} src/merge_mining_client_tari.cpp)
 endif()
@@ -234,6 +258,10 @@ include_directories(src)
 include_directories(external/src)
 include_directories(external/src/crypto)
 include_directories(external/src/cryptonote)
+include_directories(external/mx25519/include)
+if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "AMD64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "amd64")
+	include_directories(external/mx25519/src/amd64)
+endif()
 include_directories(${UV_INCLUDE_DIR})
 include_directories(external/src/cppzmq)
 include_directories(${ZMQ_INCLUDE_DIR})