Charon/blockchain
1
0
Fork 0
forked from lthn/blockchain
Code Pull requests Activity

Merge branch 'develop' into random_refactoring

Browse source
This commit is contained in:
sowle 2025-08-10 05:20:03 +03:00
commit 15417edbce
No known key found for this signature in database
GPG key ID: C07A24B2D89D49FC
4 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -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)

2
src/gui/qt-daemon/layout

@ -1 +1 @@
Subproject commit 69df3c6d86e230dd406097676afa0d0b8c1d9231
Subproject commit 0a7bf9b4d5710e4d112173a9e87117206ac037eb

2
tests/crypto/crypto.cpp
View file

@ -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) {

1
utils/p2p_manual_config/proxy_via_seed_nodes/p2p_manual_config.json
View file

@ -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",