Merge pull request #2 from FairCoinOfficial/fix/ibd-mnsync-bootstrap

Fix node self-deadlock when reviving a stalled PoW→PoS chain

Author: NateIsern

src/chainparams.cpp

@@ -434,7 +434,7 @@ class CMainParams : public CChainParams
 
         nPoolMaxTransactions = 3;
         strSporkKey = "044072106100b738bb99d24f2230708ebebdca687a01f8d0ce138551da829cf4e28ac499242806279787afc5293c97b72694f111e91c376cdb0d0fda8778ad4425";
-        strObfuscationPoolDummyAddress = "";
+        strObfuscationPoolDummyAddress = "FRZou2ApnnNyHGJRqoHgVLDF71Yviuhfz2"; // valid FairCoin addr; used only to build the collateral-check dummy tx (must be standard, never broadcast)
         nStartMasternodePayments = 1744156800; // April 9, 2026
     }
 

src/main.cpp

@@ -36,7 +36,6 @@
 #include <boost/filesystem/fstream.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/thread.hpp>
-#include <boost/version.hpp>
 
 using namespace boost;
 using namespace std;
@@ -205,9 +204,7 @@ struct CMainSignals {
 
 void RegisterValidationInterface(CValidationInterface* pwalletIn)
 {
-#if BOOST_VERSION >= 107300
     using namespace boost::placeholders;
-#endif
     g_signals.SyncTransaction.connect(boost::bind(&CValidationInterface::SyncTransaction, pwalletIn, _1, _2));
     g_signals.UpdatedTransaction.connect(boost::bind(&CValidationInterface::UpdatedTransaction, pwalletIn, _1));
     g_signals.SetBestChain.connect(boost::bind(&CValidationInterface::SetBestChain, pwalletIn, _1));
@@ -218,9 +215,7 @@ void RegisterValidationInterface(CValidationInterface* pwalletIn)
 
 void UnregisterValidationInterface(CValidationInterface* pwalletIn)
 {
-#if BOOST_VERSION >= 107300
     using namespace boost::placeholders;
-#endif
     g_signals.BlockChecked.disconnect(boost::bind(&CValidationInterface::BlockChecked, pwalletIn, _1, _2));
     g_signals.Broadcast.disconnect(boost::bind(&CValidationInterface::ResendWalletTransactions, pwalletIn));
     g_signals.Inventory.disconnect(boost::bind(&CValidationInterface::Inventory, pwalletIn, _1));
@@ -1881,7 +1876,7 @@ bool IsInitialBlockDownload()
     if (lockIBDState)
         return false;
     bool state = (chainActive.Height() < pindexBestHeader->nHeight - 24 * 6 ||
-                  pindexBestHeader->GetBlockTime() < GetTime() - 6 * 60 * 60); // ~144 blocks behind -> 2 x fork detection time
+                  pindexBestHeader->GetBlockTime() < GetTime() - GetArg("-maxtipage", 6 * 60 * 60)); // ~144 blocks behind -> 2 x fork detection time; -maxtipage overrides the staleness window (default 6h)
     if (!state)
         lockIBDState = true;
     return state;

src/masternode-sync.cpp

@@ -35,7 +35,7 @@ bool CMasternodeSync::IsBlockchainSynced()
     static int64_t lastProcess = GetTime();
 
     // if the last call to this function was more than 60 minutes ago (client was in sleep mode) reset the sync process
-    if (GetTime() - lastProcess > 60 * 60) {
+    if (GetTime() - lastProcess > GetArg("-maxtipage", 60 * 60)) {
         Reset();
         fBlockchainSynced = false;
     }
@@ -52,7 +52,7 @@ bool CMasternodeSync::IsBlockchainSynced()
     if (pindex == NULL) return false;
 
 
-    if (pindex->nTime + 60 * 60 < GetTime())
+    if (pindex->nTime + GetArg("-maxtipage", 60 * 60) < GetTime())
         return false;
 
     fBlockchainSynced = true;
@@ -237,13 +237,13 @@ void CMasternodeSync::Process()
     if (tick++ % MASTERNODE_SYNC_TIMEOUT != 0) return;
 
     if (IsSynced()) {
-        /* 
-            Resync if we lose all masternodes from sleep/wake or failure to sync originally
+        /*
+            Stay synced once finished. Previously this Reset() every tick whenever there were
+            0 enabled masternodes, which on a small/bootstrapping network (legitimately 0 MNs)
+            caused an endless resync loop so sync never stabilized. New masternodes are still
+            picked up via normal mnb processing; a restart re-syncs from scratch anyway.
         */
-        if (mnodeman.CountEnabled() == 0) {
-            Reset();
-        } else
-            return;
+        return;
     }
 
     //try syncing again
@@ -261,6 +261,16 @@ void CMasternodeSync::Process()
     if (Params().NetworkID() != CBaseChainParams::REGTEST &&
         !IsBlockchainSynced() && RequestedMasternodeAssets > MASTERNODE_SYNC_SPORKS) return;
 
+    // Advance the sync asset by time when it stalls. On small/zero-masternode networks no peer
+    // ever returns LIST/MNW/BUDGET items, and the per-peer "fulfilled request" gating then leaves
+    // the asset stuck forever (so IsSynced() is never reached). When real data exists the normal
+    // data-driven transitions above fire well before this timeout, so this only affects the empty case.
+    if (RequestedMasternodeAssets >= MASTERNODE_SYNC_SPORKS &&
+        GetTime() - nAssetSyncStarted > MASTERNODE_SYNC_TIMEOUT * 5) {
+        GetNextAsset();
+        return;
+    }
+
     TRY_LOCK(cs_vNodes, lockRecv);
     if (!lockRecv) return;
 

src/masternode.cpp

@@ -211,7 +211,7 @@ void CMasternode::Check(bool forceCheck)
     if (!unitTest) {
         CValidationState state;
         CMutableTransaction tx = CMutableTransaction();
-        CTxOut vout = CTxOut(9999.99 * COIN, obfuscationPool.collateralPubKey);
+        CTxOut vout = CTxOut(4999.99 * COIN, obfuscationPool.collateralPubKey); // MASTER_NODE_AMOUNT (5000) minus 0.01 fee margin
         tx.vin.push_back(vin);
         tx.vout.push_back(vout);
 
@@ -572,7 +572,7 @@ bool CMasternodeBroadcast::CheckInputsAndAdd(int& nDoS)
 
     CValidationState state;
     CMutableTransaction tx = CMutableTransaction();
-    CTxOut vout = CTxOut(9999.99 * COIN, obfuscationPool.collateralPubKey);
+    CTxOut vout = CTxOut(4999.99 * COIN, obfuscationPool.collateralPubKey); // MASTER_NODE_AMOUNT (5000) minus 0.01 fee margin
     tx.vin.push_back(vin);
     tx.vout.push_back(vout);
 

src/masternodeman.cpp

@@ -959,7 +959,7 @@ void CMasternodeMan::ProcessMessage(CNode* pfrom, std::string& strCommand, CData
 
         CValidationState state;
         CMutableTransaction tx = CMutableTransaction();
-        CTxOut vout = CTxOut(9999.99 * COIN, obfuscationPool.collateralPubKey);
+        CTxOut vout = CTxOut(4999.99 * COIN, obfuscationPool.collateralPubKey); // MASTER_NODE_AMOUNT (5000) minus 0.01 fee margin
         tx.vin.push_back(vin);
         tx.vout.push_back(vout);