fix: update DIP0001 related stuff even in IBD (#1652)

dashpay · Sep 22, 2017 · d07ac4f · d07ac4f
1 parent 7efa5e7
commit d07ac4f
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/src/dsnotificationinterface.cpp b/src/dsnotificationinterface.cpp
@@ -34,15 +34,6 @@ void CDSNotificationInterface::UpdatedBlockTip(const CBlockIndex *pindexNew, con
 
     masternodeSync.UpdatedBlockTip(pindexNew, fInitialDownload, connman);
 
-    if (fInitialDownload) // In IBD
-        return;
-
-    mnodeman.UpdatedBlockTip(pindexNew);
-    privateSendClient.UpdatedBlockTip(pindexNew);
-    instantsend.UpdatedBlockTip(pindexNew);
-    mnpayments.UpdatedBlockTip(pindexNew, connman);
-    governance.UpdatedBlockTip(pindexNew, connman);
-
     // DIP0001 updates
 
     bool fDIP0001ActiveAtTipTmp = fDIP0001ActiveAtTip;
@@ -63,6 +54,15 @@ void CDSNotificationInterface::UpdatedBlockTip(const CBlockIndex *pindexNew, con
             CWallet::fallbackFee = CFeeRate(fDIP0001ActiveAtTip ? DEFAULT_DIP0001_FALLBACK_FEE : DEFAULT_LEGACY_FALLBACK_FEE);
         }
     }
+
+    if (fInitialDownload || !masternodeSync.IsBlockchainSynced())
+        return;
+
+    mnodeman.UpdatedBlockTip(pindexNew);
+    privateSendClient.UpdatedBlockTip(pindexNew);
+    instantsend.UpdatedBlockTip(pindexNew);
+    mnpayments.UpdatedBlockTip(pindexNew, connman);
+    governance.UpdatedBlockTip(pindexNew, connman);
 }
 
 void CDSNotificationInterface::SyncTransaction(const CTransaction &tx, const CBlock *pblock)