Merge

Author: levonpetrosyan93

src/batchproof_container.cpp

@@ -74,10 +74,16 @@ void BatchProofContainer::removeLelantus(std::unordered_map<Scalar, int> spentSe
         int id = spendSerial.second;
 
         // afterFixes bool with the pair of set id is considered separate set identifiers, so try to find in one set, if not found try also in another
-        std::pair<uint32_t, bool> key = std::make_pair(id, false);
+        std::pair<uint32_t, bool> key1 = std::make_pair(id, false);
+        std::pair<uint32_t, bool> key2 = std::make_pair(id, true);
         std::vector<LelantusSigmaProofData>* vProofs;
-        if (lelantusSigmaProofs.count(key) > 0) {
-            vProofs = &lelantusSigmaProofs[key];
+        if (lelantusSigmaProofs.count(key1) > 0) {
+            vProofs = &lelantusSigmaProofs[key1];
+            erase(vProofs, spendSerial.first);
+        }
+
+        if (lelantusSigmaProofs.count(key2) > 0) {
+            vProofs = &lelantusSigmaProofs[key2];
             erase(vProofs, spendSerial.first);
         }
     }

src/qt/automintmodel.cpp

@@ -55,7 +55,7 @@ void IncomingFundNotifier::check()
         return;
 
     // update only if there are transaction and last update was done more than 2 minutes ago, and in case it is first time
-    if ((lastUpdateTime!= 0 && (GetSystemTimeInSeconds() - lastUpdateTime <= 120))) {
+    if (txs.empty() || (lastUpdateTime!= 0 && (GetSystemTimeInSeconds() - lastUpdateTime <= 120))) {
         return;
     }
 
@@ -97,7 +97,6 @@ void IncomingFundNotifier::check()
         for (auto const &valueAndUTXO : valueAndUTXOs) {
             credit += valueAndUTXO.first;
         }
-
     }
 
     for (auto const &tx : immatures) {

src/test/lelantus_mintspend_test.cpp

@@ -76,7 +76,7 @@ BOOST_AUTO_TEST_CASE(lelantus_mintspend_test)
     CWalletTx result;
     {
         std::vector<CHDMint> mintCoins; // new mints
-        CAmount fee;
+        CAmount fee = 0;
         result = pwalletMain->CreateLelantusJoinSplitTransaction(recipients, fee, {}, spendCoins, mintCoins);
         pwalletMain->CommitLelantusTransaction(result, spendCoins, mintCoins);
     }
@@ -104,7 +104,7 @@ BOOST_AUTO_TEST_CASE(lelantus_mintspend_test)
     result.Init(NULL);
     {
         std::vector<CHDMint> mintCoins; // new mints
-        CAmount fee;
+        CAmount fee = 0;
         result = pwalletMain->CreateLelantusJoinSplitTransaction(recipients, fee, {}, spendCoins, mintCoins);
         pwalletMain->CommitLelantusTransaction(result, spendCoins, mintCoins);
     }

src/wallet/rpcwallet.cpp

@@ -5263,19 +5263,19 @@ static const CRPCCommand commands[] =
     { "wallet",             "walletpassphrase",         &walletpassphrase,         true,   {"passphrase","timeout"} },
     { "wallet",             "removeprunedfunds",        &removeprunedfunds,        true,   {"txid"} },
 
-    { "wallet",             "listunspentlelantusmints", &listunspentlelantusmints, false },
-    { "wallet",             "mintlelantus",             &mintlelantus,             false },
-    { "wallet",             "autoMintlelantus",         &autoMintlelantus,         false },
-    { "wallet",             "joinsplit",                &joinsplit,                false },
-    { "wallet",             "resetlelantusmint",        &resetlelantusmint,        false },
-    { "wallet",             "setlelantusmintstatus",    &setlelantusmintstatus,    false },
-    { "wallet",             "listlelantusmints",        &listlelantusmints,        false },
-
-    { "wallet",             "setmininput",              &setmininput,              false },
-    { "wallet",             "regeneratemintpool",       &regeneratemintpool,       false },
-    { "wallet",             "removetxmempool",          &removetxmempool,          false },
-    { "wallet",             "removetxwallet",           &removetxwallet,           false },
-    { "wallet",             "listlelantusjoinsplits",   &listlelantusjoinsplits,   false },
+    { "wallet",             "listunspentlelantusmints", &listunspentlelantusmints, false, {} },
+    { "wallet",             "mintlelantus",             &mintlelantus,             false, {} },
+    { "wallet",             "autoMintlelantus",         &autoMintlelantus,         false, {} },
+    { "wallet",             "joinsplit",                &joinsplit,                false, {} },
+    { "wallet",             "resetlelantusmint",        &resetlelantusmint,        false, {} },
+    { "wallet",             "setlelantusmintstatus",    &setlelantusmintstatus,    false, {} },
+    { "wallet",             "listlelantusmints",        &listlelantusmints,        false, {} },
+
+    { "wallet",             "setmininput",              &setmininput,              false, {} },
+    { "wallet",             "regeneratemintpool",       &regeneratemintpool,       false, {} },
+    { "wallet",             "removetxmempool",          &removetxmempool,          false, {} },
+    { "wallet",             "removetxwallet",           &removetxwallet,           false, {} },
+    { "wallet",             "listlelantusjoinsplits",   &listlelantusjoinsplits,   false, {} },
 
     //spark
     { "wallet",             "listunspentsparkmints",  &listunspentsparkmints,  false, {} },