Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-27 09:59:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5009

Browse Source 
5e10dee3 simplewallet: fix show_transfers colouring, and add red for failed (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2019-01-16 21:30:51 +02:00
commit f8a10bcc07
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/simplewallet/simplewallet.cpp
View File

@ -7340,6 +7340,7 @@ bool simple_wallet::get_transfers(std::vector<std::string>& local_args, std::vec
const std::string type = pd.m_coinbase ? tr("block") : tr("in"); const std::string type = pd.m_coinbase ? tr("block") : tr("in");
const bool unlocked = m_wallet->is_transfer_unlocked(pd.m_unlock_time, pd.m_block_height); const bool unlocked = m_wallet->is_transfer_unlocked(pd.m_unlock_time, pd.m_block_height);
transfers.push_back({ transfers.push_back({
type,
pd.m_block_height, pd.m_block_height,
pd.m_timestamp, pd.m_timestamp,
type, type,
@ -7372,6 +7373,7 @@ bool simple_wallet::get_transfers(std::vector<std::string>& local_args, std::vec
payment_id = payment_id.substr(0,16); payment_id = payment_id.substr(0,16);
std::string note = m_wallet->get_tx_note(i->first); std::string note = m_wallet->get_tx_note(i->first);
transfers.push_back({ transfers.push_back({
"out",
pd.m_block_height, pd.m_block_height,
pd.m_timestamp, pd.m_timestamp,
"out", "out",
@ -7408,6 +7410,7 @@ bool simple_wallet::get_transfers(std::vector<std::string>& local_args, std::vec
if (i->second.m_double_spend_seen) if (i->second.m_double_spend_seen)
double_spend_note = tr("[Double spend seen on the network: this transaction may or may not end up being mined] "); double_spend_note = tr("[Double spend seen on the network: this transaction may or may not end up being mined] ");
transfers.push_back({ transfers.push_back({
"pool",
"pool", "pool",
pd.m_timestamp, pd.m_timestamp,
"in", "in",
@ -7448,6 +7451,7 @@ bool simple_wallet::get_transfers(std::vector<std::string>& local_args, std::vec
bool is_failed = pd.m_state == tools::wallet2::unconfirmed_transfer_details::failed; bool is_failed = pd.m_state == tools::wallet2::unconfirmed_transfer_details::failed;
if ((failed && is_failed) || (!is_failed && pending)) { if ((failed && is_failed) || (!is_failed && pending)) {
transfers.push_back({ transfers.push_back({
(is_failed ? "failed" : "pending"),
(is_failed ? "failed" : "pending"), (is_failed ? "failed" : "pending"),
pd.m_timestamp, pd.m_timestamp,
"out", "out",
@ -7496,7 +7500,7 @@ bool simple_wallet::show_transfers(const std::vector<std::string> &args_)
for (const auto& transfer : all_transfers) for (const auto& transfer : all_transfers)
{ {
const auto color = transfer.confirmed ? ((transfer.direction == "in" || transfer.direction == "block") ? console_color_green : console_color_magenta) : console_color_white; const auto color = transfer.type == "failed" ? console_color_red : transfer.confirmed ? ((transfer.direction == "in" || transfer.direction == "block") ? console_color_green : console_color_magenta) : console_color_default;
std::string destinations = "-"; std::string destinations = "-";
if (!transfer.outputs.empty()) if (!transfer.outputs.empty())

1
src/simplewallet/simplewallet.h
View File

@ -256,6 +256,7 @@ namespace cryptonote
struct transfer_view struct transfer_view
{ {
std::string type;
boost::variant<uint64_t, std::string> block; boost::variant<uint64_t, std::string> block;
uint64_t timestamp; uint64_t timestamp;
std::string direction; std::string direction;