Merge pull request #6 from Infernoman/Working

Merge working branch

Author: Infernoman

CHANGELOG

@@ -64,6 +64,11 @@ https://github.com/dashpay/dash/commit/0d51e1c90df98f649ea3062efa448c1c5bb9827b
 Added dstx support for free transactions ( NEEDS FIXED - AcceptToMemoryPool)
 https://github.com/dashpay/dash/commit/13246598b8b84af2ade8b3d0368655fc64f5cca0
 
+
+
+Change the way changes are handled:
+https://github.com/dashpay/dash/commit/2e05bf212eaf5e0fe98161f673483dc62e5c0a95
+
 rpc fixes:
 https://github.com/dashpay/dash/commit/558585039696096b355a9e75beb70b36a3b7cec9
 
@@ -76,6 +81,28 @@ https://github.com/dashpay/dash/commit/56471f83304cff936f2ad09242f9a2462389e75b
 allow searching masternode list by ip address
 https://github.com/dashpay/dash/commit/736e6da6b852119332b41b4da955af4d1b4ed8f9
 
+Few fixes for processing extra messages:
+https://github.com/dashpay/dash/commit/1ded1b9ec2de5687b38ac9178cc4b58375201e03
+
+Fix crashes on remove from vector
+https://github.com/dashpay/dash/commit/4fe845bf1530ad1b59dcfddebe50f323e1977402
+
+Fix versions:
+https://github.com/dashpay/dash/commit/0747da6b36a51f24efa7ca7fcb4f2ffa3332a118
+
+check and remove expired masternodes on client start
+https://github.com/dashpay/dash/commit/4af7c7411ac6837260ff5ff04ee4a4a944ac2082
+
+clear maps in mnodeman
+https://github.com/dashpay/dash/commit/80ce3f5a061e069145db81850e1afcffa52c7e12
+
+Cleanup copiler
+
+
+
+
+
+
 
 Removal of old code:
 IsProtocolV1/IsProtocolV2 hard fork switches removed

src/darksend.cpp

