From 6010cbe3129a544539712f70fa651a637414fc33 Mon Sep 17 00:00:00 2001 From: Duke Leto Date: Fri, 13 Sep 2019 09:44:16 -0400 Subject: [PATCH] Maybe fix the autostarting-on-windows bug --- src/connection.cpp | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/src/connection.cpp b/src/connection.cpp index e1c0ec6..52f7859 100644 --- a/src/connection.cpp +++ b/src/connection.cpp @@ -336,7 +336,6 @@ bool ConnectionLoader::startEmbeddedZcashd() { } } - // Finally, start hushd QDir appPath(QCoreApplication::applicationDirPath()); #ifdef Q_OS_LINUX auto hushdProgram = appPath.absoluteFilePath("hushd"); @@ -346,10 +345,11 @@ bool ConnectionLoader::startEmbeddedZcashd() { #elif defined(Q_OS_DARWIN) auto hushdProgram = appPath.absoluteFilePath("hushd"); #elif defined(Q_OS_WIN64) - auto hushdProgram = appPath.absoluteFilePath("hushd.bat"); + // we use the CLI directly + auto hushdProgram = appPath.absoluteFilePath("komodod"); #else - //TODO: Not Linux + not darwin DOES NOT EQUAL windows!!! - auto hushdProgram = appPath.absoluteFilePath("hushd"); + main->logger->write("Unknown OS!"); + auto hushdProgram = appPath.absoluteFilePath("komodod"); #endif if (!QFile(hushdProgram).exists()) { @@ -380,13 +380,26 @@ bool ConnectionLoader::startEmbeddedZcashd() { processStdErrOutput.append(output); }); + + // This string should be the exact arg list seperated by single spaces + QString params = "-ac_name=HUSH3 -ac_sapling=1 -ac_reward=0,1125000000,562500000 -ac_halving=129,340000,840000 -ac_end=128,340000,5422111 -ac_eras=3 -ac_blocktime=150 -ac_cc=2 -ac_ccenable=228,234,235,236,241 -ac_founders=1 -ac_supply=6178674 -ac_perc=11111111 -clientname=GoldenSandtrout -addnode=188.165.212.101 -addnode=136.243.227.142 -addnode=5.9.224.250 -ac_cclib=hush3 -ac_script=76a9145eb10cf64f2bab1b457f1f25e658526155928fac88ac"; + QStringList arguments = params.split(" "); + // Finally, actually start the full node + #ifdef Q_OS_LINUX + main->logger->write("Starting on Linux"); ezcashd->start(hushdProgram); #elif defined(Q_OS_DARWIN) + main->logger->write("Starting on Darwin"); ezcashd->start(hushdProgram); +#elif defined(Q_OS_WIN64) + main->logger->write("Starting on Win64 with params " + params); + ezcashd->setWorkingDirectory(appPath.absolutePath()); + ezcashd->start(hushdProgram, arguments); #else + main->logger->write("Starting on Unknown OS with params " + params); ezcashd->setWorkingDirectory(appPath.absolutePath()); - ezcashd->start(hushdProgram); + ezcashd->start(hushdProgram, arguments); #endif // Q_OS_LINUX