nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

simplewallet: show_transfers can now show just failed txes

Browse Source
This commit is contained in:
moneromooo-monero 2016-01-30 13:26:57 +00:00
parent b11539fda7
commit b7e37b7763
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/simplewallet/simplewallet.cpp
View File

@ -2194,18 +2194,19 @@ bool simple_wallet::show_transfers(const std::vector<std::string> &args_)
bool in = true; bool in = true;
bool out = true; bool out = true;
bool pending = true; bool pending = true;
bool failed = true;
uint64_t min_height = 0; uint64_t min_height = 0;
uint64_t max_height = (uint64_t)-1; uint64_t max_height = (uint64_t)-1;
if(local_args.size() > 3) { if(local_args.size() > 3) {
fail_msg_writer() << tr("usage: show_transfers [in|out|all|pending] [<min_height> [<max_height>]]"); fail_msg_writer() << tr("usage: show_transfers [in|out|all|pending|failed] [<min_height> [<max_height>]]");
return true; return true;
} }
// optional in/out selector // optional in/out selector
if (local_args.size() > 0) { if (local_args.size() > 0) {
if (local_args[0] == "in" || local_args[0] == "incoming") { if (local_args[0] == "in" || local_args[0] == "incoming") {
out = pending = false; out = pending = failed = false;
local_args.erase(local_args.begin()); local_args.erase(local_args.begin());
} }
else if (local_args[0] == "out" || local_args[0] == "outgoing") { else if (local_args[0] == "out" || local_args[0] == "outgoing") {
@ -2213,7 +2214,11 @@ bool simple_wallet::show_transfers(const std::vector<std::string> &args_)
local_args.erase(local_args.begin()); local_args.erase(local_args.begin());
} }
else if (local_args[0] == "pending") { else if (local_args[0] == "pending") {
in = out = false; in = out = failed = false;
local_args.erase(local_args.begin());
}
else if (local_args[0] == "failed") {
in = out = pending = false;
local_args.erase(local_args.begin()); local_args.erase(local_args.begin());
} }
else if (local_args[0] == "all" || local_args[0] == "both") { else if (local_args[0] == "all" || local_args[0] == "both") {
@ -2287,7 +2292,7 @@ bool simple_wallet::show_transfers(const std::vector<std::string> &args_)
} }
// print unconfirmed last // print unconfirmed last
if (pending) { if (pending || failed) {
std::list<std::pair<crypto::hash, tools::wallet2::unconfirmed_transfer_details>> upayments; std::list<std::pair<crypto::hash, tools::wallet2::unconfirmed_transfer_details>> upayments;
m_wallet->get_unconfirmed_payments_out(upayments); m_wallet->get_unconfirmed_payments_out(upayments);
for (std::list<std::pair<crypto::hash, tools::wallet2::unconfirmed_transfer_details>>::const_iterator i = upayments.begin(); i != upayments.end(); ++i) { for (std::list<std::pair<crypto::hash, tools::wallet2::unconfirmed_transfer_details>>::const_iterator i = upayments.begin(); i != upayments.end(); ++i) {
@ -2298,8 +2303,10 @@ bool simple_wallet::show_transfers(const std::vector<std::string> &args_)
std::string payment_id = string_tools::pod_to_hex(i->second.m_payment_id); std::string payment_id = string_tools::pod_to_hex(i->second.m_payment_id);
if (payment_id.substr(16).find_first_not_of('0') == std::string::npos) if (payment_id.substr(16).find_first_not_of('0') == std::string::npos)
payment_id = payment_id.substr(0,16); payment_id = payment_id.substr(0,16);
bool failed = pd.m_state == tools::wallet2::unconfirmed_transfer_details::failed; bool is_failed = pd.m_state == tools::wallet2::unconfirmed_transfer_details::failed;
message_writer() << (boost::format("%8.8s %6.6s %20.20s %s %s %14.14s") % (failed ? tr("failed") : tr("pending")) % tr("out") % print_money(amount - pd.m_change) % string_tools::pod_to_hex(i->first) % payment_id % print_money(fee)).str(); if ((failed && is_failed) || (!is_failed && pending)) {
message_writer() << (boost::format("%8.8s %6.6s %20.20s %s %s %14.14s") % (is_failed ? tr("failed") : tr("pending")) % tr("out") % print_money(amount - pd.m_change) % string_tools::pod_to_hex(i->first) % payment_id % print_money(fee)).str();
}
} }
} }