fix merge conflicts

2024-01-10 16:10:21 +01:00
parent 9276519c7b 4e074b20fd
commit 2b46484f90
107 changed files with 144 additions and 115 deletions
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
- Copyright 2019-2023 The Hush developers
+ Copyright 2019-2024 The Hush developers
 Copyright 2018 adityapk 
     
     
--- a/README.md
+++ b/README.md
@@ -55,7 +55,7 @@ rustup -V
 sudo apt-get -y install build-essential qtbase5-dev qt5-qmake qtcreator qttools5-dev-tools
 ```

-##### Ubuntu 20.04:
+##### Ubuntu 18.04 and 20.04:
 ```shell script
 sudo apt-get -y install build-essential qt5-default qt5-qmake qtcreator qttools5-dev-tools
 ```
@@ -72,7 +72,7 @@ cd SilentDragonLite

 ### Other notes

-#### Install Torsocks (or any other Socks service for TOR) on Ubuntu
+#### Install Torsocks (or any other Socks service for TOR) on Ubuntu 18.04
 ```shell script
 sudo apt update
 sudo apt install torsocks
--- a/build.sh
+++ b/build.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2019-2023 The Hush Developers
+# Copyright 2019-2024 The Hush Developers
 # Released under the GPLv3

 UNAME=$(uname)
--- a/contrib/debian/changelog
+++ b/contrib/debian/changelog
@@ -1,5 +1,5 @@
-silentdragonlite (1.5.3) stable; urgency=medium
+silentdragonlite (2.0.0) stable; urgency=medium

-  * 1.5.3.1 release.
+  * 2.0.0.1 release.

- -- onryo <onryo@hush.land>  Sat, 10 Jun 2023 15:20:30 +0200
+ -- onryo <onryo@hush.land>  Sat, 06 Jan 2024 10:20:30 +0200
--- a/contrib/debian/copyright
+++ b/contrib/debian/copyright
@@ -1,5 +1,5 @@
 Files: *
-Copyright: 2019-2023, The Hush developers
+Copyright: 2019-2024, The Hush developers
 2018-2019, The Zcash developers
 License: GPLv3
 Comment: https://hush.is/developers
