diff options
| author | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2019-01-13 14:44:48 +0000 |
|---|---|---|
| committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2019-01-13 14:48:16 +0000 |
| commit | 96e35506e9ba2f8aeff729f3e7ff34067ece96f8 (patch) | |
| tree | 6f5a7b142ae449c7c4ede1fce5a35d3321167b9d | |
| parent | Merge pull request #5045 (diff) | |
| download | monero-96e35506e9ba2f8aeff729f3e7ff34067ece96f8.tar.xz | |
wallet2: fix incorrect patch for determining fork rules
Half of the patch was correct, but half was introducing another bug,
where a wallet asking for a fork that the daemon does not know about
yet would decide to use those rules.
| -rw-r--r-- | src/wallet/wallet2.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index 2080c1832..4e6d6954f 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -9463,7 +9463,7 @@ bool wallet2::use_fork_rules(uint8_t version, int64_t early_blocks) const result = m_node_rpc_proxy.get_earliest_height(version, earliest_height); throw_on_rpc_response_error(result, "get_hard_fork_info"); - bool close_enough = height >= earliest_height - early_blocks; // start using the rules that many blocks beforehand + bool close_enough = height >= earliest_height - early_blocks && earliest_height != std::numeric_limits<uint64_t>::max(); // start using the rules that many blocks beforehand if (close_enough) LOG_PRINT_L2("Using v" << (unsigned)version << " rules"); else |