Skip to content

Commit

Permalink
Merge bitcoin#15193: Default -whitelistforcerelay to off
Browse files Browse the repository at this point in the history
a36d97d Default -whitelistforcerelay to off (Suhas Daftuar)

Pull request description:

  No one seems to use this "feature", and at any rate the behavior of relaying transactions when they violate local policy is error-prone, if we ever consider changing the ban behavior of our software from one version to the next.

  Defaulting this to off means that users who use -whitelist won't be unexpectedly surprised by this interaction.  If anyone is still relying on this feature, it can still be explicitly turned on.

Tree-SHA512: 52650ad464a728d1648f496751e3f713077ea3a1de7278ed03531b2e8723e63cf2f6f41b56c98c0f73ffa22c36e01d9170b409ab452c737aca35b7ecd7a6b448

# Conflicts:
#	doc/release-notes.md
#	src/validation.h
#	test/functional/p2p_segwit.py
  • Loading branch information
laanwj authored and PastaPastaPasta committed Jul 19, 2021
1 parent 3c1b570 commit 29d70e6
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/net.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class BanMan;
/** Default for -whitelistrelay. */
static const bool DEFAULT_WHITELISTRELAY = true;
/** Default for -whitelistforcerelay. */
static const bool DEFAULT_WHITELISTFORCERELAY = true;
static const bool DEFAULT_WHITELISTFORCERELAY = false;

/** Time between pings automatically sent out for latency probing and keepalive (in seconds). */
static const int PING_INTERVAL = 2 * 60;
Expand Down

0 comments on commit 29d70e6

Please sign in to comment.