diff options
| author | Riccardo Spagni <ric@spagni.net> | 2018-09-29 22:13:16 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2018-09-29 22:20:05 +0200 |
| commit | b710d780268de63e77cd0d0a3efaf733819f4897 (patch) | |
| tree | 365fe5d4ef9f53ebaa38cb248499fe0a39f9aab2 | |
| parent | Merge pull request #4434 (diff) | |
| download | monero-b710d780268de63e77cd0d0a3efaf733819f4897.tar.xz | |
Merge pull request #4439
174f31bf simplewallet: don't complain about payment id on pool mined blocks (moneromooo-monero)
| -rw-r--r-- | src/simplewallet/simplewallet.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index 302d2a999..06655ed69 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -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)) { 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)) message_writer() << 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) << tr("WARNING: this transaction uses an unencrypted payment ID: consider using subaddresses instead"); } |