Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4439 

174f31bf simplewallet: don't complain about payment id on pool mined blocks (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2018-09-29 22:13:16 +02:00
parent 559a0cfc92 174f31bf7d
commit 931e7faa0b
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/simplewallet/simplewallet.cpp
View File

@ -4157,10 +4157,11 @@ void simple_wallet::on_money_received(uint64_t height, const crypto::hash &txid,
if (find_tx_extra_field_by_type(tx_extra_fields, extra_nonce)) if (find_tx_extra_field_by_type(tx_extra_fields, extra_nonce))
{ {
crypto::hash8 payment_id8 = crypto::null_hash8; crypto::hash8 payment_id8 = crypto::null_hash8;
crypto::hash payment_id = crypto::null_hash;
if (get_encrypted_payment_id_from_tx_extra_nonce(extra_nonce.nonce, payment_id8)) if (get_encrypted_payment_id_from_tx_extra_nonce(extra_nonce.nonce, payment_id8))
message_writer() << message_writer() <<
tr("NOTE: this transaction uses an encrypted payment ID: consider using subaddresses instead"); tr("NOTE: this transaction uses an encrypted payment ID: consider using subaddresses instead");
else else if (get_payment_id_from_tx_extra_nonce(extra_nonce.nonce, payment_id))
message_writer(console_color_red, false) << message_writer(console_color_red, false) <<
tr("WARNING: this transaction uses an unencrypted payment ID: consider using subaddresses instead"); tr("WARNING: this transaction uses an unencrypted payment ID: consider using subaddresses instead");
} }