Various fixes for 11.0.5

-Darksend balance shows sendable amount now.
-Fixed "darksend is disabled" inaccurate message
-Fixed crashing on -reindex and -gen
This commit is contained in:
Evan Duffield 2015-01-12 10:04:28 -07:00
parent 5c16596b01
commit 76ab102ff7
5 changed files with 7 additions and 5 deletions

View File

@ -3,7 +3,7 @@ AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 0)
define(_CLIENT_VERSION_MINOR, 11)
define(_CLIENT_VERSION_REVISION, 0)
define(_CLIENT_VERSION_BUILD, 4)
define(_CLIENT_VERSION_BUILD, 5)
define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2015)
AC_INIT([Darkcoin Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[info@darkcoin.io],[darkcoin])

View File

@ -13,7 +13,7 @@
#define CLIENT_VERSION_MAJOR 0
#define CLIENT_VERSION_MINOR 11
#define CLIENT_VERSION_REVISION 0
#define CLIENT_VERSION_BUILD 4
#define CLIENT_VERSION_BUILD 5

View File

@ -1499,6 +1499,7 @@ bool CDarkSendPool::DoAutomaticDenominating(bool fDryRun, bool ready)
}
LogPrintf("DoAutomaticDenominating : Too little to denominate \n");
strAutoDenomResult = "Too little to denominate";
return false;
}

View File

@ -366,8 +366,7 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn)
nLastBlockTx = nBlockTx;
nLastBlockSize = nBlockSize;
LogPrintf("CreateNewBlock(): total size %u\n", nBlockSize);
int64_t blockValue = GetBlockValue(GetNextWorkRequired(pindexPrev, pblock), pindexPrev->nHeight+1, nFees);
int64_t blockValue = GetBlockValue(pindexPrev->nBits, pindexPrev->nHeight, nFees);
int64_t masternodePayment = GetMasternodePayment(pindexPrev->nHeight+1, blockValue);
//create masternode payment

View File

@ -70,7 +70,9 @@ qint64 WalletModel::getBalance(const CCoinControl *coinControl) const
qint64 WalletModel::getAnonymizedBalance() const
{
return wallet->GetAnonymizedBalance();
qint64 ret = wallet->GetAnonymizedBalance() - (COIN/10);
if (ret < 0) ret = 0;
return ret;
}
qint64 WalletModel::getUnconfirmedBalance() const