highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-03-23 05:59:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge #10431: Prevent shadowing the global dustRelayFee

Browse Source 
43c5877 Prevent shadowing the global dustRelayFee. (Pavel Janík)

Tree-SHA512: 9765931a7753c484990003396afd0bb65a53f42d1cad9502017720618ce90b3c5ae68591db01e3524adecdbe6925a5eeeebf04012ba644ef3b65073af207ae5d
This commit is contained in:
MarcoFalke
2017-05-22 08:14:17 +02:00
parent 6b99dafe42 43c587738d
commit a4ca0b0423
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/policy/policy.cpp
View File

@@ -15,7 +15,7 @@
#include <boost/foreach.hpp>
CAmount GetDustThreshold(const CTxOut& txout, const CFeeRate& dustRelayFee)
CAmount GetDustThreshold(const CTxOut& txout, const CFeeRate& dustRelayFeeIn)
{
// "Dust" is defined in terms of dustRelayFee,
// which has units satoshis-per-kilobyte.
@@ -44,12 +44,12 @@ CAmount GetDustThreshold(const CTxOut& txout, const CFeeRate& dustRelayFee)
nSize += (32 + 4 + 1 + 107 + 4); // the 148 mentioned above
}
return 3 * dustRelayFee.GetFee(nSize);
return 3 * dustRelayFeeIn.GetFee(nSize);
}
bool IsDust(const CTxOut& txout, const CFeeRate& dustRelayFee)
bool IsDust(const CTxOut& txout, const CFeeRate& dustRelayFeeIn)
{
return (txout.nValue < GetDustThreshold(txout, dustRelayFee));
return (txout.nValue < GetDustThreshold(txout, dustRelayFeeIn));
}
/**