Merge pull request #170 from MyHush/dev

v1.3.8
MyHush · Jun 26, 2020 · 7409134 · 7409134
2 parents abb2d4d + af8dab4
commit 7409134
Show file tree

Hide file tree

Showing 50 changed files with 2,141 additions and 180 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,12 +4,12 @@ matrix:
   include:
     # works on Precise and Trusty
     - os: linux
-    - dist: xenial
+    - dist: bionec
       compiler: clang
       addons:
         apt:
-          sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.7']
-          packages: ['clang-3.7', 'g++-5']
+          sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise-7']
+          packages: ['clang-7', 'g++-5']
 
 before_script:
   - export PATH="$PATH:$HOME/.cargo/bin"
@@ -20,10 +20,10 @@ before_install:
  - gem install bundler
  - curl -sSL https://sh.rustup.rs | sh -s -- -y --default-toolchain=nightly --profile=minimal
  - export PATH="$PATH:$HOME/.cargo/bin"
- - sudo add-apt-repository ppa:beineri/opt-qt591-xenial -y
+ - sudo add-apt-repository ppa:beineri/opt-qt-5.14.2-bionic -y
  - sudo apt-get update -qq
- - sudo apt-get install qt59base qt59websockets libgl1-mesa-dev
- - source /opt/qt59/bin/qt59-env.sh
+ - sudo apt-get install qt514base qt514websockets libgl1-mesa-dev
+ - source /opt/qt514/bin/qt514-env.sh
  - chmod +x res/libsodium/buildlibsodium.sh
 
 script:

diff --git a/application.qrc b/application.qrc
@@ -47,8 +47,11 @@
         <file>res/addContactBlack.png</file>
         <file>res/unknownBlack.png</file>
         <file>res/unknownWhite.png</file>
-        <file>res/hush-passion.png</file>
         <file>res/dark-01.png</file>
+        <file>res/money-mouth.png</file>
+        <file>res/money-outgoing.png</file>
+        <file>res/hush-money-white.png</file>
+
     </qresource>
     <qresource prefix="/img">
         <file>res/hushdlogo.gif</file>
@@ -59,6 +62,27 @@
         <file>res/loaderblack.gif</file>
         <file>res/loaderwhite.gif</file>
     </qresource>
+    <qresource prefix="/emoji">
+    <file>res/emoji/emoji1.png</file>
+    <file>res/emoji/laughing.png</file>
+    <file>res/emoji/money-mouth.png</file>
+    <file>res/emoji/sweet_smile.png</file>
+    <file>res/emoji/joy.png</file>
+    <file>res/emoji/innocent.png</file>
+    <file>res/emoji/partying_face.png</file>
+    <file>res/emoji/face_with_3hearts.png</file>
+    <file>res/emoji/face-with-rolling-eyes.png</file>
+    <file>res/emoji/face-with-tongue.png</file>
+    <file>res/emoji/heart_shaped_eyes.png</file>
+    <file>res/emoji/nauseated-face.png</file>
+    <file>res/emoji/pile-of-poo.png</file>
+    <file>res/emoji/serious-face-with-symbols-covering-mouth.png</file>
+    <file>res/emoji/smiling-face-with-sunglasses.png</file>
+    <file>res/emoji/stuck-out.png</file>
+    <file>res/emoji/sweet_smile.png</file>
+    <file>res/emoji/hush-money-white.png</file>
+    <file>res/emoji/SD.png</file>
+    </qresource>
     <qresource prefix="/translations">
         <file>res/silentdragonlite_de.qm</file>
         <file>res/silentdragonlite_es.qm</file>