@@ -55,7 +55,7 @@ void ProcessMessageDarksend(CNode* pfrom, std::string& strCommand, CDataStream&
     if(IsInitialBlockDownload()) return;
 
     if (strCommand == "dsf") { //DarkSend Final tx
-        if (pfrom->nVersion < darkSendPool.MIN_PEER_PROTO_VERSION) {
+        if (pfrom->nVersion < MIN_POOL_PEER_PROTO_VERSION) {
             return;
         }
 
@@ -78,7 +78,7 @@ void ProcessMessageDarksend(CNode* pfrom, std::string& strCommand, CDataStream&
     }
 
     else if (strCommand == "dsc") { //DarkSend Complete
-        if (pfrom->nVersion < darkSendPool.MIN_PEER_PROTO_VERSION) {
+        if (pfrom->nVersion < MIN_POOL_PEER_PROTO_VERSION) {
             return;
         }
 
@@ -102,7 +102,7 @@ void ProcessMessageDarksend(CNode* pfrom, std::string& strCommand, CDataStream&
 
     else if (strCommand == "dsa") { //DarkSend Acceptable
 
-        if (pfrom->nVersion < darkSendPool.MIN_PEER_PROTO_VERSION) {
+        if (pfrom->nVersion < MIN_POOL_PEER_PROTO_VERSION) {
             std::string strError = _("Incompatible version.");
             LogPrintf("dsa -- incompatible version! \n");
             pfrom->PushMessage("dssu", darkSendPool.sessionID, darkSendPool.GetState(), darkSendPool.GetEntriesCount(), MASTERNODE_REJECTED, strError);
@@ -133,7 +133,7 @@ void ProcessMessageDarksend(CNode* pfrom, std::string& strCommand, CDataStream&
 
         if(darkSendPool.sessionUsers == 0) {
             if(pmn->nLastDsq != 0 &&
-                pmn->nLastDsq + mnodeman.CountMasternodesAboveProtocol(darkSendPool.MIN_PEER_PROTO_VERSION)/5 > darkSendPool.nDsqCount){
+                pmn->nLastDsq + mnodeman.CountMasternodesAboveProtocol(MIN_POOL_PEER_PROTO_VERSION)/5 > darkSendPool.nDsqCount){
                 LogPrintf("dsa -- last dsq too recent, must wait. %s \n", pmn->addr.ToString().c_str());                std::string strError = _("Last Darksend was too recent.");
                 pfrom->PushMessage("dssu", darkSendPool.sessionID, darkSendPool.GetState(), darkSendPool.GetEntriesCount(), MASTERNODE_REJECTED, strError);
                 return;
@@ -152,7 +152,7 @@ void ProcessMessageDarksend(CNode* pfrom, std::string& strCommand, CDataStream&
         }
     } else if (strCommand == "dsq") { //DarkSend Queue
 
-        if (pfrom->nVersion < darkSendPool.MIN_PEER_PROTO_VERSION) {
+        if (pfrom->nVersion < MIN_POOL_PEER_PROTO_VERSION) {
             return;
         }
 
@@ -186,7 +186,7 @@ void ProcessMessageDarksend(CNode* pfrom, std::string& strCommand, CDataStream&
             if(fDebug) LogPrintf("dsq last %d last2 %d count %d\n", pmn->nLastDsq, pmn->nLastDsq + mnodeman.size()/5, darkSendPool.nDsqCount);
             //don't allow a few nodes to dominate the queuing process
             if(pmn->nLastDsq != 0 &&
-                pmn->nLastDsq + mnodeman.CountMasternodesAboveProtocol(darkSendPool.MIN_PEER_PROTO_VERSION)/5 > darkSendPool.nDsqCount){
+                pmn->nLastDsq + mnodeman.CountMasternodesAboveProtocol(MIN_POOL_PEER_PROTO_VERSION)/5 > darkSendPool.nDsqCount){
                 if(fDebug) LogPrintf("dsq -- masternode sending too many dsq messages. %s \n", pmn->addr.ToString().c_str());
                 return;
             }
@@ -202,7 +202,7 @@ void ProcessMessageDarksend(CNode* pfrom, std::string& strCommand, CDataStream&
 
     } else if (strCommand == "dsi") { //DarkSend vIn
         std::string error = "";
-        if (pfrom->nVersion < darkSendPool.MIN_PEER_PROTO_VERSION) {
+        if (pfrom->nVersion < MIN_POOL_PEER_PROTO_VERSION) {
             LogPrintf("dsi -- incompatible version! \n");
             error = _("Incompatible version.");
             pfrom->PushMessage("dssu", darkSendPool.sessionID, darkSendPool.GetState(), darkSendPool.GetEntriesCount(), MASTERNODE_REJECTED, error);
@@ -327,7 +327,7 @@ void ProcessMessageDarksend(CNode* pfrom, std::string& strCommand, CDataStream&
     }
 
     else if (strCommand == "dssub") { //DarkSend Subscribe To
-        if (pfrom->nVersion < darkSendPool.MIN_PEER_PROTO_VERSION) {
+        if (pfrom->nVersion < MIN_POOL_PEER_PROTO_VERSION) {
             return;
         }
 
@@ -340,7 +340,7 @@ void ProcessMessageDarksend(CNode* pfrom, std::string& strCommand, CDataStream&
 
     else if (strCommand == "dssu") { //DarkSend status update
 
-        if (pfrom->nVersion < darkSendPool.MIN_PEER_PROTO_VERSION) {
+        if (pfrom->nVersion < MIN_POOL_PEER_PROTO_VERSION) {
             return;
         }
 
@@ -368,7 +368,7 @@ void ProcessMessageDarksend(CNode* pfrom, std::string& strCommand, CDataStream&
     }
 
     else if (strCommand == "dss") { //DarkSend Sign Final Tx
-        if (pfrom->nVersion < darkSendPool.MIN_PEER_PROTO_VERSION) {
+        if (pfrom->nVersion < MIN_POOL_PEER_PROTO_VERSION) {
             return;
         }
 
@@ -1039,7 +1039,8 @@ bool CDarkSendPool::IsCollateralValid(const CTransaction& txCollateral){
 
     CValidationState state;
     //if(!AcceptableInputs(mempool, state, txCollateral)){
-    bool* pfMissingInputs = false;
+    bool* pfMissingInputs = new bool;
+    *pfMissingInputs = false;
     if(!AcceptableInputs(mempool, txCollateral, false, pfMissingInputs)){
         if(fDebug) LogPrintf ("CDarkSendPool::IsCollateralValid - didn't pass IsAcceptable\n");
         return false;
@@ -1548,7 +1549,7 @@ bool CDarkSendPool::DoAutomaticDenominating(bool fDryRun, bool ready)
 
                 int protocolVersion;
                 if(!dsq.GetProtocolVersion(protocolVersion)) continue;
-                if(protocolVersion < MIN_PEER_PROTO_VERSION) continue;
+                if(protocolVersion < MIN_POOL_PEER_PROTO_VERSION) continue;
 
                 //non-denom's are incompatible
                 if((dsq.nDenom & (1 << 4))) continue;
@@ -1610,7 +1611,7 @@ bool CDarkSendPool::DoAutomaticDenominating(bool fDryRun, bool ready)
             if(pmn == NULL)
             {
                 LogPrintf("DoAutomaticDenominating --- masternode list is empty!\n");
-               return false;
+                return false;
             }
             //don't reuse masternodes
             BOOST_FOREACH(CTxIn usedVin, vecMasternodesUsed) {
@@ -1619,13 +1620,13 @@ bool CDarkSendPool::DoAutomaticDenominating(bool fDryRun, bool ready)
                     continue;
                 }
             }
-            if(pmn->protocolVersion < darkSendPool.MIN_PEER_PROTO_VERSION) {
+            if(pmn->protocolVersion < MIN_POOL_PEER_PROTO_VERSION) {
                 i++;
                 continue;
             }
 
             if(pmn->nLastDsq != 0 &&
-                pmn->nLastDsq + mnodeman.CountMasternodesAboveProtocol(darkSendPool.MIN_PEER_PROTO_VERSION)/5 > darkSendPool.nDsqCount){
+                pmn->nLastDsq + mnodeman.CountMasternodesAboveProtocol(MIN_POOL_PEER_PROTO_VERSION)/5 > darkSendPool.nDsqCount){
                 i++;
                 continue;
             }
@@ -2185,25 +2186,18 @@ void ThreadCheckDarkSendPool()
         MilliSleep(2500);
         //LogPrintf("ThreadCheckDarkSendPool::check timeout\n");
         darkSendPool.CheckTimeout();
-
-        if(c % 60 == 0){
+        if(c % 60 == 0)
+        {
+            LOCK(cs_main);
+            /*
+                cs_main is required for doing CMasternode.Check because something
+                is modifying the coins view without a mempool lock. It causes
+                segfaults from this code without the cs_main lock.
+            */
+            mnodeman.CheckAndRemove();
             darkSendPool.ProcessMasternodeConnections();
             masternodePayments.CleanPaymentList();
             CleanTransactionLocksList();
-
-            // nodes refuse to relay dseep if it was less then MASTERNODE_MIN_DSEEP_SECONDS ago
-            // MASTERNODE_PING_WAIT_SECONDS gives some additional time on top of it
-            // so we have a timeout for this check on start unless we need to
-            if(c > MASTERNODE_MIN_DSEEP_SECONDS + MASTERNODE_PING_WAIT_SECONDS || mnodeman.UpdateNeeded())
-            {
-                LOCK(cs_main);
-                /*
-                    cs_main is required for doing CMasternode.Check because something
-                    is modifying the coins view without a mempool lock. It causes
-                    segfaults from this code without the cs_main lock.
-                */
-                mnodeman.CheckAndRemove();
-            }
 	    }
 
         if(c % MASTERNODE_PING_SECONDS == 0) activeMasternode.ManageStatus();
@@ -2217,7 +2211,7 @@ void ThreadCheckDarkSendPool()
                 LOCK(cs_vNodes);
                 BOOST_FOREACH(CNode* pnode, vNodes)
                 {
-                    if (pnode->nVersion >= darkSendPool.MIN_PEER_PROTO_VERSION) {
+                    if (pnode->nVersion >= MIN_POOL_PEER_PROTO_VERSION) {
 
                         //keep track of who we've asked for the list
                         if(pnode->HasFulfilledRequest("mnsync")) continue;
@@ -2226,7 +2220,7 @@ void ThreadCheckDarkSendPool()
                         LogPrintf("Successfully synced, asking for Masternode list and payment list\n");
 
                         //request full mn list only if masternodes.dat was updated quite a long time ago
-                        if(mnodeman.UpdateNeeded()) pnode->PushMessage("dseg", CTxIn());
+                        mnodeman.DsegUpdate(pnode);
 
                         pnode->PushMessage("mnget"); //sync payees
                         pnode->PushMessage("getsporks"); //get current network sporks

src/darksend.h

@@ -38,6 +38,8 @@ class CActiveMasternode;
 #define DARKSEND_QUEUE_TIMEOUT                 120
 #define DARKSEND_SIGNING_TIMEOUT               30
 
+static const int MIN_POOL_PEER_PROTO_VERSION = 61400; // minimum peer version accepted by DarkSendPool
+
 extern CDarkSendPool darkSendPool;
 extern CDarkSendSigner darkSendSigner;
 extern std::vector<CDarksendQueue> vecDarksendQueue;
@@ -225,8 +227,6 @@ class CDarksendSession
 class CDarkSendPool
 {
 public:
-    static const int MIN_PEER_PROTO_VERSION = 60020;
-
     // clients entries
     std::vector<CDarkSendEntry> myEntries;
     // masternode entries

src/init.cpp

@@ -892,10 +892,12 @@ bool AppInit2(boost::thread_group& threadGroup)
         CMasternodeDB mndb;
         if (!mndb.Read(mnodeman))
             LogPrintf("Invalid or missing masternodes.dat; recreating\n");
+        else
+            mnodeman.CheckAndRemove(); // clean out expired
     }
 
-    LogPrintf("Loaded %i masternodes from masternodes.dat  %dms\n",
-           mnodeman.size(), GetTimeMillis() - nStart);
+    LogPrintf("Loaded info from masternodes.dat  %dms\n", GetTimeMillis() - nStart);
+    LogPrintf("  %s\n", mnodeman.ToString());
 
 
     fMasterNode = GetBoolArg("-masternode", false);

src/instantx.cpp

@@ -37,7 +37,7 @@ void ProcessMessageInstantX(CNode* pfrom, std::string& strCommand, CDataStream&
     if(fLiteMode) return; //disable all darksend/masternode related functionality
     if(!IsSporkActive(SPORK_1_MASTERNODE_PAYMENTS_ENFORCEMENT)) return;
     if(IsInitialBlockDownload()) return;
-
+    
     if (strCommand == "txlreq")
     {
         //LogPrintf("ProcessMessageInstantX::txlreq\n");

src/main.cpp

@@ -762,6 +762,7 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CTransaction &tx, bool fLimitFree,
     LogPrint("mempool", "AcceptToMemoryPool : accepted %s (poolsz %u)\n",
            hash.ToString(),
            pool.mapTx.size());
+    
     return true;
 }
 
@@ -791,6 +792,7 @@ bool AcceptableInputs(CTxMemPool& pool, const CTransaction &txo, bool fLimitFree
         return error("AcceptableInputs : nonstandard transaction: %s",
                      reason);
 
+
     // is it already in the memory pool?
     uint256 hash = tx.GetHash();
     if (pool.exists(hash))
@@ -887,9 +889,10 @@ bool AcceptableInputs(CTxMemPool& pool, const CTransaction &txo, bool fLimitFree
     }
 
 
-    LogPrint("mempool", "AcceptableInputs : accepted %s (poolsz %u)\n",
+    /*LogPrint("mempool", "AcceptableInputs : accepted %s (poolsz %u)\n",
            hash.ToString(),
            pool.mapTx.size());
+    */
     return true;
 }
 
@@ -3719,7 +3722,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         CTransaction tx;
 
         //masternode signed transaction
-        bool allowFree = false;
+        //bool allowFree = false;
         CTxIn vin;
         vector<unsigned char> vchSig;
         int64_t sigTime;
@@ -3750,7 +3753,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
 
                 LogPrintf("dstx: Got Masternode transaction %s\n", tx.GetHash().ToString().c_str());
 
-                allowFree = true;
+                //allowFree = true;
                 pmn->allowFreeTx = false;
 
                 if(!mapDarksendBroadcastTxes.count(tx.GetHash())){

src/masternode.cpp

@@ -135,7 +135,7 @@ CMasternode::CMasternode()
     pubkey2 = CPubKey();
     sig = std::vector<unsigned char>();
     activeState = MASTERNODE_ENABLED;
-    now = GetTime();
+    sigTime = GetAdjustedTime();
     lastDseep = 0;
     lastTimeSeen = 0;
     cacheInputAge = 0;
@@ -155,7 +155,7 @@ CMasternode::CMasternode(const CMasternode& other)
     pubkey2 = other.pubkey2;
     sig = other.sig;
     activeState = other.activeState;
-    now = other.now;
+    sigTime = other.sigTime;
     lastDseep = other.lastDseep;
     lastTimeSeen = other.lastTimeSeen;
     cacheInputAge = other.cacheInputAge;
@@ -166,7 +166,7 @@ CMasternode::CMasternode(const CMasternode& other)
     nLastDsq = other.nLastDsq;
 }
 
-CMasternode::CMasternode(CService newAddr, CTxIn newVin, CPubKey newPubkey, std::vector<unsigned char> newSig, int64_t newNow, CPubKey newPubkey2, int protocolVersionIn)
+CMasternode::CMasternode(CService newAddr, CTxIn newVin, CPubKey newPubkey, std::vector<unsigned char> newSig, int64_t newSigTime, CPubKey newPubkey2, int protocolVersionIn)
 {
     LOCK(cs);
     vin = newVin;
@@ -175,7 +175,7 @@ CMasternode::CMasternode(CService newAddr, CTxIn newVin, CPubKey newPubkey, std:
     pubkey2 = newPubkey2;
     sig = newSig;
     activeState = MASTERNODE_ENABLED;
-    now = newNow;
+    sigTime = newSigTime;
     lastDseep = 0;
     lastTimeSeen = 0;
     cacheInputAge = 0;
@@ -232,7 +232,8 @@ void CMasternode::Check()
         tx.vout.push_back(vout);
 
         //if(!AcceptableInputs(mempool, state, tx)){
-        bool* pfMissingInputs = false;
+        bool* pfMissingInputs = new bool;
+        *pfMissingInputs = false;
 	if(!AcceptableInputs(mempool, tx, false, pfMissingInputs)){
             activeState = MASTERNODE_VIN_SPENT;
             return;
@@ -379,6 +380,7 @@ bool CMasternodePayments::ProcessBlock(int nBlockHeight)
     LOCK(cs_masternodes);
     if(!enabled) return false;
     CMasternodePaymentWinner newWinner;
+    int nEnabled = mnodeman.CountEnabled();
 
     std::vector<CTxIn> vecLastPayments;
     BOOST_REVERSE_FOREACH(CMasternodePaymentWinner& winner, vWinning)
@@ -389,8 +391,9 @@ bool CMasternodePayments::ProcessBlock(int nBlockHeight)
         vecLastPayments.push_back(winner.vin);
     }
 
-    CMasternode* pmn = mnodeman.FindNotInVec(vecLastPayments);
-    if(pmn != NULL)
+    // pay to the oldest MN that still had no payment but its input is old enough and it was active long enough
+    CMasternode *pmn = mnodeman.FindOldestNotInVec(vecLastPayments);
+    if(pmn != NULL && pmn->GetMasternodeInputAge() > nEnabled && pmn->lastTimeSeen - pmn->sigTime > nEnabled * 2.5 * 60)
     {
         newWinner.score = 0;
         newWinner.nBlockHeight = nBlockHeight;
@@ -399,7 +402,7 @@ bool CMasternodePayments::ProcessBlock(int nBlockHeight)
     }
 
     //if we can't find new MN to get paid, pick first active MN counting back from the end of vecLastPayments list
-    if(newWinner.nBlockHeight == 0 && mnodeman.CountEnabled() > 0)
+    if(newWinner.nBlockHeight == 0 && nEnabled > 0)
     {
         BOOST_REVERSE_FOREACH(CTxIn& vinLP, vecLastPayments)
         {