aboutsummaryrefslogtreecommitdiff
path: root/src/simplewallet/simplewallet.cpp
diff options
context:
space:
mode:
authormoneromooo-monero <moneromooo-monero@users.noreply.github.com>2017-10-06 11:24:46 +0100
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2017-12-17 16:12:21 +0000
commit7f4c220b70b5ef46bd80e4530a3581063d6cdbd5 (patch)
tree64da4590e2801e2ce59a0670c2eba1ff605fb5da /src/simplewallet/simplewallet.cpp
parentwallet: guard against partly initialized multisig wallet (diff)
downloadmonero-7f4c220b70b5ef46bd80e4530a3581063d6cdbd5.tar.xz
simplewallet: add multisig to wallet type in wallet_info output
Diffstat (limited to 'src/simplewallet/simplewallet.cpp')
-rw-r--r--src/simplewallet/simplewallet.cpp12
1 files changed, 11 insertions, 1 deletions
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp
index 40226ec34..505237027 100644
--- a/src/simplewallet/simplewallet.cpp
+++ b/src/simplewallet/simplewallet.cpp
@@ -5987,10 +5987,20 @@ bool simple_wallet::status(const std::vector<std::string> &args)
//----------------------------------------------------------------------------------------------------
bool simple_wallet::wallet_info(const std::vector<std::string> &args)
{
+ bool ready;
+ uint32_t threshold, total;
+
message_writer() << tr("Filename: ") << m_wallet->get_wallet_file();
message_writer() << tr("Description: ") << m_wallet->get_description();
message_writer() << tr("Address: ") << m_wallet->get_account().get_public_address_str(m_wallet->testnet());
- message_writer() << tr("Watch only: ") << (m_wallet->watch_only() ? tr("Yes") : tr("No"));
+ std::string type;
+ if (m_wallet->watch_only())
+ type = tr("Watch only");
+ else if (m_wallet->multisig(&ready, &threshold, &total))
+ type = (boost::format(tr("%u/%u multisig%s")) % threshold % total % (ready ? "" : " (not yet finalized)")).str();
+ else
+ type = tr("Normal");
+ message_writer() << tr("Type: ") << type;
message_writer() << tr("Testnet: ") << (m_wallet->testnet() ? tr("Yes") : tr("No"));
return true;
}