LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Merge branch 'subcent-change' of https://github.com/tcatm/bitcoin

Browse source
This commit is contained in:
Gavin Andresen 2011-03-13 17:15:28 -04:00
commit dfd059173d
1 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
main.cpp
View file

@ -3759,16 +3759,16 @@ bool SelectCoinsMinConf(int64 nTargetValue, int nConfMine, int nConfTheirs, set<
int64 n = pcoin->GetCredit(); int64 n = pcoin->GetCredit();
if (n <= 0) if (n <= 0)
continue; continue;
if (n < nTargetValue) if (n == nTargetValue)
{
vValue.push_back(make_pair(n, pcoin));
nTotalLower += n;
}
else if (n == nTargetValue)
{ {
setCoinsRet.insert(pcoin); setCoinsRet.insert(pcoin);
return true; return true;
} }
else if (n < nTargetValue + CENT)
{
vValue.push_back(make_pair(n, pcoin));
nTotalLower += n;
}
else if (n < nLowestLarger) else if (n < nLowestLarger)
{ {
nLowestLarger = n; nLowestLarger = n;
@ -3777,7 +3777,14 @@ bool SelectCoinsMinConf(int64 nTargetValue, int nConfMine, int nConfTheirs, set<
} }
} }
if (nTotalLower < nTargetValue) if (nTotalLower == nTargetValue || nTotalLower == nTargetValue + CENT)
{
for (int i = 0; i < vValue.size(); ++i)
setCoinsRet.insert(vValue[i].second);
return true;
}
if (nTotalLower < nTargetValue + (pcoinLowestLarger ? CENT : 0))
{ {
if (pcoinLowestLarger == NULL) if (pcoinLowestLarger == NULL)
return false; return false;
@ -3785,6 +3792,9 @@ bool SelectCoinsMinConf(int64 nTargetValue, int nConfMine, int nConfTheirs, set<
return true; return true;
} }
if (nTotalLower >= nTargetValue + CENT)
nTargetValue += CENT;
// Solve subset sum by stochastic approximation // Solve subset sum by stochastic approximation
sort(vValue.rbegin(), vValue.rend()); sort(vValue.rbegin(), vValue.rend());
vector<char> vfIncluded; vector<char> vfIncluded;