Merge branch 'dev' into dev

2 years ago · b04b3b5927
32 changed files with 174 additions and 119 deletions
--- a/README.md
+++ b/README.md
@ -1,12 +1,6 @@
 # SilentDragon

 <p align="left">
-    <a href="https://twitter.com/MyHushTeam">
-        <img src="https://img.shields.io/twitter/url?style=social&url=https%3A%2F%2Ftwitter.com%2Fmyhushteam"
-            alt="MyHushTeam's Twitter"></a>
-    <a href="https://twitter.com/intent/follow?screen_name=MyHushTeam">
-        <img src="https://img.shields.io/twitter/follow/MyHushTeam?style=social&logo=twitter"
-            alt="follow on Twitter"></a>
    <a href="https://fosstodon.org/@myhushteam">
        <img src="https://img.shields.io/badge/Mastodon-MyHushTeam-blue"
            alt="follow on Mastodon"></a>
@ -16,7 +10,9 @@
 </p>

 SilentDragon desktop wallet for HUSH runs on Linux, Windows and macOS.
-This is experimental software under active development!
+This is experimental software under active development! Get real-time
+support on [our Telegram support group](https://hush.is/tg_support) and
+feel free to join the [main Telegram group](https://hush.is/tg) as well.

 ![Screenshots](images/sd-receive-tab.png?raw=true)

@ -33,13 +29,16 @@ The following are screenshots for each SilentDragon tab:
 SilentDragon contacts a few different external websites to get various
 bits of data.

-    * coingecko.com for price data API
-    * explorer.hush.is for explorer links
+    * coingecko.com for price data API (defaults to on, optional)
+    * explorer.hush.is for explorer links (optional)
    * dexstats.info for address utilities
-    * wormhole.hush.is for Wormhole services
+        * Address Asset Viewer menu action (optional)
+        * Convert Address menu action (optional)
+    * wormhole.hush.is for Wormhole services (optional)

 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/
+NOTE: Tor v3 is not yet supported.

 # Installation

@ -56,6 +55,9 @@ Additionally, if this is the first time you're running SilentDragon or a hushd d

 Pass `--no-embedded` to disable the embedded hushd and force SilentDragon to connect to an external node.

+If SD crashes when autostarting hushd, you may have run out of memory. This could happen with very large wallets. Try closing unnecessary applications and/or browser tabs and retry.
+Another method is to start hushd first, then start SD, which will connect to the existing hushd.
+
 ## Compiling from source

 SilentDragon is written in C++ 14, and can be compiled with g++/clang++/visual
@ -66,6 +68,19 @@ hushd, or compile hushd as well.

 ### Building on Linux

+#### Linux Troubleshooting
+If you run into an error with OpenGL, you may need to install extra deps. More details [here](https://gist.github.com/shamiul94/a632f7ab94cf389e08efd7174335df1c)
+
+**Error**
+```
+/usr/bin/ld: cannot find -lGL
+clang: error: linker command failed with exit code 1 (use -v to see invocation)
+```
+**Solution**
+```
+sudo apt-get -y install libglu1-mesa-dev freeglut3-dev mesa-common-dev
+```
+
 #### Ubuntu 18.04 and 20.04

 You can install the pre-reqs and build on Ubuntu 18.04 & 20.04 with:
--- a/doc/relnotes/README.md
+++ b/doc/relnotes/README.md
@ -0,0 +1,33 @@
+# Official SilentDragon Release Notes
+
+SilentDragon release notes were done on Github until 1.0.0
+and now are officially part of our Gitea repo at https://git.hush.is/hush/silentdragon
+
+## Downloading Releases
+
+Hush releases are on our own Gitea at <a href="https://git.hush.is/">git.hush.is</a>
+and no longer on Github, since they banned Duke Leto and
+also because they censor many people around the world and work with
+evil organizations.
+
+# SilentDragon 1.3.0 "Berserk Bonnacon"
+
+```
+ 60 files changed, 4328 insertions(+), 1568 deletions(-)
+```
+
+  * :tada: New Polish translation ( @onryo )
+  * This release of SD is only compatible with hushd 3.9.0 or later, which is a mandatory update
+    * Older Hush full nodes will not be compatible with the Hush network going forward
+  * New shinier startup animation by Dan S ( https://twitter.com/Dan\_MGDesign )
+  * When right-clicking on a zaddr, there are now two new menu options
+  * Shield all mining funds to this zaddr (z_shieldcoinbase)
+    * Use this if you are a solo miner who mined full blocks to a taddr
+    * Only 50 blocks will be shielded at a time. If you have more, run this multiple times.
+  * Shield all non-mining taddr funds to this zaddr (z_mergetoaddress)
+    * Use this if you have an old wallet with funds in taddrs
+    * Only 50 utxos (transactions) will be shielded at a time. If you  have more, run this multiple times.
+  * SD now looks for Hush full node data in `~/.hush/HUSH3` but still supports the legacy location
+  * The About screen now reports the version of QT5 being used
+  * In the case of an exception, the default currency will be set to BTC instead of USD
+  * SD includes its version number in autogenerated HUSH3.conf config files
--- a/res/silentdragon_be.ts
+++ b/res/silentdragon_be.ts
@ -1463,7 +1463,7 @@ Please set the host/port and user/password in the Edit-&gt;Settings menu.</sourc
        <translation>Гэта можа заняць некалькі гадзін, вазьміце трохі папкорна</translation>
    </message>
    <message>
-        <location filename="../src/connection.cpp" line="844"/>
+        <location filename="../src/connection.cpp" line="842"/>
        <source>There was an error! : </source>
        <translation>Памылка! : </translation>
    </message>
@ -1517,12 +1517,12 @@ Please set the host/port and user/password in the Edit-&gt;Settings menu.</sourc
        <translation> вылічэнне транзакцый.</translation>
    </message>
    <message>
-        <location filename="../src/rpc.cpp" line="1369"/>
+        <location filename="../src/rpc.cpp" line="1375"/>
        <source>Please enhance your calm and wait for SilentDragon to exit</source>
        <translation>Калі ласка, пачакайце выхаду з SilentDragon</translation>
    </message>
    <message>
-        <location filename="../src/rpc.cpp" line="1370"/>
+        <location filename="../src/rpc.cpp" line="1376"/>
        <source>Waiting for hushd to exit, y&apos;all</source>
        <translation>Чакаем выхаду hushd</translation>
    </message>
@ -1627,7 +1627,7 @@ Please set the host/port and user/password in the Edit-&gt;Settings menu.</sourc
        <translation>Памылка Злучэння</translation>
    </message>
    <message>
-        <location filename="../src/connection.cpp" line="844"/>
+        <location filename="../src/connection.cpp" line="842"/>
        <location filename="../src/sendtab.cpp" line="756"/>
        <source>Transaction Error</source>
        <translation>Памылка Транзакцыі</translation>
--- a/res/silentdragon_bg.ts
+++ b/res/silentdragon_bg.ts
@ -1320,13 +1320,13 @@ Please set the host/port and user/password in the Edit-&gt;Settings menu.</sourc
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/connection.cpp" line="844"/>
+        <location filename="../src/connection.cpp" line="842"/>
        <location filename="../src/sendtab.cpp" line="756"/>
        <source>Transaction Error</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/connection.cpp" line="844"/>
+        <location filename="../src/connection.cpp" line="842"/>
        <source>There was an error! : </source>
        <translation type="unfinished"></translation>
    </message>
@ -1404,12 +1404,12 @@ Would you like to visit the releases page?</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/rpc.cpp" line="1369"/>
+        <location filename="../src/rpc.cpp" line="1375"/>
        <source>Please enhance your calm and wait for SilentDragon to exit</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/rpc.cpp" line="1370"/>
+        <location filename="../src/rpc.cpp" line="1376"/>
        <source>Waiting for hushd to exit, y&apos;all</source>
        <translation type="unfinished"></translation>
    </message>
--- a/res/silentdragon_de.ts
+++ b/res/silentdragon_de.ts
@ -1385,7 +1385,7 @@ If all else fails, please run hushd manually.</source>
        <translation>Dies kann einige Stunden dauern, machen Sie sich einen Kaffee</translation>
    </message>
    <message>
-        <location filename="../src/connection.cpp" line="844"/>
+        <location filename="../src/connection.cpp" line="842"/>
        <source>There was an error! : </source>
        <translation>Es gab einen Fehler! : </translation>
    </message>
@ -1425,12 +1425,12 @@ If all else fails, please run hushd manually.</source>
        <translation>erzeuge Transaktion</translation>
    </message>
    <message>
-        <location filename="../src/rpc.cpp" line="1369"/>
+        <location filename="../src/rpc.cpp" line="1375"/>
        <source>Please enhance your calm and wait for SilentDragon to exit</source>
        <translation>Bitte warten Sie, bis Silentdragon beendet ist</translation>
    </message>
    <message>
-        <location filename="../src/rpc.cpp" line="1370"/>
+        <location filename="../src/rpc.cpp" line="1376"/>
        <source>Waiting for hushd to exit, y&apos;all</source>
        <translation>Bitte warten Sie, bis Hushd beendet ist</translation>
    </message>
@ -1551,7 +1551,7 @@ Please set the host/port and user/password in the Edit-&gt;Settings menu.</sourc
        <translation>Verbindungsfehler</translation>
    </message>
    <message>
-        <location filename="../src/connection.cpp" line="844"/>
+        <location filename="../src/connection.cpp" line="842"/>
        <location filename="../src/sendtab.cpp" line="756"/>
        <source>Transaction Error</source>
        <translation>Transaktionsfehler</translation>
--- a/res/silentdragon_es.ts
+++ b/res/silentdragon_es.ts
@ -1262,12 +1262,12 @@ doesn&apos;t look like a z-address</source>
        <translation>transacción es computación</translation>
    </message>
    <message>
-        <location filename="../src/rpc.cpp" line="1369"/>
+        <location filename="../src/rpc.cpp" line="1375"/>
        <source>Please enhance your calm and wait for SilentDragon to exit</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/rpc.cpp" line="1370"/>
+        <location filename="../src/rpc.cpp" line="1376"/>
        <source>Waiting for hushd to exit, y&apos;all</source>
        <translation type="unfinished"></translation>
    </message>
@ -1459,12 +1459,12 @@ Por favor, especificar el host/puerta y usario/contraseña en el menú Editar-&g
 	</translation>
    </message>
    <message>
-        <location filename="../src/connection.cpp" line="844"/>
+        <location filename="../src/connection.cpp" line="842"/>
        <source>There was an error! : </source>
        <translation>¡Hubo un error! :</translation>
    </message>
    <message>
-        <location filename="../src/connection.cpp" line="844"/>
+        <location filename="../src/connection.cpp" line="842"/>
        <location filename="../src/sendtab.cpp" line="756"/>
        <source>Transaction Error</source>
        <translation> Error De Transacción</translation>
--- a/res/silentdragon_fi.ts
+++ b/res/silentdragon_fi.ts
@ -1341,7 +1341,7 @@ Integroitua hushdia ei käynnistetä, koska --ei-integroitu ohitettiin</translat
        <translation>MT at </translation>
    </message>
    <message>
-        <location filename="../src/connection.cpp" line="844"/>
+        <location filename="../src/connection.cpp" line="842"/>
        <source>There was an error! : </source>
        <translation>Tapahtui virhe! : </translation>
    </message>
@ -1415,12 +1415,12 @@ Haluaisitko vierailla lataus-sivulla?</translation>
        <translation>Sinulla on jo uusin versio v%1</translation>
    </message>
    <message>
-        <location filename="../src/rpc.cpp" line="1369"/>
+        <location filename="../src/rpc.cpp" line="1375"/>
        <source>Please enhance your calm and wait for SilentDragon to exit</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/rpc.cpp" line="1370"/>
+        <location filename="../src/rpc.cpp" line="1376"/>
        <source>Waiting for hushd to exit, y&apos;all</source>
        <translation type="unfinished"></translation>
    </message>
@ -1514,7 +1514,7 @@ Aseta isäntä/portti ja käyttäjänimi/salasana Muokkaa-&gt; Asetukset-valikos
        <translation>Yhteysvirhe</translation>
    </message>
    <message>
-        <location filename="../src/connection.cpp" line="844"/>
+        <location filename="../src/connection.cpp" line="842"/>
        <location filename="../src/sendtab.cpp" line="756"/>
        <source>Transaction Error</source>
        <translation>Tapahtumavirhe</translation>
--- a/res/silentdragon_fil.ts
+++ b/res/silentdragon_fil.ts
@ -1380,13 +1380,13 @@ Mangyaring i-set ang host/port at user/password sa Edit-&gt;Settings na menu.</t
        <translation>May Mali sa Koneksyon</translation>
    </message>
    <message>
-        <location filename="../src/connection.cpp" line="844"/>
+        <location filename="../src/connection.cpp" line="842"/>
        <location filename="../src/sendtab.cpp" line="756"/>
        <source>Transaction Error</source>
        <translation>May Mali sa Transaksyon</translation>
    </message>
    <message>
-        <location filename="../src/connection.cpp" line="844"/>
+        <location filename="../src/connection.cpp" line="842"/>
        <source>There was an error! : </source>
        <translation>Mayroong Mali! : </translation>
    </message>
@ -1468,12 +1468,12 @@ Would you like to visit the releases page?</source>
        <translation>Nasa iyo na ang pinakabagong release v%1</translation>
    </message>
    <message>
-        <location filename="../src/rpc.cpp" line="1369"/>
+        <location filename="../src/rpc.cpp" line="1375"/>
        <source>Please enhance your calm and wait for SilentDragon to exit</source>
        <translation>Mangyaring maging mas kalmado at hintayin ang SilentDragon na mag-exit</translation>
    </message>
    <message>
-        <location filename="../src/rpc.cpp" line="1370"/>
+        <location filename="../src/rpc.cpp" line="1376"/>
        <source>Waiting for hushd to exit, y&apos;all</source>
        <translation>Hinihintay ang hush na mag-exit, y&apos;all</translation>
    </message>
--- a/res/silentdragon_fr.ts
+++ b/res/silentdragon_fr.ts
@ -1366,7 +1366,7 @@ If all else fails, please run hushd manually.</source>
        <translation>Cela peut prendre plusieurs heures. Prenez du pop-corn</translation>
    </message>
    <message>
-        <location filename="../src/connection.cpp" line="844"/>
+        <location filename="../src/connection.cpp" line="842"/>
        <source>There was an error! : </source>
        <translation>Il y avait une erreur! :</translation>
    </message>
@ -1406,12 +1406,12 @@ If all else fails, please run hushd manually.</source>
        <translation> transaction en cours.</translation>
    </message>
    <message>
-        <location filename="../src/rpc.cpp" line="1369"/>
+        <location filename="../src/rpc.cpp" line="1375"/>
        <source>Please enhance your calm and wait for SilentDragon to exit</source>
        <translation>Veuillez restez calme et attendre la fermeture de SilentDragon</translation>
    </message>
    <message>
-        <location filename="../src/rpc.cpp" line="1370"/>
+        <location filename="../src/rpc.cpp" line="1376"/>
        <source>Waiting for hushd to exit, y&apos;all</source>
        <translation>Veuillez attendre que hushd soit arrêté.</translation>
    </message>
@ -1532,7 +1532,7 @@ Veuillez configurer l&apos;hôte/port et utilisateur/mot de passe dans le menu E
        <translation>Erreur de connection</translation>
    </message>
    <message>
-        <location filename="../src/connection.cpp" line="844"/>
+        <location filename="../src/connection.cpp" line="842"/>
        <location filename="../src/sendtab.cpp" line="756"/>
        <source>Transaction Error</source>
        <translation>Erreur de transaction</translation>
--- a/res/silentdragon_hr.ts
+++ b/res/silentdragon_hr.ts
@ -1381,13 +1381,13 @@ Molimo postavite host/port i korisnčko ime/lozinku u Uredi-&gt;Postavke meniju.
        <translation>Greška sa vezom</translation>
    </message>
    <message>
-        <location filename="../src/connection.cpp" line="844"/>
+        <location filename="../src/connection.cpp" line="842"/>
        <location filename="../src/sendtab.cpp" line="756"/>
        <source>Transaction Error</source>
        <translation>Greška u transakciji</translation>
    </message>
    <message>
-        <location filename="../src/connection.cpp" line="844"/>
+        <location filename="../src/connection.cpp" line="842"/>
        <source>There was an error! : </source>
        <translation>Dogodila se greška! : </translation>
    </message>
@ -1471,12 +1471,12 @@ Would you like to visit the releases page?</source>
        <translation>Već imate najnovije izdanje v%1</translation>
    </message>
    <message>
-        <location filename="../src/rpc.cpp" line="1369"/>
+        <location filename="../src/rpc.cpp" line="1375"/>
        <source>Please enhance your calm and wait for SilentDragon to exit</source>
        <translation>Molimo pokušajte se strpiti i pričekajte da se SilentDragon zatvori</translation>
    </message>
    <message>
-        <location filename="../src/rpc.cpp" line="1370"/>
+        <location filename="../src/rpc.cpp" line="1376"/>
        <source>Waiting for hushd to exit, y&apos;all</source>
        <translation>Pričekajte da hushd završi</translation>
    </message>
--- a/res/silentdragon_it.ts
+++ b/res/silentdragon_it.ts
@ -1345,7 +1345,7 @@ If all else fails, please run hushd manually.</source>
        <translation>Potrebbero essere necessarie alcune ore, prendi dei popcorn</translation>
    </message>
    <message>
-        <location filename="../src/connection.cpp" line="844"/>
+        <location filename="../src/connection.cpp" line="842"/>
        <source>There was an error! : </source>
        <translation>C&apos;era un errore! :</translation>
    </message>
@ -1390,12 +1390,12 @@ If all else fails, please run hushd manually.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/rpc.cpp" line="1369"/>
+        <location filename="../src/rpc.cpp" line="1375"/>
        <source>Please enhance your calm and wait for SilentDragon to exit</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/rpc.cpp" line="1370"/>
+        <location filename="../src/rpc.cpp" line="1376"/>
        <source>Waiting for hushd to exit, y&apos;all</source>
        <translation type="unfinished"></translation>
    </message>
@ -1510,7 +1510,7 @@ Impostare host/porta e utente/password nel menu Modifica-&gt; Impostazioni.</tra
        <translation>Errore di Connessione</translation>
    </message>
    <message>
-        <location filename="../src/connection.cpp" line="844"/>
+        <location filename="../src/connection.cpp" line="842"/>
        <location filename="../src/sendtab.cpp" line="756"/>
        <source>Transaction Error</source>
        <translation>Errore di transazione</translation>
--- a/res/silentdragon_nl.ts
+++ b/res/silentdragon_nl.ts
@ -1345,7 +1345,7 @@ Als al het andere faalt, voer hushd dan handmatig uit.</translation>
        <translation>Dit kan enkele uren duren, pak wat popcorn</translation>
    </message>
    <message>
-        <location filename="../src/connection.cpp" line="844"/>
+        <location filename="../src/connection.cpp" line="842"/>
        <source>There was an error! : </source>
        <translation>Er was een error! : </translation>
    </message>
@ -1390,12 +1390,12 @@ Als al het andere faalt, voer hushd dan handmatig uit.</translation>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/rpc.cpp" line="1369"/>
+        <location filename="../src/rpc.cpp" line="1375"/>
        <source>Please enhance your calm and wait for SilentDragon to exit</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/rpc.cpp" line="1370"/>
+        <location filename="../src/rpc.cpp" line="1376"/>
        <source>Waiting for hushd to exit, y&apos;all</source>
        <translation type="unfinished"></translation>
    </message>
@ -1509,7 +1509,7 @@ Stel de host / poort en gebruiker / wachtwoord in het menu Bewerken-&gt; Instell
        <translation>Connectie Fout</translation>
    </message>
    <message>
-        <location filename="../src/connection.cpp" line="844"/>
+        <location filename="../src/connection.cpp" line="842"/>
        <location filename="../src/sendtab.cpp" line="756"/>
        <source>Transaction Error</source>
        <translation>Transactie Fout</translation>
--- a/res/silentdragon_pl.ts
+++ b/res/silentdragon_pl.ts
@ -1258,7 +1258,7 @@ Ustaw host/port i użytkownik/hasło w Edytuj-&gt;Ustawienia menu.</translation>
        <translation>Może to zająć do kilku godzin, tymczasem chwyćcie za popcorn</translation>
    </message>
    <message>
-        <location filename="../src/connection.cpp" line="844"/>
+        <location filename="../src/connection.cpp" line="842"/>
        <source>There was an error! : </source>
        <translation>Wystąpił błąd! : </translation>
    </message>
@ -1308,12 +1308,12 @@ Ustaw host/port i użytkownik/hasło w Edytuj-&gt;Ustawienia menu.</translation>
        <translation> przetwarzanie transakcji.</translation>
    </message>
    <message>
-        <location filename="../src/rpc.cpp" line="1369"/>
+        <location filename="../src/rpc.cpp" line="1375"/>
        <source>Please enhance your calm and wait for SilentDragon to exit</source>
        <translation>Proszę poczekać SilentDragon do wyjścia</translation>
    </message>
    <message>
-        <location filename="../src/rpc.cpp" line="1370"/>
+        <location filename="../src/rpc.cpp" line="1376"/>
        <source>Waiting for hushd to exit, y&apos;all</source>
        <translation>Czekam na wyjście hushd</translation>
    </message>
@ -1382,7 +1382,7 @@ Ustaw host/port i użytkownik/hasło w Edytuj-&gt;Ustawienia menu.</translation>
        <translation>Błąd Połączenia</translation>
    </message>
    <message>
-        <location filename="../src/connection.cpp" line="844"/>
+        <location filename="../src/connection.cpp" line="842"/>
        <location filename="../src/sendtab.cpp" line="756"/>
        <source>Transaction Error</source>
        <translation>Błąd Transakcji</translation>
--- a/res/silentdragon_pt.ts
+++ b/res/silentdragon_pt.ts
@ -1332,7 +1332,7 @@ Se tudo mais falhar, execute o hushd manualmente.</translation>
        <translation>Isso pode levar várias horas, pegue um pouco de pipoca</translation>
    </message>
    <message>
-        <location filename="../src/connection.cpp" line="844"/>
+        <location filename="../src/connection.cpp" line="842"/>
        <source>There was an error! : </source>
        <translation>Havia um erro! :</translation>
    </message>
@ -1377,12 +1377,12 @@ Se tudo mais falhar, execute o hushd manualmente.</translation>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/rpc.cpp" line="1369"/>
+        <location filename="../src/rpc.cpp" line="1375"/>
        <source>Please enhance your calm and wait for SilentDragon to exit</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/rpc.cpp" line="1370"/>
+        <location filename="../src/rpc.cpp" line="1376"/>
        <source>Waiting for hushd to exit, y&apos;all</source>
        <translation type="unfinished"></translation>
    </message>
@ -1496,7 +1496,7 @@ Por favor, coloque o host/porta e usuário/senha no menu Editar&gt;Preferências
        <translation>Erro na Conexão</translation>
    </message>
    <message>
-        <location filename="../src/connection.cpp" line="844"/>
+        <location filename="../src/connection.cpp" line="842"/>
        <location filename="../src/sendtab.cpp" line="756"/>
        <source>Transaction Error</source>
        <translation>Erro na transação</translation>
--- a/res/silentdragon_ro.ts
+++ b/res/silentdragon_ro.ts
@ -1376,13 +1376,13 @@ Rugam sa setati host/port si utilizator/parola in Editare-&gt; Meniu setari</tra
        <translation>Eroare la Conexiune</translation>
    </message>
    <message>
-        <location filename="../src/connection.cpp" line="844"/>
+        <location filename="../src/connection.cpp" line="842"/>
        <location filename="../src/sendtab.cpp" line="756"/>
        <source>Transaction Error</source>
        <translation>Eroarea de Tranzactie</translation>
    </message>
    <message>
-        <location filename="../src/connection.cpp" line="844"/>
+        <location filename="../src/connection.cpp" line="842"/>
        <source>There was an error! : </source>
        <translation>A avut loc eroarea</translation>
    </message>
@ -1465,12 +1465,12 @@ Doriti sa vizitati pagina veriunii?</translation>
        <translation>Deja aveti cea mai recenta versiune</translation>
    </message>
    <message>
-        <location filename="../src/rpc.cpp" line="1369"/>
+        <location filename="../src/rpc.cpp" line="1375"/>
        <source>Please enhance your calm and wait for SilentDragon to exit</source>
        <translation>Rugam sa sporiti calmul si sa astepati pina ce SilentDragon sa iese</translation>
    </message>
    <message>
-        <location filename="../src/rpc.cpp" line="1370"/>
+        <location filename="../src/rpc.cpp" line="1376"/>
        <source>Waiting for hushd to exit, y&apos;all</source>
        <translation>Asteptam hushd sa iese.</translation>
    </message>
--- a/res/silentdragon_ru.ts
+++ b/res/silentdragon_ru.ts
@ -1463,7 +1463,7 @@ Please set the host/port and user/password in the Edit-&gt;Settings menu.</sourc
        <translation>Это может занять несколько часов, возьмите немного попкорна</translation>
    </message>
    <message>
-        <location filename="../src/connection.cpp" line="844"/>
+        <location filename="../src/connection.cpp" line="842"/>
        <source>There was an error! : </source>
        <translation>Была ошибка! : </translation>
    </message>
@ -1517,12 +1517,12 @@ Please set the host/port and user/password in the Edit-&gt;Settings menu.</sourc
        <translation> вычисление транзакции.</translation>
    </message>
    <message>
-        <location filename="../src/rpc.cpp" line="1369"/>
+        <location filename="../src/rpc.cpp" line="1375"/>
        <source>Please enhance your calm and wait for SilentDragon to exit</source>
        <translation>Пожалуйста, дождитесь выхода SilentDragon</translation>
    </message>
    <message>
-        <location filename="../src/rpc.cpp" line="1370"/>
+        <location filename="../src/rpc.cpp" line="1376"/>
        <source>Waiting for hushd to exit, y&apos;all</source>
        <translation>Ожидаем выхода hushd</translation>
    </message>
@ -1627,7 +1627,7 @@ Please set the host/port and user/password in the Edit-&gt;Settings menu.</sourc
        <translation>Ошибка соединения</translation>
    </message>
    <message>
-        <location filename="../src/connection.cpp" line="844"/>
+        <location filename="../src/connection.cpp" line="842"/>
        <location filename="../src/sendtab.cpp" line="756"/>
        <source>Transaction Error</source>
        <translation>&quot;&gt;Ошибка транзакции</translation>
--- a/res/silentdragon_sr.ts
+++ b/res/silentdragon_sr.ts
@ -1381,13 +1381,13 @@ Molimo postavite host/port i korisnčko ime/lozinku u Uredi-&gt;Podešavanja men
        <translation>Greška sa vezom</translation>
    </message>
    <message>
-        <location filename="../src/connection.cpp" line="844"/>
+        <location filename="../src/connection.cpp" line="842"/>
        <location filename="../src/sendtab.cpp" line="756"/>
        <source>Transaction Error</source>
        <translation>Greška u transakciji</translation>
    </message>
    <message>
-        <location filename="../src/connection.cpp" line="844"/>
+        <location filename="../src/connection.cpp" line="842"/>
        <source>There was an error! : </source>
        <translation>Dogodila se greška! : </translation>
    </message>
@ -1471,12 +1471,12 @@ Would you like to visit the releases page?</source>
        <translation>Već imate najnovije izdanje v%1</translation>
    </message>
    <message>
-        <location filename="../src/rpc.cpp" line="1369"/>
+        <location filename="../src/rpc.cpp" line="1375"/>
        <source>Please enhance your calm and wait for SilentDragon to exit</source>
        <translation>Molimo pokušajte se strpiti i pričekajte da se SilentDragon zatvori</translation>
    </message>
    <message>
-        <location filename="../src/rpc.cpp" line="1370"/>
+        <location filename="../src/rpc.cpp" line="1376"/>
        <source>Waiting for hushd to exit, y&apos;all</source>
        <translation>Pričekajte da hushd završi</translation>
    </message>
--- a/res/silentdragon_tr.ts
+++ b/res/silentdragon_tr.ts
@ -1328,7 +1328,7 @@ Hepsi başarısız olursa, lütfen hushd&apos;i manuel olarak çalıştırın.</
        <translation>MB saniyede </translation>
    </message>
    <message>
-        <location filename="../src/connection.cpp" line="844"/>
+        <location filename="../src/connection.cpp" line="842"/>
        <source>There was an error! : </source>
        <translation>Bir hata oluştu! : </translation>
    </message>
@ -1373,12 +1373,12 @@ Hepsi başarısız olursa, lütfen hushd&apos;i manuel olarak çalıştırın.</
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/rpc.cpp" line="1369"/>
+        <location filename="../src/rpc.cpp" line="1375"/>
        <source>Please enhance your calm and wait for SilentDragon to exit</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/rpc.cpp" line="1370"/>
+        <location filename="../src/rpc.cpp" line="1376"/>
        <source>Waiting for hushd to exit, y&apos;all</source>
        <translation type="unfinished"></translation>
    </message>
@ -1501,7 +1501,7 @@ Lütfen Düzenle-&gt;Ayarlar menüsünde sunucu/bağlantı noktası ve kullanıc
        <translation>Bağlantı Hatası</translation>
    </message>
    <message>
-        <location filename="../src/connection.cpp" line="844"/>
+        <location filename="../src/connection.cpp" line="842"/>
        <location filename="../src/sendtab.cpp" line="756"/>
        <source>Transaction Error</source>
        <translation>İşlem Hatası</translation>
--- a/res/silentdragon_uk.ts
+++ b/res/silentdragon_uk.ts
@ -1451,7 +1451,7 @@ Please set the host/port and user/password in the Edit-&gt;Settings menu.</sourc
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/connection.cpp" line="844"/>
+        <location filename="../src/connection.cpp" line="842"/>
        <source>There was an error! : </source>
        <translation type="unfinished"></translation>
    </message>
@ -1505,12 +1505,12 @@ Please set the host/port and user/password in the Edit-&gt;Settings menu.</sourc
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/rpc.cpp" line="1369"/>
+        <location filename="../src/rpc.cpp" line="1375"/>
        <source>Please enhance your calm and wait for SilentDragon to exit</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/rpc.cpp" line="1370"/>
+        <location filename="../src/rpc.cpp" line="1376"/>
        <source>Waiting for hushd to exit, y&apos;all</source>
        <translation type="unfinished"></translation>
    </message>
@ -1615,7 +1615,7 @@ Please set the host/port and user/password in the Edit-&gt;Settings menu.</sourc
        <translation>Помилка з&apos;єднання</translation>
    </message>
    <message>
-        <location filename="../src/connection.cpp" line="844"/>
+        <location filename="../src/connection.cpp" line="842"/>
        <location filename="../src/sendtab.cpp" line="756"/>
        <source>Transaction Error</source>
        <translation>Помилка транзакції</translation>
--- a/res/silentdragon_zh.ts
+++ b/res/silentdragon_zh.ts
@ -1522,7 +1522,7 @@ Please set the host/port and user/password in the Edit-&gt;Settings menu.</sourc
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/connection.cpp" line="844"/>
+        <location filename="../src/connection.cpp" line="842"/>
        <source>There was an error! : </source>
        <translation type="unfinished"></translation>
    </message>
@ -1537,7 +1537,7 @@ Please set the host/port and user/password in the Edit-&gt;Settings menu.</sourc
        <translation>连接错误</translation>
    </message>
    <message>
-        <location filename="../src/connection.cpp" line="844"/>
+        <location filename="../src/connection.cpp" line="842"/>
        <location filename="../src/sendtab.cpp" line="756"/>
        <source>Transaction Error</source>
        <translation>交易错误</translation>
@ -1645,12 +1645,12 @@ Please set the host/port and user/password in the Edit-&gt;Settings menu.</sourc
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/rpc.cpp" line="1369"/>
+        <location filename="../src/rpc.cpp" line="1375"/>
        <source>Please enhance your calm and wait for SilentDragon to exit</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/rpc.cpp" line="1370"/>
+        <location filename="../src/rpc.cpp" line="1376"/>
        <source>Waiting for hushd to exit, y&apos;all</source>
        <translation type="unfinished"></translation>
    </message>
--- a/src/connection.cpp
+++ b/src/connection.cpp
@ -7,6 +7,7 @@
 #include "ui_createzcashconfdialog.h"
 #include "rpc.h"
 #include "precompiled.h"
+#include "version.h"

 ConnectionLoader::ConnectionLoader(MainWindow* main, RPC* rpc) {
    this->main = main;
@ -41,7 +42,7 @@ void ConnectionLoader::loadConnection() {
        d->exec();
 }

-void ConnectionLoader::doAutoConnect(bool tryEzcashdStart) {
+void ConnectionLoader::doAutoConnect(bool tryEhushdStart) {
    // Priority 1: Ensure all params are present.
    if (!verifyParams()) {
        qDebug() << "Cannot find sapling params!";
@ -58,7 +59,7 @@ void ConnectionLoader::doAutoConnect(bool tryEzcashdStart) {
        refreshHushdState(connection, [=] () {
            // Refused connection. So try and start embedded hushd
            if (Settings::getInstance()->useEmbedded()) {
-                if (tryEzcashdStart) {
+                if (tryEhushdStart) {
                    this->showInformation(QObject::tr("Starting embedded hushd"));
                    if (this->startEmbeddedHushd()) {
                        // Embedded hushd started up. Wait a second and then refresh the connection
@ -194,7 +195,7 @@ void ConnectionLoader::createHushConf() {

    QTextStream out(&file);

-    out << "# Autogenerated by Hush SilentDragon https://hush.is\n";
+    out << "# Autogenerated by Hush SilentDragon " << APP_VERSION << " https://hush.is\n";
    out << "server=1\n";
    out << "rpcuser=hush\n";
    out << "rpcpassword=" % randomPassword() << "\n";
@ -249,7 +250,7 @@ void ConnectionLoader::doNextDownload(std::function<void(void)> cb) {
    int filesRemaining = downloadQueue->size();

    QString filename = fnSaveFileName(url);
-    QString paramsDir = zcashParamsDir();
+    QString paramsDir = zkParamsDir();

    if (QFile(QDir(paramsDir).filePath(filename)).exists()) {
        main->logger->write(filename + " already exists, skipping");
@ -352,6 +353,7 @@ bool ConnectionLoader::startEmbeddedHushd() {
        main->logger->write("Can't find hushd at " + hushdProgram);
        return false;
    } else {
+        qDebug() << "Found hushd at " << hushdProgram;
        main->logger->write("Found hushd at " + hushdProgram);
    }

@ -366,7 +368,8 @@ bool ConnectionLoader::startEmbeddedHushd() {
    });

    QObject::connect(ehushd.get(), &QProcess::errorOccurred, [&] (QProcess::ProcessError error) {
-        qDebug() << "Couldn't start hushd at " << hushdProgram << ":" << error;
+        qDebug() << "Couldn't start hushd!";
+        qDebug() << "hushd at " << hushdProgram << ":" << error;
    });

    std::weak_ptr<QProcess> weak_obj(ehushd);
@ -379,7 +382,7 @@ bool ConnectionLoader::startEmbeddedHushd() {

    // This string should be the exact arg list seperated by single spaces
    // Could be modified to start different Hush Smart Chains
-    QString params = ""; // "-ac_name=TUSH";
+    QString params = "-tls=only -clientname=GoldenSandtrout"; // "-ac_name=TUSH";

    /* This is now enabled by default in hushd
    // Binaries come with this file
@ -587,7 +590,7 @@ QString ConnectionLoader::hushConfWritableLocation() {
    return QDir::cleanPath(confLocation);
 }

-QString ConnectionLoader::zcashParamsDir() {
+QString ConnectionLoader::zkParamsDir() {
 #ifdef Q_OS_LINUX
    //TODO: If /usr/share/hush exists, use that. It should not be assumed writeable
    auto paramsLocation = QDir(QDir(QStandardPaths::writableLocation(QStandardPaths::HomeLocation)).filePath(".zcash-params"));
@ -611,7 +614,7 @@ QString ConnectionLoader::zcashParamsDir() {
 }

 bool ConnectionLoader::verifyParams() {
-    QDir paramsDir(zcashParamsDir());
+    QDir paramsDir(zkParamsDir());

    // TODO: better error reporting if only 1 file exists or is missing
    qDebug() << "Verifying sapling param files exist";
@ -728,9 +731,7 @@ std::shared_ptr<ConnectionConfig> ConnectionLoader::autoDetectHushConf() {
    return std::shared_ptr<ConnectionConfig>(hushconf);
 }

-/**
- * Load connection settings from the UI, which indicates an unknown, external zcashd
- */ 
+// Load connection settings from the UI, which indicates an unknown, external hushd
 std::shared_ptr<ConnectionConfig> ConnectionLoader::loadFromSettings() {
    // Load from the QT Settings. 
    QSettings s;
--- a/src/connection.h
+++ b/src/connection.h
@ -47,13 +47,13 @@ private:

    Connection* makeConnection(std::shared_ptr<ConnectionConfig> config);

-    void doAutoConnect(bool tryEzcashdStart = true);
+    void doAutoConnect(bool tryEhushdStart = true);
    void doManualConnect();

    void createHushConf();
    QString locateHushConfFile();
    QString hushConfWritableLocation();
-    QString zcashParamsDir();
+    QString zkParamsDir();

    bool verifyParams();
    void downloadParams(std::function<void(void)> cb);
@ -84,7 +84,7 @@ private:
 };

 /**
- * Represents a connection to a zcashd. It may even start a new zcashd if needed.
+ * Represents a connection to a hushd. It may even start a new hushd if needed.
 * This is also a UI class, so it may show a dialog waiting for the connection.
 */
 class Connection {
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@ -61,7 +61,7 @@ MainWindow::MainWindow(QWidget *parent) :
    });

    // Request hush
-    QObject::connect(ui->actionRequest_zcash, &QAction::triggered, [=]() {
+    QObject::connect(ui->actionRequest_hush, &QAction::triggered, [=]() {
        RequestDialog::showRequestZcash(this);
    });

@ -279,7 +279,7 @@ void MainWindow::setupSettingsModal() {
            currency_name = Settings::getInstance()->get_currency_name();
        } catch (const std::exception& e) {
            qDebug() << QString("Currency name exception! : ");
-            currency_name = "USD";
+            currency_name = "BTC";
        }

        this->slot_change_currency(currency_name);
@ -1655,7 +1655,7 @@ void MainWindow::setupReceiveTab() {
        }

        ui->rcvLabel->setText(label);
-        ui->rcvBal->setText(Settings::getZECUSDDisplayFormat(rpc->getAllBalances()->value(addr)));
+        ui->rcvBal->setText(Settings::getHUSHUSDDisplayFormat(rpc->getAllBalances()->value(addr)));
        ui->txtReceive->setPlainText(addr);
        ui->qrcodeDisplay->setQrcodeString(addr);
        if (rpc->getUsedAddresses()->value(addr, false)) {
@ -1758,7 +1758,7 @@ void MainWindow::slot_change_currency(const QString& currency_name)
       saved_currency_name = Settings::getInstance()->get_currency_name();
    } catch (const std::exception& e) {
        qDebug() << QString("Ignoring currency change Exception! : ");
-        saved_currency_name = "USD";
+        saved_currency_name = "BTC";
    }
 }

--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@ -1594,7 +1594,7 @@
    <property name="title">
     <string>&amp;File</string>
    </property>
-    <addaction name="actionRequest_zcash"/>
+    <addaction name="actionRequest_hush"/>
    <addaction name="actionPay_URI"/>
    <addaction name="separator"/>
    <addaction name="actionImport_Private_Key"/>
@ -1729,7 +1729,7 @@
    <string>Ctrl+M</string>
   </property>
  </action>
-  <action name="actionRequest_zcash">
+  <action name="actionRequest_hush">
   <property name="text">
    <string>Request HUSH...</string>
   </property>
--- a/src/requestdialog.cpp
+++ b/src/requestdialog.cpp
@ -125,7 +125,7 @@ void RequestDialog::showRequestZcash(MainWindow* main) {
    req.txtFrom->setFocus();

    if (d.exec() == QDialog::Accepted) {
-        // Construct a zcash Payment URI with the data and pay it immediately.
+        // Construct a Hush Payment URI with the data and pay it immediately.
        QString memoURI = "hush:" + req.cmbMyAddress->currentText()
                    + "?amt=" + Settings::getDecimalString(req.txtAmount->text().toDouble())
                    + "&memo=" + QUrl::toPercentEncoding(req.txtMemo->toPlainText());
--- a/src/rpc.cpp
+++ b/src/rpc.cpp
@ -1229,14 +1229,20 @@ void RPC::refreshPrice() {
    if  (conn == nullptr)
        return noConnection();

+
    QString price_feed = "https://api.coingecko.com/api/v3/simple/price?ids=hush&vs_currencies=btc%2Cusd%2Ceur%2Ceth%2Cgbp%2Ccny%2Cjpy%2Cidr%2Crub%2Ccad%2Csgd%2Cchf%2Cinr%2Caud%2Cinr%2Ckrw%2Cthb%2Cnzd%2Czar%2Cvef%2Cxau%2Cxag%2Cvnd%2Csar%2Ctwd%2Caed%2Cars%2Cbdt%2Cbhd%2Cbmd%2Cbrl%2Cclp%2Cczk%2Cdkk%2Chuf%2Cils%2Ckwd%2Clkr%2Cpkr%2Cnok%2Ctry%2Csek%2Cmxn%2Cuah%2Chkd&include_market_cap=true&include_24hr_vol=true&include_24hr_change=true";
+    qDebug() << "Requesting price feed data via " << price_feed;
+
    QUrl cmcURL(price_feed);
    QNetworkRequest req;
    req.setUrl(cmcURL);
+
+    qDebug() << "Created price request object";
+
    QNetworkReply *reply = conn->restclient->get(req);
-    auto s = Settings::getInstance();
+    qDebug() << "Created QNetworkReply";

-    qDebug() << "Requesting price feed data via " << price_feed;
+    auto s = Settings::getInstance();

    QObject::connect(reply, &QNetworkReply::finished, [=] {
        reply->deleteLater();
--- a/src/scripts/dounifiedbuild.ps1
+++ b/src/scripts/dounifiedbuild.ps1
@ -28,7 +28,7 @@ Write-Host ""


 Write-Host "[Building on Mac]"
-bash src/scripts/mkmacdmg.sh --qt_path ~/Qt/5.11.1/clang_64/ --version $version --zcash_path ~/gi/hush3 --certificate "$certificate"
+bash src/scripts/mkmacdmg.sh --qt_path ~/Qt/5.11.1/clang_64/ --version $version --hush_path ~/gi/hush3 --certificate "$certificate"
 if (! $?) {
    Write-Output "[Error]"
    exit 1;
--- a/src/scripts/mkwininstaller.ps1
+++ b/src/scripts/mkwininstaller.ps1
@ -2,28 +2,28 @@ param (
    [Parameter(Mandatory=$true)][string]$version
 )

-$target="zecwallet-v$version"
+$target="silentdragon-v$version"

 Remove-Item -Path release/wininstaller -Recurse -ErrorAction Ignore  | Out-Null
 New-Item release/wininstaller -itemtype directory                    | Out-Null

-Copy-Item release/$target/zecwallet.exe     release/wininstaller/
+Copy-Item release/$target/silentdragon.exe     release/wininstaller/
 Copy-Item release/$target/LICENSE           release/wininstaller/
 Copy-Item release/$target/README.md         release/wininstaller/
-Copy-Item release/$target/zcashd.exe        release/wininstaller/
-Copy-Item release/$target/zcash-cli.exe     release/wininstaller/
+Copy-Item release/$target/hushd.exe        release/wininstaller/
+Copy-Item release/$target/hush-cli.exe     release/wininstaller/

-Get-Content src/scripts/zec-qt-wallet.wxs | ForEach-Object { $_ -replace "RELEASE_VERSION", "$version" } | Out-File -Encoding utf8 release/wininstaller/zec-qt-wallet.wxs
+Get-Content src/scripts/silentdragon.wxs | ForEach-Object { $_ -replace "RELEASE_VERSION", "$version" } | Out-File -Encoding utf8 release/wininstaller/silentdragon.wxs

-candle.exe release/wininstaller/zec-qt-wallet.wxs -o release/wininstaller/zec-qt-wallet.wixobj 
+candle.exe release/wininstaller/silentdragon.wxs -o release/wininstaller/silentdragon.wixobj 
 if (!$?) {
    exit 1;
 }

-light.exe -ext WixUIExtension -cultures:en-us release/wininstaller/zec-qt-wallet.wixobj -out release/wininstaller/zecwallet.msi 
+light.exe -ext WixUIExtension -cultures:en-us release/wininstaller/silentdragon.wixobj -out release/wininstaller/silentdragon.msi 
 if (!$?) {
    exit 1;
 }

 New-Item artifacts -itemtype directory -Force | Out-Null
-Copy-Item release/wininstaller/zecwallet.msi ./artifacts/Windows-installer-$target.msi
+Copy-Item release/wininstaller/silentdragon.msi ./artifacts/Windows-installer-$target.msi
--- a/src/sendtab.cpp
+++ b/src/sendtab.cpp
@ -663,9 +663,9 @@ bool MainWindow::confirmTx(Tx tx) {
    // And FromAddress in the confirm dialog 
    confirm.sendFrom->setText(fnSplitAddressForWrap(tx.fromAddr));
    QString tooltip = tr("Current balance      : ") +
-        Settings::getZECUSDDisplayFormat(rpc->getAllBalances()->value(tx.fromAddr));
+        Settings::getHUSHUSDDisplayFormat(rpc->getAllBalances()->value(tx.fromAddr));
    tooltip += "\n" + tr("Balance after this Tx: ") +
-        Settings::getZECUSDDisplayFormat(rpc->getAllBalances()->value(tx.fromAddr) - totalSpending);
+        Settings::getHUSHUSDDisplayFormat(rpc->getAllBalances()->value(tx.fromAddr) - totalSpending);
    confirm.sendFrom->setToolTip(tooltip);

    // Show the dialog and submit it if the user confirms
--- a/src/senttxstore.cpp
+++ b/src/senttxstore.cpp
@ -57,7 +57,7 @@ void SentTxStore::addToSentTx(Tx tx, QString txid) {
    if (!Settings::getInstance()->getSaveZtxs())
        return;

-    // Also, only store outgoing txs where the from address is a z-Addr. Else, regular zcashd 
+    // Also, only store outgoing txs where the from address is a z-Addr. Else, regular hushd 
    // stores it just fine
    if (!tx.fromAddr.startsWith("z")) 
        return;
--- a/src/settings.cpp
+++ b/src/settings.cpp
@ -302,7 +302,7 @@ QString Settings::getDisplayFormat(double bal) {
    return getDecimalString(bal) % " " % Settings::getTokenName();
 }

-QString Settings::getZECUSDDisplayFormat(double bal) {
+QString Settings::getHUSHUSDDisplayFormat(double bal) {
    auto usdFormat = getUSDFormat(bal);
    if (!usdFormat.isEmpty())
        return getDisplayFormat(bal) % " (" % getUSDFormat(bal) % ")";
--- a/src/settings.h
+++ b/src/settings.h
@ -123,7 +123,7 @@ public:
    static QString getDecimalString(double amt);
    static QString getUSDFormat(double bal);
    static QString getDisplayFormat(double bal);
-    static QString getZECUSDDisplayFormat(double bal);
+    static QString getHUSHUSDDisplayFormat(double bal);

    static QString getTokenName();
    static QString getDonationAddr();