From ba0625f25d5071628ae713af1f22e1e8405467e3 Mon Sep 17 00:00:00 2001 From: Simon Date: Sun, 13 Nov 2016 20:38:24 -0800 Subject: [PATCH] Set default minrelaytxfee to 1000 zatoshis to match upstream. A txout will be considered dust when it has a value <546 zatoshis. Helps to address #1719. --- src/main.cpp | 2 +- src/main.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index c432bcd63..612f1ed83 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -69,7 +69,7 @@ uint64_t nPruneTarget = 0; bool fAlerts = DEFAULT_ALERTS; /** Fees smaller than this (in satoshi) are considered zero fee (for relaying and mining) */ -CFeeRate minRelayTxFee = CFeeRate(5000); +CFeeRate minRelayTxFee = CFeeRate(DEFAULT_MIN_RELAY_TX_FEE); CTxMemPool mempool(::minRelayTxFee); diff --git a/src/main.h b/src/main.h index aec92435c..64b844db0 100644 --- a/src/main.h +++ b/src/main.h @@ -60,6 +60,8 @@ static const int ALERT_PRIORITY_SAFE_MODE = 4000; static const unsigned int MAX_P2SH_SIGOPS = 15; /** The maximum number of sigops we're willing to relay/mine in a single tx */ static const unsigned int MAX_STANDARD_TX_SIGOPS = MAX_BLOCK_SIGOPS/5; +/** Default for -minrelaytxfee, minimum relay fee for transactions */ +static const unsigned int DEFAULT_MIN_RELAY_TX_FEE = 1000; /** Default for -maxorphantx, maximum number of orphan transactions kept in memory */ static const unsigned int DEFAULT_MAX_ORPHAN_TRANSACTIONS = 100; /** The maximum size of a blk?????.dat file (since 0.8) */