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

Merge pull request #6027

Browse Source 
9768e96 simplewallet: remove remaining payment id dead code (moneromooo-monero)
This commit is contained in:
luigi1111 2019-12-12 13:38:00 -06:00
commit a61db51aae
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
1 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/simplewallet/simplewallet.cpp
View File

@ -912,16 +912,6 @@ bool simple_wallet::change_password(const std::vector<std::string> &args)
bool simple_wallet::payment_id(const std::vector<std::string> &args/* = std::vector<std::string>()*/) bool simple_wallet::payment_id(const std::vector<std::string> &args/* = std::vector<std::string>()*/)
{ {
LONG_PAYMENT_ID_SUPPORT_CHECK(); LONG_PAYMENT_ID_SUPPORT_CHECK();
crypto::hash payment_id;
if (args.size() > 0)
{
PRINT_USAGE(USAGE_PAYMENT_ID);
return true;
}
payment_id = crypto::rand<crypto::hash>();
success_msg_writer() << tr("Random payment ID: ") << payment_id;
return true;
} }
bool simple_wallet::print_fee_info(const std::vector<std::string> &args/* = std::vector<std::string>()*/) bool simple_wallet::print_fee_info(const std::vector<std::string> &args/* = std::vector<std::string>()*/)
@ -6293,13 +6283,6 @@ bool simple_wallet::transfer_main(int transfer_type, const std::vector<std::stri
if (tools::wallet2::parse_long_payment_id(payment_id_str, payment_id)) if (tools::wallet2::parse_long_payment_id(payment_id_str, payment_id))
{ {
LONG_PAYMENT_ID_SUPPORT_CHECK(); LONG_PAYMENT_ID_SUPPORT_CHECK();
std::string extra_nonce;
set_payment_id_to_tx_extra_nonce(extra_nonce, payment_id);
r = add_extra_nonce_to_tx_extra(extra, extra_nonce);
local_args.pop_back();
payment_id_seen = true;
message_writer() << tr("Warning: Unencrypted payment IDs will harm your privacy: ask the recipient to use subaddresses instead");
} }
if(!r) if(!r)
{ {
@ -6408,8 +6391,6 @@ bool simple_wallet::transfer_main(int transfer_type, const std::vector<std::stri
else if (tools::wallet2::parse_payment_id(payment_id_uri, payment_id)) else if (tools::wallet2::parse_payment_id(payment_id_uri, payment_id))
{ {
LONG_PAYMENT_ID_SUPPORT_CHECK(); LONG_PAYMENT_ID_SUPPORT_CHECK();
set_payment_id_to_tx_extra_nonce(extra_nonce, payment_id);
message_writer() << tr("Warning: Unencrypted payment IDs will harm your privacy: ask the recipient to use subaddresses instead");
} }
else else
{ {
@ -6945,11 +6926,6 @@ bool simple_wallet::sweep_main(uint64_t below, bool locked, const std::vector<st
if(r) if(r)
{ {
LONG_PAYMENT_ID_SUPPORT_CHECK(); LONG_PAYMENT_ID_SUPPORT_CHECK();
std::string extra_nonce;
set_payment_id_to_tx_extra_nonce(extra_nonce, payment_id);
r = add_extra_nonce_to_tx_extra(extra, extra_nonce);
payment_id_seen = true;
} }
if(!r && local_args.size() == 3) if(!r && local_args.size() == 3)
@ -7191,7 +7167,6 @@ bool simple_wallet::sweep_single(const std::vector<std::string> &args_)
if (tools::wallet2::parse_long_payment_id(local_args.back(), payment_id)) if (tools::wallet2::parse_long_payment_id(local_args.back(), payment_id))
{ {
LONG_PAYMENT_ID_SUPPORT_CHECK(); LONG_PAYMENT_ID_SUPPORT_CHECK();
set_payment_id_to_tx_extra_nonce(extra_nonce, payment_id);
} }
else else
{ {
@ -9421,7 +9396,6 @@ bool simple_wallet::address_book(const std::vector<std::string> &args/* = std::v
if (tools::wallet2::parse_long_payment_id(args[3], payment_id)) if (tools::wallet2::parse_long_payment_id(args[3], payment_id))
{ {
LONG_PAYMENT_ID_SUPPORT_CHECK(); LONG_PAYMENT_ID_SUPPORT_CHECK();
description_start += 2;
} }
else if (tools::wallet2::parse_short_payment_id(args[3], info.payment_id)) else if (tools::wallet2::parse_short_payment_id(args[3], info.payment_id))
{ {