Merge pull request #22 from adeptio-project/storADEchecker

storADE mechnism change

Author: adeptio-project

src/activemasternode.cpp

@@ -120,6 +120,7 @@ void CActiveMasternode::ManageStatus()
 
             LogPrintf("CActiveMasternode::ManageStatus() - Is capable master node!\n");
             status = ACTIVE_MASTERNODE_STARTED;
+            startTime = GetAdjustedTime();
 
             return;
         } else {
@@ -129,6 +130,22 @@ void CActiveMasternode::ManageStatus()
         }
     }
 
+    workTime = GetAdjustedTime() - startTime;
+    notCheckedTime = GetAdjustedTime() - lastCheck;
+
+    if (workTime >= MASTERNODE_STORADE_START_SECONDS) {
+        
+        if(notCheckedTime >= MASTERNODE_STORADE_CHECK_SECONDS) {
+
+            if(!StoradeIsEnabled()){
+
+                status = ACTIVE_MASTERNODE_STORADE_ERROR;
+
+                LogPrintf("CActiveMasternode::ManageStatus() - StorADE not working\n");
+            }
+        }
+    }
+
     //send to all peers
     if (!SendMasternodePing(errorMessage)) {
         LogPrintf("CActiveMasternode::ManageStatus() - Error on Ping: %s\n", errorMessage);
@@ -146,13 +163,40 @@ std::string CActiveMasternode::GetStatus()
         return strprintf("Masternode input must have at least %d confirmations", MASTERNODE_MIN_CONFIRMATIONS);
     case ACTIVE_MASTERNODE_NOT_CAPABLE:
         return "Not capable masternode: " + notCapableReason;
+    case ACTIVE_MASTERNODE_STORADE_ERROR:
+        return "StorADE working problem";
     case ACTIVE_MASTERNODE_STARTED:
         return "Masternode successfully started";
     default:
         return "unknown";
     }
 }
 
+bool CActiveMasternode::StoradeIsEnabled()
+{
+    SOCKET hSocket;
+    CService storade = service;
+    storade.SetPort(Params().GetStorADEdefaultPort());
+    startTime = GetAdjustedTime();
+
+    if(!ConnectSocket(storade, hSocket, nConnectTimeout)) {
+
+        return false;
+
+    } else if(!IsSelectableSocket(hSocket)) {
+
+        CloseSocket(hSocket);
+
+        return false;
+
+    } else {
+
+        CloseSocket(hSocket);
+
+        return true;
+    }
+}
+
 bool CActiveMasternode::SendMasternodePing(std::string& errorMessage)
 {
     if (status != ACTIVE_MASTERNODE_STARTED) {
@@ -470,6 +514,7 @@ bool CActiveMasternode::EnableHotColdMasterNode(CTxIn& newVin, CService& newServ
     if (!fMasterNode) return false;
 
     status = ACTIVE_MASTERNODE_STARTED;
+    startTime = GetAdjustedTime();
 
     //The values below are needed for signing mnping messages going forward
     vin = newVin;

src/activemasternode.h

@@ -1,5 +1,6 @@
 // Copyright (c) 2014-2016 The Dash developers
-// Copyright (c) 2015-2017 The PIVX developers// Copyright (c) 2017-2019 The Adeptio developers
+// Copyright (c) 2015-2017 The PIVX developers
+// Copyright (c) 2017-2019 The Adeptio developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -19,6 +20,7 @@
 #define ACTIVE_MASTERNODE_INPUT_TOO_NEW 2
 #define ACTIVE_MASTERNODE_NOT_CAPABLE 3
 #define ACTIVE_MASTERNODE_STARTED 4
+#define ACTIVE_MASTERNODE_STORADE_ERROR 5
 
 // Responsible for activating the Masternode and pinging the network
 class CActiveMasternode
@@ -37,6 +39,8 @@ class CActiveMasternode
     bool GetMasterNodeVin(CTxIn& vin, CPubKey& pubkey, CKey& secretKey, std::string strTxHash, std::string strOutputIndex);
     bool GetVinFromOutput(COutput out, CTxIn& vin, CPubKey& pubkey, CKey& secretKey);
 
+    bool StoradeIsEnabled();
+
 public:
     // Initialized by init.cpp
     // Keys for the main Masternode
@@ -47,11 +51,14 @@ class CActiveMasternode
     CService service;
 
     int status;
+    int64_t startTime;
+    int64_t lastCheck;
     std::string notCapableReason;
 
     CActiveMasternode()
     {
         status = ACTIVE_MASTERNODE_INITIAL;
+        lastCheck = 0;
     }
 
     /// Manage status of main Masternode

src/init.cpp

@@ -1782,6 +1782,9 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
             if (!addrTest.IsValid()) {
                 return InitError("Invalid -masternodeaddr address: " + strMasterNodeAddr);
             }
+            if (addrTest.IsLocal()) {
+                return InitError("-masternodeaddr address is local: " + strMasterNodeAddr);
+            }
         }
 
         strMasterNodePrivKey = GetArg("-masternodeprivkey", "");

src/main.cpp

@@ -6673,15 +6673,18 @@ bool ProcessMessages(CNode* pfrom)
             } else if (strstr(e.what(), "size too large")) {
                 // Allow exceptions from over-long size
                 LogPrintf("ProcessMessages(%s, %u bytes): Exception '%s' caught\n", SanitizeString(strCommand), nMessageSize, e.what());
+            } else if (strstr(e.what(), "non-canonical ReadCompactSize()")) {
+                // Allow exceptions from non-canonical encoding
+                LogPrintf("ProcessMessages(%s, %u bytes): Exception '%s' caught\n", SanitizeString(strCommand), nMessageSize, e.what());
             } else {
-                PrintExceptionContinue(&e, "ProcessMessages()");
+                PrintExceptionContinue(&e, strprintf("ProcessMessages(%s, %u bytes)", SanitizeString(strCommand), nMessageSize));
             }
         } catch (boost::thread_interrupted) {
             throw;
         } catch (std::exception& e) {
-            PrintExceptionContinue(&e, "ProcessMessages()");
+            PrintExceptionContinue(&e, strprintf("ProcessMessages(%s, %u bytes)", SanitizeString(strCommand), nMessageSize));
         } catch (...) {
-            PrintExceptionContinue(NULL, "ProcessMessages()");
+            PrintExceptionContinue(NULL, strprintf("ProcessMessages(%s, %u bytes)", SanitizeString(strCommand), nMessageSize));
         }
 
         if (!fRet)

