tiamak/Peya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

disabled Trezor until protobuf fixes are available; disabled moneropulse issues; bumped version number

Browse Source
This commit is contained in:
Some Random Crypto Guy
2024-08-16 20:47:03 +01:00
parent 0ee3c669d6
commit 6d8e925fdb
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/CheckTrezor.cmake
View File

@@ -6,10 +6,10 @@ function(_trezor_default_val val_name val_default)
endfunction() endfunction()
# Define default options via env vars # 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_MANDATORY OFF)
_trezor_default_val(USE_DEVICE_TREZOR_PROTOBUF_TEST ON) _trezor_default_val(USE_DEVICE_TREZOR_PROTOBUF_TEST OFF)
_trezor_default_val(USE_DEVICE_TREZOR_LIBUSB ON) _trezor_default_val(USE_DEVICE_TREZOR_LIBUSB OFF)
_trezor_default_val(USE_DEVICE_TREZOR_UDP_RELEASE OFF) _trezor_default_val(USE_DEVICE_TREZOR_UDP_RELEASE OFF)
_trezor_default_val(USE_DEVICE_TREZOR_DEBUG OFF) _trezor_default_val(USE_DEVICE_TREZOR_DEBUG OFF)
_trezor_default_val(TREZOR_DEBUG OFF) _trezor_default_val(TREZOR_DEBUG OFF)

12
src/checkpoints/checkpoints.cpp
View File

@@ -249,22 +249,22 @@ namespace cryptonote
std::vector<std::string> records; std::vector<std::string> records;
// All four MoneroPulse domains have DNSSEC on and valid // All four MoneroPulse domains have DNSSEC on and valid
static const std::vector<std::string> dns_urls = { "checkpoints.moneropulse.se" static const std::vector<std::string> dns_urls = { /*"checkpoints.moneropulse.se"
, "checkpoints.moneropulse.org" , "checkpoints.moneropulse.org"
, "checkpoints.moneropulse.net" , "checkpoints.moneropulse.net"
, "checkpoints.moneropulse.co" , "checkpoints.moneropulse.co"*/
}; };
static const std::vector<std::string> testnet_dns_urls = { "testpoints.moneropulse.se" static const std::vector<std::string> testnet_dns_urls = { /*"testpoints.moneropulse.se"
, "testpoints.moneropulse.org" , "testpoints.moneropulse.org"
, "testpoints.moneropulse.net" , "testpoints.moneropulse.net"
, "testpoints.moneropulse.co" , "testpoints.moneropulse.co"*/
}; };
static const std::vector<std::string> stagenet_dns_urls = { "stagenetpoints.moneropulse.se" static const std::vector<std::string> stagenet_dns_urls = { /*"stagenetpoints.moneropulse.se"
, "stagenetpoints.moneropulse.org" , "stagenetpoints.moneropulse.org"
, "stagenetpoints.moneropulse.net" , "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)) if (!tools::dns_utils::load_txt_records_from_dns(records, nettype == TESTNET ? testnet_dns_urls : nettype == STAGENET ? stagenet_dns_urls : dns_urls))

2
src/cryptonote_core/cryptonote_core.cpp
View File

@@ -1898,7 +1898,7 @@ namespace cryptonote
if (!tools::check_updates(software, buildtag, version, hash)) if (!tools::check_updates(software, buildtag, version, hash))
return false; return false;
if (tools::vercmp(version.c_str(), MONERO_VERSION) <= 0) if (tools::vercmp(version.c_str(), SALVIUM_VERSION) <= 0)
{ {
m_update_available = false; m_update_available = false;
return true; return true;

4
src/rpc/core_rpc_server.cpp
View File

@@ -3183,7 +3183,7 @@ namespace cryptonote
return true; return true;
} }
static const char software[] = "monero"; static const char software[] = "salvium";
#ifdef BUILD_TAG #ifdef BUILD_TAG
static const char buildtag[] = BOOST_PP_STRINGIZE(BUILD_TAG); static const char buildtag[] = BOOST_PP_STRINGIZE(BUILD_TAG);
static const char subdir[] = "cli"; static const char subdir[] = "cli";
@@ -3204,7 +3204,7 @@ namespace cryptonote
res.status = "Error checking for updates"; res.status = "Error checking for updates";
return true; return true;
} }
if (tools::vercmp(version.c_str(), MONERO_VERSION) <= 0) if (tools::vercmp(version.c_str(), SALVIUM_VERSION) <= 0)
{ {
res.update = false; res.update = false;
res.status = CORE_RPC_STATUS_OK; res.status = CORE_RPC_STATUS_OK;

2
src/version.cpp.in
View File

@@ -1,5 +1,5 @@
#define DEF_SALVIUM_VERSION_TAG "@VERSIONTAG@" #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_TAG "release"
#define DEF_MONERO_VERSION "0.18.3.3" #define DEF_MONERO_VERSION "0.18.3.3"
#define DEF_MONERO_RELEASE_NAME "Zero" #define DEF_MONERO_RELEASE_NAME "Zero"

2
src/wallet/api/wallet_manager.cpp
View File

@@ -370,7 +370,7 @@ std::tuple<bool, std::string, std::string, std::string, std::string> WalletManag
if (!tools::check_updates(software, buildtag, version, hash)) if (!tools::check_updates(software, buildtag, version, hash))
return std::make_tuple(false, "", "", "", ""); 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 user_url = tools::get_update_url(software, subdir, buildtag, version, true);
std::string auto_url = tools::get_update_url(software, subdir, buildtag, version, false); std::string auto_url = tools::get_update_url(software, subdir, buildtag, version, false);