[*] getting net list from cli

CellFrameDashboardGUI/DapSettingsNetworkModel.cpp

 #include "DapSettingsNetworkModel.h"
 
-DapSettingsNetworkModel::DapSettingsNetworkModel(QObject *parent) : QAbstractListModel(parent)
+DapSettingsNetworkModel::DapSettingsNetworkModel(QObject *parent) : QAbstractListModel(parent),
+    m_CurrentIndex(-1)
 {
     m_NetworkList  = QStringList() << "First" << "Second" << "Third" << "Forth";
 }
@@ -40,6 +41,11 @@ QString DapSettingsNetworkModel::getCurrentNetwork() const
     return m_CurrentNetwork;
 }
 
+int DapSettingsNetworkModel::getCurrentIndex() const
+{
+    return m_CurrentIndex;
+}
+
 void DapSettingsNetworkModel::setNetworkList(const QStringList& aNetworkList)
 {
     if(m_NetworkList == aNetworkList) return;
@@ -48,11 +54,12 @@ void DapSettingsNetworkModel::setNetworkList(const QStringList& aNetworkList)
     endResetModel();
 }
 
-void DapSettingsNetworkModel::setCurrentNetwork(QString CurrentNetwork)
+void DapSettingsNetworkModel::setCurrentNetwork(QString CurrentNetwork, int CurrentIndex)
 {
     if (m_CurrentNetwork == CurrentNetwork)
         return;
 
     m_CurrentNetwork = CurrentNetwork;
+    m_CurrentIndex = CurrentIndex;
     emit currentNetworkChanged(m_CurrentNetwork);
 }

CellFrameDashboardGUI/DapSettingsNetworkModel.h

@@ -9,7 +9,7 @@ class DapSettingsNetworkModel : public QAbstractListModel
 {
     Q_OBJECT
 
-    Q_PROPERTY(QString CurrentNetwork READ getCurrentNetwork WRITE setCurrentNetwork NOTIFY currentNetworkChanged)
+//    Q_PROPERTY(QString CurrentNetwork READ getCurrentNetwork WRITE setCurrentNetwork NOTIFY currentNetworkChanged)
 
 public:
     enum DisplayRole {
@@ -19,6 +19,7 @@ public:
 private:
     QStringList m_NetworkList;
     QString m_CurrentNetwork;
+    int m_CurrentIndex;
 
 public:
     explicit DapSettingsNetworkModel(QObject *parent = nullptr);
@@ -29,10 +30,11 @@ public:
     QHash<int, QByteArray> roleNames() const;
 
     Q_INVOKABLE QString getCurrentNetwork() const;
+    Q_INVOKABLE int getCurrentIndex() const;
 
 public slots:
     void setNetworkList(const QStringList& aNetworkList);
-    void setCurrentNetwork(QString CurrentNetwork);
+    void setCurrentNetwork(QString CurrentNetwork, int CurrentIndex);
 
 signals:
     void currentNetworkChanged(QString currentNetwork);

CellFrameDashboardGUI/DapUiQmlWidgetSettingsNetwork.qml

@@ -14,12 +14,13 @@ DapUiQmlWidgetSettingsNetworkForm {
         anchors.topMargin: 13 * pt
         model: dapSettingsNetworkModel
         textRole: "network"
-        currentIndex: find(dapSettingsNetworkModel.CurrentNetwork)
+        currentIndex: dapSettingsNetworkModel.getCurrentIndex()
 
         onCurrentTextChanged: {
             console.debug(currentText);
-            if(dapSettingsNetworkModel.CurrentNetwork != currentText)
-                dapSettingsNetworkModel.CurrentNetwork = currentText;
+            if(dapSettingsNetworkModel.getCurrentIndex() !== currentIndex) {
+                dapSettingsNetworkModel.setCurrentNetwork(currentText, currentIndex);
+            }
         }
     }
 }

CellFrameDashboardService/CellFrameDashboardService.pro

@@ -20,7 +20,7 @@ ICON = icon.ico
 
 win32 {
     VERSION = $${VER_MAJ}.$${VER_MIN}.$$VER_PAT
-    DEFINES += CLI_PATH=\\\"./kelvin-node-cli.exe\\\"
+    DEFINES += CLI_PATH=\\\"./cellframe-node-cli.exe\\\"
     DEFINES += LOG_FILE=\\\"./opt/cellframe-node/var/log/cellframe-node_logs.txt\\\"
 }
 else {

CellFrameDashboardService/DapChainDashboardService.cpp

@@ -18,7 +18,6 @@ DapChainDashboardService::DapChainDashboardService() : DapRpcService(nullptr)
     QObject::connect(m_pDapChainHistoryHandler, &DapChainHistoryHandler::changeHistory, this, &DapChainDashboardService::doSendNewHistory);
 
     m_pDapChainNetworkHandler = new DapChainNetworkHandler(this);
-    QObject::connect(m_pDapChainNetworkHandler, &DapChainNetworkHandler::changeCurrentNetwork, m_pDapChainHistoryHandler, &DapChainHistoryHandler::setCurrentNetwork);
 }
 
 bool DapChainDashboardService::start()
@@ -96,15 +95,11 @@ QStringList DapChainDashboardService::getNetworkList() const
     return m_pDapChainNetworkHandler->getNetworkList();
 }
 
