diff --git a/CMakeLists.txt b/CMakeLists.txt index 2010836c..4aa125a5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,8 +32,8 @@ if(CMAKE_SYSTEM_NAME STREQUAL "iOS" OR CMAKE_SYSTEM_NAME STREQUAL "Android") add_definitions(-DMOBILE_WALLET_BUILD) if(CMAKE_SYSTEM_NAME STREQUAL "iOS" ) add_definitions(-DIOS_BUILD) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fembed-bitcode") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fembed-bitcode") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fembed-bitcode -Wno-enum-constexpr-conversion") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fembed-bitcode -Wno-enum-constexpr-conversion") endif() if(CMAKE_SYSTEM_NAME STREQUAL "Android") add_definitions(-DANDROID_BUILD) diff --git a/src/gui/qt-daemon/layout b/src/gui/qt-daemon/layout index 69df3c6d..0a7bf9b4 160000 --- a/src/gui/qt-daemon/layout +++ b/src/gui/qt-daemon/layout @@ -1 +1 @@ -Subproject commit 69df3c6d86e230dd406097676afa0d0b8c1d9231 +Subproject commit 0a7bf9b4d5710e4d112173a9e87117206ac037eb diff --git a/tests/crypto/crypto.cpp b/tests/crypto/crypto.cpp index cbc5879c..381960a5 100644 --- a/tests/crypto/crypto.cpp +++ b/tests/crypto/crypto.cpp @@ -11,7 +11,7 @@ bool check_scalar(const crypto::ec_scalar &scalar) { } void random_scalar(crypto::ec_scalar &res) { - crypto::random_scalar(res); + crypto::random_scalar_no_lock(res); } void hash_to_scalar(const void *data, std::size_t length, crypto::ec_scalar &res) { diff --git a/utils/p2p_manual_config/proxy_via_seed_nodes/p2p_manual_config.json b/utils/p2p_manual_config/proxy_via_seed_nodes/p2p_manual_config.json index 64f3711e..c559d520 100644 --- a/utils/p2p_manual_config/proxy_via_seed_nodes/p2p_manual_config.json +++ b/utils/p2p_manual_config/proxy_via_seed_nodes/p2p_manual_config.json @@ -29,6 +29,7 @@ "use_only_priority_peers": true, "priority_peers_list": [ "95.217.43.225:11121", + "94.130.137.230:11121", "95.217.42.247:11121", "94.130.160.115:11121", "195.201.107.230:11121",