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

[Wallet] Don't add P2CS automatically to GetLockedCredit #1264

Merged
merged 1 commit into from
Jan 14, 2020
Merged

[Wallet] Don't add P2CS automatically to GetLockedCredit #1264

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 2 additions & 5 deletions src/wallet/wallet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1336,15 +1336,12 @@ CAmount CWalletTx::GetLockedCredit() const
// Skip spent coins
if (pwallet->IsSpent(hashTx, i)) continue;

// Add delegated coins
nCredit += pwallet->GetCredit(txout, ISMINE_SPENDABLE_DELEGATED);

// Add locked coins
if (pwallet->IsLockedCoin(hashTx, i)) {
nCredit += pwallet->GetCredit(txout, ISMINE_SPENDABLE);
nCredit += pwallet->GetCredit(txout, ISMINE_SPENDABLE_ALL);
}

// Add masternode collaterals which are handled likc locked coins
// Add masternode collaterals which are handled like locked coins
else if (fMasterNode && vout[i].nValue == 10000 * COIN) {
nCredit += pwallet->GetCredit(txout, ISMINE_SPENDABLE);
}
Expand Down