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.
This commit is contained in:
moneromooo-monero 2019-01-13 14:44:48 +00:00
parent 7c863a9fa5
commit fcb524bea6
No known key found for this signature in database
GPG key ID: 686F07454D6CEFC3

View file

@ -9093,7 +9093,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); result = m_node_rpc_proxy.get_earliest_height(version, earliest_height);
throw_on_rpc_response_error(result, "get_hard_fork_info"); 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) if (close_enough)
LOG_PRINT_L2("Using v" << (unsigned)version << " rules"); LOG_PRINT_L2("Using v" << (unsigned)version << " rules");
else else