aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBtcDrak <btcdrak@gmail.com>2016-03-24 19:25:03 +0000
committerWladimir J. van der Laan <laanwj@gmail.com>2016-03-30 19:42:02 +0200
commitc251f46bea8f9a8a0cc975b023a39b9ba3c72f04 (patch)
treec7f35f856ba81fe5833ce3f1a946685909ea0199
parent12943ad96db6ccd23581442ed41b6f702029ecd4 (diff)
downloadbitcoin-c251f46bea8f9a8a0cc975b023a39b9ba3c72f04.tar.xz
Mark p2p alert system as deprecated.
Set default to off This feature is removed entirely as of 0.13.0 Github-Pull: #7741 Rebased-From: c0fe2c9e0301f9b046b51fd78bb89ed8f6946eb8
-rw-r--r--doc/release-notes.md5
-rw-r--r--src/main.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/doc/release-notes.md b/doc/release-notes.md
index 46dd795eb6..19f77b94ef 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -48,6 +48,11 @@ known problems when downgrading from 0.11.x to 0.10.x.
Notable changes since 0.11.2
============================
+Alert system
+--------------
+
+The P2P alert system is off by default. To turn on, use `-alert` with startup
+configuration.
0.11.3 Change log
=================
diff --git a/src/main.h b/src/main.h
index 74911f6e65..7f2e3fb4e2 100644
--- a/src/main.h
+++ b/src/main.h
@@ -53,7 +53,7 @@ static const unsigned int DEFAULT_BLOCK_MIN_SIZE = 0;
/** Default for -blockprioritysize, maximum space for zero/low-fee transactions **/
static const unsigned int DEFAULT_BLOCK_PRIORITY_SIZE = 50000;
/** Default for accepting alerts from the P2P network. */
-static const bool DEFAULT_ALERTS = true;
+static const bool DEFAULT_ALERTS = false;
/** The maximum size for transactions we're willing to relay/mine */
static const unsigned int MAX_STANDARD_TX_SIZE = 100000;
/** Maximum number of signature check operations in an IsStandard() P2SH script */