diff options
| author | J Ross Nicoll <[email protected]> | 2015-09-03 21:34:03 +0100 |
|---|---|---|
| committer | J Ross Nicoll <[email protected]> | 2015-09-06 11:37:03 +0100 |
| commit | ce196a9bfc2007b4ce79a1ec874c18fdda453caa (patch) | |
| tree | 1e369abc14f87d54cc3213699f092ce01336c747 /src/main.cpp | |
| parent | Merge pull request #1277 from patricklodder/1.10-fix-travis-extra-compiler (diff) | |
| download | discoin-ce196a9bfc2007b4ce79a1ec874c18fdda453caa.tar.xz discoin-ce196a9bfc2007b4ce79a1ec874c18fdda453caa.zip | |
Match fee calculation to legacy code
Purge all support for zero-fee transactions
Disable IsDust() for backwards compatibility
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
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; |