Merge pull request #3074 from laanwj/2013_10_remove_default_key_1

Remove automatic update of default key
11 years ago · 496c2a3542
parent 749230d05c b0091bb896
commit 496c2a3542
1 changed files with 0 additions and 19 deletions
--- a/src/wallet.cpp
+++ b/src/wallet.cpp
@ -483,25 +483,6 @@ bool CWallet::AddToWallet(const CWalletTx& wtxIn)
            if (!wtx.WriteToDisk())
                return false;

-        if (!fHaveGUI) {
-            // If default receiving address gets used, replace it with a new one
-            if (vchDefaultKey.IsValid()) {
-                CScript scriptDefaultKey;
-                scriptDefaultKey.SetDestination(vchDefaultKey.GetID());
-                BOOST_FOREACH(const CTxOut& txout, wtx.vout)
-                {
-                    if (txout.scriptPubKey == scriptDefaultKey)
-                    {
-                        CPubKey newDefaultKey;
-                        if (GetKeyFromPool(newDefaultKey))
-                        {
-                            SetDefaultKey(newDefaultKey);
-                            SetAddressBook(vchDefaultKey.GetID(), "", "receive");
-                        }
-                    }
-                }
-            }
-        }
        // since AddToWallet is called directly for self-originating transactions, check for consumption of own coins
        WalletUpdateSpent(wtx);