From 595a8d477aed99de706e97638c2dabe774202bce Mon Sep 17 00:00:00 2001
From: adityapk <adityapk@gmail.com>
Date: Thu, 8 Nov 2018 13:06:30 -0800
Subject: [PATCH] zcashd on windows

---
 src/connection.cpp | 29 +++++++++++++++++++++++------
 src/connection.ui  |  2 +-
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/connection.cpp b/src/connection.cpp
index 231ed93..67bf1c1 100644
--- a/src/connection.cpp
+++ b/src/connection.cpp
@@ -70,6 +70,23 @@ void ConnectionLoader::loadConnection() {
     } 
 }
 
+QString randomPassword() {
+    static const char alphanum[] =
+        "0123456789"
+        "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+        "abcdefghijklmnopqrstuvwxyz";
+
+    const int passwordLength = 10;
+    char* s = new char[passwordLength + 1];
+
+    for (int i = 0; i < passwordLength; ++i) {
+        s[i] = alphanum[rand() % (sizeof(alphanum) - 1)];
+    }
+
+    s[passwordLength] = 0;
+    return QString::fromStdString(s);
+}
+
 /**
  * This will create a new zcash.conf, download zcash parameters.
  */ 
@@ -93,13 +110,14 @@ void ConnectionLoader::createZcashConf() {
         
         out << "server=1\n";
         out << "rpcuser=zec-qt-wallet\n";
-        out << "rpcpassword=" % QString::number(std::rand()) << "\n";
+        out << "rpcpassword=" % randomPassword() << "\n";
         file.close();
 
         this->loadConnection(); 
     });    
 }
 
+
 void ConnectionLoader::downloadParams(std::function<void(void)> cb) {    
     // Add all the files to the download queue
     downloadQueue = new QQueue<QUrl>();
@@ -216,20 +234,19 @@ bool ConnectionLoader::startEmbeddedZcashd() {
     qDebug() << "Starting zcashd";
     QFileInfo fi(Settings::getInstance()->getExecName());
 #ifdef Q_OS_LINUX
-    auto zcashdProgram = "zcashd";
+    auto zcashdProgram = fi.dir().absoluteFilePath("zcashd");
 #elif defined(Q_OS_DARWIN)
-    auto zcashdProgram = "zcashd";
+    auto zcashdProgram = fi.dir().absoluteFilePath("zcashd");
 #else
-    auto zcashdProgram = "zcashd.exe";
+    auto zcashdProgram = fi.dir().absoluteFilePath("zcashd.exe");
 #endif
     
     if (!QFile(zcashdProgram).exists()) {
-        qDebug() << "Can't find zcashd";
+        qDebug() << "Can't find zcashd at " << zcashdProgram;
         return false;
     }
 
     ezcashd = new QProcess(main);    
-    ezcashd->setWorkingDirectory(fi.dir().absolutePath());
     QObject::connect(ezcashd, &QProcess::started, [=] () {
         qDebug() << "zcashd started";
     });
diff --git a/src/connection.ui b/src/connection.ui
index 704f9d9..9a33ed6 100644
--- a/src/connection.ui
+++ b/src/connection.ui
@@ -52,7 +52,7 @@
    <item>
     <widget class="QLabel" name="status">
      <property name="text">
-      <string>Connection Status</string>
+      <string>Starting Up</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignCenter</set>