diff --git a/res/silentdragon_be.ts b/res/silentdragon_be.ts index 3d605bb..79a3a68 100644 --- a/res/silentdragon_be.ts +++ b/res/silentdragon_be.ts @@ -2692,7 +2692,7 @@ You either have unconfirmed funds or the balance is too low for an automatic mig - createZcashConf + createHushConf Show Advanced Configuration diff --git a/res/silentdragon_bg.ts b/res/silentdragon_bg.ts index b9b8077..e56dbd5 100644 --- a/res/silentdragon_bg.ts +++ b/res/silentdragon_bg.ts @@ -2117,7 +2117,7 @@ Would you like to visit the releases page? - createZcashConf + createHushConf Configure HUSH3.conf diff --git a/res/silentdragon_de.qm b/res/silentdragon_de.qm index 28d0b32..6fd1543 100644 Binary files a/res/silentdragon_de.qm and b/res/silentdragon_de.qm differ diff --git a/res/silentdragon_de.ts b/res/silentdragon_de.ts index 0ee486e..79fc6d1 100644 --- a/res/silentdragon_de.ts +++ b/res/silentdragon_de.ts @@ -672,7 +672,7 @@ Die URI sollte folgendes Format haben: 'hush:<Adresse>?Betrag=x&Nachricht=y - Paste Zcash URI + Paste Hush URI Füge HUSH URI ein @@ -2412,7 +2412,7 @@ You either have unconfirmed funds or the balance is too low for an automatic mig - createZcashConf + createHushConf Configure HUSH3.conf diff --git a/res/silentdragon_es.qm b/res/silentdragon_es.qm index 72c22e7..7597346 100644 Binary files a/res/silentdragon_es.qm and b/res/silentdragon_es.qm differ diff --git a/res/silentdragon_es.ts b/res/silentdragon_es.ts index 47a8358..699a1c3 100644 --- a/res/silentdragon_es.ts +++ b/res/silentdragon_es.ts @@ -2347,7 +2347,7 @@ El saldo es insuficiente para una migración automática. - createZcashConf + createHushConf Configure HUSH3.conf @@ -2470,7 +2470,7 @@ El saldo es insuficiente para una migración automática. <html><head/><body><p>ZBoard: Fully anonymous and untraceable chat messages based on the ZCash blockchain. <a href="http://www.z-board.net/"><span style=" text-decoration: underline; color:#0000ff;">http://www.z-board.net/</span></a></p></body></html> - <html><head/><body><p>ZBoard: Mensajes de chat totalmente anónimos e imposibles de rastrear basados en la cadena de bloques Zcash. <a href="http://www.z-board.net/"><span style=" text-decoration: underline; color:#0000ff;">http://www.z-board.net/</span></a></p></body></html> + <html><head/><body><p>ZBoard: Mensajes de chat totalmente anónimos e imposibles de rastrear basados en la cadena de bloques Hush. <a href="http://www.z-board.net/"><span style=" text-decoration: underline; color:#0000ff;">http://www.z-board.net/</span></a></p></body></html> Warning diff --git a/res/silentdragon_fi.qm b/res/silentdragon_fi.qm index b4eaf9a..2f10600 100644 Binary files a/res/silentdragon_fi.qm and b/res/silentdragon_fi.qm differ diff --git a/res/silentdragon_fi.ts b/res/silentdragon_fi.ts index e839610..1a289d0 100644 --- a/res/silentdragon_fi.ts +++ b/res/silentdragon_fi.ts @@ -1461,7 +1461,7 @@ Aseta isäntä/portti ja käyttäjänimi/salasana Muokkaa-> Asetukset-valikos Osoitteen Formaatti Virhe - doesn't seem to be a valid Zcash address. + doesn't seem to be a valid Hush address. YOUR_TRANSLATION_HERE @@ -2367,7 +2367,7 @@ Sinulla on joko vahvistamattomia varoja tai saldo on liian pieni automaattiseen - createZcashConf + createHushConf Configure HUSH3.conf diff --git a/res/silentdragon_fil.qm b/res/silentdragon_fil.qm index 2558a7d..2e0a717 100644 Binary files a/res/silentdragon_fil.qm and b/res/silentdragon_fil.qm differ diff --git a/res/silentdragon_fil.ts b/res/silentdragon_fil.ts index d7f2eb6..83f3e4d 100644 --- a/res/silentdragon_fil.ts +++ b/res/silentdragon_fil.ts @@ -2189,7 +2189,7 @@ Would you like to visit the releases page? - createZcashConf + createHushConf Configure HUSH3.conf diff --git a/res/silentdragon_fr.qm b/res/silentdragon_fr.qm index 3b97737..c82acb0 100644 Binary files a/res/silentdragon_fr.qm and b/res/silentdragon_fr.qm differ diff --git a/res/silentdragon_fr.ts b/res/silentdragon_fr.ts index 1ec3577..d1fc928 100644 --- a/res/silentdragon_fr.ts +++ b/res/silentdragon_fr.ts @@ -2385,7 +2385,7 @@ Vous avez soit des fonds non confirmés soit le solde est trop petit pour une mi - createZcashConf + createHushConf Configure HUSH3.conf diff --git a/res/silentdragon_hr.qm b/res/silentdragon_hr.qm index 77a98e5..20946a3 100644 Binary files a/res/silentdragon_hr.qm and b/res/silentdragon_hr.qm differ diff --git a/res/silentdragon_hr.ts b/res/silentdragon_hr.ts index 0b96df1..a6db88d 100644 --- a/res/silentdragon_hr.ts +++ b/res/silentdragon_hr.ts @@ -2192,7 +2192,7 @@ Would you like to visit the releases page? - createZcashConf + createHushConf Configure HUSH3.conf diff --git a/res/silentdragon_id.qm b/res/silentdragon_id.qm index b8dc7f0..3cdc54d 100644 Binary files a/res/silentdragon_id.qm and b/res/silentdragon_id.qm differ diff --git a/res/silentdragon_id.ts b/res/silentdragon_id.ts index 74d6565..bdc111e 100644 --- a/res/silentdragon_id.ts +++ b/res/silentdragon_id.ts @@ -2180,7 +2180,7 @@ Would you like to visit the releases page? - createZcashConf + createHushConf Configure HUSH3.conf diff --git a/res/silentdragon_it.qm b/res/silentdragon_it.qm index 268646f..ab3b503 100644 Binary files a/res/silentdragon_it.qm and b/res/silentdragon_it.qm differ diff --git a/res/silentdragon_it.ts b/res/silentdragon_it.ts index 3aa03af..55246d3 100644 --- a/res/silentdragon_it.ts +++ b/res/silentdragon_it.ts @@ -2357,7 +2357,7 @@ Avete fondi non confermati o il saldo è troppo basso per una migrazione automat - createZcashConf + createHushConf Configure HUSH3.conf diff --git a/res/silentdragon_nl.qm b/res/silentdragon_nl.qm index 7158058..eda849c 100644 Binary files a/res/silentdragon_nl.qm and b/res/silentdragon_nl.qm differ diff --git a/res/silentdragon_nl.ts b/res/silentdragon_nl.ts index 87d460a..3bd7480 100644 --- a/res/silentdragon_nl.ts +++ b/res/silentdragon_nl.ts @@ -2418,7 +2418,7 @@ Je hebt nog onbevestigde transacties of je saldo is te laag voor een automatisch - createZcashConf + createHushConf Configure HUSH3.conf diff --git a/res/silentdragon_pt.qm b/res/silentdragon_pt.qm index acc25ca..71dfe1f 100644 Binary files a/res/silentdragon_pt.qm and b/res/silentdragon_pt.qm differ diff --git a/res/silentdragon_pt.ts b/res/silentdragon_pt.ts index 33a7b43..077afa6 100644 --- a/res/silentdragon_pt.ts +++ b/res/silentdragon_pt.ts @@ -2341,7 +2341,7 @@ Você possui fundos não confirmados ou o saldo é muito baixo para uma migraç - createZcashConf + createHushConf Configure HUSH3.conf @@ -2464,7 +2464,7 @@ Você possui fundos não confirmados ou o saldo é muito baixo para uma migraç <html><head/><body><p>ZBoard: Fully anonymous and untraceable chat messages based on the ZCash blockchain. <a href="http://www.z-board.net/"><span style=" text-decoration: underline; color:#0000ff;">http://www.z-board.net/</span></a></p></body></html> - <html><head/><body><p>ZBoard: Chat de mensagens totalmente anônimas e irrastreáveis usando a blockchain da Zcash. <a href="http://www.z-board.net/"><span style=" text-decoration: underline; color:#0000ff;">http://www.z-board.net/</span></a></p></body></html> + <html><head/><body><p>ZBoard: Chat de mensagens totalmente anônimas e irrastreáveis usando a blockchain da Hush. <a href="http://www.z-board.net/"><span style=" text-decoration: underline; color:#0000ff;">http://www.z-board.net/</span></a></p></body></html> Warning diff --git a/res/silentdragon_ro.qm b/res/silentdragon_ro.qm index 99b8896..7d3963d 100644 Binary files a/res/silentdragon_ro.qm and b/res/silentdragon_ro.qm differ diff --git a/res/silentdragon_ro.ts b/res/silentdragon_ro.ts index ffbdd61..01bbefd 100644 --- a/res/silentdragon_ro.ts +++ b/res/silentdragon_ro.ts @@ -2190,7 +2190,7 @@ Doriti sa vizitati pagina veriunii? - createZcashConf + createHushConf Configure HUSH3.conf diff --git a/res/silentdragon_ru.qm b/res/silentdragon_ru.qm index 2e1a782..8685ae1 100644 Binary files a/res/silentdragon_ru.qm and b/res/silentdragon_ru.qm differ diff --git a/res/silentdragon_ru.ts b/res/silentdragon_ru.ts index 0757da2..b16f0c1 100644 --- a/res/silentdragon_ru.ts +++ b/res/silentdragon_ru.ts @@ -2693,7 +2693,7 @@ You either have unconfirmed funds or the balance is too low for an automatic mig - createZcashConf + createHushConf Show Advanced Configuration diff --git a/res/silentdragon_sr.qm b/res/silentdragon_sr.qm index 7bc7d84..34bdbed 100644 Binary files a/res/silentdragon_sr.qm and b/res/silentdragon_sr.qm differ diff --git a/res/silentdragon_sr.ts b/res/silentdragon_sr.ts index 16d908e..53f5bef 100644 --- a/res/silentdragon_sr.ts +++ b/res/silentdragon_sr.ts @@ -2192,7 +2192,7 @@ Would you like to visit the releases page? - createZcashConf + createHushConf Configure HUSH3.conf diff --git a/res/silentdragon_template.ts b/res/silentdragon_template.ts index a593740..1843608 100644 --- a/res/silentdragon_template.ts +++ b/res/silentdragon_template.ts @@ -1760,7 +1760,7 @@ Would you like to visit the releases page? - createZcashConf + createHushConf Configure HUSH3.conf diff --git a/res/silentdragon_tr.qm b/res/silentdragon_tr.qm index 356d112..58f8f17 100644 Binary files a/res/silentdragon_tr.qm and b/res/silentdragon_tr.qm differ diff --git a/res/silentdragon_tr.ts b/res/silentdragon_tr.ts index d16d024..e1b068b 100644 --- a/res/silentdragon_tr.ts +++ b/res/silentdragon_tr.ts @@ -2350,7 +2350,7 @@ Onaylanmamış fonunuz var veya otomatik geçiş için bakiye çok düşük. - createZcashConf + createHushConf Configure HUSH3.conf diff --git a/res/silentdragon_uk.qm b/res/silentdragon_uk.qm index 36b47ac..fc7102f 100644 Binary files a/res/silentdragon_uk.qm and b/res/silentdragon_uk.qm differ diff --git a/res/silentdragon_uk.ts b/res/silentdragon_uk.ts index 94ea9cf..41d5d3d 100644 --- a/res/silentdragon_uk.ts +++ b/res/silentdragon_uk.ts @@ -2704,7 +2704,7 @@ You either have unconfirmed funds or the balance is too low for an automatic mig - createZcashConf + createHushConf Show Advanced Configuration diff --git a/res/silentdragon_zh.qm b/res/silentdragon_zh.qm index e1b5b92..c0aa8b0 100644 Binary files a/res/silentdragon_zh.qm and b/res/silentdragon_zh.qm differ diff --git a/res/silentdragon_zh.ts b/res/silentdragon_zh.ts index b44de56..f606abe 100644 --- a/res/silentdragon_zh.ts +++ b/res/silentdragon_zh.ts @@ -2604,7 +2604,7 @@ You either have unconfirmed funds or the balance is too low for an automatic mig - createZcashConf + createHushConf Configure hush.conf 配置 hush.conf diff --git a/src/connection.cpp b/src/connection.cpp index 6dc8f64..355a82a 100644 --- a/src/connection.cpp +++ b/src/connection.cpp @@ -55,23 +55,23 @@ void ConnectionLoader::doAutoConnect(bool tryEzcashdStart) { } // Priority 2: Try to connect to detect HUSH3.conf and connect to it. - auto config = autoDetectZcashConf(); + auto config = autoDetectHushConf(); main->logger->write(QObject::tr("Attempting autoconnect")); if (config.get() != nullptr) { auto connection = makeConnection(config); - refreshZcashdState(connection, [=] () { + refreshHushdState(connection, [=] () { // Refused connection. So try and start embedded zcashd if (Settings::getInstance()->useEmbedded()) { if (tryEzcashdStart) { this->showInformation(QObject::tr("Starting embedded hushd")); - if (this->startEmbeddedZcashd()) { + if (this->startEmbeddedHushd()) { // Embedded hushd started up. Wait a second and then refresh the connection main->logger->write("Embedded hushd started up, trying autoconnect in 1 sec"); QTimer::singleShot(1000, [=]() { doAutoConnect(); } ); } else { - if (config->zcashDaemon) { + if (config->hushDaemon) { // hushd is configured to run as a daemon, so we must wait for a few seconds // to let it start up. main->logger->write("hushd is daemon=1. Waiting for it to start up"); @@ -89,7 +89,7 @@ void ConnectionLoader::doAutoConnect(bool tryEzcashdStart) { // We tried to start ehushd previously, and it didn't work. So, show the error. main->logger->write("Couldn't start embedded hushd for unknown reason"); QString explanation; - if (config->zcashDaemon) { + if (config->hushDaemon) { explanation = QString() % QObject::tr("You have hushd set to start as a daemon, which can cause problems " "with SilentDragon\n\n." "Please remove the following line from your HUSH3.conf and restart SilentDragon\n" @@ -319,7 +319,7 @@ void ConnectionLoader::doNextDownload(std::function cb) { }); } -bool ConnectionLoader::startEmbeddedZcashd() { +bool ConnectionLoader::startEmbeddedHushd() { if (!Settings::getInstance()->useEmbedded()) return false; @@ -429,7 +429,7 @@ void ConnectionLoader::doManualConnect() { } auto connection = makeConnection(config); - refreshZcashdState(connection, [=] () { + refreshHushdState(connection, [=] () { QString explanation = QString() % QObject::tr("Could not connect to hushd configured in settings.\n\n" "Please set the host/port and user/password in the Edit->Settings menu."); @@ -442,7 +442,7 @@ void ConnectionLoader::doManualConnect() { } void ConnectionLoader::doRPCSetConnection(Connection* conn) { - rpc->setEZcashd(ehushd); + rpc->setEHushd(ehushd); rpc->setConnection(conn); d->accept(); @@ -469,7 +469,7 @@ Connection* ConnectionLoader::makeConnection(std::shared_ptr c return new Connection(main, client, request, config); } -void ConnectionLoader::refreshZcashdState(Connection* connection, std::function refused) { +void ConnectionLoader::refreshHushdState(Connection* connection, std::function refused) { main->logger->write("refreshing state"); QJsonObject payload = { @@ -512,7 +512,7 @@ void ConnectionLoader::refreshZcashdState(Connection* connection, std::function< this->showInformation(QObject::tr("Your hushd is starting up. Please wait."), status); main->logger->write("Waiting for hushd to come online."); // Refresh after one second - QTimer::singleShot(1000, [=]() { this->refreshZcashdState(connection, refused); }); + QTimer::singleShot(1000, [=]() { this->refreshHushdState(connection, refused); }); } } ); @@ -540,14 +540,14 @@ void ConnectionLoader::showInformation(QString info, QString detail) { * Show error will close the loading dialog and show an error. */ void ConnectionLoader::showError(QString explanation) { - rpc->setEZcashd(nullptr); + rpc->setEHushd(nullptr); rpc->noConnection(); QMessageBox::critical(main, QObject::tr("Connection Error"), explanation, QMessageBox::Ok); d->close(); } -QString ConnectionLoader::locateZcashConfFile() { +QString ConnectionLoader::locateHushConfFile() { #ifdef Q_OS_LINUX auto confLocation = QStandardPaths::locate(QStandardPaths::HomeLocation, ".komodo/HUSH3/HUSH3.conf"); #elif defined(Q_OS_DARWIN) @@ -643,11 +643,11 @@ bool ConnectionLoader::verifyParams() { /** * Try to automatically detect a HUSH3/HUSH3.conf file in the correct location and load parameters */ -std::shared_ptr ConnectionLoader::autoDetectZcashConf() { - auto confLocation = locateZcashConfFile(); +std::shared_ptr ConnectionLoader::autoDetectHushConf() { + auto confLocation = locateHushConfFile(); if (confLocation.isNull()) { - // No Zcash file, just return with nothing + // No file, just return with nothing return nullptr; } @@ -662,11 +662,11 @@ std::shared_ptr ConnectionLoader::autoDetectZcashConf() { auto zcashconf = new ConnectionConfig(); zcashconf->host = "127.0.0.1"; zcashconf->connType = ConnectionType::DetectedConfExternalHushD; - zcashconf->usingZcashConf = true; + zcashconf->usingHushConf = true; zcashconf->zcashDir = QFileInfo(confLocation).absoluteDir().absolutePath(); - zcashconf->zcashDaemon = false; + zcashconf->hushDaemon = false; - Settings::getInstance()->setUsingZcashConf(confLocation); + Settings::getInstance()->setUsingHushConf(confLocation); while (!in.atEnd()) { QString line = in.readLine(); @@ -684,7 +684,7 @@ std::shared_ptr ConnectionLoader::autoDetectZcashConf() { zcashconf->port = value; } if (name == "daemon" && value == "1") { - zcashconf->zcashDaemon = true; + zcashconf->hushDaemon = true; } if (name == "proxy") { zcashconf->proxy = value; diff --git a/src/connection.h b/src/connection.h index ee48f4c..aadcf04 100644 --- a/src/connection.h +++ b/src/connection.h @@ -20,8 +20,8 @@ struct ConnectionConfig { QString port; QString rpcuser; QString rpcpassword; - bool usingZcashConf; - bool zcashDaemon; + bool usingHushConf; + bool hushDaemon; QString zcashDir; QString proxy; QString consolidation; @@ -42,7 +42,7 @@ public: void loadConnection(); private: - std::shared_ptr autoDetectZcashConf(); + std::shared_ptr autoDetectHushConf(); std::shared_ptr loadFromSettings(); Connection* makeConnection(std::shared_ptr config); @@ -51,16 +51,16 @@ private: void doManualConnect(); void createHushConf(); - QString locateZcashConfFile(); + QString locateHushConfFile(); QString zcashConfWritableLocation(); QString zcashParamsDir(); bool verifyParams(); void downloadParams(std::function cb); void doNextDownload(std::function cb); - bool startEmbeddedZcashd(); + bool startEmbeddedHushd(); - void refreshZcashdState(Connection* connection, std::function refused); + void refreshHushdState(Connection* connection, std::function refused); void showError(QString explanation); void showInformation(QString info, QString detail = ""); diff --git a/src/main.cpp b/src/main.cpp index 084caae..03a22e9 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -222,7 +222,7 @@ public: // If there was a payment URI on the command line, pay it if (parser.positionalArguments().length() > 0) { - w->payZcashURI(parser.positionalArguments()[0]); + w->payHushURI(parser.positionalArguments()[0]); } // Listen for any secondary instances telling us about a Hush payment URI @@ -230,7 +230,7 @@ public: QString uri(msg); // We need to execute this async, otherwise the app seems to crash for some reason. - QTimer::singleShot(1, [=]() { w->payZcashURI(uri); }); + QTimer::singleShot(1, [=]() { w->payHushURI(uri); }); }); // For MacOS, we have an event filter diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 99badc5..1e1b93d 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -68,7 +68,7 @@ MainWindow::MainWindow(QWidget *parent) : // Pay Hush URI QObject::connect(ui->actionPay_URI, &QAction::triggered, [=] () { - payZcashURI(); + payHushURI(); }); // Import Private Key @@ -195,7 +195,7 @@ void MainWindow::closeEvent(QCloseEvent* event) { s.sync(); // Let the RPC know to shut down any running service. - rpc->shutdownZcashd(); + rpc->shutdownHushd(); // Bubble up if (event) @@ -389,9 +389,9 @@ void MainWindow::setupSettingsModal() { settings.port->setValidator(&validator); // If values are coming from HUSH3.conf, then disable all the fields - auto zcashConfLocation = Settings::getInstance()->getZcashdConfLocation(); - if (!zcashConfLocation.isEmpty()) { - settings.confMsg->setText("Settings are being read from \n" + zcashConfLocation); + auto hushConfLocation = Settings::getInstance()->getHushdConfLocation(); + if (!hushConfLocation.isEmpty()) { + settings.confMsg->setText("Settings are being read from \n" + hushConfLocation); settings.hostname->setEnabled(false); settings.port->setEnabled(false); settings.rpcuser->setEnabled(false); @@ -450,7 +450,7 @@ void MainWindow::setupSettingsModal() { if (!isUsingTor && settings.chkTor->isChecked()) { // If "use tor" was previously unchecked and now checked - Settings::addToZcashConf(zcashConfLocation, "proxy=127.0.0.1:9050"); + Settings::addToHushConf(hushConfLocation, "proxy=127.0.0.1:9050"); rpc->getConnection()->config->proxy = "proxy=127.0.0.1:9050"; QMessageBox::information(this, tr("Enable Tor"), @@ -460,7 +460,7 @@ void MainWindow::setupSettingsModal() { if (isUsingTor && !settings.chkTor->isChecked()) { // If "use tor" was previously checked and now is unchecked - Settings::removeFromZcashConf(zcashConfLocation, "proxy"); + Settings::removeFromHushConf(hushConfLocation, "proxy"); rpc->getConnection()->config->proxy.clear(); QMessageBox::information(this, tr("Disable Tor"), @@ -468,7 +468,7 @@ void MainWindow::setupSettingsModal() { QMessageBox::Ok); } - if (zcashConfLocation.isEmpty()) { + if (hushConfLocation.isEmpty()) { // Save settings Settings::getInstance()->saveSettings( settings.hostname->text(), @@ -491,55 +491,55 @@ void MainWindow::setupSettingsModal() { bool showRestartInfo = false; bool showReindexInfo = false; if (settings.chkRescan->isChecked()) { - Settings::addToZcashConf(zcashConfLocation, "rescan=1"); + Settings::addToHushConf(hushConfLocation, "rescan=1"); showRestartInfo = true; } if (settings.chkReindex->isChecked()) { - Settings::addToZcashConf(zcashConfLocation, "reindex=1"); + Settings::addToHushConf(hushConfLocation, "reindex=1"); showRestartInfo = true; } if (!rpc->getConnection()->config->consolidation.isEmpty()==false) { if (settings.chkConso->isChecked()) { - Settings::addToZcashConf(zcashConfLocation, "consolidation=1"); + Settings::addToHushConf(hushConfLocation, "consolidation=1"); showRestartInfo = true; } } if (!rpc->getConnection()->config->consolidation.isEmpty()) { if (settings.chkConso->isChecked() == false) { - Settings::removeFromZcashConf(zcashConfLocation, "consolidation"); + Settings::removeFromHushConf(hushConfLocation, "consolidation"); showRestartInfo = true; } } if (!rpc->getConnection()->config->deletetx.isEmpty() == false) { if (settings.chkDeletetx->isChecked()) { - Settings::addToZcashConf(zcashConfLocation, "deletetx=1"); + Settings::addToHushConf(hushConfLocation, "deletetx=1"); showRestartInfo = true; } } if (!rpc->getConnection()->config->deletetx.isEmpty()) { if (settings.chkDeletetx->isChecked() == false) { - Settings::removeFromZcashConf(zcashConfLocation, "deletetx"); + Settings::removeFromHushConf(hushConfLocation, "deletetx"); showRestartInfo = true; } } if (!rpc->getConnection()->config->zindex.isEmpty() == false) { if (settings.chkzindex->isChecked()) { - Settings::addToZcashConf(zcashConfLocation, "zindex=1"); - Settings::addToZcashConf(zcashConfLocation, "reindex=1"); + Settings::addToHushConf(hushConfLocation, "zindex=1"); + Settings::addToHushConf(hushConfLocation, "reindex=1"); showReindexInfo = true; } } if (!rpc->getConnection()->config->zindex.isEmpty()) { if (settings.chkzindex->isChecked() == false) { - Settings::removeFromZcashConf(zcashConfLocation, "zindex"); - Settings::addToZcashConf(zcashConfLocation, "reindex=1"); + Settings::removeFromHushConf(hushConfLocation, "zindex"); + Settings::addToHushConf(hushConfLocation, "reindex=1"); showReindexInfo = true; } } @@ -692,7 +692,7 @@ void MainWindow::balancesReady() { // process it. if (!pendingURIPayment.isEmpty()) { qDebug() << "Paying hush URI"; - payZcashURI(pendingURIPayment); + payHushURI(pendingURIPayment); pendingURIPayment = ""; } @@ -703,7 +703,7 @@ bool MainWindow::eventFilter(QObject *object, QEvent *event) { if (event->type() == QEvent::FileOpen) { QFileOpenEvent *fileEvent = static_cast(event); if (!fileEvent->url().isEmpty()) - payZcashURI(fileEvent->url().toString()); + payHushURI(fileEvent->url().toString()); return true; } @@ -715,7 +715,7 @@ bool MainWindow::eventFilter(QObject *object, QEvent *event) { // Pay the Hush URI by showing a confirmation window. If the URI parameter is empty, the UI // will prompt for one. If the myAddr is empty, then the default from address is used to send // the transaction. -void MainWindow::payZcashURI(QString uri, QString myAddr) { +void MainWindow::payHushURI(QString uri, QString myAddr) { // If the Payments UI is not ready (i.e, all balances have not loaded), defer the payment URI if (!uiPaymentsReady) { qDebug() << "Payment UI not ready, waiting for UI to pay URI"; diff --git a/src/mainwindow.h b/src/mainwindow.h index 0b033f4..afda5c6 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -55,7 +55,7 @@ public: void stopWebsocket(); void balancesReady(); - void payZcashURI(QString uri = "", QString myAddr = ""); + void payHushURI(QString uri = "", QString myAddr = ""); void validateAddress(); diff --git a/src/requestdialog.cpp b/src/requestdialog.cpp index 70a20f1..62d5eca 100644 --- a/src/requestdialog.cpp +++ b/src/requestdialog.cpp @@ -82,7 +82,7 @@ void RequestDialog::showPaymentConfirmation(MainWindow* main, QString paymentURI req.lblHeader->setText(tr("You are paying a payment request. Your address will not be visible to the person requesting this payment.")); if (d.exec() == QDialog::Accepted) { - main->payZcashURI(paymentURI, req.cmbMyAddress->currentText()); + main->payHushURI(paymentURI, req.cmbMyAddress->currentText()); } } @@ -136,6 +136,6 @@ void RequestDialog::showRequestZcash(MainWindow* main) { // If the disclosed address in the memo doesn't have a balance, it will automatically fallback to the default // sapling address - main->payZcashURI(sendURI, req.cmbMyAddress->currentText()); + main->payHushURI(sendURI, req.cmbMyAddress->currentText()); } } diff --git a/src/rpc.cpp b/src/rpc.cpp index b65a9d4..2ddd44f 100644 --- a/src/rpc.cpp +++ b/src/rpc.cpp @@ -68,7 +68,7 @@ RPC::~RPC() { delete conn; } -void RPC::setEZcashd(std::shared_ptr p) { +void RPC::setEHushd(std::shared_ptr p) { ehushd = p; if (ehushd && ui->tabWidget->widget(4) == nullptr) { @@ -86,9 +86,9 @@ void RPC::setConnection(Connection* c) { ui->statusBar->showMessage("Ready! Thank you for helping secure the Hush network by running a full node."); // See if we need to remove the reindex/rescan flags from the zcash.conf file - auto zcashConfLocation = Settings::getInstance()->getZcashdConfLocation(); - Settings::removeFromZcashConf(zcashConfLocation, "rescan"); - Settings::removeFromZcashConf(zcashConfLocation, "reindex"); + auto hushConfLocation = Settings::getInstance()->getHushdConfLocation(); + Settings::removeFromHushConf(hushConfLocation, "rescan"); + Settings::removeFromHushConf(hushConfLocation, "reindex"); // Refresh the UI refreshPrice(); @@ -579,7 +579,7 @@ void RPC::getInfoThenRefresh(bool force) { // Fuck The KYC Traitor named jl777 //QString kmdver = reply["KMDversion"].toString(); - Settings::getInstance()->setZcashdVersion(version); + Settings::getInstance()->setHushdVersion(version); ui->longestchain->setText(QString::number(longestchain)); ui->notarizedhashvalue->setText( ntzhash ); @@ -708,7 +708,7 @@ void RPC::getInfoThenRefresh(bool force) { else { tooltip = QObject::tr("hushd has no peer connections! Network issues?"); } - tooltip = tooltip % "(v" % QString::number(Settings::getInstance()->getZcashdVersion()) % ")"; + tooltip = tooltip % "(v" % QString::number(Settings::getInstance()->getHushdVersion()) % ")"; if (!hushPrice.isEmpty()) { tooltip = "1 HUSH = " % hushPrice % "\n" % tooltip; @@ -1210,7 +1210,7 @@ void RPC::refreshPrice() { }); } -void RPC::shutdownZcashd() { +void RPC::shutdownHushd() { // Shutdown embedded hushd if it was started if (ehushd == nullptr || ehushd->processId() == 0 || conn == nullptr) { // No hushd running internally, just return @@ -1254,7 +1254,7 @@ void RPC::shutdownZcashd() { if ((ehushd->atEnd() && ehushd->processId() == 0) || ehushd->state() == QProcess::NotRunning || waitCount > 30 || - conn->config->zcashDaemon) { // If hushd is daemon, then we don't have to do anything else + conn->config->hushDaemon) { // If hushd is daemon, then we don't have to do anything else qDebug() << "Ended"; waiter.stop(); QTimer::singleShot(1000, [&]() { d.accept(); }); diff --git a/src/rpc.h b/src/rpc.h index f420dd0..06c1ae8 100644 --- a/src/rpc.h +++ b/src/rpc.h @@ -38,7 +38,7 @@ public: ~RPC(); void setConnection(Connection* c); - void setEZcashd(std::shared_ptr p); + void setEHushd(std::shared_ptr p); const QProcess* getEHushD() { return ehushd.get(); } void refresh(bool force = false); @@ -78,7 +78,7 @@ public: void importTPrivKey(QString addr, bool rescan, const std::function& cb); void validateAddress(QString address, const std::function& cb); - void shutdownZcashd(); + void shutdownHushd(); void noConnection(); bool isEmbedded() { return ehushd != nullptr; } diff --git a/src/settings.cpp b/src/settings.cpp index 5df9428..cfad6af 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -89,7 +89,7 @@ void Settings::saveRestoreTableHeader(QTableView* table, QDialog* d, QString tab }); } -void Settings::setUsingZcashConf(QString confLocation) { +void Settings::setUsingHushConf(QString confLocation) { if (!confLocation.isEmpty()) _confLocation = confLocation; } @@ -131,11 +131,11 @@ bool Settings::isTAddress(QString addr) { return addr.startsWith("R"); } -int Settings::getZcashdVersion() { +int Settings::getHushdVersion() { return _zcashdVersion; } -void Settings::setZcashdVersion(int version) { +void Settings::setHushdVersion(int version) { _zcashdVersion = version; } @@ -329,7 +329,7 @@ QString Settings::getDonationAddr() { return "zs1aq4xnrkjlnxx0zesqye7jz3dfrf3rjh7q5z6u8l6mwyqqaam3gx3j2fkqakp33v93yavq46j83q"; } -bool Settings::addToZcashConf(QString confLocation, QString line) { +bool Settings::addToHushConf(QString confLocation, QString line) { QFile file(confLocation); if (!file.open(QIODevice::ReadWrite | QIODevice::Append)) return false; @@ -352,7 +352,7 @@ void Settings::set_currency_name(QString currency_name) { } -bool Settings::removeFromZcashConf(QString confLocation, QString option) { +bool Settings::removeFromHushConf(QString confLocation, QString option) { if (confLocation.isEmpty()) return false; diff --git a/src/settings.h b/src/settings.h index 5aba2e2..16d9ca4 100644 --- a/src/settings.h +++ b/src/settings.h @@ -54,8 +54,8 @@ public: bool isSyncing(); void setSyncing(bool syncing); - int getZcashdVersion(); - void setZcashdVersion(int version); + int getHushdVersion(); + void setHushdVersion(int version); void setUseEmbedded(bool r) { _useEmbedded = r; } bool useEmbedded() { return _useEmbedded; } @@ -89,8 +89,8 @@ public: QString get_currency_name(); void set_currency_name(QString currency_name); - void setUsingZcashConf(QString confLocation); - const QString& getZcashdConfLocation() { return _confLocation; } + void setUsingHushConf(QString confLocation); + const QString& getHushdConfLocation() { return _confLocation; } void setHUSHPrice(double p) { hushPrice = p; } void set_fiat_price(double p) { fiat_price = p; } @@ -136,8 +136,8 @@ public: static bool isValidAddress(QString addr); - static bool addToZcashConf(QString confLocation, QString line); - static bool removeFromZcashConf(QString confLocation, QString option); + static bool addToHushConf(QString confLocation, QString line); + static bool removeFromHushConf(QString confLocation, QString option); static const QString labelRegExp;