diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2019-03-14 16:45:28 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2019-03-14 16:45:32 -0400 |
| commit | d3a038200709c48922faab96d0ba558a574fa4d9 (patch) | |
| tree | dcc5dded96c601bde9f511a99edf99c25bcbdc21 /src | |
| parent | 889af0eaacd9c858471a53d4125057eece6a4f3d (diff) | |
| parent | a7563633d25a99bb3ef170aaaeccacf44990f2d9 (diff) | |
| download | bitcoin-d3a038200709c48922faab96d0ba558a574fa4d9.tar.xz | |
Merge #15602: 0.18: [p2p] Enable reject messages by defaultv0.18.0rc2
a7563633d2 [docs] document BIP 61 deprecation (John Newbery)
da14d90984 [p2p] Enable BIP 61 REJECT messages by default (John Newbery)
Pull request description:
This PR reverts #14054 following discussion on the bitcoin-dev mailing list.
It also adds release notes to clearly document that the `enablebip61` option will be disabled by default in a future release before being removed entirely.
Tree-SHA512: 0c9162045a4fb95689a0cb2de19f98a83636c9a6fb7ffa6809773b593c6c00b14e0480683e4d1c48e9b7f90e89cf7c2dca18bff42f5d2da2a43c522039e9f1ee
Diffstat (limited to 'src')
| -rw-r--r-- | src/net_processing.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/net_processing.h b/src/net_processing.h index 39c22d7118..4189debe4c 100644 --- a/src/net_processing.h +++ b/src/net_processing.h @@ -18,7 +18,7 @@ static const unsigned int DEFAULT_MAX_ORPHAN_TRANSACTIONS = 100; /** Default number of orphan+recently-replaced txn to keep around for block reconstruction */ static const unsigned int DEFAULT_BLOCK_RECONSTRUCTION_EXTRA_TXN = 100; /** Default for BIP61 (sending reject messages) */ -static constexpr bool DEFAULT_ENABLE_BIP61{false}; +static constexpr bool DEFAULT_ENABLE_BIP61{true}; class PeerLogicValidation final : public CValidationInterface, public NetEventsInterface { private: |