Skip to content

Commit

Permalink
Merge branch 'develop' into fix-buffers-2
Browse files Browse the repository at this point in the history
# Conflicts:
#	nano/node/lmdb/lmdb.cpp
#	nano/node/node.cpp
#	nano/secure/CMakeLists.txt
#	nano/secure/store.hpp
  • Loading branch information
pwojcikdev committed Sep 26, 2023
2 parents 0169487 + 6a01fc4 commit d8449ca
Show file tree
Hide file tree
Showing 253 changed files with 5,497 additions and 7,407 deletions.
3 changes: 1 addition & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
url = https://github.com/miniupnp/miniupnp.git
[submodule "lmdb"]
path = submodules/lmdb
url = https://github.com/nanocurrency/lmdb.git
branch = lmdb_0_9_23
url = https://github.com/LMDB/lmdb.git
[submodule "cryptopp"]
path = submodules/cryptopp
url = https://github.com/weidai11/cryptopp.git
Expand Down
10 changes: 7 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.4)
cmake_minimum_required(VERSION 3.14)

if(CMAKE_VERSION VERSION_GREATER 3.12 OR CMAKE_VERSION VERSION_EQUAL 3.12)
# find_package uses <PACKAGENAME>_ROOT variables
Expand Down Expand Up @@ -547,7 +547,8 @@ endif()
if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
add_definitions(-DCRYPTOPP_DISABLE_MIXED_ASM -DCRYPTOPP_DISABLE_ASM)
message(
"CryptoPP with disabled ASM for ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}"
STATUS
"CryptoPP with disabled ASM for ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}"
)
endif()
add_definitions(-DCRYPTOPP_DISABLE_SHANI)
Expand Down Expand Up @@ -650,6 +651,9 @@ target_compile_definitions(blake2 PRIVATE -D__SSE2__)

add_subdirectory(nano/crypto_lib)
add_subdirectory(nano/secure)
add_subdirectory(nano/store)
target_include_directories(nano_store PUBLIC ${BOOST_LIBRARY_INCLUDES})
target_include_directories(nano_store PUBLIC submodules)
add_subdirectory(nano/lib)
add_subdirectory(nano/node)
add_subdirectory(nano/nano_node)
Expand Down Expand Up @@ -774,7 +778,7 @@ if(NANO_GUI OR RAIBLOCKS_GUI)
nano_wallet ${PLATFORM_GUI_TARGET_PROPERTIES} ${PLATFORM_WALLET_SOURCE}
nano/nano_wallet/entry.cpp nano/nano_wallet/icon.hpp ${RES})

target_link_libraries(nano_wallet rpc node qt)
target_link_libraries(nano_wallet Boost::process rpc node qt)

if(WIN32)
target_link_libraries(nano_wallet Qt5::WinExtras)
Expand Down
2 changes: 1 addition & 1 deletion nano/core_test/backlog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ TEST (backlog, population)
nano::test::system system{};
auto & node = *system.add_node ();

node.backlog.activate_callback.add ([&] (nano::transaction const & transaction, nano::account const & account, nano::account_info const & account_info, nano::confirmation_height_info const & conf_info) {
node.backlog.activate_callback.add ([&] (nano::store::transaction const & transaction, nano::account const & account, nano::account_info const & account_info, nano::confirmation_height_info const & conf_info) {
nano::lock_guard<nano::mutex> lock{ mutex };

activated.insert (account);
Expand Down
Loading

0 comments on commit d8449ca

Please sign in to comment.