diff --git a/README.md b/README.md index d939eb3..0b88cda 100644 --- a/README.md +++ b/README.md @@ -26,9 +26,9 @@ SilentDragon contacts a few different external websites to get various bits of data. * coingecko.com for price data API - * explorer.myhush.org for explorer links + * explorer.hush.is for explorer links * dexstats.info for address utilities - * wormhole.myhush.org for Wormhole services + * wormhole.hush.is for Wormhole services This means your IP address is known to these servers. Enable Tor setting in SilentDragon to prevent this, or better yet, use TAILS: https://tails.boum.org/ diff --git a/res/Info.plist b/res/Info.plist index 9df118f..c0ffbc5 100644 --- a/res/Info.plist +++ b/res/Info.plist @@ -9,7 +9,7 @@ CFBundleIconFile logo.icns CFBundleIdentifier - com.myhush.silentdragon + com.hush.silentdragon CFBundlePackageType APPL CFBundleSignature diff --git a/res/silentdragon_bg.ts b/res/silentdragon_bg.ts index d77b101..fce19ba 100644 --- a/res/silentdragon_bg.ts +++ b/res/silentdragon_bg.ts @@ -469,7 +469,7 @@ - &Hush Discord + &Hush Telegram diff --git a/res/silentdragon_de.ts b/res/silentdragon_de.ts index 976e678..db87019 100644 --- a/res/silentdragon_de.ts +++ b/res/silentdragon_de.ts @@ -266,8 +266,8 @@ - &Hush Discord - Discord von &Hush + &Hush Telegram + Telegram von &Hush diff --git a/res/silentdragon_es.ts b/res/silentdragon_es.ts index aedcd0c..2c056aa 100644 --- a/res/silentdragon_es.ts +++ b/res/silentdragon_es.ts @@ -256,8 +256,8 @@ - &Hush Discord - &Hush Discord + &Hush Telegram + &Hush Telegram diff --git a/res/silentdragon_fi.ts b/res/silentdragon_fi.ts index 1e1c5a4..193ff6a 100644 --- a/res/silentdragon_fi.ts +++ b/res/silentdragon_fi.ts @@ -259,8 +259,8 @@ - &Hush Discord - &Hush Discord + &Hush Telegram + &Hush Telegram diff --git a/res/silentdragon_fil.ts b/res/silentdragon_fil.ts index 6e80afb..fd63a26 100644 --- a/res/silentdragon_fil.ts +++ b/res/silentdragon_fil.ts @@ -470,8 +470,8 @@ - &Hush Discord - Discord ng Hush + &Hush Telegram + Telegram ng Hush diff --git a/res/silentdragon_fr.ts b/res/silentdragon_fr.ts index 3544a8f..f7c8676 100644 --- a/res/silentdragon_fr.ts +++ b/res/silentdragon_fr.ts @@ -257,8 +257,8 @@ - &Hush Discord - Discord + &Hush Telegram + Telegram diff --git a/res/silentdragon_hr.ts b/res/silentdragon_hr.ts index d05cd80..f20d937 100644 --- a/res/silentdragon_hr.ts +++ b/res/silentdragon_hr.ts @@ -469,8 +469,8 @@ - &Hush Discord - &Hush Discord + &Hush Telegram + &Hush Telegram diff --git a/res/silentdragon_id.ts b/res/silentdragon_id.ts index 145b637..431afd3 100644 --- a/res/silentdragon_id.ts +++ b/res/silentdragon_id.ts @@ -473,8 +473,8 @@ - &Hush Discord - &Discord hush + &Hush Telegram + &Telegram hush diff --git a/res/silentdragon_it.ts b/res/silentdragon_it.ts index f13b722..91a8931 100644 --- a/res/silentdragon_it.ts +++ b/res/silentdragon_it.ts @@ -260,8 +260,8 @@ - &Hush Discord - &Hush Discord + &Hush Telegram + &Hush Telegram diff --git a/res/silentdragon_nl.ts b/res/silentdragon_nl.ts index 2796fbe..4671027 100644 --- a/res/silentdragon_nl.ts +++ b/res/silentdragon_nl.ts @@ -220,8 +220,8 @@ - &Hush Discord - &Hush Discord + &Hush Telegram + &Hush Telegram diff --git a/res/silentdragon_pt.ts b/res/silentdragon_pt.ts index 1949412..368de94 100644 --- a/res/silentdragon_pt.ts +++ b/res/silentdragon_pt.ts @@ -256,8 +256,8 @@ - &Hush Discord - &Hush Discord + &Hush Telegram + &Hush Telegram diff --git a/res/silentdragon_ro.ts b/res/silentdragon_ro.ts index 27777f8..9a06cf1 100644 --- a/res/silentdragon_ro.ts +++ b/res/silentdragon_ro.ts @@ -473,8 +473,8 @@ - &Hush Discord - Hush Discord + &Hush Telegram + Hush Telegram diff --git a/res/silentdragon_ru.ts b/res/silentdragon_ru.ts index cc66e8f..036fca9 100644 --- a/res/silentdragon_ru.ts +++ b/res/silentdragon_ru.ts @@ -510,8 +510,8 @@ - &Hush Discord - &Hush Discord + &Hush Telegram + &Hush Telegram diff --git a/res/silentdragon_sr.ts b/res/silentdragon_sr.ts index 1929a12..1bd0ff1 100644 --- a/res/silentdragon_sr.ts +++ b/res/silentdragon_sr.ts @@ -469,8 +469,8 @@ - &Hush Discord - &Hush Discord + &Hush Telegram + &Hush Telegram diff --git a/res/silentdragon_template.ts b/res/silentdragon_template.ts index 5025092..364faa1 100644 --- a/res/silentdragon_template.ts +++ b/res/silentdragon_template.ts @@ -424,7 +424,7 @@ - &Hush Discord + &Hush Telegram diff --git a/res/silentdragon_tr.ts b/res/silentdragon_tr.ts index 11a1186..3f61ee5 100644 --- a/res/silentdragon_tr.ts +++ b/res/silentdragon_tr.ts @@ -246,8 +246,8 @@ - &Hush Discord - &Hush Discord + &Hush Telegram + &Hush Telegram diff --git a/res/silentdragon_uk.ts b/res/silentdragon_uk.ts index 0e94675..83a15c1 100644 --- a/res/silentdragon_uk.ts +++ b/res/silentdragon_uk.ts @@ -510,8 +510,8 @@ - &Hush Discord - &Hush Discord + &Hush Telegram + &Hush Telegram diff --git a/res/silentdragon_zh.ts b/res/silentdragon_zh.ts index 8c9cba1..323af10 100644 --- a/res/silentdragon_zh.ts +++ b/res/silentdragon_zh.ts @@ -413,7 +413,7 @@ - &Hush Discord + &Hush Telegram diff --git a/src/connection.cpp b/src/connection.cpp index 2037910..e43b892 100644 --- a/src/connection.cpp +++ b/src/connection.cpp @@ -202,7 +202,7 @@ void ConnectionLoader::createZcashConf() { QTextStream out(&file); - out << "# Autogenerated by Hush SilentDragon https://myhush.org\n"; + out << "# Autogenerated by Hush SilentDragon https://hush.is\n"; out << "server=1\n"; out << "rpcuser=hush\n"; out << "rpcpassword=" % randomPassword() << "\n"; @@ -232,16 +232,7 @@ void ConnectionLoader::createZcashConf() { void ConnectionLoader::downloadParams(std::function cb) { - main->logger->write("Adding params to download queue"); - // Add all the files to the download queue - downloadQueue = new QQueue(); - client = new QNetworkAccessManager(main); - - //Currently we fallback to this in rare edgecases, it's not normally executed - downloadQueue->enqueue(QUrl("https://z.cash/downloads/sapling-output.params")); - downloadQueue->enqueue(QUrl("https://z.cash/downloads/sapling-spend.params")); - - doNextDownload(cb); + main->logger->write("Bad juju"); } void ConnectionLoader::doNextDownload(std::function cb) { diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 65b164c..f4f987b 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -48,16 +48,11 @@ MainWindow::MainWindow(QWidget *parent) : // Settings editor setupSettingsModal(); - // Set up exit action + // Set up actions QObject::connect(ui->actionExit, &QAction::triggered, this, &MainWindow::close); - - // Set up feedback action QObject::connect(ui->actionDonate, &QAction::triggered, this, &MainWindow::donate); - - QObject::connect(ui->actionDiscord, &QAction::triggered, this, &MainWindow::discord); - + QObject::connect(ui->actionTelegram, &QAction::triggered, this, &MainWindow::telegram); QObject::connect(ui->actionReportBug, &QAction::triggered, this, &MainWindow::reportbug); - QObject::connect(ui->actionWebsite, &QAction::triggered, this, &MainWindow::website); // Set up check for updates action @@ -579,18 +574,18 @@ void MainWindow::addressBook() { AddressBook::open(this); } -void MainWindow::discord() { - QString url = "https://myhush.org/discord/"; +void MainWindow::telegram() { + QString url = "https://hush.is/tg"; QDesktopServices::openUrl(QUrl(url)); } void MainWindow::reportbug() { - QString url = "https://github.com/MyHush/SilentDragon/issues/new"; + QString url = "https://git.hush.is/hush/SilentDragon/issues/new"; QDesktopServices::openUrl(QUrl(url)); } void MainWindow::website() { - QString url = "https://myhush.org"; + QString url = "https://hush.is"; QDesktopServices::openUrl(QUrl(url)); } @@ -608,9 +603,7 @@ void MainWindow::donate() { ui->tabWidget->setCurrentIndex(1); } -/** - * Validate an address - */ +// Validate an address void MainWindow::validateAddress() { // Make sure everything is up and running if (!getRPC() || !getRPC()->getConnection()) diff --git a/src/mainwindow.h b/src/mainwindow.h index fab7567..7ee90f8 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -117,7 +117,7 @@ private: void donate(); void website(); - void discord(); + void telegram(); void reportbug(); void addressBook(); void postToZBoard(); diff --git a/src/mainwindow.ui b/src/mainwindow.ui index 0120c81..7557cb4 100644 --- a/src/mainwindow.ui +++ b/src/mainwindow.ui @@ -1540,7 +1540,7 @@ &Help - + @@ -1595,9 +1595,9 @@ &Send Duke Feedback - + - &Hush Discord + &Hush Telegram diff --git a/src/sendtab.cpp b/src/sendtab.cpp index 0fa7fbf..28e3512 100644 --- a/src/sendtab.cpp +++ b/src/sendtab.cpp @@ -776,9 +776,10 @@ QString MainWindow::doSendTxValidations(Tx tx) { } for (auto toAddr : tx.toAddrs) { + //TODO: diff errors for completely invalid vs transparent? Educate. if (!Settings::isValidAddress(toAddr.addr)) { QString addr = (toAddr.addr.length() > 100 ? toAddr.addr.left(100) + "..." : toAddr.addr); - return QString(tr("Recipient Address ")) % addr % tr(" is Invalid"); + return QString(tr("Extreme Privacy! ")) % addr % tr(" is transparent. You must send to a zaddr."); } // This technically shouldn't be possible, but issue #62 seems to have discovered a bug @@ -788,7 +789,6 @@ QString MainWindow::doSendTxValidations(Tx tx) { } } - return QString(); } diff --git a/src/settings.cpp b/src/settings.cpp index c3de779..20d5490 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -35,8 +35,8 @@ void Settings::setAllowFetchPrices(bool allow) { Explorer Settings::getExplorer() { // Load from the QT Settings. QSettings s; - //TODO: make it easy for people to use other explorers like komodod.com - QString explorer = "https://explorer.myhush.org"; + //TODO: make it easy for people to use other explorers + QString explorer = "https://explorer.hush.is"; auto txExplorerUrl = s.value("explorer/txExplorerUrl", explorer + "/tx/").toString(); auto addressExplorerUrl = s.value("explorer/addressExplorerUrl", explorer + "/address/").toString(); diff --git a/src/settings.ui b/src/settings.ui index 16a6de8..3abc312 100644 --- a/src/settings.ui +++ b/src/settings.ui @@ -615,7 +615,7 @@ - https://explorer.myhush.org/tx/ + https://explorer.hush.is/tx/ @@ -641,7 +641,7 @@ - https://explorer.myhush.org/address/ + https://explorer.hush.is/address/ @@ -693,7 +693,7 @@ - https://explorer.testnet.myhush.org/address/ + https://explorer.testnet.hush.is/address/ diff --git a/src/websockets.cpp b/src/websockets.cpp index 38305b9..c600a94 100644 --- a/src/websockets.cpp +++ b/src/websockets.cpp @@ -1,6 +1,5 @@ // Copyright 2019-2020 Hush developers #include "websockets.h" - #include "rpc.h" #include "settings.h" #include "ui_mobileappconnector.h" @@ -28,7 +27,7 @@ WSServer::WSServer(quint16 port, bool debug, QObject *parent) : m_mainWindow = (MainWindow *) parent; if (m_pWebSocketServer->listen(QHostAddress::AnyIPv4, port)) { if (m_debug) - qDebug() << "Echoserver listening on port" << port; + qDebug() << "SD WebSocketServer listening on port" << port; connect(m_pWebSocketServer, &QWebSocketServer::newConnection, this, &WSServer::onNewConnection); connect(m_pWebSocketServer, &QWebSocketServer::closed, this, &WSServer::closed); @@ -37,7 +36,7 @@ WSServer::WSServer(quint16 port, bool debug, QObject *parent) : WSServer::~WSServer() { - qDebug() << "Closing websocket server"; + qDebug() << "Closing WebsocketServer"; m_pWebSocketServer->close(); qDeleteAll(m_clients.begin(), m_clients.end()); qDebug() << "Deleted all websocket clients"; @@ -45,7 +44,7 @@ WSServer::~WSServer() void WSServer::onNewConnection() { - qDebug() << "Websocket server: new connection"; + qDebug() << "WebsocketServer: new connection"; QWebSocket *pSocket = m_pWebSocketServer->nextPendingConnection(); connect(pSocket, &QWebSocket::textMessageReceived, this, &WSServer::processTextMessage); @@ -121,7 +120,9 @@ void ws_error() { void WormholeClient::sslerrors(const QList &) { - qDebug() << "SSL errors occurred!"; + //TODO: give more details. We only get semi-useful data and some errors + // should be ignored + qDebug() << "SSL errors occurred, lulz!"; //TODO: don't do this in prod //m_webSocket->ignoreSslErrors(); @@ -131,7 +132,7 @@ void WormholeClient::connect() { qDebug() << "Wormhole::connect"; delete m_webSocket; m_webSocket = new QWebSocket(); - QUrl wormhole = QUrl("wss://wormhole.myhush.org:443"); + QUrl wormhole = QUrl("wss://wormhole.hush.is:443"); if (m_webSocket) { QObject::connect(m_webSocket, &QWebSocket::connected, this, &WormholeClient::onConnected);