From 6c97286a7cbb3184a39e7f0ba74b088f0dbb7c6f Mon Sep 17 00:00:00 2001 From: Ilya Kitaev Date: Thu, 8 Jul 2021 20:16:14 +0300 Subject: [PATCH 1/5] updated cryptonode submodule --- modules/cryptonode | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/cryptonode b/modules/cryptonode index 74922d6e..05c7c7c5 160000 --- a/modules/cryptonode +++ b/modules/cryptonode @@ -1 +1 @@ -Subproject commit 74922d6eaccad21d00daf8bc0fe6f5a69ff9787c +Subproject commit 05c7c7c59f0310d689bb6a8f5fec100c2690077b From c6b86e8fe01da968162a6a3e2e84fdb42374da5e Mon Sep 17 00:00:00 2001 From: Ilya Kitaev Date: Thu, 8 Jul 2021 20:16:38 +0300 Subject: [PATCH 2/5] fix: linking errors --- CMakeLists.txt | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a7e3fef8..e8d81dd5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -278,16 +278,6 @@ target_include_directories(requests_common PRIVATE ) target_link_libraries(requests_common PRIVATE - ${CRYPTONODE_LIBS} - ${CMAKE_THREAD_LIBS_INIT} - ${Boost_PROGRAM_OPTIONS_LIBRARY} - ${Boost_CHRONO_LIBRARY} - ${Boost_FILESYSTEM_LIBRARY} - ${Boost_SYSTEM_LIBRARY} - ${Boost_SERIALIZATION_LIBRARY} - ${Boost_THREAD_LIBRARY} - ${Boost_REGEX_LIBRARY} - ${COMMON_LIBS} graft ) @@ -330,7 +320,7 @@ target_include_directories(supernode_common PRIVATE ${GRAFT_INCLUDE_DIRS} ) -target_link_libraries(supernode_common PRIVATE + target_link_libraries(supernode_common PUBLIC ${CRYPTONODE_LIBS} ${CMAKE_THREAD_LIBS_INIT} ${Boost_PROGRAM_OPTIONS_LIBRARY} @@ -387,9 +377,12 @@ target_include_directories(wallet_server PRIVATE ) target_link_libraries(wallet_server PRIVATE - ${Boost_SYSTEM_LIBRARY} + #${CRYPTONODE_LIBS} + #${CMAKE_THREAD_LIBS_INIT} + ${COMMON_LIBS} graft requests_common + supernode_common ) add_dependencies(wallet_server graft requests_common) From e90221973776398e3fea582318004207db7e8dcd Mon Sep 17 00:00:00 2001 From: Ilya Kitaev Date: Wed, 4 Aug 2021 12:44:34 +0300 Subject: [PATCH 3/5] Updated cryptonode submodule --- .gitmodules | 2 +- modules/cryptonode | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 728b9403..e8f86aa0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,7 @@ [submodule "cryptonode"] path = modules/cryptonode url = https://github.com/graft-project/GraftNetwork.git - branch = rta-alpha4 + branch = master [submodule "libr3"] path = modules/libr3 url = https://github.com/graft-project/r3.git diff --git a/modules/cryptonode b/modules/cryptonode index 05c7c7c5..254d52eb 160000 --- a/modules/cryptonode +++ b/modules/cryptonode @@ -1 +1 @@ -Subproject commit 05c7c7c59f0310d689bb6a8f5fec100c2690077b +Subproject commit 254d52eb171805cfbc383a44399b5b0540d1dc3a From b825ffbdfb57bd97cdc19a8f3a0f130dadbfd7ab Mon Sep 17 00:00:00 2001 From: Ilya Kitaev Date: Wed, 4 Aug 2021 13:59:03 +0300 Subject: [PATCH 4/5] fixed more linking errors --- CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index e8d81dd5..19c8c63d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -120,7 +120,10 @@ set(CRYPTONODE_LIB_DIRS ${PROJECT_BINARY_DIR}/BUILD/cryptonode/external/easylogging++ ${PROJECT_BINARY_DIR}/BUILD/cryptonode/external/unbound ${PROJECT_BINARY_DIR}/BUILD/cryptonode/external/db_drivers/liblmdb + ${PROJECT_BINARY_DIR}/BUILD/cryptonode/external/randomx ${PROJECT_BINARY_DIR}/BUILD/cryptonode/lib + ${PROJECT_BINARY_DIR}/BUILD/cryptonode/src/blocks + ${PROJECT_BINARY_DIR}/BUILD/cryptonode/src/blockchain_db ${PROJECT_BINARY_DIR}/BUILD/cryptonode/src/common ${PROJECT_BINARY_DIR}/BUILD/cryptonode/src/crypto ${PROJECT_BINARY_DIR}/BUILD/cryptonode/src/cryptonote_basic @@ -153,6 +156,9 @@ set(CRYPTONODE_LIBS sodium checkpoints lmdb + randomx + blocks + blockchain_db ) if(STATIC_LINK) From 596ac719d458d9de080954ae12446c5b40d95fb7 Mon Sep 17 00:00:00 2001 From: Ilya Kitaev Date: Wed, 11 Aug 2021 20:48:48 +0300 Subject: [PATCH 5/5] updated cryptonode submodule --- modules/cryptonode | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/cryptonode b/modules/cryptonode index 254d52eb..5bc6673f 160000 --- a/modules/cryptonode +++ b/modules/cryptonode @@ -1 +1 @@ -Subproject commit 254d52eb171805cfbc383a44399b5b0540d1dc3a +Subproject commit 5bc6673f872afeefea309f3f7a1ac7d194cdaf78