Merge pull request #526 from mxaddict/patch-28

Added new progress ui for sync

Author: proletesseract

src/Makefile.qt.include

@@ -96,6 +96,7 @@ QT_FORMS_UI = \
 	qt/forms/editaddressdialog.ui \
 	qt/forms/helpmessagedialog.ui \
 	qt/forms/intro.ui \
+	qt/forms/modaloverlay.ui \
 	qt/forms/openuridialog.ui \
 	qt/forms/optionsdialog.ui \
 	qt/forms/overviewpage.ui \
@@ -137,6 +138,7 @@ QT_MOC_CPP = \
 	qt/moc_editaddressdialog.cpp \
 	qt/moc_guiutil.cpp \
 	qt/moc_intro.cpp \
+	qt/moc_modaloverlay.cpp \
 	qt/moc_macdockiconhandler.cpp \
 	qt/moc_macnotificationhandler.cpp \
 	qt/moc_navtechinit.cpp \
@@ -198,7 +200,7 @@ QT_MOC = \
 	qt/communityfunddisplaypaymentrequestdetailed.moc \
 	qt/communityfunddisplaydetailed.moc \
 	qt/communityfundcreateproposaldialog.moc \
-	qt/communityfundcreatepaymentrequestdialog.moc 
+	qt/communityfundcreatepaymentrequestdialog.moc
 
 QT_QRC_CPP = qt/qrc_navcoin.cpp
 QT_QRC = qt/navcoin.qrc
@@ -234,6 +236,7 @@ NAVCOIN_QT_H = \
 	qt/navtechitem.h \
 	qt/navtechsetup.h \
 	qt/getaddresstoreceive.h \
+	qt/modaloverlay.h \
 	qt/networkstyle.h \
 	qt/notificator.h \
 	qt/openuridialog.h \
@@ -401,6 +404,7 @@ NAVCOIN_QT_CPP += \
 	qt/coincontroltreewidget.cpp \
 	qt/coldstakingwizard.cpp \
 	qt/editaddressdialog.cpp \
+	qt/modaloverlay.cpp \
 	qt/openuridialog.cpp \
 	qt/overviewpage.cpp \
 	qt/communityfundpage.cpp \
@@ -432,7 +436,7 @@ NAVCOIN_QT_CPP += \
 	qt/walletview.cpp
 endif # ENABLE_WALLET
 
-RES_IMAGES = 
+RES_IMAGES =
 
 RES_MOVIES = $(wildcard qt/res/movies/spinner-*.png)
 

src/main.cpp

