diff --git a/configure.ac b/configure.ac index 9b17c6dea..f255ea5d3 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, 11) +define(_CLIENT_VERSION_BUILD, 12) 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 ebdad62ab..a145984f9 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 11 +#define CLIENT_VERSION_BUILD 12 diff --git a/src/darksend.h b/src/darksend.h index 06717395e..1d8671ad5 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 = 70061; + static const int MIN_PEER_PROTO_VERSION = 70062; // clients entries std::vector myEntries; diff --git a/src/instantx.cpp b/src/instantx.cpp index 7056c545d..3f06c952c 100644 --- a/src/instantx.cpp +++ b/src/instantx.cpp @@ -158,9 +158,9 @@ void ProcessMessageInstantX(CNode* pfrom, std::string& strCommand, CDataStream& LOCK(cs_vNodes); BOOST_FOREACH(CNode* pnode, vNodes) - { + {/* if(!pnode->fRelayTxes) - continue; + continue;*/ pnode->PushMessage("txlvote", ctx); } @@ -297,12 +297,13 @@ bool ProcessConsensusVote(CConsensusVote& ctx) int x = GetMasternodeByVin(ctx.vinMasternode); if(x != -1){ - LogPrintf("InstantX::ProcessConsensusVote - Masternode ADDR %s %d\n", vecMasternodes[x].addr.ToString().c_str(), n); + if(fDebug) LogPrintf("InstantX::ProcessConsensusVote - Masternode ADDR %s %d\n", vecMasternodes[x].addr.ToString().c_str(), n); } if(n == -1) { - LogPrintf("InstantX::ProcessConsensusVote - Unknown Masternode\n"); + //can be caused by past versions trying to vote with an invalid protocol + if(fDebug) LogPrintf("InstantX::ProcessConsensusVote - Unknown Masternode\n"); return false; } diff --git a/src/instantx.h b/src/instantx.h index 2308d6216..b7a71c17f 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 = 70061; +static const int MIN_INSTANTX_PROTO_VERSION = 70062; extern map mapTxLockReq; extern map mapTxLocks; diff --git a/src/version.h b/src/version.h index 8d3daa41e..2afd7bc83 100644 --- a/src/version.h +++ b/src/version.h @@ -27,13 +27,13 @@ extern const std::string CLIENT_DATE; // network protocol versioning // -static const int PROTOCOL_VERSION = 70061; +static const int PROTOCOL_VERSION = 70062; // intial proto version, to be increased after version/verack negotiation static const int INIT_PROTO_VERSION = 209; // disconnect from peers older than this proto version -static const int MIN_PEER_PROTO_VERSION = 70051; +static const int MIN_PEER_PROTO_VERSION = 70062; //70051 // nTime field added to CAddress, starting with this version; // if possible, avoid requesting addresses nodes older than this