Merge pull request #425

ef1d7f9 send custom commands to daemon + status button requires #1618 (Jaquee)
2e925b5 Update submodule + fix epee link (Jaquee)
39f9d5a pin submodule to monero head (Jaquee)

4 files changed, 52 insertions, 17 deletions

diff --git a/src/daemon/DaemonManager.cpp b/src/daemon/DaemonManager.cpp
index e85db709..5298743a 100644
--- a/src/daemon/DaemonManager.cpp
+++ b/src/daemon/DaemonManager.cpp
@@ -25,20 +25,6 @@ DaemonManager *DaemonManager::instance(const QStringList *args)
 
 bool DaemonManager::start(const QString &flags)
 {
-    //
-    QString process;
-#ifdef Q_OS_WIN
-    process = QApplication::applicationDirPath() + "/monerod.exe";
-#elif defined(Q_OS_UNIX)
-    process = QApplication::applicationDirPath() + "/monerod";
-#endif
-
-    if (process.length() == 0) {
-        qDebug() << "no daemon binary defined for current platform";
-        return false;
-    }
-
-
     // prepare command line arguments and pass to monerod
     QStringList arguments;
     foreach (const QString &str, m_clArgs) {
@@ -55,8 +41,8 @@ bool DaemonManager::start(const QString &flags)
     }
 
 
-    qDebug() << "starting monerod " + process;
-    qDebug() << "With command line arguments " << arguments;
+    qDebug() << "starting monerod " + m_monerod;
+    qDebug() << "With command line arguments " << m_monerod;
 
     m_daemon = new QProcess();
     initialized = true;
@@ -66,7 +52,7 @@ bool DaemonManager::start(const QString &flags)
     connect (m_daemon, SIGNAL(readyReadStandardError()), this, SLOT(printError()));
 
     // Start monerod
-    m_daemon->start(process,arguments);
+    m_daemon->start(m_monerod, arguments);
     bool started =  m_daemon->waitForStarted();
 
     // add state changed listener
@@ -134,10 +120,47 @@ bool DaemonManager::running() const
     return false;
 }
 
+bool DaemonManager::sendCommand(const QString &cmd,bool testnet)
+{
+    // If daemon is started by GUI - interactive mode
+    if (initialized && running()) {
+        m_daemon->write(cmd.toUtf8() +"\n");
+        return true;
+    }
+
+    // else send external command
+    QProcess p;
+    QString external_cmd = m_monerod + " " + cmd;
+
+    // Add nestnet flag if needed
+    if (testnet)
+        external_cmd += " --testnet";
+    external_cmd += "\n";
+
+    p.start(external_cmd);
+    bool started = p.waitForFinished(-1);
+    QString p_stdout = p.readAllStandardOutput();
+    qDebug() << p_stdout;
+    emit daemonConsoleUpdated(p_stdout);
+
+    return started;
+}
+
 DaemonManager::DaemonManager(QObject *parent)
     : QObject(parent)
 {
 
+    // Platform depetent path to monerod
+#ifdef Q_OS_WIN
+    m_monerod = QApplication::applicationDirPath() + "/monerod.exe";
+#elif defined(Q_OS_UNIX)
+    m_monerod = QApplication::applicationDirPath() + "/monerod";
+#endif
+
+    if (m_monerod.length() == 0) {
+        qCritical() << "no daemon binary defined for current platform";
+        m_has_daemon = false;
+    }
 }
 
 void DaemonManager::closing()
diff --git a/src/daemon/DaemonManager.h b/src/daemon/DaemonManager.h
index 7c9730e8..2a2b38df 100644
--- a/src/daemon/DaemonManager.h
+++ b/src/daemon/DaemonManager.h
@@ -18,6 +18,7 @@ public:
 
     // return true if daemon process is started
     Q_INVOKABLE bool running() const;
+    Q_INVOKABLE bool sendCommand(const QString &cmd, bool testnet);
 
 signals:
     void daemonStarted();
@@ -37,6 +38,8 @@ private:
     static QStringList m_clArgs;
     QProcess *m_daemon;
     bool initialized = false;
+    QString m_monerod;
+    bool m_has_daemon = true;
 
 };
 
diff --git a/src/libwalletqt/Wallet.cpp b/src/libwalletqt/Wallet.cpp
index 6147e1cb..2ade69bb 100644
--- a/src/libwalletqt/Wallet.cpp
+++ b/src/libwalletqt/Wallet.cpp
@@ -98,6 +98,11 @@ Wallet::Status Wallet::status() const
     return static_cast<Status>(m_walletImpl->status());
 }
 
+bool Wallet::testnet() const
+{
+    return m_walletImpl->testnet();
+}
+
 Wallet::ConnectionStatus Wallet::connected() const
 {
     // cache connection status
diff --git a/src/libwalletqt/Wallet.h b/src/libwalletqt/Wallet.h
index 2fb0ba6e..9aec45fc 100644
--- a/src/libwalletqt/Wallet.h
+++ b/src/libwalletqt/Wallet.h
@@ -25,6 +25,7 @@ class Wallet : public QObject
     Q_PROPERTY(QString seed READ getSeed)
     Q_PROPERTY(QString seedLanguage READ getSeedLanguage)
     Q_PROPERTY(Status status READ status)
+    Q_PROPERTY(bool testnet READ testnet)
     Q_PROPERTY(ConnectionStatus connected READ connected)
     Q_PROPERTY(bool synchronized READ synchronized)
     Q_PROPERTY(QString errorString READ errorString)
@@ -70,6 +71,9 @@ public:
     //! returns last operation's status
     Status status() const;
 
+    //! returns true testnet wallet.
+    bool testnet() const;
+
     //! returns whether the wallet is connected, and version status
     ConnectionStatus connected() const;