qml: handle pre & header sync, move verification progress along

This connects us to the header tip signal so that we can handle when the
node is in pre & or headers sync. This calculates the progress of the
pre or headers sync and adds it to our verification progress. Pre and 
headers sync take up 1% of verification progress each, then IBD begins
at 2% progress as displayed on the block clock.

Author: jarolrod

src/qml/nodemodel.cpp

@@ -20,6 +20,7 @@ NodeModel::NodeModel(interfaces::Node& node)
     : m_node{node}
 {
     ConnectToBlockTipSignal();
+    ConnectToHeaderTipSignal();
     ConnectToNumConnectionsChangedSignal();
 }
 
@@ -39,6 +40,47 @@ void NodeModel::setNumOutboundPeers(int new_num)
     }
 }
 
+void NodeModel::setInHeaderSync(bool new_in_header_sync)
+{
+    if (new_in_header_sync != m_in_header_sync) {
+        m_in_header_sync = new_in_header_sync;
+        Q_EMIT inHeaderSyncChanged();
+    }
+}
+
+void NodeModel::setHeaderSyncProgress(int64_t header_height, const QDateTime& block_date)
+{
+    int estimated_headers_left = block_date.secsTo(QDateTime::currentDateTime()) / Params().GetConsensus().nPowTargetSpacing;
+    double new_header_sync_progress = (100.0 / (header_height + estimated_headers_left) * header_height) / 10000;
+
+    if (new_header_sync_progress != m_header_sync_progress) {
+        m_header_sync_progress = new_header_sync_progress;
+        setVerificationProgress(0.0);
+        Q_EMIT headerSyncProgressChanged();
+    }
+}
+
+void NodeModel::setInPreHeaderSync(bool new_in_pre_header_sync)
+{
+    if (new_in_pre_header_sync != m_in_pre_header_sync) {
+        m_in_pre_header_sync = new_in_pre_header_sync;
+        Q_EMIT inPreHeaderSyncChanged();
+    }
+}
+
+void NodeModel::setPreHeaderSyncProgress(int64_t header_height, const QDateTime& block_date)
+{
+    int estimated_headers_left = block_date.secsTo(QDateTime::currentDateTime()) / Params().GetConsensus().nPowTargetSpacing;
+    double new_pre_header_sync_progress = (100.0 / (header_height + estimated_headers_left) * header_height) / 10000;
+
+    if (new_pre_header_sync_progress != m_pre_header_sync_progress) {
+        m_pre_header_sync_progress = new_pre_header_sync_progress;
+        setVerificationProgress(0.0);
+        Q_EMIT preHeaderSyncProgressChanged();
+
+    }
+}
+
 void NodeModel::setRemainingSyncTime(double new_progress)
 {
     int currentTime = QDateTime::currentDateTime().toMSecsSinceEpoch();
@@ -74,12 +116,18 @@ void NodeModel::setRemainingSyncTime(double new_progress)
         }
     }
 }
+
 void NodeModel::setVerificationProgress(double new_progress)
 {
-    if (new_progress != m_verification_progress) {
-        setRemainingSyncTime(new_progress);
+    if (!m_in_header_sync && !m_in_pre_header_sync) {
+       if (new_progress != m_verification_progress) {
+            setRemainingSyncTime(new_progress);
 
-        m_verification_progress = new_progress;
+            m_verification_progress = new_progress + m_header_sync_progress + m_pre_header_sync_progress;
+            Q_EMIT verificationProgressChanged();
+        }
+    } else {
+        m_verification_progress = new_progress + m_header_sync_progress + m_pre_header_sync_progress;
         Q_EMIT verificationProgressChanged();
     }
 }
@@ -135,12 +183,33 @@ void NodeModel::ConnectToBlockTipSignal()
             QMetaObject::invokeMethod(this, [=] {
                 setBlockTipHeight(tip.block_height);
                 setVerificationProgress(verification_progress);
-
+                setInHeaderSync(false);
+                setInPreHeaderSync(false);
                 Q_EMIT setTimeRatioList(tip.block_time);
             });
         });
 }
 
