diff options
| author | Matt Corallo <git@bluematt.me> | 2016-10-03 13:00:14 -0400 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2016-10-04 18:24:10 +0200 |
| commit | 06128da751371797683eabb577298a4966b2ce28 (patch) | |
| tree | 278be3e422c3eba73e3df7dae463bc62b4938c0a | |
| parent | d7615af34e8e19920ed12bfdafb09e0e4b57c7c5 (diff) | |
| download | bitcoin-06128da751371797683eabb577298a4966b2ce28.tar.xz | |
Make GetFetchFlags always request witness objects from witness peers
This fixes a bug where we might (in exceedingly rare circumstances)
accidentally ban a node for sending us the first (potentially few)
segwit blocks in non-segwit mode.
| -rw-r--r-- | src/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp index 437e972382..40c31b6ca6 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -4922,7 +4922,7 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam uint32_t GetFetchFlags(CNode* pfrom, CBlockIndex* pprev, const Consensus::Params& chainparams) { uint32_t nFetchFlags = 0; - if (IsWitnessEnabled(pprev, chainparams) && State(pfrom->GetId())->fHaveWitness) { + if ((pfrom->GetLocalServices() & NODE_WITNESS) && State(pfrom->GetId())->fHaveWitness) { nFetchFlags |= MSG_WITNESS_FLAG; } return nFetchFlags; |