diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index c416d2a88..701fbb0fd 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -3352,11 +3352,10 @@ void check_block_hard_fork_version(cryptonote::network_type nettype, uint8_t hf_ return; // 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 == 7 ? 0 : wallet_hard_forks[hf_version - 7].height; + uint64_t start_height = hf_version == 1 ? 0 : wallet_hard_forks[hf_version - 1].height; uint64_t end_height = static_cast(hf_version) + 1 > wallet_num_hard_forks ? std::numeric_limits::max() - : wallet_hard_forks[hf_version - 6].height; + : wallet_hard_forks[hf_version].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 if (daemon_hard_forks.size() > 0) { - // Block 0 in Wownero starts from version 7 - bool daemon_outdated = daemon_hard_forks.size() + 6 < wallet_num_hard_forks; - bool wallet_outdated = daemon_hard_forks.size() + 6 > wallet_num_hard_forks; + bool daemon_outdated = daemon_hard_forks.size() < wallet_num_hard_forks; + bool wallet_outdated = daemon_hard_forks.size() > wallet_num_hard_forks; if (daemon_is_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) { - 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 // the Monero network. Don't connect.