Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-08-21 03:48:17 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3907

Browse source 
dcbc17e wallet: include a suggested number of confirmations based on amount (moneromooo-monero)
This commit is contained in:
luigi1111 2018-06-27 16:32:33 -05:00
commit 2329d2f4c8
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
5 changed files with 49 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/simplewallet/simplewallet.cpp
View file

@ -7424,8 +7424,12 @@ bool simple_wallet::show_transfer(const std::vector<std::string> &args)
if (pd.m_unlock_time < CRYPTONOTE_MAX_BLOCK_NUMBER)
{
uint64_t bh = std::max(pd.m_unlock_time, pd.m_block_height + CRYPTONOTE_DEFAULT_TX_SPENDABLE_AGE);
uint64_t last_block_reward = m_wallet->get_last_block_reward();
uint64_t suggested_threshold = last_block_reward ? (pd.m_amount + last_block_reward - 1) / last_block_reward : 0;
if (bh >= last_block_height)
success_msg_writer() << "Locked: " << (bh - last_block_height) << " blocks to unlock";
else if (suggested_threshold > 0)
success_msg_writer() << std::to_string(last_block_height - bh) << " confirmations (" << suggested_threshold << " suggested threshold)";
else
success_msg_writer() << std::to_string(last_block_height - bh) << " confirmations";
}