--- a/doc/relnotes.md
+++ b/doc/relnotes.md
@@ -1,3 +1,23 @@
+# SilentDragonLite v1.5.4 "Shielded Supersonic"
+
+* Mempool integration: https://git.hush.is/hush/SilentDragonLite/commit/3962b42e3098863a8b959de1b12b029c13008cbe, https://git.hush.is/hush/SilentDragonLite/pulls/126.
+* Improve error handling when restoring from seedphrase:  https://git.hush.is/hush/SilentDragonLite/commit/5d5447aced2c6b2a16e7dc1efd6a235c478480fb, https://git.hush.is/hush/SilentDragonLite/commit/6165733e039defc58d56fb34add5b0be43dba72d, https://git.hush.is/hush/SilentDragonLite/commit/1e6e77055b2df916af69c1c5ab16cc9294b29344.
+* Remove websockets, we now have a standalone Android wallet: https://git.hush.is/hush/SilentDragonLite/commit/430a7ab47424a3b5f9af95f47913cecb7aee05d0, https://git.hush.is/hush/SilentDragonLite/commit/3b6da338c910f4a901d65cae3fad262db09c393f.
+* Try another server if current is down when creating new seed: https://git.hush.is/hush/SilentDragonLite/commit/3f8ae1f9d75766331e3d1bb7689e7b18850061e1, https://git.hush.is/hush/SilentDragonLite/commit/557e10e5e8c35a102e82370517bf3a7a5ab25fca.
+* Try another server if current is down when restoring during a rescan; report down server in error: https://git.hush.is/hush/SilentDragonLite/commit/f7787fe9e92ec560b48550728315e7068f8f815f.
+* Report server in error when saving wallet as part of rescan: https://git.hush.is/hush/SilentDragonLite/commit/17fcb84a897ddc5b8e62241d2a3da2576200e618, https://git.hush.is/hush/SilentDragonLite/commit/51483843ac148be7d2c6956147e2fc57e144c387.
+* Make sure to init from phrase when trying a new server during restore in first time wizard: https://git.hush.is/hush/SilentDragonLite/commit/ad5b294d95953bfe2f6061e20829da79919647a6.
+* Initialize a new server connection from seedphrase when restoring from seed: https://git.hush.is/hush/SilentDragonLite/commit/c7e0f0fae6ea41e23ef3abc3035ecaa807201d95.
+* Try another server if current is down when saving wallet via a rescan: https://git.hush.is/hush/SilentDragonLite/commit/9befa3450fdeea8a76bae324811f49b0593a151f.
+* Try another server if we get an error when executing an RPC: https://git.hush.is/hush/SilentDragonLite/commit/7e54360b7215627a613a309960386ebd455a68dd, https://git.hush.is/hush/SilentDragonLite/commit/b84828604f8c9aa25acf41e90fdf5e9f4118e6bd, https://git.hush.is/hush/SilentDragonLite/commit/77ac1f99ae9a2b0b42ae752e1ce457ff9abdfcd8, https://git.hush.is/hush/SilentDragonLite/commit/f46e1b4a578b3af2d4b6cbe4754959278bbfdba9, https://git.hush.is/hush/SilentDragonLite/commit/bfdda1f1af7e4bc42dc1a4e10985e6c152dad8bd, https://git.hush.is/hush/SilentDragonLite/issues/119. (NOT READY YET)
+* Update current server on info tab since it can change at run-time: https://git.hush.is/hush/SilentDragonLite/commit/a080d0ca80d757519367a38a480caee0fb1f0173.
+* Misc: https://git.hush.is/hush/SilentDragonLite/commit/5508050fcca66cda38045b0f80535e3aea2aad50, https://git.hush.is/hush/SilentDragonLite/commit/cb0de2c3f6fd4b378fbfe9d37d90287c38196be4.
+* Look for non-empty responses instead of the string "OK": https://git.hush.is/hush/SilentDragonLite/commit/51fe4d6cde15c1ae6b7c7930bfd4878a174f5ac5.
+* Check for a non-empty response from litelib_execute: https://git.hush.is/hush/SilentDragonLite/commit/7364e21f999693825f1bd59a0814f7534e9d6f90.
+* Docs: https://git.hush.is/hush/SilentDragonLite/commit/d05d8271ecc78cad6acae8d335ada7f394d72fe6, https://git.hush.is/hush/SilentDragonLite/commit/9a7e87fa1d089c2c8eb7c8abfe843d6954f384cf.
+* Debug: https://git.hush.is/hush/SilentDragonLite/commit/5b33cb3638adc17f414e1f211d90b124b4f0dc69.
+* deb stuff: https://git.hush.is/hush/SilentDragonLite/commit/aa58e3a4ce162e828a1ae25a2f242285296b33db, https://git.hush.is/hush/SilentDragonLite/commit/d8ff0de15d78d6daf3dc280f4f70c62adae40340, https://git.hush.is/hush/SilentDragonLite/commit/b8c18aa38b3b18d0e630423004fbf70284446a21, https://git.hush.is/hush/SilentDragonLite/commit/eca9c53ff7346f48706740443f10273a91df4475.
+
 # SilentDragonLite v1.5.3 "Mythical Coelacanth"

 * Change lite server after sending a tx for improved privacy: https://git.hush.is/hush/SilentDragonLite/commit/a8fc12e0e2b2324db21407f4848f2d4aa59f4575.
--- a/lib/Cargo.toml
+++ b/lib/Cargo.toml
@@ -13,4 +13,3 @@ libc = "0.2.58"
 lazy_static = "1.4.0"
 blake3 = "0.3.4"
 silentdragonlitelib = { git = "https://git.hush.is/hush/silentdragonlite-cli", rev = "4ec78a01b4f35b08eff42b10e3be85de87ba2b02" }
-
--- a/res/libsodium/buildlibsodium.sh
+++ b/res/libsodium/buildlibsodium.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2019-2023 The Hush developers
+# Copyright 2019-2024 The Hush developers
 # Released under the GPLv3
 VERSION=1.0.18

--- a/run-after-build.sh
+++ b/run-after-build.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
-# Copyright 2019-2023 The Hush Developers
+# Copyright 2019-2024 The Hush Developers

 ./build.sh && ./SilentDragonLite
--- a/silentdragon-lite.pro
+++ b/silentdragon-lite.pro
@@ -3,7 +3,7 @@
 # Project created by QtCreator 2018-10-05T09:54:45
 #
 #-------------------------------------------------
-# Copyright 2019-2023 The Hush Developers
+# Copyright 2019-2024 The Hush Developers
 # Released under the GPLv3

 QT       += core gui network
--- a/src/3rdparty/sodium.h
+++ b/src/3rdparty/sodium.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3

 #ifndef sodium_H
--- a/src/Chat/Chat.cpp
+++ b/src/Chat/Chat.cpp
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3

 #include "Chat.h"
