Cypher_Stack/wownero
2
0
Fork 0
mirror of https://git.wownero.com/wownero/wownero.git synced 2024-12-22 06:48:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove nudge in daemon_is_outdated

Browse Source
This commit is contained in:
wowario 2023-10-02 05:37:52 +03:00
parent 5a127e006e
commit 6a5303f21b
No known key found for this signature in database
GPG Key ID: 793504B449C69220
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/wallet/wallet2.cpp
View File

@ -3352,11 +3352,10 @@ void check_block_hard_fork_version(cryptonote::network_type nettype, uint8_t hf_
return; return;
// check block's height falls within wallet's expected range for block's given version // check block's height falls within wallet's expected range for block's given version
// Wownero version 7 starts from block 0 uint64_t start_height = hf_version == 1 ? 0 : wallet_hard_forks[hf_version - 1].height;
uint64_t start_height = hf_version == 7 ? 0 : wallet_hard_forks[hf_version - 7].height;
uint64_t end_height = static_cast<size_t>(hf_version) + 1 > wallet_num_hard_forks uint64_t end_height = static_cast<size_t>(hf_version) + 1 > wallet_num_hard_forks
? std::numeric_limits<uint64_t>::max() ? std::numeric_limits<uint64_t>::max()
: wallet_hard_forks[hf_version - 6].height; : wallet_hard_forks[hf_version].height;
daemon_is_outdated = height < start_height || height >= end_height; daemon_is_outdated = height < start_height || height >= end_height;
} }
@ -6397,9 +6396,8 @@ bool wallet2::check_hard_fork_version(cryptonote::network_type nettype, const st
// a hard fork). Then check if fork has passed rendering versions incompatible // a hard fork). Then check if fork has passed rendering versions incompatible
if (daemon_hard_forks.size() > 0) if (daemon_hard_forks.size() > 0)
{ {
// Block 0 in Wownero starts from version 7 bool daemon_outdated = daemon_hard_forks.size() < wallet_num_hard_forks;
bool daemon_outdated = daemon_hard_forks.size() + 6 < wallet_num_hard_forks; bool wallet_outdated = daemon_hard_forks.size() > wallet_num_hard_forks;
bool wallet_outdated = daemon_hard_forks.size() + 6 > wallet_num_hard_forks;
if (daemon_is_outdated) if (daemon_is_outdated)
*daemon_is_outdated = daemon_outdated; *daemon_is_outdated = daemon_outdated;
@ -6408,7 +6406,7 @@ bool wallet2::check_hard_fork_version(cryptonote::network_type nettype, const st
if (daemon_outdated) if (daemon_outdated)
{ {
uint64_t daemon_missed_fork_height = wallet_hard_forks[daemon_hard_forks.size() + 6].height; uint64_t daemon_missed_fork_height = wallet_hard_forks[daemon_hard_forks.size()].height;
// If the daemon missed the fork, then technically it is no longer part of // If the daemon missed the fork, then technically it is no longer part of
// the Monero network. Don't connect. // the Monero network. Don't connect.