Skip to content
This repository has been archived by the owner on Oct 9, 2019. It is now read-only.

Adding command-line arg to hide segwit2x service bit #109

Closed
wants to merge 1 commit into from
Closed

Adding command-line arg to hide segwit2x service bit #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/init.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,6 +371,7 @@ std::string HelpMessage(HelpMessageMode mode)
strUsage += HelpMessageOpt("-dnsseed", _("Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect/-noconnect)"));
strUsage += HelpMessageOpt("-externalip=<ip>", _("Specify your own public address"));
strUsage += HelpMessageOpt("-forcednsseed", strprintf(_("Always query for peer addresses via DNS lookup (default: %u)"), DEFAULT_FORCEDNSSEED));
strUsage += HelpMessageOpt("-hidesegwit2x", strprintf(_("Hides the NODE_SEGWIT2X service bit for peering purposes (default: %u)"), DEFAULT_HIDESEGWIT2X));
strUsage += HelpMessageOpt("-listen", _("Accept connections from outside (default: 1 if no -proxy or -connect/-noconnect)"));
strUsage += HelpMessageOpt("-listenonion", strprintf(_("Automatically create Tor hidden service (default: %d)"), DEFAULT_LISTEN_ONION));
strUsage += HelpMessageOpt("-maxconnections=<n>", strprintf(_("Maintain at most <n> connections to peers (default: %u)"), DEFAULT_MAX_PEER_CONNECTIONS));
Expand Down Expand Up @@ -1050,8 +1051,10 @@ bool AppInitParameterInteraction()
fAcceptDatacarrier = GetBoolArg("-datacarrier", DEFAULT_ACCEPT_DATACARRIER);
nMaxDatacarrierBytes = GetArg("-datacarriersize", nMaxDatacarrierBytes);

// Advertise as segwit2x node
nLocalServices = ServiceFlags(nLocalServices | NODE_SEGWIT2X);
if (!GetBoolArg("-hidesegwit2x", DEFAULT_HIDESEGWIT2X)) {
// Advertise as segwit2x node
nLocalServices = ServiceFlags(nLocalServices | NODE_SEGWIT2X);
}

// Prefer peers with compatible rulesets
if (GetBoolArg("-prefpeering", DEFAULT_PREFPEERING)) {
Expand Down
2 changes: 2 additions & 0 deletions src/net.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ static const bool DEFAULT_FORCEDNSSEED = false;
static const size_t DEFAULT_MAXRECEIVEBUFFER = 5 * 1000;
static const size_t DEFAULT_MAXSENDBUFFER = 1 * 1000;

static const bool DEFAULT_HIDESEGWIT2X = false;

static const ServiceFlags REQUIRED_SERVICES = NODE_NETWORK;

// NOTE: When adjusting this, update rpcnet:setban's help ("24h")
Expand Down