--- a/src/Chat/Chat.h
+++ b/src/Chat/Chat.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #ifndef CHAT_H
 #define CHAT_H
--- a/src/Chat/Helper/ChatDelegator.h
+++ b/src/Chat/Helper/ChatDelegator.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // GPLv3

 #ifndef CHATDELEGATOR_H
--- a/src/Crypto/FileEncryption.cpp
+++ b/src/Crypto/FileEncryption.cpp
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #include "FileEncryption.h"

--- a/src/Crypto/FileEncryption.h
+++ b/src/Crypto/FileEncryption.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #ifndef FILEENCRYPTION_H
 #define FILEENCRYPTION_H
--- a/src/Crypto/passwd.cpp
+++ b/src/Crypto/passwd.cpp
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #include "passwd.h"

--- a/src/Crypto/passwd.h
+++ b/src/Crypto/passwd.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #ifndef PASSWD_H
 #define PASSWD_H
--- a/src/DataStore/ChatDataStore.cpp
+++ b/src/DataStore/ChatDataStore.cpp
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3

 #include "ChatDataStore.h"
--- a/src/DataStore/ChatDataStore.h
+++ b/src/DataStore/ChatDataStore.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #ifndef CHATDATASTORE_H
 #define CHATDATASTORE_H
--- a/src/DataStore/ContactDataStore.cpp
+++ b/src/DataStore/ContactDataStore.cpp
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // GPLv3

 #include "ContactDataStore.h"
--- a/src/DataStore/ContactDataStore.h
+++ b/src/DataStore/ContactDataStore.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #ifndef CONTACTDATASTORE_H
 #define CONTACTDATASTORE_H
--- a/src/DataStore/DataStore-deprecated.h
+++ b/src/DataStore/DataStore-deprecated.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #ifndef DATASTORE_H
 #define DATASTORE_H
--- a/src/DataStore/DataStore.cpp
+++ b/src/DataStore/DataStore.cpp
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #include "DataStore.h"

--- a/src/DataStore/DataStore.h
+++ b/src/DataStore/DataStore.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #ifndef DATASTORE_H
 #define DATASTORE_H
--- a/src/DataStore/SietchDataStore.cpp
+++ b/src/DataStore/SietchDataStore.cpp
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #include "SietchDataStore.h"

--- a/src/DataStore/SietchDataStore.h
+++ b/src/DataStore/SietchDataStore.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #ifndef SIETCHDATASTORE_H
 #define SIETCHDATASTORE_H
--- a/src/FileSystem/FileSystem.cpp
+++ b/src/FileSystem/FileSystem.cpp
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #include "FileSystem.h"

--- a/src/FileSystem/FileSystem.h
+++ b/src/FileSystem/FileSystem.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // GPLv3
 #ifndef FILESYSTEM_H
 #define FILESYSTEM_H
--- a/src/Logger/LogContext.h
+++ b/src/Logger/LogContext.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #ifndef LOGCONTEXT_H
 #define LOGCONTEXT_H
--- a/src/Logger/LogCrtitical.h
+++ b/src/Logger/LogCrtitical.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #ifndef LOGCRITICAL_H
 #define LOGCRITICAL_H
--- a/src/Logger/LogDebug.h
+++ b/src/Logger/LogDebug.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #ifndef LOGDEBUG_H
 #define LOGDEBUG_H
--- a/src/Logger/LogError.h
+++ b/src/Logger/LogError.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #ifndef LOGERROR_H
 #define LOGERROR_H
--- a/src/Logger/LogFatal.h
+++ b/src/Logger/LogFatal.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #ifndef LOGFATAL_H
 #define LOGFATAL_H
--- a/src/Logger/LogInfo.h
+++ b/src/Logger/LogInfo.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #ifndef LOGINFO_H
 #define LOGINFO_H
--- a/src/Logger/LogStrategy.h
+++ b/src/Logger/LogStrategy.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #ifndef LOGSTRATEGY_H
 #define LOGSTRATEGY_H
--- a/src/Logger/LogSuccess.h
+++ b/src/Logger/LogSuccess.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #ifndef LOGSUCCESS_H
 #define LOGSUCCESS_H
--- a/src/Logger/LogType.h
+++ b/src/Logger/LogType.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #ifndef LOGTYPE_H
 #define LOGTYPE_H
--- a/src/Logger/LogWarning.h
+++ b/src/Logger/LogWarning.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #ifndef LOGWARNING_H
 #define LOGWARNING_H
--- a/src/Logger/LogWriter.cpp
+++ b/src/Logger/LogWriter.cpp
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #include "LogWriter.h"

