aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2016-11-18 00:15:15 +0100
committerMarcoFalke <falke.marco@gmail.com>2016-11-18 00:23:25 +0100
commitfa7cc5a508921182a4ebf1f9ed296664e5044007 (patch)
tree9a82f763ac3ac895f8f2a78de73685f0b7895e10
parent0a6d48d9ed60b0b02177059ab116f8f46d2cbed3 (diff)
downloadbitcoin-fa7cc5a508921182a4ebf1f9ed296664e5044007.tar.xz
Set DEFAULT_LIMITFREERELAY = 0 kB/minute
-rw-r--r--doc/release-notes.md6
-rw-r--r--src/main.h2
2 files changed, 6 insertions, 2 deletions
diff --git a/doc/release-notes.md b/doc/release-notes.md
index f511fee22e..fe7f69d1f8 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -53,11 +53,15 @@ Removal of Priority Estimation
- Estimation of "priority" needed for a transaction to be included within a target
number of blocks has been removed. The rpc calls are deprecated and will either
- return -1 or 1e24 appropriately. The format for fee_estimates.dat has also
+ return -1 or 1e24 appropriately. The format for `fee_estimates.dat` has also
changed to no longer save these priority estimates. It will automatically be
converted to the new format which is not readable by prior versions of the
software.
+- The concept of "priority" transactions is planned to be removed in the next
+ major version. To prepare for this, the default for the rate limit of priority
+ transactions (`-limitfreerelay`) has been set to `0` kB/minute.
+
0.14.0 Change log
=================
diff --git a/src/main.h b/src/main.h
index 21829b6c25..304c4cf1ea 100644
--- a/src/main.h
+++ b/src/main.h
@@ -125,7 +125,7 @@ static const int64_t BLOCK_DOWNLOAD_TIMEOUT_BASE = 1000000;
/** Additional block download timeout per parallel downloading peer (i.e. 5 min) */
static const int64_t BLOCK_DOWNLOAD_TIMEOUT_PER_PEER = 500000;
-static const unsigned int DEFAULT_LIMITFREERELAY = 15;
+static const unsigned int DEFAULT_LIMITFREERELAY = 0;
static const bool DEFAULT_RELAYPRIORITY = true;
static const int64_t DEFAULT_MAX_TIP_AGE = 24 * 60 * 60;