+void NodeModel::ConnectToHeaderTipSignal()
+{
+    assert(!m_handler_notify_header_tip);
+
+    m_handler_notify_header_tip = m_node.handleNotifyHeaderTip(
+        [this](SynchronizationState sync_state, interfaces::BlockTip tip, bool presync) {
+            QMetaObject::invokeMethod(this, [=] {
+                if (presync) {
+                    setInHeaderSync(false);
+                    setInPreHeaderSync(true);
+                    setPreHeaderSyncProgress(tip.block_height, QDateTime::fromSecsSinceEpoch(tip.block_time));
+                } else {
+                    setInHeaderSync(true);
+                    setInPreHeaderSync(false);
+                    setHeaderSyncProgress(tip.block_height, QDateTime::fromSecsSinceEpoch(tip.block_time));
+                }
+            });
+        });
+}
+
 void NodeModel::ConnectToNumConnectionsChangedSignal()
 {
     assert(!m_handler_notify_num_peers_changed);

src/qml/nodemodel.h

@@ -27,6 +27,10 @@ class NodeModel : public QObject
     Q_PROPERTY(int blockTipHeight READ blockTipHeight NOTIFY blockTipHeightChanged)
     Q_PROPERTY(int numOutboundPeers READ numOutboundPeers NOTIFY numOutboundPeersChanged)
     Q_PROPERTY(int maxNumOutboundPeers READ maxNumOutboundPeers CONSTANT)
+    Q_PROPERTY(bool inHeaderSync READ inHeaderSync WRITE setInHeaderSync NOTIFY inHeaderSyncChanged)
+    Q_PROPERTY(double headerSyncProgress READ headerSyncProgress NOTIFY headerSyncProgressChanged)
+    Q_PROPERTY(bool inPreHeaderSync READ inPreHeaderSync WRITE setInPreHeaderSync NOTIFY inPreHeaderSyncChanged)
+    Q_PROPERTY(double preHeaderSyncProgress READ preHeaderSyncProgress NOTIFY preHeaderSyncProgressChanged)
     Q_PROPERTY(int remainingSyncTime READ remainingSyncTime NOTIFY remainingSyncTimeChanged)
     Q_PROPERTY(double verificationProgress READ verificationProgress NOTIFY verificationProgressChanged)
     Q_PROPERTY(bool pause READ pause WRITE setPause NOTIFY pauseChanged)
@@ -39,6 +43,14 @@ class NodeModel : public QObject
     int numOutboundPeers() const { return m_num_outbound_peers; }
     void setNumOutboundPeers(int new_num);
     int maxNumOutboundPeers() const { return m_max_num_outbound_peers; }
+    bool inHeaderSync() const { return m_in_header_sync; }
+    void setInHeaderSync(bool new_in_header_sync);
+    double headerSyncProgress() const { return m_header_sync_progress; }
+    void setHeaderSyncProgress(int64_t header_height, const QDateTime& block_date);
+    bool inPreHeaderSync() const { return m_in_pre_header_sync; }
+    void setInPreHeaderSync(bool new_in_pre_header_sync);
+    double preHeaderSyncProgress() const { return m_pre_header_sync_progress; }
+    void setPreHeaderSyncProgress(int64_t header_height, const QDateTime& block_date);
     int remainingSyncTime() const { return m_remaining_sync_time; }
     void setRemainingSyncTime(double new_progress);
     double verificationProgress() const { return m_verification_progress; }
@@ -57,6 +69,10 @@ public Q_SLOTS:
 Q_SIGNALS:
     void blockTipHeightChanged();
     void numOutboundPeersChanged();
+    void inHeaderSyncChanged();
+    void headerSyncProgressChanged();
+    void inPreHeaderSyncChanged();
+    void preHeaderSyncProgressChanged();
     void remainingSyncTimeChanged();
     void requestedInitialize();
     void requestedShutdown();
@@ -74,6 +90,10 @@ public Q_SLOTS:
     int m_block_tip_height{0};
     int m_num_outbound_peers{0};
     static constexpr int m_max_num_outbound_peers{MAX_OUTBOUND_FULL_RELAY_CONNECTIONS + MAX_BLOCK_RELAY_ONLY_CONNECTIONS};
+    bool m_in_header_sync;
+    double m_header_sync_progress;
+    bool m_in_pre_header_sync;
+    double m_pre_header_sync_progress;
     int m_remaining_sync_time{0};
     double m_verification_progress{0.0};
     bool m_pause{false};
@@ -84,9 +104,11 @@ public Q_SLOTS:
 
     interfaces::Node& m_node;
     std::unique_ptr<interfaces::Handler> m_handler_notify_block_tip;
+    std::unique_ptr<interfaces::Handler> m_handler_notify_header_tip;
     std::unique_ptr<interfaces::Handler> m_handler_notify_num_peers_changed;
 
     void ConnectToBlockTipSignal();
+    void ConnectToHeaderTipSignal();
     void ConnectToNumConnectionsChangedSignal();
 };