--- a/src/Logger/LogWriter.h
+++ b/src/Logger/LogWriter.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #ifndef LOGWRITER_H
 #define LOGWRITER_H
--- a/src/Logger/Logger.h
+++ b/src/Logger/Logger.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #ifndef LOGGER_H
 #define LOGGER_H
--- a/src/Logger/SimpleLogger.h
+++ b/src/Logger/SimpleLogger.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #ifndef SIMPLELOGGER_H
 #define SIMPLELOGGER_H
--- a/src/Logger/test.cpp
+++ b/src/Logger/test.cpp
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #include "SimpleLogger.h"

--- a/src/Model/ChatItem.cpp
+++ b/src/Model/ChatItem.cpp
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3

 #include "ChatItem.h"
--- a/src/Model/ChatItem.h
+++ b/src/Model/ChatItem.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3

 #ifndef CHATITEM_H
--- a/src/Model/ContactItem.cpp
+++ b/src/Model/ContactItem.cpp
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // GPLv3
 #include "ContactItem.h"
 #include "chatmodel.h"
--- a/src/Model/ContactItem.h
+++ b/src/Model/ContactItem.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #ifndef CONTACTITEM_H
 #define CONTACTITEM_H
--- a/src/Model/ContactRequest.cpp
+++ b/src/Model/ContactRequest.cpp
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // GPLv3

 #include "ContactRequest.h"
--- a/src/Model/ContactRequest.h
+++ b/src/Model/ContactRequest.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #ifndef CONTACTREQUEST_H
 #define CONTACTREQUEST_H
--- a/src/Model/ContactRequestChatItem.cpp
+++ b/src/Model/ContactRequestChatItem.cpp
@@ -1,3 +1,3 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #include "ContactRequestChatItem.h"
--- a/src/Model/ContactRequestChatItem.h
+++ b/src/Model/ContactRequestChatItem.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #ifdef CONTACTREQUESTCHATITEM_H
 #define CONTACTREQUESTCHATITEM_H
--- a/src/about.ui
+++ b/src/about.ui
@@ -63,7 +63,7 @@
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright (c) 2019-2023 The Hush developers  GNU Public License V3&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright (c) 2019-2024 The Hush developers  GNU Public License V3&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright (c) 2018-2019 Aditya Kulkarni, Duke Leto, Jane Mercer &lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
--- a/src/addressbook.cpp
+++ b/src/addressbook.cpp
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3

 #include "addressbook.h"
--- a/src/addressbook.h
+++ b/src/addressbook.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #ifndef ADDRESSBOOK_H
 #define ADDRESSBOOK_H
--- a/src/addresscombo.cpp
+++ b/src/addresscombo.cpp
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #include "addresscombo.h"
 #include "addressbook.h"
--- a/src/addresscombo.h
+++ b/src/addresscombo.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #ifndef ADDRESSCOMBO_H
 #define ADDRESSCOMBO_H
--- a/src/balancestablemodel.cpp
+++ b/src/balancestablemodel.cpp
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #include "balancestablemodel.h"
 #include "addressbook.h"
--- a/src/balancestablemodel.h
+++ b/src/balancestablemodel.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #ifndef BALANCESTABLEMODEL_H
 #define BALANCESTABLEMODEL_H
--- a/src/camount.cpp
+++ b/src/camount.cpp
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #include "camount.h"
 #include "settings.h"
--- a/src/camount.h
+++ b/src/camount.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #ifndef CAMOUNT_H
 #define CAMOUNT_H
--- a/src/chatbubbleme.cpp
+++ b/src/chatbubbleme.cpp
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #include "chatbubbleme.h"
 #include "ui_chatbubbleme.h"
--- a/src/chatbubbleme.h
+++ b/src/chatbubbleme.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #ifndef CHATBUBBLEME_H
 #define CHATBUBBLEME_H
--- a/src/chatbubblepartner.cpp
+++ b/src/chatbubblepartner.cpp
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #include "chatbubblepartner.h"
 #include "ui_chatbubblepartner.h"
--- a/src/chatbubblepartner.h
+++ b/src/chatbubblepartner.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #ifndef CHATBUBBLEPARTNER_H
 #define CHATBUBBLEPARTNER_H
--- a/src/chatmodel.cpp
+++ b/src/chatmodel.cpp
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #include "chatmodel.h"
 #include "settings.h"
--- a/src/chatmodel.h
+++ b/src/chatmodel.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3

 #ifndef CHATMODEL_H
