Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DPoW #201

Merged
merged 3 commits into from
Feb 21, 2017
Merged

DPoW #201

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2e79a56
Test
Feb 21, 2017
50c887a
Merge pull request #199 from jl777/dev
jl777 Feb 21, 2017
fcd55e6
Merge pull request #200 from jl777/beta
jl777 Feb 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/wallet/wallet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2338,7 +2338,7 @@ static void ApproximateBestSubset(vector<pair<CAmount, pair<const CWalletTx*,uns

bool CWallet::SelectCoinsMinConf(const CAmount& nTargetValue, int nConfMine, int nConfTheirs, vector<COutput> vCoins,set<pair<const CWalletTx*,unsigned int> >& setCoinsRet, CAmount& nValueRet, uint64_t *interestp) const
{
uint64_t interests[1024],lowest_interest = 0; int32_t count = 0;
uint64_t interests[8192],lowest_interest = 0; int32_t count = 0;
setCoinsRet.clear();
memset(interests,0,sizeof(interests));
nValueRet = 0;
Expand Down Expand Up @@ -2448,7 +2448,7 @@ bool CWallet::SelectCoinsMinConf(const CAmount& nTargetValue, int nConfMine, int
LogPrint("selectcoins", "SelectCoins() best subset: ");
for (unsigned int i = 0; i < vValue.size(); i++)
if (vfBest[i])
LogPrint("selectcoins", "%s + %s, ", FormatMoney(vValue[i].first),FormatMoney(interests[i]));
LogPrint("selectcoins", "%s + %s, ", FormatMoney(vValue[i].first),FormatMoney(i < count ? interests[i] : 0));
LogPrint("selectcoins", "total %s\n", FormatMoney(nBest));
}

Expand Down