diff --git a/configure.ac b/configure.ac index 1be2cba1d..e671db1e7 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, 22) +define(_CLIENT_VERSION_BUILD, 23) 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 89c544a46..db486da85 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 22 +#define CLIENT_VERSION_BUILD 23 diff --git a/src/main.cpp b/src/main.cpp index 3e052f963..5b8654009 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -4053,8 +4053,9 @@ void static ProcessGetData(CNode* pfrom) if (!pushed && inv.type == MSG_MASTERNODE_WINNER) { if(mapSeenMasternodeVotes.count(inv.hash)){ CDataStream ss(SER_NETWORK, PROTOCOL_VERSION); + int a = 0; ss.reserve(1000); - ss << mapSeenMasternodeVotes[inv.hash]; + ss << mapSeenMasternodeVotes[inv.hash] << a; pfrom->PushMessage("mnw", ss); pushed = true; } diff --git a/src/masternode.cpp b/src/masternode.cpp index a94bd1ba3..511dfa14e 100644 --- a/src/masternode.cpp +++ b/src/masternode.cpp @@ -331,7 +331,8 @@ void ProcessMessageMasternode(CNode* pfrom, std::string& strCommand, CDataStream else if (strCommand == "mnw") { //Masternode Payments Declare Winner //this is required in litemode CMasternodePaymentWinner winner; - vRecv >> winner; + int a = 0; + vRecv >> winner >> a; if(chainActive.Tip() == NULL) return; @@ -600,7 +601,7 @@ void CMasterNode::Check() bool CMasternodePayments::CheckSignature(CMasternodePaymentWinner& winner) { //note: need to investigate why this is failing - std::string strMessage = winner.vin.ToString().c_str() + boost::lexical_cast(winner.nBlockHeight); + std::string strMessage = winner.vin.ToString().c_str() + boost::lexical_cast(winner.nBlockHeight) + winner.payee.ToString(); std::string strPubKey = (Params().NetworkID() == CChainParams::MAIN) ? strMainPubKey : strTestPubKey; CPubKey pubkey(ParseHex(strPubKey)); @@ -614,7 +615,7 @@ bool CMasternodePayments::CheckSignature(CMasternodePaymentWinner& winner) bool CMasternodePayments::Sign(CMasternodePaymentWinner& winner) { - std::string strMessage = winner.vin.ToString().c_str() + boost::lexical_cast(winner.nBlockHeight); + std::string strMessage = winner.vin.ToString().c_str() + boost::lexical_cast(winner.nBlockHeight) + winner.payee.ToString(); CKey key2; CPubKey pubkey2; @@ -649,7 +650,7 @@ uint64_t CMasternodePayments::CalculateScore(uint256 blockHash, CTxIn& vin) //printf(" -- CMasternodePayments CalculateScore() n2 = %d \n", n2.Get64()); //printf(" -- CMasternodePayments CalculateScore() n3 = %d \n", n3.Get64()); //printf(" -- CMasternodePayments CalculateScore() n4 = %d \n", n4.Get64()); - + return n4.Get64(); } @@ -705,7 +706,7 @@ bool CMasternodePayments::AddWinningMasternode(CMasternodePaymentWinner& winnerI if(!foundBlock){ vWinning.push_back(winnerIn); mapSeenMasternodeVotes.insert(make_pair(winnerIn.GetHash(), winnerIn)); - + return true; }