From ce196a9bfc2007b4ce79a1ec874c18fdda453caa Mon Sep 17 00:00:00 2001 From: J Ross Nicoll Date: Thu, 3 Sep 2015 21:34:03 +0100 Subject: Match fee calculation to legacy code Purge all support for zero-fee transactions Disable IsDust() for backwards compatibility --- src/main.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index 8e52b5a8e..6c82434c8 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -872,8 +872,7 @@ CAmount GetMinRelayFee(const CTransaction& tx, unsigned int nBytes, bool fAllowF CAmount nMinFee = ::minRelayTxFee.GetFee(nBytes); nMinFee += GetDogecoinDustFee(tx.vout, ::minRelayTxFee); - // Dogecoin: Disable free transactions - /* if (fAllowFree) + if (fAllowFree) { // There is a free transaction area in blocks created by most miners, // * If we are relaying we allow transactions up to DEFAULT_BLOCK_PRIORITY_SIZE - 1000 @@ -881,7 +880,7 @@ CAmount GetMinRelayFee(const CTransaction& tx, unsigned int nBytes, bool fAllowF // multiple transactions instead of one big transaction to avoid fees. if (nBytes < (DEFAULT_BLOCK_PRIORITY_SIZE - 1000)) nMinFee = 0; - } */ + } if (!MoneyRange(nMinFee)) nMinFee = MAX_MONEY; -- cgit v1.2.3