PUBKEY_PAIR_ADDRESS / PUBKEY_PAIR_ADDRESS_TEST

[novacoin.git] / src / wallet.cpp

diff --git a/src/wallet.cpp b/src/wallet.cpp
index c720615..908afaa 100644 (file)
--- a/src/wallet.cpp
+++ b/src/wallet.cpp
@@ -2121,7 +2121,6 @@ bool CWallet::CommitTransaction(CWalletTx& wtxNew, CReserveKey& reservekey)
             AddToWallet(wtxNew);
 
             // Mark old coins as spent
-            set<CWalletTx*> setCoins;
             BOOST_FOREACH(const CTxIn& txin, wtxNew.vin)
             {
                 CWalletTx &coin = mapWallet[txin.prevout.hash];
@@ -2830,7 +2829,7 @@ bool CWallet::ExtractAddress(const CScript& scriptPubKey, std::string& addressRe
         if (!CheckOwnership(CPubKey(vSolutions[0]), CPubKey(vSolutions[1]), view))
             return false;
 
-        addressRet = view.GetMalleablePubKey().ToString();
+        addressRet = CBitcoinAddress(view.GetMalleablePubKey()).ToString();
         return true;
     }
     else if (whichType == TX_PUBKEYHASH)