Merge pull request #34 from kaykurokawa/check_dust

Re-enable dust threshold checks
This commit is contained in:
Job Evers‐Meltzer 2016-10-18 11:27:20 -05:00 committed by GitHub
commit b89ff5f456
2 changed files with 16 additions and 9 deletions

View file

@ -171,14 +171,18 @@ public:
if (scriptPubKey.IsUnspendable())
return 0;
size_t nSize = GetSerializeSize(SER_DISK,0)+148u;
return 3*minRelayTxFee.GetFee(nSize);
// for lbrycrd this is mainly to prevent 0 value claims
// and some spam protection without limiting small
// lbrynet transactions
return 1;
// below is original bitcoin core code
//size_t nSize = GetSerializeSize(SER_DISK,0)+dd148u;
//return 3*minRelayTxFee.GetFee(nSize);
}
bool IsDust(const CFeeRate &minRelayTxFee) const
{
return false;
// return (nValue < GetDustThreshold(minRelayTxFee));
return (nValue < GetDustThreshold(minRelayTxFee));
}
friend bool operator==(const CTxOut& a, const CTxOut& b)

View file

@ -337,11 +337,14 @@ BOOST_AUTO_TEST_CASE(test_IsStandard)
BOOST_CHECK(IsStandardTx(t, reason));
// Check dust with default relay fee:
CAmount nDustThreshold = 182 * minRelayTxFee.GetFeePerK()/1000 * 3;
BOOST_CHECK_EQUAL(nDustThreshold, 546);
//CAmount nDustThreshold = 182 * minRelayTxFee.GetFeePerK()/1000 * 3;
//BOOST_CHECK_EQUAL(nDustThreshold, 546);
// lbry dust is set to 1, regardless of minRelayTxfee
CAmount nDustThreshold = 1;
// dust:
//t.vout[0].nValue = nDustThreshold - 1;
//BOOST_CHECK(!IsStandardTx(t, reason));
t.vout[0].nValue = nDustThreshold - 1;
BOOST_CHECK(!IsStandardTx(t, reason));
// not dust:
t.vout[0].nValue = nDustThreshold;
BOOST_CHECK(IsStandardTx(t, reason));