Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated cryptonode submodule #427

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Updated cryptonode submodule #427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6c97286
updated cryptonode submodule
mbg033 Jul 8, 2021
c6b86e8
fix: linking errors
mbg033 Jul 8, 2021
e902219
Updated cryptonode submodule
mbg033 Aug 4, 2021
b825ffb
fixed more linking errors
mbg033 Aug 4, 2021
596ac71
updated cryptonode submodule
mbg033 Aug 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
23 changes: 11 additions & 12 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -153,6 +156,9 @@ set(CRYPTONODE_LIBS
sodium
checkpoints
lmdb
randomx
blocks
blockchain_db
)

if(STATIC_LINK)
Expand Down Expand Up @@ -278,16 +284,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
)

Expand Down Expand Up @@ -330,7 +326,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}
Expand Down Expand Up @@ -387,9 +383,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)
Expand Down
2 changes: 1 addition & 1 deletion modules/cryptonode
Open in desktop
Submodule cryptonode updated 51 files
+3 −0 .gitmodules
+18 −15 CMakeLists.txt
+27 −2 README.md
+26 −0 contrib/epee/include/misc_log_ex.h
+51 −2 contrib/epee/src/mlog.cpp
+1 −0 external/CMakeLists.txt
+1 −0 external/randomx
+1 −1 external/unbound
+3 −0 src/blockchain_utilities/blockchain_blackball.cpp
+6 −1 src/crypto/CMakeLists.txt
+58 −0 src/crypto/c_threads.h
+8 −0 src/crypto/hash-ops.h
+357 −0 src/crypto/rx-slow-hash.c
+17 −5 src/crypto/slow-hash.c
+26 −24 src/cryptonote_basic/cryptonote_format_utils.cpp
+2 −3 src/cryptonote_basic/cryptonote_format_utils.h
+12 −7 src/cryptonote_basic/miner.cpp
+5 −2 src/cryptonote_basic/miner.h
+1 −0 src/cryptonote_config.h
+57 −9 src/cryptonote_core/blockchain.cpp
+17 −0 src/cryptonote_core/blockchain.h
+16 −6 src/cryptonote_core/cryptonote_core.cpp
+49 −2 src/cryptonote_core/cryptonote_tx_utils.cpp
+7 −0 src/cryptonote_core/cryptonote_tx_utils.h
+20 −4 src/cryptonote_core/stake_transaction_processor.cpp
+7 −0 src/cryptonote_core/stake_transaction_processor.h
+2 −2 src/cryptonote_core/tx_pool.cpp
+2 −1 src/graft_rta_config.h
+72 −29 src/p2p/net_node.h
+203 −144 src/p2p/net_node.inl
+22 −6 src/rpc/core_rpc_server.cpp
+8 −8 src/rpc/core_rpc_server.h
+6 −0 src/rpc/core_rpc_server_commands_defs.h
+19 −4 src/simplewallet/simplewallet.cpp
+2 −0 src/supernode/CMakeLists.txt
+187 −2 src/supernode/baseclientproxy.cpp
+1 −0 src/supernode/baseclientproxy.h
+1 −0 src/supernode/graft_defines.h
+1 −0 src/supernode/supernode_rpc_command.cpp
+43 −1 src/supernode/supernode_rpc_command.h
+1 −1 src/version.cpp.in
+3 −0 src/wallet/api/wallet.cpp
+3 −0 src/wallet/graft_wallet.cpp
+27 −11 src/wallet/ringdb.cpp
+2 −1 src/wallet/ringdb.h
+27 −16 src/wallet/wallet2.cpp
+4 −1 src/wallet/wallet2.h
+87 −0 src/wallet/wallet_rpc_server.cpp
+19 −0 src/wallet/wallet_rpc_server_commands_defs.h
+2 −2 tests/core_proxy/core_proxy.cpp
+2 −2 tests/core_tests/chaingen.cpp