carrot_impl: fix payment ID scanning in scanning_tools

src/wallet/scanning_tools.cpp

@@ -81,9 +81,9 @@ static bool parse_tx_extra_for_scanning(const std::vector<std::uint8_t> &tx_extr
 
     // 4. extract nonce string
     cryptonote::tx_extra_nonce field_extra_nonce;
-    if (!cryptonote::find_tx_extra_field_by_type(tx_extra_fields, field_extra_nonce))
-        field_extra_nonce.nonce.clear();
-    
+    if (cryptonote::find_tx_extra_field_by_type(tx_extra_fields, field_extra_nonce))
+        tx_extra_nonce_out = std::move(field_extra_nonce.nonce);
+
     return fully_parsed;
 }
 //-------------------------------------------------------------------------------------------------------------------

src/wallet/wallet2.cpp

@@ -2541,9 +2541,10 @@ void wallet2::process_new_scanned_transaction(
       MWARNING("Found OBSOLETE AND IGNORED unencrypted payment ID: these are bad for privacy, "
         << "use subaddresses or encrypted payment IDs instead");
     }
-    else
+    else if (enote_scan_info->payment_id != payment_id)
     {
       payment_id = enote_scan_info->payment_id;
+      MDEBUG("Found payment ID " << payment_id << " in TX " << txid);
     }
 
     notify = true;