Allow the default key to be unavailable

sipa · recursive-rat4 · commit 2f4d0a82bc48 · 2014-05-05T22:41:33.000+04:00
This solves the issue where no default key can be added after -salvagewallet.

Conflicts:
	src/main.cpp
	src/wallet.cpp
diff --git a/src/init.cpp b/src/init.cpp
@@ -813,11 +813,11 @@ bool AppInit2()
         RandAddSeedPerfmon();
 
         CPubKey newDefaultKey;
-        if (!pwalletMain->GetKeyFromPool(newDefaultKey, false))
-            strErrors << _("Cannot initialize keypool") << "\n";
-        pwalletMain->SetDefaultKey(newDefaultKey);
-        if (!pwalletMain->SetAddressBookName(pwalletMain->vchDefaultKey.GetID(), ""))
-            strErrors << _("Cannot write default address") << "\n";
+        if (pwalletMain->GetKeyFromPool(newDefaultKey, false)) {
+            pwalletMain->SetDefaultKey(newDefaultKey);
+            if (!pwalletMain->SetAddressBookName(pwalletMain->vchDefaultKey.GetID(), ""))
+                strErrors << _("Cannot write default address") << "\n";
+        }
     }
 
     printf("%s", strErrors.str().c_str());
diff --git a/src/miner.cpp b/src/miner.cpp
@@ -125,7 +125,10 @@ CBlock* CreateNewBlock(CWallet* pwallet, bool fProofOfStake, int64_t* pFees)
     if (!fProofOfStake)
     {
         CReserveKey reservekey(pwallet);
-        txNew.vout[0].scriptPubKey.SetDestination(reservekey.GetReservedKey().GetID());
+        CPubKey pubkey;
+        if (!reservekey.GetReservedKey(pubkey))
+            return NULL;
+        txNew.vout[0].scriptPubKey.SetDestination(pubkey.GetID());
     }
     else
     {
diff --git a/src/wallet.cpp b/src/wallet.cpp
@@ -509,17 +509,19 @@ bool CWallet::AddToWallet(const CWalletTx& wtxIn)
                 return false;
 #ifndef QT_GUI
         // If default receiving address gets used, replace it with a new one
-        CScript scriptDefaultKey;
-        scriptDefaultKey.SetDestination(vchDefaultKey.GetID());
-        BOOST_FOREACH(const CTxOut& txout, wtx.vout)
-        {
-            if (txout.scriptPubKey == scriptDefaultKey)
+        if (vchDefaultKey.IsValid()) {
+            CScript scriptDefaultKey;
+            scriptDefaultKey.SetDestination(vchDefaultKey.GetID());
+            BOOST_FOREACH(const CTxOut& txout, wtx.vout)
             {
-                CPubKey newDefaultKey;
-                if (GetKeyFromPool(newDefaultKey, false))
+                if (txout.scriptPubKey == scriptDefaultKey)
                 {
-                    SetDefaultKey(newDefaultKey);
-                    SetAddressBookName(vchDefaultKey.GetID(), "");
+                    CPubKey newDefaultKey;
+                    if (GetKeyFromPool(newDefaultKey, false))
+                    {
+                        SetDefaultKey(newDefaultKey);
+                        SetAddressBookName(vchDefaultKey.GetID(), "");
+                    }
                 }
             }
         }
@@ -1437,7 +1439,8 @@ bool CWallet::CreateTransaction(const vector<pair<CScript, int64_t> >& vecSend,
                         //  post-backup change.
 
                         // Reserve a new key pair from key pool
-                        CPubKey vchPubKey = reservekey.GetReservedKey();
+                        CPubKey vchPubKey;
+                        assert(reservekey.GetReservedKey(vchPubKey)); // should never fail, as we just unlocked
 
                         scriptChange.SetDestination(vchPubKey.GetID());
                     }
@@ -2321,22 +2324,25 @@ void CWallet::DisableTransaction(const CTransaction &tx)
     }
 }
 
-CPubKey CReserveKey::GetReservedKey()
+bool CReserveKey::GetReservedKey(CPubKey& pubkey)
 {
     if (nIndex == -1)
     {
         CKeyPool keypool;
         pwallet->ReserveKeyFromKeyPool(nIndex, keypool);
         if (nIndex != -1)
             vchPubKey = keypool.vchPubKey;
-        else
-        {
-            printf("CReserveKey::GetReservedKey(): Warning: Using default key instead of a new key, top up your keypool!");
-            vchPubKey = pwallet->vchDefaultKey;
+        else {
+            if (pwallet->vchDefaultKey.IsValid()) {
+                printf("CReserveKey::GetReservedKey(): Warning: Using default key instead of a new key, top up your keypool!");
+                vchPubKey = pwallet->vchDefaultKey;
+            } else
+                return false;
         }
     }
     assert(vchPubKey.IsValid());
-    return vchPubKey;
+    pubkey = vchPubKey;
+    return true;
 }
 
 void CReserveKey::KeepKey()
diff --git a/src/wallet.h b/src/wallet.h
@@ -345,7 +345,7 @@ class CReserveKey
     }
 
     void ReturnKey();
