From dda57680262f63ac4cfab857b793872c8671dc63 Mon Sep 17 00:00:00 2001 From: Evan Duffield Date: Sun, 12 Oct 2014 07:57:01 -0700 Subject: [PATCH] req version, payment signatures --- src/darksend.cpp | 4 ++-- src/main.cpp | 2 +- src/rpcdarksend.cpp | 4 ++-- src/version.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/darksend.cpp b/src/darksend.cpp index ae175a082e..d3d6832822 100644 --- a/src/darksend.cpp +++ b/src/darksend.cpp @@ -1323,7 +1323,7 @@ bool CMasternodePayments::AddWinningMasternode(CMasternodePaymentWinner& winnerI void CMasternodePayments::CleanPaymentList() { - if(pindexBest == NULL); + if(pindexBest == NULL) return; vector::iterator it; for(it=vWinning.begin();it= pindexBest->nHeight-10 && winner.nBlockHeight <= pindexBest->nHeight + 20) node->PushMessage("mnw", winner); } diff --git a/src/main.cpp b/src/main.cpp index 39659db25b..46b8d89dc7 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -4222,7 +4222,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) if(!masternodePayments.CheckSignature(winner)){ LogPrintf("mnw - invalid signature\n"); - pfrom->Misbehaving(100); + //pfrom->Misbehaving(100); return false; } diff --git a/src/rpcdarksend.cpp b/src/rpcdarksend.cpp index de5890b15b..bf4f9183a1 100644 --- a/src/rpcdarksend.cpp +++ b/src/rpcdarksend.cpp @@ -184,7 +184,7 @@ Value masternode(const Array& params, bool fHelp) darkSendPool.RegisterAsMasterNode(false); pwalletMain->Lock(); - if(darkSendPool.isCapableMasterNode == MASTERNODE_INPUT_TOO_NEW) return "masternode input must have at least 200 confirmations"; + if(darkSendPool.isCapableMasterNode == MASTERNODE_INPUT_TOO_NEW) return "masternode input must have at least 15 confirmations"; if(darkSendPool.isCapableMasterNode == MASTERNODE_STOPPED) return "masternode is stopped"; if(darkSendPool.isCapableMasterNode == MASTERNODE_IS_CAPABLE) return "successfully started masternode"; if(darkSendPool.masternodePortOpen == MASTERNODE_PORT_NOT_OPEN) return "inbound port is not open. Please open it and try again. (19999 for testnet and 9999 for mainnet)"; @@ -196,7 +196,7 @@ Value masternode(const Array& params, bool fHelp) if (strCommand == "debug") { - if(darkSendPool.isCapableMasterNode == MASTERNODE_INPUT_TOO_NEW) return "masternode input must have at least 200 confirmations"; + if(darkSendPool.isCapableMasterNode == MASTERNODE_INPUT_TOO_NEW) return "masternode input must have at least 15 confirmations"; if(darkSendPool.isCapableMasterNode == MASTERNODE_IS_CAPABLE) return "successfully started masternode"; if(darkSendPool.isCapableMasterNode == MASTERNODE_STOPPED) return "masternode is stopped"; if(darkSendPool.masternodePortOpen == MASTERNODE_PORT_NOT_OPEN) return "inbound port is not open. Please open it and try again. (19999 for testnet and 9999 for mainnet)"; diff --git a/src/version.h b/src/version.h index 7b003d0765..a5f107dcc4 100644 --- a/src/version.h +++ b/src/version.h @@ -31,7 +31,7 @@ static const int PROTOCOL_VERSION = 70041; static const int INIT_PROTO_VERSION = 209; // disconnect from peers older than this proto version -static const int MIN_PEER_PROTO_VERSION = 70039; +static const int MIN_PEER_PROTO_VERSION = 70041; // nTime field added to CAddress, starting with this version; // if possible, avoid requesting addresses nodes older than this