Bug/merchantnode sync (#139)

* Bumped version to 0.0.19. Updated how merchantnodes are synced. Handling case when connecting blocks which are out of sync with merchantnode sync

* Fixed last commit

configure.ac

@@ -2,7 +2,7 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 1)
 define(_CLIENT_VERSION_MINOR, 0)
-define(_CLIENT_VERSION_REVISION, 18)
+define(_CLIENT_VERSION_REVISION, 19)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2018)

src/init.cpp

@@ -62,6 +62,7 @@
 #include <tpos/merchantnodeman.h>
 #include <netfulfilledman.h>
 #include <governance/governance.h>
+#include <tpos/merchantnode-sync.h>
 #include <flat-database.h>
 
 #ifndef WIN32

src/net_processing_xsn.cpp

@@ -250,6 +250,7 @@ void net_processing_xsn::ThreadProcessExtensions(CConnman *pConnman)
                 if(nTick % 60 == 0) {
                     merchantnodeman.ProcessMerchantnodeConnections(connman);
                     merchantnodeman.CheckAndRemove(connman);
+                    merchantnodeman.AskForMissing(connman);
                 }
                 if(fMerchantNode && (nTick % (60 * 5) == 0)) {
                     merchantnodeman.DoFullVerificationStep(connman);

src/tpos/merchantnodeman.cpp

@@ -368,13 +368,21 @@ bool CMerchantnodeMan::Get(const CKeyID &pubKeyID, CMerchantnode& merchantnodeRe
 {
     // Theses mutexes are recursive so double locking by the same thread is safe.
     LOCK(cs);
-    for (auto& mnpair : mapMerchantnodes) {
+    for (auto& mnpair : mapMerchantnodes)
+    {
         CKeyID keyID = mnpair.second.pubKeyMerchantnode.GetID();
         if (keyID == pubKeyID) {
             merchantnodeRet = mnpair.second;
             return true;
         }
     }
+
+    if(mUnknownMerchantnodes.size() < 100)
+    {
+        // if it's more than 100, which is very unlikely, someone might try to attack us.
+        mUnknownMerchantnodes[pubKeyID] += 1;
+    }
+
     return false;
 }
 
@@ -438,7 +446,7 @@ void CMerchantnodeMan::ProcessMerchantnodeConnections(CConnman& connman)
     //we don't care about this for regtest
     if(Params().NetworkIDString() == CBaseChainParams::REGTEST) return;
 
-    connman.ForEachNode([](CNode* pnode) {
+    connman.ForEachNode([&connman](CNode* pnode) {
         if(pnode->fMerchantnode) {
             LogPrintf("Closing Merchantnode connection: peer=%d, addr=%s\n", pnode->GetId(), pnode->addr.ToString());
             pnode->fDisconnect = true;
@@ -487,6 +495,14 @@ void CMerchantnodeMan::ProcessMessage(CNode* pfrom, const std::string& strComman
 
         if(!merchantnodeSync.IsBlockchainSynced()) return;
 
+        {
+            auto it = mUnknownMerchantnodes.find(mnb.pubKeyMerchantnode.GetID());
+            if(it != std::end(mUnknownMerchantnodes))
+            {
+                mUnknownMerchantnodes.erase(it);
+            }
+        }
+
         LogPrint(BCLog::MERCHANTNODE, "MERCHANTNODEANNOUNCE -- Merchantnode announce, merchantnode=%s\n", mnb.pubKeyMerchantnode.GetID().ToString());
 
         int nDos = 0;
@@ -710,6 +726,23 @@ void CMerchantnodeMan::DoFullVerificationStep(CConnman& connman)
 #endif
 }
 
+void CMerchantnodeMan::AskForMissing(CConnman &connman)
+{
+    bool shouldAsk = false;
+
+    for(auto &&it : mUnknownMerchantnodes)
+    {
+        shouldAsk |= (it.second >= 10);
+    }
+
+    if(shouldAsk)
+    {
+        connman.ForEachNode([this, &connman](CNode* pnode) {
+            DsegUpdate(pnode, connman);
+        });
+    }
+}
+
 // This function tries to find merchantnodes with the same addr,
 // find a verified one and ban all the other. If there are many nodes
 // with the same addr but none of them is verified yet, then none of them are banned.
@@ -1138,7 +1171,7 @@ bool CMerchantnodeMan::CheckMnbAndUpdateMerchantnodeList(CNode* pfrom, CMerchant
 
         {
             // Need to lock cs_main here to ensure consistent locking order because the SimpleCheck call below locks cs_main
-//            LOCK(cs_main);
+            //            LOCK(cs_main);
             if(!mnb.SimpleCheck(nDos)) {
                 LogPrint(BCLog::MERCHANTNODE, "CMerchantnodeMan::CheckMnbAndUpdateMerchantnodeList -- SimpleCheck() failed, merchantnode=%s\n",
                          mnb.pubKeyMerchantnode.GetID().ToString());

src/tpos/merchantnodeman.h

@@ -57,6 +57,8 @@ class CMerchantnodeMan
     std::map<uint256, std::pair< int64_t, std::set<CNetAddr> > > mMnbRecoveryRequests;
     std::map<uint256, std::vector<CMerchantnodeBroadcast> > mMnbRecoveryGoodReplies;
     std::list< std::pair<CService, uint256> > listScheduledMnbRequestConnections;
+    // map to represent unkown merchantnode and how many times it was asked
+    std::map<CKeyID, unsigned> mUnknownMerchantnodes;
 
     int64_t nLastWatchdogVoteTime;
 
@@ -155,6 +157,7 @@ class CMerchantnodeMan
     void ProcessMessage(CNode* pfrom, const string &strCommand, CDataStream& vRecv, CConnman& connman);
 
     void DoFullVerificationStep(CConnman& connman);
+    void AskForMissing(CConnman& connman);
     void CheckSameAddr();
     bool SendVerifyRequest(const CAddress& addr, const std::vector<CMerchantnode*>& vSortedByAddr, CConnman& connman);
     void SendVerifyReply(CNode* pnode, CMerchantnodeVerification& mnv, CConnman& connman);

src/tpos/tposutils.cpp

@@ -16,7 +16,6 @@
 
 static const std::string TPOSEXPORTHEADER("TPOSOWNERINFO");
 static const int TPOSEXPORTHEADERWIDTH = 40;
-
 static const int TPOS_CONTRACT_COLATERAL = 1 * COIN;
 
 std::string ParseAddressFromMetadata(std::string str)

src/validation.cpp

@@ -2713,7 +2713,7 @@ bool CChainState::ActivateBestChainStep(CValidationState& state, const CChainPar
     else
         CheckForkWarningConditions();
 
-    return true;
+    return !fInvalidFound;
 }
 
 static void NotifyHeaderTip() {