[Qt] only update "amount of blocks left" when the header chain is in-sync

jonasschnelli · jonasschnelli · commit d8b062ef5eea · 2016-09-13T17:57:25.000+02:00
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
@@ -500,7 +500,7 @@ void BitcoinGUI::setClientModel(ClientModel *clientModel)
             setTrayIconVisible(optionsModel->getHideTrayIcon());
         }
 
-        modalOverlay->setKnownBestHeight(clientModel->getHeaderHeight());
+        modalOverlay->setKnownBestHeight(clientModel->getHeaderTipHeight(), QDateTime::fromTime_t(clientModel->getHeaderTipTime()));
     } else {
         // Disable possibility to show main window via action
         toggleHideAction->setEnabled(false);
@@ -718,7 +718,10 @@ void BitcoinGUI::setNumBlocks(int count, const QDateTime& blockDate, double nVer
     if (modalOverlay)
     {
         if (header)
-            modalOverlay->setKnownBestHeight(count);
+        {
+            /* use clientmodels getHeaderTipHeight and getHeaderTipTime because the NotifyHeaderTip signal does not fire when updating the best header */
+            modalOverlay->setKnownBestHeight(clientModel->getHeaderTipHeight(), QDateTime::fromTime_t(clientModel->getHeaderTipTime()));
+        }
         else
             modalOverlay->tipUpdate(count, blockDate, nVerificationProgress);
     }
diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp
@@ -68,14 +68,22 @@ int ClientModel::getNumBlocks() const
     return chainActive.Height();
 }
 
-int ClientModel::getHeaderHeight() const
+int ClientModel::getHeaderTipHeight() const
 {
     LOCK(cs_main);
     if (!pindexBestHeader)
         return 0;
     return pindexBestHeader->nHeight;
 }
 
+int64_t ClientModel::getHeaderTipTime() const
+{
+    LOCK(cs_main);
+    if (!pindexBestHeader)
+        return 0;
+    return pindexBestHeader->GetBlockTime();
+}
+
 quint64 ClientModel::getTotalBytesRecv() const
 {
     return CNode::GetTotalBytesRecv();
diff --git a/src/qt/clientmodel.h b/src/qt/clientmodel.h
@@ -51,8 +51,8 @@ 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;
-    int getHeaderHeight() 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
diff --git a/src/qt/forms/modaloverlay.ui b/src/qt/forms/modaloverlay.ui
@@ -82,6 +82,9 @@ QLabel { color: rgb(40,40,40);  }</string>
              </property>
              <item>
               <widget class="QPushButton" name="warningIcon">
+               <property name="enabled">
+                <bool>false</bool>
+               </property>
                <property name="text">
                 <string/>
                </property>
diff --git a/src/qt/modaloverlay.cpp b/src/qt/modaloverlay.cpp
@@ -63,10 +63,17 @@ bool ModalOverlay::event(QEvent* ev) {
     return QWidget::event(ev);
 }
 
-void ModalOverlay::setKnownBestHeight(int count)
+void ModalOverlay::setKnownBestHeight(int count, const QDateTime& blockDate)
 {
-    if (count > bestBlockHeight)
-        bestBlockHeight = count;
+
+    /* only update the blockheight if the headerschain-tip is not older then 30 days */
+    int64_t now = QDateTime::currentDateTime().toTime_t();
+    int64_t btime = blockDate.toTime_t();
+    if (btime+3600*24*30 > now)
+    {
+        if (count > bestBlockHeight)
+            bestBlockHeight = count;
+    }
 }
 
 void ModalOverlay::tipUpdate(int count, const QDateTime& blockDate, double nVerificationProgress)
@@ -122,6 +129,8 @@ void ModalOverlay::tipUpdate(int count, const QDateTime& blockDate, double nVeri
     // show remaining amount of blocks
     if (bestBlockHeight > 0)
         ui->amountOfBlocksLeft->setText(QString::number(bestBlockHeight-count));
+    else
+        ui->expectedTimeLeft->setText(tr("Unknown. Syncing Headers..."));
 }
 
 void ModalOverlay::showHide(bool hide, bool userRequested)
diff --git a/src/qt/modaloverlay.h b/src/qt/modaloverlay.h
@@ -23,7 +23,7 @@ class ModalOverlay : public QWidget
 
 public Q_SLOTS:
     void tipUpdate(int count, const QDateTime& blockDate, double nVerificationProgress);
-    void setKnownBestHeight(int count);
+    void setKnownBestHeight(int count, const QDateTime& blockDate);
 
     // will show or hide the modal layer
     void showHide(bool hide = false, bool userRequested = false);

Original file line number	Diff line number	Diff line change
`@@ -500,7 +500,7 @@ void BitcoinGUI::setClientModel(ClientModel *clientModel)`
`500`	`500`	`setTrayIconVisible(optionsModel->getHideTrayIcon());`
`501`	`501`	`}`
`502`	`502`
`503`		`- modalOverlay->setKnownBestHeight(clientModel->getHeaderHeight());`
	`503`	`+ modalOverlay->setKnownBestHeight(clientModel->getHeaderTipHeight(), QDateTime::fromTime_t(clientModel->getHeaderTipTime()));`
`504`	`504`	`} else {`
`505`	`505`	`// Disable possibility to show main window via action`
`506`	`506`	`toggleHideAction->setEnabled(false);`
`@@ -718,7 +718,10 @@ void BitcoinGUI::setNumBlocks(int count, const QDateTime& blockDate, double nVer`
`718`	`718`	`if (modalOverlay)`
`719`	`719`	`{`
`720`	`720`	`if (header)`
`721`		`- modalOverlay->setKnownBestHeight(count);`
	`721`	`+ {`
	`722`	`+ /* use clientmodels getHeaderTipHeight and getHeaderTipTime because the NotifyHeaderTip signal does not fire when updating the best header */`
	`723`	`+ modalOverlay->setKnownBestHeight(clientModel->getHeaderTipHeight(), QDateTime::fromTime_t(clientModel->getHeaderTipTime()));`
	`724`	`+ }`
`722`	`725`	`else`
`723`	`726`	`modalOverlay->tipUpdate(count, blockDate, nVerificationProgress);`
`724`	`727`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,14 +68,22 @@ int ClientModel::getNumBlocks() const`
`68`	`68`	`return chainActive.Height();`
`69`	`69`	`}`
`70`	`70`
`71`		`-int ClientModel::getHeaderHeight() const`
	`71`	`+int ClientModel::getHeaderTipHeight() const`
`72`	`72`	`{`
`73`	`73`	`LOCK(cs_main);`
`74`	`74`	`if (!pindexBestHeader)`
`75`	`75`	`return 0;`
`76`	`76`	`return pindexBestHeader->nHeight;`
`77`	`77`	`}`
`78`	`78`
	`79`	`+int64_t ClientModel::getHeaderTipTime() const`
	`80`	`+{`
	`81`	`+ LOCK(cs_main);`
	`82`	`+ if (!pindexBestHeader)`
	`83`	`+ return 0;`
	`84`	`+ return pindexBestHeader->GetBlockTime();`
	`85`	`+}`
	`86`	`+`
`79`	`87`	`quint64 ClientModel::getTotalBytesRecv() const`
`80`	`88`	`{`
`81`	`89`	`return CNode::GetTotalBytesRecv();`