Merge pull request #76 from scala-network/v4.1.0

V4.1.0
scala-network · Oct 7, 2020 · d8b9add · d8b9add
2 parents bafcfd6 + f6c8e39
commit d8b9add
Show file tree

Hide file tree

Showing 19 changed files with 397 additions and 389 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -10,11 +10,10 @@
 	path = external/rapidjson
 	url = https://github.com/Tencent/rapidjson
 	branch = master
-[submodule "external/panthera"]
-	path = external/panthera
-	url = https://github.com/scala-network/DefyX
-	branch = Panthera_DP
 [submodule "external/trezor-common"]
 	path = external/trezor-common
 	url = https://github.com/trezor/trezor-common
 	branch = master
+[submodule "external/randomx"]
+	path = external/randomx
+	url = https://github.com/scala-network/Panthera
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -198,21 +198,21 @@ if(NOT MANUAL_SUBMODULES)
         message(FATAL_ERROR "Submodule '${relative_path}' is not up-to-date. Please update all submodules with\ngit submodule update --init --force\nor run cmake with -DMANUAL_SUBMODULES=1\n")
       endif()
     endfunction ()
-    
+
     message(STATUS "Checking submodules")
     check_submodule(external/miniupnp)
     check_submodule(external/unbound)
     check_submodule(external/rapidjson)
     check_submodule(external/trezor-common)
-    check_submodule(external/panthera)
+    check_submodule(external/randomx)
   endif()
 endif()
 
 set(CMAKE_C_FLAGS_RELEASE "-DNDEBUG ${OPT_FLAGS_RELEASE}")
 set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${OPT_FLAGS_RELEASE}")
 
 # set this to 0 if per-block checkpoint needs to be disabled
-set(PER_BLOCK_CHECKPOINT 0)
+set(PER_BLOCK_CHECKPOINT 1)
 
 if(PER_BLOCK_CHECKPOINT)
   add_definitions("-DPER_BLOCK_CHECKPOINT")

diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
@@ -80,4 +80,4 @@ endif()
 
 add_subdirectory(db_drivers)
 add_subdirectory(easylogging++)
-add_subdirectory(panthera EXCLUDE_FROM_ALL)
+add_subdirectory(randomx EXCLUDE_FROM_ALL)
diff --git a/external/panthera b/external/panthera
diff --git a/external/randomx b/external/randomx
diff --git a/src/blocks/checkpoints.dat b/src/blocks/checkpoints.dat
diff --git a/src/crypto/CMakeLists.txt b/src/crypto/CMakeLists.txt
@@ -47,7 +47,7 @@ set(crypto_sources
   random.c
   skein.c
   slow-hash.c
-  dx-slow-hash.c
+  rx-slow-hash.c
   CryptonightR_JIT.c
   tree-hash.c)
 
@@ -90,7 +90,7 @@ scala_add_library(cncrypto
 target_link_libraries(cncrypto
   PUBLIC
     epee
-    defyx
+    randomx
     ${Boost_SYSTEM_LIBRARY}
     ${SODIUM_LIBRARY}
   PRIVATE