mirror of
https://git.wownero.com/wownero/wownero.git
synced 2024-08-15 01:03:23 +00:00
Merge pull request #4378
ac934663
rpc: add a "is an update available" flag in get_info (moneromooo-monero)
This commit is contained in:
commit
0645dcdbdb
4 changed files with 23 additions and 2 deletions
|
@ -181,7 +181,8 @@ namespace cryptonote
|
||||||
m_last_json_checkpoints_update(0),
|
m_last_json_checkpoints_update(0),
|
||||||
m_disable_dns_checkpoints(false),
|
m_disable_dns_checkpoints(false),
|
||||||
m_update_download(0),
|
m_update_download(0),
|
||||||
m_nettype(UNDEFINED)
|
m_nettype(UNDEFINED),
|
||||||
|
m_update_available(false)
|
||||||
{
|
{
|
||||||
m_checkpoints_updating.clear();
|
m_checkpoints_updating.clear();
|
||||||
set_cryptonote_protocol(pprotocol);
|
set_cryptonote_protocol(pprotocol);
|
||||||
|
@ -1541,10 +1542,14 @@ namespace cryptonote
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
if (tools::vercmp(version.c_str(), MONERO_VERSION) <= 0)
|
if (tools::vercmp(version.c_str(), MONERO_VERSION) <= 0)
|
||||||
|
{
|
||||||
|
m_update_available = false;
|
||||||
return true;
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
std::string url = tools::get_update_url(software, subdir, buildtag, version, true);
|
std::string url = tools::get_update_url(software, subdir, buildtag, version, true);
|
||||||
MCLOG_CYAN(el::Level::Info, "global", "Version " << version << " of " << software << " for " << buildtag << " is available: " << url << ", SHA256 hash " << hash);
|
MCLOG_CYAN(el::Level::Info, "global", "Version " << version << " of " << software << " for " << buildtag << " is available: " << url << ", SHA256 hash " << hash);
|
||||||
|
m_update_available = true;
|
||||||
|
|
||||||
if (check_updates_level == UPDATES_NOTIFY)
|
if (check_updates_level == UPDATES_NOTIFY)
|
||||||
return true;
|
return true;
|
||||||
|
|
|
@ -738,6 +738,16 @@ namespace cryptonote
|
||||||
*/
|
*/
|
||||||
network_type get_nettype() const { return m_nettype; };
|
network_type get_nettype() const { return m_nettype; };
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief check whether an update is known to be available or not
|
||||||
|
*
|
||||||
|
* This does not actually trigger a check, but returns the result
|
||||||
|
* of the last check
|
||||||
|
*
|
||||||
|
* @return whether an update is known to be available or not
|
||||||
|
*/
|
||||||
|
bool is_update_available() const { return m_update_available; }
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief get whether fluffy blocks are enabled
|
* @brief get whether fluffy blocks are enabled
|
||||||
*
|
*
|
||||||
|
@ -966,6 +976,8 @@ namespace cryptonote
|
||||||
|
|
||||||
network_type m_nettype; //!< which network are we on?
|
network_type m_nettype; //!< which network are we on?
|
||||||
|
|
||||||
|
std::atomic<bool> m_update_available;
|
||||||
|
|
||||||
std::string m_checkpoints_path; //!< path to json checkpoints file
|
std::string m_checkpoints_path; //!< path to json checkpoints file
|
||||||
time_t m_last_dns_checkpoints_update; //!< time when dns checkpoints were last updated
|
time_t m_last_dns_checkpoints_update; //!< time when dns checkpoints were last updated
|
||||||
time_t m_last_json_checkpoints_update; //!< time when json checkpoints were last updated
|
time_t m_last_json_checkpoints_update; //!< time when json checkpoints were last updated
|
||||||
|
|
|
@ -208,6 +208,7 @@ namespace cryptonote
|
||||||
res.was_bootstrap_ever_used = m_was_bootstrap_ever_used;
|
res.was_bootstrap_ever_used = m_was_bootstrap_ever_used;
|
||||||
}
|
}
|
||||||
res.database_size = m_core.get_blockchain_storage().get_db().get_database_size();
|
res.database_size = m_core.get_blockchain_storage().get_db().get_database_size();
|
||||||
|
res.update_available = m_core.is_update_available();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
//------------------------------------------------------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
@ -1595,6 +1596,7 @@ namespace cryptonote
|
||||||
res.was_bootstrap_ever_used = m_was_bootstrap_ever_used;
|
res.was_bootstrap_ever_used = m_was_bootstrap_ever_used;
|
||||||
}
|
}
|
||||||
res.database_size = m_core.get_blockchain_storage().get_db().get_database_size();
|
res.database_size = m_core.get_blockchain_storage().get_db().get_database_size();
|
||||||
|
res.update_available = m_core.is_update_available();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
//------------------------------------------------------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
|
@ -49,7 +49,7 @@ namespace cryptonote
|
||||||
// advance which version they will stop working with
|
// advance which version they will stop working with
|
||||||
// Don't go over 32767 for any of these
|
// Don't go over 32767 for any of these
|
||||||
#define CORE_RPC_VERSION_MAJOR 2
|
#define CORE_RPC_VERSION_MAJOR 2
|
||||||
#define CORE_RPC_VERSION_MINOR 0
|
#define CORE_RPC_VERSION_MINOR 1
|
||||||
#define MAKE_CORE_RPC_VERSION(major,minor) (((major)<<16)|(minor))
|
#define MAKE_CORE_RPC_VERSION(major,minor) (((major)<<16)|(minor))
|
||||||
#define CORE_RPC_VERSION MAKE_CORE_RPC_VERSION(CORE_RPC_VERSION_MAJOR, CORE_RPC_VERSION_MINOR)
|
#define CORE_RPC_VERSION MAKE_CORE_RPC_VERSION(CORE_RPC_VERSION_MAJOR, CORE_RPC_VERSION_MINOR)
|
||||||
|
|
||||||
|
@ -893,6 +893,7 @@ namespace cryptonote
|
||||||
uint64_t height_without_bootstrap;
|
uint64_t height_without_bootstrap;
|
||||||
bool was_bootstrap_ever_used;
|
bool was_bootstrap_ever_used;
|
||||||
uint64_t database_size;
|
uint64_t database_size;
|
||||||
|
bool update_available;
|
||||||
|
|
||||||
BEGIN_KV_SERIALIZE_MAP()
|
BEGIN_KV_SERIALIZE_MAP()
|
||||||
KV_SERIALIZE(status)
|
KV_SERIALIZE(status)
|
||||||
|
@ -926,6 +927,7 @@ namespace cryptonote
|
||||||
KV_SERIALIZE(height_without_bootstrap)
|
KV_SERIALIZE(height_without_bootstrap)
|
||||||
KV_SERIALIZE(was_bootstrap_ever_used)
|
KV_SERIALIZE(was_bootstrap_ever_used)
|
||||||
KV_SERIALIZE(database_size)
|
KV_SERIALIZE(database_size)
|
||||||
|
KV_SERIALIZE(update_available)
|
||||||
END_KV_SERIALIZE_MAP()
|
END_KV_SERIALIZE_MAP()
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue