diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-11-21 15:27:41 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-11-21 15:27:48 +0100 |
| commit | b9a87b459d2536e572b3a0836f8affb2cc894330 (patch) | |
| tree | 844b66e5292c2deb81cef0c0c0b7bed28fa8ffe2 | |
| parent | c3906403c8edb17433a6370bfb65324f9c7f361c (diff) | |
| parent | fa7cc5a508921182a4ebf1f9ed296664e5044007 (diff) | |
| download | bitcoin-b9a87b459d2536e572b3a0836f8affb2cc894330.tar.xz | |
Merge #9179: Set DEFAULT_LIMITFREERELAY = 0 kB/minute
fa7cc5a Set DEFAULT_LIMITFREERELAY = 0 kB/minute (MarcoFalke)
| -rw-r--r-- | doc/release-notes.md | 6 | ||||
| -rw-r--r-- | src/main.h | 2 |
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 678f0fd99d..48fc3306f9 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; |