Fix recent changes in DSA conditions (#2494)

* pr2487 bugfix * push reject msg
dashpay · Nov 25, 2018 · bb11f1a · bb11f1a
1 parent 6480ad1
commit bb11f1a
Showing 1 changed file with 17 additions and 15 deletions.
diff --git a/src/privatesend-server.cpp b/src/privatesend-server.cpp
@@ -50,24 +50,26 @@ void CPrivateSendServer::ProcessMessage(CNode* pfrom, const std::string& strComm
             return;
         }
 
-        {
-            TRY_LOCK(cs_vecqueue, lockRecv);
-            if (!lockRecv) return;
-
-            for (const auto& q : vecPrivateSendQueue) {
-                if (q.masternodeOutpoint == activeMasternodeInfo.outpoint) {
-                    // refuse to create another queue this often
-                    LogPrint("privatesend", "DSACCEPT -- last dsq is still in queue, refuse to mix\n");
-                    return;
+        if (vecSessionCollaterals.size() == 0) {
+            {
+                TRY_LOCK(cs_vecqueue, lockRecv);
+                if (!lockRecv) return;
+
+                for (const auto& q : vecPrivateSendQueue) {
+                    if (q.masternodeOutpoint == activeMasternodeInfo.outpoint) {
+                        // refuse to create another queue this often
+                        LogPrint("privatesend", "DSACCEPT -- last dsq is still in queue, refuse to mix\n");
+                        PushStatus(pfrom, STATUS_REJECTED, ERR_RECENT, connman);
+                        return;
+                    }
                 }
             }
-        }
 
-        if (vecSessionCollaterals.size() == 0 && mnInfo.nLastDsq != 0 &&
-            mnInfo.nLastDsq + mnodeman.CountMasternodes() / 5 > mnodeman.nDsqCount) {
-            LogPrintf("DSACCEPT -- last dsq too recent, must wait: addr=%s\n", pfrom->addr.ToString());
-            PushStatus(pfrom, STATUS_REJECTED, ERR_RECENT, connman);
-            return;
+            if (mnInfo.nLastDsq != 0 && mnInfo.nLastDsq + mnodeman.CountMasternodes() / 5 > mnodeman.nDsqCount) {
+                LogPrintf("DSACCEPT -- last dsq too recent, must wait: addr=%s\n", pfrom->addr.ToString());
+                PushStatus(pfrom, STATUS_REJECTED, ERR_RECENT, connman);
+                return;
+            }
         }
 
         PoolMessage nMessageID = MSG_NOERR;