Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-10-01 11:49:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

simplewallet: spell out change when signing a transfer

Browse Source 
Also catch change to multiple addresses, this is unexpected
This commit is contained in:
moneromooo-monero 2016-11-13 17:48:17 +00:00
parent 14cb088300
commit 47413a5626
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/simplewallet/simplewallet.cpp
View File

@ -2803,7 +2803,12 @@ bool simple_wallet::accept_loaded_tx(const std::function<size_t()> get_num_txes,
fail_msg_writer() << tr("Claimed change is larger than payment to the change address"); fail_msg_writer() << tr("Claimed change is larger than payment to the change address");
return false; return false;
} }
change = cd.change_dts.amount; if (memcmp(&cd.change_dts.addr, &get_tx(0).change_dts.addr, sizeof(cd.change_dts.addr)))
{
fail_msg_writer() << tr("Change does to more than one address");
return false;
}
change += cd.change_dts.amount;
it->second -= cd.change_dts.amount; it->second -= cd.change_dts.amount;
if (it->second == 0) if (it->second == 0)
dests.erase(get_account_address_as_str(m_wallet->testnet(), cd.change_dts.addr)); dests.erase(get_account_address_as_str(m_wallet->testnet(), cd.change_dts.addr));
@ -2820,8 +2825,17 @@ bool simple_wallet::accept_loaded_tx(const std::function<size_t()> get_num_txes,
if (dest_string.empty()) if (dest_string.empty())
dest_string = tr("with no destinations"); dest_string = tr("with no destinations");
std::string change_string;
if (change > 0)
{
std::string address = get_account_address_as_str(m_wallet->testnet(), get_tx(0).change_dts.addr);
change_string += (boost::format(tr("%s change to %s")) % print_money(change) % address).str();
}
else
change_string += tr("no change");
uint64_t fee = amount - amount_to_dests; uint64_t fee = amount - amount_to_dests;
std::string prompt_str = (boost::format(tr("Loaded %lu transactions, for %s, fee %s, change %s, %s, with min mixin %lu. Is this okay? (Y/Yes/N/No)")) % (unsigned long)get_num_txes() % print_money(amount) % print_money(fee) % print_money(change) % dest_string % (unsigned long)min_mixin).str(); std::string prompt_str = (boost::format(tr("Loaded %lu transactions, for %s, fee %s, %s, %s, with min mixin %lu. Is this okay? (Y/Yes/N/No)")) % (unsigned long)get_num_txes() % print_money(amount) % print_money(fee) % dest_string % change_string % (unsigned long)min_mixin).str();
std::string accepted = command_line::input_line(prompt_str); std::string accepted = command_line::input_line(prompt_str);
return is_it_true(accepted); return is_it_true(accepted);
} }