From 6d8e925fdb08277f80e979bacb3970a4a36bc861 Mon Sep 17 00:00:00 2001 From: Some Random Crypto Guy Date: Fri, 16 Aug 2024 20:47:03 +0100 Subject: [PATCH] disabled Trezor until protobuf fixes are available; disabled moneropulse issues; bumped version number --- cmake/CheckTrezor.cmake | 6 +++--- src/checkpoints/checkpoints.cpp | 12 ++++++------ src/cryptonote_core/cryptonote_core.cpp | 2 +- src/rpc/core_rpc_server.cpp | 4 ++-- src/version.cpp.in | 2 +- src/wallet/api/wallet_manager.cpp | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/cmake/CheckTrezor.cmake b/cmake/CheckTrezor.cmake index 87582a7..11e4ec3 100644 --- a/cmake/CheckTrezor.cmake +++ b/cmake/CheckTrezor.cmake @@ -6,10 +6,10 @@ function(_trezor_default_val val_name val_default) endfunction() # Define default options via env vars -_trezor_default_val(USE_DEVICE_TREZOR ON) +_trezor_default_val(USE_DEVICE_TREZOR OFF) _trezor_default_val(USE_DEVICE_TREZOR_MANDATORY OFF) -_trezor_default_val(USE_DEVICE_TREZOR_PROTOBUF_TEST ON) -_trezor_default_val(USE_DEVICE_TREZOR_LIBUSB ON) +_trezor_default_val(USE_DEVICE_TREZOR_PROTOBUF_TEST OFF) +_trezor_default_val(USE_DEVICE_TREZOR_LIBUSB OFF) _trezor_default_val(USE_DEVICE_TREZOR_UDP_RELEASE OFF) _trezor_default_val(USE_DEVICE_TREZOR_DEBUG OFF) _trezor_default_val(TREZOR_DEBUG OFF) diff --git a/src/checkpoints/checkpoints.cpp b/src/checkpoints/checkpoints.cpp index ccc41e4..5ded649 100644 --- a/src/checkpoints/checkpoints.cpp +++ b/src/checkpoints/checkpoints.cpp @@ -249,22 +249,22 @@ namespace cryptonote std::vector records; // All four MoneroPulse domains have DNSSEC on and valid - static const std::vector dns_urls = { "checkpoints.moneropulse.se" + static const std::vector dns_urls = { /*"checkpoints.moneropulse.se" , "checkpoints.moneropulse.org" , "checkpoints.moneropulse.net" - , "checkpoints.moneropulse.co" + , "checkpoints.moneropulse.co"*/ }; - static const std::vector testnet_dns_urls = { "testpoints.moneropulse.se" + static const std::vector testnet_dns_urls = { /*"testpoints.moneropulse.se" , "testpoints.moneropulse.org" , "testpoints.moneropulse.net" - , "testpoints.moneropulse.co" + , "testpoints.moneropulse.co"*/ }; - static const std::vector stagenet_dns_urls = { "stagenetpoints.moneropulse.se" + static const std::vector stagenet_dns_urls = { /*"stagenetpoints.moneropulse.se" , "stagenetpoints.moneropulse.org" , "stagenetpoints.moneropulse.net" - , "stagenetpoints.moneropulse.co" + , "stagenetpoints.moneropulse.co"*/ }; if (!tools::dns_utils::load_txt_records_from_dns(records, nettype == TESTNET ? testnet_dns_urls : nettype == STAGENET ? stagenet_dns_urls : dns_urls)) diff --git a/src/cryptonote_core/cryptonote_core.cpp b/src/cryptonote_core/cryptonote_core.cpp index 89e408e..7f5620e 100644 --- a/src/cryptonote_core/cryptonote_core.cpp +++ b/src/cryptonote_core/cryptonote_core.cpp @@ -1898,7 +1898,7 @@ namespace cryptonote if (!tools::check_updates(software, buildtag, version, hash)) return false; - if (tools::vercmp(version.c_str(), MONERO_VERSION) <= 0) + if (tools::vercmp(version.c_str(), SALVIUM_VERSION) <= 0) { m_update_available = false; return true; diff --git a/src/rpc/core_rpc_server.cpp b/src/rpc/core_rpc_server.cpp index 4d58891..54a45f2 100644 --- a/src/rpc/core_rpc_server.cpp +++ b/src/rpc/core_rpc_server.cpp @@ -3183,7 +3183,7 @@ namespace cryptonote return true; } - static const char software[] = "monero"; + static const char software[] = "salvium"; #ifdef BUILD_TAG static const char buildtag[] = BOOST_PP_STRINGIZE(BUILD_TAG); static const char subdir[] = "cli"; @@ -3204,7 +3204,7 @@ namespace cryptonote res.status = "Error checking for updates"; return true; } - if (tools::vercmp(version.c_str(), MONERO_VERSION) <= 0) + if (tools::vercmp(version.c_str(), SALVIUM_VERSION) <= 0) { res.update = false; res.status = CORE_RPC_STATUS_OK; diff --git a/src/version.cpp.in b/src/version.cpp.in index 4df9a23..db33bbc 100644 --- a/src/version.cpp.in +++ b/src/version.cpp.in @@ -1,5 +1,5 @@ #define DEF_SALVIUM_VERSION_TAG "@VERSIONTAG@" -#define DEF_SALVIUM_VERSION "0.4.5" +#define DEF_SALVIUM_VERSION "0.5.0" #define DEF_MONERO_VERSION_TAG "release" #define DEF_MONERO_VERSION "0.18.3.3" #define DEF_MONERO_RELEASE_NAME "Zero" diff --git a/src/wallet/api/wallet_manager.cpp b/src/wallet/api/wallet_manager.cpp index e81b8f8..c126f73 100644 --- a/src/wallet/api/wallet_manager.cpp +++ b/src/wallet/api/wallet_manager.cpp @@ -370,7 +370,7 @@ std::tuple WalletManag if (!tools::check_updates(software, buildtag, version, hash)) return std::make_tuple(false, "", "", "", ""); - if (tools::vercmp(version.c_str(), current_version != nullptr ? current_version : MONERO_VERSION) > 0) + if (tools::vercmp(version.c_str(), current_version != nullptr ? current_version : SALVIUM_VERSION) > 0) { std::string user_url = tools::get_update_url(software, subdir, buildtag, version, true); std::string auto_url = tools::get_update_url(software, subdir, buildtag, version, false);