diff options
| author | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2018-09-25 12:33:39 +0000 |
|---|---|---|
| committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2018-09-25 12:34:42 +0000 |
| commit | 174f31bf7d53b032523f89cfe3ac78e9df2f784e (patch) | |
| tree | 890ca51d6bdfda87e137602b0dcb8fccc3d6f8c5 /src/simplewallet/simplewallet.cpp | |
| parent | Merge pull request #4416 (diff) | |
| download | monero-174f31bf7d53b032523f89cfe3ac78e9df2f784e.tar.xz | |
simplewallet: don't complain about payment id on pool mined blocks
Those use the extra nonce without a payment id
Diffstat (limited to '')
| -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"); } |