Version 0.4.9 build 1147

* Add support for SSL RPC * Add support for custom path for remote RPC daemons * Allow sending TLO using e-mail address of registered webwallet user * Build fixes for Android, FreeBSD, Linux, OpenBSD and NetBSD * Windows will show filename of currently opened wallet file in title bar of window when using walletd or SimpleWallet
TalleoProject · May 5, 2022 · 4fd8275 · 4fd8275
1 parent 5aa00c8
commit 4fd8275
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 7 deletions.
diff --git a/external/rocksdb/env/env_posix.cc b/external/rocksdb/env/env_posix.cc
@@ -22,6 +22,7 @@
 #include <sys/stat.h>
 #ifdef OS_ANDROID
 #include <sys/sysmacros.h>
+#include <sys/statfs.h>
 #endif
 #ifdef OS_LINUX
 #include <sys/statfs.h>

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -200,3 +200,11 @@ set_property(TARGET SimpleWallet PROPERTY OUTPUT_NAME "simplewallet")
 set_property(TARGET PaymentGateService PROPERTY OUTPUT_NAME "walletd")
 set_property(TARGET Miner PROPERTY OUTPUT_NAME "miner")
 set_property(TARGET AddressGenerator PROPERTY OUTPUT_NAME "generate")
+
+if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND STATIC)
+  set_property(TARGET Daemon PROPERTY LINK_FLAGS "-Wl,--as-needed -static-libgcc -static-libstdc++")
+  set_property(TARGET SimpleWallet PROPERTY LINK_FLAGS "-Wl,--as-needed -static-libgcc -static-libstdc++")
+  set_property(TARGET PaymentGateService PROPERTY LINK_FLAGS "-Wl,--as-needed -static-libgcc -static-libstdc++")
+  set_property(TARGET Miner PROPERTY LINK_FLAGS "-Wl,--as-needed -static-libgcc -static-libstdc++")
+  set_property(TARGET AddressGenerator PROPERTY LINK_FLAGS "-Wl,--as-needed -static-libgcc -static-libstdc++")
+endif()
diff --git a/src/PaymentGateService/PaymentServiceConfiguration.cpp b/src/PaymentGateService/PaymentServiceConfiguration.cpp
@@ -71,7 +71,7 @@ void Configuration::initOptions(po::options_description& desc) {
       ("container-file,w", po::value<std::string>(), "container file")
       ("container-password,p", po::value<std::string>(), "container password")
       ("generate-container,g", "generate new container file with one wallet and exit")
-      ("view-key", po::value<std::string>(), "generate a container with this secret key view")
+      ("view-key", po::value<std::string>(), "generate a container with this secret view key")
       ("spend-key", po::value<std::string>(), "generate a container with this secret spend key")
       ("mnemonic-seed", po::value<std::string>(), "generate a container with this mnemonic seed")
       ("daemon,d", "run as daemon in Unix or as service in Windows")

diff --git a/src/PaymentGateService/RpcNodeConfiguration.cpp b/src/PaymentGateService/RpcNodeConfiguration.cpp
@@ -42,7 +42,7 @@ void RpcNodeConfiguration::initOptions(boost::program_options::options_descripti
     ("daemon-port", po::value<uint16_t>()->default_value((uint16_t) CryptoNote::RPC_DEFAULT_PORT), "daemon port")
     ("daemon-port-ssl", po::value<uint16_t>()->default_value((uint16_t) CryptoNote::RPC_DEFAULT_SSL_PORT), "daemon port ssl")
     ("daemon-rpc-path", po::value<std::string>()->default_value("/"), "daemon RPC path")
-    ("daemon-ssl-enable", po::bool_switch(), "")
+    ("daemon-ssl-enable", po::bool_switch(), "Enable SSL for daemon")
     ("daemon-chain-file", po::value<std::string>()->default_value(std::string(CryptoNote::RPC_DEFAULT_CHAIN_FILE)), "")
     ("daemon-key-file", po::value<std::string>()->default_value(std::string(CryptoNote::RPC_DEFAULT_KEY_FILE)), "")
     ("daemon-dh-file", po::value<std::string>()->default_value(std::string(CryptoNote::RPC_DEFAULT_DH_FILE)), "");

diff --git a/src/version.h.in b/src/version.h.in
@@ -4,11 +4,11 @@
 #define PROJECT_NAME "Talleo"
 #define PROJECT_COMPANY "Talleo Project"
 #define PROJECT_SITE "https://talleo.org/"
-#define PROJECT_COPYRIGHT "Copyright 2019-2020, The Talleo Developers"
+#define PROJECT_COPYRIGHT "Copyright 2019-2022, The Talleo Developers"
 #define APP_VER_MAJOR 0
 #define APP_VER_MINOR 4
-#define APP_VER_REV 8
-#define APP_VER_BUILD 1128
+#define APP_VER_REV 9
+#define APP_VER_BUILD 1147
 
 #define BUILD_COMMIT_ID "@VERSION@"
 #define PROJECT_VERSION STR(APP_VER_MAJOR) "." STR(APP_VER_MINOR) "." STR(APP_VER_REV)

diff --git a/tests/PerformanceTests/PerformanceUtils.h b/tests/PerformanceTests/PerformanceUtils.h
@@ -65,7 +65,7 @@ void set_process_affinity(int core)
   CPU_ZERO(&cpuset);
   CPU_SET(core, &cpuset);
 #if defined (__ANDROID__)
-  if (0 != sched_setaffinity(0, sizeof(cpuset), &cpuset)) {
+  if (0 != ::sched_setaffinity(0, sizeof(cpuset), &cpuset)) {
     std::cout << "sched_setaffinity - ERROR" << std::endl;
   }
 #else
@@ -92,7 +92,7 @@ void set_thread_high_priority()
   ::pthread_attr_getschedpolicy(&attr, &policy);
   max_prio_for_policy = ::sched_get_priority_max(policy);
 
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__ANDROID__)
   sched_param params;
   params.sched_priority = max_prio_for_policy;
   if (0 != ::sched_setparam(0, &params))