Merge branch 'features-2510' into 'master'

Features 2510

See merge request !16

CellFrameDashboardService/DapChainHistoryHandler.h

@@ -16,6 +16,7 @@ class DapChainHistoryHandler : public QObject
     Q_OBJECT
 
 private:
+    QString m_CurrentNetwork;
     QVariant m_history;
     QTimer* m_timoutRequestHistory;
 
@@ -30,6 +31,9 @@ public slots:
     /// Request new tx history
     /// @param wallet list
     void onRequestNewHistory(const QMap<QString, QVariant>& aWallets);
+    /// Set current network
+    /// @param name of network
+    void setCurrentNetwork(const QString& aNetwork);
 
 signals:
     /// Signal for request wallets list

CellFrameDashboardService/DapChainNetworkHandler.cpp

+#include "DapChainNetworkHandler.h"
+#include <QDebug>
+
+DapChainNetworkHandler::DapChainNetworkHandler(QObject *parent) : QObject(parent)
+{
+
+}
+
+QStringList DapChainNetworkHandler::getNetworkList()
+{
+    QStringList network;
+    QProcess process;
+    process.start(QString(CLI_PATH) + " net list");
+    process.waitForFinished(-1);
+    QByteArray result = process.readAll();
+
+    if(!result.isEmpty())
+    {
+        QString data = QString::fromStdString(result.toStdString());
+        data = data.remove("\n");
+        QStringList list = data.split(": ");
+        if(list.count() > 1)
+        {
+            network = list.at(1).split(", ");
+        }
+    }
+
+    return network;
+}

CellFrameDashboardService/DapChainNetworkHandler.h

+#ifndef DAPCHAINNETWORKHANDLER_H
+#define DAPCHAINNETWORKHANDLER_H
+
+#include <QObject>
+#include <QString>
+#include <QProcess>
+
+#include <QFile>
+
+class DapChainNetworkHandler : public QObject
+{
+    Q_OBJECT
+
+private:
+    QStringList m_NetworkList;
+
+public:
+    explicit DapChainNetworkHandler(QObject *parent = nullptr);
+
+    /// Get network list
+    /// @return Network list
+    QStringList getNetworkList();
+};
+
+#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("%1 node dump -net %2 -full").arg(CLI_PATH).arg(m_CurrentNetwork));
     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,16 @@ 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 %1 go %2").arg(m_CurrentNetwork).arg(aIsOnline ? "online" : "offline"));
     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,9 @@ public slots:
     /// Get new node network
     /// @return data of node network
     QVariant getNodeNetwork() const;
+    /// Set current network
+    /// @param name of network
+    void setCurrentNetwork(const QString& aNetwork);
 };
 
 #endif // DAPCHAINNODENETWORKHANDLER_H

CellFrameDashboardService/DapChainWalletHandler.cpp

@@ -94,22 +94,29 @@ 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 %2 -chain gdb -from_wallet %3 -to_addr %4 -token %5 -value %6")
                   .arg(CLI_PATH)
+                  .arg(m_CurrentNetwork)
                   .arg(asSendWallet)
                   .arg(asAddressReceiver)
                   .arg(asToken)
-                  .arg(aAmount));
+                  .arg(aAmount) );
     processCreate.waitForFinished(-1);
     QString resultCreate = QString::fromLatin1(processCreate.readAll());
     qDebug() << resultCreate;
     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);
 
@@ -19,11 +22,31 @@ public:
 signals:
 
 public slots:
+    /// Create new wallet
+    /// @param name of wallet
+    /// @return result
     QStringList createWallet(const QString& asNameWallet);
+    /// Remove wallet
+    /// @param name of wallet
     void removeWallet(const QString& asNameWallet);
+    /// Get list of wallets
+    /// @return QMap of available wallets, where the key is name of wallet
+    /// and the value is number of wallet
     QMap<QString, QVariant> getWallets();
+    /// Get details about wallet
+    /// @param name of wallet
+    /// @return list with balances and tokens
     QStringList getWalletInfo(const QString& asNameWallet);
+    /// Create new token
+    /// @param name of wallet where is needed to send
+    /// @param andress of wallet which will receive
+    /// @param token name
+    /// @param sum for sending
+    /// @return result
     QString sendToken(const QString &asSendWallet, const QString& asAddressReceiver, const QString& asToken, const QString& aAmount);
+    /// Set current network
+    /// @param name of network
+    void setCurrentNetwork(const QString& aNetwork);
 };
 
 #endif // DAPCHAINWALLETHANDLER_H