oxen-io
/
oxen-core
mirror of https://github.com/oxen-io/oxen-core.git
2
1
Fork 0
Code Issues Projects Releases Wiki Activity

Combine is_synced/is_close_to_synced 

Add a `grace_blocks` (defaulting to 0) to `is_synced()`.
This commit is contained in:
Jason Rhinelander 2021-01-07 10:45:54 -04:00
parent cbbd1208f9
commit 88b401cf88
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/wallet/wallet2.cpp
View File

@ -8339,7 +8339,7 @@ wallet2::register_service_node_result wallet2::create_register_service_node_tx(c
return result;
}
if (!is_close_to_synced())
if (!is_synced(1))
{
result.status = register_service_node_result_status::wallet_not_synced;
result.msg = tr("Wallet is not synced. Please synchronise your wallet to the blockchain");
@ -14556,20 +14556,12 @@ uint64_t wallet2::get_blockchain_height_by_date(uint16_t year, uint8_t month, ui
}
}
//----------------------------------------------------------------------------------------------------
bool wallet2::is_synced() const
bool wallet2::is_synced(uint64_t grace_blocks) const
{
uint64_t height;
if (!m_node_rpc_proxy.get_height(height))
return false;
return get_blockchain_current_height() >= height;
}
//----------------------------------------------------------------------------------------------------
bool wallet2::is_close_to_synced() const
{
uint64_t height;
if (!m_node_rpc_proxy.get_height(height))
return false;
return get_blockchain_current_height() >= height-1;
return get_blockchain_current_height() + grace_blocks >= height;
}
//----------------------------------------------------------------------------------------------------
uint64_t wallet2::get_segregation_fork_height() const

5
src/wallet/wallet2.h
View File

@ -1213,8 +1213,9 @@ private:
uint64_t get_blockchain_height_by_date(uint16_t year, uint8_t month, uint8_t day); // 1<=month<=12, 1<=day<=31
bool is_synced() const;
bool is_close_to_synced() const;
/// Returns true if the wallet is synced with the chain; if grace_blocks > 0 then the check is
/// that we are within that many blocks of the top of the chain.
bool is_synced(uint64_t grace_blocks = 0) const;
uint64_t get_fee_percent(uint32_t priority, cryptonote::txtype type) const;
cryptonote::byte_and_output_fees get_base_fees() const;