From 581312ff9087306f84ce58172ecc0dfe6754602b Mon Sep 17 00:00:00 2001 From: UdjinM6 Date: Wed, 2 Mar 2016 14:36:41 +0300 Subject: [PATCH] Fix default fees Closes #708 --- src/main.cpp | 5 +---- src/main.h | 7 +++++-- src/wallet/wallet.cpp | 2 -- src/wallet/wallet.h | 6 +++++- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index c5f9fb8fa8..cc0a5edddc 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -86,10 +86,7 @@ uint64_t nPruneTarget = 0; bool fAlerts = DEFAULT_ALERTS; bool fEnableReplacement = DEFAULT_ENABLE_REPLACEMENT; -/** Fees smaller than this (in duffs) are considered zero fee (for relaying, mining and transaction creation) - * We are ~100 times smaller then bitcoin now (2015-06-23), set minRelayTxFee only 10 times higher - * so it's still 10 times lower comparing to bitcoin. - */ +/** Fees smaller than this (in duffs) are considered zero fee (for relaying, mining and transaction creation) */ CFeeRate minRelayTxFee = CFeeRate(DEFAULT_MIN_RELAY_TX_FEE); CTxMemPool mempool(::minRelayTxFee); diff --git a/src/main.h b/src/main.h index b3defa84eb..5668771318 100644 --- a/src/main.h +++ b/src/main.h @@ -47,8 +47,11 @@ static const bool DEFAULT_ALERTS = true; static const bool DEFAULT_WHITELISTRELAY = true; /** Default for DEFAULT_WHITELISTFORCERELAY. */ static const bool DEFAULT_WHITELISTFORCERELAY = true; -/** Default for -minrelaytxfee, minimum relay fee for transactions */ -static const unsigned int DEFAULT_MIN_RELAY_TX_FEE = 10000; +/** Default for -minrelaytxfee, minimum relay fee for transactions + * We are ~100 times smaller then bitcoin now (2016-03-01), set minRelayTxFee only 10 times higher + * so it's still 10 times lower comparing to bitcoin. + */ +static const unsigned int DEFAULT_MIN_RELAY_TX_FEE = 10000; // was 1000 /** Default for -maxorphantx, maximum number of orphan transactions kept in memory */ static const unsigned int DEFAULT_MAX_ORPHAN_TRANSACTIONS = 100; /** Default for -limitancestorcount, max number of in-mempool ancestors */ diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 151bbe66fb..ca0a63a65f 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -51,8 +51,6 @@ bool fSendFreeTransactions = DEFAULT_SEND_FREE_TRANSACTIONS; /** * Fees smaller than this (in duffs) are considered zero fee (for transaction creation) - * We are ~100 times smaller then bitcoin now (2015-06-23), set minTxFee 10 times higher - * so it's still 10 times lower comparing to bitcoin. * Override with -mintxfee */ CFeeRate CWallet::minTxFee = CFeeRate(DEFAULT_TRANSACTION_MINFEE); diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 8155bdbafe..05bb9944eb 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -49,7 +49,11 @@ static const CAmount nHighTransactionFeeWarning = 0.01 * COIN; //! -fallbackfee default static const CAmount DEFAULT_FALLBACK_FEE = 20000; //! -mintxfee default -static const CAmount DEFAULT_TRANSACTION_MINFEE = 1000; +/** + * We are ~100 times smaller then bitcoin now (2016-03-01), set minTxFee 10 times higher + * so it's still 10 times lower comparing to bitcoin. + */ +static const CAmount DEFAULT_TRANSACTION_MINFEE = 10000; // was 1000 //! -maxtxfee default static const CAmount DEFAULT_TRANSACTION_MAXFEE = 0.1 * COIN; //! minimum change amount