qml: Connect NodeModel to the NotifyBlockTip core signal

Author: hebasto

src/qml/bitcoin.cpp

@@ -128,7 +128,7 @@ int QmlGuiMain(int argc, char* argv[])
     InitExecutor init_executor{*node};
     QObject::connect(&node_model, &NodeModel::requestedInitialize, &init_executor, &InitExecutor::initialize);
     QObject::connect(&node_model, &NodeModel::requestedShutdown, &init_executor, &InitExecutor::shutdown);
-    // QObject::connect(&init_executor, &InitExecutor::initializeResult, &node_model, &NodeModel::initializeResult);
+    QObject::connect(&init_executor, &InitExecutor::initializeResult, &node_model, &NodeModel::initializeResult);
     QObject::connect(&init_executor, &InitExecutor::shutdownResult, qGuiApp, &QGuiApplication::quit, Qt::QueuedConnection);
     // QObject::connect(&init_executor, &InitExecutor::runawayException, &node_model, &NodeModel::handleRunawayException);
 

src/qml/nodemodel.cpp

@@ -5,10 +5,12 @@
 #include <qml/nodemodel.h>
 
 #include <interfaces/node.h>
+#include <validation.h>
 
 NodeModel::NodeModel(interfaces::Node& node)
     : m_node{node}
 {
+    ConnectToBlockTipSignal();
 }
 
 void NodeModel::setBlockTipHeight(int new_height)
@@ -28,3 +30,18 @@ void NodeModel::startNodeShutdown()
 {
     Q_EMIT requestedShutdown();
 }
+
+void NodeModel::initializeResult([[maybe_unused]] bool success, interfaces::BlockAndHeaderTipInfo tip_info)
+{
+    // TODO: Handle the `success` parameter,
+    setBlockTipHeight(tip_info.block_height);
+}
+
+void NodeModel::ConnectToBlockTipSignal()
+{
+    assert(!m_handler_notify_block_tip);
+    m_handler_notify_block_tip = m_node.handleNotifyBlockTip(
+        [this](SynchronizationState state, interfaces::BlockTip tip, double verification_progress) {
+            setBlockTipHeight(tip.block_height);
+        });
+}

src/qml/nodemodel.h

@@ -5,6 +5,11 @@
 #ifndef BITCOIN_QML_NODEMODEL_H
 #define BITCOIN_QML_NODEMODEL_H
 
+#include <interfaces/handler.h>
+#include <interfaces/node.h>
+
+#include <memory>
+
 #include <QObject>
 
 namespace interfaces {
@@ -26,6 +31,9 @@ class NodeModel : public QObject
     Q_INVOKABLE void startNodeInitializionThread();
     void startNodeShutdown();
 
+public Q_SLOTS:
+    void initializeResult(bool success, interfaces::BlockAndHeaderTipInfo tip_info);
+
 Q_SIGNALS:
     void blockTipHeightChanged();
     void requestedInitialize();
@@ -36,6 +44,9 @@ class NodeModel : public QObject
     int m_block_tip_height{0};
 
     interfaces::Node& m_node;
+    std::unique_ptr<interfaces::Handler> m_handler_notify_block_tip;
+
+    void ConnectToBlockTipSignal();
 };
 
 #endif // BITCOIN_QML_NODEMODEL_H

src/qt/bitcoin.cpp

@@ -85,7 +85,6 @@ static void RegisterMetaTypes()
 
     qRegisterMetaType<std::function<void()>>("std::function<void()>");
     qRegisterMetaType<QMessageBox::Icon>("QMessageBox::Icon");
-    qRegisterMetaType<interfaces::BlockAndHeaderTipInfo>("interfaces::BlockAndHeaderTipInfo");
 }
 
 static QString GetLangTerritory()

src/qt/main.cpp

@@ -12,6 +12,7 @@
 #include <qt/bitcoin.h>
 #endif // USE_QML
 
+#include <interfaces/node.h>
 #include <logging.h>
 #include <noui.h>
 #include <util/system.h>
@@ -62,6 +63,8 @@ void DebugMessageHandler(QtMsgType type, const QMessageLogContext& context, cons
 
 int main(int argc, char* argv[])
 {
+    qRegisterMetaType<interfaces::BlockAndHeaderTipInfo>("interfaces::BlockAndHeaderTipInfo");
+
 #ifdef WIN32
     util::WinCmdLineArgs win_args;
     std::tie(argc, argv) = win_args.get();