--- a/src/connection.cpp
+++ b/src/connection.cpp
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #include "connection.h"
 #include "mainwindow.h"
--- a/src/connection.h
+++ b/src/connection.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #ifndef CONNECTION_H
 #define CONNECTION_H
--- a/src/contactmodel.cpp
+++ b/src/contactmodel.cpp
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // GPLv3

 #include "contactmodel.h"
--- a/src/contactmodel.h
+++ b/src/contactmodel.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #ifndef CONTACTMODEL_H
 #define CONTACTMODEL_H
--- a/src/controller.cpp
+++ b/src/controller.cpp
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3

 #include "controller.h"
--- a/src/datamodel.cpp
+++ b/src/datamodel.cpp
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #include "datamodel.h"

--- a/src/datamodel.h
+++ b/src/datamodel.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #ifndef DATAMODEL_H
 #define DATAMODEL_H
--- a/src/fillediconlabel.h
+++ b/src/fillediconlabel.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #ifndef FILLEDICONLABEL_H
 #define FILLEDICONLABEL_H
--- a/src/firsttimewizard.cpp
+++ b/src/firsttimewizard.cpp
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #include "firsttimewizard.h"
 #include "ui_newseed.h"
--- a/src/firsttimewizard.h
+++ b/src/firsttimewizard.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #ifndef FIRSTTIMEWIZARD_H
 #define FIRSTTIMEWIZARD_H
--- a/src/liteinterface.cpp
+++ b/src/liteinterface.cpp
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #include "liteinterface.h"

--- a/src/liteinterface.h
+++ b/src/liteinterface.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #ifndef hushDRPC_H
 #define hushDRPC_H
--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #include "logger.h"

--- a/src/logger.h
+++ b/src/logger.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #ifndef LOGGER_H
 #define LOGGER_H
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #include <singleapplication.h>

--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #include "mainwindow.h"
 #include "addressbook.h"
@@ -931,7 +931,7 @@ void MainWindow::doImport(QList<QString>* keys) {
    keys->pop_front();
    //bool rescan = keys->isEmpty();

-    if (key.startsWith("SK") || key.startsWith("secret")) {
+    if (key.startsWith("secret")) {
        rpc->importZPrivKey(key, [=] (auto) { this->doImport(keys); });
    } else if (key.startsWith("U") || key.startsWith("5") || key.startsWith("L") || key.startsWith("K")) {
        // 5 = uncompressed, len=51
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
--- a/src/memoedit.cpp
+++ b/src/memoedit.cpp
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #include "memoedit.h"

--- a/src/memoedit.h
+++ b/src/memoedit.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #ifndef MEMOEDIT_H
 #define MEMOEDIT_H
--- a/src/precompiled.h
+++ b/src/precompiled.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #if defined __cplusplus
 /* Add C++ includes here */
--- a/src/qrcodelabel.cpp
+++ b/src/qrcodelabel.cpp
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #include "qrcodelabel.h"

--- a/src/qrcodelabel.h
+++ b/src/qrcodelabel.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #ifndef QRCODELABEL_H
 #define QRCODELABEL_H
--- a/src/recurring.cpp
+++ b/src/recurring.cpp
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #include "recurring.h"

--- a/src/recurring.h
+++ b/src/recurring.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #ifndef RECURRING_H
 #define RECURRING_H
--- a/src/requestdialog.cpp
+++ b/src/requestdialog.cpp
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #include "requestdialog.h"
 #include "ui_requestdialog.h"
--- a/src/requestdialog.h
+++ b/src/requestdialog.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #ifndef REQUESTDIALOG_H
 #define REQUESTDIALOG_H
--- a/src/sendtab.cpp
+++ b/src/sendtab.cpp
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #include "mainwindow.h"
 #include "settings.h"
--- a/src/settings.h
+++ b/src/settings.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #ifndef SETTINGS_H
 #define SETTINGS_H
--- a/src/txtablemodel.cpp
+++ b/src/txtablemodel.cpp
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #include "txtablemodel.h"
 #include "settings.h"
--- a/src/txtablemodel.h
+++ b/src/txtablemodel.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #ifndef STRINGSTABLEMODEL_H
 #define STRINGSTABLEMODEL_H
--- a/src/version.h
+++ b/src/version.h
@@ -1,3 +1,3 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
-#define APP_VERSION "1.5.4"
+#define APP_VERSION "2.0.0"
--- a/src/viewalladdresses.cpp
+++ b/src/viewalladdresses.cpp
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #include "viewalladdresses.h"
 #include "camount.h"
--- a/Show More
+++ b/Show More