X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fwallet.cpp;h=e3ca7d297d908c0d37205fcef3fbed0392ab41b5;hb=d764d9161e548c7fbf835b70eb9d5c75caa28ff5;hp=3ed880f600e69ee906f3b96a60762d1bdde2a3a5;hpb=9e9869d0fe9c5cb38273a557e28b1922356d0e11;p=novacoin.git

diff --git a/src/wallet.cpp b/src/wallet.cpp
index 3ed880f..e3ca7d2 100644
--- a/src/wallet.cpp
+++ b/src/wallet.cpp
@@ -187,10 +187,12 @@ bool CWallet::EncryptWallet(const string& strWalletPassphrase)
         }
 
         Lock();
-    }
 
-    if (Resilver(strWalletFile))
-        CWalletDB(strWalletFile, "r+").WriteSetting("fIsResilvered", true);
+        // Need to completely rewrite the wallet file; if we don't, bdb might keep
+        // bits of the unencrypted private key in slack space in the database file.
+        setKeyPool.clear();
+        CDB::Rewrite(strWalletFile, "\x04pool");
+    }
 
     return true;
 }
@@ -1145,11 +1147,16 @@ int CWallet::LoadWallet(bool& fFirstRunRet)
         return false;
     fFirstRunRet = false;
     int nLoadWalletRet = CWalletDB(strWalletFile,"cr+").LoadWallet(this);
-    if (nLoadWalletRet == DB_NEED_RESILVER)
+    if (nLoadWalletRet == DB_NEED_REWRITE)
     {
-        if (Resilver(strWalletFile))
-            CWalletDB(strWalletFile, "r+").WriteSetting("fIsResilvered", true);
-        nLoadWalletRet = DB_LOAD_OK;
+        if (CDB::Rewrite(strWalletFile, "\x04pool"))
+        {
+            setKeyPool.clear();
+            // Note: can't top-up keypool here, because wallet is locked.
+            // User will be prompted to unlock wallet the next operation
+            // the requires a new key.
+        }
+        nLoadWalletRet = DB_NEED_REWRITE;
     }
 
     if (nLoadWalletRet != DB_LOAD_OK)