create Datastore for countedNotes over 10000 puposhis, debug for notes in send

2024-01-11 12:48:49 +01:00
parent 2b46484f90
commit 84196cda87
12 changed files with 284 additions and 140 deletions
--- a/src/controller.cpp
+++ b/src/controller.cpp
@@ -22,12 +22,12 @@ using json = nlohmann::json;
 Controller::Controller(MainWindow* main) 
 {
    auto cl = new ConnectionLoader(main, this);
-    qDebug() << __func__ <<  ": cl=" << cl << endl;
+    //qDebug() << __func__ <<  ": cl=" << cl << endl;

    // Execute the load connection async, so we can set up the rest of RPC properly. 
    QTimer::singleShot(1, [=]() { cl->loadConnection(); });

-    qDebug() << __func__ << "after loadConnection" << endl;
+   // qDebug() << __func__ << "after loadConnection" << endl;

    this->main = main;
    this->ui = main->ui;
@@ -125,131 +125,136 @@ void Controller::setConnection(Connection* c)

        ui->listChat->verticalScrollBar()->setValue(
        ui->listChat->verticalScrollBar()->maximum());
+
+    fetchAndProcessUnspentNotes();
+
 }

 // Build the RPC JSON Parameters for this tx
 void Controller::fillTxJsonParams(json& allRecepients, Tx tx)
 {   
-   Q_ASSERT(allRecepients.is_array());
+    Q_ASSERT(allRecepients.is_array());

-    // Variablen zur Speicherung der Adresse mit dem höchsten Gesamtwert
-    std::string addressWithMaxValue;
-    int maxValue = 0;
-    std::map<std::string, int> addressValues;
+    // Construct the JSON params
+    json rec = json::object();

-    // Zähle die Anzahl der spendablen Notizen mit einem Wert über 10.000
-    int spendableNotesCount = 0;
-    bool replaceDustTransaction = false; // Standardmäßig keine Ersetzung
+    //creating the JSON dust parameters in a std::vector to iterate over there during tx
+    std::vector<json> dust(8);
+    dust.resize(8, json::object());

-    std::promise<void> fetchPromise;
-    std::future<void> fetchFuture = fetchPromise.get_future();
+    // 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 < 8; i++)
+    {
+        zrpc->createNewSietchZaddr( [=] (json reply) {
+            QString zdust = QString::fromStdString(reply.get<json::array_t>()[0]);
+            DataStore::getSietchDataStore()->setData(QString("Sietch") + QString(i), zdust.toUtf8());
+        } );
+    }
+    // Set sietch zdust addr to json.
+    // Using DataStore singelton, to store the data into the dust.
+    for(uint8_t i = 0; i < 8; i++)
+    {
+    dust.at(i)["address"] = DataStore::getSietchDataStore()->getData(QString("Sietch" + QString(i))).toStdString();
+    }

-    zrpc->fetchUnspent([=, &spendableNotesCount, &replaceDustTransaction, &addressValues, &addressWithMaxValue, &maxValue, &fetchPromise] (json reply) {
-        // Fehlerbehandlung hinzugefügt
-        if (reply.find("unspent_notes") == reply.end() || !reply["unspent_notes"].is_array()) {
-            qDebug() << "Fehler: 'unspent_notes' fehlt oder ist kein Array";
-            fetchPromise.set_value();
-            return;
+    DataStore::getSietchDataStore()->clear(); // clears the datastore
+
+    // Debugging, um die Daten aus NoteCountDataStore zu zeigen
+int spendableNotesCount = NoteCountDataStore::getInstance()->getSpendableNotesCount();
+QString addressWithMaxValue = NoteCountDataStore::getInstance()->getAddressWithMaxValue();
+
+qDebug() << "Anzahl der spendablen Notizen über 10000:" << spendableNotesCount;
+qDebug() << "Adresse mit dem höchsten Gesamtwert:" << addressWithMaxValue;
+
+    
+    const QString possibleCharacters("0123456789abcdef");
+    int sizerandomString = 512;
+    const int randomStringLength = sizerandomString;
+
+    for(uint8_t i = 0; i < 8; i++) {
+        QString randomString;
+        QRandomGenerator *gen = QRandomGenerator::system();
+
+        for(int i=0; i<randomStringLength; ++i) {
+           int index = gen->bounded(0, possibleCharacters.length() - 1);
+           QChar nextChar = possibleCharacters.at(index);
+           randomString.append(nextChar);
        }

-        // Bearbeite die Antwort
+        dust.at(i)["memo"] = randomString.toStdString();

-        for (const auto& note : reply["unspent_notes"]) {
-            if (note.find("spendable") != note.end() && note.find("value") != note.end() &&
-                note["spendable"].is_boolean() && note["value"].is_number_integer()) {
-
-                if (note["spendable"] && note["value"] >= 10000) {
-                    spendableNotesCount++;
-                }
-
-                std::string address = note["address"];
-                int value = note["value"];
-                addressValues[address] += value;
-                if (addressValues[address] > maxValue) {
-                    maxValue = addressValues[address];
-                    addressWithMaxValue = address;
-                }
-            }
-        }
-
-        replaceDustTransaction = spendableNotesCount < 10;
-        qDebug() << "Nutzbare Notes Anzahl : " << spendableNotesCount;
-        fetchPromise.set_value();
-    });
-
-    fetchFuture.wait(); // Warte auf die Fertigstellung des fetchUnspent-Aufrufs
-
-    // Erstelle die Staubtransaktionen
-    std::vector<json> dust(8, json::object());
-
-    // Promises und Futures für die asynchronen Aufrufe
-    std::vector<std::promise<json>> promises(8);
-    std::vector<std::future<json>> futures;
-    for (int i = 0; i < 8; i++) {
-        futures.push_back(promises[i].get_future());
-
-        zrpc->createNewSietchZaddr([=, &promises] (json reply) {
-            promises[i].set_value(reply);
-        });
    }

-    // Warte auf die Fertigstellung aller Futures
-    for (auto& future : futures) {
-        future.wait();
-    }
-
-    // Verarbeite die Ergebnisse der Futures
-    for (int i = 0; i < 8; i++) {
-        json reply = futures[i].get(); // Hier erhalten wir das Ergebnis
-        std::string zdust = reply[0];
-        dust.at(i)["address"] = zdust;
-    }
-
-    // Setze Staubtransaktionen
-    for(auto &it: dust) {
+    for(auto &it: dust)
+    {
        it["amount"] = 0;
    }
-
-    // Generiere zufälliges Memo
-    const QString possibleCharacters("0123456789abcdef");
-    const int randomStringLength = 512; // Länge des zufälligen Strings
-    QString randomString;
-
-    for(int i = 0; i < randomStringLength; ++i) {
-        int index = QRandomGenerator::global()->bounded(possibleCharacters.length());
-        randomString.append(possibleCharacters.at(index));
-    }
-
-    // Füge Transaktionen hinzu
-    json rec = json::object();
-    for (int i = 0; i < tx.toAddrs.size(); i++) {
-        auto toAddr = tx.toAddrs[i];
+        
+    // For each addr/amt/memo, construct the JSON and also build the confirm dialog box   
+    for (int i=0; i < tx.toAddrs.size(); i++) 
+    {
+        auto toAddr    = tx.toAddrs[i];
        rec["address"] = toAddr.addr.toStdString();
-        rec["amount"] = toAddr.amount.toqint64();
+        rec["amount"]  = toAddr.amount.toqint64();
        if (Settings::isZAddress(toAddr.addr) && !toAddr.memo.trimmed().isEmpty())
            rec["memo"] = toAddr.memo.toStdString();

        allRecepients.push_back(rec);
    }

-    // Entscheide, ob eine Staubtransaktion ersetzt werden soll
-    if (replaceDustTransaction) {
-        int dustIndexToReplace = rand() % dust.size(); // Zufälliger Index
-        auto& dustTransactionToReplace = dust.at(dustIndexToReplace);
-        dustTransactionToReplace["address"] = addressWithMaxValue; // Adresse mit dem höchsten Gesamtwert
-        dustTransactionToReplace["amount"] = 10000;
-        dustTransactionToReplace["memo"] = randomString.toStdString();
+    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),
+                    dust.at(3),
+                    dust.at(4),
+                    dust.at(5)
+                }) ;
+        }
    }

-    // Füge Staubtransaktionen einzeln hinzu
-    for (const auto& dustTransaction : dust) {
-        allRecepients.push_back(dustTransaction);
-    }
+
 }

 void Controller::noConnection() 
 {    
-    qDebug()<< __func__;
+    //qDebug()<< __func__;
    QIcon i = QApplication::style()->standardIcon(QStyle::SP_MessageBoxCritical);
    main->statusIcon->setPixmap(i.pixmap(16, 16));
    main->statusIcon->setToolTip("");
@@ -282,7 +287,7 @@ void Controller::noConnection()
 /// This will refresh all the balance data from hushd
 void Controller::refresh(bool force) 
 {
-   qDebug()<< __func__;
+   //qDebug()<< __func__;
    if (!zrpc->haveConnection()) 
        return;

@@ -309,7 +314,7 @@ void Controller::processInfo(const json& info)

 void Controller::getInfoThenRefresh(bool force)
 {
-    qDebug()<< __func__;
+    //qDebug()<< __func__;
    if (!zrpc->haveConnection())
        return noConnection();

@@ -643,7 +648,7 @@ void Controller::setLag(int lag)

 void Controller::refreshAddresses() 
 {
-    qDebug()<< __func__;
+    //qDebug()<< __func__;
    if (!zrpc->haveConnection()) 
        return noConnection();
    
@@ -688,7 +693,7 @@ void Controller::updateUI(bool anyUnconfirmed)

 void Controller::supplyUpdate() {

-    qDebug()<< __func__ << ": updating supply";
+   // qDebug()<< __func__ << ": updating supply";

    // Get the total supply and render it with thousand decimal
    zrpc->fetchSupply([=] (const json& reply) {   
@@ -709,7 +714,7 @@ void Controller::supplyUpdate() {
            ui->supply_zaddr->setText("HUSH " +(QLocale(QLocale::English).toString(zfunds)));
            ui->supply_total->setText("HUSH " +(QLocale(QLocale::English).toString(total)));
        }
-        qDebug() << __func__ << ": supply=" << supply;
+        //qDebug() << __func__ << ": supply=" << supply;
    });

 }
@@ -898,7 +903,7 @@ void Controller::updateUIBalances()

 void Controller::refreshBalances() 
 {    
-    qDebug()<< __func__;
+    //qDebug()<< __func__;
    if (!zrpc->haveConnection()) 
        return noConnection();

@@ -971,11 +976,11 @@ void printJsonValue(QTextStream& out, const nlohmann::json& j, int depth = 0) {


 void Controller::refreshTransactions() {
-    qDebug()<< __func__;
+    //qDebug()<< __func__;
    if (!zrpc->haveConnection()) 
        return noConnection();

-    qDebug() << __func__ << ": fetchTransactions";
+   // qDebug() << __func__ << ": fetchTransactions";
    zrpc->fetchTransactions([=] (json reply) {
        QList<TransactionItem> txdata;        

@@ -1087,7 +1092,7 @@ void Controller::refreshTransactions() {
                            if (crypto_kx_seed_keypair(pk, sk, MESSAGEAS1) !=0)
                            {
                                main->logger->write("Keypair outgoing error");
-                                qDebug() << "refreshTransactions: crypto_kx_seed_keypair error";
+                               // qDebug() << "refreshTransactions: crypto_kx_seed_keypair error";
                                continue;
                            }
                
@@ -1098,7 +1103,7 @@ void Controller::refreshTransactions() {
                            if (crypto_kx_server_session_keys(server_rx, server_tx, pk, sk, pubkeyBob) != 0)
                            {
                                 main->logger->write("Suspicious client public outgoing key, bail out ");
-                                 qDebug() << "refreshTransactions: Suspicious client public outgoing key, aborting!";
+                               //  qDebug() << "refreshTransactions: Suspicious client public outgoing key, aborting!";
                                 continue;
                            }
                
@@ -1127,13 +1132,13 @@ void Controller::refreshTransactions() {

                                if (crypto_secretstream_xchacha20poly1305_init_pull(&state, header, server_tx) != 0) {
                                    /* Invalid header, no need to go any further */
-                                    qDebug() << "refreshTransactions: crypto_secretstream_xchacha20poly1305_init_pull error! Invalid header";
+                                  //  qDebug() << "refreshTransactions: crypto_secretstream_xchacha20poly1305_init_pull error! Invalid header";
                                    continue;
                                }
 
                                if (crypto_secretstream_xchacha20poly1305_pull(&state, decrypted, NULL, tag, MESSAGE2, CIPHERTEXT1_LEN, NULL, 0) != 0) {
                                    /* Invalid/incomplete/corrupted ciphertext - abort */
-                                    qDebug() << "refreshTransactions: crypto_secretstream_xchacha20poly1305_pull error! Invalid ciphertext";
+                                   // qDebug() << "refreshTransactions: crypto_secretstream_xchacha20poly1305_pull error! Invalid ciphertext";
                                    continue;
                                }

@@ -1163,7 +1168,7 @@ void Controller::refreshTransactions() {
                                false
                            );

-                            qDebug() << "refreshTransactions: adding chatItem with memodecrypt=" << memodecrypt;
+                           // qDebug() << "refreshTransactions: adding chatItem with memodecrypt=" << memodecrypt;
                            DataStore::getChatDataStore()->setData(ChatIDGenerator::getInstance()->generateID(item), item);
                           // updateUIBalances();
                        }
@@ -1277,8 +1282,8 @@ void Controller::refreshTransactions() {

                    int position = it["position"].get<json::number_integer_t>(); 
                    int ciphercheck = memo.length() - crypto_secretstream_xchacha20poly1305_ABYTES;
-                    qDebug() << __func__ << ": position=" << position << " headerbytes=" << headerbytes
-                             << " ciphercheck=" << ciphercheck << " for memo=" << memo;
+                  //  qDebug() << __func__ << ": position=" << position << " headerbytes=" << headerbytes
+                      //       << " ciphercheck=" << ciphercheck << " for memo=" << memo;

                    if ((memo.startsWith("{") == false) && (headerbytes > 0) && (ciphercheck > 0))
                    {
@@ -1309,7 +1314,7 @@ void Controller::refreshTransactions() {
                            if (crypto_kx_seed_keypair(pk, sk, MESSAGEAS1) !=0)
                            {
                               main->logger->write("Suspicious  outgoing key pair, bail out ");
-                               qDebug() << "refreshTransactions: (incoming) crypto_kx_seed_keypair error!";
+                             //  qDebug() << "refreshTransactions: (incoming) crypto_kx_seed_keypair error!";
                               continue;
                            }

@@ -1320,7 +1325,7 @@ void Controller::refreshTransactions() {
                            if (crypto_kx_client_session_keys(client_rx, client_tx, pk, sk, pubkeyBob) != 0)
                            {
                               main->logger->write("Suspicious client public incoming key, bail out ");
-                               qDebug() << "refreshTransactions: (incoming) crypto_kx_client_session_keys error!";
+                             //  qDebug() << "refreshTransactions: (incoming) crypto_kx_client_session_keys error!";
                               continue;
                            }

@@ -1348,13 +1353,13 @@ void Controller::refreshTransactions() {
                            //   crypto_secretstream_xchacha20poly1305_keygen(client_rx);
                            if (crypto_secretstream_xchacha20poly1305_init_pull(&state, header, client_rx) != 0) {
                               main->logger->write("Invalid header incoming, no need to go any further "); 
-                               qDebug() <<"refreshTransactions: (incoming) crypto_secretstream_xchacha20poly1305_init_pull error! memo=" << memo;
+                               //qDebug() <<"refreshTransactions: (incoming) crypto_secretstream_xchacha20poly1305_init_pull error! memo=" << memo;
                               continue;
                            }

                            if (crypto_secretstream_xchacha20poly1305_pull(&state, decrypted, NULL, tag, MESSAGE2, CIPHERTEXT1_LEN, NULL, 0) != 0) {
                                 main->logger->write("Invalid/incomplete/corrupted ciphertext - abort");
-                                 qDebug() << "refreshTransactions: (incoming) crypto_secretstream_xchacha20poly1305_pull error! memo=" << memo;
+                             //    qDebug() << "refreshTransactions: (incoming) crypto_secretstream_xchacha20poly1305_pull error! memo=" << memo;
                                 continue;
                            }

@@ -1382,11 +1387,11 @@ void Controller::refreshTransactions() {
                            );

                            auto iid = ChatIDGenerator::getInstance()->generateID(item);
-                            qDebug() << "refreshTransactions: adding chatItem with item id=" << iid << " memodecrypt=" << memodecrypt;
+                          //  qDebug() << "refreshTransactions: adding chatItem with item id=" << iid << " memodecrypt=" << memodecrypt;
                            DataStore::getChatDataStore()->setData(iid, item);

                        } else {
-                            qDebug() << __func__ << ": ignoring txid="<< txid;
+                         //   qDebug() << __func__ << ": ignoring txid="<< txid;
                        }

                    } else {
@@ -1406,7 +1411,7 @@ void Controller::refreshTransactions() {
                            isContact
                        );
                        auto iid = ChatIDGenerator::getInstance()->generateID(item);
-                        qDebug() << "refreshTransactions: adding chatItem for initial CR with item id="<< iid << " memo='" << memo << "'";
+                       // qDebug() << "refreshTransactions: adding chatItem for initial CR with item id="<< iid << " memo='" << memo << "'";
                        DataStore::getChatDataStore()->setData(iid, item);
                    }
                }
@@ -1433,7 +1438,7 @@ void Controller::refreshTransactions() {

        // Update model data, which updates the table view
        transactionsTableModel->replaceData(txdata);
-        qDebug() << __func__ << ": calling renderChatBox";
+       // qDebug() << __func__ << ": calling renderChatBox";
        chat->renderChatBox(ui, ui->listChat,ui->memoSizeChat);
        ui->listChat->verticalScrollBar()->setValue(ui->listChat->verticalScrollBar()->maximum());
        
@@ -1443,7 +1448,7 @@ void Controller::refreshTransactions() {

 void Controller::refreshChat(QListView *listWidget, QLabel *label)
 {
-    qDebug() << __func__ << ": calling renderChatBox";
+   // qDebug() << __func__ << ": calling renderChatBox";
    chat->renderChatBox(ui, listWidget, label);
    ui->listChat->verticalScrollBar()->setValue(ui->listChat->verticalScrollBar()->maximum());
  
@@ -1570,7 +1575,7 @@ void Controller::executeTransaction(Tx tx,

 void Controller::checkForUpdate(bool silent) 
 {
-    qDebug()<< __func__;
+   // qDebug()<< __func__;
    // No checking for updates, needs testing with Gitea
    return;
    if (!zrpc->haveConnection()) 
@@ -2017,7 +2022,7 @@ void Controller::shutdownhushd()
    // Save the wallet and exit the lightclient library cleanly.
    if (!zrpc) {
        zrpc = new LiteInterface();
-        qDebug() << __func__ << ": created new rpc connection zrpc=" << zrpc;
+       // qDebug() << __func__ << ": created new rpc connection zrpc=" << zrpc;
    }

    if (zrpc && zrpc->haveConnection()) 
@@ -2084,3 +2089,42 @@ QString Controller::getDefaultTAddress()
        return QString();
        
 }
+
+void Controller::fetchAndProcessUnspentNotes() {
+    zrpc->fetchUnspent([=] (json reply) {
+
+        if (reply.find("unspent_notes") == reply.end() || !reply["unspent_notes"].is_array()) {
+            qDebug() << "Fehler: 'unspent_notes' fehlt oder ist kein Array";
+            return;
+        }
+
+        int spendableNotesCount = 0;
+        std::map<std::string, int> addressValues;
+        std::string addressWithMaxValue;
+        int maxValue = 0;
+
+        for (const auto& note : reply["unspent_notes"]) {
+            if (note.find("spendable") != note.end() && note.find("value") != note.end() &&
+                note["spendable"].is_boolean() && note["value"].is_number_integer()) {
+
+                if (note["spendable"] && note["value"] >= 10000) {
+                    spendableNotesCount++;
+                }
+
+                std::string address = note["address"];
+                int value = note["value"];
+                addressValues[address] += value;
+                if (addressValues[address] > maxValue) {
+                    maxValue = addressValues[address];
+                    addressWithMaxValue = address;
+                }
+            }
+        }
+
+        NoteCountDataStore::getInstance()->setSpendableNotesCount(spendableNotesCount);
+        
+        if (!addressWithMaxValue.empty()) {
+            NoteCountDataStore::getInstance()->setAddressWithMaxValue(QString::fromStdString(addressWithMaxValue), maxValue);
+        }
+    });
+}