diff --git a/doc/release-notes.md b/doc/release-notes.md --- a/doc/release-notes.md +++ b/doc/release-notes.md @@ -5,3 +5,4 @@ This release includes the following features and fixes: - Remove the newdaaactivationtime configuration. + - Do not use the NODE_BITCOIN_CASH service bit for preferencial peering anymore. diff --git a/src/init.cpp b/src/init.cpp --- a/src/init.cpp +++ b/src/init.cpp @@ -1527,9 +1527,6 @@ // to differentiate the network nodes. nLocalServices = ServiceFlags(nLocalServices | NODE_BITCOIN_CASH); - // Preferentially keep peers which service NODE_BITCOIN_CASH - nRelevantServices = ServiceFlags(nRelevantServices | NODE_BITCOIN_CASH); - nMaxTipAge = GetArg("-maxtipage", DEFAULT_MAX_TIP_AGE); if (mapMultiArgs.count("-bip9params")) { diff --git a/src/seeder/db.h b/src/seeder/db.h --- a/src/seeder/db.h +++ b/src/seeder/db.h @@ -114,7 +114,6 @@ bool IsGood() const { if (ip.GetPort() != GetDefaultPort()) return false; if (!(services & NODE_NETWORK)) return false; - if (!(services & NODE_BITCOIN_CASH)) return false; if (!ip.IsRoutable()) return false; if (clientVersion && clientVersion < REQUIRE_VERSION) return false; if (blocks && blocks < GetRequireHeight()) return false; diff --git a/src/seeder/main.cpp b/src/seeder/main.cpp --- a/src/seeder/main.cpp +++ b/src/seeder/main.cpp @@ -153,13 +153,10 @@ } } if (filter_whitelist.empty()) { - filter_whitelist.insert(NODE_NETWORK | NODE_BITCOIN_CASH); - filter_whitelist.insert(NODE_NETWORK | NODE_BITCOIN_CASH | - NODE_BLOOM); - filter_whitelist.insert(NODE_NETWORK | NODE_BITCOIN_CASH | - NODE_XTHIN); - filter_whitelist.insert(NODE_NETWORK | NODE_BITCOIN_CASH | - NODE_BLOOM | NODE_XTHIN); + filter_whitelist.insert(NODE_NETWORK); + filter_whitelist.insert(NODE_NETWORK | NODE_BLOOM); + filter_whitelist.insert(NODE_NETWORK | NODE_XTHIN); + filter_whitelist.insert(NODE_NETWORK | NODE_BLOOM | NODE_XTHIN); } if (host != nullptr && ns == nullptr) showHelp = true; if (showHelp) fprintf(stderr, help, argv[0]);