-    CPubKey GetReservedKey();
+    bool GetReservedKey(CPubKey &pubkey);
     void KeepKey();
 };
 

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,10 @@ CBlock* CreateNewBlock(CWallet* pwallet, bool fProofOfStake, int64_t* pFees)`
`125`	`125`	`if (!fProofOfStake)`
`126`	`126`	`{`
`127`	`127`	`CReserveKey reservekey(pwallet);`
`128`		`- txNew.vout[0].scriptPubKey.SetDestination(reservekey.GetReservedKey().GetID());`
	`128`	`+ CPubKey pubkey;`
	`129`	`+ if (!reservekey.GetReservedKey(pubkey))`
	`130`	`+ return NULL;`
	`131`	`+ txNew.vout[0].scriptPubKey.SetDestination(pubkey.GetID());`
`129`	`132`	`}`
`130`	`133`	`else`
`131`	`134`	`{`
Original file line number	Diff line number	Diff line change
`@@ -509,17 +509,19 @@ bool CWallet::AddToWallet(const CWalletTx& wtxIn)`
`509`	`509`	`return false;`
`510`	`510`	`#ifndef QT_GUI`
`511`	`511`	`// If default receiving address gets used, replace it with a new one`
`512`		`- CScript scriptDefaultKey;`
`513`		`- scriptDefaultKey.SetDestination(vchDefaultKey.GetID());`
`514`		`- BOOST_FOREACH(const CTxOut& txout, wtx.vout)`
`515`		`- {`
`516`		`- if (txout.scriptPubKey == scriptDefaultKey)`
	`512`	`+ if (vchDefaultKey.IsValid()) {`
	`513`	`+ CScript scriptDefaultKey;`
	`514`	`+ scriptDefaultKey.SetDestination(vchDefaultKey.GetID());`
	`515`	`+ BOOST_FOREACH(const CTxOut& txout, wtx.vout)`
`517`	`516`	`{`
`518`		`- CPubKey newDefaultKey;`
`519`		`- if (GetKeyFromPool(newDefaultKey, false))`
	`517`	`+ if (txout.scriptPubKey == scriptDefaultKey)`
`520`	`518`	`{`
`521`		`- SetDefaultKey(newDefaultKey);`
`522`		`- SetAddressBookName(vchDefaultKey.GetID(), "");`
	`519`	`+ CPubKey newDefaultKey;`
	`520`	`+ if (GetKeyFromPool(newDefaultKey, false))`
	`521`	`+ {`
	`522`	`+ SetDefaultKey(newDefaultKey);`
	`523`	`+ SetAddressBookName(vchDefaultKey.GetID(), "");`
	`524`	`+ }`
`523`	`525`	`}`
`524`	`526`	`}`
`525`	`527`	`}`
`@@ -1437,7 +1439,8 @@ bool CWallet::CreateTransaction(const vector<pair<CScript, int64_t> >& vecSend,`
`1437`	`1439`	`// post-backup change.`
`1438`	`1440`
`1439`	`1441`	`// Reserve a new key pair from key pool`
`1440`		`- CPubKey vchPubKey = reservekey.GetReservedKey();`
	`1442`	`+ CPubKey vchPubKey;`
	`1443`	`+ assert(reservekey.GetReservedKey(vchPubKey)); // should never fail, as we just unlocked`
`1441`	`1444`
`1442`	`1445`	`scriptChange.SetDestination(vchPubKey.GetID());`
`1443`	`1446`	`}`
`@@ -2321,22 +2324,25 @@ void CWallet::DisableTransaction(const CTransaction &tx)`
`2321`	`2324`	`}`
`2322`	`2325`	`}`
`2323`	`2326`
`2324`		`-CPubKey CReserveKey::GetReservedKey()`
	`2327`	`+bool CReserveKey::GetReservedKey(CPubKey& pubkey)`
`2325`	`2328`	`{`
`2326`	`2329`	`if (nIndex == -1)`
`2327`	`2330`	`{`
`2328`	`2331`	`CKeyPool keypool;`
`2329`	`2332`	`pwallet->ReserveKeyFromKeyPool(nIndex, keypool);`
`2330`	`2333`	`if (nIndex != -1)`
`2331`	`2334`	`vchPubKey = keypool.vchPubKey;`
`2332`		`- else`
`2333`		`- {`
`2334`		`- printf("CReserveKey::GetReservedKey(): Warning: Using default key instead of a new key, top up your keypool!");`
`2335`		`- vchPubKey = pwallet->vchDefaultKey;`
	`2335`	`+ else {`
	`2336`	`+ if (pwallet->vchDefaultKey.IsValid()) {`
	`2337`	`+ printf("CReserveKey::GetReservedKey(): Warning: Using default key instead of a new key, top up your keypool!");`
	`2338`	`+ vchPubKey = pwallet->vchDefaultKey;`
	`2339`	`+ } else`
	`2340`	`+ return false;`
`2336`	`2341`	`}`
`2337`	`2342`	`}`
`2338`	`2343`	`assert(vchPubKey.IsValid());`
`2339`		`- return vchPubKey;`
	`2344`	`+ pubkey = vchPubKey;`
	`2345`	`+ return true;`
`2340`	`2346`	`}`
`2341`	`2347`
`2342`	`2348`	`void CReserveKey::KeepKey()`
Original file line number	Diff line number	Diff line change
`@@ -345,7 +345,7 @@ class CReserveKey`
`345`	`345`	`}`
`346`	`346`
`347`	`347`	`void ReturnKey();`
`348`		`- CPubKey GetReservedKey();`
	`348`	`+ bool GetReservedKey(CPubKey &pubkey);`
`349`	`349`	`void KeepKey();`
`350`	`350`	`};`
`351`	`351`