diff --git a/lib/Cargo.lock b/lib/Cargo.lock
diff --git a/lib/Cargo.toml b/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://github.com/MyHush/silentdragonlite-cli", rev = "07288de82d84b9bf35d1210ccc98eb1e4b757eb7" }
+silentdragonlitelib = { git = "https://github.com/MyHush/silentdragonlite-cli", rev = "6c3f6f22bfc642c714c1e43f6e09cb4d34c7a1de" }
diff --git a/lib/silentdragonlitelib.h b/lib/silentdragonlitelib.h
@@ -6,11 +6,11 @@ extern "C" {
 #endif
 
 extern bool   litelib_wallet_exists       (const char* chain_name);
-extern char * litelib_initialize_new      (bool dangerous, const char* server);
+extern char * litelib_initialize_new      (const char* server);
 extern char * litelib_initialize_new_from_phrase
-                                          (bool dangerous, const char* server, const char* seed,
+                                          (const char* server, const char* seed,
                                            unsigned long long birthday, unsigned long long number);  
-extern char * litelib_initialize_existing (bool dangerous, const char* server);
+extern char * litelib_initialize_existing (const char* server);
 extern char * litelib_execute             (const char* s, const char* args);
 extern void   litelib_rust_free_string    (char* s);
 extern char * blake3_PW                   (char* pw);

diff --git a/lib/src/lib.rs b/lib/src/lib.rs
@@ -57,15 +57,15 @@ return e_str.into_raw();
 
 /// Create a new wallet and return the seed for the newly created wallet.
 #[no_mangle]
-pub extern fn litelib_initialize_new(dangerous: bool, server: *const c_char) -> *mut c_char {
+pub extern fn litelib_initialize_new(server: *const c_char) -> *mut c_char {
     let server_str = unsafe {
         assert!(!server.is_null());
 
         CStr::from_ptr(server).to_string_lossy().into_owned()
     };
 
     let server = LightClientConfig::get_server_or_default(Some(server_str));
-    let (config, latest_block_height) = match LightClientConfig::create(server, dangerous) {
+    let (config, latest_block_height) = match LightClientConfig::create(server) {
         Ok((c, h)) => (c, h),
         Err(e) => {
             let e_str = CString::new(format!("Error: {}", e)).unwrap();
@@ -101,8 +101,8 @@ pub extern fn litelib_initialize_new(dangerous: bool, server: *const c_char) ->
 
 /// Restore a wallet from the seed phrase
 #[no_mangle]
-pub extern fn litelib_initialize_new_from_phrase(dangerous: bool, server: *const c_char, 
-            seed: *const c_char, birthday: u64, number: u64) -> *mut c_char {
+pub extern fn litelib_initialize_new_from_phrase(server: *const c_char, 
+            seed: *const c_char, birthday: u64, number: u64, overwrite: bool) -> *mut c_char {
     let server_str = unsafe {
         assert!(!server.is_null());
 
@@ -116,15 +116,15 @@ pub extern fn litelib_initialize_new_from_phrase(dangerous: bool, server: *const
     };
 
     let server = LightClientConfig::get_server_or_default(Some(server_str));
-    let (config, _latest_block_height) = match LightClientConfig::create(server, dangerous) {
+    let (config, _latest_block_height) = match LightClientConfig::create(server) {
         Ok((c, h)) => (c, h),
         Err(e) => {
             let e_str = CString::new(format!("Error: {}", e)).unwrap();
             return e_str.into_raw();
         }
     };
 
-    let lightclient = match LightClient::new_from_phrase(seed_str, &config, birthday, number, false) {
+    let lightclient = match LightClient::new_from_phrase(seed_str, &config, birthday, number, overwrite) {
         Ok(l) => l,
         Err(e) => {
             let e_str = CString::new(format!("Error: {}", e)).unwrap();
@@ -143,15 +143,15 @@ pub extern fn litelib_initialize_new_from_phrase(dangerous: bool, server: *const
 
 // Initialize a new lightclient and store its value
 #[no_mangle]
-pub extern fn litelib_initialize_existing(dangerous: bool, server: *const c_char) -> *mut c_char {
+pub extern fn litelib_initialize_existing(server: *const c_char) -> *mut c_char {
     let server_str = unsafe {
         assert!(!server.is_null());
 
         CStr::from_ptr(server).to_string_lossy().into_owned()
     };
 
     let server = LightClientConfig::get_server_or_default(Some(server_str));
-    let (config, _latest_block_height) = match LightClientConfig::create(server, dangerous) {
+    let (config, _latest_block_height) = match LightClientConfig::create(server) {
         Ok((c, h)) => (c, h),
         Err(e) => {
             let e_str = CString::new(format!("Error: {}", e)).unwrap();

diff --git a/res/emoji/SD.png b/res/emoji/SD.png
diff --git a/res/emoji/emoji1.png b/res/emoji/emoji1.png
diff --git a/res/emoji/face-with-rolling-eyes.png b/res/emoji/face-with-rolling-eyes.png
diff --git a/res/emoji/face-with-tongue.png b/res/emoji/face-with-tongue.png
diff --git a/res/emoji/face_with_3hearts.png b/res/emoji/face_with_3hearts.png
diff --git a/res/emoji/heart_shaped_eyes.png b/res/emoji/heart_shaped_eyes.png
diff --git a/res/emoji/hush-money-white.png b/res/emoji/hush-money-white.png
diff --git a/res/emoji/innocent.png b/res/emoji/innocent.png
diff --git a/res/emoji/joy.png b/res/emoji/joy.png
diff --git a/res/emoji/laughing.png b/res/emoji/laughing.png
diff --git a/res/emoji/money-mouth.png b/res/emoji/money-mouth.png
diff --git a/res/emoji/nauseated-face.png b/res/emoji/nauseated-face.png
diff --git a/res/emoji/partying_face.png b/res/emoji/partying_face.png
diff --git a/res/emoji/pile-of-poo.png b/res/emoji/pile-of-poo.png
diff --git a/res/emoji/serious-face-with-symbols-covering-mouth.png b/res/emoji/serious-face-with-symbols-covering-mouth.png
diff --git a/res/emoji/smiling-face-with-sunglasses.png b/res/emoji/smiling-face-with-sunglasses.png
diff --git a/res/emoji/stuck-out.png b/res/emoji/stuck-out.png
diff --git a/res/emoji/sweet_smile.png b/res/emoji/sweet_smile.png
diff --git a/res/hush-money-white.png b/res/hush-money-white.png
diff --git a/res/hush-money.png b/res/hush-money.png
diff --git a/res/money-mouth.png b/res/money-mouth.png
diff --git a/res/money-outgoing.png b/res/money-outgoing.png
diff --git a/res/silentdragonlite.desktop b/res/silentdragonlite.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Name=SilentDragonLite
+Comment=Lightclient UI wallet for Hush
+GenericName=Wallet
+Exec=SilentDragonLite %u
+Icon=SilentDragonLite
+Type=Application
+StartupNotify=true
+StartupWMClass=SilentDragonLite
+Categories=Utility;
+MimeType=x-scheme-handler/hush;
+Keywords=SilentDragonLite;
+
diff --git a/silentdragon-lite.pro b/silentdragon-lite.pro
@@ -14,6 +14,7 @@ QT += widgets
 QT += websockets
 
 
+
 TARGET = SilentDragonLite
 
 TEMPLATE = app
@@ -121,6 +122,7 @@ HEADERS += \
 FORMS += \
     src/contactrequest.ui \
     src/deposithush.ui \
+    src/emoji.ui \
     src/encryption.ui \
     src/hushrequest.ui \
     src/mainwindow.ui \
@@ -129,6 +131,8 @@ FORMS += \
     src/newwallet.ui \
     src/recurringpayments.ui \
     src/restoreseed.ui \
+    src/seedrestore.ui \
+    src/sendHushTransactionChat.ui \
     src/settings.ui \
     src/about.ui \
     src/confirm.ui \

diff --git a/src/Chat/Helper/ChatDelegator.h b/src/Chat/Helper/ChatDelegator.h
@@ -51,6 +51,27 @@ inline void ListViewDelegate::paint(QPainter *painter, QStyleOptionViewItem cons
     bodydoc.setDefaultFont(QFont("Roboto", 12));
     QString bodytext(index.data(Qt::DisplayRole).toString());
     bodydoc.setHtml(bodytext.replace("\n",  "<br>")); 
+    bodydoc.setHtml(bodytext.replace(":smiley:",  "<img src=':/emoji/res/emoji/emoji1.png'>"));
+    bodydoc.setHtml(bodytext.replace(":-)",  "<img src=':/emoji/res/emoji/emoji1.png'>"));
+    bodydoc.setHtml(bodytext.replace(":money_mouth:",  "<img src=':/emoji/res/emoji/money-mouth.png'>"));
+    bodydoc.setHtml(bodytext.replace(":laughing:",  "<img src=':/emoji/res/emoji/laughing.png'>"));
+    bodydoc.setHtml(bodytext.replace(":sweet_smile:",  "<img src=':/emoji/res/emoji/sweet_smile.png'>"));
+    bodydoc.setHtml(bodytext.replace(":joy:",  "<img src=':/emoji/res/emoji/joy.png'>"));
+    bodydoc.setHtml(bodytext.replace(":innocent:",  "<img src=':/emoji/res/emoji/innocent.png'>"));
+    bodydoc.setHtml(bodytext.replace(":partying_face:",  "<img src=':/emoji/res/emoji/partying_face.png'>"));
+    bodydoc.setHtml(bodytext.replace(":fire:",  "<img src=':/emoji/res/emoji/fire.png'>"));
+    bodydoc.setHtml(bodytext.replace(":rolling_eyes:",  "<img src=':/emoji/res/emoji/face-with-rolling-eyes.png'>"));
+    bodydoc.setHtml(bodytext.replace(":stuck_out_tongue:",  "<img src=':/emoji/res/emoji/face-with-tongue.png'>"));
+    bodydoc.setHtml(bodytext.replace(":face_with_3hearts:",  "<img src=':/emoji/res/emoji/face_with_3hearts.png'>"));
+    bodydoc.setHtml(bodytext.replace(":heart_eyes:",  "<img src=':/emoji/res/emoji/heart_shaped_eyes.png'>"));
+    bodydoc.setHtml(bodytext.replace(":nauseated:",  "<img src=':/emoji/res/emoji/nauseated-face.png'>"));
+    bodydoc.setHtml(bodytext.replace(":poop:",  "<img src=':/emoji/res/emoji/pile-of-poo.png'>"));
+    bodydoc.setHtml(bodytext.replace(":symbols_mouth:",  "<img src=':/emoji/res/emoji/serious-face-with-symbols-covering-mouth.png'>"));
+    bodydoc.setHtml(bodytext.replace(":sunglass:",  "<img src=':/emoji/res/emoji/smiling-face-with-sunglasses.png'>"));
+    bodydoc.setHtml(bodytext.replace(":stuck_out:",  "<img src=':/emoji/res/emoji/stuck-out.png'>"));
+    bodydoc.setHtml(bodytext.replace(";p",  "<img src=':/emoji/res/emoji/stuck-out.png'>"));
+    bodydoc.setHtml(bodytext.replace(":hush_white:",  "<img src=':/emoji/res/emoji/hush-money-white.png'>"));
+    bodydoc.setHtml(bodytext.replace(":sd:",  "<img src=':/emoji/res/emoji/SD.png'>"));
     qreal contentswidth = option.rect.width() * d_widthfraction - d_horizontalmargin - d_pointerwidth - d_leftpadding - d_rightpadding;
     bodydoc.setTextWidth(contentswidth);
     qreal bodyheight = bodydoc.size().height();
@@ -174,7 +195,27 @@ inline QSize ListViewDelegate::sizeHint(QStyleOptionViewItem const &option, QMod
     bodydoc.setDefaultFont(QFont("Roboto", 12));
     QString bodytext(index.data(Qt::DisplayRole).toString());
     bodydoc.setHtml(bodytext.replace("\n",  "<br>"));
-
+    bodydoc.setHtml(bodytext.replace(":smiley:",  "<img src=':/emoji/res/emoji/emoji1.png'>"));
+    bodydoc.setHtml(bodytext.replace(":-)",  "<img src=':/emoji/res/emoji/emoji1.png'>"));
+    bodydoc.setHtml(bodytext.replace(":money_mouth:",  "<img src=':/emoji/res/emoji/money-mouth.png'>"));
+    bodydoc.setHtml(bodytext.replace(":laughing:",  "<img src=':/emoji/res/emoji/laughing.png'>"));
+    bodydoc.setHtml(bodytext.replace(":sweet_smile:",  "<img src=':/emoji/res/emoji/sweet_smile.png'>"));
+    bodydoc.setHtml(bodytext.replace(":joy:",  "<img src=':/emoji/res/emoji/joy.png'>"));
+    bodydoc.setHtml(bodytext.replace(":innocent:",  "<img src=':/emoji/res/emoji/innocent.png'>"));
+    bodydoc.setHtml(bodytext.replace(":partying_face:",  "<img src=':/emoji/res/emoji/partying_face.png'>"));
+    bodydoc.setHtml(bodytext.replace(":fire:",  "<img src=':/emoji/res/emoji/fire.png'>"));
+    bodydoc.setHtml(bodytext.replace(":rolling_eyes:",  "<img src=':/emoji/res/emoji/face-with-rolling-eyes.png'>"));
+    bodydoc.setHtml(bodytext.replace(":stuck_out_tongue:",  "<img src=':/emoji/res/emoji/face-with-tongue.png'>"));
+    bodydoc.setHtml(bodytext.replace(":face_with_3hearts:",  "<img src=':/emoji/res/emoji/face_with_3hearts.png'>"));
+    bodydoc.setHtml(bodytext.replace(":heart_eyes:",  "<img src=':/emoji/res/emoji/heart_shaped_eyes.png'>"));
+    bodydoc.setHtml(bodytext.replace(":nauseated:",  "<img src=':/emoji/res/emoji/nauseated-face.png'>"));
+    bodydoc.setHtml(bodytext.replace(":poop:",  "<img src=':/emoji/res/emoji/pile-of-poo.png'>"));
+    bodydoc.setHtml(bodytext.replace(":symbols_mouth:",  "<img src=':/emoji/res/emoji/serious-face-with-symbols-covering-mouth.png'>"));
+    bodydoc.setHtml(bodytext.replace(":sunglass:",  "<img src=':/emoji/res/emoji/smiling-face-with-sunglasses.png'>"));
+    bodydoc.setHtml(bodytext.replace(":stuck_out:",  "<img src=':/emoji/res/emoji/stuck-out.png'>"));
+    bodydoc.setHtml(bodytext.replace(";p",  "<img src=':/emoji/res/emoji/stuck-out.png'>"));
+    bodydoc.setHtml(bodytext.replace(":hush_white:",  "<img src=':/emoji/res/emoji/hush-money-white.png'>"));
+    bodydoc.setHtml(bodytext.replace(":sd:",  "<img src=':/emoji/res/emoji/SD.png'>"));
 
     // the width of the contents are the (a fraction of the window width) minus (margins + padding + width of the bubble's tail)
     qreal contentswidth = option.rect.width() * d_widthfraction - d_horizontalmargin - d_pointerwidth - d_leftpadding - d_rightpadding;

diff --git a/src/DataStore/ChatDataStore.cpp b/src/DataStore/ChatDataStore.cpp
@@ -116,6 +116,46 @@ std::map<QString, ChatItem> ChatDataStore::getAllOldContactRequests()
     return filteredItems;
 }
 
+std::map<QString, ChatItem> ChatDataStore::getAllCashMemosIncoming()
+{
+    std::map<QString, ChatItem> filteredItems;
+
+    for(auto &c: this->data)   
+    {
+        if (
+            (c.second.isOutgoing() == false) &&
+            (c.second.getType() == "Money")  &&
+            (c.second.getMemo().startsWith("{"))  
+
+        ) 
+
+        {
+            filteredItems[c.first] = c.second;
+        }
+    }
+    return filteredItems;
+}
+
+std::map<QString, ChatItem> ChatDataStore::getAllCashMemosOutgoing()
+{
+    std::map<QString, ChatItem> filteredItems;
+
+    for(auto &c: this->data)   
+    {
+        if (
+            (c.second.isOutgoing() == true) &&
+            (c.second.getType() == "Money")  &&
+            (c.second.getMemo().startsWith("{"))  
+
+        ) 
+
+        {
+            filteredItems[c.first] = c.second;
+        }
+    }
+    return filteredItems;
+}
+
 std::map<QString, ChatItem> ChatDataStore::getAllMemos()
 {
     std::map<QString, ChatItem> filteredItems;

diff --git a/src/DataStore/ChatDataStore.h b/src/DataStore/ChatDataStore.h
@@ -22,6 +22,8 @@ class ChatDataStore
         ChatItem getData(QString key);
         std::map<QString, ChatItem> getAllRawChatItems();
         std::map<QString, ChatItem> getAllNewContactRequests();
+        std::map<QString, ChatItem> getAllCashMemosOutgoing();
+        std::map<QString, ChatItem> getAllCashMemosIncoming();
         std::map<QString, ChatItem> getAllOldContactRequests();
         std::map<QString, ChatItem> getAllMemos();
         QString getPassword();

diff --git a/src/Model/ChatItem.cpp b/src/Model/ChatItem.cpp
@@ -158,6 +158,9 @@ QString ChatItem::toChatLine()
 {
     QDateTime myDateTime;
     QString lock;
+    QString money;
+    QString moneyText;
+    QString moneyTextRequest;
     myDateTime.setTime_t(_timestamp);
 
     if (_notarize == true)
@@ -175,11 +178,43 @@ QString ChatItem::toChatLine()
         {
 
         lock = "<b> <img src=':/icons/res/lock_green.png'><b>";
-        }
+        }else{}
+
+    if (_memo.startsWith("Money transaction of :"))
+    {
+    if (_outgoing == true)
+    {
+
+        moneyText = QString("<br>") + QString("<br>") + QString("<pr> Outgoing Money Transaction </pr>") + QString("<b> <img src=':/icons/res/money-outgoing.png'><b>");
+    }else{
+
+
+        moneyText = QString("<br>") + QString("<br>") + QString("<pr> Incoming Money Transaction </pr>") + QString("<b> <img src=':/icons/res/money-mouth.png'><b>");
+
+    } 
+    }else{money = "";
+    moneyText = ""; }
+
+      if (_memo.startsWith("Request of :"))
+    {
+    if (_outgoing == true)
+    {
+
+        moneyTextRequest = QString("<br>") + QString("<br>") + QString("<pr> Outgoing Hush Request </pr>") + QString("<b> <img src=':/icons/res/money-outgoing.png'><b>");
+    }else{
+
+
+        moneyTextRequest = QString("<br>") + QString("<br>") + QString("<pr> Incoming Hush Request </pr>") + QString("<b> <img src=':/icons/res/money-mouth.png'><b>");
+
+    } 
+    }else{moneyTextRequest = "";
+    moneyTextRequest = "";    }
+
+
 
 
     QString line = QString("<small>") + myDateTime.toString("yyyy-MM-dd hh:mm");
-    line += QString(lock) + QString("</small>");
+    line += QString(lock) + QString(moneyText) + QString(moneyTextRequest) +  QString("</small>");
     line +=QString("<p>") + _memo.toHtmlEscaped() + QString("</p>");
     return line;
 }

diff --git a/src/addressbook.cpp b/src/addressbook.cpp
@@ -250,6 +250,9 @@ void AddressBook::open(MainWindow* parent, QLineEdit* target)
 
         );
 
+       parent->ui->listChat->verticalScrollBar()->setValue(
+        parent->ui->listChat->verticalScrollBar()->maximum());
+
     });
 
    //  AddressBook::getInstance()->addAddressLabel(newLabel, ab.addr->text(), cid);