From d650f96d5f48a9cc458af9ef644f57973ca7f48b Mon Sep 17 00:00:00 2001 From: Chris Moore Date: Sat, 7 Apr 2012 12:45:39 -0700 Subject: [PATCH] Preserve the shuffled order of coins with equal value to give more randomized coin selection. --- src/wallet.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/wallet.cpp b/src/wallet.cpp index 36dbe7aeb1..d190ad9242 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -17,6 +17,15 @@ using namespace std; // mapWallet // +struct CompareValueOnly +{ + bool operator()(const pair >& t1, + const pair >& t2) const + { + return t1.first < t2.first; + } +}; + CPubKey CWallet::GenerateNewKey() { bool fCompressed = CanSupportFeature(FEATURE_COMPRPUBKEY); // default to compressed public keys if we want 0.6.0 wallets @@ -980,7 +989,7 @@ bool CWallet::SelectCoinsMinConf(int64 nTargetValue, int nConfMine, int nConfThe nTargetValue += CENT; // Solve subset sum by stochastic approximation - sort(vValue.rbegin(), vValue.rend()); + sort(vValue.rbegin(), vValue.rend(), CompareValueOnly()); vector vfIncluded; vector vfBest(vValue.size(), true); int64 nBest = nTotalLower;