Merge pull request #6 from StealthSend/dev-fork005

Dev fork005

Author: StealthSend

Stealth.pro

@@ -18,7 +18,7 @@ win32 {
 
 TEMPLATE = app
 TARGET = "Stealth Qt"
-VERSION = 2.1.0.0
+VERSION = 2.1.0.1
 INCLUDEPATH += src src/json src/qt src/tor
 INCLUDEPATH += src/tor/adapter src/tor/common src/tor/ext
 INCLUDEPATH += src/tor/ext/curve25519_donna src/tor/ext/ed25519/donna

contrib/macdeploy/Info.plist

@@ -9,16 +9,16 @@
         <key>CFBundlePackageType</key>
         <string>APPL</string>
         <key>CFBundleGetInfoString</key>
-        <string>StealthCoin [XST] Complete Anonymity 2.1.0.0</string>
+        <string>StealthCoin [XST] Complete Anonymity 2.1.0.1</string>
         <key>CFBundleExecutable</key>
         <string>Stealth Qt</string>
         <key>CFBundleIdentifier</key>
         <string>com.stealth-coin.stealthcoin-qt</string>
         <key>CFBundleShortVersionString</key>
-        <string>2.1.0.0</string>
+        <string>2.1.0.1</string>
         <key>CFBundleSignature</key>
         <string>oXST</string>
         <key>CFBundleVersion</key>
-        <string>2.1.0.0</string>
+        <string>2.1.0.1</string>
 </dict>
 </plist>

src/clientversion.h

@@ -9,7 +9,7 @@
 #define CLIENT_VERSION_MAJOR       2
 #define CLIENT_VERSION_MINOR       1
 #define CLIENT_VERSION_REVISION    0
-#define CLIENT_VERSION_BUILD       0
+#define CLIENT_VERSION_BUILD       1
 
 // Converts the parameter X to a string after macro replacement on X has been performed.
 // Don't merge these into one macro!

src/version.h

@@ -32,6 +32,7 @@ extern const std::string CLIENT_DATE;
 //         Technically not a network protocol difference
 // 62020 : Fixes signature malleability
 // 62100 : Clockdrift improvements & Checklocktimeverify (forking)
+//         Client version: 2.1.0
 static const int PROTOCOL_VERSION = 62100;
 
 // intial proto version, to be increased after version/verack negotiation
@@ -64,6 +65,6 @@ static const int DATABASE_VERSION = 61201;
 #define DISPLAY_VERSION_MAJOR       2
 #define DISPLAY_VERSION_MINOR       1
 #define DISPLAY_VERSION_REVISION    0
-#define DISPLAY_VERSION_BUILD       0
+#define DISPLAY_VERSION_BUILD       1
 
 #endif

src/wallet.cpp

@@ -1518,8 +1518,10 @@ bool CWallet::CreateTransaction(const vector<pair<CScript, int64> >& vecSend, CW
 
                 int nIn = 0;
                 BOOST_FOREACH(const PAIRTYPE(const CWalletTx*,unsigned int)& coin, setCoins)
-                if (!SignSignature(*this, *coin.first, wtxNew, nIn++))
+                if (SignSignature(*this, *coin.first, wtxNew, nIn++) != 0)
+                {
                     return false;
+                }
 
                 unsigned int nBytes = ::GetSerializeSize(*(CTransaction*)&wtxNew, SER_NETWORK, PROTOCOL_VERSION);
                 if (nBytes >= MAX_BLOCK_SIZE_GEN/5)
@@ -2525,8 +2527,10 @@ bool CWallet::CreateCoinStake(const CKeyStore& keystore, unsigned int nBits, int
         int nIn = 0;
         BOOST_FOREACH(const CWalletTx* pcoin, vwtxPrev)
         {
-            if (!SignSignature(*this, *pcoin, txNew, nIn++))
+            if (SignSignature(*this, *pcoin, txNew, nIn++) != 0)
+            {
                 return error("CreateCoinStake : failed to sign coinstake");
+            }
         }
 
         // Limit size