diff options
| author | jcktm <kitten@protonmail.com> | 2018-04-19 12:17:45 +1000 |
|---|---|---|
| committer | jcktm <kitten@protonmail.com> | 2018-05-15 15:28:42 +1000 |
| commit | 89e51ecd38e6958f9de8431c2c95dc76e9b246cd (patch) | |
| tree | 3ac8e32e265b257902e5c0894ac89931ab77b4b5 | |
| parent | Merge pull request #3794 (diff) | |
| download | monero-89e51ecd38e6958f9de8431c2c95dc76e9b246cd.tar.xz | |
simple-wallet-cli: Add warnings about inaccurate balances to to watch-only wallet
| -rw-r--r-- | src/simplewallet/simplewallet.cpp | 2 | ||||
| -rw-r--r-- | src/wallet/wallet2.cpp | 8 | ||||
| -rw-r--r-- | src/wallet/wallet2.h | 1 |
3 files changed, 11 insertions, 0 deletions
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index 639b394f3..3a13181ba 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -3923,6 +3923,8 @@ bool simple_wallet::show_balance_unlocked(bool detailed) std::string extra; if (m_wallet->has_multisig_partial_key_images()) extra = tr(" (Some owned outputs have partial key images - import_multisig_info needed)"); + else if (m_wallet->has_unknown_key_images()) + extra += tr(" (Some owned outputs have missing key images - import_key_images needed)"); success_msg_writer() << tr("Currently selected account: [") << m_current_subaddress_account << tr("] ") << m_wallet->get_subaddress_label({m_current_subaddress_account, 0}); const std::string tag = m_wallet->get_account_tags().second[m_current_subaddress_account]; success_msg_writer() << tr("Tag: ") << (tag.empty() ? std::string{tr("(No tag assigned)")} : tag); diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index 6a37b59eb..6a77584f4 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -3611,6 +3611,14 @@ bool wallet2::has_multisig_partial_key_images() const return false; } +bool wallet2::has_unknown_key_images() const +{ + for (const auto &td: m_transfers) + if (!td.m_key_image_known) + return true; + return false; +} + /*! * \brief Rewrites to the wallet file for wallet upgrade (doesn't generate key, assumes it's already there) * \param wallet_name Name of wallet file (should exist) diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h index 69b63876a..763f8a9e2 100644 --- a/src/wallet/wallet2.h +++ b/src/wallet/wallet2.h @@ -653,6 +653,7 @@ namespace tools bool watch_only() const { return m_watch_only; } bool multisig(bool *ready = NULL, uint32_t *threshold = NULL, uint32_t *total = NULL) const; bool has_multisig_partial_key_images() const; + bool has_unknown_key_images() const; bool get_multisig_seed(std::string& seed, const epee::wipeable_string &passphrase = std::string(), bool raw = true) const; bool key_on_device() const { return m_key_on_device; } |