-void DapChainDashboardService::setCurrentNetwork(const QString& aNetwork)
-{
-    m_pDapChainNetworkHandler->setCurrentNetwork(aNetwork);
-}
-
 void DapChainDashboardService::changeCurrentNetwork(const QString& aNetwork)
 {
-    m_pDapChainNetworkHandler->setCurrentNetwork(aNetwork);
     m_pDapChainHistoryHandler->setCurrentNetwork(aNetwork);
+    m_pDapChainNodeHandler->setCurrentNetwork(aNetwork);
+    m_pDapChainWalletHandler->setCurrentNetwork(aNetwork);
 }
 
 void DapChainDashboardService::doRequestWallets()

CellFrameDashboardService/DapChainDashboardService.h

@@ -108,8 +108,6 @@ public slots:
 
     QStringList getNetworkList() const;
 
-    void setCurrentNetwork(const QString& aNetwork);
-
     void changeCurrentNetwork(const QString& aNetwork);
 
 private slots:

CellFrameDashboardService/DapChainNetworkHandler.cpp

 #include "DapChainNetworkHandler.h"
 
-DapChainNetworkHandler::DapChainNetworkHandler(QObject *parent) : QObject(parent),
-    m_CurrentNetwork(-1)
+DapChainNetworkHandler::DapChainNetworkHandler(QObject *parent) : QObject(parent)
 {
 
 }
@@ -9,26 +8,13 @@ DapChainNetworkHandler::DapChainNetworkHandler(QObject *parent) : QObject(parent
 QStringList DapChainNetworkHandler::getNetworkList()
 {
     QStringList network;
-    /// TODO: It's test. We should change it later
-    QFile file("network.txt");
-    if(file.open(QIODevice::ReadOnly | QIODevice::Text))
-    {
-        QString data = QString::fromStdString(file.readAll().toStdString());
-        network = data.split(": ").at(1).split(", ");
-    }
+    QProcess process;
+    process.start(QString(CLI_PATH) + " net list");
+    process.waitForFinished(-1);
+    QByteArray result = process.readAll();
 
-    if(!network.isEmpty())
-    {
-        if(m_CurrentNetwork.isEmpty() || !m_NetworkList.contains(m_CurrentNetwork))
-            m_CurrentNetwork = network.at(0);
-        emit changeCurrentNetwork(m_CurrentNetwork);
-    }
+    QString data = QString::fromStdString(result.toStdString());
+    network = data.split("\n").at(0).split(": ").at(1).split(", ");
 
     return network;
 }
-
-void DapChainNetworkHandler::setCurrentNetwork(const QString& aNetwork)
-{
-    if(m_NetworkList.contains(aNetwork))
-        emit changeCurrentNetwork(aNetwork);
-}

CellFrameDashboardService/DapChainNetworkHandler.h

@@ -3,6 +3,7 @@
 
 #include <QObject>
 #include <QString>
+#include <QProcess>
 
 #include <QFile>
 
@@ -11,19 +12,12 @@ class DapChainNetworkHandler : public QObject
     Q_OBJECT
 
 private:
-    QString m_CurrentNetwork;
     QStringList m_NetworkList;
 
 public:
     explicit DapChainNetworkHandler(QObject *parent = nullptr);
 
     QStringList getNetworkList();
-
-public slots:
-    void setCurrentNetwork(const QString& aNetwork);
-
-signals:
-    void changeCurrentNetwork(QString network);
 };
 
 #endif // DAPCHAINNETWORKHANDLER_H

CellFrameDashboardService/DapChainNodeNetworkHandler.cpp

