gitea-mirror/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2026-01-05 09:17:40 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3991

Browse Source 
798dfcf wallet: allow unspendable unmixable outputs to be discarded (stoffu)
This commit is contained in:
luigi1111
2018-06-27 16:25:03 -05:00
parent cbfa0a2a7e 798dfcfe79
commit 5eb2e01216
3 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/simplewallet/simplewallet.cpp
View File

@@ -4940,6 +4940,20 @@ bool simple_wallet::sweep_unmixable(const std::vector<std::string> &args_)
commit_or_save(ptx_vector, m_do_not_relay);
}
}
catch (const tools::error::not_enough_unlocked_money& e)
{
fail_msg_writer() << tr("Not enough money in unlocked balance");
std::string accepted = input_line((boost::format(tr("Discarding %s of unmixable outputs that cannot be spent, which can be undone by \"rescan_spent\". Is this okay? (Y/Yes/N/No): ")) % print_money(e.available())).str());
if (std::cin.eof())
return true;
if (command_line::is_yes(accepted))
{
try
{
m_wallet->discard_unmixable_outputs(is_daemon_trusted());
} catch (...) {}
}
}
catch (const std::exception &e)
{
handle_transfer_exception(std::current_exception(), is_daemon_trusted());