Merge pull request #7757

d689b94 protocol: fix delayed 'you are now synchronized...' message (moneromooo-monero)
This commit is contained in:
luigi1111 2021-08-02 18:43:44 -04:00
commit 0cdb8d02e8
No known key found for this signature in database
GPG key ID: F4ACA0183641E010

View file

@ -2081,6 +2081,8 @@ skip:
} }
MDEBUG(context << "Nothing to get from this peer, and it's not ahead of us, all done"); MDEBUG(context << "Nothing to get from this peer, and it's not ahead of us, all done");
context.m_state = cryptonote_connection_context::state_normal; context.m_state = cryptonote_connection_context::state_normal;
if (m_core.get_current_blockchain_height() >= m_core.get_target_blockchain_height())
on_connection_synchronized();
return true; return true;
} }
uint64_t next_needed_height = m_block_queue.get_next_needed_height(bc_height); uint64_t next_needed_height = m_block_queue.get_next_needed_height(bc_height);
@ -2228,6 +2230,8 @@ skip:
} }
MDEBUG(context << "Nothing to get from this peer, and it's not ahead of us, all done"); MDEBUG(context << "Nothing to get from this peer, and it's not ahead of us, all done");
context.m_state = cryptonote_connection_context::state_normal; context.m_state = cryptonote_connection_context::state_normal;
if (m_core.get_current_blockchain_height() >= m_core.get_target_blockchain_height())
on_connection_synchronized();
return true; return true;
} }
@ -2419,11 +2423,8 @@ skip:
if (context.m_remote_blockchain_height >= m_core.get_target_blockchain_height()) if (context.m_remote_blockchain_height >= m_core.get_target_blockchain_height())
{ {
if (m_core.get_current_blockchain_height() >= m_core.get_target_blockchain_height()) if (m_core.get_current_blockchain_height() >= m_core.get_target_blockchain_height())
{
MGINFO_GREEN("SYNCHRONIZED OK");
on_connection_synchronized(); on_connection_synchronized();
} }
}
else else
{ {
MINFO(context << " we've reached this peer's blockchain height (theirs " << context.m_remote_blockchain_height << ", our target " << m_core.get_target_blockchain_height()); MINFO(context << " we've reached this peer's blockchain height (theirs " << context.m_remote_blockchain_height << ", our target " << m_core.get_target_blockchain_height());