diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-06-12 12:00:39 +0200 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-06-15 10:17:56 +0200 |
commit | be6420407b37c4c45a42874ea3cd974605fb65dc (patch) | |
tree | 4cc5421fa09fcd13dab332daf514b0b1e4f4bb75 /src/main.h | |
parent | 0fd846445894e9641d6a908a3e87065ec4d9fef4 (diff) | |
download | bitcoin-be6420407b37c4c45a42874ea3cd974605fb65dc.tar.xz |
Add option `-alerts` to opt out of alert system
Make it possible to opt-out of the centralized alert system by providing
an option `-noalerts` or `-alerts=0`. The default remains unchanged.
This is a gentler form of #6260, in which I went a bit overboard by
removing the alert system completely.
I intend to add this to the GUI options in another pull after this.
Conflicts:
src/init.cpp
src/main.cpp
Github-Pull: #6274
Rebased-From: 02a6702a82a5b00e0e0351041dd3267308b7f319
Diffstat (limited to 'src/main.h')
-rw-r--r-- | src/main.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/main.h b/src/main.h index 71f21716d0..9a875a0750 100644 --- a/src/main.h +++ b/src/main.h @@ -54,6 +54,8 @@ static const unsigned int DEFAULT_BLOCK_MAX_SIZE = 750000; 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; /** The maximum size for transactions we're willing to relay/mine */ static const unsigned int MAX_STANDARD_TX_SIZE = 100000; /** The maximum allowed number of signature check operations in a block (network rule) */ @@ -129,6 +131,7 @@ extern bool fIsBareMultisigStd; extern bool fCheckBlockIndex; extern unsigned int nCoinCacheSize; extern CFeeRate minRelayTxFee; +extern bool fAlerts; /** Best header we've seen so far (used for getheaders queries' starting points). */ extern CBlockIndex *pindexBestHeader; |