Merge pull request #3399

1d39b265 wallet2: fix use_fork_rules() when querying version that is defined but not enabled yet (stoffu)
This commit is contained in:
Riccardo Spagni 2018-03-14 16:17:59 +02:00
commit 2fe1504c03
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD

View file

@ -7449,7 +7449,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