@@ -4033,21 +4033,17 @@ static void NotifyHeaderTip() {
     bool fNotify = false;
     bool fInitialBlockDownload = false;
     static CBlockIndex* pindexHeaderOld = NULL;
-    CBlockIndex* pindexHeader = NULL;
     {
         LOCK(cs_main);
-        if (!setBlockIndexCandidates.empty()) {
-            pindexHeader = *setBlockIndexCandidates.rbegin();
-        }
-        if (pindexHeader != pindexHeaderOld) {
+        if (pindexBestHeader != pindexHeaderOld) {
             fNotify = true;
             fInitialBlockDownload = IsInitialBlockDownload();
-            pindexHeaderOld = pindexHeader;
+            pindexHeaderOld = pindexBestHeader;
         }
     }
     // Send block tip changed notifications without cs_main
     if (fNotify) {
-        uiInterface.NotifyHeaderTip(fInitialBlockDownload, pindexHeader);
+        uiInterface.NotifyHeaderTip(fInitialBlockDownload, pindexBestHeader);
     }
 }
 
@@ -4216,8 +4212,6 @@ bool ResetBlockFailureFlags(CBlockIndex *pindex) {
 
 CBlockIndex* AddToBlockIndex(const CBlockHeader& block)
 {
-
-
     // Check for duplicate
     uint256 hash = block.GetHash();
     BlockMap::iterator it = mapBlockIndex.find(hash);
@@ -5963,7 +5957,7 @@ std::string GetWarnings(const std::string& strFor, bool fForStaking)
             strGUI = _(strRPC.c_str());
         }
 
-        if (!pwalletMain->GetStakeWeight()) 
+        if (!pwalletMain->GetStakeWeight())
         {
             strStatusBar = strRPC = "Warning: We don't appear to have mature coins.";
             strGUI = _(strRPC.c_str());

src/qt/clientmodel.cpp

@@ -34,6 +34,8 @@ ClientModel::ClientModel(OptionsModel *optionsModel, QObject *parent) :
     banTableModel(0),
     pollTimer(0)
 {
+    cachedBestHeaderHeight = -1;
+    cachedBestHeaderTime = -1;
     peerTableModel = new PeerTableModel(this);
     banTableModel = new BanTableModel(this);
     pollTimer = new QTimer(this);
@@ -62,6 +64,45 @@ int ClientModel::getNumConnections(unsigned int flags) const
     return nNum;
 }
 
+int ClientModel::getHeaderTipHeight() const
+{
+    if (cachedBestHeaderHeight == -1) {
+        // make sure we initially populate the cache via a cs_main lock
+        // otherwise we need to wait for a tip update
+        int height;
+        int64_t blockTime;
+        if (getHeaderTip(height, blockTime)) {
+            cachedBestHeaderHeight = height;
+            cachedBestHeaderTime = blockTime;
+        }
+    }
+    return cachedBestHeaderHeight;
+}
+
+int64_t ClientModel::getHeaderTipTime() const
+{
+    if (cachedBestHeaderTime == -1) {
+        int height;
+        int64_t blockTime;
+        if (getHeaderTip(height, blockTime)) {
+            cachedBestHeaderHeight = height;
+            cachedBestHeaderTime = blockTime;
+        }
+    }
+    return cachedBestHeaderTime;
+}
+
+bool ClientModel::getHeaderTip(int& height, int64_t& block_time) const
+{
+    LOCK(cs_main);
+    if (pindexBestHeader) {
+        height = pindexBestHeader->nHeight;
+        block_time = pindexBestHeader->GetBlockTime();
+        return true;
+    }
+    return false;
+}
+
 int ClientModel::getNumBlocks() const
 {
     LOCK(cs_main);
@@ -240,6 +281,7 @@ static void BannedListChanged(ClientModel *clientmodel)
     QMetaObject::invokeMethod(clientmodel, "updateBanlist", Qt::QueuedConnection);
 }
 
+/* static void BlockTipChanged(ClientModel *clientmodel, bool initialSync, int height, int64_t blockTime, double verificationProgress, bool fHeader) */
 static void BlockTipChanged(ClientModel *clientmodel, bool initialSync, const CBlockIndex *pIndex, bool fHeader)
 {
     // lock free async UI updates in case we have a new block tip
@@ -251,12 +293,20 @@ static void BlockTipChanged(ClientModel *clientmodel, bool initialSync, const CB
 
     int64_t& nLastUpdateNotification = fHeader ? nLastHeaderTipUpdateNotification : nLastBlockTipUpdateNotification;
 
-    // if we are in-sync, update the UI regardless of last update time
-    if (!initialSync || now - nLastUpdateNotification > MODEL_UPDATE_DELAY) {
-        //pass a async signal to the UI thread
+    int height = pIndex->nHeight;
+    int64_t blockTime = pIndex->GetBlockTime();
+
+    if (fHeader) {
+        // cache best headers time and height to reduce future cs_main locks
+        clientmodel->cachedBestHeaderHeight = height;
+        clientmodel->cachedBestHeaderTime = blockTime;
+    }
+    // if we are in-sync or if we notify a header update, update the UI regardless of last update time
+    if (fHeader || !initialSync || now - nLastUpdateNotification > MODEL_UPDATE_DELAY) {
+        //pass an async signal to the UI thread
         QMetaObject::invokeMethod(clientmodel, "numBlocksChanged", Qt::QueuedConnection,
-                                  Q_ARG(int, pIndex->nHeight),
-                                  Q_ARG(QDateTime, QDateTime::fromTime_t(pIndex->GetBlockTime())),
+                                  Q_ARG(int, height),
+                                  Q_ARG(QDateTime, QDateTime::fromTime_t(blockTime)),
                                   Q_ARG(double, clientmodel->getVerificationProgress(pIndex)),
                                   Q_ARG(bool, fHeader));
         nLastUpdateNotification = now;

src/qt/clientmodel.h

@@ -8,6 +8,8 @@
 #include <QObject>
 #include <QDateTime>
 
+#include <atomic>
+
 class AddressTableModel;
 class BanTableModel;
 class OptionsModel;
@@ -51,12 +53,15 @@ class ClientModel : public QObject
     //! Return number of connections, default is in- and outbound (total)
     int getNumConnections(unsigned int flags = CONNECTIONS_ALL) const;
     int getNumBlocks() const;
+    bool getHeaderTip(int& height, int64_t& block_time) const;
+    int getHeaderTipHeight() const;
+    int64_t getHeaderTipTime() const;
 
     //! Return number of transactions in the mempool
     long getMempoolSize() const;
     //! Return the dynamic memory usage of the mempool
     size_t getMempoolDynamicUsage() const;
-    
+
     quint64 getTotalBytesRecv() const;
     quint64 getTotalBytesSent() const;
 
@@ -78,6 +83,10 @@ class ClientModel : public QObject
     QString formatClientStartupTime() const;
     QString dataDir() const;
 
+    // caches for the best header
+    mutable std::atomic<int> cachedBestHeaderHeight;
+    mutable std::atomic<int64_t> cachedBestHeaderTime;
+
 private:
     OptionsModel *optionsModel;
     PeerTableModel *peerTableModel;