Fixes for PS and UTXO sorting

Duality-CDOO · Duality-CDOO · commit ae857fbcee65 · 2018-11-30T15:08:44.000+01:00
diff --git a/src/privatesend-client.cpp b/src/privatesend-client.cpp
@@ -971,10 +971,10 @@ bool CPrivateSendClientManager::DoAutomaticDenominating(CConnman& connman, bool
         return false;
     }
 
-    int nDnCount = dnodeman.CountDynodes();
+    int nDnCountEnabled = dnodeman.CountEnabled(MIN_PRIVATESEND_PEER_PROTO_VERSION);
 
     // If we've used 90% of the Dynode list then drop the oldest first ~30%
-    int nThreshold_high = nDnCount * 0.9;
+    int nThreshold_high = nDnCountEnabled * 0.9;
     int nThreshold_low = nThreshold_high * 0.7;
     LogPrint("privatesend", "Checking vecDynodesUsed: size: %d, threshold: %d\n", (int)vecDynodesUsed.size(), nThreshold_high);
 
@@ -1371,6 +1371,11 @@ bool CPrivateSendClientSession::MakeCollateralAmounts(CConnman& connman)
         return false;
     }
 
+    // Start from smallest balances first to consume tiny amounts and cleanup UTXO a bit
+    std::sort(vecTally.begin(), vecTally.end(), [](const CompactTallyItem& a, const CompactTallyItem& b) {
+        return a.nAmount < b.nAmount;
+    });
+
     // First try to use only non-denominated funds
     for (const auto& item : vecTally) {
         if (!MakeCollateralAmounts(item, false, connman))
@@ -1483,6 +1488,11 @@ bool CPrivateSendClientSession::CreateDenominated(CConnman& connman)
         return false;
     }
 
+    // Start from largest balances first to speed things up by creating txes with larger/largest denoms included
+    std::sort(vecTally.begin(), vecTally.end(), [](const CompactTallyItem& a, const CompactTallyItem& b) {
+        return a.nAmount > b.nAmount;
+    });
+    
     bool fCreateMixingCollaterals = !pwalletMain->HasCollateralInputs();
 
     for (const auto& item : vecTally) {
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -2991,14 +2991,6 @@ bool CWallet::SelectPSInOutPairsByDenominations(int nDenom, CAmount nValueMin, C
     return nValueTotal >= nValueMin && nDenom == nDenomResult;
 }
 
-struct CompareByAmount {
-    bool operator()(const CompactTallyItem& t1,
-        const CompactTallyItem& t2) const
-    {
-        return t1.nAmount > t2.nAmount;
-    }
-};
-
 bool CWallet::SelectCoinsGroupedByAddresses(std::vector<CompactTallyItem>& vecTallyRet, bool fSkipDenominated, bool fAnonymizable, bool fSkipUnconfirmed, int nMaxOupointsPerAddress) const
 {
     LOCK2(cs_main, cs_wallet);
@@ -3084,16 +3076,14 @@ bool CWallet::SelectCoinsGroupedByAddresses(std::vector<CompactTallyItem>& vecTa
     }
 
     // construct resulting vector
+    // NOTE: vecTallyRet is "sorted" by txdest (i.e. address), just like mapTally
     vecTallyRet.clear();
     for (const auto& item : mapTally) {
         if (fAnonymizable && item.second.nAmount < nSmallestDenom)
             continue;
         vecTallyRet.push_back(item.second);
     }
 
-    // order by amounts per address, from smallest to largest
-    sort(vecTallyRet.rbegin(), vecTallyRet.rend(), CompareByAmount());
-
     // cache already confirmed anonymizable entries for later use, no cache should be saved when the limit is specified
     if(nMaxOupointsPerAddress != -1 && fAnonymizable && fSkipUnconfirmed) {
         if (fSkipDenominated) {
