From 77bade91bed93fb377a9de19594800b171e79725 Mon Sep 17 00:00:00 2001
From: Evan Duffield <evan@darkcoin.io>
Date: Wed, 4 Feb 2015 21:05:36 -0700
Subject: [PATCH] version bump

---
 configure.ac        |  2 +-
 src/clientversion.h |  2 +-
 src/darksend.h      |  2 +-
 src/instantx.cpp    | 12 ++++++------
 src/instantx.h      |  2 +-
 src/version.h       |  2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/configure.ac b/configure.ac
index b6c6ea2f4..2832876bc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 0)
 define(_CLIENT_VERSION_MINOR, 11)
 define(_CLIENT_VERSION_REVISION, 1)
-define(_CLIENT_VERSION_BUILD, 7)
+define(_CLIENT_VERSION_BUILD, 8)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2015)
 AC_INIT([Darkcoin Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[info@darkcoin.io],[darkcoin])
diff --git a/src/clientversion.h b/src/clientversion.h
index c16c9cfc6..644c150a1 100644
--- a/src/clientversion.h
+++ b/src/clientversion.h
@@ -12,7 +12,7 @@
 #define CLIENT_VERSION_MAJOR       0
 #define CLIENT_VERSION_MINOR       11
 #define CLIENT_VERSION_REVISION    1
-#define CLIENT_VERSION_BUILD       7
+#define CLIENT_VERSION_BUILD       8
 
 
 
diff --git a/src/darksend.h b/src/darksend.h
index 545af484a..9fcf246c9 100644
--- a/src/darksend.h
+++ b/src/darksend.h
@@ -222,7 +222,7 @@ class CDarksendSession
 class CDarkSendPool
 {
 public:
-    static const int MIN_PEER_PROTO_VERSION = 70057;
+    static const int MIN_PEER_PROTO_VERSION = 70058;
 
     // clients entries
     std::vector<CDarkSendEntry> myEntries;
diff --git a/src/instantx.cpp b/src/instantx.cpp
index 5c3a3f7c6..cbc39596a 100644
--- a/src/instantx.cpp
+++ b/src/instantx.cpp
@@ -66,7 +66,7 @@ void ProcessMessageInstantX(CNode* pfrom, std::string& strCommand, CDataStream&
         bool fMissingInputs = false;
         CValidationState state;
 
-        
+
         if (AcceptToMemoryPool(mempool, state, tx, true, &fMissingInputs))
         {
             RelayTransactionLockReq(tx, tx.GetHash());
@@ -212,7 +212,7 @@ int64_t CreateNewLock(CTransaction tx)
         nTxAge = GetInputAge(i);
         if(nTxAge < 6)
         {
-            LogPrintf("ProcessMessageInstantX::txlreq - Transaction not found / too new: %d / %s\n", nTxAge, tx.GetHash().ToString().c_str());
+            LogPrintf("CreateNewLock - Transaction not found / too new: %d / %s\n", nTxAge, tx.GetHash().ToString().c_str());
             return 0;
         }
     }
@@ -225,7 +225,7 @@ int64_t CreateNewLock(CTransaction tx)
     int nBlockHeight = (chainActive.Tip()->nHeight - nTxAge)+4;
 
     if (!mapTxLocks.count(tx.GetHash())){
-        LogPrintf("InstantX::ProcessConsensusVote - New Transaction Lock %s !\n", tx.GetHash().ToString().c_str());
+        LogPrintf("CreateNewLock - New Transaction Lock %s !\n", tx.GetHash().ToString().c_str());
 
         CTransactionLock newLock;
         newLock.nBlockHeight = nBlockHeight;
@@ -234,7 +234,7 @@ int64_t CreateNewLock(CTransaction tx)
         mapTxLocks.insert(make_pair(tx.GetHash(), newLock));
     } else {
         mapTxLocks[tx.GetHash()].nBlockHeight = nBlockHeight;
-        if(fDebug) LogPrintf("InstantX::ProcessConsensusVote - Transaction Lock Exists %s !\n", tx.GetHash().ToString().c_str());
+        if(fDebug) LogPrintf("CreateNewLock - Transaction Lock Exists %s !\n", tx.GetHash().ToString().c_str());
     }
 
     return nBlockHeight;
@@ -284,7 +284,7 @@ bool ProcessConsensusVote(CConsensusVote& ctx)
 
     if(n > 10)
     {
-        LogPrintf("InstantX::ProcessConsensusVote - Masternode not in the top 10\n");
+        LogPrintf("InstantX::ProcessConsensusVote - Masternode not in the top 10 (%d)\n", n);
         return false;
     }
 
@@ -508,7 +508,7 @@ int CTransactionLock::CountSignatures()
         The votes have no proof it's the correct blockheight
     */
 
-    if(nBlockHeight == 0) return 0;
+    if(nBlockHeight == 0) return -1;
 
     int n = 0;
     BOOST_FOREACH(CConsensusVote v, vecConsensusVotes){
diff --git a/src/instantx.h b/src/instantx.h
index 29238f9d7..fe1e69b4f 100644
--- a/src/instantx.h
+++ b/src/instantx.h
@@ -23,7 +23,7 @@ class CConsensusVote;
 class CTransaction;
 class CTransactionLock;
 
-static const int MIN_INSTANTX_PROTO_VERSION = 70057;
+static const int MIN_INSTANTX_PROTO_VERSION = 70058;
 
 extern map<uint256, CTransaction> mapTxLockReq;
 extern map<uint256, CTransactionLock> mapTxLocks;
diff --git a/src/version.h b/src/version.h
index d316f07ea..5cfc5039b 100644
--- a/src/version.h
+++ b/src/version.h
@@ -27,7 +27,7 @@ extern const std::string CLIENT_DATE;
 // network protocol versioning
 //
 
-static const int PROTOCOL_VERSION = 70057;
+static const int PROTOCOL_VERSION = 70058;
 
 // intial proto version, to be increased after version/verack negotiation
 static const int INIT_PROTO_VERSION = 209;