Merge pull request #31 from lateminer/patch-6

Do not exclude stake from balances in listaddressgroupings RPC
This commit is contained in:
janko33bd
2018-02-01 21:52:19 +01:00
committed by GitHub
4 changed files with 4 additions and 4 deletions

View File

@@ -4311,7 +4311,7 @@
<message>
<location line="+3"/>
<source>Copyright (C) 2009-%i The Bitcoin Core Developers</source>
<translation>Copyright (C) 2014-%i The Blackcoin Lore Developers</translation>
<translation>Copyright (C) 2009-%i The Bitcoin Core Developers</translation>
</message>
<message>
<location line="+16"/>

View File

@@ -3317,7 +3317,7 @@
</message>
<message>
<source>Copyright (C) 2009-%i The Bitcoin Core Developers</source>
<translation>Copyright (C) 2014-%i The Blackcoin Lore Developers</translation>
<translation>Copyright (C) 2009-%i The Bitcoin Core Developers</translation>
</message>
<message>
<source>Error loading wallet.dat: Wallet requires newer version of Bitcoin Core</source>

View File

@@ -3213,7 +3213,7 @@
</message>
<message>
<source>Copyright (C) 2009-%i The Bitcoin Core Developers</source>
<translation>Copyright (C) 20014-%i The Blackcoin Lore Developers</translation>
<translation>Copyright (C) 2009-%i The Bitcoin Core Developers</translation>
</message>
<message>
<source>Error loading wallet.dat: Wallet requires newer version of Bitcoin Core</source>

View File

@@ -3235,7 +3235,7 @@ std::map<CTxDestination, CAmount> CWallet::GetAddressBalances()
if (!CheckFinalTx(*pcoin) || !pcoin->IsTrusted())
continue;
if ((pcoin->IsCoinBase() || pcoin->IsCoinStake()) && pcoin->GetBlocksToMaturity() > 0)
if (pcoin->IsCoinBase() && pcoin->GetBlocksToMaturity() > 0)
continue;
int nDepth = pcoin->GetDepthInMainChain();