dash/blackcoin-more
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[amount] Add support for negative fee rates

Browse Source
This commit is contained in:
MarcoFalke
2016-04-03 13:44:01 +02:00
committed by lateminer
parent b51c500e6e
commit fb9c7896c4
2 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/amount.cpp
View File

@@ -10,20 +10,30 @@
const std::string CURRENCY_UNIT = "BTC";
CFeeRate::CFeeRate(const CAmount& nFeePaid, size_t nSize)
CFeeRate::CFeeRate(const CAmount& nFeePaid, size_t nBytes_)
{
assert(nBytes_ <= uint64_t(std::numeric_limits<int64_t>::max()));
int64_t nSize = int64_t(nBytes_);
if (nSize > 0)
nSatoshisPerK = nFeePaid*1000/nSize;
nSatoshisPerK = nFeePaid * 1000 / nSize;
else
nSatoshisPerK = 0;
}
CAmount CFeeRate::GetFee(size_t nSize) const
CAmount CFeeRate::GetFee(size_t nBytes_) const
{
CAmount nFee = nSatoshisPerK * ceil(1 + nSize / 1000);
assert(nBytes_ <= uint64_t(std::numeric_limits<int64_t>::max()));
int64_t nSize = int64_t(nBytes_);
if (nFee == 0 && nSatoshisPerK > 0)
nFee = nSatoshisPerK;
CAmount nFee = nSatoshisPerK * nSize / 1000;
if (nFee == 0 && nSize != 0) {
if (nSatoshisPerK > 0)
nFee = CAmount(1);
if (nSatoshisPerK < 0)
nFee = CAmount(-1);
}
return nFee;
}