src/masternode.cpp

@@ -201,7 +201,7 @@ void CMasternode::Check(bool forceCheck)
     if (!forceCheck && (GetTime() - lastTimeChecked < MASTERNODE_CHECK_SECONDS)) return;
     lastTimeChecked = GetTime();
 
-    if (activeState == MASTERNODE_STORADE_EXPIRED) return;
+    //if (activeState == MASTERNODE_STORADE_EXPIRED) return;
 
     //once spent, stop doing the checks
     if (activeState == MASTERNODE_VIN_SPENT) return;
@@ -239,7 +239,9 @@ void CMasternode::Check(bool forceCheck)
             }
         }
     }
-        // The "StorADE" service needs the correct default port to work properly
+
+    /*
+    // The "StorADE" service needs the correct default port to work properly
     int64_t storADElastCheck = GetAdjustedTime() - storADElastTime;
 
     if( (storADElastCheck >= 12 * 60 * 60) || (storADElastCheck >= 1 * 60 * 60 && activeState == MASTERNODE_STORADE_EXPIRED) ) {
@@ -266,7 +268,8 @@ void CMasternode::Check(bool forceCheck)
         } else if(block_height >= 0) // Start storADE in v2
 
             threads.create_thread(boost::bind(&CMasternode::CheckStorADEport, this));
-    }
+    }*/
+
     activeState = MASTERNODE_ENABLED; // OK
 }
 

src/masternode.h

@@ -16,8 +16,10 @@
 #include "util.h"
 
 #define MASTERNODE_MIN_CONFIRMATIONS 15
-#define MASTERNODE_MIN_MNP_SECONDS (10 * 60)
+#define MASTERNODE_MIN_MNP_SECONDS (15 * 60)
 #define MASTERNODE_MIN_MNB_SECONDS (5 * 60)
+#define MASTERNODE_STORADE_START_SECONDS (10 * 60)
+#define MASTERNODE_STORADE_CHECK_SECONDS (360 * 60)
 #define MASTERNODE_PING_SECONDS (5 * 60)
 #define MASTERNODE_EXPIRATION_SECONDS (120 * 60)
 #define MASTERNODE_REMOVAL_SECONDS (130 * 60)