From 43f22dc5180d953d278580dff887245a4f44a4da Mon Sep 17 00:00:00 2001 From: fsb4000 Date: Wed, 26 Nov 2014 15:26:00 +0600 Subject: [PATCH] =?utf8?q?=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B7=D0=BD=D0=B0=D1=87=D0=B5=D0=BD=D0=B8=D0=B9=20=D0=B2=20=D1=81=D1=82=D0=BE=D0=B1=D0=BB=D1=86=D0=B5=20"=D0=92=D0=B5=D1=81"?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/kernelrecord.cpp | 12 ++++++++++-- src/kernelrecord.h | 1 + src/qt/mintingtablemodel.cpp | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/kernelrecord.cpp b/src/kernelrecord.cpp index f4ec68e..ef46b46 100644 --- a/src/kernelrecord.cpp +++ b/src/kernelrecord.cpp @@ -2,9 +2,7 @@ #include "wallet.h" #include "base58.h" -#include "main.h" -#include using namespace std; @@ -77,6 +75,16 @@ int64 KernelRecord::getAge() const return (GetAdjustedTime() - nTime) / 86400; } +uint64 KernelRecord::getCoinDay() const +{ + int64 nWeight = GetAdjustedTime() - nTime - nStakeMinAge; + if( nWeight < 0) + return 0; + nWeight = min(nWeight, (int64)nStakeMaxAge); + uint64 coinAge = (nValue * nWeight ) / (COIN * 86400); + return coinAge; +} + int64 KernelRecord::getPoSReward(int nBits, int minutes) { double PoSReward; diff --git a/src/kernelrecord.h b/src/kernelrecord.h index c18c6cf..fce7b24 100644 --- a/src/kernelrecord.h +++ b/src/kernelrecord.h @@ -41,6 +41,7 @@ public: std::string getTxID(); int64 getAge() const; + uint64 getCoinDay() const; double getProbToMintStake(double difficulty, int timeOffset = 0) const; double getProbToMintWithinNMinutes(double difficulty, int minutes); int64 getPoSReward(int nBits, int timeOffset); diff --git a/src/qt/mintingtablemodel.cpp b/src/qt/mintingtablemodel.cpp index 97e3245..b77a4c8 100644 --- a/src/qt/mintingtablemodel.cpp +++ b/src/qt/mintingtablemodel.cpp @@ -401,7 +401,7 @@ QString MintingTableModel::formatTxHash(const KernelRecord *wtx) const QString MintingTableModel::formatTxCoinDay(const KernelRecord *wtx) const { - return QString::number(wtx->coinAge); + return QString::number(wtx->getCoinDay()); } QString MintingTableModel::formatTxAge(const KernelRecord *wtx) const -- 1.7.1