Merge pull request #179 from MyHush/dev

fix retry on broken connection,  fix number of sietch zaddrs for transactions and hushchat ,  allow to send a message only if their was a initial contact request

lib/Cargo.lock

@@ -1192,7 +1192,7 @@ dependencies = [
  "blake3 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
- "silentdragonlitelib 0.1.0 (git+https://github.com/MyHush/silentdragonlite-cli?rev=ffd77503f73b727ea9469d5b9122d60554c2a372)",
+ "silentdragonlitelib 0.1.0 (git+https://github.com/MyHush/silentdragonlite-cli?rev=fcd9cbb17020ffbaef41b2db62766ef8c3c81768)",
 ]
 
 [[package]]
@@ -1655,7 +1655,7 @@ dependencies = [
 [[package]]
 name = "silentdragonlitelib"
 version = "0.1.0"
-source = "git+https://github.com/MyHush/silentdragonlite-cli?rev=ffd77503f73b727ea9469d5b9122d60554c2a372#ffd77503f73b727ea9469d5b9122d60554c2a372"
+source = "git+https://github.com/MyHush/silentdragonlite-cli?rev=fcd9cbb17020ffbaef41b2db62766ef8c3c81768#fcd9cbb17020ffbaef41b2db62766ef8c3c81768"
 dependencies = [
  "base58 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "bellman 0.1.0 (git+https://github.com/MyHush/librustzcash.git?rev=1a0204113d487cdaaf183c2967010e5214ff9e37)",
@@ -2660,7 +2660,7 @@ dependencies = [
 "checksum serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)" = "691b17f19fc1ec9d94ec0b5864859290dff279dbd7b03f017afda54eb36c3c35"
 "checksum sha2 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "27044adfd2e1f077f649f59deb9490d3941d674002f7d062870a60ebe9bd47a0"
 "checksum signal-hook-registry 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94f478ede9f64724c5d173d7bb56099ec3e2d9fc2774aac65d34b8b890405f41"
-"checksum silentdragonlitelib 0.1.0 (git+https://github.com/MyHush/silentdragonlite-cli?rev=ffd77503f73b727ea9469d5b9122d60554c2a372)" = "<none>"
+"checksum silentdragonlitelib 0.1.0 (git+https://github.com/MyHush/silentdragonlite-cli?rev=fcd9cbb17020ffbaef41b2db62766ef8c3c81768)" = "<none>"
 "checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
 "checksum smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6"
 "checksum socket2 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)" = "e8b74de517221a2cb01a53349cf54182acdc31a074727d3079068448c0676d85"

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 = "ffd77503f73b727ea9469d5b9122d60554c2a372" }
+silentdragonlitelib = { git = "https://github.com/MyHush/silentdragonlite-cli", rev = "fcd9cbb17020ffbaef41b2db62766ef8c3c81768" }

src/Chat/Chat.cpp

@@ -126,7 +126,7 @@ void Chat::renderChatBox(Ui::MainWindow *ui, QListView *view, QLabel *label)
                 Items1->setData(INCOMING, Qt::UserRole + 1);
                 chat->appendRow(Items1);
                 ui->listChat->setModel(chat);
-                
+                ui->memoTxtChat->setEnabled(true);
                
             }
             else

src/controller.cpp

@@ -92,7 +92,7 @@ void Controller::setConnection(Connection* c)
 
     // Create Sietch zdust addr at startup.
     // Using DataStore singelton, to store the data outside of lambda, bing bada boom :D
-    for(uint8_t i = 0; i < 6; i++)
+    for(uint8_t i = 0; i < 8; i++)
     {
         zrpc->createNewSietchZaddr( [=] (json reply) {
             QString zdust = QString::fromStdString(reply.get<json::array_t>()[0]);
@@ -133,12 +133,12 @@ void Controller::fillTxJsonParams(json& allRecepients, Tx tx)
     json rec = json::object();
 
     //creating the JSON dust parameters in a std::vector to iterate over there during tx
-    std::vector<json> dust(6);
-    dust.resize(6, json::object());
+    std::vector<json> dust(8);
+    dust.resize(8, json::object());
 
     // Create Sietch zdust addr again to not use it twice.
     // Using DataStore singelton, to store the data outside of lambda, bing bada boom :D
-    for(uint8_t i = 0; i < 6; i++)
+    for(uint8_t i = 0; i < 8; i++)
     {
         zrpc->createNewSietchZaddr( [=] (json reply) {
             QString zdust = QString::fromStdString(reply.get<json::array_t>()[0]);
@@ -147,7 +147,7 @@ void Controller::fillTxJsonParams(json& allRecepients, Tx tx)
     }
     // Set sietch zdust addr to json.
     // Using DataStore singelton, to store the data into the dust.
-    for(uint8_t i = 0; i < 6; i++)
+    for(uint8_t i = 0; i < 8; i++)
     {
     dust.at(i)["address"] = DataStore::getSietchDataStore()->getData(QString("Sietch" + QString(i))).toStdString();
     }
@@ -169,7 +169,7 @@ void Controller::fillTxJsonParams(json& allRecepients, Tx tx)
        randomString.append(nextChar);
     }
   
-   for(uint8_t i = 0; i < 6; i++)
+   for(uint8_t i = 0; i < 8; i++)
     {
         int length = randomString.length(); 
         int randomSize = rand() % 120 +10;
@@ -210,7 +210,56 @@ void Controller::fillTxJsonParams(json& allRecepients, Tx tx)
         allRecepients.push_back(rec);
     }
 
+    int decider = rand() % 100 + 1 ;  ; // random int between 1 and 100
+
+if (tx.toAddrs.size() < 2)
+{
+
+if(decider % 4 == 3) 
+{
+
     allRecepients.insert(std::begin(allRecepients), {
+            dust.at(0),    
+            dust.at(1),
+            dust.at(2),
+            dust.at(3),
+            dust.at(4),
+            dust.at(5)
+
+        }) ;
+      
+}else{
+
+ allRecepients.insert(std::begin(allRecepients), {
+            dust.at(0),
+            dust.at(1),
+            dust.at(2),
+            dust.at(3),
+            dust.at(4),
+            dust.at(5),
+            dust.at(6)
+
+        }) ;
+
+}
+}else{
+
+if(decider % 4 == 3) 
+{
+
+    allRecepients.insert(std::begin(allRecepients), {
+            dust.at(0),    
+            dust.at(1),
+            dust.at(2),
+            dust.at(3),
+            dust.at(4)
+
+
+        }) ;
+      
+}else{
+
+ allRecepients.insert(std::begin(allRecepients), {
             dust.at(0),
             dust.at(1),
             dust.at(2),
@@ -220,7 +269,10 @@ void Controller::fillTxJsonParams(json& allRecepients, Tx tx)
 
         }) ;
 
-        qDebug()<<"ADDR DUST";
+}
+}
+
+
 }
 
 void Controller::noConnection() 

src/mainwindow.cpp

@@ -92,7 +92,7 @@ MainWindow::MainWindow(QWidget *parent) :
     }
 
      ui->memoTxtChat->setAutoFillBackground(false);
-     ui->memoTxtChat->setPlaceholderText("Send Message");
+     ui->memoTxtChat->setPlaceholderText("Send Message (you can only write messages after the initial message from your contact)");
      ui->memoTxtChat->setTextColor(Qt::white);
     
     // Status Bar
@@ -1613,7 +1613,7 @@ void MainWindow::setupchatTab() {
      ui->listContactWidget->addAction(HushAction);
      ui->listContactWidget->addAction(editAction); 
      ui->listContactWidget->addAction(subatomicAction);
-     ui->memoTxtChat->setEnabled(true);
+     ui->memoTxtChat->setEnabled(false);
 
           QModelIndex index = ui->listContactWidget->currentIndex();
         QString label_contact = index.data(Qt::DisplayRole).toString();