Merge pull request #3069 from Diapolo/fix_addressbook

don't touch addressbook when using secure payment-requests

src/qt/walletmodel.cpp

@@ -258,22 +258,26 @@ WalletModel::SendCoinsReturn WalletModel::sendCoins(WalletModelTransaction &tran
     // and emit coinsSent signal for each recipient
     foreach(const SendCoinsRecipient &rcp, transaction.getRecipients())
     {
-        std::string strAddress = rcp.address.toStdString();
+        // Don't touch the address book when we have a secure payment-request
-        CTxDestination dest = CBitcoinAddress(strAddress).Get();
+        if (rcp.authenticatedMerchant.isEmpty())
-        std::string strLabel = rcp.label.toStdString();
         {
-            LOCK(wallet->cs_wallet);
+            std::string strAddress = rcp.address.toStdString();
-
+            CTxDestination dest = CBitcoinAddress(strAddress).Get();
-            std::map<CTxDestination, CAddressBookData>::iterator mi = wallet->mapAddressBook.find(dest);
+            std::string strLabel = rcp.label.toStdString();
-
-            // Check if we have a new address or an updated label
-            if (mi == wallet->mapAddressBook.end())
-            {
-                wallet->SetAddressBook(dest, strLabel, "send");
-            }
-            else if (mi->second.name != strLabel)
             {
-                wallet->SetAddressBook(dest, strLabel, ""); // "" means don't change purpose
+                LOCK(wallet->cs_wallet);
+
+                std::map<CTxDestination, CAddressBookData>::iterator mi = wallet->mapAddressBook.find(dest);
+
+                // Check if we have a new address or an updated label
+                if (mi == wallet->mapAddressBook.end())
+                {
+                    wallet->SetAddressBook(dest, strLabel, "send");
+                }
+                else if (mi->second.name != strLabel)
+                {
+                    wallet->SetAddressBook(dest, strLabel, ""); // "" means don't change purpose
+                }
             }
         }
         emit coinsSent(wallet, rcp, transaction_array);