rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-23 11:23:26 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5018

Browse Source 
8bd71677 simplewallet: remove ability to transfer with detached short payment ids (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2019-01-16 21:35:48 +02:00
commit 46fcae717a
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 2 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/simplewallet/simplewallet.cpp
View File

@ -5319,19 +5319,6 @@ bool simple_wallet::transfer_main(int transfer_type, const std::vector<std::stri
payment_id_seen = true;
message_writer() << tr("Unencrypted payment IDs are bad for privacy: ask the recipient to use subaddresses instead");
}
else
{
crypto::hash8 payment_id8;
if (tools::wallet2::parse_short_payment_id(payment_id_str, payment_id8))
{
std::string extra_nonce;
set_encrypted_payment_id_to_tx_extra_nonce(extra_nonce, payment_id8);
r = add_extra_nonce_to_tx_extra(extra, extra_nonce);
local_args.pop_back();
payment_id_seen = true;
}
}
if(!r)
{
fail_msg_writer() << tr("payment id failed to encode");
@ -5984,18 +5971,6 @@ bool simple_wallet::sweep_main(uint64_t below, bool locked, const std::vector<st
r = add_extra_nonce_to_tx_extra(extra, extra_nonce);
payment_id_seen = true;
}
else
{
crypto::hash8 payment_id8;
r = tools::wallet2::parse_short_payment_id(payment_id_str, payment_id8);
if(r)
{
std::string extra_nonce;
set_encrypted_payment_id_to_tx_extra_nonce(extra_nonce, payment_id8);
r = add_extra_nonce_to_tx_extra(extra, extra_nonce);
payment_id_seen = true;
}
}
if(!r && local_args.size() == 3)
{
@ -6248,10 +6223,6 @@ bool simple_wallet::sweep_single(const std::vector<std::string> &args_)
{
set_payment_id_to_tx_extra_nonce(extra_nonce, payment_id);
}
else if(tools::wallet2::parse_short_payment_id(local_args.back(), payment_id8))
{
set_encrypted_payment_id_to_tx_extra_nonce(extra_nonce, payment_id8);
}
else
{
fail_msg_writer() << tr("failed to parse Payment ID");
@ -8255,8 +8226,8 @@ bool simple_wallet::address_book(const std::vector<std::string> &args/* = std::v
}
else if (tools::wallet2::parse_short_payment_id(args[3], info.payment_id))
{
memcpy(payment_id.data, info.payment_id.data, 8);
description_start += 2;
fail_msg_writer() << tr("Short payment IDs are to be used within an integrated address only");
return true;
}
else
{