Merge branch 'dev'

.travis.yml

@@ -25,7 +25,7 @@ before_install:
  - sudo add-apt-repository ppa:beineri/opt-qt-5.14.2-xenial -y
  - sudo apt-get update -qq
  - sudo apt-get install libsodium-dev pkg-config
- - sudo apt-get install qt514base qt514websockets libgl1-mesa-dev
+ - sudo apt-get install qt514base libgl1-mesa-dev
  - source /opt/qt514/bin/qt514-env.sh
  - chmod +x res/libsodium/buildlibsodium.sh
 

LICENSE

@@ -1,4 +1,4 @@
- Copyright 2019-2023 The Hush developers
+ Copyright 2019-2024 The Hush developers
  Copyright 2018 adityapk 
      
      

README.md

@@ -49,11 +49,20 @@ rustup -V
 
 **Nothing below will work without the Linux "build-essential" package. Check that your system has it installed. If not, and you're using a Ubuntu/Debian distro, then you can install with `apt install build-essential`.**
 
-Compiling can take some time, so be patient and wait for it to finish. It will take potentially a long time for slower systems. Be Patient and please report compiler problems!
+##### Ubuntu 22.04:
+
+```shell script
+sudo apt-get -y install build-essential qtbase5-dev qt5-qmake qtcreator qttools5-dev-tools
+```
 
 ##### Ubuntu 18.04 and 20.04:
 ```shell script
-sudo apt-get -y install build-essential qt5-default qt5-qmake libqt5websockets5-dev qtcreator qttools5-dev-tools
+sudo apt-get -y install build-essential qt5-default qt5-qmake qtcreator qttools5-dev-tools
+```
+
+Compiling can take some time, so be patient and wait for it to finish. It will take potentially a long time for slower systems. Be Patient and please report compiler problems!
+
+```shell script
 git clone https://git.hush.is/hush/SilentDragonLite
 cd SilentDragonLite
 ./build.sh linguist

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)

contrib/debian/README.md

@@ -0,0 +1,11 @@
+Install build tools:
+
+```
+sudo apt install dh-make
+```
+
+To build the package from source run the following:
+
+```
+dpkg-buildpackage -rfakeroot -b -uc -us
+```

contrib/debian/changelog

@@ -0,0 +1,5 @@
+silentdragonlite (1.5.4) stable; urgency=medium
+
+  * 1.5.4.1 release.
+
+ -- onryo <onryo@hush.land>  Sat, 06 Jan 2024 10:20:30 +0200

contrib/debian/compat

@@ -0,0 +1 @@
+9

contrib/debian/control

@@ -0,0 +1,13 @@
+Source: silentdragonlite
+Section: utils
+Priority: optional
+Maintainer: onryo <onryo@hush.land>
+Standards-Version: 4.6.0
+Homepage: https://hush.is
+Vcs-Browser: https://git.hush.is/hush/SilentDragonLite
+Vcs-Git: https://git.hush.is/hush/SilentDragonLite.git
+
+Package: silentdragonlite
+Architecture: amd64 arm64
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: SilentDragonLite is a lightwallet for HUSH which does not require you to download the full blockchain.

contrib/debian/copyright

@@ -0,0 +1,5 @@
+Files: *
+Copyright: 2019-2024, The Hush developers
+ 2018-2019, The Zcash developers
+License: GPLv3
+Comment: https://hush.is/developers

contrib/debian/rules

@@ -0,0 +1,20 @@
+#!/usr/bin/make -f
+# See debhelper(7) (uncomment to enable)
+# output every command that modifies files on the build system.
+#export DH_VERBOSE = 1
+
+# see FEATURE AREAS in dpkg-buildflags(1)
+#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+# see ENVIRONMENT in dpkg-buildflags(1)
+# package maintainers to append CFLAGS
+#export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
+# package maintainers to append LDFLAGS
+#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+
+%:
+	dh $@
+
+# dh_make generated override targets
+# This is example for Cmake (See https://bugs.debian.org/641051 )
+#override_dh_auto_configure:
+#	dh_auto_configure -- #	-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)

doc/developer.md

@@ -0,0 +1,62 @@
+# Developer Docs for SDL
+
+Random stuff that is useful for devs.
+
+# Checking return values from litelib
+
+There are 3 functions written in Rust that live in lib/src/lib.rs :
+
+  * `litelib_initialize_new`
+    * create a new client/connection and brand new wallet
+  * `litelib_initialize_new_from_phrase`
+    * create a new client/connection from a seedphrase (restoring from seedphrase)
+  * `litelib_initialize_existing`
+    * create a new client/connection with an already existing wallet
+
+The Rust code calls it a "LightClient" while the C++ of SDL calls it a "Connection".
+
+When `litelib_initialize_existing` or `litelib_initialize_new_from_phrase` return successfully, they return the string "OK" (which is not JSON).
+
+When `litelib_initialize_new` returns successfully it returns JSON that looks like :
+
+```
+{"seed":"seed","birthday":birthday}
+```
+
+where "seed" is a 24 word seed and birthday is an integer block height.
+
+So when calling these 3 functions, which looks almost the same in the calling code, the code which checks if they worked will be different, depending on what each returns on success.
+
+When checking the return value of `litelib_initialize_existing` or `litelib_initialize_new_from_phrase` it should look like :
+
+```
+QString reply = "";
+try {
+    char* resp = litelib_initialize_new_from_phrase(...);
+    reply = litelib_process_response(resp);
+} catch {
+    ...
+}
+if (reply.isEmpty())) {
+    // litelib_initialize_new_from_phrase failed
+    ...
+}
+```
+
+Yes, `isEmpty()` is not a very strict check, we could actually check for valid-looking JSON (starts with a { and ends with a }) as well as making sure the keys "seed" and "birthday" exist. Please implement this.
+
+When checking the return value of `litelib_initialize_new`  it should look like :
+
+```
+QString reply = "";
+try {
+    char* resp = litelib_initialize_new(...);
+    reply = litelib_process_response(resp);
+} catch {
+    ...
+}
+if (reply.toUpper().trimmed() != "OK") {
+    // litelib_initialize_new failed
+    ...
+}
+```

doc/release-process.md

@@ -55,4 +55,13 @@ To update the file run `cargo vendor` as was mentioned in https://git.hush.is/hu
 
 ## Release process
 
-...
+  * Write release notes
+  * Choose a release name
+  * Make Gitea release from master branch
+    * You can either manually make a git tag or let Gitea do it, which is easier
+  * Make binaries
+    * Windows exe 
+    * Windows msi
+    * Linux
+    * Mac
+    * Debian package

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.

doc/win/DEVELOPING-Ubuntu-18-04.md

@@ -56,7 +56,7 @@ mkdir ~/git && cd ~/git
 git clone https://github.com/mxe/mxe.git
 cd mxe
 
-make -j$(nproc) MXE_TARGETS=x86_64-w64-mingw32.static qtbase qtwebsockets
+make -j$(nproc) MXE_TARGETS=x86_64-w64-mingw32.static qtbase
 
 ```
 # Build SilentDragonLite .exe

lib/Cargo.lock

@@ -1849,7 +1849,7 @@ dependencies = [
 [[package]]
 name = "silentdragonlitelib"
 version = "0.1.0"
-source = "git+https://git.hush.is/hush/silentdragonlite-cli?rev=0181b16fd037f98c760e668bb6af8a41dd0d6267#0181b16fd037f98c760e668bb6af8a41dd0d6267"
+source = "git+https://git.hush.is/hush/silentdragonlite-cli?rev=4ec78a01b4f35b08eff42b10e3be85de87ba2b02#4ec78a01b4f35b08eff42b10e3be85de87ba2b02"
 dependencies = [
  "base58",
  "bellman",

lib/Cargo.toml

@@ -12,4 +12,4 @@ crate-type = ["staticlib"]
 libc = "0.2.58"
 lazy_static = "1.4.0"
 blake3 = "0.3.4"
-silentdragonlitelib = { git = "https://git.hush.is/hush/silentdragonlite-cli", rev = "0181b16fd037f98c760e668bb6af8a41dd0d6267" }
+silentdragonlitelib = { git = "https://git.hush.is/hush/silentdragonlite-cli", rev = "4ec78a01b4f35b08eff42b10e3be85de87ba2b02" }

lib/src/lib.rs

@@ -92,7 +92,15 @@ pub extern fn litelib_initialize_new(dangerous: bool,server: *const c_char) -> *
         }
     };
 