@@ -9,7 +9,7 @@ DapChainNodeNetworkHandler::DapChainNodeNetworkHandler(QObject *parent) : QObjec
 QVariant DapChainNodeNetworkHandler::getNodeNetwork() const
 {
     QProcess process;
-    process.start(QString(CLI_PATH) + " node dump -net kelvin-testnet -full");
+    process.start(QString(CLI_PATH) + " node dump -net " + m_CurrentNetwork + " -full");
     process.waitForFinished(-1);
 
     QByteArray result = process.readAll();
@@ -50,7 +50,7 @@ QVariant DapChainNodeNetworkHandler::getNodeNetwork() const
 
 
     QProcess process_status;
-    process_status.start(QString(CLI_PATH) + QString(" net -net kelvin-testnet get status"));
+    process_status.start(QString(CLI_PATH) + " net -net " + m_CurrentNetwork + " get status");
 
     process_status.waitForFinished(-1);
     QByteArray result_status = process_status.readAll();
@@ -67,9 +67,15 @@ QVariant DapChainNodeNetworkHandler::getNodeNetwork() const
     return nodeMap;
 }
 
+void DapChainNodeNetworkHandler::setCurrentNetwork(const QString& aNetwork)
+{
+    if(m_CurrentNetwork == aNetwork) return;
+    m_CurrentNetwork = aNetwork;
+}
+
 void DapChainNodeNetworkHandler::setNodeStatus(const bool aIsOnline)
 {
     QProcess process;
-    process.start(QString(CLI_PATH) + QString(" net -net kelvin-testnet go %1").arg(aIsOnline ? "online" : "offline"));
+    process.start(QString(CLI_PATH) + QString(" net -net %2 go %1").arg(aIsOnline ? "online" : "offline").arg(m_CurrentNetwork));
     process.waitForFinished(-1);
 }

CellFrameDashboardService/DapChainNodeNetworkHandler.h

@@ -13,6 +13,9 @@ class DapChainNodeNetworkHandler : public QObject
 {
     Q_OBJECT
 
+private:
+    QString m_CurrentNetwork;
+
 public:
     explicit DapChainNodeNetworkHandler(QObject *parent = nullptr);
 
@@ -23,6 +26,8 @@ public slots:
     /// Get new node network
     /// @return data of node network
     QVariant getNodeNetwork() const;
+
+    void setCurrentNetwork(const QString& aNetwork);
 };
 
 #endif // DAPCHAINNODENETWORKHANDLER_H

CellFrameDashboardService/DapChainWalletHandler.cpp

@@ -94,7 +94,7 @@ QString DapChainWalletHandler::sendToken(const QString &asSendWallet, const QStr
     QString answer;
     qInfo() << QString("sendTokenTest(%1, %2, %3, %4)").arg(asSendWallet).arg(asAddressReceiver).arg(asToken).arg(aAmount);
     QProcess processCreate;
-    processCreate.start(QString("%1 tx_create -net cellframe-testnet -chain gdb -from_wallet %2 -to_addr %3 -token %4 -value %5")
+    processCreate.start(QString("%1 tx_create -net " + m_CurrentNetwork +" -chain gdb -from_wallet %2 -to_addr %3 -token %4 -value %5")
                   .arg(CLI_PATH)
                   .arg(asSendWallet)
                   .arg(asAddressReceiver)
@@ -106,10 +106,16 @@ QString DapChainWalletHandler::sendToken(const QString &asSendWallet, const QStr
     if(!(resultCreate.isEmpty() || resultCreate.isNull()))
     {
         QProcess processMempool;
-        processMempool.start(QString("%1 mempool_proc -net kelvin-testnet -chain gdb").arg(CLI_PATH));
+        processMempool.start(QString("%1 mempool_proc -net " + m_CurrentNetwork +" -chain gdb").arg(CLI_PATH));
         processMempool.waitForFinished(-1);
         answer = QString::fromLatin1(processMempool.readAll());
         qDebug() << answer;
     }
     return answer;
 }
+
+void DapChainWalletHandler::setCurrentNetwork(const QString& aNetwork)
+{
+    if(m_CurrentNetwork != aNetwork) return;
+    m_CurrentNetwork = aNetwork;
+}

CellFrameDashboardService/DapChainWalletHandler.h

@@ -10,6 +10,9 @@ class DapChainWalletHandler : public QObject
 {
     Q_OBJECT
 
+private:
+    QString m_CurrentNetwork;
+
 protected:
     virtual QString parse(const QByteArray& aWalletAddress);
 
@@ -24,6 +27,7 @@ public slots:
     QMap<QString, QVariant> getWallets();
     QStringList getWalletInfo(const QString& asNameWallet);
     QString sendToken(const QString &asSendWallet, const QString& asAddressReceiver, const QString& asToken, const QString& aAmount);
+    void setCurrentNetwork(const QString& aNetwork);
 };
 
 #endif // DAPCHAINWALLETHANDLER_H