Merge pull request #6579

afb0cca Add NODE_BLOOM service bit and bump protocol version (Matt Corallo)
This commit is contained in:
Wladimir J. van der Laan 2015-09-08 17:03:23 +02:00
commit 0c27795140
No known key found for this signature in database
GPG key ID: 74810B012346C9A6
4 changed files with 26 additions and 1 deletions

View file

@ -918,6 +918,9 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
// Option to startup with mocktime set (used for regression testing):
SetMockTime(GetArg("-mocktime", 0)); // SetMockTime(0) is a no-op
if (GetBoolArg("-peerbloomfilters", true))
nLocalServices |= NODE_BLOOM;
// ********************************************************* Step 4: application initialization: dir lock, daemonize, pidfile, debug log
// Initialize elliptic curve code