From cfb8c36de8543056da2b5fd1475f626885356598 Mon Sep 17 00:00:00 2001
From: jahway603
Date: Sun, 23 Aug 2020 16:13:36 -0400
Subject: [PATCH 1/8] added badges and Mac OSX support to README.md
---
README.md | 31 ++++++++++++++++++++++++++-----
1 file changed, 26 insertions(+), 5 deletions(-)
diff --git a/README.md b/README.md
index ccb24c5..4562611 100644
--- a/README.md
+++ b/README.md
@@ -1,19 +1,41 @@
# SilentDragonLite
+[![GitHub license](https://img.shields.io/badge/License-GPL%20v3-yellow.svg)](https://github.com/MyHush/SilentDragonLite/blob/master/LICENSE)
+[![GitHub version](https://badge.fury.io/gh/MyHush%2FSilentDragonLite.svg)](https://badge.fury.io/gh/MyHush%2FSilentDragonLite)
+[![Github All Releases](https://img.shields.io/github/downloads/MyHush/SilentDragonLite/total.svg)](https://img.shields.io/github/downloads/MyHush/SilentDragonLite/total.svg)
-SilentDragonLite is a lightwallet for HUSH ($HUSH) runs on Linux and Windows which does not require you to download the full blockchain. This is experimental software under active development!
+
+
+
+
+
+
+
+
+
+
+SilentDragonLite is a lightwallet for HUSH ($HUSH) which runs on Linux, Windows, and Mac OSX. This does not require you to download the full blockchain. This is experimental software under active development!
## PRIVACY NOTICE
-SilentDragonLite contacts a few different external websites to get various bits of data. * coingecko.com for price data API * explorer.myhush.org for explorer links * dexstats.info for address utilities, hush-lightwallet.de to get Data.
+SilentDragonLite contacts a few different external websites to get various bits of data.
-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/
+ * coingecko.com for price data API
+ * explorer.myhush.org for explorer links
+ * dexstats.info for address utilities
+ * hush-lightwallet.de to get Data
+
+This means your IP address is known to these servers. Enable Tor setting in SilentDragonLite to prevent this, or better yet, use TAILS: https://tails.boum.org/
## Installation
-Go to the releases page and grab the latest installers or binary. https://github.com/MyHush/SilentDragonLite/releases
+Go to the [releases page](https://github.com/MyHush/SilentDragonLite/releases) and grab the latest installers or binary.
## Install Torsocks (or any other Socks service for TOR) on Ubuntu 18.04
```
@@ -48,4 +70,3 @@ cd silentdragonlite
```
-
From eda743b497e65e4ab0af7a28c6d1422eb194b710 Mon Sep 17 00:00:00 2001
From: jahway603
Date: Sun, 23 Aug 2020 16:21:19 -0400
Subject: [PATCH 2/8] minor changes to README.md
---
README.md | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/README.md b/README.md
index 4562611..545d714 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@
alt="MyHushTeam's Reddit">
-SilentDragonLite is a lightwallet for HUSH ($HUSH) which runs on Linux, Windows, and Mac OSX. This does not require you to download the full blockchain. This is experimental software under active development!
+SilentDragonLite is a lightwallet for HUSH ($HUSH) which runs on Linux, Windows, and macOS. This does not require you to download the full blockchain. This is experimental software under active development!
@@ -60,13 +60,17 @@ SilentDragonLite does automatic note and utxo management, which means it doesn't
* It also depends on Qt5, which you can get from [here](https://www.qt.io/download).
* You'll need Rust v1.41 +
-## Building on Linux
+### Building on Linux
```
-git clone https://github.com/MyHush/SilenDragonLite.git
-cd silentdragonlite
+git clone https://github.com/MyHush/SilentDragonLite.git
+cd SilentDragonLite
./build.sh
-./Silentdragonlite
+./SilentDragonLite
```
+## Support
+
+For support or other questions, join us on [Discord](https://myhush.org/discord), or tweet at [@MyHushTeam](https://twitter.com/MyHushTeam), or toot at our [Mastodon](https://fosstodon.org/@myhushteam), or join [Telegram](http://myhush.org/telegram) or [file an issue](https://github.com/MyHush/SilentDragonLite/issues).
+
From a4a89dfd81dd0b6b11d5bab65a1a601ff83a60a2 Mon Sep 17 00:00:00 2001
From: jahway603
Date: Sun, 23 Aug 2020 23:16:46 -0400
Subject: [PATCH 3/8] updated README.md with new badges and Arch AUR package
install info
---
README.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 545d714..0f11ef1 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@
alt="MyHushTeam's Reddit">
-SilentDragonLite is a lightwallet for HUSH ($HUSH) which runs on Linux, Windows, and macOS. This does not require you to download the full blockchain. This is experimental software under active development!
+SilentDragonLite is a lightwallet for HUSH ($HUSH) which runs on Linux and Windows. This does not require you to download the full blockchain. This is experimental software under active development!
@@ -35,7 +35,7 @@ This means your IP address is known to these servers. Enable Tor setting in Sile
## Installation
-Go to the [releases page](https://github.com/MyHush/SilentDragonLite/releases) and grab the latest installers or binary.
+Go to the [releases page](https://github.com/MyHush/SilentDragonLite/releases) and grab the latest installers or binary. For any Arch Linux users, we also have packages on [AUR](https://aur.archlinux.org/) which can be installed with **[yay -S silentdragonlite](https://aur.archlinux.org/packages/silentdragonlite/)** or with **[yay -S silentdragonlite-appimage](https://aur.archlinux.org/packages/silentdragonlite-appimage/)** for the AppImage package.
## Install Torsocks (or any other Socks service for TOR) on Ubuntu 18.04
```
From 17172c68d969b6ffb8e4fe3acf6f3c97d4a04db7 Mon Sep 17 00:00:00 2001
From: jahway603
Date: Sun, 23 Aug 2020 23:36:16 -0400
Subject: [PATCH 4/8] updated Copyright year in some files
---
LICENSE | 2 +-
build.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/LICENSE b/LICENSE
index 262f6fb..fa19312 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
- Copyright 2019 The Hush developers
+ Copyright 2019-2020 The Hush developers
Copyright 2018 adityapk
diff --git a/build.sh b/build.sh
index deaf8b2..8954556 100755
--- a/build.sh
+++ b/build.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2019 The Hush Developers
+# Copyright 2019-2020 The Hush Developers
UNAME=$(uname)
From b85d29ba56e26683aad67f4c040442d9718127eb Mon Sep 17 00:00:00 2001
From: Duke Leto
Date: Thu, 19 Nov 2020 10:32:10 -0500
Subject: [PATCH 5/8] Update links
---
README.md | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/README.md b/README.md
index 0f11ef1..e3746c5 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,4 @@
# SilentDragonLite
-[![GitHub license](https://img.shields.io/badge/License-GPL%20v3-yellow.svg)](https://github.com/MyHush/SilentDragonLite/blob/master/LICENSE)
-[![GitHub version](https://badge.fury.io/gh/MyHush%2FSilentDragonLite.svg)](https://badge.fury.io/gh/MyHush%2FSilentDragonLite)
-[![Github All Releases](https://img.shields.io/github/downloads/MyHush/SilentDragonLite/total.svg)](https://img.shields.io/github/downloads/MyHush/SilentDragonLite/total.svg)
@@ -35,7 +32,7 @@ This means your IP address is known to these servers. Enable Tor setting in Sile
## Installation
-Go to the [releases page](https://github.com/MyHush/SilentDragonLite/releases) and grab the latest installers or binary. For any Arch Linux users, we also have packages on [AUR](https://aur.archlinux.org/) which can be installed with **[yay -S silentdragonlite](https://aur.archlinux.org/packages/silentdragonlite/)** or with **[yay -S silentdragonlite-appimage](https://aur.archlinux.org/packages/silentdragonlite-appimage/)** for the AppImage package.
+Go to the [releases page](https://git.hush.is/hush/SilentDragonLite/releases) and grab the latest installers or binary. For any Arch Linux users, we also have packages on [AUR](https://aur.archlinux.org/) which can be installed with **[yay -S silentdragonlite](https://aur.archlinux.org/packages/silentdragonlite/)** or with **[yay -S silentdragonlite-appimage](https://aur.archlinux.org/packages/silentdragonlite-appimage/)** for the AppImage package.
## Install Torsocks (or any other Socks service for TOR) on Ubuntu 18.04
```
@@ -63,7 +60,7 @@ SilentDragonLite does automatic note and utxo management, which means it doesn't
### Building on Linux
```
-git clone https://github.com/MyHush/SilentDragonLite.git
+git clone https://git.hush.is/hush/SilentDragonLite
cd SilentDragonLite
./build.sh
./SilentDragonLite
@@ -72,5 +69,5 @@ cd SilentDragonLite
## Support
-For support or other questions, join us on [Discord](https://myhush.org/discord), or tweet at [@MyHushTeam](https://twitter.com/MyHushTeam), or toot at our [Mastodon](https://fosstodon.org/@myhushteam), or join [Telegram](http://myhush.org/telegram) or [file an issue](https://github.com/MyHush/SilentDragonLite/issues).
+For support join us on [Telegram Support](https://hush.is/telegram_support), [Main Telegram](https://hush.is/telegram) or tweet at [@MyHushTeam](https://twitter.com/MyHushTeam), or toot at our [Mastodon](https://fosstodon.org/@myhushteam), or [file an issue](https://git.hush.is/hush/SilentDragonLite/issues).
From 31a607a88f8fefe921e036567cb3a2153d590f38 Mon Sep 17 00:00:00 2001
From: jahway603
Date: Sun, 29 Nov 2020 00:12:19 +0000
Subject: [PATCH 6/8] added gilardh changes
added changes from @gilardh to resolve the conflicting file in PR #1
---
README.md | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/README.md b/README.md
index e3746c5..f586ead 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@
SilentDragonLite is a lightwallet for HUSH ($HUSH) which runs on Linux and Windows. This does not require you to download the full blockchain. This is experimental software under active development!
-
+
## PRIVACY NOTICE
@@ -69,5 +69,4 @@ cd SilentDragonLite
## Support
-For support join us on [Telegram Support](https://hush.is/telegram_support), [Main Telegram](https://hush.is/telegram) or tweet at [@MyHushTeam](https://twitter.com/MyHushTeam), or toot at our [Mastodon](https://fosstodon.org/@myhushteam), or [file an issue](https://git.hush.is/hush/SilentDragonLite/issues).
-
+For support join us on [Telegram Support](https://hush.is/telegram_support), or our [Main Telegram](https://hush.is/telegram) or tweet at [@MyHushTeam](https://twitter.com/MyHushTeam), or toot at our [Mastodon](https://fosstodon.org/@myhushteam), or [file an issue](https://git.hush.is/hush/SilentDragonLite/issues).
From 46c748d06fc5fe199bbe5a710046af9be2d90c44 Mon Sep 17 00:00:00 2001
From: Duke Leto
Date: Sat, 2 Jan 2021 10:55:25 -0500
Subject: [PATCH 7/8] hush.is is the only Official Hush domain
---
README.md | 2 +-
src/mainwindow.cpp | 10 +++++-----
src/settings.cpp | 6 +++---
src/websockets.cpp | 2 +-
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/README.md b/README.md
index f586ead..1b56889 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ SilentDragonLite is a lightwallet for HUSH ($HUSH) which runs on Linux and Windo
SilentDragonLite 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
* hush-lightwallet.de to get Data
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index a9f28fc..760b557 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -779,7 +779,7 @@ void MainWindow::setupStatusBar() {
});
menu.addAction(tr("Copy block explorer link"), [=]() {
// auto explorer = Settings::getInstance()->getExplorer();
- QGuiApplication::clipboard()->setText("https://explorer.myhush.org/tx/" + txid);
+ QGuiApplication::clipboard()->setText("https://explorer.hush.is/tx/" + txid);
});
menu.addAction(tr("View tx on block explorer"), [=]() {
@@ -851,7 +851,7 @@ void MainWindow::setupSettingsModal() {
settings.chkFetchPrices->setChecked(Settings::getInstance()->getAllowFetchPrices());
// List of default servers
- settings.cmbServer->addItem("https://lite.myhush.org");
+ settings.cmbServer->addItem("https://lite.hush.is");
settings.cmbServer->addItem("6onaaujm4ozaokzu.onion:80");
@@ -906,12 +906,12 @@ void MainWindow::addressBook() {
}
void MainWindow::discord() {
- QString url = "https://myhush.org/discord/";
+ QString url = "https://hush.is/discord/";
QDesktopServices::openUrl(QUrl(url));
}
void MainWindow::website() {
- QString url = "https://myhush.org";
+ QString url = "https://hush.is";
QDesktopServices::openUrl(QUrl(url));
}
@@ -1382,7 +1382,7 @@ void MainWindow::setupTransactionsTab() {
}
menu.addAction(tr("Copy block explorer link"), [=]() {
// auto explorer = Settings::getInstance()->getExplorer();
- QGuiApplication::clipboard()->setText("https://explorer.myhush.org/tx/" + txid);
+ QGuiApplication::clipboard()->setText("https://explorer.hush.is/tx/" + txid);
});
menu.addAction(tr("View on block explorer"), [=] () {
diff --git a/src/settings.cpp b/src/settings.cpp
index fd47f76..d11aecd 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -262,7 +262,7 @@ void Settings::saveRestoreTableHeader(QTableView* table, QDialog* d, QString tab
}
QString Settings::getDefaultServer() {
- return "https://lite.myhush.org";
+ return "https://lite.hush.is";
}
void Settings::openAddressInExplorer(QString address) {
@@ -270,7 +270,7 @@ void Settings::openAddressInExplorer(QString address) {
if (Settings::getInstance()->isTestnet()) {
url = "https://chain.so/address/hushTEST/" + address;
} else {
- url = "https://explorer.myhush.org/address/" + address;
+ url = "https://explorer.hush.is/address/" + address;
}
QDesktopServices::openUrl(QUrl(url));
}
@@ -281,7 +281,7 @@ void Settings::openTxInExplorer(QString txid) {
url = "https://chain.so/tx/hushTEST/" + txid;
}
else {
- url = "https://explorer.myhush.org/tx/" + txid;
+ url = "https://explorer.hush.is/tx/" + txid;
}
QDesktopServices::openUrl(QUrl(url));
}
diff --git a/src/websockets.cpp b/src/websockets.cpp
index 3f75e59..fc63192 100644
--- a/src/websockets.cpp
+++ b/src/websockets.cpp
@@ -126,7 +126,7 @@ void WormholeClient::connect() {
qDebug() << "Invalid websocket object!";
}
- m_webSocket->open(QUrl("wss://wormhole.myhush.org:443"));
+ m_webSocket->open(QUrl("wss://wormhole.hush.is:443"));
//m_webSocket->open(QUrl("ws://127.0.0.1:7070"));
}
From 256070ef4ea613c891b36c65ced7d5818e80682a Mon Sep 17 00:00:00 2001
From: Duke Leto
Date: Sat, 2 Jan 2021 10:57:00 -0500
Subject: [PATCH 8/8] 2021
---
src/Chat/Chat.cpp | 2 +-
src/DataStore/ChatDataStore.cpp | 2 +-
src/DataStore/ContactDataStore.cpp | 2 +-
src/FileSystem/FileSystem.h | 2 +-
src/Model/ChatItem.cpp | 2 +-
src/Model/ChatItem.h | 2 +-
src/Model/ContactItem.cpp | 2 +-
src/Model/ContactItem.h | 2 +-
src/Model/ContactRequest.cpp | 2 +-
src/Model/ContactRequest.h | 2 +-
src/addressbook.cpp | 2 +-
src/chatmodel.cpp | 2 +-
src/chatmodel.h | 2 +-
src/contactmodel.cpp | 2 +-
src/contactmodel.h | 2 +-
src/controller.cpp | 2 +-
src/controller.h | 2 +-
src/mainwindow.cpp | 2 +-
18 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/Chat/Chat.cpp b/src/Chat/Chat.cpp
index a4f8549..9c7cf58 100644
--- a/src/Chat/Chat.cpp
+++ b/src/Chat/Chat.cpp
@@ -1,4 +1,4 @@
-// Copyright 2019-2020 The Hush developers
+// Copyright 2019-2021 The Hush developers
// GPLv3
#include "Chat.h"
diff --git a/src/DataStore/ChatDataStore.cpp b/src/DataStore/ChatDataStore.cpp
index 4e54e1e..788ee3a 100644
--- a/src/DataStore/ChatDataStore.cpp
+++ b/src/DataStore/ChatDataStore.cpp
@@ -1,4 +1,4 @@
-// Copyright 2019-2020 The Hush developers
+// Copyright 2019-2021 The Hush developers
// GPLv3
#include "ChatDataStore.h"
diff --git a/src/DataStore/ContactDataStore.cpp b/src/DataStore/ContactDataStore.cpp
index 61d58bd..67e1d85 100644
--- a/src/DataStore/ContactDataStore.cpp
+++ b/src/DataStore/ContactDataStore.cpp
@@ -1,4 +1,4 @@
-// Copyright 2019-2020 The Hush developers
+// Copyright 2019-2021 The Hush developers
// GPLv3
#include "ContactDataStore.h"
diff --git a/src/FileSystem/FileSystem.h b/src/FileSystem/FileSystem.h
index 6ee40cd..930caa7 100644
--- a/src/FileSystem/FileSystem.h
+++ b/src/FileSystem/FileSystem.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2020 The Hush developers
+// Copyright 2019-2021 The Hush developers
// GPLv3
#ifndef FILESYSTEM_H
#define FILESYSTEM_H
diff --git a/src/Model/ChatItem.cpp b/src/Model/ChatItem.cpp
index 06d3ef7..34c8f54 100644
--- a/src/Model/ChatItem.cpp
+++ b/src/Model/ChatItem.cpp
@@ -1,4 +1,4 @@
-// Copyright 2019-2020 The Hush developers
+// Copyright 2019-2021 The Hush developers
// GPLv3
#include "ChatItem.h"
diff --git a/src/Model/ChatItem.h b/src/Model/ChatItem.h
index 991868a..eae54a8 100644
--- a/src/Model/ChatItem.h
+++ b/src/Model/ChatItem.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2020 The Hush developers
+// Copyright 2019-2021 The Hush developers
// GPLv3
#ifndef CHATITEM_H
diff --git a/src/Model/ContactItem.cpp b/src/Model/ContactItem.cpp
index 2188d05..db3f947 100644
--- a/src/Model/ContactItem.cpp
+++ b/src/Model/ContactItem.cpp
@@ -1,4 +1,4 @@
-// Copyright 2019-2020 The Hush developers
+// Copyright 2019-2021 The Hush developers
// GPLv3
#include "ContactItem.h"
#include "chatmodel.h"
diff --git a/src/Model/ContactItem.h b/src/Model/ContactItem.h
index 9fdd7a4..fe3f68d 100644
--- a/src/Model/ContactItem.h
+++ b/src/Model/ContactItem.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2020 The Hush developers
+// Copyright 2019-2021 The Hush developers
// GPLv3
#ifndef CONTACTITEM_H
#define CONTACTITEM_H
diff --git a/src/Model/ContactRequest.cpp b/src/Model/ContactRequest.cpp
index 28f1d17..d8d356b 100644
--- a/src/Model/ContactRequest.cpp
+++ b/src/Model/ContactRequest.cpp
@@ -1,4 +1,4 @@
-// Copyright 2019-2020 The Hush developers
+// Copyright 2019-2021 The Hush developers
// GPLv3
#include "ContactRequest.h"
diff --git a/src/Model/ContactRequest.h b/src/Model/ContactRequest.h
index 5fe5fa3..e241918 100644
--- a/src/Model/ContactRequest.h
+++ b/src/Model/ContactRequest.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2020 The Hush developers
+// Copyright 2019-2021 The Hush developers
// GPLv3
#ifndef CONTACTREQUEST_H
diff --git a/src/addressbook.cpp b/src/addressbook.cpp
index 6e99e23..f07f53f 100644
--- a/src/addressbook.cpp
+++ b/src/addressbook.cpp
@@ -1,4 +1,4 @@
-// Copyright 2019-2020 The Hush developers
+// Copyright 2019-2021 The Hush developers
// GPLv3
#include "addressbook.h"
diff --git a/src/chatmodel.cpp b/src/chatmodel.cpp
index c21b512..63bba8d 100644
--- a/src/chatmodel.cpp
+++ b/src/chatmodel.cpp
@@ -1,4 +1,4 @@
-// Copyright 2019-2020 The Hush developers
+// Copyright 2019-2021 The Hush developers
// GPLv3
#include "chatmodel.h"
#include "settings.h"
diff --git a/src/chatmodel.h b/src/chatmodel.h
index 1676993..9bc56ad 100644
--- a/src/chatmodel.h
+++ b/src/chatmodel.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2020 The Hush developers
+// Copyright 2019-2021 The Hush developers
// GPLv3
#ifndef CHATMODEL_H
diff --git a/src/contactmodel.cpp b/src/contactmodel.cpp
index f3d529f..e7192ad 100644
--- a/src/contactmodel.cpp
+++ b/src/contactmodel.cpp
@@ -1,4 +1,4 @@
-// Copyright 2019-2020 The Hush developers
+// Copyright 2019-2021 The Hush developers
// GPLv3
#include "contactmodel.h"
diff --git a/src/contactmodel.h b/src/contactmodel.h
index 584b5f9..6a19ec8 100644
--- a/src/contactmodel.h
+++ b/src/contactmodel.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2020 The Hush developers
+// Copyright 2019-2021 The Hush developers
// GPLv3
#ifndef CONTACTMODEL_H
#define CONTACTMODEL_H
diff --git a/src/controller.cpp b/src/controller.cpp
index 9500e81..7fba08a 100644
--- a/src/controller.cpp
+++ b/src/controller.cpp
@@ -1,4 +1,4 @@
-// Copyright 2019-2020 The Hush developers
+// Copyright 2019-2021 The Hush developers
// GPLv3
#include "controller.h"
diff --git a/src/controller.h b/src/controller.h
index a3333c2..45d114a 100644
--- a/src/controller.h
+++ b/src/controller.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2020 The Hush developers
+// Copyright 2019-2021 The Hush developers
// GPLv3
#ifndef RPCCLIENT_H
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 760b557..9288d14 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1,4 +1,4 @@
-// Copyright 2019-2020 The Hush developers
+// Copyright 2019-2021 The Hush developers
// GPLv3
#include "mainwindow.h"