Bump client and wallet version.

TODO.md

@@ -15,14 +15,15 @@ DONE:
 - Changed genesisblockhash and timestamp
 - Reviewed and updated checkpoints
 - Adjusted algorithm (X11)
+- Updated subsidity function (Block value)
+- Adjusted wallet keypool size to 1000 and added loading indicator on fresh wallet load
 
 
 MUST-HAVE:
 ----------
 
-- Adjust difficulty/subsidity (KGW, DGW based on blockheight)
+- Adjust difficulty (KGW, DGW based on blockheight)
 - Add masternode payment checks a.k.a. enforcement (based on blockheight)
-- Adjust wallet keypool size and add loading indicator on fresh wallet
 - Remove Bitcoin dead weight (SHA256, hardcoded keys, nodes)
 
 

src/clientversion.h

@@ -10,8 +10,8 @@
 
 // These need to be macros, as version.cpp's and darkcoin-qt.rc's voodoo requires it
 #define CLIENT_VERSION_MAJOR       0
-#define CLIENT_VERSION_MINOR       9
-#define CLIENT_VERSION_REVISION    3
+#define CLIENT_VERSION_MINOR       11
+#define CLIENT_VERSION_REVISION    0
 #define CLIENT_VERSION_BUILD       0
 
 // Set to true for release, false for prerelease or test build

src/wallet.cpp

 // Copyright (c) 2009-2010 Satoshi Nakamoto
 // Copyright (c) 2009-2014 The Bitcoin developers
+// Copyright (c) 2014 vertoe & the Darkcoin developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -1617,7 +1618,7 @@ bool CWallet::NewKeyPool()
         if (IsLocked())
             return false;
 
-        int64_t nKeys = max(GetArg("-keypool", 100), (int64_t)0);
+        int64_t nKeys = max(GetArg("-keypool", 1000), (int64_t) 0);
         for (int i = 0; i < nKeys; i++)
         {
             int64_t nIndex = i+1;
@@ -1644,7 +1645,7 @@ bool CWallet::TopUpKeyPool(unsigned int kpSize)
         if (kpSize > 0)
             nTargetSize = kpSize;
         else
-            nTargetSize = max(GetArg("-keypool", 100), (int64_t) 0);
+            nTargetSize = max(GetArg("-keypool", 1000), (int64_t) 0);
 
         while (setKeyPool.size() < (nTargetSize + 1))
         {
@@ -1655,6 +1656,9 @@ bool CWallet::TopUpKeyPool(unsigned int kpSize)
                 throw runtime_error("TopUpKeyPool() : writing generated key failed");
             setKeyPool.insert(nEnd);
             LogPrintf("keypool added key %d, size=%u\n", nEnd, setKeyPool.size());
+
+            std::string strMsg = strprintf(_("Loading wallet... (Generating keys %d/1000)"), nEnd);
+            uiInterface.InitMessage(strMsg);
         }
     }
     return true;

src/wallet.h

@@ -47,7 +47,7 @@ enum WalletFeature
     FEATURE_WALLETCRYPT = 40000, // wallet encryption
     FEATURE_COMPRPUBKEY = 60000, // compressed public keys
 
-    FEATURE_LATEST = 60000
+    FEATURE_LATEST = 60002
 };