-    LIGHTCLIENT.lock().unwrap().replace(Some(Arc::new(lightclient)));
+    let lc = Arc::new(lightclient);
+    match LightClient::start_mempool_monitor(lc.clone()) {
+        Ok(_) => {println!("Starting Mempool")},
+        Err(e) => {
+            println!("Couldnt start mempool {}", e)
+        }
+    }
+    
+    LIGHTCLIENT.lock().unwrap().replace(Some(lc));
 
     // Return the wallet's seed
     let s_str = CString::new(seed).unwrap();
@@ -135,7 +143,15 @@ pub extern fn litelib_initialize_new_from_phrase(dangerous: bool,server: *const
     // Initialize logging
     let _ = lightclient.init_logging();
 
-    LIGHTCLIENT.lock().unwrap().replace(Some(Arc::new(lightclient)));
+    let lc = Arc::new(lightclient);
+    match LightClient::start_mempool_monitor(lc.clone()) {
+        Ok(_) => {println!("Starting Mempool")},
+        Err(e) => {
+            println!("Couldnt start mempool {}",e)
+        }
+    }
+
+    LIGHTCLIENT.lock().unwrap().replace(Some(lc));
  
     let c_str = CString::new("OK").unwrap();
     return c_str.into_raw();
@@ -169,8 +185,17 @@ pub extern fn litelib_initialize_existing(dangerous: bool, server: *const c_char
 
     // Initialize logging
     let _ = lightclient.init_logging();
+    
 
-    LIGHTCLIENT.lock().unwrap().replace(Some(Arc::new(lightclient)));
+    let lc = Arc::new(lightclient);
+    match LightClient::start_mempool_monitor(lc.clone()) {
+        Ok(_) => {println!("Starting Mempool")},
+        Err(e) => {
+            println!("Couldnt start mempool {}",e)
+        }
+    }
+
+    LIGHTCLIENT.lock().unwrap().replace(Some(lc));
 
     let c_str = CString::new("OK").unwrap();
     return c_str.into_raw();

res/css/Dark.css

@@ -25,7 +25,7 @@ QTabWidget QTabBar::tab:hover {
 background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 0.25, stop: 0 #747577, stop: 1 #3E4244);
 color:#fff;
 border: 1px ridge #fff;
-min-height: 20px
+min-height: 20px;
 }
 
 QHeaderView { /* Table Header */

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
 

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

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
@@ -13,7 +13,6 @@ CONFIG += precompile_header
 PRECOMPILED_HEADER = src/precompiled.h
 
 QT += widgets
-QT += websockets
 
 TARGET = SilentDragonLite
 TEMPLATE = app
@@ -59,8 +58,6 @@ SOURCES += \
     src/addressbook.cpp \
     src/logger.cpp \
     src/addresscombo.cpp \
-    src/websockets.cpp \
-    src/mobileappconnector.cpp \
     src/recurring.cpp \
     src/requestdialog.cpp \
     src/memoedit.cpp \
@@ -104,8 +101,6 @@ HEADERS += \
     src/addressbook.h \
     src/logger.h \
     src/addresscombo.h \
-    src/websockets.h \
-    src/mobileappconnector.h \
     src/recurring.h \
     src/requestdialog.h \
     src/memoedit.h \
@@ -143,7 +138,6 @@ FORMS += \
     src/connection.ui \
     src/addressbook.ui \
     src/memodialog.ui \
-    src/mobileappconnector.ui \
     src/createhushconfdialog.ui \
     src/recurringdialog.ui \
     src/requestContactDialog.ui \

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

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"

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

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

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"
 

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

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"
 

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

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"

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

src/DataStore/ContactDataStore.cpp

@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // GPLv3
 
 #include "ContactDataStore.h"

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

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

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"
 

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

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"
 

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

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"
 

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

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

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

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

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

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

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

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

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

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

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

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"
 

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

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

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

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"
 

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"

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

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"

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

src/Model/ContactRequest.cpp

@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // GPLv3
 
 #include "ContactRequest.h"

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

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"

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

src/about.ui

@@ -63,7 +63,7 @@
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
 </style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Copyright (c) 2019-2023 The Hush developers  GNU Public License V3</p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Copyright (c) 2019-2024 The Hush developers  GNU Public License V3</p>
 <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p>
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Copyright (c) 2018-2019 Aditya Kulkarni, Duke Leto, Jane Mercer </p>
 <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p>

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"

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

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"

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

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"

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

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"

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

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"

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

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"

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

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"

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

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"
@@ -9,6 +9,8 @@
 #include "controller.h"
 #include "../lib/silentdragonlitelib.h"
 #include "precompiled.h"
+#include <QThreadPool>
+#include "sdl.h"
 
 using json = nlohmann::json;
 
@@ -32,7 +34,7 @@ ConnectionLoader::ConnectionLoader(MainWindow* main, Controller* rpc)
     connD->setupUi(d);
 
     auto theme = Settings::getInstance()->get_theme_name();
-    qDebug() << theme << "theme " << theme << " has loaded";
+    DEBUG("theme " << theme << " has loaded");
     auto size  = QSize(512,512);
 
     if (theme == "Dark" || theme == "Midnight") {
@@ -55,6 +57,7 @@ ConnectionLoader::ConnectionLoader(MainWindow* main, Controller* rpc)
 
 ConnectionLoader::~ConnectionLoader()
 {
+    DEBUG("destroying ConnectionLoader");
     delete isSyncing;
     delete connD;
     delete d;
@@ -62,6 +65,7 @@ ConnectionLoader::~ConnectionLoader()
 
 void ConnectionLoader::loadConnection()
 {
+    DEBUG("calling doAutoConnect");
     QTimer::singleShot(1, [=]() { this->doAutoConnect(); });
     if (!Settings::getInstance()->isHeadless())
         d->exec();
@@ -69,7 +73,22 @@ void ConnectionLoader::loadConnection()
 
 void ConnectionLoader::loadProgress()
 {
-    QTimer::singleShot(1, [=]() { this->ShowProgress(); });
+    bool failed = false;
+    QTimer::singleShot(1, [=]() mutable {
+        DEBUG("failed=" << failed);
+        // continually retry ShowProgress() until it succeeds
+        // by running without an exception
+        do {
+            try {
+                this->ShowProgress();
+                failed = false;
+            } catch (const std::exception& e)  {
+                DEBUG("caught exception " << e.what() );
+                failed = true;
+            }
+        } while (failed);
+
+    });
     if (!Settings::getInstance()->isHeadless())
         d->exec();
 }
@@ -83,56 +102,62 @@ void ConnectionLoader::ShowProgress()
 
     auto connection = makeConnection(config);
     auto me   = this;
-    qDebug() << __func__ << ": server=" <<  config->server << " connection=" << connection << " me=" << me;
+    DEBUG("server=" <<  config->server << " connection=" << connection << " me=" << me);
 
     isSyncing = new QAtomicInteger<bool>();
     isSyncing->store(true);
-    main->logger->write("isSyncing");
+    DEBUG("isSyncing");
-    
+
     // Do a sync after import
     syncTimer = new QTimer(main);
-    main->logger->write("Beginning sync after import wif");
+    DEBUG("Beginning sync after import wif");
-    connection->doRPCWithDefaultErrorHandling("sync", "", [=](auto) {
+    connection->doRPC("sync", "", [=](auto) {
+        DEBUG("finished syncing");
         isSyncing->store(false);
         // Cancel the timer
         syncTimer->deleteLater();
         // When sync is done, set the connection
         this->doRPCSetConnectionShield(connection);
+    }, [=](auto) {
+        DEBUG("sync rpc error! server=" << config->server);
     });
-    
+
     // While it is syncing, we'll show the status updates while it is alive.
     QObject::connect(syncTimer, &QTimer::timeout, [=]() {
-        // Check the sync status
+        DEBUG("Check the sync status");
         if (isSyncing != nullptr && isSyncing->load()) {
-            // Get the sync status
+            DEBUG("Get the sync status");
-    
             try {
-            connection->doRPC("syncstatus", "", [=](json reply) {
+                connection->doRPC("syncstatus", "", [=](json reply) {
-                if (isSyncing != nullptr && reply.find("synced_blocks") != reply.end())
+                    if (isSyncing != nullptr && reply.find("synced_blocks") != reply.end()) {
-    
+                        qint64 synced = reply["synced_blocks"].get<json::number_unsigned_t>();
-                {
+                        qint64 total = reply["total_blocks"].get<json::number_unsigned_t>();
-                    qint64 synced = reply["synced_blocks"].get<json::number_unsigned_t>();
+                        me->showInformation(
-                    qint64 total = reply["total_blocks"].get<json::number_unsigned_t>();
+                            "Syncing... " + QString::number(synced) + " / " + QString::number(total)
-                    me->showInformation(
+                        );
-                        "Syncing... " + QString::number(synced) + " / " + QString::number(total)
+                    }
-                    );
+                }, [=](QString err) {
-                }
+                    DEBUG("Sync error " << err);
-            },
+                    // We may have gotten "Unexpected compression flag: 60"
-            [=](QString err) {
+                    // or some other error, so let's try another server
-                qDebug() << "Sync error" << err;
+                    config->server = Settings::getRandomServer();
-            });
+                    DEBUG("Changed server to " << config->server );
-        }catch (...)
+                });
-        {
+            } catch (const std::exception& e)  {
-            main->logger->write("catch sync progress reply");
+                DEBUG("syncstatus exception: " << e.what() );
-        }
+                main->logger->write("catch sync progress reply");
-    
-        }
-});
 
-syncTimer->setInterval(1* 1000);
+                // rethrow exception so loadProgress can catch
-syncTimer->start();
+                // it and retry the entire ShowProgress() function again
-main->logger->write("Start sync timer");
+                throw new std::runtime_error(std::string("syncstatus failed"));
+            }
+        }
+    });
 
+    int interval = 1*1000;
+    syncTimer->setInterval(interval);
+    syncTimer->start();
+    DEBUG("Start sync timer with interval=" << interval);
 }
 
 void ConnectionLoader::doAutoConnect()
@@ -140,43 +165,53 @@ void ConnectionLoader::doAutoConnect()
     auto config = std::shared_ptr<ConnectionConfig>(new ConnectionConfig());
     config->dangerous = false;
     config->server = Settings::getInstance()->getSettings().server;
-    qDebug() << __func__ << " server=" << config->server;
+    DEBUG(" server=" << config->server);
 
     // Initialize the library
-    main->logger->write(QObject::tr("Attempting to initialize library with ") + config->server);
+    DEBUG("Attempting to initialize library with "<< config->server);
 
     // Check to see if there's an existing wallet
     if (litelib_wallet_exists(Settings::getDefaultChainName().toStdString().c_str())) {
-        qDebug() << __func__ << ": using existing wallet";
+        DEBUG("using existing wallet");
         main->logger->write(QObject::tr("Using existing wallet."));
-        char* resp = litelib_initialize_existing(
-            config->dangerous,
-            config->server.toStdString().c_str()
-        );
-        QString response = litelib_process_response(resp);
 
-        if (response.toUpper().trimmed() != "OK") {
+        QString response = "";
-            config->server = Settings::getRandomServer();
+        try {
-
+            char* resp = litelib_initialize_existing(
-            resp = litelib_initialize_existing(
                 config->dangerous,
                 config->server.toStdString().c_str()
             );
             response = litelib_process_response(resp);
+        } catch (const std::exception& e)  {
+            DEBUG("caught an exception, ignoring: " << e.what());
+        }
+
+        if (response.toUpper().trimmed() != "OK") {
+            config->server = Settings::getRandomServer();
+
+            try {
+                char* resp = litelib_initialize_existing(
+                    config->dangerous,
+                    config->server.toStdString().c_str()
+                );
+                response = litelib_process_response(resp);
+            } catch (const std::exception& e)  {
+                DEBUG("caught an exception, ignoring: " << e.what());
+            }
 
             if (response.toUpper().trimmed() != "OK") {
                 QString resp = "Error when connecting to " + config->server + ": " + response;
                 showError(resp);
                 return;
             } else {
-                qDebug() << __func__ << ": Successfully connected to random server: " << config->server << " !!!";
+                DEBUG("Successfully connected to random server: " << config->server << " !!!");
             }
         } else {
-            qDebug() << __func__ << ": Successfully connected to " << config->server << " !!!";
+            DEBUG("Successfully connected to " << config->server << " !!!");
         }
 
     } else {
-        qDebug() << __func__ << ": no existing wallet";
+        DEBUG("no existing wallet");
         main->logger->write(QObject::tr("Create/restore wallet."));
         createOrRestore(config->dangerous, config->server);
         d->show();
@@ -187,61 +222,77 @@ void ConnectionLoader::doAutoConnect()
     qDebug() << __func__ << ": server=" <<  config->server
              << " connection=" << connection << " me=" << me << endl;
 
-
     // After the lib is initialized, try to do get info
     connection->doRPC("info", "", [=](auto reply) {
         // If success, set the connection
-        main->logger->write("Connection is online.");
+        DEBUG("Connection is online.");
         connection->setInfo(reply);
-        main->logger->write("getting Connection reply");
+        DEBUG("getting Connection reply");
         isSyncing = new QAtomicInteger<bool>();
         isSyncing->store(true);
-        main->logger->write("isSyncing");
+        DEBUG("isSyncing");
 
         // Do a sync at startup
         syncTimer = new QTimer(main);
-        main->logger->write("Beginning sync");
+        DEBUG("Beginning sync");
-        connection->doRPCWithDefaultErrorHandling("sync", "", [=](auto) {
+        connection->doRPC("sync", "", [=](auto) {
+            DEBUG("finished syncing");
             isSyncing->store(false);
             // Cancel the timer
             syncTimer->deleteLater();
             // When sync is done, set the connection
             this->doRPCSetConnection(connection);
+        }, [=](auto) mutable {
+            DEBUG("sync rpc error! server=" << config->server);
+            // continually retry sync RPC until it succeeds
+            // don't change server each time it fails
+            bool failed = true;
+            do {
+                // config->server = Settings::getRandomServer();
+                // auto connection = makeConnection(config);
+                // DEBUG("changed server to " << config->server);
+                connection->doRPC("sync", "", [=](auto) mutable {
+                    DEBUG("sync success with server=" << config->server);
+                    failed = false;
+                    isSyncing->store(false);
+                    // Cancel the timer
+                    syncTimer->deleteLater();
+                    // When sync is done, set the connection
+                    this->doRPCSetConnection(connection);
+                }, [=](auto) {
+                    DEBUG("sync failed with server=" << config->server << " . continuing sync loop" );
+                });
+            } while (failed);
         });
 
         // While it is syncing, we'll show the status updates while it is alive.
         QObject::connect(syncTimer, &QTimer::timeout, [=]() {
-            // Check the sync status
+            DEBUG("Check the sync status");
             if (isSyncing != nullptr && isSyncing->load()) {
-                // Get the sync status
+                DEBUG("Getting the sync status");
-
                 try {
                 connection->doRPC("syncstatus", "", [=](json reply) {
-                    if (isSyncing != nullptr && reply.find("synced_blocks") != reply.end())
+                    if (isSyncing != nullptr && reply.find("synced_blocks") != reply.end()) {
-
-                    {
                         qint64 synced = reply["synced_blocks"].get<json::number_unsigned_t>();
                         qint64 total = reply["total_blocks"].get<json::number_unsigned_t>();
                         me->showInformation(
                             "Syncing... " + QString::number(synced) + " / " + QString::number(total)
                         );
                     }
-                },
+                    },
-                [=](QString err) {
+                    [=](QString err) {
-                    qDebug() << "Sync error" << err;
+                        DEBUG("syncstatus error" << err);
-                });
+                    });
-            }catch (...)
+                } catch (const std::exception& e)  {
-            {
+                    DEBUG("caught exception from syncstatus: " << e.what());
-                main->logger->write("catch sync progress reply");
+                }
-
-            }
-
             }
         });
 
-        syncTimer->setInterval(1* 1000);
+        int interval = 1*1000;
+        syncTimer->setInterval(interval);
         syncTimer->start();
-        main->logger->write("Start sync timer");
+        DEBUG("Start sync timer with interval=" << interval);
 
     }, [=](QString err) {
         showError(err);
@@ -255,13 +306,13 @@ void ConnectionLoader::createOrRestore(bool dangerous, QString server)
     d->hide();
     // Create a wizard
     FirstTimeWizard wizard(dangerous,server);
-    main->logger->write("Start new Wallet with FirstimeWizard");
+    DEBUG("Start new Wallet with FirstimeWizard");
     wizard.exec();
 }
 
 void ConnectionLoader::doRPCSetConnection(Connection* conn)
 {
-    qDebug() << "Connectionloader finished, setting connection";
+    DEBUG("Connectionloader finished, setting connection");
     main->logger->write("Connectionloader finished, setting connection");
     rpc->setConnection(conn);
     d->accept();
@@ -272,17 +323,16 @@ void ConnectionLoader::doRPCSetConnection(Connection* conn)
         main->logger->write("Path to Wallet.dat : " );
         qDebug() << __func__ << ": wallet path =" << plaintextWallet;
         plaintextWallet.remove();
-    
+    } catch (const std::exception& e)  {
-    } catch (...) {
+        DEBUG("Caught exception" << e.what() );
-        qDebug() << "No plaintext wallet found! file=" << plaintextWallet;
+        DEBUG("No plaintext wallet found! file=" << plaintextWallet);
         main->logger->write("no Plaintext wallet.dat");
     }
-    
 }
 
 void ConnectionLoader::doRPCSetConnectionShield(Connection* conn)
 {
-    qDebug() << "Importing finished, setting connection";
+    DEBUG("Importing finished, setting connection");
     rpc->setConnection(conn);
     d->accept();
     main->getRPC()->shield([=] (auto) {});
@@ -293,9 +343,10 @@ void ConnectionLoader::doRPCSetConnectionShield(Connection* conn)
         main->logger->write("Path to Wallet.dat : " );
         qDebug() << __func__ << ": wallet path =" << plaintextWallet;
         plaintextWallet.remove();
-    } catch (...) {
+    } catch (const std::exception& e)  {
+        DEBUG("Caught exception" << e.what() );
         main->logger->write("no Plaintext wallet.dat");
-        qDebug() << "No plaintext wallet found! file=" << plaintextWallet;
+        DEBUG("No plaintext wallet found! file=" << plaintextWallet);
     }
 }
 
@@ -346,19 +397,50 @@ QString litelib_process_response(char* resp)
  ************************************************************************************/
 void Executor::run()
 {
-    char* resp = litelib_execute(this->cmd.toStdString().c_str(), this->args.toStdString().c_str());
+    auto config = std::shared_ptr<ConnectionConfig>(new ConnectionConfig());
-    QString reply = litelib_process_response(resp);
+    DEBUG("cmd=" << cmd << " args=" << args << " server=" << config->server);
-    auto parsed = json::parse(
+    QString response = "";
-        reply.toStdString().c_str(),
+    try {
-        nullptr,
+        char* resp = litelib_execute(this->cmd.toStdString().c_str(), this->args.toStdString().c_str());
-        false
+        response = litelib_process_response(resp);
-    );
+    } catch (const std::exception& e)  {
-    if (parsed.is_discarded() || parsed.is_null())
+        DEBUG("ignoring exception: " << e.what() );
-        emit handleError(reply);
+    }
 
-    else
+    //TODO: we can do stricter error checking
+    if (response.isEmpty()) {
+        config->server = Settings::getRandomServer();
+
+        try {
+            char* resp = litelib_initialize_existing(
+                config->dangerous,
+                config->server.toStdString().c_str()
+            );
+            response = litelib_process_response(resp);
+            resp = litelib_execute(this->cmd.toStdString().c_str(), this->args.toStdString().c_str());
+            response = litelib_process_response(resp);
+        } catch (const std::exception& e)  {
+            DEBUG("server= " << config->server << " gave exception: " << e.what() );
+            emit handleError(response);
+        }
+    }
+    try {
+        auto parsed = json::parse(
+            response.toStdString().c_str(),
+            nullptr,
+            false
+        );
+
+        if (parsed.is_discarded() || parsed.is_null()) {
+            emit handleError(response);
+        } else {
+            emit responseReady(parsed);
+        }
+    } catch (const std::exception& e)  {
+        DEBUG("exception when parsing json: " << e.what() );
+        emit handleError(response);
+    }
 
-    emit responseReady(parsed);
 }
 
 void Callback::processRPCCallback(json resp)
@@ -386,11 +468,12 @@ Connection::Connection(MainWindow* m, std::shared_ptr<ConnectionConfig> conf)
 
 void Connection::doRPC(const QString cmd, const QString args, const std::function<void(json)>& cb, const std::function<void(QString)>& errCb)
 {
-    if (shutdownInProgress)
+    if (shutdownInProgress) {
-        // Ignoring RPC because shutdown in progress
+        DEBUG("Ignoring RPC because shutdown in progress");
         return;
+    }
 
-    qDebug() << __func__ << ": " << cmd;
+    DEBUG("cmd=" << cmd << " args=" << args);
 
     // Create a runner.
     auto runner = new Executor(cmd, args);
@@ -405,7 +488,7 @@ void Connection::doRPC(const QString cmd, const QString args, const std::functio
 
 void Connection::doRPCWithDefaultErrorHandling(const QString cmd, const QString args, const std::function<void(json)>& cb)
 {
-    qDebug() << __func__ << ": " << cmd;
+    DEBUG("cmd=" << cmd << " args=" << args);
     doRPC(cmd, args, cb, [=] (QString err) {
         this->showTxError(err);
     });
@@ -413,7 +496,7 @@ void Connection::doRPCWithDefaultErrorHandling(const QString cmd, const QString
 
 void Connection::doRPCIgnoreError(const QString cmd, const QString args, const std::function<void(json)>& cb)
 {
-    qDebug() << __func__ << ": " << cmd;
+    DEBUG("cmd=" << cmd << " args=" << args);
     doRPC(cmd, args, cb, [=] (auto) {
         // Ignored error handling
     });
@@ -445,5 +528,6 @@ void Connection::showTxError(const QString& error)
  */
 void Connection::shutdown()
 {
+    DEBUG("shutting down");
     shutdownInProgress = true;
 }

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
@@ -6,6 +6,7 @@
 #include "mainwindow.h"
 #include "ui_connection.h"
 #include "precompiled.h"
+#include <QRunnable>
 
 using json = nlohmann::json;
 

src/contactmodel.cpp

@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // GPLv3
 
 #include "contactmodel.h"

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

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"
@@ -7,7 +7,6 @@
 #include "settings.h"
 #include "version.h"
 #include "camount.h"
-#include "websockets.h"
 #include "Model/ChatItem.h"
 #include "DataStore/DataStore.h"
 
@@ -262,10 +261,12 @@ void Controller::noConnection()
 
     // Clear balances
     ui->balSheilded->setText("");
+    ui->balUnconfirmed->setText("");
     ui->balTransparent->setText("");
     ui->balTotal->setText("");
 
     ui->balSheilded->setToolTip("");
+    ui->balUnconfirmed->setToolTip("");
     ui->balTransparent->setToolTip("");
     ui->balTotal->setToolTip("");
 }
@@ -298,12 +299,19 @@ void Controller::processInfo(const json& info)
         main->disableRecurring();
 }
 
-void Controller::getInfoThenRefresh(bool force) 
+void Controller::getInfoThenRefresh(bool force)
 {
     qDebug()<< __func__;
-    if (!zrpc->haveConnection()) 
+    if (!zrpc->haveConnection())
         return noConnection();
 
+    // Update current server in Info Tab
+    auto current_server = Settings::getInstance()->getSettings().server;
+    ui->current_server->setText(current_server);
+
+    // no need to update sticky server because currently there is no
+    // way to change that at run-time via GUI
+
     static bool prevCallSucceeded = false;
 
     zrpc->fetchInfo([=] (const json& reply) {
@@ -732,6 +740,7 @@ void Controller::updateUIBalances()
 {
     CAmount balT         = getModel()->getBalT();
     CAmount balZ         = getModel()->getBalZ();
+    CAmount balU         = getModel()->getBalU();
     CAmount balVerified  = getModel()->getBalVerified();
     CAmount balSpendable = getModel()->getBalSpendable();
 
@@ -749,6 +758,7 @@ void Controller::updateUIBalances()
     // Balances table
     ui->balSheilded->setText(balZ.toDecimalhushString());
     ui->balVerified->setText(balVerified.toDecimalhushString());
+    ui->balUnconfirmed->setText(balU.toDecimalhushString());
     ui->balTransparent->setText(balT.toDecimalhushString());
     ui->balSpendable->setText(balSpendable.toDecimalhushString());
     ui->balTotal->setText(balTotal.toDecimalhushString());
@@ -888,17 +898,16 @@ void Controller::refreshBalances()
     zrpc->fetchBalance([=] (json reply) {    
         CAmount balT        = CAmount::fromqint64(reply["tbalance"].get<json::number_unsigned_t>());
         CAmount balZ        = CAmount::fromqint64(reply["zbalance"].get<json::number_unsigned_t>());
+        CAmount balU        = CAmount::fromqint64(reply["unconfirmed"].get<json::number_unsigned_t>());
         CAmount balVerified = CAmount::fromqint64(reply["verified_zbalance"].get<json::number_unsigned_t>());
         CAmount balSpendable = CAmount::fromqint64(reply["spendable_zbalance"].get<json::number_unsigned_t>());
         
         model->setBalT(balT);
         model->setBalZ(balZ);
+        model->setBalU(balU);
         model->setBalVerified(balVerified);
         model->setBalSpendable(balSpendable);
 
-        // This is for the websockets
-        AppDataModel::getInstance()->setBalances(balT, balZ);
-        
         // This is for the datamodel
         CAmount balAvailable = balT + balVerified;
         model->setAvailableBalance(balAvailable);
@@ -933,6 +942,26 @@ void Controller::refreshBalances()
     });
 }
 
+void printJsonValue(QTextStream& out, const nlohmann::json& j, int depth = 0) {
+    if (j.is_array()) {
+        for (auto& elem : j) {
+            printJsonValue(out, elem, depth + 1);
+        }
+    } else if (j.is_object()) {
+        for (auto it = j.begin(); it != j.end(); ++it) {
+            std::string key = it.key();
+            const nlohmann::json& value = it.value();
+            out << QString::fromStdString(std::string(depth * 4, ' '))
+                << QString::fromStdString(key) << ": ";
+            printJsonValue(out, value, depth + 1);
+        }
+    } else {
+        out << QString::fromStdString(j.dump(4)) << "\n";
+    }
+}
+
+
+
 void Controller::refreshTransactions() {
     qDebug()<< __func__;
     if (!zrpc->haveConnection()) 
@@ -1044,7 +1073,6 @@ void Controller::refreshTransactions() {
          
                             #define MESSAGEAS1 ((const unsigned char *) hashEncryptionKeyraw) ///////////
                             #define MESSAGEAS1_LEN length
-
                             unsigned char sk[crypto_kx_SECRETKEYBYTES];
                             unsigned char pk[crypto_kx_PUBLICKEYBYTES];
       
@@ -1058,9 +1086,7 @@ void Controller::refreshTransactions() {
                             unsigned char server_rx[crypto_kx_SESSIONKEYBYTES], server_tx[crypto_kx_SESSIONKEYBYTES];
       
                             ////////////////Get the pubkey from Bob, so we can create the share key
-
                             /////Create the shared key for sending the message
-
                             if (crypto_kx_server_session_keys(server_rx, server_tx, pk, sk, pubkeyBob) != 0)
                             {
                                  main->logger->write("Suspicious client public outgoing key, bail out ");
@@ -1082,15 +1108,11 @@ void Controller::refreshTransactions() {
                             {
                                 //////unsigned char* as message from QString
                                 #define MESSAGE2 (const unsigned char *) encryptedMemo
-
                                 ///////// length of the encrypted message
                                 #define CIPHERTEXT1_LEN  encryptedMemoSize1
-
                                 ///////Message length is smaller then the encrypted message
                                 #define MESSAGE1_LEN encryptedMemoSize1 - crypto_secretstream_xchacha20poly1305_ABYTES
-
                                 //////Set the length of the decrypted message
-
                                 unsigned char decrypted[MESSAGE1_LEN];
                                 unsigned char tag[crypto_secretstream_xchacha20poly1305_TAG_FINAL];
                                 crypto_secretstream_xchacha20poly1305_state state;
@@ -1118,7 +1140,6 @@ void Controller::refreshTransactions() {
 
                             /////Now we can convert it to QString
                             //////////////Give us the output of the decrypted message as debug to see if it was successfully
-
                             ChatItem item = ChatItem(
                                 datetime,
                                 address,
@@ -1161,13 +1182,13 @@ void Controller::refreshTransactions() {
             } else {
                
                { // Incoming Transaction
-                address = (it["address"].is_null() ? "" : QString::fromStdString(it["address"]));
+               QString memo;
-                model->markAddressUsed(address);
+               address =  (it["address"].is_null() ? "" : QString::fromStdString(it["address"]));
 
-                QString memo;
                 if (!it["memo"].is_null()) {
                     memo = QString::fromStdString(it["memo"]);
                 }
+               
                 items.push_back(TransactionItemDetail{ address,
                     CAmount::fromqint64(it["amount"].get<json::number_integer_t>()),
                     memo
@@ -1187,7 +1208,7 @@ void Controller::refreshTransactions() {
                 QString contactname = "";
                 bool isContact = false;
 
-                if (!it["memo"].is_null()) {
+                if (!memo.isNull()) {
 
                 if (memo.startsWith("{")) {
                  try {
@@ -1257,7 +1278,8 @@ void Controller::refreshTransactions() {
                             if (position == 1)
                             {
                                 chatModel->addMemo(txid, headerbytes);
-                            } else {
+                            }
+                            else {
                                 //
                             }
 
@@ -1273,7 +1295,6 @@ void Controller::refreshTransactions() {
 
                             #define MESSAGEAS1 ((const unsigned char *) hashEncryptionKeyraw)///////////
                             #define MESSAGEAS1_LEN length
-
                             unsigned char sk[crypto_kx_SECRETKEYBYTES];
                             unsigned char pk[crypto_kx_PUBLICKEYBYTES];
 
@@ -1287,7 +1308,6 @@ void Controller::refreshTransactions() {
                             unsigned char client_rx[crypto_kx_SESSIONKEYBYTES], client_tx[crypto_kx_SESSIONKEYBYTES];
 
                             ////////////////Get the pubkey from Bob, so we can create the share key
-
                             /////Create the shared key for sending the message
                             if (crypto_kx_client_session_keys(client_rx, client_tx, pk, sk, pubkeyBob) != 0)
                             {
@@ -1304,18 +1324,13 @@ void Controller::refreshTransactions() {
 
                             int encryptedMemoSize1 = ba.length();
                             //int headersize = ba1.length();
-
                             //////unsigned char* as message from QString
                             #define MESSAGE2 (const unsigned char *) encryptedMemo
-
                             ///////// length of the encrypted message
                             #define CIPHERTEXT1_LEN  encryptedMemoSize1
-
                             ///////Message length is smaller then the encrypted message
                             #define MESSAGE1_LEN encryptedMemoSize1 - crypto_secretstream_xchacha20poly1305_ABYTES
-
                             //////Set the length of the decrypted message
-
                             unsigned char decrypted[MESSAGE1_LEN+1];
                             unsigned char tag[crypto_secretstream_xchacha20poly1305_TAG_FINAL];
                             crypto_secretstream_xchacha20poly1305_state state;
@@ -1343,7 +1358,6 @@ void Controller::refreshTransactions() {
                             memodecrypt = QString::fromUtf8( decryptedMemo.data(), decryptedMemo.size());
 
                             ////Give us the output of the decrypted message as debug to see if it was successfully
-
                             ChatItem item = ChatItem(
                                 datetime,
                                 address,
@@ -1367,8 +1381,6 @@ void Controller::refreshTransactions() {
                             qDebug() << __func__ << ": ignoring txid="<< txid;
                         }
 
-                    //} else if (memo.startsWith("{")) {
-                    //qDebug() << __func__ << ": ignoring a header memo";
                     } else {
                         // Add a chatitem for the initial CR
                         ChatItem item = ChatItem(

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"
 

src/datamodel.h

@@ -1,11 +1,11 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #ifndef DATAMODEL_H
 #define DATAMODEL_H
 
 #include "camount.h"
 #include "precompiled.h"
-
+#include <QReadLocker>
 
 struct UnspentOutput {
     QString address;
@@ -48,6 +48,9 @@ public:
     CAmount                    getBalZ()          { QReadLocker locker(lock); return balZ; }
     void                       setBalZ(CAmount a) { QReadLocker locker(lock); this->balZ = a; }
 
+    CAmount                    getBalU()          { QReadLocker locker(lock); return balU; }
+    void                       setBalU(CAmount a) { QReadLocker locker(lock); this->balU = a; }
+
     CAmount                    getBalVerified()          { QReadLocker locker(lock); return balVerified; }
     void                       setBalVerified(CAmount a) { QReadLocker locker(lock); this->balVerified = a; }
 
@@ -76,6 +79,7 @@ private:
 
     CAmount                 balT;
     CAmount                 balZ;
+    CAmount                 balU;
     CAmount                 balVerified;
     CAmount                 balSpendable;
 

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

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"
@@ -293,10 +293,28 @@ void NewSeedPage::initializePage() {
     // Call the library to create a new wallet.
     qDebug() << __func__;
 
-    char* resp = litelib_initialize_new(parent->dangerous,parent->server.toStdString().c_str());
+    QString reply = "";
-    QString reply = litelib_process_response(resp);
+    try {
+        char* resp = litelib_initialize_new(parent->dangerous,parent->server.toStdString().c_str());
+        reply = litelib_process_response(resp);
+    } catch (const std::exception& e)  {
+        qDebug() << __func__ << ": caught an exception, ignoring: " << e.what();
+    }
+
     qDebug() << __func__ << ": reply=" << reply;
 
+    if (reply.isEmpty()) {
+            qDebug() << "Lite server " << parent->server << " is down, getting a random one";
+            parent->server = Settings::getRandomServer();
+            qDebug() << __func__ << ": new server is " << parent->server;
+
+            // retry with the new server
+            // we use litelib_initialize_existing because the call to litelib_initialize_new above
+            // has already created a wallet on disk
+            char* resp = litelib_initialize_existing(parent->dangerous,parent->server.toStdString().c_str());
+            reply = litelib_process_response(resp);
+    }
+
     auto parsed = json::parse(reply.toStdString().c_str(), nullptr, false);
     if (parsed.is_discarded() || parsed.is_null() || parsed.find("seed") == parsed.end()) {
         form.txtSeed->setPlainText(tr("Error creating a wallet") + "\n" + reply);
@@ -607,21 +625,49 @@ bool NewSeedPage::validatePage() {
 
     dialog.exec();
 
-    if ((verifyseed.verify->toPlainText() == seed) && (verifyseed.verifyBirthday->toPlainText() == birthday))
+    QString reply = "";
-    {
+    if ((verifyseed.verify->toPlainText() == seed) && (verifyseed.verifyBirthday->toPlainText() == birthday)) {
-    char* resp = litelib_execute("save", "");
+        try {
-    QString reply = litelib_process_response(resp);
+            char* resp = litelib_execute("save", "");
+            reply = litelib_process_response(resp);
+        } catch (const std::exception& e)  {
+            qDebug() << __func__ << ": caught an exception, ignoring: " << e.what();
+        }
 
-    auto parsed = json::parse(reply.toStdString().c_str(), nullptr, false);
+        qDebug() << __func__ << ": reply=" << reply;
-    if (parsed.is_discarded() || parsed.is_null() || parsed.find("result") == parsed.end()) {
 
-        QMessageBox::warning(this, tr("Failed to save wallet"), 
+        // TODO: this is duplicated code that should be refactored
-            tr("Couldn't save the wallet") + "\n" + reply,
+        // into a dedicated function
-            QMessageBox::Ok);
+        if (reply.isEmpty()) {
-        return false;
+                qDebug() << "Lite server " << parent->server << " is down, getting a random one";
-    } else {
+                parent->server = Settings::getRandomServer();
-        return true;
+                qDebug() << __func__ << ": new server is " << parent->server;
-    }
+
+                // make a new connection to the new server
+                char* resp = litelib_initialize_new(parent->dangerous,parent->server.toStdString().c_str());
+                reply = litelib_process_response(resp);
+
+                // retry with the new server
+                try {
+                    resp = litelib_execute("save", "");
+                    reply = litelib_process_response(resp);
+                } catch (const std::exception& e)  {
+                    qDebug() << __func__ << ": caught an exception with new server, something is fucky: " << e.what();
+                }
+        }
+
+        qDebug() << __func__ << ": reply=" << reply;
+
+        auto parsed = json::parse(reply.toStdString().c_str(), nullptr, false);
+        if (parsed.is_discarded() || parsed.is_null() || parsed.find("result") == parsed.end()) {
+
+            QMessageBox::warning(this, tr("Failed to save wallet"),
+                tr("Couldn't save the wallet") + "\n" + "server=" + parent->server + "\n" + reply,
+                QMessageBox::Ok);
+            return false;
+        } else {
+            return true;
+        }
     }else{
         qDebug()<<"Wrong Seed";
         QFile file(dirwalletencfirst);
@@ -629,9 +675,7 @@ bool NewSeedPage::validatePage() {
 
         file.remove();
         file1.remove();
-        QMessageBox::warning(this, tr("Wrong Seed"), 
+        QMessageBox::warning(this, tr("Wrong Seed"), tr("Please try again") + "\n" , QMessageBox::Ok);
-            tr("Please try again") + "\n" ,
-            QMessageBox::Ok);
         form.birthday->setVisible(true);
         form.txtSeed->setVisible(true);
         return false;
@@ -686,32 +730,79 @@ bool RestoreSeedPage::validatePage() {
     qint64 number      = number_str.toUInt();
     // 3. Attempt to restore wallet with the seed phrase
     {
-        char* resp = litelib_initialize_new_from_phrase(parent->dangerous, parent->server.toStdString().c_str(),
+        QString reply = "";
-                seed.toStdString().c_str(), birthday, number);
+        try {
-        QString reply = litelib_process_response(resp);
+            char* resp = litelib_initialize_new_from_phrase(parent->dangerous, parent->server.toStdString().c_str(),
+                    seed.toStdString().c_str(), birthday, number);
+            reply = litelib_process_response(resp);
+        } catch (const std::exception& e)  {
+            qDebug() << __func__ << ": caught an exception, ignoring: " << e.what();
+        }
+
+        qDebug() << __func__ << ": reply=" << reply;
 
         if (reply.toUpper().trimmed() != "OK") {
-            QMessageBox::warning(this, tr("Failed to restore wallet"), 
+                qDebug() << "Lite server " << parent->server << " is down, getting a random one";
-                tr("Couldn't restore the wallet") + "\n" + reply,
+                parent->server = Settings::getRandomServer();
+                qDebug() << __func__ << ": new server is " << parent->server;
+
+                // retry with the new server
+                char* resp = litelib_initialize_new_from_phrase(parent->dangerous, parent->server.toStdString().c_str(),
+                    seed.toStdString().c_str(), birthday, number);
+                reply = litelib_process_response(resp);
+        }
+
+
+        if (reply.toUpper().trimmed() != "OK") {
+            QMessageBox::warning(this, tr("Failed to restore wallet"),
+                tr("Couldn't restore the wallet") + "\n" + "server=" + parent->server + "\n" + reply,
                 QMessageBox::Ok);
             return false;
-        } 
+        }
     }
 
     // 4. Finally attempt to save the wallet
     {
-        char* resp = litelib_execute("save", "");
+        QString reply = "";
-        QString reply = litelib_process_response(resp);
+        try {
+            char* resp = litelib_execute("save", "");
+            reply = litelib_process_response(resp);
+        } catch (const std::exception& e)  {
+            qDebug() << __func__ << ": caught an exception, ignoring: " << e.what();
+        }
+
+        // TODO: this is duplicated code that should be refactored
+        // into a dedicated function
+        if (reply.isEmpty()) {
+                qDebug() << "Lite server " << parent->server << " is down, getting a random one";
+                parent->server = Settings::getRandomServer();
+                qDebug() << __func__ << ": new server is " << parent->server;
+
+                // make a new connection to the new server
+                char* resp = litelib_initialize_new_from_phrase(parent->dangerous, parent->server.toStdString().c_str(),
+                    seed.toStdString().c_str(), birthday, number);
+                reply = litelib_process_response(resp);
+
+                // retry with the new server
+                try {
+                    resp = litelib_execute("save", "");
+                    reply = litelib_process_response(resp);
+                } catch (const std::exception& e)  {
+                    qDebug() << __func__ << ": caught an exception with new server, something is fucky: " << e.what();
+                }
+        }
+
+        qDebug() << __func__ << ": reply=" << reply;
 
         auto parsed = json::parse(reply.toStdString().c_str(), nullptr, false);
         if (parsed.is_discarded() || parsed.is_null() || parsed.find("result") == parsed.end()) {
             qDebug() << __func__ << ": Failed to save wallet, reply=" << reply;
-            QMessageBox::warning(this, tr("Failed to save wallet"), 
+            QMessageBox::warning(this, tr("Failed to save wallet"),
-                tr("Couldn't save the wallet") + "\n" + reply,
+                tr("Couldn't save the wallet") + "\n" + "server=" + parent->server + "\n" + reply,
                 QMessageBox::Ok);
             return false;
         } else {
             return true;
-        }         
+        }
     }
 }

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

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"
 

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

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"
 

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

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>
 
@@ -6,6 +6,7 @@
 #include "mainwindow.h"
 #include "controller.h"
 #include "settings.h"
+#include <QCommandLineParser>
 
 #include "version.h"
 

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"
@@ -25,7 +25,6 @@
 #include "ui_startupencryption.h" 
 #include "ui_removeencryption.h"
 #include "ui_seedrestore.h"
-#include "websockets.h"
 #include "sodium.h"
 #include "sodium/crypto_generichash_blake2b.h"
 #include <QRegularExpression>
@@ -38,6 +37,7 @@
 #include <QCoreApplication>
 #include <QGuiApplication>
 #include <QKeyEvent>
+#include "sdl.h"
 
 using json = nlohmann::json;
 
@@ -159,11 +159,11 @@ MainWindow::MainWindow(QWidget *parent) :
 
     // Rescan
     QObject::connect(ui->actionRescan, &QAction::triggered, [=]() {
-
+        DEBUG("rescan action triggered");
-    Ui_Restore restoreSeed;
+        Ui_Restore restoreSeed;
-    QDialog dialog(this);
+        QDialog dialog(this);
-    restoreSeed.setupUi(&dialog);
+        restoreSeed.setupUi(&dialog);
-    Settings::saveRestore(&dialog);
+        Settings::saveRestore(&dialog);
 
     rpc->fetchSeed([=](json reply) {
         if (isJsonError(reply)) {
@@ -209,35 +209,74 @@ MainWindow::MainWindow(QWidget *parent) :
     config->server = Settings::getInstance()->getSettings().server;
     // 3. Attempt to restore wallet with the seed phrase
     {
-        char* resp = litelib_initialize_new_from_phrase(config->dangerous, config->server.toStdString().c_str(),
+        QString reply = "";
-                seed.toStdString().c_str(), birthday, number);
+        try {
-        QString reply = litelib_process_response(resp);
+            char* resp = litelib_initialize_new_from_phrase(config->dangerous, config->server.toStdString().c_str(),
+                    seed.toStdString().c_str(), birthday, number);
+            reply = litelib_process_response(resp);
+        } catch (const std::exception& e)  {
+            qDebug() << __func__ << ": caught an exception, ignoring: " << e.what();
+        }
 
         if (reply.toUpper().trimmed() != "OK") {
-            QMessageBox::warning(this, tr("Failed to restore wallet"), 
+                qDebug() << "Lite server " << config->server << " is down, getting a random one";
-                tr("Couldn't restore the wallet") + "\n" + reply,
+                config->server = Settings::getRandomServer();
+                qDebug() << __func__ << ": new server is " << config->server;
+                // retry with the new server
+                char* resp = litelib_initialize_new_from_phrase(config->dangerous,config->server.toStdString().c_str(),
+                    seed.toStdString().c_str(), birthday, number);
+                reply = litelib_process_response(resp);
+        }
+
+        if (reply.toUpper().trimmed() != "OK") {
+            QMessageBox::warning(this, tr("Failed to restore wallet"),
+                tr("Couldn't restore the wallet") + "\n" + "server=" + config->server + "\n" + reply,
                 QMessageBox::Ok);
-           
+            return false;
-        } 
+        }
     }
 
     // 4. Finally attempt to save the wallet
     {
-        char* resp = litelib_execute("save", "");
+        QString reply = "";
-        QString reply = litelib_process_response(resp);
+        try {
+            char* resp = litelib_execute("save", "");
+            QString reply = litelib_process_response(resp);
+        } catch (const std::exception& e)  {
+            qDebug() << __func__ << ": caught an exception, ignoring: " << e.what();
+        }
+
+        if (reply.isEmpty()) {
+                qDebug() << "Lite server " << config->server << " is down, getting a random one";
+                config->server = Settings::getRandomServer();
+                qDebug() << __func__ << ": new server is " << config->server;
+                // make a new connection to the new server
+                char* resp = litelib_initialize_new_from_phrase(config->dangerous,config->server.toStdString().c_str(),
+                    seed.toStdString().c_str(), birthday, number);
+                reply = litelib_process_response(resp);
+
+                // retry with the new server
+                try {
+                    resp = litelib_execute("save", "");
+                    reply = litelib_process_response(resp);
+                } catch (const std::exception& e)  {
+                    qDebug() << __func__ << ": caught an exception with new server, something is fucky: " << e.what();
+                }
+        }
+
 
         QByteArray ba_reply = reply.toUtf8();
         QJsonDocument jd_reply = QJsonDocument::fromJson(ba_reply);
         QJsonObject parsed = jd_reply.object();
 
         if (parsed.isEmpty() || parsed["result"].isNull()) {
-            QMessageBox::warning(this, tr("Failed to save wallet"), 
+            QMessageBox::warning(this, tr("Failed to save wallet"),
-                tr("Couldn't save the wallet") + "\n" + reply,
+                tr("Couldn't save the wallet") + "\n" + "server=" + config->server + "\n" + reply,
                 QMessageBox::Ok);
 
         } else {
             qDebug() << __func__ << ": saved wallet correctly";
-        }  
+        }
 
         dialog.close();
         // To rescan, we clear the wallet state, and then reload the connection
@@ -250,15 +289,14 @@ MainWindow::MainWindow(QWidget *parent) :
                 // Then reload the connection. The ConnectionLoader deletes itself.
                auto cl = new ConnectionLoader(this, rpc);
                cl->loadConnection();
-            });       
+            });
         });
-    
+
       }
 
      });
-             
      dialog.exec();
-});
+    }); // actionReason
 
     // Import Privkey
     QObject::connect(ui->actionImport_Privatkey, &QAction::triggered, this, &MainWindow::importPrivKey);
@@ -294,16 +332,6 @@ MainWindow::MainWindow(QWidget *parent) :
 
     restoreSavedStates();
 
-    if (AppDataServer::getInstance()->isAppConnected()) {
-        qDebug() << __func__ << ": app is connected to wormhole";
-        auto ads = AppDataServer::getInstance();
-
-        QString wormholecode = "";
-        if (ads->getAllowInternetConnection())
-            wormholecode = ads->getWormholeCode(ads->getSecretHex());
-
-        createWebsocket(wormholecode);
-    }
 }
 
 bool MainWindow::fileExists(QString path) 
@@ -312,36 +340,6 @@ bool MainWindow::fileExists(QString path)
     return (check_file.exists() && check_file.isFile());
 }
  
-void MainWindow::createWebsocket(QString wormholecode) {
-    qDebug() << "Listening for app connections on port 8777";
-    // Create the websocket server, for listening to direct connections
-    wsserver = new WSServer(8777, false, this);
-
-    if (!wormholecode.isEmpty()) {
-        // Connect to the wormhole service
-        wormhole = new WormholeClient(this, wormholecode);
-    }
-}
-
-void MainWindow::stopWebsocket() {
-    delete wsserver;
-    wsserver = nullptr;
-
-    delete wormhole;
-    wormhole = nullptr;
-
-    qDebug() << "Websockets for app connections shut down";
-}
-
-bool MainWindow::isWebsocketListening() {
-    return wsserver != nullptr;
-}
-
-void MainWindow::replaceWormholeClient(WormholeClient* newClient) {
-    delete wormhole;
-    wormhole = newClient;
-}
-
 void MainWindow::restoreSavedStates() {
     QSettings s;
     restoreGeometry(s.value("geometry").toByteArray());
@@ -933,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
@@ -1097,10 +1095,10 @@ void MainWindow::payhushURI(QString uri, QString myAddr) {
             // Save the wallet
             this->getRPC()->saveWallet([=] (auto) {
                 // Then reload the connection. The ConnectionLoader deletes itself.
-               auto cl = new ConnectionLoader(this, rpc);
+                auto cl = new ConnectionLoader(this, rpc);
                 cl->loadProgress();
-                         });       
+            });
-                     });    
+          });
 
     }else if ((pui.rescan->isChecked() == true) && (pui.privKeyTxt->toPlainText().startsWith("secret"))){
 
@@ -2724,8 +2722,6 @@ MainWindow::~MainWindow()
     delete loadingMovie;
     delete logger;
 
-    delete wsserver;
-    delete wormhole;
 }
 void MainWindow::on_givemeZaddr_clicked()
 {

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
@@ -14,8 +14,6 @@ using json = nlohmann::json;
 // Forward declare to break circular dependency.
 class Controller;
 class Settings;
-class WSServer;
-class WormholeClient;
 class ChatModel;
 
 
@@ -70,10 +68,6 @@ public:
     
     
 
-    void replaceWormholeClient(WormholeClient* newClient);
-    bool isWebsocketListening();
-    void createWebsocket(QString wormholecode);
-    void stopWebsocket();
     void saveContact();
     void saveandsendContact();
     void showRequesthush();
@@ -200,10 +194,6 @@ private:
     bool            uiPaymentsReady    = false;
     QString         pendingURIPayment;
 
-    WSServer*       wsserver = nullptr;
-    WormholeClient* wormhole = nullptr;
-
-
     Controller*         rpc             = nullptr;
     
     QCompleter*         labelCompleter  = nullptr;

src/mainwindow.ui

@@ -641,6 +641,33 @@
               <layout class="QHBoxLayout" name="horizontalLayout_2">
                <item>
                 <widget class="QLabel" name="label_2">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                 <property name="text">
+                  <string>Unconfirmed</string>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QLabel" name="balUnconfirmed">
+                 <property name="text">
+                  <string/>
+                 </property>
+                 <property name="alignment">
+                  <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                 </property>
+                </widget>
+               </item>
+              </layout>
+             </item>
+             <item row="3" column="0">
+              <layout class="QHBoxLayout" name="horizontalLayout_2_1">
+               <item>
+                <widget class="QLabel" name="label_2_1">
                  <property name="sizePolicy">
                   <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
                    <horstretch>0</horstretch>
@@ -664,7 +691,7 @@
                </item>
               </layout>
              </item>
-             <item row="3" column="0">
+             <item row="4" column="0">
               <layout class="QHBoxLayout" name="horizontalLayout_20">
                <item>
                 <widget class="QLabel" name="label_40">
@@ -691,14 +718,14 @@
                </item>
               </layout>
              </item>
-             <item row="4" column="0">
+             <item row="5" column="0">
               <widget class="Line" name="line">
                <property name="orientation">
                 <enum>Qt::Horizontal</enum>
                </property>
               </widget>
              </item>
-             <item row="5" column="0">
+             <item row="6" column="0">
               <layout class="QHBoxLayout" name="horizontalLayout_3">
                <item>
                 <widget class="QLabel" name="label_3">
@@ -735,7 +762,7 @@
                </item>
               </layout>
              </item>
-             <item row="6" column="0">
+             <item row="7" column="0">
               <widget class="QLabel" name="lblSyncWarning">
                <property name="styleSheet">
                 <string notr="true">color:red;</string>
@@ -748,7 +775,7 @@
                </property>
               </widget>
              </item>
-             <item row="7" column="0">
+             <item row="8" column="0">
               <widget class="QLabel" name="unconfirmedWarning">
                <property name="sizePolicy">
                 <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
@@ -767,14 +794,14 @@
                </property>
               </widget>
              </item>
-             <item row="8" column="0">
+             <item row="9" column="0">
               <widget class="QPushButton" name="depositHushButton">
                <property name="text">
                 <string>Deposit Hush</string>
                </property>
               </widget>
              </item>
-             <item row="9" column="0">
+             <item row="10" column="0">
               <spacer name="verticalSpacer">
                <property name="orientation">
                 <enum>Qt::Vertical</enum>

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"
 

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

src/mobileappconnector.cpp

@@ -1,16 +0,0 @@
-// Copyright 2019-2023 The Hush developers
-// Released under the GPLv3
-#include "mobileappconnector.h"
-#include "ui_mobileappconnector.h"
-
-MobileAppConnector::MobileAppConnector(QWidget *parent) :
-    QDialog(parent),
-    ui(new Ui::MobileAppConnector)
-{
-    ui->setupUi(this);
-}
-
-MobileAppConnector::~MobileAppConnector()
-{
-    delete ui;
-}